Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto
Dir : e17/proto/edje_editor/src/bin
Modified Files:
callbacks.c interface.c main.c
Log Message:
Small fixs again.
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- callbacks.c 13 Mar 2007 04:43:18 -0000 1.17
+++ callbacks.c 13 Mar 2007 05:27:11 -0000 1.18
@@ -13,12 +13,16 @@
int current_color_object;
/* Called when the window is destroyed */
-void etk_main_quit_cb(void *data){
+void
+etk_main_quit_cb(void *data)
+{
etk_main_quit();
}
/* Called when the canvas change size */
-void on_canvas_geometry_changed(Etk_Object *canvas, const char *property_name,
void *data){
+void
+on_canvas_geometry_changed(Etk_Object *canvas, const char *property_name, void
*data)
+{
int cx, cy, cw, ch;
//printf("Geometry Changed Signal on Canvas\n");
//resize canvas bg
@@ -33,7 +37,7 @@
void
on_AllButton_click(Etk_Button *button, void *data)
{
- //GList *current,*prev;
+ char cmd[1024];
switch ((int)data)
{
case TOOLBAR_NEW:
@@ -97,9 +101,14 @@
break;
case TOOLBAR_PLAY:
printf("Clicked signal on Toolbar Button 'Play' EMITTED\n");
- ShowAlert("Not yet implemented");
- //SaveEDC(NULL);
- //PlayEDC();
+ if (Cur.open_file_name)
+ {
+ snprintf(cmd,1024,"edje_viewer %s &",Cur.open_file_name);
+ printf("TEST IN VIEWER. cmd: %s\n",cmd);
+ system(cmd);
+ }else{
+ ShowAlert("You need to save the file before testing it.");
+ }
break;
case TOOLBAR_DEBUG:
DebugInfo(FALSE);
@@ -1011,7 +1020,6 @@
AddStateToTree(new_state);
Cur.ep = part;
- //Cur.eps = new_state;
etk_tree_row_select(ecore_hash_get(hash,new_state));
etk_tree_row_unfold(ecore_hash_get(hash,Cur.eg));
@@ -1037,7 +1045,6 @@
AddStateToTree(new_state);
Cur.ep = part;
- //Cur.eps = new_state;
etk_tree_row_select(ecore_hash_get(hash,new_state));
etk_tree_row_unfold(ecore_hash_get(hash,Cur.eg));
@@ -1059,11 +1066,12 @@
engrave_part_state_name_set(new_state, "default", 0.0);
engrave_part_state_rel1_relative_set(new_state, 0.1, 0.1);
engrave_part_state_rel2_relative_set(new_state, 0.9, 0.9);
+ engrave_part_state_text_size_set(new_state,16);
+ engrave_part_state_text_text_set(new_state,"something to say...");
engrave_part_state_add(part,new_state);
AddStateToTree(new_state);
Cur.ep = part;
- //Cur.eps = new_state;
etk_tree_row_select(ecore_hash_get(hash,new_state));
etk_tree_row_unfold(ecore_hash_get(hash,Cur.eg));
@@ -1081,8 +1089,6 @@
engrave_part_state_name_set(new_state, "state", 0.0);
engrave_part_state_add(Cur.ep,new_state);
AddStateToTree(new_state);
-
- //Cur.eps = new_state;
etk_tree_row_select(ecore_hash_get(hash,new_state));
etk_tree_row_unfold(ecore_hash_get(hash,Cur.ep));
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- interface.c 13 Mar 2007 04:43:18 -0000 1.20
+++ interface.c 13 Mar 2007 05:27:11 -0000 1.21
@@ -453,7 +453,6 @@
//int alpha;
int r, g, b;
Etk_Combobox_Item *item = NULL;
- char* font;
Engrave_Font *ef;
if (Cur.eps){
@@ -986,14 +985,12 @@
etk_toolbar_append(ETK_TOOLBAR(ToolBar), button);
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_SAVE_EDJ);
-
- //SaveEDCButton
+/* //SaveEDCButton
button = etk_tool_button_new_from_stock(ETK_STOCK_DOCUMENT_SAVE);
etk_object_properties_set(ETK_OBJECT(button),"label","Export edc",NULL);
etk_toolbar_append(ETK_TOOLBAR(ToolBar), button);
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_SAVE_EDC);
-
-
+ */
sep = etk_hseparator_new();
etk_toolbar_append(ETK_TOOLBAR(ToolBar), sep);
sep = etk_vseparator_new();
@@ -1020,6 +1017,7 @@
etk_menu_item_image_set(ETK_MENU_ITEM_IMAGE(menu_item), ETK_IMAGE(image));
etk_signal_connect("activated", ETK_OBJECT(menu_item),
ETK_CALLBACK(on_AddMenu_item_activated),(void*) NEW_IMAGE);
etk_menu_shell_append(ETK_MENU_SHELL(UI_AddMenu), ETK_MENU_ITEM(menu_item));
+
//New Text
menu_item = etk_menu_item_image_new_with_label("Text");
image = etk_image_new_from_edje(EdjeFile,"TEXT.PNG");
@@ -1088,7 +1086,7 @@
//Compile Button
button = etk_tool_button_new_from_stock( ETK_STOCK_MEDIA_PLAYBACK_START);
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_PLAY);
- etk_object_properties_set(ETK_OBJECT(button),"label","Compile",NULL);
+ etk_object_properties_set(ETK_OBJECT(button),"label","Test in viewer",NULL);
etk_toolbar_append(ETK_TOOLBAR(ToolBar), button);
//DebugButton
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- main.c 13 Mar 2007 04:10:34 -0000 1.8
+++ main.c 13 Mar 2007 05:27:11 -0000 1.9
@@ -13,6 +13,7 @@
#define MAIN_EDC_NAME "edje_editor_link.edc"
+
/**
* engrave_part_state_remove - remove the state from the part.
* @param ep: The Engrave_Part to remove the state to.
@@ -414,7 +415,7 @@
//Text_view
UI_LoadTextView = etk_text_view_new ();
-
etk_textblock_object_cursor_visible_set(ETK_TEXT_VIEW(UI_LoadTextView)->textblock,
ETK_FALSE); //TODO questa riga non funziona
+
//etk_textblock_object_cursor_visible_set(ETK_TEXT_VIEW(UI_LoadTextView)->textblock,
ETK_FALSE); //TODO questa riga non funziona
scrolled_view = etk_scrolled_view_new();
etk_scrolled_view_policy_set(ETK_SCROLLED_VIEW(scrolled_view),
ETK_POLICY_HIDE, ETK_POLICY_SHOW);
etk_bin_child_set( ETK_BIN(scrolled_view), UI_LoadTextView);
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
