Merge branch 'main' into feat/native-start-panel-167

Merge pull request 'fix: use Gui.Document.Modified instead of App.Document.Modified' (#14 ) from fix/save-modified-attribute into main
Reviewed-on: #14
2026-02-10 16:40:49 +00:00 · 2026-02-10 12:57:29 +00:00 · 2026-02-10 12:57:16 +00:00 · 2026-02-09 18:40:42 -06:00 · 2026-02-09 18:40:18 -06:00
2 changed files with 7 additions and 7 deletions
--- a/freecad/silo_commands.py
+++ b/freecad/silo_commands.py
@@ -990,10 +990,8 @@ def _check_pull_conflicts(part_number, local_path, doc=None):
    conflicts = []

    # Check for unsaved changes in an open document
-    if doc is not None:
-        gui_doc = FreeCADGui.getDocument(doc.Name) if doc.Name else None
-        if gui_doc and gui_doc.Modified:
-            conflicts.append("Document has unsaved local changes.")
+    if doc is not None and doc.IsModified():
+        conflicts.append("Document has unsaved local changes.")

    # Check local revision vs server latest
    if doc is not None:
@@ -1215,7 +1213,7 @@ class Silo_Pull:
        progress = QtGui.QProgressDialog(
            f"Downloading {part_number} rev {rev_num}...", "Cancel", 0, 100
        )
-        progress.setWindowModality(QtCore.Qt.WindowModal)
+        progress.setWindowModality(2)  # Qt.WindowModal
        progress.setMinimumDuration(0)
        progress.setValue(0)

--- a/freecad/silo_origin.py
+++ b/freecad/silo_origin.py
@@ -392,8 +392,10 @@ class SiloOrigin:
                obj.SiloPartNumber, str(file_path), properties, comment=""
            )

-            # Clear modified flag
-            doc.Modified = False
+            # Clear modified flag (Modified is on Gui.Document, not App.Document)
+            gui_doc = FreeCADGui.getDocument(doc.Name)
+            if gui_doc:
+                gui_doc.Modified = False

            return True
        except Exception as e:
Author	SHA1	Message	Date
forbes	af7eab3a70	Merge branch 'main' into feat/native-start-panel-167	2026-02-10 16:40:49 +00:00
forbes	6d231e80dd	Merge pull request 'fix: use Gui.Document.Modified instead of App.Document.Modified' (#14 ) from fix/save-modified-attribute into main Reviewed-on: #14	2026-02-10 12:57:29 +00:00
forbes	a7ef5f195b	Merge branch 'main' into fix/save-modified-attribute	2026-02-10 12:57:16 +00:00
Zoe Forbes	7cf5867a7a	fix: use Gui.Document.Modified instead of App.Document.Modified (#13 ) App.Document has no 'Modified' attribute — it only exists on Gui.Document. This caused every Silo save to fail with: Silo save failed: 'App.Document' object has no attribute 'Modified' The save itself succeeded but the modified flag was never cleared, so the document always appeared unsaved.	2026-02-09 18:40:42 -06:00
Zoe Forbes	9a6d1dfbd2	fix: use Gui.Document.Modified instead of App.Document.Modified (#13 ) App.Document has no 'Modified' attribute — it only exists on Gui.Document. This caused every Silo save to fail with: Silo save failed: 'App.Document' object has no attribute 'Modified' The save itself succeeded but the modified flag was never cleared, so the document always appeared unsaved.	2026-02-09 18:40:18 -06:00