Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use new icon from qubes-artwork

Browse Source
This commit is contained in:
Wojciech Zygmunt Porczyk 2014-07-09 18:21:56 +02:00
parent 159eea7ac8
commit 060b16900a
7 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
icons/qubes.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 20 KiB

6
mainwindow.ui
View File

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

3
newappvmdlg.ui
View File

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

2
qubes-manager.desktop
View File

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

6
qubesmanager/main.py
View File

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

1
resources.qrc
View File

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

1
rpm_spec/qmgr.spec
View File

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