comparison main/PreferencesDialog.h @ 1007:8d45d6412ca6 3.0-integration

Merge from branch osx-retina
author Chris Cannam
date Fri, 26 Jun 2015 14:18:18 +0100
parents c9d87032f3da
children 11ef2f95ea15
comparison
equal deleted inserted replaced
1006:c96b848edef7 1007:8d45d6412ca6
62 void viewFontSizeChanged(int sz); 62 void viewFontSizeChanged(int sz);
63 void showSplashChanged(int state); 63 void showSplashChanged(int state);
64 void defaultTemplateChanged(int); 64 void defaultTemplateChanged(int);
65 void localeChanged(int); 65 void localeChanged(int);
66 void networkPermissionChanged(int state); 66 void networkPermissionChanged(int state);
67 void retinaChanged(int state);
67 68
68 void tempDirButtonClicked(); 69 void tempDirButtonClicked();
69 70
70 void okClicked(); 71 void okClicked();
71 void applyClicked(); 72 void applyClicked();
93 double m_tuningFrequency; 94 double m_tuningFrequency;
94 int m_audioDevice; 95 int m_audioDevice;
95 int m_resampleQuality; 96 int m_resampleQuality;
96 bool m_resampleOnLoad; 97 bool m_resampleOnLoad;
97 bool m_networkPermission; 98 bool m_networkPermission;
99 bool m_retina;
98 QString m_tempDirRoot; 100 QString m_tempDirRoot;
99 int m_backgroundMode; 101 int m_backgroundMode;
100 int m_timeToTextMode; 102 int m_timeToTextMode;
101 bool m_showHMS; 103 bool m_showHMS;
102 int m_octaveSystem; 104 int m_octaveSystem;