Merge lp:~robert-ancell/ido/lp582985 into lp:ido/13.04
- lp582985
- Merge into trunk.13.04
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Didier Roche-Tolomelli | ||||
Approved revision: | 123 | ||||
Merged at revision: | 122 | ||||
Proposed branch: | lp:~robert-ancell/ido/lp582985 | ||||
Merge into: | lp:ido/13.04 | ||||
Diff against target: |
858 lines (+366/-40) 13 files modified
configure.ac (+9/-0) debian/control (+17/-0) debian/gir1.2-ido3-0.1.install (+1/-0) debian/libido3-0.1-dev.install (+2/-0) src/Makefile.am (+53/-0) src/idocalendarmenuitem.c (+77/-7) src/idoentrymenuitem.c (+18/-4) src/idomessagedialog.c (+20/-1) src/idorange.c (+2/-0) src/idoscalemenuitem.c (+62/-22) src/idoscalemenuitem.h (+2/-2) src/idoswitchmenuitem.c (+15/-4) src/idotimeline.c (+88/-0) |
||||
To merge this branch: | bzr merge lp:~robert-ancell/ido/lp582985 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Mathieu Trudel-Lapierre | Approve | ||
Review via email: mp+139791@code.launchpad.net |
Commit message
Add introspection and vala support
Description of the change
PS Jenkins bot (ps-jenkins) wrote : | # |
Robert Ancell (robert-ancell) wrote : | # |
I think the build failure might be because the packaging branch that Jenkins is using won't have the dependencies required for this? I can update the packaging but not sure where it is...
Mathieu Trudel-Lapierre (cyphermox) wrote : | # |
Correct, given that we now use "inline" packaging (split mode in bzr), you'll want to add gobject-
Robert Ancell (robert-ancell) wrote : | # |
Whoops, I was looking at libindicate. Now I notice debian/ is in ido. Too many i* names...
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:122
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:123
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Robert Ancell (robert-ancell) wrote : | # |
Hmm, the amd64 build failure seems to be something to do with Xvfb? I can't trigger a rebuild it seems, can someone?
Allan LeSage (allanlesage) wrote : | # |
Let me do a test build Robert, will report here.
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:123
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Allan LeSage (allanlesage) wrote : | # |
Fixed the tests separately (in https:/
Robert Ancell (robert-ancell) wrote : | # |
Thanks Allan!
Mathieu Trudel-Lapierre (cyphermox) wrote : | # |
Approve
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Autolanding.
No commit message was specified.
Allan LeSage (allanlesage) wrote : | # |
The "use description for commit" option was set for this build--attempting again.
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Autolanding.
No commit message was specified.
Preview Diff
1 | === modified file 'configure.ac' | |||
2 | --- configure.ac 2012-11-08 15:37:00 +0000 | |||
3 | +++ configure.ac 2012-12-15 07:41:19 +0000 | |||
4 | @@ -123,6 +123,14 @@ | |||
5 | 123 | AC_SUBST(COVERAGE_CXXFLAGS) | 123 | AC_SUBST(COVERAGE_CXXFLAGS) |
6 | 124 | AC_SUBST(COVERAGE_LDFLAGS) | 124 | AC_SUBST(COVERAGE_LDFLAGS) |
7 | 125 | 125 | ||
8 | 126 | dnl = GObject Introspection =================================================== | ||
9 | 127 | |||
10 | 128 | GOBJECT_INTROSPECTION_CHECK([0.6.7]) | ||
11 | 129 | |||
12 | 130 | dnl = Vala API Generation ===================================================== | ||
13 | 131 | |||
14 | 132 | AC_PATH_PROG([VALA_API_GEN], [vapigen]) | ||
15 | 133 | |||
16 | 126 | dnl = Google Test Framework =================================================== | 134 | dnl = Google Test Framework =================================================== |
17 | 127 | 135 | ||
18 | 128 | m4_include([m4/gtest.m4]) | 136 | m4_include([m4/gtest.m4]) |
19 | @@ -152,6 +160,7 @@ | |||
20 | 152 | echo "" | 160 | echo "" |
21 | 153 | echo " Prefix : ${prefix}" | 161 | echo " Prefix : ${prefix}" |
22 | 154 | echo " gcov : ${use_gcov}" | 162 | echo " gcov : ${use_gcov}" |
23 | 163 | echo " introspection: ${enable_introspection}" | ||
24 | 155 | echo "" | 164 | echo "" |
25 | 156 | echo " Documentation: ${enable_gtk_doc}" | 165 | echo " Documentation: ${enable_gtk_doc}" |
26 | 157 | echo "" | 166 | echo "" |
27 | 158 | 167 | ||
28 | === modified file 'debian/control' | |||
29 | --- debian/control 2012-12-05 15:40:53 +0000 | |||
30 | +++ debian/control 2012-12-15 07:41:19 +0000 | |||
31 | @@ -11,6 +11,11 @@ | |||
32 | 11 | libglib2.0-dev (>=2.14.0), | 11 | libglib2.0-dev (>=2.14.0), |
33 | 12 | libgtk-3-dev (>= 3.0), | 12 | libgtk-3-dev (>= 3.0), |
34 | 13 | gtk-doc-tools, | 13 | gtk-doc-tools, |
35 | 14 | gobject-introspection, | ||
36 | 15 | libgirepository1.0-dev, | ||
37 | 16 | gir1.2-glib-2.0, | ||
38 | 17 | gir1.2-gtk-2.0, | ||
39 | 18 | valac-0.16 | ||
40 | 14 | Standards-Version: 3.9.3 | 19 | Standards-Version: 3.9.3 |
41 | 15 | Homepage: https://launchpad.net/ido | 20 | Homepage: https://launchpad.net/ido |
42 | 16 | # If you aren't a member of ~indicator-applet-developers but need to upload | 21 | # If you aren't a member of ~indicator-applet-developers but need to upload |
43 | @@ -44,3 +49,15 @@ | |||
44 | 44 | system indicators | 49 | system indicators |
45 | 45 | . | 50 | . |
46 | 46 | This package contains files that are needed to build GTK+ 3 applications. | 51 | This package contains files that are needed to build GTK+ 3 applications. |
47 | 52 | |||
48 | 53 | Package: gir1.2-ido3-0.1 | ||
49 | 54 | Section: libs | ||
50 | 55 | Architecture: any | ||
51 | 56 | Depends: ${misc:Depends}, | ||
52 | 57 | libido3-0.1-0 (>= ${binary:Version}), | ||
53 | 58 | ${gir:Depends} | ||
54 | 59 | Description: Typelib file for libido3-0.1 | ||
55 | 60 | Shared library providing extra gtk menu items for display in system indicators. | ||
56 | 61 | . | ||
57 | 62 | This package can be used by other packages using the GIRepository format to | ||
58 | 63 | generate dynamic bindings for libido3-0.1. | ||
59 | 47 | 64 | ||
60 | === added file 'debian/gir1.2-ido3-0.1.install' | |||
61 | --- debian/gir1.2-ido3-0.1.install 1970-01-01 00:00:00 +0000 | |||
62 | +++ debian/gir1.2-ido3-0.1.install 2012-12-15 07:41:19 +0000 | |||
63 | @@ -0,0 +1,1 @@ | |||
64 | 1 | usr/lib/*/girepository-1.0 /usr/lib | ||
65 | 0 | 2 | ||
66 | === modified file 'debian/libido3-0.1-dev.install' | |||
67 | --- debian/libido3-0.1-dev.install 2012-11-19 18:58:43 +0000 | |||
68 | +++ debian/libido3-0.1-dev.install 2012-12-15 07:41:19 +0000 | |||
69 | @@ -1,3 +1,5 @@ | |||
70 | 1 | usr/include/libido3-* | 1 | usr/include/libido3-* |
71 | 2 | usr/lib/*/pkgconfig/libido3-* | 2 | usr/lib/*/pkgconfig/libido3-* |
72 | 3 | usr/lib/*/libido3-*.so | 3 | usr/lib/*/libido3-*.so |
73 | 4 | usr/share/vala | ||
74 | 5 | usr/share/gir-1.0 | ||
75 | 4 | 6 | ||
76 | === modified file 'src/Makefile.am' | |||
77 | --- src/Makefile.am 2012-08-22 14:39:22 +0000 | |||
78 | +++ src/Makefile.am 2012-12-15 07:41:19 +0000 | |||
79 | @@ -1,3 +1,5 @@ | |||
80 | 1 | CLEANFILES = | ||
81 | 2 | |||
82 | 1 | VER=3 | 3 | VER=3 |
83 | 2 | lib_LTLIBRARIES = libido3-0.1.la | 4 | lib_LTLIBRARIES = libido3-0.1.la |
84 | 3 | 5 | ||
85 | @@ -94,3 +96,54 @@ | |||
86 | 94 | idotypebuiltins.h \ | 96 | idotypebuiltins.h \ |
87 | 95 | idotypebuiltins.c | 97 | idotypebuiltins.c |
88 | 96 | 98 | ||
89 | 99 | -include $(INTROSPECTION_MAKEFILE) | ||
90 | 100 | INTROSPECTION_GIRS = | ||
91 | 101 | INTROSPECTION_SCANNER_ARGS = \ | ||
92 | 102 | --symbol-prefix=ido \ | ||
93 | 103 | --warn-all \ | ||
94 | 104 | --identifier-prefix=Ido | ||
95 | 105 | |||
96 | 106 | if HAVE_INTROSPECTION | ||
97 | 107 | |||
98 | 108 | Ido3-0.1.gir: libido3-0.1.la | ||
99 | 109 | Ido3_0_1_gir_INCLUDES = Gtk-3.0 | ||
100 | 110 | Ido3_0_1_gir_CFLAGS = | ||
101 | 111 | Ido3_0_1_gir_LIBS = libido3-0.1.la | ||
102 | 112 | Ido3_0_1_gir_FILES = \ | ||
103 | 113 | idocalendarmenuitem.h \ | ||
104 | 114 | idoentrymenuitem.h \ | ||
105 | 115 | idomessagedialog.h \ | ||
106 | 116 | idorange.h \ | ||
107 | 117 | idoscalemenuitem.h \ | ||
108 | 118 | idoswitchmenuitem.h \ | ||
109 | 119 | idotimeline.h \ | ||
110 | 120 | $(libido_0_1_la_SOURCES) | ||
111 | 121 | Ido3_0_1_gir_NAMESPACE = Ido3 | ||
112 | 122 | Ido3_0_1_gir_VERSION = 0.1 | ||
113 | 123 | Ido3_0_1_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS) | ||
114 | 124 | |||
115 | 125 | INTROSPECTION_GIRS += Ido3-0.1.gir | ||
116 | 126 | |||
117 | 127 | girdir = $(datadir)/gir-1.0 | ||
118 | 128 | gir_DATA = $(INTROSPECTION_GIRS) | ||
119 | 129 | |||
120 | 130 | typelibdir = $(libdir)/girepository-1.0 | ||
121 | 131 | typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) | ||
122 | 132 | |||
123 | 133 | CLEANFILES += $(gir_DATA) $(typelib_DATA) | ||
124 | 134 | |||
125 | 135 | endif | ||
126 | 136 | |||
127 | 137 | if HAVE_INTROSPECTION | ||
128 | 138 | |||
129 | 139 | vapidir = $(datadir)/vala/vapi | ||
130 | 140 | vapi_DATA = Ido3-0.1.vapi | ||
131 | 141 | |||
132 | 142 | Ido3-0.1.vapi: Ido3-0.1.gir | ||
133 | 143 | $(VALA_API_GEN) --library=Ido3-0.1 \ | ||
134 | 144 | --pkg gtk+-3.0 \ | ||
135 | 145 | $< | ||
136 | 146 | |||
137 | 147 | CLEANFILES += $(vapi_DATA) | ||
138 | 148 | |||
139 | 149 | endif | ||
140 | 97 | 150 | ||
141 | === modified file 'src/idocalendarmenuitem.c' | |||
142 | --- src/idocalendarmenuitem.c 2012-09-20 04:32:58 +0000 | |||
143 | +++ src/idocalendarmenuitem.c 2012-12-15 07:41:19 +0000 | |||
144 | @@ -324,21 +324,44 @@ | |||
145 | 324 | g_signal_emit_by_name (item, "day-selected-double-click", NULL); | 324 | g_signal_emit_by_name (item, "day-selected-double-click", NULL); |
146 | 325 | } | 325 | } |
147 | 326 | 326 | ||
149 | 327 | /* Public API */ | 327 | /** |
150 | 328 | * ido_calendar_menu_item_new: | ||
151 | 329 | * | ||
152 | 330 | * Creates a new #IdoCalendarMenuItem | ||
153 | 331 | * | ||
154 | 332 | * Return Value: a new #IdoCalendarMenuItem. | ||
155 | 333 | **/ | ||
156 | 328 | GtkWidget * | 334 | GtkWidget * |
157 | 329 | ido_calendar_menu_item_new (void) | 335 | ido_calendar_menu_item_new (void) |
158 | 330 | { | 336 | { |
159 | 331 | return g_object_new (IDO_TYPE_CALENDAR_MENU_ITEM, NULL); | 337 | return g_object_new (IDO_TYPE_CALENDAR_MENU_ITEM, NULL); |
160 | 332 | } | 338 | } |
161 | 333 | 339 | ||
162 | 340 | /** | ||
163 | 341 | * ido_calendar_menu_item_get_calendar: | ||
164 | 342 | * @menuitem: A #IdoCalendarMenuItem | ||
165 | 343 | * | ||
166 | 344 | * Returns the calendar associated with this menu item. | ||
167 | 345 | * | ||
168 | 346 | * Return Value: (transfer none): The #GtkCalendar used in this item. | ||
169 | 347 | */ | ||
170 | 334 | GtkWidget * | 348 | GtkWidget * |
172 | 335 | ido_calendar_menu_item_get_calendar (IdoCalendarMenuItem *item) | 349 | ido_calendar_menu_item_get_calendar (IdoCalendarMenuItem *menuitem) |
173 | 336 | { | 350 | { |
175 | 337 | g_return_val_if_fail (IDO_IS_CALENDAR_MENU_ITEM (item), NULL); | 351 | g_return_val_if_fail (IDO_IS_CALENDAR_MENU_ITEM (menuitem), NULL); |
176 | 338 | 352 | ||
178 | 339 | return item->priv->calendar; | 353 | return menuitem->priv->calendar; |
179 | 340 | } | 354 | } |
180 | 341 | 355 | ||
181 | 356 | /** | ||
182 | 357 | * ido_calendar_menu_item_mark_day: | ||
183 | 358 | * @menuitem: A #IdoCalendarMenuItem | ||
184 | 359 | * @day: the day number to unmark between 1 and 31. | ||
185 | 360 | * | ||
186 | 361 | * Places a visual marker on a particular day. | ||
187 | 362 | * | ||
188 | 363 | * Return Value: #TRUE | ||
189 | 364 | */ | ||
190 | 342 | gboolean | 365 | gboolean |
191 | 343 | ido_calendar_menu_item_mark_day (IdoCalendarMenuItem *menuitem, guint day) | 366 | ido_calendar_menu_item_mark_day (IdoCalendarMenuItem *menuitem, guint day) |
192 | 344 | { | 367 | { |
193 | @@ -348,6 +371,15 @@ | |||
194 | 348 | return TRUE; | 371 | return TRUE; |
195 | 349 | } | 372 | } |
196 | 350 | 373 | ||
197 | 374 | /** | ||
198 | 375 | * ido_calendar_menu_item_unmark_day: | ||
199 | 376 | * @menuitem: A #IdoCalendarMenuItem | ||
200 | 377 | * @day: the day number to unmark between 1 and 31. | ||
201 | 378 | * | ||
202 | 379 | * Removes the visual marker from a particular day. | ||
203 | 380 | * | ||
204 | 381 | * Return Value: #TRUE | ||
205 | 382 | */ | ||
206 | 351 | gboolean | 383 | gboolean |
207 | 352 | ido_calendar_menu_item_unmark_day (IdoCalendarMenuItem *menuitem, guint day) | 384 | ido_calendar_menu_item_unmark_day (IdoCalendarMenuItem *menuitem, guint day) |
208 | 353 | { | 385 | { |
209 | @@ -357,6 +389,12 @@ | |||
210 | 357 | return TRUE; | 389 | return TRUE; |
211 | 358 | } | 390 | } |
212 | 359 | 391 | ||
213 | 392 | /** | ||
214 | 393 | * ido_calendar_menu_item_clear_marks: | ||
215 | 394 | * @menuitem: A #IdoCalendarMenuItem | ||
216 | 395 | * | ||
217 | 396 | * Remove all visual markers. | ||
218 | 397 | */ | ||
219 | 360 | void | 398 | void |
220 | 361 | ido_calendar_menu_item_clear_marks (IdoCalendarMenuItem *menuitem) | 399 | ido_calendar_menu_item_clear_marks (IdoCalendarMenuItem *menuitem) |
221 | 362 | { | 400 | { |
222 | @@ -365,6 +403,13 @@ | |||
223 | 365 | gtk_calendar_clear_marks(GTK_CALENDAR (menuitem->priv->calendar)); | 403 | gtk_calendar_clear_marks(GTK_CALENDAR (menuitem->priv->calendar)); |
224 | 366 | } | 404 | } |
225 | 367 | 405 | ||
226 | 406 | /** | ||
227 | 407 | * ido_calendar_menu_item_set_display_options: | ||
228 | 408 | * @menuitem: A #IdoCalendarMenuItem | ||
229 | 409 | * @flags: the display options to set | ||
230 | 410 | * | ||
231 | 411 | * Set the display options for the calendar. | ||
232 | 412 | */ | ||
233 | 368 | void | 413 | void |
234 | 369 | ido_calendar_menu_item_set_display_options (IdoCalendarMenuItem *menuitem, GtkCalendarDisplayOptions flags) | 414 | ido_calendar_menu_item_set_display_options (IdoCalendarMenuItem *menuitem, GtkCalendarDisplayOptions flags) |
235 | 370 | { | 415 | { |
236 | @@ -373,6 +418,14 @@ | |||
237 | 373 | gtk_calendar_set_display_options (GTK_CALENDAR (menuitem->priv->calendar), flags); | 418 | gtk_calendar_set_display_options (GTK_CALENDAR (menuitem->priv->calendar), flags); |
238 | 374 | } | 419 | } |
239 | 375 | 420 | ||
240 | 421 | /** | ||
241 | 422 | * ido_calendar_menu_item_get_display_options: | ||
242 | 423 | * @menuitem: A #IdoCalendarMenuItem | ||
243 | 424 | * | ||
244 | 425 | * Get the display options for the calendar. | ||
245 | 426 | * | ||
246 | 427 | * Return Value: the display options in use | ||
247 | 428 | */ | ||
248 | 376 | GtkCalendarDisplayOptions | 429 | GtkCalendarDisplayOptions |
249 | 377 | ido_calendar_menu_item_get_display_options (IdoCalendarMenuItem *menuitem) | 430 | ido_calendar_menu_item_get_display_options (IdoCalendarMenuItem *menuitem) |
250 | 378 | { | 431 | { |
251 | @@ -381,6 +434,15 @@ | |||
252 | 381 | return gtk_calendar_get_display_options (GTK_CALENDAR (menuitem->priv->calendar)); | 434 | return gtk_calendar_get_display_options (GTK_CALENDAR (menuitem->priv->calendar)); |
253 | 382 | } | 435 | } |
254 | 383 | 436 | ||
255 | 437 | /** | ||
256 | 438 | * ido_calendar_menu_item_get_date: | ||
257 | 439 | * @menuitem: A #IdoCalendarMenuItem | ||
258 | 440 | * @year: (out) (allow-none): location to store the year as a decimal number (e.g. 2011), or #NULL. | ||
259 | 441 | * @month: (out) (allow-none): location to store the month number (between 0 and 11), or #NULL. | ||
260 | 442 | * @day: (out) (allow-none): location to store the day number (between 1 and 31), or #NULL. | ||
261 | 443 | * | ||
262 | 444 | * Gets the selected date. | ||
263 | 445 | */ | ||
264 | 384 | void | 446 | void |
265 | 385 | ido_calendar_menu_item_get_date (IdoCalendarMenuItem *menuitem, | 447 | ido_calendar_menu_item_get_date (IdoCalendarMenuItem *menuitem, |
266 | 386 | guint *year, | 448 | guint *year, |
267 | @@ -391,6 +453,17 @@ | |||
268 | 391 | gtk_calendar_get_date (GTK_CALENDAR (menuitem->priv->calendar), year, month, day); | 453 | gtk_calendar_get_date (GTK_CALENDAR (menuitem->priv->calendar), year, month, day); |
269 | 392 | } | 454 | } |
270 | 393 | 455 | ||
271 | 456 | /** | ||
272 | 457 | * ido_calendar_menu_item_set_date: | ||
273 | 458 | * @menuitem: A #IdoCalendarMenuItem | ||
274 | 459 | * @year: the year to show (e.g. 2011). | ||
275 | 460 | * @month: a month number (between 0 and 11). | ||
276 | 461 | * @day: The day number (between 1 and 31). | ||
277 | 462 | * | ||
278 | 463 | * Set the date shown on the calendar. | ||
279 | 464 | * | ||
280 | 465 | * Return Value: #TRUE | ||
281 | 466 | */ | ||
282 | 394 | gboolean | 467 | gboolean |
283 | 395 | ido_calendar_menu_item_set_date (IdoCalendarMenuItem *menuitem, | 468 | ido_calendar_menu_item_set_date (IdoCalendarMenuItem *menuitem, |
284 | 396 | guint year, | 469 | guint year, |
285 | @@ -402,6 +475,3 @@ | |||
286 | 402 | gtk_calendar_select_day (GTK_CALENDAR (menuitem->priv->calendar), day); | 475 | gtk_calendar_select_day (GTK_CALENDAR (menuitem->priv->calendar), day); |
287 | 403 | return TRUE; | 476 | return TRUE; |
288 | 404 | } | 477 | } |
289 | 405 | |||
290 | 406 | |||
291 | 407 | |||
292 | 408 | 478 | ||
293 | === modified file 'src/idoentrymenuitem.c' | |||
294 | --- src/idoentrymenuitem.c 2012-08-22 14:41:36 +0000 | |||
295 | +++ src/idoentrymenuitem.c 2012-12-15 07:41:19 +0000 | |||
296 | @@ -260,17 +260,31 @@ | |||
297 | 260 | GTK_DIR_TAB_FORWARD); | 260 | GTK_DIR_TAB_FORWARD); |
298 | 261 | } | 261 | } |
299 | 262 | 262 | ||
301 | 263 | /* Public API */ | 263 | /** |
302 | 264 | * ido_entry_menu_item_new: | ||
303 | 265 | * | ||
304 | 266 | * Creates a new #IdoEntryMenuItem. | ||
305 | 267 | * | ||
306 | 268 | * Return Value: the newly created #IdoEntryMenuItem. | ||
307 | 269 | */ | ||
308 | 264 | GtkWidget * | 270 | GtkWidget * |
309 | 265 | ido_entry_menu_item_new (void) | 271 | ido_entry_menu_item_new (void) |
310 | 266 | { | 272 | { |
311 | 267 | return g_object_new (IDO_TYPE_ENTRY_MENU_ITEM, NULL); | 273 | return g_object_new (IDO_TYPE_ENTRY_MENU_ITEM, NULL); |
312 | 268 | } | 274 | } |
313 | 269 | 275 | ||
314 | 276 | /** | ||
315 | 277 | * ido_entry_menu_item_get_entry: | ||
316 | 278 | * @menuitem: The #IdoEntryMenuItem. | ||
317 | 279 | * | ||
318 | 280 | * Get the #GtkEntry used in this menu item. | ||
319 | 281 | * | ||
320 | 282 | * Return Value: (transfer none): The #GtkEntry inside this menu item. | ||
321 | 283 | */ | ||
322 | 270 | GtkWidget * | 284 | GtkWidget * |
324 | 271 | ido_entry_menu_item_get_entry (IdoEntryMenuItem *item) | 285 | ido_entry_menu_item_get_entry (IdoEntryMenuItem *menuitem) |
325 | 272 | { | 286 | { |
327 | 273 | g_return_val_if_fail (IDO_IS_ENTRY_MENU_ITEM (item), NULL); | 287 | g_return_val_if_fail (IDO_IS_ENTRY_MENU_ITEM (menuitem), NULL); |
328 | 274 | 288 | ||
330 | 275 | return item->priv->entry; | 289 | return menuitem->priv->entry; |
331 | 276 | } | 290 | } |
332 | 277 | 291 | ||
333 | === modified file 'src/idomessagedialog.c' | |||
334 | --- src/idomessagedialog.c 2012-08-22 14:44:00 +0000 | |||
335 | +++ src/idomessagedialog.c 2012-12-15 07:41:19 +0000 | |||
336 | @@ -258,7 +258,7 @@ | |||
337 | 258 | * dialog it will expand to provide the secondary message | 258 | * dialog it will expand to provide the secondary message |
338 | 259 | * and the action buttons. | 259 | * and the action buttons. |
339 | 260 | * | 260 | * |
341 | 261 | * Return value: a new #IdoMessageDialog | 261 | * Return Value: a new #IdoMessageDialog |
342 | 262 | **/ | 262 | **/ |
343 | 263 | GtkWidget* | 263 | GtkWidget* |
344 | 264 | ido_message_dialog_new (GtkWindow *parent, | 264 | ido_message_dialog_new (GtkWindow *parent, |
345 | @@ -305,6 +305,25 @@ | |||
346 | 305 | return widget; | 305 | return widget; |
347 | 306 | } | 306 | } |
348 | 307 | 307 | ||
349 | 308 | /** | ||
350 | 309 | * ido_message_dialog_new_with_markup: | ||
351 | 310 | * @parent: transient parent, or %NULL for none | ||
352 | 311 | * @flags: flags | ||
353 | 312 | * @type: type of message | ||
354 | 313 | * @buttons: a set of buttons to use | ||
355 | 314 | * @message_format: printf()-style format string, or %NULL | ||
356 | 315 | * @Varargs: arguments for @message_format. They will be escaped to allow valid XML. | ||
357 | 316 | * | ||
358 | 317 | * Creates a new message dialog, which is based upon | ||
359 | 318 | * GtkMessageDialog so it shares API and functionality | ||
360 | 319 | * with it. IdoMessageDialog differs in that it has two | ||
361 | 320 | * states. The initial state hides the action buttons | ||
362 | 321 | * and the secondary message. When a user clicks on the | ||
363 | 322 | * dialog it will expand to provide the secondary message | ||
364 | 323 | * and the action buttons. | ||
365 | 324 | * | ||
366 | 325 | * Return Value: a new #IdoMessageDialog | ||
367 | 326 | **/ | ||
368 | 308 | GtkWidget* | 327 | GtkWidget* |
369 | 309 | ido_message_dialog_new_with_markup (GtkWindow *parent, | 328 | ido_message_dialog_new_with_markup (GtkWindow *parent, |
370 | 310 | GtkDialogFlags flags, | 329 | GtkDialogFlags flags, |
371 | 311 | 330 | ||
372 | === modified file 'src/idorange.c' | |||
373 | --- src/idorange.c 2012-08-27 20:01:07 +0000 | |||
374 | +++ src/idorange.c 2012-12-15 07:41:19 +0000 | |||
375 | @@ -172,6 +172,8 @@ | |||
376 | 172 | * @style: The range style | 172 | * @style: The range style |
377 | 173 | * | 173 | * |
378 | 174 | * Creates a new #IdoRange widget. | 174 | * Creates a new #IdoRange widget. |
379 | 175 | * | ||
380 | 176 | * Return Value: A new #IdoRange | ||
381 | 175 | **/ | 177 | **/ |
382 | 176 | GtkWidget * | 178 | GtkWidget * |
383 | 177 | ido_range_new (GObject *adj, | 179 | ido_range_new (GObject *adj, |
384 | 178 | 180 | ||
385 | === modified file 'src/idoscalemenuitem.c' | |||
386 | --- src/idoscalemenuitem.c 2012-08-27 20:01:07 +0000 | |||
387 | +++ src/idoscalemenuitem.c 2012-12-15 07:41:19 +0000 | |||
388 | @@ -309,6 +309,12 @@ | |||
389 | 309 | FALSE, | 309 | FALSE, |
390 | 310 | G_PARAM_READWRITE)); | 310 | G_PARAM_READWRITE)); |
391 | 311 | 311 | ||
392 | 312 | /** | ||
393 | 313 | * IdoScaleMenuItem::slider-grabbed: | ||
394 | 314 | * @menuitem: The #IdoScaleMenuItem emitting the signal. | ||
395 | 315 | * | ||
396 | 316 | * The ::slider-grabbed signal is emitted when the pointer selects the slider. | ||
397 | 317 | */ | ||
398 | 312 | signals[SLIDER_GRABBED] = g_signal_new ("slider-grabbed", | 318 | signals[SLIDER_GRABBED] = g_signal_new ("slider-grabbed", |
399 | 313 | G_OBJECT_CLASS_TYPE (gobject_class), | 319 | G_OBJECT_CLASS_TYPE (gobject_class), |
400 | 314 | G_SIGNAL_RUN_FIRST, | 320 | G_SIGNAL_RUN_FIRST, |
401 | @@ -317,6 +323,12 @@ | |||
402 | 317 | g_cclosure_marshal_VOID__VOID, | 323 | g_cclosure_marshal_VOID__VOID, |
403 | 318 | G_TYPE_NONE, 0); | 324 | G_TYPE_NONE, 0); |
404 | 319 | 325 | ||
405 | 326 | /** | ||
406 | 327 | * IdoScaleMenuItem::slider-released: | ||
407 | 328 | * @menuitem: The #IdoScaleMenuItem emitting the signal. | ||
408 | 329 | * | ||
409 | 330 | * The ::slider-released signal is emitted when the pointer releases the slider. | ||
410 | 331 | */ | ||
411 | 320 | signals[SLIDER_RELEASED] = g_signal_new ("slider-released", | 332 | signals[SLIDER_RELEASED] = g_signal_new ("slider-released", |
412 | 321 | G_OBJECT_CLASS_TYPE (gobject_class), | 333 | G_OBJECT_CLASS_TYPE (gobject_class), |
413 | 322 | G_SIGNAL_RUN_FIRST, | 334 | G_SIGNAL_RUN_FIRST, |
414 | @@ -325,6 +337,12 @@ | |||
415 | 325 | g_cclosure_marshal_VOID__VOID, | 337 | g_cclosure_marshal_VOID__VOID, |
416 | 326 | G_TYPE_NONE, 0); | 338 | G_TYPE_NONE, 0); |
417 | 327 | 339 | ||
418 | 340 | /** | ||
419 | 341 | * IdoScaleMenuItem::primary-clicked: | ||
420 | 342 | * @menuitem: The #IdoScaleMenuItem emitting the signal. | ||
421 | 343 | * | ||
422 | 344 | * The ::primary-clicked signal is emitted when the pointer clicks the primary label. | ||
423 | 345 | */ | ||
424 | 328 | signals[PRIMARY_CLICKED] = g_signal_new ("primary-clicked", | 346 | signals[PRIMARY_CLICKED] = g_signal_new ("primary-clicked", |
425 | 329 | G_TYPE_FROM_CLASS (item_class), | 347 | G_TYPE_FROM_CLASS (item_class), |
426 | 330 | G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS, | 348 | G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS, |
427 | @@ -334,6 +352,12 @@ | |||
428 | 334 | G_TYPE_NONE, /* return type */ | 352 | G_TYPE_NONE, /* return type */ |
429 | 335 | 0 /* n_params */); | 353 | 0 /* n_params */); |
430 | 336 | 354 | ||
431 | 355 | /** | ||
432 | 356 | * IdoScaleMenuItem::secondary-clicked: | ||
433 | 357 | * @menuitem: The #IdoScaleMenuItem emitting the signal. | ||
434 | 358 | * | ||
435 | 359 | * The ::secondary-clicked signal is emitted when the pointer clicks the secondary label. | ||
436 | 360 | */ | ||
437 | 337 | signals[SECONDARY_CLICKED] = g_signal_new ("secondary-clicked", | 361 | signals[SECONDARY_CLICKED] = g_signal_new ("secondary-clicked", |
438 | 338 | G_TYPE_FROM_CLASS (item_class), | 362 | G_TYPE_FROM_CLASS (item_class), |
439 | 339 | G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS, | 363 | G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS, |
440 | @@ -625,9 +649,10 @@ | |||
441 | 625 | * @label: the text of the new menu item. | 649 | * @label: the text of the new menu item. |
442 | 626 | * @size: The size style of the range. | 650 | * @size: The size style of the range. |
443 | 627 | * @adjustment: A #GtkAdjustment describing the slider value. | 651 | * @adjustment: A #GtkAdjustment describing the slider value. |
444 | 628 | * @returns: a new #IdoScaleMenuItem. | ||
445 | 629 | * | 652 | * |
446 | 630 | * Creates a new #IdoScaleMenuItem with an empty label. | 653 | * Creates a new #IdoScaleMenuItem with an empty label. |
447 | 654 | * | ||
448 | 655 | * Return Value: a new #IdoScaleMenuItem. | ||
449 | 631 | **/ | 656 | **/ |
450 | 632 | GtkWidget* | 657 | GtkWidget* |
451 | 633 | ido_scale_menu_item_new (const gchar *label, | 658 | ido_scale_menu_item_new (const gchar *label, |
452 | @@ -647,9 +672,10 @@ | |||
453 | 647 | * @min: The minimum value of the slider. | 672 | * @min: The minimum value of the slider. |
454 | 648 | * @max: The maximum value of the slider. | 673 | * @max: The maximum value of the slider. |
455 | 649 | * @step: The step increment of the slider. | 674 | * @step: The step increment of the slider. |
456 | 650 | * @returns: a new #IdoScaleMenuItem. | ||
457 | 651 | * | 675 | * |
458 | 652 | * Creates a new #IdoScaleMenuItem containing a label. | 676 | * Creates a new #IdoScaleMenuItem containing a label. |
459 | 677 | * | ||
460 | 678 | * Return Value: a new #IdoScaleMenuItem. | ||
461 | 653 | **/ | 679 | **/ |
462 | 654 | GtkWidget* | 680 | GtkWidget* |
463 | 655 | ido_scale_menu_item_new_with_range (const gchar *label, | 681 | ido_scale_menu_item_new_with_range (const gchar *label, |
464 | @@ -671,9 +697,10 @@ | |||
465 | 671 | /** | 697 | /** |
466 | 672 | * ido_scale_menu_item_get_scale: | 698 | * ido_scale_menu_item_get_scale: |
467 | 673 | * @menuitem: The #IdoScaleMenuItem | 699 | * @menuitem: The #IdoScaleMenuItem |
468 | 674 | * @returns: A pointer to the scale widget. | ||
469 | 675 | * | 700 | * |
470 | 676 | * Retrieves the scale widget. | 701 | * Retrieves the scale widget. |
471 | 702 | * | ||
472 | 703 | * Return Value: (transfer none): The #IdoRange in this item | ||
473 | 677 | **/ | 704 | **/ |
474 | 678 | GtkWidget* | 705 | GtkWidget* |
475 | 679 | ido_scale_menu_item_get_scale (IdoScaleMenuItem *menuitem) | 706 | ido_scale_menu_item_get_scale (IdoScaleMenuItem *menuitem) |
476 | @@ -690,10 +717,11 @@ | |||
477 | 690 | /** | 717 | /** |
478 | 691 | * ido_scale_menu_item_get_style: | 718 | * ido_scale_menu_item_get_style: |
479 | 692 | * @menuitem: The #IdoScaleMenuItem | 719 | * @menuitem: The #IdoScaleMenuItem |
480 | 693 | * @returns: A #IdoScaleMenuItemStyle enum describing the style. | ||
481 | 694 | * | 720 | * |
482 | 695 | * Retrieves the type of widgets being used for the primary and | 721 | * Retrieves the type of widgets being used for the primary and |
483 | 696 | * secondary widget slots. This could be images, labels, or nothing. | 722 | * secondary widget slots. This could be images, labels, or nothing. |
484 | 723 | * | ||
485 | 724 | * Return Value: A #IdoScaleMenuItemStyle enum describing the style. | ||
486 | 697 | **/ | 725 | **/ |
487 | 698 | IdoScaleMenuItemStyle | 726 | IdoScaleMenuItemStyle |
488 | 699 | ido_scale_menu_item_get_style (IdoScaleMenuItem *menuitem) | 727 | ido_scale_menu_item_get_style (IdoScaleMenuItem *menuitem) |
489 | @@ -707,6 +735,14 @@ | |||
490 | 707 | return priv->style; | 735 | return priv->style; |
491 | 708 | } | 736 | } |
492 | 709 | 737 | ||
493 | 738 | /** | ||
494 | 739 | * ido_scale_menu_item_set_style: | ||
495 | 740 | * @menuitem: The #IdoScaleMenuItem | ||
496 | 741 | * @style: Set the style use for the primary and secondary widget slots. | ||
497 | 742 | * | ||
498 | 743 | * Sets the type of widgets being used for the primary and | ||
499 | 744 | * secondary widget slots. This could be images, labels, or nothing. | ||
500 | 745 | **/ | ||
501 | 710 | void | 746 | void |
502 | 711 | ido_scale_menu_item_set_style (IdoScaleMenuItem *menuitem, | 747 | ido_scale_menu_item_set_style (IdoScaleMenuItem *menuitem, |
503 | 712 | IdoScaleMenuItemStyle style) | 748 | IdoScaleMenuItemStyle style) |
504 | @@ -725,11 +761,12 @@ | |||
505 | 725 | /** | 761 | /** |
506 | 726 | * ido_scale_menu_item_get_primary_image: | 762 | * ido_scale_menu_item_get_primary_image: |
507 | 727 | * @menuitem: The #IdoScaleMenuItem | 763 | * @menuitem: The #IdoScaleMenuItem |
508 | 728 | * @returns: A #GtkWidget pointer for the primary image. | ||
509 | 729 | * | 764 | * |
510 | 730 | * Retrieves a pointer to the image widget used in the primary slot. | 765 | * Retrieves a pointer to the image widget used in the primary slot. |
511 | 731 | * Whether this is visible depends upon the return value from | 766 | * Whether this is visible depends upon the return value from |
512 | 732 | * ido_scale_menu_item_get_style(). | 767 | * ido_scale_menu_item_get_style(). |
513 | 768 | * | ||
514 | 769 | * Return Value: (transfer none): A #GtkWidget pointer for the primary image. | ||
515 | 733 | **/ | 770 | **/ |
516 | 734 | GtkWidget * | 771 | GtkWidget * |
517 | 735 | ido_scale_menu_item_get_primary_image (IdoScaleMenuItem *menuitem) | 772 | ido_scale_menu_item_get_primary_image (IdoScaleMenuItem *menuitem) |
518 | @@ -746,11 +783,12 @@ | |||
519 | 746 | /** | 783 | /** |
520 | 747 | * ido_scale_menu_item_get_secondary_image: | 784 | * ido_scale_menu_item_get_secondary_image: |
521 | 748 | * @menuitem: The #IdoScaleMenuItem | 785 | * @menuitem: The #IdoScaleMenuItem |
522 | 749 | * @returns: A #GtkWidget pointer for the secondary image. | ||
523 | 750 | * | 786 | * |
524 | 751 | * Retrieves a pointer to the image widget used in the secondary slot. | 787 | * Retrieves a pointer to the image widget used in the secondary slot. |
525 | 752 | * Whether this is visible depends upon the return value from | 788 | * Whether this is visible depends upon the return value from |
526 | 753 | * ido_scale_menu_item_get_style(). | 789 | * ido_scale_menu_item_get_style(). |
527 | 790 | * | ||
528 | 791 | * Return Value: (transfer none): A #GtkWidget pointer for the secondary image. | ||
529 | 754 | **/ | 792 | **/ |
530 | 755 | GtkWidget * | 793 | GtkWidget * |
531 | 756 | ido_scale_menu_item_get_secondary_image (IdoScaleMenuItem *menuitem) | 794 | ido_scale_menu_item_get_secondary_image (IdoScaleMenuItem *menuitem) |
532 | @@ -767,11 +805,12 @@ | |||
533 | 767 | /** | 805 | /** |
534 | 768 | * ido_scale_menu_item_get_primary_label: | 806 | * ido_scale_menu_item_get_primary_label: |
535 | 769 | * @menuitem: The #IdoScaleMenuItem | 807 | * @menuitem: The #IdoScaleMenuItem |
536 | 770 | * @returns: A const gchar* string of the label text. | ||
537 | 771 | * | 808 | * |
538 | 772 | * Retrieves a string of the text for the primary label widget. | 809 | * Retrieves a string of the text for the primary label widget. |
539 | 773 | * Whether this is visible depends upon the return value from | 810 | * Whether this is visible depends upon the return value from |
540 | 774 | * ido_scale_menu_item_get_style(). | 811 | * ido_scale_menu_item_get_style(). |
541 | 812 | * | ||
542 | 813 | * Return Value: The label text. | ||
543 | 775 | **/ | 814 | **/ |
544 | 776 | const gchar* | 815 | const gchar* |
545 | 777 | ido_scale_menu_item_get_primary_label (IdoScaleMenuItem *menuitem) | 816 | ido_scale_menu_item_get_primary_label (IdoScaleMenuItem *menuitem) |
546 | @@ -786,13 +825,14 @@ | |||
547 | 786 | } | 825 | } |
548 | 787 | 826 | ||
549 | 788 | /** | 827 | /** |
551 | 789 | * ido_scale_menu_item_get_primary_label: | 828 | * ido_scale_menu_item_get_secondary_label: |
552 | 790 | * @menuitem: The #IdoScaleMenuItem | 829 | * @menuitem: The #IdoScaleMenuItem |
553 | 791 | * @returns: A const gchar* string of the label text. | ||
554 | 792 | * | 830 | * |
556 | 793 | * Retrieves a string of the text for the primary label widget. | 831 | * Retrieves a string of the text for the secondary label widget. |
557 | 794 | * Whether this is visible depends upon the return value from | 832 | * Whether this is visible depends upon the return value from |
558 | 795 | * ido_scale_menu_item_get_style(). | 833 | * ido_scale_menu_item_get_style(). |
559 | 834 | * | ||
560 | 835 | * Return Value: The label text. | ||
561 | 796 | **/ | 836 | **/ |
562 | 797 | const gchar* | 837 | const gchar* |
563 | 798 | ido_scale_menu_item_get_secondary_label (IdoScaleMenuItem *menuitem) | 838 | ido_scale_menu_item_get_secondary_label (IdoScaleMenuItem *menuitem) |
564 | @@ -809,7 +849,7 @@ | |||
565 | 809 | /** | 849 | /** |
566 | 810 | * ido_scale_menu_item_set_primary_label: | 850 | * ido_scale_menu_item_set_primary_label: |
567 | 811 | * @menuitem: The #IdoScaleMenuItem | 851 | * @menuitem: The #IdoScaleMenuItem |
569 | 812 | * @label: A string containing the label text | 852 | * @label: The label text |
570 | 813 | * | 853 | * |
571 | 814 | * Sets the text for the label widget in the primary slot. This | 854 | * Sets the text for the label widget in the primary slot. This |
572 | 815 | * widget will only be visibile if the return value of | 855 | * widget will only be visibile if the return value of |
573 | @@ -832,11 +872,11 @@ | |||
574 | 832 | } | 872 | } |
575 | 833 | 873 | ||
576 | 834 | /** | 874 | /** |
578 | 835 | * ido_scale_menu_item_set_primary_label: | 875 | * ido_scale_menu_item_set_secondary_label: |
579 | 836 | * @menuitem: The #IdoScaleMenuItem | 876 | * @menuitem: The #IdoScaleMenuItem |
581 | 837 | * @label: A string containing the label text | 877 | * @label: The label text |
582 | 838 | * | 878 | * |
584 | 839 | * Sets the text for the label widget in the primary slot. This | 879 | * Sets the text for the label widget in the secondary slot. This |
585 | 840 | * widget will only be visibile if the return value of | 880 | * widget will only be visibile if the return value of |
586 | 841 | * ido_scale_menu_item_get_style() is set to %IDO_SCALE_MENU_ITEM_STYLE_LABEL. | 881 | * ido_scale_menu_item_get_style() is set to %IDO_SCALE_MENU_ITEM_STYLE_LABEL. |
587 | 842 | **/ | 882 | **/ |
588 | @@ -859,16 +899,16 @@ | |||
589 | 859 | /** | 899 | /** |
590 | 860 | * ido_scale_menu_item_primary_clicked: | 900 | * ido_scale_menu_item_primary_clicked: |
591 | 861 | * @menuitem: the #IdoScaleMenuItem | 901 | * @menuitem: the #IdoScaleMenuItem |
593 | 862 | * | 902 | * |
594 | 863 | * Emits the "primary-clicked" signal. | 903 | * Emits the "primary-clicked" signal. |
595 | 864 | * | 904 | * |
596 | 865 | * The default handler for this signal lowers the scale's | 905 | * The default handler for this signal lowers the scale's |
597 | 866 | * adjustment to its lower bound. | 906 | * adjustment to its lower bound. |
598 | 867 | */ | 907 | */ |
599 | 868 | void | 908 | void |
601 | 869 | ido_scale_menu_item_primary_clicked (IdoScaleMenuItem * item) | 909 | ido_scale_menu_item_primary_clicked (IdoScaleMenuItem * menuitem) |
602 | 870 | { | 910 | { |
604 | 871 | g_signal_emit (item, signals[PRIMARY_CLICKED], 0); | 911 | g_signal_emit (menuitem, signals[PRIMARY_CLICKED], 0); |
605 | 872 | } | 912 | } |
606 | 873 | static void | 913 | static void |
607 | 874 | default_primary_clicked_handler (IdoScaleMenuItem * item) | 914 | default_primary_clicked_handler (IdoScaleMenuItem * item) |
608 | @@ -880,18 +920,18 @@ | |||
609 | 880 | } | 920 | } |
610 | 881 | 921 | ||
611 | 882 | /** | 922 | /** |
613 | 883 | * ido_scale_menu_item_primary_clicked: | 923 | * ido_scale_menu_item_secondary_clicked: |
614 | 884 | * @menuitem: the #IdoScaleMenuItem | 924 | * @menuitem: the #IdoScaleMenuItem |
617 | 885 | * | 925 | * |
618 | 886 | * Emits the "primary-clicked" signal. | 926 | * Emits the "secondary-clicked" signal. |
619 | 887 | * | 927 | * |
620 | 888 | * The default handler for this signal raises the scale's | 928 | * The default handler for this signal raises the scale's |
621 | 889 | * adjustment to its upper bound. | 929 | * adjustment to its upper bound. |
622 | 890 | */ | 930 | */ |
623 | 891 | void | 931 | void |
625 | 892 | ido_scale_menu_item_secondary_clicked (IdoScaleMenuItem * item) | 932 | ido_scale_menu_item_secondary_clicked (IdoScaleMenuItem * menuitem) |
626 | 893 | { | 933 | { |
628 | 894 | g_signal_emit (item, signals[SECONDARY_CLICKED], 0); | 934 | g_signal_emit (menuitem, signals[SECONDARY_CLICKED], 0); |
629 | 895 | } | 935 | } |
630 | 896 | static void | 936 | static void |
631 | 897 | default_secondary_clicked_handler (IdoScaleMenuItem * item) | 937 | default_secondary_clicked_handler (IdoScaleMenuItem * item) |
632 | 898 | 938 | ||
633 | === modified file 'src/idoscalemenuitem.h' | |||
634 | --- src/idoscalemenuitem.h 2012-03-10 06:04:36 +0000 | |||
635 | +++ src/idoscalemenuitem.h 2012-12-15 07:41:19 +0000 | |||
636 | @@ -61,8 +61,8 @@ | |||
637 | 61 | GtkMenuItemClass parent_class; | 61 | GtkMenuItemClass parent_class; |
638 | 62 | 62 | ||
639 | 63 | /* signal default handlers */ | 63 | /* signal default handlers */ |
642 | 64 | void (*primary_clicked)(IdoScaleMenuItem * self); | 64 | void (*primary_clicked)(IdoScaleMenuItem * menuitem); |
643 | 65 | void (*secondary_clicked)(IdoScaleMenuItem * self); | 65 | void (*secondary_clicked)(IdoScaleMenuItem * menuitem); |
644 | 66 | }; | 66 | }; |
645 | 67 | 67 | ||
646 | 68 | 68 | ||
647 | 69 | 69 | ||
648 | === modified file 'src/idoswitchmenuitem.c' | |||
649 | --- src/idoswitchmenuitem.c 2012-08-21 21:43:49 +0000 | |||
650 | +++ src/idoswitchmenuitem.c 2012-12-15 07:41:19 +0000 | |||
651 | @@ -101,16 +101,27 @@ | |||
652 | 101 | return TRUE; /* stop the event so that it doesn't trigger popdown() */ | 101 | return TRUE; /* stop the event so that it doesn't trigger popdown() */ |
653 | 102 | } | 102 | } |
654 | 103 | 103 | ||
659 | 104 | /*** | 104 | /** |
660 | 105 | **** Public API | 105 | * ido_switch_menu_item_new: |
661 | 106 | ***/ | 106 | * |
662 | 107 | 107 | * Creates a new #IdoSwitchMenuItem | |
663 | 108 | * | ||
664 | 109 | * Return Value: a new #IdoSwitchMenuItem. | ||
665 | 110 | **/ | ||
666 | 108 | GtkWidget * | 111 | GtkWidget * |
667 | 109 | ido_switch_menu_item_new (void) | 112 | ido_switch_menu_item_new (void) |
668 | 110 | { | 113 | { |
669 | 111 | return g_object_new (IDO_TYPE_SWITCH_MENU_ITEM, NULL); | 114 | return g_object_new (IDO_TYPE_SWITCH_MENU_ITEM, NULL); |
670 | 112 | } | 115 | } |
671 | 113 | 116 | ||
672 | 117 | /** | ||
673 | 118 | * ido_switch_menu_item_get_content_area: | ||
674 | 119 | * @item: The #IdoSwitchMenuItem. | ||
675 | 120 | * | ||
676 | 121 | * Get the #GtkContainer to add additional widgets into. | ||
677 | 122 | * | ||
678 | 123 | * Return Value: (transfer none): The #GtkContainer to add additional widgets into. | ||
679 | 124 | **/ | ||
680 | 114 | GtkContainer * | 125 | GtkContainer * |
681 | 115 | ido_switch_menu_item_get_content_area (IdoSwitchMenuItem * item) | 126 | ido_switch_menu_item_get_content_area (IdoSwitchMenuItem * item) |
682 | 116 | { | 127 | { |
683 | 117 | 128 | ||
684 | === modified file 'src/idotimeline.c' | |||
685 | --- src/idotimeline.c 2011-06-01 19:36:43 +0000 | |||
686 | +++ src/idotimeline.c 2012-12-15 07:41:19 +0000 | |||
687 | @@ -132,6 +132,12 @@ | |||
688 | 132 | GDK_TYPE_SCREEN, | 132 | GDK_TYPE_SCREEN, |
689 | 133 | G_PARAM_READWRITE)); | 133 | G_PARAM_READWRITE)); |
690 | 134 | 134 | ||
691 | 135 | /** | ||
692 | 136 | * IdoTimeline::started: | ||
693 | 137 | * @timeline: The #IdoTimeline emitting the signal. | ||
694 | 138 | * | ||
695 | 139 | * The ::started signal is emitted when the timeline starts. | ||
696 | 140 | */ | ||
697 | 135 | signals[STARTED] = | 141 | signals[STARTED] = |
698 | 136 | g_signal_new ("started", | 142 | g_signal_new ("started", |
699 | 137 | G_TYPE_FROM_CLASS (object_class), | 143 | G_TYPE_FROM_CLASS (object_class), |
700 | @@ -141,6 +147,12 @@ | |||
701 | 141 | g_cclosure_marshal_VOID__VOID, | 147 | g_cclosure_marshal_VOID__VOID, |
702 | 142 | G_TYPE_NONE, 0); | 148 | G_TYPE_NONE, 0); |
703 | 143 | 149 | ||
704 | 150 | /** | ||
705 | 151 | * IdoTimeline::paused: | ||
706 | 152 | * @timeline: The #IdoTimeline emitting the signal. | ||
707 | 153 | * | ||
708 | 154 | * The ::paused signal is emitted when the timeline pauses. | ||
709 | 155 | */ | ||
710 | 144 | signals[PAUSED] = | 156 | signals[PAUSED] = |
711 | 145 | g_signal_new ("paused", | 157 | g_signal_new ("paused", |
712 | 146 | G_TYPE_FROM_CLASS (object_class), | 158 | G_TYPE_FROM_CLASS (object_class), |
713 | @@ -150,6 +162,12 @@ | |||
714 | 150 | g_cclosure_marshal_VOID__VOID, | 162 | g_cclosure_marshal_VOID__VOID, |
715 | 151 | G_TYPE_NONE, 0); | 163 | G_TYPE_NONE, 0); |
716 | 152 | 164 | ||
717 | 165 | /** | ||
718 | 166 | * IdoTimeline::finished: | ||
719 | 167 | * @timeline: The #IdoTimeline emitting the signal. | ||
720 | 168 | * | ||
721 | 169 | * The ::paused signal is emitted when the timeline finishes. | ||
722 | 170 | */ | ||
723 | 153 | signals[FINISHED] = | 171 | signals[FINISHED] = |
724 | 154 | g_signal_new ("finished", | 172 | g_signal_new ("finished", |
725 | 155 | G_TYPE_FROM_CLASS (object_class), | 173 | G_TYPE_FROM_CLASS (object_class), |
726 | @@ -159,6 +177,13 @@ | |||
727 | 159 | g_cclosure_marshal_VOID__VOID, | 177 | g_cclosure_marshal_VOID__VOID, |
728 | 160 | G_TYPE_NONE, 0); | 178 | G_TYPE_NONE, 0); |
729 | 161 | 179 | ||
730 | 180 | /** | ||
731 | 181 | * IdoTimeline::frame: | ||
732 | 182 | * @timeline: The #IdoTimeline emitting the signal. | ||
733 | 183 | * @progress: The progress position for this frame from 0.0 (start) to 1.0 (end). | ||
734 | 184 | * | ||
735 | 185 | * The ::frame signal is emitted when a frame should be drawn. | ||
736 | 186 | */ | ||
737 | 162 | signals[FRAME] = | 187 | signals[FRAME] = |
738 | 163 | g_signal_new ("frame", | 188 | g_signal_new ("frame", |
739 | 164 | G_TYPE_FROM_CLASS (object_class), | 189 | G_TYPE_FROM_CLASS (object_class), |
740 | @@ -342,6 +367,15 @@ | |||
741 | 342 | NULL); | 367 | NULL); |
742 | 343 | } | 368 | } |
743 | 344 | 369 | ||
744 | 370 | /** | ||
745 | 371 | * ido_timeline_new_for_screen: | ||
746 | 372 | * @duration: duration in milliseconds for the timeline | ||
747 | 373 | * @screen: Screen to start on. | ||
748 | 374 | * | ||
749 | 375 | * Creates a new #IdoTimeline with the specified number of frames on the given screen. | ||
750 | 376 | * | ||
751 | 377 | * Return Value: the newly created #IdoTimeline | ||
752 | 378 | **/ | ||
753 | 345 | IdoTimeline * | 379 | IdoTimeline * |
754 | 346 | ido_timeline_new_for_screen (guint duration, | 380 | ido_timeline_new_for_screen (guint duration, |
755 | 347 | GdkScreen *screen) | 381 | GdkScreen *screen) |
756 | @@ -573,6 +607,13 @@ | |||
757 | 573 | } | 607 | } |
758 | 574 | } | 608 | } |
759 | 575 | 609 | ||
760 | 610 | /** | ||
761 | 611 | * ido_timeline_set_duration: | ||
762 | 612 | * @timeline: A #IdoTimeline | ||
763 | 613 | * @duration: Duration in milliseconds. | ||
764 | 614 | * | ||
765 | 615 | * Set the animation duration. | ||
766 | 616 | */ | ||
767 | 576 | void | 617 | void |
768 | 577 | ido_timeline_set_duration (IdoTimeline *timeline, | 618 | ido_timeline_set_duration (IdoTimeline *timeline, |
769 | 578 | guint duration) | 619 | guint duration) |
770 | @@ -590,6 +631,14 @@ | |||
771 | 590 | } | 631 | } |
772 | 591 | } | 632 | } |
773 | 592 | 633 | ||
774 | 634 | /** | ||
775 | 635 | * ido_timeline_get_duration: | ||
776 | 636 | * @timeline: A #IdoTimeline | ||
777 | 637 | * | ||
778 | 638 | * Set the animation duration. | ||
779 | 639 | * | ||
780 | 640 | * Return Value: Duration in milliseconds. | ||
781 | 641 | */ | ||
782 | 593 | guint | 642 | guint |
783 | 594 | ido_timeline_get_duration (IdoTimeline *timeline) | 643 | ido_timeline_get_duration (IdoTimeline *timeline) |
784 | 595 | { | 644 | { |
785 | @@ -645,6 +694,13 @@ | |||
786 | 645 | return priv->direction; | 694 | return priv->direction; |
787 | 646 | } | 695 | } |
788 | 647 | 696 | ||
789 | 697 | /** | ||
790 | 698 | * ido_timeline_set_screen: | ||
791 | 699 | * @timeline: A #IdoTimeline | ||
792 | 700 | * @screen: A #GdkScreen to use | ||
793 | 701 | * | ||
794 | 702 | * Set the screen the timeline is running on. | ||
795 | 703 | */ | ||
796 | 648 | void | 704 | void |
797 | 649 | ido_timeline_set_screen (IdoTimeline *timeline, | 705 | ido_timeline_set_screen (IdoTimeline *timeline, |
798 | 650 | GdkScreen *screen) | 706 | GdkScreen *screen) |
799 | @@ -664,6 +720,14 @@ | |||
800 | 664 | g_object_notify (G_OBJECT (timeline), "screen"); | 720 | g_object_notify (G_OBJECT (timeline), "screen"); |
801 | 665 | } | 721 | } |
802 | 666 | 722 | ||
803 | 723 | /** | ||
804 | 724 | * ido_timeline_get_screen: | ||
805 | 725 | * @timeline: A #IdoTimeline | ||
806 | 726 | * | ||
807 | 727 | * Get the screen this timeline is running on. | ||
808 | 728 | * | ||
809 | 729 | * Return Value: (transfer none): The #GdkScreen this timeline is running on. | ||
810 | 730 | */ | ||
811 | 667 | GdkScreen * | 731 | GdkScreen * |
812 | 668 | ido_timeline_get_screen (IdoTimeline *timeline) | 732 | ido_timeline_get_screen (IdoTimeline *timeline) |
813 | 669 | { | 733 | { |
814 | @@ -675,6 +739,14 @@ | |||
815 | 675 | return priv->screen; | 739 | return priv->screen; |
816 | 676 | } | 740 | } |
817 | 677 | 741 | ||
818 | 742 | /** | ||
819 | 743 | * ido_timeline_get_progress: | ||
820 | 744 | * @timeline: A #IdoTimeline | ||
821 | 745 | * | ||
822 | 746 | * Get the progress on the timeline. | ||
823 | 747 | * | ||
824 | 748 | * Return Value: The progress from 0.0 (start) to 1.0 (end) | ||
825 | 749 | */ | ||
826 | 678 | gdouble | 750 | gdouble |
827 | 679 | ido_timeline_get_progress (IdoTimeline *timeline) | 751 | ido_timeline_get_progress (IdoTimeline *timeline) |
828 | 680 | { | 752 | { |
829 | @@ -686,6 +758,13 @@ | |||
830 | 686 | return priv->progress; | 758 | return priv->progress; |
831 | 687 | } | 759 | } |
832 | 688 | 760 | ||
833 | 761 | /** | ||
834 | 762 | * ido_timeline_set_progress: | ||
835 | 763 | * @timeline: A #IdoTimeline | ||
836 | 764 | * @progress: The progress from 0.0 (start) to 1.0 (end) | ||
837 | 765 | * | ||
838 | 766 | * Set the progress on the timeline. | ||
839 | 767 | */ | ||
840 | 689 | void | 768 | void |
841 | 690 | ido_timeline_set_progress (IdoTimeline *timeline, gdouble progress) | 769 | ido_timeline_set_progress (IdoTimeline *timeline, gdouble progress) |
842 | 691 | { | 770 | { |
843 | @@ -707,6 +786,15 @@ | |||
844 | 707 | ido_timeline_start (timeline); | 786 | ido_timeline_start (timeline); |
845 | 708 | } | 787 | } |
846 | 709 | 788 | ||
847 | 789 | /** | ||
848 | 790 | * ido_timeline_calculate_progress: | ||
849 | 791 | * @linear_progress: The progress from 0.0 (start) to 1.0 (end) | ||
850 | 792 | * @progress_type: The progress transform to apply | ||
851 | 793 | * | ||
852 | 794 | * Transform a linear progress position using the given transform. | ||
853 | 795 | * | ||
854 | 796 | * Return Value: the progress position using the provided transform. | ||
855 | 797 | */ | ||
856 | 710 | gdouble | 798 | gdouble |
857 | 711 | ido_timeline_calculate_progress (gdouble linear_progress, | 799 | ido_timeline_calculate_progress (gdouble linear_progress, |
858 | 712 | IdoTimelineProgressType progress_type) | 800 | IdoTimelineProgressType progress_type) |
FAILED: Continuous integration, rev:121 jenkins. qa.ubuntu. com/job/ ido-ci/ 18/ jenkins. qa.ubuntu. com/job/ ido-ci/ ./build= pbuilder, distribution= coverity- raring, flavor= amd64/18/ console jenkins. qa.ubuntu. com/job/ ido-ci/ ./build= pbuilder, distribution= raring, flavor= i386/18/ console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: jenkins. qa.ubuntu. com/job/ ido-ci/ 18//rebuild/?
http://