dany/clapper
1
0
Fork 0
mirror of https://github.com/Rafostar/clapper.git synced 2025-12-24 05:56:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

clapper-gtk: Bundle custom speed icons

Browse Source 
Recent Adwaita icon theme changed "power-profile" icons which were
used for speed status. Since new ones do not fit our usage, bundle
icons that do, so they will be always loaded.

Fixes #570
This commit is contained in:
Rafał Dzięgiel
2025-12-21 18:47:37 +01:00
parent 0db279da59
commit 37a4bcb84c
7 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib/clapper-gtk/clapper-gtk-av.c
View File

@@ -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);

6
src/lib/clapper-gtk/clapper-gtk-utils.c
View File

@@ -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";
}

5
src/lib/clapper-gtk/clapper-gtk.gresources.xml
View File

@@ -10,6 +10,11 @@
<file preprocess="xml-stripblanks">ui/clapper-gtk-title-header.ui</file>
<file preprocess="xml-stripblanks">ui/clapper-gtk-video.ui</file>
<file preprocess="xml-stripblanks">ui/clapper-gtk-video-placeholder.ui</file>
<file preprocess="xml-stripblanks">icons/scalable/status/clapper-gtk-speed-normal-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/scalable/status/clapper-gtk-speed-slow-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/scalable/status/clapper-gtk-speed-fast-symbolic.svg</file>
<file preprocess="xml-stripblanks" alias="icons/scalable/status/clapper-gtk-speed-slow-symbolic-rtl.svg">icons/scalable/status/clapper-gtk-speed-fast-symbolic.svg</file>
<file preprocess="xml-stripblanks" alias="icons/scalable/status/clapper-gtk-speed-fast-symbolic-rtl.svg">icons/scalable/status/clapper-gtk-speed-slow-symbolic.svg</file>
<file compressed="true">css/styles.css</file>
</gresource>
</gresources>

4
src/lib/clapper-gtk/icons/scalable/status/clapper-gtk-speed-fast-symbolic.svg Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
<path d="m 8 1.003906 c -2.050781 0 -4.097656 0.78125 -5.65625 2.339844 c -3.117188 3.117188 -3.117188 8.195312 0 11.3125 c 0.390625 0.390625 1.023438 0.390625 1.414062 0 c 0.390626 -0.390625 0.390626 -1.023438 0 -1.414062 c -2.351562 -2.351563 -2.351562 -6.132813 0 -8.484376 c 2.351563 -2.351562 6.132813 -2.351562 8.484376 0 c 1.972656 1.972657 2.289062 4.953126 0.953124 7.246094 c -0.257812 0.445313 -0.574218 0.859375 -0.953124 1.238282 c -0.390626 0.390624 -0.390626 1.023437 0 1.414062 c 0.390624 0.390625 1.023437 0.390625 1.414062 0 c 3.117188 -3.117188 3.117188 -8.195312 0 -11.3125 c -1.558594 -1.558594 -3.605469 -2.339844 -5.65625 -2.339844 z m 5.195312 11 l -0.363281 -1.363281 l -2.832031 -1.636719 c 0 -0.714844 -0.382812 -1.371094 -1 -1.730468 c -0.957031 -0.550782 -2.179688 -0.222657 -2.730469 0.730468 c -0.554687 0.957032 -0.226562 2.183594 0.730469 2.734375 c 0.617188 0.355469 1.378906 0.351563 1.996094 -0.003906 l 2.835937 1.636719 z m 0 0" fill="#2e3434"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

4
src/lib/clapper-gtk/icons/scalable/status/clapper-gtk-speed-normal-symbolic.svg Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
<path d="m 8 1.003906 c -2.050781 0 -4.097656 0.78125 -5.65625 2.339844 c -3.117188 3.117188 -3.117188 8.195312 0 11.3125 c 0.390625 0.390625 1.023438 0.390625 1.414062 0 c 0.390626 -0.390625 0.390626 -1.023438 0 -1.414062 c -2.351562 -2.351563 -2.351562 -6.132813 0 -8.484376 c 2.351563 -2.351562 6.132813 -2.351562 8.484376 0 c 2.351562 2.351563 2.351562 6.132813 0 8.484376 c -0.390626 0.390624 -0.390626 1.023437 0 1.414062 c 0.390624 0.390625 1.023437 0.390625 1.414062 0 c 3.117188 -3.117188 3.117188 -8.195312 0 -11.3125 c -1.558594 -1.558594 -3.605469 -2.339844 -5.65625 -2.339844 z m -1 2.996094 v 3.273438 c -0.617188 0.355468 -0.996094 1.015624 -1 1.726562 c 0 1.105469 0.894531 2 2 2 s 2 -0.894531 2 -2 c 0 -0.714844 -0.382812 -1.375 -1 -1.730469 v -3.269531 l -1 -1 z m 0 0" fill="#2e3434"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 943 B

4
src/lib/clapper-gtk/icons/scalable/status/clapper-gtk-speed-slow-symbolic.svg Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
<path d="m 8 1.003906 c -2.050781 0 -4.097656 0.78125 -5.65625 2.339844 c -3.117188 3.117188 -3.117188 8.195312 0 11.3125 c 0.390625 0.390625 1.023438 0.390625 1.414062 0 c 0.390626 -0.390625 0.390626 -1.023438 0 -1.414062 c -0.378906 -0.378907 -0.699218 -0.796876 -0.957031 -1.242188 c -1.332031 -2.296875 -1.015625 -5.269531 0.957031 -7.242188 c 2.351563 -2.351562 6.132813 -2.351562 8.484376 0 c 2.351562 2.351563 2.351562 6.132813 0 8.484376 c -0.390626 0.390624 -0.390626 1.023437 0 1.414062 c 0.390624 0.390625 1.023437 0.390625 1.414062 0 c 3.117188 -3.117188 3.117188 -8.195312 0 -11.3125 c -1.558594 -1.558594 -3.605469 -2.339844 -5.65625 -2.339844 z m -5.199219 10.996094 l 1.367188 0.363281 l 2.835937 -1.632812 c 0.617188 0.355469 1.378906 0.355469 1.996094 0 c 0.957031 -0.550781 1.285156 -1.773438 0.730469 -2.730469 c -0.550781 -0.957031 -1.773438 -1.285156 -2.730469 -0.734375 c -0.617188 0.359375 -0.996094 1.019531 -0.996094 1.730469 l -2.835937 1.636718 z m 0 0" fill="#2e3434"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

2
src/lib/clapper-gtk/ui/clapper-gtk-extra-menu-button.ui
View File

@@ -113,7 +113,7 @@
<object class="GtkButton" id="speed_button">
<property name="halign">center</property>
<property name="valign">center</property>
<property name="icon-name">power-profile-balanced-symbolic</property>
<property name="icon-name">clapper-gtk-speed-normal-symbolic</property>
<property name="action-name">video.set-speed</property>
<property name="action-target">1.0</property>
<property name="tooltip-text" translatable="yes">Reset</property>