Update import

This commit is contained in:
Loic Guegan 2022-12-25 14:32:06 +01:00
parent 11a46aadf7
commit 05ffd7c9e5
5 changed files with 18 additions and 7 deletions

View file

@ -1,13 +1,22 @@
#include "BaseImportTab.hpp" #include "BaseImportTab.hpp"
BaseImportTab::BaseImportTab(wxFrame *parent): BaseImportTab::BaseImportTab(wxFrame *parent, TabInfos *main_tab):
TabBase_TabImport(parent) TabBase_TabImport(parent), main_tab(main_tab)
{ {
RefreshImportLists();
}
void BaseImportTab::RefreshImportLists(){
for (TabInfos *i : wxGetApp().ListTabInfos()) { for (TabInfos *i : wxGetApp().ListTabInfos()) {
if (i->type == TabInfos::GAME || i->type == TabInfos::BASE) { if (i->type == TabInfos::GAME) {
wxWindow *win = dynamic_cast<wxWindow *>(i); wxWindow *win = dynamic_cast<wxWindow *>(i);
opened_game_list->Append(win->GetLabel(),i); opened_game_list->Append(win->GetLabel(),i);
opened_game_list->SetSelection(0); opened_game_list->SetSelection(0);
} }
else if (i->type == TabInfos::BASE && i->id != main_tab->id) {
wxWindow *win = dynamic_cast<wxWindow *>(i);
opened_db_list->Append(win->GetLabel(),i);
opened_db_list->SetSelection(0);
}
} }
} }

View file

@ -2,7 +2,9 @@
class BaseImportTab : public TabBase_TabImport { class BaseImportTab : public TabBase_TabImport {
TabInfos *main_tab;
public: public:
BaseImportTab(wxFrame *parent); BaseImportTab(wxFrame *parent, TabInfos *main_tab);
void RefreshImportLists();
}; };

View file

@ -9,7 +9,7 @@ BaseTab::BaseTab(wxFrame *parent, std::string base_file)
games_tab=new BaseGameTab((wxFrame *)notebook,base_file,this); games_tab=new BaseGameTab((wxFrame *)notebook,base_file,this);
notebook->AddPage(games_tab, "Games list",true); // true for selecting the tab notebook->AddPage(games_tab, "Games list",true); // true for selecting the tab
// Import tab // Import tab
import_tab=new BaseImportTab((wxFrame *)notebook); import_tab=new BaseImportTab((wxFrame *)notebook,this);
notebook->AddPage(import_tab, "Import games"); notebook->AddPage(import_tab, "Import games");
// Manage tab // Manage tab
manage_tab=new BaseManageTab((wxFrame *)notebook); manage_tab=new BaseManageTab((wxFrame *)notebook);

View file

@ -603,7 +603,7 @@ TabBase_TabImport::TabBase_TabImport( wxWindow* parent, wxWindowID id, const wxP
wxBoxSizer* bSizer33; wxBoxSizer* bSizer33;
bSizer33 = new wxBoxSizer( wxHORIZONTAL ); bSizer33 = new wxBoxSizer( wxHORIZONTAL );
opened_db_list = new wxComboBox( this, wxID_ANY, wxT("No database opened"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); opened_db_list = new wxComboBox( this, wxID_ANY, wxT("No other databases opened"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
bSizer33->Add( opened_db_list, 100, wxALL|wxEXPAND, 5 ); bSizer33->Add( opened_db_list, 100, wxALL|wxEXPAND, 5 );
import_from_db_button = new wxButton( this, wxID_ANY, wxT("Import Selected Games"), wxDefaultPosition, wxDefaultSize, 0 ); import_from_db_button = new wxButton( this, wxID_ANY, wxT("Import Selected Games"), wxDefaultPosition, wxDefaultSize, 0 );

View file

@ -6104,7 +6104,7 @@
<property name="validator_style">wxFILTER_NONE</property> <property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property> <property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property> <property name="validator_variable"></property>
<property name="value">No database opened</property> <property name="value">No other databases opened</property>
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>