From 41dfbdf3d9c6acbdde4e8e38a5b0cfde8c8acd6a Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Tue, 23 Sep 2008 13:04:46 +0000 Subject: [PATCH] Fixed issue that the "Show Menu Bar" state is not updated correctly (workaround for bug #171080). Patch has been provided by Laurens Vanhove. svn path=/trunk/KDE/kdebase/apps/; revision=863909 --- src/dolphincontextmenu.cpp | 4 ---- src/dolphinmainwindow.cpp | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 55b83c552..7edfdb285 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -322,10 +322,6 @@ void DolphinContextMenu::addShowMenubarAction(KMenu* menu) { KAction* showMenuBar = m_mainWindow->showMenuBarAction(); if (!m_mainWindow->menuBar()->isVisible()) { - // TODO: it should not be necessary to uncheck the menu - // bar action, but currently the action states don't get - // updated if the menu is disabled - showMenuBar->setChecked(false); menu->addAction(showMenuBar); menu->addSeparator(); } diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 78e5ab31c..da7f8e170 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -834,7 +834,6 @@ void DolphinMainWindow::init() m_centralWidgetLayout->addWidget(m_tabBar); m_centralWidgetLayout->addWidget(m_viewTab[m_tabIndex].splitter); - setCentralWidget(centralWidget); setupDockWidgets(); @@ -861,6 +860,7 @@ void DolphinMainWindow::init() resize(750, 500); } + m_showMenuBar->setChecked(!menuBar()->isHidden()); // workaround for bug #171080 emit urlChanged(homeUrl); } -- 2.47.3