Commit 126c71b3 authored by Enrico Ros's avatar Enrico Ros

Updated rc files since some actions changed. Name of some actions is more

coherent now.

svn path=/branches/kpdf_experiments/kdegraphics/kpdf/; revision=346258
parent a7c7dd89
......@@ -102,7 +102,7 @@ Part::Part(QWidget *parentWidget, const char *widgetName,
KActionCollection * ac = actionCollection();
// Page Traversal actions
m_gotoPage = KStdAction::gotoPage( this, SLOT( slotGoToPage() ), ac, "goToPage" );
m_gotoPage = KStdAction::gotoPage( this, SLOT( slotGoToPage() ), ac, "goto_page" );
m_prevPage = KStdAction::prior(this, SLOT(slotPreviousPage()), ac, "previous_page");
m_prevPage->setWhatsThis( i18n( "Moves to the previous page of the document" ) );
......@@ -110,10 +110,10 @@ Part::Part(QWidget *parentWidget, const char *widgetName,
m_nextPage = KStdAction::next(this, SLOT(slotNextPage()), ac, "next_page" );
m_nextPage->setWhatsThis( i18n( "Moves to the next page of the document" ) );
m_firstPage = KStdAction::firstPage( this, SLOT( slotGotoFirst() ), ac, "goToStart" );
m_firstPage = KStdAction::firstPage( this, SLOT( slotGotoFirst() ), ac, "first_page" );
m_firstPage->setWhatsThis( i18n( "Moves to the first page of the document" ) );
m_lastPage = KStdAction::lastPage( this, SLOT( slotGotoLast() ), ac, "goToEnd" );
m_lastPage = KStdAction::lastPage( this, SLOT( slotGotoLast() ), ac, "last_page" );
m_lastPage->setWhatsThis( i18n( "Moves to the last page of the document" ) );
// Find and other actions
......
......@@ -11,35 +11,38 @@
<Action name="find_next"/>
</Menu>
<Menu name="view"><text>&amp;View</text>
<Action name="fit_to_width"/>
<Separator/>
<Action name="zoom_in"/>
<Action name="zoom_out"/>
<Action name="zoom_fit_width"/>
<Action name="zoom_fit_page"/>
</Menu>
<Menu name="go"><text>&amp;Go</text>
<Action name="back"/>
<Action name="forward"/>
<Separator/>
<Action name="first_page"/>
<Action name="previous_page"/>
<Action name="next_page"/>
<Action name="last_page"/>
<Separator/>
<Action name="goToPage"/>
<Action name="goto_page"/>
</Menu>
<Menu name="settings"><text>&amp;Settings</text>
<Action name="show_scrollbars" group="show_merge"/>
<Action name="show_page_list" group="show_merge"/>
<Action name="show_thumbnails" group="show_merge"/>
</Menu>
</MenuBar>
<ToolBar name="mainToolBar">
<ToolBar name="mainToolBar"><text>Main Toolbar</text>
<Separator/>
<Action name="previous_page"/>
<Action name="next_page"/>
<Separator/>
<Action name="zoom_in"/>
<Action name="zoomTo" />
<Action name="zoom_to" />
<Action name="zoom_out"/>
<Action name="fit_to_width"/>
<!--Action name="zoom_fit_width"/-->
<!--Action name="zoom_fit_page"/-->
<Separator/>
<Action name="previous_page"/>
<Action name="next_page"/>
<Action name="goToStart"/>
<Action name="goToEnd"/>
<Action name="mouse_drag"/>
<Action name="mouse_select"/>
<Action name="mouse_draw"/>
</ToolBar>
</kpartgui>
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
<kpartgui name="kpdf_shell" version="5">
<MenuBar>
<Menu name="file">
<DefineGroup name="file_save" append="save_merge"/>
<DefineGroup name="file_print" append="print_merge"/>
<kpartgui version="6" name="kpdf_shell" >
<MenuBar>
<Menu name="file" >
<DefineGroup append="save_merge" name="file_save" />
<DefineGroup append="print_merge" name="file_print" />
</Menu>
<Menu name="view">
<Action name="fullscreen"/>
<Menu name="view" >
<Action name="fullscreen" />
</Menu>
<Menu name="settings">
<DefineGroup name="show_merge" append="show_merge"/>
<Menu name="settings" >
<DefineGroup append="show_merge" name="show_merge" />
</Menu>
<Merge/>
</MenuBar>
</MenuBar>
<ToolBar noMerge="1" name="mainToolBar" >
<text>Main Toolbar</text>
<Action name="file_open" />
<Action name="file_open_recent" />
<Action name="file_print" />
</ToolBar>
</kpartgui>
......@@ -40,7 +40,7 @@ ThumbnailList::ThumbnailList(QWidget *parent, KPDFDocument *document)
void ThumbnailList::setupActions( KActionCollection * ac, KConfigGroup * config )
{
KToggleAction * show = new KToggleAction( i18n( "Show &Page List" ), 0, ac, "show_page_list" );
KToggleAction * show = new KToggleAction( i18n( "Show &Page List" ), 0, ac, "show_thumbnails" );
show->setCheckedState(i18n("Hide &Page List"));
connect( show, SIGNAL( toggled( bool ) ), SLOT( setShown( bool ) ) );
......@@ -188,7 +188,7 @@ void ThumbnailList::contentsMousePressEvent( QMouseEvent * e )
void ThumbnailList::viewportResizeEvent(QResizeEvent *e)
{
if ( m_thumbnails.count() < 1 )
if ( m_thumbnails.count() < 1 || width() < 1 || !isShown() )
return;
// if width changed resize all the Thumbnails, reposition them to the
// right place and recalculate the contents area
......
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