[OMPT-svn-commit] SF.net SVN: modplug:[5353] trunk/OpenMPT/mptrack

[<sag...@us...>]

Revision: 5353
          http://sourceforge.net/p/modplug/code/5353
Author:   saga-games
Date:     2015-06-25 16:32:36 +0000 (Thu, 25 Jun 2015)
Log Message:
-----------
[Mod] Move "create backups" option to Path / Auto Save tab.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/GeneralConfigDlg.cpp
    trunk/OpenMPT/mptrack/PathConfigDlg.cpp
    trunk/OpenMPT/mptrack/mptrack.rc

Modified: trunk/OpenMPT/mptrack/GeneralConfigDlg.cpp
===================================================================
--- trunk/OpenMPT/mptrack/GeneralConfigDlg.cpp	2015-06-25 13:47:00 UTC (rev 5352)
+++ trunk/OpenMPT/mptrack/GeneralConfigDlg.cpp	2015-06-25 16:32:36 UTC (rev 5353)
@@ -44,7 +44,6 @@
 	{PATTERN_CENTERROW,		"Always center active row",			"Turn on this option to have the active row always centered in the pattern editor."},
 	{PATTERN_HEXDISPLAY,	"Display rows in hex",				"With this option enabled, row numbers and sequence numbers will be displayed in hexadecimal."},
 	{PATTERN_WRAP,			"Cursor wrap in pattern editor",	"When this option is active, going past the end of a pattern row or channel will move the cursor to the beginning. When \"Continuous scroll\"-option is enabled, row wrap is disabled."},
-	{PATTERN_CREATEBACKUP,	"Create backup files (*.bak)",		"When this option is active, saving a file will create a backup copy of the original."},
 	{PATTERN_DRAGNDROPEDIT,	"Drag and Drop Editing",			"Enable moving a selection in the pattern editor (copying if pressing shift while dragging)"},
 	{PATTERN_FLATBUTTONS,	"Flat Buttons",						"Use flat buttons in toolbars"},
 	{PATTERN_SINGLEEXPAND,	"Single click to expand tree",		"Single-clicking in the left tree view will expand a node."},
@@ -57,7 +56,7 @@
 	{PATTERN_MIDIRECORD,	"MIDI record",						"Enable MIDI in record by default."},
 	{PATTERN_OLDCTXMENUSTYLE, "Old style pattern context menu", "Check this option to hide unavailable items in the pattern editor context menu. Uncheck to grey-out unavailable items instead."},
 	{PATTERN_SYNCMUTE,		"Maintain sample sync on mute",		"Samples continue to be processed when channels are muted (like in IT2 and FT2)"},
-	{PATTERN_SYNCSAMPLEPOS,	"Maintain sample sync on seek",		"Sample that are still active from previous patterns are continued to be played after seeking.\nNote: Samples with portamento effects applied are not synced. This feature may slow down seeking."},
+	{PATTERN_SYNCSAMPLEPOS,	"Maintain sample sync on seek",		"Sample that are still active from previous patterns are continued to be played after seeking.\nNote: Some pattern commands may prevent samples from being synced. This feature may slow down seeking."},
 	{PATTERN_AUTODELAY,		"Automatic delay commands",			"Automatically insert appropriate note-delay commands when recording notes during live playback."},
 	{PATTERN_NOTEFADE,		"Note fade on key up",				"Enable to fade / stop notes on key up in pattern tab."},
 	{PATTERN_OVERFLOWPASTE,	"Overflow paste mode",				"Wrap pasted pattern data into next pattern. This is useful for creating echo channels."},

Modified: trunk/OpenMPT/mptrack/PathConfigDlg.cpp
===================================================================
--- trunk/OpenMPT/mptrack/PathConfigDlg.cpp	2015-06-25 13:47:00 UTC (rev 5352)
+++ trunk/OpenMPT/mptrack/PathConfigDlg.cpp	2015-06-25 16:32:36 UTC (rev 5353)
@@ -43,6 +43,7 @@
 	ON_COMMAND(IDC_BUTTON_CHANGE_VSTPRESETSDIR,	OnBrowsePresets)
 
 	// Autosave
+	ON_COMMAND(IDC_CHECK1,						OnSettingsChanged)
 	ON_BN_CLICKED(IDC_AUTOSAVE_BROWSE,			OnBrowseAutosavePath)
 	ON_BN_CLICKED(IDC_AUTOSAVE_ENABLE,			OnAutosaveEnable)
 	ON_BN_CLICKED(IDC_AUTOSAVE_USEORIGDIR,		OnAutosaveUseOrigDir)
@@ -66,6 +67,8 @@
 	::SetDlgItemTextW(m_hWnd, IDC_OPTIONS_DIR_VSTPRESETS,	TrackerSettings::Instance().PathPluginPresets.GetDefaultDir().AsNative().c_str());
 
 	// Autosave
+	CheckDlgButton(IDC_CHECK1, (TrackerSettings::Instance().m_dwPatternSetup & PATTERN_CREATEBACKUP) != 0);
+
 	CheckDlgButton(IDC_AUTOSAVE_ENABLE, TrackerSettings::Instance().AutosaveEnabled ? BST_CHECKED : BST_UNCHECKED);
 	SetDlgItemInt(IDC_AUTOSAVE_HISTORY, TrackerSettings::Instance().AutosaveHistoryDepth);
 	::SetDlgItemTextW(m_hWnd, IDC_AUTOSAVE_PATH, TrackerSettings::Instance().AutosavePath.GetDefaultDir().AsNative().c_str());
@@ -98,6 +101,10 @@
 			mpt::PathString::FromNative(szVstDir),
 			mpt::PathString::FromNative(szPresetDir));
 
