diff base/Preferences.h @ 383:94fc0591ea43 1.2-stable

* merge from trunk (1.2 ended up being tracked from trunk, but we may want
  this branch for fixes later)

--- a/base/Preferences.h	Fri Nov 30 17:36:14 2007 +0000
+++ b/base/Preferences.h	Wed Feb 27 10:32:45 2008 +0000
@@ -54,6 +54,8 @@
     };
     PropertyBoxLayout getPropertyBoxLayout() const { return m_propertyBoxLayout; }
 
+    int getViewFontSize() const { return m_viewFontSize; }
+
     bool getOmitTempsFromRecentFiles() const { return m_omitRecentTemps; }
 
     QString getTemporaryDirectoryRoot() const { return m_tempDirRoot; }
@@ -67,6 +69,8 @@
     };
     BackgroundMode getBackgroundMode() const { return m_backgroundMode; }
 
+    bool getShowSplash() const { return m_showSplash; }
+
 public slots:
     virtual void setProperty(const PropertyName &, int);
 
@@ -79,6 +83,8 @@
     void setTemporaryDirectoryRoot(QString tempDirRoot);
     void setResampleOnLoad(bool);
     void setBackgroundMode(BackgroundMode mode);
+    void setViewFontSize(int size);
+    void setShowSplash(bool);
 
 private:
     Preferences(); // may throw DirectoryCreationFailed
@@ -94,7 +100,9 @@
     bool m_omitRecentTemps;
     QString m_tempDirRoot;
     bool m_resampleOnLoad;
+    int m_viewFontSize;
     BackgroundMode m_backgroundMode;
+    bool m_showSplash;
 };
 
 #endif