jazzplusplus-updates

SF.net SVN: jazzplusplus:[765] trunk/jazz/src/Dialogs.cpp

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

Revision: 765
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=765&view=rev
Author:   pstieber
Date:     2010-04-27 13:54:59 +0000 (Tue, 27 Apr 2010)

Log Message:
-----------
Removed the old channel event dialog.  This dialog added a channel (1-16) select control
to the event dialog.

Modified Paths:
--------------
    trunk/jazz/src/Dialogs.cpp

Modified: trunk/jazz/src/Dialogs.cpp
===================================================================
--- trunk/jazz/src/Dialogs.cpp	2010-04-27 03:39:37 UTC (rev 764)
+++ trunk/jazz/src/Dialogs.cpp	2010-04-27 13:54:59 UTC (rev 765)
@@ -313,42 +313,6 @@
   gpHelpInstance->ShowTopic("Piano Window");
 }
 
-// --------------------------- ChannelEvent ----------------------------
-
-
-class tChEventDlg : public tEventDlg
-{
-  public:
-
-    int Channel;
-
-    tChEventDlg(JZChannelEvent* pChannelEvent, JZPianoWindow* w, JZTrack *pTrack)
-      : tEventDlg(pChannelEvent, w, pTrack)
-    {
-      Channel = pChannelEvent->GetChannel() + 1;                // 1..16
-    }
-    void AddProperties();
-    bool OnClose();
-};
-
-void tChEventDlg::AddProperties()
-{
-  sheet->AddProperty(new wxProperty(
-    "Channel",
-    wxPropertyValue(&Channel),
-    "integer",
-    new wxIntegerListValidator(1, 16)));
-  tEventDlg::AddProperties();
-}
-
-
-bool tChEventDlg::OnClose()
-{
-  ((JZChannelEvent *)Copy)->SetChannel(Channel - 1);
-  tEventDlg::OnClose();
-  return false;
-}
-
 // -------------------------------- Play track ---------------------------
 
 class tPlayTrackDlg : public tEventDlg


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

SF.net SVN: jazzplusplus:[766] trunk/jazz/src/Dialogs.cpp

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

Revision: 766
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=766&view=rev
Author:   pstieber
Date:     2010-04-27 14:02:36 +0000 (Tue, 27 Apr 2010)

Log Message:
-----------
Commented out the play track dialog and the event dialog.

Modified Paths:
--------------
    trunk/jazz/src/Dialogs.cpp

Modified: trunk/jazz/src/Dialogs.cpp
===================================================================
--- trunk/jazz/src/Dialogs.cpp	2010-04-27 13:54:59 UTC (rev 765)
+++ trunk/jazz/src/Dialogs.cpp	2010-04-27 14:02:36 UTC (rev 766)
@@ -255,126 +255,122 @@
 
 
 //*****************************************************************************
-// Event-Dialogue
+// Event-Dialog
 //*****************************************************************************
+//class tEventDlg : public tPropertyListDlg
+//{
+//  public:
+//
+//    JZTrack    *Track;
+//    JZClockDialog ClockDlg;
+//    JZPianoWindow* Win;
+//
+//    JZEvent    *Event;
+//    JZEvent    *Copy;
+//
+//    tEventDlg(JZEvent *e, JZPianoWindow* w, JZTrack *pTrack);
+//    virtual void AddProperties();
+//    virtual bool OnClose();
+//    virtual void OnHelp();
+//    virtual void OnCancel();
+//};
 
-class tEventDlg : public tPropertyListDlg
-{
-  public:
+//tEventDlg::tEventDlg(JZEvent *e, JZPianoWindow* w, JZTrack *pTrack)
+//  : tPropertyListDlg( "Event" ),
+//    ClockDlg(w->GetProject(), "Time ", e->GetClock())
+//{
+//  Win   = w;
+//  Track = pTrack;
+//  Event = e;
+//  Copy  = e->Copy();
+//}
 
-    JZTrack    *Track;
-    JZClockDialog ClockDlg;
-    JZPianoWindow* Win;
+//void tEventDlg::AddProperties()
+//{
+//  sheet->AddProperty(ClockDlg.mkProperty());
+//}
 
-    JZEvent    *Event;
-    JZEvent    *Copy;
+//void tEventDlg::OnCancel()
+//{
+//  delete Copy;
+//  //tPropertyListDlg::OnCancel();
+//}
 
-    tEventDlg(JZEvent *e, JZPianoWindow* w, JZTrack *pTrack);
-    virtual void AddProperties();
-    virtual bool OnClose();
-    virtual void OnHelp();
-    virtual void OnCancel();
-};
+//bool tEventDlg::OnClose()
+//{
+//  Copy->SetClock(ClockDlg.GetClock());
+//  Track->Kill(Event);
+//  Track->Put(Copy);
+//  Track->Cleanup();
+//  Win->Refresh();
+//  return tPropertyListDlg::OnClose();
+//}
 
