Merge lp://qastaging/~tintou/scratch/scratch-backup-changes into lp://qastaging/~elementary-apps/scratch/scratch
Proposed by
Corentin Noël
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~tintou/scratch/scratch-backup-changes |
Merge into: | lp://qastaging/~elementary-apps/scratch/scratch |
Diff against target: |
628 lines (+206/-165) 4 files modified
plugins/outline/CMakeLists.txt (+9/-5) src/MainWindow.vala (+1/-1) src/Services/Document.vala (+195/-158) src/Services/FileHandler.vala (+1/-1) |
To merge this branch: | bzr merge lp://qastaging/~tintou/scratch/scratch-backup-changes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Zisu Andrei (community) | Needs Information | ||
xapantu (community) | Needs Fixing | ||
Review via email:
|
Description of the change
The restoration point isn't kept in memory but in the backup file.
Don't check for file existence at focus but creates a FileMonitor to have every events on real-time.
With this the file loading process is much faster.
To post a comment you must log in.
Unmerged revisions
- 1560. By Corentin Noël
-
Fix save as.
Fixed Outline plugin cmake. - 1559. By Corentin Noël
-
Don't save the file while restoring it.
- 1558. By Corentin Noël
-
Fixed reverting sensitivity not being per-document.
- 1557. By Corentin Noël
-
More efficient document loading and changes handling.
Some in-line comments, maybe more to come.
Here is a crash, after using the "save as" button (maybe not related, I don't have a backtrace yet).
xapantu@ntu /t/s/build> src/scratch- text-editor vala:155: Scratch version: 2.2.1 vala:157: Kernel version: 4.1.4-1-ARCH scratch. saved-state' scratch. settings' scratch. services' scratch. plugins. terminal' gtk-menu- images is deprecated and shouldn't be used anymore. It will be removed in a future version. bar_pack: assertion 'gtk_widget_ get_parent (widget) == NULL' failed set_visible: assertion 'GTK_IS_ACTION (action)' failed vala:673: open temporary file: Fichier texte à partir de 2015-09-24 01:28:31 vala:204: schema_version is 10 Pixbuf: follow- state is deprecated and shouldn't be used anymore. It will be removed in a future version. scratch. plugins. folder- manager' vala:204: schema_version is 10 vala:142: This Document was already opened! Not opening a duplicate! vala:204: schema_version is 10 view_get_ editable: assertion 'GTK_IS_TEXT_VIEW (text_view)' failed view_get_ editable: assertion 'GTK_IS_TEXT_VIEW (text_view)' failed view_get_ editable: assertion 'GTK_IS_TEXT_VIEW (text_view)' failed view_get_ editable: assertion 'GTK_IS_TEXT_VIEW (text_view)' failed view_get_ editable: assertion 'GTK_IS_TEXT_VIEW (text_view)' failed view_get_ editable: assertion 'GTK_IS_TEXT_VIEW (text_view)' failed
[INFO 02:22:03.881206] Application.
[INFO 02:22:03.881260] Application.
[DEBUG 02:22:03.882757] Settings.vala:163: Loading settings from schema 'org.pantheon.
[DEBUG 02:22:03.883261] Settings.vala:163: Loading settings from schema 'org.pantheon.
[DEBUG 02:22:03.884352] Settings.vala:163: Loading settings from schema 'org.pantheon.
[DEBUG 02:22:03.959510] [Gtk] Connecting to session manager
[WARNING 02:22:03.965308] [Gtk] Attempting to add a widget with type GtkScrolledWindow to a GtkDialog, but as a GtkBin subclass a GtkDialog can only contain one widget at a time; it already contains a widget of type GtkBox
[WARNING 02:22:03.965550] [libpeas] Failed to enable unknown plugin loader 'gjs'
[DEBUG 02:22:03.991315] Settings.vala:163: Loading settings from schema 'org.pantheon.
[WARNING 02:22:04.011552] [libpeas] Failed to enable unknown plugin loader 'gjs'
[WARNING 02:22:04.045298] [GLib-GObject] The property GtkSettings:
[FATAL 02:22:04.051353] [Gtk] gtk_header_
[FATAL 02:22:04.157390] [Gtk] gtk_action_
[DEBUG 02:22:04.157634] MainWindow.
[DEBUG 02:22:04.162284] sql-schema.
[INFO 02:22:04.206977] Document.vala:171: Opening "Nouveau document"
[DEBUG 02:22:04.312185] SplitView.vala:124: View added successfully
[WARNING 02:22:04.501706] [GLib-GObject] The property GtkCellRenderer
[DEBUG 02:22:04.502441] Settings.vala:163: Loading settings from schema 'org.pantheon.
[DEBUG 02:22:04.596172] sql-schema.
[INFO 02:22:04.606347] Document.vala:171: Opening "Nouveau document"
[WARNING 02:22:04.616528] DocumentView.
[DEBUG 02:22:04.618693] sql-schema.
[INFO 02:22:04.625701] Document.vala:171: Opening "40_39.diff"
[FATAL 02:22:04.712490] [Gtk] gtk_text_
[FATAL 02:22:04.718433] [Gtk] gtk_text_
[FATAL 02:22:04.722147] [Gtk] gtk_text_
[FATAL 02:22:04.727046] [Gtk] gtk_text_
[FATAL 02:22:04.730144] [Gtk] gtk_text_
[FATAL 02:22:04.732916] [Gtk] gtk_text_
[FAT...