Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[528] trunk/OpenMPT/mptrack
|
From: <sag...@us...> - 2010-03-13 14:17:41
|
Revision: 528
http://modplug.svn.sourceforge.net/modplug/?rev=528&view=rev
Author: saga-games
Date: 2010-03-13 14:17:33 +0000 (Sat, 13 Mar 2010)
Log Message:
-----------
[Imp] Sample Editor: Remember previous settings in RAW import dialog
[New] Sample Editor: Option to not ask for RAW import settings again (settings are remembered independently for all modules)
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Ctrl_smp.cpp
trunk/OpenMPT/mptrack/Ctrl_smp.h
trunk/OpenMPT/mptrack/Mpdlgs.cpp
trunk/OpenMPT/mptrack/Mpdlgs.h
trunk/OpenMPT/mptrack/mptrack.rc
trunk/OpenMPT/mptrack/resource.h
Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2010-03-13 00:22:53 UTC (rev 527)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2010-03-13 14:17:33 UTC (rev 528)
@@ -159,6 +159,7 @@
{
m_nSample = 1;
m_nLockCount = 1;
+ m_nPreviousRawFormat = 0;
}
@@ -722,9 +723,17 @@
if (!bOk)
{
CRawSampleDlg dlg(this);
+ if(m_nPreviousRawFormat != 0)
+ {
+ dlg.m_nFormat = m_nPreviousRawFormat;
+ dlg.m_bRememberFormat = true;
+ }
EndWaitCursor();
- if (dlg.DoModal() == IDOK)
+ if ((m_nPreviousRawFormat != 0) || (dlg.DoModal() == IDOK))
{
+
+ m_nPreviousRawFormat = ((dlg.m_bRememberFormat)) ? dlg.m_nFormat : 0;
+
BeginWaitCursor();
UINT flags = 0;
MODSAMPLE *pSmp = &m_pSndFile->Samples[m_nSample];
Modified: trunk/OpenMPT/mptrack/Ctrl_smp.h
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.h 2010-03-13 00:22:53 UTC (rev 527)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.h 2010-03-13 14:17:33 UTC (rev 528)
@@ -32,6 +32,7 @@
uint32 m_nOverlapMs;
uint16 m_nFinetuneStep; // Increment finetune by x when using spin control. Default = 25
enum {nDefaultStretchChunkSize = 8192};
+ UINT m_nPreviousRawFormat;
CComboBox m_ComboPitch, m_ComboQuality, m_ComboFFT;
Modified: trunk/OpenMPT/mptrack/Mpdlgs.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mpdlgs.cpp 2010-03-13 00:22:53 UTC (rev 527)
+++ trunk/OpenMPT/mptrack/Mpdlgs.cpp 2010-03-13 14:17:33 UTC (rev 528)
@@ -1066,6 +1066,9 @@
// CRawSampleDlg
+UINT CRawSampleDlg::m_nFormat = 0;
+
+
BOOL CRawSampleDlg::OnInitDialog()
//--------------------------------
{
@@ -1082,6 +1085,7 @@
if (IsDlgButtonChecked(IDC_RADIO2)) m_nFormat |= 1;
if (IsDlgButtonChecked(IDC_RADIO4)) m_nFormat |= 2;
if (IsDlgButtonChecked(IDC_RADIO6)) m_nFormat |= 4;
+ m_bRememberFormat = IsDlgButtonChecked(IDC_CHK_REMEMBERSETTINGS) ? true : false;
CDialog::OnOK();
}
@@ -1092,6 +1096,7 @@
CheckRadioButton(IDC_RADIO1, IDC_RADIO2, (m_nFormat & 1) ? IDC_RADIO2 : IDC_RADIO1);
CheckRadioButton(IDC_RADIO3, IDC_RADIO4, (m_nFormat & 2) ? IDC_RADIO4 : IDC_RADIO3);
CheckRadioButton(IDC_RADIO5, IDC_RADIO6, (m_nFormat & 4) ? IDC_RADIO6 : IDC_RADIO5);
+ CheckDlgButton(IDC_CHK_REMEMBERSETTINGS, (m_bRememberFormat) ? MF_CHECKED : MF_UNCHECKED);
}
Modified: trunk/OpenMPT/mptrack/Mpdlgs.h
===================================================================
--- trunk/OpenMPT/mptrack/Mpdlgs.h 2010-03-13 00:22:53 UTC (rev 527)
+++ trunk/OpenMPT/mptrack/Mpdlgs.h 2010-03-13 14:17:33 UTC (rev 528)
@@ -134,10 +134,15 @@
//=================================
{
public:
- UINT m_nFormat;
+ static UINT m_nFormat;
+ bool m_bRememberFormat;
public:
- CRawSampleDlg(CWnd *parent=NULL):CDialog(IDD_LOADRAWSAMPLE, parent) { m_nFormat = 0; }
+ CRawSampleDlg(CWnd *parent = NULL):CDialog(IDD_LOADRAWSAMPLE, parent)
+ {
+ //m_nFormat = 0;
+ m_bRememberFormat = false;
+ }
protected:
virtual BOOL OnInitDialog();
Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc 2010-03-13 00:22:53 UTC (rev 527)
+++ trunk/OpenMPT/mptrack/mptrack.rc 2010-03-13 14:17:33 UTC (rev 528)
@@ -424,23 +424,25 @@
CONTROL "Spin1",IDC_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,196,232,11,14
END
-IDD_LOADRAWSAMPLE DIALOGEX 0, 0, 178, 89
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_LOADRAWSAMPLE DIALOGEX 0, 0, 178, 95
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Unknown file type"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- DEFPUSHBUTTON "OK",IDOK,66,66,50,14
- PUSHBUTTON "Cancel",IDCANCEL,120,66,50,14
- GROUPBOX "",IDC_STATIC,6,24,48,34,WS_GROUP
+ DEFPUSHBUTTON "OK",IDOK,66,72,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,120,72,50,14
+ GROUPBOX "",IDC_STATIC,6,18,48,34,WS_GROUP
LTEXT "Load it as a raw sample of the following format:",IDC_STATIC,6,6,156,12
- CONTROL "8-bit",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,12,32,29,10
- CONTROL "16-bit",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,12,44,33,10
- GROUPBOX "",IDC_STATIC,60,24,54,34,WS_GROUP
- CONTROL "Unsigned",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,64,32,46,10
- CONTROL "Signed",IDC_RADIO4,"Button",BS_AUTORADIOBUTTON,64,44,38,10
- GROUPBOX "",IDC_STATIC,120,24,51,34,WS_GROUP
- CONTROL "Mono",IDC_RADIO5,"Button",BS_AUTORADIOBUTTON,126,32,34,10
- CONTROL "Stereo",IDC_RADIO6,"Button",BS_AUTORADIOBUTTON,126,44,37,10
+ CONTROL "8-bit",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,12,26,29,10
+ CONTROL "16-bit",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,12,38,33,10
+ GROUPBOX "",IDC_STATIC,60,18,54,34,WS_GROUP
+ CONTROL "Unsigned",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,64,26,46,10
+ CONTROL "Signed",IDC_RADIO4,"Button",BS_AUTORADIOBUTTON,64,38,38,10
+ GROUPBOX "",IDC_STATIC,120,18,51,34,WS_GROUP
+ CONTROL "Mono",IDC_RADIO5,"Button",BS_AUTORADIOBUTTON,126,26,34,10
+ CONTROL "Stereo",IDC_RADIO6,"Button",BS_AUTORADIOBUTTON,126,38,37,10
+ CONTROL "Remember these settings",IDC_CHK_REMEMBERSETTINGS,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,54,168,12
END
IDD_CONTROL_GLOBALS DIALOGEX 0, 0, 561, 94
@@ -1550,7 +1552,7 @@
IDD_LOADRAWSAMPLE, DIALOG
BEGIN
RIGHTMARGIN, 156
- BOTTOMMARGIN, 88
+ BOTTOMMARGIN, 94
END
IDD_CONTROL_COMMENTS, DIALOG
Modified: trunk/OpenMPT/mptrack/resource.h
===================================================================
--- trunk/OpenMPT/mptrack/resource.h 2010-03-13 00:22:53 UTC (rev 527)
+++ trunk/OpenMPT/mptrack/resource.h 2010-03-13 14:17:33 UTC (rev 528)
@@ -948,6 +948,7 @@
#define IDC_EDIT_PRESET_EXPR 2424
#define IDC_LIST_SAMPLEGEN_PRESETS 2425
#define IDC_CHECK_UNDO 2426
+#define IDC_CHK_REMEMBERSETTINGS 2427
#define ID_FILE_NEWMOD 32771
#define ID_FILE_NEWXM 32772
#define ID_FILE_NEWS3M 32773
@@ -1200,11 +1201,11 @@
#define ID_SAMPLE_GENERATOR_MENU 60244
#define ID_SAMPLE_GENERATOR_PRESET_MENU 60344
#define ID_SAMPLE_GENERATE 60445
-#define ID_NOTEMAP_TRANS_UP 60446
-#define ID_NOTEMAP_TRANS_DOWN 60447
-#define ID_PATTERN_EDIT_PCNOTE_PLUGIN 60448
-#define ID_ENVELOPE_ZOOM_IN 60449
-#define ID_ENVELOPE_ZOOM_OUT 60450
+#define ID_NOTEMAP_TRANS_UP 60446
+#define ID_NOTEMAP_TRANS_DOWN 60447
+#define ID_PATTERN_EDIT_PCNOTE_PLUGIN 60448
+#define ID_ENVELOPE_ZOOM_IN 60449
+#define ID_ENVELOPE_ZOOM_OUT 60450
// Next default values for new objects
//
@@ -1213,7 +1214,7 @@
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 526
#define _APS_NEXT_COMMAND_VALUE 60451
-#define _APS_NEXT_CONTROL_VALUE 2427
+#define _APS_NEXT_CONTROL_VALUE 2428
#define _APS_NEXT_SYMED_VALUE 901
#endif
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
