mirror of
https://invent.kde.org/graphics/okular
synced 2024-08-25 02:45:38 +00:00
Revert "KStandardAction::showMenubar => showHideMenubar"
Shouldn't have pushed this, sorry. svn path=/trunk/KDE/kdegraphics/okular/; revision=1196649
This commit is contained in:
parent
a60cff7901
commit
7ba5a5e30a
|
@ -26,7 +26,6 @@
|
|||
#include <kaction.h>
|
||||
#include <kapplication.h>
|
||||
#include <kcmdlineargs.h>
|
||||
#include <kdualaction.h>
|
||||
#include <kfiledialog.h>
|
||||
#include <kpluginloader.h>
|
||||
#include <kmessagebox.h>
|
||||
|
@ -188,7 +187,7 @@ void Shell::setupActions()
|
|||
|
||||
setStandardToolBarMenuEnabled(true);
|
||||
|
||||
m_showMenuBarAction = KStandardAction::showHideMenubar( this, SLOT( slotShowMenubar() ), actionCollection());
|
||||
m_showMenuBarAction = KStandardAction::showMenubar( this, SLOT( slotShowMenubar() ), actionCollection());
|
||||
m_fullScreenAction = KStandardAction::fullScreen( this, SLOT( slotUpdateFullScreen() ), this,actionCollection() );
|
||||
}
|
||||
|
||||
|
@ -281,7 +280,7 @@ void Shell::setFullScreen( bool useFullScreen )
|
|||
|
||||
void Shell::showEvent(QShowEvent *e)
|
||||
{
|
||||
m_showMenuBarAction->setActive( menuBar()->isVisible() );
|
||||
m_showMenuBarAction->setChecked( menuBar()->isVisible() );
|
||||
|
||||
KParts::MainWindow::showEvent(e);
|
||||
}
|
||||
|
|
|
@ -19,7 +19,6 @@
|
|||
#include <kparts/mainwindow.h>
|
||||
|
||||
class KCmdLineArgs;
|
||||
class KDualAction;
|
||||
class KRecentFilesAction;
|
||||
class KToggleAction;
|
||||
|
||||
|
@ -100,7 +99,7 @@ private:
|
|||
bool m_fileformatsscanned;
|
||||
KAction* m_printAction;
|
||||
KToggleAction* m_fullScreenAction;
|
||||
KDualAction* m_showMenuBarAction;
|
||||
KToggleAction* m_showMenuBarAction;
|
||||
bool m_menuBarWasShown, m_toolBarWasShown;
|
||||
KUrl m_openUrl;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue