From 64c5256e3ae989f7d6f2d2b141d118cec2e40d45 Mon Sep 17 00:00:00 2001 From: Matt Chang Date: Wed, 16 Sep 2020 10:48:21 +1000 Subject: [PATCH 1/5] Add 3 Toolbars: main, view and overlay --- app/src/mainwindow2.cpp | 32 ++++++++++++++++++++++++++++++++ app/src/mainwindow2.h | 14 ++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/app/src/mainwindow2.cpp b/app/src/mainwindow2.cpp index 663f004d7a..8656b3aac5 100644 --- a/app/src/mainwindow2.cpp +++ b/app/src/mainwindow2.cpp @@ -29,8 +29,12 @@ GNU General Public License for more details. #include #include #include +<<<<<<< HEAD #include #include +======= +#include +>>>>>>> bd2acacd (Add 3 Toolbars: main, view and overlay) // core_lib headers #include "pencildef.h" @@ -120,6 +124,7 @@ MainWindow2::MainWindow2(QWidget* parent) : createDockWidgets(); createMenus(); + createToolbars(); setupKeyboardShortcuts(); readSettings(); @@ -1587,3 +1592,30 @@ void MainWindow2::startProjectRecovery(int result) const QString text = tr("Please save your work immediately to prevent loss of data"); QMessageBox::information(this, title, QString("

%1

