From d84abfaadbdbbf279172f7d4c2605781c90ede3b Mon Sep 17 00:00:00 2001
From: "s.mehrbrodt@exposong.org" <s.mehrbrodt@exposong.org>
Date: Wed, 17 Jul 2013 12:02:54 +0200
Subject: [PATCH 1/3] Set Minimum Size for PreviewPane and LivePane

---
 resources/forms/mainwindow.ui | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/resources/forms/mainwindow.ui b/resources/forms/mainwindow.ui
index 2b422d930..60595864e 100644
--- a/resources/forms/mainwindow.ui
+++ b/resources/forms/mainwindow.ui
@@ -38,6 +38,12 @@
        <enum>Qt::Horizontal</enum>
       </property>
       <widget class="QWidget" native="1" name="PreviewPane" >
+       <property name="minimumSize">
+        <size>
+         <width>150</width>
+         <height>0</height>
+        </size>
+       </property>
        <layout class="QVBoxLayout" name="PreviewPaneLayout" >
         <property name="spacing" >
          <number>0</number>
@@ -78,6 +84,12 @@
        </layout>
       </widget>
       <widget class="QWidget" native="1" name="LivePane" >
+       <property name="minimumSize">
+        <size>
+         <width>150</width>
+         <height>0</height>
+        </size>
+       </property>
        <layout class="QVBoxLayout" name="LivePaneLayout" >
         <property name="spacing" >
          <number>0</number>

From 951d8964db6dbcdf1335f2b187daa665f2df784a Mon Sep 17 00:00:00 2001
From: "s.mehrbrodt@gmail.com" <s.mehrbrodt@gmail.com>
Date: Fri, 19 Jul 2013 17:36:45 +0200
Subject: [PATCH 2/3] Don't allow to collapse the Live or Preview Pane.

They can still be hidden via the menu.
---
 openlp/core/ui/mainwindow.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 307239032..e616a7b42 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -1196,6 +1196,9 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         self.live_controller.splitter.restoreState(settings.value(u'live splitter geometry'))
         self.preview_controller.splitter.restoreState(settings.value(u'preview splitter geometry'))
         self.control_splitter.restoreState(settings.value(u'main window splitter geometry'))
+        #This needs to be called after restoreState(), because saveState() also saves the "Collapsible" property
+        #which was True (by default) < OpenLP 2.1.
+        self.control_splitter.setChildrenCollapsible(False)
         settings.endGroup()
 
     def save_settings(self):

From 41cfa38fb6387b4450744214d89af069c1c9f788 Mon Sep 17 00:00:00 2001
From: "s.mehrbrodt@gmail.com" <s.mehrbrodt@gmail.com>
Date: Fri, 19 Jul 2013 17:39:05 +0200
Subject: [PATCH 3/3] Revert changes in mainwindow.ui file

---
 resources/forms/mainwindow.ui | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/resources/forms/mainwindow.ui b/resources/forms/mainwindow.ui
index 60595864e..2b422d930 100644
--- a/resources/forms/mainwindow.ui
+++ b/resources/forms/mainwindow.ui
@@ -38,12 +38,6 @@
        <enum>Qt::Horizontal</enum>
       </property>
       <widget class="QWidget" native="1" name="PreviewPane" >
-       <property name="minimumSize">
-        <size>
-         <width>150</width>
-         <height>0</height>
-        </size>
-       </property>
        <layout class="QVBoxLayout" name="PreviewPaneLayout" >
         <property name="spacing" >
          <number>0</number>
@@ -84,12 +78,6 @@
        </layout>
       </widget>
       <widget class="QWidget" native="1" name="LivePane" >
-       <property name="minimumSize">
-        <size>
-         <width>150</width>
-         <height>0</height>
-        </size>
-       </property>
        <layout class="QVBoxLayout" name="LivePaneLayout" >
         <property name="spacing" >
          <number>0</number>