+//void tEventDlg::OnHelp()
+//{
+//  gpHelpInstance->ShowTopic("Piano Window");
+//}
 
-tEventDlg::tEventDlg(JZEvent *e, JZPianoWindow* w, JZTrack *pTrack)
-  : tPropertyListDlg( "Event" ),
-    ClockDlg(w->GetProject(), "Time ", e->GetClock())
-{
-  Win   = w;
-  Track = pTrack;
-  Event = e;
-  Copy  = e->Copy();
-}
-
-void tEventDlg::AddProperties()
-{
-  sheet->AddProperty(ClockDlg.mkProperty());
-}
-
-void tEventDlg::OnCancel()
-{
-  delete Copy;
-  //tPropertyListDlg::OnCancel();
-}
-
-bool tEventDlg::OnClose()
-{
-  Copy->SetClock(ClockDlg.GetClock());
-  Track->Kill(Event);
-  Track->Put(Copy);
-  Track->Cleanup();
-  Win->Refresh();
-  return tPropertyListDlg::OnClose();
-}
-
-void tEventDlg::OnHelp()
-{
-  gpHelpInstance->ShowTopic("Piano Window");
-}
-
 // -------------------------------- Play track ---------------------------
 
-class tPlayTrackDlg : public tEventDlg
-{
- public:
+//class tPlayTrackDlg : public tEventDlg
+//{
+// public:
+//
+//  int transpose;
+//  int track;
+//  int eventlength;
+//
+//  tNamedChoice Choice;
+//
+//  tPlayTrackDlg(JZPlayTrackEvent *e, JZPianoWindow* w, JZTrack *pTrack);
+//
+//  void AddProperties();
+//  bool OnClose();
+//};
 
-  int transpose;
-  int track;
-  int eventlength;
+//tPlayTrackDlg::tPlayTrackDlg(JZPlayTrackEvent *e, JZPianoWindow* w, JZTrack *pTrack)
+//  : tEventDlg(e, w, pTrack),
+//    Choice("playtrack", gpConfig->GetControlNames(), &track)
+//{
+//  Event = e;
+//  track = e->track;
+//  transpose=e->transpose;
+//  eventlength=e->eventlength;
+//}
 
-  tNamedChoice Choice;
+//bool tPlayTrackDlg::OnClose()
+//{
+//  JZPlayTrackEvent* p=(JZPlayTrackEvent*)Copy;
+//
+//  Choice.GetValue();
+//  p->track = track;
+//  p->transpose = transpose;
+//  p->eventlength = eventlength;
+//  return tEventDlg::OnClose();
+//}
 
-  tPlayTrackDlg(JZPlayTrackEvent *e, JZPianoWindow* w, JZTrack *pTrack);
+//void tPlayTrackDlg::AddProperties()
+//{
+//  sheet->AddProperty(new wxProperty(
+//    "Track",
+//    wxPropertyValue(&track),
+//    "integer",
+//    new wxIntegerListValidator(0, 127)));
+//  sheet->AddProperty(new wxProperty(
+//    "Transpose",
+//    wxPropertyValue(&transpose),
+//    "integer",
+//    new wxIntegerListValidator(-127, 127)));
+//  sheet->AddProperty(new wxProperty(
+//    "Length",
+//    wxPropertyValue(&eventlength),
+//    "integer",
+//    new wxIntegerListValidator(0, 127)));
+//  tEventDlg::AddProperties();
+//}
 
-  void AddProperties();
-  bool OnClose();
-};
 
