Indicator Display Objects

Merge lp:~ken-vandine/ido/lp_888392 into lp:ido/0.3

  1. lp_888392
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 98
Merged at revision: 98
Proposed branch: lp:~ken-vandine/ido/lp_888392
Merge into: lp:ido/0.3
Diff against target: 233 lines (+58/-0)
8 files modified
configure.ac (+1/-0)
example/menus.c (+6/-0)
example/messagedialog.c (+6/-0)
src/idocalendarmenuitem.c (+6/-0)
src/idoentrymenuitem.c (+6/-0)
src/idomessagedialog.c (+17/-0)
src/idorange.c (+2/-0)
src/idoscalemenuitem.c (+14/-0)
To merge this branch: bzr merge lp:~ken-vandine/ido/lp_888392
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+85709@code.launchpad.net

Description of the change

removed deprecations from gtk3 and fixed sizing issues with idemessagedialog (LP: #888392)

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks Ken, that looks fine to me!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2011-10-13 15:48:46 +0000
3+++ configure.ac 2011-12-14 17:26:37 +0000
4@@ -139,6 +139,7 @@
5 echo " ==============================="
6 echo ""
7 echo " Prefix : ${prefix}"
8+echo " GTK : ${with_gtk}"
9 echo ""
10 echo " Documentation: ${enable_gtk_doc}"
11 echo ""
12
13=== modified file 'example/menus.c'
14--- example/menus.c 2010-08-19 16:48:45 +0000
15+++ example/menus.c 2011-12-14 17:26:37 +0000
16@@ -3,6 +3,7 @@
17 #include "idoscalemenuitem.h"
18 #include "idocalendarmenuitem.h"
19 #include "idoentrymenuitem.h"
20+#include "config.h"
21
22 static void
23 slider_grabbed (GtkWidget *widget, gpointer user_data)
24@@ -37,7 +38,12 @@
25 g_signal_connect (window, "delete-event",
26 G_CALLBACK (gtk_main_quit), NULL);
27
28+#ifdef USE_GTK3
29+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
30+#else
31 vbox = gtk_vbox_new (FALSE, 0);
32+#endif
33+
34 gtk_container_add (GTK_CONTAINER (window), vbox);
35
36 menubar = gtk_menu_bar_new ();
37
38=== modified file 'example/messagedialog.c'
39--- example/messagedialog.c 2010-05-12 21:21:36 +0000
40+++ example/messagedialog.c 2011-12-14 17:26:37 +0000
41@@ -1,6 +1,7 @@
42 #include <gtk/gtk.h>
43
44 #include "idomessagedialog.h"
45+#include "config.h"
46
47 static void
48 response_cb (GtkDialog *dialog,
49@@ -40,7 +41,12 @@
50 gtk_window_set_title (GTK_WINDOW (window), "Message Dialogs");
51 g_signal_connect (window, "destroy", gtk_main_quit, NULL);
52
53+#ifdef USE_GTK3
54+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
55+#else
56 vbox = gtk_vbox_new (FALSE, 0);
57+#endif
58+
59 gtk_container_add (GTK_CONTAINER (window), vbox);
60
61 button = gtk_button_new_with_label ("Confirmation dialog");
62
63=== modified file 'src/idocalendarmenuitem.c'
64--- src/idocalendarmenuitem.c 2011-09-16 18:04:30 +0000
65+++ src/idocalendarmenuitem.c 2011-12-14 17:26:37 +0000
66@@ -25,6 +25,7 @@
67
68 #include <gdk/gdkkeysyms.h>
69 #include "idocalendarmenuitem.h"
70+#include "config.h"
71
72 #if GTK_CHECK_VERSION (3, 0, 0)
73 static void ido_calendar_menu_item_select (GtkMenuItem *item);
74@@ -131,7 +132,12 @@
75 G_CALLBACK (calendar_move_focus_cb),
76 item);
77
78+#ifdef USE_GTK3
79+ priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
80+#else
81 priv->box = gtk_hbox_new (FALSE, 0);
82+#endif
83+
84 gtk_box_pack_start (GTK_BOX (priv->box), priv->calendar, FALSE, FALSE, 0);
85
86 gtk_container_add (GTK_CONTAINER (item), priv->box);
87
88=== modified file 'src/idoentrymenuitem.c'
89--- src/idoentrymenuitem.c 2011-06-01 19:49:43 +0000
90+++ src/idoentrymenuitem.c 2011-12-14 17:26:37 +0000
91@@ -25,6 +25,7 @@
92
93 #include <gdk/gdkkeysyms.h>
94 #include "idoentrymenuitem.h"
95+#include "config.h"
96
97 #if GTK_CHECK_VERSION (3, 0, 0)
98 static void ido_entry_menu_item_select (GtkMenuItem *item);
99@@ -118,7 +119,12 @@
100 G_CALLBACK (entry_move_focus_cb),
101 item);
102
103+#ifdef USE_GTK3
104+ priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
105+#else
106 priv->box = gtk_hbox_new (FALSE, 0);
107+#endif
108+
109 gtk_box_pack_start (GTK_BOX (priv->box), priv->entry, FALSE, FALSE, 0);
110
111 gtk_container_add (GTK_CONTAINER (item), priv->box);
112
113=== modified file 'src/idomessagedialog.c'
114--- src/idomessagedialog.c 2011-06-01 19:36:43 +0000
115+++ src/idomessagedialog.c 2011-12-14 17:26:37 +0000
116@@ -32,6 +32,7 @@
117
118 #include "idomessagedialog.h"
119 #include "idotimeline.h"
120+#include "config.h"
121
122 #define IDO_MESSAGE_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), IDO_TYPE_MESSAGE_DIALOG, IdoMessageDialogPrivate))
123
124@@ -166,14 +167,22 @@
125 IdoTimeline *timeline;
126 IdoMessageDialogMorphContext *context;
127
128+#ifdef USE_GTK3
129+ gtk_widget_get_preferred_size (GTK_WIDGET (dialog), NULL, &start);
130+#else
131 gtk_widget_get_requisition (GTK_WIDGET (dialog), &start);
132+#endif
133
134 priv->expanded = TRUE;
135
136 gtk_widget_show (priv->action_area);
137 gtk_widget_show (priv->secondary_label);
138
139+#ifdef USE_GTK3
140+ gtk_widget_get_preferred_size (GTK_WIDGET (dialog), NULL, &end);
141+#else
142 gtk_widget_get_requisition (GTK_WIDGET (dialog), &end);
143+#endif
144
145 gtk_widget_hide (priv->action_area);
146 gtk_widget_hide (priv->secondary_label);
147@@ -370,7 +379,11 @@
148
149 for (list = children; list != NULL; list = list->next)
150 {
151+#ifdef USE_GTK3
152+ if (G_TYPE_FROM_INSTANCE (list->data) == GTK_TYPE_BOX && gtk_orientable_get_orientation (list->data) == GTK_ORIENTATION_HORIZONTAL)
153+#else
154 if (G_TYPE_FROM_INSTANCE (list->data) == GTK_TYPE_HBOX)
155+#endif
156 {
157 GList *hchildren;
158 GList *hlist;
159@@ -380,7 +393,11 @@
160
161 for (hlist = hchildren; hlist != NULL; hlist = hlist->next)
162 {
163+#ifdef USE_GTK3
164+ if (G_TYPE_FROM_INSTANCE (hlist->data) == GTK_TYPE_BOX && gtk_orientable_get_orientation (hlist->data) == GTK_ORIENTATION_VERTICAL)
165+#else
166 if (G_TYPE_FROM_INSTANCE (hlist->data) == GTK_TYPE_VBOX)
167+#endif
168 {
169 GList *vlist;
170 GtkWidget *vbox = GTK_WIDGET (hlist->data);
171
172=== modified file 'src/idorange.c'
173--- src/idorange.c 2011-10-05 17:41:37 +0000
174+++ src/idorange.c 2011-12-14 17:26:37 +0000
175@@ -177,6 +177,7 @@
176 "knob-height", &height,
177 NULL);
178
179+#ifndef USE_GTK3
180 g_snprintf (buf, sizeof (buf),
181 "style \"ido-range\" {\n"
182 " GtkRange::slider-width = %d\n"
183@@ -184,6 +185,7 @@
184 "} widget \"*.idorange-%p\" style \"ido-range\"\n",
185 width, height, range);
186 gtk_rc_parse_string (buf);
187+#endif
188 }
189
190 gtk_range_set_slider_size_fixed (GTK_RANGE (range), TRUE);
191
192=== modified file 'src/idoscalemenuitem.c'
193--- src/idoscalemenuitem.c 2011-10-06 13:25:34 +0000
194+++ src/idoscalemenuitem.c 2011-12-14 17:26:37 +0000
195@@ -157,16 +157,26 @@
196 switch (priv->style)
197 {
198 case IDO_SCALE_MENU_ITEM_STYLE_IMAGE:
199+#ifdef USE_GTK3
200+ gtk_widget_get_preferred_size (priv->primary_image, &primary_req, NULL);
201+ gtk_widget_get_preferred_size (priv->secondary_image, &secondary_req, NULL);
202+#else
203 gtk_widget_get_child_requisition (priv->primary_image, &primary_req);
204 gtk_widget_get_child_requisition (priv->secondary_image, &secondary_req);
205+#endif
206
207 primary_padding = gtk_widget_get_visible (priv->primary_image) ? primary_req.width : 0;
208 secondary_padding = gtk_widget_get_visible (priv->secondary_image) ? secondary_req.width : 0;
209 break;
210
211 case IDO_SCALE_MENU_ITEM_STYLE_LABEL:
212+#ifdef USE_GTK3
213+ gtk_widget_get_preferred_size (priv->primary_label, &primary_req, NULL);
214+ gtk_widget_get_preferred_size (priv->secondary_label, &secondary_req, NULL);
215+#else
216 gtk_widget_get_child_requisition (priv->primary_label, &primary_req);
217 gtk_widget_get_child_requisition (priv->secondary_label, &secondary_req);
218+#endif
219
220 primary_padding = gtk_widget_get_visible (priv->primary_label) ? primary_req.width : 0;
221 secondary_padding = gtk_widget_get_visible (priv->secondary_label) ? secondary_req.width : 0;
222@@ -247,7 +257,11 @@
223 gtk_container_add (GTK_CONTAINER (priv->proxy), priv->scale);
224 #endif
225
226+#ifdef USE_GTK3
227+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
228+#else
229 hbox = gtk_hbox_new (FALSE, 0);
230+#endif
231
232 priv->primary_image = gtk_image_new ();
233 g_signal_connect (priv->primary_image, "notify",

Subscribers

People subscribed via source and target branches