SF.net SVN: jazzplusplus: [473] trunk/jazz

[<pst...@us...>]

Revision: 473
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=473&view=rev
Author:   pstieber
Date:     2008-04-21 06:49:25 -0700 (Mon, 21 Apr 2008)

Log Message:
-----------
Added the track dialog to the build.  This is a WIP.

Modified Paths:
--------------
    trunk/jazz/src/Makefile.am
    trunk/jazz/src/Track.cpp
    trunk/jazz/src/TrackWindow.cpp
    trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj
    trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj

Modified: trunk/jazz/src/Makefile.am
===================================================================
--- trunk/jazz/src/Makefile.am	2008-04-21 05:29:47 UTC (rev 472)
+++ trunk/jazz/src/Makefile.am	2008-04-21 13:49:25 UTC (rev 473)
@@ -21,6 +21,7 @@
 Dialogs/KeyOnDialog.cpp \
 Dialogs/MetronomeSettingsDialog.cpp \
 Dialogs/SynthesizerSettingsDialog.cpp \
+Dialogs/TrackDialog.cpp \
 Dialogs.cpp \
 DynamicArray.cpp \
 ErrorMessage.cpp \
@@ -99,6 +100,7 @@
 Dialogs/KeyOnDialog.h \
 Dialogs/MetronomeSettingsDialog.h \
 Dialogs/SynthesizerSettingsDialog.h \
+Dialogs/TrackDialog.h \
 Dialogs.h \
 DynamicArray.h \
 ErrorMessage.h \

Modified: trunk/jazz/src/Track.cpp
===================================================================
--- trunk/jazz/src/Track.cpp	2008-04-21 05:29:47 UTC (rev 472)
+++ trunk/jazz/src/Track.cpp	2008-04-21 13:49:25 UTC (rev 473)
@@ -27,10 +27,10 @@
 #include "Configuration.h"
 #include "Player.h"
 #include "JazzPlusPlusApplication.h"
-//#include "eventwin.h"
 #include "TrackWindow.h"
 #include "Globals.h"
 #include "Song.h"
+#include "Dialogs/TrackDialog.h"
 
 #include <cstdlib>
 #include <assert.h>
@@ -1902,26 +1902,17 @@
 
 #endif // OBSOLETE
 
-void JZTrack::Dialog(JZTrackWindow *parent)
+void JZTrack::Dialog(JZTrackWindow* pParent)
 {
+  JZTrackDialog TrackDialog(*this, pParent);
+  TrackDialog.ShowModal();
 #ifdef OBSOLETE
-
-  tTrackDlg *dlg;
-  if (DialogBox)
-  {
-    DialogBox->Show(true);
-    return;
-  }
-#ifdef __WXMSW__
-  bool modal = true;  // keep button down
-#else
-  bool modal = false;
-#endif
-  DialogBox = new wxDialogBox(parent, "Track Settings", modal, Config(C_TrackDlgXpos), Config(C_TrackDlgYpos));
-  dlg = new tTrackDlg((JZTrackWindow*) parent, this);
-  dlg->EditForm(DialogBox);
-  DialogBox->Fit();
-  DialogBox->Show(TRUE);
+  DialogBox = new wxDialogBox(
+    pParent,
+    "Track Settings",
+    modal,
+    Config(C_TrackDlgXpos),
+    Config(C_TrackDlgYpos));
 #endif // OBSOLETE
 }
 

Modified: trunk/jazz/src/TrackWindow.cpp
===================================================================
--- trunk/jazz/src/TrackWindow.cpp	2008-04-21 05:29:47 UTC (rev 472)
+++ trunk/jazz/src/TrackWindow.cpp	2008-04-21 13:49:25 UTC (rev 473)
@@ -342,7 +342,19 @@
   {
     ToggleTrackState(Point);
   }
+  // Check to see if the mouse was clicked inside of a track name.
   else if (
+    Point.x >= mTrackNameX &&
+    Point.x < mTrackNameX + mTrackNameWidth)
+  {
+    // Edit the track settings.
+    JZTrack* pTrack = y2Track(Point.y);
+    if (pTrack)
+    {
+      pTrack->Dialog(this);
+    }
+  }
+  else if (
     Point.x >= mEventsX && Point.x < mEventsX + mEventsWidth &&
     Point.y >= mEventsY && Point.y < mEventsY + mEventsHeight)
   {

Modified: trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj
===================================================================
--- trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj	2008-04-21 05:29:47 UTC (rev 472)
+++ trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj	2008-04-21 13:49:25 UTC (rev 473)
@@ -853,6 +853,14 @@
 				RelativePath="..\src\Dialogs\SynthesizerSettingsDialog.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\Dialogs\TrackDialog.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\Dialogs\TrackDialog.h"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>

Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
===================================================================
--- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj	2008-04-21 05:29:47 UTC (rev 472)
+++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj	2008-04-21 13:49:25 UTC (rev 473)
@@ -852,6 +852,14 @@
 				RelativePath="..\src\Dialogs\SynthesizerSettingsDialog.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\Dialogs\TrackDialog.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\Dialogs\TrackDialog.h"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>


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