From c2df7a83db9b2e8e49f830a00918d3dfc3a115fa Mon Sep 17 00:00:00 2001
From: tarman3 <joice501790018@tutamail.com>
Date: Thu, 8 May 2025 10:47:48 +0300
Subject: [PATCH] Macro: Button to open folder with macros

---
 src/Gui/Dialogs/DlgMacroExecute.ui     | 82 +++++++++++++++-----------
 src/Gui/Dialogs/DlgMacroExecuteImp.cpp | 13 ++++
 src/Gui/Dialogs/DlgMacroExecuteImp.h   |  1 +
 3 files changed, 62 insertions(+), 34 deletions(-)

diff --git a/src/Gui/Dialogs/DlgMacroExecute.ui b/src/Gui/Dialogs/DlgMacroExecute.ui
index 3be506ef36..8ddbff5ac7 100644
--- a/src/Gui/Dialogs/DlgMacroExecute.ui
+++ b/src/Gui/Dialogs/DlgMacroExecute.ui
@@ -313,42 +313,55 @@
        </item>
       </layout>
      </item>
-     <item row="1" column="0">
-      <widget class="QGroupBox" name="DestinationGroup">
-       <property name="title">
-        <string>User macros location:</string>
-       </property>
-       <layout class="QGridLayout">
-        <property name="leftMargin">
-         <number>9</number>
-        </property>
-        <property name="topMargin">
-         <number>9</number>
-        </property>
-        <property name="rightMargin">
-         <number>9</number>
-        </property>
-        <property name="bottomMargin">
-         <number>9</number>
-        </property>
-        <property name="spacing">
-         <number>6</number>
-        </property>
-        <item row="0" column="0">
-         <widget class="Gui::FileChooser" name="fileChooser">
-          <property name="focusPolicy">
-           <enum>Qt::StrongFocus</enum>
-          </property>
-          <property name="mode">
-           <enum>Gui::FileChooser::Directory</enum>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
     </layout>
    </item>
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="DestinationGroup">
+     <property name="title">
+      <string>User macros location:</string>
+     </property>
+     <layout class="QGridLayout">
+      <property name="leftMargin">
+       <number>9</number>
+      </property>
+      <property name="topMargin">
+       <number>9</number>
+      </property>
+      <property name="rightMargin">
+       <number>9</number>
+      </property>
+      <property name="bottomMargin">
+       <number>9</number>
+      </property>
+      <property name="spacing">
+       <number>6</number>
+      </property>
+      <item row="0" column="0">
+       <widget class="Gui::FileChooser" name="fileChooser">
+        <property name="focusPolicy">
+         <enum>Qt::StrongFocus</enum>
+        </property>
+        <property name="mode">
+         <enum>Gui::FileChooser::Mode::Directory</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QPushButton" name="folderButton">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
+        <property name="toolTip">
+         <string>Open folder with macros in system file manager.</string>
+        </property>
+        <property name="text">
+         <string>Open folder</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
@@ -371,6 +384,7 @@
   <tabstop>toolbarButton</tabstop>
   <tabstop>addonsButton</tabstop>
   <tabstop>fileChooser</tabstop>
+  <tabstop>folderButton</tabstop>
  </tabstops>
  <resources/>
  <connections>
diff --git a/src/Gui/Dialogs/DlgMacroExecuteImp.cpp b/src/Gui/Dialogs/DlgMacroExecuteImp.cpp
index cf90e85acd..1c7649a24b 100644
--- a/src/Gui/Dialogs/DlgMacroExecuteImp.cpp
+++ b/src/Gui/Dialogs/DlgMacroExecuteImp.cpp
@@ -22,6 +22,7 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+#include <QDesktopServices>
 #include <QInputDialog>
 #include <QLabel>
 #include <QMessageBox>
@@ -152,6 +153,8 @@ void DlgMacroExecuteImp::setupConnections()
             this, &DlgMacroExecuteImp::onToolbarButtonClicked);
     connect(ui->addonsButton, &QPushButton::clicked,
             this, &DlgMacroExecuteImp::onAddonsButtonClicked);
+    connect(ui->folderButton, &QPushButton::clicked,
+            this, &DlgMacroExecuteImp::onFolderButtonClicked);
     connect(ui->userMacroListBox, &QTreeWidget::currentItemChanged,
             this, &DlgMacroExecuteImp::onUserMacroListBoxCurrentItemChanged);
     connect(ui->systemMacroListBox, &QTreeWidget::currentItemChanged,
@@ -1064,4 +1067,14 @@ void DlgMacroExecuteImp::onAddonsButtonClicked()
     this->fillUpList();
 }
 
+/**
+ * convenience link button to open folder with macros
+ * from within macro dialog
+ */
+void DlgMacroExecuteImp::onFolderButtonClicked()
+{
+    QString path = QString::fromStdString(App::Application::getUserMacroDir());
+    QUrl url = QUrl::fromLocalFile(path);
+    QDesktopServices::openUrl(url);
+}
 #include "moc_DlgMacroExecuteImp.cpp"
diff --git a/src/Gui/Dialogs/DlgMacroExecuteImp.h b/src/Gui/Dialogs/DlgMacroExecuteImp.h
index 3be7b4b0a4..cf12d5add1 100644
--- a/src/Gui/Dialogs/DlgMacroExecuteImp.h
+++ b/src/Gui/Dialogs/DlgMacroExecuteImp.h
@@ -60,6 +60,7 @@ private:
     void onDuplicateButtonClicked();
     void onToolbarButtonClicked();
     void onAddonsButtonClicked();
+    void onFolderButtonClicked();
 
     void onUserMacroListBoxCurrentItemChanged(QTreeWidgetItem*);
     void onSystemMacroListBoxCurrentItemChanged(QTreeWidgetItem*);