Merge lp:~bratsche/ido/initial-slider-value into lp:ido/0.3

Proposed by Cody Russell
Status: Merged
Merged at revision: not available
Proposed branch: lp:~bratsche/ido/initial-slider-value
Merge into: lp:ido/0.3
Diff against target: 42 lines (+4/-2)
3 files modified
example/menus.c (+1/-1)
src/idoscalemenuitem.c (+2/-1)
src/idoscalemenuitem.h (+1/-0)
To merge this branch: bzr merge lp:~bratsche/ido/initial-slider-value
Reviewer Review Type Date Requested Status
Conor Curran (community) Approve
Review via email: mp+18941@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Conor Curran (cjcurran) wrote :

the less code on my side the better :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'example/menus.c'
--- example/menus.c 2010-02-05 01:15:35 +0000
+++ example/menus.c 2010-02-09 18:03:11 +0000
@@ -38,7 +38,7 @@
38 menuitem = gtk_menu_item_new_with_label ("Open");38 menuitem = gtk_menu_item_new_with_label ("Open");
39 gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);39 gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
4040
41 menuitem = ido_scale_menu_item_new_with_range ("Volume", 0, 100, 1);41 menuitem = ido_scale_menu_item_new_with_range ("Volume", 65, 0, 100, 1);
42 gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);42 gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
4343
44 menuitem = ido_entry_menu_item_new ();44 menuitem = ido_entry_menu_item_new ();
4545
=== modified file 'src/idoscalemenuitem.c'
--- src/idoscalemenuitem.c 2010-02-05 20:35:53 +0000
+++ src/idoscalemenuitem.c 2010-02-09 18:03:11 +0000
@@ -369,11 +369,12 @@
369 **/369 **/
370GtkWidget*370GtkWidget*
371ido_scale_menu_item_new_with_range (const gchar *label,371ido_scale_menu_item_new_with_range (const gchar *label,
372 gdouble value,
372 gdouble min,373 gdouble min,
373 gdouble max,374 gdouble max,
374 gdouble step)375 gdouble step)
375{376{
376 GtkObject *adjustment = gtk_adjustment_new (min, min, max, step, 10 * step, 0);377 GtkObject *adjustment = gtk_adjustment_new (value, min, max, step, 10 * step, 0);
377378
378 return g_object_new (IDO_TYPE_SCALE_MENU_ITEM,379 return g_object_new (IDO_TYPE_SCALE_MENU_ITEM,
379 "label", label,380 "label", label,
380381
=== modified file 'src/idoscalemenuitem.h'
--- src/idoscalemenuitem.h 2010-02-04 20:57:39 +0000
+++ src/idoscalemenuitem.h 2010-02-09 18:03:11 +0000
@@ -59,6 +59,7 @@
59GtkWidget *ido_scale_menu_item_new (const gchar *label,59GtkWidget *ido_scale_menu_item_new (const gchar *label,
60 GtkAdjustment *adjustment);60 GtkAdjustment *adjustment);
61GtkWidget *ido_scale_menu_item_new_with_range (const gchar *label,61GtkWidget *ido_scale_menu_item_new_with_range (const gchar *label,
62 gdouble value,
62 gdouble min,63 gdouble min,
63 gdouble max,64 gdouble max,
64 gdouble step);65 gdouble step);

Subscribers

People subscribed via source and target branches

to all changes: