summaryrefslogtreecommitdiffstats
path: root/kicker/taskbar/taskbarcontainer.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-17 14:34:51 -0600
committerTimothy Pearson <[email protected]>2013-01-17 14:34:51 -0600
commita0d0b876b6447c5be26a50a0b295e91cd95a8ceb (patch)
treed8d5ddf687d96525743613a38c280fb8b4cc4706 /kicker/taskbar/taskbarcontainer.cpp
parent18f6f27f9f340d56b12b8f7bc87ae410d595d1b1 (diff)
downloadtdebase-a0d0b876b6447c5be26a50a0b295e91cd95a8ceb.tar.gz
tdebase-a0d0b876b6447c5be26a50a0b295e91cd95a8ceb.zip
Fix taskbar configuration issues
Fix Kicker menu button layout in Deep Buttons mode
Diffstat (limited to 'kicker/taskbar/taskbarcontainer.cpp')
-rw-r--r--kicker/taskbar/taskbarcontainer.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp
index 00ed9786c..581719660 100644
--- a/kicker/taskbar/taskbarcontainer.cpp
+++ b/kicker/taskbar/taskbarcontainer.cpp
@@ -23,11 +23,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqlayout.h>
#include <tqtimer.h>
+#include <tqfile.h>
#include <dcopclient.h>
#include <kapplication.h>
#include <kdebug.h>
#include <kiconloader.h>
+#include <kstandarddirs.h>
#include <twindowlistmenu.h>
#include <X11/X.h>
@@ -57,6 +59,14 @@ TaskBarContainer::TaskBarContainer( bool enableFrame, TQString configFileOverrid
{
configFile = GLOBAL_TASKBAR_CONFIG_FILE_NAME;
}
+ TQFile configFileObject(locateLocal("config", configFile));
+ if (!configFileObject.exists())
+ {
+ KConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE);
+ KConfig localConfig(configFile);
+ globalConfig.copyTo(configFile, &localConfig);
+ localConfig.sync();
+ }
settingsObject = new TaskBarSettings(KSharedConfig::openConfig(configFile));
setBackgroundOrigin( AncestorOrigin );