Merge branch 'FreeCAD:main' into main

Author: trilbytim

.github/workflows/sub_buildPixi.yml

@@ -108,7 +108,7 @@ jobs:
 
     - uses: prefix-dev/[email protected]
       with:
-        pixi-version: v0.34.0
+        pixi-version: v0.39.4
         cache: false
 
     - name: Restore Compiler Cache

pixi.lock

@@ -3,7 +3,7 @@ name = "FreeCAD"
 version = "0.22.0"
 description = "pixi instructions for FreeCAD"
 authors = ["looooo <[email protected]>"]
-channels = ["conda-forge/label/pivy_rc", "conda-forge"]
+channels = ["conda-forge"]
 platforms = [ "linux-64", "linux-aarch64", "osx-64", "osx-arm64", "win-64" ]
 
 [dependencies]
@@ -34,7 +34,7 @@ ply = "*"
 pre-commit = "*"
 pybind11 = "*"
 pyside6 = "*"
-python = "3.12"
+python = "3.13"
 pyyaml = "*"
 qt6-main = "*"
 scipy = ">=1.14.1,<2"
@@ -75,6 +75,7 @@ sed = "*"
 sysroot_linux-64 = "*"
 xorg-x11-server-common-cos6-x86_64 = "*"
 xorg-x11-server-xvfb-cos6-x86_64 = "*"
+xorg-xproto = "*"
 
 ## Linux Dependencies (aarch64)
 [target.linux-aarch64.dependencies]
@@ -108,6 +109,7 @@ sed = "*"
 sysroot_linux-aarch64 = "*"
 xorg-x11-server-common-cos7-aarch64 = "*"
 xorg-x11-server-xvfb-cos7-aarch64 = "*"
+xorg-xproto = "*"
 
 ## macOS Dependencies (Intel)
 [target.osx-64.dependencies]

pixi.toml

