Skip to content

Commit 06975b2

Browse files
committed
Add ext .ows to filename automatically during saving new file.
- reverts commit 4f02bf8. - Add question MessageBox when overriding file - changed place when `filename` is changed to `filename`.ows in compare to reverted commit.
1 parent cec649d commit 06975b2

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

orangecanvas/application/canvasmain.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1558,8 +1558,15 @@ def save_scheme_as(self):
15581558
# dialog.exec waits for user action
15591559
if dialog.exec():
15601560
filename = dialog.selectedFiles()[0]
1561+
# Enforcing ".ows" extension during saving file.
1562+
filename = filename if str(filename).endswith('.ows') else f"{filename}.ows"
1563+
do_override = QMessageBox.question(
1564+
self, "Overwrite file?",
1565+
f"File {os.path.split(filename)[1]} already exists."
1566+
"\nOverwrite?"
1567+
) == QMessageBox.Yes if os.path.exists(filename) else True
15611568
settings.setValue("last-scheme-dir", os.path.dirname(filename))
1562-
if self.save_scheme_to(curr_scheme, filename):
1569+
if do_override and self.save_scheme_to(curr_scheme, filename):
15631570
document.setPath(filename)
15641571
document.setModified(False)
15651572
self.add_recent_scheme(curr_scheme.title, document.path())
@@ -1575,9 +1582,6 @@ def save_scheme_to(self, scheme, filename):
15751582
`True`, else show a message to the user explaining the error and
15761583
return `False`.
15771584
"""
1578-
# Enforcing ".ows" extension during saving file.
1579-
# see .../biolab/orange-canvas-core/pull/330
1580-
filename = filename if str(filename).endswith('.ows') else f"{filename}.ows"
15811585
dirname, basename = os.path.split(filename)
15821586
title = scheme.title or "untitled"
15831587

0 commit comments

Comments
 (0)