summaryrefslogtreecommitdiffstats
path: root/kcontrol/taskbar
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/taskbar')
-rw-r--r--kcontrol/taskbar/kcmtaskbar.cpp29
-rw-r--r--kcontrol/taskbar/kcmtaskbar.h3
-rw-r--r--kcontrol/taskbar/kcmtaskbarui.ui32
3 files changed, 56 insertions, 8 deletions
diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp
index 3a2436b24..00e0cd1f3 100644
--- a/kcontrol/taskbar/kcmtaskbar.cpp
+++ b/kcontrol/taskbar/kcmtaskbar.cpp
@@ -21,6 +21,8 @@
#include <tqlayout.h>
#include <tqtimer.h>
#include <tqvaluelist.h>
+#include <tqfile.h>
+#include <tqlabel.h>
#include <dcopclient.h>
@@ -31,7 +33,7 @@
#include <kgenericfactory.h>
#include <twin.h>
#include <kcolorbutton.h>
-#include <tqlabel.h>
+#include <kstandarddirs.h>
#define protected public
#include "kcmtaskbarui.h"
@@ -161,7 +163,24 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL
{
m_configFileName = args[0];
m_widget->globalConfigWarning->hide();
+ m_widget->globalConfigReload->show();
+ }
+ else
+ {
+ m_widget->globalConfigReload->hide();
+ m_widget->globalConfigWarning->show();
+ }
+ connect(m_widget->globalConfigReload, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotReloadConfigurationFromGlobals()));
+
+ TQFile configFile(locateLocal("config", m_configFileName));
+ if (!configFile.exists())
+ {
+ KConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE);
+ KConfig localConfig(m_configFileName);
+ globalConfig.copyTo(m_configFileName, &localConfig);
+ localConfig.sync();
}
+
m_settingsObject = new TaskBarSettings(KSharedConfig::openConfig(m_configFileName));
m_settingsObject->readConfig();
@@ -240,6 +259,14 @@ TaskbarConfig::~TaskbarConfig()
}
}
+void TaskbarConfig::slotReloadConfigurationFromGlobals()
+{
+ KConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE);
+ globalConfig.copyTo(m_configFileName);
+ m_settingsObject->readConfig();
+ load();
+}
+
void TaskbarConfig::slotUpdateCustomColors()
{
m_widget->kcfg_ActiveTaskTextColor->setEnabled(m_widget->kcfg_UseCustomColors->isChecked());
diff --git a/kcontrol/taskbar/kcmtaskbar.h b/kcontrol/taskbar/kcmtaskbar.h
index 5e7d9d905..9aaec9664 100644
--- a/kcontrol/taskbar/kcmtaskbar.h
+++ b/kcontrol/taskbar/kcmtaskbar.h
@@ -70,6 +70,9 @@ protected slots:
void notChanged();
void slotUpdateCustomColors();
+private slots:
+ void slotReloadConfigurationFromGlobals();
+
private:
TaskbarAppearance::List m_appearances;
void updateAppearanceCombo();
diff --git a/kcontrol/taskbar/kcmtaskbarui.ui b/kcontrol/taskbar/kcmtaskbarui.ui
index ce0ddb6fe..a522ef683 100644
--- a/kcontrol/taskbar/kcmtaskbarui.ui
+++ b/kcontrol/taskbar/kcmtaskbarui.ui
@@ -462,16 +462,34 @@ By default, this option is selected and all windows are shown.</string>
</widget>
</grid>
</widget>
- <widget class="TQLabel" rowspan="1" colspan="2">
+ <widget class="TQGroupBox">
<property name="name">
- <cstring>globalConfigWarning</cstring>
+ <cstring>GroupBox2</cstring>
</property>
- <property name="text">
- <string>NOTE: This module is currently editing the global floating taskbar configuration.&lt;br&gt;To change the configuration of a specific Kicker taskbar applet, please use the Configure Taskbar menu option.</string>
- </property>
- <property name="buddy" stdset="0">
- <cstring>kcfg_ShowTaskStates</cstring>
+ <property name="title">
+ <string>Settings</string>
</property>
+ <grid>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="TQLabel" rowspan="1" colspan="2">
+ <property name="name">
+ <cstring>globalConfigWarning</cstring>
+ </property>
+ <property name="text">
+ <string>NOTE: This module is currently editing the global floating taskbar configuration.&lt;br&gt;To change the configuration of a specific Kicker taskbar applet, please use the Configure Taskbar menu option.</string>
+ </property>
+ </widget>
+ <widget class="TQPushButton" rowspan="1" colspan="2">
+ <property name="name">
+ <cstring>globalConfigReload</cstring>
+ </property>
+ <property name="text">
+ <string>Use current global floating taskbar configuration</string>
+ </property>
+ </widget>
+ </grid>
</widget>
<spacer>
<property name="name">