From 43e8fa69b3986331806e9a69f6b3b8f52421ff5c Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 14 Dec 2013 20:41:41 +0100 Subject: [PATCH 1/3] Fix wrong maintained kate MRU list if any plugin is enabled This resolves Bug 1743 --- kate/app/katemainwindow.cpp | 11 +++-------- kate/app/katepluginmanager.cpp | 1 - 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp index 14a5341c5..4cd3c358e 100644 --- a/kate/app/katemainwindow.cpp +++ b/kate/app/katemainwindow.cpp @@ -422,7 +422,6 @@ void KateMainWindow::readOptions () void KateMainWindow::saveOptions () { TDEConfig *config = KateApp::self()->config (); - config->setGroup("General"); if (console) @@ -431,20 +430,16 @@ void KateMainWindow::saveOptions () config->writeEntry("Show Console", false); config->writeEntry("Save Meta Infos", KateDocManager::self()->getSaveMetaInfos()); - config->writeEntry("Days Meta Infos", KateDocManager::self()->getDaysMetaInfos()); - config->writeEntry("Show Full Path in Title", m_viewManager->getShowFullPath()); - config->writeEntry("Sync Konsole", syncKonsole); - config->writeEntry("UseInstance", useInstance); - + fileOpenRecent->saveEntries(config, "Recent Files"); - fileselector->writeConfig(config, "fileselector"); - filelist->writeConfig(config, "Filelist"); + + config->sync(); } void KateMainWindow::slotWindowActivated () diff --git a/kate/app/katepluginmanager.cpp b/kate/app/katepluginmanager.cpp index 455866a0b..3e0a93f69 100644 --- a/kate/app/katepluginmanager.cpp +++ b/kate/app/katepluginmanager.cpp @@ -65,7 +65,6 @@ void KatePluginManager::setupPluginList () TQString pVersion = ptr->property("X-Kate-Version").toString(); -// if ((pVersion >= "2.5") && (pVersion <= KateApp::kateVersion(false))) if (pVersion == "2.5") { KatePluginInfo info; From 0230e38665822bc60d04bfba482165fea655c211 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 14 Dec 2013 20:44:19 +0100 Subject: [PATCH 2/3] Fix slow first opening kicker T-Menu on Alt+F1 This resolves Bug 1733 --- kicker/kicker/ui/k_mnu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index b052c1fdd..a39da3051 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -409,7 +409,7 @@ void PanelKMenu::initialize() #endif if (displayRepaired == FALSE) { - displayRepairTimer->start(0, FALSE); + displayRepairTimer->start(5, FALSE); displayRepaired = TRUE; } From 6523942e553ef2854f32b245aaffa49b743beac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 14 Dec 2013 20:47:34 +0100 Subject: [PATCH 3/3] Fix saving kicker settins in wrong section --- kcontrol/kicker/menutab_impl.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp index 5ba9dd54f..571365a55 100644 --- a/kcontrol/kicker/menutab_impl.cpp +++ b/kcontrol/kicker/menutab_impl.cpp @@ -229,10 +229,13 @@ void MenuTab::save() } } c->writeEntry("Extensions", ext); - c->setGroup("General"); + c->setGroup("General"); bool kmenusetting = m_comboMenuStyle->currentItem()==1; bool oldkmenusetting = c->readBoolEntry("LegacyKMenu", true); + c->writeEntry("LegacyKMenu", kmenusetting); + c->writeEntry("OpenOnHover", m_openOnHover->isChecked()); + c->sync(); c->setGroup("KMenu"); bool oldmenutextenabledsetting = c->readBoolEntry("ShowText", true); @@ -241,10 +244,6 @@ void MenuTab::save() c->setGroup("buttons"); TQFont oldmenufontsetting = c->readFontEntry("Font"); - c->writeEntry("LegacyKMenu", kmenusetting); - c->writeEntry("OpenOnHover", m_openOnHover->isChecked()); - c->sync(); - if (kmenusetting != oldkmenusetting) { forceRestart = true; }