toxblh/podcasts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Stop overriding the images

Browse Source
This commit is contained in:
Zander Brown 2018-07-23 23:28:22 +01:00 committed by Jordan Petridis
parent cf1042f40d
commit cfe10553b2
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
5 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hammond-gtk/resources/gtk/player_toolbar.ui
View File

@ -2,13 +2,10 @@
<!-- Generated with glade 3.22.0 -->
<interface>
<requires lib="gtk+" version="3.20"/>
<object class="GtkImage" id="ff_image">
<object class="GtkImage" id="fast_forward">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="margin_top">1</property>
<property name="resource">/org/gnome/Hammond/icons/src/skip-forward-symbolic</property>
<property name="icon_size">1</property>
<property name="icon_name">skip-forward-symbolic</property>
</object>
<object class="GtkImage" id="pause_image">
<property name="visible">True</property>
@ -24,12 +21,10 @@
<property name="icon_name">media-playback-start-symbolic</property>
<property name="icon_size">1</property>
</object>
<object class="GtkImage" id="previous_image">
<object class="GtkImage" id="rewind">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">1</property>
<property name="resource">/org/gnome/Hammond/icons/src/skip-back-symbolic</property>
<property name="icon_size">1</property>
<property name="icon_name">skip-back-symbolic</property>
</object>
<object class="GtkActionBar" id="action_bar">
<property name="can_focus">False</property>
@ -47,7 +42,7 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Rewind 10 seconds</property>
<property name="image">previous_image</property>
<property name="image">rewind</property>
<property name="always_show_image">True</property>
</object>
<packing>
@ -94,7 +89,7 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Fast Forward 10 seconds</property>
<property name="image">ff_image</property>
<property name="image">fast_forward</property>
<property name="always_show_image">True</property>
</object>
<packing>

0
hammond-gtk/resources/icons/src/skip-back-symbolic.svg → hammond-gtk/resources/icons/skip-back-symbolic.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

0
hammond-gtk/resources/icons/src/skip-forward-symbolic.svg → hammond-gtk/resources/icons/skip-forward-symbolic.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

6
hammond-gtk/resources/resources.xml
View File

@ -15,8 +15,8 @@
<file compressed="true" preprocess="xml-stripblanks">gtk/show_menu.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtk/help-overlay.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtk/player_toolbar.ui</file>
<file compressed="true" preprocess="xml-stripblanks">icons/src/skip-back-symbolic.svg</file>
<file compressed="true" preprocess="xml-stripblanks">icons/src/skip-forward-symbolic.svg</file>
<file compressed="true" preprocess="xml-stripblanks">icons/skip-back-symbolic.svg</file>
<file compressed="true" preprocess="xml-stripblanks">icons/skip-forward-symbolic.svg</file>
<file compressed="true">gtk/style.css</file>
</gresource>
</gresources>
</gresources>

7
hammond-gtk/src/widgets/player.rs
View File

@ -188,13 +188,6 @@ impl Default for PlayerWidget {
let forward: gtk::Button = builder.get_object("ff_button").unwrap();
let rewind: gtk::Button = builder.get_object("rewind_button").unwrap();
let img =
gtk::Image::new_from_resource("/org/gnome/Hammond/icons/src/skip-forward-symbolic.svg");
forward.set_image(&img);
let img =
gtk::Image::new_from_resource("/org/gnome/Hammond/icons/src/skip-back-symbolic.svg");
rewind.set_image(&img);
let controls = PlayerControls {
container: buttons,
play,