Changeset 6239

Timestamp:

06/06/08 07:23:44 (4 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

Files:

• config/general.cpp (modified) (10 diffs)
• config/general.h (modified) (5 diffs)
• dialogs/editfiledlg.cpp (modified) (1 diff)
• settings/general.cpp (modified) (3 diffs)
• settings/general.h (modified) (1 diff)
• userevents/usersendcommon.cpp (modified) (1 diff)
• widgets/mledit.cpp (modified) (3 diffs)
• widgets/mledit.h (modified) (2 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

trunk/qt4-gui/src/dialogs/editfiledlg.cpp

@@ -48 +48 @@
   QVBoxLayout* top_lay = new QVBoxLayout(this);
 
-  myFileEdit = new MLEdit(false, this, false);
+  myFileEdit = new MLEdit(false, this, true);
   myFileEdit->setMinimumHeight(myFileEdit->frameWidth() * 2 + 20 * myFileEdit->fontMetrics().lineSpacing());
   myFileEdit->setMinimumWidth(myFileEdit->fontMetrics().width("_") * 80);

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);
 }

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

@@ -95 +95 @@
   QLabel* myFontLabel;
   QLabel* myEditFontLabel;
+  QLabel* myFixedFontLabel;
   FontEdit* myNormalFontEdit;
   FontEdit* myEditFontEdit;
+  FontEdit* myFixedFontEdit;
   QLabel* myDefaultEncodingLabel;
   QCheckBox* myShowAllEncodingsCheck;

trunk/qt4-gui/src/userevents/usersendcommon.cpp

@@ -415 +415 @@
   myPictureSplitter = new QSplitter(myViewSplitter);
 
-  myMessageEdit = new MLEdit(true, myPictureSplitter, true);
+  myMessageEdit = new MLEdit(true, myPictureSplitter);
   myMessageEdit->setSizeHintLines(3);
   myMessageEdit->setCheckSpellingEnabled(Config::Chat::instance()->checkSpelling());

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

@@ -32 +32 @@
 /* TRANSLATOR LicqQtGui::MLEdit */
 
-MLEdit::MLEdit(bool wordWrap, QWidget* parent, bool /* doQuotes */, const char* name)
+MLEdit::MLEdit(bool wordWrap, QWidget* parent, bool useFixedFont, const char* name)
   : MLEDIT_BASE(parent),
+    myUseFixedFont(useFixedFont),
     myFixSetTextNewlines(true),
     myLastKeyWasReturn(false),
@@ -46 +47 @@
 
   updateFont();
-  connect(Config::General::instance(), SIGNAL(fontChanged()), SLOT(updateFont()));
+  connect(Config::General::instance(),
+      myUseFixedFont ? SIGNAL(fixedFontChanged()) : SIGNAL(fontChanged()),
+      SLOT(updateFont()));
 }
 
@@ -210 +213 @@
 void MLEdit::updateFont()
 {
-  setFont(Config::General::instance()->editFont());
+  setFont(myUseFixedFont ? Config::General::instance()->fixedFont() :
+      Config::General::instance()->editFont());
 
   // Get height of current font

trunk/qt4-gui/src/widgets/mledit.h

@@ -41 +41 @@
 
 public:
-  MLEdit(bool wordWrap, QWidget* parent = 0, bool handlequotes = false, const char* name = 0);
+  MLEdit(bool wordWrap, QWidget* parent = 0, bool useFixedFont = false, const char* name = 0);
   virtual ~MLEdit();
 
@@ -83 +83 @@
 
 private:
+  bool myUseFixedFont;
   bool myFixSetTextNewlines;
   bool myLastKeyWasReturn;