raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Merge from lp:~raoul-snyman/openlp/uifixes

Browse Source 
bzr-revno: 606
This commit is contained in:
Raoul Snyman 2009-10-17 21:14:39 +02:00
commit 3e4f07be6e
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/core/lib/mediamanageritem.py
View File

@ -113,8 +113,8 @@ class MediaManagerItem(QtGui.QWidget):
self.title = title self.title = title
self.Toolbar = None self.Toolbar = None
self.PageLayout = QtGui.QVBoxLayout(self) self.PageLayout = QtGui.QVBoxLayout(self)
self.PageLayout.setSpacing(4) self.PageLayout.setSpacing(0)
self.PageLayout.setMargin(0) self.PageLayout.setContentsMargins(4, 0, 4, 0)
self.requiredIcons() self.requiredIcons()
self.setupUi() self.setupUi()
self.retranslateUi() self.retranslateUi()

26
openlp/core/ui/mainwindow.py
View File

@ -35,6 +35,22 @@ from openlp.core.lib import translate, RenderManager, PluginConfig, \
buildIcon buildIcon
from openlp.core.utils import check_latest_version from openlp.core.utils import check_latest_version
media_manager_style = """
QToolBox::tab {
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 palette(midlight), stop: 1.0 palette(dark));
border-width: 1px;
border-style: outset;
border-color: palette(midlight);
border-radius: 5px;
}
QToolBox::tab:selected {
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 palette(light), stop: 1.0 palette(dark));
border-color: palette(light);
}
"""
class Ui_MainWindow(object): class Ui_MainWindow(object):
def setupUi(self, MainWindow): def setupUi(self, MainWindow):
""" """
@ -107,15 +123,7 @@ class Ui_MainWindow(object):
self.MediaManagerDock = OpenLPDockWidget(MainWindow) self.MediaManagerDock = OpenLPDockWidget(MainWindow)
MediaManagerIcon = buildIcon(u':/system/system_mediamanager.png') MediaManagerIcon = buildIcon(u':/system/system_mediamanager.png')
self.MediaManagerDock.setWindowIcon(MediaManagerIcon) self.MediaManagerDock.setWindowIcon(MediaManagerIcon)
self.MediaManagerDock.setStyleSheet(""" self.MediaManagerDock.setStyleSheet(media_manager_style)
QToolBox::tab {
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 palette(light), stop: 1.0 palette(dark));
border: none;
border-radius: 5px;
margin: 0;
}
""")
self.MediaManagerDock.setMinimumWidth( self.MediaManagerDock.setMinimumWidth(
self.settingsmanager.mainwindow_left) self.settingsmanager.mainwindow_left)
self.MediaManagerDock.setObjectName(u'MediaManagerDock') self.MediaManagerDock.setObjectName(u'MediaManagerDock')

2
openlp/plugins/songs/lib/mediaitem.py
View File

@ -93,7 +93,7 @@ class SongMediaItem(MediaManagerItem):
self.SearchLayout.setWidget( self.SearchLayout.setWidget(
1, QtGui.QFormLayout.FieldRole, self.SearchTypeComboBox) 1, QtGui.QFormLayout.FieldRole, self.SearchTypeComboBox)
self.PageLayout.addLayout(self.SearchLayout) self.PageLayout.addLayout(self.SearchLayout)
self.SearchButtonLayout = QtGui.QHBoxLayout(self) self.SearchButtonLayout = QtGui.QHBoxLayout()
self.SearchButtonLayout.setMargin(0) self.SearchButtonLayout.setMargin(0)
self.SearchButtonLayout.setSpacing(4) self.SearchButtonLayout.setSpacing(4)
self.SearchButtonLayout.setObjectName(u'SearchButtonLayout') self.SearchButtonLayout.setObjectName(u'SearchButtonLayout')