Changeset 6239 for trunk/qt4-gui/src/settings/general.cpp

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.

Files:

• trunk/qt4-gui/src/settings/general.cpp (modified) (3 diffs)

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

@@ -140 +140 @@
   myFontLayout->addWidget(myEditFontLabel, 1, 0);
   myEditFontEdit = new FontEdit();
-  myEditFontEdit->setToolTip(myFontLabel->toolTip());
-  myFontLabel->setBuddy(myEditFontEdit);
+  myEditFontEdit->setToolTip(myEditFontLabel->toolTip());
+  myEditFontLabel->setBuddy(myEditFontEdit);
   myFontLayout->addWidget(myEditFontEdit, 1, 1);
+
+  // Fixed font
+  myFixedFontLabel = new QLabel(tr("Fixed:"));
+  myFixedFontLabel->setToolTip(tr("Used in file editor and network log."));
+  myFontLayout->addWidget(myFixedFontLabel, 2, 0);
+  myFixedFontEdit = new FontEdit();
+  myFixedFontEdit->setToolTip(myFixedFontLabel->toolTip());
+  myFixedFontLabel->setBuddy(myFixedFontEdit);
+  myFontLayout->addWidget(myFixedFontEdit, 2, 1);
 
   myPageFontsLayout->addWidget(myFontBox);
@@ -234 +243 @@
   myNormalFontEdit->setFont(QFont(generalConfig->normalFont()));
   myEditFontEdit->setFont(QFont(generalConfig->editFont()));
+  myFixedFontEdit->setFont(QFont(generalConfig->fixedFont()));
 }
 
@@ -265 +275 @@
 
   if (myNormalFontEdit->font() == Config::General::instance()->defaultFont())
-    generalConfig->setNormalFont(QString());
+    generalConfig->setNormalFont(QString::null);
   else
     generalConfig->setNormalFont(myNormalFontEdit->font().toString());
 
   if (myEditFontEdit->font() == Config::General::instance()->defaultFont())
-    generalConfig->setEditFont(QString());
+    generalConfig->setEditFont(QString::null);
   else
     generalConfig->setEditFont(myEditFontEdit->font().toString());
 
+  if (myFixedFontEdit->font() == Config::General::instance()->defaultFixedFont())
+    generalConfig->setFixedFont(QString::null);
+  else
+    generalConfig->setFixedFont(myFixedFontEdit->font().toString());
+
   generalConfig->blockUpdates(false);
 }