raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Impress issues

Browse Source
This commit is contained in:
Tim Bentley 2009-09-11 20:51:06 +01:00
parent f4966a655e
commit 43b374a994
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openlp/core/lib/settingsmanager.py
View File

@ -77,5 +77,6 @@ class SettingsManager(object):
isVisible)
def setDockbarLeft(self, value):
ConfigHelper.set_config(u'user interface', u'mediamanager left', value)
#ConfigHelper.set_config(u'user interface', u'mediamanager left', value)
pass

15
openlp/core/ui/mainwindow.py
View File

@ -118,12 +118,15 @@ class Ui_MainWindow(object):
self.MediaManagerDock.setWindowIcon(icon)
self.MediaManagerDock.setFloating(False)
self.MediaManagerDock.setObjectName(u'MediaManagerDock')
self.MediaManagerDock.setSizePolicy(QtGui.QSizePolicy(QtGui.QSizePolicy.Ignored,
QtGui.QSizePolicy.Maximum))
geometry = self.MediaManagerDock.geometry()
geometry.setWidth(self.settingsmanager.mainwindow_left)
self.MediaManagerDock.setGeometry(geometry)
self.MediaManagerDock.setMinimumWidth(10)
self.MediaManagerDock.setMinimumWidth(
self.settingsmanager.mainwindow_left)
# self.MediaManagerDock.setSizePolicy(QtGui.QSizePolicy(QtGui.QSizePolicy.Ignored,
# QtGui.QSizePolicy.Maximum))
# geometry = self.MediaManagerDock.geometry()
# geometry.setWidth(self.settingsmanager.mainwindow_left)
# self.MediaManagerDock.setGeometry(geometry)
# self.MediaManagerDock.setMinimumWidth(10)
self.MediaManagerContents = QtGui.QWidget()
self.MediaManagerContents.setObjectName(u'MediaManagerContents')

18
openlp/core/ui/slidecontroller.py
View File

@ -70,7 +70,7 @@ class SlideController(QtGui.QWidget):
self.parent = parent
self.image_list = [u'Start Loop', u'Stop Loop', u'Loop Separator', u'Image SpinBox']
self.timer_id = 0
self.item = None
self.commandItem = None
self.Panel = QtGui.QWidget(parent.ControlSplitter)
self.Splitter = QtGui.QSplitter(self.Panel)
self.Splitter.setOrientation(QtCore.Qt.Vertical)
@ -233,9 +233,9 @@ class SlideController(QtGui.QWidget):
"""
log.debug(u'addServiceItem')
#If old item was a command tell it to stop
if self.item is not None and self.item.service_item_type == ServiceType.Command:
if self.commandItem is not None and self.commandItem.service_item_type == ServiceType.Command:
Receiver().send_message(u'%s_stop'% self.item.name.lower())
self.item = item
self.commandItem = item
item.render()
self.enableToolBar(item)
if item.service_item_type == ServiceType.Command:
@ -252,9 +252,9 @@ class SlideController(QtGui.QWidget):
"""
log.debug(u'addServiceItem')
#If old item was a command tell it to stop
if self.item is not None and self.item.service_item_type == ServiceType.Command:
if self.commandItem is not None and self.commandItem.service_item_type == ServiceType.Command:
Receiver().send_message(u'%s_stop'% self.item.name.lower())
self.item = item
self.commandItem = item
self.enableToolBar(item)
if item.service_item_type == ServiceType.Command:
Receiver().send_message(u'%s_start'%item.name.lower(), \
@ -329,8 +329,8 @@ class SlideController(QtGui.QWidget):
"""
Go to the next slide.
"""
if self.item.service_item_type == ServiceType.Command:
Receiver().send_message(u'%s_next'% self.item.name.lower())
if self.commandItem.service_item_type == ServiceType.Command:
Receiver().send_message(u'%s_next'% self.commandItem.name.lower())
else:
row = self.PreviewListWidget.currentRow() + 1
if row == self.PreviewListWidget.rowCount():
@ -342,8 +342,8 @@ class SlideController(QtGui.QWidget):
"""
Go to the previous slide.
"""
if self.item.service_item_type == ServiceType.Command:
Receiver().send_message(u'%s_previous'% self.item.name.lower())
if self.commandItem.service_item_type == ServiceType.Command:
Receiver().send_message(u'%s_previous'% self.commandItem.name.lower())
else:
row = self.PreviewListWidget.currentRow() - 1
if row == -1: