From 73908d0e01ab186c4c33fcc22a401650bbb6b894 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 29 Jun 2015 20:06:26 +0300 Subject: [PATCH] Help user understand how deal with modes. --HG-- branch : develop --- src/app/mainwindow.cpp | 28 +++++++++++++++++- src/app/mainwindow.h | 3 ++ src/app/share/resources/icon.qrc | 4 +++ .../fast_forward_left_to_right_arrow.png | Bin 0 -> 560 bytes .../fast_forward_right_to_left_arrow.png | Bin 0 -> 583 bytes .../icon/24x24/left_to_right_arrow.png | Bin 0 -> 493 bytes .../icon/24x24/right_to_left_arrow.png | Bin 0 -> 531 bytes 7 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 src/app/share/resources/icon/24x24/fast_forward_left_to_right_arrow.png create mode 100644 src/app/share/resources/icon/24x24/fast_forward_right_to_left_arrow.png create mode 100644 src/app/share/resources/icon/24x24/left_to_right_arrow.png create mode 100644 src/app/share/resources/icon/24x24/right_to_left_arrow.png diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp index 27bdaa634..5285da6ce 100644 --- a/src/app/mainwindow.cpp +++ b/src/app/mainwindow.cpp @@ -78,7 +78,8 @@ MainWindow::MainWindow(QWidget *parent) mouseCoordinate(nullptr), helpLabel(nullptr), isInitialized(false), dialogTable(nullptr), dialogTool(nullptr), dialogHistory(nullptr), comboBoxDraws(nullptr), mode(Draw::Calculation), currentDrawIndex(0), currentToolBoxIndex(0), drawMode(true), recentFileActs(), - separatorAct(nullptr), autoSaveTimer(nullptr), guiEnabled(true), gradationHeights(nullptr), + separatorAct(nullptr), + leftGoToStage(nullptr), rightGoToStage(nullptr), autoSaveTimer(nullptr), guiEnabled(true), gradationHeights(nullptr), gradationSizes(nullptr), #if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0) toolOptions(nullptr), lock(nullptr) @@ -94,6 +95,7 @@ MainWindow::MainWindow(QWidget *parent) CreateActions(); CreateMenus(); ToolBarDraws(); + ToolBarStages(); InitToolButtons(); InitScenes(); @@ -973,6 +975,18 @@ void MainWindow::SetDefaultSize(int value) } } +//--------------------------------------------------------------------------------------------------------------------- +void MainWindow::ToolBarStages() +{ + leftGoToStage = new QLabel(this); + leftGoToStage->setPixmap(QPixmap("://icon/24x24/fast_forward_left_to_right_arrow.png")); + ui->toolBarStages->insertWidget(ui->actionDetails, leftGoToStage); + + rightGoToStage = new QLabel(this); + rightGoToStage->setPixmap(QPixmap("://icon/24x24/left_to_right_arrow.png")); + ui->toolBarStages->insertWidget(ui->actionLayout, rightGoToStage); +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief ToolBarDraws enable draw toolbar. @@ -1294,6 +1308,10 @@ void MainWindow::ActionDraw(bool checked) if (checked) { qCDebug(vMainWindow, "Show draw scene"); + + leftGoToStage->setPixmap(QPixmap("://icon/24x24/fast_forward_left_to_right_arrow.png")); + rightGoToStage->setPixmap(QPixmap("://icon/24x24/left_to_right_arrow.png")); + ui->actionDetails->setChecked(false); ui->actionLayout->setChecked(false); SaveCurrentScene(); @@ -1366,6 +1384,10 @@ void MainWindow::ActionDetails(bool checked) } qCDebug(vMainWindow, "Show details scene"); + + leftGoToStage->setPixmap(QPixmap("://icon/24x24/right_to_left_arrow.png")); + rightGoToStage->setPixmap(QPixmap("://icon/24x24/left_to_right_arrow.png")); + ui->actionDraw->setChecked(false); ui->actionLayout->setChecked(false); SaveCurrentScene(); @@ -1444,6 +1466,10 @@ void MainWindow::ActionLayout(bool checked) } qCDebug(vMainWindow, "Show layout scene"); + + leftGoToStage->setPixmap(QPixmap("://icon/24x24/right_to_left_arrow.png")); + rightGoToStage->setPixmap(QPixmap("://icon/24x24/fast_forward_right_to_left_arrow.png")); + ui->actionDraw->setChecked(false); ui->actionDetails->setChecked(false); SaveCurrentScene(); diff --git a/src/app/mainwindow.h b/src/app/mainwindow.h index 9035ae906..b0db7bda5 100644 --- a/src/app/mainwindow.h +++ b/src/app/mainwindow.h @@ -206,6 +206,8 @@ private: enum { MaxRecentFiles = 5 }; QAction *recentFileActs[MaxRecentFiles]; QAction *separatorAct; + QLabel *leftGoToStage; + QLabel *rightGoToStage; QTimer *autoSaveTimer; bool guiEnabled; QComboBox *gradationHeights; @@ -216,6 +218,7 @@ private: #endif void ToolBarOption(); + void ToolBarStages(); void ToolBarDraws(); void ToolBarTools(); void InitToolButtons(); diff --git a/src/app/share/resources/icon.qrc b/src/app/share/resources/icon.qrc index fc72ccef5..f7a9d9a76 100644 --- a/src/app/share/resources/icon.qrc +++ b/src/app/share/resources/icon.qrc @@ -46,5 +46,9 @@ icon/16x16/toolsectiondetail.png icon/16x16/toolsectionlayout.png toolicon/32x32/true_darts.png + icon/24x24/fast_forward_left_to_right_arrow.png + icon/24x24/fast_forward_right_to_left_arrow.png + icon/24x24/left_to_right_arrow.png + icon/24x24/right_to_left_arrow.png diff --git a/src/app/share/resources/icon/24x24/fast_forward_left_to_right_arrow.png b/src/app/share/resources/icon/24x24/fast_forward_left_to_right_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..93b06b6f5fa7b0e7b90275faba1cafcf584f049b GIT binary patch literal 560 zcmV-00?+-4P)L~qma;wMhD!F4Ib#Xg`DalZ_7ST>kAMJk zA92I>37{|O9`Gbh!b5;S0--Uv858C?Rcc9dnDsn1pE6#?T$Z#WX&!h8yo%ziHHv6Y z&?w1AOV|{#RO>3f19z}rf=(Jg0In&Y-34w{FInXRx$_zIPR3T2>nDF7Bh9A zQPY(3(x*Wx^D65itfB1BNY}ByAYCAT&Szu~k=_G0f$du5!Hl9PBbiiHq3Z)+Lueg* z2;9Y9w$u;|kk){WGzkX)HNi#WKq!yGM&mO8o&)C!BVUCUF`v?QNEBzUfh*3ndxp51 zguThsYiSa0&AL5+D9!?KA2blWu)Wf4H-Aiwv@G_8p8+dr((F%j)P6@^hu*g>Sy95ytOtnQ2HM`jRw@f2~aYs=Q(ujyGVx!nPQAlIq z2e7e`Y=TWHKS7Wgu&}U_EyQAu#k?8UNw!EV-P7F5+_~r7d+xgr=9ps;XGe;aXv|C= zW+2W2cY)O!aRi*htoDcL?d^^3%mbnsm9;EJzz6VBE!GB}6){dqiVoGmAWlzVCzATb z7k&HFRk{Rh0zGVyTEOBU&cJ{uY=A|ssmdC_9otWVwxpk!SBS?zZhRl}M9{K?>_8HH zX{t;Y=U9_QAYTMt0+&L|dzjdGOK<}88grqPLnU#|uev~`AsWQlHDCw0Vmq?^4s#y7 zCFus}6VR_~U3T!7UzaEh`54eNfRqbOkbi}io5oE~B~&&@vftl-i{1h&f{%rktbulb zW$ZUXE3$W?9GDRfY}0;?+f)*kLtX&Zfk%b~*%ROe;yG5s@0Azrw+w6=PKU(Lz%ARkBy6KnuENiC@S>${U}Ur=_%cp9XQ~2* z>2XOT;3jw%ba9+?@5z0?2z002ovPDHLkV1ix%{;U81 literal 0 HcmV?d00001 diff --git a/src/app/share/resources/icon/24x24/left_to_right_arrow.png b/src/app/share/resources/icon/24x24/left_to_right_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..54dd6c5fc3981b2f7b8abdbc26d32efed664a903 GIT binary patch literal 493 zcmVFU?~K@EACUJ*wT0mJeFRSFP)QR|V5%f7=U*Ip|?Nn;g@@psx|q z;=ZLP%UC47gEP>Zd^X-#lWg4WfmifI;w9!FpHF^ms~IFvzfFO8fOwtH$AA7+Ge`h< j2fWJXXP))LM$PMN}W)Lsw)*^U}54{ zWC@6ciQi!V1;he_4}RV-13wRee0uF)RM0#lZ8bA{ExT74E za3(MEJnA`kx<;Y%=G4+`0$@E3WgG50LF=>wI>7#8+?&?2r2@kaaYGXqld_5##7Vkh zbRyURMVdj^3b;vF5vbaT;w0MxT?ux9Xy)Ms?L(}RgrHUgEMhvY<)+2sz0~}9+$@yTim~7({<39 zVWTdoYBQ`8wZ)Z9+di}&__s}8QgOi1)@sYqV2ROSd5HNWaSlAvbm6}djEPQ{?tp#FH$f`tzg{>W<0RX7zk27oo&ZHp VsAFipsha=*002ovPDHLkV1hiB<7NN= literal 0 HcmV?d00001