From 933a4b82db688a9f6626c1f93ed0d0c65489a511 Mon Sep 17 00:00:00 2001
From: Wojtek Porczyk <woju@invisiblethingslab.com>
Date: Mon, 26 Jun 2017 16:49:35 +0200
Subject: [PATCH] spring cleaning part 1

ui/
---
 Makefile                                      | 18 +++++----------
 qubesmanager.pro                              | 22 +++++++++----------
 rpm_spec/qmgr.spec                            |  2 +-
 about.ui => ui/about.ui                       |  0
 backupdlg.ui => ui/backupdlg.ui               |  4 ++--
 .../globalsettingsdlg.ui                      |  0
 informationnotes.ui => ui/informationnotes.ui |  0
 logdlg.ui => ui/logdlg.ui                     |  4 ++--
 mainwindow.ui => ui/mainwindow.ui             |  0
 .../multiselectwidget.ui                      |  0
 networknotes.ui => ui/networknotes.ui         |  0
 newappvmdlg.ui => ui/newappvmdlg.ui           |  0
 newfwruledlg.ui => ui/newfwruledlg.ui         |  0
 releasenotes.ui => ui/releasenotes.ui         |  0
 restoredlg.ui => ui/restoredlg.ui             |  0
 settingsdlg.ui => ui/settingsdlg.ui           | 20 ++++++++---------
 16 files changed, 31 insertions(+), 39 deletions(-)
 rename about.ui => ui/about.ui (100%)
 rename backupdlg.ui => ui/backupdlg.ui (99%)
 rename globalsettingsdlg.ui => ui/globalsettingsdlg.ui (100%)
 rename informationnotes.ui => ui/informationnotes.ui (100%)
 rename logdlg.ui => ui/logdlg.ui (97%)
 rename mainwindow.ui => ui/mainwindow.ui (100%)
 rename multiselectwidget.ui => ui/multiselectwidget.ui (100%)
 rename networknotes.ui => ui/networknotes.ui (100%)
 rename newappvmdlg.ui => ui/newappvmdlg.ui (100%)
 rename newfwruledlg.ui => ui/newfwruledlg.ui (100%)
 rename releasenotes.ui => ui/releasenotes.ui (100%)
 rename restoredlg.ui => ui/restoredlg.ui (100%)
 rename settingsdlg.ui => ui/settingsdlg.ui (98%)

diff --git a/Makefile b/Makefile
index fee78d1..6923770 100644
--- a/Makefile
+++ b/Makefile
@@ -16,21 +16,13 @@ rpms-dom0:
 	rpmbuild --define "_rpmdir $(RPMS_DIR)" -bb rpm_spec/qmgr.spec
 	rpm --addsign $(RPMS_DIR)/x86_64/qubes-manager*$(VERSION)*.rpm
 
