summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <wyskas@gmail.com>2009-03-12 16:02:44 +0100
committerAnton Khirnov <wyskas@gmail.com>2009-03-12 16:02:44 +0100
commitd1d34bf429baf282bb91b30805232cb29450d0a3 (patch)
treee8c606dba950c533a31725bde1840e463bb42ad8
parenta45d35eaa9e80af973cd4e62c1efa539dd4853f7 (diff)
Set default application icon.
-rwxr-xr-xnephilim.py3
-rw-r--r--nephilim/connect_wg.py3
-rw-r--r--nephilim/settings_win.py3
-rw-r--r--nephilim/winMain.py2
4 files changed, 3 insertions, 8 deletions
diff --git a/nephilim.py b/nephilim.py
index 6cefbe0..4e7ce45 100755
--- a/nephilim.py
+++ b/nephilim.py
@@ -28,7 +28,7 @@ except ImportError:
sys.exit('PyQt4 not found. Ensure that it is installed.')
from nephilim.winMain import winMain
-from nephilim.misc import APPNAME, ORGNAME
+from nephilim.misc import APPNAME, ORGNAME, appIcon
def main():
@@ -36,6 +36,7 @@ def main():
app = QtGui.QApplication(sys.argv)
app.setApplicationName(APPNAME)
app.setOrganizationName(ORGNAME)
+ app.setWindowIcon(QtGui.QIcon(appIcon))
wMain = winMain()
wMain.show()
diff --git a/nephilim/connect_wg.py b/nephilim/connect_wg.py
index a7c3896..373b612 100644
--- a/nephilim/connect_wg.py
+++ b/nephilim/connect_wg.py
@@ -2,8 +2,6 @@ from PyQt4 import QtGui, QtCore
from PyQt4.QtCore import QVariant
import time
-from misc import appIcon
-
class ConnectWidget(QtGui.QWidget):
host_txt = None
port_txt = None
@@ -31,7 +29,6 @@ class ConnectWidget(QtGui.QWidget):
self.layout().addWidget(self.port_txt, 1, 1)
self.layout().addWidget(self.connect_btn, 2, 0)
- self.setWindowIcon(QtGui.QIcon(appIcon))
self.setWindowTitle('Connect to MPD')
self.center()
diff --git a/nephilim/settings_win.py b/nephilim/settings_win.py
index d5e021d..df822da 100644
--- a/nephilim/settings_win.py
+++ b/nephilim/settings_win.py
@@ -2,7 +2,7 @@ from PyQt4 import QtGui, QtCore
from PyQt4.QtCore import QVariant
import os
-from misc import Button, appIcon
+from misc import Button
import plugin
@@ -103,7 +103,6 @@ class SettingsWindow(QtGui.QWidget):
self.connect(self.pluginlist, QtCore.SIGNAL('itemChanged(QListWidgetItem*)'), self.plugin_checked)
- self.setWindowIcon(QtGui.QIcon(appIcon))
self.setWindowTitle('Settings')
self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
self.center()
diff --git a/nephilim/winMain.py b/nephilim/winMain.py
index 0a5b3c5..29a3839 100644
--- a/nephilim/winMain.py
+++ b/nephilim/winMain.py
@@ -107,8 +107,6 @@ class winMain(QtGui.QMainWindow):
self.connect(self.mpclient, QtCore.SIGNAL('time_changed'), self.on_time_change)
self.enableAll(True)
- self.setWindowIcon(QtGui.QIcon(appIcon))
- # set icon in system tray
self.wConnect.monitor()
self.update_state_messages()