Changeset 6450 for trunk/qt4-gui/src

Timestamp:

07/16/08 23:03:02 (4 months ago)

Author:

flynd

Message:

Added configuration to set history font separately.

Location:

trunk/qt4-gui/src

Files:

• config/general.cpp (modified) (3 diffs)
• config/general.h (modified) (3 diffs)
• settings/general.cpp (modified) (4 diffs)
• settings/general.h (modified) (1 diff)
• widgets/mlview.cpp (modified) (1 diff)

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

@@ -81 +81 @@
     szTemp[0] = '\0';
   setEditFont(szTemp);
+  iniFile.ReadStr("HistoryFont", szTemp, "default");
+  if (strcmp(szTemp, "default") == 0)
+    szTemp[0] = '\0';
+  setHistoryFont(szTemp);
   iniFile.ReadStr("FixedFont", szTemp, "default");
   if (strcmp(szTemp, "default") == 0)
@@ -148 +152 @@
   iniFile.WriteStr("EditFont", myEditFont == myDefaultFont ?
       "default" : myEditFont.toString().toLatin1());
+  iniFile.WriteStr("HistoryFont", myHistoryFont == myDefaultFont ?
+      "default" : myHistoryFont.toString().toLatin1());
   iniFile.WriteStr("FixedFont", myFixedFont == myDefaultFixedFont ?
       "default" : myFixedFont.toString().toLatin1());
@@ -278 +284 @@
 }
 
+void Config::General::setHistoryFont(QString historyFont)
+{
+  QFont f;
+  if (historyFont.isEmpty())
+    f = myDefaultFont;
+  else
+    f.fromString(historyFont);
+
+  if (f == myHistoryFont)
+    return;
+
+  myHistoryFont = f;
+  if (myBlockUpdates)
+    myFontHasChanged = true;
+  else
+    emit fontChanged();
+}
+
 void Config::General::setFixedFont(QString fixedFont)
 {

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

@@ -83 +83 @@
   QFont normalFont() const;
   QFont editFont() const { return myEditFont; }
+  QFont historyFont() const { return myHistoryFont; }
   QFont fixedFont() const { return myFixedFont; }
 
@@ -126 +127 @@
   void setNormalFont(QString normalFont);
   void setEditFont(QString editFont);
+  void setHistoryFont(QString historyFont);
   void setFixedFont(QString fixedFont);
 
@@ -204 +206 @@
   QFont myDefaultFixedFont;
   QFont myEditFont;
+  QFont myHistoryFont;
   QFont myFixedFont;
 

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

@@ -144 +144 @@
   myFontLayout->addWidget(myEditFontEdit, 1, 1);
 
+  // History font
+  myHistoryFontLabel = new QLabel(tr("History:"));
+  myHistoryFontLabel->setToolTip(tr("Used in message history."));
+  myFontLayout->addWidget(myHistoryFontLabel, 2, 0);
+  myHistoryFontEdit = new FontEdit();
+  myHistoryFontEdit->setToolTip(myHistoryFontLabel->toolTip());
+  myHistoryFontLabel->setBuddy(myHistoryFontEdit);
+  myFontLayout->addWidget(myHistoryFontEdit, 2, 1);
+
   // Fixed font
   myFixedFontLabel = new QLabel(tr("Fixed:"));
   myFixedFontLabel->setToolTip(tr("Used in file editor and network log."));
-  myFontLayout->addWidget(myFixedFontLabel, 2, 0);
+  myFontLayout->addWidget(myFixedFontLabel, 3, 0);
   myFixedFontEdit = new FontEdit();
   myFixedFontEdit->setToolTip(myFixedFontLabel->toolTip());
   myFixedFontLabel->setBuddy(myFixedFontEdit);
-  myFontLayout->addWidget(myFixedFontEdit, 2, 1);
+  myFontLayout->addWidget(myFixedFontEdit, 3, 1);
 
   myPageFontsLayout->addWidget(myFontBox);
@@ -215 +224 @@
 {
   myEditFontEdit->setFont(font);
+  myHistoryFontEdit->setFont(font);
 }
 
@@ -243 +253 @@
   myNormalFontEdit->setFont(QFont(generalConfig->normalFont()));
   myEditFontEdit->setFont(QFont(generalConfig->editFont()));
+  myHistoryFontEdit->setFont(QFont(generalConfig->historyFont()));
   myFixedFontEdit->setFont(QFont(generalConfig->fixedFont()));
 }
@@ -284 +295 @@
     generalConfig->setEditFont(myEditFontEdit->font().toString());
 
+  if (myHistoryFontEdit->font() == Config::General::instance()->defaultFont())
+    generalConfig->setHistoryFont(QString::null);
+  else
+    generalConfig->setHistoryFont(myHistoryFontEdit->font().toString());
+
   if (myFixedFontEdit->font() == Config::General::instance()->defaultFixedFont())
     generalConfig->setFixedFont(QString::null);

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

@@ -95 +95 @@
   QLabel* myFontLabel;
   QLabel* myEditFontLabel;
+  QLabel* myHistoryFontLabel;
   QLabel* myFixedFontLabel;
   FontEdit* myNormalFontEdit;
   FontEdit* myEditFontEdit;
+  FontEdit* myHistoryFontEdit;
   FontEdit* myFixedFontEdit;
   QLabel* myDefaultEncodingLabel;

trunk/qt4-gui/src/widgets/mlview.cpp

@@ -358 +358 @@
 void MLView::updateFont()
 {
-  setFont(Config::General::instance()->editFont());
+  setFont(Config::General::instance()->historyFont());
 
   // Get height of current font