Changeset 6239 for trunk/qt4-gui/src/config

Timestamp:

06/06/08 07:23:44 (6 months ago)

Author:

eugene

Message:

Introduced Fixed font setting and made it to be used in network log and file editors.
Default fixed font is constructed by taking global qApp->font() and setting Monospace family on it.

Location:

trunk/qt4-gui/src/config

Files:

• general.cpp (modified) (10 diffs)
• general.h (modified) (5 diffs)

trunk/qt4-gui/src/config/general.cpp

@@ -48 +48 @@
     myDockModeHasChanged(false),
     myFontHasChanged(false),
+    myFixedFontHasChanged(false),
     myBlockUpdates(false)
 {
@@ -55 +56 @@
   myDefaultFont = qApp->font();
 #endif
+
+  myDefaultFixedFont = QFont(myDefaultFont);
+  myDefaultFixedFont.setFamily("Monospace");
 }
 
@@ -70 +74 @@
 
   iniFile.ReadStr("Font", szTemp, "default");
-  if (strcmp(szTemp, "default") != 0)
-  {
-    QFont f;
-    f.fromString(szTemp);
-    qApp->setFont(f);
-  }
+  if (strcmp(szTemp, "default") == 0)
+    szTemp[0] = '\0';
+  setNormalFont(szTemp);
   iniFile.ReadStr("EditFont", szTemp, "default");
-  if(!strcmp(szTemp, "default"))
-    myEditFont = myDefaultFont;
-  else
-    myEditFont.fromString(szTemp);
+  if (strcmp(szTemp, "default") == 0)
+    szTemp[0] = '\0';
+  setEditFont(szTemp);
+  iniFile.ReadStr("FixedFont", szTemp, "default");
+  if (strcmp(szTemp, "default") == 0)
+    szTemp[0] = '\0';
+  setFixedFont(szTemp);
 
   iniFile.ReadBool("InMiniMode", myMiniMode, false);
@@ -128 +132 @@
   emit dockModeChanged();
   emit fontChanged();
+  emit fixedFontChanged();
 }
 
@@ -143 +148 @@
   iniFile.WriteStr("EditFont", myEditFont == myDefaultFont ?
       "default" : myEditFont.toString().toLatin1());
+  iniFile.WriteStr("FixedFont", myFixedFont == myDefaultFixedFont ?
+      "default" : myFixedFont.toString().toLatin1());
 
   iniFile.WriteBool("InMiniMode", myMiniMode);
@@ -177 +184 @@
 void Config::General::blockUpdates(bool block)
 {
-  myBlockUpdates = block;
-
-  if (!block && myMainwinHasChanged)
+  if ((myBlockUpdates = block))
+    return;
+
+  if (myMainwinHasChanged)
   {
     myMainwinHasChanged = false;
     emit mainwinChanged();
   }
-  if (!block && myDockModeHasChanged)
+  if (myDockModeHasChanged)
   {
     myDockModeHasChanged = false;
@@ -190 +198 @@
     emit dockModeChanged();
   }
-  if (!block && myDockHasChanged)
+  if (myDockHasChanged)
   {
     myDockHasChanged = false;
     emit dockChanged();
   }
-  if (!block && myFontHasChanged)
+  if (myFontHasChanged)
   {
     myFontHasChanged = false;
     emit fontChanged();
   }
+  if (myFixedFontHasChanged)
+  {
+    myFixedFontHasChanged = false;
+    emit fixedFontChanged();
+  }
 }
 
@@ -235 +248 @@
 {
   QFont f;
-  if (normalFont.isNull())
+  if (normalFont.isEmpty())
     f = myDefaultFont;
   else
@@ -250 +263 @@
 {
   QFont f;
-  if (editFont.isNull())
+  if (editFont.isEmpty())
     f = myDefaultFont;
   else
@@ -263 +276 @@
   else
     emit fontChanged();
+}
+
+void Config::General::setFixedFont(QString fixedFont)
+{
+  QFont f;
+  if (fixedFont.isEmpty())
+    f = myDefaultFixedFont;
+  else
+    f.fromString(fixedFont);
+
+  if (f == myFixedFont)
+    return;
+
+  myFixedFont = f;
+  if (myBlockUpdates)
+    myFixedFontHasChanged = true;
+  else
+    emit fixedFontChanged();
 }
 

trunk/qt4-gui/src/config/general.h

@@ -80 +80 @@
   bool delayStatusChange() const { return myDelayStatusChange; }
   QFont defaultFont() const { return myDefaultFont; }
+  QFont defaultFixedFont() const { return myDefaultFixedFont; }
   QFont normalFont() const;
   QFont editFont() const { return myEditFont; }
+  QFont fixedFont() const { return myFixedFont; }
 
   bool miniMode() const { return myMiniMode; }
@@ -124 +126 @@
   void setNormalFont(QString normalFont);
   void setEditFont(QString editFont);
+  void setFixedFont(QString fixedFont);
 
   void setMiniMode(bool miniMode);
@@ -174 +177 @@
 
   /**
+   * Fixed Font configuration has changed (not emitted for normal font)
+   */
+  void fixedFontChanged();
+
+  /**
    * Popup key has changed
    */
@@ -186 +194 @@
   bool myDockModeHasChanged;
   bool myFontHasChanged;
+  bool myFixedFontHasChanged;
   bool myBlockUpdates;
 
@@ -193 +202 @@
   bool myDelayStatusChange;
   QFont myDefaultFont;
+  QFont myDefaultFixedFont;
   QFont myEditFont;
+  QFont myFixedFont;
 
   // Mainwin configuration