From 961df67a333609ab4f482fb073441c461d916309 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Wed, 7 Jul 2010 15:44:22 +0100 Subject: [PATCH 01/10] Cleanups --- openlp/core/ui/maindisplay.py | 38 +++++++++++++++++------------------ openlp/core/ui/mainwindow.py | 4 ++-- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index 530cd6124..d7906c6a0 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -154,9 +154,10 @@ class DisplayWidget(QtGui.QGraphicsView): """ log.info(u'MainDisplay loaded') - def __init__(self, parent=None, name=None): + def __init__(self, parent=None, name=None, primary=False): QtGui.QWidget.__init__(self, None) self.parent = parent + self.primary = primary self.hotkey_map = { QtCore.Qt.Key_Return: 'servicemanager_next_item', QtCore.Qt.Key_Space: 'slidecontroller_live_next_noloop', @@ -189,6 +190,14 @@ class DisplayWidget(QtGui.QGraphicsView): else: event.ignore() + def resetDisplay(self): + log.debug(u'resetDisplay') + Receiver.send_message(u'slidecontroller_live_stop_loop') + if self.primary: + self.setVisible(False) + else: + self.setVisible(True) + class MainDisplay(DisplayWidget): """ This is the form that is used to display things on the projector. @@ -206,7 +215,7 @@ class MainDisplay(DisplayWidget): The list of screens. """ log.debug(u'Initialisation started') - DisplayWidget.__init__(self, parent) + DisplayWidget.__init__(self, parent, primary=True) self.setWindowFlags(QtCore.Qt.Window | QtCore.Qt.FramelessWindowHint) self.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff) self.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff) @@ -222,7 +231,6 @@ class MainDisplay(DisplayWidget): self.setupText() self.setupAlert() self.setupBlank() - self.primary = True self.blankFrame = None self.frame = None #Hide desktop for now until we know where to put it @@ -239,7 +247,7 @@ class MainDisplay(DisplayWidget): self.screen = self.screens.current #Sort out screen locations and sizes self.setGeometry(self.screen[u'size']) - self.scene.setSceneRect(0,0,self.size().width(), self.size().height()) + self.scene.setSceneRect(0, 0, self.size().width(), self.size().height()) self.webView.setGeometry(0, 0, self.size().width(), self.size().height()) #Build a custom splash screen self.InitialFrame = QtGui.QImage( @@ -280,7 +288,7 @@ class MainDisplay(DisplayWidget): def setupScene(self): self.scene = QtGui.QGraphicsScene(self) - self.scene.setSceneRect(0,0,self.size().width(), self.size().height()) + self.scene.setSceneRect(0, 0, self.size().width(), self.size().height()) self.setScene(self.scene) def setupVideo(self): @@ -319,14 +327,6 @@ class MainDisplay(DisplayWidget): self.displayBlank.setZValue(10) self.scene.addItem(self.displayBlank) - def resetDisplay(self): - log.debug(u'resetDisplay') - Receiver.send_message(u'slidecontroller_live_stop_loop') - if self.primary: - self.setVisible(False) - else: - self.setVisible(True) - # def hideDisplayForVideo(self): # """ # Hides the main display if for the video to be played @@ -385,9 +385,9 @@ class MainDisplay(DisplayWidget): if location == 0: self.alertText.setPos(0, 0) elif location == 1: - self.alertText.setPos(0,self.size().height()/2) + self.alertText.setPos(0, self.size().height() / 2) else: - self.alertText.setPos(0,self.size().height() - 76) + self.alertText.setPos(0, self.size().height() - 76) self.alertText.setHtml(message) def displayImage(self, frame): @@ -531,8 +531,8 @@ class VideoDisplay(Phonon.VideoWidget): Shutting down so clean up connections """ self.onMediaStop() - for pth in self.outputPaths(): - disconnected = pth.disconnect() + for path in self.outputPaths(): + disconnected = path.disconnect() # def onMediaBackground(self, message=None): # """ @@ -657,8 +657,8 @@ class AudioPlayer(QtCore.QObject): Shutting down so clean up connections """ self.onMediaStop() - for pth in self.mediaObject.outputPaths(): - disconnected = pth.disconnect() + for path in self.mediaObject.outputPaths(): + disconnected = path.disconnect() def onMediaQueue(self, message): """ diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 9c5939070..841a0424b 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -38,7 +38,7 @@ from openlp.core.utils import check_latest_version, AppLocation, add_actions, \ log = logging.getLogger(__name__) -media_manager_style = """ +MEDIA_MANAGER_STYLE = """ QToolBox::tab { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 palette(button), stop: 1.0 palette(dark)); @@ -174,7 +174,7 @@ class Ui_MainWindow(object): self.MediaManagerDock = OpenLPDockWidget(MainWindow) self.MediaManagerDock.setWindowIcon( build_icon(u':/system/system_mediamanager.png')) - self.MediaManagerDock.setStyleSheet(media_manager_style) + self.MediaManagerDock.setStyleSheet(MEDIA_MANAGER_STYLE) self.MediaManagerDock.setMinimumWidth( self.settingsmanager.mainwindow_left) self.MediaManagerDock.setObjectName(u'MediaManagerDock') From cde04a9218cd086d7eedd93c9ea5bd486932f868 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Wed, 7 Jul 2010 17:03:30 +0100 Subject: [PATCH 02/10] Naming fixes for mediamanageritem --- openlp/core/lib/mediamanageritem.py | 94 +++++++++---------- .../plugins/bibles/forms/bibleimportwizard.py | 12 +-- openlp/plugins/bibles/lib/mediaitem.py | 24 ++--- openlp/plugins/custom/lib/mediaitem.py | 18 ++-- openlp/plugins/images/lib/mediaitem.py | 38 ++++---- openlp/plugins/media/lib/mediaitem.py | 30 +++--- openlp/plugins/presentations/lib/mediaitem.py | 18 ++-- openlp/plugins/songs/lib/mediaitem.py | 24 ++--- 8 files changed, 129 insertions(+), 129 deletions(-) diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index 8ebfe88ae..00d2ee1ef 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -108,13 +108,13 @@ class MediaManagerItem(QtGui.QWidget): self.icon = None if title: self.title = title - self.Toolbar = None + self.toolbar = None self.remoteTriggered = None - self.ServiceItemIconName = None + self.serviceItemIconName = None self.singleServiceItem = True - self.PageLayout = QtGui.QVBoxLayout(self) - self.PageLayout.setSpacing(0) - self.PageLayout.setContentsMargins(4, 0, 4, 0) + self.pageLayout = QtGui.QVBoxLayout(self) + self.pageLayout.setSpacing(0) + self.pageLayout.setContentsMargins(4, 0, 4, 0) self.requiredIcons() self.initPluginNameVisible() self.setupUi() @@ -149,9 +149,9 @@ class MediaManagerItem(QtGui.QWidget): A method to help developers easily add a toolbar to the media manager item. """ - if self.Toolbar is None: - self.Toolbar = OpenLPToolbar(self) - self.PageLayout.addWidget(self.Toolbar) + if self.toolbar is None: + self.toolbar = OpenLPToolbar(self) + self.pageLayout.addWidget(self.toolbar) def addToolbarButton( self, title, tooltip, icon, slot=None, checkable=False): @@ -180,13 +180,13 @@ class MediaManagerItem(QtGui.QWidget): # break compatability), but it makes sense for the icon to # come before the tooltip (as you have to have an icon, but # not neccesarily a tooltip) - self.Toolbar.addToolbarButton(title, icon, tooltip, slot, checkable) + self.toolbar.addToolbarButton(title, icon, tooltip, slot, checkable) def addToolbarSeparator(self): """ A very simple method to add a separator to the toolbar. """ - self.Toolbar.addSeparator() + self.toolbar.addSeparator() def setupUi(self): """ @@ -275,60 +275,60 @@ class MediaManagerItem(QtGui.QWidget): Creates the main widget for listing items the media item is tracking """ #Add the List widget - self.ListView = self.ListViewWithDnD_class(self) - self.ListView.uniformItemSizes = True - self.ListView.setGeometry(QtCore.QRect(10, 100, 256, 591)) - self.ListView.setSpacing(1) - self.ListView.setSelectionMode( + self.listView = self.ListViewWithDnD_class(self) + self.listView.uniformItemSizes = True + self.listView.setGeometry(QtCore.QRect(10, 100, 256, 591)) + self.listView.setSpacing(1) + self.listView.setSelectionMode( QtGui.QAbstractItemView.ExtendedSelection) - self.ListView.setAlternatingRowColors(True) - self.ListView.setDragEnabled(True) - self.ListView.setObjectName(u'%sListView' % self.PluginNameShort) - #Add tp PageLayout - self.PageLayout.addWidget(self.ListView) + self.listView.setAlternatingRowColors(True) + self.listView.setDragEnabled(True) + self.listView.setObjectName(u'%sListView' % self.PluginNameShort) + #Add to pageLayout + self.pageLayout.addWidget(self.listView) #define and add the context menu - self.ListView.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu) + self.listView.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu) if self.hasEditIcon: - self.ListView.addAction( + self.listView.addAction( context_menu_action( - self.ListView, u':/general/general_edit.png', + self.listView, u':/general/general_edit.png', unicode(translate('MediaManagerItem', '&Edit %s')) % self.PluginNameVisible, self.onEditClick)) - self.ListView.addAction(context_menu_separator(self.ListView)) + self.listView.addAction(context_menu_separator(self.listView)) if self.hasDeleteIcon: - self.ListView.addAction( + self.listView.addAction( context_menu_action( - self.ListView, u':/general/general_delete.png', + self.listView, u':/general/general_delete.png', unicode(translate('MediaManagerItem', '&Delete %s')) % self.PluginNameVisible, self.onDeleteClick)) - self.ListView.addAction(context_menu_separator(self.ListView)) - self.ListView.addAction( + self.listView.addAction(context_menu_separator(self.listView)) + self.listView.addAction( context_menu_action( - self.ListView, u':/general/general_preview.png', + self.listView, u':/general/general_preview.png', unicode(translate('MediaManagerItem', '&Preview %s')) % self.PluginNameVisible, self.onPreviewClick)) - self.ListView.addAction( + self.listView.addAction( context_menu_action( - self.ListView, u':/general/general_live.png', + self.listView, u':/general/general_live.png', translate('MediaManagerItem', '&Show Live'), self.onLiveClick)) - self.ListView.addAction( + self.listView.addAction( context_menu_action( - self.ListView, u':/general/general_add.png', + self.listView, u':/general/general_add.png', translate('MediaManagerItem', '&Add to Service'), self.onAddClick)) if self.addToServiceItem: - self.ListView.addAction( + self.listView.addAction( context_menu_action( - self.ListView, u':/general/general_add.png', + self.listView, u':/general/general_add.png', translate('MediaManagerItem', '&Add to selected Service Item'), self.onAddEditClick)) QtCore.QObject.connect( - self.ListView, QtCore.SIGNAL(u'doubleClicked(QModelIndex)'), + self.listView, QtCore.SIGNAL(u'doubleClicked(QModelIndex)'), self.onPreviewClick) def initialise(self): @@ -372,8 +372,8 @@ class MediaManagerItem(QtGui.QWidget): """ count = 0 filelist = [] - while count < self.ListView.count(): - bitem = self.ListView.item(count) + while count < self.listView.count(): + bitem = self.listView.item(count) filename = unicode(bitem.data(QtCore.Qt.UserRole).toString()) filelist.append(filename) count += 1 @@ -388,11 +388,11 @@ class MediaManagerItem(QtGui.QWidget): thumbdate = os.stat(thumb).st_mtime #if file updated rebuild icon if filedate > thumbdate: - self.IconFromFile(file, thumb) + self.iconFromFile(file, thumb) return True return False - def IconFromFile(self, file, thumb): + def iconFromFile(self, file, thumb): """ Create a thumbnail icon from a given file @@ -433,7 +433,7 @@ class MediaManagerItem(QtGui.QWidget): Preview an item by building a service item then adding that service item to the preview slide controller. """ - if not self.ListView.selectedIndexes() and not self.remoteTriggered: + if not self.listView.selectedIndexes() and not self.remoteTriggered: QtGui.QMessageBox.information(self, translate('MediaManagerItem', 'No Items Selected'), translate('MediaManagerItem', @@ -450,7 +450,7 @@ class MediaManagerItem(QtGui.QWidget): Send an item live by building a service item then adding that service item to the live slide controller. """ - if not self.ListView.selectedIndexes(): + if not self.listView.selectedIndexes(): QtGui.QMessageBox.information(self, translate('MediaManagerItem', 'No Items Selected'), translate('MediaManagerItem', @@ -466,7 +466,7 @@ class MediaManagerItem(QtGui.QWidget): """ Add a selected item to the current service """ - if not self.ListView.selectedIndexes() and not self.remoteTriggered: + if not self.listView.selectedIndexes() and not self.remoteTriggered: QtGui.QMessageBox.information(self, translate('MediaManagerItem', 'No Items Selected'), translate('MediaManagerItem', @@ -482,7 +482,7 @@ class MediaManagerItem(QtGui.QWidget): self.parent.serviceManager.addServiceItem(service_item, replace=self.remoteTriggered) else: - items = self.ListView.selectedIndexes() + items = self.listView.selectedIndexes() for item in items: service_item = self.buildServiceItem(item) if service_item: @@ -493,7 +493,7 @@ class MediaManagerItem(QtGui.QWidget): """ Add a selected item to an existing item in the current service. """ - if not self.ListView.selectedIndexes() and not self.remoteTriggered: + if not self.listView.selectedIndexes() and not self.remoteTriggered: QtGui.QMessageBox.information(self, translate('MediaManagerItem', 'No items selected'), translate('MediaManagerItem', @@ -522,8 +522,8 @@ class MediaManagerItem(QtGui.QWidget): Common method for generating a service item """ service_item = ServiceItem(self.parent) - if self.ServiceItemIconName: - service_item.add_icon(self.ServiceItemIconName) + if self.serviceItemIconName: + service_item.add_icon(self.serviceItemIconName) else: service_item.add_icon(self.parent.icon) if self.generateSlideData(service_item, item): diff --git a/openlp/plugins/bibles/forms/bibleimportwizard.py b/openlp/plugins/bibles/forms/bibleimportwizard.py index a2aa92fc0..0f18d2f05 100644 --- a/openlp/plugins/bibles/forms/bibleimportwizard.py +++ b/openlp/plugins/bibles/forms/bibleimportwizard.py @@ -61,10 +61,10 @@ class Ui_BibleImportWizard(object): BibleImportWizard.addPage(self.WelcomePage) self.SelectPage = QtGui.QWizardPage() self.SelectPage.setObjectName(u'SelectPage') - self.SelectPageLayout = QtGui.QVBoxLayout(self.SelectPage) - self.SelectPageLayout.setSpacing(8) - self.SelectPageLayout.setMargin(20) - self.SelectPageLayout.setObjectName(u'SelectPageLayout') + self.selectPageLayout = QtGui.QVBoxLayout(self.SelectPage) + self.selectPageLayout.setSpacing(8) + self.selectPageLayout.setMargin(20) + self.selectPageLayout.setObjectName(u'selectPageLayout') self.FormatSelectLayout = QtGui.QHBoxLayout() self.FormatSelectLayout.setSpacing(8) self.FormatSelectLayout.setObjectName(u'FormatSelectLayout') @@ -81,7 +81,7 @@ class Ui_BibleImportWizard(object): spacerItem2 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) self.FormatSelectLayout.addItem(spacerItem2) - self.SelectPageLayout.addLayout(self.FormatSelectLayout) + self.selectPageLayout.addLayout(self.FormatSelectLayout) self.FormatWidget = QtGui.QStackedWidget(self.SelectPage) self.FormatWidget.setObjectName(u'FormatWidget') self.OsisPage = QtGui.QWidget() @@ -251,7 +251,7 @@ class Ui_BibleImportWizard(object): self.WebDownloadTabWidget.addTab(self.ProxyServerTab, u'') self.WebDownloadLayout.addWidget(self.WebDownloadTabWidget) self.FormatWidget.addWidget(self.WebDownloadPage) - self.SelectPageLayout.addWidget(self.FormatWidget) + self.selectPageLayout.addWidget(self.FormatWidget) BibleImportWizard.addPage(self.SelectPage) self.LicenseDetailsPage = QtGui.QWizardPage() self.LicenseDetailsPage.setObjectName(u'LicenseDetailsPage') diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 6bc6d99d4..ffb49081a 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -235,7 +235,7 @@ class BibleMediaItem(MediaManagerItem): self.SearchTabWidget.addTab(self.AdvancedTab, translate('BiblesPlugin.MediaItem', 'Advanced')) # Add the search tab widget to the page layout - self.PageLayout.addWidget(self.SearchTabWidget) + self.pageLayout.addWidget(self.SearchTabWidget) # Combo Boxes QtCore.QObject.connect(self.AdvancedVersionComboBox, QtCore.SIGNAL(u'activated(int)'), self.onAdvancedVersionComboBox) @@ -271,8 +271,8 @@ class BibleMediaItem(MediaManagerItem): self.SearchProgress.setFormat('') self.SearchProgress.setMinimum(0) self.SearchProgress.setMaximum(0) - self.SearchProgress.setGeometry(self.ListView.geometry().left(), - self.ListView.geometry().top(), 81, 23) + self.SearchProgress.setGeometry(self.listView.geometry().left(), + self.listView.geometry().top(), 81, 23) self.SearchProgress.setVisible(False) self.SearchProgress.setObjectName(u'SearchProgress') @@ -370,9 +370,9 @@ class BibleMediaItem(MediaManagerItem): self.initialiseBible(bible) def onListViewResize(self, width, height): - self.SearchProgress.setGeometry(self.ListView.geometry().x(), - (self.ListView.geometry().y() + self.ListView.geometry().height())\ - - 23, 81, 23) + listViewGeometry = self.listView.geometry() + self.SearchProgress.setGeometry(listViewGeometry.x(), + (listViewGeometry.y() + listViewGeometry.height()) - 23, 81, 23) def onSearchProgressShow(self): self.SearchProgress.setVisible(True) @@ -436,7 +436,7 @@ class BibleMediaItem(MediaManagerItem): chapter_to, verse_to) self.search_results = self.parent.manager.get_verses(bible, versetext) if self.ClearAdvancedSearchComboBox.currentIndex() == 0: - self.ListView.clear() + self.listView.clear() self.lastReference = [] self.lastReference.append(versetext) self.displayResults(bible) @@ -456,7 +456,7 @@ class BibleMediaItem(MediaManagerItem): bible = unicode(self.QuickVersionComboBox.currentText()) text = unicode(self.QuickSearchEdit.text()) if self.ClearQuickSearchComboBox.currentIndex() == 0: - self.ListView.clear() + self.listView.clear() self.lastReference = [] self.lastReference.append(text) self.search_results = self.parent.manager.get_verses(bible, text) @@ -465,7 +465,7 @@ class BibleMediaItem(MediaManagerItem): def generateSlideData(self, service_item, item=None): log.debug(u'generating slide data') - items = self.ListView.selectedIndexes() + items = self.listView.selectedIndexes() if len(items) == 0: return False old_chapter = u'' @@ -506,7 +506,7 @@ class BibleMediaItem(MediaManagerItem): bible2_permission = u'' # Let's loop through the main lot, and assemble our verses for item in items: - bitem = self.ListView.item(item.row()) + bitem = self.listView.item(item.row()) reference = bitem.data(QtCore.Qt.UserRole) if isinstance(reference, QtCore.QVariant): reference = reference.toPyObject() @@ -653,8 +653,8 @@ class BibleMediaItem(MediaManagerItem): 'text': QtCore.QVariant(verse.text) } bible_verse.setData(QtCore.Qt.UserRole, QtCore.QVariant(vdict)) - self.ListView.addItem(bible_verse) - row = self.ListView.setCurrentRow(count) + self.listView.addItem(bible_verse) + row = self.listView.setCurrentRow(count) if row: row.setSelected(True) diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py index 9cc5627ed..ac77b72e4 100644 --- a/openlp/plugins/custom/lib/mediaitem.py +++ b/openlp/plugins/custom/lib/mediaitem.py @@ -86,12 +86,12 @@ class CustomMediaItem(MediaManagerItem): self.onRemoteEditClear() def loadCustomListView(self, list): - self.ListView.clear() + self.listView.clear() for customSlide in list: custom_name = QtGui.QListWidgetItem(customSlide.title) custom_name.setData( QtCore.Qt.UserRole, QtCore.QVariant(customSlide.id)) - self.ListView.addItem(custom_name) + self.listView.addItem(custom_name) def onNewClick(self): self.parent.edit_custom_form.loadCustom(0) @@ -121,10 +121,10 @@ class CustomMediaItem(MediaManagerItem): """ Edit a custom item """ - if check_item_selected(self.ListView, + if check_item_selected(self.listView, translate('CustomPlugin.MediaItem', 'You must select an item to edit.')): - item = self.ListView.currentItem() + item = self.listView.currentItem() item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0] self.parent.edit_custom_form.loadCustom(item_id, False) self.parent.edit_custom_form.exec_() @@ -134,17 +134,17 @@ class CustomMediaItem(MediaManagerItem): """ Remove a custom item from the list and database """ - if check_item_selected(self.ListView, + if check_item_selected(self.listView, translate('CustomPlugin.MediaItem', 'You must select an item to delete.')): - row_list = [item.row() for item in self.ListView.selectedIndexes()] + row_list = [item.row() for item in self.listView.selectedIndexes()] row_list.sort(reverse=True) id_list = [(item.data(QtCore.Qt.UserRole)).toInt()[0] - for item in self.ListView.selectedIndexes()] + for item in self.listView.selectedIndexes()] for id in id_list: self.parent.custommanager.delete_object(CustomSlide, id) for row in row_list: - self.ListView.takeItem(row) + self.listView.takeItem(row) def generateSlideData(self, service_item, item=None): raw_slides = [] @@ -153,7 +153,7 @@ class CustomMediaItem(MediaManagerItem): theme = None if item is None: if self.remoteTriggered is None: - item = self.ListView.currentItem() + item = self.listView.currentItem() if item is None: return False item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0] diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index a7f8ae73c..b2e2b158b 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -75,10 +75,10 @@ class ImageMediaItem(MediaManagerItem): def initialise(self): log.debug(u'initialise') - self.ListView.clear() - self.ListView.setSelectionMode( + self.listView.clear() + self.listView.setSelectionMode( QtGui.QAbstractItemView.ExtendedSelection) - self.ListView.setIconSize(QtCore.QSize(88, 50)) + self.listView.setIconSize(QtCore.QSize(88, 50)) self.servicePath = os.path.join( AppLocation.get_section_data_path(self.settingsSection), u'thumbnails') @@ -89,10 +89,10 @@ class ImageMediaItem(MediaManagerItem): def addListViewToToolBar(self): MediaManagerItem.addListViewToToolBar(self) - self.ListView.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu) - self.ListView.addAction( + self.listView.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu) + self.listView.addAction( context_menu_action( - self.ListView, u':/slides/slide_blank.png', + self.listView, u':/slides/slide_blank.png', translate('ImagePlugin.MediaItem', 'Replace Live Background'), self.onReplaceClick)) @@ -106,23 +106,23 @@ class ImageMediaItem(MediaManagerItem): self.ImageWidget.sizePolicy().hasHeightForWidth()) self.ImageWidget.setSizePolicy(sizePolicy) self.ImageWidget.setObjectName(u'ImageWidget') - self.blankButton = self.Toolbar.addToolbarButton( + self.blankButton = self.toolbar.addToolbarButton( u'Replace Background', u':/slides/slide_blank.png', translate('ImagePlugin.MediaItem', 'Replace Live Background'), self.onReplaceClick, False) # Add the song widget to the page layout - self.PageLayout.addWidget(self.ImageWidget) + self.pageLayout.addWidget(self.ImageWidget) def onDeleteClick(self): """ Remove an image item from the list """ - if check_item_selected(self.ListView, translate('ImagePlugin.MediaItem', + if check_item_selected(self.listView, translate('ImagePlugin.MediaItem', 'You must select an item to delete.')): - row_list = [item.row() for item in self.ListView.selectedIndexes()] + row_list = [item.row() for item in self.listView.selectedIndexes()] row_list.sort(reverse=True) for row in row_list: - text = self.ListView.item(row) + text = self.listView.item(row) if text: try: os.remove(os.path.join(self.servicePath, @@ -130,7 +130,7 @@ class ImageMediaItem(MediaManagerItem): except OSError: #if not present do not worry pass - self.ListView.takeItem(row) + self.listView.takeItem(row) SettingsManager.set_list(self.settingsSection, self.settingsSection, self.getFileList()) @@ -144,14 +144,14 @@ class ImageMediaItem(MediaManagerItem): else: icon = build_icon(u':/general/general_delete.png') else: - icon = self.IconFromFile(file, thumb) + icon = self.iconFromFile(file, thumb) item_name = QtGui.QListWidgetItem(filename) item_name.setIcon(icon) item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file)) - self.ListView.addItem(item_name) + self.listView.addItem(item_name) def generateSlideData(self, service_item, item=None): - items = self.ListView.selectedIndexes() + items = self.listView.selectedIndexes() if items: service_item.title = unicode( translate('ImagePlugin.MediaItem', 'Image(s)')) @@ -160,7 +160,7 @@ class ImageMediaItem(MediaManagerItem): service_item.add_capability(ItemCapabilities.AllowsLoop) service_item.add_capability(ItemCapabilities.AllowsAdditions) for item in items: - bitem = self.ListView.item(item.row()) + bitem = self.listView.item(item.row()) filename = unicode(bitem.data(QtCore.Qt.UserRole).toString()) frame = QtGui.QImage(unicode(filename)) (path, name) = os.path.split(filename) @@ -170,12 +170,12 @@ class ImageMediaItem(MediaManagerItem): return False def onReplaceClick(self): - if check_item_selected(self.ListView, + if check_item_selected(self.listView, translate('ImagePlugin.MediaItem', 'You must select an item to process.')): - items = self.ListView.selectedIndexes() + items = self.listView.selectedIndexes() for item in items: - bitem = self.ListView.item(item.row()) + bitem = self.listView.item(item.row()) filename = unicode(bitem.data(QtCore.Qt.UserRole).toString()) frame = QtGui.QImage(unicode(filename)) self.parent.displayManager.displayImageWithText(frame) diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index a5fca6c12..52156d4ce 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -56,7 +56,7 @@ class MediaMediaItem(MediaManagerItem): u':/media/media_video.png').toImage() MediaManagerItem.__init__(self, parent, icon, title) self.singleServiceItem = False - self.ServiceItemIconName = u':/media/media_video.png' + self.serviceItemIconName = u':/media/media_video.png' def initPluginNameVisible(self): self.PluginNameVisible = translate('MediaPlugin.MediaItem', 'Media') @@ -76,9 +76,9 @@ class MediaMediaItem(MediaManagerItem): def addListViewToToolBar(self): MediaManagerItem.addListViewToToolBar(self) - self.ListView.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu) - self.ListView.addAction( - context_menu_action(self.ListView, u':/slides/slide_blank.png', + self.listView.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu) + self.listView.addAction( + context_menu_action(self.listView, u':/slides/slide_blank.png', translate('MediaPlugin.MediaItem', 'Replace Live Background'), self.onReplaceClick)) @@ -93,25 +93,25 @@ class MediaMediaItem(MediaManagerItem): self.ImageWidget.setSizePolicy(sizePolicy) self.ImageWidget.setObjectName(u'ImageWidget') #Replace backgrounds do not work at present so remove functionality. - self.blankButton = self.Toolbar.addToolbarButton( + self.blankButton = self.toolbar.addToolbarButton( u'Replace Background', u':/slides/slide_blank.png', translate('MediaPlugin.MediaItem', 'Replace Live Background'), self.onReplaceClick, False) # Add the song widget to the page layout - self.PageLayout.addWidget(self.ImageWidget) + self.pageLayout.addWidget(self.ImageWidget) def onReplaceClick(self): - if check_item_selected(self.ListView, + if check_item_selected(self.listView, translate('ImagePlugin.MediaItem', 'You must select an item to process.')): - item = self.ListView.currentItem() + item = self.listView.currentItem() filename = unicode(item.data(QtCore.Qt.UserRole).toString()) self.parent.displayManager.displayVideo(filename) def generateSlideData(self, service_item, item=None): if item is None: - item = self.ListView.currentItem() + item = self.listView.currentItem() if item is None: return False filename = unicode(item.data(QtCore.Qt.UserRole).toString()) @@ -124,9 +124,9 @@ class MediaMediaItem(MediaManagerItem): return True def initialise(self): - self.ListView.setSelectionMode( + self.listView.setSelectionMode( QtGui.QAbstractItemView.ExtendedSelection) - self.ListView.setIconSize(QtCore.QSize(88, 50)) + self.listView.setIconSize(QtCore.QSize(88, 50)) self.loadList(SettingsManager.load_list(self.settingsSection, self.settingsSection)) @@ -134,12 +134,12 @@ class MediaMediaItem(MediaManagerItem): """ Remove a media item from the list """ - if check_item_selected(self.ListView, translate('MediaPlugin.MediaItem', + if check_item_selected(self.listView, translate('MediaPlugin.MediaItem', 'You must select an item to delete.')): - row_list = [item.row() for item in self.ListView.selectedIndexes()] + row_list = [item.row() for item in self.listView.selectedIndexes()] row_list.sort(reverse=True) for row in row_list: - self.ListView.takeItem(row) + self.listView.takeItem(row) SettingsManager.set_list(self.settingsSection, self.settingsSection, self.getFileList()) @@ -150,4 +150,4 @@ class MediaMediaItem(MediaManagerItem): img = QtGui.QPixmap(u':/media/media_video.png').toImage() item_name.setIcon(build_icon(img)) item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file)) - self.ListView.addItem(item_name) + self.listView.addItem(item_name) diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py index 6f6d6fdb1..617bc2c78 100644 --- a/openlp/plugins/presentations/lib/mediaitem.py +++ b/openlp/plugins/presentations/lib/mediaitem.py @@ -108,13 +108,13 @@ class PresentationMediaItem(MediaManagerItem): self.DisplayTypeLabel.setText( translate('PresentationPlugin.MediaItem', 'Present using:')) # Add the Presentation widget to the page layout - self.PageLayout.addWidget(self.PresentationWidget) + self.pageLayout.addWidget(self.PresentationWidget) def initialise(self): self.servicePath = os.path.join( AppLocation.get_section_data_path(self.settingsSection), u'thumbnails') - self.ListView.setIconSize(QtCore.QSize(88, 50)) + self.listView.setIconSize(QtCore.QSize(88, 50)) if not os.path.exists(self.servicePath): os.mkdir(self.servicePath) list = SettingsManager.load_list( @@ -165,22 +165,22 @@ class PresentationMediaItem(MediaManagerItem): u':/general/general_delete.png') else: os.makedirs(thumbPath) - icon = self.IconFromFile(preview, thumb) + icon = self.iconFromFile(preview, thumb) if not icon: icon = build_icon(u':/general/general_delete.png') item_name = QtGui.QListWidgetItem(filename) item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file)) item_name.setIcon(icon) - self.ListView.addItem(item_name) + self.listView.addItem(item_name) def onDeleteClick(self): """ Remove a presentation item from the list """ - if check_item_selected(self.ListView, + if check_item_selected(self.listView, translate('PresentationPlugin.MediaItem', 'You must select an item to delete.')): - items = self.ListView.selectedIndexes() + items = self.listView.selectedIndexes() row_list = [item.row() for item in items] row_list.sort(reverse=True) for item in items: @@ -193,12 +193,12 @@ class PresentationMediaItem(MediaManagerItem): doc.presentation_deleted() doc.close_presentation() for row in row_list: - self.ListView.takeItem(row) + self.listView.takeItem(row) SettingsManager.set_list(self.settingsSection, self.settingsSection, self.getFileList()) def generateSlideData(self, service_item, item=None): - items = self.ListView.selectedIndexes() + items = self.listView.selectedIndexes() if len(items) > 1: return False service_item.title = unicode(self.DisplayTypeComboBox.currentText()) @@ -206,7 +206,7 @@ class PresentationMediaItem(MediaManagerItem): shortname = service_item.shortname if shortname: for item in items: - bitem = self.ListView.item(item.row()) + bitem = self.listView.item(item.row()) filename = unicode(bitem.data(QtCore.Qt.UserRole).toString()) if shortname == self.Automatic: service_item.shortname = self.findControllerByType(filename) diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index eadff6b52..3aee00e26 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -75,7 +75,7 @@ class SongMediaItem(MediaManagerItem): translate('SongsPlugin.MediaItem', 'Maintain the lists of authors, topics and books'), ':/songs/song_maintenance.png', self.onSongMaintenanceClick) - self.PageLayout.setSpacing(4) + self.pageLayout.setSpacing(4) self.SearchLayout = QtGui.QFormLayout() self.SearchLayout.setMargin(0) self.SearchLayout.setSpacing(4) @@ -100,7 +100,7 @@ class SongMediaItem(MediaManagerItem): self.SearchTypeComboBox.setObjectName(u'SearchTypeComboBox') self.SearchLayout.setWidget( 1, QtGui.QFormLayout.FieldRole, self.SearchTypeComboBox) - self.PageLayout.addLayout(self.SearchLayout) + self.pageLayout.addLayout(self.SearchLayout) self.SearchButtonLayout = QtGui.QHBoxLayout() self.SearchButtonLayout.setMargin(0) self.SearchButtonLayout.setSpacing(4) @@ -114,7 +114,7 @@ class SongMediaItem(MediaManagerItem): self.ClearTextButton = QtGui.QPushButton(self) self.ClearTextButton.setObjectName(u'ClearTextButton') self.SearchButtonLayout.addWidget(self.ClearTextButton) - self.PageLayout.addLayout(self.SearchButtonLayout) + self.pageLayout.addLayout(self.SearchButtonLayout) # Signals and slots QtCore.QObject.connect(self.SearchTextEdit, QtCore.SIGNAL(u'returnPressed()'), self.onSearchTextButtonClick) @@ -193,7 +193,7 @@ class SongMediaItem(MediaManagerItem): def displayResultsSong(self, searchresults): log.debug(u'display results Song') - self.ListView.clear() + self.listView.clear() for song in searchresults: author_list = u'' for author in song.authors: @@ -204,11 +204,11 @@ class SongMediaItem(MediaManagerItem): song_detail = u'%s (%s)' % (song_title, author_list) song_name = QtGui.QListWidgetItem(song_detail) song_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(song.id)) - self.ListView.addItem(song_name) + self.listView.addItem(song_name) def displayResultsAuthor(self, searchresults): log.debug(u'display results Author') - self.ListView.clear() + self.listView.clear() for author in searchresults: for song in author.songs: song_detail = unicode( @@ -216,7 +216,7 @@ class SongMediaItem(MediaManagerItem): (author.display_name, song.title) song_name = QtGui.QListWidgetItem(song_detail) song_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(song.id)) - self.ListView.addItem(song_name) + self.listView.addItem(song_name) def onClearTextButtonClick(self): """ @@ -284,9 +284,9 @@ class SongMediaItem(MediaManagerItem): """ Edit a song """ - if check_item_selected(self.ListView, translate('SongsPlugin.MediaItem', + if check_item_selected(self.listView, translate('SongsPlugin.MediaItem', 'You must select an item to edit.')): - item = self.ListView.currentItem() + item = self.listView.currentItem() item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0] self.edit_song_form.loadSong(item_id, False) self.edit_song_form.exec_() @@ -295,9 +295,9 @@ class SongMediaItem(MediaManagerItem): """ Remove a song from the list and database """ - if check_item_selected(self.ListView, translate('SongsPlugin.MediaItem', + if check_item_selected(self.listView, translate('SongsPlugin.MediaItem', 'You must select an item to delete.')): - items = self.ListView.selectedIndexes() + items = self.listView.selectedIndexes() if len(items) == 1: del_message = translate('SongsPlugin.MediaItem', 'Delete song?') @@ -325,7 +325,7 @@ class SongMediaItem(MediaManagerItem): ccli = u'' if item is None: if self.remoteTriggered is None: - item = self.ListView.currentItem() + item = self.listView.currentItem() if item is None: return False item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0] From 19a831d9cf2ddf5c0b9d08416ef43c60642c8bff Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Wed, 7 Jul 2010 18:06:31 +0100 Subject: [PATCH 03/10] Naming fixes for toolbar and maindisplay --- openlp/core/lib/toolbar.py | 26 +++++++++++++------------- openlp/core/ui/maindisplay.py | 8 ++++---- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/openlp/core/lib/toolbar.py b/openlp/core/lib/toolbar.py index 6b87f84fe..14b6d66ac 100644 --- a/openlp/core/lib/toolbar.py +++ b/openlp/core/lib/toolbar.py @@ -71,27 +71,27 @@ class OpenLPToolbar(QtGui.QToolBar): ``objectname`` The name of the object, as used in `