spring cleaning part 1

ui/
This commit is contained in:
Wojtek Porczyk 2017-06-26 16:49:35 +02:00
parent 1c47c31a06
commit 933a4b82db
16 changed files with 31 additions and 39 deletions

View File

@ -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

View File

@ -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 \

View File

@ -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

View File

@ -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>

View File

@ -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>

View File

@ -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>