-
-tPlayTrackDlg::tPlayTrackDlg(JZPlayTrackEvent *e, JZPianoWindow* w, JZTrack *pTrack)
-  : tEventDlg(e, w, pTrack),
-    Choice("playtrack", gpConfig->GetControlNames(), &track)
-{
-  Event = e;
-  track = e->track;
-  transpose=e->transpose;
-  eventlength=e->eventlength;
-}
-
-
-bool tPlayTrackDlg::OnClose()
-{
-  JZPlayTrackEvent* p=(JZPlayTrackEvent*)Copy;
-
-  Choice.GetValue();
-  p->track = track;
-  p->transpose = transpose;
-  p->eventlength = eventlength;
-  return tEventDlg::OnClose();
-}
-
-void tPlayTrackDlg::AddProperties()
-{
-  sheet->AddProperty(new wxProperty(
-    "Track",
-    wxPropertyValue(&track),
-    "integer",
-    new wxIntegerListValidator(0, 127)));
-  sheet->AddProperty(new wxProperty(
-    "Transpose",
-    wxPropertyValue(&transpose),
-    "integer",
-    new wxIntegerListValidator(-127, 127)));
-  sheet->AddProperty(new wxProperty(
-    "Length",
-    wxPropertyValue(&eventlength),
-    "integer",
-    new wxIntegerListValidator(0, 127)));
-  tEventDlg::AddProperties();
-}
-
-
 //*****************************************************************************
 // Description:
 //   Display a dialog box to select an event to be created.
@@ -471,8 +467,8 @@
     return;
   }
 
-  tEventDlg* pDialog = 0;
-  const char* str = 0;
+//  tEventDlg* pDialog = 0;
+//  const char* str = 0;
   switch (pEvent->GetStat())
   {
     case StatKeyOn:
@@ -539,8 +535,8 @@
       break;
 
     case StatPlayTrack:
-      str = "Play Track";
-      pDialog = new tPlayTrackDlg(pEvent->IsPlayTrack(), pPianoWindow, pTrack);
+//      str = "Play Track";
+//      pDialog = new tPlayTrackDlg(pEvent->IsPlayTrack(), pPianoWindow, pTrack);
       break;
 
     case StatEndOfTrack:
@@ -564,8 +560,8 @@
       break;
   }
 
-  if (pDialog)
-  {
-    pDialog->Create();
-  }
+//  if (pDialog)
+//  {
+//    pDialog->Create();
+//  }
 }


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

SF.net SVN: jazzplusplus:[767] trunk/jazz/src/Dialogs.cpp

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

Revision: 767
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=767&view=rev
Author:   pstieber
Date:     2010-04-27 14:07:18 +0000 (Tue, 27 Apr 2010)

Log Message:
-----------
Used #if 0 to removed the sequence length and MIDI delay dialogs.
This allowed the removal of the DeprecatedWx/proplist.h include file :-)

Modified Paths:
--------------
    trunk/jazz/src/Dialogs.cpp

Modified: trunk/jazz/src/Dialogs.cpp
===================================================================
--- trunk/jazz/src/Dialogs.cpp	2010-04-27 14:02:36 UTC (rev 766)
+++ trunk/jazz/src/Dialogs.cpp	2010-04-27 14:07:18 UTC (rev 767)
@@ -24,7 +24,9 @@
 
 #include "ClockDialog.h"
 #include "Command.h"
+#if 0
 #include "DeprecatedWx/proplist.h"
+#endif
 #include "Dialogs/ControllerDialog.h"
 #include "Dialogs/EndOfTrackDialog.h"
 #include "Dialogs/KeyOnDialog.h"
@@ -149,6 +151,7 @@
 
 
 
+#if 0
 //*****************************************************************************
 // seqLength
 //*****************************************************************************
@@ -251,9 +254,9 @@
 
   //System 3:
 }
+#endif
 
 
-
 //*****************************************************************************
 // Event-Dialog
 //*****************************************************************************


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

SF.net SVN: jazzplusplus:[849] trunk/jazz/src/Dialogs.cpp

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

Revision: 849
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=849&view=rev
Author:   pstieber
Date:     2011-07-28 14:43:42 +0000 (Thu, 28 Jul 2011)

Log Message:
-----------
Removed an include of ClockDialog.h.

Modified Paths:
--------------
    trunk/jazz/src/Dialogs.cpp

Modified: trunk/jazz/src/Dialogs.cpp
===================================================================
--- trunk/jazz/src/Dialogs.cpp	2011-07-28 13:27:25 UTC (rev 848)
+++ trunk/jazz/src/Dialogs.cpp	2011-07-28 14:43:42 UTC (rev 849)
@@ -22,7 +22,6 @@
 
 #include "Dialogs.h"
 
-#include "ClockDialog.h"
 #include "Command.h"
 #if 0
 #include "DeprecatedWx/proplist.h"


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