Commit 0612a602 authored by Enrico Ros's avatar Enrico Ros

merging patch_111

svn path=/branches/kpdf/annotations/kdegraphics/kpdf/; revision=425048
parent 1bf56ad4
......@@ -16,8 +16,8 @@
<Menu name="view"><text>&amp;View</text>
<Action name="presentation"/>
<Separator/>
<Action name="zoom_out"/>
<Action name="zoom_in"/>
<Action name="zoom_out"/>
<Action name="zoom_fit_width"/>
<Action name="zoom_fit_page"/>
<Action name="zoom_fit_rect"/>
......@@ -26,9 +26,10 @@
<Action name="view_twopages"/>
</Menu>
<Menu name="go"><text>&amp;Go</text>
<Action name="first_page"/>
<Action name="previous_page"/>
<Action name="next_page"/>
<Separator/>
<Action name="first_page"/>
<Action name="last_page"/>
<Separator/>
<Action name="history_back"/>
......@@ -36,7 +37,7 @@
<Separator/>
<Action name="goto_page"/>
</Menu>
<Menu name="mouseMode"><text>&amp;Mouse Mode</text>
<Menu name="mouseMode"><text>&amp;Tools</text>
<Action name="mouse_drag"/>
<Action name="mouse_zoom"/>
<Action name="mouse_select"/>
......@@ -56,11 +57,9 @@
<Action name="zoom_in"/>
<Action name="zoom_to" />
<Action name="zoom_out"/>
<!--Action name="zoom_fit_width"/-->
<!--Action name="zoom_fit_page"/-->
<Separator/>
<Action name="view_continuous"/>
<Action name="view_twopages"/>
<Action name="zoom_fit_width"/>
<Action name="zoom_fit_page"/>
<Separator/>
<Action name="mouse_drag"/>
<Action name="mouse_zoom"/>
......
......@@ -185,16 +185,19 @@ void PageView::setupActions( KActionCollection * ac )
// Zoom actions ( higher scales takes lots of memory! )
d->aZoom = new KSelectAction( i18n( "Zoom" ), "viewmag", 0, this, SLOT( slotZoom() ), ac, "zoom_to" );
d->aZoom->setEditable( true );
#if KDE_IS_VERSION(3,4,89)
d->aZoom->setMaxComboViewCount( 13 );
#endif
updateZoomText();
KStdAction::zoomIn( this, SLOT( slotZoomIn() ), ac, "zoom_in" );
KStdAction::zoomOut( this, SLOT( slotZoomOut() ), ac, "zoom_out" );
d->aZoomFitWidth = new KToggleAction( i18n("Fit to Page &Width"), "viewmagfit", 0, ac, "zoom_fit_width" );
d->aZoomFitWidth = new KToggleAction( i18n("Fit to Page &Width"), "view_fit_width", 0, ac, "zoom_fit_width" );
connect( d->aZoomFitWidth, SIGNAL( toggled( bool ) ), SLOT( slotFitToWidthToggled( bool ) ) );
d->aZoomFitPage = new KToggleAction( i18n("Fit to &Page"), "viewmagfit", 0, ac, "zoom_fit_page" );
d->aZoomFitPage = new KToggleAction( i18n("Fit to &Page"), "view_fit_window", 0, ac, "zoom_fit_page" );
connect( d->aZoomFitPage, SIGNAL( toggled( bool ) ), SLOT( slotFitToPageToggled( bool ) ) );
d->aZoomFitText = new KToggleAction( i18n("Fit to &Text"), "viewmagfit", 0, ac, "zoom_fit_text" );
......
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