From 3022e41cdcf81aaf4f98e9253f5e8ab5a387fc1b Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 23 Mar 2023 10:42:42 +0600 Subject: [PATCH 1/2] Header title labels are made bold --- source/ubl-settings-manager.c | 9 ++++- ubl-settings-manager.glade | 71 ++++++++++++++++++++++++++++++++--- 2 files changed, 72 insertions(+), 8 deletions(-) diff --git a/source/ubl-settings-manager.c b/source/ubl-settings-manager.c index 928f278..c4396d0 100644 --- a/source/ubl-settings-manager.c +++ b/source/ubl-settings-manager.c @@ -1658,7 +1658,6 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them // } if (curWidgets->ButtonBackToMain!=NULL) g_signal_connect(G_OBJECT(curWidgets->ButtonBackToMain), "clicked", G_CALLBACK(on_backToSettingsButton_clicked), curWidgets); - curWidgets->LabelTitle=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"LabelTitle")); gtk_window_set_title(GTK_WINDOW(curWidgets->window),_("UBLinux Settings Manager")); gtk_window_move(GTK_WINDOW(curWidgets->window),main_config.windowPosX,main_config.windowPosY); // Standard for all themes @@ -1723,7 +1722,13 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them } gtk_widget_hide_on_delete(curWidgets->window); g_signal_connect(G_OBJECT(curWidgets->window), "destroy", G_CALLBACK(yon_main_quit), curWidgets); - gtk_label_set_text(GTK_LABEL(curWidgets->LabelTitle),_("UBLinux Settings Manager")); + gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder,"MainHeaderNameLabel")),_("UBLinux Settings Manager")); + gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder,"sectionsHeaderNameLabel")),_("UBLinux Settings Manager")); + gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder,"GnomeHeaderNameLabel")),_("UBLinux Settings Manager")); + gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder,"UBLinux Settings")),_("UBLinux Settings Manager")); + gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder,"webHeaderNameLabel")),_("UBLinux Settings Manager")); + gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder,"warningHeaderNameLabel")),_("UBLinux Settings Manager")); + gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder,"LoaderHeaderNameLabel")),_("UBLinux Settings Manager")); gtk_label_set_text(GTK_LABEL(curWidgets->settingsSubmenuLabelSize),_("Icon size")); gtk_label_set_text(GTK_LABEL(curWidgets->settingsSubmenuLabelTheme),_("Window theme")); gtk_label_set_text(GTK_LABEL(curWidgets->helpHeader),_("Would you like to read documentation in the Web?")); diff --git a/ubl-settings-manager.glade b/ubl-settings-manager.glade index 19fc833..4c46be2 100644 --- a/ubl-settings-manager.glade +++ b/ubl-settings-manager.glade @@ -87,7 +87,16 @@ True False - UBLinux Settings Manager + + + True + False + UBLinux Settings + + + + + True @@ -307,7 +316,16 @@ True False - UBLinux Settings + + + True + False + UBLinux Settings + + + + + True @@ -681,7 +699,16 @@ True False - UBLinux Settings + + + True + False + UBLinux Settings + + + + + True @@ -900,6 +927,16 @@ True False True + + + True + False + UBLinux Settings + + + + + True @@ -1301,7 +1338,16 @@ True False - UBLinux Settings + + + True + False + UBLinux Settings + + + + + True @@ -1576,6 +1622,16 @@ True False True + + + True + False + UBLinux Settings + + + + + True @@ -1972,10 +2028,13 @@ False True - + True False - UBLinux Settings Manager + UBLinux Settings + + + True From f40524de3a1eacbc226646aebd1472f042fc6212 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 23 Mar 2023 11:29:53 +0600 Subject: [PATCH 2/2] Saving of closing state for banners --- source/ubl-settings-manager.c | 8 ++++++++ source/ubl-settings-manager.h | 1 + 2 files changed, 9 insertions(+) diff --git a/source/ubl-settings-manager.c b/source/ubl-settings-manager.c index c4396d0..39f23f8 100644 --- a/source/ubl-settings-manager.c +++ b/source/ubl-settings-manager.c @@ -625,10 +625,12 @@ void on_reveal_banner(GtkWidget *button, actionWidgets *widgets){ if (gtk_revealer_get_reveal_child(GTK_REVEALER(widgets->Revealer))==1){ gtk_revealer_set_reveal_child(GTK_REVEALER(widgets->Revealer),0); gtk_menu_button_set_direction(GTK_MENU_BUTTON(widgets->BannerRevealer),GTK_ARROW_RIGHT); + main_config.BannerHidden=1; } else { gtk_revealer_set_reveal_child(GTK_REVEALER(widgets->Revealer),1); gtk_menu_button_set_direction(GTK_MENU_BUTTON(widgets->BannerRevealer),GTK_ARROW_LEFT); + main_config.BannerHidden=0; } } } @@ -937,6 +939,7 @@ int setup_config(){ main_config.labelDensity=g_key_file_get_integer(configfile,"window","LabelDensity",NULL); main_config.lastUser=g_key_file_get_string(configfile,"window","User",NULL); main_config.fullscreen=g_key_file_get_boolean(configfile,"window","fullscreen",NULL); + main_config.BannerHidden=g_key_file_get_boolean(configfile,"window","BannerHidden",NULL); if (main_config.MainlabelSize==0) main_config.MainlabelSize=12; if (main_config.labelDensity==0) main_config.labelDensity=0; main_config.MainlabelSize=main_config.MainlabelSize*1000; @@ -1020,6 +1023,7 @@ void save_config(actionWidgets *widgets){ g_key_file_set_string(gfile,"window","WindowHeight",fromint); } g_key_file_set_boolean(gfile,"window","fullscreen",main_config.fullscreen); + g_key_file_set_boolean(gfile,"window","BannerHidden",main_config.BannerHidden); sprintf(fromint,"%d",main_config.WindowTheme); g_key_file_set_string(gfile,"window","WindowTheme",fromint); sprintf(fromint,"%d",sz); @@ -1638,6 +1642,10 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them curWidgets->BannerRevealer=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"RevealButton"))); curWidgets->Revealer=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"Revealer"))); curWidgets->SettingsSections=main_config.SettingsSections; + if (main_config.BannerHidden==0){ + gtk_revealer_set_reveal_child(GTK_REVEALER(curWidgets->Revealer),1); + gtk_menu_button_set_direction(GTK_MENU_BUTTON(curWidgets->BannerRevealer),GTK_ARROW_LEFT); + } if (main_config.lock_settings==1){ gtk_widget_set_sensitive(curWidgets->MenuItemSettings,0); } diff --git a/source/ubl-settings-manager.h b/source/ubl-settings-manager.h index cb946fe..b06def6 100644 --- a/source/ubl-settings-manager.h +++ b/source/ubl-settings-manager.h @@ -87,6 +87,7 @@ typedef struct { int MainDoubleClick; int *currentDoubleClick; dictionary *SettingsSections; + int BannerHidden; } config; typedef struct {