← Back to branch summary

~ubuntu-branches/ubuntu/vivid/gmpc/vivid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/0003-Fix-images-on-buttons.patch

  • Committer: Package Import Robot
  • Author(s): Etienne Millon
  • Date: 2011-12-18 16:09:43 UTC
  • Revision ID: package-import@ubuntu.com-20111218160943-9vk3xroitg1dm0j1
Tags: 11.8.16-2
http://bugs.debian.org/647701
http://bugs.debian.org/646803
http://bugs.debian.org/646822
http://bugs.debian.org/650219
* Install user manual (Closes: #647701)
* New patches :
    - Change volume slider sensitivity (Closes: #646803)
    - Bring back images for transport buttons (Closes: #646822)
    - Fix build with valac 0.14 (Thanks to Michael Biebl, Closes: #650219)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0003-Fix-images-on-buttons.patch
 
1
From: Qball Cow <qball@gmpclient.org>
 
2
Date: Thu, 3 Nov 2011 19:12:02 +0100
 
3
Subject: Fix images on buttons
 
4
 
 
5
Cherry-picked from upstream commits :
 
6
 
 
7
19e74c56f9ee88c240ef58379667efe4b31bfebc
 
8
ced4f26e053bff5bb04205f623a179fc97fdfe52
 
9
---
 
10
 glade/playlist3.ui |   22 ++++++++++++----------
 
11
 src/playlist3.c    |   11 ++++++-----
 
12
 2 files changed, 18 insertions(+), 15 deletions(-)
 
13
 
 
14
diff --git a/glade/playlist3.ui b/glade/playlist3.ui
 
15
index fedb627..452f3ec 100644
 
16
--- a/glade/playlist3.ui
 
17
+++ b/glade/playlist3.ui
 
18
@@ -436,16 +436,17 @@
 
19
                                 <child>
 
20
                                   <object class="GtkButton" id="button_previous">
 
21
                                     <property name="visible">True</property>
 
22
+                                    <property name="use_action_appearance">False</property>
 
23
                                     <property name="related-action">MPDPrevious</property>
 
24
                                     <property name="can_focus">True</property>
 
25
                                     <property name="receives_default">False</property>
 
26
                                     <property name="relief">none</property>
 
27
                                     <property name="use_action_appearance">False</property>
 
28
                                     <child>
 
29
-                                      <object class="GtkImage" id="image10">
 
30
+                                        <object class="GtkImage" id="button_previous_image">
 
31
                                         <property name="visible">True</property>
 
32
                                         <property name="stock">gtk-media-previous</property>
 
33
-                                      </object>
 
34
+                                        </object>
 
35
                                     </child>
 
36
                                   </object>
 
37
                                   <packing>
 
38
@@ -455,18 +456,18 @@
 
39
                                   </packing>
 
40
                                 </child>
 
41
                                 <child>
 
42
-                                  <object class="GtkButton" id="top_button">
 
43
+                                  <object class="GtkButton" id="stop_button">
 
44
                                     <property name="visible">True</property>
 
45
+                                    <property name="use_action_appearance">False</property>
 
46
                                     <property name="related-action">MPDStop</property>
 
47
                                     <property name="can_focus">True</property>
 
48
                                     <property name="receives_default">True</property>
 
49
                                     <property name="relief">none</property>
 
50
-                                    <property name="use_action_appearance">False</property>
 
51
                                     <child>
 
52
-                                      <object class="GtkImage" id="stop_button_image">
 
53
+                                        <object class="GtkImage" id="button_stop_image">
 
54
                                         <property name="visible">True</property>
 
55
                                         <property name="stock">gtk-media-stop</property>
 
56
-                                      </object>
 
57
+                                        </object>
 
58
                                     </child>
 
59
                                   </object>
 
60
                                   <packing>
 
61
@@ -478,15 +479,16 @@
 
62
                                 <child>
 
63
                                   <object class="GtkButton" id="play_button">
 
64
                                     <property name="visible">True</property>
 
65
+                                    <property name="use_action_appearance">False</property>
 
66
                                     <property name="related-action">MPDPlayPause</property>
 
67
                                     <property name="can_focus">True</property>
 
68
                                     <property name="receives_default">False</property>
 
69
                                     <property name="relief">none</property>
 
70
                                     <child>
 
71
-                                      <object class="GtkImage" id="play_button_image">
 
72
+                                        <object class="GtkImage" id="play_button_image">
 
73
                                         <property name="visible">True</property>
 
74
                                         <property name="stock">gtk-media-play</property>
 
75
-                                      </object>
 
76
+                                        </object>
 
77
                                     </child>
 
78
                                   </object>
 
79
                                   <packing>
 
80
@@ -498,13 +500,13 @@
 
81
                                 <child>
 
82
                                   <object class="GtkButton" id="next_button">
 
83
                                     <property name="visible">True</property>
 
84
+                                    <property name="use_action_appearance">False</property>
 
85
                                     <property name="related-action">MPDNext</property>
 
86
                                     <property name="can_focus">True</property>
 
87
                                     <property name="receives_default">False</property>
 
88
-                                    <property name="use_action_appearance">False</property>
 
89
                                     <property name="relief">none</property>
 
90
                                     <child>
 
91
-                                      <object class="GtkImage" id="image11">
 
92
+                                      <object class="GtkImage" id="next_button_image">
 
93
                                         <property name="visible">True</property>
 
94
                                         <property name="stock">gtk-media-next</property>
 
95
                                       </object>
 
96
diff --git a/src/playlist3.c b/src/playlist3.c
 
97
index 72b4ef7..3dac409 100644
 
98
--- a/src/playlist3.c
 
99
+++ b/src/playlist3.c
 
100
@@ -1632,7 +1632,8 @@ static void playlist_status_changed(MpdObj * mi, ChangedStatusType what, void *u
 
101
                 gtk_action_set_stock_id(GTK_ACTION(gtk_builder_get_object(pl3_xml, "MPDPlayPause")), "gtk-media-pause");
 
102
                 gtk_image_set_from_stock(GTK_IMAGE
 
103
                     (gtk_builder_get_object
 
104
-                    (pl3_xml, "play_button_image")), "gtk-media-pause", GTK_ICON_SIZE_BUTTON);
 
105
+                    (pl3_xml, "play_button_image")), "gtk-media-pause",
 
106
+                                       GTK_ICON_SIZE_MENU);
 
107
 
 
108
                 /**
 
109
                  * Update window title
 
110
@@ -1669,8 +1670,8 @@ static void playlist_status_changed(MpdObj * mi, ChangedStatusType what, void *u
 
111
                 gtk_action_set_stock_id(GTK_ACTION(gtk_builder_get_object(pl3_xml, "MPDPlayPause")), "gtk-media-play");
 
112
                 gtk_image_set_from_stock(GTK_IMAGE
 
113
                     (gtk_builder_get_object
 
114
-                    (pl3_xml, "play_button_image")), "gtk-media-play", GTK_ICON_SIZE_BUTTON);
 
115
-
 
116
+                    (pl3_xml, "play_button_image")), "gtk-media-play",
 
117
+                                       GTK_ICON_SIZE_MENU);
 
118
                 /**
 
119
                  * Set paused in Window string
 
120
                  */
 
121
@@ -1704,8 +1705,8 @@ static void playlist_status_changed(MpdObj * mi, ChangedStatusType what, void *u
 
122
 
 
123
                 gtk_image_set_from_stock(GTK_IMAGE
 
124
                     (gtk_builder_get_object
 
125
-                    (pl3_xml, "play_button_image")), "gtk-media-play", GTK_ICON_SIZE_BUTTON);
 
126
-
 
127
+                    (pl3_xml, "play_button_image")), "gtk-media-play",
 
128
+                                       GTK_ICON_SIZE_MENU);
 
129
                 if (gmpc_profiles_get_number_of_profiles(gmpc_profiles) > 1)
 
130
                 {
 
131
                     gchar *id = gmpc_profiles_get_current(gmpc_profiles);
 
132
--