Merge pull request 'Added root only check' (#82) from YanTheKaller/ubinstall-gtk:master into master

Reviewed-on: #82

source/ubinstall-gtk.c

@@ -434,7 +434,11 @@ void yon_interface_update(main_window *widgets){
     char *autologin = config(autologin_parameter);
     char *hostname = config(hostname_parameter);
     if (!yon_char_is_empty(user_name)){
-        gtk_entry_set_text(GTK_ENTRY(widgets->LoginEntry),user_name);
+        if (!strcmp(user_name,"root")){
+            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->UserRootOnlyCheck),1);
+        } else {
+            gtk_entry_set_text(GTK_ENTRY(widgets->LoginEntry),user_name);
+        }
     } else {
         gtk_entry_set_text(GTK_ENTRY(widgets->LoginEntry),"");
         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->LoginSensitiveCheck),0);
@@ -1639,10 +1643,13 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
                     if (yon_char_is_empty(gtk_entry_get_text(GTK_ENTRY(widgets->LoginEntry)))||!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->LoginSensitiveCheck))){
                         yon_config_remove_by_key(user_name_parameter);
                     } else {
-                        char *login = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->LoginEntry));
+                        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->UserRootOnlyCheck))){
-                        if (login){};
+                        yon_config_register(user_name_parameter,user_name_parameter_command,"root");
-                        yon_config_register(user_name_parameter,user_name_parameter_command,login);
+                        } else {
-
+                            char *login = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->LoginEntry));
+                            if (login){};
+                            yon_config_register(user_name_parameter,user_name_parameter_command,login);
+                        }
                     }
 
                     if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->PasswordSensitiveCheck))){
@@ -2500,6 +2507,7 @@ main_window *yon_main_window_complete(){
     widgets->LayoutSensitiveCheck = yon_gtk_builder_get_widget(builder,"LayoutSensitiveCheck");
     widgets->UsernameSensitiveCheck = yon_gtk_builder_get_widget(builder,"UsernameSensitiveCheck");
     widgets->LoginSensitiveCheck = yon_gtk_builder_get_widget(builder,"LoginSensitiveCheck");
+    widgets->UserRootOnlyCheck = yon_gtk_builder_get_widget(builder,"UserRootOnlyCheck");
     widgets->PasswordSensitiveCheck = yon_gtk_builder_get_widget(builder,"PasswordSensitiveCheck");
     widgets->AutologinSensitiveCheck = yon_gtk_builder_get_widget(builder,"AutologinSensitiveCheck");
     widgets->RootPasswordSensitiveCheck = yon_gtk_builder_get_widget(builder,"RootPasswordSensitiveCheck");

source/ubinstall-gtk.h

@@ -377,6 +377,7 @@ typedef struct {
 	GtkWidget *LayoutSensitiveCheck;
 	GtkWidget *UsernameSensitiveCheck;
 	GtkWidget *LoginSensitiveCheck;
+	GtkWidget *UserRootOnlyCheck;
 	GtkWidget *PasswordSensitiveCheck;
 	GtkWidget *AutologinSensitiveCheck;
 	GtkWidget *RootPasswordSensitiveCheck;

source/ubl-strings.h

@@ -14,6 +14,7 @@
 #define CANCEL_LABEL _("Cancel")
 #define BACK_LABEL _("Back")
 #define NEXT_LABEL _("Next")
+#define ROOT_ONLY_LABEL _("Root only")
 #define WELCOME_TAB_LABEL _("Welcome")
 #define LICENCE_TAB_LABEL _("Licence\nagreement")
 #define SECTIONS_TAB__LABEL _("Sections")

ubinstall-gtk.glade

@@ -2396,6 +2396,20 @@ and help you install UBLinux on your computer</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="UserRootOnlyCheck">
+                                    <property name="label" translatable="yes">Root only</property>
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="receives-default">False</property>
+                                    <property name="draw-indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
                                 <child>
                                   <object class="GtkEntry" id="LoginEntry">
                                     <property name="visible">True</property>

ubinstall-gtk.pot

@@ -99,6 +99,10 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
+#: source/ubl-strings.h:13
+msgid "Root only"
+msgstr ""
+
 #: source/ubl-strings.h:14
 msgid "Welcome"
 msgstr ""

ubinstall-gtk_ru.po

@@ -103,6 +103,10 @@ msgstr "Назад"
 msgid "Next"
 msgstr "Далее"
 
+#: source/ubl-strings.h:13
+msgid "Root only"
+msgstr "Только root"
+
 #: source/ubl-strings.h:14
 msgid "Welcome"
 msgstr ""