Skip to content

Commit

Permalink
Merge branch 'master' of github.com:danrabbit/nimbus
Browse files Browse the repository at this point in the history
  • Loading branch information
danirabbit committed May 14, 2017
2 parents 5130f21 + 026b0a5 commit af7a08d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,16 @@ See the current temperature and weather conditions for your location with this m
## Building, Testing, and Installation


You'll need the following dependencies:
You'll need the following dependencies to build:
* libgeoclue-2-dev
* libgtk-3-dev
* libgweather-3-dev
* meson
* valac

You'll need the following dependencies to run:
* geoclue-2.0

Run `meson build` to configure the build environment and then change to the build directory and run `ninja` to build

meson build
Expand Down
9 changes: 5 additions & 4 deletions src/MainWindow.vala
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public class MainWindow : Gtk.Dialog {
icon_name: "com.github.danrabbit.nimbus",
resizable: false,
skip_taskbar_hint: true,
skip_pager_hint: true,
title: _("Nimbus"),
type_hint: Gdk.WindowTypeHint.UTILITY,
height_request: 272,
Expand All @@ -50,7 +51,7 @@ public class MainWindow : Gtk.Dialog {

weather_info = new GWeather.Info (location, GWeather.ForecastType.LIST);

var weather_icon = new Gtk.Image.from_icon_name ("%s-symbolic".printf (weather_info.get_icon_name ()), Gtk.IconSize.LARGE_TOOLBAR);
var weather_icon = new Gtk.Image.from_icon_name (weather_info.get_symbolic_icon_name (), Gtk.IconSize.LARGE_TOOLBAR);

var weather_label = new Gtk.Label (weather_info.get_sky ());
weather_label.halign = Gtk.Align.START;
Expand Down Expand Up @@ -119,10 +120,10 @@ public class MainWindow : Gtk.Dialog {
return;
}

location_label.label = location.get_city_name ();
location_label.label = dgettext("libgweather-locations", location.get_city_name ());

weather_icon.icon_name = "%s-symbolic".printf (weather_info.get_icon_name ());
weather_label.label = weather_info.get_sky ();
weather_icon.icon_name = weather_info.get_symbolic_icon_name ();
weather_label.label = dgettext("libgweather", weather_info.get_sky ());

double temp;
weather_info.get_value_temp (GWeather.TemperatureUnit.DEFAULT, out temp);
Expand Down

0 comments on commit af7a08d

Please sign in to comment.