Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/estickies/src/bin
Modified Files:
about.c stickies.c theme_chooser.c
Log Message:
Fix estickies
===================================================================
RCS file: /cvs/e/e17/proto/estickies/src/bin/about.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- about.c 5 Aug 2006 16:46:51 -0000 1.3
+++ about.c 15 Aug 2006 18:10:38 -0000 1.4
@@ -30,7 +30,7 @@
/* Logo */
logo = etk_image_new_from_file(PACKAGE_DATA_DIR"/images/estickies.png");
- etk_box_pack_start(ETK_BOX(vbox), logo, ETK_TRUE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), logo, ETK_BOX_START, ETK_BOX_EXPAND, 0);
/* Description */
frame = etk_frame_new("What is E Stickies?");
@@ -48,7 +48,7 @@
"</style></p>",
ETK_TRUE);
etk_container_add(ETK_CONTAINER(frame), desctext);
- etk_box_pack_start(ETK_BOX(vbox), frame, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), frame, ETK_BOX_START, ETK_BOX_NONE, 0);
/* Authors */
frame = etk_frame_new("Authors");
@@ -64,7 +64,7 @@
"Brian 'morlenxus' Miculcy",
ETK_TRUE);
etk_container_add(ETK_CONTAINER(frame), abouttext);
- etk_box_pack_start(ETK_BOX(vbox), frame, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), frame, ETK_BOX_START, ETK_BOX_NONE, 0);
/* Help */
frame = etk_frame_new("Common shortcuts");
@@ -80,7 +80,7 @@
"<b>control-v:</b> paste text from clipboard\n",
ETK_TRUE);
etk_container_add(ETK_CONTAINER(frame), helptext);
- etk_box_pack_start(ETK_BOX(vbox), frame, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), frame, ETK_BOX_START, ETK_BOX_NONE, 0);
etk_dialog_pack_in_main_area(ETK_DIALOG(win), vbox, ETK_FALSE, ETK_FALSE,
0, ETK_FALSE);
===================================================================
RCS file: /cvs/e/e17/proto/estickies/src/bin/stickies.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- stickies.c 8 Aug 2006 21:43:33 -0000 1.8
+++ stickies.c 15 Aug 2006 18:10:38 -0000 1.9
@@ -301,7 +301,7 @@
hbox = etk_hbox_new(ETK_FALSE, 2);
s->buttonbox = hbox;
- etk_box_pack_start(ETK_BOX(vbox), hbox, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START, ETK_BOX_NONE, 0);
s->stick_toggle = etk_toggle_button_new();
etk_object_properties_set(ETK_OBJECT(s->stick_toggle),
"focusable", ETK_FALSE, NULL);
@@ -311,7 +311,7 @@
etk_signal_connect_swapped("clicked", ETK_OBJECT(s->stick_toggle),
ETK_CALLBACK(_e_sticky_stick_toggle), s);
//etk_tooltips_tip_set(button, "Make sticky visible on all desktops");
- etk_box_pack_start(ETK_BOX(hbox), s->stick_toggle, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(hbox), s->stick_toggle, ETK_BOX_START, ETK_BOX_NONE,
0);
s->lock_toggle = etk_toggle_button_new();
etk_object_properties_set(ETK_OBJECT(s->lock_toggle),
@@ -322,7 +322,7 @@
etk_signal_connect_swapped("toggled", ETK_OBJECT(s->lock_toggle),
ETK_CALLBACK(_e_sticky_lock_toggle), s);
//etk_tooltips_tip_set(button, "Lock sticky (read-only)");
- etk_box_pack_start(ETK_BOX(hbox), s->lock_toggle, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(hbox), s->lock_toggle, ETK_BOX_START, ETK_BOX_NONE,
0);
s->close_button = etk_button_new();
etk_object_properties_set(ETK_OBJECT(s->close_button),
@@ -333,7 +333,7 @@
etk_signal_connect_swapped("clicked", ETK_OBJECT(s->close_button),
ETK_CALLBACK(_e_sticky_delete_confirm), s);
//etk_tooltips_tip_set(button, "Delete this sticky");
- etk_box_pack_start(ETK_BOX(hbox), s->close_button, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(hbox), s->close_button, ETK_BOX_START, ETK_BOX_NONE,
0);
s->textview = etk_text_view_new();
etk_widget_repeat_mouse_events_set(s->textview, ETK_TRUE);
@@ -343,7 +343,7 @@
else
etk_textblock_text_set(ETK_TEXT_VIEW(s->textview)->textblock, " ",
ETK_TRUE);
- etk_box_pack_start(ETK_BOX(vbox), s->textview, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(vbox), s->textview, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
etk_container_add(ETK_CONTAINER(s->win), vbox);
etk_widget_focus(s->textview);
===================================================================
RCS file: /cvs/e/e17/proto/estickies/src/bin/theme_chooser.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- theme_chooser.c 31 Jul 2006 00:31:45 -0000 1.1
+++ theme_chooser.c 15 Aug 2006 18:10:38 -0000 1.2
@@ -51,7 +51,7 @@
/* hbox to hold tree and preview */
preview_hbox = etk_hbox_new(ETK_FALSE, 5);
- etk_box_pack_start(ETK_BOX(vbox), preview_hbox, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(vbox), preview_hbox, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
/* the preview, an image */
preview = etk_image_new();
@@ -92,27 +92,27 @@
ecore_list_destroy(themes);
/* pack tree + preview widget */
- etk_box_pack_start(ETK_BOX(preview_hbox), thumbs, ETK_TRUE, ETK_TRUE, 0);
- etk_box_pack_start(ETK_BOX(preview_hbox), preview, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(preview_hbox), thumbs, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
+ etk_box_append(ETK_BOX(preview_hbox), preview, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
/* box to store the check buttons */
frame = etk_frame_new("Options");
option_vbox = etk_vbox_new(ETK_FALSE, 0);
etk_container_add(ETK_CONTAINER(frame), option_vbox);
- etk_box_pack_start(ETK_BOX(vbox), frame, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), frame, ETK_BOX_START, ETK_BOX_NONE, 0);
/* check buttons for various options */
button = etk_radio_button_new_with_label("Apply to this sticky only", NULL);
- etk_box_pack_start(ETK_BOX(option_vbox), button, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(option_vbox), button, ETK_BOX_START, ETK_BOX_NONE,
0);
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_e_theme_sticky_only_cb), NULL);
button = etk_radio_button_new_with_label_from_widget("Apply to all
stickies",
ETK_RADIO_BUTTON(button));
- etk_box_pack_start(ETK_BOX(option_vbox), button, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(option_vbox), button, ETK_BOX_START, ETK_BOX_NONE,
0);
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_e_theme_stickies_all_cb), NULL);
button = etk_check_button_new_with_label("Make this my default theme");
- etk_box_pack_start(ETK_BOX(option_vbox), button, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(option_vbox), button, ETK_BOX_START, ETK_BOX_NONE,
0);
etk_signal_connect("toggled", ETK_OBJECT(button),
ETK_CALLBACK(_e_theme_make_default_cb), NULL);
/* box to store Ok / Apply / Cancel */
@@ -129,14 +129,14 @@
etk_signal_connect("clicked", ETK_OBJECT(cancel_button),
ETK_CALLBACK(_e_theme_cancel_cb), s);
- etk_box_pack_start(ETK_BOX(button_hbox), ok_button,
- ETK_FALSE, ETK_FALSE, 0);
- etk_box_pack_start(ETK_BOX(button_hbox), apply_button,
- ETK_FALSE, ETK_FALSE, 0);
- etk_box_pack_start(ETK_BOX(button_hbox), cancel_button,
- ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(button_hbox), ok_button,
+ ETK_BOX_START, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(button_hbox), apply_button,
+ ETK_BOX_START, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(button_hbox), cancel_button,
+ ETK_BOX_START, ETK_BOX_NONE, 0);
- etk_box_pack_start(ETK_BOX(vbox), button_hbox, ETK_FALSE, ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), button_hbox, ETK_BOX_START, ETK_BOX_NONE, 0);
etk_container_add(ETK_CONTAINER(win), vbox);
etk_container_border_width_set(ETK_CONTAINER(win), 5);
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
