vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

E: Fix nasty formatting in e_sys. 

SVN revision: 61427
This commit is contained in:
Christopher Michael 2011-07-16 15:58:59 +00:00
parent 2b8a975102
commit cfe2544d9f
1 changed files with 53 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
src/bin/e_sys.c
View File

@ -169,13 +169,21 @@ _e_sys_cb_timer(void *data __UNUSED__)
char buf[4096];
e_init_status_set(_("Checking System Permissions"));
snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys -t halt", e_prefix_lib_get());
snprintf(buf, sizeof(buf),
"%s/enlightenment/utils/enlightenment_sys -t halt",
e_prefix_lib_get());
_e_sys_halt_check_exe = ecore_exe_run(buf, NULL);
snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys -t reboot", e_prefix_lib_get());
snprintf(buf, sizeof(buf),
"%s/enlightenment/utils/enlightenment_sys -t reboot",
e_prefix_lib_get());
_e_sys_reboot_check_exe = ecore_exe_run(buf, NULL);
snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys -t suspend", e_prefix_lib_get());
snprintf(buf, sizeof(buf),
"%s/enlightenment/utils/enlightenment_sys -t suspend",
e_prefix_lib_get());
_e_sys_suspend_check_exe = ecore_exe_run(buf, NULL);
snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys -t hibernate", e_prefix_lib_get());
snprintf(buf, sizeof(buf),
"%s/enlightenment/utils/enlightenment_sys -t hibernate",
e_prefix_lib_get());
_e_sys_hibernate_check_exe = ecore_exe_run(buf, NULL);
return ECORE_CALLBACK_CANCEL;
}
@ -307,8 +315,7 @@ _e_sys_logout_confirm_dialog_update(int remaining)
"Do you want to finish the logout<br>"
"anyway without closing these<br>"
"applications first?<br><br>"
"Auto logout in %d seconds."),
remaining);
"Auto logout in %d seconds."), remaining);
e_dialog_text_set(_e_sys_logout_confirm_dialog, txt);
}
@ -365,9 +372,12 @@ _e_sys_cb_logout_timer(void *data __UNUSED__)
_e_sys_logout_confirm_dialog = dia;
e_dialog_title_set(dia, _("Logout problems"));
e_dialog_icon_set(dia, "system-log-out", 64);
e_dialog_button_add(dia, _("Logout now"), NULL, _e_sys_cb_logout_logout, NULL);
e_dialog_button_add(dia, _("Wait longer"), NULL, _e_sys_cb_logout_wait, NULL);
e_dialog_button_add(dia, _("Cancel Logout"), NULL, _e_sys_cb_logout_abort, NULL);
e_dialog_button_add(dia, _("Logout now"), NULL,
_e_sys_cb_logout_logout, NULL);
e_dialog_button_add(dia, _("Wait longer"), NULL,
_e_sys_cb_logout_wait, NULL);
e_dialog_button_add(dia, _("Cancel Logout"), NULL,
_e_sys_cb_logout_abort, NULL);
e_dialog_button_focus_num(dia, 1);
_e_sys_logout_confirm_dialog_update(E_LOGOUT_AUTO_TIME);
e_win_centered_set(dia->win, 1);
@ -432,7 +442,8 @@ _e_sys_current_action(void)
/* display dialog that currently an action is in progress */
E_Dialog *dia;
dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_sys_error_action_busy");
dia = e_dialog_new(e_container_current_get(e_manager_current_get()),
"E", "_sys_error_action_busy");
if (!dia) return;
e_dialog_title_set(dia, _("Enlightenment is busy with another request"));
@ -440,45 +451,33 @@ _e_sys_current_action(void)
switch (_e_sys_action_current)
{
case E_SYS_LOGOUT:
e_dialog_text_set(dia,
_("Logging out.<br>"
"You cannot perform other system actions<br>"
"once a logout has begun.")
);
e_dialog_text_set(dia, _("Logging out.<br>"
"You cannot perform other system actions<br>"
"once a logout has begun."));
break;
case E_SYS_HALT:
case E_SYS_HALT_NOW:
e_dialog_text_set(dia,
_("Powering off.<br>"
"You cannot do any other system actions<br>"
"once a shutdown has been started.")
);
e_dialog_text_set(dia, _("Powering off.<br>"
"You cannot do any other system actions<br>"
"once a shutdown has been started."));
break;
case E_SYS_REBOOT:
e_dialog_text_set(dia,
_("Resetting.<br>"
"You cannot do any other system actions<br>"
"once a reboot has begun.")
);
e_dialog_text_set(dia, _("Resetting.<br>"
"You cannot do any other system actions<br>"
"once a reboot has begun."));
break;
case E_SYS_SUSPEND:
e_dialog_text_set(dia,
_("Suspending.<br>"
"Until suspend is complete you cannot perform<br>"
"any other system actions.")
);
e_dialog_text_set(dia, _("Suspending.<br>"
"Until suspend is complete you cannot perform<br>"
"any other system actions."));
break;
case E_SYS_HIBERNATE:
e_dialog_text_set(dia,
_("Hibernating.<br>"
"You cannot perform an other system actions<br>"
"until this is complete.")
);
e_dialog_text_set(dia, _("Hibernating.<br>"
"You cannot perform any other system actions<br>"
"until this is complete."));
break;
default:
e_dialog_text_set(dia,
_("EEK! This should not happen")
);
e_dialog_text_set(dia, _("EEK! This should not happen"));
break;
}
e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL);
@ -493,7 +492,8 @@ _e_sys_action_failed(void)
/* display dialog that the current action failed */
E_Dialog *dia;
dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_sys_error_action_failed");
dia = e_dialog_new(e_container_current_get(e_manager_current_get()),
"E", "_sys_error_action_failed");
if (!dia) return;
e_dialog_title_set(dia, _("Enlightenment is busy with another request"));
@ -502,29 +502,19 @@ _e_sys_action_failed(void)
{
case E_SYS_HALT:
case E_SYS_HALT_NOW:
e_dialog_text_set(dia,
_("Power off failed.")
);
e_dialog_text_set(dia, _("Power off failed."));
break;
case E_SYS_REBOOT:
e_dialog_text_set(dia,
_("Reset failed.")
);
e_dialog_text_set(dia, _("Reset failed."));
break;
case E_SYS_SUSPEND:
e_dialog_text_set(dia,
_("Suspend failed.")
);
e_dialog_text_set(dia, _("Suspend failed."));
break;
case E_SYS_HIBERNATE:
e_dialog_text_set(dia,
_("Hibernate failed.")
);
e_dialog_text_set(dia, _("Hibernate failed."));
break;
default:
e_dialog_text_set(dia,
_("EEK! This should not happen")
);
e_dialog_text_set(dia, _("EEK! This should not happen"));
break;
}
e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL);
@ -564,8 +554,9 @@ _e_sys_action_do(E_Sys_Action a, char *param __UNUSED__)
case E_SYS_HALT_NOW:
/* shutdown -h now */
if (e_util_immortal_check()) return 0;
snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys halt",
e_prefix_lib_get());
snprintf(buf, sizeof(buf),
"%s/enlightenment/utils/enlightenment_sys halt",
e_prefix_lib_get());
if (_e_sys_exe)
{
_e_sys_current_action();
@ -591,7 +582,8 @@ _e_sys_action_do(E_Sys_Action a, char *param __UNUSED__)
case E_SYS_REBOOT:
/* shutdown -r now */
if (e_util_immortal_check()) return 0;
snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys reboot",
snprintf(buf, sizeof(buf),
"%s/enlightenment/utils/enlightenment_sys reboot",
e_prefix_lib_get());
if (_e_sys_exe)
{
@ -617,7 +609,8 @@ _e_sys_action_do(E_Sys_Action a, char *param __UNUSED__)
break;
case E_SYS_SUSPEND:
/* /etc/acpi/sleep.sh force */
snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys suspend",
snprintf(buf, sizeof(buf),
"%s/enlightenment/utils/enlightenment_sys suspend",
e_prefix_lib_get());
if (_e_sys_exe)
{
@ -645,7 +638,8 @@ _e_sys_action_do(E_Sys_Action a, char *param __UNUSED__)
break;
case E_SYS_HIBERNATE:
/* /etc/acpi/hibernate.sh force */
snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys hibernate",
snprintf(buf, sizeof(buf),
"%s/enlightenment/utils/enlightenment_sys hibernate",
e_prefix_lib_get());
if (_e_sys_exe)
{