Enlightenment CVS committal
Author : sndev
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_shelf.c
Log Message:
* improving the usability of the Shelf config dialog in E config panel. Now
when one add a new shelf the selector automatically goes to it.
* adding a confirmation dialog on shelf delete. Request from CodeWarrior. :)
* possible-TODO: would be nice very nice "question" icon for this dialog.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_shelf.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_int_config_shelf.c 21 May 2006 11:45:22 -0000 1.3
+++ e_int_config_shelf.c 22 May 2006 12:01:09 -0000 1.4
@@ -9,6 +9,7 @@
{
E_Config_Dialog *cfd;
Evas_Object *ilist;
+ E_Dialog *confirm_dialog;
};
EAPI E_Config_Dialog *
@@ -140,29 +141,79 @@
e_config_save_queue();
_ilist_fill(cfdata);
+ e_widget_ilist_selected_set(cfdata->ilist,
e_widget_ilist_count(cfdata->ilist) - 1);
}
static void
-_cb_del(void *data, void *data2)
+_cb_confirm_dialog_no(void *data, E_Dialog *dia)
{
E_Config_Dialog_Data *cfdata;
+
+ cfdata = data;
+ e_object_del(E_OBJECT(cfdata->confirm_dialog));
+ cfdata->confirm_dialog = NULL;
+}
+static void
+_cb_confirm_dialog_yes(void *data, E_Dialog *dia)
+{
E_Shelf *es;
E_Config_Shelf *cfg;
-
+ E_Config_Dialog_Data *cfdata;
+
cfdata = data;
es = evas_list_nth(e_shelf_list(),
e_widget_ilist_selected_get(cfdata->ilist));
- if (!es) return;
- cfg = es->cfg;
- e_object_del(E_OBJECT(es));
-
- e_config->shelves = evas_list_remove(e_config->shelves, cfg);
- if (cfg->name) evas_stringshare_del(cfg->name);
- if (cfg->style) evas_stringshare_del(cfg->style);
- E_FREE(cfg);
-
- e_config_save_queue();
-
- _ilist_fill(cfdata);
+ if (es)
+ {
+ cfg = es->cfg;
+ e_object_del(E_OBJECT(es));
+
+ e_config->shelves = evas_list_remove(e_config->shelves, cfg);
+ if (cfg->name) evas_stringshare_del(cfg->name);
+ if (cfg->style) evas_stringshare_del(cfg->style);
+ E_FREE(cfg);
+ e_config_save_queue();
+
+ _ilist_fill(cfdata);
+ }
+
+ e_object_del(E_OBJECT(cfdata->confirm_dialog));
+ cfdata->confirm_dialog = NULL;
+}
+static void
+_cb_confirm_dialog_delete(E_Win *win)
+{
+ E_Config_Dialog_Data *cfdata;
+ cfdata = ((E_Dialog *)win->data)->data;
+ _cb_confirm_dialog_no(cfdata, cfdata->confirm_dialog);
+}
+
+static void
+_cb_del(void *data, void *data2)
+{
+ char buf[4096];
+ E_Config_Dialog_Data *cfdata;
+
+ cfdata = data;
+ if (cfdata->confirm_dialog) e_object_del(E_OBJECT(cfdata->confirm_dialog));
+ cfdata->confirm_dialog =
e_dialog_new(e_container_current_get(e_manager_current_get()));
+ if (!cfdata->confirm_dialog) return;
+ cfdata->confirm_dialog->data = cfdata;
+ e_win_delete_callback_set(cfdata->confirm_dialog->win,
_cb_confirm_dialog_delete);
+ e_dialog_title_set(cfdata->confirm_dialog, _("Are you sure you want to
delete this shelf?"));
+
+ snprintf(buf, sizeof(buf), _("You requested to delete \"%s\".<br>"
+ "<br>"
+ "Are you sure you want to delete this shelf?"),
+ e_widget_ilist_selected_label_get(cfdata->ilist));
+
+ e_dialog_text_set(cfdata->confirm_dialog, buf);
+ e_dialog_icon_set(cfdata->confirm_dialog, "enlightenment/exit", 64);
+ e_dialog_button_add(cfdata->confirm_dialog, _("Yes"), NULL,
_cb_confirm_dialog_yes, cfdata);
+ e_dialog_button_add(cfdata->confirm_dialog, _("No"), NULL,
_cb_confirm_dialog_no, cfdata);
+
+ e_dialog_button_focus_num(cfdata->confirm_dialog, 1);
+ e_win_centered_set(cfdata->confirm_dialog->win, 1);
+ e_dialog_show(cfdata->confirm_dialog);
}
static void
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
