Merge pull request 'master' (#38) from YanTheKaller/ubl-settings-manager:master into develop

Reviewed-on: #38

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);
     }
@@ -1658,7 +1666,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 +1730,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?"));

source/ubl-settings-manager.h

@@ -87,6 +87,7 @@ typedef struct {
     int MainDoubleClick;
     int *currentDoubleClick;
     dictionary *SettingsSections;
+    int BannerHidden;
 } config;
 
 typedef struct {

ubl-settings-manager.glade

@@ -87,7 +87,16 @@
       <object class="GtkHeaderBar">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-        <property name="title" translatable="yes">UBLinux Settings Manager</property>
+        <child type="title">
+          <object class="GtkLabel" id="warningHeaderNameLabel">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="label" translatable="yes">UBLinux Settings</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
         <child>
           <object class="GtkImage">
             <property name="visible">True</property>
@@ -307,7 +316,16 @@
       <object class="GtkHeaderBar" id="SettingsBar">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-        <property name="title" translatable="yes">UBLinux Settings</property>
+        <child type="title">
+          <object class="GtkLabel" id="webHeaderNameLabel">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="label" translatable="yes">UBLinux Settings</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
         <child>
           <object class="GtkImage">
             <property name="visible">True</property>
@@ -681,7 +699,16 @@
       <object class="GtkHeaderBar" id="SettingsBar1">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-        <property name="title" translatable="yes">UBLinux Settings</property>
+        <child type="title">
+          <object class="GtkLabel" id="settingsHeaderNameLabel">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="label" translatable="yes">UBLinux Settings</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
         <child>
           <object class="GtkImage">
             <property name="visible">True</property>
@@ -900,6 +927,16 @@
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="show-close-button">True</property>
+        <child type="title">
+          <object class="GtkLabel" id="GnomeHeaderNameLabel">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="label" translatable="yes">UBLinux Settings</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
         <child>
           <object class="GtkImage">
             <property name="visible">True</property>
@@ -1301,7 +1338,16 @@
       <object class="GtkHeaderBar" id="SettingsBar2">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-        <property name="title" translatable="yes">UBLinux Settings</property>
+        <child type="title">
+          <object class="GtkLabel" id="sectionsHeaderNameLabel">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="label" translatable="yes">UBLinux Settings</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
         <child>
           <object class="GtkImage">
             <property name="visible">True</property>
@@ -1576,6 +1622,16 @@
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="show-close-button">True</property>
+        <child type="title">
+          <object class="GtkLabel" id="MainHeaderNameLabel">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="label" translatable="yes">UBLinux Settings</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
         <child>
           <object class="GtkImage">
             <property name="visible">True</property>
@@ -1972,10 +2028,13 @@
             <property name="can-focus">False</property>
             <property name="hexpand">True</property>
             <child>
-              <object class="GtkLabel" id="LabelTitle1">
+              <object class="GtkLabel" id="LoaderHeaderNameLabel">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes">UBLinux Settings Manager</property>
+                <property name="label" translatable="yes">UBLinux Settings</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
               <packing>
                 <property name="expand">True</property>