diff --git a/openlp.pyw b/openlp.pyw index 203137e1f..2c2e5fdb8 100755 --- a/openlp.pyw +++ b/openlp.pyw @@ -37,6 +37,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 +73,7 @@ class OpenLP(QtGui.QApplication): QtCore.SIGNAL(u'process_events'), self.processEvents) self.setApplicationName(u'OpenLP') self.setApplicationVersion(applicationVersion) + self.setStyleSheet(application_stylesheet) show_splash = str_to_bool(ConfigHelper.get_registry().get_value( u'general', u'show splash', True)) if show_splash: diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 6227a29a6..ec145f736 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/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'%s' % translate(u'SlideController', u'Live')) + else: + self.TypeLabel.setText(u'%s' % 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))