From 75550b505bdb2bc88b4b3e8d12e129c0e6a46ba6 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Tue, 28 Jun 2011 17:35:50 +0100 Subject: [PATCH 1/4] Save Controller Toolbars Fixes: https://launchpad.net/bugs/765239 --- openlp/core/ui/mainwindow.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index e73ea5b80..ca84de411 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -1030,6 +1030,10 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): self.restoreGeometry( settings.value(u'main window geometry').toByteArray()) self.restoreState(settings.value(u'main window state').toByteArray()) + self.liveController.splitter.restoreState( + settings.value(u'live splitter geometry').toByteArray()) + self.previewController.splitter.restoreState( + settings.value(u'preview splitter geometry').toByteArray()) settings.endGroup() def saveSettings(self): @@ -1050,6 +1054,10 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): QtCore.QVariant(self.saveState())) settings.setValue(u'main window geometry', QtCore.QVariant(self.saveGeometry())) + settings.setValue(u'live splitter geometry', + QtCore.QVariant(self.liveController.splitter.saveState())) + settings.setValue(u'preview splitter geometry', + QtCore.QVariant(self.liveController.splitter.saveState())) settings.endGroup() def updateFileMenu(self): From a167f6ef86f4d21799d7dcd7b5a8abb04101e1bd Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Tue, 28 Jun 2011 17:40:17 +0100 Subject: [PATCH 2/4] Make progressbar smaller --- openlp/core/ui/mainwindow.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index ca84de411..53cd5a792 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -65,6 +65,12 @@ MEDIA_MANAGER_STYLE = """ } """ +PROGRESSBAR = """ + QProgressBar{ + height: 10px; + } +""" + class Ui_MainWindow(object): def setupUi(self, mainWindow): """ @@ -130,6 +136,7 @@ class Ui_MainWindow(object): self.statusBar.addPermanentWidget(self.loadProgressBar) self.loadProgressBar.hide() self.loadProgressBar.setValue(0) + self.loadProgressBar.setStyleSheet(PROGRESSBAR) self.defaultThemeLabel = QtGui.QLabel(self.statusBar) self.defaultThemeLabel.setObjectName(u'defaultThemeLabel') self.statusBar.addPermanentWidget(self.defaultThemeLabel) From 30df723358536ab462a050fbe51f3871039e88ca Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 29 Jun 2011 07:12:32 +0100 Subject: [PATCH 3/4] Fixes --- openlp/core/ui/mainwindow.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 53cd5a792..67839b52f 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -65,7 +65,7 @@ MEDIA_MANAGER_STYLE = """ } """ -PROGRESSBAR = """ +PROGRESSBAR_STYLE = """ QProgressBar{ height: 10px; } @@ -136,7 +136,7 @@ class Ui_MainWindow(object): self.statusBar.addPermanentWidget(self.loadProgressBar) self.loadProgressBar.hide() self.loadProgressBar.setValue(0) - self.loadProgressBar.setStyleSheet(PROGRESSBAR) + self.loadProgressBar.setStyleSheet(PROGRESSBAR_STYLE) self.defaultThemeLabel = QtGui.QLabel(self.statusBar) self.defaultThemeLabel.setObjectName(u'defaultThemeLabel') self.statusBar.addPermanentWidget(self.defaultThemeLabel) @@ -1064,7 +1064,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): settings.setValue(u'live splitter geometry', QtCore.QVariant(self.liveController.splitter.saveState())) settings.setValue(u'preview splitter geometry', - QtCore.QVariant(self.liveController.splitter.saveState())) + QtCore.QVariant(self.previewController.splitter.saveState())) settings.endGroup() def updateFileMenu(self): From 143e69728173e6596e06b3ea1c75030f98a85863 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 29 Jun 2011 17:11:19 +0100 Subject: [PATCH 4/4] Add middle splitter --- openlp/core/ui/mainwindow.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 67839b52f..a34cb7b96 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -1041,6 +1041,9 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): settings.value(u'live splitter geometry').toByteArray()) self.previewController.splitter.restoreState( settings.value(u'preview splitter geometry').toByteArray()) + self.controlSplitter.restoreState( + settings.value(u'mainwindow splitter geometry').toByteArray()) + settings.endGroup() def saveSettings(self): @@ -1065,6 +1068,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): QtCore.QVariant(self.liveController.splitter.saveState())) settings.setValue(u'preview splitter geometry', QtCore.QVariant(self.previewController.splitter.saveState())) + settings.setValue(u'mainwindow splitter geometry', + QtCore.QVariant(self.controlSplitter.saveState())) settings.endGroup() def updateFileMenu(self):