From efb852a63e1bfeb14fe6ae1bd49b296e834a80bd Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 18 May 2016 19:34:34 +0300 Subject: [PATCH] Call the property browser to update state each time a user call undo/redo command. --HG-- branch : feature --- src/app/valentina/mainwindow.cpp | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 1b8c4f7f6..9803a5753 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -130,17 +130,8 @@ MainWindow::MainWindow(QWidget *parent) } CreateActions(); - CreateMenus(); - ToolBarDraws(); - ToolBarStages(); - InitToolButtons(); InitScenes(); - helpLabel = new QLabel(QObject::tr("Create new pattern piece to start working.")); - ui->statusBar->addWidget(helpLabel); - - ToolBarTools(); - doc = new VPattern(pattern, &mode, sceneDraw, sceneDetails); connect(doc, &VPattern::ClearMainWindow, this, &MainWindow::Clear); connect(doc, &VPattern::patternChanged, this, &MainWindow::PatternWasModified); @@ -150,6 +141,17 @@ MainWindow::MainWindow(QWidget *parent) connect(doc, &VPattern::SetCurrentPP, this, &MainWindow::GlobalChangePP); qApp->setCurrentDocument(doc); + InitDocksContain(); + CreateMenus(); + ToolBarDraws(); + ToolBarStages(); + InitToolButtons(); + + helpLabel = new QLabel(QObject::tr("Create new pattern piece to start working.")); + ui->statusBar->addWidget(helpLabel); + + ToolBarTools(); + connect(qApp->getUndoStack(), &QUndoStack::cleanChanged, this, &MainWindow::PatternWasModified); InitAutoSave(); @@ -157,7 +159,6 @@ MainWindow::MainWindow(QWidget *parent) ui->toolBox->setCurrentIndex(0); ReadSettings(); - InitDocksContain(); setCurrentFile(""); WindowsLocale(); @@ -3371,12 +3372,14 @@ void MainWindow::CreateMenus() //Add Undo/Redo actions. undoAction = qApp->getUndoStack()->createUndoAction(this, tr("&Undo")); + connect(undoAction, &QAction::triggered, toolOptions, &VToolOptionsPropertyBrowser::RefreshOptions); undoAction->setShortcuts(QKeySequence::Undo); undoAction->setIcon(QIcon::fromTheme("edit-undo")); ui->menuPatternPiece->insertAction(ui->actionLast_tool, undoAction); ui->toolBarTools->addAction(undoAction); redoAction = qApp->getUndoStack()->createRedoAction(this, tr("&Redo")); + connect(redoAction, &QAction::triggered, toolOptions, &VToolOptionsPropertyBrowser::RefreshOptions); redoAction->setShortcuts(QKeySequence::Redo); redoAction->setIcon(QIcon::fromTheme("edit-redo")); ui->menuPatternPiece->insertAction(ui->actionLast_tool, redoAction);