diff --git a/src/base_tab/BaseImportTab.cpp b/src/base_tab/BaseImportTab.cpp index 6395fdf..c499428 100644 --- a/src/base_tab/BaseImportTab.cpp +++ b/src/base_tab/BaseImportTab.cpp @@ -27,10 +27,11 @@ void BaseImportTab::OnImportDatabase(wxCommandEvent &event){ void BaseImportTab::RefreshPendingImports(){ int ngames=games_to_import.size(); int ndb=databases_to_import.size(); + pending_imports->Clear(); if(ngames+ndb>0){ - pending_imports->SetLabel(" Pending imports: "+std::to_string(ngames)+" games and "+std::to_string(ndb)+" databases"); + pending_imports->AppendText(" Pending imports: "+std::to_string(ngames)+" games and "+std::to_string(ndb)+" databases"); }else - pending_imports->SetLabel(""); + pending_imports->SetHint("No pending imports"); } void BaseImportTab::RefreshImportLists(){ diff --git a/src/gui.cpp b/src/gui.cpp index b33583f..1077a2e 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -565,15 +565,9 @@ TabBase_TabImport::TabBase_TabImport( wxWindow* parent, wxWindowID id, const wxP wxBoxSizer* main_sizer; main_sizer = new wxBoxSizer( wxVERTICAL ); - pending_imports = new wxStaticText( this, wxID_ANY, wxT("No pending imports"), wxDefaultPosition, wxDefaultSize, 0 ); - pending_imports->Wrap( -1 ); - pending_imports->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); - + pending_imports = new wxTextCtrl( this, wxID_ANY, wxT("No pending imports"), wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); main_sizer->Add( pending_imports, 0, wxALL|wxEXPAND, 5 ); - m_staticline41 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - main_sizer->Add( m_staticline41, 0, wxEXPAND | wxALL, 5 ); - wxBoxSizer* games_sizer; games_sizer = new wxBoxSizer( wxHORIZONTAL ); diff --git a/src/gui.h b/src/gui.h index df64a5e..99405fc 100644 --- a/src/gui.h +++ b/src/gui.h @@ -334,8 +334,7 @@ class TabBase_TabImport : public wxPanel private: protected: - wxStaticText* pending_imports; - wxStaticLine* m_staticline41; + wxTextCtrl* pending_imports; wxStaticText* from_game_label; wxComboBox* opened_game_list; wxButton* import_from_game_button; diff --git a/tools/wxFrameBuilder.fbp b/tools/wxFrameBuilder.fbp index 006a2d1..62c5f90 100644 --- a/tools/wxFrameBuilder.fbp +++ b/tools/wxFrameBuilder.fbp @@ -5552,68 +5552,7 @@ 5 wxALL|wxEXPAND 0 - - 1 - 1 - 1 - 1 - - - - - - wxSYS_COLOUR_WINDOW - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - No pending imports - 0 - - 0 - - - 0 - - 1 - pending_imports - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxEXPAND | wxALL - 0 - + 1 1 1 @@ -5644,11 +5583,12 @@ 0 + 0 1 - m_staticline41 + pending_imports 1 @@ -5658,10 +5598,15 @@ Resizable 1 - wxLI_HORIZONTAL + wxTE_READONLY ; ; forward_declare 0 + + wxFILTER_NONE + wxDefaultValidator + + No pending imports