From 1ebe5b9e7c490921a287732364380a8b32fe3e90 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 24 Apr 2024 16:56:11 +0600 Subject: [PATCH 1/6] Added table borders --- ubl-settings-services.glade | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ubl-settings-services.glade b/ubl-settings-services.glade index 3fc82d3..e8022ad 100644 --- a/ubl-settings-services.glade +++ b/ubl-settings-services.glade @@ -646,7 +646,7 @@ True SystemList 5 - horizontal + both @@ -1228,7 +1228,7 @@ True UserList 5 - horizontal + both @@ -1517,6 +1517,7 @@ True True ConfigList + both @@ -1710,6 +1711,7 @@ True True SessionsList + both @@ -1841,6 +1843,7 @@ True True TimersList + both From cc8f638412e5c791868e973e49674f247df72366 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 25 Apr 2024 09:52:01 +0600 Subject: [PATCH 2/6] Updated terminal calls for new library version --- source/ubl-settings-services.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/source/ubl-settings-services.c b/source/ubl-settings-services.c index b08a248..ce2fed8 100644 --- a/source/ubl-settings-services.c +++ b/source/ubl-settings-services.c @@ -722,7 +722,7 @@ void on_system_info_clicked(GtkWidget *self, main_window *widgets){ gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SERVICE_STATE_TITLE_LABEL(name)); gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_STATE_TITLE_LABEL(name)); window->target = service_info_command(name); - yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); + yon_terminal_integrated_start(window->SystemTerminal,window->target); gtk_widget_show(window->Window); } } @@ -741,7 +741,7 @@ void on_system_log_clicked(GtkWidget *self, main_window *widgets){ gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SERVICE_LOG_TITLE_LABEL(name)); gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_LOG_TITLE_LABEL(name)); window->target = get_log_command(name); - yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); + yon_terminal_integrated_start(window->SystemTerminal,window->target); gtk_widget_show(window->Window); } } @@ -752,7 +752,7 @@ void *on_terminal_relaunch(log_window *window){ gtk_widget_set_sensitive(window->SystemTerminal,0); sleep(1); gtk_widget_set_sensitive(window->SystemTerminal,1); - yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); + yon_terminal_integrated_start(window->SystemTerminal,window->target); return NULL; } @@ -766,7 +766,7 @@ void on_save_clicked(GtkWidget *self, log_window *window){ void on_update_clicked(GtkWidget *self, log_window *window){ if (self){}; - yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); + yon_terminal_integrated_start(window->SystemTerminal,window->target); } void on_system_edit_clicked(GtkWidget *self, main_window *widgets){ @@ -782,7 +782,7 @@ void on_system_edit_clicked(GtkWidget *self, main_window *widgets){ gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_UNIT_EDIT_TITLE_LABEL); gtk_widget_show(window->SaveButton); window->target=show_source_command(name); - yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); + yon_terminal_integrated_start(window->SystemTerminal,window->target); GdkRGBA rgba; rgba.blue=1; rgba.green=1; @@ -808,7 +808,7 @@ void on_system_status_clicked(GtkWidget *self, main_window *widgets){ gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),PROPERTIES_LABEL); gtk_window_set_title(GTK_WINDOW(window->Window),PROPERTIES_LABEL); window->target = properties_command(name); - yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); + yon_terminal_integrated_start(window->SystemTerminal,window->target); gtk_widget_show(window->Window); } @@ -853,7 +853,7 @@ void on_user_info_clicked(GtkWidget *self, main_window *widgets){ gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SERVICE_STATE_TITLE_LABEL(name)); gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_STATE_TITLE_LABEL(name)); window->target = user_service_info_command(name); - yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); + yon_terminal_integrated_start(window->SystemTerminal,window->target); gtk_widget_show(window->Window); } } @@ -872,7 +872,7 @@ void on_user_log_clicked(GtkWidget *self, main_window *widgets){ gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SERVICE_LOG_TITLE_LABEL(name)); gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_LOG_TITLE_LABEL(name)); window->target = user_get_log_command(name); - yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); + yon_terminal_integrated_start(window->SystemTerminal,window->target); gtk_widget_show(window->Window); } } @@ -892,7 +892,7 @@ void on_user_edit_clicked(GtkWidget *self, main_window *widgets){ gtk_window_set_title(GTK_WINDOW(window->Window),SERVICE_UNIT_EDIT_TITLE_LABEL); gtk_widget_show(window->SaveButton); window->target=user_show_source_command(name); - yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); + yon_terminal_integrated_start(window->SystemTerminal,window->target); GdkRGBA rgba; rgba.blue=1; rgba.green=1; @@ -918,7 +918,7 @@ void on_user_status_clicked(GtkWidget *self, main_window *widgets){ gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),PROPERTIES_LABEL); gtk_window_set_title(GTK_WINDOW(window->Window),PROPERTIES_LABEL); window->target = user_properties_command(name); - yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); + yon_terminal_integrated_start(window->SystemTerminal,window->target); gtk_widget_show(window->Window); } @@ -978,7 +978,7 @@ void on_system_services_status(GtkWidget *self, main_window *widgets){ gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SYSTEM_STATUS_LABEL); gtk_window_set_title(GTK_WINDOW(window->Window),SYSTEM_STATUS_LABEL); window->target = system_services_status_command; - yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); + yon_terminal_integrated_start(window->SystemTerminal,window->target); gtk_widget_show(window->Window); } @@ -992,7 +992,7 @@ void on_user_services_status(GtkWidget *self, main_window *widgets){ gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),USER_STATUS_LABEL); gtk_window_set_title(GTK_WINDOW(window->Window),USER_STATUS_LABEL); window->target = user_services_status_command; - yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); + yon_terminal_integrated_start(window->SystemTerminal,window->target); gtk_widget_show(window->Window); } @@ -1006,7 +1006,7 @@ void on_units_status(GtkWidget *self, main_window *widgets){ gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),INSTALLED_UNIT_LABEL); gtk_window_set_title(GTK_WINDOW(window->Window),INSTALLED_UNIT_LABEL); window->target = !gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))?installed_units_states_command:user_installed_units_states_command; - yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); + yon_terminal_integrated_start(window->SystemTerminal,window->target); gtk_widget_show(window->Window); } @@ -1020,7 +1020,7 @@ void on_units_list_status(GtkWidget *self, main_window *widgets){ gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),UNITS_LIST_LABEL); gtk_window_set_title(GTK_WINDOW(window->Window),UNITS_LIST_LABEL); window->target = !gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))?list_of_units_states_command:user_list_of_units_states_command; - yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); + yon_terminal_integrated_start(window->SystemTerminal,window->target); gtk_widget_show(window->Window); } @@ -1034,7 +1034,7 @@ void on_sockets_list_status(GtkWidget *self, main_window *widgets){ gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),SOCKETS_LIST_LABEL); gtk_window_set_title(GTK_WINDOW(window->Window),SOCKETS_LIST_LABEL); window->target = !gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))?list_of_sockets_states_command:user_list_of_sockets_states_command; - yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); + yon_terminal_integrated_start(window->SystemTerminal,window->target); gtk_widget_show(window->Window); } @@ -1048,7 +1048,7 @@ void on_timers_list_status(GtkWidget *self, main_window *widgets){ gtk_label_set_text(GTK_LABEL(window->webHeaderNameLabel),TIMERS_LIST_LABEL); gtk_window_set_title(GTK_WINDOW(window->Window),TIMERS_LIST_LABEL); window->target = !gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))?list_of_timers_states_command:user_list_of_timers_states_command; - yon_terminal_integrated_start(window->SystemTerminal,window->target,NULL,NULL); + yon_terminal_integrated_start(window->SystemTerminal,window->target); gtk_widget_show(window->Window); } From 8697f2819886f8807eaff2fa214659b2f20cc192 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 25 Apr 2024 11:54:34 +0600 Subject: [PATCH 3/6] Fixed status check for saving status message --- source/ubl-settings-services.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ubl-settings-services.c b/source/ubl-settings-services.c index ce2fed8..3cbe626 100644 --- a/source/ubl-settings-services.c +++ b/source/ubl-settings-services.c @@ -18,7 +18,7 @@ void on_save_done(main_window *widgets, config_str output, int size){ case 1: yon_ubl_status_box_render(LOCAL_SAVE_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); break; - case 2: + case 3: yon_ubl_status_box_render(GLOBAL_LOCAL_SAVE_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); break; } From 64ffb297dcb7002f9b3bf6010e719db8f319a68c Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 25 Apr 2024 12:27:15 +0600 Subject: [PATCH 4/6] Fixed crash at saving if command gives no output --- source/ubl-settings-services.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/source/ubl-settings-services.c b/source/ubl-settings-services.c index 3cbe626..d07a229 100644 --- a/source/ubl-settings-services.c +++ b/source/ubl-settings-services.c @@ -7,9 +7,13 @@ config main_config; void on_save_done(main_window *widgets, config_str output, int size){ if (widgets) {}; char *final_output = yon_char_parsed_to_string(output,size,""); - printf("%s\n",final_output); - free(final_output); - yon_char_parsed_free(output,size); + if (!yon_char_is_empty(final_output)){ + printf("%s\n",final_output); + free(final_output); + } + if (output&&size>0){ + yon_char_parsed_free(output,size); + } textdomain(template_ui_LocaleName); switch (main_config.save_config){ case 0: From aee622cfab8f044066c3e69ae365a35755045580 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 25 Apr 2024 15:53:56 +0600 Subject: [PATCH 5/6] Fixed saving of removed services --- source/ubl-settings-services.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/source/ubl-settings-services.c b/source/ubl-settings-services.c index d07a229..6062f47 100644 --- a/source/ubl-settings-services.c +++ b/source/ubl-settings-services.c @@ -179,6 +179,7 @@ enum YON_UNIT_TYPE yon_get_unit_type(char *unit_name){ void on_activate(GtkTreeView *self, main_window *widgets){ if (self&&widgets){}; } + void on_config_autostart_clicked(GtkCellRenderer *self, char *path, main_window *widgets){ if (self){}; GtkTreeIter filter_iter; @@ -207,6 +208,11 @@ void on_config_autostart_clicked(GtkCellRenderer *self, char *path, main_window char *config_sting = yon_config_get_by_key("SERVICES_ENABLE"); int size; config_str parsed = yon_char_parse(config_sting,&size,","); + if (strstr(name,".service")){ + char *temp = yon_char_divide_search(name,".",-1); + free(name); + name = temp; + } int place = yon_char_parsed_check_exist(parsed,size,name); if (status==0){ if (place ==-1){ @@ -261,6 +267,11 @@ void on_config_autostop_clicked(GtkCellRenderer *self, char *path, main_window * char *config_sting = yon_config_get_by_key("SERVICES_DISABLE"); int size; config_str parsed = yon_char_parse(config_sting,&size,","); + if (strstr(name,".service")){ + char *temp = yon_char_divide_search(name,".",-1); + free(name); + name = temp; + } int place = yon_char_parsed_check_exist(parsed,size,name); if (status==0){ if (place ==-1){ @@ -316,6 +327,11 @@ void on_config_block_clicked(GtkCellRenderer *self, char *path, main_window *wid char *config_sting = yon_config_get_by_key("SERVICES_MASK"); int size; config_str parsed = yon_char_parse(config_sting,&size,","); + if (strstr(name,".service")){ + char *temp = yon_char_divide_search(name,".",-1); + free(name); + name = temp; + } int place = yon_char_parsed_check_exist(parsed,size,name); if (status==0){ if (place ==-1){ From 6ff395095f5013cb5501d8dd526c5fed87609dfb Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 26 Apr 2024 11:05:34 +0600 Subject: [PATCH 6/6] Added restart service button --- source/ubl-settings-services.c | 29 +++++----- source/ubl-settings-services.h | 2 + source/ubl-strings.h | 4 +- ubl-settings-services.glade | 98 +++++++++++++++++++++++++--------- 4 files changed, 90 insertions(+), 43 deletions(-) diff --git a/source/ubl-settings-services.c b/source/ubl-settings-services.c index 6062f47..336900b 100644 --- a/source/ubl-settings-services.c +++ b/source/ubl-settings-services.c @@ -529,17 +529,6 @@ void on_system_launch_clicked(GtkWidget *self, char *path, main_window *widgets) gtk_list_store_set(GTK_LIST_STORE(model),&iter,4,1,-1); } } - - // yon_char_parsed_free(result,size); - // 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); - // } } } @@ -1353,6 +1342,8 @@ gboolean yon_interface_update(main_window *widgets){ void on_interface_update(GtkWidget *self, main_window *widgets){ if (self){}; if (!main_config.update_thread_active){ + gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->SystemUnitsTree))); + gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->UserUnitsTree))); main_config.update_thread_active=1; pthread_t tid; pthread_create(&tid,NULL,(void*)(void*)((yon_interface_update)),widgets); @@ -1417,6 +1408,7 @@ void on_tree_selection_changed(GtkWidget *self, main_window *widgets){ if (getuid()==0){ gtk_widget_set_sensitive(widgets->SystemEditButton,1); gtk_widget_set_sensitive(widgets->SystemLogButton,1); + gtk_widget_set_sensitive(widgets->SystemUpdateServiceButton,1); } } else { @@ -1427,6 +1419,7 @@ void on_tree_selection_changed(GtkWidget *self, main_window *widgets){ if (getuid()==0){ gtk_widget_set_sensitive(widgets->SystemEditButton,0); gtk_widget_set_sensitive(widgets->SystemLogButton,0); + gtk_widget_set_sensitive(widgets->SystemUpdateServiceButton,0); } } } else if (page==1){ @@ -1442,7 +1435,7 @@ void on_tree_selection_changed(GtkWidget *self, main_window *widgets){ if (getuid()==0){ gtk_widget_set_sensitive(widgets->UserEditButton,1); gtk_widget_set_sensitive(widgets->UserLogButton,1); - gtk_widget_set_sensitive(widgets->UserServiceUpdateButton,1); + gtk_widget_set_sensitive(widgets->UserUpdateServiceButton,1); } } else { gtk_label_set_text(GTK_LABEL(widgets->UserServiceLabel),""); @@ -1452,7 +1445,7 @@ void on_tree_selection_changed(GtkWidget *self, main_window *widgets){ if (getuid()==0){ gtk_widget_set_sensitive(widgets->UserEditButton,0); gtk_widget_set_sensitive(widgets->UserLogButton,0); - gtk_widget_set_sensitive(widgets->UserServiceUpdateButton,0); + gtk_widget_set_sensitive(widgets->UserUpdateServiceButton,0); } } @@ -1506,6 +1499,7 @@ void yon_main_window_complete(main_window *widgets){ widgets->SystemPrevButton=yon_gtk_builder_get_widget(builder,"SystemPrevButton"); widgets->SystemUpdateButton=yon_gtk_builder_get_widget(builder,"SystemUpdateButton"); widgets->SystemServiceUpdateButton=yon_gtk_builder_get_widget(builder,"SystemServiceUpdateButton"); + widgets->SystemUpdateServiceButton=yon_gtk_builder_get_widget(builder,"SystemUpdateServiceButton"); widgets->SystemInfoButton=yon_gtk_builder_get_widget(builder,"SystemInfoButton"); widgets->SystemLogButton=yon_gtk_builder_get_widget(builder,"SystemLogButton"); widgets->SystemEditButton=yon_gtk_builder_get_widget(builder,"SystemEditButton"); @@ -1542,6 +1536,7 @@ void yon_main_window_complete(main_window *widgets){ widgets->UserPrevButton=yon_gtk_builder_get_widget(builder,"UserPrevButton"); widgets->UserUpdateButton=yon_gtk_builder_get_widget(builder,"UserUpdateButton"); widgets->UserServiceUpdateButton=yon_gtk_builder_get_widget(builder,"UserServiceUpdateButton"); + widgets->UserUpdateServiceButton=yon_gtk_builder_get_widget(builder,"UserUpdateServiceButton"); widgets->UserInfoButton=yon_gtk_builder_get_widget(builder,"UserInfoButton"); widgets->UserLogButton=yon_gtk_builder_get_widget(builder,"UserLogButton"); widgets->UserEditButton=yon_gtk_builder_get_widget(builder,"UserEditButton"); @@ -1590,7 +1585,8 @@ void yon_main_window_complete(main_window *widgets){ g_signal_connect(G_OBJECT(widgets->SystemPrevButton),"clicked",G_CALLBACK(on_system_update_hz_clicked),widgets); g_signal_connect(G_OBJECT(widgets->SystemUpdateButton),"clicked",G_CALLBACK(on_interface_update),widgets); - g_signal_connect(G_OBJECT(widgets->SystemServiceUpdateButton),"clicked",G_CALLBACK(on_system_restart_clicked),widgets); + g_signal_connect(G_OBJECT(widgets->SystemServiceUpdateButton),"clicked",G_CALLBACK(on_system_update_clicked),widgets); + g_signal_connect(G_OBJECT(widgets->SystemUpdateServiceButton),"clicked",G_CALLBACK(on_system_restart_clicked),widgets); g_signal_connect(G_OBJECT(widgets->SystemInfoButton),"clicked",G_CALLBACK(on_system_info_clicked),widgets); g_signal_connect(G_OBJECT(widgets->SystemLogButton),"clicked",G_CALLBACK(on_system_log_clicked),widgets); g_signal_connect(G_OBJECT(widgets->SystemEditButton),"clicked",G_CALLBACK(on_system_edit_clicked),widgets); @@ -1602,7 +1598,8 @@ void yon_main_window_complete(main_window *widgets){ g_signal_connect(G_OBJECT(widgets->UserPrevButton),"clicked",G_CALLBACK(on_user_update_hz_clicked),widgets); g_signal_connect(G_OBJECT(widgets->UserUpdateButton),"clicked",G_CALLBACK(on_interface_update),widgets); - g_signal_connect(G_OBJECT(widgets->UserServiceUpdateButton),"clicked",G_CALLBACK(on_system_restart_clicked),widgets); + g_signal_connect(G_OBJECT(widgets->UserServiceUpdateButton),"clicked",G_CALLBACK(on_user_update_clicked),widgets); + g_signal_connect(G_OBJECT(widgets->UserUpdateServiceButton),"clicked",G_CALLBACK(on_system_restart_clicked),widgets); g_signal_connect(G_OBJECT(widgets->UserInfoButton),"clicked",G_CALLBACK(on_user_info_clicked),widgets); g_signal_connect(G_OBJECT(widgets->UserLogButton),"clicked",G_CALLBACK(on_user_log_clicked),widgets); g_signal_connect(G_OBJECT(widgets->UserEditButton),"clicked",G_CALLBACK(on_user_edit_clicked),widgets); @@ -1639,7 +1636,7 @@ void yon_main_window_complete(main_window *widgets){ g_signal_connect(G_OBJECT(widgets->UserConfigBlockCell),"toggled",G_CALLBACK(on_config_block_clicked),widgets); if (getuid()==0){ - gtk_widget_set_sensitive(widgets->UserUpdateButton,0); + gtk_widget_set_sensitive(widgets->UserServiceUpdateButton,0); gtk_widget_set_sensitive(widgets->UserPrevButton,0); g_signal_connect(G_OBJECT(widgets->SystemAutostartCell),"toggled",G_CALLBACK(on_system_autostart_clicked),widgets); g_signal_connect(G_OBJECT(widgets->SystemLaunchedCell),"toggled",G_CALLBACK(on_system_launch_clicked),widgets); diff --git a/source/ubl-settings-services.h b/source/ubl-settings-services.h index 86ea10b..45e190d 100644 --- a/source/ubl-settings-services.h +++ b/source/ubl-settings-services.h @@ -160,6 +160,7 @@ typedef struct { GtkWidget *SystemPrevButton; GtkWidget *SystemUpdateButton; GtkWidget *SystemServiceUpdateButton; + GtkWidget *SystemUpdateServiceButton; GtkWidget *SystemInfoButton; GtkWidget *SystemLogButton; GtkWidget *SystemEditButton; @@ -178,6 +179,7 @@ typedef struct { GtkWidget *UserPrevButton; GtkWidget *UserUpdateButton; GtkWidget *UserServiceUpdateButton; + GtkWidget *UserUpdateServiceButton; GtkWidget *UserInfoButton; GtkWidget *UserLogButton; GtkWidget *UserEditButton; diff --git a/source/ubl-strings.h b/source/ubl-strings.h index cfb97a9..974fddd 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -148,4 +148,6 @@ #define SERVICE_RELOAD_SUCCESS_LABEL _("Service has been successfully restarted") -#define SAVE_LABEL _("Save") \ No newline at end of file +#define SAVE_LABEL _("Save") + +#define service_tooltip_template() yon_char_unite("",target,"\n",_("Description:"),description,"\n",_("Unit file:"),unit,"\n",_("Status:"),status,"\n",) \ No newline at end of file diff --git a/ubl-settings-services.glade b/ubl-settings-services.glade index e8022ad..40e4cca 100644 --- a/ubl-settings-services.glade +++ b/ubl-settings-services.glade @@ -165,6 +165,16 @@ False com.ublinux.ubl-settings-services.update-symbolic + + True + False + com.ublinux.ubl-settings-services.update-symbolic + + + True + False + com.ublinux.ubl-settings-services.update-symbolic + True False @@ -183,7 +193,7 @@ True False - com.ublinux.ubl-settings-services.sync-symbolic + com.ublinux.ubl-settings-services.update-symbolic True @@ -193,7 +203,7 @@ True False - com.ublinux.ubl-settings-services.update-symbolic + com.ublinux.ubl-settings-services.sync-symbolic True @@ -398,12 +408,12 @@ vertical 5 - + True True True - Update - image6 + Reexec systemd + image8 @@ -443,12 +453,12 @@ - + True True True - Reexec systemd - image8 + Update + image6 @@ -470,6 +480,24 @@ 4 + + + True + False + True + True + Reexec systemd + image20 + + + + False + True + 5 + + True @@ -485,7 +513,7 @@ False True - 5 + 6 @@ -503,7 +531,7 @@ False True - 6 + 7 @@ -521,7 +549,7 @@ False True - 7 + 8 @@ -539,7 +567,7 @@ False True - 8 + 9 @@ -550,7 +578,7 @@ False True - 9 + 10 @@ -575,7 +603,7 @@ False True - 10 + 11 @@ -984,12 +1012,12 @@ vertical 5 - + True True True - Update - image2 + Reexec systemd + image14 @@ -1029,12 +1057,12 @@ - + True True True - Reexec systemd - image14 + Update + image2 @@ -1056,6 +1084,24 @@ 4 + + + True + False + True + True + Reexec systemd + image21 + + + + False + True + 5 + + True @@ -1071,7 +1117,7 @@ False True - 5 + 6 @@ -1089,7 +1135,7 @@ False True - 6 + 7 @@ -1107,7 +1153,7 @@ False True - 7 + 8 @@ -1125,7 +1171,7 @@ False True - 8 + 9 @@ -1136,7 +1182,7 @@ False True - 9 + 10 @@ -1161,7 +1207,7 @@ False True - 10 + 11