diff --git a/gui/ksysguard.cpp b/gui/ksysguard.cpp --- a/gui/ksysguard.cpp +++ b/gui/ksysguard.cpp @@ -63,6 +63,7 @@ #include #include #include +#include #include #include @@ -145,23 +146,14 @@ mConfigureSheetAction->setIcon( QIcon::fromTheme(QStringLiteral("configure")) ); connect(mConfigureSheetAction, &QAction::triggered, this, &TopLevel::configureCurrentSheet); // set up 'Settings' menu - mShowMenuBarAction = KStandardAction::showMenubar(this, &TopLevel::toggleShowMenuBar, actionCollection()); + mShowMenuBarAction = KStandardAction::showMenubar(this, &TopLevel::toggleShowMenuBar, this, actionCollection()); retranslateUi(); } void TopLevel::toggleShowMenuBar() { - if (mShowMenuBarAction->isChecked()) { - menuBar()->show(); - } else { - const QString accel = mShowMenuBarAction->shortcut().toString(); - KMessageBox::information(this, i18n("This will hide the menu bar completely." - " You can show it again by typing %1.", accel), - i18n("Hide menu bar"), - QStringLiteral("HideMenuBarWarning")); - menuBar()->hide(); - } + menuBar()->setVisible(mShowMenuBarAction->isChecked()); } void TopLevel::setLocalProcessController(ProcessController * localProcessController) @@ -417,6 +409,12 @@ // if ( cfg.readEntry( "isMinimized" , false) == true ) // showMinimized(); + QString menuBar = cfg.readEntry( "MenuBar", QString("Enabled")); + if (menuBar == "Disabled") { + mShowMenuBarAction->setChecked(false); + } + static_cast< KToggleShowMenuBarAction * >(mShowMenuBarAction)->setShowMessage(true); + mSplitterSize = cfg.readEntry( "SplitterSizeList",QList() ); if ( mSplitterSize.isEmpty() ) { // start with a 30/70 ratio