From 2abe1e6f4022109b1e179242aa9765810d7f680c Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 18 Dec 2009 02:32:16 +0000
Subject: * ark context un[tar/zip/bz] crash repair * gcc4.4 compilation fixes
 * superkaramba xmms sensor addition * automake updates

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1063396 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kmilo/kmilod/defaultskin.cpp  |  32 +++++++++++
 kmilo/kmilod/defaultskin.h    |   1 +
 kmilo/kmilod/defaultwidget.ui | 127 +++---------------------------------------
 3 files changed, 42 insertions(+), 118 deletions(-)

(limited to 'kmilo/kmilod')

diff --git a/kmilo/kmilod/defaultskin.cpp b/kmilo/kmilod/defaultskin.cpp
index f0324de..a0ef2b0 100644
--- a/kmilo/kmilod/defaultskin.cpp
+++ b/kmilo/kmilod/defaultskin.cpp
@@ -33,6 +33,7 @@
 #include <netwm.h>
 #include <kglobalsettings.h>
 #include <kdeversion.h>
+#include <kconfig.h>
 
 #include "defaultskin.h"
 
@@ -49,6 +50,9 @@ DefaultSkin::DefaultSkin() {
 	KWin::setType(_widget->winId(), NET::Override);
 
 	_widget->hide();
+
+	KConfig config("kmilodrc");
+	reconfigure( &config );
 }
 
 
@@ -57,6 +61,34 @@ DefaultSkin::~DefaultSkin() {
 	_widget = 0;
 }
 
