Thread: SF.net SVN: jazzplusplus: [442] trunk/jazz/src (Page 3)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 442
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=442&view=rev
Author:   pstieber
Date:     2008-04-08 07:03:32 -0700 (Tue, 08 Apr 2008)

Log Message:
-----------
Added more menu update handlers.  I don't have this quite right, but it's close.

Modified Paths:
--------------
    trunk/jazz/src/Harmony.cpp
    trunk/jazz/src/Harmony.h

Modified: trunk/jazz/src/Harmony.cpp
===================================================================

--- trunk/jazz/src/Harmony.cpp	2008-04-08 04:34:59 UTC (rev 441)
+++ trunk/jazz/src/Harmony.cpp	2008-04-08 14:03:32 UTC (rev 442)
@@ -487,6 +487,17 @@
 
     virtual ~HBCanvas();
 
+    bool GetMark4Common() const;
+    bool GetMark3Common() const;
+    bool GetMark2Common() const;
+    bool GetMark1Common() const;
+    bool GetMarkBCommon() const;
+    bool GetMark0Common() const;
+    bool GetMark1Semi() const;
+    bool GetMark251() const;
+    bool GetMarkTritone() const;
+    bool GetMarkPiano() const;
+
     virtual void OnDraw(wxDC& Dc);
 
     void DrawMarkers(wxDC& Dc, const HBContext& Context);
@@ -601,9 +612,69 @@
 inline
 bool HBCanvas::IsUsingHaunschildLayout() const
 {
-   return mHaunschildLayout;
+  return mHaunschildLayout;
 }
 
+inline
+bool HBCanvas::GetMark4Common() const
+{
+  return mMark4Common;
+}
+
+inline
+bool HBCanvas::GetMark3Common() const
+{
+  return mMark3Common;
+}
+
+inline
+bool HBCanvas::GetMark2Common() const
+{
+  return mMark2Common;
+}
+
+inline
+bool HBCanvas::GetMark1Common() const
+{
+  return mMark1Common;
+}
+
+inline
+bool HBCanvas::GetMarkBCommon() const
+{
+  return mMarkBCommon;
+}
+
+inline
+bool HBCanvas::GetMark0Common() const
+{
+  return mMark0Common;
+}
+
+inline
+bool HBCanvas::GetMark1Semi() const
+{
+  return mMark1Semi;
+}
+
+inline
+bool HBCanvas::GetMark251() const
+{
+  return mMark251;
+}
+
+inline
+bool HBCanvas::GetMarkTritone() const
+{
+  return mMarkTritone;
+}
+
+inline
+bool HBCanvas::GetMarkPiano() const
+{
+  return mMarkPiano;
+}
+
 //*****************************************************************************
 // Description:
 //   This is the harmony browser match markers class definition.
@@ -1866,11 +1937,21 @@
   EVT_UPDATE_UI(MEN_IONSCALE, HBFrame::OnUpdateIonicScale)
   EVT_MENU(MEN_IONSCALE, HBFrame::OnToolBarSelect)
 
+  EVT_UPDATE_UI(MEN_EQ4, HBFrame::OnUpdateFourEqualNotes)
   EVT_MENU(MEN_EQ4, HBFrame::OnToolBarSelect)
+
+  EVT_UPDATE_UI(MEN_EQ3, HBFrame::OnUpdateThreeEqualNotes)
   EVT_MENU(MEN_EQ3, HBFrame::OnToolBarSelect)
+
+  EVT_UPDATE_UI(MEN_EQ2, HBFrame::OnUpdateTwoEqualNotes)
   EVT_MENU(MEN_EQ2, HBFrame::OnToolBarSelect)
+
+  EVT_UPDATE_UI(MEN_EQ1, HBFrame::OnUpdateOneEqualNotes)
   EVT_MENU(MEN_EQ1, HBFrame::OnToolBarSelect)
+
+  EVT_UPDATE_UI(MEN_EQ1, HBFrame::OnUpdateZeroEqualNotes)
   EVT_MENU(MEN_EQ0, HBFrame::OnToolBarSelect)
+
   EVT_MENU(MEN_EQH, HBFrame::OnToolBarSelect)
   EVT_MENU(MEN_251, HBFrame::OnToolBarSelect)
   EVT_MENU(MEN_EQB, HBFrame::OnToolBarSelect)
@@ -1933,22 +2014,76 @@
     true);
 
   wxMenu* pScaleMenu = new wxMenu;
-  pScaleMenu->Append(MEN_MAJSCALE, "&Major", "Use Major Scales", true);
-  pScaleMenu->Append(MEN_HARSCALE, "&Harmonic Minor", "Use Harmonic Minor Scales", true);
-  pScaleMenu->Append(MEN_MELSCALE, "&Melodic Minor", "Use Melodic Minor Scales", true);
-  pScaleMenu->Append(MEN_IONSCALE, "&Ionic", "Use Ionic Scales", true);
+  pScaleMenu->Append(
+    MEN_MAJSCALE,
+    "&Major",
+    "Use Major Scales",
+    true);
+  pScaleMenu->Append(
+    MEN_HARSCALE,
+    "&Harmonic Minor",
+    "Use Harmonic Minor Scales",
+    true);
+  pScaleMenu->Append(
+    MEN_MELSCALE,
+    "&Melodic Minor",
+    "Use Melodic Minor Scales",
+    true);
+  pScaleMenu->Append(
+    MEN_IONSCALE,
+    "&Ionic",
+    "Use Ionic Scales",
+    true);
 
   wxMenu* pShowMenu = new wxMenu;
