use new icon from qubes-artwork

mainwindow.ui

@@ -23,8 +23,7 @@
    <string>Qubes VM Manager</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="resources.qrc">
-    <normaloff>:/qubes.png</normaloff>:/qubes.png</iconset>
+   <iconset theme="qubes-manager"/>
   </property>
   <property name="locale">
    <locale language="English" country="UnitedStates"/>
@@ -769,8 +768,7 @@
   </action>
   <action name="action_about_qubes">
    <property name="icon">
-    <iconset resource="resources.qrc">
-     <normaloff>:/qubes.png</normaloff>:/qubes.png</iconset>
+    <iconset theme="qubes-manager"/>
    </property>
    <property name="text">
     <string>Qubes OS</string>

newappvmdlg.ui

@@ -14,8 +14,7 @@
    <string>Create New VM</string>
   </property>
   <property name="windowIcon">
-   <iconset>
-    <normaloff>:/qubes.png</normaloff>:/qubes.png</iconset>
+   <iconset theme="qubes-manager"/>
   </property>
   <widget class="QFrame" name="hvmtemplatewarningbox">
    <property name="geometry">

qubes-manager.desktop

@@ -2,7 +2,7 @@
 Type=Application
 Exec=qubes-manager
 Path=/var/lib/qubes
-Icon=/usr/share/qubes/icons/qubes.png
+Icon=qubes-manager
 Terminal=false
 Name=Qubes VM Manager
 GenericName=Qubes VM Manager

qubesmanager/main.py

@@ -1690,7 +1690,7 @@ class QubesTrayIcon(QSystemTrayIcon):
         if self.tray_notifier_type == "KDE":
             message = message.replace('\n', '<br/>\n')
         self.tray_notifier.call("Notify", "Qubes", v_replace_id,
-                "/usr/share/qubes/icons/qubes.png", "Qubes VM Manager",
+                "qubes-manager", "Qubes VM Manager",
                 message, v_actions, QVariant.fromMap({}), msecs)
 
     def createAction(self, text, slot=None, shortcut=None, icon=None,
@@ -1862,7 +1862,7 @@ def main():
     app.setOrganizationName("The Qubes Project")
     app.setOrganizationDomain("http://qubes-os.org")
     app.setApplicationName("Qubes VM Manager")
-    app.setWindowIcon(QIcon(":/qubes.png"))
+    app.setWindowIcon(QIcon.fromTheme("qubes-manager"))
     app.setAttribute(Qt.AA_DontShowIconsInMenus, False)
 
     sys.excepthook = handle_exception
@@ -1878,7 +1878,7 @@ def main():
     blk_manager = QubesBlockDevicesManager(qvm_collection)
 
     global trayIcon
-    trayIcon = QubesTrayIcon(QIcon(":/qubes.png"), blk_manager)
+    trayIcon = QubesTrayIcon(QIcon.fromTheme("qubes-manager"), blk_manager)
 
     global manager_window
     manager_window = VmManagerWindow(qvm_collection, blk_manager)

resources.qrc

@@ -28,7 +28,6 @@
     <file alias="flag-yellow.png">icons/flag-yellow.png</file>
     <file alias="remove.png">icons/remove.png</file>
     <file alias="appsprefs.png">icons/appsprefs.png</file>
-    <file alias="qubes.png">icons/qubes.png</file>
     <file alias="appvm.png">icons/appvm.png</file>
     <file alias="netvm.png">icons/netvm.png</file>
     <file alias="proxyvm.png">icons/proxyvm.png</file>

rpm_spec/qmgr.spec

@@ -14,6 +14,7 @@ URL:		http://fixme
 Requires:	python, PyQt4, qubes-core-dom0 > 1.7.23
 Requires:	pmount, cryptsetup, wmctrl
 Requires:	dbus
+Requires:	qubes-artwork
 BuildRequires:	PyQt4-devel
 AutoReq:	0