Merge pull request #1466 from otseng/changes

Fix shortcut

.gitignore

@@ -60,7 +60,7 @@ uniquebible/htmlResources/images/[A-Z]*/*
 uniquebible/htmlResources/images/qrcode.png
 **/.DS_Store
 nohup.out
-/Perimeter\ Worship\ Songs
+uniquebible/Perimeter\ Worship\ Songs
 /Personal
 uniquebible/htmlResources/main-*.html
 uniquebible/htmlResources/lib/pdfjs-2.7.570-dist/web/*.pdf

uniquebible/gui/AlephMainWindow.py

@@ -8,7 +8,7 @@
 from uniquebible.util.FileUtil import FileUtil
 from uniquebible.util.WebtopUtil import WebtopUtil
 import re, os
-import shortcut as sc
+import uniquebible.shortcut as sc
 
 
 class AlephMainWindow:

uniquebible/gui/ClassicMainWindow.py

@@ -7,7 +7,7 @@
 from uniquebible.util.FileUtil import FileUtil
 from uniquebible.util.WebtopUtil import WebtopUtil
 import re, os
-import shortcut as sc
+import uniquebible.shortcut as sc
 
 
 class ClassicMainWindow:

uniquebible/gui/FocusMainWindow.py

@@ -7,7 +7,7 @@
 from uniquebible.util.LanguageUtil import LanguageUtil
 from uniquebible.util.FileUtil import FileUtil
 from uniquebible.util.WebtopUtil import WebtopUtil
-import shortcut as sc
+import uniquebible.shortcut as sc
 import re, os
 
 

uniquebible/gui/MainWindow.py

@@ -81,7 +81,7 @@
 from uniquebible.util.ShortcutUtil import ShortcutUtil
 from uniquebible.util.TextUtil import TextUtil
 from uniquebible.util.PydubUtil import PydubUtil
-import shortcut as sc
+import uniquebible.shortcut as sc
 from uniquebible.util.UpdateUtil import UpdateUtil
 from uniquebible.util.DateUtil import DateUtil
 from uniquebible.util.CrossPlatform import CrossPlatform

uniquebible/gui/MasterControl.py

@@ -1,5 +1,5 @@
 from uniquebible import config
-import shortcut as sc
+import uniquebible.shortcut as sc
 from uniquebible.gui.BibleExplorer import BibleExplorer
 from uniquebible.gui.Library2Launcher import Library2Launcher
 from uniquebible.gui.MediaLauncher import MediaLauncher

uniquebible/gui/MaterialMainWindow.py

@@ -8,7 +8,7 @@
 from uniquebible.util.Languages import Languages
 from uniquebible.util.FileUtil import FileUtil
 from uniquebible.util.WebtopUtil import WebtopUtil
-import shortcut as sc
+import uniquebible.shortcut as sc
 import re, os, webbrowser
 
 

uniquebible/gui/MiniTextEditor.py

@@ -1,6 +1,6 @@
 from uniquebible import config
 import re, os
-import shortcut as sc
+import uniquebible.shortcut as sc
 from datetime import datetime
 if config.qtLibrary == "pyside6":
     from PySide6.QtCore import Qt, QTimer

uniquebible/gui/WebEngineView.py

@@ -3,7 +3,7 @@
 from uniquebible.util.GoogleCloudTTSVoices import GoogleCloudTTS
 from uniquebible import config
 import os, platform, re
-import shortcut as sc
+import uniquebible.shortcut as sc
 from functools import partial
 if config.qtLibrary == "pyside6":
     from PySide6.QtCore import Qt

uniquebible/gui/WebEngineViewPopover.py

@@ -1,7 +1,7 @@
 from genericpath import isfile
 import os
 from uniquebible import config
-import shortcut as sc
+import uniquebible.shortcut as sc
 if config.qtLibrary == "pyside6":
     from PySide6.QtGui import QKeySequence, QAction, QShortcut
     from PySide6.QtWidgets import QFileDialog, QInputDialog, QLineEdit

uniquebible/gui/WorkSpace.py

@@ -1,7 +1,7 @@
 from uniquebible import config
 import re, os, base64, glob, webbrowser, markdown
 from datetime import datetime
-import shortcut as sc
+import uniquebible.shortcut as sc
 from uniquebible.util.SystemUtil import SystemUtil
 
 if config.qtLibrary == "pyside6":

uniquebible/plugins/layout/Starter.py

@@ -1,5 +1,5 @@
 from uniquebible.gui.MenuItems import *
-import shortcut as sc
+import uniquebible.shortcut as sc
 from uniquebible.db.BiblesSqlite import BiblesSqlite
 from uniquebible.util.LanguageUtil import LanguageUtil
 

uniquebible/util/ShortcutUtil.py

@@ -743,7 +743,7 @@ def getListCustomShortcuts():
 
     @staticmethod
     def getAllShortcuts():
-        import shortcut as sc
+        import uniquebible.shortcut as sc
 
         lines = []
         for action in sc.__dict__.keys():
@@ -789,7 +789,7 @@ def readShorcutFile(name=None):
 
     @staticmethod
     def loadShortcutFile(name=None):
-        import shortcut
+        import uniquebible.shortcut as shortcut
         customShortcuts = ShortcutUtil.readShorcutFile(name)
         for key in customShortcuts.keys():
             action = customShortcuts[key]