+	// Autosave
+	if(IsDlgButtonChecked(IDC_CHECK1)) TrackerSettings::Instance().m_dwPatternSetup |= PATTERN_CREATEBACKUP;
+	else TrackerSettings::Instance().m_dwPatternSetup &= ~PATTERN_CREATEBACKUP;
+
 	WCHAR tempPath[MAX_PATH];
 	TrackerSettings::Instance().AutosaveEnabled = (IsDlgButtonChecked(IDC_AUTOSAVE_ENABLE) != BST_UNCHECKED);
 	TrackerSettings::Instance().AutosaveHistoryDepth = (GetDlgItemInt(IDC_AUTOSAVE_HISTORY));

Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc	2015-06-25 13:47:00 UTC (rev 5352)
+++ trunk/OpenMPT/mptrack/mptrack.rc	2015-06-25 16:32:36 UTC (rev 5353)
@@ -1640,24 +1640,6 @@
 CAPTION "Paths / Auto Save"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    GROUPBOX        "Auto Save",IDC_STATIC,6,120,278,157
-    CONTROL         "&Enable Auto Save",IDC_AUTOSAVE_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,132,237,10
-    LTEXT           "&Save every:",IDC_STATIC,17,146,40,12,SS_CENTERIMAGE
-    EDITTEXT        IDC_AUTOSAVE_INTERVAL,61,146,24,12,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "minutes",IDC_STATIC,89,146,165,12,SS_CENTERIMAGE
-    LTEXT           "&Keep up to:",IDC_STATIC,17,163,36,12,SS_CENTERIMAGE
-    EDITTEXT        IDC_AUTOSAVE_HISTORY,61,163,24,12,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "backups of each file name",IDC_STATIC,89,163,165,12,SS_CENTERIMAGE
-    GROUPBOX        "Location:",IDC_STATIC,17,187,255,80
-    CONTROL         "Use song's &original directory.",IDC_AUTOSAVE_USEORIGDIR,
-                    "Button",BS_AUTORADIOBUTTON,30,200,218,10
-    CONTROL         "&Use:",IDC_AUTOSAVE_USECUSTOMDIR,"Button",BS_AUTORADIOBUTTON,30,214,31,10
-    EDITTEXT        IDC_AUTOSAVE_PATH,62,213,186,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_AUTOSAVE_BROWSE,254,213,12,11,NOT WS_TABSTOP
-    LTEXT           "Filename:",IDC_STATIC,30,237,30,12,SS_CENTERIMAGE
-    LTEXT           "[filename].AutoSave.[timestamp].[extension]",IDC_STATIC,62,237,186,12,SS_CENTERIMAGE,WS_EX_CLIENTEDGE
-    LTEXT           "(example: mySong.AutoSave.20050327.2343.it)",IDC_STATIC,62,252,186,12,SS_CENTERIMAGE
-    GROUPBOX        "Default Directories",IDC_STATIC,6,6,276,102
     RTEXT           "Songs:",IDC_STATIC_MODDIR,12,18,48,12,SS_CENTERIMAGE
     EDITTEXT        IDC_OPTIONS_DIR_MODS,66,18,192,12,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_BUTTON_CHANGE_MODDIR,264,18,12,11,NOT WS_TABSTOP
@@ -1673,6 +1655,25 @@
     RTEXT           "VST Presets:",IDC_STATIC_VSTPRESETDIR,12,90,48,12,SS_CENTERIMAGE
     EDITTEXT        IDC_OPTIONS_DIR_VSTPRESETS,66,90,192,12,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_BUTTON_CHANGE_VSTPRESETSDIR,264,90,12,11,NOT WS_TABSTOP
+    CONTROL         "Create &backup copy (*.bak) when saving a module files",IDC_CHECK1,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,135,258,12
+    CONTROL         "&Enable Auto Save",IDC_AUTOSAVE_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,154,237,10
+    LTEXT           "&Save every:",IDC_STATIC,18,168,40,12,SS_CENTERIMAGE
+    EDITTEXT        IDC_AUTOSAVE_INTERVAL,62,168,24,12,ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "minutes",IDC_STATIC,90,168,165,12,SS_CENTERIMAGE
+    LTEXT           "&Keep up to:",IDC_STATIC,18,185,36,12,SS_CENTERIMAGE
+    EDITTEXT        IDC_AUTOSAVE_HISTORY,62,185,24,12,ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "backups of each file name",IDC_STATIC,90,185,165,12,SS_CENTERIMAGE
+    CONTROL         "Store auto save files in song's &original directory.",IDC_AUTOSAVE_USEORIGDIR,
+                    "Button",BS_AUTORADIOBUTTON,18,202,218,10
+    CONTROL         "S&tore in:",IDC_AUTOSAVE_USECUSTOMDIR,"Button",BS_AUTORADIOBUTTON,18,218,43,10
+    EDITTEXT        IDC_AUTOSAVE_PATH,72,216,186,12,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_AUTOSAVE_BROWSE,264,216,12,11,NOT WS_TABSTOP
+    LTEXT           "Filename:",IDC_STATIC,30,240,36,12,SS_CENTERIMAGE
+    LTEXT           "[filename].AutoSave.[timestamp].[extension]",IDC_STATIC,72,240,186,12,SS_CENTERIMAGE,WS_EX_CLIENTEDGE
+    LTEXT           "(example: mySong.AutoSave.20050327.2343.it)",IDC_STATIC,72,258,186,12,SS_CENTERIMAGE
+    GROUPBOX        "Backup and Auto Save",IDC_STATIC,6,120,278,157
+    GROUPBOX        "Default Directories",IDC_STATIC,6,6,276,102
 END
 
 IDD_EDIT_GOTO DIALOGEX 0, 0, 130, 79

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.