Changeset 423f33dfc2ef7be69a94187fb0e80cbfeedc5ffd

Timestamp:

30/10/10 16:53:54 (3 years ago)

Author:

Matias De la Puente <mfpuente.ar@…>

Children:

ce22ee226eaa1e1892f415d8a8ca6c531aac8b22

Parents:

eff5657181e6e907db0f2b8157586277f4258033

git-committer:

Matias De la Puente <mfpuente.ar@…> (30/10/10 16:53:54)

Message:

Bind properties in GtkFrontend?.SearchBarView?

Files:

• gtkfrontend/searchbarview.vala (modified) (2 diffs)
• libi4uccore/documentpagelogic.vala (modified) (2 diffs)
• libi4uccore/searchbarlogic.vala (modified) (1 diff)
• libi4uccore/searchbarview.vala (modified) (1 diff)

gtkfrontend/searchbarview.vala

@@ -34 +34 @@
         private Menu _options_menu = new Menu ();
         
-        public string search_text
-        {
-                set { _search_text_entry.text = value; }
-                get { return _search_text_entry.text; }
-        }
-        
-        public bool search_backward_sensitive
-        {
-                set { _search_backward_button.sensitive = value; }
-                get { return _search_backward_button.sensitive; }
-        }
-        
-        public bool search_forward_sensitive
-        {
-                set { _search_forward_button.sensitive = value; }
-                get { return _search_forward_button.sensitive; }
-        }
-        
-        public bool highlight_all
-        {
-                set { _highlight_all_check.active = value; }
-                get { return _highlight_all_check.active; }
-        }
-        
-        public bool match_case
-        {
-                set { _match_case_check.active = value; }
-                get { return _match_case_check.active; }
-        }
-        
-        public string replace_text
-        {
-                set { _replace_text_entry.text = value; }
-                get { return _replace_text_entry.text; }
-        }
-        
-        public bool replace_sensitive
-        {
-                set { _replace_button.sensitive = value; }
-                get { return _replace_button.sensitive; }
-        }
-        
-        public bool replace_all_sensitive
-        {
-                set { _replace_all_button.sensitive = value; }
-                get { return _replace_all_button.sensitive; }
-        }
+        public string search_text { set; get; }
+        public bool search_backward_sensitive { set; get; }
+        public bool search_forward_sensitive { set; get; }
+        public bool highlight_all { set; get; }
+        public bool match_case { set; get; }
+        public string replace_text { set; get; }
+        public bool replace_sensitive { set; get; }
+        public bool replace_all_sensitive { set; get; }
         
         public SearchBarView (SourceView source_view)
@@ -145 +106 @@
                 _options_menu.show_all ();
                 
+                //Bind properties
+                bind_property ("search-text", _search_text_entry, "text", BindingFlags.BIDIRECTIONAL);
+                bind_property ("search-backward-sensitive", _search_backward_button, "sensitive", BindingFlags.BIDIRECTIONAL);
+                bind_property ("search-forward-sensitive", _search_forward_button, "sensitive", BindingFlags.BIDIRECTIONAL);
+                bind_property ("highlight-all", _highlight_all_check, "active", BindingFlags.BIDIRECTIONAL);
+                bind_property ("match-case", _match_case_check, "active", BindingFlags.BIDIRECTIONAL);
+                bind_property ("replace-text", _replace_text_entry, "text", BindingFlags.BIDIRECTIONAL);
+                bind_property ("replace-sensitive", _replace_button, "sensitive", BindingFlags.BIDIRECTIONAL);
+                bind_property ("replace-all-sensitive", _replace_all_button, "sensitive", BindingFlags.BIDIRECTIONAL);
+                
                 //connect signals
-                _search_text_entry.changed.connect (() => this.search_text_changed ());
                 _search_text_entry.icon_press.connect (on_search_text_entry_icon_press);
                 _search_backward_button.clicked.connect (() => this.search_backward_clicked ());
                 _search_forward_button.clicked.connect (() => this.search_forward_clicked ());
-                _highlight_all_check.toggled.connect (() => this.highlight_all_changed ());
-                _replace_text_entry.changed.connect (() => this.replace_text_changed ());
                 _replace_text_entry.icon_press.connect (on_replace_text_entry_icon_press);
                 _replace_button.clicked.connect (() => this.replace_clicked ());

libi4uccore/documentpagelogic.vala

@@ -229 +229 @@
         {
                 _view.search_bar_view_visible = true;
-                _view.search_bar_view.search_text_changed ();
+                _view.search_bar_view.notify_property ("search-text");
         }
         
@@ -283 +283 @@
         {
                 if (_view.search_bar_view_visible)
-                        _view.search_bar_view.search_text_changed ();
+                        _view.search_bar_view.notify_property ("search-text");
         }
         

libi4uccore/searchbarlogic.vala

@@ -35 +35 @@
                 
                 //connect view signals
-                _view.search_text_changed.connect (on_search_text_changed);
+                _view.notify["search-text"].connect (on_search_text_changed);
                 _view.search_backward_clicked.connect (() => _view.search (false));
                 _view.search_forward_clicked.connect (() => _view.search (true));
-                _view.highlight_all_changed.connect (on_highlight_all_changed);
-                _view.replace_text_changed.connect (on_replace_text_changed);
+                _view.notify["highlight-all"].connect (on_highlight_all_changed);
+                _view.notify["replace-text"].connect (on_replace_text_changed);
                 _view.replace_clicked.connect (() => _view.replace ());
                 _view.replace_all_clicked.connect (() => _view.replace_all ());

libi4uccore/searchbarview.vala

@@ -31 +31 @@
         public abstract bool replace_all_sensitive { set; get; }
         
-        public signal void search_text_changed ();
         public signal void search_backward_clicked ();
         public signal void search_forward_clicked ();
-        public signal void highlight_all_changed ();
-        public signal void replace_text_changed ();
         public signal void replace_clicked ();
         public signal void replace_all_clicked ();