Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor/src/bin
Modified Files:
callbacks.c callbacks.h interface.c interface.h main.h
Log Message:
Add part-align and text-align spinners
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- callbacks.c 27 Nov 2007 01:28:47 -0000 1.35
+++ callbacks.c 27 Nov 2007 18:43:32 -0000 1.36
@@ -810,6 +810,26 @@
return ETK_TRUE;
}
+Etk_Bool
+on_FontAlignSpinner_value_changed(Etk_Range *range, double value, void *data)
+{
+ printf("Value Changed Signal on AlignSpinner (h or v, text or part) EMITTED
(value: %.2f)\n",etk_range_value_get(range));
+
+ if (data == TEXT_ALIGNH_SPINNER)
+ engrave_part_state_text_align_set(Cur.eps, etk_range_value_get(range),
-1);
+
+ if (data == TEXT_ALIGNV_SPINNER)
+ engrave_part_state_text_align_set(Cur.eps, -1,
etk_range_value_get(range));
+
+ if (data == STATE_ALIGNH_SPINNER)
+ engrave_part_state_align_set(Cur.eps, etk_range_value_get(range), -1);
+
+ if (data == STATE_ALIGNV_SPINNER)
+ engrave_part_state_align_set(Cur.eps, -1, etk_range_value_get(range));
+
+ return ETK_TRUE;
+}
+
/* Programs Callbacks */
Etk_Bool
on_ActionComboBox_changed(Etk_Combobox *combobox, void *data)
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- callbacks.h 26 Nov 2007 17:40:12 -0000 1.16
+++ callbacks.h 27 Nov 2007 18:43:32 -0000 1.17
@@ -18,6 +18,7 @@
Etk_Bool on_RemoveMenu_item_activated (Etk_Object *object, void *data);
Etk_Bool on_RelToComboBox_changed (Etk_Combobox *combobox, void
*data);
Etk_Bool on_TextEntry_text_changed (Etk_Object *object, void *data);
+Etk_Bool on_FontAlignSpinner_value_changed (Etk_Range *range, double value,
void *data);
Etk_Bool on_FileChooser_response (Etk_Dialog *dialog, int
response_id,void *data);
Etk_Bool on_FileChooser_selected (Etk_Filechooser_Widget
*filechooser);
Etk_Bool on_FileChooserDialog_response (Etk_Dialog *dialog, int
response_id, void *data);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- interface.c 27 Nov 2007 01:28:48 -0000 1.42
+++ interface.c 27 Nov 2007 18:43:32 -0000 1.43
@@ -412,6 +412,7 @@
double aspect_min;
double aspect_max;
int minw,minh,maxw,maxh;
+ double h, v;
//printf("Update Description Frame: %s\n",Cur.eps->name);
@@ -448,6 +449,10 @@
etk_range_value_set(ETK_RANGE(UI_StateMinHSpinner), minh);
etk_range_value_set(ETK_RANGE(UI_StateMaxWSpinner), maxw);
etk_range_value_set(ETK_RANGE(UI_StateMaxHSpinner), maxh);
+
+ engrave_part_state_align_get(Cur.eps, &h, &v);
+ etk_range_value_set (ETK_RANGE(UI_StateAlignHSpinner), h);
+ etk_range_value_set (ETK_RANGE(UI_StateAlignVSpinner), v);
//ReEnable Signal Propagation
etk_signal_unblock("text-changed",ETK_OBJECT(UI_StateEntry),on_StateEntry_text_changed,
NULL);
@@ -566,6 +571,7 @@
{
int eff_num = 0;
int i;
+ double h, v;
//int alpha;
int r, g, b;
Etk_Combobox_Item *item = NULL;
@@ -601,6 +607,11 @@
//Set the font size spinner
etk_range_value_set (ETK_RANGE(UI_FontSizeSpinner),
(float)engrave_part_state_text_size_get(Cur.eps));
+
+ //Set the font align spinners
+ engrave_part_state_text_align_get(Cur.eps, &h, &v);
+ etk_range_value_set (ETK_RANGE(UI_FontAlignHSpinner), h);
+ etk_range_value_set (ETK_RANGE(UI_FontAlignVSpinner), v);
//Set Effect ComboBox
switch (Cur.ep->effect)
@@ -1515,6 +1526,28 @@
etk_widget_size_request_set(UI_StateMaxHSpinner, 45, 20);
etk_box_append(ETK_BOX(hbox),UI_StateMaxHSpinner, ETK_BOX_START,
ETK_BOX_NONE, 0);
+ //hbox
+ hbox = etk_hbox_new(ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START, ETK_BOX_NONE, 0);
+
+ //UI_StateAlignHSpinner
+ label = etk_label_new("Align");
+ 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);
+ 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);
+
+ //UI_StateAlignVSpinner
+ label = etk_label_new("V Align");
+ 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);
+ 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_signal_connect("text-changed", ETK_OBJECT(UI_StateEntry),
ETK_CALLBACK(on_StateEntry_text_changed), NULL);
etk_signal_connect("value-changed", ETK_OBJECT(UI_StateIndexSpinner),
@@ -1533,7 +1566,10 @@
ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
etk_signal_connect("value-changed", ETK_OBJECT(UI_StateMaxHSpinner),
ETK_CALLBACK(on_StateMinMaxSpinner_value_changed), NULL);
-
+ etk_signal_connect("value-changed", ETK_OBJECT(UI_StateAlignVSpinner),
+ ETK_CALLBACK(on_FontAlignSpinner_value_changed),
(void*)STATE_ALIGNV_SPINNER);
+ etk_signal_connect("value-changed", ETK_OBJECT(UI_StateAlignHSpinner),
+ ETK_CALLBACK(on_FontAlignSpinner_value_changed),
(void*)STATE_ALIGNH_SPINNER);
return vbox;
}
@@ -1697,7 +1733,7 @@
vbox = etk_vbox_new(ETK_FALSE, 5);
//table
- table = etk_table_new (5, 3, ETK_TABLE_NOT_HOMOGENEOUS);
+ table = etk_table_new (5, 4, ETK_TABLE_NOT_HOMOGENEOUS);
etk_box_append(ETK_BOX(vbox), table, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
label = etk_label_new("Text");
@@ -1737,10 +1773,28 @@
etk_widget_size_request_set(UI_FontSizeSpinner, 45, 20);
etk_table_attach_default (ETK_TABLE(table),UI_FontSizeSpinner, 4, 4, 1,1);
- label = etk_label_new("Effect");
+ //FontAlignHSpinner
+ label = etk_label_new("Align");
etk_table_attach_default (ETK_TABLE(table),label, 0, 0, 2,2);
-
+
+ UI_FontAlignHSpinner = etk_spinner_new (0, 1, 0, 0.01, 0.1);
+ etk_spinner_digits_set (ETK_SPINNER(UI_FontAlignHSpinner), 2);
+ etk_widget_size_request_set(UI_FontAlignHSpinner, 45, 20);
+ etk_table_attach_default (ETK_TABLE(table),UI_FontAlignHSpinner, 1, 1, 2,2);
+
+ //FontAlignVSpinner
+ label = etk_label_new("V Align");
+ etk_table_attach_default (ETK_TABLE(table),label, 2, 2, 2,2);
+
+ UI_FontAlignVSpinner = etk_spinner_new (0, 1, 0, 0.01, 0.1);
+ etk_spinner_digits_set (ETK_SPINNER(UI_FontAlignVSpinner), 2);
+ etk_widget_size_request_set(UI_FontAlignVSpinner, 45, 20);
+ etk_table_attach_default (ETK_TABLE(table),UI_FontAlignVSpinner, 3, 4, 2,2);
+
//PartEffectComboBox
+ label = etk_label_new("Effect");
+ etk_table_attach_default (ETK_TABLE(table),label, 0, 0, 3,3);
+
UI_EffectComboBox = etk_combobox_new();
etk_combobox_column_add(ETK_COMBOBOX(UI_EffectComboBox),
ETK_COMBOBOX_IMAGE, 24, ETK_COMBOBOX_NONE, 0.0);
@@ -1778,7 +1832,7 @@
etk_image_new_from_edje (EdjeFile,"NONE.PNG"), "Glow");
etk_combobox_item_data_set (ComboItem, (void*)ENGRAVE_TEXT_EFFECT_GLOW);
- etk_table_attach_default (ETK_TABLE(table),UI_EffectComboBox, 1, 4, 2,2);
+ etk_table_attach_default (ETK_TABLE(table),UI_EffectComboBox, 1, 4, 3,3);
//hbox
hbox = etk_hbox_new(ETK_FALSE, 10);
@@ -1802,7 +1856,11 @@
ETK_CALLBACK(on_FontSizeSpinner_value_changed), NULL);
etk_signal_connect("text-changed", ETK_OBJECT(UI_TextEntry),
ETK_CALLBACK(on_TextEntry_text_changed), NULL);
-
+ etk_signal_connect("value-changed", ETK_OBJECT(UI_FontAlignVSpinner),
+ ETK_CALLBACK(on_FontAlignSpinner_value_changed),
(void*)TEXT_ALIGNV_SPINNER);
+ etk_signal_connect("value-changed", ETK_OBJECT(UI_FontAlignHSpinner),
+ ETK_CALLBACK(on_FontAlignSpinner_value_changed),
(void*)TEXT_ALIGNH_SPINNER);
+
return vbox;
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- interface.h 27 Nov 2007 01:28:48 -0000 1.20
+++ interface.h 27 Nov 2007 18:43:32 -0000 1.21
@@ -62,6 +62,8 @@
Etk_Widget *UI_GroupMaxHSpinner;
Etk_Widget *UI_ImageAddButton;
Etk_Widget *UI_FontAddButton;
+Etk_Widget *UI_FontAlignVSpinner;
+Etk_Widget *UI_FontAlignHSpinner;
Etk_Widget *UI_AspectMinSpinner;
Etk_Widget *UI_AspectMaxSpinner;
Etk_Widget *UI_AspectComboBox;
@@ -69,6 +71,8 @@
Etk_Widget *UI_StateMinHSpinner;
Etk_Widget *UI_StateMaxWSpinner;
Etk_Widget *UI_StateMaxHSpinner;
+Etk_Widget *UI_StateAlignVSpinner;
+Etk_Widget *UI_StateAlignHSpinner;
Etk_Widget *UI_ProgramEntry;
Etk_Widget *UI_SignalEntry;
Etk_Widget *UI_ScriptBox;
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- main.h 25 Nov 2007 18:42:56 -0000 1.13
+++ main.h 27 Nov 2007 18:43:32 -0000 1.14
@@ -75,6 +75,10 @@
MAXW_SPINNER,
MINH_SPINNER,
MAXH_SPINNER,
+ STATE_ALIGNV_SPINNER,
+ STATE_ALIGNH_SPINNER,
+ TEXT_ALIGNV_SPINNER,
+ TEXT_ALIGNH_SPINNER,
BORDER_TOP,
BORDER_LEFT,
BORDER_RIGHT,
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
