diff --git a/openlp/core/lib/dockwidget.py b/openlp/core/lib/dockwidget.py index c7fa0e6eb..30182c901 100644 --- a/openlp/core/lib/dockwidget.py +++ b/openlp/core/lib/dockwidget.py @@ -28,8 +28,7 @@ ############################################################################### """ -Provide additional functionality required by OpenLP from the inherited -QDockWidget. +Provide additional functionality required by OpenLP from the inherited QDockWidget. """ import logging @@ -56,8 +55,8 @@ class OpenLPDockWidget(QtGui.QDockWidget): self.setWindowIcon(build_icon(icon)) # Sort out the minimum width. screens = ScreenList() - mainwindow_docbars = screens.current[u'size'].width() / 5 - if mainwindow_docbars > 300: + main_window_docbars = screens.current[u'size'].width() / 5 + if main_window_docbars > 300: self.setMinimumWidth(300) else: - self.setMinimumWidth(mainwindow_docbars) + self.setMinimumWidth(main_window_docbars) diff --git a/openlp/core/lib/plugin.py b/openlp/core/lib/plugin.py index f3aea2e5c..87e4ecc90 100644 --- a/openlp/core/lib/plugin.py +++ b/openlp/core/lib/plugin.py @@ -214,7 +214,7 @@ class Plugin(QtCore.QObject): you need, and return it for integration into OpenLP. """ if self.mediaItemClass: - self.mediaItem = self.mediaItemClass(self.main_window.mediaDockManager.media_dock, self) + self.mediaItem = self.mediaItemClass(self.main_window.media_dock_manager.media_dock, self) def addImportMenuItem(self, importMenu): """ @@ -284,14 +284,14 @@ class Plugin(QtCore.QObject): """ if self.mediaItem: self.mediaItem.initialise() - self.main_window.mediaDockManager.insert_dock(self.mediaItem, self.icon, self.weight) + self.main_window.media_dock_manager.insert_dock(self.mediaItem, self.icon, self.weight) def finalise(self): """ Called by the plugin Manager to cleanup things. """ if self.mediaItem: - self.main_window.mediaDockManager.remove_dock(self.mediaItem) + self.main_window.media_dock_manager.remove_dock(self.mediaItem) def app_startup(self): """ diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 8aebda375..e44347e55 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -93,209 +93,211 @@ class Ui_MainWindow(object): main_window.setWindowIcon(build_icon(u':/icon/openlp-logo-64x64.png')) main_window.setDockNestingEnabled(True) # Set up the main container, which contains all the other form widgets. - self.mainContent = QtGui.QWidget(main_window) - self.mainContent.setObjectName(u'mainContent') - self.mainContentLayout = QtGui.QHBoxLayout(self.mainContent) - self.mainContentLayout.setSpacing(0) - self.mainContentLayout.setMargin(0) - self.mainContentLayout.setObjectName(u'mainContentLayout') - main_window.setCentralWidget(self.mainContent) - self.controlSplitter = QtGui.QSplitter(self.mainContent) + self.main_content = QtGui.QWidget(main_window) + self.main_content.setObjectName(u'main_content') + self.main_contentLayout = QtGui.QHBoxLayout(self.main_content) + self.main_contentLayout.setSpacing(0) + self.main_contentLayout.setMargin(0) + self.main_contentLayout.setObjectName(u'main_contentLayout') + main_window.setCentralWidget(self.main_content) + self.controlSplitter = QtGui.QSplitter(self.main_content) self.controlSplitter.setOrientation(QtCore.Qt.Horizontal) self.controlSplitter.setObjectName(u'controlSplitter') - self.mainContentLayout.addWidget(self.controlSplitter) + self.main_contentLayout.addWidget(self.controlSplitter) # Create slide controllers self.preview_controller = SlideController(self) self.live_controller = SlideController(self, True) - previewVisible = Settings().value(u'user interface/preview panel') - self.preview_controller.panel.setVisible(previewVisible) - liveVisible = Settings().value(u'user interface/live panel') - panelLocked = Settings().value(u'user interface/lock panel') - self.live_controller.panel.setVisible(liveVisible) + preview_visible = Settings().value(u'user interface/preview panel') + self.preview_controller.panel.setVisible(preview_visible) + live_visible = Settings().value(u'user interface/live panel') + panel_locked = Settings().value(u'user interface/lock panel') + self.live_controller.panel.setVisible(live_visible) # Create menu self.menuBar = QtGui.QMenuBar(main_window) self.menuBar.setObjectName(u'menuBar') - self.fileMenu = QtGui.QMenu(self.menuBar) - self.fileMenu.setObjectName(u'fileMenu') - self.recentFilesMenu = QtGui.QMenu(self.fileMenu) - self.recentFilesMenu.setObjectName(u'recentFilesMenu') - self.file_import_menu = QtGui.QMenu(self.fileMenu) + self.file_menu = QtGui.QMenu(self.menuBar) + self.file_menu.setObjectName(u'fileMenu') + self.recent_files_menu = QtGui.QMenu(self.file_menu) + self.recent_files_menu.setObjectName(u'recentFilesMenu') + self.file_import_menu = QtGui.QMenu(self.file_menu) self.file_import_menu.setObjectName(u'file_import_menu') - self.file_export_menu = QtGui.QMenu(self.fileMenu) + self.file_export_menu = QtGui.QMenu(self.file_menu) self.file_export_menu.setObjectName(u'file_export_menu') # View Menu - self.viewMenu = QtGui.QMenu(self.menuBar) - self.viewMenu.setObjectName(u'viewMenu') - self.viewModeMenu = QtGui.QMenu(self.viewMenu) - self.viewModeMenu.setObjectName(u'viewModeMenu') + self.view_menu = QtGui.QMenu(self.menuBar) + self.view_menu.setObjectName(u'viewMenu') + self.view_modeMenu = QtGui.QMenu(self.view_menu) + self.view_modeMenu.setObjectName(u'viewModeMenu') # Tools Menu self.tools_menu = QtGui.QMenu(self.menuBar) self.tools_menu.setObjectName(u'tools_menu') # Settings Menu - self.settingsMenu = QtGui.QMenu(self.menuBar) - self.settingsMenu.setObjectName(u'settingsMenu') - self.settingsLanguageMenu = QtGui.QMenu(self.settingsMenu) - self.settingsLanguageMenu.setObjectName(u'settingsLanguageMenu') + self.settings_menu = QtGui.QMenu(self.menuBar) + self.settings_menu.setObjectName(u'settingsMenu') + self.settings_language_menu = QtGui.QMenu(self.settings_menu) + self.settings_language_menu.setObjectName(u'settingsLanguageMenu') # Help Menu - self.helpMenu = QtGui.QMenu(self.menuBar) - self.helpMenu.setObjectName(u'helpMenu') + self.help_menu = QtGui.QMenu(self.menuBar) + self.help_menu.setObjectName(u'helpMenu') main_window.setMenuBar(self.menuBar) - self.statusBar = QtGui.QStatusBar(main_window) - self.statusBar.setObjectName(u'statusBar') - main_window.setStatusBar(self.statusBar) - self.loadProgressBar = QtGui.QProgressBar(self.statusBar) - self.loadProgressBar.setObjectName(u'loadProgressBar') - self.statusBar.addPermanentWidget(self.loadProgressBar) - self.loadProgressBar.hide() - self.loadProgressBar.setValue(0) - self.loadProgressBar.setStyleSheet(PROGRESSBAR_STYLE) - self.defaultThemeLabel = QtGui.QLabel(self.statusBar) - self.defaultThemeLabel.setObjectName(u'defaultThemeLabel') - self.statusBar.addPermanentWidget(self.defaultThemeLabel) + self.status_bar = QtGui.QStatusBar(main_window) + self.status_bar.setObjectName(u'status_bar') + main_window.setStatusBar(self.status_bar) + self.load_progress_bar = QtGui.QProgressBar(self.status_bar) + self.load_progress_bar.setObjectName(u'load_progress_bar') + self.status_bar.addPermanentWidget(self.load_progress_bar) + self.load_progress_bar.hide() + self.load_progress_bar.setValue(0) + self.load_progress_bar.setStyleSheet(PROGRESSBAR_STYLE) + self.default_theme_label = QtGui.QLabel(self.status_bar) + self.default_theme_label.setObjectName(u'default_theme_label') + self.status_bar.addPermanentWidget(self.default_theme_label) # Create the MediaManager - self.mediaManagerDock = OpenLPDockWidget(main_window, u'mediaManagerDock', u':/system/system_mediamanager.png') - self.mediaManagerDock.setStyleSheet(MEDIA_MANAGER_STYLE) + self.media_manager_dock = OpenLPDockWidget(main_window, u'media_manager_dock', + u':/system/system_mediamanager.png') + self.media_manager_dock.setStyleSheet(MEDIA_MANAGER_STYLE) # Create the media toolbox - self.mediaToolBox = QtGui.QToolBox(self.mediaManagerDock) - self.mediaToolBox.setObjectName(u'mediaToolBox') - self.mediaManagerDock.setWidget(self.mediaToolBox) - main_window.addDockWidget(QtCore.Qt.LeftDockWidgetArea, self.mediaManagerDock) + self.media_tool_box = QtGui.QToolBox(self.media_manager_dock) + self.media_tool_box.setObjectName(u'media_tool_box') + self.media_manager_dock.setWidget(self.media_tool_box) + main_window.addDockWidget(QtCore.Qt.LeftDockWidgetArea, self.media_manager_dock) # Create the service manager - self.serviceManagerDock = OpenLPDockWidget(main_window, u'serviceManagerDock', + self.service_manager_dock = OpenLPDockWidget(main_window, u'service_manager_dock', u':/system/system_servicemanager.png') - self.serviceManagerContents = ServiceManager(self.serviceManagerDock) - self.serviceManagerDock.setWidget(self.serviceManagerContents) - main_window.addDockWidget(QtCore.Qt.RightDockWidgetArea, self.serviceManagerDock) + self.service_manager_contents = ServiceManager(self.service_manager_dock) + self.service_manager_dock.setWidget(self.service_manager_contents) + main_window.addDockWidget(QtCore.Qt.RightDockWidgetArea, self.service_manager_dock) # Create the theme manager - self.themeManagerDock = OpenLPDockWidget(main_window, u'themeManagerDock', u':/system/system_thememanager.png') - self.themeManagerContents = ThemeManager(self.themeManagerDock) - self.themeManagerContents.setObjectName(u'themeManagerContents') - self.themeManagerDock.setWidget(self.themeManagerContents) - main_window.addDockWidget(QtCore.Qt.RightDockWidgetArea, self.themeManagerDock) + self.theme_manager_dock = OpenLPDockWidget(main_window, u'theme_manager_dock', + u':/system/system_thememanager.png') + self.theme_manager_contents = ThemeManager(self.theme_manager_dock) + self.theme_manager_contents.setObjectName(u'theme_manager_contents') + self.theme_manager_dock.setWidget(self.theme_manager_contents) + main_window.addDockWidget(QtCore.Qt.RightDockWidgetArea, self.theme_manager_dock) # Create the menu items action_list = ActionList.get_instance() action_list.add_category(UiStrings().File, CategoryOrder.standard_menu) - self.fileNewItem = create_action(main_window, u'fileNewItem', + self.file_new_item = create_action(main_window, u'fileNewItem', icon=u':/general/general_new.png', can_shortcuts=True, category=UiStrings().File, - triggers=self.serviceManagerContents.on_new_service_clicked) - self.fileOpenItem = create_action(main_window, u'fileOpenItem', + triggers=self.service_manager_contents.on_new_service_clicked) + self.file_open_item = create_action(main_window, u'fileOpenItem', icon=u':/general/general_open.png', can_shortcuts=True, category=UiStrings().File, - triggers=self.serviceManagerContents.on_load_service_clicked) - self.fileSaveItem = create_action(main_window, u'fileSaveItem', + triggers=self.service_manager_contents.on_load_service_clicked) + self.file_save_item = create_action(main_window, u'fileSaveItem', icon=u':/general/general_save.png', can_shortcuts=True, category=UiStrings().File, - triggers=self.serviceManagerContents.save_file) - self.fileSaveAsItem = create_action(main_window, u'fileSaveAsItem', + triggers=self.service_manager_contents.save_file) + self.file_save_as_item = create_action(main_window, u'fileSaveAsItem', can_shortcuts=True, category=UiStrings().File, - triggers=self.serviceManagerContents.save_file_as) - self.printServiceOrderItem = create_action(main_window, + triggers=self.service_manager_contents.save_file_as) + self.print_service_order_item = create_action(main_window, u'printServiceItem', can_shortcuts=True, category=UiStrings().File, - triggers=self.serviceManagerContents.print_service_order) - self.fileExitItem = create_action(main_window, u'fileExitItem', + triggers=self.service_manager_contents.print_service_order) + self.file_exit_item = create_action(main_window, u'fileExitItem', icon=u':/system/system_exit.png', can_shortcuts=True, category=UiStrings().File, triggers=main_window.close) # Give QT Extra Hint that this is the Exit Menu Item - self.fileExitItem.setMenuRole(QtGui.QAction.QuitRole) + self.file_exit_item.setMenuRole(QtGui.QAction.QuitRole) action_list.add_category(UiStrings().Import, CategoryOrder.standard_menu) - self.importThemeItem = create_action( + self.import_theme_item = create_action( main_window, u'importThemeItem', category=UiStrings().Import, can_shortcuts=True) - self.importLanguageItem = create_action(main_window, u'importLanguageItem') + self.import_language_item = create_action(main_window, u'importLanguageItem') action_list.add_category(UiStrings().Export, CategoryOrder.standard_menu) - self.exportThemeItem = create_action( + self.export_theme_item = create_action( main_window, u'exportThemeItem', category=UiStrings().Export, can_shortcuts=True) - self.exportLanguageItem = create_action(main_window, u'exportLanguageItem') + self.export_language_item = create_action(main_window, u'exportLanguageItem') action_list.add_category(UiStrings().View, CategoryOrder.standard_menu) - self.viewMediaManagerItem = create_action(main_window, + self.view_media_manager_item = create_action(main_window, u'viewMediaManagerItem', icon=u':/system/system_mediamanager.png', - checked=self.mediaManagerDock.isVisible(), + checked=self.media_manager_dock.isVisible(), can_shortcuts=True, - category=UiStrings().View, triggers=self.toggleMediaManager) - self.viewThemeManagerItem = create_action(main_window, + category=UiStrings().View, triggers=self.toggle_media_manager) + self.view_theme_manager_item = create_action(main_window, u'viewThemeManagerItem', can_shortcuts=True, icon=u':/system/system_thememanager.png', - checked=self.themeManagerDock.isVisible(), - category=UiStrings().View, triggers=self.toggleThemeManager) - self.viewServiceManagerItem = create_action(main_window, + checked=self.theme_manager_dock.isVisible(), + category=UiStrings().View, triggers=self.toggle_theme_manager) + self.view_service_manager_item = create_action(main_window, u'viewServiceManagerItem', can_shortcuts=True, icon=u':/system/system_servicemanager.png', - checked=self.serviceManagerDock.isVisible(), - category=UiStrings().View, triggers=self.toggleServiceManager) - self.viewPreviewPanel = create_action(main_window, u'viewPreviewPanel', - can_shortcuts=True, checked=previewVisible, - category=UiStrings().View, triggers=self.setPreviewPanelVisibility) - self.viewLivePanel = create_action(main_window, u'viewLivePanel', - can_shortcuts=True, checked=liveVisible, - category=UiStrings().View, triggers=self.setLivePanelVisibility) + checked=self.service_manager_dock.isVisible(), + category=UiStrings().View, triggers=self.toggle_service_manager) + self.view_preview_panel = create_action(main_window, u'viewPreviewPanel', + can_shortcuts=True, checked=preview_visible, + category=UiStrings().View, triggers=self.set_preview_panel_visibility) + self.view_live_panel = create_action(main_window, u'viewLivePanel', + can_shortcuts=True, checked=live_visible, + category=UiStrings().View, triggers=self.set_live_panel_visibility) self.lockPanel = create_action(main_window, u'lockPanel', - can_shortcuts=True, checked=panelLocked, + can_shortcuts=True, checked=panel_locked, category=UiStrings().View, - triggers=self.setLockPanel) + triggers=self.set_lock_panel) action_list.add_category(UiStrings().ViewMode, CategoryOrder.standard_menu) - self.modeDefaultItem = create_action( + self.mode_default_Item = create_action( main_window, u'modeDefaultItem', checked=False, category=UiStrings().ViewMode, can_shortcuts=True) - self.modeSetupItem = create_action( + self.mode_setup_item = create_action( main_window, u'modeSetupItem', checked=False, category=UiStrings().ViewMode, can_shortcuts=True) - self.modeLiveItem = create_action( + self.mode_live_item = create_action( main_window, u'modeLiveItem', checked=True, category=UiStrings().ViewMode, can_shortcuts=True) self.modeGroup = QtGui.QActionGroup(main_window) - self.modeGroup.addAction(self.modeDefaultItem) - self.modeGroup.addAction(self.modeSetupItem) - self.modeGroup.addAction(self.modeLiveItem) - self.modeDefaultItem.setChecked(True) + self.modeGroup.addAction(self.mode_default_Item) + self.modeGroup.addAction(self.mode_setup_item) + self.modeGroup.addAction(self.mode_live_item) + self.mode_default_Item.setChecked(True) action_list.add_category(UiStrings().Tools, CategoryOrder.standard_menu) - self.toolsAddToolItem = create_action(main_window, + self.tools_add_Tool_Item = create_action(main_window, u'toolsAddToolItem', icon=u':/tools/tools_add.png', category=UiStrings().Tools, can_shortcuts=True) - self.toolsOpenDataFolder = create_action(main_window, + self.tools_open_data_folder = create_action(main_window, u'toolsOpenDataFolder', icon=u':/general/general_open.png', category=UiStrings().Tools, can_shortcuts=True) - self.toolsFirstTimeWizard = create_action(main_window, + self.tools_first_time_wizard = create_action(main_window, u'toolsFirstTimeWizard', icon=u':/general/general_revert.png', category=UiStrings().Tools, can_shortcuts=True) - self.updateThemeImages = create_action(main_window, + self.update_theme_images = create_action(main_window, u'updateThemeImages', category=UiStrings().Tools, can_shortcuts=True) action_list.add_category(UiStrings().Settings, CategoryOrder.standard_menu) self.settingsPluginListItem = create_action(main_window, u'settingsPluginListItem', icon=u':/system/settings_plugin_list.png', can_shortcuts=True, - category=UiStrings().Settings, triggers=self.onPluginItemClicked) + category=UiStrings().Settings, triggers=self.on_plugin_item_clicked) # i18n Language Items - self.autoLanguageItem = create_action(main_window, u'autoLanguageItem', checked=LanguageManager.auto_language) - self.languageGroup = QtGui.QActionGroup(main_window) - self.languageGroup.setExclusive(True) - self.languageGroup.setObjectName(u'languageGroup') - add_actions(self.languageGroup, [self.autoLanguageItem]) - qmList = LanguageManager.get_qm_list() - savedLanguage = LanguageManager.get_language() - for key in sorted(qmList.keys()): - languageItem = create_action(main_window, key, checked=qmList[key] == savedLanguage) - add_actions(self.languageGroup, [languageItem]) - self.settingsShortcutsItem = create_action(main_window, u'settingsShortcutsItem', + self.auto_language_item = create_action(main_window, u'autoLanguageItem', checked=LanguageManager.auto_language) + self.language_group = QtGui.QActionGroup(main_window) + self.language_group.setExclusive(True) + self.language_group.setObjectName(u'languageGroup') + add_actions(self.language_group, [self.auto_language_item]) + qm_list = LanguageManager.get_qm_list() + saved_language = LanguageManager.get_language() + for key in sorted(qm_list.keys()): + language_item = create_action(main_window, key, checked=qm_list[key] == saved_language) + add_actions(self.language_group, [language_item]) + self.settings_shortcuts_item = create_action(main_window, u'settingsShortcutsItem', icon=u':/system/system_configure_shortcuts.png', category=UiStrings().Settings, can_shortcuts=True) # Formatting Tags were also known as display tags. - self.formattingTagItem = create_action(main_window, u'displayTagItem', + self.formatting_tag_item = create_action(main_window, u'displayTagItem', icon=u':/system/tag_editor.png', category=UiStrings().Settings, can_shortcuts=True) - self.settingsConfigureItem = create_action(main_window, u'settingsConfigureItem', + self.settings_configure_item = create_action(main_window, u'settingsConfigureItem', icon=u':/system/system_settings.png', can_shortcuts=True, category=UiStrings().Settings) # Give QT Extra Hint that this is the Preferences Menu Item - self.settingsConfigureItem.setMenuRole(QtGui.QAction.PreferencesRole) - self.settingsImportItem = create_action( + self.settings_configure_item.setMenuRole(QtGui.QAction.PreferencesRole) + self.settings_import_item = create_action( main_window, u'settingsImportItem', category=UiStrings().Import, can_shortcuts=True) - self.settingsExportItem = create_action( + self.settings_export_item = create_action( main_window, u'settingsExportItem', category=UiStrings().Export, can_shortcuts=True) action_list.add_category(UiStrings().Help, CategoryOrder.standard_menu) - self.aboutItem = create_action(main_window, u'aboutItem', icon=u':/system/system_about.png', + self.about_item = create_action(main_window, u'aboutItem', icon=u':/system/system_about.png', can_shortcuts=True, category=UiStrings().Help, triggers=self.onAboutItemClicked) # Give QT Extra Hint that this is an About Menu Item - self.aboutItem.setMenuRole(QtGui.QAction.AboutRole) + self.about_item.setMenuRole(QtGui.QAction.AboutRole) if os.name == u'nt': self.localHelpFile = os.path.join( AppLocation.get_directory(AppLocation.AppDir), 'OpenLP.chm') @@ -303,55 +305,55 @@ class Ui_MainWindow(object): icon=u':/system/system_help_contents.png', can_shortcuts=True, category=UiStrings().Help, triggers=self.onOfflineHelpClicked) - self.onlineHelpItem = create_action(main_window, u'onlineHelpItem', + self.on_line_help_item = create_action(main_window, u'onlineHelpItem', icon=u':/system/system_online_help.png', can_shortcuts=True, category=UiStrings().Help, triggers=self.onOnlineHelpClicked) - self.webSiteItem = create_action(main_window, u'webSiteItem', can_shortcuts=True, category=UiStrings().Help) - add_actions(self.file_import_menu, (self.settingsImportItem, None, self.importThemeItem, - self.importLanguageItem)) - add_actions(self.file_export_menu, (self.settingsExportItem, None, self.exportThemeItem, - self.exportLanguageItem)) - add_actions(self.fileMenu, (self.fileNewItem, self.fileOpenItem, - self.fileSaveItem, self.fileSaveAsItem, self.recentFilesMenu.menuAction(), None, - self.file_import_menu.menuAction(), self.file_export_menu.menuAction(), None, self.printServiceOrderItem, - self.fileExitItem)) - add_actions(self.viewModeMenu, (self.modeDefaultItem, self.modeSetupItem, self.modeLiveItem)) - add_actions(self.viewMenu, (self.viewModeMenu.menuAction(), None, self.viewMediaManagerItem, - self.viewServiceManagerItem, self.viewThemeManagerItem, None, self.viewPreviewPanel, - self.viewLivePanel, None, self.lockPanel)) + self.web_site_item = create_action(main_window, u'webSiteItem', can_shortcuts=True, category=UiStrings().Help) + add_actions(self.file_import_menu, (self.settings_import_item, None, self.import_theme_item, + self.import_language_item)) + add_actions(self.file_export_menu, (self.settings_export_item, None, self.export_theme_item, + self.export_language_item)) + add_actions(self.file_menu, (self.file_new_item, self.file_open_item, + self.file_save_item, self.file_save_as_item, self.recent_files_menu.menuAction(), None, + self.file_import_menu.menuAction(), self.file_export_menu.menuAction(), None, self.print_service_order_item, + self.file_exit_item)) + add_actions(self.view_modeMenu, (self.mode_default_Item, self.mode_setup_item, self.mode_live_item)) + add_actions(self.view_menu, (self.view_modeMenu.menuAction(), None, self.view_media_manager_item, + self.view_service_manager_item, self.view_theme_manager_item, None, self.view_preview_panel, + self.view_live_panel, None, self.lockPanel)) # i18n add Language Actions - add_actions(self.settingsLanguageMenu, (self.autoLanguageItem, None)) - add_actions(self.settingsLanguageMenu, self.languageGroup.actions()) + add_actions(self.settings_language_menu, (self.auto_language_item, None)) + add_actions(self.settings_language_menu, self.language_group.actions()) # Order things differently in OS X so that Preferences menu item in the # app menu is correct (this gets picked up automatically by Qt). if sys.platform == u'darwin': - add_actions(self.settingsMenu, (self.settingsPluginListItem, self.settingsLanguageMenu.menuAction(), None, - self.settingsConfigureItem, self.settingsShortcutsItem, self.formattingTagItem)) + add_actions(self.settings_menu, (self.settingsPluginListItem, self.settings_language_menu.menuAction(), + None, self.settings_configure_item, self.settings_shortcuts_item, self.formatting_tag_item)) else: - add_actions(self.settingsMenu, (self.settingsPluginListItem, self.settingsLanguageMenu.menuAction(), None, - self.formattingTagItem, self.settingsShortcutsItem, self.settingsConfigureItem)) - add_actions(self.tools_menu, (self.toolsAddToolItem, None)) - add_actions(self.tools_menu, (self.toolsOpenDataFolder, None)) - add_actions(self.tools_menu, (self.toolsFirstTimeWizard, None)) - add_actions(self.tools_menu, [self.updateThemeImages]) + add_actions(self.settings_menu, (self.settingsPluginListItem, self.settings_language_menu.menuAction(), + None, self.formatting_tag_item, self.settings_shortcuts_item, self.settings_configure_item)) + add_actions(self.tools_menu, (self.tools_add_Tool_Item, None)) + add_actions(self.tools_menu, (self.tools_open_data_folder, None)) + add_actions(self.tools_menu, (self.tools_first_time_wizard, None)) + add_actions(self.tools_menu, [self.update_theme_images]) if os.name == u'nt': - add_actions(self.helpMenu, (self.offlineHelpItem, self.onlineHelpItem, None, self.webSiteItem, - self.aboutItem)) + add_actions(self.help_menu, (self.offlineHelpItem, self.on_line_help_item, None, self.web_site_item, + self.about_item)) else: - add_actions(self.helpMenu, (self.onlineHelpItem, None, self.webSiteItem, self.aboutItem)) - add_actions(self.menuBar, (self.fileMenu.menuAction(), self.viewMenu.menuAction(), self.tools_menu.menuAction(), - self.settingsMenu.menuAction(), self.helpMenu.menuAction())) + add_actions(self.help_menu, (self.on_line_help_item, None, self.web_site_item, self.about_item)) + add_actions(self.menuBar, (self.file_menu.menuAction(), self.view_menu.menuAction(), + self.tools_menu.menuAction(), self.settings_menu.menuAction(), self.help_menu.menuAction())) # Initialise the translation self.retranslateUi(main_window) - self.mediaToolBox.setCurrentIndex(0) + self.media_tool_box.setCurrentIndex(0) # Connect up some signals and slots - self.fileMenu.aboutToShow.connect(self.updateRecentFilesMenu) + self.file_menu.aboutToShow.connect(self.update_recent_files_menu) # Hide the entry, as it does not have any functionality yet. - self.toolsAddToolItem.setVisible(False) - self.importLanguageItem.setVisible(False) - self.exportLanguageItem.setVisible(False) - self.setLockPanel(panelLocked) + self.tools_add_Tool_Item.setVisible(False) + self.import_language_item.setVisible(False) + self.export_language_item.setVisible(False) + self.set_lock_panel(panel_locked) self.settingsImported = False def retranslateUi(self, mainWindow): @@ -360,98 +362,101 @@ class Ui_MainWindow(object): """ mainWindow.mainTitle = UiStrings().OLPV2x mainWindow.setWindowTitle(mainWindow.mainTitle) - self.fileMenu.setTitle(translate('OpenLP.MainWindow', '&File')) + self.file_menu.setTitle(translate('OpenLP.MainWindow', '&File')) self.file_import_menu.setTitle(translate('OpenLP.MainWindow', '&Import')) self.file_export_menu.setTitle(translate('OpenLP.MainWindow', '&Export')) - self.recentFilesMenu.setTitle(translate('OpenLP.MainWindow', '&Recent Files')) - self.viewMenu.setTitle(translate('OpenLP.MainWindow', '&View')) - self.viewModeMenu.setTitle(translate('OpenLP.MainWindow', 'M&ode')) + self.recent_files_menu.setTitle(translate('OpenLP.MainWindow', '&Recent Files')) + self.view_menu.setTitle(translate('OpenLP.MainWindow', '&View')) + self.view_modeMenu.setTitle(translate('OpenLP.MainWindow', 'M&ode')) self.tools_menu.setTitle(translate('OpenLP.MainWindow', '&Tools')) - self.settingsMenu.setTitle(translate('OpenLP.MainWindow', '&Settings')) - self.settingsLanguageMenu.setTitle(translate('OpenLP.MainWindow', '&Language')) - self.helpMenu.setTitle(translate('OpenLP.MainWindow', '&Help')) - self.mediaManagerDock.setWindowTitle(translate('OpenLP.MainWindow', 'Media Manager')) - self.serviceManagerDock.setWindowTitle(translate('OpenLP.MainWindow', 'Service Manager')) - self.themeManagerDock.setWindowTitle(translate('OpenLP.MainWindow', 'Theme Manager')) - self.fileNewItem.setText(translate('OpenLP.MainWindow', '&New')) - self.fileNewItem.setToolTip(UiStrings().NewService) - self.fileNewItem.setStatusTip(UiStrings().CreateService) - self.fileOpenItem.setText(translate('OpenLP.MainWindow', '&Open')) - self.fileOpenItem.setToolTip(UiStrings().OpenService) - self.fileOpenItem.setStatusTip(translate('OpenLP.MainWindow', 'Open an existing service.')) - self.fileSaveItem.setText(translate('OpenLP.MainWindow', '&Save')) - self.fileSaveItem.setToolTip(UiStrings().SaveService) - self.fileSaveItem.setStatusTip(translate('OpenLP.MainWindow', 'Save the current service to disk.')) - self.fileSaveAsItem.setText(translate('OpenLP.MainWindow', 'Save &As...')) - self.fileSaveAsItem.setToolTip(translate('OpenLP.MainWindow', 'Save Service As')) - self.fileSaveAsItem.setStatusTip(translate('OpenLP.MainWindow', 'Save the current service under a new name.')) - self.printServiceOrderItem.setText(UiStrings().PrintService) - self.printServiceOrderItem.setStatusTip(translate('OpenLP.MainWindow', 'Print the current service.')) - self.fileExitItem.setText(translate('OpenLP.MainWindow', 'E&xit')) - self.fileExitItem.setStatusTip(translate('OpenLP.MainWindow', 'Quit OpenLP')) - self.importThemeItem.setText(translate('OpenLP.MainWindow', '&Theme')) - self.importLanguageItem.setText(translate('OpenLP.MainWindow', '&Language')) - self.exportThemeItem.setText(translate('OpenLP.MainWindow', '&Theme')) - self.exportLanguageItem.setText(translate('OpenLP.MainWindow', '&Language')) - self.settingsShortcutsItem.setText(translate('OpenLP.MainWindow', 'Configure &Shortcuts...')) - self.formattingTagItem.setText(translate('OpenLP.MainWindow', 'Configure &Formatting Tags...')) - self.settingsConfigureItem.setText(translate('OpenLP.MainWindow', '&Configure OpenLP...')) - self.settingsExportItem.setStatusTip(translate('OpenLP.MainWindow', + self.settings_menu.setTitle(translate('OpenLP.MainWindow', '&Settings')) + self.settings_language_menu.setTitle(translate('OpenLP.MainWindow', '&Language')) + self.help_menu.setTitle(translate('OpenLP.MainWindow', '&Help')) + self.media_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Media Manager')) + self.service_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Service Manager')) + self.theme_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Theme Manager')) + self.file_new_item.setText(translate('OpenLP.MainWindow', '&New')) + self.file_new_item.setToolTip(UiStrings().NewService) + self.file_new_item.setStatusTip(UiStrings().CreateService) + self.file_open_item.setText(translate('OpenLP.MainWindow', '&Open')) + self.file_open_item.setToolTip(UiStrings().OpenService) + self.file_open_item.setStatusTip(translate('OpenLP.MainWindow', 'Open an existing service.')) + self.file_save_item.setText(translate('OpenLP.MainWindow', '&Save')) + self.file_save_item.setToolTip(UiStrings().SaveService) + self.file_save_item.setStatusTip(translate('OpenLP.MainWindow', 'Save the current service to disk.')) + self.file_save_as_item.setText(translate('OpenLP.MainWindow', 'Save &As...')) + self.file_save_as_item.setToolTip(translate('OpenLP.MainWindow', 'Save Service As')) + self.file_save_as_item.setStatusTip(translate('OpenLP.MainWindow', + 'Save the current service under a new name.')) + self.print_service_order_item.setText(UiStrings().PrintService) + self.print_service_order_item.setStatusTip(translate('OpenLP.MainWindow', 'Print the current service.')) + self.file_exit_item.setText(translate('OpenLP.MainWindow', 'E&xit')) + self.file_exit_item.setStatusTip(translate('OpenLP.MainWindow', 'Quit OpenLP')) + self.import_theme_item.setText(translate('OpenLP.MainWindow', '&Theme')) + self.import_language_item.setText(translate('OpenLP.MainWindow', '&Language')) + self.export_theme_item.setText(translate('OpenLP.MainWindow', '&Theme')) + self.export_language_item.setText(translate('OpenLP.MainWindow', '&Language')) + self.settings_shortcuts_item.setText(translate('OpenLP.MainWindow', 'Configure &Shortcuts...')) + self.formatting_tag_item.setText(translate('OpenLP.MainWindow', 'Configure &Formatting Tags...')) + self.settings_configure_item.setText(translate('OpenLP.MainWindow', '&Configure OpenLP...')) + self.settings_export_item.setStatusTip(translate('OpenLP.MainWindow', 'Export OpenLP settings to a specified *.config file')) - self.settingsExportItem.setText(translate('OpenLP.MainWindow', 'Settings')) - self.settingsImportItem.setStatusTip(translate('OpenLP.MainWindow', + self.settings_export_item.setText(translate('OpenLP.MainWindow', 'Settings')) + self.settings_import_item.setStatusTip(translate('OpenLP.MainWindow', 'Import OpenLP settings from a specified *.config file previously exported on this or another machine')) - self.settingsImportItem.setText(translate('OpenLP.MainWindow', 'Settings')) - self.viewMediaManagerItem.setText(translate('OpenLP.MainWindow', '&Media Manager')) - self.viewMediaManagerItem.setToolTip(translate('OpenLP.MainWindow', 'Toggle Media Manager')) - self.viewMediaManagerItem.setStatusTip(translate('OpenLP.MainWindow', + self.settings_import_item.setText(translate('OpenLP.MainWindow', 'Settings')) + self.view_media_manager_item.setText(translate('OpenLP.MainWindow', '&Media Manager')) + self.view_media_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Media Manager')) + self.view_media_manager_item.setStatusTip(translate('OpenLP.MainWindow', 'Toggle the visibility of the media manager.')) - self.viewThemeManagerItem.setText(translate('OpenLP.MainWindow', '&Theme Manager')) - self.viewThemeManagerItem.setToolTip(translate('OpenLP.MainWindow', 'Toggle Theme Manager')) - self.viewThemeManagerItem.setStatusTip(translate('OpenLP.MainWindow', + self.view_theme_manager_item.setText(translate('OpenLP.MainWindow', '&Theme Manager')) + self.view_theme_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Theme Manager')) + self.view_theme_manager_item.setStatusTip(translate('OpenLP.MainWindow', 'Toggle the visibility of the theme manager.')) - self.viewServiceManagerItem.setText(translate('OpenLP.MainWindow', '&Service Manager')) - self.viewServiceManagerItem.setToolTip(translate('OpenLP.MainWindow', 'Toggle Service Manager')) - self.viewServiceManagerItem.setStatusTip(translate('OpenLP.MainWindow', + self.view_service_manager_item.setText(translate('OpenLP.MainWindow', '&Service Manager')) + self.view_service_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Service Manager')) + self.view_service_manager_item.setStatusTip(translate('OpenLP.MainWindow', 'Toggle the visibility of the service manager.')) - self.viewPreviewPanel.setText(translate('OpenLP.MainWindow', '&Preview Panel')) - self.viewPreviewPanel.setToolTip(translate('OpenLP.MainWindow', 'Toggle Preview Panel')) - self.viewPreviewPanel.setStatusTip( + self.view_preview_panel.setText(translate('OpenLP.MainWindow', '&Preview Panel')) + self.view_preview_panel.setToolTip(translate('OpenLP.MainWindow', 'Toggle Preview Panel')) + self.view_preview_panel.setStatusTip( translate('OpenLP.MainWindow', 'Toggle the visibility of the preview panel.')) - self.viewLivePanel.setText(translate('OpenLP.MainWindow', '&Live Panel')) - self.viewLivePanel.setToolTip(translate('OpenLP.MainWindow', 'Toggle Live Panel')) + self.view_live_panel.setText(translate('OpenLP.MainWindow', '&Live Panel')) + self.view_live_panel.setToolTip(translate('OpenLP.MainWindow', 'Toggle Live Panel')) self.lockPanel.setText(translate('OpenLP.MainWindow', 'L&ock Panels')) self.lockPanel.setStatusTip(translate('OpenLP.MainWindow', 'Prevent the panels being moved.')) - self.viewLivePanel.setStatusTip(translate('OpenLP.MainWindow', 'Toggle the visibility of the live panel.')) + self.view_live_panel.setStatusTip(translate('OpenLP.MainWindow', 'Toggle the visibility of the live panel.')) self.settingsPluginListItem.setText(translate('OpenLP.MainWindow', '&Plugin List')) self.settingsPluginListItem.setStatusTip(translate('OpenLP.MainWindow', 'List the Plugins')) - self.aboutItem.setText(translate('OpenLP.MainWindow', '&About')) - self.aboutItem.setStatusTip(translate('OpenLP.MainWindow', 'More information about OpenLP')) + self.about_item.setText(translate('OpenLP.MainWindow', '&About')) + self.about_item.setStatusTip(translate('OpenLP.MainWindow', 'More information about OpenLP')) if os.name == u'nt': self.offlineHelpItem.setText(translate('OpenLP.MainWindow', '&User Guide')) - self.onlineHelpItem.setText(translate('OpenLP.MainWindow', '&Online Help')) - self.webSiteItem.setText(translate('OpenLP.MainWindow', '&Web Site')) - for item in self.languageGroup.actions(): + self.on_line_help_item.setText(translate('OpenLP.MainWindow', '&Online Help')) + self.web_site_item.setText(translate('OpenLP.MainWindow', '&Web Site')) + for item in self.language_group.actions(): item.setText(item.objectName()) item.setStatusTip(translate('OpenLP.MainWindow', 'Set the interface language to %s') % item.objectName()) - self.autoLanguageItem.setText(translate('OpenLP.MainWindow', '&Autodetect')) - self.autoLanguageItem.setStatusTip(translate('OpenLP.MainWindow', 'Use the system language, if available.')) - self.toolsAddToolItem.setText(translate('OpenLP.MainWindow', 'Add &Tool...')) - self.toolsAddToolItem.setStatusTip(translate('OpenLP.MainWindow', 'Add an application to the list of tools.')) - self.toolsOpenDataFolder.setText(translate('OpenLP.MainWindow', 'Open &Data Folder...')) - self.toolsOpenDataFolder.setStatusTip(translate('OpenLP.MainWindow', + self.auto_language_item.setText(translate('OpenLP.MainWindow', '&Autodetect')) + self.auto_language_item.setStatusTip(translate('OpenLP.MainWindow', 'Use the system language, if available.')) + self.tools_add_Tool_Item.setText(translate('OpenLP.MainWindow', 'Add &Tool...')) + self.tools_add_Tool_Item.setStatusTip(translate('OpenLP.MainWindow', + 'Add an application to the list of tools.')) + self.tools_open_data_folder.setText(translate('OpenLP.MainWindow', 'Open &Data Folder...')) + self.tools_open_data_folder.setStatusTip(translate('OpenLP.MainWindow', 'Open the folder where songs, bibles and other data resides.')) - self.toolsFirstTimeWizard.setText(translate('OpenLP.MainWindow', 'Re-run First Time Wizard')) - self.toolsFirstTimeWizard.setStatusTip(translate('OpenLP.MainWindow', + self.tools_first_time_wizard.setText(translate('OpenLP.MainWindow', 'Re-run First Time Wizard')) + self.tools_first_time_wizard.setStatusTip(translate('OpenLP.MainWindow', 'Re-run the First Time Wizard, importing songs, Bibles and themes.')) - self.updateThemeImages.setText(translate('OpenLP.MainWindow', 'Update Theme Images')) - self.updateThemeImages.setStatusTip(translate('OpenLP.MainWindow', 'Update the preview images for all themes.')) - self.modeDefaultItem.setText(translate('OpenLP.MainWindow', '&Default')) - self.modeDefaultItem.setStatusTip(translate('OpenLP.MainWindow', 'Set the view mode back to the default.')) - self.modeSetupItem.setText(translate('OpenLP.MainWindow', '&Setup')) - self.modeSetupItem.setStatusTip(translate('OpenLP.MainWindow', 'Set the view mode to Setup.')) - self.modeLiveItem.setText(translate('OpenLP.MainWindow', '&Live')) - self.modeLiveItem.setStatusTip(translate('OpenLP.MainWindow', 'Set the view mode to Live.')) + self.update_theme_images.setText(translate('OpenLP.MainWindow', 'Update Theme Images')) + self.update_theme_images.setStatusTip(translate('OpenLP.MainWindow', + 'Update the preview images for all themes.')) + self.mode_default_Item.setText(translate('OpenLP.MainWindow', '&Default')) + self.mode_default_Item.setStatusTip(translate('OpenLP.MainWindow', 'Set the view mode back to the default.')) + self.mode_setup_item.setText(translate('OpenLP.MainWindow', '&Setup')) + self.mode_setup_item.setStatusTip(translate('OpenLP.MainWindow', 'Set the view mode to Setup.')) + self.mode_live_item.setText(translate('OpenLP.MainWindow', '&Live')) + self.mode_live_item.setStatusTip(translate('OpenLP.MainWindow', 'Set the view mode to Live.')) class MainWindow(QtGui.QMainWindow, Ui_MainWindow): @@ -470,63 +475,63 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): self.clipboard = self.application.clipboard() self.arguments = self.application.args # Set up settings sections for the main application (not for use by plugins). - self.uiSettingsSection = u'user interface' - self.generalSettingsSection = u'general' - self.advancedSettingsSection = u'advanced' - self.shortcutsSettingsSection = u'shortcuts' - self.serviceManagerSettingsSection = u'servicemanager' - self.songsSettingsSection = u'songs' - self.themesSettingsSection = u'themes' - self.playersSettingsSection = u'players' - self.displayTagsSection = u'displayTags' - self.headerSection = u'SettingsImport' - self.recentFiles = [] + self.ui_settings_section = u'user interface' + self.general_settings_section = u'general' + self.advanced_settings_section = u'advanced' + self.shortcuts_settings_section = u'shortcuts' + self.service_manager_settings_section = u'servicemanager' + self.songs_settings_section = u'songs' + self.themes_settings_section = u'themes' + self.players_settings_section = u'players' + self.display_tags_section = u'displayTags' + self.header_section = u'SettingsImport' + self.recent_files = [] self.timer_id = 0 self.timer_version_id = 0 self.new_data_path = None self.copy_data = False Settings().set_up_default_values() Settings().remove_obsolete_settings() - self.serviceNotSaved = False - self.aboutForm = AboutForm(self) + self.service_not_saved = False + self.about_form = AboutForm(self) self.media_controller = MediaController() - self.settingsForm = SettingsForm(self) - self.formattingTagForm = FormattingTagForm(self) - self.shortcutForm = ShortcutListForm(self) + self.settings_form = SettingsForm(self) + self.formatting_tag_form = FormattingTagForm(self) + self.shortcut_form = ShortcutListForm(self) # Set up the path with plugins self.plugin_manager = PluginManager() self.image_manager = ImageManager() # Set up the interface self.setupUi(self) # Define the media Dock Manager - self.mediaDockManager = MediaDockManager(self.mediaToolBox) + self.media_dock_manager = MediaDockManager(self.media_tool_box) # Load settings after setupUi so default UI sizes are overwritten - self.loadSettings() + self.load_settings() # Once settings are loaded update the menu with the recent files. - self.updateRecentFilesMenu() - self.pluginForm = PluginForm(self) + self.update_recent_files_menu() + self.plugin_form = PluginForm(self) # Set up signals and slots - self.mediaManagerDock.visibilityChanged.connect(self.viewMediaManagerItem.setChecked) - self.serviceManagerDock.visibilityChanged.connect(self.viewServiceManagerItem.setChecked) - self.themeManagerDock.visibilityChanged.connect(self.viewThemeManagerItem.setChecked) - self.importThemeItem.triggered.connect(self.themeManagerContents.on_import_theme) - self.exportThemeItem.triggered.connect(self.themeManagerContents.on_export_theme) - self.webSiteItem.triggered.connect(self.onHelpWebSiteClicked) - self.toolsOpenDataFolder.triggered.connect(self.onToolsOpenDataFolderClicked) - self.toolsFirstTimeWizard.triggered.connect(self.onFirstTimeWizardClicked) - self.updateThemeImages.triggered.connect(self.onUpdateThemeImages) - self.formattingTagItem.triggered.connect(self.onFormattingTagItemClicked) - self.settingsConfigureItem.triggered.connect(self.onSettingsConfigureItemClicked) - self.settingsShortcutsItem.triggered.connect(self.onSettingsShortcutsItemClicked) - self.settingsImportItem.triggered.connect(self.onSettingsImportItemClicked) - self.settingsExportItem.triggered.connect(self.onSettingsExportItemClicked) + self.media_manager_dock.visibilityChanged.connect(self.view_media_manager_item.setChecked) + self.service_manager_dock.visibilityChanged.connect(self.view_service_manager_item.setChecked) + self.theme_manager_dock.visibilityChanged.connect(self.view_theme_manager_item.setChecked) + self.import_theme_item.triggered.connect(self.theme_manager_contents.on_import_theme) + self.export_theme_item.triggered.connect(self.theme_manager_contents.on_export_theme) + self.web_site_item.triggered.connect(self.onHelpWebSiteClicked) + self.tools_open_data_folder.triggered.connect(self.onToolsOpenDataFolderClicked) + self.tools_first_time_wizard.triggered.connect(self.onFirstTimeWizardClicked) + self.update_theme_images.triggered.connect(self.onUpdateThemeImages) + self.formatting_tag_item.triggered.connect(self.onFormattingTagItemClicked) + self.settings_configure_item.triggered.connect(self.onSettingsConfigureItemClicked) + self.settings_shortcuts_item.triggered.connect(self.onSettingsShortcutsItemClicked) + self.settings_import_item.triggered.connect(self.onSettingsImportItemClicked) + self.settings_export_item.triggered.connect(self.onSettingsExportItemClicked) # i18n set signals for languages - self.languageGroup.triggered.connect(LanguageManager.set_language) - self.modeDefaultItem.triggered.connect(self.onModeDefaultItemClicked) - self.modeSetupItem.triggered.connect(self.onModeSetupItemClicked) - self.modeLiveItem.triggered.connect(self.onModeLiveItemClicked) + self.language_group.triggered.connect(LanguageManager.set_language) + self.mode_default_Item.triggered.connect(self.onModeDefaultItemClicked) + self.mode_setup_item.triggered.connect(self.onModeSetupItemClicked) + self.mode_live_item.triggered.connect(self.onModeLiveItemClicked) # Media Manager - self.mediaToolBox.currentChanged.connect(self.onMediaToolBoxChanged) + self.media_tool_box.currentChanged.connect(self.onMediaToolBoxChanged) self.application.set_busy_cursor() # Simple message boxes Registry().register_function(u'theme_update_global', self.default_theme_changed) @@ -537,7 +542,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): if Settings().value(u'advanced/save current plugin'): savedPlugin = Settings().value(u'advanced/current media plugin') if savedPlugin != -1: - self.mediaToolBox.setCurrentIndex(savedPlugin) + self.media_tool_box.setCurrentIndex(savedPlugin) # Reset the cursor self.application.set_normal_cursor() @@ -545,15 +550,15 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): """ Set the language to automatic. """ - self.languageGroup.setDisabled(value) + self.language_group.setDisabled(value) LanguageManager.auto_language = value - LanguageManager.set_language(self.languageGroup.checkedAction()) + LanguageManager.set_language(self.language_group.checkedAction()) def onMediaToolBoxChanged(self, index): """ Focus a widget when the media toolbox changes. """ - widget = self.mediaToolBox.widget(index) + widget = self.media_tool_box.widget(index) if widget: widget.onFocus() @@ -582,19 +587,19 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): filename = args[0] if not isinstance(filename, unicode): filename = unicode(filename, sys.getfilesystemencoding()) - self.serviceManagerContents.load_file(filename) - elif Settings().value(self.generalSettingsSection + u'/auto open'): - self.serviceManagerContents.load_Last_file() + self.service_manager_contents.load_file(filename) + elif Settings().value(self.general_settings_section + u'/auto open'): + self.service_manager_contents.load_Last_file() self.timer_version_id = self.startTimer(1000) - view_mode = Settings().value(u'%s/view mode' % self.generalSettingsSection) + view_mode = Settings().value(u'%s/view mode' % self.general_settings_section) if view_mode == u'default': - self.modeDefaultItem.setChecked(True) + self.mode_default_Item.setChecked(True) elif view_mode == u'setup': self.setViewMode(True, True, False, True, False) - self.modeSetupItem.setChecked(True) + self.mode_setup_item.setChecked(True) elif view_mode == u'live': self.setViewMode(False, True, False, False, True) - self.modeLiveItem.setChecked(True) + self.mode_live_item.setChecked(True) def app_startup(self): """ @@ -654,8 +659,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): else: self.activePlugin.toggleStatus(PluginStatus.Inactive) # Set global theme and - Registry().execute(u'theme_update_global', self.themeManagerContents.global_theme) - self.themeManagerContents.load_first_time_themes() + Registry().execute(u'theme_update_global', self.theme_manager_contents.global_theme) + self.theme_manager_contents.load_first_time_themes() # Check if any Bibles downloaded. If there are, they will be processed. Registry().execute(u'bibles_load_list', True) self.application.set_normal_cursor() @@ -666,8 +671,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): """ settings = Settings() self.live_controller.mainDisplaySetBackground() - if settings.value(u'%s/screen blank' % self.generalSettingsSection): - if settings.value(u'%s/blank warning' % self.generalSettingsSection): + if settings.value(u'%s/screen blank' % self.general_settings_section): + if settings.value(u'%s/blank warning' % self.general_settings_section): QtGui.QMessageBox.question(self, translate('OpenLP.MainWindow', 'OpenLP Main Display Blanked'), translate('OpenLP.MainWindow', 'The Main Display has been blanked out')) @@ -734,14 +739,14 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): """ Show the About form """ - self.aboutForm.exec_() + self.about_form.exec_() - def onPluginItemClicked(self): + def on_plugin_item_clicked(self): """ Show the Plugin form """ - self.pluginForm.load() - self.pluginForm.exec_() + self.plugin_form.load() + self.plugin_form.exec_() def onToolsOpenDataFolderClicked(self): """ @@ -754,19 +759,19 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): """ Updates the new theme preview images. """ - self.themeManagerContents.update_preview_images() + self.theme_manager_contents.update_preview_images() def onFormattingTagItemClicked(self): """ Show the Settings dialog """ - self.formattingTagForm.exec_() + self.formatting_tag_form.exec_() def onSettingsConfigureItemClicked(self): """ Show the Settings dialog """ - self.settingsForm.exec_() + self.settings_form.exec_() def paintEvent(self, event): """ @@ -779,8 +784,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): """ Show the shortcuts dialog """ - if self.shortcutForm.exec_(): - self.shortcutForm.save() + if self.shortcut_form.exec_(): + self.shortcut_form.save() def onSettingsImportItemClicked(self): """ @@ -800,15 +805,15 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): return setting_sections = [] # Add main sections. - setting_sections.extend([self.generalSettingsSection]) - setting_sections.extend([self.advancedSettingsSection]) - setting_sections.extend([self.uiSettingsSection]) - setting_sections.extend([self.shortcutsSettingsSection]) - setting_sections.extend([self.serviceManagerSettingsSection]) - setting_sections.extend([self.themesSettingsSection]) - setting_sections.extend([self.playersSettingsSection]) - setting_sections.extend([self.displayTagsSection]) - setting_sections.extend([self.headerSection]) + setting_sections.extend([self.general_settings_section]) + setting_sections.extend([self.advanced_settings_section]) + setting_sections.extend([self.ui_settings_section]) + setting_sections.extend([self.shortcuts_settings_section]) + setting_sections.extend([self.service_manager_settings_section]) + setting_sections.extend([self.themes_settings_section]) + setting_sections.extend([self.players_settings_section]) + setting_sections.extend([self.display_tags_section]) + setting_sections.extend([self.header_section]) setting_sections.extend([u'crashreport']) # Add plugin sections. for plugin in self.plugin_manager.plugins: @@ -854,7 +859,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): if value is not None: settings.setValue(u'%s' % (section_key), value) now = datetime.now() - settings.beginGroup(self.headerSection) + settings.beginGroup(self.header_section) settings.setValue(u'file_imported', import_file_name) settings.setValue(u'file_date_imported', now.strftime("%Y-%m-%d %H:%M")) settings.endGroup() @@ -887,13 +892,13 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): self.save_settings() setting_sections = [] # Add main sections. - setting_sections.extend([self.generalSettingsSection]) - setting_sections.extend([self.advancedSettingsSection]) - setting_sections.extend([self.uiSettingsSection]) - setting_sections.extend([self.shortcutsSettingsSection]) - setting_sections.extend([self.serviceManagerSettingsSection]) - setting_sections.extend([self.themesSettingsSection]) - setting_sections.extend([self.displayTagsSection]) + setting_sections.extend([self.general_settings_section]) + setting_sections.extend([self.advanced_settings_section]) + setting_sections.extend([self.ui_settings_section]) + setting_sections.extend([self.shortcuts_settings_section]) + setting_sections.extend([self.service_manager_settings_section]) + setting_sections.extend([self.themes_settings_section]) + setting_sections.extend([self.display_tags_section]) # Add plugin sections. for plugin in self.plugin_manager.plugins: setting_sections.extend([plugin.name]) @@ -903,7 +908,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): if os.path.exists(export_file_name): os.remove(export_file_name) settings = Settings() - settings.remove(self.headerSection) + settings.remove(self.header_section) # Get the settings. keys = settings.allKeys() export_settings = Settings(temp_file, Settings.IniFormat) @@ -913,7 +918,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): application_version = get_application_version() # Write INI format using Qsettings. # Write our header. - export_settings.beginGroup(self.headerSection) + export_settings.beginGroup(self.header_section) export_settings.setValue(u'Make_Changes', u'At_Own_RISK') export_settings.setValue(u'type', u'OpenLP_settings_export') export_settings.setValue(u'file_date_created', now.strftime("%Y-%m-%d %H:%M")) @@ -967,12 +972,12 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): """ if mode: settings = Settings() - settings.setValue(u'%s/view mode' % self.generalSettingsSection, mode) - self.mediaManagerDock.setVisible(media) - self.serviceManagerDock.setVisible(service) - self.themeManagerDock.setVisible(theme) - self.setPreviewPanelVisibility(preview) - self.setLivePanelVisibility(live) + settings.setValue(u'%s/view mode' % self.general_settings_section, mode) + self.media_manager_dock.setVisible(media) + self.service_manager_dock.setVisible(service) + self.theme_manager_dock.setVisible(theme) + self.set_preview_panel_visibility(preview) + self.set_live_panel_visibility(live) def screen_changed(self): """ @@ -1002,10 +1007,10 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): if self.settingsImported: self.clean_up(False) event.accept() - if self.serviceManagerContents.is_modified(): - ret = self.serviceManagerContents.save_modified_service() + if self.service_manager_contents.is_modified(): + ret = self.service_manager_contents.save_modified_service() if ret == QtGui.QMessageBox.Save: - if self.serviceManagerContents.decide_save_method(): + if self.service_manager_contents.decide_save_method(): self.clean_up() event.accept() else: @@ -1041,10 +1046,10 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): while self.image_manager.image_thread.isRunning(): time.sleep(0.1) # Clean temporary files used by services - self.serviceManagerContents.clean_up() + self.service_manager_contents.clean_up() if save_settings: if Settings().value(u'advanced/save current plugin'): - Settings().setValue(u'advanced/current media plugin', self.mediaToolBox.currentIndex()) + Settings().setValue(u'advanced/current media plugin', self.media_tool_box.currentIndex()) # Call the cleanup method to shutdown plugins. log.info(u'cleanup plugins') self.plugin_manager.finalise_plugins() @@ -1053,13 +1058,13 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): self.save_settings() # Check if we need to change the data directory if self.new_data_path: - self.changeDataDirectory() + self.change_data_directory() # Close down the display if self.live_controller.display: self.live_controller.display.close() self.live_controller.display = None - def serviceChanged(self, reset=False, serviceName=None): + def service_changed(self, reset=False, serviceName=None): """ Hook to change the main window title when the service changes @@ -1074,14 +1079,14 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): else: service_name = serviceName if reset: - self.serviceNotSaved = False + self.service_not_saved = False title = u'%s - %s' % (self.mainTitle, service_name) else: - self.serviceNotSaved = True + self.service_not_saved = True title = u'%s - %s*' % (self.mainTitle, service_name) self.setWindowTitle(title) - def setServiceModified(self, modified, fileName): + def set_service_modified(self, modified, fileName): """ This method is called from the ServiceManager to set the title of the main window. @@ -1102,34 +1107,34 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): """ Show a message in the status bar """ - self.statusBar.showMessage(message) + self.status_bar.showMessage(message) def default_theme_changed(self): """ Update the default theme indicator in the status bar """ - self.defaultThemeLabel.setText(translate('OpenLP.MainWindow', 'Default Theme: %s') % + self.default_theme_label.setText(translate('OpenLP.MainWindow', 'Default Theme: %s') % Settings().value(u'themes/global theme')) - def toggleMediaManager(self): + def toggle_media_manager(self): """ Toggle the visibility of the media manager """ - self.mediaManagerDock.setVisible(not self.mediaManagerDock.isVisible()) + self.media_manager_dock.setVisible(not self.media_manager_dock.isVisible()) - def toggleServiceManager(self): + def toggle_service_manager(self): """ Toggle the visibility of the service manager """ - self.serviceManagerDock.setVisible(not self.serviceManagerDock.isVisible()) + self.service_manager_dock.setVisible(not self.service_manager_dock.isVisible()) - def toggleThemeManager(self): + def toggle_theme_manager(self): """ Toggle the visibility of the theme manager """ - self.themeManagerDock.setVisible(not self.themeManagerDock.isVisible()) + self.theme_manager_dock.setVisible(not self.theme_manager_dock.isVisible()) - def setPreviewPanelVisibility(self, visible): + def set_preview_panel_visibility(self, visible): """ Sets the visibility of the preview panel including saving the setting and updating the menu. @@ -1141,33 +1146,33 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): """ self.preview_controller.panel.setVisible(visible) Settings().setValue(u'user interface/preview panel', visible) - self.viewPreviewPanel.setChecked(visible) + self.view_preview_panel.setChecked(visible) - def setLockPanel(self, lock): + def set_lock_panel(self, lock): """ Sets the ability to stop the toolbars being changed. """ if lock: - self.themeManagerDock.setFeatures(QtGui.QDockWidget.NoDockWidgetFeatures) - self.serviceManagerDock.setFeatures(QtGui.QDockWidget.NoDockWidgetFeatures) - self.mediaManagerDock.setFeatures(QtGui.QDockWidget.NoDockWidgetFeatures) - self.viewMediaManagerItem.setEnabled(False) - self.viewServiceManagerItem.setEnabled(False) - self.viewThemeManagerItem.setEnabled(False) - self.viewPreviewPanel.setEnabled(False) - self.viewLivePanel.setEnabled(False) + self.theme_manager_dock.setFeatures(QtGui.QDockWidget.NoDockWidgetFeatures) + self.service_manager_dock.setFeatures(QtGui.QDockWidget.NoDockWidgetFeatures) + self.media_manager_dock.setFeatures(QtGui.QDockWidget.NoDockWidgetFeatures) + self.view_media_manager_item.setEnabled(False) + self.view_service_manager_item.setEnabled(False) + self.view_theme_manager_item.setEnabled(False) + self.view_preview_panel.setEnabled(False) + self.view_live_panel.setEnabled(False) else: - self.themeManagerDock.setFeatures(QtGui.QDockWidget.AllDockWidgetFeatures) - self.serviceManagerDock.setFeatures(QtGui.QDockWidget.AllDockWidgetFeatures) - self.mediaManagerDock.setFeatures(QtGui.QDockWidget.AllDockWidgetFeatures) - self.viewMediaManagerItem.setEnabled(True) - self.viewServiceManagerItem.setEnabled(True) - self.viewThemeManagerItem.setEnabled(True) - self.viewPreviewPanel.setEnabled(True) - self.viewLivePanel.setEnabled(True) + self.theme_manager_dock.setFeatures(QtGui.QDockWidget.AllDockWidgetFeatures) + self.service_manager_dock.setFeatures(QtGui.QDockWidget.AllDockWidgetFeatures) + self.media_manager_dock.setFeatures(QtGui.QDockWidget.AllDockWidgetFeatures) + self.view_media_manager_item.setEnabled(True) + self.view_service_manager_item.setEnabled(True) + self.view_theme_manager_item.setEnabled(True) + self.view_preview_panel.setEnabled(True) + self.view_live_panel.setEnabled(True) Settings().setValue(u'user interface/lock panel', lock) - def setLivePanelVisibility(self, visible): + def set_live_panel_visibility(self, visible): """ Sets the visibility of the live panel including saving the setting and updating the menu. @@ -1179,9 +1184,9 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): """ self.live_controller.panel.setVisible(visible) Settings().setValue(u'user interface/live panel', visible) - self.viewLivePanel.setChecked(visible) + self.view_live_panel.setChecked(visible) - def loadSettings(self): + def load_settings(self): """ Load the main window settings. """ @@ -1190,10 +1195,10 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): # Remove obsolete entries. settings.remove(u'custom slide') settings.remove(u'service') - settings.beginGroup(self.generalSettingsSection) - self.recentFiles = settings.value(u'recent files') + settings.beginGroup(self.general_settings_section) + self.recent_files = settings.value(u'recent files') settings.endGroup() - settings.beginGroup(self.uiSettingsSection) + settings.beginGroup(self.ui_settings_section) self.move(settings.value(u'main window position')) self.restoreGeometry(settings.value(u'main window geometry')) self.restoreState(settings.value(u'main window state')) @@ -1211,10 +1216,10 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): return log.debug(u'Saving QSettings') settings = Settings() - settings.beginGroup(self.generalSettingsSection) - settings.setValue(u'recent files', self.recentFiles) + settings.beginGroup(self.general_settings_section) + settings.setValue(u'recent files', self.recent_files) settings.endGroup() - settings.beginGroup(self.uiSettingsSection) + settings.beginGroup(self.ui_settings_section) settings.setValue(u'main window position', self.pos()) settings.setValue(u'main window state', self.saveState()) settings.setValue(u'main window geometry', self.saveGeometry()) @@ -1223,42 +1228,42 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): settings.setValue(u'main window splitter geometry', self.controlSplitter.saveState()) settings.endGroup() - def updateRecentFilesMenu(self): + def update_recent_files_menu(self): """ Updates the recent file menu with the latest list of service files accessed. """ - recentFileCount = Settings().value(u'advanced/recent file count') - existingRecentFiles = [recentFile for recentFile in self.recentFiles + recent_file_count = Settings().value(u'advanced/recent file count') + existing_recent_files = [recentFile for recentFile in self.recent_files if os.path.isfile(unicode(recentFile))] - recentFilesToDisplay = existingRecentFiles[0:recentFileCount] - self.recentFilesMenu.clear() - for fileId, filename in enumerate(recentFilesToDisplay): + recent_files_to_display = existing_recent_files[0:recent_file_count] + self.recent_files_menu.clear() + for file_id, filename in enumerate(recent_files_to_display): log.debug('Recent file name: %s', filename) action = create_action(self, u'', - text=u'&%d %s' % (fileId + 1, os.path.splitext(os.path.basename( + text=u'&%d %s' % (file_id + 1, os.path.splitext(os.path.basename( unicode(filename)))[0]), data=filename, - triggers=self.serviceManagerContents.on_recent_service_clicked) - self.recentFilesMenu.addAction(action) - clearRecentFilesAction = create_action(self, u'', + triggers=self.service_manager_contents.on_recent_service_clicked) + self.recent_files_menu.addAction(action) + clear_recent_files_action = create_action(self, u'', text=translate('OpenLP.MainWindow', 'Clear List', 'Clear List of recent files'), statustip=translate('OpenLP.MainWindow', 'Clear the list of recent files.'), - enabled=bool(self.recentFiles), - triggers=self.clearRecentFileMenu) - add_actions(self.recentFilesMenu, (None, clearRecentFilesAction)) - clearRecentFilesAction.setEnabled(bool(self.recentFiles)) + enabled=bool(self.recent_files), + triggers=self.clear_recent_file_menu) + add_actions(self.recent_files_menu, (None, clear_recent_files_action)) + clear_recent_files_action.setEnabled(bool(self.recent_files)) - def addRecentFile(self, filename): + def add_recent_file(self, filename): """ Adds a service to the list of recently used files. ``filename`` The service filename to add """ - # The maxRecentFiles value does not have an interface and so never gets + # The max_recent_files value does not have an interface and so never gets # actually stored in the settings therefore the default value of 20 will # always be used. - maxRecentFiles = Settings().value(u'advanced/max recent files') + max_recent_files = Settings().value(u'advanced/max recent files') if filename: # Add some cleanup to reduce duplication in the recent file list filename = os.path.abspath(filename) @@ -1266,35 +1271,35 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): # in the given filename which then causes duplication. if filename[1:3] == ':\\': filename = filename[0].upper() + filename[1:] - if filename in self.recentFiles: - self.recentFiles.remove(filename) - self.recentFiles.insert(0, filename) - while len(self.recentFiles) > maxRecentFiles: - self.recentFiles.pop() + if filename in self.recent_files: + self.recent_files.remove(filename) + self.recent_files.insert(0, filename) + while len(self.recent_files) > max_recent_files: + self.recent_files.pop() - def clearRecentFileMenu(self): + def clear_recent_file_menu(self): """ Clears the recent files. """ - self.recentFiles = [] + self.recent_files = [] - def displayProgressBar(self, size): + def display_progress_bar(self, size): """ Make Progress bar visible and set size """ - self.loadProgressBar.show() - self.loadProgressBar.setMaximum(size) - self.loadProgressBar.setValue(0) + self.load_progress_bar.show() + self.load_progress_bar.setMaximum(size) + self.load_progress_bar.setValue(0) self.application.process_events() def increment_progress_bar(self): """ Increase the Progress Bar value by 1 """ - self.loadProgressBar.setValue(self.loadProgressBar.value() + 1) + self.load_progress_bar.setValue(self.load_progress_bar.value() + 1) self.application.process_events() - def finishedProgressBar(self): + def finished_progress_bar(self): """ Trigger it's removal after 2.5 second """ @@ -1306,7 +1311,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): """ if event.timerId() == self.timer_id: self.timer_id = 0 - self.loadProgressBar.hide() + self.load_progress_bar.hide() self.application.process_events() if event.timerId() == self.timer_version_id: self.timer_version_id = 0 @@ -1332,7 +1337,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): """ self.copy_data = copy_data - def changeDataDirectory(self): + def change_data_directory(self): """ Change the data directory. """ diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 9e99e2303..647a01e9d 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -208,7 +208,7 @@ class ServiceManagerDialog(object): self.service_manager_list.itemCollapsed.connect(self.collapsed) self.service_manager_list.itemExpanded.connect(self.expanded) # Last little bits of setting up - self.service_theme = Settings().value(self.main_window.serviceManagerSettingsSection + u'/service theme') + self.service_theme = Settings().value(self.main_window.service_manager_settings_section + u'/service theme') self.servicePath = AppLocation.get_section_data_path(u'servicemanager') # build the drag and drop context menu self.dndMenu = QtGui.QMenu() @@ -323,7 +323,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog): self.service_id += 1 self._modified = modified service_file = self.short_file_name() or translate('OpenLP.ServiceManager', 'Untitled Service') - self.main_window.setServiceModified(modified, service_file) + self.main_window.set_service_modified(modified, service_file) def is_modified(self): """ @@ -336,7 +336,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog): Setter for service file. """ self._file_name = unicode(file_name) - self.main_window.setServiceModified(self.is_modified(), self.short_file_name()) + self.main_window.set_service_modified(self.is_modified(), self.short_file_name()) Settings().setValue(u'servicemanager/last file', file_name) self._save_lite = self._file_name.endswith(u'.oszl') @@ -401,14 +401,14 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog): file_name = QtGui.QFileDialog.getOpenFileName( self.main_window, translate('OpenLP.ServiceManager', 'Open File'), - Settings().value(self.main_window.serviceManagerSettingsSection + u'/last directory'), + Settings().value(self.main_window.service_manager_settings_section + u'/last directory'), translate('OpenLP.ServiceManager', 'OpenLP Service Files (*.osz *.oszl)') ) if not file_name: return False else: file_name = load_file - Settings().setValue(self.main_window.serviceManagerSettingsSection + u'/last directory', + Settings().setValue(self.main_window.service_manager_settings_section + u'/last directory', split_filename(file_name)[0]) self.load_file(file_name) @@ -461,7 +461,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog): base_name = os.path.splitext(file_name)[0] service_file_name = '%s.osd' % base_name log.debug(u'ServiceManager.save_file - %s', path_file_name) - Settings().setValue(self.main_window.serviceManagerSettingsSection + u'/last directory', path) + Settings().setValue(self.main_window.service_manager_settings_section + u'/last directory', path) service = [] write_list = [] missing_list = [] @@ -469,7 +469,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog): total_size = 0 self.application.set_busy_cursor() # Number of items + 1 to zip it - self.main_window.displayProgressBar(len(self.service_items) + 1) + self.main_window.display_progress_bar(len(self.service_items) + 1) # Get list of missing files, and list of files to write for item in self.service_items: if not item[u'service_item'].uses_file(): @@ -491,7 +491,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog): answer = QtGui.QMessageBox.critical(self, title, message, QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok | QtGui.QMessageBox.Cancel)) if answer == QtGui.QMessageBox.Cancel: - self.main_window.finishedProgressBar() + self.main_window.finished_progress_bar() return False # Check if item contains a missing file. for item in list(self.service_items): @@ -551,14 +551,14 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog): finally: if zip_file: zip_file.close() - self.main_window.finishedProgressBar() + self.main_window.finished_progress_bar() self.application.set_normal_cursor() if success: try: shutil.copy(temp_file_name, path_file_name) except shutil.Error: return self.save_file_as() - self.main_window.addRecentFile(path_file_name) + self.main_window.add_recent_file(path_file_name) self.set_modified(False) delete_file(temp_file_name) return success @@ -579,11 +579,11 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog): base_name = os.path.splitext(file_name)[0] service_file_name = '%s.osd' % base_name log.debug(u'ServiceManager.save_file - %s', path_file_name) - Settings().setValue(self.main_window.serviceManagerSettingsSection + u'/last directory', path) + Settings().setValue(self.main_window.service_manager_settings_section + u'/last directory', path) service = [] self.application.set_busy_cursor() # Number of items + 1 to zip it - self.main_window.displayProgressBar(len(self.service_items) + 1) + self.main_window.display_progress_bar(len(self.service_items) + 1) for item in self.service_items: self.main_window.increment_progress_bar() service_item = item[u'service_item'].get_service_repr(self._save_lite) @@ -608,14 +608,14 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog): finally: if zip_file: zip_file.close() - self.main_window.finishedProgressBar() + self.main_window.finished_progress_bar() self.application.set_normal_cursor() if success: try: shutil.copy(temp_file_name, path_file_name) except shutil.Error: return self.save_file_as() - self.main_window.addRecentFile(path_file_name) + self.main_window.add_recent_file(path_file_name) self.set_modified(False) delete_file(temp_file_name) return success @@ -643,7 +643,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog): default_file_name = format_time(default_pattern, local_time) else: default_file_name = u'' - directory = Settings().value(self.main_window.serviceManagerSettingsSection + u'/last directory') + directory = Settings().value(self.main_window.service_manager_settings_section + u'/last directory') path = os.path.join(directory, default_file_name) # SaveAs from osz to oszl is not valid as the files will be deleted # on exit which is not sensible or usable in the long term. @@ -712,7 +712,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog): file_to.close() self.new_file() self.set_file_name(file_name) - self.main_window.displayProgressBar(len(items)) + self.main_window.display_progress_bar(len(items)) for item in items: self.main_window.increment_progress_bar() service_item = ServiceItem() @@ -730,7 +730,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog): service_item.temporary_edit = self.load_item_temporary self.add_service_item(service_item, repaint=False) delete_file(p_file) - self.main_window.addRecentFile(file_name) + self.main_window.add_recent_file(file_name) self.set_modified(False) Settings().setValue('servicemanager/last file', file_name) else: @@ -758,7 +758,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog): file_to.close() if zip_file: zip_file.close() - self.main_window.finishedProgressBar() + self.main_window.finished_progress_bar() self.application.set_normal_cursor() self.repaint_service_list(-1, -1) @@ -871,7 +871,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog): self.auto_play_slides_loop.setChecked(False) if service_item.auto_play_slides_once and service_item.timed_slide_interval == 0: service_item.timed_slide_interval = Settings().value( - self.main_window.generalSettingsSection + u'/loop delay') + self.main_window.general_settings_section + u'/loop delay') self.set_modified() def toggle_auto_play_slides_loop(self): @@ -886,7 +886,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog): self.auto_play_slides_once.setChecked(False) if service_item.auto_play_slides_loop and service_item.timed_slide_interval == 0: service_item.timed_slide_interval = Settings().value( - self.main_window.generalSettingsSection + u'/loop delay') + self.main_window.general_settings_section + u'/loop delay') self.set_modified() def on_timed_slide_interval(self): @@ -1228,7 +1228,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog): log.debug(u'on_theme_combo_box_selected') self.service_theme = self.theme_combo_box.currentText() self.renderer.set_service_theme(self.service_theme) - Settings().setValue(self.main_window.serviceManagerSettingsSection + u'/service theme', self.service_theme) + Settings().setValue(self.main_window.service_manager_settings_section + u'/service theme', self.service_theme) self.regenerate_service_Items(True) def theme_change(self): @@ -1397,7 +1397,7 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog): self.application.set_busy_cursor() if self.service_items[item][u'service_item'].is_valid: self.live_controller.addServiceManagerItem(self.service_items[item][u'service_item'], child) - if Settings().value(self.main_window.generalSettingsSection + u'/auto preview'): + if Settings().value(self.main_window.general_settings_section + u'/auto preview'): item += 1 if self.service_items and item < len(self.service_items) and \ self.service_items[item][u'service_item'].is_capable(ItemCapabilities.CanPreview): diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index aa46ea732..a1222e90c 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -238,7 +238,7 @@ class SlideController(DisplayController): self.play_slides_once = create_action(self, u'playSlidesOnce', text=UiStrings().PlaySlidesToEnd, icon=u':/media/media_time.png', checked=False, can_shortcuts=True, category=self.category, triggers=self.onPlaySlidesOnce) - if Settings().value(self.main_window.advancedSettingsSection + u'/slide limits') == SlideLimits.Wrap: + if Settings().value(self.main_window.advanced_settings_section + u'/slide limits') == SlideLimits.Wrap: self.play_slides_menu.setDefaultAction(self.play_slides_loop) else: self.play_slides_menu.setDefaultAction(self.play_slides_once) @@ -615,7 +615,7 @@ class SlideController(DisplayController): """ Updates the Slide Limits variable from the settings. """ - self.slide_limits = Settings().value(self.main_window.advancedSettingsSection + u'/slide limits') + self.slide_limits = Settings().value(self.main_window.advanced_settings_section + u'/slide limits') def enableToolBar(self, item): """ @@ -874,7 +874,7 @@ class SlideController(DisplayController): Allow the main display to blank the main display at startup time """ log.debug(u'mainDisplaySetBackground live = %s' % self.is_live) - display_type = Settings().value(self.main_window.generalSettingsSection + u'/screen blank') + display_type = Settings().value(self.main_window.general_settings_section + u'/screen blank') if self.screens.which_screen(self.window()) != self.screens.which_screen(self.display): # Order done to handle initial conversion if display_type == u'themed': diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index a92e977f2..5c1b40105 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -62,8 +62,8 @@ class ThemeManager(QtGui.QWidget): Registry().register_function(u'bootstrap_initialise', self.load_first_time_themes) Registry().register_function(u'bootstrap_post_set_up', self._push_themes) self.settingsSection = u'themes' - self.themeForm = ThemeForm(self) - self.fileRenameForm = FileRenameForm() + self.theme_form = ThemeForm(self) + self.file_rename_form = FileRenameForm() # start with the layout self.layout = QtGui.QVBoxLayout(self) self.layout.setSpacing(0) @@ -74,13 +74,13 @@ class ThemeManager(QtGui.QWidget): self.toolbar.add_toolbar_action(u'newTheme', text=UiStrings().NewTheme, icon=u':/themes/theme_new.png', tooltip=translate('OpenLP.ThemeManager', 'Create a new theme.'), - triggers=self.onAddTheme) + triggers=self.on_add_theme) self.toolbar.add_toolbar_action(u'editTheme', text=translate('OpenLP.ThemeManager', 'Edit Theme'), icon=u':/themes/theme_edit.png', tooltip=translate('OpenLP.ThemeManager', 'Edit a theme.'), triggers=self.on_edit_theme) - self.deleteToolbarAction = self.toolbar.add_toolbar_action(u'delete_theme', + self.delete_toolbar_action = self.toolbar.add_toolbar_action(u'delete_theme', text=translate('OpenLP.ThemeManager', 'Delete Theme'), icon=u':/general/general_delete.png', tooltip=translate('OpenLP.ThemeManager', 'Delete a theme.'), @@ -137,11 +137,11 @@ class ThemeManager(QtGui.QWidget): self.theme_list = [] self.path = AppLocation.get_section_data_path(self.settingsSection) check_directory_exists(self.path) - self.thumbPath = os.path.join(self.path, u'thumbnails') - check_directory_exists(self.thumbPath) - self.themeForm.path = self.path - self.oldBackgroundImage = None - self.badV1NameChars = re.compile(r'[%+\[\]]') + self.thumb_path = os.path.join(self.path, u'thumbnails') + check_directory_exists(self.thumb_path) + self.theme_form.path = self.path + self.old_background_image = None + self.bad_v1_name_chars = re.compile(r'[%+\[\]]') # Last little bits of setting up self.global_theme = Settings().value(self.settingsSection + u'/global theme') @@ -155,9 +155,9 @@ class ThemeManager(QtGui.QWidget): theme_name = item.text() # If default theme restrict actions if real_theme_name == theme_name: - self.deleteToolbarAction.setVisible(True) + self.delete_toolbar_action.setVisible(True) else: - self.deleteToolbarAction.setVisible(False) + self.delete_toolbar_action.setVisible(False) def context_menu(self, point): """ @@ -192,7 +192,7 @@ class ThemeManager(QtGui.QWidget): if self.global_theme == new_name: name = translate('OpenLP.ThemeManager', '%s (default)') % new_name self.theme_list_widget.item(count).setText(name) - self.deleteToolbarAction.setVisible(item not in self.theme_list_widget.selectedItems()) + self.delete_toolbar_action.setVisible(item not in self.theme_list_widget.selectedItems()) def change_global_from_screen(self, index=-1): """ @@ -216,15 +216,15 @@ class ThemeManager(QtGui.QWidget): Registry().execute(u'theme_update_global') self._push_themes() - def onAddTheme(self): + def on_add_theme(self): """ Loads a new theme with the default settings and then launches the theme editing form for the user to make their customisations. """ theme = ThemeXML() theme.set_default_header_footer() - self.themeForm.theme = theme - self.themeForm.exec_() + self.theme_form.theme = theme + self.theme_form.exec_() self.load_themes() def on_rename_theme(self): @@ -236,14 +236,14 @@ class ThemeManager(QtGui.QWidget): translate('OpenLP.ThemeManager', 'Rename %s theme?'), False, False): item = self.theme_list_widget.currentItem() old_theme_name = item.data(QtCore.Qt.UserRole) - self.fileRenameForm.file_name_edit.setText(old_theme_name) - if self.fileRenameForm.exec_(): - new_theme_name = self.fileRenameForm.file_name_edit.text() + self.file_rename_form.file_name_edit.setText(old_theme_name) + if self.file_rename_form.exec_(): + new_theme_name = self.file_rename_form.file_name_edit.text() if old_theme_name == new_theme_name: return if self.check_if_theme_exists(new_theme_name): old_theme_data = self.get_theme_data(old_theme_name) - self.cloneThemeData(old_theme_data, new_theme_name) + self.clone_theme_data(old_theme_data, new_theme_name) self.delete_theme(old_theme_name) for plugin in self.plugin_manager.plugins: if plugin.uses_theme(old_theme_name): @@ -257,19 +257,19 @@ class ThemeManager(QtGui.QWidget): """ item = self.theme_list_widget.currentItem() old_theme_name = item.data(QtCore.Qt.UserRole) - self.fileRenameForm.file_name_edit.setText(translate('OpenLP.ThemeManager', + self.file_rename_form.file_name_edit.setText(translate('OpenLP.ThemeManager', 'Copy of %s', 'Copy of ') % old_theme_name) - if self.fileRenameForm.exec_(True): - new_theme_name = self.fileRenameForm.file_name_edit.text() + if self.file_rename_form.exec_(True): + new_theme_name = self.file_rename_form.file_name_edit.text() if self.check_if_theme_exists(new_theme_name): theme_data = self.get_theme_data(old_theme_name) - self.cloneThemeData(theme_data, new_theme_name) + self.clone_theme_data(theme_data, new_theme_name) - def cloneThemeData(self, theme_data, new_theme_name): + def clone_theme_data(self, theme_data, new_theme_name): """ Takes a theme and makes a new copy of it as well as saving it. """ - log.debug(u'cloneThemeData') + log.debug(u'clone_theme_data') save_to = None save_from = None if theme_data.background_type == u'image': @@ -290,10 +290,10 @@ class ThemeManager(QtGui.QWidget): item = self.theme_list_widget.currentItem() theme = self.get_theme_data(item.data(QtCore.Qt.UserRole)) if theme.background_type == u'image': - self.oldBackgroundImage = theme.background_filename - self.themeForm.theme = theme - self.themeForm.exec_(True) - self.oldBackgroundImage = None + self.old_background_image = theme.background_filename + self.theme_form.theme = theme + self.theme_form.exec_(True) + self.old_background_image = None self.renderer.update_theme(theme.theme_name) self.load_themes() @@ -324,7 +324,7 @@ class ThemeManager(QtGui.QWidget): self.theme_list.remove(theme) thumb = u'%s.png' % theme delete_file(os.path.join(self.path, thumb)) - delete_file(os.path.join(self.thumbPath, thumb)) + delete_file(os.path.join(self.thumb_path, thumb)) try: encoding = get_filesystem_encoding() shutil.rmtree(os.path.join(self.path, theme).encode(encoding)) @@ -370,9 +370,8 @@ class ThemeManager(QtGui.QWidget): def on_import_theme(self): """ - Opens a file dialog to select the theme file(s) to import before - attempting to extract OpenLP themes from those files. This process - will load both OpenLP version 1 and version 2 themes. + Opens a file dialog to select the theme file(s) to import before attempting to extract OpenLP themes from + those files. This process will load both OpenLP version 1 and version 2 themes. """ files = QtGui.QFileDialog.getOpenFileNames(self, translate('OpenLP.ThemeManager', 'Select Theme Import File'), @@ -431,7 +430,7 @@ class ThemeManager(QtGui.QWidget): name = translate('OpenLP.ThemeManager', '%s (default)') % text_name else: name = text_name - thumb = os.path.join(self.thumbPath, u'%s.png' % text_name) + thumb = os.path.join(self.thumb_path, u'%s.png' % text_name) item_name = QtGui.QListWidgetItem(name) if validate_thumb(theme, thumb): icon = build_icon(thumb) @@ -504,8 +503,8 @@ class ThemeManager(QtGui.QWidget): xml_tree = ElementTree(element=XML(theme_zip.read(xml_file[0]))).getroot() v1_background = xml_tree.find(u'BackgroundType') if v1_background is not None: - theme_name, file_xml, out_file, abort_import = self.unzip_version_122( - directory, theme_zip, xml_file[0], xml_tree, v1_background, out_file) + theme_name, file_xml, out_file, abort_import = \ + self.unzip_version_122(directory, theme_zip, xml_file[0], xml_tree, v1_background, out_file) else: theme_name = xml_tree.find(u'name').text.strip() theme_folder = os.path.join(directory, theme_name) @@ -571,7 +570,7 @@ class ThemeManager(QtGui.QWidget): this method, please keep in mind, that some parameters are redundant. """ theme_name = xml_tree.find(u'Name').text.strip() - theme_name = self.badV1NameChars.sub(u'', theme_name) + theme_name = self.bad_v1_name_chars.sub(u'', theme_name) theme_folder = os.path.join(dir_name, theme_name) theme_exists = os.path.exists(theme_folder) if theme_exists and not self.over_write_message_box(theme_name): @@ -634,8 +633,8 @@ class ThemeManager(QtGui.QWidget): theme_dir = os.path.join(self.path, name) check_directory_exists(theme_dir) theme_file = os.path.join(theme_dir, name + u'.xml') - if self.oldBackgroundImage and image_to != self.oldBackgroundImage: - delete_file(self.oldBackgroundImage) + if self.old_background_image and image_to != self.old_background_image: + delete_file(self.old_background_image) out_file = None try: out_file = open(theme_file, u'w') @@ -663,7 +662,7 @@ class ThemeManager(QtGui.QWidget): if os.path.exists(sample_path_name): os.unlink(sample_path_name) frame.save(sample_path_name, u'png') - thumb = os.path.join(self.thumbPath, u'%s.png' % name) + thumb = os.path.join(self.thumb_path, u'%s.png' % name) create_thumb(sample_path_name, thumb, False) log.debug(u'Theme image written to %s', sample_path_name) @@ -672,11 +671,11 @@ class ThemeManager(QtGui.QWidget): Called to update the themes' preview images. """ log.debug('update_preview_images') - self.main_window.displayProgressBar(len(self.theme_list)) + self.main_window.display_progress_bar(len(self.theme_list)) for theme in self.theme_list: self.main_window.increment_progress_bar() self.generate_and_save_image(self.path, theme, self.get_theme_data(theme)) - self.main_window.finishedProgressBar() + self.main_window.finished_progress_bar() self.load_themes() def generate_image(self, theme_data, forcePage=False): @@ -759,7 +758,7 @@ class ThemeManager(QtGui.QWidget): """ theme = Theme(xml_data) new_theme = ThemeXML() - new_theme.theme_name = self.badV1NameChars.sub(u'', theme.Name) + new_theme.theme_name = self.bad_v1_name_chars.sub(u'', theme.Name) if theme.BackgroundType == BackgroundType.Solid: new_theme.background_type = BackgroundType.to_string(BackgroundType.Solid) new_theme.background_color = unicode(theme.BackgroundParameter1.name()) diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index edc4aab25..65510d784 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -99,7 +99,7 @@ class ImageMediaItem(MediaManagerItem): row_list = [item.row() for item in self.listView.selectedIndexes()] row_list.sort(reverse=True) self.application.set_busy_cursor() - self.main_window.displayProgressBar(len(row_list)) + self.main_window.display_progress_bar(len(row_list)) for row in row_list: text = self.listView.item(row) if text: @@ -107,14 +107,14 @@ class ImageMediaItem(MediaManagerItem): self.listView.takeItem(row) self.main_window.increment_progress_bar() Settings.setValue(self.settingsSection + u'/images files', self.getFileList()) - self.main_window.finishedProgressBar() + self.main_window.finished_progress_bar() self.application.set_normal_cursor() self.listView.blockSignals(False) def loadList(self, images, initialLoad=False): self.application.set_busy_cursor() if not initialLoad: - self.main_window.displayProgressBar(len(images)) + self.main_window.display_progress_bar(len(images)) # Sort the images by its filename considering language specific # characters. images.sort(cmp=locale_compare, key=lambda filename: os.path.split(unicode(filename))[1]) @@ -136,7 +136,7 @@ class ImageMediaItem(MediaManagerItem): if not initialLoad: self.main_window.increment_progress_bar() if not initialLoad: - self.main_window.finishedProgressBar() + self.main_window.finished_progress_bar() self.application.set_normal_cursor() def generateSlideData(self, service_item, item=None, xmlVersion=False, diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py index a1e8ce028..a239e3cf4 100644 --- a/openlp/plugins/presentations/lib/mediaitem.py +++ b/openlp/plugins/presentations/lib/mediaitem.py @@ -151,7 +151,7 @@ class PresentationMediaItem(MediaManagerItem): titles = [os.path.split(file)[1] for file in currlist] self.application.set_busy_cursor() if not initialLoad: - self.main_window.displayProgressBar(len(files)) + self.main_window.display_progress_bar(len(files)) # Sort the presentations by its filename considering language specific characters. files.sort(cmp=locale_compare, key=lambda filename: os.path.split(unicode(filename))[1]) @@ -205,7 +205,7 @@ class PresentationMediaItem(MediaManagerItem): item_name.setToolTip(file) self.listView.addItem(item_name) if not initialLoad: - self.main_window.finishedProgressBar() + self.main_window.finished_progress_bar() self.application.set_normal_cursor() def onDeleteClick(self): @@ -217,7 +217,7 @@ class PresentationMediaItem(MediaManagerItem): row_list = [item.row() for item in items] row_list.sort(reverse=True) self.application.set_busy_cursor() - self.main_window.displayProgressBar(len(row_list)) + self.main_window.display_progress_bar(len(row_list)) for item in items: filepath = unicode(item.data(QtCore.Qt.UserRole)) for cidx in self.controllers: @@ -225,7 +225,7 @@ class PresentationMediaItem(MediaManagerItem): doc.presentation_deleted() doc.close_presentation() self.main_window.increment_progress_bar() - self.main_window.finishedProgressBar() + self.main_window.finished_progress_bar() self.application.set_busy_cursor() for row in row_list: self.listView.takeItem(row) diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py index d9df64f6d..024a278cb 100644 --- a/openlp/plugins/presentations/presentationplugin.py +++ b/openlp/plugins/presentations/presentationplugin.py @@ -110,7 +110,7 @@ class PresentationPlugin(Plugin): Create the Media Manager List """ self.mediaItem = PresentationMediaItem( - self.main_window.mediaDockManager.media_dock, self, self.icon, self.controllers) + self.main_window.media_dock_manager.media_dock, self, self.icon, self.controllers) def registerControllers(self, controller): """ @@ -132,13 +132,12 @@ class PresentationPlugin(Plugin): if filename.endswith(u'controller.py') and not filename == 'presentationcontroller.py': path = os.path.join(controller_dir, filename) if os.path.isfile(path): - modulename = u'openlp.plugins.presentations.lib.' + os.path.splitext(filename)[0] - log.debug(u'Importing controller %s', modulename) + module_name = u'openlp.plugins.presentations.lib.' + os.path.splitext(filename)[0] + log.debug(u'Importing controller %s', module_name) try: - __import__(modulename, globals(), locals(), []) + __import__(module_name, globals(), locals(), []) except ImportError: - log.warn(u'Failed to import %s on path %s', - modulename, path) + log.warn(u'Failed to import %s on path %s', module_name, path) controller_classes = PresentationController.__subclasses__() for controller_class in controller_classes: controller = controller_class(self) diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index 80c3c45b8..1f19de776 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -84,7 +84,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): self.verse_delete_button.clicked.connect(self.on_verse_delete_button_clicked) self.verse_list_widget.itemClicked.connect(self.on_verse_list_view_clicked) self.verse_order_edit.textChanged.connect(self.on_verse_order_text_changed) - self.theme_add_button.clicked.connect(self.theme_manager.onAddTheme) + self.theme_add_button.clicked.connect(self.theme_manager.on_add_theme) self.maintenance_button.clicked.connect(self.on_maintenance_button_clicked) self.from_file_button.clicked.connect(self.on_audio_add_from_file_button_clicked) self.from_media_button.clicked.connect(self.on_audio_add_from_media_button_clicked) diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 533f79a4c..8d4fd2e01 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -366,7 +366,7 @@ class SongMediaItem(MediaManagerItem): QtGui.QMessageBox.Yes) == QtGui.QMessageBox.No: return self.application.set_busy_cursor() - self.main_window.displayProgressBar(len(items)) + self.main_window.display_progress_bar(len(items)) for item in items: item_id = item.data(QtCore.Qt.UserRole) media_files = self.plugin.manager.get_all_objects(MediaFile, MediaFile.song_id == item_id) @@ -383,7 +383,7 @@ class SongMediaItem(MediaManagerItem): log.exception(u'Could not remove directory: %s', save_path) self.plugin.manager.delete_object(Song, item_id) self.main_window.increment_progress_bar() - self.main_window.finishedProgressBar() + self.main_window.finished_progress_bar() self.application.set_normal_cursor() self.onSearchTextButtonClicked() diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py index df7e4c8cc..2bfc6b253 100644 --- a/openlp/plugins/songusage/songusageplugin.py +++ b/openlp/plugins/songusage/songusageplugin.py @@ -106,12 +106,12 @@ class SongUsagePlugin(Plugin): self.song_usage_menu.addSeparator() self.song_usage_menu.addAction(self.song_usage_report) self.song_usage_menu.addAction(self.song_usage_delete) - self.song_usage_active_button = QtGui.QToolButton(self.main_window.statusBar) + self.song_usage_active_button = QtGui.QToolButton(self.main_window.status_bar) self.song_usage_active_button.setCheckable(True) self.song_usage_active_button.setAutoRaise(True) self.song_usage_active_button.setStatusTip(translate('SongUsagePlugin', 'Toggle the tracking of song usage.')) self.song_usage_active_button.setObjectName(u'song_usage_active_button') - self.main_window.statusBar.insertPermanentWidget(1, self.song_usage_active_button) + self.main_window.status_bar.insertPermanentWidget(1, self.song_usage_active_button) self.song_usage_active_button.hide() # Signals and slots QtCore.QObject.connect(self.song_usage_status, QtCore.SIGNAL(u'visibilityChanged(bool)'),