From f6c2a5b410bd5c27e2fa726cabd012ec3cbaef7f Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Tue, 2 Feb 2016 23:55:37 +0200 Subject: [PATCH] Fix bug #1533246 Fixes: https://launchpad.net/bugs/1533246 --- openlp/core/common/settings.py | 45 ++++++++++++---------------------- 1 file changed, 15 insertions(+), 30 deletions(-) diff --git a/openlp/core/common/settings.py b/openlp/core/common/settings.py index 68b0763df..8ef2b3c8b 100644 --- a/openlp/core/common/settings.py +++ b/openlp/core/common/settings.py @@ -252,68 +252,56 @@ class Settings(QtCore.QSettings): 'shortcuts/blankScreen': [QtGui.QKeySequence(QtCore.Qt.Key_Period)], 'shortcuts/collapse': [QtGui.QKeySequence(QtCore.Qt.Key_Minus)], 'shortcuts/desktopScreen': [QtGui.QKeySequence(QtCore.Qt.Key_D)], - 'shortcuts/delete': [QtGui.QKeySequence(QtGui.QKeySequence.Delete), - QtGui.QKeySequence(QtCore.Qt.Key_Delete)], + 'shortcuts/delete': [QtGui.QKeySequence(QtGui.QKeySequence.Delete)], 'shortcuts/down': [QtGui.QKeySequence(QtCore.Qt.Key_Down)], 'shortcuts/editSong': [], 'shortcuts/escapeItem': [QtGui.QKeySequence(QtCore.Qt.Key_Escape)], 'shortcuts/expand': [QtGui.QKeySequence(QtCore.Qt.Key_Plus)], 'shortcuts/exportThemeItem': [], - 'shortcuts/fileNewItem': [QtGui.QKeySequence(QtGui.QKeySequence.New), - QtGui.QKeySequence(QtCore.Qt.CTRL + QtCore.Qt.Key_N)], - 'shortcuts/fileSaveAsItem': [QtGui.QKeySequence(QtGui.QKeySequence.SaveAs), - QtGui.QKeySequence(QtCore.Qt.CTRL + QtCore.Qt.SHIFT + QtCore.Qt.Key_S)], - 'shortcuts/fileExitItem': [QtGui.QKeySequence(QtGui.QKeySequence.Quit), - QtGui.QKeySequence(QtCore.Qt.ALT + QtCore.Qt.Key_F4)], - 'shortcuts/fileSaveItem': [QtGui.QKeySequence(QtGui.QKeySequence.Save), - QtGui.QKeySequence(QtCore.Qt.CTRL + QtCore.Qt.Key_S)], - 'shortcuts/fileOpenItem': [QtGui.QKeySequence(QtGui.QKeySequence.Open), - QtGui.QKeySequence(QtCore.Qt.CTRL + QtCore.Qt.Key_O)], + 'shortcuts/fileNewItem': [QtGui.QKeySequence(QtGui.QKeySequence.New)], + 'shortcuts/fileSaveAsItem': [QtGui.QKeySequence(QtGui.QKeySequence.SaveAs)], + 'shortcuts/fileExitItem': [QtGui.QKeySequence(QtGui.QKeySequence.Quit)], + 'shortcuts/fileSaveItem': [QtGui.QKeySequence(QtGui.QKeySequence.Save)], + 'shortcuts/fileOpenItem': [QtGui.QKeySequence(QtGui.QKeySequence.Open)], 'shortcuts/goLive': [], 'shortcuts/importThemeItem': [], 'shortcuts/importBibleItem': [], - 'shortcuts/listViewBiblesDeleteItem': [QtGui.QKeySequence(QtGui.QKeySequence.Delete), - QtGui.QKeySequence(QtCore.Qt.Key_Delete)], + 'shortcuts/listViewBiblesDeleteItem': [QtGui.QKeySequence(QtGui.QKeySequence.Delete)], 'shortcuts/listViewBiblesPreviewItem': [QtGui.QKeySequence(QtCore.Qt.Key_Return), QtGui.QKeySequence(QtCore.Qt.Key_Enter)], 'shortcuts/listViewBiblesLiveItem': [QtGui.QKeySequence(QtCore.Qt.SHIFT + QtCore.Qt.Key_Return), QtGui.QKeySequence(QtCore.Qt.SHIFT + QtCore.Qt.Key_Enter)], 'shortcuts/listViewBiblesServiceItem': [QtGui.QKeySequence(QtCore.Qt.Key_Plus), QtGui.QKeySequence(QtCore.Qt.Key_Equal)], - 'shortcuts/listViewCustomDeleteItem': [QtGui.QKeySequence(QtGui.QKeySequence.Delete), - QtGui.QKeySequence(QtCore.Qt.Key_Delete)], + 'shortcuts/listViewCustomDeleteItem': [QtGui.QKeySequence(QtGui.QKeySequence.Delete)], 'shortcuts/listViewCustomPreviewItem': [QtGui.QKeySequence(QtCore.Qt.Key_Return), QtGui.QKeySequence(QtCore.Qt.Key_Enter)], 'shortcuts/listViewCustomLiveItem': [QtGui.QKeySequence(QtCore.Qt.SHIFT + QtCore.Qt.Key_Return), QtGui.QKeySequence(QtCore.Qt.SHIFT + QtCore.Qt.Key_Enter)], 'shortcuts/listViewCustomServiceItem': [QtGui.QKeySequence(QtCore.Qt.Key_Plus), QtGui.QKeySequence(QtCore.Qt.Key_Equal)], - 'shortcuts/listViewImagesDeleteItem': [QtGui.QKeySequence(QtGui.QKeySequence.Delete), - QtGui.QKeySequence(QtCore.Qt.Key_Delete)], + 'shortcuts/listViewImagesDeleteItem': [QtGui.QKeySequence(QtGui.QKeySequence.Delete)], 'shortcuts/listViewImagesPreviewItem': [QtGui.QKeySequence(QtCore.Qt.Key_Return), QtGui.QKeySequence(QtCore.Qt.Key_Enter)], 'shortcuts/listViewImagesLiveItem': [QtGui.QKeySequence(QtCore.Qt.SHIFT + QtCore.Qt.Key_Return), QtGui.QKeySequence(QtCore.Qt.SHIFT + QtCore.Qt.Key_Enter)], 'shortcuts/listViewImagesServiceItem': [QtGui.QKeySequence(QtCore.Qt.Key_Plus), QtGui.QKeySequence(QtCore.Qt.Key_Equal)], - 'shortcuts/listViewMediaDeleteItem': [QtGui.QKeySequence(QtGui.QKeySequence.Delete), - QtGui.QKeySequence(QtCore.Qt.Key_Delete)], + 'shortcuts/listViewMediaDeleteItem': [QtGui.QKeySequence(QtGui.QKeySequence.Delete)], 'shortcuts/listViewMediaPreviewItem': [QtGui.QKeySequence(QtCore.Qt.Key_Return), QtGui.QKeySequence(QtCore.Qt.Key_Enter)], 'shortcuts/listViewMediaLiveItem': [QtGui.QKeySequence(QtCore.Qt.SHIFT + QtCore.Qt.Key_Return), QtGui.QKeySequence(QtCore.Qt.SHIFT + QtCore.Qt.Key_Enter)], 'shortcuts/listViewMediaServiceItem': [QtGui.QKeySequence(QtCore.Qt.Key_Plus), QtGui.QKeySequence(QtCore.Qt.Key_Equal)], - 'shortcuts/listViewPresentationsDeleteItem': [QtGui.QKeySequence(QtGui.QKeySequence.Delete), - QtGui.QKeySequence(QtCore.Qt.Key_Delete)], + 'shortcuts/listViewPresentationsDeleteItem': [QtGui.QKeySequence(QtGui.QKeySequence.Delete)], 'shortcuts/listViewPresentationsPreviewItem': [QtGui.QKeySequence(QtCore.Qt.Key_Return), QtGui.QKeySequence(QtCore.Qt.Key_Enter)], 'shortcuts/listViewPresentationsLiveItem': [QtGui.QKeySequence(QtCore.Qt.SHIFT + QtCore.Qt.Key_Return), QtGui.QKeySequence(QtCore.Qt.SHIFT + QtCore.Qt.Key_Enter)], 'shortcuts/listViewPresentationsServiceItem': [QtGui.QKeySequence(QtCore.Qt.Key_Plus), QtGui.QKeySequence(QtCore.Qt.Key_Equal)], - 'shortcuts/listViewSongsDeleteItem': [QtGui.QKeySequence(QtGui.QKeySequence.Delete), - QtGui.QKeySequence(QtCore.Qt.Key_Delete)], + 'shortcuts/listViewSongsDeleteItem': [QtGui.QKeySequence(QtGui.QKeySequence.Delete)], 'shortcuts/listViewSongsPreviewItem': [QtGui.QKeySequence(QtCore.Qt.Key_Return), QtGui.QKeySequence(QtCore.Qt.Key_Enter)], 'shortcuts/listViewSongsLiveItem': [QtGui.QKeySequence(QtCore.Qt.SHIFT + QtCore.Qt.Key_Return), @@ -337,8 +325,7 @@ class Settings(QtCore.QSettings): 'shortcuts/nextService': [QtGui.QKeySequence(QtCore.Qt.Key_Right)], 'shortcuts/newService': [], 'shortcuts/offlineHelpItem': [QtGui.QKeySequence(QtGui.QKeySequence.HelpContents)], - 'shortcuts/onlineHelpItem': [QtGui.QKeySequence(QtGui.QKeySequence.HelpContents), - QtGui.QKeySequence(QtCore.Qt.ALT + QtCore.Qt.Key_F1)], + 'shortcuts/onlineHelpItem': [QtGui.QKeySequence(QtGui.QKeySequence.HelpContents)], 'shortcuts/openService': [], 'shortcuts/saveService': [], 'shortcuts/previousItem_live': [QtGui.QKeySequence(QtCore.Qt.Key_Up), @@ -351,12 +338,10 @@ class Settings(QtCore.QSettings): 'shortcuts/previousService': [QtGui.QKeySequence(QtCore.Qt.Key_Left)], 'shortcuts/previousItem_preview': [QtGui.QKeySequence(QtCore.Qt.Key_Up), QtGui.QKeySequence(QtCore.Qt.Key_PageUp)], - 'shortcuts/printServiceItem': [QtGui.QKeySequence(QtGui.QKeySequence.Print), - QtGui.QKeySequence(QtCore.Qt.CTRL + QtCore.Qt.Key_P)], + 'shortcuts/printServiceItem': [QtGui.QKeySequence(QtGui.QKeySequence.Print)], 'shortcuts/songExportItem': [], 'shortcuts/songUsageStatus': [QtGui.QKeySequence(QtCore.Qt.Key_F4)], - 'shortcuts/searchShortcut': [QtGui.QKeySequence(QtGui.QKeySequence.Find), - QtGui.QKeySequence(QtCore.Qt.CTRL + QtCore.Qt.Key_F)], + 'shortcuts/searchShortcut': [QtGui.QKeySequence(QtGui.QKeySequence.Find)], 'shortcuts/settingsShortcutsItem': [], 'shortcuts/settingsImportItem': [], 'shortcuts/settingsPluginListItem': [QtGui.QKeySequence(QtCore.Qt.ALT + QtCore.Qt.Key_F7)],