Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_background.c e_int_config_background_import.c
Log Message:
Rename the buttons
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_background.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- e_int_config_background.c 23 Jan 2006 04:35:03 -0000 1.34
+++ e_int_config_background.c 23 Jan 2006 04:52:37 -0000 1.35
@@ -114,7 +114,7 @@
e_widget_table_object_append(ot, il, 0, 0, 1, 2, 1, 1, 1, 1);
/* Add import Button */
- o = e_widget_button_add(evas, _("Import An Image"), NULL,
_bg_config_dialog_cb_import, cfd, NULL);
+ o = e_widget_button_add(evas, _("Select An Image"), NULL,
_bg_config_dialog_cb_import, cfd, NULL);
e_widget_table_object_append(ot, o, 0, 2, 1, 1, 1, 0, 0, 0);
of = e_widget_framelist_add(evas, _("Background Preview"), 0);
@@ -180,7 +180,7 @@
e_widget_table_object_append(ot, il, 0, 0, 1, 3, 1, 1, 1, 1);
/* Add import Button */
- o = e_widget_button_add(evas, _("Import An Image"), NULL,
_bg_config_dialog_cb_import, cfd, NULL);
+ o = e_widget_button_add(evas, _("Select An Image"), NULL,
_bg_config_dialog_cb_import, cfd, NULL);
e_widget_table_object_append(ot, o, 0, 3, 1, 1, 1, 0, 0, 0);
of = e_widget_framelist_add(evas, _("Background Preview"), 0);
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_background_import.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_int_config_background_import.c 23 Jan 2006 02:56:01 -0000 1.6
+++ e_int_config_background_import.c 23 Jan 2006 04:52:37 -0000 1.7
@@ -199,11 +199,11 @@
edje_object_part_swallow(import->bg_obj, "content_swallow", o);
evas_object_show(o);
- import->ok_obj = e_widget_button_add(evas, _("Import"), NULL,
_import_cb_ok, win, cfdata);
+ import->ok_obj = e_widget_button_add(evas, _("Ok"), NULL, _import_cb_ok,
win, cfdata);
e_widget_disabled_set(import->ok_obj, 1);
e_widget_list_object_append(import->box_obj, import->ok_obj, 1, 0, 0.5);
- import->close_obj = e_widget_button_add(evas, _("Close"), NULL,
_import_cb_close, win, NULL);
+ import->close_obj = e_widget_button_add(evas, _("Cancel"), NULL,
_import_cb_close, win, NULL);
e_widget_list_object_append(import->box_obj, import->close_obj, 1, 0, 0.5);
e_win_centered_set(win, 1);
@@ -374,19 +374,32 @@
Evas *evas;
E_Win *win;
E_Config_Dialog_Data *cfdata;
+ Bg_Import_Window *import;
win = data;
+ import = win->data;
cfdata = data2;
+
+ if (!cfdata->file[0])
+ {
+ if (import) e_widget_disabled_set(import->ok_obj, 1);
+ return;
+ }
- if (!cfdata->file[0]) return;
f = e_fm_file_new(cfdata->file);
if (!f) return;
- if (!e_fm_file_is_image(f)) return;
+ if (!e_fm_file_is_image(f))
+ {
+ if (import) e_widget_disabled_set(import->ok_obj, 1);
+ return;
+ }
+
free(f);
evas = e_win_evas_get(win);
_bg_edj_gen(evas, cfdata->file, cfdata->method);
+ if (import) e_widget_disabled_set(import->ok_obj, 1);
}
static void
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
