diff --git a/src/lib/clapper-gtk/clapper-gtk-av.c b/src/lib/clapper-gtk/clapper-gtk-av.c index 305c878f..22d09302 100644 --- a/src/lib/clapper-gtk/clapper-gtk-av.c +++ b/src/lib/clapper-gtk/clapper-gtk-av.c @@ -85,7 +85,7 @@ enum PROP_LAST }; -static gboolean provider_added = FALSE; +static gboolean resources_added = FALSE; static GParamSpec *param_specs[PROP_LAST] = { NULL, }; static void @@ -290,25 +290,30 @@ select_item_action_cb (GtkWidget *widget, const gchar *action_name, GVariant *pa } static void -_ensure_css_provider (void) +_ensure_resources (void) { GdkDisplay *display; - if (provider_added) + if (resources_added) return; display = gdk_display_get_default (); if (G_LIKELY (display != NULL)) { - GtkCssProvider *provider = gtk_css_provider_new (); + GtkCssProvider *provider; + GtkIconTheme *icon_theme; + + provider = gtk_css_provider_new (); gtk_css_provider_load_from_resource (provider, CLAPPER_GTK_RESOURCE_PREFIX "/css/styles.css"); - gtk_style_context_add_provider_for_display (display, (GtkStyleProvider *) provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION - 1); g_object_unref (provider); - provider_added = TRUE; + icon_theme = gtk_icon_theme_get_for_display (display); + gtk_icon_theme_add_resource_path (icon_theme, CLAPPER_GTK_RESOURCE_PREFIX "/icons"); + + resources_added = TRUE; } } @@ -472,7 +477,7 @@ clapper_gtk_av_root (GtkWidget *widget) ClapperGtkAv *self = CLAPPER_GTK_AV_CAST (widget); ClapperGtkAvPrivate *priv = clapper_gtk_av_get_instance_private (self); - _ensure_css_provider (); + _ensure_resources (); GTK_WIDGET_CLASS (parent_class)->root (widget); diff --git a/src/lib/clapper-gtk/clapper-gtk-utils.c b/src/lib/clapper-gtk/clapper-gtk-utils.c index 1c4c78de..039aa950 100644 --- a/src/lib/clapper-gtk/clapper-gtk-utils.c +++ b/src/lib/clapper-gtk/clapper-gtk-utils.c @@ -92,8 +92,8 @@ const gchar * clapper_gtk_get_icon_name_for_speed (gfloat speed) { return (speed < 1.0f) - ? "power-profile-power-saver-symbolic" + ? "clapper-gtk-speed-slow-symbolic" : (speed == 1.0f) - ? "power-profile-balanced-symbolic" - : "power-profile-performance-symbolic"; + ? "clapper-gtk-speed-normal-symbolic" + : "clapper-gtk-speed-fast-symbolic"; } diff --git a/src/lib/clapper-gtk/clapper-gtk.gresources.xml b/src/lib/clapper-gtk/clapper-gtk.gresources.xml index b625109a..26ba860e 100644 --- a/src/lib/clapper-gtk/clapper-gtk.gresources.xml +++ b/src/lib/clapper-gtk/clapper-gtk.gresources.xml @@ -10,6 +10,11 @@ ui/clapper-gtk-title-header.ui ui/clapper-gtk-video.ui ui/clapper-gtk-video-placeholder.ui + icons/scalable/status/clapper-gtk-speed-normal-symbolic.svg + icons/scalable/status/clapper-gtk-speed-slow-symbolic.svg + icons/scalable/status/clapper-gtk-speed-fast-symbolic.svg + icons/scalable/status/clapper-gtk-speed-fast-symbolic.svg + icons/scalable/status/clapper-gtk-speed-slow-symbolic.svg css/styles.css diff --git a/src/lib/clapper-gtk/icons/scalable/status/clapper-gtk-speed-fast-symbolic.svg b/src/lib/clapper-gtk/icons/scalable/status/clapper-gtk-speed-fast-symbolic.svg new file mode 100644 index 00000000..7a472c89 --- /dev/null +++ b/src/lib/clapper-gtk/icons/scalable/status/clapper-gtk-speed-fast-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/lib/clapper-gtk/icons/scalable/status/clapper-gtk-speed-normal-symbolic.svg b/src/lib/clapper-gtk/icons/scalable/status/clapper-gtk-speed-normal-symbolic.svg new file mode 100644 index 00000000..9f01bdeb --- /dev/null +++ b/src/lib/clapper-gtk/icons/scalable/status/clapper-gtk-speed-normal-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/lib/clapper-gtk/icons/scalable/status/clapper-gtk-speed-slow-symbolic.svg b/src/lib/clapper-gtk/icons/scalable/status/clapper-gtk-speed-slow-symbolic.svg new file mode 100644 index 00000000..31deb98d --- /dev/null +++ b/src/lib/clapper-gtk/icons/scalable/status/clapper-gtk-speed-slow-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/lib/clapper-gtk/ui/clapper-gtk-extra-menu-button.ui b/src/lib/clapper-gtk/ui/clapper-gtk-extra-menu-button.ui index 6b0725e6..03f1038e 100644 --- a/src/lib/clapper-gtk/ui/clapper-gtk-extra-menu-button.ui +++ b/src/lib/clapper-gtk/ui/clapper-gtk-extra-menu-button.ui @@ -113,7 +113,7 @@ center center - power-profile-balanced-symbolic + clapper-gtk-speed-normal-symbolic video.set-speed 1.0 Reset