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

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/widgets

Files:

• mledit.cpp (modified) (3 diffs)
• mledit.h (modified) (2 diffs)

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;