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
1=== modified file 'example/menus.c'
2--- example/menus.c 2010-02-05 01:15:35 +0000
3+++ example/menus.c 2010-02-09 18:03:11 +0000
4@@ -38,7 +38,7 @@
5 menuitem = gtk_menu_item_new_with_label ("Open");
6 gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
7
8- menuitem = ido_scale_menu_item_new_with_range ("Volume", 0, 100, 1);
9+ menuitem = ido_scale_menu_item_new_with_range ("Volume", 65, 0, 100, 1);
10 gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
11
12 menuitem = ido_entry_menu_item_new ();
13
14=== modified file 'src/idoscalemenuitem.c'
15--- src/idoscalemenuitem.c 2010-02-05 20:35:53 +0000
16+++ src/idoscalemenuitem.c 2010-02-09 18:03:11 +0000
17@@ -369,11 +369,12 @@
18 **/
19 GtkWidget*
20 ido_scale_menu_item_new_with_range (const gchar *label,
21+ gdouble value,
22 gdouble min,
23 gdouble max,
24 gdouble step)
25 {
26- GtkObject *adjustment = gtk_adjustment_new (min, min, max, step, 10 * step, 0);
27+ GtkObject *adjustment = gtk_adjustment_new (value, min, max, step, 10 * step, 0);
28
29 return g_object_new (IDO_TYPE_SCALE_MENU_ITEM,
30 "label", label,
31
32=== modified file 'src/idoscalemenuitem.h'
33--- src/idoscalemenuitem.h 2010-02-04 20:57:39 +0000
34+++ src/idoscalemenuitem.h 2010-02-09 18:03:11 +0000
35@@ -59,6 +59,7 @@
36 GtkWidget *ido_scale_menu_item_new (const gchar *label,
37 GtkAdjustment *adjustment);
38 GtkWidget *ido_scale_menu_item_new_with_range (const gchar *label,
39+ gdouble value,
40 gdouble min,
41 gdouble max,
42 gdouble step);

Subscribers

People subscribed via source and target branches

to all changes: