Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor/src/bin
Modified Files:
callbacks.c interface.c main.c
Log Message:
* implemented add/remove of programs
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- callbacks.c 17 Feb 2008 21:39:18 -0000 1.50
+++ callbacks.c 18 Feb 2008 00:07:14 -0000 1.51
@@ -242,6 +242,7 @@
Cur.part = etk_string_set(Cur.part, name);
Cur.state = etk_string_clear(Cur.state);
Cur.tween = etk_string_clear(Cur.tween);
+ Cur.prog = etk_string_clear(Cur.prog);
edje_object_signal_emit(edje_ui,"description_frame_hide","edje_editor");
edje_object_signal_emit(edje_ui,"position_frame_hide","edje_editor");
@@ -260,6 +261,7 @@
Cur.state = etk_string_set(Cur.state, name);
Cur.part = etk_string_set(Cur.part, parent_name);
Cur.tween = etk_string_clear(Cur.tween);
+ Cur.prog = etk_string_clear(Cur.prog);
edje_edit_part_selected_state_set(edje_o, Cur.part->string,
Cur.state->string);
@@ -1373,7 +1375,6 @@
row = AddStateToTree(Cur.part->string, "New state 0.00");
etk_tree_row_select(row);
etk_tree_row_unfold(evas_hash_find(Parts_Hash,Cur.part->string));
-
break;
case NEW_PROG:
@@ -1382,7 +1383,14 @@
ShowAlert("You must first select a group.");
break;
}
- ShowAlert("not yet implemented.");
+ if (!edje_edit_program_add(edje_o, "New program"))
+ {
+ ShowAlert("ERROR: can't add program");
+ break;
+ }
+ row = AddProgramToTree("New program");
+ etk_tree_row_select(row);
+ etk_tree_row_scroll_to(row, ETK_FALSE);
break;
case NEW_GROUP:
@@ -1481,7 +1489,23 @@
break;
case REMOVE_PROG:
- ShowAlert("not yet implemented");
+ if (!etk_string_length_get(Cur.prog))
+ {
+ ShowAlert("You must first select a program");
+ }
+ if (!edje_edit_program_del(edje_o, Cur.prog->string))
+ {
+ ShowAlert("Can't delete program");
+ break;
+ }
+ row = etk_tree_selected_row_get(ETK_TREE(UI_PartsTree));
+ next = etk_tree_row_next_get(row);
+ if (!next)
+ next = etk_tree_row_prev_get(row);
+ etk_tree_row_delete(row);
+ if (next)
+ etk_tree_row_select(next);
+
break;
}
return ETK_TRUE;
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- interface.c 17 Feb 2008 21:39:18 -0000 1.57
+++ interface.c 18 Feb 2008 00:07:14 -0000 1.58
@@ -1161,12 +1161,12 @@
ETK_CALLBACK(on_AllButton_click),
(void*)TOOLBAR_SAVE_EDJ);
//SaveEDCButton
- button = etk_tool_button_new_from_stock(ETK_STOCK_DOCUMENT_SAVE_AS);
+ /* button = etk_tool_button_new_from_stock(ETK_STOCK_DOCUMENT_SAVE_AS);
etk_object_properties_set(ETK_OBJECT(button),"label","Export edc",NULL);
etk_toolbar_append(ETK_TOOLBAR(UI_Toolbar), button, ETK_BOX_START);
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(on_AllButton_click),
(void*)TOOLBAR_SAVE_EDC);
-
+ */
sep = etk_vseparator_new();
etk_toolbar_append(ETK_TOOLBAR(UI_Toolbar), sep, ETK_BOX_START);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- main.c 17 Feb 2008 21:39:18 -0000 1.30
+++ main.c 18 Feb 2008 00:07:14 -0000 1.31
@@ -292,6 +292,7 @@
TestEdjeGroup(argv[2],argv[3]);
return 0;
}
+
//Init ETK
if (!etk_init(argc, argv))
{
@@ -302,7 +303,7 @@
if (!ecore_init())
{
printf("ERROR: Cannot init Ecore!\n");
- return -1;
+ return 1;
}
@@ -312,19 +313,6 @@
return 1;
}
- //Create the etk window and all the widgets
- create_main_window();
-
- printf("*********************************\n");
- printf("Testing edje direct access!!...\n");
- printf("*********************************\n");
-
-
- setlocale(LC_NUMERIC,"C");
- //printf("LOCALE TEST:\n");
- //double val = 1.2;
- //sscanf("3.2","%lf", &val);
- //printf("%f\n", val);
Cur.edj_file_name = etk_string_new("");
Cur.edj_temp_name = etk_string_new("");
@@ -334,7 +322,16 @@
Cur.prog = etk_string_new("");
Cur.tween = etk_string_new("");
-
+
+ setlocale(LC_NUMERIC,"C");
+ //printf("LOCALE TEST:\n");
+ //double val = 1.2;
+ //sscanf("3.2","%lf", &val);
+ //printf("%f\n", val);
+
+ //Create the etk window and all the widgets
+ create_main_window();
+
//Open a file from command line
if (argc == 2)
{
@@ -352,10 +349,11 @@
//Start main loop
etk_main();
- //Remove temp file
- ecore_file_unlink(Cur.edj_temp_name->string); //TODO move this line down
(when don't use etk_string anymore)
-
+ //Main loop is finished
etk_shutdown();
+ //Remove temp file
+ ecore_file_unlink(Cur.edj_temp_name->string);
+
return 0;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
