Confirmation windows removed

pull/28/head
parent 10f5380a5e
commit c05b7cdeb1

@ -442,15 +442,9 @@ void on_system_launch_clicked(GtkWidget *self, char *path, main_window *widgets)
config_str result = yon_config_load(service_check_active_command(service_name),&size); config_str result = yon_config_load(service_check_active_command(service_name),&size);
yon_char_remove_last_symbol(result[0],'\n'); yon_char_remove_last_symbol(result[0],'\n');
if (size>0){ if (size>0){
int answer = 0;
if (!strcmp(result[0],"active")){ if (!strcmp(result[0],"active")){
if (status){ if (status){
dialog_confirmation_data data; on_system_kill_confirmed(NULL,service_name);
data.action_text=STOP_SERVICE_WARMING_LABEL(service_name);
data.function=(void*)(void*)on_system_kill_confirmed;
data.data=service_name;
answer = yon_confirmation_dialog_call(widgets->Window,&data);
if (answer==GTK_RESPONSE_ACCEPT)
gtk_list_store_set(GTK_LIST_STORE(model),&iter,4,0,-1); gtk_list_store_set(GTK_LIST_STORE(model),&iter,4,0,-1);
} }
} else { } else {
@ -591,7 +585,7 @@ void on_system_update_hz_clicked(GtkWidget *self, main_window *widgets){
if (self){} if (self){}
if (widgets){ if (widgets){
dialog_confirmation_data *data = malloc(sizeof(dialog_confirmation_data)); dialog_confirmation_data *data = malloc(sizeof(dialog_confirmation_data));
data->action_text = "Are you sure?"; data->action_text = RELOAD_SERVICE_WARMING_LABEL("systemd");
data->data = widgets; data->data = widgets;
data->function = (data_function)yon_system_systemd_restart; data->function = (data_function)yon_system_systemd_restart;
yon_confirmation_dialog_call(self,data); yon_confirmation_dialog_call(self,data);
@ -603,7 +597,7 @@ void on_system_update_clicked(GtkWidget *self, main_window *widgets){
if (self){} if (self){}
if (widgets){ if (widgets){
dialog_confirmation_data *data = malloc(sizeof(dialog_confirmation_data)); dialog_confirmation_data *data = malloc(sizeof(dialog_confirmation_data));
data->action_text = "Are you sure?"; data->action_text = REEXEC_SERVICE_WARMING_LABEL("systemd");
data->data = widgets; data->data = widgets;
data->function = (data_function)yon_system_systemd_reexec; data->function = (data_function)yon_system_systemd_reexec;
yon_confirmation_dialog_call(self,data); yon_confirmation_dialog_call(self,data);
@ -714,7 +708,7 @@ void on_user_update_hz_clicked(GtkWidget *self, main_window *widgets){
if (self){} if (self){}
if (widgets){ if (widgets){
dialog_confirmation_data *data = malloc(sizeof(dialog_confirmation_data)); dialog_confirmation_data *data = malloc(sizeof(dialog_confirmation_data));
data->action_text = "Are you sure?"; data->action_text = REEXEC_SERVICE_WARMING_LABEL("systemd");
data->data = widgets; data->data = widgets;
data->function = (data_function)yon_system_systemd_restart; data->function = (data_function)yon_system_systemd_restart;
yon_confirmation_dialog_call(self,data); yon_confirmation_dialog_call(self,data);
@ -727,7 +721,7 @@ void on_user_update_clicked(GtkWidget *self, main_window *widgets){
if (self){} if (self){}
if (widgets){ if (widgets){
dialog_confirmation_data *data = malloc(sizeof(dialog_confirmation_data)); dialog_confirmation_data *data = malloc(sizeof(dialog_confirmation_data));
data->action_text = "Are you sure?"; data->action_text = RELOAD_SERVICE_WARMING_LABEL("systemd");
data->data = widgets; data->data = widgets;
data->function = (data_function)yon_system_systemd_reexec; data->function = (data_function)yon_system_systemd_reexec;
yon_confirmation_dialog_call(self,data); yon_confirmation_dialog_call(self,data);
@ -1581,7 +1575,9 @@ int main(int argc, char *argv[]){
char *path = yon_char_unite(yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",LocaleName,".conf",NULL); char *path = yon_char_unite(yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",LocaleName,".conf",NULL);
yon_window_config_load(path); yon_window_config_load(path);
if (getuid()!=0){ if (getuid()!=0){
textdomain(template_ui_LocaleName);
yon_ubl_status_box_render(ROOT_WARNING_LABEL,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_box_render(ROOT_WARNING_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
textdomain(LocaleName);
} }
main_config.launch_arguments=argv; main_config.launch_arguments=argv;
main_config.launch_size=argc; main_config.launch_size=argc;

@ -59,7 +59,8 @@
#define ERROR_LABEL _("Error has occured") #define ERROR_LABEL _("Error has occured")
#define SWITCH_OFF_ERROR_LABEL _("Service were not stopped") #define SWITCH_OFF_ERROR_LABEL _("Service were not stopped")
#define STOP_SERVICE_WARMING_LABEL(target) yon_char_unite(_("Are you sure want to stop "),target,"?\n",_("The stop will be forced.\nThe system may become unstable."),NULL) #define REEXEC_SERVICE_WARMING_LABEL(target) yon_char_unite(_("Are you sure want to restart "),target,"?\n",_("The system may become unstable."),NULL)
#define RELOAD_SERVICE_WARMING_LABEL(target) yon_char_unite(_("Are you sure want to reload "),target,"?\n",_("The system may become unstable."),NULL)
#define DAYS_LABEL _("Days") #define DAYS_LABEL _("Days")
#define HOURS_LABEL _("Hours") #define HOURS_LABEL _("Hours")
#define MINUTES_LABEL _("Minutes") #define MINUTES_LABEL _("Minutes")

@ -198,223 +198,225 @@ msgid "Service were not stopped"
msgstr "" msgstr ""
#: source/ubl-strings.h:62 #: source/ubl-strings.h:62
msgid "Are you sure want to stop " msgid "Are you sure want to restart "
msgstr "" msgstr ""
#: source/ubl-strings.h:62 #: source/ubl-strings.h:62 source/ubl-strings.h:63
msgid "" msgid "The system may become unstable."
"The stop will be forced.\n"
"The system may become unstable."
msgstr "" msgstr ""
#: source/ubl-strings.h:63 #: source/ubl-strings.h:63
msgid "Days" msgid "Are you sure want to reload "
msgstr "" msgstr ""
#: source/ubl-strings.h:64 #: source/ubl-strings.h:64
msgid "Hours" msgid "Days"
msgstr "" msgstr ""
#: source/ubl-strings.h:65 #: source/ubl-strings.h:65
msgid "Minutes" msgid "Hours"
msgstr "" msgstr ""
#: source/ubl-strings.h:66 #: source/ubl-strings.h:66
msgid "Minutes"
msgstr ""
#: source/ubl-strings.h:67
msgid "Seconds" msgid "Seconds"
msgstr "" msgstr ""
#: source/ubl-strings.h:68 #: source/ubl-strings.h:69
msgid "Active" msgid "Active"
msgstr "" msgstr ""
#: source/ubl-strings.h:69 #: source/ubl-strings.h:70
msgid "Inactive" msgid "Inactive"
msgstr "" msgstr ""
#: source/ubl-strings.h:71 #: source/ubl-strings.h:72
msgid "System units" msgid "System units"
msgstr "" msgstr ""
#: source/ubl-strings.h:72 #: source/ubl-strings.h:73
msgid "User units" msgid "User units"
msgstr "" msgstr ""
#: source/ubl-strings.h:73 #: source/ubl-strings.h:74
msgid "Config files" msgid "Config files"
msgstr "" msgstr ""
#: source/ubl-strings.h:74 #: source/ubl-strings.h:75
msgid "Sessions" msgid "Sessions"
msgstr "" msgstr ""
#: source/ubl-strings.h:75 #: source/ubl-strings.h:76
msgid "Timers" msgid "Timers"
msgstr "" msgstr ""
#: source/ubl-strings.h:77 #: source/ubl-strings.h:78
msgid "System services status" msgid "System services status"
msgstr "" msgstr ""
#: source/ubl-strings.h:78 #: source/ubl-strings.h:79
msgid "User services status" msgid "User services status"
msgstr "" msgstr ""
#: source/ubl-strings.h:79 #: source/ubl-strings.h:80
msgid "Installed unit files" msgid "Installed unit files"
msgstr "" msgstr ""
#: source/ubl-strings.h:80 #: source/ubl-strings.h:81
msgid "Units and status list" msgid "Units and status list"
msgstr "" msgstr ""
#: source/ubl-strings.h:81 #: source/ubl-strings.h:82
msgid "Sockets and status list" msgid "Sockets and status list"
msgstr "" msgstr ""
#: source/ubl-strings.h:82 #: source/ubl-strings.h:83
msgid "Timers and status list" msgid "Timers and status list"
msgstr "" msgstr ""
#: source/ubl-strings.h:84 #: source/ubl-strings.h:85
msgid "Unit" msgid "Unit"
msgstr "" msgstr ""
#: source/ubl-strings.h:86 #: source/ubl-strings.h:87
msgid "Relaunch systemctl" msgid "Relaunch systemctl"
msgstr "" msgstr ""
#: source/ubl-strings.h:87 #: source/ubl-strings.h:88
msgid "Reexec systemctl" msgid "Reexec systemctl"
msgstr "" msgstr ""
#: source/ubl-strings.h:88 #: source/ubl-strings.h:89
msgid "Show service information" msgid "Show service information"
msgstr "" msgstr ""
#: source/ubl-strings.h:89 #: source/ubl-strings.h:90
msgid "Show service log" msgid "Show service log"
msgstr "" msgstr ""
#: source/ubl-strings.h:90 #: source/ubl-strings.h:91
msgid "Show service source file" msgid "Show service source file"
msgstr "" msgstr ""
#: source/ubl-strings.h:91 #: source/ubl-strings.h:92
msgid "Show service properties" msgid "Show service properties"
msgstr "" msgstr ""
#: source/ubl-strings.h:92 #: source/ubl-strings.h:93
msgid "Show..." msgid "Show..."
msgstr "" msgstr ""
#: source/ubl-strings.h:94 #: source/ubl-strings.h:95
msgid "Show inactive" msgid "Show inactive"
msgstr "" msgstr ""
#: source/ubl-strings.h:95 #: source/ubl-strings.h:96
msgid "Show unloaded" msgid "Show unloaded"
msgstr "" msgstr ""
#: source/ubl-strings.h:97 #: source/ubl-strings.h:98
msgid "File" msgid "File"
msgstr "" msgstr ""
#: source/ubl-strings.h:98 #: source/ubl-strings.h:99
msgid "Change date" msgid "Change date"
msgstr "" msgstr ""
#: source/ubl-strings.h:99 #: source/ubl-strings.h:100
msgid "Description" msgid "Description"
msgstr "" msgstr ""
#: source/ubl-strings.h:100 #: source/ubl-strings.h:101
msgid "Edit" msgid "Edit"
msgstr "" msgstr ""
#: source/ubl-strings.h:102 #: source/ubl-strings.h:103
msgid "Session ID" msgid "Session ID"
msgstr "" msgstr ""
#: source/ubl-strings.h:103 #: source/ubl-strings.h:104
msgid "User ID" msgid "User ID"
msgstr "" msgstr ""
#: source/ubl-strings.h:104 #: source/ubl-strings.h:105
msgid "User name" msgid "User name"
msgstr "" msgstr ""
#: source/ubl-strings.h:105 #: source/ubl-strings.h:106
msgid "Seat ID" msgid "Seat ID"
msgstr "" msgstr ""
#: source/ubl-strings.h:107 #: source/ubl-strings.h:108
msgid "Start session" msgid "Start session"
msgstr "" msgstr ""
#: source/ubl-strings.h:108 #: source/ubl-strings.h:109
msgid "Stop session" msgid "Stop session"
msgstr "" msgstr ""
#: source/ubl-strings.h:109 #: source/ubl-strings.h:110
msgid "Lock session" msgid "Lock session"
msgstr "" msgstr ""
#: source/ubl-strings.h:111 #: source/ubl-strings.h:112
msgid "Timer" msgid "Timer"
msgstr "" msgstr ""
#: source/ubl-strings.h:112 #: source/ubl-strings.h:113
msgid "Next" msgid "Next"
msgstr "" msgstr ""
#: source/ubl-strings.h:113 #: source/ubl-strings.h:114
msgid "Left" msgid "Left"
msgstr "" msgstr ""
#: source/ubl-strings.h:114 #: source/ubl-strings.h:115
msgid "Last" msgid "Last"
msgstr "" msgstr ""
#: source/ubl-strings.h:115 #: source/ubl-strings.h:116
msgid "Passed" msgid "Passed"
msgstr "" msgstr ""
#: source/ubl-strings.h:116 #: source/ubl-strings.h:117
msgid "Activates" msgid "Activates"
msgstr "" msgstr ""
#: source/ubl-strings.h:118 #: source/ubl-strings.h:119
msgid "active" msgid "active"
msgstr "" msgstr ""
#: source/ubl-strings.h:119 #: source/ubl-strings.h:120
msgid "dead" msgid "dead"
msgstr "" msgstr ""
#: source/ubl-strings.h:120 #: source/ubl-strings.h:121
msgid "waiting" msgid "waiting"
msgstr "" msgstr ""
#: source/ubl-strings.h:121 #: source/ubl-strings.h:122
msgid "running" msgid "running"
msgstr "" msgstr ""
#: source/ubl-strings.h:122 #: source/ubl-strings.h:123
msgid "listening" msgid "listening"
msgstr "" msgstr ""
#: source/ubl-strings.h:123 #: source/ubl-strings.h:124
msgid "exited" msgid "exited"
msgstr "" msgstr ""
#: source/ubl-strings.h:124 #: source/ubl-strings.h:125
msgid "mounted" msgid "mounted"
msgstr "" msgstr ""
#: source/ubl-strings.h:125 #: source/ubl-strings.h:126
msgid "plugged" msgid "plugged"
msgstr "" msgstr ""
#: source/ubl-strings.h:127 #: source/ubl-strings.h:128
msgid "Upgrade to root" msgid "Upgrade to root"
msgstr "" msgstr ""

@ -199,225 +199,226 @@ msgid "Service were not stopped"
msgstr "Сервис не был остановлен" msgstr "Сервис не был остановлен"
#: source/ubl-strings.h:62 #: source/ubl-strings.h:62
msgid "Are you sure want to stop " msgid "Are you sure want to restart "
msgstr "Вы уверены что хотите остановить " msgstr "Вы уверены что хотите перезапустить "
#: source/ubl-strings.h:62 #: source/ubl-strings.h:62 source/ubl-strings.h:63
msgid "" msgid "The system may become unstable."
"The stop will be forced.\n"
"The system may become unstable."
msgstr "" msgstr ""
"Остановка будет произведена принудительно.\n"
"Возможна нестабильная работа системы." "Возможна нестабильная работа системы."
#: source/ubl-strings.h:63 #: source/ubl-strings.h:63
msgid "Are you sure want to reload "
msgstr "Вы уверены что хотите пурузагрузить "
#: source/ubl-strings.h:64
msgid "Days" msgid "Days"
msgstr "Дней" msgstr "Дней"
#: source/ubl-strings.h:64 #: source/ubl-strings.h:65
msgid "Hours" msgid "Hours"
msgstr "Часов" msgstr "Часов"
#: source/ubl-strings.h:65 #: source/ubl-strings.h:66
msgid "Minutes" msgid "Minutes"
msgstr "Минут" msgstr "Минут"
#: source/ubl-strings.h:66 #: source/ubl-strings.h:67
msgid "Seconds" msgid "Seconds"
msgstr "Секунд" msgstr "Секунд"
#: source/ubl-strings.h:68 #: source/ubl-strings.h:69
msgid "Active" msgid "Active"
msgstr "Активна" msgstr "Активна"
#: source/ubl-strings.h:69 #: source/ubl-strings.h:70
msgid "Inactive" msgid "Inactive"
msgstr "Неактивна" msgstr "Неактивна"
#: source/ubl-strings.h:71 #: source/ubl-strings.h:72
msgid "System units" msgid "System units"
msgstr "Системные юниты" msgstr "Системные юниты"
#: source/ubl-strings.h:72 #: source/ubl-strings.h:73
msgid "User units" msgid "User units"
msgstr "Пользовательские юниты" msgstr "Пользовательские юниты"
#: source/ubl-strings.h:73 #: source/ubl-strings.h:74
msgid "Config files" msgid "Config files"
msgstr "Конфигурационные файлы" msgstr "Конфигурационные файлы"
#: source/ubl-strings.h:74 #: source/ubl-strings.h:75
msgid "Sessions" msgid "Sessions"
msgstr "Сессии" msgstr "Сессии"
#: source/ubl-strings.h:75 #: source/ubl-strings.h:76
msgid "Timers" msgid "Timers"
msgstr "Таймеры" msgstr "Таймеры"
#: source/ubl-strings.h:77 #: source/ubl-strings.h:78
msgid "System services status" msgid "System services status"
msgstr "Статус сервисов системы" msgstr "Статус сервисов системы"
#: source/ubl-strings.h:78 #: source/ubl-strings.h:79
msgid "User services status" msgid "User services status"
msgstr "Статус сервисов пользователя" msgstr "Статус сервисов пользователя"
#: source/ubl-strings.h:79 #: source/ubl-strings.h:80
msgid "Installed unit files" msgid "Installed unit files"
msgstr "Установленные юнит-файлы" msgstr "Установленные юнит-файлы"
#: source/ubl-strings.h:80 #: source/ubl-strings.h:81
msgid "Units and status list" msgid "Units and status list"
msgstr "Список юнитов и состояния" msgstr "Список юнитов и состояния"
#: source/ubl-strings.h:81 #: source/ubl-strings.h:82
msgid "Sockets and status list" msgid "Sockets and status list"
msgstr "Список сокетов и состояния" msgstr "Список сокетов и состояния"
#: source/ubl-strings.h:82 #: source/ubl-strings.h:83
msgid "Timers and status list" msgid "Timers and status list"
msgstr "Список таймеров и состояния" msgstr "Список таймеров и состояния"
#: source/ubl-strings.h:84 #: source/ubl-strings.h:85
msgid "Unit" msgid "Unit"
msgstr "Юнит" msgstr "Юнит"
#: source/ubl-strings.h:86 #: source/ubl-strings.h:87
msgid "Relaunch systemctl" msgid "Relaunch systemctl"
msgstr "Перезагрузить systemctl" msgstr "Перезагрузить systemctl"
#: source/ubl-strings.h:87 #: source/ubl-strings.h:88
msgid "Reexec systemctl" msgid "Reexec systemctl"
msgstr "Перезапустить systemctl" msgstr "Перезапустить systemctl"
#: source/ubl-strings.h:88 #: source/ubl-strings.h:89
msgid "Show service information" msgid "Show service information"
msgstr "Показать информацию о сервисе" msgstr "Показать информацию о сервисе"
#: source/ubl-strings.h:89 #: source/ubl-strings.h:90
msgid "Show service log" msgid "Show service log"
msgstr "Открыть лог сервиса" msgstr "Открыть лог сервиса"
#: source/ubl-strings.h:90 #: source/ubl-strings.h:91
msgid "Show service source file" msgid "Show service source file"
msgstr "Показать конфигурационный файл сервиса" msgstr "Показать конфигурационный файл сервиса"
#: source/ubl-strings.h:91 #: source/ubl-strings.h:92
msgid "Show service properties" msgid "Show service properties"
msgstr "Открыть свойства сервиса" msgstr "Открыть свойства сервиса"
#: source/ubl-strings.h:92 #: source/ubl-strings.h:93
msgid "Show..." msgid "Show..."
msgstr "Показать..." msgstr "Показать..."
#: source/ubl-strings.h:94 #: source/ubl-strings.h:95
msgid "Show inactive" msgid "Show inactive"
msgstr "Показать неактивные" msgstr "Показать неактивные"
#: source/ubl-strings.h:95 #: source/ubl-strings.h:96
msgid "Show unloaded" msgid "Show unloaded"
msgstr "Показать незагруженные" msgstr "Показать незагруженные"
#: source/ubl-strings.h:97 #: source/ubl-strings.h:98
msgid "File" msgid "File"
msgstr "Файл" msgstr "Файл"
#: source/ubl-strings.h:98 #: source/ubl-strings.h:99
msgid "Change date" msgid "Change date"
msgstr "Изменён" msgstr "Изменён"
#: source/ubl-strings.h:99 #: source/ubl-strings.h:100
msgid "Description" msgid "Description"
msgstr "Описание" msgstr "Описание"
#: source/ubl-strings.h:100 #: source/ubl-strings.h:101
msgid "Edit" msgid "Edit"
msgstr "Редактировать" msgstr "Редактировать"
#: source/ubl-strings.h:102 #: source/ubl-strings.h:103
msgid "Session ID" msgid "Session ID"
msgstr "ID сессии" msgstr "ID сессии"
#: source/ubl-strings.h:103 #: source/ubl-strings.h:104
msgid "User ID" msgid "User ID"
msgstr "ID пользователя" msgstr "ID пользователя"
#: source/ubl-strings.h:104 #: source/ubl-strings.h:105
msgid "User name" msgid "User name"
msgstr "Имя пользователя" msgstr "Имя пользователя"
#: source/ubl-strings.h:105 #: source/ubl-strings.h:106
msgid "Seat ID" msgid "Seat ID"
msgstr "Seat ID" msgstr "Seat ID"
#: source/ubl-strings.h:107 #: source/ubl-strings.h:108
msgid "Start session" msgid "Start session"
msgstr "Запустить сессию" msgstr "Запустить сессию"
#: source/ubl-strings.h:108 #: source/ubl-strings.h:109
msgid "Stop session" msgid "Stop session"
msgstr "Остановить сессию" msgstr "Остановить сессию"
#: source/ubl-strings.h:109 #: source/ubl-strings.h:110
msgid "Lock session" msgid "Lock session"
msgstr "Заблокировать сессию" msgstr "Заблокировать сессию"
#: source/ubl-strings.h:111 #: source/ubl-strings.h:112
msgid "Timer" msgid "Timer"
msgstr "Таймер" msgstr "Таймер"
#: source/ubl-strings.h:112 #: source/ubl-strings.h:113
msgid "Next" msgid "Next"
msgstr "Следующий" msgstr "Следующий"
#: source/ubl-strings.h:113 #: source/ubl-strings.h:114
msgid "Left" msgid "Left"
msgstr "Осталось времени" msgstr "Осталось времени"
#: source/ubl-strings.h:114 #: source/ubl-strings.h:115
msgid "Last" msgid "Last"
msgstr "Последний" msgstr "Последний"
#: source/ubl-strings.h:115 #: source/ubl-strings.h:116
msgid "Passed" msgid "Passed"
msgstr "Пройденный" msgstr "Пройденный"
#: source/ubl-strings.h:116 #: source/ubl-strings.h:117
msgid "Activates" msgid "Activates"
msgstr "Активируется" msgstr "Активируется"
#: source/ubl-strings.h:118 #: source/ubl-strings.h:119
msgid "active" msgid "active"
msgstr "актиен" msgstr "актиен"
#: source/ubl-strings.h:119 #: source/ubl-strings.h:120
msgid "dead" msgid "dead"
msgstr "" msgstr ""
#: source/ubl-strings.h:120 #: source/ubl-strings.h:121
msgid "waiting" msgid "waiting"
msgstr "ожидает" msgstr "ожидает"
#: source/ubl-strings.h:121 #: source/ubl-strings.h:122
msgid "running" msgid "running"
msgstr "работает" msgstr "работает"
#: source/ubl-strings.h:122 #: source/ubl-strings.h:123
msgid "listening" msgid "listening"
msgstr "слушает" msgstr "слушает"
#: source/ubl-strings.h:123 #: source/ubl-strings.h:124
msgid "exited" msgid "exited"
msgstr "" msgstr ""
#: source/ubl-strings.h:124 #: source/ubl-strings.h:125
msgid "mounted" msgid "mounted"
msgstr "примонтирован" msgstr "примонтирован"
#: source/ubl-strings.h:125 #: source/ubl-strings.h:126
msgid "plugged" msgid "plugged"
msgstr "подключен" msgstr "подключен"
#: source/ubl-strings.h:127 #: source/ubl-strings.h:128
msgid "Upgrade to root" msgid "Upgrade to root"
msgstr "Повысить права до root" msgstr "Повысить права до root"

Loading…
Cancel
Save