comparison src/MainWindow.h @ 187:dedd09297a3e

Fix #884 (erroneously allows you to change candidate even when candidates not visible) and remaining part of #874 (show pitch candidates only on request). Also reorder menu items a little
author Chris Cannam
date Tue, 04 Mar 2014 14:10:37 +0000
parents ea15fa75ae6f
children 431a95c9d14d
comparison
equal deleted inserted replaced
186:01139b1cb98d 187:dedd09297a3e
28 public: 28 public:
29 MainWindow(bool withAudioOutput = true, 29 MainWindow(bool withAudioOutput = true,
30 bool withOSCSupport = true); 30 bool withOSCSupport = true);
31 virtual ~MainWindow(); 31 virtual ~MainWindow();
32 32
33 signals:
34 virtual void canChangePitchCandidate(bool);
35
33 public slots: 36 public slots:
34 virtual bool commitData(bool mayAskUser); // on session shutdown 37 virtual bool commitData(bool mayAskUser); // on session shutdown
35 38
36 protected slots: 39 protected slots:
37 virtual void openFile(); 40 virtual void openFile();
173 176
174 QAction *m_deleteSelectedAction; 177 QAction *m_deleteSelectedAction;
175 QAction *m_ffwdAction; 178 QAction *m_ffwdAction;
176 QAction *m_rwdAction; 179 QAction *m_rwdAction;
177 QAction *m_editSelectAction; 180 QAction *m_editSelectAction;
181 QAction *m_showCandidatesAction;
178 QAction *m_toggleIntelligenceAction; 182 QAction *m_toggleIntelligenceAction;
179 bool m_intelligentActionOn; // GF: !!! temporary 183 bool m_intelligentActionOn; // GF: !!! temporary
180 184
181 QAction *m_showAudio; 185 QAction *m_showAudio;
182 QAction *m_showSpect; 186 QAction *m_showSpect;