-  pShowMenu->Append(MEN_EQ4, "&4 equal notes");
-  pShowMenu->Append(MEN_EQ3, "&3 equal notes");
-  pShowMenu->Append(MEN_EQ2, "&2 equal notes");
-  pShowMenu->Append(MEN_EQ1, "&1 equal note");
-  pShowMenu->Append(MEN_EQ0, "&0 equal notes");
-  pShowMenu->Append(MEN_EQH, "1/2 note &difference");
-  pShowMenu->Append(MEN_251, "2-5-1 &move");
-  pShowMenu->Append(MEN_EQB, "&Same bass note");
-  pShowMenu->Append(MEN_TRITONE, "&Tritone substitute");
-  pShowMenu->Append(MEN_PIANO, "Contains &Pianowin Buffer");
+  pShowMenu->Append(
+    MEN_EQ4,
+    "&4 equal notes",
+    "Display Chords with 4 common notes",
+    true);
+  pShowMenu->Append(
+    MEN_EQ3,
+    "&3 equal notes",
+    "Display Chords with 3 common notes",
+    true);
+  pShowMenu->Append(
+    MEN_EQ2,
+    "&2 equal notes",
+    "Display Chords with 2 common notes",
+    true);
+  pShowMenu->Append(
+    MEN_EQ1,
+    "&1 equal note",
+    "Display Chords with 1 common notes",
+    true);
+  pShowMenu->Append(
+    MEN_EQ0,
+    "&0 equal notes",
+    "Display Chords with no common notes",
+    true);
+  pShowMenu->Append(
+    MEN_EQH,
+    "1/2 note &difference",
+    "Display Chords with a 1/2 note difference",
+    true);
+  pShowMenu->Append(
+    MEN_251,
+    "2-5-1 &move",
+    "Display Chords with a 2-5-1 move",
+    true);
+  pShowMenu->Append(
+    MEN_EQB,
+    "&Same bass note",
+    "Display Chords with the same bass note",
+    true);
+  pShowMenu->Append(
+    MEN_TRITONE,
+    "&Tritone substitute",
+    "Display Chords with that are tritone substitutes",
+    true);
+  pShowMenu->Append(
+    MEN_PIANO,
+    "Contains &Pianowin Buffer");
 
   wxMenu* pActionMenu = new wxMenu;
   pActionMenu->Append(MEN_TRANSPOSE, "&Transpose");
@@ -2077,6 +2212,41 @@
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
+void HBFrame::OnUpdateFourEqualNotes(wxUpdateUIEvent& Event)
+{
+  Event.Check(mpHbWindow->GetMark4Common());
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void HBFrame::OnUpdateThreeEqualNotes(wxUpdateUIEvent& Event)
+{
+  Event.Check(mpHbWindow->GetMark3Common());
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void HBFrame::OnUpdateTwoEqualNotes(wxUpdateUIEvent& Event)
+{
+  Event.Check(mpHbWindow->GetMark2Common());
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void HBFrame::OnUpdateOneEqualNotes(wxUpdateUIEvent& Event)
+{
+  Event.Check(mpHbWindow->GetMark1Common());
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void HBFrame::OnUpdateZeroEqualNotes(wxUpdateUIEvent& Event)
+{
+  Event.Check(mpHbWindow->GetMark0Common());
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 void HBFrame::OnToolBarSelect(wxCommandEvent& Event)
 {
   mpHbWindow->MenuCommand(

Modified: trunk/jazz/src/Harmony.h
===================================================================
--- trunk/jazz/src/Harmony.h	2008-04-08 04:34:59 UTC (rev 441)
+++ trunk/jazz/src/Harmony.h	2008-04-08 14:03:32 UTC (rev 442)
@@ -91,6 +91,12 @@
     void OnUpdateMelodicMinorScale(wxUpdateUIEvent& Event);
     void OnUpdateIonicScale(wxUpdateUIEvent& Event);
 
+    void OnUpdateFourEqualNotes(wxUpdateUIEvent& Event);
+    void OnUpdateThreeEqualNotes(wxUpdateUIEvent& Event);
+    void OnUpdateTwoEqualNotes(wxUpdateUIEvent& Event);
+    void OnUpdateOneEqualNotes(wxUpdateUIEvent& Event);
+    void OnUpdateZeroEqualNotes(wxUpdateUIEvent& Event);
+
     void OnToolBarSelect(wxCommandEvent& Event);
 
     void OnFileLoad(wxCommandEvent& Event);


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




Thread: SF.net SVN: jazzplusplus: [442] trunk/jazz/src (Page 3)

jazzplusplus-updates