Changeset 55a539329eeb4bd6efda73fcde6ecc5e7e4a83eb

Timestamp:

11/07/10 23:20:07 (3 years ago)

Author:

Matias De la Puente <mfpuente.ar@…>

Children:

53ea8825b659440db8993e7e37898c851e59d94d

Parents:

b8a031146b9319b4220dbeca550e0d4a96caf376

git-author:

Matias De la Puente <mfpuente.ar@…> (11/07/10 21:48:09)

git-committer:

Matias De la Puente <mfpuente.ar@…> (11/07/10 23:20:07)

Message:

Documents: Warn if the document was externally modified

Location:

libi4uc

Files:

• i4ucdocument.vala (modified) (3 diffs)
• i4ucdocumentpagepresenter.vala (modified) (8 diffs)
• i4ucdocumentpageview.vala (modified) (6 diffs)
• i4ucdocumentpageviewiface.vala (modified) (2 diffs)

libi4uc/i4ucdocument.vala

@@ -23 +23 @@
 {
         private File _file;
+        private string _etag;
         
         public string uri { owned get { return _file.get_uri (); } }
         
         public string path { owned get { return _file.get_path (); } }
-        
-        public string etag { private set; get; }
         
         public string display_name
@@ -82 +81 @@
                 if (_file == null || !_file.equal (file))
                         _file = file;
-                this.etag = new_etag;
+                _etag = new_etag;
                 string utf8_contents;
                 to_utf8 (contents, out utf8_contents);
@@ -101 +100 @@
                 if (_file == null || (uri != null && _file.get_uri () != uri))
                         _file = file;
-                this.etag = new_etag;
+                _etag = new_etag;
+        }
+        
+        public bool get_modified ()
+        {
+                if (_file == null)
+                        return false;
+                
+                string current_etag = null;
+                try
+                {
+                        var file_info = _file.query_info (FILE_ATTRIBUTE_ETAG_VALUE, FileQueryInfoFlags.NONE, null);
+                        current_etag = file_info.get_etag ();
+                }
+                catch (GLib.Error e)
+                {
+                        warning (e.message);
+                        return false;
+                }
+                return (current_etag != null && current_etag != _etag);
         }
         

libi4uc/i4ucdocumentpagepresenter.vala

@@ -25 +25 @@
         private Document _document = new Document ();
         private SearchBarPresenter _search_bar_presenter;
+        private bool _externally_modified_adviced;
         
         public DocumentPageViewIface view { get { return _view; } }
@@ -60 +61 @@
                 
                 _view.error_bar_visible = false;
+                _view.reload_bar_visible = false;
+                _view.save_bar_visible = false;
                 _view.search_bar_view_visible = false;
                 
                 //connect view signals
                 _view.error_bar_ok_clicked.connect (on_error_bar_ok_clicked);
+                _view.reload_bar_reload_clicked.connect (on_reload_bar_reload_clicked);
+                _view.reload_bar_cancel_clicked.connect (on_reload_bar_cancel_clicked);
+                _view.save_bar_save_clicked.connect (on_save_bar_save_clicked);
+                _view.save_bar_cancel_clicked.connect (() => _view.save_bar_visible = false);
                 _view.close_clicked.connect (on_close_clicked);
                 _view.search_bar_view.close_clicked.connect (() => _view.search_bar_view_visible = false);
@@ -69 +76 @@
                 _view.content_changed.connect (on_content_changed);
                 _view.selection_changed.connect (() => this.refresh_actions ());
+                _view.focused_in.connect (on_focused_in);
         }
         
@@ -84 +92 @@
                         _view.tab_mark = false;
                         _view.guess_language_id (_document.content_type);
+                        _externally_modified_adviced = false;
                 }
                 catch (GLib.Error e)
@@ -94 +103 @@
         }
         
-        public void save ()
+        public void save (bool forced=false)
         {
                 if (_is_new)
@@ -102 +111 @@
                         try
                         {
-                                _document.save_contents (_view.content);
+                                _document.save_contents (_view.content, null, forced);
                                 _view.tab_mark = false;
+                                _externally_modified_adviced = false;
                         }
                         catch (GLib.Error e)
                         {
-                                _view.error_bar_primary_text = _("Error trying to save ") + _document.path;
-                                _view.error_bar_secondary_text = e.message;
-                                _view.error_bar_visible = true;
+                                if (e is IOError.WRONG_ETAG)
+                                {
+                                        _view.save_bar_primary_text = _("The document was externally changed");
+                                        _view.save_bar_secondary_text = _("Do you want to save the document?");
+                                        _view.save_bar_visible = true;
+                                }
+                                else
+                                {
+                                        _view.error_bar_primary_text = _("Error trying to save ") + _document.path;
+                                        _view.error_bar_secondary_text = e.message;
+                                        _view.error_bar_visible = true;
+                                }
                         }
                 }
