[kde-doc-english] [kde-baseapps/KDE/4.8] konqueror: Make sure the user's preference to show or hide the close buttons takes effect

[Dawit Alemayehu]

Git commit 2f63fe74e513580879cde3d4678d8268bd91da52 by Dawit Alemayehu.
Committed on 29/01/2012 at 07:09.
Pushed by adawit into branch 'KDE/4.8'.

Make sure the user's preference to show or hide the close buttons takes effect
as soon as the changes are applied. Not after restarting Konqueror.

BUG: 121792
FIXED-IN: 4.8.1
GUI: Removed portion of a tool tip text that is no longer valid.

M  +1    -1    konqueror/settings/konqhtml/advancedTabOptions.ui
M  +1    -0    konqueror/src/konqviewmanager.cpp

http://commits.kde.org/kde-baseapps/2f63fe74e513580879cde3d4678d8268bd91da52

diff --git a/konqueror/settings/konqhtml/advancedTabOptions.ui 
b/konqueror/settings/konqhtml/advancedTabOptions.ui
index 6f9abe5..754eb8a 100644
--- a/konqueror/settings/konqhtml/advancedTabOptions.ui
+++ b/konqueror/settings/konqhtml/advancedTabOptions.ui
@@ -78,7 +78,7 @@
      <item>
       <widget class="QCheckBox" name="m_pPermanentCloseButton" >
        <property name="whatsThis" >
-        <string>This will display close buttons inside each tab (Konqueror 
needs to be restarted for changes to take effect).</string>
+        <string>This will display close buttons inside each tab.</string>
        </property>
        <property name="text" >
         <string>&amp;Show close button on tabs</string>
diff --git a/konqueror/src/konqviewmanager.cpp 
b/konqueror/src/konqviewmanager.cpp
index bd5e9a0..5352eeb 100644
--- a/konqueror/src/konqviewmanager.cpp
+++ b/konqueror/src/konqviewmanager.cpp
@@ -1616,6 +1616,7 @@ void KonqViewManager::createTabContainer(QWidget* parent, 
KonqFrameContainerBase
 void KonqViewManager::applyConfiguration()
 {
     tabContainer()->setAlwaysTabbedMode( KonqSettings::alwaysTabbedMode() );
+    tabContainer()->setTabsClosable( KonqSettings::permanentCloseButton() );
 }
 
 KonqMainWindow* KonqViewManager::duplicateWindow()