diff --git a/gresource.xml b/gresource.xml index 4c3f1da..0fcb609 100644 --- a/gresource.xml +++ b/gresource.xml @@ -4,7 +4,7 @@ ublsettingsui-gtk3.glade ublsettingsui-gtk3-about.glade ublsettingsui-gtk3-documentation.glade - ublsettingsui-gtk3-save-confirmation.glade + ublsettingsui-gtk3-saving.glade ublsettingsui-gtk3.css diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 580e8b1..758b994 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -35,7 +35,7 @@ set(DEPENDFILES ../ublsettingsui-gtk3.glade ../ublsettingsui-gtk3-about.glade ../ublsettingsui-gtk3-documentation.glade - ../ublsettingsui-gtk3-save-confirmation.glade + ../ublsettingsui-gtk3-saving.glade ../gresource.xml ../ublsettingsui-gtk3-banner.png ../ublsettingsui-gtk3.css diff --git a/source/ublsettingsui-gtk3.c b/source/ublsettingsui-gtk3.c index c48db2e..59969cf 100644 --- a/source/ublsettingsui-gtk3.c +++ b/source/ublsettingsui-gtk3.c @@ -69,9 +69,22 @@ void on_about(GtkWidget *self, char *version_application){ //functions -void yon_load_proceed(char *command){ - yon_ubl_status_box_render(LOCAL_LOAD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); - +int yon_load_proceed(YON_CONFIG_TYPE type){ + // if (yon_config_load_register(type,"logging",,"logging",JOURNALD("*"),NULL)){ + // update_loaded_logrotate(); + // return 1; + // } +} + +void yon_save_proceed(char *path,YON_CONFIG_TYPE type){ + if (((type==YON_CONFIG_LOCAL&& template_config->load_mode==1)||(type==YON_CONFIG_GLOBAL&& template_config->load_mode==0))) + yon_config_save_registered(path); + else{ + GtkBuilder *builder = gtk_builder_new_from_resource(ui_glade_path_saving); + GtkWidget *window = yon_gtk_builder_get_widget(builder,"MainWindow"); + gtk_widget_show(window); + } + } // standard functions diff --git a/source/ublsettingsui-gtk3.h b/source/ublsettingsui-gtk3.h index f72c510..b1266eb 100644 --- a/source/ublsettingsui-gtk3.h +++ b/source/ublsettingsui-gtk3.h @@ -18,6 +18,7 @@ #define ui_glade_path "/com/ublinux/ui/ublsettingsui-gtk3.glade" #define ui_glade_path_documentation "/com/ublinux/ui/ublsettingsui-gtk3-documentation.glade" #define ui_glade_path_about "/com/ublinux/ui/ublsettingsui-gtk3-about.glade" +#define ui_glade_path_saving "/com/ublinux/ui/ublsettingsui-gtk3-saving.glade" #define ui_banner_path "/com/ublinux/images/ublsettingsui-gtk3-banner.png" #define ui_CssPath "/com/ublinux/css/ublsettingsui-gtk3.css" #define ui_config_path yon_char_unite(yon_ubl_user_get_home_directory(),"/.config/",template_app_information.app_tech_name,"/",template_app_information.app_tech_name,".conf",NULL) @@ -88,6 +89,8 @@ typedef struct { int lock_save_global; int lock_load_global; + int load_mode; + int always_open_documentation; } _template_config; static _template_config *template_config; @@ -133,6 +136,10 @@ typedef struct { GtkWidget *AcceptButton; } template_documentation_confirmation_window; +int yon_load_proceed(YON_CONFIG_TYPE type); + +void yon_save_proceed(char *path,YON_CONFIG_TYPE type); + /**yon_open_browser(GtkWidget *self, char *link) * [EN] * Opens browser with [link] link. diff --git a/ublsettingsui-gtk3-save-confirmation.glade b/ublsettingsui-gtk3-save-confirmation.glade deleted file mode 100644 index 488e351..0000000 --- a/ublsettingsui-gtk3-save-confirmation.glade +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - True - False - process-stop-symbolic - - - True - False - emblem-ok-symbolic - - - - - - - - - - - False - False - 450 - dialog-question-symbolic - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - vertical - 10 - - - True - True - liststore1 - - - - - - Parameter - - - - 0 - - - - - - - Save - - - - 1 - - - - - - - True - True - 0 - - - - - True - False - end - 5 - True - - - Cancel - True - True - True - image8 - - - - True - True - 0 - - - - - Accept - True - True - True - image9 - - - - True - True - 1 - - - - - False - True - 1 - - - - - - - True - False - True - - - True - False - ubl-settings-TEMPLATES - - - - - - - - - diff --git a/ublsettingsui-gtk3-saving.glade b/ublsettingsui-gtk3-saving.glade new file mode 100644 index 0000000..7fc2a0b --- /dev/null +++ b/ublsettingsui-gtk3-saving.glade @@ -0,0 +1,186 @@ + + + + + + Save + True + True + False + True + + + True + False + process-stop-symbolic + + + True + False + emblem-ok-symbolic + + + + 450 + False + True + com.ublinux.ubl-settings-logging + dialog + + + False + 5 + vertical + 5 + + + False + end + + + Cancel + True + True + True + image1 + + + True + True + 0 + + + + + Save + True + True + True + image2 + + + True + True + 1 + + + + + False + False + end + 0 + + + + + True + False + vertical + + + + + + False + True + 0 + + + + + True + True + in + + + True + True + liststore1 + + + + + + Save + + + + + + + + Parameter + + + + + + + + Old value + + + + + + + + New value + + + + + + + + + + True + True + 1 + + + + + + + True + False + True + + + True + False + 5 + 5 + 5 + 5 + 2 + TEMPLATE Manager + + + + + + + + True + False + 5 + 5 + 5 + 5 + 6 + 6 + 32 + com.ublinux.ublsettingsui-gtk3 + + + + + + + diff --git a/ublsettingsui-gtk3.glade b/ublsettingsui-gtk3.glade index 1e4feb9..a4f118f 100644 --- a/ublsettingsui-gtk3.glade +++ b/ublsettingsui-gtk3.glade @@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. False center - + True False 5 @@ -298,7 +298,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + True False 5 @@ -350,15 +350,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + True False - 5 - 5 - 5 - 5 - 6 - 6 32 com.ublinux.ublsettingsui-gtk3