Changeset 759935945aef4be4bdc69724a7648f25885843f4

Timestamp:

06/08/10 16:53:35 (3 years ago)

Author:

Matias De la Puente <mfpuente.ar@…>

Children:

9d43db94269512bf20ab23e9dd7416fe0c741151

Parents:

34fbc249592793418e7eb907cccee13196e06ed6

git-committer:

Matias De la Puente <mfpuente.ar@…> (06/08/10 16:53:35)

Message:

Documents: Improve message bars

Location:

libi4uc

Files:

• Makefile.am (modified) (1 diff)
• i4ucdocumentpagepresenter.vala (modified) (9 diffs)
• i4ucdocumentpageview.vala (modified) (6 diffs)
• i4ucdocumentpageviewiface.vala (modified) (2 diffs)
• i4ucmessagebar.vala (added)
• i4ucmessagebariface.vala (added)

libi4uc/Makefile.am

@@ -69 +69 @@
         i4ucmainwindowview.vala \
         i4ucmainwindowviewiface.vala \
+        i4ucmessagebar.vala \
+        i4ucmessagebariface.vala \
         i4ucnewprojectdialog.vala \
         i4ucpage.vala \

libi4uc/i4ucdocumentpagepresenter.vala

@@ -61 +61 @@
                 _view.wrap_mode = settings.documents_wrap_mode;
                 
-                _view.error_bar_visible = false;
-                _view.reload_bar_visible = false;
-                _view.save_bar_visible = false;
+                _view.error_message_bar.visible = false;
+                _view.error_message_bar.image = TabImage.ERROR;
+                _view.reload_message_bar.visible = false;
+                _view.reload_message_bar.image = TabImage.WARNING;
+                _view.save_message_bar.visible = false;
+                _view.save_message_bar.image = TabImage.WARNING;
                 _view.search_bar_view_visible = false;
                 _view.content_modified = 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 (on_save_bar_cancel_clicked);
+                _view.error_message_bar.ok_clicked.connect (on_error_message_bar_ok_clicked);
+                _view.reload_message_bar.ok_clicked.connect (on_reload_message_bar_ok_clicked);
+                _view.reload_message_bar.cancel_clicked.connect (on_reload_message_bar_cancel_clicked);
+                _view.save_message_bar.ok_clicked.connect (on_save_message_bar_ok_clicked);
+                _view.save_message_bar.cancel_clicked.connect (on_save_message_bar_cancel_clicked);
                 _view.close_clicked.connect (on_close_clicked);
                 _view.search_bar_view.close_clicked.connect (() => _view.search_bar_view_visible = false);
@@ -101 +104 @@
                 {
                         _view.content_visible = false;
-                        _view.error_bar_primary_text = _("Error trying to open ") + file.get_path ();
-                        _view.error_bar_secondary_text = e.message;
+                        _view.error_message_bar.primary_text = _("Error trying to open ") + file.get_path ();
+                        _view.error_message_bar.secondary_text = e.message;
                         _view.tab_image = TabImage.ERROR;
-                        _view.error_bar_visible = true;
+                        _view.error_message_bar.visible = true;
                 }
         }
@@ -126 +129 @@
                                 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_message_bar.primary_text = _("The document was externally changed");
+                                        _view.save_message_bar.secondary_text = _("Do you want to save the document?");
                                         _prev_tab_image = _view.tab_image;
                                         _view.tab_image = TabImage.WARNING;
-                                        _view.save_bar_visible = true;
+                                        _view.save_message_bar.visible = true;
                                 }
                                 else
                                 {
-                                        _view.error_bar_primary_text = _("Error trying to save ") + _document.path;
-                                        _view.error_bar_secondary_text = e.message;
+                                        _view.error_message_bar.primary_text = _("Error trying to save ") + _document.path;
+                                        _view.error_message_bar.secondary_text = e.message;
                                         _prev_tab_image = _view.tab_image;
                                         _view.tab_image = TabImage.ERROR;
-                                        _view.error_bar_visible = true;
+                                        _view.error_message_bar.visible = true;
                                 }
                         }
@@ -167 +170 @@
                         catch (GLib.Error e)
                         {
-                                _view.error_bar_primary_text = _("Error trying to save as ") + File.new_for_uri (document_uri).get_path ();
-                                _view.error_bar_secondary_text = e.message;
+                                _view.error_message_bar.primary_text = _("Error trying to save as ") + File.new_for_uri (document_uri).get_path ();
+                                _view.error_message_bar.secondary_text = e.message;
                                 _prev_tab_image = _view.tab_image;
                                 _view.tab_image = TabImage.ERROR;
-                                _view.error_bar_visible = true;
+                                _view.error_message_bar.visible = true;
                         }
                 }
@@ -184 +187 @@
                 catch (GLib.Error e)
                 {
-                        _view.error_bar_primary_text = _("Error trying to print ") + _document.uri;
-                        _view.error_bar_secondary_text = e.message;
+                        _view.error_message_bar.primary_text = _("Error trying to print ") + _document.uri;
+                        _view.error_message_bar.secondary_text = e.message;
                         _prev_tab_image = _view.tab_image;
                         _view.tab_image = TabImage.ERROR;
-                        _view.error_bar_visible = true;
+                        _view.error_message_bar.visible = true;
                 }
         }
@@ -227 +230 @@
         }
         
-        private void on_error_bar_ok_clicked ()
+        private void on_error_message_bar_ok_clicked ()
         {
                 //Error produced trying to open a document
@@ -233 +236 @@
                         this.remove_document ();
                 _view.tab_image = _prev_tab_image;
-                _view.error_bar_visible = false;
-                _view.grab_focus ();
-        }
-        
-        private void on_reload_bar_reload_clicked ()
-        {
-                _view.tab_image = _prev_tab_image;
-                _view.reload_bar_visible = false;
+                _view.error_message_bar.visible = false;
+                _view.grab_focus ();
+        }
+        
+        private void on_reload_message_bar_ok_clicked ()
+        {
+                _view.tab_image = _prev_tab_image;
+                _view.reload_message_bar.visible = false;
                 open (_document.uri);
                 _view.grab_focus ();
         }
         
