From a35d205cea4958a8a8ddd00021eee5eadbe0b36d Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Fri, 16 Oct 2009 20:41:41 +0200 Subject: [PATCH 1/2] Reducing spacing on media manager items. --- openlp/core/lib/mediamanageritem.py | 2 +- openlp/plugins/bibles/lib/mediaitem.py | 8 +-- openlp/plugins/songs/lib/mediaitem.py | 72 ++++++++++++++------------ 3 files changed, 43 insertions(+), 39 deletions(-) diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index 2e151ebf4..9c54e05e1 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -113,7 +113,7 @@ class MediaManagerItem(QtGui.QWidget): self.title = title self.Toolbar = None self.PageLayout = QtGui.QVBoxLayout(self) - self.PageLayout.setSpacing(0) + self.PageLayout.setSpacing(4) self.PageLayout.setMargin(0) self.requiredIcons() self.setupUi() diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 462e3c34a..e0725ea67 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -80,7 +80,7 @@ class BibleMediaItem(MediaManagerItem): self.QuickVerticalLayout = QtGui.QVBoxLayout(self.QuickTab) self.QuickVerticalLayout.setObjectName("verticalLayout") self.QuickLayout = QtGui.QGridLayout() - self.QuickLayout.setMargin(5) + self.QuickLayout.setMargin(0) self.QuickLayout.setSpacing(4) self.QuickLayout.setObjectName(u'QuickLayout') self.QuickVersionLabel = QtGui.QLabel(self.QuickTab) @@ -127,7 +127,7 @@ class BibleMediaItem(MediaManagerItem): self.AdvancedVerticalLayout = QtGui.QVBoxLayout(self.AdvancedTab) self.AdvancedVerticalLayout.setObjectName("verticalLayout") self.AdvancedLayout = QtGui.QGridLayout() - self.AdvancedLayout.setMargin(5) + self.AdvancedLayout.setMargin(0) self.AdvancedLayout.setSpacing(4) self.AdvancedLayout.setObjectName(u'AdvancedLayout') self.AdvancedVersionLabel = QtGui.QLabel(self.AdvancedTab) @@ -173,10 +173,10 @@ class BibleMediaItem(MediaManagerItem): self.ClearAdvancedSearchComboBox.setObjectName( u'ClearAdvancedSearchComboBox') self.AdvancedLayout.addWidget( - self.ClearAdvancedSearchComboBox, 5, 2, 1, 1) + self.ClearAdvancedSearchComboBox, 5, 2, 1, 2) self.AdvancedSearchButton = QtGui.QPushButton(self.AdvancedTab) self.AdvancedSearchButton.setObjectName(u'AdvancedSearchButton') - self.AdvancedLayout.addWidget(self.AdvancedSearchButton, 5, 3, 1, 1) + self.AdvancedLayout.addWidget(self.AdvancedSearchButton, 6, 3, 1, 1) self.AdvancedVerticalLayout.addLayout(self.AdvancedLayout) self.AdvancedSecondBibleComboBox = QtGui.QComboBox(self.AdvancedTab) self.AdvancedSecondBibleComboBox.setObjectName(u'SecondBible') diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index f8e0f67fa..8488766bf 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -68,42 +68,48 @@ class SongMediaItem(MediaManagerItem): u'Maintain the lists of authors, topics and books'), ':/songs/song_maintenance.png', self.onSongMaintenanceClick, 'SongMaintenanceItem') - ## Add the SongListView widget ## - # Create the tab widget - self.SongWidget = QtGui.QWidget(self) - sizePolicy = QtGui.QSizePolicy( - QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth( - self.SongWidget.sizePolicy().hasHeightForWidth()) - self.SongWidget.setSizePolicy(sizePolicy) - self.SongWidget.setObjectName(u'SongWidget') - self.SearchLayout = QtGui.QGridLayout(self.SongWidget) - self.SearchLayout.setMargin(5) + self.SearchLayout = QtGui.QFormLayout() + self.SearchLayout.setMargin(0) self.SearchLayout.setSpacing(4) self.SearchLayout.setObjectName(u'SearchLayout') - self.SearchTypeComboBox = QtGui.QComboBox(self.SongWidget) - self.SearchTypeComboBox.setObjectName(u'SearchTypeComboBox') - self.SearchLayout.addWidget(self.SearchTypeComboBox, 0, 1, 1, 2) - self.SearchTypeLabel = QtGui.QLabel(self.SongWidget) - self.SearchTypeLabel.setObjectName(u'SearchTypeLabel') - self.SearchLayout.addWidget(self.SearchTypeLabel, 0, 0, 1, 1) - self.SearchTextLabel = QtGui.QLabel(self.SongWidget) + self.SearchTextLabel = QtGui.QLabel(self) + self.SearchTextLabel.setAlignment( + QtCore.Qt.AlignBottom|QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft) self.SearchTextLabel.setObjectName(u'SearchTextLabel') - self.SearchLayout.addWidget(self.SearchTextLabel, 2, 0, 1, 1) - self.SearchTextEdit = QtGui.QLineEdit(self.SongWidget) + self.SearchLayout.setWidget( + 0, QtGui.QFormLayout.LabelRole, self.SearchTextLabel) + self.SearchTextEdit = QtGui.QLineEdit(self) self.SearchTextEdit.setObjectName(u'SearchTextEdit') - self.SearchLayout.addWidget(self.SearchTextEdit, 2, 1, 1, 2) - self.ClearTextButton = QtGui.QPushButton(self.SongWidget) - self.ClearTextButton.setObjectName(u'ClearTextButton') - self.SearchLayout.addWidget(self.ClearTextButton, 3, 1, 1, 1) - self.SearchTextButton = QtGui.QPushButton(self.SongWidget) + self.SearchLayout.setWidget( + 0, QtGui.QFormLayout.FieldRole, self.SearchTextEdit) + self.SearchTypeLabel = QtGui.QLabel(self) + self.SearchTypeLabel.setAlignment( + QtCore.Qt.AlignBottom|QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft) + self.SearchTypeLabel.setObjectName(u'SearchTypeLabel') + self.SearchLayout.setWidget( + 1, QtGui.QFormLayout.LabelRole, self.SearchTypeLabel) + self.SearchTypeComboBox = QtGui.QComboBox(self) + self.SearchTypeComboBox.setObjectName(u'SearchTypeComboBox') + self.SearchLayout.setWidget( + 1, QtGui.QFormLayout.FieldRole, self.SearchTypeComboBox) + self.PageLayout.addLayout(self.SearchLayout) + self.SearchButtonLayout = QtGui.QHBoxLayout(self) + self.SearchButtonLayout.setMargin(0) + self.SearchButtonLayout.setSpacing(4) + self.SearchButtonLayout.setObjectName(u'SearchButtonLayout') + self.SearchButtonSpacer = QtGui.QSpacerItem(40, 20, + QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.SearchButtonLayout.addItem(self.SearchButtonSpacer) + self.SearchTextButton = QtGui.QPushButton(self) self.SearchTextButton.setObjectName(u'SearchTextButton') - self.SearchLayout.addWidget(self.SearchTextButton, 3, 2, 1, 1) - # Add the song widget to the page layout - self.PageLayout.addWidget(self.SongWidget) + self.SearchButtonLayout.addWidget(self.SearchTextButton) + self.ClearTextButton = QtGui.QPushButton(self) + self.ClearTextButton.setObjectName(u'ClearTextButton') + self.SearchButtonLayout.addWidget(self.ClearTextButton) + self.PageLayout.addLayout(self.SearchButtonLayout) # Signals and slots + QtCore.QObject.connect(self.SearchTextEdit, + QtCore.SIGNAL(u'returnPressed()'), self.onSearchTextButtonClick) QtCore.QObject.connect(self.SearchTextButton, QtCore.SIGNAL(u'pressed()'), self.onSearchTextButtonClick) QtCore.QObject.connect(self.ClearTextButton, @@ -115,10 +121,8 @@ class SongMediaItem(MediaManagerItem): QtCore.SIGNAL(u'load_song_list'), self.onSearchTextButtonClick) def retranslateUi(self): - self.SearchTypeLabel.setText( - translate(u'SongMediaItem', u'Search Type:')) - self.SearchTextLabel.setText( - translate(u'SongMediaItem', u'Search Text:')) + self.SearchTextLabel.setText(translate(u'SongMediaItem', u'Search:')) + self.SearchTypeLabel.setText(translate(u'SongMediaItem', u'Type:')) self.ClearTextButton.setText(translate(u'SongMediaItem', u'Clear')) self.SearchTextButton.setText(translate(u'SongMediaItem', u'Search')) From f2058a516a3977febe8a56ff1c64a4b35158ac5b Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Sat, 17 Oct 2009 12:55:28 +0200 Subject: [PATCH 2/2] Playing around with the look and feel of tabs on the ToolBox --- openlp/core/ui/mainwindow.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 67b9bcd3d..bd1cadc7a 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -107,9 +107,18 @@ class Ui_MainWindow(object): self.MediaManagerDock = OpenLPDockWidget(MainWindow) MediaManagerIcon = buildIcon(u':/system/system_mediamanager.png') self.MediaManagerDock.setWindowIcon(MediaManagerIcon) - self.MediaManagerDock.setObjectName(u'MediaManagerDock') + self.MediaManagerDock.setStyleSheet(""" + 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.settingsmanager.mainwindow_left) + self.MediaManagerDock.setObjectName(u'MediaManagerDock') self.MediaManagerContents = QtGui.QWidget() self.MediaManagerContents.setObjectName(u'MediaManagerContents') self.MediaManagerLayout = QtGui.QHBoxLayout(self.MediaManagerContents)