Summary: | Typo: "Special character" button hides the main toolbar | ||
---|---|---|---|
Product: | [Applications] khangman | Reporter: | Mikko Ikola <ikola> |
Component: | general | Assignee: | Anne-Marie Mahfouf <annma> |
Status: | RESOLVED FIXED | ||
Severity: | normal | ||
Priority: | NOR | ||
Version: | unspecified | ||
Target Milestone: | --- | ||
Platform: | unspecified | ||
OS: | Linux | ||
Latest Commit: | Version Fixed In: |
Description
Mikko Ikola
2003-09-28 17:57:03 UTC
A typo in my report... the menu should be "Settings" -> "Configure toolbars" Subject: kdeedu/khangman/khangman CVS commit by annma: fix the code so to resolve bug 65102. Suppress the KToggleToolBar action so that it does not appear anymore in the Configure Toolbar dialog where it did bnot behave correctly CCMAIL=65102-done@bugs.kde.org M +5 -5 khangman.cpp 1.91 M +1 -1 khangman.h 1.45 M +0 -1 khangmanui.rc 1.14 --- kdeedu/khangman/khangman/khangman.cpp #1.90:1.91 @@ -78,5 +78,4 @@ KHangMan::KHangMan() secondToolbar->setBarPos(KToolBar::Bottom); connect(m_view, SIGNAL(signalChangeLanguage(int)), this, SLOT(changeLanguage(int))); - m_bCharToolbar=true; loadSettings(); loadLangToolBar(); @@ -97,5 +96,5 @@ void KHangMan::setupActions() createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - secondAct = new KToggleToolBarAction(secondToolbar, i18n("Special Characters"), actionCollection(), "second_act"); + //secondAct = new KToggleToolBarAction(secondToolbar, i18n("Special Characters"), actionCollection(), "second_act"); langAct = new KSelectAction(i18n("&Languages"), 0, this, SLOT(slotLanguage()), actionCollection(), "combo_lang"); langAct->setItems(m_sortedNames); @@ -273,5 +272,5 @@ void KHangMan::loadSettings() // Show/hide characters toolbar - m_bCharToolbar = config->readBoolEntry( "showCharToolbar", true); + m_bCharToolbar = config->readBoolEntry( "showCharToolbar", false); if (m_bCharToolbar) secondToolbar->show(); else secondToolbar->hide(); @@ -491,4 +490,6 @@ void KHangMan::slotSofter() void KHangMan::loadLangToolBar() { + if (secondToolbar->isVisible() && (m_view->language != "en" || m_view->language != "it")) + m_bCharToolbar=true; secondToolbar->clear(); if (m_view->language=="es" || m_view->language == "pt" || m_view->language == "ca") @@ -552,8 +553,7 @@ void KHangMan::loadLangToolBar() if (m_bCharToolbar) { secondToolbar->show(); - secondAct->setChecked(true); } else secondToolbar->hide(); - if (m_view->language == "en" || m_view->language == "it") + if (m_view->language == "en" || m_view->language == "it")//no special chars in those languages secondToolbar->hide(); } --- kdeedu/khangman/khangman/khangman.h #1.44:1.45 @@ -192,5 +192,5 @@ private: KToggleAction *hintAct; KToggleAction *accentsAct; - KToggleToolBarAction *secondAct; + //KToggleToolBarAction *secondAct; KSelectAction *langAct, *levelAct, *modeAct; QPopupMenu *langPopup; --- kdeedu/khangman/khangman/khangmanui.rc #1.13:1.14 @@ -38,4 +38,3 @@ <Action name="combo_mode"/> </ToolBar> - </kpartgui> |