pencil2d · MrStevns · Jun 8, 2022 · Sep 16, 2020 · Sep 16, 2020 · Sep 16, 2020
diff --git a/app/data/app.qrc b/app/data/app.qrc
@@ -35,6 +35,10 @@
         <file>icons/exit.png</file>
         <file>icons/cut.png</file>
         <file>icons/prefs-shortcuts.png</file>
+		<file>icons/grid.png</file>
+		<file>icons/zoom-in.png</file>
+		<file>icons/zoom-out.png</file>
+		<file>icons/zoom-reset.png</file>
         <file>background/checkerboard.png</file>
         <file>icons/controls/stop.png</file>
         <file>icons/controls/sound-disabled.png</file>

diff --git a/app/data/icons/unused/grid-a.png → app/data/icons/grid.png b/app/data/icons/unused/grid-a.png → app/data/icons/grid.png
diff --git a/app/data/icons/zoom-in.png b/app/data/icons/zoom-in.png
diff --git a/app/data/icons/zoom-out.png b/app/data/icons/zoom-out.png
diff --git a/app/data/icons/zoom-reset.png b/app/data/icons/zoom-reset.png
diff --git a/app/src/mainwindow2.cpp b/app/src/mainwindow2.cpp
@@ -31,6 +31,7 @@ GNU General Public License for more details.
 #include <QDateTime>
 #include <QLabel>
 #include <QClipboard>
+#include <QToolBar>
 
 // core_lib headers
 #include "pencildef.h"
@@ -120,6 +121,7 @@ MainWindow2::MainWindow2(QWidget* parent) :
 
     createDockWidgets();
     createMenus();
+    createToolbars();
     setupKeyboardShortcuts();
 
     readSettings();
@@ -1587,3 +1589,37 @@ void MainWindow2::startProjectRecovery(int result)
     const QString text = tr("Please save your work immediately to prevent loss of data");
     QMessageBox::information(this, title, QString("<h4>%1</h4>%2").arg(title, text));
 }
+
+void MainWindow2::createToolbars()
+{
+    mMainToolbar = addToolBar(tr("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(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(tr("Overlay Toolbar"));
+    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());
+    }
+}
diff --git a/app/src/mainwindow2.h b/app/src/mainwindow2.h
@@ -22,6 +22,7 @@ GNU General Public License for more details.
 
 template<typename T> class QList;
 class QActionGroup;
+class QToolBar;
 class Object;
 class Editor;
 class ScribbleArea;
@@ -164,15 +165,21 @@ private slots:
     TimeLine*             mTimeLine = nullptr;
     ColorInspector*       mColorInspector = nullptr;
     OnionSkinWidget*      mOnionSkinWidget = nullptr;
+    QToolBar*             mMainToolbar = nullptr;
+    QToolBar*             mViewToolbar = nullptr;
+    QToolBar*             mOverlayToolbar = nullptr;
 
     // backup
     BackupElement* mBackupAtSave = nullptr;
 
     PegBarAlignmentDialog* mPegAlign = nullptr;
     LayerOpacityDialog* mLayerOpacityDialog = nullptr;
 
+    void createToolbars();
+private:
     ActionCommands* mCommands = nullptr;
     QList<BaseDockWidget*> mDockWidgets;
+    QList<QToolBar*> mToolbars;
 
     QIcon mStartIcon;
     QIcon mStopIcon;

diff --git a/app/ui/mainwindow2.ui b/app/ui/mainwindow2.ui
@@ -479,7 +479,7 @@
   <action name="actionZoom_In">
    <property name="icon">
     <iconset resource="../data/app.qrc">
-     <normaloff>:/icons/magnify.png</normaloff>:/icons/magnify.png</iconset>
+     <normaloff>:/icons/zoom-in.png</normaloff>:/icons/zoom-in.png</iconset>
    </property>
    <property name="text">
     <string>Zoom In</string>
@@ -488,7 +488,7 @@
   <action name="actionZoom_Out">
    <property name="icon">
     <iconset resource="../data/app.qrc">
-     <normaloff>:/icons/magnify.png</normaloff>:/icons/magnify.png</iconset>
+     <normaloff>:/icons/zoom-out.png</normaloff>:/icons/zoom-out.png</iconset>
    </property>
    <property name="text">
     <string>Zoom Out</string>
@@ -505,6 +505,10 @@
    </property>
   </action>
   <action name="actionReset_View">
+   <property name="icon">
+    <iconset resource="../data/app.qrc">
+     <normaloff>:/icons/zoom-reset.png</normaloff>:/icons/zoom-reset.png</iconset>
+   </property>
    <property name="text">
     <string>Reset</string>
    </property>
@@ -545,6 +549,10 @@
    <property name="checkable">
     <bool>true</bool>
    </property>
+   <property name="icon">
+    <iconset resource="../data/app.qrc">
+     <normaloff>:/icons/grid.png</normaloff>:/icons/grid.png</iconset>
+   </property>
    <property name="text">
     <string>Grid</string>
    </property>