From e0b78f0f27a2b22d1dc7722879bc5441e00bbc47 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 12 May 2015 19:52:07 +0300 Subject: [PATCH] Show the result generation a layout. --HG-- branch : feature --- src/app/mainwindow.cpp | 21 +++++++++++++++++++++ src/app/mainwindow.h | 2 ++ src/app/mainwindow.ui | 27 +++++++++++++++++++++++++++ 3 files changed, 50 insertions(+) diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp index df748737e..e5ed8b021 100644 --- a/src/app/mainwindow.cpp +++ b/src/app/mainwindow.cpp @@ -131,6 +131,9 @@ MainWindow::MainWindow(QWidget *parent) ui->toolBarStages->setIconSize(QSize(24, 24)); ui->toolBarTools->setIconSize(QSize(24, 24)); #endif + + connect(ui->listWidget, &QListWidget::currentRowChanged, this, &MainWindow::ShowPaper); + ui->dockWidgetLayoutPages->setVisible(false); } //--------------------------------------------------------------------------------------------------------------------- @@ -2218,6 +2221,8 @@ void MainWindow::ReadSettings() */ void MainWindow::WriteSettings() { + ActionDraw(true); + qApp->getSettings()->SetGeometry(saveGeometry()); qApp->getSettings()->SetWindowState(saveState()); qApp->getSettings()->SetToolbarsState(saveState(APP_VERSION)); @@ -2735,6 +2740,22 @@ void MainWindow::ToolBarStyles() ToolBarStyle(ui->mainToolBar); } +//--------------------------------------------------------------------------------------------------------------------- +void MainWindow::ShowPaper(int index) +{ + if (index < 0 || index > scenes.size()) + { + ui->view->setScene(tempSceneLayout); + //EnableActions(false); + } + else + { + ui->view->setScene(scenes.at(index)); + } + + ui->view->fitInView(ui->view->scene()->sceneRect(), Qt::KeepAspectRatio); +} + //--------------------------------------------------------------------------------------------------------------------- void MainWindow::ToolBarStyle(QToolBar *bar) { diff --git a/src/app/mainwindow.h b/src/app/mainwindow.h index 94a1a7a79..c140b2451 100644 --- a/src/app/mainwindow.h +++ b/src/app/mainwindow.h @@ -138,6 +138,8 @@ public slots: void GlobalChangePP(const QString &patternPiece); void WindowsLocale(); void ToolBarStyles(); + + void ShowPaper(int index); signals: void RefreshHistory(); void EnableItemMove(bool move); diff --git a/src/app/mainwindow.ui b/src/app/mainwindow.ui index e2b8f5ade..f5b72fcfb 100644 --- a/src/app/mainwindow.ui +++ b/src/app/mainwindow.ui @@ -1048,12 +1048,39 @@ 0 + + QFrame::StyledPanel + + + QFrame::Sunken + + + true + + + false + 150 200 + + QListView::Static + + + QListView::TopToBottom + + + QListView::Adjust + + + 10 + + + QListView::IconMode +