From: <sag...@us...> - 2011-10-07 01:33:49
|
Revision: 1094 http://modplug.svn.sourceforge.net/modplug/?rev=1094&view=rev Author: saga-games Date: 2011-10-07 01:33:41 +0000 (Fri, 07 Oct 2011) Log Message: ----------- [Mod] Cleaned up tuning dialog. [Fix] Pattern Editor: Default volume display was not always updated properly when using Cut. [Imp] Song Properties: Song flags and such are now updated instantly when changing mod type. Modified Paths: -------------- trunk/OpenMPT/mptrack/TuningDialog.cpp trunk/OpenMPT/mptrack/TuningDialog.h trunk/OpenMPT/mptrack/View_pat.cpp trunk/OpenMPT/mptrack/dlg_misc.cpp trunk/OpenMPT/mptrack/mptrack.rc Modified: trunk/OpenMPT/mptrack/TuningDialog.cpp =================================================================== --- trunk/OpenMPT/mptrack/TuningDialog.cpp 2011-10-06 15:37:37 UTC (rev 1093) +++ trunk/OpenMPT/mptrack/TuningDialog.cpp 2011-10-07 01:33:41 UTC (rev 1094) @@ -302,8 +302,6 @@ } m_CombobTuningType.EnableWindow(enableControls); - m_EditTableSize.SetReadOnly(!enableControls); - m_EditBeginNote.SetReadOnly(!enableControls); m_EditSteps.SetReadOnly(!enableControls); m_EditRatioPeriod.SetReadOnly(!enableControls); m_EditRatio.SetReadOnly(!enableControls); @@ -323,8 +321,6 @@ if(m_pActiveTuning == NULL) //No active tuning, clearing tuning part. { m_EditName.SetWindowText(""); - m_EditTableSize.SetWindowText(""); - m_EditBeginNote.SetWindowText(""); m_EditSteps.SetWindowText(""); m_EditRatioPeriod.SetWindowText(""); m_EditRatio.SetWindowText(""); @@ -354,8 +350,6 @@ CDialog::DoDataExchange(pDX); DDX_Control(pDX, IDC_STATICRATIOMAP, m_RatioMapWnd); DDX_Control(pDX, IDC_COMBO_TTYPE, m_CombobTuningType); - DDX_Control(pDX, IDC_EDIT_TABLESIZE, m_EditTableSize); - DDX_Control(pDX, IDC_EDIT_BEGINNOTE, m_EditBeginNote); DDX_Control(pDX, IDC_EDIT_STEPS, m_EditSteps); DDX_Control(pDX, IDC_EDIT_RATIOPERIOD, m_EditRatioPeriod); DDX_Control(pDX, IDC_EDIT_RATIOVALUE, m_EditRatio); Modified: trunk/OpenMPT/mptrack/TuningDialog.h =================================================================== --- trunk/OpenMPT/mptrack/TuningDialog.h 2011-10-06 15:37:37 UTC (rev 1093) +++ trunk/OpenMPT/mptrack/TuningDialog.h 2011-10-07 01:33:41 UTC (rev 1094) @@ -266,8 +266,6 @@ CComboBox m_CombobTuningType; //Tuning Edits--> - CEdit m_EditTableSize; - CEdit m_EditBeginNote; CEdit m_EditSteps; CEdit m_EditRatioPeriod; CEdit m_EditRatio; Modified: trunk/OpenMPT/mptrack/View_pat.cpp =================================================================== --- trunk/OpenMPT/mptrack/View_pat.cpp 2011-10-06 15:37:37 UTC (rev 1093) +++ trunk/OpenMPT/mptrack/View_pat.cpp 2011-10-07 01:33:41 UTC (rev 1094) @@ -905,25 +905,28 @@ CModDoc *pModDoc = GetDocument(); if (!pModDoc || !(IsEditingEnabled_bmsg())) return; CSoundFile *pSndFile = pModDoc->GetSoundFile(); - MODCOMMAND *p = pSndFile->Patterns[m_nPattern]; - if (!p) return; + if(pSndFile == nullptr || !pSndFile->Patterns.IsValidPat(m_nPattern)) + return; BeginWaitCursor(); - if(ITStyle && GetColTypeFromCursor(m_dwEndSel) == NOTE_COLUMN) m_dwEndSel += 1; //If selection ends to a note column, in ITStyle extending it to instrument column since the instrument data is //removed with note data. + if(ITStyle && GetColTypeFromCursor(m_dwEndSel) == NOTE_COLUMN) m_dwEndSel += 1; PrepareUndo(m_dwBeginSel, m_dwEndSel); - DWORD tmp = m_dwEndSel; - bool invalidateAllCols = false; + DWORD endCursor = m_dwEndSel; - for (UINT row = GetRowFromCursor(m_dwBeginSel); row <= GetRowFromCursor(m_dwEndSel); row++) { // for all selected rows - for (UINT i=(m_dwBeginSel & 0xFFFF); i<=(m_dwEndSel & 0xFFFF); i++) if (GetColTypeFromCursor(i) <= LAST_COLUMN) { // for all selected cols + for (ROWINDEX row = GetRowFromCursor(m_dwBeginSel); row <= GetRowFromCursor(m_dwEndSel); row++) + { + // for all selected rows + for (UINT i = (m_dwBeginSel & 0xFFFF); i <= (m_dwEndSel & 0xFFFF); i++) if (GetColTypeFromCursor(i) <= LAST_COLUMN) + { + // for all selected cols UINT chn = GetChanFromCursor(i); if ((chn >= pSndFile->m_nChannels) || (row >= pSndFile->Patterns[m_nPattern].GetNumRows())) continue; - MODCOMMAND *m = &p[row * pSndFile->m_nChannels + chn]; + MODCOMMAND *m = pSndFile->Patterns[m_nPattern].GetpModCommand(row, chn); switch(GetColTypeFromCursor(i)) { case NOTE_COLUMN: // Clear note @@ -932,7 +935,6 @@ if(m->IsPcNote()) { // Clear whole cell if clearing PC note m->Clear(); - invalidateAllCols = true; } else { @@ -956,7 +958,6 @@ if(m->IsPcNote()) { m->SetValueEffectCol(0); - invalidateAllCols = true; } } break; @@ -979,16 +980,13 @@ } //end selected columns } //end selected rows - // If selection ends on effect command column, extent invalidation area to - // effect param column as well. - if (GetColTypeFromCursor(tmp) == EFFECT_COLUMN) - tmp++; + // Expand invalidation to the whole column. Needed for: + // - Last column is the effect character (parameter needs to be invalidated, too + // - PC Notes + // - Default volume display is enabled. + endCursor += LAST_COLUMN - GetColTypeFromCursor(endCursor); - // If invalidation on all columns is wanted, extent invalidation area. - if(invalidateAllCols) - tmp += LAST_COLUMN - GetColTypeFromCursor(tmp); - - InvalidateArea(m_dwBeginSel, tmp); + InvalidateArea(m_dwBeginSel, endCursor); pModDoc->SetModified(); pModDoc->UpdateAllViews(this, HINT_PATTERNDATA | (m_nPattern << HINT_SHIFT_PAT), NULL); EndWaitCursor(); @@ -1195,7 +1193,7 @@ InvalidateRect(&m_rcDropItem, FALSE); - const bool duplicate = (nFlags & MK_SHIFT) ? true : false; + const bool duplicate = (nFlags & MK_SHIFT) != 0; const CHANNELINDEX newChannels = pModDoc->GetNumChannels() + (duplicate ? 1 : 0); vector<CHANNELINDEX> channels(newChannels, 0); CHANNELINDEX i = 0; @@ -1224,8 +1222,8 @@ { if(duplicate) { - pModDoc->UpdateAllViews(this, HINT_MODCHANNELS); - pModDoc->UpdateAllViews(this, HINT_MODTYPE); + // Number of channels changed: Update channel headers and other information. + pModDoc->UpdateAllViews(this, HINT_MODCHANNELS | HINT_MODTYPE); SetCurrentPattern(m_nPattern); } InvalidatePattern(); @@ -1233,9 +1231,11 @@ } } break; + case DRAGITEM_PATTERNHEADER: OnPatternProperties(); break; + case DRAGITEM_PLUGNAME: //rewbs.patPlugNames if (nItemNo < MAX_BASECHANNELS) TogglePluginEditor(nItemNo); @@ -1641,10 +1641,12 @@ void CViewPattern::OnSplitRecordSelect() { CModDoc *pModDoc = GetDocument(); - if (pModDoc){ + if (pModDoc) + { UINT nNumChn = pModDoc->GetNumChannels(); UINT nChn = GetChanFromCursor(m_nMenuParam); - if (nChn < nNumChn){ + if (nChn < nNumChn) + { pModDoc->Record2Channel(nChn); InvalidateChannelsHeaders(); } @@ -1731,7 +1733,7 @@ CSoundFile *pSndFile = pModDoc->GetSoundFile(); UINT nrows = GetRowFromCursor(m_dwEndSel) - GetRowFromCursor(m_dwBeginSel) + 1; DeleteRows(0, pSndFile->GetNumChannels() - 1, nrows); - m_dwEndSel = (m_dwEndSel & 0x0000FFFF) | (m_dwBeginSel & 0xFFFF0000); + m_dwEndSel = CreateCursor(GetRowFromCursor(m_dwBeginSel), GetChanFromCursor(m_dwEndSel), GetColTypeFromCursor(m_dwEndSel)); } void CViewPattern::InsertRows(UINT colmin, UINT colmax) //rewbs.customKeys: added args Modified: trunk/OpenMPT/mptrack/dlg_misc.cpp =================================================================== --- trunk/OpenMPT/mptrack/dlg_misc.cpp 2011-10-06 15:37:37 UTC (rev 1093) +++ trunk/OpenMPT/mptrack/dlg_misc.cpp 2011-10-07 01:33:41 UTC (rev 1094) @@ -70,9 +70,9 @@ m_nType = m_pSndFile->GetType(); m_nChannels = m_pSndFile->GetNumChannels(); m_dwSongFlags = m_pSndFile->m_dwSongFlags; - SetDlgItemInt(IDC_ROWSPERBEAT, m_pSndFile->m_nDefaultRowsPerBeat); - SetDlgItemInt(IDC_ROWSPERMEASURE, m_pSndFile->m_nDefaultRowsPerMeasure); + // Mod types + m_TypeBox.SetItemData(m_TypeBox.AddString("ProTracker MOD"), MOD_TYPE_MOD); m_TypeBox.SetItemData(m_TypeBox.AddString("ScreamTracker S3M"), MOD_TYPE_S3M); m_TypeBox.SetItemData(m_TypeBox.AddString("FastTracker XM"), MOD_TYPE_XM); @@ -94,6 +94,8 @@ default: m_TypeBox.SetCurSel(0); break; } + // Tempo modes + // Don't show new tempo modes for XM/IT, unless they are currently used const bool showNewTempoModes = (m_pSndFile->GetType() == MOD_TYPE_MPT || (m_pSndFile->m_dwSongFlags & SONG_ITPROJECT) != 0); @@ -112,6 +114,8 @@ } } + // Mix levels + m_PlugMixBox.SetItemData(m_PlugMixBox.AddString("OpenMPT 1.17RC3"), mixLevels_117RC3); if(m_pSndFile->m_nMixLevels == mixLevels_117RC2) // Only shown for backwards compatibility with existing tunes m_PlugMixBox.SetItemData(m_PlugMixBox.AddString("OpenMPT 1.17RC2"), mixLevels_117RC2); @@ -130,6 +134,19 @@ } } + // Misc flags + + CheckDlgButton(IDC_CHK_COMPATPLAY, m_pSndFile->GetModFlag(MSF_COMPATIBLE_PLAY)); + CheckDlgButton(IDC_CHK_MIDICCBUG, m_pSndFile->GetModFlag(MSF_MIDICC_BUGEMULATION)); + CheckDlgButton(IDC_CHK_OLDRANDOM, m_pSndFile->GetModFlag(MSF_OLDVOLSWING)); + + // Time signature information + + SetDlgItemInt(IDC_ROWSPERBEAT, m_pSndFile->m_nDefaultRowsPerBeat); + SetDlgItemInt(IDC_ROWSPERMEASURE, m_pSndFile->m_nDefaultRowsPerMeasure); + + // Version information + SetDlgItemText(IDC_TEXT_CREATEDWITH, "Created with:"); SetDlgItemText(IDC_TEXT_SAVEDWITH, "Last saved with:"); @@ -183,6 +200,8 @@ void CModTypeDlg::UpdateDialog() //------------------------------ { + const MODTYPE type = m_TypeBox.GetItemData(m_TypeBox.GetCurSel()); + UpdateChannelCBox(); m_CheckBox1.SetCheck((m_pSndFile->m_dwSongFlags & SONG_LINEARSLIDES) ? MF_CHECKED : 0); @@ -197,20 +216,20 @@ m_CheckBox6.SetCheck((m_pSndFile->m_dwSongFlags & SONG_ITPEMBEDIH) ? MF_CHECKED : 0); // -! NEW_FEATURE#0023 - m_CheckBox1.EnableWindow((m_pSndFile->m_nType & (MOD_TYPE_XM|MOD_TYPE_IT|MOD_TYPE_MPT)) ? TRUE : FALSE); - m_CheckBox2.EnableWindow((m_pSndFile->m_nType == MOD_TYPE_S3M) ? TRUE : FALSE); - m_CheckBox3.EnableWindow((m_pSndFile->m_nType & (MOD_TYPE_IT|MOD_TYPE_MPT)) ? TRUE : FALSE); - m_CheckBox4.EnableWindow((m_pSndFile->m_nType & (MOD_TYPE_IT|MOD_TYPE_MPT)) ? TRUE : FALSE); - m_CheckBox5.EnableWindow((m_pSndFile->m_nType & (MOD_TYPE_XM|MOD_TYPE_IT|MOD_TYPE_MPT)) ? TRUE : FALSE); - m_CheckBoxPT1x.EnableWindow((m_pSndFile->m_nType & (MOD_TYPE_MOD)) ? TRUE : FALSE); + m_CheckBox1.EnableWindow((type & (MOD_TYPE_XM|MOD_TYPE_IT|MOD_TYPE_MPT)) ? TRUE : FALSE); + m_CheckBox2.EnableWindow((type == MOD_TYPE_S3M) ? TRUE : FALSE); + m_CheckBox3.EnableWindow((type & (MOD_TYPE_IT|MOD_TYPE_MPT)) ? TRUE : FALSE); + m_CheckBox4.EnableWindow((type & (MOD_TYPE_IT|MOD_TYPE_MPT)) ? TRUE : FALSE); + m_CheckBox5.EnableWindow((type & (MOD_TYPE_XM|MOD_TYPE_IT|MOD_TYPE_MPT)) ? TRUE : FALSE); + m_CheckBoxPT1x.EnableWindow((type & (MOD_TYPE_MOD)) ? TRUE : FALSE); // -> CODE#0023 // -> DESC="IT project files (.itp)" m_CheckBox6.EnableWindow(m_TypeBox.GetCurSel() == 4 ? TRUE : FALSE); // -! NEW_FEATURE#0023 - const bool XMorITorMPT = ((m_TypeBox.GetItemData(m_TypeBox.GetCurSel()) & (MOD_TYPE_XM | MOD_TYPE_IT | MOD_TYPE_MPT)) != 0); - const bool ITorMPT = ((m_TypeBox.GetItemData(m_TypeBox.GetCurSel()) & (MOD_TYPE_IT | MOD_TYPE_MPT)) != 0); + const bool XMorITorMPT = (type & (MOD_TYPE_XM | MOD_TYPE_IT | MOD_TYPE_MPT)) != 0; + const bool ITorMPT = (type & (MOD_TYPE_IT | MOD_TYPE_MPT)) != 0; // Misc Flags if(ITorMPT) @@ -225,10 +244,6 @@ GetDlgItem(IDC_CHK_MIDICCBUG)->ShowWindow(XMorITorMPT); GetDlgItem(IDC_CHK_OLDRANDOM)->ShowWindow(ITorMPT); - CheckDlgButton(IDC_CHK_COMPATPLAY, m_pSndFile->GetModFlag(MSF_COMPATIBLE_PLAY)); - CheckDlgButton(IDC_CHK_MIDICCBUG, m_pSndFile->GetModFlag(MSF_MIDICC_BUGEMULATION)); - CheckDlgButton(IDC_CHK_OLDRANDOM, m_pSndFile->GetModFlag(MSF_OLDVOLSWING)); - // Deprecated flags are greyed out if they are not being used. GetDlgItem(IDC_CHK_MIDICCBUG)->EnableWindow(m_pSndFile->GetModFlag(MSF_MIDICC_BUGEMULATION) ? TRUE : FALSE); GetDlgItem(IDC_CHK_OLDRANDOM)->EnableWindow(m_pSndFile->GetModFlag(MSF_OLDVOLSWING) ? TRUE : FALSE); Modified: trunk/OpenMPT/mptrack/mptrack.rc =================================================================== --- trunk/OpenMPT/mptrack/mptrack.rc 2011-10-06 15:37:37 UTC (rev 1093) +++ trunk/OpenMPT/mptrack/mptrack.rc 2011-10-07 01:33:41 UTC (rev 1094) @@ -2606,53 +2606,49 @@ CONTROL "Pattern Record",IDC_CHECK_PATRECORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,114,20,65,10 END -IDD_TUNING DIALOGEX 0, 0, 512, 240 +IDD_TUNING DIALOGEX 0, 0, 512, 231 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME EXSTYLE WS_EX_CONTROLPARENT -CAPTION "Tuning properties" +CAPTION "Tuning Properties" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Close",IDOK,449,8,50,14 - CONTROL "",IDC_STATICRATIOMAP,"Static",SS_GRAYRECT | SS_NOTIFY | WS_TABSTOP,299,70,193,111,WS_EX_CLIENTEDGE - LTEXT "Tuning type",IDC_STATIC,109,116,46,8,SS_CENTERIMAGE - COMBOBOX IDC_COMBO_TTYPE,167,113,113,45,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Ratiotable size",IDC_STATIC,251,170,48,12,SS_CENTERIMAGE | NOT WS_VISIBLE - EDITTEXT IDC_EDIT_STEPS,167,162,66,12,ES_AUTOHSCROLL | ES_READONLY - LTEXT "Groupsize",IDC_STATIC,109,162,58,15,SS_CENTERIMAGE - LTEXT "Groupratio",IDC_STATIC,109,185,36,12,SS_CENTERIMAGE - EDITTEXT IDC_EDIT_RATIOPERIOD,167,186,66,12,ES_AUTOHSCROLL | ES_READONLY - LTEXT "Ratiotable begin note",IDC_STATIC,241,185,58,21,NOT WS_VISIBLE - EDITTEXT IDC_EDIT_BEGINNOTE,243,199,66,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_VISIBLE - EDITTEXT IDC_EDIT_TABLESIZE,245,178,66,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_VISIBLE - LTEXT "Ratio",IDC_STATIC,412,186,24,8,SS_CENTERIMAGE - EDITTEXT IDC_EDIT_RATIOVALUE,442,184,37,12,ES_AUTOHSCROLL | ES_WANTRETURN - LTEXT "Notename",IDC_STATIC,309,186,36,8,SS_CENTERIMAGE - EDITTEXT IDC_EDIT_NOTENAME,354,183,26,12,ES_AUTOHSCROLL | ES_WANTRETURN - PUSHBUTTON "Set",IDC_BUTTON_SETVALUES,389,203,23,12 - PUSHBUTTON "Import",IDC_BUTTON_IMPORT,451,26,48,13 - PUSHBUTTON "Export",IDC_BUTTON_EXPORT,451,44,48,13 - LTEXT "Multiply ",IDC_STATIC,309,204,29,12,SS_CENTERIMAGE - EDITTEXT IDC_EDIT_MISC_ACTIONS,353,202,30,13,ES_AUTOHSCROLL - LTEXT "Finetune steps",IDC_STATIC,109,207,48,12,SS_CENTERIMAGE - EDITTEXT IDC_EDIT_FINETUNESTEPS,167,207,66,12,ES_AUTOHSCROLL - CONTROL "Read Only",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,109,74,126,12 - EDITTEXT IDC_EDIT_NAME,167,91,112,12,ES_AUTOHSCROLL | ES_READONLY - LTEXT "Name",IDC_STATIC,109,93,38,11 - GROUPBOX "Tuning",IDC_STATIC,104,63,395,168 - CONTROL "",IDC_TREE_TUNING,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,9,15,92,200 - GROUPBOX "Tuning collection",IDC_STATIC,104,6,342,55 - LTEXT "Name:",IDC_STATIC,111,18,45,9,SS_CENTERIMAGE - EDITTEXT IDC_EDIT_TUNINGCOLLECTION_NAME,167,16,90,12,ES_AUTOHSCROLL | ES_READONLY - LTEXT "Version",IDC_STATIC,109,32,41,9,SS_CENTERIMAGE - LTEXT "Number of tunings",IDC_STATIC,268,15,89,11,SS_CENTERIMAGE - LTEXT "Edit mask",IDC_STATIC,109,46,48,8,SS_CENTERIMAGE - EDITTEXT IDC_EDIT_TUNINGC_VERSION,168,31,90,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_VISIBLE - EDITTEXT IDC_EDIT_TUNINGC_EDITMASK,168,45,90,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_VISIBLE - EDITTEXT IDC_EDIT_TUNINGNUM,353,15,28,13,ES_AUTOHSCROLL | ES_READONLY - LTEXT "Filepath: ",IDC_STATIC,268,38,31,12,SS_CENTERIMAGE - EDITTEXT IDC_EDIT_TUNINGCOLLECTION_PATH,299,38,111,12,ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "Save",IDC_BUTTON_TUNINGCOLLECTION_SAVE,410,38,32,12 - LTEXT "Static",IDC_TUNINGTYPE_DESC,109,134,179,20,0,WS_EX_STATICEDGE + DEFPUSHBUTTON "Close",IDOK,456,12,48,14 + PUSHBUTTON "Import",IDC_BUTTON_IMPORT,456,30,48,14 + PUSHBUTTON "Export",IDC_BUTTON_EXPORT,456,48,48,14 + CONTROL "",IDC_TREE_TUNING,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_SHOWSELALWAYS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,6,6,96,222 + CONTROL "Read Only",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,113,77,199,12 + LTEXT "Name:",IDC_STATIC,114,96,53,11 + EDITTEXT IDC_EDIT_NAME,168,96,144,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "Tuning Type:",IDC_STATIC,114,122,46,8,SS_CENTERIMAGE + COMBOBOX IDC_COMBO_TTYPE,168,120,144,45,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Static",IDC_TUNINGTYPE_DESC,114,138,198,20,0,WS_EX_STATICEDGE + LTEXT "Group Size:",IDC_STATIC,114,170,60,8,SS_CENTERIMAGE + EDITTEXT IDC_EDIT_STEPS,174,168,30,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "Group Ratio:",IDC_STATIC,114,187,60,9,SS_CENTERIMAGE + EDITTEXT IDC_EDIT_RATIOPERIOD,174,186,30,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "Finetune Steps:",IDC_STATIC,114,206,60,8,SS_CENTERIMAGE + EDITTEXT IDC_EDIT_FINETUNESTEPS,174,204,30,12,ES_AUTOHSCROLL + LTEXT "Note Name:",IDC_STATIC,210,170,39,8,SS_CENTERIMAGE + EDITTEXT IDC_EDIT_NOTENAME,252,168,30,12,ES_AUTOHSCROLL | ES_WANTRETURN + LTEXT "Ratio",IDC_STATIC,210,188,30,8,SS_CENTERIMAGE + EDITTEXT IDC_EDIT_RATIOVALUE,240,186,42,12,ES_AUTOHSCROLL | ES_WANTRETURN + LTEXT "Multiply:",IDC_STATIC,210,204,29,12,SS_CENTERIMAGE + EDITTEXT IDC_EDIT_MISC_ACTIONS,240,204,42,13,ES_AUTOHSCROLL + PUSHBUTTON "Set",IDC_BUTTON_SETVALUES,288,204,23,12 + CONTROL "",IDC_STATICRATIOMAP,"Static",SS_GRAYRECT | SS_NOTIFY | WS_TABSTOP,324,78,168,138,WS_EX_CLIENTEDGE + GROUPBOX "Tuning Editor",IDC_STATIC,108,66,395,162 + LTEXT "Name:",IDC_STATIC,114,19,35,9,SS_CENTERIMAGE + EDITTEXT IDC_EDIT_TUNINGCOLLECTION_NAME,162,18,84,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "File Path: ",IDC_STATIC,252,18,31,12,SS_CENTERIMAGE + EDITTEXT IDC_EDIT_TUNINGCOLLECTION_PATH,288,18,120,12,ES_AUTOHSCROLL | ES_READONLY + PUSHBUTTON "Save",IDC_BUTTON_TUNINGCOLLECTION_SAVE,414,18,30,12 + LTEXT "Number of tunings:",IDC_STATIC,114,36,72,11,SS_CENTERIMAGE + EDITTEXT IDC_EDIT_TUNINGNUM,186,36,60,13,ES_AUTOHSCROLL | ES_READONLY + LTEXT "Version:",IDC_STATIC,252,37,35,9,SS_CENTERIMAGE + EDITTEXT IDC_EDIT_TUNINGC_VERSION,288,36,30,13,ES_AUTOHSCROLL | ES_READONLY | NOT WS_VISIBLE + LTEXT "Edit Mask:",IDC_STATIC,324,38,35,8,SS_CENTERIMAGE + EDITTEXT IDC_EDIT_TUNINGC_EDITMASK,366,36,78,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_VISIBLE + GROUPBOX "Tuning Collection",IDC_STATIC,108,6,342,54 END IDD_CHANNELMANAGER DIALOGEX 0, 0, 524, 231 @@ -2764,7 +2760,7 @@ VERTGUIDE, 268 VERTGUIDE, 299 VERTGUIDE, 442 - BOTTOMMARGIN, 236 + BOTTOMMARGIN, 227 END IDD_CHANNELMANAGER, DIALOG This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |