Commit 00f069f8 authored by Sebastian Trueg's avatar Sebastian Trueg

Reverted part of my patches based on pinotree's wishes. :)

svn path=/trunk/KDE/kdegraphics/okular/; revision=887165
parent b787abb5
......@@ -224,14 +224,8 @@ m_cliPresentation(false), m_generatorGuiClient(0), m_keeper( 0 )
GuiUtils::setIconLoader( iconLoader() );
QWidget* mainWidget = new QWidget( parentWidget );
QVBoxLayout* mainWidgetLayout = new QVBoxLayout( mainWidget );
mainWidgetLayout->setMargin( 0 );
mainWidgetLayout->setSpacing( 0 );
m_sidebar = new Sidebar( mainWidget );
mainWidgetLayout->addWidget( m_sidebar );
setWidget( mainWidget );
m_sidebar = new Sidebar( parentWidget );
setWidget( m_sidebar );
// build the document
m_document = new Okular::Document(widget());
......@@ -328,8 +322,7 @@ m_cliPresentation(false), m_generatorGuiClient(0), m_keeper( 0 )
rightLayout->addWidget( m_pageView );
m_findBar = new FindBar( m_document, rightContainer );
rightLayout->addWidget( m_findBar );
QWidget * bottomBar = new QWidget( mainWidget );
mainWidgetLayout->addWidget( bottomBar );
QWidget * bottomBar = new QWidget( rightContainer );
QHBoxLayout * bottomBarLayout = new QHBoxLayout( bottomBar );
m_pageSizeLabel = new PageSizeLabel( bottomBar, m_document );
bottomBarLayout->setMargin( 0 );
......@@ -340,6 +333,7 @@ m_cliPresentation(false), m_generatorGuiClient(0), m_keeper( 0 )
bottomBarLayout->addWidget( m_miniBar );
bottomBarLayout->addItem( new QSpacerItem( 5, 5, QSizePolicy::Expanding, QSizePolicy::Minimum ) );
bottomBarLayout->addWidget( m_pageSizeLabel );
rightLayout->addWidget( bottomBar );
connect( m_reviewsWidget, SIGNAL( setAnnotationWindow( Okular::Annotation* ) ),
m_pageView, SLOT( setAnnotationWindow( Okular::Annotation* ) ) );
......
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
<kpartgui name="okular_part" version="27">
<kpartgui name="okular_part" version="28">
<MenuBar>
<Menu name="file"><text>&amp;File</text>
<Action name="get_new_stuff" group="file_open"/>
......@@ -87,8 +87,7 @@
<Action name="go_previous"/>
<Action name="go_next"/>
<Separator/>
<Action name="view_fit_to_width"/>
<Action name="view_fit_to_page"/>
<Action name="zoom_to" />
<Action name="view_zoom_out"/>
<Action name="view_zoom_in"/>
<Separator/>
......
......@@ -203,7 +203,6 @@ class SidebarListWidget : public QListWidget
SidebarListWidget::SidebarListWidget( QWidget *parent )
: QListWidget( parent )
{
setFrameStyle( NoFrame );
}
SidebarListWidget::~SidebarListWidget()
......
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