Merge pull request 'master' (#91) from YanTheKaller/ubl-settings-system:master into master

Reviewed-on: #91

locale/ubl-settings-system.pot

@@ -109,6 +109,10 @@ msgstr ""
 msgid "Accept"
 msgstr ""
 
+#: source/ubl-strings.h:30
+msgid "Apply"
+msgstr ""
+
 #: source/ubl-strings.h:32
 msgid "Important field is empty"
 msgstr ""

locale/ubl-settings-system_ru.po

@@ -110,6 +110,10 @@ msgstr "Введите данные"
 msgid "Accept"
 msgstr "Принять"
 
+#: source/ubl-strings.h:30
+msgid "Apply"
+msgstr "Применить"
+
 #: source/ubl-strings.h:32
 msgid "Important field is empty"
 msgstr "Пустое важное поле"

source/ubl-settings-system-language.c

@@ -132,9 +132,12 @@ void on_language_remove(GtkWidget *, main_window *widgets){
         if (!yon_char_is_empty(temp)){
             yon_config_register(locale_parameter,locale_parameter_command,temp);
             free(temp);
+        } else {
+            yon_config_remove_by_key(locale_parameter);
+
         }
         locale_param = config(language_parameter);
-        if (!strcmp(locale_param,target)){
+        if (!yon_char_is_empty(locale_param)&&!strcmp(locale_param,target)){
             yon_config_remove_by_key(language_parameter);
         }
         yon_interface_update(widgets);

source/ubl-settings-system.c

@@ -46,7 +46,6 @@ void yon_interface_update(main_window *widgets){
             gtk_switch_set_active(GTK_SWITCH(widgets->LocaleDefaultSwitch),1);
         } else {
             gtk_switch_set_active(GTK_SWITCH(widgets->LocaleDefaultSwitch),0);
-        }
             int parsed_param_size;
             config_str parsed_param = yon_char_parse(config_locale,&parsed_param_size,",");
             GtkTreeIter iter;
@@ -61,13 +60,14 @@ void yon_interface_update(main_window *widgets){
                         if (!strcmp(config_languages,parsed[0])){
                             gtk_list_store_set(widgets->LanguageList,&iter,0,1,-1);
                         } 
-                } else if (!i){
-
+                    } else if (yon_char_is_empty(config_languages)&&!i){
+                            gtk_list_store_set(widgets->LanguageList,&iter,0,1,-1);
                         }
                     yon_char_parsed_free(parsed,parsed_size);
                 }
             }
         }
+    }
 
     g_signal_handlers_unblock_by_func(G_OBJECT(widgets->IDEntry),G_CALLBACK(on_id_changed),widgets);
     g_signal_handlers_unblock_by_func(G_OBJECT(widgets->HostnameEntry),G_CALLBACK(on_hostname_changed),widgets);

source/ubl-settings-system.h

@@ -41,7 +41,7 @@
 #define get_id_command "/etc/machine-id"
 
 #define config_get_command(source) yon_char_unite("ubconfig --source ", source, " -ea get [system] HOSTNAME MACHINEID -- get [locale] CONSOLE_FONT LOCALE LANG -- get [network] DOMAIN DOMAIN[admanger] DOMAIN[server] DOMAIN[dns] DOMAIN[client]",NULL)
-#define config_get_default_command "ubconfig --source default get [locale] CONSOLE_FONT LOCALE LANG"
+#define config_get_default_command "ubconfig --source default get [locale] CONSOLE_FONT LOCALE LANG -- [system] HOSTNAME"
 
 #define config_get_global_only_parameters ""
 #define config_get_local_only_parameters ""

source/ubl-strings.h

@@ -28,6 +28,7 @@
 #define INSERT_LABEL _("Insert data")
 
 #define ACCEPT_LABEL _("Accept")
+#define APPLY_LABEL _("Apply")
 
 #define EMPTY_IMPORTANT_LABEL _("Important field is empty")
 

ubl-settings-system-layouts.glade

@@ -77,6 +77,9 @@
                     <property name="search-column">1</property>
                     <property name="enable-grid-lines">both</property>
                     <property name="activate-on-single-click">True</property>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection"/>
+                    </child>
                     <child>
                       <object class="GtkTreeViewColumn">
                         <child>
@@ -215,7 +218,7 @@
         </child>
         <child>
           <object class="GtkButton" id="AcceptButton">
-            <property name="label" translatable="yes">Accept</property>
+            <property name="label" translatable="yes">Apply</property>
             <property name="visible">True</property>
             <property name="can-focus">True</property>
             <property name="receives-default">True</property>