ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pcsx2: replace macro in GameDb by function

This commit is contained in:
Gregory Hainaut 2016-08-27 19:00:27 +02:00
parent 35cf2638e8
commit 02da178d5c
2 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/gui/Panels/ConfigurationPanels.h
View File

@ -409,6 +409,10 @@ namespace Panels
void PopulateFields( const wxString& serial=wxEmptyString ); void PopulateFields( const wxString& serial=wxEmptyString );
bool WriteFieldsToDB(); bool WriteFieldsToDB();
void Search_Click( wxCommandEvent& evt ); void Search_Click( wxCommandEvent& evt );
private:
void placeTextBox(wxFlexGridSizer& sizer1, wxTextCtrl* wxBox, const wxString& txt);
void blankLine(wxFlexGridSizer& sizer1);
}; };
class SettingsDirPickerPanel : public DirPickerPanel class SettingsDirPickerPanel : public DirPickerPanel

45
pcsx2/gui/Panels/GameDatabasePanel.cpp
View File

@ -309,18 +309,6 @@ wxListItemAttr* GameDatabaseListView::OnGetItemAttr(long item) const
} }
#define blankLine() { \
sizer1+=5; sizer1+=5; sizer1+=Text(wxEmptyString); sizer1+=5; sizer1+=5; \
}
#define placeTextBox(wxBox, txt) { \
sizer1 += Label(_(txt)); \
sizer1 += 5; \
sizer1 += wxBox | pxCenter; \
sizer1 += 5; \
sizer1 += 5; \
}
wxTextCtrl* CreateMultiLineTextCtrl( wxWindow* parent, int digits, long flags = 0 ) wxTextCtrl* CreateMultiLineTextCtrl( wxWindow* parent, int digits, long flags = 0 )
{ {
wxTextCtrl* ctrl = new wxTextCtrl(parent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE); wxTextCtrl* ctrl = new wxTextCtrl(parent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);
@ -350,20 +338,20 @@ Panels::GameDatabasePanel::GameDatabasePanel( wxWindow* parent )
wxFlexGridSizer& sizer1(*new wxFlexGridSizer(5, StdPadding, 0)); wxFlexGridSizer& sizer1(*new wxFlexGridSizer(5, StdPadding, 0));
sizer1.AddGrowableCol(0); sizer1.AddGrowableCol(0);
blankLine(); blankLine(sizer1);
sizer1 += Label(L"Serial: "); sizer1 += Label(L"Serial: ");
sizer1 += 5; sizer1 += 5;
sizer1 += serialBox | pxCenter; sizer1 += serialBox | pxCenter;
sizer1 += 5; sizer1 += 5;
sizer1 += searchBtn; sizer1 += searchBtn;
placeTextBox(nameBox, "Name: "); placeTextBox(sizer1, nameBox, _("Name: "));
placeTextBox(regionBox, "Region: "); placeTextBox(sizer1, regionBox, _("Region: "));
placeTextBox(compatBox, "Compatibility: "); placeTextBox(sizer1, compatBox, _("Compatibility: "));
placeTextBox(commentBox, "Comments: "); placeTextBox(sizer1, commentBox, _("Comments: "));
placeTextBox(patchesBox, "Patches: "); placeTextBox(sizer1, patchesBox, _("Patches: "));
blankLine(); blankLine(sizer1);
wxStaticBoxSizer& sizer2 = *new wxStaticBoxSizer(wxVERTICAL, this, _("Gamefixes")); wxStaticBoxSizer& sizer2 = *new wxStaticBoxSizer(wxVERTICAL, this, _("Gamefixes"));
wxFlexGridSizer& sizer3(*new wxFlexGridSizer(3, 0, StdPadding*4)); wxFlexGridSizer& sizer3(*new wxFlexGridSizer(3, 0, StdPadding*4));
@ -381,6 +369,20 @@ Panels::GameDatabasePanel::GameDatabasePanel( wxWindow* parent )
PopulateFields(); PopulateFields();
} }
void Panels::GameDatabasePanel::blankLine(wxFlexGridSizer& sizer1)
{
sizer1+=5; sizer1+=5; sizer1+=Text(wxEmptyString); sizer1+=5; sizer1+=5;
}
void Panels::GameDatabasePanel::placeTextBox(wxFlexGridSizer& sizer1, wxTextCtrl* wxBox, const wxString& txt)
{
sizer1 += Label(txt);
sizer1 += 5;
sizer1 += wxBox | pxCenter;
sizer1 += 5;
sizer1 += 5;
}
void Panels::GameDatabasePanel::PopulateFields( const wxString& id ) { void Panels::GameDatabasePanel::PopulateFields( const wxString& id ) {
IGameDatabase* GameDB = AppHost_GetGameDatabase(); IGameDatabase* GameDB = AppHost_GetGameDatabase();
if (!pxAssert(GameDB)) return; if (!pxAssert(GameDB)) return;
@ -417,11 +419,6 @@ void Panels::GameDatabasePanel::PopulateFields( const wxString& id ) {
} }
} }
#define writeTextBoxToDB(_key, _value) { \
if (_value.IsEmpty()) GameDB->deleteKey(wxT(_key)); \
else GameDB->writeString(wxT(_key), _value); \
}
// returns True if the database is modified, or FALSE if no changes to save. // returns True if the database is modified, or FALSE if no changes to save.
bool Panels::GameDatabasePanel::WriteFieldsToDB() { bool Panels::GameDatabasePanel::WriteFieldsToDB() {
IGameDatabase* GameDB = AppHost_GetGameDatabase(); IGameDatabase* GameDB = AppHost_GetGameDatabase();