+void DefaultSkin::reconfigure( KConfig *config ) {
+	
+	config->setGroup("DefaultSkin");
+	
+	QFont *defaultFont = new QFont("Sans", 10, QFont::Bold );
+	QSize *defaultSize = new QSize( 80, 30 );
+	QColor *defaultpaletteForegroundColor = new QColor( 200, 200, 200 );
+	QColor *defaultpaletteBackgroundColor = new QColor( 100, 100, 100 );
+	QFont *defaultProgressFont = new QFont("Sans", 8, QFont::Bold );
+	
+	_widget->resize( config->readSizeEntry("Size", defaultSize ) );
+	_widget->setFont( config->readFontEntry("Font", defaultFont ) );
+	_widget->setPaletteForegroundColor( config->readColorEntry("paletteForegroundColor", defaultpaletteForegroundColor ) );
+	_widget->setPaletteBackgroundColor( config->readColorEntry("paletteBackgroundColor", defaultpaletteBackgroundColor ) );
+	_widget->_progress->setFont( config->readFontEntry("ProgressFont", defaultProgressFont ) );
+
+	if ( ! config->hasGroup("DefaultSkin") )
+	{
+		
+		config->writeEntry("Size", *defaultSize );
+		config->writeEntry("Font", *defaultFont );
+		config->writeEntry("paletteForegroundColor", *defaultpaletteForegroundColor );
+		config->writeEntry("paletteBackgroundColor", *defaultpaletteBackgroundColor );
+		config->writeEntry("ProgressFont", *defaultProgressFont );
+		
+	}
+	
+}
 
 void DefaultSkin::clear() {
 	_timer.stop();
diff --git a/kmilo/kmilod/defaultskin.h b/kmilo/kmilod/defaultskin.h
index 0e01f23..1610152 100644
--- a/kmilo/kmilod/defaultskin.h
+++ b/kmilo/kmilod/defaultskin.h
@@ -37,6 +37,7 @@ class DefaultSkin : public QObject, public KMilo::DisplaySkin {
 		virtual ~DefaultSkin();
 
 		virtual void clear();
+		virtual void reconfigure( KConfig *config );
 
 		virtual void displayText(const QString& text, const QPixmap& customPixmap=QPixmap());
 		virtual void displayProgress(const QString& text,
diff --git a/kmilo/kmilod/defaultwidget.ui b/kmilo/kmilod/defaultwidget.ui
index b4809fe..65c19d8 100644
--- a/kmilo/kmilod/defaultwidget.ui
+++ b/kmilo/kmilod/defaultwidget.ui
@@ -7,21 +7,6 @@ Released under the terms of the GNU GPL.</comment>
     <property name="name">
         <cstring>DefaultWidget</cstring>
     </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>566</width>
-            <height>180</height>
-        </rect>
-    </property>
-    <property name="paletteBackgroundColor">
-        <color>
-            <red>214</red>
-            <green>213</green>
-            <blue>212</blue>
-        </color>
-    </property>
     <grid>
         <property name="name">
             <cstring>unnamed</cstring>
@@ -30,19 +15,6 @@ Released under the terms of the GNU GPL.</comment>
             <property name="name">
                 <cstring>_widgetStack</cstring>
             </property>
-            <property name="paletteBackgroundColor">
-                <color>
-                    <red>214</red>
-                    <green>213</green>
-                    <blue>212</blue>
-                </color>
-            </property>
-            <property name="frameShape">
-                <enum>StyledPanel</enum>
-            </property>
-            <property name="frameShadow">
-                <enum>Sunken</enum>
-            </property>
             <widget class="QWidget">
                 <property name="name">
                     <cstring>page</cstring>
@@ -58,26 +30,6 @@ Released under the terms of the GNU GPL.</comment>
                         <property name="name">
                             <cstring>_textOnly</cstring>
                         </property>
-                        <property name="paletteForegroundColor">
-                            <color>
-                                <red>26</red>
-                                <green>69</green>
-                                <blue>198</blue>
-                            </color>
-                        </property>
-                        <property name="paletteBackgroundColor">
-                            <color>
-                                <red>214</red>
-                                <green>213</green>
-                                <blue>212</blue>
-                            </color>
-                        </property>
-                        <property name="font">
-                            <font>
-                                <pointsize>28</pointsize>
-                                <bold>1</bold>
-                            </font>
-                        </property>
                         <property name="text">
                             <string></string>
                         </property>
@@ -98,41 +50,18 @@ Released under the terms of the GNU GPL.</comment>
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <spacer row="1" column="2">
-                        <property name="name">
-                            <cstring>spacer1</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>81</width>
-                                <height>31</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <spacer row="1" column="0">
+                    <widget class="QLabel" row="0" column="0">
                         <property name="name">
-                            <cstring>spacer1_2</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
+                            <cstring>_progressText</cstring>
                         </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
+                        <property name="text">
+                            <string></string>
                         </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>81</width>
-                                <height>31</height>
-                            </size>
+                        <property name="alignment">
+                            <set>AlignCenter</set>
                         </property>
-                    </spacer>
-                    <widget class="QProgressBar" row="1" column="1">
+                    </widget>
+                    <widget class="QProgressBar" row="0" column="1" colspan="2">
                         <property name="name">
                             <cstring>_progress</cstring>
                         </property>
@@ -144,52 +73,14 @@ Released under the terms of the GNU GPL.</comment>
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="paletteBackgroundColor">
-                            <color>
-                                <red>214</red>
-                                <green>213</green>
-                                <blue>212</blue>
-                            </color>
-                        </property>
                         <property name="centerIndicator">
                             <bool>false</bool>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
-                        <property name="name">
-                            <cstring>_progressText</cstring>
-                        </property>
-                        <property name="paletteForegroundColor">
-                            <color>
-                                <red>26</red>
-                                <green>69</green>
-                                <blue>198</blue>
-                            </color>
-                        </property>
-                        <property name="paletteBackgroundColor">
-                            <color>
-                                <red>214</red>
-                                <green>213</green>
-                                <blue>212</blue>
-                            </color>
-                        </property>
-                        <property name="font">
-                            <font>
-                                <pointsize>28</pointsize>
-                                <bold>1</bold>
-                            </font>
-                        </property>
-                        <property name="text">
-                            <string></string>
-                        </property>
-                        <property name="alignment">
-                            <set>AlignCenter</set>
-                        </property>
-                    </widget>
                 </grid>
             </widget>
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="2" margin="2"/>
 </UI>
-- 
cgit v1.2.1