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_dialogs.h
edje_editor_group.c edje_editor_part.c edje_editor_position.c
edje_editor_program.c edje_editor_rect.c edje_editor_state.c
edje_editor_toolbar.c edje_editor_window.c main.c
Log Message:
cleans & renames of edje_editor_dialogs.c
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_dialogs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- edje_editor_dialogs.c 2 Jul 2008 02:26:31 -0000 1.2
+++ edje_editor_dialogs.c 2 Jul 2008 13:50:00 -0000 1.3
@@ -3,45 +3,26 @@
#include <Edje_Edit.h>
#include "main.h"
-//#include "callbacks.h"
-
-
-
-
-void
-ShowAlert(char* text)
-{
- etk_message_dialog_text_set(ETK_MESSAGE_DIALOG(UI_AlertDialog), text);
- etk_widget_show_all(UI_AlertDialog);
-}
+/*** FileChooser Dialog ***/
Etk_Widget*
-create_alert_dialog(void)
-{
- UI_AlertDialog = etk_message_dialog_new (ETK_MESSAGE_DIALOG_INFO,
- ETK_MESSAGE_DIALOG_OK, "Hallo world!");
- etk_widget_size_request_set(UI_AlertDialog, 240, 100);
- etk_signal_connect("delete-event", ETK_OBJECT(UI_AlertDialog),
- ETK_CALLBACK(etk_window_hide_on_delete), NULL);
- etk_signal_connect("response", ETK_OBJECT(UI_AlertDialog),
- ETK_CALLBACK(on_AlertDialog_response), NULL);
- return UI_AlertDialog;
-}
-
-Etk_Widget*
-create_filechooser_dialog(void)
+dialog_filechooser_create(void)
{
//Dialog
UI_FileChooserDialog = etk_dialog_new();
- etk_object_properties_set (ETK_OBJECT(UI_FileChooserDialog),
"action-area-homogeneous",ETK_FALSE,NULL);
- etk_signal_connect("delete-event", ETK_OBJECT(UI_FileChooserDialog),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
- etk_signal_connect("response", ETK_OBJECT(UI_FileChooserDialog),
ETK_CALLBACK(on_FileChooserDialog_response), NULL);
+ etk_object_properties_set (ETK_OBJECT(UI_FileChooserDialog),
+ "action-area-homogeneous", ETK_FALSE, NULL);
+ etk_signal_connect("delete-event", ETK_OBJECT(UI_FileChooserDialog),
+ ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ etk_signal_connect("response", ETK_OBJECT(UI_FileChooserDialog),
+ ETK_CALLBACK(_dialog_filechooser_response_cb), NULL);
//Filechooser
UI_FileChooser = etk_filechooser_widget_new();
etk_dialog_pack_in_main_area(ETK_DIALOG(UI_FileChooserDialog),
UI_FileChooser,
ETK_BOX_START, ETK_BOX_EXPAND_FILL,0);
- etk_signal_connect("selected", ETK_OBJECT(UI_FileChooser),
ETK_CALLBACK(on_FileChooser_selected), NULL);
+ etk_signal_connect("selected", ETK_OBJECT(UI_FileChooser),
+ ETK_CALLBACK(_dialog_filechooser_selected_cb), NULL);
etk_dialog_button_add_from_stock(ETK_DIALOG(UI_FileChooserDialog),
ETK_STOCK_DIALOG_CANCEL, ETK_RESPONSE_CANCEL );
@@ -54,7 +35,7 @@
}
void
-ShowFilechooser(int FileChooserType)
+dialog_filechooser_show(int FileChooserType)
{
etk_widget_show_all(UI_FileChooserDialog);
@@ -93,7 +74,7 @@
Etk_Bool
-on_FileChooserDialog_response(Etk_Dialog *dialog, int response_id, void *data)
+_dialog_filechooser_response_cb(Etk_Dialog *dialog, int response_id, void
*data)
{
char cmd[4096];
@@ -116,7 +97,7 @@
edje_edit_save(edje_o);
if(!ecore_file_cp(Cur.edj_temp_name->string, cmd))
{
- ShowAlert("<b>ERROR:<\b><br>Can't write file");
+ dialog_alert_show("<b>ERROR:<\b><br>Can't write file");
}
else
{
@@ -125,7 +106,7 @@
}
break;
case FILECHOOSER_SAVE_EDC:
- ShowAlert("Not yet implemented.");
+ dialog_alert_show("Not yet implemented.");
break;
case FILECHOOSER_IMAGE:
snprintf(cmd, 4096, "%s/%s",
@@ -133,7 +114,7 @@
etk_filechooser_widget_selected_file_get(ETK_FILECHOOSER_WIDGET(UI_FileChooser)));
if (!edje_edit_image_add(edje_o, cmd))
{
- ShowAlert("ERROR: Can't import image file.");
+ dialog_alert_show("ERROR: Can't import image file.");
break;
}
PopulateImageBrowser();
@@ -158,7 +139,7 @@
etk_filechooser_widget_selected_file_get(ETK_FILECHOOSER_WIDGET(UI_FileChooser)));
if (!edje_edit_font_add(edje_o, cmd))
{
- ShowAlert("ERROR: Can't import font file.");
+ dialog_alert_show("ERROR: Can't import font file.");
break;
}
PopulateFontsComboBox();
@@ -177,24 +158,21 @@
}
Etk_Bool
-on_FileChooser_selected(Etk_Filechooser_Widget *filechooser)
+_dialog_filechooser_selected_cb(Etk_Filechooser_Widget *filechooser)
{
printf("*** FILECHOOSER SELECTD ON *** \n");
- on_FileChooserDialog_response(ETK_DIALOG(UI_FileChooserDialog),
ETK_RESPONSE_OK, NULL);
+ _dialog_filechooser_response_cb(ETK_DIALOG(UI_FileChooserDialog),
+ ETK_RESPONSE_OK, NULL);
return ETK_TRUE;
}
-Etk_Bool
-on_AlertDialog_response(Etk_Dialog *dialog, int response_id, void *data)
-{
- etk_widget_hide(ETK_WIDGET(dialog));
- return ETK_TRUE;
-}
+
+/*** Color Picker Dialog ***/
Etk_Widget *
-create_colorpicker(void)
+dialog_colorpicker_create(void)
{
UI_ColorWin = etk_window_new();
etk_signal_connect("delete-event", ETK_OBJECT(UI_ColorWin),
@@ -203,12 +181,12 @@
etk_colorpicker_use_alpha_set (ETK_COLORPICKER(UI_ColorPicker), TRUE);
etk_container_add(ETK_CONTAINER(UI_ColorWin), UI_ColorPicker);
etk_signal_connect("color-changed", ETK_OBJECT(UI_ColorPicker),
- ETK_CALLBACK(on_ColorDialog_change), NULL);
+ ETK_CALLBACK(_dialog_colorpicker_change_cb), NULL);
return UI_ColorWin;
}
Etk_Bool
-on_ColorDialog_change(Etk_Object *object, void *data)
+_dialog_colorpicker_change_cb(Etk_Object *object, void *data)
{
// printf("ColorChangeSignal on ColorDialog EMITTED\n");
Etk_Color color;
@@ -260,3 +238,25 @@
canvas_redraw();
return ETK_TRUE;
}
+
+/*** Alert Dialog ***/
+Etk_Widget*
+dialog_alert_create(void)
+{
+ UI_AlertDialog = etk_message_dialog_new (ETK_MESSAGE_DIALOG_INFO,
+ ETK_MESSAGE_DIALOG_OK, "Hallo world!");
+ etk_widget_size_request_set(UI_AlertDialog, 240, 100);
+ etk_signal_connect("delete-event", ETK_OBJECT(UI_AlertDialog),
+ ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ etk_signal_connect("response", ETK_OBJECT(UI_AlertDialog),
+ ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ return UI_AlertDialog;
+}
+
+void
+dialog_alert_show(char* text)
+{
+ etk_message_dialog_text_set(ETK_MESSAGE_DIALOG(UI_AlertDialog), text);
+ etk_widget_show_all(UI_AlertDialog);
+}
+
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_dialogs.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_editor_dialogs.h 2 Jul 2008 01:07:02 -0000 1.1
+++ edje_editor_dialogs.h 2 Jul 2008 13:50:01 -0000 1.2
@@ -2,33 +2,34 @@
#define _EDJE_EDITOR_DIALOGS_H_
-Etk_Widget *UI_AlertDialog;
+//Alert Dialog
+Etk_Widget *UI_AlertDialog;
-Etk_Widget *UI_FileChooser;
-Etk_Widget *UI_FileChooserDialog;
-Etk_Widget *UI_FilechooserSaveButton;
-Etk_Widget *UI_FilechooserLoadButton;
+Etk_Widget* dialog_alert_create (void);
+void dialog_alert_show (char* text);
-Etk_Widget *UI_ColorWin;
-Etk_Widget *UI_ColorPicker;
-int current_color_object;
+//FileChooser Dialog
+Etk_Widget *UI_FileChooser;
+Etk_Widget *UI_FileChooserDialog;
+Etk_Widget *UI_FilechooserSaveButton;
+Etk_Widget *UI_FilechooserLoadButton;
-Etk_Widget* create_alert_dialog(void);
-void ShowAlert(char* text);
+Etk_Widget* dialog_filechooser_create (void);
+void dialog_filechooser_show (int FileChooserType);
-Etk_Widget* create_filechooser_dialog(void);
-void ShowFilechooser(int FileChooserType);
-Etk_Widget *create_colorpicker(void);
+//Color Picker Dialog
+Etk_Widget *UI_ColorWin;
+Etk_Widget *UI_ColorPicker;
+int current_color_object;
-
-Etk_Bool on_FileChooserDialog_response (Etk_Dialog *dialog, int
response_id, void *data);
-Etk_Bool on_FileChooser_selected (Etk_Filechooser_Widget
*filechooser);
-Etk_Bool on_AlertDialog_response (Etk_Dialog *dialog, int
response_id, void *data);
-
-Etk_Bool on_ColorDialog_change (Etk_Object *object, void *data);
+Etk_Widget* dialog_colorpicker_create (void);
+/*** Callbacks ***/
+Etk_Bool _dialog_colorpicker_change_cb (Etk_Object *object, void *data);
+Etk_Bool _dialog_filechooser_response_cb (Etk_Dialog *dialog, int response_id,
void *data);
+Etk_Bool _dialog_filechooser_selected_cb (Etk_Filechooser_Widget *filechooser);
#endif
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_group.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_editor_group.c 2 Jul 2008 01:07:02 -0000 1.1
+++ edje_editor_group.c 2 Jul 2008 13:50:01 -0000 1.2
@@ -215,7 +215,7 @@
if (!edje_edit_group_name_set(edje_o, name))
{
- ShowAlert("Can't rename group.<br>Another group with this name exist?");
+ dialog_alert_show("Can't rename group.<br>Another group with this name
exist?");
return ETK_TRUE;
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_part.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_editor_part.c 2 Jul 2008 01:07:02 -0000 1.1
+++ edje_editor_part.c 2 Jul 2008 13:50:01 -0000 1.2
@@ -239,7 +239,7 @@
if (!strcmp(gr, Cur.group->string))
{
- ShowAlert("A group can't contain itself");
+ dialog_alert_show("A group can't contain itself");
return ETK_TRUE;
}
@@ -286,7 +286,7 @@
/* change the name in edje */
if (!edje_edit_part_name_set(edje_o, Cur.part->string, name))
{
- ShowAlert("Can't set part name.<br>Another name with this name exist? ");
+ dialog_alert_show("Can't set part name.<br>Another name with this name
exist? ");
return ETK_TRUE;
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_position.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- edje_editor_position.c 2 Jul 2008 02:26:31 -0000 1.2
+++ edje_editor_position.c 2 Jul 2008 13:50:01 -0000 1.3
@@ -564,7 +564,7 @@
if (parent && (strcmp(parent,Cur.part->string) == 0))
{
- ShowAlert("A state can't rel to itself.");
+ dialog_alert_show("A state can't rel to itself.");
return ETK_TRUE;
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_program.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- edje_editor_program.c 2 Jul 2008 02:48:58 -0000 1.2
+++ edje_editor_program.c 2 Jul 2008 13:50:01 -0000 1.3
@@ -618,7 +618,7 @@
etk_widget_hide(ETK_WIDGET(UI_ProgramEntryImage));
}
else
- ShowAlert("Can't rename program.<br>Another program with this name just
exist?");
+ dialog_alert_show("Can't rename program.<br>Another program with this
name just exist?");
return ETK_TRUE;
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_rect.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_editor_rect.c 2 Jul 2008 01:07:02 -0000 1.1
+++ edje_editor_rect.c 2 Jul 2008 13:50:01 -0000 1.2
@@ -21,7 +21,7 @@
&color.r, &color.g, &color.b, &color.a);
etk_signal_block("color-changed", ETK_OBJECT(UI_ColorPicker),
- ETK_CALLBACK(on_ColorDialog_change), NULL);
+ ETK_CALLBACK(_dialog_colorpicker_change_cb), NULL);
//Set ColorPicker
etk_colorpicker_current_color_set (ETK_COLORPICKER(UI_ColorPicker),
color);
@@ -30,7 +30,7 @@
evas_object_color_set(RectColorObject,color.r,color.g,color.b,color.a);
etk_signal_unblock("color-changed", ETK_OBJECT(UI_ColorPicker),
- ETK_CALLBACK(on_ColorDialog_change), NULL);
+ ETK_CALLBACK(_dialog_colorpicker_change_cb), NULL);
}
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_state.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- edje_editor_state.c 2 Jul 2008 02:26:31 -0000 1.2
+++ edje_editor_state.c 2 Jul 2008 13:50:01 -0000 1.3
@@ -274,7 +274,7 @@
printf("PRESSED %s\n", event->keyname);
if (!strcmp("default 0.00", Cur.state->string))
{
- ShowAlert("You can't rename default 0.0");
+ dialog_alert_show("You can't rename default 0.0");
return ETK_TRUE;
}
@@ -319,10 +319,10 @@
etk_widget_hide(ETK_WIDGET(UI_StateEntryImage));
}
else
- ShowAlert("<b>Wrong name format</b><br>Name must be in the
form:<br>\"default 0.00\"");
+ dialog_alert_show("<b>Wrong name format</b><br>Name must be in the
form:<br>\"default 0.00\"");
}
else
- ShowAlert("You can't rename default 0.0");
+ dialog_alert_show("You can't rename default 0.0");
return ETK_TRUE;
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_toolbar.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- edje_editor_toolbar.c 2 Jul 2008 02:26:31 -0000 1.2
+++ edje_editor_toolbar.c 2 Jul 2008 13:50:01 -0000 1.3
@@ -339,7 +339,7 @@
case NEW_RECT:
if (!etk_string_length_get(Cur.group))
{
- ShowAlert("You must first select a group.");
+ dialog_alert_show("You must first select a group.");
break;
}
//generate a unique new name
@@ -350,7 +350,7 @@
if (!edje_edit_part_add(edje_o, name, EDJE_PART_TYPE_RECTANGLE))
{
- ShowAlert("Can't create part.");
+ dialog_alert_show("Can't create part.");
break;
}
@@ -364,7 +364,7 @@
case NEW_IMAGE:
if (!etk_string_length_get(Cur.group))
{
- ShowAlert("You must first select a group.");
+ dialog_alert_show("You must first select a group.");
break;
}
//generate a unique new name
@@ -375,7 +375,7 @@
if (!edje_edit_part_add(edje_o, name, EDJE_PART_TYPE_IMAGE))
{
- ShowAlert("Can't create part.");
+ dialog_alert_show("Can't create part.");
break;
}
//TODO generate a unique new name
@@ -400,7 +400,7 @@
case NEW_TEXT:
if (!etk_string_length_get(Cur.group))
{
- ShowAlert("You must first select a group.");
+ dialog_alert_show("You must first select a group.");
break;
}
//generate a unique new name
@@ -411,7 +411,7 @@
if (!edje_edit_part_add(edje_o, name, EDJE_PART_TYPE_TEXT))
{
- ShowAlert("Can't create part.");
+ dialog_alert_show("Can't create part.");
break;
}
row = AddPartToTree(name, NULL);
@@ -437,7 +437,7 @@
case NEW_SWAL:
if (!etk_string_length_get(Cur.group))
{
- ShowAlert("You must first select a group.");
+ dialog_alert_show("You must first select a group.");
break;
}
//generate a unique new name
@@ -448,7 +448,7 @@
if (!edje_edit_part_add(edje_o, name, EDJE_PART_TYPE_SWALLOW))
{
- ShowAlert("Can't create part.");
+ dialog_alert_show("Can't create part.");
break;
}
row = AddPartToTree(name, NULL);
@@ -460,7 +460,7 @@
case NEW_GROUPSWAL:
if (!etk_string_length_get(Cur.group))
{
- ShowAlert("You must first select a group.");
+ dialog_alert_show("You must first select a group.");
break;
}
//generate a unique new name
@@ -471,7 +471,7 @@
if (!edje_edit_part_add(edje_o, name, EDJE_PART_TYPE_GROUP))
{
- ShowAlert("Can't create part.");
+ dialog_alert_show("Can't create part.");
break;
}
row = AddPartToTree(name, NULL);
@@ -484,7 +484,7 @@
case NEW_DESC:
if (!etk_string_length_get(Cur.part))
{
- ShowAlert("You must first select a part.");
+ dialog_alert_show("You must first select a part.");
break;
}
@@ -516,7 +516,7 @@
case NEW_PROG:
if (!etk_string_length_get(Cur.group))
{
- ShowAlert("You must first select a group.");
+ dialog_alert_show("You must first select a group.");
break;
}
//generate a unique new name
@@ -527,7 +527,7 @@
if (!edje_edit_program_add(edje_o, name))
{
- ShowAlert("ERROR: can't add program");
+ dialog_alert_show("ERROR: can't add program");
break;
}
row = AddProgramToTree(name);
@@ -550,7 +550,7 @@
}
else
{
- ShowAlert("Can't create group.");
+ dialog_alert_show("Can't create group.");
}
break;
}
@@ -569,12 +569,12 @@
case REMOVE_DESCRIPTION:
if (!etk_string_length_get(Cur.state))
{
- ShowAlert("No part state selected");
+ dialog_alert_show("No part state selected");
break;
}
if (!strcmp(Cur.state->string,"default 0.00"))
{
- ShowAlert("You can't remove default 0.0");
+ dialog_alert_show("You can't remove default 0.0");
break;
}
edje_edit_state_del(edje_o, Cur.part->string, Cur.state->string);
@@ -591,12 +591,12 @@
case REMOVE_PART:
if (!etk_string_length_get(Cur.part))
{
- ShowAlert("No part selected");
+ dialog_alert_show("No part selected");
break;
}
if (!edje_edit_part_del(edje_o, Cur.part->string))
{
- ShowAlert("Can't delete part");
+ dialog_alert_show("Can't delete part");
break;
}
@@ -623,7 +623,7 @@
case REMOVE_GROUP:
if (!edje_edit_group_del(edje_o))
{
- ShowAlert("Can't delete group");
+ dialog_alert_show("Can't delete group");
break;
}
Etk_Combobox_Item *item, *nitem;
@@ -640,11 +640,11 @@
case REMOVE_PROG:
if (!etk_string_length_get(Cur.prog))
{
- ShowAlert("You must first select a program");
+ dialog_alert_show("You must first select a program");
}
if (!edje_edit_program_del(edje_o, Cur.prog->string))
{
- ShowAlert("Can't delete program");
+ dialog_alert_show("Can't delete program");
break;
}
row = etk_tree_selected_row_get(ETK_TREE(UI_PartsTree));
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_window.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edje_editor_window.c 2 Jul 2008 02:48:58 -0000 1.3
+++ edje_editor_window.c 2 Jul 2008 13:50:01 -0000 1.4
@@ -249,13 +249,13 @@
EV_Consolle = consolle_create();
//Filechooser
- UI_FileChooserDialog = create_filechooser_dialog();
+ UI_FileChooserDialog = dialog_filechooser_create();
//Alert Dialog
- UI_AlertDialog = create_alert_dialog();
+ UI_AlertDialog = dialog_alert_create();
//ColorPicker
- UI_ColorWin = create_colorpicker();
+ UI_ColorWin = dialog_colorpicker_create();
//Image Browser
create_image_browser();
@@ -328,26 +328,26 @@
system("edje_editor &");
break;
case TOOLBAR_OPEN:
- ShowFilechooser(FILECHOOSER_OPEN);
+ dialog_filechooser_show(FILECHOOSER_OPEN);
break;
case TOOLBAR_SAVE:
if (!etk_string_length_get(Cur.edj_file_name))
{
- ShowFilechooser(FILECHOOSER_SAVE_EDJ);
+ dialog_filechooser_show(FILECHOOSER_SAVE_EDJ);
break;
}
edje_edit_save(edje_o);
if (!ecore_file_cp(Cur.edj_temp_name->string, Cur.edj_file_name->string))
{
- ShowAlert("<b>ERROR:<\b><br>Can't write file");
+ dialog_alert_show("<b>ERROR:<\b><br>Can't write file");
}
break;
case TOOLBAR_SAVE_EDC:
- ShowAlert("Not yet reimplemented ;)");
+ dialog_alert_show("Not yet reimplemented ;)");
break;
case TOOLBAR_SAVE_EDJ:
- ShowFilechooser(FILECHOOSER_SAVE_EDJ);
+ dialog_filechooser_show(FILECHOOSER_SAVE_EDJ);
break;
case TOOLBAR_ADD:
if (!etk_string_length_get(Cur.part))
@@ -374,7 +374,7 @@
case TOOLBAR_MOVE_UP: //Lower
if (!etk_string_length_get(Cur.part))
{
- ShowAlert("You must select a part to lower");
+ dialog_alert_show("You must select a part to lower");
break;
}
if (!edje_edit_part_restack_below(edje_o, Cur.part->string))
@@ -401,7 +401,7 @@
case TOOLBAR_MOVE_DOWN: //Raise
if (!etk_string_length_get(Cur.part))
{
- ShowAlert("You must select a part to lower");
+ dialog_alert_show("You must select a part to lower");
break;
}
if (!edje_edit_part_restack_above(edje_o, Cur.part->string))
@@ -429,13 +429,13 @@
ShowImageBrowser(0);
break;
case TOOLBAR_FONT_BROWSER:
- ShowAlert("Font Browser");
+ dialog_alert_show("Font Browser");
break;
case TOOLBAR_IMAGE_FILE_ADD:
- ShowFilechooser(FILECHOOSER_IMAGE);
+ dialog_filechooser_show(FILECHOOSER_IMAGE);
break;
case TOOLBAR_FONT_FILE_ADD:
- ShowFilechooser(FILECHOOSER_FONT);
+ dialog_filechooser_show(FILECHOOSER_FONT);
break;
case IMAGE_TWEEN_ADD:
icons =
etk_iconbox_icon_get_selected(ETK_ICONBOX(UI_ImageBrowserIconbox));
@@ -453,7 +453,7 @@
}
else
{
- ShowAlert("You must choose an image to add from the Image Browser");
+ dialog_alert_show("You must choose an image to add from the Image
Browser");
}
break;
case IMAGE_TWEEN_DELETE:
@@ -508,10 +508,10 @@
edje_edit_print_internal_status(edje_o);
break;
case IMAGE_TWEEN_UP:
- ShowAlert("Up not yet implemented.");
+ dialog_alert_show("Up not yet implemented.");
break;
case IMAGE_TWEEN_DOWN:
- ShowAlert("Down not yet implemented.");
+ dialog_alert_show("Down not yet implemented.");
break;
case RUN_PROG:
if (etk_string_length_get(Cur.prog))
@@ -520,7 +520,7 @@
case SAVE_SCRIPT:
text = etk_textblock_text_get(ETK_TEXT_VIEW(UI_ScriptBox)->textblock,
ETK_TRUE);
- ShowAlert("Script not yet implemented.");
+ dialog_alert_show("Script not yet implemented.");
etk_object_destroy(ETK_OBJECT(text));
break;
default:
@@ -589,31 +589,37 @@
if (UI_ColorWin) etk_widget_show_all(UI_ColorWin);
current_color_object = (int)data;
- etk_signal_block("color-changed", ETK_OBJECT(UI_ColorPicker),
ETK_CALLBACK(on_ColorDialog_change), NULL);
+ etk_signal_block("color-changed", ETK_OBJECT(UI_ColorPicker),
+ ETK_CALLBACK(_dialog_colorpicker_change_cb), NULL);
switch (current_color_object)
{
case COLOR_OBJECT_RECT:
etk_window_title_set(ETK_WINDOW(UI_ColorWin), "Rectangle color");
- edje_edit_state_color_get(edje_o, Cur.part->string,
Cur.state->string, &c.r,&c.g,&c.b,&c.a);
+ edje_edit_state_color_get(edje_o, Cur.part->string, Cur.state->string,
+ &c.r,&c.g,&c.b,&c.a);
etk_colorpicker_current_color_set(ETK_COLORPICKER(UI_ColorPicker), c);
break;
case COLOR_OBJECT_TEXT:
etk_window_title_set(ETK_WINDOW(UI_ColorWin), "Text color");
- edje_edit_state_color_get(edje_o, Cur.part->string,
Cur.state->string, &c.r,&c.g,&c.b,&c.a);
+ edje_edit_state_color_get(edje_o, Cur.part->string, Cur.state->string,
+ &c.r,&c.g,&c.b,&c.a);
etk_colorpicker_current_color_set(ETK_COLORPICKER(UI_ColorPicker), c);
break;
case COLOR_OBJECT_SHADOW:
etk_window_title_set(ETK_WINDOW(UI_ColorWin), "Shadow color");
- edje_edit_state_color3_get(edje_o, Cur.part->string,
Cur.state->string, &c.r,&c.g,&c.b,&c.a);
+ edje_edit_state_color3_get(edje_o, Cur.part->string,
Cur.state->string,
+ &c.r,&c.g,&c.b,&c.a);
etk_colorpicker_current_color_set(ETK_COLORPICKER(UI_ColorPicker), c);
break;
case COLOR_OBJECT_OUTLINE:
etk_window_title_set(ETK_WINDOW(UI_ColorWin), "Outline color");
- edje_edit_state_color2_get(edje_o, Cur.part->string,
Cur.state->string, &c.r,&c.g,&c.b,&c.a);
+ edje_edit_state_color2_get(edje_o, Cur.part->string,
Cur.state->string,
+ &c.r,&c.g,&c.b,&c.a);
etk_colorpicker_current_color_set(ETK_COLORPICKER(UI_ColorPicker), c);
break;
}
- etk_signal_unblock("color-changed", ETK_OBJECT(UI_ColorPicker),
ETK_CALLBACK(on_ColorDialog_change), NULL);
+ etk_signal_unblock("color-changed", ETK_OBJECT(UI_ColorPicker),
+ ETK_CALLBACK(_dialog_colorpicker_change_cb), NULL);
}
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/main.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- main.c 2 Jul 2008 02:48:58 -0000 1.44
+++ main.c 2 Jul 2008 13:50:01 -0000 1.45
@@ -149,7 +149,7 @@
if (!edje_object_file_set(edje_o, Cur.edj_temp_name->string, group))
{
- ShowAlert("Error loading group");
+ dialog_alert_show("Error loading group");
return;
}
evas_object_show(edje_o);
@@ -205,17 +205,17 @@
realp = ecore_file_realpath(file);
if (!ecore_file_exists(realp))
{
- ShowAlert("<b>ERROR:</b><br>File not exists.");
+ dialog_alert_show("<b>ERROR:</b><br>File not exists.");
return 0;
}
if (!ecore_file_can_read(realp))
{
- ShowAlert("<b>ERROR</b>:<br>Can't read file.");
+ dialog_alert_show("<b>ERROR</b>:<br>Can't read file.");
return 0;
}
if (!ecore_str_has_suffix(realp, ".edj")) //TODO: better check
{
- ShowAlert("<b>ERROR</b>:<br>File is not an edje file.");
+ dialog_alert_show("<b>ERROR</b>:<br>File is not an edje file.");
return 0;
}
@@ -240,7 +240,7 @@
if (!ecore_file_cp(realp, Cur.edj_temp_name->string))
{
- ShowAlert("<b>ERROR</b>:<br>Can't copy to temp file.");
+ dialog_alert_show("<b>ERROR</b>:<br>Can't copy to temp file.");
return 0;
}
@@ -271,7 +271,7 @@
//Delete old temp file
if (old_temp && !ecore_file_unlink(old_temp))
{
- ShowAlert("<b>ERROR</b>:<br>Can't remove temp file.");
+ dialog_alert_show("<b>ERROR</b>:<br>Can't remove temp file.");
return 0;
}
if (old_temp) free(old_temp);
-------------------------------------------------------------------------
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
