Menu
▾
▴
SF.net SVN: jazzplusplus:[698] trunk/jazz
|
From: <pst...@us...> - 2009-02-16 05:04:04
|
Revision: 698
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=698&view=rev
Author: pstieber
Date: 2009-02-16 05:03:58 +0000 (Mon, 16 Feb 2009)
Log Message:
-----------
1. Added a placeholder for a new velocity dialog.
2. Updated some meter change resource ID.
3. Updated the names of some wxWidgets event handlers.
4. Moved the meter change dialog from the event window source files to the
dialog source files.
5. Made cosmetic changes.
Modified Paths:
--------------
trunk/jazz/src/Dialogs.cpp
trunk/jazz/src/Dialogs.h
trunk/jazz/src/EventFrame.cpp
trunk/jazz/src/EventFrame.h
trunk/jazz/src/EventWindow.cpp
trunk/jazz/src/EventWindow.h
trunk/jazz/src/Makefile.am
trunk/jazz/src/PianoFrame.cpp
trunk/jazz/src/PianoWindow.cpp
trunk/jazz/src/Resources.h
trunk/jazz/src/TrackFrame.cpp
trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj
trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
Added Paths:
-----------
trunk/jazz/src/Dialogs/VelocityDialog.cpp
trunk/jazz/src/Dialogs/VelocityDialog.h
Added: trunk/jazz/src/Dialogs/VelocityDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/VelocityDialog.cpp (rev 0)
+++ trunk/jazz/src/Dialogs/VelocityDialog.cpp 2009-02-16 05:03:58 UTC (rev 698)
@@ -0,0 +1,5 @@
+#include "VelocityDialog.h"
+
+JZVelocityDialog::JZVelocityDialog()
+{
+}
Property changes on: trunk/jazz/src/Dialogs/VelocityDialog.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/jazz/src/Dialogs/VelocityDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/VelocityDialog.h (rev 0)
+++ trunk/jazz/src/Dialogs/VelocityDialog.h 2009-02-16 05:03:58 UTC (rev 698)
@@ -0,0 +1,14 @@
+#ifndef JZ_VELOCITYDIALOG_H
+#define JZ_VELOCITYDIALOG_H
+
+#include <wx/dialog.h>
+
+class JZVelocityDialog : public wxDialog
+{
+ public:
+
+ JZVelocityDialog();
+
+};
+
+#endif // !defined(JZ_VELOCITYDIALOG_H)
Property changes on: trunk/jazz/src/Dialogs/VelocityDialog.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/jazz/src/Dialogs.cpp
===================================================================
--- trunk/jazz/src/Dialogs.cpp 2009-01-22 02:24:58 UTC (rev 697)
+++ trunk/jazz/src/Dialogs.cpp 2009-02-16 05:03:58 UTC (rev 698)
@@ -26,6 +26,7 @@
#include "Command.h"
#include "DeprecatedWx/proplist.h"
#include "Dialogs/KeyOnDialog.h"
+//#include "EventFrame.h"
#include "Events.h"
#include "EventWindow.h"
#include "Filter.h"
@@ -48,9 +49,9 @@
using namespace std;
-// **************************************************************************
+//*****************************************************************************
// Shift
-// *************************************************************************
+//*****************************************************************************
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//tShiftDlg::tShiftDlg(JZEventFrame* pEventWindow, JZFilter* pFilter, long unit)
@@ -101,9 +102,9 @@
//}
-// **************************************************************************
+//*****************************************************************************
// Cleanup
-// *************************************************************************
+//*****************************************************************************
int tCleanupDlg::lowLimit = 48;
bool tCleanupDlg::shortenOverlaps = 1;
@@ -183,9 +184,9 @@
}
-// **************************************************************************
+//*****************************************************************************
// SearchReplace
-// *************************************************************************
+//*****************************************************************************
int tSearchReplaceDlg::frCtrl = 1;
int tSearchReplaceDlg::toCtrl = 1;
@@ -230,9 +231,9 @@
-// **************************************************************************
+//*****************************************************************************
// Transpose
-// *************************************************************************
+//*****************************************************************************
int tTransposeDlg::Notes = 0;
int tTransposeDlg::Scale = gScaleChromatic;
@@ -281,9 +282,9 @@
"bool"));
}
-// **************************************************************************
+//*****************************************************************************
// SetChannel
-// *************************************************************************
+//*****************************************************************************
int tSetChannelDlg::NewChannel = 1;
@@ -329,9 +330,9 @@
-// **************************************************************************
+//*****************************************************************************
// Velocity
-// *************************************************************************
+//*****************************************************************************
int tVelocityDlg::FromValue = 64;
int tVelocityDlg::ToValue = 0;
@@ -380,9 +381,9 @@
-// **************************************************************************
+//*****************************************************************************
// Length
-// *************************************************************************
+//*****************************************************************************
int tLengthDlg::FromValue = 30;
int tLengthDlg::ToValue = 0;
@@ -441,9 +442,9 @@
-// **************************************************************************
+//*****************************************************************************
// seqLength
-// *************************************************************************
+//*****************************************************************************
double tSeqLengthDlg::scale = 1.0;
@@ -484,9 +485,9 @@
}
-// **************************************************************************
+//*****************************************************************************
// midiDelay
-// *************************************************************************
+//*****************************************************************************
double tMidiDelayDlg::scale = 0.5;
long tMidiDelayDlg::clockDelay = 10;
@@ -546,9 +547,9 @@
-// *************************************************************************
+//*****************************************************************************
// Delete
-// *************************************************************************
+//*****************************************************************************
bool tDeleteDlg::LeaveSpace = 1;
@@ -585,9 +586,9 @@
//LAST ADDED EVENT
-// **************************************************************************
+//*****************************************************************************
// Snap
-// *************************************************************************
+//*****************************************************************************
tSnapDlg::tSnapDlg(JZPianoWindow* pPianoWindow, int* snapptr)
: tPropertyListDlg("Snap:quantize cut/paste events"),
@@ -631,9 +632,9 @@
}
-// **************************************************************************
+//*****************************************************************************
// Quantize
-// *************************************************************************
+//*****************************************************************************
bool tQuantizeDlg::NoteStart = 1;
bool tQuantizeDlg::NoteLength = 0;
@@ -641,7 +642,8 @@
int tQuantizeDlg::Delay = 0;
int tQuantizeDlg::Groove = 0;
-tQuantizeDlg::tQuantizeDlg(JZEventFrame *w, JZFilter *f)
+//tQuantizeDlg::tQuantizeDlg(JZEventFrame *w, JZFilter *f)
+tQuantizeDlg::tQuantizeDlg(JZEventWindow *w, JZFilter *f)
: tPropertyListDlg("Quantize" )
//, Steps("steps", gQntSteps, &gQntStep)
{
@@ -701,9 +703,9 @@
}
-// ***********************************************************************
+//*****************************************************************************
// Event-Dialogue
-// ***********************************************************************
+//*****************************************************************************
class tEventDlg : public tPropertyListDlg
{
@@ -1440,3 +1442,51 @@
}
}
+//*****************************************************************************
+// MeterChange Dialog
+//*****************************************************************************
+
+int tMeterChangeDlg::Numerator = 4;
+int tMeterChangeDlg::Denomiator = 4;
+int tMeterChangeDlg::BarNr = 1;
+
+tMeterChangeDlg::tMeterChangeDlg(JZEventWindow* pEventWindow)
+ : tPropertyListDlg("Meter Change"),
+ mpEventWindow(pEventWindow)
+{
+}
+
+void tMeterChangeDlg::AddProperties()
+{
+ sheet->AddProperty(new wxProperty(
+ "BarNr",
+ wxPropertyValue(&BarNr),
+ "integer"));//JAVE validators here? problem is i dont know which ranges are valid FIXME
+ sheet->AddProperty(new wxProperty(
+ "Numerator",
+ wxPropertyValue(&Numerator),
+ "integer"));
+ sheet->AddProperty(new wxProperty(
+ "Denomiator(2,4,8,16,32)",
+ wxPropertyValue(&Denomiator),
+ "integer"));//JAVE should be a integer list instead FIXME
+}
+
+void tMeterChangeDlg::OnCancel()
+{
+ mpEventWindow->FinishMeterEdit();
+}
+
+bool tMeterChangeDlg::OnClose()
+{
+ BarNr += mpEventWindow->GetSong()->GetIntroLength();
+ mpEventWindow->GetSong()->SetMeterChange(BarNr, Numerator, Denomiator);
+ mpEventWindow->Refresh();
+ mpEventWindow->FinishMeterEdit();
+ return false;
+}
+
+void tMeterChangeDlg::OnHelp()
+{
+ gpHelpInstance->ShowTopic("Meterchange");
+}
Modified: trunk/jazz/src/Dialogs.h
===================================================================
--- trunk/jazz/src/Dialogs.h 2009-01-22 02:24:58 UTC (rev 697)
+++ trunk/jazz/src/Dialogs.h 2009-02-16 05:03:58 UTC (rev 698)
@@ -238,7 +238,7 @@
long Quantize(long);
- tQuantizeDlg(JZEventFrame *w, JZFilter *f);
+ tQuantizeDlg(JZEventWindow* w, JZFilter* pFilter);
void AddProperties();
//tNamedChoice Steps;
bool OnClose();
@@ -253,4 +253,25 @@
int Channel,
int Pitch);
+//*****************************************************************************
+// MeterChange Dialog
+//*****************************************************************************
+class tMeterChangeDlg : public tPropertyListDlg
+{
+ public:
+
+ tMeterChangeDlg(JZEventWindow* pEventWindow);
+
+ void AddProperties();
+
+ virtual bool OnClose();
+ virtual void OnCancel();
+ virtual void OnHelp();
+
+ JZEventWindow* mpEventWindow;
+ static int Numerator;
+ static int Denomiator;
+ static int BarNr;
+};
+
#endif // !defined(JZ_DIALOGS_H)
Modified: trunk/jazz/src/EventFrame.cpp
===================================================================
--- trunk/jazz/src/EventFrame.cpp 2009-01-22 02:24:58 UTC (rev 697)
+++ trunk/jazz/src/EventFrame.cpp 2009-02-16 05:03:58 UTC (rev 698)
@@ -23,8 +23,8 @@
//-----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(JZEventFrame, wxFrame)
- EVT_UPDATE_UI(ID_SHIFT, JZEventFrame::OnUpdateEditShift)
- EVT_MENU(ID_SHIFT, JZEventFrame::OnEditShift)
+ EVT_UPDATE_UI(ID_SHIFT, JZEventFrame::OnUpdateEventsSelected)
+ EVT_MENU(ID_SHIFT, JZEventFrame::OnShift)
END_EVENT_TABLE()
@@ -47,7 +47,6 @@
mEventsHeight(0),
SnapSel(0),
MouseAction(0),
- mpSettingsDialog(0),
MixerForm(0),
mpToolBar(0),
mpEventWindow(0)
@@ -189,7 +188,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZEventFrame::OnUpdateEditShift(wxUpdateUIEvent& Event)
+void JZEventFrame::OnUpdateEventsSelected(wxUpdateUIEvent& Event)
{
if (mpEventWindow)
{
@@ -203,7 +202,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZEventFrame::OnEditShift(wxCommandEvent& Event)
+void JZEventFrame::OnShift(wxCommandEvent& Event)
{
if (mpEventWindow)
{
@@ -215,118 +214,123 @@
//-----------------------------------------------------------------------------
void JZEventFrame::OnQuantize(wxCommandEvent& Event)
{
- if (!mpEventWindow || !mpEventWindow->AreEventsSelected())
+ if (mpEventWindow)
{
- return;
+ mpEventWindow->Quantize();
}
-
- // wxDialogBox *panel = new wxDialogBox(this, "Quantize", FALSE );
- tQuantizeDlg * dlg = new tQuantizeDlg(this, mpFilter);
- dlg->Create();
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZEventFrame::MenCleanup()
+void JZEventFrame::OnSetChannel(wxCommandEvent& Event)
{
if (!mpEventWindow || !mpEventWindow->AreEventsSelected())
{
return;
}
- tCleanupDlg * dlg = new tCleanupDlg(this, mpFilter);
+ tSetChannelDlg * dlg = new tSetChannelDlg(mpFilter);
dlg->Create();
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZEventFrame::MenSearchReplace()
+void JZEventFrame::OnTranspose(wxCommandEvent& Event)
{
if (!mpEventWindow || !mpEventWindow->AreEventsSelected())
{
return;
}
- tSearchReplaceDlg * dlg = new tSearchReplaceDlg(this, mpFilter);
+ tTransposeDlg * dlg = new tTransposeDlg(this, mpFilter);
dlg->Create();
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZEventFrame::MenSetChannel()
+void JZEventFrame::OnDelete(wxCommandEvent& Event)
{
if (!mpEventWindow || !mpEventWindow->AreEventsSelected())
{
return;
}
- tSetChannelDlg * dlg = new tSetChannelDlg(mpFilter);
+ tDeleteDlg * dlg = new tDeleteDlg(this, mpFilter);
dlg->Create();
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZEventFrame::MenTranspose()
+void JZEventFrame::OnVelocity(wxCommandEvent& Event)
{
if (!mpEventWindow || !mpEventWindow->AreEventsSelected())
{
return;
}
- tTransposeDlg * dlg = new tTransposeDlg(this, mpFilter);
+ tVelocityDlg * dlg = new tVelocityDlg(mpFilter);
dlg->Create();
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZEventFrame::MenDelete()
+void JZEventFrame::OnLength(wxCommandEvent& Event)
{
if (!mpEventWindow || !mpEventWindow->AreEventsSelected())
{
return;
}
- tDeleteDlg * dlg = new tDeleteDlg(this, mpFilter);
+ tLengthDlg * dlg = new tLengthDlg(this, mpFilter);
dlg->Create();
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZEventFrame::MenVelocity()
+void JZEventFrame::OnConvertToModulation(wxCommandEvent& Event)
{
if (!mpEventWindow || !mpEventWindow->AreEventsSelected())
{
return;
}
- tVelocityDlg * dlg = new tVelocityDlg(mpFilter);
- dlg->Create();
+ tCmdConvertToModulation cmd(mpFilter);
+ cmd.Execute();
+ Redraw();
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZEventFrame::MenLength()
+void JZEventFrame::OnCleanup(wxCommandEvent& Event)
{
if (!mpEventWindow || !mpEventWindow->AreEventsSelected())
{
return;
}
- tLengthDlg * dlg = new tLengthDlg(this, mpFilter);
+ tCleanupDlg * dlg = new tCleanupDlg(this, mpFilter);
dlg->Create();
}
//-----------------------------------------------------------------------------
-// convert to modulation
//-----------------------------------------------------------------------------
-void JZEventFrame::MenConvertToModulation()
+void JZEventFrame::OnSearchReplace(wxCommandEvent& Event)
{
if (!mpEventWindow || !mpEventWindow->AreEventsSelected())
{
return;
}
- tCmdConvertToModulation cmd(mpFilter);
- cmd.Execute();
- Redraw();
+ tSearchReplaceDlg * dlg = new tSearchReplaceDlg(this, mpFilter);
+ dlg->Create();
}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZEventFrame::OnMeterChange(wxCommandEvent& Event)
+{
+ if (mpEventWindow)
+ {
+ mpEventWindow->EditMeter();
+ }
+}
Modified: trunk/jazz/src/EventFrame.h
===================================================================
--- trunk/jazz/src/EventFrame.h 2009-01-22 02:24:58 UTC (rev 697)
+++ trunk/jazz/src/EventFrame.h 2009-02-16 05:03:58 UTC (rev 698)
@@ -85,9 +85,6 @@
JZSnapSelection* SnapSel;
tMouseAction* MouseAction;
- // Settings-Dialog
- wxDialog* mpSettingsDialog;
-
// Mixer-Dialog
wxDialog* MixerForm;
@@ -95,23 +92,34 @@
bool OnCharHook(wxKeyEvent& Event);
- void OnUpdateEditShift(wxUpdateUIEvent& Event);
- void OnEditShift(wxCommandEvent& Event);
+ void OnUpdateEventsSelected(wxUpdateUIEvent& Event);
+ void OnShift(wxCommandEvent& Event);
+
void OnQuantize(wxCommandEvent& Event);
- void MenSetChannel();
- void MenTranspose();
- void MenDelete();
- void MenVelocity();
- void MenLength();
- void MenSeqLength();
- void MenMidiDelay();
- void MenConvertToModulation();
- void MenCleanup();
- void MenSearchReplace();
- void MenMeterChange();
+ void OnSetChannel(wxCommandEvent& Event);
+ void OnTranspose(wxCommandEvent& Event);
+
+ void OnDelete(wxCommandEvent& Event);
+
+ void OnVelocity(wxCommandEvent& Event);
+
+ void OnLength(wxCommandEvent& Event);
+
+// void OnSeqLength(wxCommandEvent& Event);
+
+// void OnMidiDelay(wxCommandEvent& Event);
+
+ void OnConvertToModulation(wxCommandEvent& Event);
+
+ void OnCleanup(wxCommandEvent& Event);
+
+ void OnSearchReplace(wxCommandEvent& Event);
+
+ void OnMeterChange(wxCommandEvent& Event);
+
protected:
JZToolBar* mpToolBar;
Modified: trunk/jazz/src/EventWindow.cpp
===================================================================
--- trunk/jazz/src/EventWindow.cpp 2009-01-22 02:24:58 UTC (rev 697)
+++ trunk/jazz/src/EventWindow.cpp 2009-02-16 05:03:58 UTC (rev 698)
@@ -24,6 +24,7 @@
#include "Command.h"
#include "Dialogs/ShiftDialog.h"
+#include "Dialogs.h"
#include "EventFrame.h"
#include "Filter.h"
#include "MouseAction.h"
@@ -80,7 +81,8 @@
mFromLine(0),
mToLine(0),
mScrolledX(0),
- mScrolledY(0)
+ mScrolledY(0),
+ mpSettingsDialog(0)
{
mpSnapSel = new JZSnapSelection(this);
@@ -103,6 +105,7 @@
delete mpFilter;
delete mpGreyColor;
delete mpGreyBrush;
+ FinishMeterEdit();
}
//-----------------------------------------------------------------------------
@@ -149,17 +152,65 @@
//-----------------------------------------------------------------------------
// Quantize selected events.
//-----------------------------------------------------------------------------
-//void JZEventWindow::Quantize()
-//{
-// if (AreEventsSelected())
-// {
+void JZEventWindow::Quantize()
+{
+ if (AreEventsSelected())
+ {
+// wxDialogBox *panel = new wxDialogBox(this, "Quantize", FALSE );
+ tQuantizeDlg* pQuantizeDlg = new tQuantizeDlg(this, mpFilter);
+ pQuantizeDlg->Create();
+
// tCmdQuantize QuantizeCommand(mpFilter, SnapClocks(), 0, 0);
// QuantizeCommand.Execute(1);
// JZProjectManager::Instance()->UpdateAllViews();
-// }
-//}
+ }
+}
//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZEventWindow::EditMeter()
+{
+ if (!IsEditingMeter())
+ {
+ if (!mpSettingsDialog)
+ {
+ mpSettingsDialog = new wxDialog(this, wxID_ANY, "Meter Change");
+ }
+ mpSettingsDialog->Show(true);
+ }
+ else
+ {
+ mpSettingsDialog->SetFocus();
+ }
+// tMeterChangeDlg *dlg;
+// dlg = new tMeterChangeDlg(this);
+// dlg->Create();
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+bool JZEventWindow::IsEditingMeter() const
+{
+ if (mpSettingsDialog)
+ {
+ return (mpSettingsDialog->GetHandle() != 0);
+ }
+ return false;
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZEventWindow::FinishMeterEdit()
+{
+ if (mpSettingsDialog)
+ {
+ // Mark the dialog for destruction during idle time processing.
+ mpSettingsDialog->Destroy();
+ mpSettingsDialog = 0;
+ }
+}
+
+//-----------------------------------------------------------------------------
// Description:
// Only consider the event portion of the window when computing the virtual
// size. Do not consider the static information of the left or top portion of
@@ -373,7 +424,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-// void JZEventFrame::OnChar(wxKeyEvent& KeyEvent)
+// void JZEventWindow::OnChar(wxKeyEvent& KeyEvent)
// {
// if (!OnKeyEvent(KeyEvent))
// {
@@ -387,88 +438,3 @@
//{
// return EventWin->OnKeyEvent(KeyEvent);
//}
-
-//*****************************************************************************
-// MeterChange Dialog
-//*****************************************************************************
-class tMeterChangeDlg : public tPropertyListDlg
-{
- public:
- JZEventFrame *EventWin;
- static int Numerator;
- static int Denomiator;
- static int BarNr;
- tMeterChangeDlg(JZEventFrame *w);
- void AddProperties();
- virtual bool OnClose();
- virtual void OnCancel();
- virtual void OnHelp();
-};
-
-int tMeterChangeDlg::Numerator = 4;
-int tMeterChangeDlg::Denomiator = 4;
-int tMeterChangeDlg::BarNr = 1;
-
-tMeterChangeDlg::tMeterChangeDlg(JZEventFrame *w)
- : tPropertyListDlg("Meter Change")
-{
- EventWin = w;
-}
-
-void tMeterChangeDlg::OnCancel()
-{
- EventWin->mpSettingsDialog = 0;
- //wxForm::OnCancel();
-}
-
-bool tMeterChangeDlg::OnClose()
-{
- BarNr += EventWin->Song->GetIntroLength();
- EventWin->Song->SetMeterChange(BarNr, Numerator, Denomiator);
- EventWin->Redraw();
- EventWin->mpSettingsDialog = 0;
- //wxForm::OnOk();
- return false;
-}
-
-void tMeterChangeDlg::OnHelp()
-{
- gpHelpInstance->ShowTopic("Meterchange");
-}
-
-void tMeterChangeDlg::AddProperties()
-{
- // Add(wxMakeFormShort("BarNr:", &BarNr, wxFORM_DEFAULT, 0,0,0,100));
-// Add(wxMakeFormNewLine());
-// Add(wxMakeFormShort("Numerator", &Numerator, wxFORM_DEFAULT, 0,0,0,100));
-// Add(wxMakeFormNewLine());
-// Add(wxMakeFormShort("Denomiator", &Denomiator, wxFORM_DEFAULT, 0,0,0,100));
-// Add(wxMakeFormNewLine());
-// Add(wxMakeFormMessage("Supported Denomiators: 2,4,8,16,32"));
-// AssociatePanel(panel);
- sheet->AddProperty(new wxProperty(
- "BarNr",
- wxPropertyValue(&BarNr),
- "integer"));//JAVE validators here? problem is i dont know which ranges are valid FIXME
- sheet->AddProperty(new wxProperty(
- "Numerator",
- wxPropertyValue(&Numerator),
- "integer"));
- sheet->AddProperty(new wxProperty(
- "Denomiator(2,4,8,16,32)",
- wxPropertyValue(&Denomiator),
- "integer"));//JAVE should be a integer list instead FIXME
-}
-
-void JZEventFrame::MenMeterChange()
-{
- tMeterChangeDlg *dlg;
- if (mpSettingsDialog)
- {
- mpSettingsDialog->Show(TRUE);
- return;
- }
- // mpSettingsDialog = new wxDialogBox(this, "MeterChange", FALSE );
- dlg = new tMeterChangeDlg(this);
- dlg->Create();
-}
Modified: trunk/jazz/src/EventWindow.h
===================================================================
--- trunk/jazz/src/EventWindow.h 2009-01-22 02:24:58 UTC (rev 697)
+++ trunk/jazz/src/EventWindow.h 2009-02-16 05:03:58 UTC (rev 698)
@@ -28,6 +28,7 @@
class JZFilter;
class JZSnapSelection;
class JZSong;
+class wxDialog;
//*****************************************************************************
// Description:
@@ -55,8 +56,12 @@
void Shift(int Units);
-// void Quantize();
+ void Quantize();
+ void EditMeter();
+ bool IsEditingMeter() const;
+ void FinishMeterEdit();
+
void LineText(
wxDC& Dc,
int x,
@@ -120,6 +125,9 @@
int mScrolledX, mScrolledY;
+ // Settings-Dialog
+ wxDialog* mpSettingsDialog;
+
// DECLARE_EVENT_TABLE()
};
Modified: trunk/jazz/src/Makefile.am
===================================================================
--- trunk/jazz/src/Makefile.am 2009-01-22 02:24:58 UTC (rev 697)
+++ trunk/jazz/src/Makefile.am 2009-02-16 05:03:58 UTC (rev 698)
@@ -29,6 +29,7 @@
Dialogs/ShiftDialog.cpp \
Dialogs/SynthesizerSettingsDialog.cpp \
Dialogs/TrackDialog.cpp \
+Dialogs/VelocityDialog.cpp \
Dialogs.cpp \
DynamicArray.cpp \
ErrorMessage.cpp \
Modified: trunk/jazz/src/PianoFrame.cpp
===================================================================
--- trunk/jazz/src/PianoFrame.cpp 2009-01-22 02:24:58 UTC (rev 697)
+++ trunk/jazz/src/PianoFrame.cpp 2009-02-16 05:03:58 UTC (rev 698)
@@ -54,7 +54,6 @@
#define ACT_SETTINGS 5
#define MEN_FILTER 6
-#define MEN_METERCH 8
#define ACT_HELP_MOUSE 9
#define MEN_SETCHAN 14
@@ -186,16 +185,16 @@
EVT_MENU(MEN_CTRL_CHANNEL_AFTER, JZPianoFrame::CtrlChannelAftertouchEdit)
// FIXME PAT - We need to bring these back once Dave has figured out what
// he's doing with them in relation to the track window.
-// EVT_MENU(MEN_CLEANUP, JZPianoFrame::MenCleanup)
-// EVT_MENU(MEN_SEARCHREP, JZPianoFrame::MenSearchReplace)
-// EVT_MENU(MEN_TRANSP, JZPianoFrame::MenTranspose)
-// EVT_MENU(MEN_SETCHAN, JZPianoFrame::MenSetChannel)
+// EVT_MENU(MEN_CLEANUP, JZPianoFrame::OnCleanup)
+// EVT_MENU(MEN_SEARCHREP, JZPianoFrame::OnSearchReplace)
+// EVT_MENU(MEN_TRANSP, JZPianoFrame::OnTranspose)
+// EVT_MENU(MEN_SETCHAN, JZPianoFrame::OnSetChannel)
EVT_MENU(ID_VELOCITY, JZPianoFrame::OnActivateVelocityDialog)
-// EVT_MENU(MEN_LENGTH, JZPianoFrame::MenLength)
+// EVT_MENU(MEN_LENGTH, JZPianoFrame::OnLength)
EVT_MENU(MEN_MIDIDELAY, JZPianoFrame::OnActivateMidiDelayDialog)
EVT_MENU(MEN_SEQLENGTH, JZPianoFrame::OnActivateSequenceLengthDialog)
-// EVT_MENU(MEN_CONVERT_TO_MODULATION, JZPianoFrame::MenConvertToModulation)
+// EVT_MENU(MEN_CONVERT_TO_MODULATION, JZPianoFrame::OnnConvertToModulation)
EVT_MENU(ACT_SETTINGS, JZPianoFrame::OnActivateSettingsDialog)
EVT_MENU(MEN_FILTER, JZPianoFrame::OnFilter)
EVT_MENU(ID_SNAP, JZPianoFrame::OnSnapDlg)
@@ -346,12 +345,12 @@
edit_menu->Append(MEN_CLEANUP, "&Cleanup...");
edit_menu->Append(MEN_SEARCHREP, "&Search Replace...");
- wxMenu *setting_menu = new wxMenu("",wxMENU_TEAROFF);
- setting_menu->Append(MEN_FILTER, "&Filter...");
- setting_menu->Append(ACT_SETTINGS, "&Window...");
- setting_menu->Append(MEN_VISIBLE, "&Events...");
- setting_menu->Append(ID_SNAP, "&Snap...");
- setting_menu->Append(MEN_METERCH, "&Meterchange...");
+ wxMenu *setting_menu = new wxMenu("", wxMENU_TEAROFF);
+ setting_menu->Append(MEN_FILTER, "&Filter...");
+ setting_menu->Append(ACT_SETTINGS, "&Window...");
+ setting_menu->Append(MEN_VISIBLE, "&Events...");
+ setting_menu->Append(ID_SNAP, "&Snap...");
+ setting_menu->Append(ID_METER_CHANGE, "&Meter Change...");
wxMenu *misc_menu = new wxMenu("",wxMENU_TEAROFF);
misc_menu->Append(wxID_UNDO, "&Undo");
@@ -514,7 +513,7 @@
case MEN_VISIBLE: VisibleDialog(); break;
-case MEN_METERCH: MenMeterChange(); break;
+case ID_METER_CHANGE: OnMeterChange(); break;
*/
Modified: trunk/jazz/src/PianoWindow.cpp
===================================================================
--- trunk/jazz/src/PianoWindow.cpp 2009-01-22 02:24:58 UTC (rev 697)
+++ trunk/jazz/src/PianoWindow.cpp 2009-02-16 05:03:58 UTC (rev 698)
@@ -2017,12 +2017,12 @@
{
SnapSelStart(Event);
- if (mpSnapSel->IsSelected())
- {
+// if (mpSnapSel->IsSelected())
+// {
// Redraw the whole window instead (inefficient, we should rather
// invalidate a rect).
Refresh();
- }
+// }
mpSnapSel->Event(Event);
mpMouseAction = mpSnapSel;
}
Modified: trunk/jazz/src/Resources.h
===================================================================
--- trunk/jazz/src/Resources.h 2009-01-22 02:24:58 UTC (rev 697)
+++ trunk/jazz/src/Resources.h 2009-02-16 05:03:58 UTC (rev 698)
@@ -59,6 +59,8 @@
#define ID_METRONOME_TOGGLE wxID_HIGHEST + 42
#define ID_VELOCITY wxID_HIGHEST + 43
+#define ID_METER_CHANGE wxID_HIGHEST + 45
+
#define ID_PLAY wxID_HIGHEST + 50
#define ID_PLAY_LOOP wxID_HIGHEST + 51
#define ID_RECORD wxID_HIGHEST + 52
Modified: trunk/jazz/src/TrackFrame.cpp
===================================================================
--- trunk/jazz/src/TrackFrame.cpp 2009-01-22 02:24:58 UTC (rev 697)
+++ trunk/jazz/src/TrackFrame.cpp 2009-02-16 05:03:58 UTC (rev 698)
@@ -268,18 +268,18 @@
// Miscellaneous Menu is Stupid.
// Now it's a View Menu
misc_menu = new wxMenu;
- misc_menu->Append(MEN_TMERGE, "Mer&ge Tracks...");
- misc_menu->Append(MEN_TSPLIT, "&Split Tracks...");
- misc_menu->Append(MEN_METERCH, "&Meterchange...");
- misc_menu->Append(MEN_RESET, "&Reset Midi");
- misc_menu->Append(MEN_HARMONY, "&Harmony Browser...");
- misc_menu->Append(MEN_RHYTHM, "Random R&hythm...");
- misc_menu->Append(MEN_SHUFFLE, "Random Sh&uffle...");
- misc_menu->Append(MEN_GENMELDY, "Random Melod&y...");
- misc_menu->Append(MEN_ARPEGGIO, "Random Arpeggio...");
- misc_menu->Append(MEN_MAPPER, "Ma&pper...");
- misc_menu->Append(MEN_EVENTLIST, "Event &List...");
- misc_menu->Append(MEN_COPYRIGHT,"&Set Music Copyright...");
+ misc_menu->Append(MEN_TMERGE, "Mer&ge Tracks...");
+ misc_menu->Append(MEN_TSPLIT, "&Split Tracks...");
+ misc_menu->Append(ID_METER_CHANGE, "&Meter Change...");
+ misc_menu->Append(MEN_RESET, "&Reset Midi");
+ misc_menu->Append(MEN_HARMONY, "&Harmony Browser...");
+ misc_menu->Append(MEN_RHYTHM, "Random R&hythm...");
+ misc_menu->Append(MEN_SHUFFLE, "Random Sh&uffle...");
+ misc_menu->Append(MEN_GENMELDY, "Random Melod&y...");
+ misc_menu->Append(MEN_ARPEGGIO, "Random Arpeggio...");
+ misc_menu->Append(MEN_MAPPER, "Ma&pper...");
+ misc_menu->Append(MEN_EVENTLIST, "Event &List...");
+ misc_menu->Append(MEN_COPYRIGHT, "&Set Music Copyright...");
#endif
mpToolsMenu = new wxMenu;
Modified: trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj
===================================================================
--- trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj 2009-01-22 02:24:58 UTC (rev 697)
+++ trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj 2009-02-16 05:03:58 UTC (rev 698)
@@ -890,6 +890,14 @@
RelativePath="..\src\Dialogs\TrackDialog.h"
>
</File>
+ <File
+ RelativePath="..\src\Dialogs\VelocityDialog.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\Dialogs\VelocityDialog.h"
+ >
+ </File>
</Filter>
</Files>
<Globals>
Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
===================================================================
--- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2009-01-22 02:24:58 UTC (rev 697)
+++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2009-02-16 05:03:58 UTC (rev 698)
@@ -908,6 +908,14 @@
RelativePath="..\src\Dialogs\TrackDialog.h"
>
</File>
+ <File
+ RelativePath="..\src\Dialogs\VelocityDialog.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\Dialogs\VelocityDialog.h"
+ >
+ </File>
</Filter>
</Files>
<Globals>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