%2").arg(title, text)); } + +void MainWindow2::createToolbars() +{ + mMainToolbar = addToolBar("Main Toolbar"); + mMainToolbar->addAction(ui->actionNew); + mMainToolbar->addAction(ui->actionOpen); + mMainToolbar->addAction(ui->actionSave); + mMainToolbar->addSeparator(); + mMainToolbar->addAction(ui->actionUndo); + mMainToolbar->addAction(ui->actionRedo); + mMainToolbar->addSeparator(); + mMainToolbar->addAction(ui->actionCut); + mMainToolbar->addAction(ui->actionCopy); + mMainToolbar->addAction(ui->actionPaste); + + mViewToolbar = addToolBar("View Toolbar"); + mViewToolbar->addAction(ui->actionZoom_In); + mViewToolbar->addAction(ui->actionZoom_Out); + mViewToolbar->addAction(ui->actionReset_View); + mViewToolbar->addAction(ui->actionHorizontal_Flip); + mViewToolbar->addAction(ui->actionVertical_Flip); + + mOverlayToolbar = addToolBar("Overlay Toolbar"); + mOverlayToolbar->addAction(ui->actionGrid); + + mToolbars = { mMainToolbar, mViewToolbar, mOverlayToolbar }; +} diff --git a/app/src/mainwindow2.h b/app/src/mainwindow2.h index a8572b977e..f523b954d5 100644 --- a/app/src/mainwindow2.h +++ b/app/src/mainwindow2.h @@ -22,6 +22,7 @@ GNU General Public License for more details. template class QList; class QActionGroup; +class QToolBar; class Object; class Editor; class ScribbleArea; @@ -161,9 +162,16 @@ private slots: RecentFileMenu* mRecentFileMenu = nullptr; PreferencesDialog* mPrefDialog = nullptr; //PreviewWidget* mPreview = nullptr; +<<<<<<< HEAD TimeLine* mTimeLine = nullptr; +======= + TimeLine* mTimeLine = nullptr; // be public temporarily +>>>>>>> bd2acacd (Add 3 Toolbars: main, view and overlay) ColorInspector* mColorInspector = nullptr; OnionSkinWidget* mOnionSkinWidget = nullptr; + QToolBar* mMainToolbar = nullptr; + QToolBar* mViewToolbar = nullptr; + QToolBar* mOverlayToolbar = nullptr; // backup BackupElement* mBackupAtSave = nullptr; @@ -171,8 +179,14 @@ private slots: PegBarAlignmentDialog* mPegAlign = nullptr; LayerOpacityDialog* mLayerOpacityDialog = nullptr; +<<<<<<< HEAD +======= + void createToolbars(); +private: +>>>>>>> bd2acacd (Add 3 Toolbars: main, view and overlay) ActionCommands* mCommands = nullptr; QList mDockWidgets; + QList mToolbars; QIcon mStartIcon; QIcon mStopIcon; From aaeb8ebbf316cf7bd1e157169954c4b571898ee0 Mon Sep 17 00:00:00 2001 From: Matt Chang Date: Wed, 16 Sep 2020 13:31:06 +1000 Subject: [PATCH 2/5] Can show/hide toolbars from Windows menu --- app/src/mainwindow2.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/src/mainwindow2.cpp b/app/src/mainwindow2.cpp index 8656b3aac5..9faf40537f 100644 --- a/app/src/mainwindow2.cpp +++ b/app/src/mainwindow2.cpp @@ -1618,4 +1618,11 @@ void MainWindow2::createToolbars() mOverlayToolbar->addAction(ui->actionGrid); mToolbars = { mMainToolbar, mViewToolbar, mOverlayToolbar }; + + ui->menuWindows->addSeparator(); + QMenu* toolbarMenu = ui->menuWindows->addMenu(tr("Toolbars")); + for (QToolBar* tb : mToolbars) + { + toolbarMenu->addAction(tb->toggleViewAction()); + } } From a540ca41ec2662991dd07490d4d09493511b3d46 Mon Sep 17 00:00:00 2001 From: Matt Chang Date: Wed, 16 Sep 2020 14:04:59 +1000 Subject: [PATCH 3/5] Make toolbar names translatable --- app/src/mainwindow2.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/mainwindow2.cpp b/app/src/mainwindow2.cpp index 9faf40537f..002673f383 100644 --- a/app/src/mainwindow2.cpp +++ b/app/src/mainwindow2.cpp @@ -1595,7 +1595,7 @@ void MainWindow2::startProjectRecovery(int result) void MainWindow2::createToolbars() { - mMainToolbar = addToolBar("Main Toolbar"); + mMainToolbar = addToolBar(tr("Main Toolbar")); mMainToolbar->addAction(ui->actionNew); mMainToolbar->addAction(ui->actionOpen); mMainToolbar->addAction(ui->actionSave); @@ -1607,14 +1607,14 @@ void MainWindow2::createToolbars() mMainToolbar->addAction(ui->actionCopy); mMainToolbar->addAction(ui->actionPaste); - mViewToolbar = addToolBar("View Toolbar"); + mViewToolbar = addToolBar(tr("View Toolbar")); mViewToolbar->addAction(ui->actionZoom_In); mViewToolbar->addAction(ui->actionZoom_Out); mViewToolbar->addAction(ui->actionReset_View); mViewToolbar->addAction(ui->actionHorizontal_Flip); mViewToolbar->addAction(ui->actionVertical_Flip); - mOverlayToolbar = addToolBar("Overlay Toolbar"); + mOverlayToolbar = addToolBar(tr("Overlay Toolbar")); mOverlayToolbar->addAction(ui->actionGrid); mToolbars = { mMainToolbar, mViewToolbar, mOverlayToolbar }; From 4f7434f1c6d2907d7d99a2b92238750e060c1c1f Mon Sep 17 00:00:00 2001 From: Matt Chang Date: Thu, 15 Jul 2021 16:06:16 +0800 Subject: [PATCH 4/5] Update icons for Actions grid/zoom-in/zoom-out/zoom-reset - remove redundant menu separators --- app/data/app.qrc | 4 ++++ app/data/icons/{unused/grid-a.png => grid.png} | Bin app/data/icons/zoom-in.png | Bin 0 -> 883 bytes app/data/icons/zoom-out.png | Bin 0 -> 887 bytes app/data/icons/zoom-reset.png | Bin 0 -> 908 bytes app/ui/mainwindow2.ui | 12 ++++++++++-- 6 files changed, 14 insertions(+), 2 deletions(-) rename app/data/icons/{unused/grid-a.png => grid.png} (100%) create mode 100644 app/data/icons/zoom-in.png create mode 100644 app/data/icons/zoom-out.png create mode 100644 app/data/icons/zoom-reset.png diff --git a/app/data/app.qrc b/app/data/app.qrc index fa15cf527f..eb8f845844 100644 --- a/app/data/app.qrc +++ b/app/data/app.qrc @@ -35,6 +35,10 @@ icons/exit.png icons/cut.png icons/prefs-shortcuts.png + icons/grid.png + icons/zoom-in.png + icons/zoom-out.png + icons/zoom-reset.png background/checkerboard.png icons/controls/stop.png icons/controls/sound-disabled.png diff --git a/app/data/icons/unused/grid-a.png b/app/data/icons/grid.png similarity index 100% rename from app/data/icons/unused/grid-a.png rename to app/data/icons/grid.png diff --git a/app/data/icons/zoom-in.png b/app/data/icons/zoom-in.png new file mode 100644 index 0000000000000000000000000000000000000000..6c6f684eb2cd84d9c263deb14f1f72f9a785b2fa GIT binary patch literal 883 zcmV-(1C0EMP)004{+008s*004(C004>d007mj001&P001PyN;-T;0002o zX+uL$Nkc;*P;zf(X>4Tx04UF6U|@W}00c}xoSRot6y)xt5D^)rz7n#7=^+RY2?_paX$y z6Oj6J2-^e1PJ*ywK;@n^0pvG`wVzId-OQLbBe}Gw4C)p} z#JZDC;8xQ2m2p#UK!bBuvOl#hX7?Z=YTiV|ecL)-=i zZ21Mi&}X0~U|;|MVTd@+)oHc(00009a7bBm000XU000XU0RWnu7ytkQ0ZBwbR5(wK zQ$1^9Q52l_Sn#3PY|x+2%Wl{XOeLI7YG2XuxPR;_dAX)9F+e<(R*|VltV)X0ss@iEK`f;O6Fr z*xb9$AIa>KPN!qdPB<72hnT(V{1H5l)oO+3=VvZ>08yz_;uj0-XQ_ljp|CjySRN>s z%iu3#Fc`32uQ!!_h!%?l$z&1}=7P_>MX^{!I-N!|8pZYXHAGR|RQ4fsyIu18{b)9u zurjgFXJ@i)9&Ria!+bu+VzEHv;Q`;St`47b8^+z;9eusLB)wiwTCJAY5|PK_A*TokK@PVqdXEvDwTr6;rQ!ht8|LhYL&dVw`8~5 zNs=VlNj95hr9bt94?eQj>k)rKpU)?YY{$vva;*Fx0-XJRpX&8G`Mlnp6P{JO-KI~Q zN&X2Is=)qGa=Ba(1VP>jzT(Wu@eog8JRTF@6&5l~CKDt{!f!k^ok(=0fS>>X002ov JPDHLkV1k(Hd{qDd literal 0 HcmV?d00001 diff --git a/app/data/icons/zoom-out.png b/app/data/icons/zoom-out.png new file mode 100644 index 0000000000000000000000000000000000000000..b4b529bad5a75ec55acb736ca515662981ab98d7 GIT binary patch literal 887 zcmV--1Bm>IP)004{+008s*004(C004>d007mj001&P001PyN;-T;0002o zX+uL$Nkc;*P;zf(X>4Tx04UF6U|@W}00c}xoSRot6y)xt5D^)rz7n#7=^+RY2?_paX$y z6Oj6J2-^e1PJ*ywK;@n^0pvG`wVzId-OQLbBe}Gw4C)p} z#JZDC;8xQ2m2p#UK!bBuvOl#hX7?Z=YTiV|ecL)-=i zZ21Mi&}X0~U|;|MVTd@+)oHc(00009a7bBm000XU000XU0RWnu7ytkQ1xZ9fR5(wK zQ_E^vQ50SGHlR^NXwaYzQc#>ZaiAb36F;CCJMja=PY|l&2MA6iBWKZ&B8Vsrg7c8h ziXtMuP#ma;qVW-T&pFk!RxMqyC-6k&=r1oZo6S%zmyyY2pjN99kH=3A`CzqLNvqYuE=cpEk>UV1_M({I9BptFu;s$J_XL`?d=Vwzn|r{& zaarAN7k77eFqur)Y&P4LeaH@nLl`w-EV$|5uCIx0C%s-zEJPFx z28lf%DHIA(g+hT{-8b<)iGQM6t+LOA^?Hr3kB|8F^duy4k)s#NF*YL?BtY6C3gHD19004{+008s*004(C004>d007mj001&P001PyN;-T;0002o zX+uL$Nkc;*P;zf(X>4Tx04UF6U|@W}00c}xoSRot6y)xt5D^)rz7n#7=^+RY2?_paX$y z6Oj6J2-^e1PJ*ywK;@n^0pvG`wVzId-OQLbBe}Gw4C)p} z#JZDC;8xQ2m2p#UK!bBuvOl#hX7?Z=YTiV|ecL)-=i zZ21Mi&}X0~U|;|MVTd@+)oHc(00009a7bBm000XU000XU0RWnu7ytkQ8c9S!R5(wK zQ(cRpVHm#NcURsa(GI3Km~F^`a^irJ*%Lot=h%rK;5Vp6et>e~(AgNxrZmw`%DLl> zB>8G^faIIu+2?sMyT;n~s;l(g_jP|g7l9B0hD0Jkn$0HK?KXzPAyg_A>~=f+e!svI z&VUz)$Kyn&)8X^=HS||kn9XJ=l}bpb(@-jvh{a-Oi+r$HEJUqV!{hPruFK^T>-8Fn ziwoFnHe@mx3^Cc<(P&Vs)%NM95c~Z;X0$U)X2Ruag%zbtCWHCrhEKHFY*4LM zch`OgQK3-aCq3A7I^|>nxm*sb)k>ox*vlA=Mr^m+z2q38!{OkE8q+D*&ZE%?27>{` zViDPF77q^(@Or(pmbjN3LwI?4A(2P~jYb1bTI|#1C7*&FH+37NKR)8e z^D|$G;pyp#dFJ;dhf3#IE|*Ct7$k1Dn@EzxC&}mYG_;GK2;Q^P=@9mW;c%E2IjmDC z6lnNA3NZG1JwnYy!lBUHB2v7{QZdMKs`d3 iSLl&pHk% - :/icons/magnify.png:/icons/magnify.png + :/icons/zoom-in.png:/icons/zoom-in.png Zoom In @@ -488,7 +488,7 @@ - :/icons/magnify.png:/icons/magnify.png + :/icons/zoom-out.png:/icons/zoom-out.png Zoom Out @@ -505,6 +505,10 @@ + + + :/icons/zoom-reset.png:/icons/zoom-reset.png + Reset @@ -545,6 +549,10 @@ true + + + :/icons/grid.png:/icons/grid.png + Grid From 44ae8d34b989a7f677ce6a9a8fc8a27234167cd0 Mon Sep 17 00:00:00 2001 From: MrStevns Date: Wed, 8 Jun 2022 20:42:39 +0200 Subject: [PATCH 5/5] Removed conflict markers --- app/src/mainwindow2.cpp | 3 --- app/src/mainwindow2.h | 7 ------- 2 files changed, 10 deletions(-) diff --git a/app/src/mainwindow2.cpp b/app/src/mainwindow2.cpp index 002673f383..272ebef216 100644 --- a/app/src/mainwindow2.cpp +++ b/app/src/mainwindow2.cpp @@ -29,12 +29,9 @@ GNU General Public License for more details. #include #include #include -<<<<<<< HEAD #include #include -======= #include ->>>>>>> bd2acacd (Add 3 Toolbars: main, view and overlay) // core_lib headers #include "pencildef.h" diff --git a/app/src/mainwindow2.h b/app/src/mainwindow2.h index f523b954d5..8585fb6d1c 100644 --- a/app/src/mainwindow2.h +++ b/app/src/mainwindow2.h @@ -162,11 +162,7 @@ private slots: RecentFileMenu* mRecentFileMenu = nullptr; PreferencesDialog* mPrefDialog = nullptr; //PreviewWidget* mPreview = nullptr; -<<<<<<< HEAD TimeLine* mTimeLine = nullptr; -======= - TimeLine* mTimeLine = nullptr; // be public temporarily ->>>>>>> bd2acacd (Add 3 Toolbars: main, view and overlay) ColorInspector* mColorInspector = nullptr; OnionSkinWidget* mOnionSkinWidget = nullptr; QToolBar* mMainToolbar = nullptr; @@ -179,11 +175,8 @@ private slots: PegBarAlignmentDialog* mPegAlign = nullptr; LayerOpacityDialog* mLayerOpacityDialog = nullptr; -<<<<<<< HEAD -======= void createToolbars(); private: ->>>>>>> bd2acacd (Add 3 Toolbars: main, view and overlay) ActionCommands* mCommands = nullptr; QList mDockWidgets; QList mToolbars;