Changeset 93a4b80d084e57ee8d0d11234a7290ac128ac462

Timestamp:

18/08/10 13:23:57 (3 years ago)

Author:

Matias De la Puente <mfpuente.ar@…>

Children:

1b11a0bb3603257dbeca9fadbab15b5cdca0a8cd

Parents:

b36d53cc61ecdfd153a0c3f7029459580c56d6c4

git-committer:

Matias De la Puente <mfpuente.ar@…> (18/08/10 13:23:57)

Message:

Improve SearchAndReplaceBarView?

File:

• libi4uc/i4ucsearchbarview.vala (modified) (6 diffs)

libi4uc/i4ucsearchbarview.vala

@@ -27 +27 @@
         private Button _search_backward_button = new Button ();
         private Button _search_forward_button = new Button ();
-        private CheckButton _highlight_all_check = new CheckButton.with_label (_("Highlight all"));
-        private CheckButton _match_case_check = new CheckButton.with_label (_("Match case"));
+        private CheckMenuItem _highlight_all_check = new CheckMenuItem.with_label (_("Highlight all"));
+        private CheckMenuItem _match_case_check = new CheckMenuItem.with_label (_("Match case"));
         private Entry _replace_text_entry = new Entry ();
         private Button _replace_button = new Button.with_label (_("Replace"));
         private Button _replace_all_button = new Button.with_label (_("Replace all"));
+        private Menu _options_menu = new Menu ();
         
         public string search_text
@@ -89 +90 @@
                 _source_view.buffer.get_tag_table ().add (highlight_tag);
                 
+                //Search bar
                 var close_button = ViewUtils.create_close_button ();
                 
                 var search_label = new Label (_("Search for:"));
+                
+                _search_text_entry.primary_icon_activatable = true;
+                _search_text_entry.primary_icon_stock = STOCK_PROPERTIES;
                 
                 _search_backward_button.relief = ReliefStyle.NONE;
@@ -101 +106 @@
                 _search_forward_button.image = new Image.from_stock (STOCK_GO_FORWARD, IconSize.MENU);
                 
-                _highlight_all_check.focus_on_click = false;
-                _match_case_check.focus_on_click = false;
-                
+                //Replace bar
                 var replace_label = new Label (_("Replace with:"));
                 
@@ -121 +124 @@
                 pack_start (hbox, true, true, 0);
                 
-                var advanced_vbox = new VBox (false, 0);
-                
-                hbox = new HBox (false, 0);
-                hbox.pack_start (new Label ("     "), false, false, 0);
-                hbox.pack_start (_highlight_all_check, false, false, 0);
-                hbox.pack_start (_match_case_check, false, false, 20);
-                advanced_vbox.pack_start (hbox, false, false, 0);
-                
                 hbox = new HBox (false, 0);
                 hbox.pack_start (new Label ("     "), false, false, 0);
@@ -135 +130 @@
                 hbox.pack_start (_replace_button, false, false, 0);
                 hbox.pack_start (_replace_all_button, false, false, 0);
-                advanced_vbox.pack_start (hbox, false, false, 0);
-                
-                var advanced_expander = new Expander ("<b>" + _("Advanced") + "</b>");
-                advanced_expander.set_use_markup (true);
-                advanced_expander.add (advanced_vbox);
-                pack_start (advanced_expander, true, true, 0);
+                
+                var replace_expander = new Expander ("<b>" + _("Replace") + "</b>");
+                replace_expander.set_use_markup (true);
+                replace_expander.add (hbox);
+                pack_start (replace_expander, true, true, 0);
+                
+                //options menu
+                _options_menu.append (_highlight_all_check);
+                _options_menu.append (_match_case_check);
+                _options_menu.show_all ();
                 
                 //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 ());
@@ -255 +255 @@
                 _source_view.grab_focus ();
         }
+        
+        private void on_search_text_entry_icon_press (EntryIconPosition icon_pos, Gdk.Event event)
+        {
+                if (icon_pos == EntryIconPosition.PRIMARY)
+                        _options_menu.popup (null, null, null, event.button.button, event.button.time);
+        }
 }