[kgraphviewer-devel] [KGraphViewer] 4ce4d4a: - default background color set to white; - default

[Gael.deChalendar]

commit 4ce4d4a7583b304caff682b01f3a624763a61109
branch master
Author: Gael.deChalendar <kleag at free.fr>
Date:   Thu Nov 25 22:31:00 2010 +0100

    - default background color set to white;
    - default background changed is immediatly taken into account

diff --git a/src/kgraphviewer.cpp b/src/kgraphviewer.cpp
index 970bb20..3ee711a 100644
--- a/src/kgraphviewer.cpp
+++ b/src/kgraphviewer.cpp
@@ -52,6 +52,7 @@
 #include <iostream>
 #include <stdio.h>
 #include <stdlib.h>
+#include <KColorScheme>
 
 KGraphViewerWindow::KGraphViewerWindow()
     : KParts::MainWindow(),
@@ -308,7 +309,7 @@ void KGraphViewerWindow::optionsConfigure()
   KPageDialog::FaceType ft = KPageDialog::Auto;
   KgvConfigurationDialog* dialog = new KgvConfigurationDialog( this, "settings", 
                                              KGraphViewerSettings::self(),ft ); 
-
+  connect(dialog,SIGNAL(backgroundColorChanged(QColor)),this,SLOT(slotBackgroundColorChanged(QColor)));
   Ui::KGraphViewerPreferencesParsingWidget*  parsingWidget = dialog->parsingWidget;
   kDebug() << KGraphViewerSettings::parsingMode();
   if (KGraphViewerSettings::parsingMode() == "external")
@@ -561,4 +562,19 @@ void KGraphViewerWindow::slotHoverLeave(const QString& id)
   statusBar()->showMessage("");
 }
 
+void KGraphViewerWindow::slotBackgroundColorChanged(const QColor&)
+{
+  kDebug();
+  foreach(KParts::Part* part, m_tabsPartsMap)
+  {
+    KGraphViewer::KGraphViewerInterface* kgv = qobject_cast<KGraphViewer::KGraphViewerInterface*>( part );
+    if( ! kgv )
+    {
+      // This should not happen
+      return;
+    }
+    kgv->setBackgroundColor(KGraphViewerSettings::backgroundColor());
+  }
+}
+
 #include "kgraphviewer.moc"
diff --git a/src/kgraphviewer.h b/src/kgraphviewer.h
index eccd9e1..ad2710f 100644
--- a/src/kgraphviewer.h
+++ b/src/kgraphviewer.h
@@ -103,6 +103,7 @@ private slots:
 
   void slotHoverEnter(const QString&);
   void slotHoverLeave(const QString&);
+  void slotBackgroundColorChanged(const QColor&);
   
 private:
   void setupAccel();
diff --git a/src/kgraphviewerConfigDialog.cpp b/src/kgraphviewerConfigDialog.cpp
index cca33d4..2f8bd1c 100644
--- a/src/kgraphviewerConfigDialog.cpp
+++ b/src/kgraphviewerConfigDialog.cpp
@@ -78,7 +78,7 @@ KgvConfigurationDialog::KgvConfigurationDialog (QWidget *parent, const QString&
   connect(reloadWidget->reloadOnChangeMode, SIGNAL(clicked(int)), this, SLOT(settingChanged(int)));
   connect(openingWidget->openInExistingWindowMode, SIGNAL(clicked(int)), this, SLOT(settingChanged(int)));
   connect(reopeningWidget->reopenPreviouslyOpenedFilesMode, SIGNAL(clicked(int)), this, SLOT(settingChanged(int)));
-  connect(appearanceWidget->kcolorbutton, SIGNAL(changed(QColor)), this, SLOT(backgroundColorChanged(QColor)));
+  connect(appearanceWidget->kcolorbutton, SIGNAL(changed(QColor)), this, SLOT(slotBackgroundColorChanged(QColor)));
 }
 
 KgvConfigurationDialog::~KgvConfigurationDialog () 
@@ -175,8 +175,9 @@ void KgvConfigurationDialog::updateWidgets()
     reopeningWidget->reopenPreviouslyOpenedFilesMode->setButton(2);*/
 }
 
-void KgvConfigurationDialog::backgroundColorChanged(const QColor& color)
+void KgvConfigurationDialog::slotBackgroundColorChanged(const QColor& color)
 {
   KGraphViewerSettings::setBackgroundColor(color);
+  emit backgroundColorChanged(color);
 }
 #include "kgraphviewerConfigDialog.moc"
diff --git a/src/kgraphviewerConfigDialog.h b/src/kgraphviewerConfigDialog.h
index 097b215..4b4a621 100644
--- a/src/kgraphviewerConfigDialog.h
+++ b/src/kgraphviewerConfigDialog.h
@@ -47,11 +47,14 @@ public:
 
   virtual ~KgvConfigurationDialog ();
 
-protected slots:
+Q_SIGNALS:
+  void backgroundColorChanged(const QColor& color);
+  
+protected Q_SLOTS:
   virtual void updateSettings();
   virtual void updateWidgets();
   void settingChanged(int);
-  void backgroundColorChanged(const QColor& color);
+  void slotBackgroundColorChanged(const QColor& color);
 
 protected:
   virtual bool hasChanged();
diff --git a/src/kgraphviewersettings.kcfg b/src/kgraphviewersettings.kcfg
index cfe35eb..5eebb70 100644
--- a/src/kgraphviewersettings.kcfg
+++ b/src/kgraphviewersettings.kcfg
@@ -30,7 +30,7 @@
   <group name="Appearance">
     <entry name="backgroundColor" type="Color">
       <label>Background color of the graph view.</label>
-      <default>#DCDCDC</default>
+      <default>white</default>
     </entry>
   </group>
 </kcfg>
diff --git a/src/part/dotgraphview.cpp b/src/part/dotgraphview.cpp
index 7d7c10b..68a23a9 100644
--- a/src/part/dotgraphview.cpp
+++ b/src/part/dotgraphview.cpp
@@ -693,7 +693,12 @@ void DotGraphView::setHighlighting(bool highlightingValue) {Q_D(DotGraphView); d
 
 DotGraphView::EditingMode DotGraphView::editingMode() const {Q_D(const DotGraphView); return d->m_editingMode;}
 
-void DotGraphView::setBackgroundColor(const QColor& color) {Q_D(DotGraphView); d->m_backgroundColor = color;}
+void DotGraphView::setBackgroundColor(const QColor& color)
+{
+  Q_D(DotGraphView);
+  d->m_backgroundColor = color;
+  d->m_canvas->setBackgroundBrush(QBrush(d->m_backgroundColor));
+}
 
 bool DotGraphView::initEmpty()
 {
diff --git a/src/preferencesAppearance.ui b/src/preferencesAppearance.ui
index 3201150..0bd9372 100644
--- a/src/preferencesAppearance.ui
+++ b/src/preferencesAppearance.ui
@@ -46,7 +46,22 @@
       </widget>
      </item>
      <item>
-      <widget class="KColorButton" name="kcolorbutton"/>
+      <widget class="KColorButton" name="kcolorbutton">
+       <property name="color">
+        <color>
+         <red>220</red>
+         <green>220</green>
+         <blue>220</blue>
+        </color>
+       </property>
+       <property name="defaultColor">
+        <color>
+         <red>220</red>
+         <green>220</green>
+         <blue>220</blue>
+        </color>
+       </property>
+      </widget>
      </item>
      <item>
       <spacer name="horizontalSpacer">