Version: 3.1 (using KDE 3.1.0) Installed from: compiled sources Compiler: gcc version 2.95.4 20011002 (Debian prerelease) OS: Linux (i686) release 2.4.20 I can disable showing DTD toolbar from View menu but whenever I change view - switching preview on and off, undocking and docking tree view - DTD toolbar is there again after that.
Subject: QUANTA_3_1_BRANCH: quanta/quanta CVS commit by amantia: Be less braindead regarding the Show DTD Toolbar setting. CCMAIL:53739-done@bugs.kde.org M +0 -17 dialogs/filemaskss.ui 1.10.2.1 M +8 -9 quanta.cpp 1.188.2.6 M +0 -1 quanta_init.cpp 1.197.2.6 --- quanta/quanta/quanta.cpp #1.188.2.5:1.188.2.6 @@ -816,5 +816,4 @@ void QuantaApp::slotOptions() } } - fileMasks->hideDTDToolbar->setChecked(!qConfig.enableDTDToolbar); // Preview options @@ -872,7 +871,4 @@ void QuantaApp::slotOptions() qConfig.defaultEncoding = fileMasks->encodingCombo->currentText(); - qConfig.enableDTDToolbar = !fileMasks->hideDTDToolbar->isChecked(); - showDTDToolbar->setEnabled(qConfig.enableDTDToolbar); - slotToggleDTDToolbar(showDTDToolbar->isChecked()); qConfig.refreshFrequency = parserOptions->refreshFrequency->value(); @@ -2296,5 +2292,5 @@ void QuantaApp::removeToolbar(const QStr void QuantaApp::slotToggleDTDToolbar(bool show) { - if (show && qConfig.enableDTDToolbar) + if (show) { view->toolbarTab->show(); @@ -2303,5 +2299,4 @@ void QuantaApp::slotToggleDTDToolbar(boo view->toolbarTab->hide(); } - showDTDToolbar->setChecked(show); } @@ -2419,5 +2414,6 @@ ToolbarEntry *QuantaApp::toolbarByURL(co bool QuantaApp::allToolbarsHidden() { - + bool result = true; + showDTDToolbar->setEnabled(false); ToolbarEntry *p_toolbar = 0L; QDictIterator<ToolbarEntry> iter(toolbarList); @@ -2427,9 +2423,12 @@ bool QuantaApp::allToolbarsHidden() if (p_toolbar->visible) { - return false; + showDTDToolbar->setEnabled(true); + result = false;; } } - return true; + if (!showDTDToolbar->isChecked()) + result = true; + return result; } --- quanta/quanta/quanta_init.cpp #1.197.2.5:1.197.2.6 @@ -652,5 +652,4 @@ void QuantaApp::readOptions() slotToggleDTDToolbar(qConfig.enableDTDToolbar); - showDTDToolbar->setEnabled(qConfig.enableDTDToolbar); config->setGroup("Kate View"); --- quanta/quanta/dialogs/filemaskss.ui #1.10:1.10.2.1 @@ -176,20 +176,4 @@ </widget> </widget> - <widget class="QCheckBox"> - <property name="name"> - <cstring>hideDTDToolbar</cstring> - </property> - <property name="geometry"> - <rect> - <x>5</x> - <y>290</y> - <width>401</width> - <height>22</height> - </rect> - </property> - <property name="text"> - <string>&Always hide the DTD toolbar</string> - </property> - </widget> <widget class="QComboBox"> <property name="name"> @@ -265,5 +249,4 @@ <tabstop>encodingCombo</tabstop> <tabstop>newfileCombo</tabstop> - <tabstop>hideDTDToolbar</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/>