From f44178a85110b8e3cf7fb39b84b09189fa5b16aa Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Tue, 3 Jun 2014 16:12:20 +0200
Subject: [PATCH] Alignment fixes in WelcomeView
---
GUI/coregui/Views/WelcomeView.cpp | 51 ++++++++++-----------------
GUI/coregui/Views/WelcomeView.h | 9 -----
GUI/coregui/mainwindow/mainwindow.cpp | 2 +-
3 files changed, 19 insertions(+), 43 deletions(-)
diff --git a/GUI/coregui/Views/WelcomeView.cpp b/GUI/coregui/Views/WelcomeView.cpp
index a67e6552268..ab5ce2deb7d 100644
--- a/GUI/coregui/Views/WelcomeView.cpp
+++ b/GUI/coregui/Views/WelcomeView.cpp
@@ -12,27 +12,6 @@
#include "stringutils.h"
-ContainerWidget::ContainerWidget(QWidget *parent)
- : QWidget(parent)
-{
- setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
- setObjectName("containerWidget");
- setContentsMargins(0,30,0,0);
- setFixedWidth(800);
- setStyleSheet(QString::fromUtf8("ContainerWidget#containerWidget\n"
- "{\n"
- " border-left: 1px solid gray;\n"
- " border-right: 1px solid gray;\n"
- " background-color:white;\n"
- "}\n"
- ""));
-}
-
-QSize ContainerWidget::sizeHint() const
-{
- return QSize(800,800);
-}
-
WelcomeView::WelcomeView(MainWindow *parent)
: m_mainWindow(parent)
@@ -119,33 +98,39 @@ WelcomeView::WelcomeView(MainWindow *parent)
containerLayout->addWidget(itemContainerWidget);
containerLayout->addStretch(1);
- ContainerWidget *containerWidget = new ContainerWidget;
- containerWidget->setLayout(containerLayout);
-
-// containerWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
-// containerWidget->setObjectName("containerWidget");
-// containerWidget->setFixedWidth(800);
-// containerWidget->setContentsMargins(0,30,0,0);
-// containerWidget->setLayout(containerLayout);
- containerWidget->setStyleSheet(QString::fromUtf8("#containerWidget\n"
+ QWidget *containerWidget = new QWidget;
+ containerWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+ containerWidget->setObjectName("containerWidget");
+ containerWidget->setMaximumWidth(800);
+ containerWidget->setContentsMargins(0,30,0,0);
+ containerWidget->setStyleSheet(QString::fromUtf8("QWidget#containerWidget\n"
"{\n"
" border-left: 1px solid gray;\n"
" border-right: 1px solid gray;\n"
" background-color:white;\n"
"}\n"
""));
+ containerWidget->setLayout(containerLayout);
+
+
+ QWidget *leftVerticalPanel = new QWidget;
+ QWidget *rightVerticalPanel = new QWidget;
// main layout
QHBoxLayout *mainLayout = new QHBoxLayout;
mainLayout->setContentsMargins(0,0,0,0);
- mainLayout->addStretch(1);
+ //mainLayout->addStretch(1);
+ mainLayout->addWidget(leftVerticalPanel);
mainLayout->addWidget(containerWidget);
- mainLayout->addStretch(1);
+ mainLayout->addWidget(rightVerticalPanel);
+// mainLayout->addStretch(1);
setLayout(mainLayout);
connect(newProjectButton, SIGNAL(clicked()), m_projectManager, SLOT(newProject()));
connect(openProjectButton, SIGNAL(clicked()), m_projectManager, SLOT(openProject()));
- connect(newUsertButton, SIGNAL(clicked()), this, SLOT(onNewUser()));
+ connect(newUsertButton, SIGNAL(clicked()), this, SLOT(onNewUser()));
+
+ updateRecentProjectPanel();
}
void WelcomeView::generateRecentProjectList()
diff --git a/GUI/coregui/Views/WelcomeView.h b/GUI/coregui/Views/WelcomeView.h
index 8a5305c4d21..82d91e6ca07 100644
--- a/GUI/coregui/Views/WelcomeView.h
+++ b/GUI/coregui/Views/WelcomeView.h
@@ -13,15 +13,6 @@
#include <QSignalMapper>
-class ContainerWidget : public QWidget
-{
- Q_OBJECT
-public:
- ContainerWidget(QWidget *parent = 0);
- virtual ~ContainerWidget(){}
- QSize sizeHint() const;
-};
-
class WelcomeView : public QWidget
{
diff --git a/GUI/coregui/mainwindow/mainwindow.cpp b/GUI/coregui/mainwindow/mainwindow.cpp
index 8e86c2bfa85..62a6e5bf736 100644
--- a/GUI/coregui/mainwindow/mainwindow.cpp
+++ b/GUI/coregui/mainwindow/mainwindow.cpp
@@ -109,7 +109,7 @@ MainWindow::MainWindow(QWidget *parent)
//m_tabWidget->insertTab(6, m_fitView, QIcon(":/images/mode_fit.png"), "Fit");
m_tabWidget->insertTab(JobTab, m_jobQueueView, QIcon(":/images/main_jobqueue.png"), "Jobs");
- m_tabWidget->setCurrentIndex(InstrumentTab);
+ m_tabWidget->setCurrentIndex(WelcomeTab);
m_progressBar = new Manhattan::ProgressBar(this);
m_tabWidget->addBottomCornerWidget(m_progressBar);
--
GitLab