lib/groove-dl/widgets/search/bar.rb in groove-dl-0.1.0 vs lib/groove-dl/widgets/search/bar.rb in groove-dl-0.2.0

@@ -17,11 +17,12 @@
         def load(client, window)
           search_box = Gtk::Box.new(:horizontal, 6)
 
           search_bar = Gtk::Entry.new
           search_bar.set_name('search_bar')
-          search_bar.text = 'CruciAGoT'
+          search_bar.set_placeholder_text('Search...')
+
           search_box.pack_start(search_bar,
                                 expand: true,
                                 fill: true,
                                 padding: 10)
 
@@ -34,11 +35,22 @@
           search_box.pack_start(search_type,
                                 expand: false,
                                 fill: true,
                                 padding: 5)
 
-          button = Gtk::Button.new(label: 'Search', stock_id: Gtk::Stock::FIND)
+          button = Gtk::Button.new(stock_id: Gtk::Stock::FIND)
+          button.set_name('search_button')
+          search_box.pack_start(button,
+                                expand: false,
+                                fill: false,
+                                padding: 10)
+
+          pack_start(search_box,
+                     expand: false,
+                     padding: 10)
+
+          # Signals
           button.signal_connect('released') do
             @type = search_type.active_text
             @query = search_bar.text
             next if @type.empty? || @query.empty?
             search = client.request('getResultsFromSearch',
@@ -50,17 +62,12 @@
             end if search.key?('result')
 
             window.find_by_name('search_list').create_model(results)
           end
 
-          search_box.pack_start(button,
-                                expand: false,
-                                fill: false,
-                                padding: 10)
-
-          pack_start(search_box,
-                     expand: false,
-                     padding: 10)
+          search_bar.signal_connect('activate') do
+            button.signal_emit('released')
+          end
         end
       end
     end
   end
 end