Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use dialog for external changes #1309

Merged
merged 46 commits into from
Jul 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
0987e69
Ignore external changes after "Continue"
Mar 23, 2023
3cc29cf
Reload or Overwrite options
Mar 24, 2023
d3fdc67
Merge branch 'master' into fix-external-edit
Mar 24, 2023
9db86e1
Merge branch 'master' into fix-external-edit
Mar 27, 2023
34cb3f2
Merge branch 'master' into fix-external-edit
Mar 28, 2023
d6d16f4
Add AskSaveDialog.vala
Apr 11, 2023
e9f3e3a
Introduce "locked" document state
Apr 11, 2023
3cedc1f
Lock document during loading; unlock after if writable
Apr 11, 2023
88c2bbf
Stop some functions if locked
Apr 11, 2023
bad0f37
Modify save and save as functions for locked
Apr 11, 2023
3c821f2
Make some funcs private
Apr 11, 2023
0d35093
Modify check file status function for locked
Apr 11, 2023
d3e300e
Rewrite ask save location for dialog and locked
Apr 11, 2023
eef32ab
Compile dialog
Apr 11, 2023
453ccc4
Minor improvements
Apr 11, 2023
2411124
Start unlocked after loading
Apr 12, 2023
3826760
Handle closing changed locked documents
Apr 12, 2023
ee5cbdb
Update saved status when locked status changes
Apr 12, 2023
a2c3a6d
Amend tab tooltip when locked
Apr 12, 2023
984f97b
Merge branch 'master' into fix-external-edit
zeebok Apr 15, 2023
4658618
Merge branch 'fix-external-edit' into ask-savelocation-dialog
Apr 16, 2023
fb3e173
Rework external changes with dialog
Apr 16, 2023
9e2bc94
Merge branch 'master' into ask-savelocation-dialog
Apr 16, 2023
31c6c66
Merge branch 'ask-savelocation-dialog' into asksave-externalchange-di…
Apr 16, 2023
56aa99f
Connect focus-in handler with focus-out handler
Apr 17, 2023
e8bc76f
Merge branch 'master' into asksave-externalchange-dialog
May 25, 2023
d984c2d
Merge branch 'master' into asksave-externalchange-dialog
May 31, 2023
4b87600
Fix focus in and overwrite
May 31, 2023
b4ae35b
Inline AskExternalChanges dialog
May 31, 2023
4e3bc10
Merge branch 'master' into asksave-externalchange-dialog
Jun 3, 2023
070314a
Do not throw dialog if there are no unsaved internal edits
Jun 3, 2023
7e17654
Remove unused class
Jun 3, 2023
9534e3b
Move some code back to original position
Jun 3, 2023
3b141f9
Update last_save_content after loading external changes
Jun 3, 2023
694bd94
Check for external changes even when internal changes
Jun 3, 2023
22710cc
Only save deleted file if there are unsaved changes
Jun 6, 2023
206a752
Merge branch 'master' into asksave-externalchange-dialog
Jun 16, 2023
8432737
Merge branch 'master' into asksave-externalchange-dialog
zeebok Jul 3, 2023
1a51238
Update src/Services/Document.vala
Jul 3, 2023
50db488
Merge branch 'master' into asksave-externalchange-dialog
zeebok Jul 6, 2023
7c214f6
Use copy paste to autoload changed text
Jul 6, 2023
a80ad16
Flag as not loaded while replacing text
Jul 6, 2023
77251d4
Merge branch 'master' into asksave-externalchange-dialog
zeebok Jul 7, 2023
04e428d
No undo on autoload
Jul 7, 2023
f5008b0
Lose unused infobar
Jul 7, 2023
7b6187a
Merge branch 'master' into asksave-externalchange-dialog
zeebok Jul 9, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/MainWindow.vala
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,7 @@ namespace Scratch {
if (doc.is_file_temporary == true) {
action_save_as ();
} else {
doc.save_with_hold.begin (true);
doc.save_request ();
}
}
}
Expand Down
Loading