Moved all routing popup menu stuff from app, astrip, mstrip, mtrackinfo into new class RoutePopupMenu,

 *massively* cleaning up those 4 files. Used new Route QVariant type as action data instead of integers. 
Moved MenuTitleItem definitions from astrip.cpp into it's own menutitleitem.cpp 
Added to settings: "Make popup menus stay open. Otherwise hold Ctrl." 

1 files changed, 4 insertions, 23 deletions

diff --git a/muse2/muse/app.h b/muse2/muse/app.h
index c194b603..256154e2 100644
--- a/muse2/muse/app.h
+++ b/muse2/muse/app.h
@@ -36,8 +36,7 @@ class Transport;
 class BigTime;
 class Arranger;
 class Instrument;
-class PopupMenu;
-class PopupView;
+class RoutePopupMenu;
 class Track;
 class PrinterConfig;
 class MidiSyncConfig;
@@ -69,8 +68,6 @@ class ScoreEdit;
 
 #define MENU_ADD_SYNTH_ID_BASE 0x1000
 
-
-
 //---------------------------------------------------------
 //   MusE
 //---------------------------------------------------------
@@ -164,10 +161,8 @@ class MusE : public QMainWindow
       QMenu* menu_functions, *menuScriptPlugins;
       QMenu* select, *master, *midiEdit, *addTrack;
 
-      // Special 'stay-open' menu for routes.
-      PopupMenu* routingPopupMenu; 
-      //PopupView* routingPopupView; 
-
+      // Special common menu for routes. Used (so far) by audio and midi strip, and midi trackinfo.
+      RoutePopupMenu* routingPopupMenu; 
 
       QMenu* follow;
       QMenu* midiInputPlugins;
@@ -337,7 +332,6 @@ class MusE : public QMainWindow
    private:
       void adjustGlobalLists(int startPos, int diff);
 
-     
    public slots:
       bool saveAs();
       void bounceToFile(AudioOutput* ao = 0);
@@ -358,8 +352,6 @@ class MusE : public QMainWindow
       void setUsedTool(int);
       void showDidYouKnowDialog();
       void startEditInstrument();
-      
-      void routingPopupMenuAboutToHide();
       void configMidiPorts();
 
    public:
@@ -371,7 +363,6 @@ class MusE : public QMainWindow
       bool importMidi(const QString name, bool merge);
       void kbAccel(int);
       void changeConfig(bool writeFlag);
-
       void seqStop();
       bool seqStart();
       void setHeartBeat();
@@ -384,18 +375,8 @@ class MusE : public QMainWindow
       QWidget* bigtimeWindow();
       bool importWaveToTrack(QString& name, unsigned tick=0, Track* track=NULL);
       void importPartToTrack(QString& filename, unsigned tick, Track* track);
-
       void showTransport(bool flag);
-
-      // Special 'stay-open' menu for routes.
-      PopupMenu* getRoutingPopupMenu();
-      PopupMenu* prepareRoutingPopupMenu(Track* /*track*/, bool /*dst*/);
-      void routingPopupMenuActivated(Track* /*track*/, int /*id*/);
-      void updateRouteMenus(Track* /*track*/, QObject* /*master*/);
-      // Testing...
-      //PopupView* getRoutingPopupView();
-      //PopupView* prepareRoutingPopupView(Track* /*track*/, bool /*dst*/);
-      //void routingPopupViewActivated(Track* /*track*/, int /*id*/);
+      RoutePopupMenu* getRoutingPopupMenu();
       
 #ifdef HAVE_LASH
       void lash_idle_cb ();