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

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

Revision: 425
          http://modplug.svn.sourceforge.net/modplug/?rev=425&view=rev
Author:   saga-games
Date:     2009-11-27 21:17:33 +0000 (Fri, 27 Nov 2009)

Log Message:
-----------
[New] New keyboard shortcut in pattern context: Duplicate pattern
[Fix] Cleanup dialog: The preset checkboxes were slightly wrong.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/CleanupSong.cpp
    trunk/OpenMPT/mptrack/CommandSet.cpp
    trunk/OpenMPT/mptrack/CommandSet.h
    trunk/OpenMPT/mptrack/Ctrl_pat.cpp
    trunk/OpenMPT/mptrack/Mainfrm.h
    trunk/OpenMPT/mptrack/View_pat.cpp

Modified: trunk/OpenMPT/mptrack/CleanupSong.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CleanupSong.cpp	2009-11-27 19:17:19 UTC (rev 424)
+++ trunk/OpenMPT/mptrack/CleanupSong.cpp	2009-11-27 21:17:33 UTC (rev 425)
@@ -146,14 +146,14 @@
 	// patterns
 	CheckDlgButton(IDC_CHK_CLEANUP_PATTERNS, MF_CHECKED);
 	CheckDlgButton(IDC_CHK_REMOVE_PATTERNS, MF_UNCHECKED);
-	CheckDlgButton(IDC_CHK_REARRANGE_PATTERNS, MF_UNCHECKED);
+	CheckDlgButton(IDC_CHK_REARRANGE_PATTERNS, MF_CHECKED);
 	// orders
 	CheckDlgButton(IDC_CHK_MERGE_SEQUENCES, MF_UNCHECKED);
 	CheckDlgButton(IDC_CHK_REMOVE_ORDERS, MF_UNCHECKED);
 	// samples
 	CheckDlgButton(IDC_CHK_CLEANUP_SAMPLES, MF_CHECKED);
 	CheckDlgButton(IDC_CHK_REMOVE_SAMPLES, MF_UNCHECKED);
-	CheckDlgButton(IDC_CHK_REARRANGE_SAMPLES, MF_CHECKED);
+	CheckDlgButton(IDC_CHK_REARRANGE_SAMPLES, MF_UNCHECKED);
 	CheckDlgButton(IDC_CHK_OPTIMIZE_SAMPLES, MF_CHECKED);
 	// instruments
 	CheckDlgButton(IDC_CHK_CLEANUP_INSTRUMENTS, MF_CHECKED);

Modified: trunk/OpenMPT/mptrack/CommandSet.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.cpp	2009-11-27 19:17:19 UTC (rev 424)
+++ trunk/OpenMPT/mptrack/CommandSet.cpp	2009-11-27 21:17:33 UTC (rev 425)
@@ -2410,6 +2410,11 @@
 	commands[kcOrderlistSwitchToPatternView].isHidden = false;
 	commands[kcOrderlistSwitchToPatternView].isDummy = false;
 
+	commands[kcDuplicatePattern].UID = 1806;
+	commands[kcDuplicatePattern].Message = "Duplicate pattern";
+	commands[kcDuplicatePattern].isHidden = false;
+	commands[kcDuplicatePattern].isDummy = false;
+
 	#ifdef _DEBUG
 	for (int i=0; i<kcNumCommands; i++)	{
 		if (commands[i].UID != 0) {	// ignore unset UIDs

Modified: trunk/OpenMPT/mptrack/CommandSet.h
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.h	2009-11-27 19:17:19 UTC (rev 424)
+++ trunk/OpenMPT/mptrack/CommandSet.h	2009-11-27 21:17:33 UTC (rev 425)
@@ -217,6 +217,7 @@
 	kcSetSpacing9,
 	kcSwitchToOrderList,
 	kcNewPattern,
+	kcDuplicatePattern,
 	kcTogglePluginEditor,
 	kcShowNoteProperties,
 	kcShowPatternProperties,

Modified: trunk/OpenMPT/mptrack/Ctrl_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_pat.cpp	2009-11-27 19:17:19 UTC (rev 424)
+++ trunk/OpenMPT/mptrack/Ctrl_pat.cpp	2009-11-27 21:17:33 UTC (rev 425)
@@ -520,6 +520,10 @@
 		OnPatternNew();
 		break;
 
+	case CTRLMSG_PAT_DUPPATTERN:
+		OnPatternDuplicate();
+		break;
+
 	case CTRLMSG_SETUPMACROS:
 		OnSetupZxxMacros();
 		break;
@@ -1262,7 +1266,7 @@
 
 
 void CCtrlPatterns::TogglePluginEditor(bool split)
-//----------------------------------------
+//------------------------------------------------
 {
 	if ((m_nInstrument) && (m_pModDoc))
 	{
@@ -1279,7 +1283,7 @@
 }
 
 void CCtrlPatterns::ToggleSplitPluginEditor()
-//----------------------------------------
+//-------------------------------------------
 {
 	TogglePluginEditor(true);
 }

Modified: trunk/OpenMPT/mptrack/Mainfrm.h
===================================================================
--- trunk/OpenMPT/mptrack/Mainfrm.h	2009-11-27 19:17:19 UTC (rev 424)
+++ trunk/OpenMPT/mptrack/Mainfrm.h	2009-11-27 21:17:33 UTC (rev 425)
@@ -71,6 +71,7 @@
 	CTRLMSG_INS_NEWINSTRUMENT,
 	CTRLMSG_INS_SONGDROP,
 	CTRLMSG_INS_SAMPLEMAP,
+	CTRLMSG_PAT_DUPPATTERN,
 };
 
 enum {

Modified: trunk/OpenMPT/mptrack/View_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp	2009-11-27 19:17:19 UTC (rev 424)
+++ trunk/OpenMPT/mptrack/View_pat.cpp	2009-11-27 21:17:33 UTC (rev 425)
@@ -3634,6 +3634,7 @@
 		case kcToggleFollowSong: SendCtrlMessage(CTRLMSG_PAT_FOLLOWSONG); return wParam;
 		case kcChangeLoopStatus: SendCtrlMessage(CTRLMSG_PAT_LOOP, -1); return wParam;
 		case kcNewPattern:		 SendCtrlMessage(CTRLMSG_PAT_NEWPATTERN); return wParam;
+		case kcDuplicatePattern: SendCtrlMessage(CTRLMSG_PAT_DUPPATTERN); return wParam;
 		case kcSwitchToOrderList: OnSwitchToOrderList();
 		case kcSwitchOverflowPaste:	CMainFrame::m_dwPatternSetup ^= PATTERN_OVERFLOWPASTE; return wParam;
 


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