Compare commits
2 Commits
feat/nativ
...
fix/pull-p
| Author | SHA1 | Date | |
|---|---|---|---|
| e83769090b | |||
| 6c9789fdf3 |
@@ -990,8 +990,10 @@ def _check_pull_conflicts(part_number, local_path, doc=None):
|
||||
conflicts = []
|
||||
|
||||
# Check for unsaved changes in an open document
|
||||
if doc is not None and doc.IsModified():
|
||||
conflicts.append("Document has unsaved local changes.")
|
||||
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.")
|
||||
|
||||
# Check local revision vs server latest
|
||||
if doc is not None:
|
||||
@@ -1213,7 +1215,7 @@ class Silo_Pull:
|
||||
progress = QtGui.QProgressDialog(
|
||||
f"Downloading {part_number} rev {rev_num}...", "Cancel", 0, 100
|
||||
)
|
||||
progress.setWindowModality(2) # Qt.WindowModal
|
||||
progress.setWindowModality(QtCore.Qt.WindowModal)
|
||||
progress.setMinimumDuration(0)
|
||||
progress.setValue(0)
|
||||
|
||||
|
||||
@@ -392,10 +392,8 @@ class SiloOrigin:
|
||||
obj.SiloPartNumber, str(file_path), properties, comment=""
|
||||
)
|
||||
|
||||
# Clear modified flag (Modified is on Gui.Document, not App.Document)
|
||||
gui_doc = FreeCADGui.getDocument(doc.Name)
|
||||
if gui_doc:
|
||||
gui_doc.Modified = False
|
||||
# Clear modified flag
|
||||
doc.Modified = False
|
||||
|
||||
return True
|
||||
except Exception as e:
|
||||
|
||||
Reference in New Issue
Block a user