openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/bitsandbobs into lp:openlp.

    Requested reviews:
    OpenLP Core (openlp-core)


Removed QLabel for text items in the slide controller, and tweaked the resizing slightly.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/bitsandbobs/+merge/13926
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/lib/plugin.py'
--- openlp/core/lib/plugin.py	2009-10-17 19:13:11 +0000
+++ openlp/core/lib/plugin.py	2009-10-25 21:50:22 +0000
@@ -129,7 +129,8 @@
         self.settings = plugin_helpers[u'settings']
         self.mediadock = plugin_helpers[u'toolbox']
         QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'%s_add_service_item'% self.name), self.process_add_service_event)
+            QtCore.SIGNAL(u'%s_add_service_item'% self.name),
+            self.process_add_service_event)
 
     def check_pre_conditions(self):
         """

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2009-10-25 14:39:45 +0000
+++ openlp/core/ui/slidecontroller.py	2009-10-25 21:50:22 +0000
@@ -28,14 +28,6 @@
 from PyQt4 import QtCore, QtGui
 from openlp.core.lib import OpenLPToolbar, Receiver, ServiceType
 
-label_stylesheet = u"""
-QTableWidget::item:selected
-{
-    background-color: %s;
-}
-"""
-
-
 class SlideList(QtGui.QTableWidget):
     """
     Customised version of QTableWidget which can respond to keyboard
@@ -44,12 +36,6 @@
     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:
@@ -336,22 +322,24 @@
             self.PreviewListWidget.setRowCount(
                 self.PreviewListWidget.rowCount() + 1)
             item = QtGui.QTableWidgetItem()
-            label = QtGui.QLabel()
-            label.setMargin(4)
+            slide_height = 0
             #It is a Image
             if frame[u'text'] is None:
+                label = QtGui.QLabel()
+                label.setMargin(4)
                 pixmap = self.parent.RenderManager.resize_image(frame[u'image'])
                 label.setScaledContents(True)
                 label.setPixmap(QtGui.QPixmap.fromImage(pixmap))
+                self.PreviewListWidget.setCellWidget(framenumber, 0, label)
                 slide_height = self.settingsmanager.slidecontroller_image * \
                     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)
+                item.setText(frame[u'text'])
             self.PreviewListWidget.setItem(framenumber, 0, item)
-            self.PreviewListWidget.setRowHeight(framenumber, slide_height)
+            if slide_height != 0:
+                self.PreviewListWidget.setRowHeight(framenumber, slide_height)
+        if self.serviceitem.frames[0][u'text'] is not None:
+            self.PreviewListWidget.resizeRowsToContents()
         self.PreviewListWidget.setColumnWidth(
             0, self.PreviewListWidget.viewport().size().width())
         if slideno > self.PreviewListWidget.rowCount():
@@ -427,11 +415,11 @@
             winid = QtGui.QApplication.desktop().winId()
             rect = rm.screen_list[rm.current_display][u'size']
             winimg = QtGui.QPixmap.grabWindow(winid, rect.x(), rect.y(), rect.width(), rect.height())
-            self.SlidePreview.setPixmap(winimg)        
+            self.SlidePreview.setPixmap(winimg)
         else:
             label = self.PreviewListWidget.cellWidget(self.PreviewListWidget.currentRow(), 0)
             self.SlidePreview.setPixmap(label.pixmap())
-            
+
     def onSlideSelectedNext(self):
         """
         Go to the next slide.