From 8f4f2946458bb3685f15418d5cdc346ef1c3a0d9 Mon Sep 17 00:00:00 2001 From: dismine Date: Thu, 11 Sep 2014 20:18:01 +0300 Subject: [PATCH] Deleted history dockWidget. --HG-- branch : develop --- src/app/mainwindow.cpp | 6 +----- src/app/mainwindow.ui | 31 +++++-------------------------- 2 files changed, 6 insertions(+), 31 deletions(-) diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp index d4dd30a49..15b403764 100644 --- a/src/app/mainwindow.cpp +++ b/src/app/mainwindow.cpp @@ -1968,9 +1968,7 @@ void MainWindow::CreateMenus() separatorAct->setSeparator(true); ui->menuPatternPiece->insertAction(ui->actionPattern_properties, separatorAct); - //Add docks - ui->menuPatternPiece->insertAction(ui->actionPattern_properties, ui->dockWidgetHistory->toggleViewAction()); - ui->dockWidgetHistory->close();//Default don't show hostory + //Add dock ui->menuPatternPiece->insertAction(ui->actionPattern_properties, ui->dockWidgetToolOptions->toggleViewAction()); separatorAct = new QAction(this); @@ -1981,8 +1979,6 @@ void MainWindow::CreateMenus() void MainWindow::AddDocks() { - ui->menuPatternPiece->insertAction(ui->actionPattern_properties, ui->dockWidgetHistory->toggleViewAction()); - ui->dockWidgetHistory->close();//Default don't show hostory ui->menuPatternPiece->insertAction(ui->actionPattern_properties, ui->dockWidgetToolOptions->toggleViewAction()); separatorAct = new QAction(this); diff --git a/src/app/mainwindow.ui b/src/app/mainwindow.ui index 4889a3335..2afad25b8 100644 --- a/src/app/mainwindow.ui +++ b/src/app/mainwindow.ui @@ -47,7 +47,7 @@ 0 0 - 144 + 105 272 @@ -309,7 +309,7 @@ 0 0 105 - 70 + 58 @@ -385,7 +385,7 @@ 0 0 105 - 116 + 110 @@ -513,7 +513,7 @@ 0 0 105 - 70 + 58 @@ -589,7 +589,7 @@ 0 0 105 - 64 + 58 @@ -804,27 +804,6 @@ - - - true - - - - 100 - 41 - - - - Qt::BottomDockWidgetArea|Qt::LeftDockWidgetArea|Qt::TopDockWidgetArea - - - History - - - 2 - - -