From 080dba35b2b29446605b7f873b8ed2e7790ddb2a Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Tue, 17 Mar 2015 23:15:20 +0100 Subject: [PATCH] kdelibs4support-- --- part.cpp | 6 ++++-- ui/thumbnaillist.h | 7 +++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/part.cpp b/part.cpp index 38384ff12..14e6c55f9 100644 --- a/part.cpp +++ b/part.cpp @@ -365,10 +365,12 @@ m_cliPresentation(false), m_cliPrint(false), m_embedMode(detectEmbedMode(parentW enableTOC( false ); // [left toolbox: Thumbnails and Bookmarks] | [] - KVBox * thumbsBox = new ThumbnailsBox( 0 ); - thumbsBox->setSpacing( 6 ); + QWidget * thumbsBox = new ThumbnailsBox( 0 ); + thumbsBox->layout()->setSpacing( 6 ); m_searchWidget = new SearchWidget( thumbsBox, m_document ); + thumbsBox->layout()->addWidget(m_searchWidget); m_thumbnailList = new ThumbnailList( thumbsBox, m_document ); + thumbsBox->layout()->addWidget(m_thumbnailList); // ThumbnailController * m_tc = new ThumbnailController( thumbsBox, m_thumbnailList ); connect( m_thumbnailList, SIGNAL(rightClick(const Okular::Page*,QPoint)), this, SLOT(slotShowMenu(const Okular::Page*,QPoint)) ); tbIndex = m_sidebar->addItem( thumbsBox, QIcon::fromTheme( "view-preview" ), i18n("Thumbnails") ); diff --git a/ui/thumbnaillist.h b/ui/thumbnaillist.h index 815e14ac9..c37044bc5 100644 --- a/ui/thumbnaillist.h +++ b/ui/thumbnaillist.h @@ -12,11 +12,10 @@ #include -#include #include #include "core/observer.h" - +#include class ThumbnailListPrivate; namespace Okular { @@ -76,10 +75,10 @@ Q_OBJECT /** * @short A vertical boxed container with zero size hint (for insertion on left toolbox) */ -class ThumbnailsBox : public KVBox +class ThumbnailsBox : public QWidget { public: - ThumbnailsBox( QWidget * parent ) : KVBox( parent ) {} + ThumbnailsBox( QWidget * parent ) : QWidget( parent ) { QVBoxLayout *vbox = new QVBoxLayout(this); vbox->setMargin(0); vbox->setSpacing(0);} QSize sizeHint() const { return QSize(); } };