Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto
Dir : e17/proto/enity/src/bin Modified Files: enity.c Log Message: - more label formatting - --title for enity dialogs - AUTHORS fix =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/enity/src/bin/enity.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- enity.c 14 Mar 2006 13:39:20 -0000 1.5 +++ enity.c 15 Mar 2006 00:11:08 -0000 1.6 @@ -2,6 +2,12 @@ static int _en_retval = 0; +static Etk_Bool _en_window_delete_cb(void *data) +{ + etk_main_quit(); + return ETK_TRUE; +} + static Evas_List *_en_arg_data_get(Etk_Argument *args, char *key) { Etk_Argument *arg; @@ -94,7 +100,8 @@ Evas_List *data; dialog = etk_dialog_new(); - + etk_signal_connect("delete_event", ETK_OBJECT(dialog), ETK_CALLBACK(_en_window_delete_cb), NULL); + if((data = _en_arg_data_get(args, "text")) != NULL) label = etk_label_new(data->data); else @@ -109,8 +116,13 @@ etk_dialog_button_add_from_stock(ETK_DIALOG(dialog), ETK_STOCK_DIALOG_OK, ETK_RESPONSE_OK); etk_dialog_button_add_from_stock(ETK_DIALOG(dialog), ETK_STOCK_DIALOG_CANCEL, ETK_RESPONSE_CANCEL); etk_signal_connect("response", ETK_OBJECT(dialog), ETK_CALLBACK(_en_ok_print_stdout_cb), entry); + etk_container_border_width_set(ETK_CONTAINER(dialog), 4); - etk_window_title_set(ETK_WINDOW(dialog), _("Add a new entry")); + + if((data = _en_arg_data_get(args, "title")) != NULL) + etk_window_title_set(ETK_WINDOW(dialog), data->data); + else + etk_window_title_set(ETK_WINDOW(dialog), _("Add a new entry")); etk_widget_show_all(dialog); } @@ -127,11 +139,15 @@ value = data->data; dialog = etk_message_dialog_new(ETK_MESSAGE_DIALOG_ERROR, ETK_MESSAGE_DIALOG_OK, value); + etk_signal_connect("delete_event", ETK_OBJECT(dialog), ETK_CALLBACK(_en_window_delete_cb), NULL); etk_signal_connect_swapped("response", ETK_OBJECT(dialog), ETK_CALLBACK(etk_main_quit), NULL); - - + etk_container_border_width_set(ETK_CONTAINER(dialog), 4); - etk_window_title_set(ETK_WINDOW(dialog), _("Error")); + + if((data = _en_arg_data_get(args, "title")) != NULL) + etk_window_title_set(ETK_WINDOW(dialog), data->data); + else + etk_window_title_set(ETK_WINDOW(dialog), _("Error")); etk_widget_show_all(dialog); } @@ -148,11 +164,16 @@ value = data->data; dialog = etk_message_dialog_new(ETK_MESSAGE_DIALOG_QUESTION, ETK_MESSAGE_DIALOG_OK_CANCEL, value); + etk_signal_connect("delete_event", ETK_OBJECT(dialog), ETK_CALLBACK(_en_window_delete_cb), NULL); etk_signal_connect("response", ETK_OBJECT(dialog), ETK_CALLBACK(_en_ok_print_stdout_cb), NULL); etk_container_border_width_set(ETK_CONTAINER(dialog), 4); - etk_window_title_set(ETK_WINDOW(dialog), _("Question")); - + + if((data = _en_arg_data_get(args, "title")) != NULL) + etk_window_title_set(ETK_WINDOW(dialog), data->data); + else + etk_window_title_set(ETK_WINDOW(dialog), _("Question")); + etk_widget_show_all(dialog); } @@ -168,11 +189,15 @@ value = data->data; dialog = etk_message_dialog_new(ETK_MESSAGE_DIALOG_INFO, ETK_MESSAGE_DIALOG_OK, value); + etk_signal_connect("delete_event", ETK_OBJECT(dialog), ETK_CALLBACK(_en_window_delete_cb), NULL); etk_signal_connect_swapped("response", ETK_OBJECT(dialog), ETK_CALLBACK(etk_main_quit), NULL); - - + etk_container_border_width_set(ETK_CONTAINER(dialog), 4); - etk_window_title_set(ETK_WINDOW(dialog), _("Information")); + + if((data = _en_arg_data_get(args, "title")) != NULL) + etk_window_title_set(ETK_WINDOW(dialog), data->data); + else + etk_window_title_set(ETK_WINDOW(dialog), _("Information")); etk_widget_show_all(dialog); } @@ -189,11 +214,15 @@ value = data->data; dialog = etk_message_dialog_new(ETK_MESSAGE_DIALOG_WARNING, ETK_MESSAGE_DIALOG_OK, value); + etk_signal_connect("delete_event", ETK_OBJECT(dialog), ETK_CALLBACK(_en_window_delete_cb), NULL); etk_signal_connect_swapped("response", ETK_OBJECT(dialog), ETK_CALLBACK(etk_main_quit), NULL); - - + etk_container_border_width_set(ETK_CONTAINER(dialog), 4); - etk_window_title_set(ETK_WINDOW(dialog), _("Warning")); + + if((data = _en_arg_data_get(args, "title")) != NULL) + etk_window_title_set(ETK_WINDOW(dialog), data->data); + else + etk_window_title_set(ETK_WINDOW(dialog), _("Question")); etk_widget_show_all(dialog); } @@ -212,6 +241,7 @@ Evas_List *data; dialog = etk_dialog_new(); + etk_signal_connect("delete_event", ETK_OBJECT(dialog), ETK_CALLBACK(_en_window_delete_cb), NULL); if((data = _en_arg_data_get(args, "text")) != NULL) label = etk_label_new(data->data); @@ -278,7 +308,11 @@ etk_dialog_button_add_from_stock(ETK_DIALOG(dialog), ETK_STOCK_DIALOG_CANCEL, ETK_RESPONSE_CANCEL); etk_signal_connect("response", ETK_OBJECT(dialog), ETK_CALLBACK(_en_ok_print_stdout_cb), tree); etk_container_border_width_set(ETK_CONTAINER(dialog), 4); - etk_window_title_set(ETK_WINDOW(dialog), _("Select vaue")); + + if((data = _en_arg_data_get(args, "title")) != NULL) + etk_window_title_set(ETK_WINDOW(dialog), data->data); + else + etk_window_title_set(ETK_WINDOW(dialog), _("Select value")); etk_widget_show_all(dialog); } @@ -288,6 +322,11 @@ /* do any changes / fixes / checks here */ } +static void _en_dialog_title_cb(Etk_Argument *args, int index) +{ + /* do any changes / fixes / checks here */ +} + static void _en_entry_entry_text_cb(Etk_Argument *args, int index) { /* do any changes / fixes / checks here */ @@ -296,6 +335,7 @@ Etk_Argument args[] = { /* global options that are used with more than one dialog type */ { "text", ' ', NULL, _en_dialog_text_cb, NULL, ETK_ARGUMENT_FLAG_OPTIONAL|ETK_ARGUMENT_FLAG_VALUE_REQUIRED, "Set the dialog text" }, + { "title", ' ', NULL, _en_dialog_title_cb, NULL, ETK_ARGUMENT_FLAG_OPTIONAL|ETK_ARGUMENT_FLAG_VALUE_REQUIRED, "Set the dialog title" }, /* --entry options */ { "entry-text", ' ', NULL, _en_entry_entry_text_cb, NULL, ETK_ARGUMENT_FLAG_OPTIONAL|ETK_ARGUMENT_FLAG_VALUE_REQUIRED, "Set the dialog text" }, ------------------------------------------------------- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs