forked from openlp/openlp
Fixed the main form splitter problem, set the margins and spacing on some of the layouts in the bible media item.
bzr-revno: 377
This commit is contained in:
parent
c4c3fb4851
commit
8533912cea
@ -92,8 +92,7 @@ class MainWindow(object):
|
|||||||
self.ControlSplitter = QtGui.QSplitter(self.MainContent)
|
self.ControlSplitter = QtGui.QSplitter(self.MainContent)
|
||||||
self.ControlSplitter.setOrientation(QtCore.Qt.Horizontal)
|
self.ControlSplitter.setOrientation(QtCore.Qt.Horizontal)
|
||||||
self.ControlSplitter.setObjectName("ControlSplitter")
|
self.ControlSplitter.setObjectName("ControlSplitter")
|
||||||
# TODO: need some way to make this geometry work properly!
|
self.MainContentLayout.addWidget(self.ControlSplitter)
|
||||||
self.ControlSplitter.setGeometry(self.main_window.geometry())
|
|
||||||
self.PreviewController = SlideController(self.ControlSplitter)
|
self.PreviewController = SlideController(self.ControlSplitter)
|
||||||
self.LiveController = SlideController(self.ControlSplitter)
|
self.LiveController = SlideController(self.ControlSplitter)
|
||||||
self.MenuBar = QtGui.QMenuBar(self.main_window)
|
self.MenuBar = QtGui.QMenuBar(self.main_window)
|
||||||
|
@ -74,21 +74,21 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
self.QuickTab = QtGui.QWidget()
|
self.QuickTab = QtGui.QWidget()
|
||||||
self.QuickTab.setObjectName('QuickTab')
|
self.QuickTab.setObjectName('QuickTab')
|
||||||
self.QuickLayout = QtGui.QGridLayout(self.QuickTab)
|
self.QuickLayout = QtGui.QGridLayout(self.QuickTab)
|
||||||
|
self.QuickLayout.setMargin(8)
|
||||||
|
self.QuickLayout.setSpacing(8)
|
||||||
self.QuickLayout.setObjectName('QuickLayout')
|
self.QuickLayout.setObjectName('QuickLayout')
|
||||||
self.QuickVersionComboBox = QtGui.QComboBox(self.QuickTab)
|
|
||||||
self.QuickVersionComboBox.setObjectName('VersionComboBox')
|
|
||||||
self.QuickLayout.addWidget(self.QuickVersionComboBox, 0, 1, 1, 2)
|
|
||||||
self.QuickVersionLabel = QtGui.QLabel(self.QuickTab)
|
self.QuickVersionLabel = QtGui.QLabel(self.QuickTab)
|
||||||
self.QuickVersionLabel.setObjectName('QuickVersionLabel')
|
self.QuickVersionLabel.setObjectName('QuickVersionLabel')
|
||||||
self.QuickLayout.addWidget(self.QuickVersionLabel, 0, 0, 1, 1)
|
self.QuickLayout.addWidget(self.QuickVersionLabel, 0, 0, 1, 1)
|
||||||
|
self.QuickVersionComboBox = QtGui.QComboBox(self.QuickTab)
|
||||||
self.QuickSearchComboBox = QtGui.QComboBox(self.QuickTab)
|
self.QuickVersionComboBox.setObjectName('VersionComboBox')
|
||||||
self.QuickSearchComboBox.setObjectName('SearchComboBox')
|
self.QuickLayout.addWidget(self.QuickVersionComboBox, 0, 1, 1, 2)
|
||||||
self.QuickLayout.addWidget(self.QuickSearchComboBox, 1, 1, 1, 2)
|
|
||||||
self.QuickSearchLabel = QtGui.QLabel(self.QuickTab)
|
self.QuickSearchLabel = QtGui.QLabel(self.QuickTab)
|
||||||
self.QuickSearchLabel.setObjectName('QuickSearchLabel')
|
self.QuickSearchLabel.setObjectName('QuickSearchLabel')
|
||||||
self.QuickLayout.addWidget(self.QuickSearchLabel, 1, 0, 1, 1)
|
self.QuickLayout.addWidget(self.QuickSearchLabel, 1, 0, 1, 1)
|
||||||
|
self.QuickSearchComboBox = QtGui.QComboBox(self.QuickTab)
|
||||||
|
self.QuickSearchComboBox.setObjectName('SearchComboBox')
|
||||||
|
self.QuickLayout.addWidget(self.QuickSearchComboBox, 1, 1, 1, 2)
|
||||||
self.QuickSearchLabel = QtGui.QLabel(self.QuickTab)
|
self.QuickSearchLabel = QtGui.QLabel(self.QuickTab)
|
||||||
self.QuickSearchLabel.setObjectName('QuickSearchLabel')
|
self.QuickSearchLabel.setObjectName('QuickSearchLabel')
|
||||||
self.QuickLayout.addWidget(self.QuickSearchLabel, 2, 0, 1, 1)
|
self.QuickLayout.addWidget(self.QuickSearchLabel, 2, 0, 1, 1)
|
||||||
@ -98,7 +98,6 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
self.QuickSearchButton = QtGui.QPushButton(self.QuickTab)
|
self.QuickSearchButton = QtGui.QPushButton(self.QuickTab)
|
||||||
self.QuickSearchButton.setObjectName('QuickSearchButton')
|
self.QuickSearchButton.setObjectName('QuickSearchButton')
|
||||||
self.QuickLayout.addWidget(self.QuickSearchButton, 3, 2, 1, 1)
|
self.QuickLayout.addWidget(self.QuickSearchButton, 3, 2, 1, 1)
|
||||||
|
|
||||||
self.QuickClearLabel = QtGui.QLabel(self.QuickTab)
|
self.QuickClearLabel = QtGui.QLabel(self.QuickTab)
|
||||||
self.QuickClearLabel.setObjectName('QuickSearchLabel')
|
self.QuickClearLabel.setObjectName('QuickSearchLabel')
|
||||||
self.QuickLayout.addWidget(self.QuickClearLabel, 3, 0, 1, 1)
|
self.QuickLayout.addWidget(self.QuickClearLabel, 3, 0, 1, 1)
|
||||||
@ -113,6 +112,8 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
self.AdvancedTab = QtGui.QWidget()
|
self.AdvancedTab = QtGui.QWidget()
|
||||||
self.AdvancedTab.setObjectName('AdvancedTab')
|
self.AdvancedTab.setObjectName('AdvancedTab')
|
||||||
self.AdvancedLayout = QtGui.QGridLayout(self.AdvancedTab)
|
self.AdvancedLayout = QtGui.QGridLayout(self.AdvancedTab)
|
||||||
|
self.AdvancedLayout.setMargin(8)
|
||||||
|
self.AdvancedLayout.setSpacing(8)
|
||||||
self.AdvancedLayout.setObjectName('AdvancedLayout')
|
self.AdvancedLayout.setObjectName('AdvancedLayout')
|
||||||
self.AdvancedVersionLabel = QtGui.QLabel(self.AdvancedTab)
|
self.AdvancedVersionLabel = QtGui.QLabel(self.AdvancedTab)
|
||||||
self.AdvancedVersionLabel.setObjectName('AdvancedVersionLabel')
|
self.AdvancedVersionLabel.setObjectName('AdvancedVersionLabel')
|
||||||
|
Loading…
Reference in New Issue
Block a user