-        private void on_reload_bar_cancel_clicked ()
-        {
-                _view.tab_image = _prev_tab_image;
-                _view.reload_bar_visible = false;
+        private void on_reload_message_bar_cancel_clicked ()
+        {
+                _view.tab_image = _prev_tab_image;
+                _view.reload_message_bar.visible = false;
                 _externally_modified_adviced = true;
                 _view.grab_focus ();
         }
         
-        private void on_save_bar_save_clicked ()
-        {
-                _view.tab_image = _prev_tab_image;
-                _view.save_bar_visible = false;
+        private void on_save_message_bar_ok_clicked ()
+        {
+                _view.tab_image = _prev_tab_image;
+                _view.save_message_bar.visible = false;
                 save (true);
                 _view.grab_focus ();
         }
         
-        private void on_save_bar_cancel_clicked ()
-        {
-                _view.tab_image = _prev_tab_image;
-                _view.save_bar_visible = false;
+        private void on_save_message_bar_cancel_clicked ()
+        {
+                _view.tab_image = _prev_tab_image;
+                _view.save_message_bar.visible = false;
                 _view.grab_focus ();
         }
@@ -283 +286 @@
         private void on_focused_in ()
         {
-                if (_view.reload_bar_visible || _externally_modified_adviced)
+                if (_view.reload_message_bar.visible || _externally_modified_adviced)
                         return;
                 
@@ -289 +292 @@
                         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_message_bar.primary_text = _("The file %s was externally modified").printf (_document.path);
+                _view.reload_message_bar.secondary_text = _("Do you want to reload the file?");
                 _prev_tab_image = _view.tab_image;
                 _view.tab_image = TabImage.WARNING;
-                _view.reload_bar_visible = true;
+                _view.reload_message_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 ("");
+        private MessageBar _error_message_bar = new MessageBar ();
+        private MessageBar _reload_message_bar = new MessageBar ();
+        private MessageBar _save_message_bar = new MessageBar ();
         
         //Search and Replace bar
@@ -140 +129 @@
         }
         
-        //Implementation of error bar properties
-        public bool error_bar_visible
-        {
-                set { _error_bar.visible = value; }
-                get { return _error_bar.visible; }
-        }
-        
-        public string error_bar_primary_text
-        {
-                set { _error_bar_primary_label.label = "<b>" + value + "</b>"; }
-                get { return _error_bar_primary_label.label; }
-        }
-        
-        public string error_bar_secondary_text
-        {
-                set { _error_bar_secondary_label.label = "<small>" + value + "</small>"; }
-                get { return _error_bar_secondary_label.label; }
-        }
-        
-        //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 MessageBarIface error_message_bar { get { return _error_message_bar; } }
+        public MessageBarIface reload_message_bar { get { return _reload_message_bar; } }
+        public MessageBarIface save_message_bar { get { return _save_message_bar; } }
         
         public SearchBarViewIface search_bar_view { get { return _search_bar_view; } }
@@ -232 +168 @@
                 scrolled_window.set_policy (PolicyType.AUTOMATIC, PolicyType.AUTOMATIC);
                 
-                pack_start (_error_bar, false, false, 2);
-                pack_start (_reload_bar, false, false, 2);
-                pack_start (_save_bar, false, false, 2);
+                pack_start (_error_message_bar, false, false, 2);
+                pack_start (_reload_message_bar, false, false, 2);
+                pack_start (_save_message_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);
+                _error_message_bar.response.connect (() => this.error_message_bar.ok_clicked ());
+                _reload_message_bar.response.connect (on_reload_bar_response);
+                _save_message_bar.response.connect (on_save_bar_response);
                 _source_buffer.modified_changed.connect (() => this.content_changed ());
                 _source_buffer.notify["has-selection"].connect (() => this.selection_changed ());
@@ -375 +311 @@
         private void create_error_bar ()
         {
-                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);
+                _error_message_bar.set_message_type (MessageType.ERROR);
+                _error_message_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);
+                _reload_message_bar.set_message_type (MessageType.WARNING);
+                _reload_message_bar.add_button (STOCK_REFRESH, ResponseType.OK);
+                _reload_message_bar.add_button (STOCK_CANCEL, ResponseType.CANCEL);
         }
         
@@ -395 +325 @@
         {
                 if (response == ResponseType.OK)
-                        this.reload_bar_reload_clicked ();
+                        this.reload_message_bar.ok_clicked ();
                 
                 if (response == ResponseType.CANCEL)
-                        this.reload_bar_cancel_clicked ();
+                        this.reload_message_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);
+                _save_message_bar.set_message_type (MessageType.WARNING);
+                _save_message_bar.add_button (STOCK_SAVE, ResponseType.OK);
+                _save_message_bar.add_button (STOCK_CANCEL, ResponseType.CANCEL);
         }
         
@@ -414 +341 @@
         {
                 if (response == ResponseType.OK)
-                        this.save_bar_save_clicked ();
+                        this.save_message_bar.ok_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 (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);
+                        this.save_message_bar.cancel_clicked ();
         }
 }

libi4uc/i4ucdocumentpageviewiface.vala

@@ -37 +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; }
+        public abstract MessageBarIface error_message_bar { get; }
+        public abstract MessageBarIface reload_message_bar { get; }
+        public abstract MessageBarIface save_message_bar { get; }
         
         //Search and Replace properties
@@ -65 +54 @@
         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