Merge pull request 'master' (#313) from YanTheKaller/ubinstall-gtk:master into master

Reviewed-on: #313

locale/ubinstall-gtk.pot

@@ -1305,6 +1305,10 @@ msgstr ""
 msgid "Accessed"
 msgstr ""
 
+#: source/ubl-strings.h:364
+msgid "Unaccessed"
+msgstr ""
+
 #: source/ubl-strings.h:365
 msgid "Repository status:"
 msgstr ""
@@ -1544,7 +1548,7 @@ msgid "Configuring the installation of additional components"
 msgstr ""
 
 #: source/ubl-strings.h:427
-msgid "Wait for the system to finish loading"
+msgid "Wait until the system installation is complete"
 msgstr ""
 
 #: source/ubl-strings.h:428

locale/ubinstall-gtk_ru.po

@@ -1322,6 +1322,10 @@ msgstr "Имя пакета:"
 msgid "Accessed"
 msgstr "Доступно"
 
+#: source/ubl-strings.h:364
+msgid "Unaccessed"
+msgstr "Недоступно"
+
 #: source/ubl-strings.h:365
 msgid "Repository status:"
 msgstr "Статус репозитория:"
@@ -1568,8 +1572,8 @@ msgid "Configuring the installation of additional components"
 msgstr "Настройка установки дополнительных компонентов"
 
 #: source/ubl-strings.h:427
-msgid "Wait for the system to finish loading"
+msgid "Wait until the system installation is complete"
-msgstr "Дождитесь завершения загрузки системы"
+msgstr "Дождитесь завершения установки системы"
 
 #: source/ubl-strings.h:428
 msgid "Modules and packages"

source/ubinstall-gtk-components.c

@@ -237,7 +237,7 @@ gboolean yon_os_component_insert(struct row_data *row_input){
     main_window *widgets = row_input->widgets;
     g_signal_connect(G_OBJECT(row->InstallCheck),"toggled",G_CALLBACK(yon_os_components_check_packages_size),widgets);
     gtk_list_box_insert(GTK_LIST_BOX(widgets->OSSoftwareListBox),row->row,-1);
-    yon_os_row_setup(row,row_input->name,row_input->version,row_input->tags,!yon_char_is_empty(row_input->description)?(row_input->description):"", row_input->source, row_input->size);
+    yon_os_row_setup(row,row_input->name,row_input->version,row_input->tags,!yon_char_is_empty(row_input->description)?(_(row_input->description)):"", row_input->source, row_input->size);
     char *modules = config(modules_parameter);
     if (yon_char_is_empty(modules)||yon_char_check_element(modules,row_input->name,",")||!strcmp(modules,"auto")){
         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->InstallCheck),1);

source/ubinstall-gtk-kernel.c

@@ -187,6 +187,7 @@ void yon_kernel_addon_resize(main_window *widgets){
 }
 
 void yon_kernel_init(main_window *widgets){
+    on_status_update(NULL,widgets);
     if (!main_config.configure_mode){
         yon_config_update_by_args(packages_parameter,KERNEL_BOOT_parameter,NULL);
     }
@@ -318,7 +319,7 @@ void on_kernel_addon_info(GtkLabel *self){
             int parsed_size;
             config_str parsed = yon_char_parse(info[i],&parsed_size,":");
             gtk_list_store_append(element->InfoList,&iter);
-            gtk_list_store_set(element->InfoList,&iter,0,parsed[0],1,parsed[1],-1);
+            gtk_list_store_set(element->InfoList,&iter,0,parsed[0],1,!yon_char_is_empty(parsed[1])?_(parsed[1]):"",-1);
             
         }
     } else {
@@ -395,6 +396,7 @@ void yon_kernel_addon_row_setup(kernel_addon_row *row, char *name, char *modules
 }
 
 void yon_kernel_addon_init(main_window *widgets){
+    on_status_update(NULL,widgets);
     yon_config_remove_by_args(packages_parameter,NULL);
     char *command = yon_config_parameter_prepare_command(packages_parameter_command,main_config.config_load_path,NULL,NULL);
     yon_config_load_config(YON_CONFIG_CUSTOM,command,NULL);

source/ubinstall-gtk.c

@@ -276,6 +276,24 @@ void yon_licence_load(main_window *widgets){
     }
 }
 
+void on_status_update(GtkWidget *,main_window *widgets){
+    if (system(yon_check_database_command)){
+        gtk_image_set_from_icon_name(GTK_IMAGE(widgets->KernelPacmanStatusImage),inactive_icon_path,GTK_ICON_SIZE_BUTTON);
+        gtk_image_set_from_icon_name(GTK_IMAGE(widgets->KernelAddonPacmanStatusImage),inactive_icon_path,GTK_ICON_SIZE_BUTTON);
+        gtk_image_set_from_icon_name(GTK_IMAGE(widgets->PacmanSoftwareStatusImage),inactive_icon_path,GTK_ICON_SIZE_BUTTON);
+        gtk_label_set_text(GTK_LABEL(widgets->KernelPacmanStatusLabel),UNACCESSED_LABEL);
+        gtk_label_set_text(GTK_LABEL(widgets->PacmanSoftwareStatusLabel),UNACCESSED_LABEL);
+        gtk_label_set_text(GTK_LABEL(widgets->KernelAddonPacmanStatusLabel),UNACCESSED_LABEL);
+    } else {
+        gtk_image_set_from_icon_name(GTK_IMAGE(widgets->KernelPacmanStatusImage),active_icon_path,GTK_ICON_SIZE_BUTTON);
+        gtk_image_set_from_icon_name(GTK_IMAGE(widgets->KernelAddonPacmanStatusImage),active_icon_path,GTK_ICON_SIZE_BUTTON);
+        gtk_image_set_from_icon_name(GTK_IMAGE(widgets->PacmanSoftwareStatusImage),active_icon_path,GTK_ICON_SIZE_BUTTON);
+        gtk_label_set_text(GTK_LABEL(widgets->KernelPacmanStatusLabel),ACCESSED_LABEL);
+        gtk_label_set_text(GTK_LABEL(widgets->PacmanSoftwareStatusLabel),ACCESSED_LABEL);
+        gtk_label_set_text(GTK_LABEL(widgets->KernelAddonPacmanStatusLabel),ACCESSED_LABEL);
+    }
+}
+
 void yon_scroll_block_for_builder(GtkBuilder *builder){
     GSList *list = gtk_builder_get_objects(builder);
     GSList *iter;
@@ -508,6 +526,9 @@ void yon_main_window_create(main_window *widgets){
         widgets->PackageInstallationLabel = yon_gtk_builder_get_widget(builder,"PackageInstallationLabel");
         widgets->ReadFullLogButton = yon_gtk_builder_get_widget(builder,"ReadFullLogButton");
 
+        widgets->KernelPacmanStatusImage = yon_gtk_builder_get_widget(builder,"KernelPacmanStatusImage");
+        widgets->KernelPacmanStatusLabel = yon_gtk_builder_get_widget(builder,"KernelPacmanStatusLabel");
+        widgets->KernelPacmanStatusButton = yon_gtk_builder_get_widget(builder,"KernelPacmanStatusButton");
         widgets->KernelListBox = yon_gtk_builder_get_widget(builder,"KernelListBox");
         widgets->KernelInstallLabel = yon_gtk_builder_get_widget(builder,"KernelInstallLabel");
         widgets->KernelEnableLabel = yon_gtk_builder_get_widget(builder,"KernelEnableLabel");
@@ -517,6 +538,9 @@ void yon_main_window_create(main_window *widgets){
         widgets->KernelDescriptionLabel = yon_gtk_builder_get_widget(builder,"KernelDescriptionLabel");
         widgets->KernelSizeGroup = GTK_SIZE_GROUP(gtk_builder_get_object(builder,"TagsSizeGroup"));
 
+        widgets->KernelAddonPacmanStatusImage = yon_gtk_builder_get_widget(builder,"KernelAddonPacmanStatusImage");
+        widgets->KernelAddonPacmanStatusLabel = yon_gtk_builder_get_widget(builder,"KernelAddonPacmanStatusLabel");
+        widgets->KernelAddonPacmanStatusButton = yon_gtk_builder_get_widget(builder,"KernelAddonPacmanStatusButton");
         widgets->KernelAddonListBox = yon_gtk_builder_get_widget(builder,"KernelAddonListBox");
         widgets->KernelAddonInstallLabel = yon_gtk_builder_get_widget(builder,"KernelAddonInstallLabel");
         widgets->KernelAddonNameLabel = yon_gtk_builder_get_widget(builder,"KernelAddonNameLabel");
@@ -620,7 +644,9 @@ void yon_main_window_create(main_window *widgets){
         g_signal_connect(G_OBJECT(widgets->LoadLocalConfigurationMenuItem),"activate",G_CALLBACK(on_config_local_load),widgets);
         g_signal_connect(G_OBJECT(widgets->LoadExternalConfigurationMenuItem),"activate",G_CALLBACK(on_config_custom_load),widgets);
 
-
+        g_signal_connect(G_OBJECT(widgets->KernelPacmanStatusButton),"clicked",G_CALLBACK(on_status_update),widgets);
+        g_signal_connect(G_OBJECT(widgets->KernelAddonPacmanStatusButton),"clicked",G_CALLBACK(on_status_update),widgets);
+        g_signal_connect(G_OBJECT(widgets->PacmanSoftwareStatusButton),"clicked",G_CALLBACK(on_status_update),widgets);
         g_signal_connect(G_OBJECT(widgets->ReadFullLogButton),"clicked",G_CALLBACK(on_process_log_view),widgets);
         g_signal_connect(G_OBJECT(widgets->ReadShortLogButton),"clicked",G_CALLBACK(on_summary_log_view),widgets);
 

source/ubinstall-gtk.h

@@ -47,6 +47,8 @@
 #define untoggled_icon_path "com.ublinux.libublsettingsui-gtk3.untoggled-symbolic"
 #define toggled_icon_path "com.ublinux.libublsettingsui-gtk3.toggled-symbolic"
 #define add_icon_path "com.ublinux.libublsettingsui-gtk3.increase-symbolic"
+#define active_icon_path "com.ublinux.libublsettingsui-gtk3.active-symbolic"
+#define inactive_icon_path "com.ublinux.libublsettingsui-gtk3.inactive-symbolic"
 
 #define LocalePath "/usr/share/locale"
 #define LocaleName "ubinstall-gtk"
@@ -143,6 +145,8 @@ layout && /description:/ {\
 \" | sort -u\
 "
 
+#define yon_check_database_command "pacman -Sqs >/dev/null"
+
 #define internet_tomezone_check_command "curl -s ipinfo.io/timezone"
 #define ubinstall_dry_run_command "ubinstall --dry-run"
 #define os_name_get_command "sed -En 's/^PRETTY_NAME=[\"]*([^\"]+)[\"]*/\\1/p' /etc/os-release"
@@ -682,6 +686,9 @@ typedef struct
 
 	GtkWidget *HostnameSensitiveSwitch;
 
+	GtkWidget *KernelPacmanStatusImage;
+	GtkWidget *KernelPacmanStatusLabel;
+	GtkWidget *KernelPacmanStatusButton;
 	GtkWidget *KernelListBox;
 	GtkWidget *KernelInstallLabel;
 	GtkWidget *KernelEnableLabel;
@@ -691,6 +698,9 @@ typedef struct
 	GtkWidget *KernelDescriptionLabel;
 	GtkSizeGroup *KernelSizeGroup;
 
+	GtkWidget *KernelAddonPacmanStatusImage;
+	GtkWidget *KernelAddonPacmanStatusLabel;
+	GtkWidget *KernelAddonPacmanStatusButton;
 	GtkWidget *KernelAddonListBox;
 	GtkWidget *KernelAddonInstallLabel;
 	GtkWidget *KernelAddonNameLabel;
@@ -1580,3 +1590,4 @@ void on_bootloader_admin_toggled(GtkWidget *, char *path, main_window *widgets);
 void on_bootloader_user_remove(GtkWidget *, main_window *widgets);
 void on_software_uncheck_all(GtkWidget *, main_window *widgets);
 gboolean on_kernel_enabled_toggled(GtkWidget *self, GdkEventButton *, kernel_row *row);
+void on_status_update(GtkWidget *,main_window *widgets);

source/ubl-strings.h

@@ -299,6 +299,8 @@ NULL)
 #define MODULE_NOT_ENOUGH_SPACE_LABEL _("There is not enough space to install modules")
 #define PACKAGE_NOT_ENOUGH_SPACE_LABEL _("There is not enough space to install packages")
 #define EDIT_USER_LABEL _("Edit user")
+#define ACCESSED_LABEL _("Accessed")
+#define UNACCESSED_LABEL _("Unaccessed")
 
 // #define _LABEL _("Chosen size:")
 // #define _LABEL _("Overall size:")
@@ -373,7 +375,6 @@ NULL)
 // #define _LABEL _("Type")
 // #define _LABEL _("Additional components")
 // #define _LABEL _("Package name:")
-// #define _LABEL _("Accessed")
 // #define _LABEL _("Repository status:")
 // #define _LABEL _("Pacman software")
 // #define _LABEL _("Administrator password (root):")
@@ -434,7 +435,7 @@ NULL)
 // #define _LABEL _("Setting up system boot")
 // #define _LABEL _("Setting up network access")
 // #define _LABEL _("Configuring the installation of additional components")
-// #define _LABEL _("Wait for the system to finish loading")
+// #define _LABEL _("Wait until the system installation is complete")
 // #define _LABEL _("Modules and packages")
 // #define _LABEL _("Setting the system")
 // #define _LABEL _("Selecting software packages to install from the repository. Internet access is required")

ubinstall-gtk.glade

@@ -592,6 +592,16 @@
     <property name="can-focus">False</property>
     <property name="icon-name">com.ublinux.libublsettingsui-gtk3.edit-symbolic</property>
   </object>
+  <object class="GtkImage" id="image44">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">com.ublinux.libublsettingsui-gtk3.sync-symbolic</property>
+  </object>
+  <object class="GtkImage" id="image45">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">com.ublinux.libublsettingsui-gtk3.sync-symbolic</property>
+  </object>
   <object class="GtkImage" id="image5">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
@@ -2745,6 +2755,72 @@ Select a different installation source.</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="GtkBox">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="spacing">5</property>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="label" translatable="yes">Repository status:</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkImage" id="KernelPacmanStatusImage">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <style>
+                                  <class name="thin"/>
+                                </style>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="KernelPacmanStatusLabel">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="label" translatable="yes">Accessed</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="KernelPacmanStatusButton">
+                                <property name="visible">True</property>
+                                <property name="can-focus">True</property>
+                                <property name="receives-default">True</property>
+                                <property name="image">image45</property>
+                                <style>
+                                  <class name="thin"/>
+                                </style>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
                         <child>
                           <object class="GtkBox">
                             <property name="visible">True</property>
@@ -2941,7 +3017,7 @@ Select a different installation source.</property>
                           <packing>
                             <property name="expand">True</property>
                             <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="position">2</property>
                           </packing>
                         </child>
                       </object>
@@ -3063,6 +3139,73 @@ Select a different installation source.</property>
                               </packing>
                             </child>
                           </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="spacing">5</property>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="label" translatable="yes">Repository status:</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkImage" id="KernelAddonPacmanStatusImage">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="icon-name">com.ublinux.libublsettingsui-gtk3.active-symbolic</property>
+                                <style>
+                                  <class name="thin"/>
+                                </style>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="KernelAddonPacmanStatusLabel">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="label" translatable="yes">Accessed</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="KernelAddonPacmanStatusButton">
+                                <property name="visible">True</property>
+                                <property name="can-focus">True</property>
+                                <property name="receives-default">True</property>
+                                <property name="image">image44</property>
+                                <style>
+                                  <class name="thin"/>
+                                </style>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
@@ -3097,7 +3240,7 @@ Select a different installation source.</property>
                           <packing>
                             <property name="expand">True</property>
                             <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="position">2</property>
                           </packing>
                         </child>
                       </object>
@@ -3551,16 +3694,19 @@ Select a different installation source.</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkLabel" id="PacmanSoftwareStatusLabel">
+                                          <object class="GtkBox">
                                             <property name="visible">True</property>
                                             <property name="can-focus">False</property>
-                                            <property name="label" translatable="yes">Accessed</property>
+                                            <child>
+                                              <object class="GtkLabel">
+                                                <property name="visible">True</property>
+                                                <property name="can-focus">False</property>
+                                                <property name="label" translatable="yes">Repository status:</property>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">True</property>
-                                            <property name="pack-type">end</property>
+                                                <property name="position">0</property>
-                                            <property name="position">3</property>
                                               </packing>
                                             </child>
                                             <child>
@@ -3574,21 +3720,27 @@ Select a different installation source.</property>
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">True</property>
-                                            <property name="pack-type">end</property>
+                                                <property name="position">1</property>
-                                            <property name="position">4</property>
                                               </packing>
                                             </child>
                                             <child>
-                                          <object class="GtkLabel">
+                                              <object class="GtkLabel" id="PacmanSoftwareStatusLabel">
                                                 <property name="visible">True</property>
                                                 <property name="can-focus">False</property>
-                                            <property name="label" translatable="yes">Repository status:</property>
+                                                <property name="label" translatable="yes">Accessed</property>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">2</property>
+                                              </packing>
+                                            </child>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">True</property>
                                             <property name="pack-type">end</property>
-                                            <property name="position">5</property>
+                                            <property name="position">4</property>
                                           </packing>
                                         </child>
                                       </object>
@@ -7223,7 +7375,7 @@ Select a different installation source.</property>
                                       <object class="GtkLabel">
                                         <property name="visible">True</property>
                                         <property name="can-focus">False</property>
-                                        <property name="label" translatable="yes">Wait for the system to finish loading</property>
+                                        <property name="label" translatable="yes">Wait until the system installation is complete</property>
                                         <property name="wrap">True</property>
                                         <property name="xalign">0</property>
                                         <attributes>