fix installer

resources/Makefile

@@ -11,8 +11,9 @@ MANAGER_RESOURCES_FILES = 	manager_window.ui \
 
 UPDATER_RESOURCES_FILES = 	updater_window.ui
 
-TRANSACTION_RESOURCES_FILES = 	progress_dialog.ui \
-								progress_box.ui \
+INSTALLER_RESOURCES_FILES = 	progress_dialog.ui
+
+TRANSACTION_RESOURCES_FILES = 	progress_box.ui \
 								choose_provider_dialog.ui \
 								transaction_sum_dialog.ui \
 								preferences_dialog.ui \
@@ -24,7 +25,9 @@ MANAGER_GRESOURCE_FILE = pamac.manager.gresource.xml
 
 UPDATER_GRESOURCE_FILE = pamac.updater.gresource.xml
 
-resources: transaction_resources.c manager_resources.c updater_resources.c
+INSTALLER_GRESOURCE_FILE = pamac.installer.gresource.xml
+
+resources: transaction_resources.c manager_resources.c updater_resources.c installer_resources.c
 
 clean:
 	rm -f *.c
@@ -37,3 +40,6 @@ manager_resources.c: $(MANAGER_GRESOURCE_FILE) $(MANAGER_RESOURCES_FILES)
 
 updater_resources.c: $(UPDATER_GRESOURCE_FILE) $(UPDATER_RESOURCES_FILES)
 	glib-compile-resources $(UPDATER_GRESOURCE_FILE) --target=updater_resources.c --generate-source
+
+installer_resources.c: $(INSTALLER_GRESOURCE_FILE) $(INSTALLER_RESOURCES_FILE)
+	glib-compile-resources $(INSTALLER_GRESOURCE_FILE) --target=installer_resources.c --generate-source

resources/pamac.installer.gresource.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/manjaro/pamac/installer">
+    <file preprocess="xml-stripblanks">progress_dialog.ui</file>
+  </gresource>
+</gresources>

resources/progress_dialog.ui

@@ -2,61 +2,20 @@
 <!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
-  <template class="PamacProgressDialog" parent="GtkDialog">
+  <template class="PamacProgressDialog" parent="GtkApplicationWindow">
     <property name="can_focus">False</property>
-    <property name="border_width">3</property>
+    <property name="border_width">6</property>
     <property name="title" translatable="yes">Progress</property>
-    <property name="window_position">center-on-parent</property>
+    <property name="window_position">center</property>
     <property name="default_width">600</property>
     <property name="icon_name">system-software-install</property>
-    <property name="type_hint">dialog</property>
     <property name="deletable">False</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox1">
+    <child>
+      <object class="GtkBox" id="box">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="cancel_button">
-                <property name="label" translatable="yes">_Cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="close_button">
-                <property name="label" translatable="yes">_Hide</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
         <child>
           <placeholder/>
         </child>
@@ -79,14 +38,36 @@
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">3</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButtonBox" id="button_box">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="close_button">
+                <property name="label" translatable="yes">_Close</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
           </packing>
         </child>
       </object>
     </child>
-    <action-widgets>
-      <action-widget response="-6">cancel_button</action-widget>
-      <action-widget response="-7">close_button</action-widget>
-    </action-widgets>
   </template>
 </interface>