Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor/src/bin
Modified Files:
edje_editor_dialogs.c edje_editor_state.c edje_editor_text.c
edje_editor_text.h edje_editor_tree.c edje_editor_window.c
main.c
Log Message:
cleans & renames of edje_editor_text.c ... i'm dying on the keyboard...
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_dialogs.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- edje_editor_dialogs.c 2 Jul 2008 14:29:34 -0000 1.4
+++ edje_editor_dialogs.c 2 Jul 2008 16:31:19 -0000 1.5
@@ -142,7 +142,7 @@
dialog_alert_show("ERROR: Can't import font file.");
break;
}
- PopulateFontsComboBox();
+ text_font_combo_populate();
etk_combobox_active_item_set(ETK_COMBOBOX(UI_FontComboBox),
etk_combobox_last_item_get(ETK_COMBOBOX(UI_FontComboBox)));
break;
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_state.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- edje_editor_state.c 2 Jul 2008 16:20:24 -0000 1.5
+++ edje_editor_state.c 2 Jul 2008 16:31:19 -0000 1.6
@@ -168,10 +168,10 @@
etk_signal_connect("value-changed", ETK_OBJECT(UI_StateMaxHSpinner),
ETK_CALLBACK(_state_MinMaxSpinner_value_changed_cb),
NULL);
etk_signal_connect("value-changed", ETK_OBJECT(UI_StateAlignVSpinner),
- ETK_CALLBACK(on_FontAlignSpinner_value_changed),
+ ETK_CALLBACK(_text_FontAlignSpinner_value_changed_cb),
(void*)STATE_ALIGNV_SPINNER);
etk_signal_connect("value-changed", ETK_OBJECT(UI_StateAlignHSpinner),
- ETK_CALLBACK(on_FontAlignSpinner_value_changed),
+ ETK_CALLBACK(_text_FontAlignSpinner_value_changed_cb),
(void*)STATE_ALIGNH_SPINNER);
return vbox;
}
@@ -197,10 +197,10 @@
etk_signal_block("value-changed", ETK_OBJECT(UI_StateMaxHSpinner),
ETK_CALLBACK(_state_MinMaxSpinner_value_changed_cb), NULL);
etk_signal_block("value-changed", ETK_OBJECT(UI_StateAlignVSpinner),
- ETK_CALLBACK(on_FontAlignSpinner_value_changed),
+ ETK_CALLBACK(_text_FontAlignSpinner_value_changed_cb),
(void*)STATE_ALIGNV_SPINNER);
etk_signal_block("value-changed", ETK_OBJECT(UI_StateAlignHSpinner),
- ETK_CALLBACK(on_FontAlignSpinner_value_changed),
+ ETK_CALLBACK(_text_FontAlignSpinner_value_changed_cb),
(void*)STATE_ALIGNH_SPINNER);
if (etk_string_length_get(Cur.state))
@@ -260,10 +260,10 @@
etk_signal_unblock("value-changed", ETK_OBJECT(UI_StateMaxHSpinner),
ETK_CALLBACK(_state_MinMaxSpinner_value_changed_cb),
NULL);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_StateAlignVSpinner),
- ETK_CALLBACK(on_FontAlignSpinner_value_changed),
+ ETK_CALLBACK(_text_FontAlignSpinner_value_changed_cb),
(void*)STATE_ALIGNV_SPINNER);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_StateAlignHSpinner),
- ETK_CALLBACK(on_FontAlignSpinner_value_changed),
+ ETK_CALLBACK(_text_FontAlignSpinner_value_changed_cb),
(void*)STATE_ALIGNH_SPINNER);
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_text.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- edje_editor_text.c 2 Jul 2008 02:26:31 -0000 1.2
+++ edje_editor_text.c 2 Jul 2008 16:31:19 -0000 1.3
@@ -5,8 +5,9 @@
#include "main.h"
+/*** Implementation ***/
Etk_Widget*
-create_text_frame(Evas *evas)
+text_frame_create(Evas *evas)
{
Etk_Widget *vbox;
Etk_Widget *hbox;
@@ -133,32 +134,35 @@
ETK_BOX_START, ETK_BOX_EXPAND, 0);
etk_signal_connect("clicked", ETK_OBJECT(UI_FontAddButton),
- ETK_CALLBACK(on_AllButton_click),
(void*)TOOLBAR_FONT_FILE_ADD);
+ ETK_CALLBACK(on_AllButton_click),
+ (void*)TOOLBAR_FONT_FILE_ADD);
etk_signal_connect("item-activated", ETK_OBJECT(UI_FontComboBox),
- ETK_CALLBACK(on_FontComboBox_item_activated), NULL);
+ ETK_CALLBACK(_text_FontComboBox_item_activated_cb),
NULL);
etk_signal_connect("active-item-changed", ETK_OBJECT(UI_EffectComboBox),
- ETK_CALLBACK(on_EffectComboBox_changed), NULL);
+ ETK_CALLBACK(_text_EffectComboBox_changed_cb), NULL);
etk_signal_connect("value-changed", ETK_OBJECT(UI_FontSizeSpinner),
- ETK_CALLBACK(on_FontSizeSpinner_value_changed), NULL);
+ ETK_CALLBACK(_text_FontSizeSpinner_value_changed_cb),
NULL);
etk_signal_connect("text-changed", ETK_OBJECT(UI_TextEntry),
- ETK_CALLBACK(on_TextEntry_text_changed), NULL);
+ ETK_CALLBACK(_text_Entry_text_changed_cb), NULL);
etk_signal_connect("value-changed", ETK_OBJECT(UI_FontAlignVSpinner),
- ETK_CALLBACK(on_FontAlignSpinner_value_changed),
(void*)TEXT_ALIGNV_SPINNER);
+ ETK_CALLBACK(_text_FontAlignSpinner_value_changed_cb),
+ (void*)TEXT_ALIGNV_SPINNER);
etk_signal_connect("value-changed", ETK_OBJECT(UI_FontAlignHSpinner),
- ETK_CALLBACK(on_FontAlignSpinner_value_changed),
(void*)TEXT_ALIGNH_SPINNER);
+ ETK_CALLBACK(_text_FontAlignSpinner_value_changed_cb),
+ (void*)TEXT_ALIGNH_SPINNER);
return vbox;
}
-
void
-PopulateFontsComboBox(void)
+text_font_combo_populate(void)
{
Evas_List *l;
Etk_Combobox_Item *ComboItem;
//Stop signal propagation
- etk_signal_disconnect("item-activated", ETK_OBJECT(UI_FontComboBox),
ETK_CALLBACK(on_FontComboBox_item_activated), NULL);
+ etk_signal_disconnect("item-activated", ETK_OBJECT(UI_FontComboBox),
+ ETK_CALLBACK(_text_FontComboBox_item_activated_cb),
NULL);
printf("Populate Fonts Combo\n");
@@ -176,12 +180,13 @@
edje_edit_string_list_free(fonts);
//Renable signal propagation
- etk_signal_connect("item-activated", ETK_OBJECT(UI_FontComboBox),
ETK_CALLBACK(on_FontComboBox_item_activated), NULL);
+ etk_signal_connect("item-activated", ETK_OBJECT(UI_FontComboBox),
+ ETK_CALLBACK(_text_FontComboBox_item_activated_cb),
NULL);
}
void
-UpdateTextFrame(void)
+text_frame_update(void)
{
int eff_num = 0;
//int alpha;
@@ -198,13 +203,13 @@
//Stop signal propagation
etk_signal_block("text-changed", ETK_OBJECT(UI_TextEntry),
- on_TextEntry_text_changed, NULL);
+ _text_Entry_text_changed_cb, NULL);
etk_signal_block("item-activated", ETK_OBJECT(UI_FontComboBox),
- ETK_CALLBACK(on_FontComboBox_item_activated), NULL);
+ ETK_CALLBACK(_text_FontComboBox_item_activated_cb), NULL);
etk_signal_block("value-changed", ETK_OBJECT(UI_FontAlignHSpinner),
- ETK_CALLBACK(on_FontAlignSpinner_value_changed), NULL);
+ ETK_CALLBACK(_text_FontAlignSpinner_value_changed_cb),
NULL);
etk_signal_block("value-changed", ETK_OBJECT(UI_FontAlignVSpinner),
- ETK_CALLBACK(on_FontAlignSpinner_value_changed), NULL);
+ ETK_CALLBACK(_text_FontAlignSpinner_value_changed_cb),
NULL);
//Set Text Text in Cur.eps
@@ -270,17 +275,19 @@
//Renable signal propagation
etk_signal_unblock("text-changed", ETK_OBJECT(UI_TextEntry),
- ETK_CALLBACK(on_TextEntry_text_changed), NULL);
+ ETK_CALLBACK(_text_Entry_text_changed_cb), NULL);
etk_signal_unblock("item-activated", ETK_OBJECT(UI_FontComboBox),
- ETK_CALLBACK(on_FontComboBox_item_activated), NULL);
+ ETK_CALLBACK(_text_FontComboBox_item_activated_cb),
NULL);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_FontAlignHSpinner),
- ETK_CALLBACK(on_FontAlignSpinner_value_changed), NULL);
+ ETK_CALLBACK(_text_FontAlignSpinner_value_changed_cb),
NULL);
etk_signal_unblock("value-changed", ETK_OBJECT(UI_FontAlignVSpinner),
- ETK_CALLBACK(on_FontAlignSpinner_value_changed), NULL);
+ ETK_CALLBACK(_text_FontAlignSpinner_value_changed_cb),
NULL);
}
+
+/*** Callbacks ***/
Etk_Bool
-on_FontComboBox_item_activated(Etk_Combobox *combobox, Etk_Combobox_Item
*item, void *data)
+_text_FontComboBox_item_activated_cb(Etk_Combobox *combobox, Etk_Combobox_Item
*item, void *data)
{
printf("Changed Signal on FontComboBox EMITTED \n");
@@ -295,9 +302,8 @@
return ETK_TRUE;
}
-
Etk_Bool
-on_EffectComboBox_changed(Etk_Combobox *combobox, void *data)
+_text_EffectComboBox_changed_cb(Etk_Combobox *combobox, void *data)
{
if (!etk_string_length_get(Cur.part)) return ETK_TRUE;
@@ -310,7 +316,7 @@
}
Etk_Bool
-on_FontSizeSpinner_value_changed(Etk_Range *range, double value, void *data)
+_text_FontSizeSpinner_value_changed_cb(Etk_Range *range, double value, void
*data)
{
printf("Value Changed Signal on FontSizeSpinner EMITTED (value:
%d)\n",(int)etk_range_value_get(range));
@@ -323,7 +329,7 @@
Etk_Bool
-on_TextEntry_text_changed(Etk_Object *object, void *data)
+_text_Entry_text_changed_cb(Etk_Object *object, void *data)
{
printf("Text Changed Signal on TextEntry EMITTED (value
%s)\n",etk_entry_text_get(ETK_ENTRY(object)));
edje_edit_state_text_set(edje_o, Cur.part->string, Cur.state->string,
@@ -334,7 +340,7 @@
}
Etk_Bool
-on_FontAlignSpinner_value_changed(Etk_Range *range, double value, void *data)
+_text_FontAlignSpinner_value_changed_cb(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));
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_text.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_editor_text.h 2 Jul 2008 01:07:02 -0000 1.1
+++ edje_editor_text.h 2 Jul 2008 16:31:19 -0000 1.2
@@ -16,17 +16,16 @@
Evas_Object *OutlineColorObject;
-Etk_Widget* create_text_frame(Evas *evas);
-void UpdateTextFrame(void);
-void PopulateFontsComboBox(void);
+Etk_Widget* text_frame_create (Evas *evas);
+void text_frame_update (void);
+void text_font_combo_populate (void);
-
-Etk_Bool on_FontComboBox_item_activated (Etk_Combobox *combobox,
Etk_Combobox_Item *item, void *data);
-Etk_Bool on_EffectComboBox_changed (Etk_Combobox *combobox, void
*data);
-Etk_Bool on_FontSizeSpinner_value_changed (Etk_Range *range, double value,
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 _text_FontComboBox_item_activated_cb (Etk_Combobox *combobox,
Etk_Combobox_Item *item, void *data);
+Etk_Bool _text_EffectComboBox_changed_cb (Etk_Combobox *combobox, void
*data);
+Etk_Bool _text_FontSizeSpinner_value_changed_cb (Etk_Range *range, double
value, void *data);
+Etk_Bool _text_Entry_text_changed_cb (Etk_Object *object, void
*data);
+Etk_Bool _text_FontAlignSpinner_value_changed_cb (Etk_Range *range, double
value, void *data);
#endif
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_tree.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- edje_editor_tree.c 2 Jul 2008 16:20:24 -0000 1.9
+++ edje_editor_tree.c 2 Jul 2008 16:31:19 -0000 1.10
@@ -300,7 +300,7 @@
edje_object_signal_emit(edje_ui,"text_frame_hide","edje_editor");
break;
case EDJE_PART_TYPE_TEXT:
- UpdateTextFrame();
+ text_frame_update();
edje_object_signal_emit(edje_ui,"text_frame_show","edje_editor");
edje_object_signal_emit(edje_ui,"image_frame_hide","edje_editor");
edje_object_signal_emit(edje_ui,"rect_frame_hide","edje_editor");
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_window.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- edje_editor_window.c 2 Jul 2008 16:20:24 -0000 1.12
+++ edje_editor_window.c 2 Jul 2008 16:31:19 -0000 1.13
@@ -201,7 +201,7 @@
//TextEmbed
UI_TextEmbed = etk_embed_new(UI_evas);
- etk_container_add(ETK_CONTAINER(UI_TextEmbed), create_text_frame(UI_evas));
+ etk_container_add(ETK_CONTAINER(UI_TextEmbed), text_frame_create(UI_evas));
etk_embed_position_method_set(ETK_EMBED(UI_TextEmbed),
_embed_position_set, UI_ecore_MainWin);
etk_widget_show_all(UI_TextEmbed);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- main.c 2 Jul 2008 15:48:11 -0000 1.49
+++ main.c 2 Jul 2008 16:31:19 -0000 1.50
@@ -264,7 +264,7 @@
Parts_Hash = NULL;
PopulateGroupsComboBox();
- PopulateFontsComboBox();
+ text_font_combo_populate();
-------------------------------------------------------------------------
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
