My-Weather-Indicator (Evolution)

diff -Nru my-weather-indicator-0.10.11/debian/changelog my-weather-indicator-0.10.13/debian/changelog --- my-weather-indicator-0.10.11/debian/changelog 2020-12-05 18:37:44.000000000 +0000 +++ my-weather-indicator-0.10.13/debian/changelog 2020-12-05 18:37:44.000000000 +0000 @@ -1,3 +1,8 @@ +my-weather-indicator (0.10.13-0extras23.04.00) jammy; urgency=medium + + * New issue with the location map #121 + + -- Lorenzo Carbonell Sat, 05 Dec 2020 19:37:44 +0100 my-weather-indicator (0.10.11-0extras23.04.00) jammy; urgency=medium * issue don´t fix #119 diff -Nru my-weather-indicator-0.10.11/debian/install my-weather-indicator-0.10.13/debian/install --- my-weather-indicator-0.10.11/debian/install 2020-12-05 18:37:44.000000000 +0000 +++ my-weather-indicator-0.10.13/debian/install 2020-12-05 18:37:44.000000000 +0000 @@ -1,6 +1,8 @@ bin /opt/extras.ubuntu.com/my-weather-indicator debian/changelog /opt/extras.ubuntu.com/my-weather-indicator/share/my-weather-indicator src/*.py /opt/extras.ubuntu.com/my-weather-indicator/share/my-weather-indicator +src/graph /opt/extras.ubuntu.com/my-weather-indicator/share/my-weather-indicator +src/whereami /opt/extras.ubuntu.com/my-weather-indicator/share/my-weather-indicator data/logos /opt/extras.ubuntu.com/my-weather-indicator/share/my-weather-indicator data/social /opt/extras.ubuntu.com/my-weather-indicator/share/my-weather-indicator data/images /opt/extras.ubuntu.com/my-weather-indicator/share/my-weather-indicator diff -Nru my-weather-indicator-0.10.11/src/graph/graph.html my-weather-indicator-0.10.13/src/graph/graph.html --- my-weather-indicator-0.10.11/src/graph/graph.html 1970-01-01 00:00:00.000000000 +0000 +++ my-weather-indicator-0.10.13/src/graph/graph.html 2020-12-05 18:37:44.000000000 +0000 @@ -0,0 +1,140 @@ + + + + + My-Weather-Indicator (Evolution) + + + + + +

+ + + + diff -Nru my-weather-indicator-0.10.11/src/graph.py my-weather-indicator-0.10.13/src/graph.py --- my-weather-indicator-0.10.11/src/graph.py 2020-12-05 18:37:44.000000000 +0000 +++ my-weather-indicator-0.10.13/src/graph.py 2020-12-05 18:37:44.000000000 +0000 @@ -85,7 +85,15 @@ self.update() def web_send(self, msg): - self.viewer.run_javascript(msg, None, None, None) + logger.debug(msg) + try: + self.viewer.evaluate_javascript(msg, len(msg), None, "localhost", + None) + except Exception as exception: + logger.warn(exception) + self.viewer.run_javascript(msg, None, None, None) + while Gtk.events_pending(): + Gtk.main_iteration() if __name__ == '__main__': diff -Nru my-weather-indicator-0.10.11/src/myweatherindicator.py my-weather-indicator-0.10.13/src/myweatherindicator.py --- my-weather-indicator-0.10.11/src/myweatherindicator.py 2020-12-05 18:37:44.000000000 +0000 +++ my-weather-indicator-0.10.13/src/myweatherindicator.py 2020-12-05 18:37:44.000000000 +0000 @@ -789,7 +789,7 @@ humidities.append([value, float(data['avehumidity'])]) cloudinesses.append([value, float(data['cloudiness'])]) title = _('Forecast for next hours') - subtitle = _('Weather service') + ': OpenWeatherMap' + subtitle = _('Weather service') + ': Open Meteo' graph = Graph(title, subtitle, temperature=temperatures, humidity=humidities, cloudiness=cloudinesses, temperature_unit=temperature_unit) diff -Nru my-weather-indicator-0.10.11/src/preferences.py my-weather-indicator-0.10.13/src/preferences.py --- my-weather-indicator-0.10.11/src/preferences.py 2020-12-05 18:37:44.000000000 +0000 +++ my-weather-indicator-0.10.13/src/preferences.py 2020-12-05 18:37:44.000000000 +0000 @@ -206,6 +206,7 @@ yoptions=Gtk.AttachOptions.FILL, xpadding=5, ypadding=5) self.entry21 = Gtk.Entry() + self.entry21.set_editable(False) table21.attach(self.entry21, 1, 2, 1, 2, xoptions=Gtk.AttachOptions.FILL, yoptions=Gtk.AttachOptions.FILL, diff -Nru my-weather-indicator-0.10.11/src/whereami/whereami.html my-weather-indicator-0.10.13/src/whereami/whereami.html --- my-weather-indicator-0.10.11/src/whereami/whereami.html 1970-01-01 00:00:00.000000000 +0000 +++ my-weather-indicator-0.10.13/src/whereami/whereami.html 2020-12-05 18:37:44.000000000 +0000 @@ -0,0 +1,75 @@ + + + + + + + + + + + + +

+ + + diff -Nru my-weather-indicator-0.10.11/src/whereami.py my-weather-indicator-0.10.13/src/whereami.py --- my-weather-indicator-0.10.11/src/whereami.py 2020-12-05 18:37:44.000000000 +0000 +++ my-weather-indicator-0.10.13/src/whereami.py 2020-12-05 18:37:44.000000000 +0000 @@ -57,9 +57,7 @@ self.set_position(latitude, longitude) self.set_wait_cursor() - if latitude and longitude and (location is None or location == ""): - self.do_search_location(latitude, longitude) - else: + if not (latitude and longitude and location): self.do_center() logger.info("location: {}, latitude: {}, longitude={}".format( @@ -317,7 +315,7 @@ None) except Exception as exception: logger.warn(exception) - self.viewer.run_javascript(msg) + self.viewer.run_javascript(msg, None, None, None) while Gtk.events_pending(): Gtk.main_iteration()