+qubesmanager/ui_%.py: ui/%.ui
+	pyuic4 -o $@ $<
+
+ui: $(patsubst ui/%.ui,qubesmanager/ui_%.py,$(wildcard ui/*.ui))
+
 res:
 	pyrcc4 -o qubesmanager/resources_rc.py resources.qrc
-	pyuic4 -o qubesmanager/ui_mainwindow.py mainwindow.ui
-	pyuic4 -o qubesmanager/ui_newappvmdlg.py newappvmdlg.ui
-	pyuic4 -o qubesmanager/ui_newfwruledlg.py newfwruledlg.ui
-	pyuic4 -o qubesmanager/ui_multiselectwidget.py multiselectwidget.ui
-	pyuic4 -o qubesmanager/ui_settingsdlg.py settingsdlg.ui
-	pyuic4 -o qubesmanager/ui_restoredlg.py restoredlg.ui
-	pyuic4 -o qubesmanager/ui_backupdlg.py backupdlg.ui
-	pyuic4 -o qubesmanager/ui_globalsettingsdlg.py globalsettingsdlg.ui
-	pyuic4 -o qubesmanager/ui_logdlg.py logdlg.ui
-	pyuic4 -o qubesmanager/ui_about.py about.ui
-	pyuic4 -o qubesmanager/ui_releasenotes.py releasenotes.ui
-	pyuic4 -o qubesmanager/ui_informationnotes.py informationnotes.ui
-	pyuic4 -o qubesmanager/ui_networknotes.py networknotes.ui
 
 translations:
 	lrelease-qt4 qubesmanager.pro
diff --git a/qubesmanager.pro b/qubesmanager.pro
index 9b8b95a..4ccda62 100644
--- a/qubesmanager.pro
+++ b/qubesmanager.pro
@@ -1,15 +1,15 @@
 SOURCES = \
-          about.ui \
-          backupdlg.ui \
-          globalsettingsdlg.ui \
-          logdlg.ui \
-          mainwindow.ui \
-          multiselectwidget.ui \
-          newappvmdlg.ui \
-          newfwruledlg.ui \
-          releasenotes.ui \
-          restoredlg.ui \
-          settingsdlg.ui \
+          ui/about.ui \
+          ui/backupdlg.ui \
+          ui/globalsettingsdlg.ui \
+          ui/logdlg.ui \
+          ui/mainwindow.ui \
+          ui/multiselectwidget.ui \
+          ui/newappvmdlg.ui \
+          ui/newfwruledlg.ui \
+          ui/releasenotes.ui \
+          ui/restoredlg.ui \
+          ui/settingsdlg.ui \
           qubesmanager/about.py \
           qubesmanager/appmenu_select.py \
           qubesmanager/backup.py \
diff --git a/rpm_spec/qmgr.spec b/rpm_spec/qmgr.spec
index c36cdf7..c185307 100644
--- a/rpm_spec/qmgr.spec
+++ b/rpm_spec/qmgr.spec
@@ -24,7 +24,7 @@ AutoReq:	0
 The Graphical Qubes VM Manager.
 
 %build
-make res translations
+make ui res translations
 python3 -m compileall qubesmanager
 python3 -O -m compileall qubesmanager
 
diff --git a/about.ui b/ui/about.ui
similarity index 100%
rename from about.ui
rename to ui/about.ui
diff --git a/backupdlg.ui b/ui/backupdlg.ui
similarity index 99%
rename from backupdlg.ui
rename to ui/backupdlg.ui
index 61d06ab..31760d5 100644
--- a/backupdlg.ui
+++ b/ui/backupdlg.ui
@@ -35,7 +35,7 @@
          <string>Shutdown all running selected VMs</string>
         </property>
         <property name="icon">
-         <iconset resource="resources.qrc">
+         <iconset resource="../resources.qrc">
           <normaloff>:/shutdownvm.png</normaloff>:/shutdownvm.png</iconset>
         </property>
        </widget>
@@ -346,7 +346,7 @@ p, li { white-space: pre-wrap; }
   </widget>
  </widget>
  <resources>
-  <include location="resources.qrc"/>
+  <include location="../resources.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/globalsettingsdlg.ui b/ui/globalsettingsdlg.ui
similarity index 100%
rename from globalsettingsdlg.ui
rename to ui/globalsettingsdlg.ui
diff --git a/informationnotes.ui b/ui/informationnotes.ui
similarity index 100%
rename from informationnotes.ui
rename to ui/informationnotes.ui
diff --git a/logdlg.ui b/ui/logdlg.ui
similarity index 97%
rename from logdlg.ui
rename to ui/logdlg.ui
index dab5a02..06976f5 100644
--- a/logdlg.ui
+++ b/ui/logdlg.ui
@@ -56,7 +56,7 @@
         <string>Copy to Qubes clipboard</string>
        </property>
        <property name="icon">
-        <iconset resource="resources.qrc">
+        <iconset resource="../resources.qrc">
          <normaloff>:/copy.png</normaloff>:/copy.png</iconset>
        </property>
        <property name="iconSize">
@@ -88,7 +88,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="resources.qrc"/>
+  <include location="../resources.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/mainwindow.ui b/ui/mainwindow.ui
similarity index 100%
rename from mainwindow.ui
rename to ui/mainwindow.ui
diff --git a/multiselectwidget.ui b/ui/multiselectwidget.ui
similarity index 100%
rename from multiselectwidget.ui
rename to ui/multiselectwidget.ui
diff --git a/networknotes.ui b/ui/networknotes.ui
similarity index 100%
rename from networknotes.ui
rename to ui/networknotes.ui
diff --git a/newappvmdlg.ui b/ui/newappvmdlg.ui
similarity index 100%
rename from newappvmdlg.ui
rename to ui/newappvmdlg.ui
diff --git a/newfwruledlg.ui b/ui/newfwruledlg.ui
similarity index 100%
rename from newfwruledlg.ui
rename to ui/newfwruledlg.ui
diff --git a/releasenotes.ui b/ui/releasenotes.ui
similarity index 100%
rename from releasenotes.ui
rename to ui/releasenotes.ui
diff --git a/restoredlg.ui b/ui/restoredlg.ui
similarity index 100%
rename from restoredlg.ui
rename to ui/restoredlg.ui
diff --git a/settingsdlg.ui b/ui/settingsdlg.ui
similarity index 98%
rename from settingsdlg.ui
rename to ui/settingsdlg.ui
index 1e75e36..d8c233d 100644
--- a/settingsdlg.ui
+++ b/ui/settingsdlg.ui
@@ -14,7 +14,7 @@
    <string>Settings</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="resources.qrc">
+   <iconset resource="../resources.qrc">
     <normaloff>:/root.png</normaloff>:/root.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout">
@@ -808,7 +808,7 @@
        </widget>
        <widget class="QWidget" name="firewall_tab">
         <attribute name="icon">
-         <iconset resource="resources.qrc">
+         <iconset resource="../resources.qrc">
           <normaloff>:/firewall.png</normaloff>:/firewall.png</iconset>
         </attribute>
         <attribute name="title">
@@ -903,7 +903,7 @@
                 <string/>
                </property>
                <property name="icon">
-                <iconset resource="resources.qrc">
+                <iconset resource="../resources.qrc">
                  <normaloff>:/add.png</normaloff>:/add.png</iconset>
                </property>
                <property name="iconSize">
@@ -920,7 +920,7 @@
                 <string/>
                </property>
                <property name="icon">
-                <iconset resource="resources.qrc">
+                <iconset resource="../resources.qrc">
                  <normaloff>:/pencil.png</normaloff>:/pencil.png</iconset>
                </property>
                <property name="iconSize">
@@ -937,7 +937,7 @@
                 <string/>
                </property>
                <property name="icon">
-                <iconset resource="resources.qrc">
+                <iconset resource="../resources.qrc">
                  <normaloff>:/remove.png</normaloff>:/remove.png</iconset>
                </property>
                <property name="iconSize">
@@ -1014,7 +1014,7 @@
          <bool>true</bool>
         </property>
         <attribute name="icon">
-         <iconset resource="resources.qrc">
+         <iconset resource="../resources.qrc">
           <normaloff>:/storagevm.png</normaloff>:/storagevm.png</iconset>
         </attribute>
         <attribute name="title">
@@ -1060,7 +1060,7 @@
        </widget>
        <widget class="QWidget" name="apps_tab">
         <attribute name="icon">
-         <iconset resource="resources.qrc">
+         <iconset resource="../resources.qrc">
           <normaloff>:/apps.png</normaloff>:/apps.png</iconset>
         </attribute>
         <attribute name="title">
@@ -1089,7 +1089,7 @@
             <string/>
            </property>
            <property name="icon">
-            <iconset resource="resources.qrc">
+            <iconset resource="../resources.qrc">
              <normaloff>:/add.png</normaloff>:/add.png</iconset>
            </property>
            <property name="iconSize">
@@ -1130,7 +1130,7 @@
             <string/>
            </property>
            <property name="icon">
-            <iconset resource="resources.qrc">
+            <iconset resource="../resources.qrc">
              <normaloff>:/remove.png</normaloff>:/remove.png</iconset>
            </property>
            <property name="iconSize">
@@ -1209,7 +1209,7 @@
   <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources>
-  <include location="resources.qrc"/>
+  <include location="../resources.qrc"/>
  </resources>
  <connections>
   <connection>