diff --git a/source/ubl-settings-logging.c b/source/ubl-settings-logging.c index 1329457..543f783 100644 --- a/source/ubl-settings-logging.c +++ b/source/ubl-settings-logging.c @@ -1208,6 +1208,12 @@ void on_logrotate_save(GtkWidget *, dictionary *dict){ switch(email_active){ case 1: char *adress = (char*)gtk_entry_get_text(GTK_ENTRY(window->EmailEntry)); + char *error = yon_gtk_entry_check_restricted(GTK_ENTRY(window->EmailEntry)); + if (!yon_char_is_empty(error)){ + yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),error,5,BACKGROUND_IMAGE_FAIL_TYPE); + yon_ubl_status_highlight_incorrect(window->EmailEntry); + return; + } if (!yon_char_is_empty(adress)){ mail=yon_char_append("mail ", adress); } @@ -2934,6 +2940,8 @@ void yon_main_window_complete(template_main_window **window){ g_signal_connect(G_OBJECT(widgets->ServicesStartStopButton),"clicked",G_CALLBACK(on_start_stop_clicked),widgets); g_signal_connect(G_OBJECT(widgets->ServicesEnableDisableButton),"clicked",G_CALLBACK(on_enable_disable_clicked),widgets); + yon_rmb_menu_setup(widgets->MainTree,(RmbCheck)gtk_widget_get_sensitive,widgets->MainTree,CONFIGURE_LOG_LABEL,edit_icon_name,G_CALLBACK(on_log_edit),widgets,ADD_LOG_LABEL,add_icon_name,G_CALLBACK(on_log_add),widgets,REMOVE_LOG_LABEL,remove_icon_name,G_CALLBACK(on_log_remove),widgets,NULL); + // yon_rmb_menu_setup(widgets->ServicesTree,(RmbCheck)gtk_widget_get_sensitive,widgets->MainTree,CONFIGURE_LOG_LABEL,edit_icon_name,G_CALLBACK(on_log_edit),widgets,ADD_LOG_LABEL,add_icon_name,G_CALLBACK(on_log_add),widgets,REMOVE_LOG_LABEL,remove_icon_name,G_CALLBACK(on_log_remove),widgets,NULL); gtk_widget_show(widgets->Window); yon_window_config_setup(GTK_WINDOW(widgets->Window)); diff --git a/source/ubl-settings-logging.h b/source/ubl-settings-logging.h index 4615b0d..32cb8e8 100644 --- a/source/ubl-settings-logging.h +++ b/source/ubl-settings-logging.h @@ -74,6 +74,10 @@ #define group_list_path "/etc/group" +#define edit_icon_name "document-edit-symbolic" +#define add_icon_name "com.ublinux.ubl-settings-logging.increase-symbolic" +#define remove_icon_name "com.ublinux.libublsettingsui-gtk3.trash-symbolic" + #define start_icon_name "com.ublinux.ubl-settings-logging.play-symbolic" #define stop_icon_name "com.ublinux.ubl-settings-logging.stop-symbolic" #define enable_icon_name "com.ublinux.ubl-settings-logging.check-symbolic" @@ -358,6 +362,8 @@ typedef struct { YON_CONFIG_TYPE type; } saving_window; +typedef int (*RmbCheck)(void*); + main_window *setup_window(); void on_save_window_parameter_switched(GtkCellRendererToggle *self, gchar *path, saving_window *window); char *yon_size_get_letter_from_int(int size); diff --git a/ubl-settings-logging-logrotate.glade b/ubl-settings-logging-logrotate.glade index 65bd703..5b88061 100644 --- a/ubl-settings-logging-logrotate.glade +++ b/ubl-settings-logging-logrotate.glade @@ -183,6 +183,7 @@ True False True + name True @@ -219,7 +220,7 @@ True True - terminal + name True @@ -1470,6 +1471,7 @@ True False True + name False @@ -1667,6 +1669,7 @@ True False True + url False