diff main/PreferencesDialog.h @ 245:fc542303eda2 1.2-stable

* merge from trunk (1.2 ended up being tracked from trunk, but we may want this branch for fixes later)
author Chris Cannam
date Wed, 27 Feb 2008 10:32:45 +0000
parents 98ba77e0d897
children
line wrap: on
line diff
--- a/main/PreferencesDialog.h	Fri Nov 30 17:36:14 2007 +0000
+++ b/main/PreferencesDialog.h	Wed Feb 27 10:32:45 2008 +0000
@@ -44,6 +44,8 @@
     void resampleOnLoadChanged(int state);
     void tempDirRootChanged(QString root);
     void backgroundModeChanged(int mode);
+    void viewFontSizeChanged(int sz);
+    void showSplashChanged(int state);
 
     void tempDirButtonClicked();
 
@@ -65,6 +67,8 @@
     bool m_resampleOnLoad;
     QString m_tempDirRoot;
     int m_backgroundMode;
+    int m_viewFontSize;
+    bool m_showSplash;
 
     bool m_changesOnRestart;
 };