@@ -2252,6 +2252,7 @@ void parseProgramOptions(int ac, char ** av, const string& exe, variables_map& v
     ("run-test,t", value<string>()->implicit_value(""),"Run a given test case (use 0 (zero) to run all tests). If no argument is provided then return list of all available tests.")
     ("run-open,r", value<string>()->implicit_value(""),"Run a given test case (use 0 (zero) to run all tests). If no argument is provided then return list of all available tests.  Keeps UI open after test(s) complete.")
     ("module-path,M", value< vector<string> >()->composing(),"Additional module paths")
+    ("macro-path,E", value< vector<string> >()->composing(),"Additional macro paths")
     ("python-path,P", value< vector<string> >()->composing(),"Additional python paths")
     ("disable-addon", value< vector<string> >()->composing(),"Disable a given addon.")
     ("single-instance", "Allow to run a single instance of the application")
@@ -2294,7 +2295,7 @@ void parseProgramOptions(int ac, char ** av, const string& exe, variables_map& v
 #endif
     ;
 
-   
+
     //0000723: improper handling of qt specific command line arguments
     std::vector<std::string> args;
     bool merge=false;
@@ -2429,6 +2430,15 @@ void processProgramOptions(const variables_map& vm, std::map<std::string,std::st
         mConfig["AdditionalModulePaths"] = temp;
     }
 
+    if (vm.count("macro-path")) {
+        vector<string> Macros = vm["macro-path"].as< vector<string> >();
+        string temp;
+        for (const auto & It : Macros)
+            temp += It + ";";
+        temp.erase(temp.end()-1);
+        mConfig["AdditionalMacroPaths"] = temp;
+    }
+
     if (vm.count("python-path")) {
         vector<string> Paths = vm["python-path"].as< vector<string> >();
         for (const auto & It : Paths)
@@ -2593,7 +2603,7 @@ void Application::initConfig(int argc, char ** argv)
 
     // extract home paths
     ExtractUserPath();
-    
+
     if (vm.count("safe-mode")) {
         SafeMode::StartSafeMode();
     }

src/App/Application.cpp

@@ -98,7 +98,8 @@ def InitApplications():
     LibFcDir = os.path.realpath(LibFcDir)
     if (os.path.exists(LibFcDir) and not LibFcDir in libpaths):
         libpaths.append(LibFcDir)
-    AddPath = FreeCAD.ConfigGet("AdditionalModulePaths").split(";")
+    AddPath = FreeCAD.ConfigGet("AdditionalModulePaths").split(";") + \
+            FreeCAD.ConfigGet("AdditionalMacroPaths").split(";")
     HomeMod = FreeCAD.getUserAppDataDir()+"Mod"
     HomeMod = os.path.realpath(HomeMod)
     MacroStd = App.getUserMacroDir(False)

src/App/FreeCADInit.py

@@ -534,6 +534,40 @@ void AboutDialog::linkActivated(const QUrl& link)
     licenseView->setSource(link);
 }
 
+void AboutDialog::addModuleInfo(QTextStream& str, const QString& modPath, bool& firstMod)
+{
+    QFileInfo mod(modPath);
+    if (mod.isHidden()) {  // Ignore hidden directories
+        return;
+    }
+    if (firstMod) {
+        firstMod = false;
+        str << "Installed mods: \n";
+    }
+    str << "  * " << (mod.isDir() ? QDir(modPath).dirName() : mod.fileName());
+    try {
+        auto metadataFile =
+            boost::filesystem::path(mod.absoluteFilePath().toStdString()) / "package.xml";
+        if (boost::filesystem::exists(metadataFile)) {
+            App::Metadata metadata(metadataFile);
+            if (metadata.version() != App::Meta::Version()) {
+                str << QLatin1String(" ") + QString::fromStdString(metadata.version().str());
+            }
+        }
+    }
+    catch (const Base::Exception& e) {
+        auto what = QString::fromUtf8(e.what()).trimmed().replace(QChar::fromLatin1('\n'),
+                                                                  QChar::fromLatin1(' '));
+        str << " (Malformed metadata: " << what << ")";
+    }
+    QFileInfo disablingFile(mod.absoluteFilePath(), QString::fromLatin1("ADDON_DISABLED"));
+    if (disablingFile.exists()) {
+        str << " (Disabled)";
+    }
+
+    str << "\n";
+}
+
 void AboutDialog::copyToClipboard()
 {
     QString data;
@@ -680,28 +714,16 @@ void AboutDialog::copyToClipboard()
     bool firstMod = true;
     if (fs::exists(modDir) && fs::is_directory(modDir)) {
         for (const auto& mod : fs::directory_iterator(modDir)) {
-            auto dirName = mod.path().filename().string();
-            if (dirName[0] == '.') {  // Ignore dot directories
-                continue;
-            }
-            if (firstMod) {
-                firstMod = false;
-                str << "Installed mods: \n";
-            }
-            str << "  * " << QString::fromStdString(mod.path().filename().string());
-            auto metadataFile = mod.path() / "package.xml";
-            if (fs::exists(metadataFile)) {
-                App::Metadata metadata(metadataFile);
-                if (metadata.version() != App::Meta::Version()) {
-                    str << QLatin1String(" ") + QString::fromStdString(metadata.version().str());
-                }
-            }
-            auto disablingFile = mod.path() / "ADDON_DISABLED";
-            if (fs::exists(disablingFile)) {
-                str << " (Disabled)";
-            }
+            auto dirName = mod.path().string();
+            addModuleInfo(str, QString::fromStdString(dirName), firstMod);
+        }
+    }
+    auto additionalModules = config.find("AdditionalModulePaths");
 
-            str << "\n";
+    if (additionalModules != config.end()) {
+        auto mods = QString::fromStdString(additionalModules->second).split(QChar::fromLatin1(';'));
+        for (const auto& mod : mods) {
+            addModuleInfo(str, mod, firstMod);
         }
     }
 

src/Gui/DlgAbout.cpp

@@ -26,6 +26,7 @@
 #include <QDialog>
 #include <QTextBrowser>
 #include <Gui/MDIView.h>
+#include <qlocale.h>
 
 namespace Gui
 {
@@ -88,6 +89,7 @@ class GuiExport AboutDialog: public QDialog
     void showCollectionInformation();
     void showPrivacyPolicy();
     void showOrHideImage(const QRect& rect);
+    void addModuleInfo(QTextStream& inout_str, const QString& modPath, bool& inout_first);
 
 protected:
     QPixmap aboutImage() const;

src/Gui/DlgAbout.h

@@ -60,14 +60,30 @@ namespace Dialog
 class MacroItem: public QTreeWidgetItem
 {
 public:
-    MacroItem(QTreeWidget* widget, bool systemwide)
+    MacroItem(QTreeWidget* widget, bool systemwide, const QString& dirPath)
         : QTreeWidgetItem(widget)
         , systemWide(systemwide)
+        , dirPath(dirPath)
     {}
 
+    /**
+     * Acts same as setText method but additionally set toolTip with text of
+     * absolute file path. There may be different macros with same names from
+     * different system paths. So it could be helpful for user to show where
+     * exactly macro is placed.
+     */
+    void setFileName(int column, const QString& text)
+    {
+        QFileInfo file(dirPath, text);
+
+        setToolTip(column, file.absoluteFilePath());
+        return QTreeWidgetItem::setText(column, text);
+    }
+
     ~MacroItem() override = default;
 
     bool systemWide;
+    QString dirPath;
 };
 }  // namespace Dialog
 }  // namespace Gui
@@ -229,23 +245,37 @@ QStringList DlgMacroExecuteImp::filterFiles(const QString& folder)
  * Fills up the list with macro files found in the specified location
  * that have been filtered by both filename and by content
  */
-void DlgMacroExecuteImp::fillUpList()
+void DlgMacroExecuteImp::fillUpListForDir(const QString& dirPath, bool systemWide)
 {
-    QStringList filteredByContent = this->filterFiles(this->macroPath);
+    QStringList filteredByContent = this->filterFiles(dirPath);
     ui->userMacroListBox->clear();
-    for (auto fn : filteredByContent) {
-        auto item = new MacroItem(ui->userMacroListBox, false);
-        item->setText(0, fn);
+    for (auto& fn : filteredByContent) {
+        auto* parent = systemWide ? ui->systemMacroListBox : ui->userMacroListBox;
+        auto item = new MacroItem(parent, systemWide, dirPath);
+        item->setFileName(0, fn);
     }
+}
+
+/**
+ * Fills up the list with macro files found in all system paths and specified by
+ * user location that have been filtered by both filename and by content
+ */
+void DlgMacroExecuteImp::fillUpList()
+{
+    fillUpListForDir(this->macroPath, false);
 
     QString dirstr =
         QString::fromStdString(App::Application::getHomePath()) + QString::fromLatin1("Macro");
-    filteredByContent = this->filterFiles(dirstr);
-
-    ui->systemMacroListBox->clear();
-    for (auto fn : filteredByContent) {
-        auto item = new MacroItem(ui->systemMacroListBox, true);
-        item->setText(0, fn);
+    fillUpListForDir(dirstr, true);
+
+    auto& config = App::Application::Config();
+    auto additionalMacros = config.find("AdditionalMacroPaths");
+    if (additionalMacros != config.end()) {
+        QString dirsstrs = QString::fromStdString(additionalMacros->second);
+        QStringList dirs = dirsstrs.split(QChar::fromLatin1(';'));
+        for (const auto& dirstr : dirs) {
+            fillUpListForDir(dirstr, true);
+        }
     }
 }
 
@@ -392,17 +422,7 @@ void DlgMacroExecuteImp::accept()
 
     auto mitem = static_cast<MacroItem*>(item);
 
-    QDir dir;
-
-    if (!mitem->systemWide) {
-        dir = QDir(this->macroPath);
-    }
-    else {
-        QString dirstr =
-            QString::fromStdString(App::Application::getHomePath()) + QString::fromLatin1("Macro");
-        dir = QDir(dirstr);
-    }
-
+    QDir dir(mitem->dirPath);
     QFileInfo fi(dir, item->text(0));
     try {
         getMainWindow()->setCursor(Qt::WaitCursor);
@@ -444,26 +464,23 @@ void DlgMacroExecuteImp::onFileChooserFileNameChanged(const QString& fn)
  */
 void DlgMacroExecuteImp::onEditButtonClicked()
 {
-    QDir dir;
     QTreeWidgetItem* item = nullptr;
 
     int index = ui->tabMacroWidget->currentIndex();
     if (index == 0) {  // user-specific
         item = ui->userMacroListBox->currentItem();
-        dir.setPath(this->macroPath);
     }
     else {
         // index == 1 system-wide
         item = ui->systemMacroListBox->currentItem();
-        dir.setPath(QString::fromStdString(App::Application::getHomePath())
-                    + QString::fromLatin1("Macro"));
     }
 
     if (!item) {
         return;
     }
 
     auto mitem = static_cast<MacroItem*>(item);
+    QDir dir(mitem->dirPath);
 
     QString file = QString::fromLatin1("%1/%2").arg(dir.absolutePath(), item->text(0));
     auto editor = new PythonEditor();

src/Gui/DlgMacroExecuteImp.cpp

@@ -69,6 +69,7 @@ class DlgMacroExecuteImp : public QDialog, public Gui::WindowParameter
 
 protected:
     void fillUpList();
+    void fillUpListForDir(const QString& dirPath, bool systemWide);
     QStringList filterFiles(const QString&);
 
 protected:

src/Gui/DlgMacroExecuteImp.h

@@ -289,7 +289,9 @@ PreferencePage* DlgPreferencesImp::createPreferencePage(const std::string& pageN
 
     auto resetMargins = [](QWidget* widget) {
         widget->setContentsMargins(0, 0, 0, 0);
-        widget->layout()->setContentsMargins(0, 0, 0, 0);
+        if (auto layout = widget->layout()) {
+            layout->setContentsMargins(0, 0, 0, 0);
+        }
     };
 
     // settings layout already takes care for margins, we need to reset everything to 0