@@ -198 +217 @@
         }
         
+        private void on_reload_bar_reload_clicked ()
+        {
+                _view.reload_bar_visible = false;
+                open (_document.uri);
+        }
+        
+        private void on_reload_bar_cancel_clicked ()
+        {
+                _view.reload_bar_visible = false;
+                _externally_modified_adviced = true;
+        }
+        
+        private void on_save_bar_save_clicked ()
+        {
+                save (true);
+                _view.save_bar_visible = false;
+        }
+        
         private void on_selected ()
         {
@@ -209 +246 @@
                 _view.tab_mark = true;
                 this.refresh_actions ();
+        }
+        
+        private void on_focused_in ()
+        {
+                if (_view.reload_bar_visible || _externally_modified_adviced)
+                        return;
+                
+                if (!_document.get_modified ())
+                        return;
+                
+                _view.reload_bar_primary_text = _("The file %s was externally modified").printf (_document.path);
+                _view.reload_bar_secondary_text = _("Do you want to reload the file?");
+                _view.reload_bar_visible = true;
         }
         

libi4uc/i4ucdocumentpageview.vala

@@ -23 +23 @@
 public class I4uc.DocumentPageView : Page, DocumentPageViewIface
 {
+        //Error bar
         private InfoBar _error_bar = new InfoBar ();
         private Label _error_bar_primary_label = new Label ("");
         private Label _error_bar_secondary_label = new Label ("");
+        
+        //Reload bar
+        private InfoBar _reload_bar = new InfoBar ();
+        private Label _reload_bar_primary_label = new Label ("");
+        private Label _reload_bar_secondary_label = new Label ("");
+        
+        //Save bar
+        private InfoBar _save_bar = new InfoBar ();
+        private Label _save_bar_primary_label = new Label ("");
+        private Label _save_bar_secondary_label = new Label ("");
+        
+        //Search and Replace bar
         private SearchBarView _search_bar_view;
+        
+        //Content
         private SourceView _source_view;
         private SourceBuffer _source_buffer = new SourceBuffer (null);
@@ -125 +140 @@
         }
         
+        //Implementation of error bar properties
         public bool error_bar_visible
         {
@@ -143 +159 @@
         }
         
+        //Implementation of reload bar properties
+        public bool reload_bar_visible
+        {
+                set { _reload_bar.visible = value; }
+                get { return _reload_bar.visible; }
+        }
+        
+        public string reload_bar_primary_text
+        {
+                set { _reload_bar_primary_label.label = "<b>" + value + "</b>"; }
+                get { return _reload_bar_primary_label.label; }
+        }
+        
+        public string reload_bar_secondary_text
+        {
+                set { _reload_bar_secondary_label.label = "<small>" + value + "</small>"; }
+                get { return _reload_bar_secondary_label.label; }
+        }
+        
+        //Implementation of save bar properties
+        public bool save_bar_visible
+        {
+                set { _save_bar.visible = value; }
+                get { return _save_bar.visible; }
+        }
+        
+        public string save_bar_primary_text
+        {
+                set { _save_bar_primary_label.label = "<b>" + value + "</b>"; }
+                get { return _save_bar_primary_label.label; }
+        }
+        
+        public string save_bar_secondary_text
+        {
+                set { _save_bar_secondary_label.label = "<small>" + value + "</small>"; }
+                get { return _save_bar_secondary_label.label; }
+        }
+        
         public SearchBarViewIface search_bar_view { get { return _search_bar_view; } }
         
@@ -160 +214 @@
         {
                 create_error_bar ();
+                create_reload_bar ();
+                create_save_bar ();
                 
                 _source_view = new SourceView.with_buffer (_source_buffer);
@@ -169 +225 @@
                 
                 pack_start (_error_bar, false, false, 2);
+                pack_start (_reload_bar, false, false, 2);
+                pack_start (_save_bar, false, false, 2);
                 pack_start (_search_bar_view, false, false, 2);
                 pack_start (scrolled_window, true, true, 0);
                 
                 _error_bar.response.connect (() => this.error_bar_ok_clicked ());
+                _reload_bar.response.connect (on_reload_bar_response);
+                _save_bar.response.connect (on_save_bar_response);
                 _source_buffer.changed.connect (() => this.content_changed ());
                 _source_buffer.notify["has-selection"].connect (() => this.selection_changed ());
+                _source_view.focus_in_event.connect (() => {
+                        this.focused_in ();
+                        return false;
+                });
         }
         
