Mercurial > hg > sonic-visualiser
comparison main/PreferencesDialog.h @ 913:3c88bf74959d cxx11
Merge from default branch
author | Chris Cannam |
---|---|
date | Tue, 03 Mar 2015 09:33:59 +0000 |
parents | fbd2534d17f8 |
children | a16456ca5e71 |
comparison
equal
deleted
inserted
replaced
903:6d3220e7ecef | 913:3c88bf74959d |
---|---|
55 void resampleQualityChanged(int quality); | 55 void resampleQualityChanged(int quality); |
56 void resampleOnLoadChanged(int state); | 56 void resampleOnLoadChanged(int state); |
57 void tempDirRootChanged(QString root); | 57 void tempDirRootChanged(QString root); |
58 void backgroundModeChanged(int mode); | 58 void backgroundModeChanged(int mode); |
59 void timeToTextModeChanged(int mode); | 59 void timeToTextModeChanged(int mode); |
60 void showHMSChanged(int state); | |
60 void octaveSystemChanged(int system); | 61 void octaveSystemChanged(int system); |
61 void viewFontSizeChanged(int sz); | 62 void viewFontSizeChanged(int sz); |
62 void showSplashChanged(int state); | 63 void showSplashChanged(int state); |
63 void defaultTemplateChanged(int); | 64 void defaultTemplateChanged(int); |
64 void localeChanged(int); | 65 void localeChanged(int); |
95 bool m_resampleOnLoad; | 96 bool m_resampleOnLoad; |
96 bool m_networkPermission; | 97 bool m_networkPermission; |
97 QString m_tempDirRoot; | 98 QString m_tempDirRoot; |
98 int m_backgroundMode; | 99 int m_backgroundMode; |
99 int m_timeToTextMode; | 100 int m_timeToTextMode; |
101 bool m_showHMS; | |
100 int m_octaveSystem; | 102 int m_octaveSystem; |
101 int m_viewFontSize; | 103 int m_viewFontSize; |
102 bool m_showSplash; | 104 bool m_showSplash; |
103 | 105 |
104 bool m_changesOnRestart; | 106 bool m_changesOnRestart; |