mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-24 14:49:42 -06:00
Remove some superfluous arguments from some wx control creations
wx has these as default parameters.
This commit is contained in:
Lioncash
@ -362,82 +362,73 @@ long CISOProperties::GetElementStyle(const char* section, const char* key)
|
||||
|
||||
void CISOProperties::CreateGUIControls(bool IsWad)
|
||||
{
|
||||
wxButton * const EditConfig =
|
||||
new wxButton(this, ID_EDITCONFIG, _("Edit Config"), wxDefaultPosition, wxDefaultSize);
|
||||
wxButton* const EditConfig = new wxButton(this, ID_EDITCONFIG, _("Edit Config"));
|
||||
EditConfig->SetToolTip(_("This will let you Manually Edit the INI config file"));
|
||||
|
||||
wxButton * const EditConfigDefault =
|
||||
new wxButton(this, ID_SHOWDEFAULTCONFIG, _("Show Defaults"), wxDefaultPosition, wxDefaultSize);
|
||||
wxButton* const EditConfigDefault = new wxButton(this, ID_SHOWDEFAULTCONFIG, _("Show Defaults"));
|
||||
EditConfigDefault->SetToolTip(_("Opens the default (read-only) configuration for this game in an external text editor."));
|
||||
|
||||
// Notebook
|
||||
wxNotebook * const m_Notebook =
|
||||
new wxNotebook(this, ID_NOTEBOOK, wxDefaultPosition, wxDefaultSize);
|
||||
wxPanel * const m_GameConfig =
|
||||
new wxPanel(m_Notebook, ID_GAMECONFIG, wxDefaultPosition, wxDefaultSize);
|
||||
wxNotebook* const m_Notebook = new wxNotebook(this, ID_NOTEBOOK);
|
||||
wxPanel* const m_GameConfig = new wxPanel(m_Notebook, ID_GAMECONFIG);
|
||||
m_Notebook->AddPage(m_GameConfig, _("GameConfig"));
|
||||
wxPanel * const m_PatchPage =
|
||||
new wxPanel(m_Notebook, ID_PATCH_PAGE, wxDefaultPosition, wxDefaultSize);
|
||||
wxPanel* const m_PatchPage = new wxPanel(m_Notebook, ID_PATCH_PAGE);
|
||||
m_Notebook->AddPage(m_PatchPage, _("Patches"));
|
||||
wxPanel * const m_CheatPage =
|
||||
new wxPanel(m_Notebook, ID_ARCODE_PAGE, wxDefaultPosition, wxDefaultSize);
|
||||
wxPanel* const m_CheatPage = new wxPanel(m_Notebook, ID_ARCODE_PAGE);
|
||||
m_Notebook->AddPage(m_CheatPage, _("AR Codes"));
|
||||
m_geckocode_panel = new Gecko::CodeConfigPanel(m_Notebook);
|
||||
m_Notebook->AddPage(m_geckocode_panel, _("Gecko Codes"));
|
||||
wxPanel * const m_Information =
|
||||
new wxPanel(m_Notebook, ID_INFORMATION, wxDefaultPosition, wxDefaultSize);
|
||||
wxPanel* const m_Information = new wxPanel(m_Notebook, ID_INFORMATION);
|
||||
m_Notebook->AddPage(m_Information, _("Info"));
|
||||
|
||||
// GameConfig editing - Overrides and emulation state
|
||||
wxStaticText * const OverrideText = new wxStaticText(m_GameConfig, wxID_ANY, _("These settings override core Dolphin settings.\nUndetermined means the game uses Dolphin's setting."));
|
||||
wxStaticText* const OverrideText = new wxStaticText(m_GameConfig, wxID_ANY, _("These settings override core Dolphin settings.\nUndetermined means the game uses Dolphin's setting."));
|
||||
|
||||
// Core
|
||||
CPUThread = new wxCheckBox(m_GameConfig, ID_USEDUALCORE, _("Enable Dual Core"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "CPUThread"), wxDefaultValidator);
|
||||
SkipIdle = new wxCheckBox(m_GameConfig, ID_IDLESKIP, _("Enable Idle Skipping"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "SkipIdle"), wxDefaultValidator);
|
||||
MMU = new wxCheckBox(m_GameConfig, ID_MMU, _("Enable MMU"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "MMU"), wxDefaultValidator);
|
||||
CPUThread = new wxCheckBox(m_GameConfig, ID_USEDUALCORE, _("Enable Dual Core"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "CPUThread"));
|
||||
SkipIdle = new wxCheckBox(m_GameConfig, ID_IDLESKIP, _("Enable Idle Skipping"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "SkipIdle"));
|
||||
MMU = new wxCheckBox(m_GameConfig, ID_MMU, _("Enable MMU"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "MMU"));
|
||||
MMU->SetToolTip(_("Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)"));
|
||||
TLBHack = new wxCheckBox(m_GameConfig, ID_TLBHACK, _("MMU Speed Hack"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "TLBHack"), wxDefaultValidator);
|
||||
TLBHack = new wxCheckBox(m_GameConfig, ID_TLBHACK, _("MMU Speed Hack"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "TLBHack"));
|
||||
TLBHack->SetToolTip(_("Fast version of the MMU. Does not work for every game."));
|
||||
DCBZOFF = new wxCheckBox(m_GameConfig, ID_DCBZOFF, _("Skip DCBZ clearing"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "DCBZ"), wxDefaultValidator);
|
||||
DCBZOFF = new wxCheckBox(m_GameConfig, ID_DCBZOFF, _("Skip DCBZ clearing"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "DCBZ"));
|
||||
DCBZOFF->SetToolTip(_("Bypass the clearing of the data cache by the DCBZ instruction. Usually leave this option disabled."));
|
||||
VBeam = new wxCheckBox(m_GameConfig, ID_VBEAM, _("VBeam Speed Hack"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "VBeam"), wxDefaultValidator);
|
||||
VBeam = new wxCheckBox(m_GameConfig, ID_VBEAM, _("VBeam Speed Hack"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "VBeam"));
|
||||
VBeam->SetToolTip(_("Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF = Compatible)"));
|
||||
SyncGPU = new wxCheckBox(m_GameConfig, ID_SYNCGPU, _("Synchronize GPU thread"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "SyncGPU"), wxDefaultValidator);
|
||||
SyncGPU = new wxCheckBox(m_GameConfig, ID_SYNCGPU, _("Synchronize GPU thread"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "SyncGPU"));
|
||||
SyncGPU->SetToolTip(_("Synchronizes the GPU and CPU threads to help prevent random freezes in Dual Core mode. (ON = Compatible, OFF = Fast)"));
|
||||
FastDiscSpeed = new wxCheckBox(m_GameConfig, ID_DISCSPEED, _("Speed up Disc Transfer Rate"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "FastDiscSpeed"), wxDefaultValidator);
|
||||
FastDiscSpeed = new wxCheckBox(m_GameConfig, ID_DISCSPEED, _("Speed up Disc Transfer Rate"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "FastDiscSpeed"));
|
||||
FastDiscSpeed->SetToolTip(_("Enable fast disc access. Needed for a few games. (ON = Fast, OFF = Compatible)"));
|
||||
BlockMerging = new wxCheckBox(m_GameConfig, ID_MERGEBLOCKS, _("Enable Block Merging"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "BlockMerging"), wxDefaultValidator);
|
||||
DSPHLE = new wxCheckBox(m_GameConfig, ID_AUDIO_DSP_HLE, _("DSP HLE emulation (fast)"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "DSPHLE"), wxDefaultValidator);
|
||||
BlockMerging = new wxCheckBox(m_GameConfig, ID_MERGEBLOCKS, _("Enable Block Merging"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "BlockMerging"));
|
||||
DSPHLE = new wxCheckBox(m_GameConfig, ID_AUDIO_DSP_HLE, _("DSP HLE emulation (fast)"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "DSPHLE"));
|
||||
|
||||
// Wii Console
|
||||
EnableWideScreen = new wxCheckBox(m_GameConfig, ID_ENABLEWIDESCREEN, _("Enable WideScreen"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Wii", "Widescreen"), wxDefaultValidator);
|
||||
EnableWideScreen = new wxCheckBox(m_GameConfig, ID_ENABLEWIDESCREEN, _("Enable WideScreen"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Wii", "Widescreen"));
|
||||
|
||||
// Video
|
||||
UseBBox = new wxCheckBox(m_GameConfig, ID_USE_BBOX, _("Enable Bounding Box Calculation"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Video", "UseBBox"));
|
||||
UseBBox->SetToolTip(_("If checked, the bounding box registers will be updated. Used by the Paper Mario games."));
|
||||
|
||||
// Hack
|
||||
wxFlexGridSizer * const szrPHackSettings = new wxFlexGridSizer(0);
|
||||
wxFlexGridSizer* const szrPHackSettings = new wxFlexGridSizer(0);
|
||||
PHackEnable = new wxCheckBox(m_GameConfig, ID_PHACKENABLE, _("Custom Projection Hack"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE);
|
||||
PHackEnable->SetToolTip(_("Enables Custom Projection Hack"));
|
||||
PHSettings = new wxButton(m_GameConfig, ID_PHSETTINGS, _("Settings..."));
|
||||
PHSettings->SetToolTip(_("Customize some Orthographic Projection parameters."));
|
||||
|
||||
wxBoxSizer * const sEmuState = new wxBoxSizer(wxHORIZONTAL);
|
||||
wxStaticText * const EmuStateText =
|
||||
new wxStaticText(m_GameConfig, wxID_ANY, _("Emulation State: "));
|
||||
wxBoxSizer* const sEmuState = new wxBoxSizer(wxHORIZONTAL);
|
||||
wxStaticText* const EmuStateText = new wxStaticText(m_GameConfig, wxID_ANY, _("Emulation State: "));
|
||||
arrayStringFor_EmuState.Add(_("Not Set"));
|
||||
arrayStringFor_EmuState.Add(_("Broken"));
|
||||
arrayStringFor_EmuState.Add(_("Intro"));
|
||||
arrayStringFor_EmuState.Add(_("In Game"));
|
||||
arrayStringFor_EmuState.Add(_("Playable"));
|
||||
arrayStringFor_EmuState.Add(_("Perfect"));
|
||||
EmuState = new wxChoice(m_GameConfig, ID_EMUSTATE,
|
||||
wxDefaultPosition, wxDefaultSize, arrayStringFor_EmuState);
|
||||
EmuState = new wxChoice(m_GameConfig, ID_EMUSTATE, wxDefaultPosition, wxDefaultSize, arrayStringFor_EmuState);
|
||||
EmuIssues = new wxTextCtrl(m_GameConfig, ID_EMU_ISSUES, wxEmptyString);
|
||||
|
||||
wxBoxSizer * const sConfigPage = new wxBoxSizer(wxVERTICAL);
|
||||
wxStaticBoxSizer * const sbCoreOverrides =
|
||||
wxBoxSizer* const sConfigPage = new wxBoxSizer(wxVERTICAL);
|
||||
wxStaticBoxSizer* const sbCoreOverrides =
|
||||
new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Core"));
|
||||
sbCoreOverrides->Add(CPUThread, 0, wxLEFT, 5);
|
||||
sbCoreOverrides->Add(SkipIdle, 0, wxLEFT, 5);
|
||||
@ -450,8 +441,7 @@ void CISOProperties::CreateGUIControls(bool IsWad)
|
||||
sbCoreOverrides->Add(BlockMerging, 0, wxLEFT, 5);
|
||||
sbCoreOverrides->Add(DSPHLE, 0, wxLEFT, 5);
|
||||
|
||||
wxStaticBoxSizer * const sbWiiOverrides =
|
||||
new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Wii Console"));
|
||||
wxStaticBoxSizer * const sbWiiOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Wii Console"));
|
||||
if (!DiscIO::IsVolumeWiiDisc(OpenISO) && !DiscIO::IsVolumeWadFile(OpenISO))
|
||||
{
|
||||
sbWiiOverrides->ShowItems(false);
|
||||
@ -459,15 +449,13 @@ void CISOProperties::CreateGUIControls(bool IsWad)
|
||||
}
|
||||
sbWiiOverrides->Add(EnableWideScreen, 0, wxLEFT, 5);
|
||||
|
||||
wxStaticBoxSizer * const sbVideoOverrides =
|
||||
new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Video"));
|
||||
wxStaticBoxSizer * const sbVideoOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Video"));
|
||||
sbVideoOverrides->Add(UseBBox, 0, wxLEFT, 5);
|
||||
szrPHackSettings->Add(PHackEnable, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5);
|
||||
szrPHackSettings->Add(PHSettings, 0, wxLEFT, 5);
|
||||
|
||||
sbVideoOverrides->Add(szrPHackSettings, 0, wxEXPAND);
|
||||
wxStaticBoxSizer * const sbGameConfig =
|
||||
new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Game-Specific Settings"));
|
||||
wxStaticBoxSizer * const sbGameConfig = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Game-Specific Settings"));
|
||||
sbGameConfig->Add(OverrideText, 0, wxEXPAND|wxALL, 5);
|
||||
sbGameConfig->Add(sbCoreOverrides, 0, wxEXPAND);
|
||||
sbGameConfig->Add(sbWiiOverrides, 0, wxEXPAND);
|
||||
@ -481,12 +469,11 @@ void CISOProperties::CreateGUIControls(bool IsWad)
|
||||
|
||||
|
||||
// Patches
|
||||
wxBoxSizer * const sPatches = new wxBoxSizer(wxVERTICAL);
|
||||
Patches = new wxCheckListBox(m_PatchPage, ID_PATCHES_LIST, wxDefaultPosition,
|
||||
wxDefaultSize, arrayStringFor_Patches, wxLB_HSCROLL);
|
||||
wxBoxSizer * const sPatchButtons = new wxBoxSizer(wxHORIZONTAL);
|
||||
wxBoxSizer* const sPatches = new wxBoxSizer(wxVERTICAL);
|
||||
Patches = new wxCheckListBox(m_PatchPage, ID_PATCHES_LIST, wxDefaultPosition, wxDefaultSize, arrayStringFor_Patches, wxLB_HSCROLL);
|
||||
wxBoxSizer* const sPatchButtons = new wxBoxSizer(wxHORIZONTAL);
|
||||
EditPatch = new wxButton(m_PatchPage, ID_EDITPATCH, _("Edit..."));
|
||||
wxButton * const AddPatch = new wxButton(m_PatchPage, ID_ADDPATCH, _("Add..."));
|
||||
wxButton* const AddPatch = new wxButton(m_PatchPage, ID_ADDPATCH, _("Add..."));
|
||||
RemovePatch = new wxButton(m_PatchPage, ID_REMOVEPATCH, _("Remove"));
|
||||
EditPatch->Enable(false);
|
||||
RemovePatch->Enable(false);
|
||||
@ -504,13 +491,11 @@ void CISOProperties::CreateGUIControls(bool IsWad)
|
||||
|
||||
// Action Replay Cheats
|
||||
wxBoxSizer * const sCheats = new wxBoxSizer(wxVERTICAL);
|
||||
Cheats = new wxCheckListBox(m_CheatPage, ID_CHEATS_LIST, wxDefaultPosition,
|
||||
wxDefaultSize, arrayStringFor_Cheats, wxLB_HSCROLL);
|
||||
Cheats = new wxCheckListBox(m_CheatPage, ID_CHEATS_LIST, wxDefaultPosition, wxDefaultSize, arrayStringFor_Cheats, wxLB_HSCROLL);
|
||||
wxBoxSizer * const sCheatButtons = new wxBoxSizer(wxHORIZONTAL);
|
||||
EditCheat = new wxButton(m_CheatPage, ID_EDITCHEAT, _("Edit..."));
|
||||
wxButton * const AddCheat = new wxButton(m_CheatPage, ID_ADDCHEAT, _("Add..."));
|
||||
RemoveCheat = new wxButton(m_CheatPage, ID_REMOVECHEAT, _("Remove"),
|
||||
wxDefaultPosition, wxDefaultSize, 0);
|
||||
RemoveCheat = new wxButton(m_CheatPage, ID_REMOVECHEAT, _("Remove"));
|
||||
EditCheat->Enable(false);
|
||||
RemoveCheat->Enable(false);
|
||||
|
||||
@ -525,36 +510,22 @@ void CISOProperties::CreateGUIControls(bool IsWad)
|
||||
m_CheatPage->SetSizer(sCheatPage);
|
||||
|
||||
|
||||
wxStaticText * const m_NameText =
|
||||
new wxStaticText(m_Information, wxID_ANY, _("Name:"));
|
||||
m_Name = new wxTextCtrl(m_Information, ID_NAME, wxEmptyString,
|
||||
wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
|
||||
wxStaticText * const m_GameIDText =
|
||||
new wxStaticText(m_Information, wxID_ANY, _("Game ID:"));
|
||||
m_GameID = new wxTextCtrl(m_Information, ID_GAMEID, wxEmptyString,
|
||||
wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
|
||||
wxStaticText * const m_CountryText =
|
||||
new wxStaticText(m_Information, wxID_ANY, _("Country:"));
|
||||
m_Country = new wxTextCtrl(m_Information, ID_COUNTRY, wxEmptyString,
|
||||
wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
|
||||
wxStaticText * const m_MakerIDText =
|
||||
new wxStaticText(m_Information, wxID_ANY, _("Maker ID:"));
|
||||
m_MakerID = new wxTextCtrl(m_Information, ID_MAKERID, wxEmptyString,
|
||||
wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
|
||||
wxStaticText * const m_RevisionText =
|
||||
new wxStaticText(m_Information, wxID_ANY, _("Revision:"));
|
||||
m_Revision = new wxTextCtrl(m_Information, ID_REVISION, wxEmptyString,
|
||||
wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
|
||||
wxStaticText * const m_DateText =
|
||||
new wxStaticText(m_Information, wxID_ANY, _("Date:"));
|
||||
m_Date = new wxTextCtrl(m_Information, ID_DATE, wxEmptyString,
|
||||
wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
|
||||
wxStaticText * const m_FSTText =
|
||||
new wxStaticText(m_Information, wxID_ANY, _("FST Size:"));
|
||||
m_FST = new wxTextCtrl(m_Information, ID_FST, wxEmptyString,
|
||||
wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
|
||||
wxStaticText* const m_NameText = new wxStaticText(m_Information, wxID_ANY, _("Name:"));
|
||||
m_Name = new wxTextCtrl(m_Information, ID_NAME, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
|
||||
wxStaticText* const m_GameIDText = new wxStaticText(m_Information, wxID_ANY, _("Game ID:"));
|
||||
m_GameID = new wxTextCtrl(m_Information, ID_GAMEID, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
|
||||
wxStaticText* const m_CountryText = new wxStaticText(m_Information, wxID_ANY, _("Country:"));
|
||||
m_Country = new wxTextCtrl(m_Information, ID_COUNTRY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
|
||||
wxStaticText* const m_MakerIDText = new wxStaticText(m_Information, wxID_ANY, _("Maker ID:"));
|
||||
m_MakerID = new wxTextCtrl(m_Information, ID_MAKERID, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
|
||||
wxStaticText* const m_RevisionText = new wxStaticText(m_Information, wxID_ANY, _("Revision:"));
|
||||
m_Revision = new wxTextCtrl(m_Information, ID_REVISION, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
|
||||
wxStaticText* const m_DateText = new wxStaticText(m_Information, wxID_ANY, _("Date:"));
|
||||
m_Date = new wxTextCtrl(m_Information, ID_DATE, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
|
||||
wxStaticText* const m_FSTText = new wxStaticText(m_Information, wxID_ANY, _("FST Size:"));
|
||||
m_FST = new wxTextCtrl(m_Information, ID_FST, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
|
||||
|
||||
wxStaticText * const m_LangText = new wxStaticText(m_Information, wxID_ANY, _("Show Language:"));
|
||||
wxStaticText* const m_LangText = new wxStaticText(m_Information, wxID_ANY, _("Show Language:"));
|
||||
arrayStringFor_Lang.Add(_("English"));
|
||||
arrayStringFor_Lang.Add(_("German"));
|
||||
arrayStringFor_Lang.Add(_("French"));
|
||||
@ -574,17 +545,17 @@ void CISOProperties::CreateGUIControls(bool IsWad)
|
||||
m_Lang = new wxChoice(m_Information, ID_LANG, wxDefaultPosition, wxDefaultSize, arrayStringFor_Lang);
|
||||
m_Lang->SetSelection(language);
|
||||
|
||||
wxStaticText * const m_ShortText = new wxStaticText(m_Information, wxID_ANY, _("Short Name:"));
|
||||
wxStaticText* const m_ShortText = new wxStaticText(m_Information, wxID_ANY, _("Short Name:"));
|
||||
m_ShortName = new wxTextCtrl(m_Information, ID_SHORTNAME, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
|
||||
wxStaticText * const m_MakerText = new wxStaticText(m_Information, wxID_ANY, _("Maker:"));
|
||||
wxStaticText* const m_MakerText = new wxStaticText(m_Information, wxID_ANY, _("Maker:"));
|
||||
m_Maker = new wxTextCtrl(m_Information, ID_MAKER, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
|
||||
wxStaticText * const m_CommentText = new wxStaticText(m_Information, wxID_ANY, _("Comment:"));
|
||||
wxStaticText* const m_CommentText = new wxStaticText(m_Information, wxID_ANY, _("Comment:"));
|
||||
m_Comment = new wxTextCtrl(m_Information, ID_COMMENT, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY);
|
||||
wxStaticText * const m_BannerText = new wxStaticText(m_Information, wxID_ANY, _("Banner:"));
|
||||
m_Banner = new wxStaticBitmap(m_Information, ID_BANNER, wxNullBitmap, wxDefaultPosition, wxSize(96, 32), 0);
|
||||
wxStaticText* const m_BannerText = new wxStaticText(m_Information, wxID_ANY, _("Banner:"));
|
||||
m_Banner = new wxStaticBitmap(m_Information, ID_BANNER, wxNullBitmap, wxDefaultPosition, wxSize(96, 32));
|
||||
|
||||
// ISO Details
|
||||
wxGridBagSizer * const sISODetails = new wxGridBagSizer(0, 0);
|
||||
wxGridBagSizer* const sISODetails = new wxGridBagSizer(0, 0);
|
||||
sISODetails->Add(m_NameText, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
||||
sISODetails->Add(m_Name, wxGBPosition(0, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
|
||||
sISODetails->Add(m_GameIDText, wxGBPosition(1, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
||||
@ -600,12 +571,12 @@ void CISOProperties::CreateGUIControls(bool IsWad)
|
||||
sISODetails->Add(m_FSTText, wxGBPosition(6, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
||||
sISODetails->Add(m_FST, wxGBPosition(6, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
|
||||
sISODetails->AddGrowableCol(1);
|
||||
wxStaticBoxSizer * const sbISODetails =
|
||||
wxStaticBoxSizer* const sbISODetails =
|
||||
new wxStaticBoxSizer(wxVERTICAL, m_Information, _("ISO Details"));
|
||||
sbISODetails->Add(sISODetails, 0, wxEXPAND, 5);
|
||||
|
||||
// Banner Details
|
||||
wxGridBagSizer * const sBannerDetails = new wxGridBagSizer(0, 0);
|
||||
wxGridBagSizer* const sBannerDetails = new wxGridBagSizer(0, 0);
|
||||
sBannerDetails->Add(m_LangText, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
||||
sBannerDetails->Add(m_Lang, wxGBPosition(0, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
|
||||
sBannerDetails->Add(m_ShortText, wxGBPosition(1, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
||||
@ -617,30 +588,28 @@ void CISOProperties::CreateGUIControls(bool IsWad)
|
||||
sBannerDetails->Add(m_BannerText, wxGBPosition(4, 0), wxGBSpan(1, 1), wxALL, 5);
|
||||
sBannerDetails->Add(m_Banner, wxGBPosition(4, 1), wxGBSpan(1, 1), wxEXPAND|wxALL, 5);
|
||||
sBannerDetails->AddGrowableCol(1);
|
||||
wxStaticBoxSizer * const sbBannerDetails =
|
||||
wxStaticBoxSizer* const sbBannerDetails =
|
||||
new wxStaticBoxSizer(wxVERTICAL, m_Information, _("Banner Details"));
|
||||
sbBannerDetails->Add(sBannerDetails, 0, wxEXPAND, 5);
|
||||
|
||||
wxBoxSizer * const sInfoPage = new wxBoxSizer(wxVERTICAL);
|
||||
wxBoxSizer* const sInfoPage = new wxBoxSizer(wxVERTICAL);
|
||||
sInfoPage->Add(sbISODetails, 0, wxEXPAND|wxALL, 5);
|
||||
sInfoPage->Add(sbBannerDetails, 0, wxEXPAND|wxALL, 5);
|
||||
m_Information->SetSizer(sInfoPage);
|
||||
|
||||
if (!IsWad)
|
||||
{
|
||||
wxPanel * const m_Filesystem =
|
||||
new wxPanel(m_Notebook, ID_FILESYSTEM, wxDefaultPosition, wxDefaultSize);
|
||||
wxPanel* const m_Filesystem = new wxPanel(m_Notebook, ID_FILESYSTEM);
|
||||
m_Notebook->AddPage(m_Filesystem, _("Filesystem"));
|
||||
|
||||
// Filesystem icons
|
||||
wxImageList * const m_iconList = new wxImageList(16, 16);
|
||||
wxImageList* const m_iconList = new wxImageList(16, 16);
|
||||
m_iconList->Add(wxBitmap(disc_xpm), wxNullBitmap); // 0
|
||||
m_iconList->Add(wxBitmap(folder_xpm), wxNullBitmap); // 1
|
||||
m_iconList->Add(wxBitmap(file_xpm), wxNullBitmap); // 2
|
||||
|
||||
// Filesystem tree
|
||||
m_Treectrl = new wxTreeCtrl(m_Filesystem, ID_TREECTRL,
|
||||
wxDefaultPosition, wxDefaultSize, wxTR_DEFAULT_STYLE);
|
||||
m_Treectrl = new wxTreeCtrl(m_Filesystem, ID_TREECTRL);
|
||||
m_Treectrl->AssignImageList(m_iconList);
|
||||
RootId = m_Treectrl->AddRoot(_("Disc"), 0, 0, 0);
|
||||
|
||||
@ -659,8 +628,7 @@ void CISOProperties::CreateGUIControls(bool IsWad)
|
||||
EditConfigDefault->Disable();
|
||||
|
||||
// Add notebook and buttons to the dialog
|
||||
wxBoxSizer* sMain;
|
||||
sMain = new wxBoxSizer(wxVERTICAL);
|
||||
wxBoxSizer* sMain = new wxBoxSizer(wxVERTICAL);
|
||||
sMain->Add(m_Notebook, 1, wxEXPAND|wxALL, 5);
|
||||
sMain->Add(sButtons, 0, wxEXPAND|wxLEFT|wxRIGHT|wxBOTTOM, 5);
|
||||
sMain->SetMinSize(wxSize(500, -1));
|
||||
@ -697,7 +665,7 @@ void CISOProperties::OnBannerImageSave(wxCommandEvent& WXUNUSED (event))
|
||||
wxString dirHome;
|
||||
|
||||
wxFileDialog dialog(this, _("Save as..."), wxGetHomeDir(&dirHome), wxString::Format(wxT("%s.png"), m_GameID->GetLabel().c_str()),
|
||||
wxALL_FILES_PATTERN, wxFD_SAVE|wxFD_OVERWRITE_PROMPT, wxDefaultPosition, wxDefaultSize);
|
||||
wxALL_FILES_PATTERN, wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
|
||||
if (dialog.ShowModal() == wxID_OK)
|
||||
{
|
||||
m_Banner->GetBitmap().ConvertToImage().SaveFile(dialog.GetPath());
|
||||
@ -716,9 +684,13 @@ void CISOProperties::OnRightClickOnTree(wxTreeEvent& event)
|
||||
popupMenu->Append(IDM_EXTRACTDIR, _("Extract Partition..."));
|
||||
}
|
||||
else if (m_Treectrl->GetItemImage(m_Treectrl->GetSelection()) == 1)
|
||||
{
|
||||
popupMenu->Append(IDM_EXTRACTDIR, _("Extract Directory..."));
|
||||
}
|
||||
else if (m_Treectrl->GetItemImage(m_Treectrl->GetSelection()) == 2)
|
||||
{
|
||||
popupMenu->Append(IDM_EXTRACTFILE, _("Extract File..."));
|
||||
}
|
||||
|
||||
popupMenu->Append(IDM_EXTRACTALL, _("Extract All Files..."));
|
||||
|
||||
@ -739,12 +711,9 @@ void CISOProperties::OnRightClickOnTree(wxTreeEvent& event)
|
||||
|
||||
void CISOProperties::OnExtractFile(wxCommandEvent& WXUNUSED (event))
|
||||
{
|
||||
wxString Path;
|
||||
wxString File;
|
||||
wxString File = m_Treectrl->GetItemText(m_Treectrl->GetSelection());
|
||||
|
||||
File = m_Treectrl->GetItemText(m_Treectrl->GetSelection());
|
||||
|
||||
Path = wxFileSelector(
|
||||
wxString Path = wxFileSelector(
|
||||
_("Export File"),
|
||||
wxEmptyString, File, wxEmptyString,
|
||||
wxGetTranslation(wxALL_FILES),
|
||||
@ -756,8 +725,7 @@ void CISOProperties::OnExtractFile(wxCommandEvent& WXUNUSED (event))
|
||||
|
||||
while (m_Treectrl->GetItemParent(m_Treectrl->GetSelection()) != m_Treectrl->GetRootItem())
|
||||
{
|
||||
wxString temp;
|
||||
temp = m_Treectrl->GetItemText(m_Treectrl->GetItemParent(m_Treectrl->GetSelection()));
|
||||
wxString temp = m_Treectrl->GetItemText(m_Treectrl->GetItemParent(m_Treectrl->GetSelection()));
|
||||
File = temp + wxT(DIR_SEP_CHR) + File;
|
||||
|
||||
m_Treectrl->SelectItem(m_Treectrl->GetItemParent(m_Treectrl->GetSelection()));
|
||||
|
||||
Reference in New Issue
Block a user