Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_apps_error.c e_bindings.c e_file_dialog.c
e_fileman_smart.c e_int_border_locks.c e_int_border_menu.c
e_int_config_background_import.c e_int_config_window_display.c
e_main.c e_module.c
Log Message:
cross-compile fixes, (odd that this didnt screw up before when i did some
cross-compiling of e for arm), illogict patches too :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -3 -r1.108 -r1.109
--- Makefile.am 15 Feb 2006 20:27:45 -0000 1.108
+++ Makefile.am 18 Feb 2006 04:35:26 -0000 1.109
@@ -1,6 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = -I$(includedir) \
- -I$(top_srcdir) \
+INCLUDES = -I$(top_srcdir) \
-I$(top_srcdir)/src/bin \
-I$(top_srcdir)/src/lib \
@e_cflags@ \
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_apps_error.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_apps_error.c 5 Feb 2006 00:56:20 -0000 1.11
+++ e_apps_error.c 18 Feb 2006 04:35:26 -0000 1.12
@@ -60,19 +60,19 @@
if ((app->del.signalled) && (!cfdata->signal))
{
if (app->del.exit_signal == SIGINT)
- snprintf(buf, sizeof(buf), _("%s was interrupted by an Interrupt
Singal"),
+ snprintf(buf, sizeof(buf), _("%s was interrupted by an Interrupt
Signal"),
app->app->exe);
else if (app->del.exit_signal == SIGQUIT)
- snprintf(buf, sizeof(buf), _("%s was interrupted by a Quit Singal"),
+ snprintf(buf, sizeof(buf), _("%s was interrupted by a Quit Signal"),
app->app->exe);
else if (app->del.exit_signal == SIGABRT)
- snprintf(buf, sizeof(buf), _("%s was interrupted by an Abort
Singal"),
+ snprintf(buf, sizeof(buf), _("%s was interrupted by an Abort
Signal"),
app->app->exe);
else if (app->del.exit_signal == SIGFPE)
snprintf(buf, sizeof(buf), _("%s was interrupted by a Floating Point
Error"),
app->app->exe);
else if (app->del.exit_signal == SIGKILL)
- snprintf(buf, sizeof(buf), _("%s was interrupted by an
Uninterruptable Kill Singal"),
+ snprintf(buf, sizeof(buf), _("%s was interrupted by an
Uninterruptable Kill Signal"),
app->app->exe);
else if (app->del.exit_signal == SIGSEGV)
snprintf(buf, sizeof(buf), _("%s was interrupted by a Segmentation
Fault"),
@@ -87,7 +87,7 @@
snprintf(buf, sizeof(buf), _("%s was interrupted by a Bus Error"),
app->app->exe);
else
- snprintf(buf, sizeof(buf), _("%s was interupted by the signal number
%i"),
+ snprintf(buf, sizeof(buf), _("%s was interrupted by the signal
number %i"),
app->app->exe, app->del.exit_signal);
cfdata->signal = strdup(buf);
/* FIXME: Add sigchld_info stuff
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_bindings.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- e_bindings.c 7 Jan 2006 10:39:45 -0000 1.29
+++ e_bindings.c 18 Feb 2006 04:35:26 -0000 1.30
@@ -475,7 +475,6 @@
return NULL;
}
-/* FIXME: finish off signal bindings */
EAPI void
e_bindings_signal_add(E_Binding_Context ctxt, char *sig, char *src,
E_Binding_Modifier mod, int any_mod, char *action, char *params)
{
@@ -573,7 +572,6 @@
return act;
}
-/* FIXME: finish off wheel bindings */
EAPI void
e_bindings_wheel_add(E_Binding_Context ctxt, int direction, int z,
E_Binding_Modifier mod, int any_mod, char *action, char *params)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_file_dialog.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_file_dialog.c 7 Jan 2006 10:39:45 -0000 1.11
+++ e_file_dialog.c 18 Feb 2006 04:35:26 -0000 1.12
@@ -63,7 +63,7 @@
e_widget_min_size_get(ol, &w, &h);
e_dialog_content_set(dia->dia, ol, w, h);
- e_dialog_button_add(dia->dia, _("Ok"), NULL, _e_file_dialog_button1_click,
dia);
+ e_dialog_button_add(dia->dia, _("OK"), NULL, _e_file_dialog_button1_click,
dia);
e_dialog_button_add(dia->dia, _("Cancel"), NULL,
_e_file_dialog_button2_click, dia);
return dia;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -3 -r1.134 -r1.135
--- e_fileman_smart.c 16 Feb 2006 22:04:16 -0000 1.134
+++ e_fileman_smart.c 18 Feb 2006 04:35:26 -0000 1.135
@@ -906,7 +906,7 @@
char text[PATH_MAX + 256];
dia = e_dialog_new(icon->sd->win->container);
- e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+ e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL);
e_dialog_button_focus_num(dia, 1);
e_dialog_title_set(dia, _("Error"));
snprintf(text, PATH_MAX + 256, _("Could not delete <br><b>%s</b>"),
icon->file->path);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_border_locks.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_int_border_locks.c 15 Feb 2006 20:40:55 -0000 1.11
+++ e_int_border_locks.c 18 Feb 2006 04:35:27 -0000 1.12
@@ -351,7 +351,7 @@
e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1);
ob = e_widget_check_add(evas, _("Fullscreen state"),
&(cfdata->lock.user.fullscreen));
e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 1, 1, 1);
- ob = e_widget_check_add(evas, _("The border style"),
&(cfdata->lock.border));
+ ob = e_widget_check_add(evas, _("Border style"), &(cfdata->lock.border));
e_widget_frametable_object_append(of, ob, 1, 3, 1, 1, 1, 1, 1, 1);
e_widget_list_object_append(o, of, 1, 1, 0.5);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_border_menu.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_int_border_menu.c 3 Feb 2006 06:16:25 -0000 1.13
+++ e_int_border_menu.c 18 Feb 2006 04:35:27 -0000 1.14
@@ -32,15 +32,16 @@
E_Menu_Item *mi;
if (bd->border_menu) return;
-
- m = e_menu_new();
- e_menu_category_set(m,"border/stacking");
- e_menu_category_data_set("border/stacking",bd);
- bd->border_stacking_menu = m;
+
/* Only allow to change layer for windows in "normal" layers */
if ((!bd->lock_user_stacking) &&
((bd->layer == 50) || (bd->layer == 100) || (bd->layer == 150)))
{
+ m = e_menu_new();
+ e_menu_category_set(m,"border/stacking");
+ e_menu_category_data_set("border/stacking",bd);
+ bd->border_stacking_menu = m;
+
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Always On Top"));
e_menu_item_radio_set(mi, 1);
@@ -51,6 +52,7 @@
(char
*)e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/stack_on_top"),
"widgets/border/default/stack_on_top");
+
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Normal"));
e_menu_item_radio_set(mi, 1);
@@ -61,6 +63,7 @@
(char
*)e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/stack_normal"),
"widgets/border/default/stack_normal");
+
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Always Below"));
e_menu_item_radio_set(mi, 1);
@@ -73,15 +76,17 @@
"widgets/border/default/stack_below");
}
- m = e_menu_new();
- e_menu_category_set(m,"border/maximize");
- e_menu_category_data_set("border/maximize",bd);
- bd->border_maximize_menu = m;
/* Only allow to change layer for windows in "normal" layers */
if ((!bd->lock_user_maximize) && (!bd->shaded) &&
((bd->layer == 50) || (bd->layer == 100) || (bd->layer == 150)))
{
int __fullmaximization = 0;
+
+ m = e_menu_new();
+ e_menu_category_set(m,"border/maximize");
+ e_menu_category_data_set("border/maximize",bd);
+ bd->border_maximize_menu = m;
+
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Maximized"));
e_menu_item_check_set(mi, 1);
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_background_import.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_int_config_background_import.c 23 Jan 2006 04:52:37 -0000 1.7
+++ e_int_config_background_import.c 18 Feb 2006 04:35:27 -0000 1.8
@@ -199,7 +199,7 @@
edje_object_part_swallow(import->bg_obj, "content_swallow", o);
evas_object_show(o);
- import->ok_obj = e_widget_button_add(evas, _("Ok"), 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);
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_window_display.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_int_config_window_display.c 13 Feb 2006 15:36:56 -0000 1.11
+++ e_int_config_window_display.c 18 Feb 2006 04:35:27 -0000 1.12
@@ -150,7 +150,7 @@
rg = e_widget_radio_group_new(&(cfdata->placement));
ob = e_widget_radio_add(evas, _("Smart Placement"),
E_WINDOW_PLACEMENT_SMART, rg);
e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Dont hide Gadgets"),
E_WINDOW_PLACEMENT_ANTIGADGET, rg);
+ ob = e_widget_radio_add(evas, _("Don't hide Gadgets"),
E_WINDOW_PLACEMENT_ANTIGADGET, rg);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Place at mouse pointer"),
E_WINDOW_PLACEMENT_CURSOR, rg);
e_widget_framelist_object_append(of, ob);
@@ -204,7 +204,7 @@
rg = e_widget_radio_group_new(&(cfdata->placement));
ob = e_widget_radio_add(evas, _("Smart Placement"),
E_WINDOW_PLACEMENT_SMART, rg);
e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Dont hide Gadgets"),
E_WINDOW_PLACEMENT_ANTIGADGET, rg);
+ ob = e_widget_radio_add(evas, _("Don't hide Gadgets"),
E_WINDOW_PLACEMENT_ANTIGADGET, rg);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Place at mouse pointer"),
E_WINDOW_PLACEMENT_CURSOR, rg);
e_widget_framelist_object_append(of, ob);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -3 -r1.155 -r1.156
--- e_main.c 16 Feb 2006 21:18:11 -0000 1.155
+++ e_main.c 18 Feb 2006 04:35:27 -0000 1.156
@@ -202,7 +202,7 @@
"\t\tbe used to simulate xinerama.\n"
"\t\tEG: -fake-xinerama-screen 800x600+0+0
-fake-xinerama-screen 800x600+800+0\n"
"\t-profile CONF_PROFILE\n"
- "\t\tUse the configuration profile CONF_PROFILE instead of
the the user selected default or just \"default\".\n"
+ "\t\tUse the configuration profile CONF_PROFILE instead of
the user selected default or just \"default\".\n"
"\t-good\n"
"\t\tBe good.\n"
"\t-evil\n"
@@ -374,7 +374,7 @@
ee = ecore_evas_buffer_new(1, 1);
if (!ee)
{
- e_error_message_show(_("Enlightenment found evas can't create a
buffer canvas. Please check\n"
+ e_error_message_show(_("Enlightenment found Evas can't create a
buffer canvas. Please check\n"
"Evas has Software Buffer engine
support.\n"));
_e_main_shutdown(-1);
}
@@ -384,7 +384,7 @@
evas_object_image_file_set(im, buf, NULL);
if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE)
{
- e_error_message_show(_("Enlightenment found evas can't load PNG
files. Check Evas has PNG\n"
+ e_error_message_show(_("Enlightenment found Evas can't load PNG
files. Check Evas has PNG\n"
"loader support.\n"));
_e_main_shutdown(-1);
}
@@ -393,7 +393,7 @@
evas_object_image_file_set(im, buf, NULL);
if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE)
{
- e_error_message_show(_("Enlightenment found evas can't load JPEG
files. Check Evas has JPEG\n"
+ e_error_message_show(_("Enlightenment found Evas can't load JPEG
files. Check Evas has JPEG\n"
"loader support.\n"));
_e_main_shutdown(-1);
}
@@ -402,7 +402,7 @@
evas_object_image_file_set(im, buf, "images/0");
if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE)
{
- e_error_message_show(_("Enlightenment found evas can't load EET
files. Check Evas has EET\n"
+ e_error_message_show(_("Enlightenment found Evas can't load EET
files. Check Evas has EET\n"
"loader support.\n"));
_e_main_shutdown(-1);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_module.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- e_module.c 10 Jan 2006 04:23:43 -0000 1.53
+++ e_module.c 18 Feb 2006 04:35:27 -0000 1.54
@@ -145,8 +145,8 @@
"The full path to this module is:<br>"
"%s<br>"
"The error reported was:<br>"
- "Module does not contain all needed
functions<br>"),
- name, buf);
+ "%s<br>"),
+ name, buf, _("Module does not contain all
needed functions"));
_e_module_dialog_disable_show(_("Error loading Module"), body, m);
m->api = NULL;
m->func.init = NULL;
@@ -471,7 +471,7 @@
m = e_menu_new();
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, _("About..."));
+ e_menu_item_label_set(mi, _("Aboutâ¦"));
e_menu_item_callback_set(mi, _e_module_control_menu_about, mod);
mi = e_menu_item_new(m);
-------------------------------------------------------
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
