Commit 571951fb authored by Enrico Ros's avatar Enrico Ros

Fix double Fullscreen item in menus (as reported by Albert)

svn path=/branches/kpdf_experiments/kdegraphics/kpdf/; revision=373830
parent 207c2842
......@@ -541,7 +541,7 @@ void Part::slotShowMenu(const KPDFPage *page, const QPoint &point)
for ( it = begin; it != end; ++it )
{
if (QString((*it)->name()) == "options_show_menubar") m_showMenuBarAction = (KToggleAction*)(*it);
if (QString((*it)->name()) == "fullscreen") m_showFullScreenAction = (KToggleAction*)(*it);
if (QString((*it)->name()) == "show_fullscreen") m_showFullScreenAction = (KToggleAction*)(*it);
}
}
m_actionsSearched = true;
......
......@@ -154,7 +154,7 @@ Shell::setupActions()
m_showMenuBarAction = KStdAction::showMenubar( this, SLOT( slotShowMenubar() ), actionCollection());
KStdAction::configureToolbars(this, SLOT(optionsConfigureToolbars()), actionCollection());
m_fullScreenAction = KStdAction::fullScreen( this, SLOT( slotUpdateFullScreen() ), actionCollection(), this );
m_fullScreenAction = KStdAction::fullScreen( this, SLOT( slotUpdateFullScreen() ), actionCollection(), this, "show_fullscreen" );
}
void
......
......@@ -6,7 +6,7 @@
<DefineGroup append="print_merge" name="file_print" />
</Menu>
<Menu name="view" >
<Action name="fullscreen" />
<Action name="show_fullscreen" />
</Menu>
<Menu name="settings" >
<DefineGroup append="show_merge" name="show_merge" />
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment