From: <sag...@us...> - 2014-12-16 17:51:47
|
Revision: 4655 http://sourceforge.net/p/modplug/code/4655 Author: saga-games Date: 2014-12-16 17:51:32 +0000 (Tue, 16 Dec 2014) Log Message: ----------- [Reg] Remove portable option from welcome dialog. It's not easily possible to implement this right now. Modified Paths: -------------- trunk/OpenMPT/mptrack/Mptrack.h trunk/OpenMPT/mptrack/WelcomeDialog.cpp trunk/OpenMPT/mptrack/mptrack.rc Modified: trunk/OpenMPT/mptrack/Mptrack.h =================================================================== --- trunk/OpenMPT/mptrack/Mptrack.h 2014-12-16 10:14:16 UTC (rev 4654) +++ trunk/OpenMPT/mptrack/Mptrack.h 2014-12-16 17:51:32 UTC (rev 4655) @@ -273,7 +273,6 @@ return *m_pTrackerSettings; } bool IsPortableMode() { return m_bPortableMode; } - void SetPortableMode(bool portable) { m_bPortableMode = portable; } SettingsContainer & GetPluginCache() { ASSERT(m_pPluginCache); Modified: trunk/OpenMPT/mptrack/WelcomeDialog.cpp =================================================================== --- trunk/OpenMPT/mptrack/WelcomeDialog.cpp 2014-12-16 10:14:16 UTC (rev 4654) +++ trunk/OpenMPT/mptrack/WelcomeDialog.cpp 2014-12-16 17:51:32 UTC (rev 4655) @@ -121,8 +121,6 @@ CheckDlgButton(IDC_CHECK1, BST_CHECKED); CheckDlgButton(IDC_CHECK2, (TrackerSettings::Instance().m_dwPatternSetup & PATTERN_SMALLFONT) ? BST_UNCHECKED : BST_CHECKED); - CheckDlgButton(IDC_CHECK3, theApp.IsPortableMode() ? BST_CHECKED : BST_UNCHECKED); - GetDlgItem(IDC_CHECK3)->EnableWindow(theApp.IsPortableMode() ? FALSE : TRUE); ShowWindow(SW_SHOW); @@ -156,7 +154,6 @@ TrackerSettings::Instance().m_dwPatternSetup &= ~PATTERN_SMALLFONT; else TrackerSettings::Instance().m_dwPatternSetup |= PATTERN_SMALLFONT; - theApp.SetPortableMode(IsDlgButtonChecked(IDC_CHECK3) != BST_UNCHECKED); CComboBox *combo = (CComboBox *)GetDlgItem(IDC_COMBO1); const char *keyFile = static_cast<char *>(combo->GetItemDataPtr(combo->GetCurSel())); Modified: trunk/OpenMPT/mptrack/mptrack.rc =================================================================== --- trunk/OpenMPT/mptrack/mptrack.rc 2014-12-16 10:14:16 UTC (rev 4654) +++ trunk/OpenMPT/mptrack/mptrack.rc 2014-12-16 17:51:32 UTC (rev 4655) @@ -337,25 +337,23 @@ PUSHBUTTON "&Cancel",IDCANCEL,120,24,50,14 END -IDD_WECLOME DIALOGEX 0, 0, 256, 154 +IDD_WECLOME DIALOGEX 0, 0, 256, 137 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Welcome to OpenMPT!" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "&OK",IDOK,198,135,50,14 + DEFPUSHBUTTON "&OK",IDOK,198,116,50,14 LTEXT "Please review the following settings before using this software:",IDC_STATIC,6,6,246,8 CONTROL "&Automatically check for new versions of OpenMPT",IDC_CHECK1, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,24,246,10 - CONTROL "Store settings in installation directory (&portable mode)",IDC_CHECK3, + CONTROL "&Use a big font in the pattern editor",IDC_CHECK2, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,42,246,10 - CONTROL "&Use a big font in the pattern editor",IDC_CHECK2, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,60,246,10 - LTEXT "&Default keyboard scheme:",IDC_STATIC,6,81,108,8 - COMBOBOX IDC_COMBO1,114,79,132,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Scan for existing VST plugins in the following location:",IDC_STATIC,6,100,172,8 - PUSHBUTTON "&Scan",IDC_BUTTON2,198,97,50,14 - EDITTEXT IDC_EDIT1,6,113,240,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - PUSHBUTTON "&More Settings",IDC_BUTTON1,6,135,60,14 + LTEXT "&Default keyboard scheme:",IDC_STATIC,6,63,108,8 + COMBOBOX IDC_COMBO1,114,60,132,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Scan for existing VST plugins in the following location:",IDC_STATIC,6,82,172,8 + PUSHBUTTON "&Scan",IDC_BUTTON2,198,79,50,14 + EDITTEXT IDC_EDIT1,6,95,240,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + PUSHBUTTON "&More Settings",IDC_BUTTON1,6,116,60,14 END @@ -516,7 +514,7 @@ LEFTMARGIN, 7 RIGHTMARGIN, 249 TOPMARGIN, 7 - BOTTOMMARGIN, 147 + BOTTOMMARGIN, 130 END END #endif // APSTUDIO_INVOKED This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |