Mercurial > hg > tony
comparison src/MainWindow.h @ 70:5310637392f6
Revert to using three separate tool modes (more like SV). This is less like the proposed design for Tony but better than the previous situation with two incomprehensible toggle buttons.
author | Chris Cannam |
---|---|
date | Tue, 26 Nov 2013 16:59:31 +0000 |
parents | f4ee3c11eba9 |
children | 081202998535 |
comparison
equal
deleted
inserted
replaced
69:045360070b66 | 70:5310637392f6 |
---|---|
41 virtual void exportLayer(); | 41 virtual void exportLayer(); |
42 virtual void newSession(); | 42 virtual void newSession(); |
43 virtual void closeSession(); | 43 virtual void closeSession(); |
44 | 44 |
45 virtual void renameCurrentLayer(); | 45 virtual void renameCurrentLayer(); |
46 | |
47 virtual void toolNavigateSelected(); | |
48 virtual void toolEditSelected(); | |
49 virtual void toolFreeEditSelected(); | |
46 | 50 |
47 virtual void paneAdded(Pane *); | 51 virtual void paneAdded(Pane *); |
48 virtual void paneHidden(Pane *); | 52 virtual void paneHidden(Pane *); |
49 virtual void paneAboutToBeDeleted(Pane *); | 53 virtual void paneAboutToBeDeleted(Pane *); |
50 | 54 |
96 virtual void website(); | 100 virtual void website(); |
97 virtual void help(); | 101 virtual void help(); |
98 virtual void about(); | 102 virtual void about(); |
99 virtual void keyReference(); | 103 virtual void keyReference(); |
100 | 104 |
101 // GF: function for switching to NoteEditMode (perhaps temporary, as we may want this to be triggered in some other way...) | |
102 virtual void selectNoteEditMode(); | |
103 virtual void toggleNoteEditIntelligence(); | |
104 | |
105 | |
106 protected: | 105 protected: |
107 Analyser *m_analyser; | 106 Analyser *m_analyser; |
108 | 107 |
109 Overview *m_overview; | 108 Overview *m_overview; |
110 Fader *m_fader; | 109 Fader *m_fader; |
124 QAction *m_rwdAction; | 123 QAction *m_rwdAction; |
125 QAction *m_editSelectAction; | 124 QAction *m_editSelectAction; |
126 QAction *m_toggleIntelligenceAction; | 125 QAction *m_toggleIntelligenceAction; |
127 bool m_intelligentActionOn; // GF: !!! temporary | 126 bool m_intelligentActionOn; // GF: !!! temporary |
128 | 127 |
129 | |
130 KeyReference *m_keyReference; | 128 KeyReference *m_keyReference; |
131 | 129 |
132 virtual void setupMenus(); | 130 virtual void setupMenus(); |
133 virtual void setupFileMenu(); | 131 virtual void setupFileMenu(); |
134 virtual void setupEditMenu(); | 132 virtual void setupEditMenu(); |