Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor/src/bin
Modified Files:
edje_editor_consolle.c edje_editor_fill.c
edje_editor_gradient.c edje_editor_group.c
edje_editor_images.c edje_editor_position.c
edje_editor_spectra.c edje_editor_spectra_widget.c
edje_editor_state.c edje_editor_text.c
Log Message:
* always use the correct ETK_BOX_START define
* some withespaces
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_consolle.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edje_editor_consolle.c 2 Jul 2008 17:27:02 -0000 1.3
+++ edje_editor_consolle.c 12 Jul 2008 13:28:32 -0000 1.4
@@ -78,7 +78,7 @@
//UI_SignalEmitEntry
label = etk_label_new("<b>Signal</b>");
- etk_box_append(ETK_BOX(hbox), label, 0, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
UI_SignalEmitEntry = etk_combobox_entry_new();
etk_combobox_entry_items_height_set(ETK_COMBOBOX_ENTRY(UI_SignalEmitEntry),
18);
etk_combobox_entry_column_add(ETK_COMBOBOX_ENTRY(UI_SignalEmitEntry),
@@ -88,18 +88,18 @@
//UI_SourceEmitEntry
label = etk_label_new("<b>Source</b>");
- etk_box_append(ETK_BOX(hbox), label, 0, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
UI_SourceEmitEntry = etk_combobox_entry_new();
etk_combobox_entry_items_height_set(ETK_COMBOBOX_ENTRY(UI_SourceEmitEntry),
18);
etk_combobox_entry_column_add(ETK_COMBOBOX_ENTRY(UI_SourceEmitEntry),
ETK_COMBOBOX_ENTRY_LABEL, 75, ETK_COMBOBOX_ENTRY_EXPAND,
0.0);
etk_combobox_entry_build(ETK_COMBOBOX_ENTRY(UI_SourceEmitEntry));
- etk_box_append(ETK_BOX(hbox), UI_SourceEmitEntry, 0, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(hbox), UI_SourceEmitEntry, ETK_BOX_START,
ETK_BOX_NONE, 0);
//button
button = etk_button_new_from_stock(ETK_STOCK_DIALOG_OK);
etk_object_properties_set(ETK_OBJECT(button), "label", "Emit", NULL);
- etk_box_append(ETK_BOX(hbox), button, 0, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_NONE, 0);
etk_signal_connect("active-item-changed", ETK_OBJECT(UI_SignalEmitEntry),
ETK_CALLBACK(_consolle_combobox_entry_activated_cb),
NULL);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_fill.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_editor_fill.c 12 Jul 2008 13:05:17 -0000 1.1
+++ edje_editor_fill.c 12 Jul 2008 13:28:32 -0000 1.2
@@ -33,7 +33,7 @@
//UI_FillOffsetXSpinner
UI_FillOffsetXSpinner = etk_spinner_new(-2000, 2000, 0, 1, 10);
etk_widget_size_request_set(UI_FillOffsetXSpinner, 45, 20);
- etk_box_append(ETK_BOX(hbox),UI_FillOffsetXSpinner,
+ etk_box_append(ETK_BOX(hbox), UI_FillOffsetXSpinner,
ETK_BOX_START, ETK_BOX_NONE, 0);
label = etk_label_new("<b> Y </b>");
@@ -76,7 +76,7 @@
//UI_FillSizeOffsetXSpinner
UI_FillSizeOffsetXSpinner = etk_spinner_new(-2000, 2000, 0, 1, 10);
etk_widget_size_request_set(UI_FillSizeOffsetXSpinner, 45, 20);
- etk_box_append(ETK_BOX(hbox),UI_FillSizeOffsetXSpinner,
+ etk_box_append(ETK_BOX(hbox), UI_FillSizeOffsetXSpinner,
ETK_BOX_START, ETK_BOX_NONE, 0);
label = etk_label_new("<b> Y </b>");
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_gradient.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_editor_gradient.c 12 Jul 2008 13:05:17 -0000 1.1
+++ edje_editor_gradient.c 12 Jul 2008 13:28:32 -0000 1.2
@@ -134,7 +134,7 @@
//UI_GradientRel1XOffsetSpinner
UI_GradientRel1XOffsetSpinner = etk_spinner_new(-2000, 2000, 0, 1, 10);
etk_widget_size_request_set(UI_GradientRel1XOffsetSpinner, 45, 20);
- etk_box_append(ETK_BOX(hbox),UI_GradientRel1XOffsetSpinner,
+ etk_box_append(ETK_BOX(hbox), UI_GradientRel1XOffsetSpinner,
ETK_BOX_START, ETK_BOX_NONE, 0);
label = etk_label_new("<b> Y </b>");
@@ -177,7 +177,7 @@
//UI_GradientRel2XOffsetSpinner
UI_GradientRel2XOffsetSpinner = etk_spinner_new(-2000, 2000, 0, 1, 10);
etk_widget_size_request_set(UI_GradientRel2XOffsetSpinner, 45, 20);
- etk_box_append(ETK_BOX(hbox),UI_GradientRel2XOffsetSpinner,
+ etk_box_append(ETK_BOX(hbox), UI_GradientRel2XOffsetSpinner,
ETK_BOX_START, ETK_BOX_NONE, 0);
label = etk_label_new("<b> Y </b>");
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_group.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- edje_editor_group.c 12 Jul 2008 13:05:17 -0000 1.5
+++ edje_editor_group.c 12 Jul 2008 13:28:32 -0000 1.6
@@ -43,7 +43,7 @@
//UI_GroupMinWSpinner
UI_GroupMinWSpinner = etk_spinner_new(0, 2000, 0, 1, 10);
etk_widget_size_request_set(UI_GroupMinWSpinner, 45, 20);
- etk_box_append(ETK_BOX(hbox),UI_GroupMinWSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(hbox), UI_GroupMinWSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
label = etk_label_new("x");
etk_object_properties_set(ETK_OBJECT(label), "xalign", 0.5, NULL);
@@ -52,7 +52,7 @@
//UI_GroupMinHSpinner
UI_GroupMinHSpinner = etk_spinner_new(0, 2000, 0, 1, 10);
etk_widget_size_request_set(UI_GroupMinHSpinner, 45, 20);
- etk_box_append(ETK_BOX(hbox),UI_GroupMinHSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(hbox), UI_GroupMinHSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
label = etk_label_new("max");
etk_object_properties_set(ETK_OBJECT(label), "xalign", 1.0, NULL);
@@ -61,7 +61,7 @@
//UI_GroupMaxWSpinner
UI_GroupMaxWSpinner = etk_spinner_new(0, 2000, 0, 1, 10);
etk_widget_size_request_set(UI_GroupMaxWSpinner, 45, 20);
- etk_box_append(ETK_BOX(hbox),UI_GroupMaxWSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(hbox), UI_GroupMaxWSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
label = etk_label_new("x");
etk_object_properties_set(ETK_OBJECT(label), "xalign", 0.5, NULL);
@@ -70,7 +70,7 @@
//UI_GroupMaxHspinner
UI_GroupMaxHSpinner = etk_spinner_new(0, 2000, 0, 1, 10);
etk_widget_size_request_set(UI_GroupMaxHSpinner, 45, 20);
- etk_box_append(ETK_BOX(hbox),UI_GroupMaxHSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(hbox), UI_GroupMaxHSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
etk_signal_connect("text-changed", ETK_OBJECT(UI_GroupNameEntry),
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_images.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- edje_editor_images.c 7 Jul 2008 12:27:48 -0000 1.5
+++ edje_editor_images.c 12 Jul 2008 13:28:32 -0000 1.6
@@ -32,34 +32,34 @@
//AddTweenButton
UI_AddTweenButton = etk_button_new_from_stock(ETK_STOCK_LIST_ADD);
etk_button_style_set(ETK_BUTTON(UI_AddTweenButton), ETK_BUTTON_ICON);
- etk_signal_connect("clicked", ETK_OBJECT(UI_AddTweenButton),
+ etk_signal_connect("clicked", ETK_OBJECT(UI_AddTweenButton),
ETK_CALLBACK(_window_all_button_click_cb), (void*)IMAGE_TWEEN_ADD);
- etk_box_append(ETK_BOX(UI_ImageTweenVBox), UI_AddTweenButton,
+ etk_box_append(ETK_BOX(UI_ImageTweenVBox), UI_AddTweenButton,
ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
//DeleteTweenButton
UI_DeleteTweenButton = etk_button_new_from_stock(ETK_STOCK_LIST_REMOVE);
etk_button_style_set(ETK_BUTTON(UI_DeleteTweenButton), ETK_BUTTON_ICON);
- etk_signal_connect("clicked", ETK_OBJECT(UI_DeleteTweenButton),
+ etk_signal_connect("clicked", ETK_OBJECT(UI_DeleteTweenButton),
ETK_CALLBACK(_window_all_button_click_cb), (void*)IMAGE_TWEEN_DELETE);
- etk_box_append(ETK_BOX(UI_ImageTweenVBox), UI_DeleteTweenButton,
- ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
+ etk_box_append(ETK_BOX(UI_ImageTweenVBox), UI_DeleteTweenButton,
+ ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
//MoveUpTweenButton
UI_MoveUpTweenButton = etk_button_new_from_stock(ETK_STOCK_GO_UP);
etk_button_style_set(ETK_BUTTON(UI_MoveUpTweenButton), ETK_BUTTON_ICON);
- etk_signal_connect("clicked", ETK_OBJECT(UI_MoveUpTweenButton),
+ etk_signal_connect("clicked", ETK_OBJECT(UI_MoveUpTweenButton),
ETK_CALLBACK(_window_all_button_click_cb), (void*)IMAGE_TWEEN_UP);
etk_box_append(ETK_BOX(UI_ImageTweenVBox), UI_MoveUpTweenButton,
- ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
+ ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
//MoveDownTweenButton
UI_MoveDownTweenButton = etk_button_new_from_stock(ETK_STOCK_GO_DOWN);
etk_button_style_set(ETK_BUTTON(UI_MoveDownTweenButton), ETK_BUTTON_ICON);
- etk_signal_connect("clicked", ETK_OBJECT(UI_MoveDownTweenButton),
+ etk_signal_connect("clicked", ETK_OBJECT(UI_MoveDownTweenButton),
ETK_CALLBACK(_window_all_button_click_cb), (void*)IMAGE_TWEEN_DOWN);
- etk_box_append(ETK_BOX(UI_ImageTweenVBox), UI_MoveDownTweenButton,
- ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
+ etk_box_append(ETK_BOX(UI_ImageTweenVBox), UI_MoveDownTweenButton,
+ ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
//ImageTweenList
UI_ImageTweenList = etk_tree_new();
@@ -270,10 +270,11 @@
UI_ImageBrowserIconbox = etk_iconbox_new();
etk_signal_connect("icon-selected", ETK_OBJECT(UI_ImageBrowserIconbox),
ETK_CALLBACK(_image_browser_iconbox_selected_cb), NULL);
- etk_box_append(ETK_BOX(hbox), UI_ImageBrowserIconbox, 0,
ETK_BOX_EXPAND_FILL, 0);
+ etk_box_append(ETK_BOX(hbox), UI_ImageBrowserIconbox,
+ ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
vbox = etk_vbox_new(ETK_FALSE, 0);
- etk_box_append (ETK_BOX(hbox), vbox, 0, ETK_BOX_NONE, 5);
+ etk_box_append (ETK_BOX(hbox), vbox, ETK_BOX_START, ETK_BOX_NONE, 5);
//AddImageButton
button = etk_button_new_from_stock(ETK_STOCK_DOCUMENT_OPEN);
@@ -281,14 +282,14 @@
etk_button_style_set(ETK_BUTTON(button), ETK_BUTTON_BOTH_VERT);
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_window_all_button_click_cb),
(void*)TOOLBAR_IMAGE_FILE_ADD);
- etk_box_append(ETK_BOX(vbox), button, 0, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(vbox), button, ETK_BOX_START, ETK_BOX_NONE, 0);
//DeleteImageButton
button = etk_button_new_from_stock(ETK_STOCK_EDIT_DELETE);
etk_object_properties_set(ETK_OBJECT(button), "label","Remove image",NULL);
etk_button_style_set(ETK_BUTTON(button), ETK_BUTTON_BOTH_VERT);
etk_widget_disabled_set(button, 1);
- etk_box_append(ETK_BOX(vbox), button, 0, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(vbox), button, ETK_BOX_START, ETK_BOX_NONE, 0);
//EditImageButton
button = etk_button_new_with_label("Edit Image");
@@ -296,30 +297,31 @@
etk_button_image_set(ETK_BUTTON(button), ETK_IMAGE(image));
etk_button_style_set(ETK_BUTTON(button), ETK_BUTTON_BOTH_VERT);
etk_widget_disabled_set(button, 1);
- etk_box_append(ETK_BOX(vbox), button, 0, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(vbox), button, ETK_BOX_START, ETK_BOX_NONE, 0);
//ImageInfo
frame = etk_frame_new("Image Info");
- etk_box_append(ETK_BOX(vbox), frame, 0, ETK_BOX_EXPAND_FILL, 10);
+ etk_box_append(ETK_BOX(vbox), frame, ETK_BOX_START, ETK_BOX_EXPAND_FILL,
10);
vbox2 = etk_vbox_new(ETK_FALSE, 0);
etk_container_add(ETK_CONTAINER(frame), vbox2);
label = etk_label_new("<b>name:</b>");
- etk_box_append(ETK_BOX(vbox2), label, 0, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(vbox2), label, ETK_BOX_START, ETK_BOX_NONE, 0);
label = etk_label_new("Unknow");
- etk_box_append(ETK_BOX(vbox2), label, 0, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(vbox2), label, ETK_BOX_START, ETK_BOX_NONE, 0);
label = etk_label_new(" ");
- etk_box_append(ETK_BOX(vbox2), label, 0, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(vbox2), label, ETK_BOX_START, ETK_BOX_NONE, 0);
UI_ImageBrowserSizeLabel = etk_label_new("<b>size:</b> Unknow");
etk_object_properties_set(ETK_OBJECT(UI_ImageBrowserSizeLabel), "xalign",
0, NULL);
- etk_box_append(ETK_BOX(vbox2), UI_ImageBrowserSizeLabel, 0, ETK_BOX_NONE,
0);
+ etk_box_append(ETK_BOX(vbox2), UI_ImageBrowserSizeLabel,
+ ETK_BOX_START, ETK_BOX_NONE, 0);
label = etk_label_new("<b>comp:</b> Unknow");
- etk_box_append(ETK_BOX(vbox2), label, 0, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(vbox2), label, ETK_BOX_START, ETK_BOX_NONE, 0);
//CloseButton
button = etk_button_new_from_stock(ETK_STOCK_DIALOG_CLOSE);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_position.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- edje_editor_position.c 12 Jul 2008 13:05:17 -0000 1.7
+++ edje_editor_position.c 12 Jul 2008 13:28:32 -0000 1.8
@@ -53,8 +53,8 @@
//Rel1XSpinner
UI_Rel1XSpinner = etk_spinner_new(-100.0, 100.0, 0.0, 0.01, 0.1);
etk_spinner_digits_set(ETK_SPINNER(UI_Rel1XSpinner), 2);
- etk_widget_size_request_set(UI_Rel1XSpinner,45, 20);
- etk_box_append(ETK_BOX(hbox),UI_Rel1XSpinner, ETK_BOX_START, ETK_BOX_NONE,
0);
+ etk_widget_size_request_set(UI_Rel1XSpinner, 45, 20);
+ etk_box_append(ETK_BOX(hbox), UI_Rel1XSpinner, ETK_BOX_START, ETK_BOX_NONE,
0);
label = etk_label_new("<color=#FF0000>+</>");
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
@@ -62,7 +62,7 @@
//Rel1XOffsetEntry
UI_Rel1XOffsetSpinner = etk_spinner_new(-2000, 2000, 0, 1, 10);
etk_widget_size_request_set(UI_Rel1XOffsetSpinner, 45, 20);
- etk_box_append(ETK_BOX(hbox),UI_Rel1XOffsetSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(hbox), UI_Rel1XOffsetSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
label = etk_label_new("<color=#FF0000>to</>");
etk_object_properties_set(ETK_OBJECT(label), "xalign", 1.0, NULL);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_spectra.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_editor_spectra.c 12 Jul 2008 13:05:17 -0000 1.1
+++ edje_editor_spectra.c 12 Jul 2008 13:28:32 -0000 1.2
@@ -33,7 +33,7 @@
//vbox
vbox = etk_vbox_new(ETK_FALSE, 0);
- etk_box_append(ETK_BOX(hbox), vbox, 0, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(hbox), vbox, ETK_BOX_START, ETK_BOX_NONE, 0);
//UI_SpectrumList
UI_SpectrumList = etk_tree_new();
@@ -44,7 +44,7 @@
etk_tree_col_model_add(col, etk_tree_model_image_new());
etk_tree_col_model_add(col, etk_tree_model_text_new());
etk_tree_build(ETK_TREE(UI_SpectrumList));
- etk_box_append(ETK_BOX(vbox), UI_SpectrumList, 0, ETK_BOX_EXPAND_FILL, 0);
+ etk_box_append(ETK_BOX(vbox), UI_SpectrumList, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
etk_signal_connect("row-selected", ETK_OBJECT(UI_SpectrumList),
ETK_CALLBACK(_spectra_list_row_selected_cb), NULL);
@@ -57,18 +57,18 @@
etk_button_style_set(ETK_BUTTON(button), ETK_BUTTON_ICON);
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_spectra_add_button_click_cb), NULL);
- etk_box_append(ETK_BOX(hbox2), button, 0, ETK_BOX_EXPAND_FILL, 0);
+ etk_box_append(ETK_BOX(hbox2), button, ETK_BOX_START, ETK_BOX_EXPAND_FILL,
0);
//DelSpectraButton
button = etk_button_new_from_stock(ETK_STOCK_LIST_REMOVE);
etk_button_style_set(ETK_BUTTON(button), ETK_BUTTON_ICON);
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_spectra_del_button_click_cb), NULL);
- etk_box_append(ETK_BOX(hbox2), button, 0, ETK_BOX_EXPAND_FILL, 0);
+ etk_box_append(ETK_BOX(hbox2), button, ETK_BOX_START, ETK_BOX_EXPAND_FILL,
0);
//vbox
vbox = etk_vbox_new(ETK_FALSE, 0);
- etk_box_append(ETK_BOX(hbox), vbox, 0, ETK_BOX_EXPAND_FILL, 0);
+ etk_box_append(ETK_BOX(hbox), vbox, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
//UI_SpectraWidget
UI_SpectraWidget =
spectra_widget_new(etk_widget_toplevel_evas_get(UI_SpectrumWin));
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_spectra_widget.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_editor_spectra_widget.c 12 Jul 2008 13:05:17 -0000 1.1
+++ edje_editor_spectra_widget.c 12 Jul 2008 13:28:32 -0000 1.2
@@ -65,7 +65,7 @@
etk_button_style_set(ETK_BUTTON(button), ETK_BUTTON_ICON);
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_spectra_widget_add_button_click_cb), vbox);
- etk_box_append(ETK_BOX(hbox), button, 0, ETK_BOX_START, 0);
+ etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_START, 0);
//DelStopButton
button = etk_button_new_from_stock(ETK_STOCK_LIST_REMOVE);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_state.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- edje_editor_state.c 12 Jul 2008 13:05:17 -0000 1.7
+++ edje_editor_state.c 12 Jul 2008 13:28:32 -0000 1.8
@@ -54,7 +54,7 @@
UI_AspectMinSpinner = etk_spinner_new(0.0, 100.0, 0.0, 0.1, 1.0);
etk_spinner_digits_set(ETK_SPINNER(UI_AspectMinSpinner), 1);
etk_widget_size_request_set(UI_AspectMinSpinner,45, 20);
- etk_box_append(ETK_BOX(hbox),UI_AspectMinSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(hbox), UI_AspectMinSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
label = etk_label_new("max:");
etk_object_properties_set(ETK_OBJECT(label), "xalign", 1.0, NULL);
@@ -63,14 +63,14 @@
//UI_AspectMaxSpinner
UI_AspectMaxSpinner = etk_spinner_new(0.0, 100.0, 0.0, 0.1, 1.0);
etk_spinner_digits_set(ETK_SPINNER(UI_AspectMaxSpinner), 1);
- etk_widget_size_request_set(UI_AspectMaxSpinner,45, 20);
- etk_box_append(ETK_BOX(hbox),UI_AspectMaxSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
+ etk_widget_size_request_set(UI_AspectMaxSpinner, 45, 20);
+ etk_box_append(ETK_BOX(hbox), UI_AspectMaxSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
//UI_AspectCombo
UI_AspectComboBox = etk_combobox_new();
etk_combobox_column_add(ETK_COMBOBOX(UI_AspectComboBox),
ETK_COMBOBOX_LABEL, 30, ETK_COMBOBOX_NONE, 0.0);
etk_combobox_build(ETK_COMBOBOX(UI_AspectComboBox));
- etk_box_append(ETK_BOX(hbox),UI_AspectComboBox, ETK_BOX_START,
ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(hbox), UI_AspectComboBox, ETK_BOX_START,
ETK_BOX_NONE, 0);
ComboItem = etk_combobox_item_append(ETK_COMBOBOX(UI_AspectComboBox),
"None");
etk_combobox_item_data_set(ComboItem, (void*)EDJE_ASPECT_PREFER_NONE);
@@ -94,34 +94,34 @@
//UI_StateMinWSpinner
UI_StateMinWSpinner = etk_spinner_new(0, 2000, 0, 1, 10);
etk_widget_size_request_set(UI_StateMinWSpinner, 45, 20);
- etk_box_append(ETK_BOX(hbox),UI_StateMinWSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(hbox), UI_StateMinWSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
label = etk_label_new("x");
etk_object_properties_set(ETK_OBJECT(label), "xalign", 0.5, NULL);
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
//UI_StateMinHSpinner
- UI_StateMinHSpinner = etk_spinner_new(0, 2000, 0, 1, 10);
+ UI_StateMinHSpinner = etk_spinner_new(0, 2000, 0, 1, 10);
etk_widget_size_request_set(UI_StateMinHSpinner, 45, 20);
- etk_box_append(ETK_BOX(hbox),UI_StateMinHSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(hbox), UI_StateMinHSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
label = etk_label_new("max");
etk_object_properties_set(ETK_OBJECT(label), "xalign", 1.0, NULL);
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
//UI_StateMaxWSpinner
- UI_StateMaxWSpinner = etk_spinner_new(0, 2000, 0, 1, 10);
+ UI_StateMaxWSpinner = etk_spinner_new(0, 2000, 0, 1, 10);
etk_widget_size_request_set(UI_StateMaxWSpinner, 45, 20);
- etk_box_append(ETK_BOX(hbox),UI_StateMaxWSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(hbox), UI_StateMaxWSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
label = etk_label_new("x");
etk_object_properties_set(ETK_OBJECT(label), "xalign", 0.5, NULL);
etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
//UI_StateMaxHspinner
- UI_StateMaxHSpinner = etk_spinner_new(0, 2000, 0, 1, 10);
+ UI_StateMaxHSpinner = etk_spinner_new(0, 2000, 0, 1, 10);
etk_widget_size_request_set(UI_StateMaxHSpinner, 45, 20);
- etk_box_append(ETK_BOX(hbox),UI_StateMaxHSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(hbox), UI_StateMaxHSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
//hbox
hbox = etk_hbox_new(ETK_FALSE, 0);
@@ -129,21 +129,21 @@
//UI_StateAlignHSpinner
label = etk_label_new("Align");
- etk_box_append(ETK_BOX(hbox),label, ETK_BOX_START, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
- UI_StateAlignHSpinner = etk_spinner_new(0, 1, 0, 0.01, 0.1);
+ UI_StateAlignHSpinner = etk_spinner_new(0, 1, 0, 0.01, 0.1);
etk_spinner_digits_set(ETK_SPINNER(UI_StateAlignHSpinner), 2);
etk_widget_size_request_set(UI_StateAlignHSpinner, 45, 20);
- etk_box_append(ETK_BOX(hbox),UI_StateAlignHSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(hbox), UI_StateAlignHSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
//UI_StateAlignVSpinner
label = etk_label_new("V Align");
- etk_box_append(ETK_BOX(hbox),label, ETK_BOX_START, ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
- UI_StateAlignVSpinner = etk_spinner_new(0, 1, 0, 0.01, 0.1);
+ UI_StateAlignVSpinner = etk_spinner_new(0, 1, 0, 0.01, 0.1);
etk_spinner_digits_set(ETK_SPINNER(UI_StateAlignVSpinner), 2);
etk_widget_size_request_set(UI_StateAlignVSpinner, 45, 20);
- etk_box_append(ETK_BOX(hbox),UI_StateAlignVSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
+ etk_box_append(ETK_BOX(hbox), UI_StateAlignVSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
etk_signal_connect("key-down", ETK_OBJECT(UI_StateEntry),
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_text.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- edje_editor_text.c 2 Jul 2008 17:27:02 -0000 1.4
+++ edje_editor_text.c 12 Jul 2008 13:28:32 -0000 1.5
@@ -126,11 +126,17 @@
etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
//Color buttons
- etk_box_append(ETK_BOX(hbox),
window_color_button_create("Text",COLOR_OBJECT_TEXT,30,30, evas),
+ etk_box_append(ETK_BOX(hbox),
+ window_color_button_create("Text",
+ COLOR_OBJECT_TEXT, 30, 30, evas),
ETK_BOX_START, ETK_BOX_EXPAND, 0);
- etk_box_append(ETK_BOX(hbox),
window_color_button_create("Shadow",COLOR_OBJECT_SHADOW,30,30, evas),
+ etk_box_append(ETK_BOX(hbox),
+ window_color_button_create("Shadow",
+ COLOR_OBJECT_SHADOW, 30, 30,
evas),
ETK_BOX_START, ETK_BOX_EXPAND, 0);
- etk_box_append(ETK_BOX(hbox),
window_color_button_create("Outline",COLOR_OBJECT_OUTLINE,30,30, evas),
+ etk_box_append(ETK_BOX(hbox),
+ window_color_button_create("Outline",
+ COLOR_OBJECT_OUTLINE, 30, 30,
evas),
ETK_BOX_START, ETK_BOX_EXPAND, 0);
etk_signal_connect("clicked", ETK_OBJECT(UI_FontAddButton),
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
