diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py index e104f4022..e627b1ad8 100644 --- a/openlp/core/lib/__init__.py +++ b/openlp/core/lib/__init__.py @@ -191,10 +191,10 @@ def validate_thumb(file_path, thumb_path): ``thumb_path`` The path to the thumb. """ - if not os.path.exists(unicode(thumb_path)): + if not os.path.exists(thumb_path): return False - image_date = os.stat(unicode(file_path)).st_mtime - thumb_date = os.stat(unicode(thumb_path)).st_mtime + image_date = os.stat(file_path).st_mtime + thumb_date = os.stat(thumb_path).st_mtime return image_date <= thumb_date def resize_image(image_path, width, height, background=u'#000000'): diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 663f6c75a..e1cd24dfa 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -176,7 +176,8 @@ class Ui_MainWindow(object): self.themeManagerDock) # Create the menu items action_list = ActionList.get_instance() - action_list.add_category(UiStrings().File, CategoryOrder.standardMenu) + action_list.add_category(unicode(UiStrings().File), + CategoryOrder.standardMenu) self.fileNewItem = shortcut_action(mainWindow, u'fileNewItem', [QtGui.QKeySequence(u'Ctrl+N')], self.serviceManagerContents.onNewServiceClicked, @@ -199,17 +200,20 @@ class Ui_MainWindow(object): self.fileExitItem = shortcut_action(mainWindow, u'fileExitItem', [QtGui.QKeySequence(u'Alt+F4')], mainWindow.close, u':/system/system_exit.png', category=UiStrings().File) - action_list.add_category(UiStrings().Import, CategoryOrder.standardMenu) + action_list.add_category(unicode(UiStrings().Import), + CategoryOrder.standardMenu) self.importThemeItem = base_action( mainWindow, u'importThemeItem', UiStrings().Import) self.importLanguageItem = base_action( mainWindow, u'importLanguageItem')#, UiStrings().Import) - action_list.add_category(UiStrings().Export, CategoryOrder.standardMenu) + action_list.add_category(unicode(UiStrings().Export), + CategoryOrder.standardMenu) self.exportThemeItem = base_action( mainWindow, u'exportThemeItem', UiStrings().Export) self.exportLanguageItem = base_action( mainWindow, u'exportLanguageItem')#, UiStrings().Export) - action_list.add_category(UiStrings().View, CategoryOrder.standardMenu) + action_list.add_category(unicode(UiStrings().View), + CategoryOrder.standardMenu) self.viewMediaManagerItem = shortcut_action(mainWindow, u'viewMediaManagerItem', [QtGui.QKeySequence(u'F8')], self.toggleMediaManager, u':/system/system_mediamanager.png', @@ -232,7 +236,7 @@ class Ui_MainWindow(object): self.lockPanel = shortcut_action(mainWindow, u'lockPanel', None, self.setLockPanel, checked=panelLocked, category=None) - action_list.add_category(UiStrings().ViewMode, + action_list.add_category(unicode(UiStrings().ViewMode), CategoryOrder.standardMenu) self.modeDefaultItem = checkable_action( mainWindow, u'modeDefaultItem', category=UiStrings().ViewMode) @@ -245,7 +249,8 @@ class Ui_MainWindow(object): self.modeGroup.addAction(self.modeSetupItem) self.modeGroup.addAction(self.modeLiveItem) self.modeDefaultItem.setChecked(True) - action_list.add_category(UiStrings().Tools, CategoryOrder.standardMenu) + action_list.add_category(unicode(UiStrings().Tools), + CategoryOrder.standardMenu) self.toolsAddToolItem = icon_action(mainWindow, u'toolsAddToolItem', u':/tools/tools_add.png', category=UiStrings().Tools) self.toolsOpenDataFolder = icon_action(mainWindow, @@ -256,7 +261,7 @@ class Ui_MainWindow(object): category=UiStrings().Tools) self.updateThemeImages = base_action(mainWindow, u'updateThemeImages', category=UiStrings().Tools) - action_list.add_category(UiStrings().Settings, + action_list.add_category(unicode(UiStrings().Settings), CategoryOrder.standardMenu) self.settingsPluginListItem = shortcut_action(mainWindow, u'settingsPluginListItem', [QtGui.QKeySequence(u'Alt+F7')], @@ -290,7 +295,8 @@ class Ui_MainWindow(object): u'settingsImportItem', category=UiStrings().Settings) self.settingsExportItem = base_action(mainWindow, u'settingsExportItem', category=UiStrings().Settings) - action_list.add_category(UiStrings().Help, CategoryOrder.standardMenu) + action_list.add_category(unicode(UiStrings().Help), + CategoryOrder.standardMenu) self.aboutItem = shortcut_action(mainWindow, u'aboutItem', [QtGui.QKeySequence(u'Ctrl+F1')], self.onAboutItemClicked, u':/system/system_about.png', category=UiStrings().Help) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 8ad2db9c2..0480cb70b 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -177,9 +177,9 @@ class ServiceManager(QtGui.QWidget): self.serviceManagerList.moveTop.setObjectName(u'moveTop') action_list = ActionList.get_instance() action_list.add_category( - UiStrings().Service, CategoryOrder.standardToolbar) + unicode(UiStrings().Service), CategoryOrder.standardToolbar) action_list.add_action( - self.serviceManagerList.moveTop, UiStrings().Service) + self.serviceManagerList.moveTop, unicode(UiStrings().Service)) self.serviceManagerList.moveUp = self.orderToolbar.addToolbarButton( translate('OpenLP.ServiceManager', 'Move &up'), u':/services/service_up.png', @@ -188,7 +188,7 @@ class ServiceManager(QtGui.QWidget): self.onServiceUp, shortcuts=[QtCore.Qt.Key_PageUp]) self.serviceManagerList.moveUp.setObjectName(u'moveUp') action_list.add_action( - self.serviceManagerList.moveUp, UiStrings().Service) + self.serviceManagerList.moveUp, unicode(UiStrings().Service)) self.serviceManagerList.moveDown = self.orderToolbar.addToolbarButton( translate('OpenLP.ServiceManager', 'Move &down'), u':/services/service_down.png', @@ -197,7 +197,7 @@ class ServiceManager(QtGui.QWidget): self.onServiceDown, shortcuts=[QtCore.Qt.Key_PageDown]) self.serviceManagerList.moveDown.setObjectName(u'moveDown') action_list.add_action( - self.serviceManagerList.moveDown, UiStrings().Service) + self.serviceManagerList.moveDown, unicode(UiStrings().Service)) self.serviceManagerList.moveBottom = self.orderToolbar.addToolbarButton( translate('OpenLP.ServiceManager', 'Move to &bottom'), u':/services/service_bottom.png', @@ -206,7 +206,7 @@ class ServiceManager(QtGui.QWidget): self.onServiceEnd, shortcuts=[QtCore.Qt.Key_End]) self.serviceManagerList.moveBottom.setObjectName(u'moveBottom') action_list.add_action( - self.serviceManagerList.moveBottom, UiStrings().Service) + self.serviceManagerList.moveBottom, unicode(UiStrings().Service)) self.serviceManagerList.down = self.orderToolbar.addToolbarButton( translate('OpenLP.ServiceManager', 'Move &down'), None, @@ -241,7 +241,7 @@ class ServiceManager(QtGui.QWidget): self.onExpandAll, shortcuts=[QtCore.Qt.Key_Plus]) self.serviceManagerList.expand.setObjectName(u'expand') action_list.add_action( - self.serviceManagerList.expand, UiStrings().Service) + self.serviceManagerList.expand, unicode(UiStrings().Service)) self.serviceManagerList.collapse = self.orderToolbar.addToolbarButton( translate('OpenLP.ServiceManager', '&Collapse all'), u':/services/service_collapse_all.png', @@ -250,7 +250,7 @@ class ServiceManager(QtGui.QWidget): self.onCollapseAll, shortcuts=[QtCore.Qt.Key_Minus]) self.serviceManagerList.collapse.setObjectName(u'collapse') action_list.add_action( - self.serviceManagerList.collapse, UiStrings().Service) + self.serviceManagerList.collapse, unicode(UiStrings().Service)) self.orderToolbar.addSeparator() self.serviceManagerList.makeLive = self.orderToolbar.addToolbarButton( translate('OpenLP.ServiceManager', 'Go Live'), @@ -260,7 +260,7 @@ class ServiceManager(QtGui.QWidget): shortcuts=[QtCore.Qt.Key_Enter, QtCore.Qt.Key_Return]) self.serviceManagerList.makeLive.setObjectName(u'orderToolbar') action_list.add_action( - self.serviceManagerList.makeLive, UiStrings().Service) + self.serviceManagerList.makeLive, unicode(UiStrings().Service)) self.layout.addWidget(self.orderToolbar) # Connect up our signals and slots QtCore.QObject.connect(self.themeComboBox, diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 92eb7971e..88104026f 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -540,7 +540,7 @@ class SlideController(Controller): self.nextItem.setObjectName(u'nextItemLive') action_list = ActionList.get_instance() action_list.add_category( - UiStrings().LiveToolbar, CategoryOrder.standardToolbar) + unicode(UiStrings().LiveToolbar), CategoryOrder.standardToolbar) action_list.add_action(self.previousItem) action_list.add_action(self.nextItem) self.previousService = shortcut_action(parent, u'previousService', diff --git a/openlp/core/utils/actions.py b/openlp/core/utils/actions.py index 37b66dfce..09265cc58 100644 --- a/openlp/core/utils/actions.py +++ b/openlp/core/utils/actions.py @@ -149,8 +149,6 @@ class CategoryList(object): return self.__next__() def has_key(self, key): - if isinstance(key, QtCore.QString): - key = unicode(key) for category in self.categories: if category.name == key: return True @@ -166,8 +164,6 @@ class CategoryList(object): self.add(name, weight) def add(self, name, weight=0, actions=None): - if name and isinstance(name, QtCore.QString): - name = unicode(name) category = ActionCategory(name, weight) if actions: for action in actions: @@ -254,8 +250,6 @@ class ActionList(object): The name (unicode string) of the category, which contains the action. Defaults to None. """ - if isinstance(category, QtCore.QString): - category = unicode(category) if category not in self.categories: return self.categories[category].actions.remove(action) @@ -274,8 +268,6 @@ class ActionList(object): ``weight`` The category's weight (int). """ - if isinstance(name, QtCore.QString): - name = unicode(name) if name in self.categories: # Only change the weight and resort the categories again. for category in self.categories: diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index 619581b17..a225c9a4e 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -71,7 +71,8 @@ class BiblePlugin(Plugin): self.manager.finalise() Plugin.finalise(self) action_list = ActionList.get_instance() - action_list.remove_action(self.importBibleItem, UiStrings().Import) + action_list.remove_action(self.importBibleItem, + unicode(UiStrings().Import)) self.importBibleItem.setVisible(False) #action_list.remove_action(self.exportBibleItem, UiStrings().Export) self.exportBibleItem.setVisible(False) diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index 049e2da18..b1e815a3a 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -127,13 +127,13 @@ class ImageMediaItem(MediaManagerItem): self.plugin.formparent.incrementProgressBar() filename = os.path.split(unicode(imageFile))[1] thumb = os.path.join(self.servicePath, filename) - if not os.path.exists(imageFile): + if not os.path.exists(unicode(imageFile)): icon = build_icon(u':/general/general_delete.png') else: - if validate_thumb(imageFile, thumb): + if validate_thumb(unicode(imageFile), thumb): icon = build_icon(thumb) else: - icon = create_thumb(imageFile, thumb) + icon = create_thumb(unicode(imageFile), thumb) item_name = QtGui.QListWidgetItem(filename) item_name.setIcon(icon) item_name.setToolTip(imageFile) diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py index a5f194f7b..336a7de31 100644 --- a/openlp/plugins/songs/songsplugin.py +++ b/openlp/plugins/songs/songsplugin.py @@ -269,7 +269,10 @@ class SongsPlugin(Plugin): self.songExportItem.setVisible(False) self.toolsReindexItem.setVisible(False) action_list = ActionList.get_instance() - action_list.remove_action(self.songImportItem, UiStrings().Import) - action_list.remove_action(self.songExportItem, UiStrings().Export) - action_list.remove_action(self.toolsReindexItem, UiStrings().Tools) + action_list.remove_action(self.songImportItem, + unicode(UiStrings().Import)) + action_list.remove_action(self.songExportItem, + unicode(UiStrings().Export)) + action_list.remove_action(self.toolsReindexItem, + unicode(UiStrings().Tools)) Plugin.finalise(self) diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py index d09831052..32e776989 100644 --- a/openlp/plugins/songusage/songusageplugin.py +++ b/openlp/plugins/songusage/songusageplugin.py @@ -157,11 +157,11 @@ class SongUsagePlugin(Plugin): self.songUsageMenu.menuAction().setVisible(False) action_list = ActionList.get_instance() action_list.remove_action(self.songUsageStatus, - translate('SongUsagePlugin', 'Song Usage')) + unicode(translate('SongUsagePlugin', 'Song Usage'))) action_list.remove_action(self.songUsageDelete, - translate('SongUsagePlugin', 'Song Usage')) + unicode(translate('SongUsagePlugin', 'Song Usage'))) action_list.remove_action(self.songUsageReport, - translate('SongUsagePlugin', 'Song Usage')) + unicode(translate('SongUsagePlugin', 'Song Usage'))) self.songUsageActiveButton.hide() # stop any events being processed self.songUsageActive = False