From 1b3d135b18b4ec3e9f0f6a6186ca53aa748b7ed7 Mon Sep 17 00:00:00 2001 From: "gregory.hainaut@gmail.com" Date: Wed, 26 Jan 2011 12:02:30 +0000 Subject: [PATCH] pcsx2 gui: move around the "folders" panel. Remove an useless menu git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4266 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/gui/Dialogs/SysConfigDialog.cpp | 5 ++--- pcsx2/gui/MainFrame.cpp | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pcsx2/gui/Dialogs/SysConfigDialog.cpp b/pcsx2/gui/Dialogs/SysConfigDialog.cpp index 8ffd9baf47..3bef707e0e 100644 --- a/pcsx2/gui/Dialogs/SysConfigDialog.cpp +++ b/pcsx2/gui/Dialogs/SysConfigDialog.cpp @@ -264,6 +264,7 @@ Dialogs::ComponentsConfigDialog::ComponentsConfigDialog(wxWindow* parent) AddPage ( pxL("Plugins"), cfgid.Plugins ); AddPage ( pxL("BIOS"), cfgid.Cpu ); + AddPage ( pxL("Folders"), cfgid.Paths ); AddListbook(); AddOkCancel(); @@ -281,9 +282,7 @@ Dialogs::InterfaceConfigDialog::InterfaceConfigDialog(wxWindow *parent) CreateListbook( wxGetApp().GetImgList_Config() ); const AppImageIds::ConfigIds& cfgid( wxGetApp().GetImgId().Config ); - // The panel is empty. Only create it in debug mode --greg - if (IsDebugBuild) AddPage ( pxL("Appearance"), cfgid.Appearance ); - AddPage ( pxL("Folders"), cfgid.Paths ); + AddPage ( pxL("Appearance"), cfgid.Appearance ); AddListbook(); AddOkCancel(); diff --git a/pcsx2/gui/MainFrame.cpp b/pcsx2/gui/MainFrame.cpp index 6f52ab7099..0d31265300 100644 --- a/pcsx2/gui/MainFrame.cpp +++ b/pcsx2/gui/MainFrame.cpp @@ -443,7 +443,8 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title) m_menuConfig.Append(MenuId_Config_McdSettings, _("&Memory cards") ); m_menuConfig.Append(MenuId_Config_BIOS, _("&Plugin/BIOS Selector") ); if (IsDebugBuild) m_menuConfig.Append(MenuId_Config_GameDatabase, _("Game Database Editor") ); - m_menuConfig.Append(MenuId_Config_Language, _("Appearance...") ); + // Empty menu + // m_menuConfig.Append(MenuId_Config_Language, _("Appearance...") ); m_menuConfig.AppendSeparator();