openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #08210
[Merge] lp:~googol-hush/openlp/trivial into lp:openlp
Andreas Preikschat has proposed merging lp:~googol-hush/openlp/trivial into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~googol-hush/openlp/trivial/+merge/58784
Hello,
- fixed logo pixelation (http://img215.imageshack.us/i/logozmf.png/)
- removed logo from maindisplay (has Tool flag -> no need for a logo)
--
https://code.launchpad.net/~googol-hush/openlp/trivial/+merge/58784
Your team OpenLP Core is requested to review the proposed merge of lp:~googol-hush/openlp/trivial into lp:openlp.
=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py 2011-04-10 22:10:23 +0000
+++ openlp/core/ui/maindisplay.py 2011-04-22 06:32:20 +0000
@@ -69,8 +69,6 @@
self.hideMode = None
self.videoHide = False
self.override = {}
- mainIcon = build_icon(u':/icon/openlp-logo-16x16.png')
- self.setWindowIcon(mainIcon)
self.retranslateUi()
self.setStyleSheet(u'border: 0px; margin: 0px; padding: 0px;')
self.setWindowFlags(QtCore.Qt.FramelessWindowHint | QtCore.Qt.Tool |
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2011-04-17 11:00:44 +0000
+++ openlp/core/ui/mainwindow.py 2011-04-22 06:32:20 +0000
@@ -71,7 +71,7 @@
mainWindow.setObjectName(u'MainWindow')
mainWindow.resize(self.settingsmanager.width,
self.settingsmanager.height)
- mainWindow.setWindowIcon(build_icon(u':/icon/openlp-logo-16x16.png'))
+ mainWindow.setWindowIcon(build_icon(u':/icon/openlp-logo-64x64.png'))
mainWindow.setDockNestingEnabled(True)
# Set up the main container, which contains all the other form widgets.
self.MainContent = QtGui.QWidget(mainWindow)