Merged lp:~raoul-snyman/openlp/uifixes

bzr-revno: 608

openlp.pyw

@@ -23,6 +23,7 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
+import os
 import sys
 import logging
 
@@ -37,6 +38,19 @@ from openlp.core.utils import ConfigHelper
 
 log = logging.getLogger()
 
+application_stylesheet = u"""
+QMainWindow::separator
+{
+  border: none;
+}
+
+QDockWidget::title
+{
+  border: none;
+  padding-left: 2px;
+}
+"""
+
 class OpenLP(QtGui.QApplication):
     """
     The core application class. This class inherits from Qt's QApplication
@@ -60,6 +74,8 @@ class OpenLP(QtGui.QApplication):
             QtCore.SIGNAL(u'process_events'), self.processEvents)
         self.setApplicationName(u'OpenLP')
         self.setApplicationVersion(applicationVersion)
+        if os.name == u'nt':
+            self.setStyleSheet(application_stylesheet)
         show_splash = str_to_bool(ConfigHelper.get_registry().get_value(
             u'general', u'show splash', True))
         if show_splash:

openlp/core/ui/slidecontroller.py

@@ -77,13 +77,22 @@ class SlideController(QtGui.QWidget):
         self.timer_id = 0
         self.commandItem = None
         self.Panel = QtGui.QWidget(parent.ControlSplitter)
-        self.Splitter = QtGui.QSplitter(self.Panel)
-        self.Splitter.setOrientation(QtCore.Qt.Vertical)
         # Layout for holding panel
         self.PanelLayout = QtGui.QVBoxLayout(self.Panel)
-        self.PanelLayout.addWidget(self.Splitter)
         self.PanelLayout.setSpacing(0)
         self.PanelLayout.setMargin(0)
+        # Type label for the top of the slide controller
+        self.TypeLabel = QtGui.QLabel(self.Panel)
+        if self.isLive:
+            self.TypeLabel.setText(u'<strong>%s</strong>' % translate(u'SlideController', u'Live'))
+        else:
+            self.TypeLabel.setText(u'<strong>%s</strong>' % translate(u'SlideController', u'Preview'))
+        self.TypeLabel.setAlignment(QtCore.Qt.AlignCenter)
+        self.PanelLayout.addWidget(self.TypeLabel)
+        # Splitter
+        self.Splitter = QtGui.QSplitter(self.Panel)
+        self.Splitter.setOrientation(QtCore.Qt.Vertical)
+        self.PanelLayout.addWidget(self.Splitter)
         # Actual controller section
         self.Controller = QtGui.QWidget(self.Splitter)
         self.Controller.setGeometry(QtCore.QRect(0, 0, 100, 536))