Merge lp:~felix-lawrence/weather-indicator/tweak-location-searching into lp:weather-indicator/3.0

[Felix Lawrence]

This makes searching for locations a bit more intuitive.

- The label text "Please input a location in the combobox below:" has been changed to "Please search our database for your location:", which warns people that they are going to have to click the search button.

- When the Search button is clicked and the results are found, the menu of results now appears automatically. Hopefully this will reduce the need for a progress indicator (bug #748116), since it is now much clearer that the operation is done.

Vadim: is it more convenient for you if I send you code in this way, or should I file a bug and attach a patch file?

=== modified file 'bin/indicator-weather'
--- bin/indicator-weather	2011-04-02 09:09:19 +0000
+++ bin/indicator-weather	2011-04-03 05:09:25 +0000
@@ -1549,6 +1549,7 @@
                 else:
                     displayed_city_name = "%s, %s" % (city['name'], city['countryName'])
                 self.store.append([displayed_city_name, str(city['geonameId']), str(city['lat']), str(city['lng']), str(city['name'])])
+                self.location_input_combo.popup()
         except urllib2.URLError:
             log.error("Assistant: error reaching url '%s'" % url)
 

=== modified file 'data/ui/Assistant.ui'
--- data/ui/Assistant.ui	2011-04-02 09:09:19 +0000
+++ data/ui/Assistant.ui	2011-04-03 05:09:25 +0000
@@ -27,7 +27,7 @@
             <property name="xalign">0</property>
             <property name="yalign">0</property>
             <property name="ypad">6</property>
-            <property name="label" translatable="yes">Please input a location in the combobox below:</property>
+            <property name="label" translatable="yes">Please search our database for your location:</property>
             <property name="wrap">True</property>
             <property name="wrap_mode">word-char</property>
           </object>