* if the system font is changed during Dolphin is open, take care to update the used font of all views too (assuming that the user selected "system font" as font)

* store the font weight instead of a bool property "isBold"

Thanks to Rafael for the patch!

CCMAIL: [email protected]

svn path=/trunk/KDE/kdebase/apps/; revision=776188

1 files changed, 23 insertions, 4 deletions

diff --git a/src/dolphincolumnwidget.cpp b/src/dolphincolumnwidget.cpp
index 9e6f9719b..2e661fe1e 100644
--- a/src/dolphincolumnwidget.cpp
+++ b/src/dolphincolumnwidget.cpp
@@ -86,9 +86,14 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent,
     const ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
     Q_ASSERT(settings != 0);
 
-    m_font = QFont(settings->fontFamily(), settings->fontSize());
-    m_font.setItalic(settings->italicFont());
-    m_font.setBold(settings->boldFont());
+    if (settings->useSystemFont()) {
+        m_font = KGlobalSettings::generalFont();
+    } else {
+        m_font = QFont(settings->fontFamily(),
+                       settings->fontSize(),
+                       settings->fontWeight(),
+                       settings->italicFont());
+    }
 
     const int iconSize = settings->iconSize();
     setDecorationSize(QSize(iconSize, iconSize));
@@ -131,12 +136,16 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent,
                 this, SLOT(requestActivation()));
         connect(m_view->m_controller, SIGNAL(urlChanged(const KUrl&)),
                 selManager, SLOT(reset()));
-}
+    }
+
     new KMimeTypeResolver(this, m_dolphinModel);
     m_iconManager = new IconManager(this, m_proxyModel);
     m_iconManager->setShowPreview(m_view->m_controller->dolphinView()->showPreview());
 
     m_dirLister->openUrl(url, KDirLister::NoFlags);
+
+    connect(KGlobalSettings::self(), SIGNAL(kdisplayFontChanged()),
+            this, SLOT(updateFont()));
 }
 
 DolphinColumnWidget::~DolphinColumnWidget()
@@ -406,6 +415,16 @@ void DolphinColumnWidget::requestActivation()
     }
 }
 
+void DolphinColumnWidget::updateFont()
+{
+    const ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
+    Q_ASSERT(settings != 0);
+
+    if (settings->useSystemFont()) {
+        m_font = KGlobalSettings::generalFont();
+    }
+}
+
 void DolphinColumnWidget::activate()
 {
     setFocus(Qt::OtherFocusReason);