Merge pull request 'master' (#46) from YanTheKaller/ubl-settings-services:master into master

Reviewed-on: #46
pull/128/head^2 v2.4
Dmitry Razumov 2 years ago
commit 89da68623b

@ -10,6 +10,7 @@ void on_save_done(main_window *widgets, config_str output, int size){
printf("%s\n",final_output);
free(final_output);
yon_char_parsed_free(output,size);
textdomain(template_ui_LocaleName);
switch (main_config.save_config){
case 0:
yon_ubl_status_box_render(GLOBAL_SAVE_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
@ -21,6 +22,7 @@ void on_save_done(main_window *widgets, config_str output, int size){
yon_ubl_status_box_render(GLOBAL_LOCAL_SAVE_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
break;
}
textdomain(LocaleName);
}
void yon_load_proceed(YON_CONFIG_TYPE type){
@ -461,25 +463,33 @@ void on_system_launch_clicked(GtkWidget *self, char *path, main_window *widgets)
gboolean status = 0;
char *service_name;
gtk_tree_model_get(model,&iter,4,&status,5,&service_name,-1);
int size;
config_str result = yon_config_load(service_check_active_command(service_name),&size);
yon_char_remove_last_symbol(result[0],'\n');
if (size>0){
if (!strcmp(result[0],"active")){
if (status){
on_system_kill_confirmed(NULL,service_name);
if (status){
dialog_confirmation_data *data = malloc(sizeof(dialog_confirmation_data));
data->action_text=SERVICE_STOP_WARNING_LABEL(service_name);
data->data=service_name;
data->function=(void*)(void*)on_system_kill_confirmed;
int size;
config_str result = yon_config_load(service_check_active_command(service_name),&size);
yon_char_remove_last_symbol(result[0],'\n');
if (size>0&&!strcmp(result[0],"active")){
int responce = yon_confirmation_dialog_call(widgets->Window,data);
if (responce == GTK_RESPONSE_ACCEPT){
gtk_list_store_set(GTK_LIST_STORE(model),&iter,4,0,-1);
}
} else {
gtk_list_store_set(GTK_LIST_STORE(model),&iter,4,0,-1);
}
yon_launch((!status)==1 ? service_start_command(service_name) : \
service_stop_command(service_name));
if (!status) {
yon_char_parsed_free(result,size);
} else {
yon_launch(service_start_command(service_name));
int size;
config_str result = yon_config_load(service_check_active_command(service_name),&size);
yon_char_remove_last_symbol(result[0],'\n');
if (size>0&&!strcmp(result[0],"active")){
gtk_list_store_set(GTK_LIST_STORE(model),&iter,4,1,-1);
} else {
yon_ubl_status_box_render(SERVICE_START_FAILED_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
}
}
yon_char_parsed_free(result,size);
}
}
@ -1010,6 +1020,10 @@ gboolean yon_interface_update(main_window *widgets){
if (system_services[i][strlen(system_services[i])-1]=='\n') system_services[i][strlen(system_services[i])-1] = '\0';
int size;
config_str parsed = yon_char_parse(system_services[i],&size,";");
char *name_temp = yon_char_replace(parsed[0],"\\","\18");
if (name_temp!=parsed[0]) free(parsed[0]);
parsed[0]=yon_char_replace(name_temp,"\18","\\\\");
if (name_temp!=parsed[0]) free(name_temp);
if (parsed){
int loaded = !strcmp(parsed[1],"loaded");
int active = !strcmp(parsed[2],"active");

@ -49,16 +49,18 @@
#define SHOW_SOURCE_LABEL _("Show source")
#define PROPERTIES_LABEL _("Properties")
#define ACTIVATE_SESSION_LABEL _("Activate session")
#define END_SESSION_LABEL _("End session")
#define END_SESSION_LABEL _("Terminate session")
#define BLOCK_SESSION_LABEL _("Block session")
#define SOURCE_UNFOUND_LABEL _("Service source were not loaded")
#define SERVICE_START_FAILED_LABEL _("Failed to launch service")
#define SAVING_LABEL _("Saving...")
#define SAVED_LABEL _("Saved")
#define ERROR_LABEL _("Error has occured")
#define SWITCH_OFF_ERROR_LABEL _("Service were not stopped")
#define SERVICE_STOP_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to stop "),target,"?\n",_("The 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")

@ -1543,6 +1543,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Activate session</property>
<property name="image">image11</property>
<style>
<class name="thin"/>
@ -1559,6 +1560,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Terminate session</property>
<property name="image">image10</property>
<style>
<class name="thin"/>
@ -1575,6 +1577,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Lock session</property>
<property name="image">image9</property>
<style>
<class name="thin"/>
@ -1740,7 +1743,9 @@
<property name="can-focus">True</property>
<property name="model">TimersList</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
<object class="GtkTreeSelection">
<property name="mode">none</property>
</object>
</child>
<child>
<object class="GtkTreeViewColumn">

@ -170,7 +170,7 @@ msgid "Activate session"
msgstr ""
#: source/ubl-strings.h:52
msgid "End session"
msgid "Terminate session"
msgstr ""
#: source/ubl-strings.h:53
@ -181,252 +181,256 @@ msgstr ""
msgid "Service source were not loaded"
msgstr ""
#: source/ubl-strings.h:57
msgid "Saving..."
#: source/ubl-strings.h:56
msgid "Failed to launch service"
msgstr ""
#: source/ubl-strings.h:58
msgid "Saved"
msgid "Saving..."
msgstr ""
#: source/ubl-strings.h:59
msgid "Saved"
msgstr ""
#: source/ubl-strings.h:60
msgid "Error has occured"
msgstr ""
#: source/ubl-strings.h:61
#: source/ubl-strings.h:62
msgid "Service were not stopped"
msgstr ""
#: source/ubl-strings.h:62
msgid "Are you sure want to restart "
#: source/ubl-strings.h:63
msgid "Are you sure want to stop "
msgstr ""
#: source/ubl-strings.h:62 source/ubl-strings.h:63
#: source/ubl-strings.h:63 source/ubl-strings.h:64 source/ubl-strings.h:65
msgid "The system may become unstable."
msgstr ""
#: source/ubl-strings.h:63
#: source/ubl-strings.h:64
msgid "Are you sure want to restart "
msgstr ""
#: source/ubl-strings.h:65
msgid "Are you sure want to reload "
msgstr ""
#: source/ubl-strings.h:64
#: source/ubl-strings.h:66
msgid "Days"
msgstr ""
#: source/ubl-strings.h:65
#: source/ubl-strings.h:67
msgid "Hours"
msgstr ""
#: source/ubl-strings.h:66
#: source/ubl-strings.h:68
msgid "Minutes"
msgstr ""
#: source/ubl-strings.h:67
#: source/ubl-strings.h:69
msgid "Seconds"
msgstr ""
#: source/ubl-strings.h:69
#: source/ubl-strings.h:71
msgid "Active"
msgstr ""
#: source/ubl-strings.h:70
#: source/ubl-strings.h:72
msgid "Inactive"
msgstr ""
#: source/ubl-strings.h:72
#: source/ubl-strings.h:74
msgid "System units"
msgstr ""
#: source/ubl-strings.h:73
#: source/ubl-strings.h:75
msgid "User units"
msgstr ""
#: source/ubl-strings.h:74
#: source/ubl-strings.h:76
msgid "Config files"
msgstr ""
#: source/ubl-strings.h:75
#: source/ubl-strings.h:77
msgid "Sessions"
msgstr ""
#: source/ubl-strings.h:76
#: source/ubl-strings.h:78
msgid "Timers"
msgstr ""
#: source/ubl-strings.h:78
#: source/ubl-strings.h:80
msgid "System services status"
msgstr ""
#: source/ubl-strings.h:79
#: source/ubl-strings.h:81
msgid "User services status"
msgstr ""
#: source/ubl-strings.h:80
#: source/ubl-strings.h:82
msgid "Installed unit files"
msgstr ""
#: source/ubl-strings.h:81
#: source/ubl-strings.h:83
msgid "Units and status list"
msgstr ""
#: source/ubl-strings.h:82
#: source/ubl-strings.h:84
msgid "Sockets and status list"
msgstr ""
#: source/ubl-strings.h:83
#: source/ubl-strings.h:85
msgid "Timers and status list"
msgstr ""
#: source/ubl-strings.h:85
#: source/ubl-strings.h:87
msgid "Unit"
msgstr ""
#: source/ubl-strings.h:87
#: source/ubl-strings.h:89
msgid "Relaunch systemctl"
msgstr ""
#: source/ubl-strings.h:88
#: source/ubl-strings.h:90
msgid "Reexec systemctl"
msgstr ""
#: source/ubl-strings.h:89
#: source/ubl-strings.h:91
msgid "Show service information"
msgstr ""
#: source/ubl-strings.h:90
#: source/ubl-strings.h:92
msgid "Show service log"
msgstr ""
#: source/ubl-strings.h:91
#: source/ubl-strings.h:93
msgid "Show service source file"
msgstr ""
#: source/ubl-strings.h:92
#: source/ubl-strings.h:94
msgid "Show service properties"
msgstr ""
#: source/ubl-strings.h:93
#: source/ubl-strings.h:95
msgid "Show..."
msgstr ""
#: source/ubl-strings.h:95
#: source/ubl-strings.h:97
msgid "Edit configuration file"
msgstr ""
#: source/ubl-strings.h:97
#: source/ubl-strings.h:99
msgid "Show inactive"
msgstr ""
#: source/ubl-strings.h:98
#: source/ubl-strings.h:100
msgid "Show unloaded"
msgstr ""
#: source/ubl-strings.h:100
#: source/ubl-strings.h:102
msgid "File"
msgstr ""
#: source/ubl-strings.h:101
#: source/ubl-strings.h:103
msgid "Change date"
msgstr ""
#: source/ubl-strings.h:102
#: source/ubl-strings.h:104
msgid "Description"
msgstr ""
#: source/ubl-strings.h:103
#: source/ubl-strings.h:105
msgid "Edit"
msgstr ""
#: source/ubl-strings.h:105
#: source/ubl-strings.h:107
msgid "Session ID"
msgstr ""
#: source/ubl-strings.h:106
#: source/ubl-strings.h:108
msgid "User ID"
msgstr ""
#: source/ubl-strings.h:107
#: source/ubl-strings.h:109
msgid "User name"
msgstr ""
#: source/ubl-strings.h:108
#: source/ubl-strings.h:110
msgid "Seat ID"
msgstr ""
#: source/ubl-strings.h:110
#: source/ubl-strings.h:112
msgid "Start session"
msgstr ""
#: source/ubl-strings.h:111
#: source/ubl-strings.h:113
msgid "Stop session"
msgstr ""
#: source/ubl-strings.h:112
#: source/ubl-strings.h:114
msgid "Lock session"
msgstr ""
#: source/ubl-strings.h:114
#: source/ubl-strings.h:116
msgid "Timer"
msgstr ""
#: source/ubl-strings.h:115
#: source/ubl-strings.h:117
msgid "Next"
msgstr ""
#: source/ubl-strings.h:116
#: source/ubl-strings.h:118
msgid "Left"
msgstr ""
#: source/ubl-strings.h:117
#: source/ubl-strings.h:119
msgid "Last"
msgstr ""
#: source/ubl-strings.h:118
#: source/ubl-strings.h:120
msgid "Passed"
msgstr ""
#: source/ubl-strings.h:119
#: source/ubl-strings.h:121
msgid "Activates"
msgstr ""
#: source/ubl-strings.h:121
#: source/ubl-strings.h:123
msgid "active"
msgstr ""
#: source/ubl-strings.h:122
#: source/ubl-strings.h:124
msgid "dead"
msgstr ""
#: source/ubl-strings.h:123
#: source/ubl-strings.h:125
msgid "waiting"
msgstr ""
#: source/ubl-strings.h:124
#: source/ubl-strings.h:126
msgid "running"
msgstr ""
#: source/ubl-strings.h:125
#: source/ubl-strings.h:127
msgid "listening"
msgstr ""
#: source/ubl-strings.h:126
#: source/ubl-strings.h:128
msgid "exited"
msgstr ""
#: source/ubl-strings.h:127
#: source/ubl-strings.h:129
msgid "mounted"
msgstr ""
#: source/ubl-strings.h:128
#: source/ubl-strings.h:130
msgid "plugged"
msgstr ""
#: source/ubl-strings.h:129
msgid "abandoned"
msgstr ""
#: source/ubl-strings.h:131
msgid "Upgrade to root"
msgid "abandoned"
msgstr ""
#: source/ubl-strings.h:133

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

Loading…
Cancel
Save