[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.4/kdegraphics/gwenview
From:       Aurélien Gâteau <agateau () kde ! org>
Date:       2010-01-18 22:47:34
Message-ID: 1263854854.143605.17988.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1076840 by gateau:

Do not show save bar below side bar.

BUG:209683
NEWS

 M  +14 -11    app/mainwindow.cpp  
 M  +1 -1      lib/splittercollapser.cpp  


--- branches/KDE/4.4/kdegraphics/gwenview/app/mainwindow.cpp #1076839:1076840
@@ -189,23 +189,26 @@
 	KNotificationRestrictions* mNotificationRestrictions;
 
 	void setupWidgets() {
-		QWidget* centralWidget = new QWidget(mWindow);
-		mWindow->setCentralWidget(centralWidget);
-		mSaveBar = new SaveBar(centralWidget, mWindow->actionCollection());
+		mCentralSplitter = new Splitter(Qt::Horizontal, mWindow);
+		mWindow->setCentralWidget(mCentralSplitter);
 
-		mCentralSplitter = new Splitter(Qt::Horizontal, centralWidget);
-		QVBoxLayout* layout = new QVBoxLayout(centralWidget);
-		layout->addWidget(mSaveBar);
-		layout->addWidget(mCentralSplitter);
-		layout->setMargin(0);
-		layout->setSpacing(0);
-
+		// Left side of splitter
 		mSideBar = new SideBar(mCentralSplitter);
 		EventWatcher::install(mSideBar, QList<QEvent::Type>() << QEvent::Show << QEvent::Hide,
 			mWindow, SLOT(updateToggleSideBarAction()));
 
-		mViewStackedWidget = new QStackedWidget(mCentralSplitter);
+		// Right side of splitter
+		QWidget* contentWidget = new QWidget(mCentralSplitter);
 
+		mSaveBar = new SaveBar(contentWidget, mWindow->actionCollection());
+		mViewStackedWidget = new QStackedWidget(contentWidget);
+		QVBoxLayout* layout = new QVBoxLayout(contentWidget);
+		layout->addWidget(mSaveBar);
+		layout->addWidget(mViewStackedWidget);
+		layout->setMargin(0);
+		layout->setSpacing(0);
+		////
+
 		mSideBarCollapser = new SplitterCollapser(mCentralSplitter, mSideBar);
 
 		mStartSlideShowWhenDirListerCompleted = false;
--- branches/KDE/4.4/kdegraphics/gwenview/lib/splittercollapser.cpp #1076839:1076840
@@ -85,7 +85,7 @@
 
 		if (!isVertical()) {
 			// FIXME: Make this configurable
-			y = 30;
+			y = 60;
 			if (mDirection == LTR) {
 				if (mWidget->isVisible()) {
 					x = widgetRect.right() + handleWidth;
[prev in list] [next in list] [prev in thread] [next in thread]