From ca96d0fda6c7a04d582086cebff8af5a01739096 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Tue, 20 Oct 2009 17:33:00 +0100 Subject: [PATCH 1/5] SlideControler UI fixes --- openlp/core/ui/slidecontroller.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index e18e1b8cc..47ffefcbb 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -28,6 +28,16 @@ import time from PyQt4 import QtCore, QtGui from openlp.core.lib import OpenLPToolbar, translate, Receiver, ServiceType +label_stylesheet = u""" +QTableWidget::item:selected +{ + border: 2px solid black; + background: lightgray; + font: italic; +} +""" + + class SlideList(QtGui.QTableWidget): """ Customised version of QTableWidget which can respond to keyboard @@ -303,19 +313,21 @@ class SlideController(QtGui.QWidget): self.PreviewListWidget.rowCount() + 1) item = QtGui.QTableWidgetItem() label = QtGui.QLabel() - label.setMargin(8) + label.setMargin(4) #It is a Image if frame[u'text'] is None: pixmap = self.parent.RenderManager.resize_image(frame[u'image']) label.setScaledContents(True) label.setPixmap(QtGui.QPixmap.fromImage(pixmap)) + slide_height = self.settingsmanager.slidecontroller_image * \ + self.parent.RenderManager.screen_ratio else: label.setText(frame[u'text']) + slide_height = label.sizeHint().height() self.PreviewListWidget.setCellWidget(framenumber, 0, label) self.PreviewListWidget.setItem(framenumber, 0, item) - slide_height = self.settingsmanager.slidecontroller_image * \ - self.parent.RenderManager.screen_ratio self.PreviewListWidget.setRowHeight(framenumber, slide_height) + self.PreviewListWidget.setStyleSheet(label_stylesheet) self.PreviewListWidget.setColumnWidth( 0, self.PreviewListWidget.viewport().size().width()) if slideno > self.PreviewListWidget.rowCount(): From 791b38e0ef5adb662ca6f16ded0b09fd1f9d5614 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Tue, 20 Oct 2009 18:01:12 +0100 Subject: [PATCH 2/5] SlideControler UI fixes - take 2 --- openlp/core/ui/slidecontroller.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 47ffefcbb..0a0118537 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -31,9 +31,8 @@ from openlp.core.lib import OpenLPToolbar, translate, Receiver, ServiceType label_stylesheet = u""" QTableWidget::item:selected { - border: 2px solid black; + border: 1px solid black; background: lightgray; - font: italic; } """ From 44e57316f23cbbf1ed98644bbf910acf4746f606 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Tue, 20 Oct 2009 18:15:37 +0100 Subject: [PATCH 3/5] SlideControler UI fixes - take 3 --- openlp/core/ui/slidecontroller.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 0a0118537..47f8e6bc3 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -31,8 +31,8 @@ from openlp.core.lib import OpenLPToolbar, translate, Receiver, ServiceType label_stylesheet = u""" QTableWidget::item:selected { - border: 1px solid black; - background: lightgray; + border: solid 20px pallette(dark); + color: palette(highlighted-text) } """ @@ -322,6 +322,7 @@ class SlideController(QtGui.QWidget): self.parent.RenderManager.screen_ratio else: label.setText(frame[u'text']) + label.setAlignment(QtCore.Qt.AlignHCenter) slide_height = label.sizeHint().height() self.PreviewListWidget.setCellWidget(framenumber, 0, label) self.PreviewListWidget.setItem(framenumber, 0, item) From 8c3370d803b28c00a5f14e5b87dc83bcc0d798e4 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Tue, 20 Oct 2009 19:28:34 +0200 Subject: [PATCH 4/5] Fixed up the styling on selected items in the slide controllers. --- openlp/core/ui/slidecontroller.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 47f8e6bc3..cd0c2f5de 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -31,8 +31,8 @@ from openlp.core.lib import OpenLPToolbar, translate, Receiver, ServiceType label_stylesheet = u""" QTableWidget::item:selected { - border: solid 20px pallette(dark); - color: palette(highlighted-text) + background-color: palette(highlight); + color: palette(highlighted-text); } """ From ee6465d8a510a089b5d22c9586c4f87437027e13 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Tue, 20 Oct 2009 21:41:15 +0200 Subject: [PATCH 5/5] Made highlight colour slightly lighter/darker than background. --- openlp/core/ui/slidecontroller.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index cd0c2f5de..4f7163ba0 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -31,8 +31,7 @@ from openlp.core.lib import OpenLPToolbar, translate, Receiver, ServiceType label_stylesheet = u""" QTableWidget::item:selected { - background-color: palette(highlight); - color: palette(highlighted-text); + background-color: %s; } """ @@ -45,6 +44,12 @@ class SlideList(QtGui.QTableWidget): def __init__(self, parent=None, name=None): QtGui.QTableWidget.__init__(self, parent.Controller) self.parent = parent + text_color = QtGui.QApplication.palette().color(QtGui.QPalette.Base) + if text_color.value() > 128: + text_color = text_color.darker(120).name() + else: + text_color = text_color.lighter(120).name() + self.setStyleSheet(label_stylesheet % text_color) def keyPressEvent(self, event): if type(event) == QtGui.QKeyEvent: @@ -327,7 +332,6 @@ class SlideController(QtGui.QWidget): self.PreviewListWidget.setCellWidget(framenumber, 0, label) self.PreviewListWidget.setItem(framenumber, 0, item) self.PreviewListWidget.setRowHeight(framenumber, slide_height) - self.PreviewListWidget.setStyleSheet(label_stylesheet) self.PreviewListWidget.setColumnWidth( 0, self.PreviewListWidget.viewport().size().width()) if slideno > self.PreviewListWidget.rowCount():