Lost 'add directory' icon on merge - added it again

emsec · Dec 19, 2023 · 088fda9 · 088fda9
1 parent 244ba02
commit 088fda9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/plugins/gui/include/gui/context_manager_widget/context_manager_widget.h b/plugins/gui/include/gui/context_manager_widget/context_manager_widget.h
@@ -62,6 +62,7 @@ namespace hal
         Q_OBJECT
         Q_PROPERTY(QString disabledIconStyle READ disabledIconStyle WRITE setDisabledIconStyle)
         Q_PROPERTY(QString newViewIconPath READ newViewIconPath WRITE setNewViewIconPath)
+        Q_PROPERTY(QString newDirIconPath READ newDirIconPath WRITE setNewDirIconPath)
         Q_PROPERTY(QString newViewIconStyle READ newViewIconStyle WRITE setNewViewIconStyle)
         Q_PROPERTY(QString renameIconPath READ renameIconPath WRITE setRenameIconPath)
         Q_PROPERTY(QString renameIconStyle READ renameIconStyle WRITE setRenameIconStyle)
@@ -128,6 +129,7 @@ namespace hal
         ///@{
         QString disabledIconStyle() const;
         QString newViewIconPath() const;
+        QString newDirIconPath() const;
         QString newViewIconStyle() const;
         QString renameIconPath() const;
         QString renameIconStyle() const;
@@ -148,6 +150,7 @@ namespace hal
         void setDisabledIconStyle(const QString &path);
         void setNewViewIconPath(const QString &path);
         void setNewViewIconStyle(const QString &style);
+        void setNewDirIconPath(const QString &path);
         void setRenameIconPath(const QString &path);
         void setRenameIconStyle(const QString &style);
         void setDeleteIconPath(const QString &path);
@@ -196,6 +199,7 @@ namespace hal
 
         QAction* mNewViewAction;
         QString mNewViewIconPath;
+        QString mNewDirIconPath;
         QString mNewViewIconStyle;
 
         QAction* mRenameAction;

diff --git a/plugins/gui/src/context_manager_widget/context_manager_widget.cpp b/plugins/gui/src/context_manager_widget/context_manager_widget.cpp
@@ -47,7 +47,7 @@ namespace hal
 
         mOpenAction->setIcon(gui_utility::getStyledSvgIcon(mOpenIconStyle, mOpenIconPath));
         mNewViewAction->setIcon(gui_utility::getStyledSvgIcon(mNewViewIconStyle, mNewViewIconPath));
-        mNewDirectoryAction->setIcon(gui_utility::getStyledSvgIcon(mNewViewIconStyle, mNewViewIconPath));
+        mNewDirectoryAction->setIcon(gui_utility::getStyledSvgIcon(mNewViewIconStyle, mNewDirIconPath));
         mRenameAction->setIcon(gui_utility::getStyledSvgIcon(mRenameIconStyle, mRenameIconPath));
         mDuplicateAction->setIcon(gui_utility::getStyledSvgIcon(mDuplicateIconStyle, mDuplicateIconPath));
         mDeleteAction->setIcon(gui_utility::getStyledSvgIcon(mDeleteIconStyle, mDeleteIconPath));
@@ -376,6 +376,11 @@ namespace hal
         return mNewViewIconPath;
     }
 
+    QString ContextManagerWidget::newDirIconPath() const
+    {
+        return mNewDirIconPath;
+    }
+
     QString ContextManagerWidget::newViewIconStyle() const
     {
         return mNewViewIconStyle;
@@ -446,6 +451,11 @@ namespace hal
         mNewViewIconPath = path;
     }
 
+    void ContextManagerWidget::setNewDirIconPath(const QString& path)
+    {
+        mNewDirIconPath = path;
+    }
+
     void ContextManagerWidget::setNewViewIconStyle(const QString& style)
     {
         mNewViewIconStyle = style;