@@ -280 +344 @@
         private void create_error_bar ()
         {
-                var image = new Image.from_stock (STOCK_DIALOG_ERROR, IconSize.DIALOG);
-                
-                _error_bar_primary_label.set_use_markup (true);
-                _error_bar_primary_label.set_line_wrap (true);
-                _error_bar_primary_label.xalign = 0;            
-                _error_bar_secondary_label.set_use_markup (true);
-                _error_bar_secondary_label.set_line_wrap (true);
-                _error_bar_secondary_label.xalign = 0;          
+                pack_bar (_error_bar, STOCK_DIALOG_ERROR, _error_bar_primary_label, _error_bar_secondary_label);
+                
+                _error_bar.can_focus = false;
+                _error_bar.set_message_type (MessageType.ERROR);
+                _error_bar.add_button (STOCK_OK, ResponseType.OK);
+        }
+        
+        private void create_reload_bar ()
+        {
+                pack_bar (_reload_bar, STOCK_DIALOG_WARNING, _reload_bar_primary_label, _reload_bar_secondary_label);
+                
+                _reload_bar.can_focus = false;
+                _reload_bar.set_message_type (MessageType.WARNING);
+                _reload_bar.add_button (STOCK_REFRESH, ResponseType.OK);
+                _reload_bar.add_button (STOCK_CANCEL, ResponseType.CANCEL);
+        }
+        
+        private void on_reload_bar_response (int response)
+        {
+                if (response == ResponseType.OK)
+                        this.reload_bar_reload_clicked ();
+                
+                if (response == ResponseType.CANCEL)
+                        this.reload_bar_cancel_clicked ();
+        }
+
+        private void create_save_bar ()
+        {
+                pack_bar (_save_bar, STOCK_DIALOG_WARNING, _save_bar_primary_label, _save_bar_secondary_label);
+                
+                _save_bar.can_focus = false;
+                _save_bar.set_message_type (MessageType.WARNING);
+                _save_bar.add_button (STOCK_SAVE, ResponseType.OK);
+                _save_bar.add_button (STOCK_CANCEL, ResponseType.CANCEL);
+        }
+        
+        private void on_save_bar_response (int response)
+        {
+                if (response == ResponseType.OK)
+                        this.save_bar_save_clicked ();
+                
+                if (response == ResponseType.CANCEL)
+                        this.save_bar_cancel_clicked ();
+        }
+        
+        private void pack_bar (InfoBar bar, string icon, Label primary_label, Label secondary_label)
+        {
+                var image = new Image.from_stock (icon, IconSize.DIALOG);
+                
+                primary_label.set_use_markup (true);
+                primary_label.set_line_wrap (true);
+                primary_label.xalign = 0;               
+                secondary_label.set_use_markup (true);
+                secondary_label.set_line_wrap (true);
+                secondary_label.xalign = 0;             
                 
                 var vbox = new VBox (false, 0);
-                vbox.pack_start (_error_bar_primary_label, false, false, 0);
-                vbox.pack_start (_error_bar_secondary_label, false, false, 0);
-                
-                var hbox = _error_bar.get_content_area () as HBox;
+                vbox.pack_start (primary_label, true, true, 0);
+                vbox.pack_start (secondary_label, true, true, 0);
+                
+                var hbox = bar.get_content_area () as HBox;
                 hbox.pack_start (image, false, false, 0);
                 hbox.pack_start (vbox, true, true, 0);
-                
-                _error_bar.set_message_type (MessageType.ERROR);
-                _error_bar.add_button (STOCK_OK, ResponseType.OK);
         }
 }

libi4uc/i4ucdocumentpageviewiface.vala

@@ -22 +22 @@
 public interface I4uc.DocumentPageViewIface : GLib.Object, PageIface
 {
+        //Settings properties
         public abstract string font_name { set; get; }
         public abstract int tab_width { set; get; }
@@ -36 +37 @@
         public abstract string language_id { set; get; }
         
+        //Error bar properties
         public abstract bool error_bar_visible { set; get; }
         public abstract string error_bar_primary_text { set; get; }
         public abstract string error_bar_secondary_text { set; get; }
+        
+        //Reload bar properties
+        public abstract bool reload_bar_visible { set; get; }
+        public abstract string reload_bar_primary_text { set; get; }
+        public abstract string reload_bar_secondary_text { set; get; }
+        
+        //Save bar properties
+        public abstract bool save_bar_visible { set; get; }
+        public abstract string save_bar_primary_text { set; get; }
+        public abstract string save_bar_secondary_text { set; get; }
+        
+        //Search and Replace properties
         public abstract SearchBarViewIface search_bar_view { get; }
         public abstract bool search_bar_view_visible { set; get; }
+        
+        //Content properties
         public abstract bool content_visible { set; get; }
         
+        //Signals
         public signal void selected ();
         public signal void content_changed ();
         public signal void selection_changed ();
+        public signal void focused_in ();
         public signal void error_bar_ok_clicked ();
+        public signal void reload_bar_reload_clicked ();
+        public signal void reload_bar_cancel_clicked ();
+        public signal void save_bar_save_clicked ();
+        public signal void save_bar_cancel_clicked ();
         
+        //Methods
         public abstract void undo ();
         public abstract void redo ();