diff -r 9c1f429cb56b -r b47dfa7a137d src/eric7/ViewManager/ViewManager.py
--- a/src/eric7/ViewManager/ViewManager.py Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/ViewManager/ViewManager.py Sun Dec 18 19:33:46 2022 +0100
@@ -25,12 +25,12 @@
from PyQt6.QtGui import QKeySequence, QPixmap
from PyQt6.QtWidgets import QApplication, QDialog, QMenu, QToolBar, QWidget
-from eric7 import Preferences, Utilities
+from eric7 import Preferences
from eric7.EricGui import EricPixmapCache
from eric7.EricGui.EricAction import EricAction, createActionGroup
from eric7.EricWidgets import EricFileDialog, EricMessageBox
from eric7.EricWidgets.EricApplication import ericApp
-from eric7.Globals import isMacPlatform, recentNameFiles
+from eric7.Globals import recentNameFiles
from eric7.QScintilla import Exporters, Lexers
from eric7.QScintilla.APIsManager import APIsManager
from eric7.QScintilla.Editor import Editor
@@ -39,6 +39,7 @@
from eric7.QScintilla.SpellChecker import SpellChecker
from eric7.QScintilla.SpellingDictionaryEditDialog import SpellingDictionaryEditDialog
from eric7.QScintilla.ZoomDialog import ZoomDialog
+from eric7.SystemUtilities import FileSystemUtilities, OSUtilities
from eric7.UI import Config
@@ -1732,7 +1733,7 @@
"vm_edit_move_left_char",
)
self.esm.setMapping(act, QsciScintilla.SCI_CHARLEFT)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setAlternateShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Meta+B"))
)
@@ -1747,7 +1748,7 @@
self.editorActGrp,
"vm_edit_move_right_char",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setAlternateShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Meta+F"))
)
@@ -1763,7 +1764,7 @@
self.editorActGrp,
"vm_edit_move_up_line",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setAlternateShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Meta+P"))
)
@@ -1779,7 +1780,7 @@
self.editorActGrp,
"vm_edit_move_down_line",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setAlternateShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Meta+N"))
)
@@ -1795,7 +1796,7 @@
self.editorActGrp,
"vm_edit_move_left_word_part",
)
- if not isMacPlatform():
+ if not OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Alt+Left"))
)
@@ -1811,7 +1812,7 @@
self.editorActGrp,
"vm_edit_move_right_word_part",
)
- if not isMacPlatform():
+ if not OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Alt+Right"))
)
@@ -1827,7 +1828,7 @@
self.editorActGrp,
"vm_edit_move_left_word",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Alt+Left"))
)
@@ -1847,7 +1848,7 @@
self.editorActGrp,
"vm_edit_move_right_word",
)
- if not isMacPlatform():
+ if not OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Ctrl+Right"))
)
@@ -1867,7 +1868,7 @@
self.editorActGrp,
"vm_edit_move_first_visible_char",
)
- if not isMacPlatform():
+ if not OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Home"))
)
@@ -1883,7 +1884,7 @@
self.editorActGrp,
"vm_edit_move_start_line",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Ctrl+Left"))
)
@@ -1903,7 +1904,7 @@
self.editorActGrp,
"vm_edit_move_end_line",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Meta+E"))
)
@@ -1983,7 +1984,7 @@
self.editorActGrp,
"vm_edit_move_down_page",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setAlternateShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Meta+V"))
)
@@ -1999,7 +2000,7 @@
self.editorActGrp,
"vm_edit_move_start_text",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Ctrl+Up"))
)
@@ -2019,7 +2020,7 @@
self.editorActGrp,
"vm_edit_move_end_text",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Ctrl+Down"))
)
@@ -2067,7 +2068,7 @@
self.editorActGrp,
"vm_edit_extend_selection_left_char",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setAlternateShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Meta+Shift+B"))
)
@@ -2087,7 +2088,7 @@
self.editorActGrp,
"vm_edit_extend_selection_right_char",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setAlternateShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Meta+Shift+F"))
)
@@ -2103,7 +2104,7 @@
self.editorActGrp,
"vm_edit_extend_selection_up_line",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setAlternateShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Meta+Shift+P"))
)
@@ -2119,7 +2120,7 @@
self.editorActGrp,
"vm_edit_extend_selection_down_line",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setAlternateShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Meta+Shift+N"))
)
@@ -2139,7 +2140,7 @@
self.editorActGrp,
"vm_edit_extend_selection_left_word_part",
)
- if not isMacPlatform():
+ if not OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(
QCoreApplication.translate("ViewManager", "Alt+Shift+Left")
@@ -2161,7 +2162,7 @@
self.editorActGrp,
"vm_edit_extend_selection_right_word_part",
)
- if not isMacPlatform():
+ if not OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(
QCoreApplication.translate("ViewManager", "Alt+Shift+Right")
@@ -2179,7 +2180,7 @@
self.editorActGrp,
"vm_edit_extend_selection_left_word",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(
QCoreApplication.translate("ViewManager", "Alt+Shift+Left")
@@ -2207,7 +2208,7 @@
self.editorActGrp,
"vm_edit_extend_selection_right_word",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(
QCoreApplication.translate("ViewManager", "Alt+Shift+Right")
@@ -2237,7 +2238,7 @@
self.editorActGrp,
"vm_edit_extend_selection_first_visible_char",
)
- if not isMacPlatform():
+ if not OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Shift+Home"))
)
@@ -2257,7 +2258,7 @@
self.editorActGrp,
"vm_edit_extend_selection_end_line",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Meta+Shift+E"))
)
@@ -2321,7 +2322,7 @@
self.editorActGrp,
"vm_edit_extend_selection_down_page",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setAlternateShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Meta+Shift+V"))
)
@@ -2341,7 +2342,7 @@
self.editorActGrp,
"vm_edit_extend_selection_start_text",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Ctrl+Shift+Up"))
)
@@ -2367,7 +2368,7 @@
self.editorActGrp,
"vm_edit_extend_selection_end_text",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(
QCoreApplication.translate("ViewManager", "Ctrl+Shift+Down")
@@ -2391,7 +2392,7 @@
self.editorActGrp,
"vm_edit_delete_previous_char",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setAlternateShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Meta+H"))
)
@@ -2429,7 +2430,7 @@
self.editorActGrp,
"vm_edit_delete_current_char",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setAlternateShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Meta+D"))
)
@@ -2483,7 +2484,7 @@
self.editorActGrp,
"vm_edit_delete_line_right",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Meta+K"))
)
@@ -2620,7 +2621,7 @@
self.editorActGrp,
"vm_edit_move_end_displayed_line",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Ctrl+Right"))
)
@@ -2644,7 +2645,7 @@
self.editorActGrp,
"vm_edit_extend_selection_end_displayed_line",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(
QCoreApplication.translate("ViewManager", "Ctrl+Shift+Right")
@@ -2690,7 +2691,7 @@
self.editorActGrp,
"vm_edit_extend_rect_selection_down_line",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setAlternateShortcut(
QKeySequence(
QCoreApplication.translate("ViewManager", "Meta+Alt+Shift+N")
@@ -2712,7 +2713,7 @@
self.editorActGrp,
"vm_edit_extend_rect_selection_up_line",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setAlternateShortcut(
QKeySequence(
QCoreApplication.translate("ViewManager", "Meta+Alt+Shift+P")
@@ -2734,7 +2735,7 @@
self.editorActGrp,
"vm_edit_extend_rect_selection_left_char",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setAlternateShortcut(
QKeySequence(
QCoreApplication.translate("ViewManager", "Meta+Alt+Shift+B")
@@ -2756,7 +2757,7 @@
self.editorActGrp,
"vm_edit_extend_rect_selection_right_char",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setAlternateShortcut(
QKeySequence(
QCoreApplication.translate("ViewManager", "Meta+Alt+Shift+F")
@@ -2782,7 +2783,7 @@
self.editorActGrp,
"vm_edit_extend_rect_selection_first_visible_char",
)
- if not isMacPlatform():
+ if not OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(
QCoreApplication.translate("ViewManager", "Alt+Shift+Home")
@@ -2804,7 +2805,7 @@
self.editorActGrp,
"vm_edit_extend_rect_selection_end_line",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(
QCoreApplication.translate("ViewManager", "Meta+Alt+Shift+E")
@@ -2846,7 +2847,7 @@
self.editorActGrp,
"vm_edit_extend_rect_selection_down_page",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setAlternateShortcut(
QKeySequence(
QCoreApplication.translate("ViewManager", "Meta+Alt+Shift+V")
@@ -2881,7 +2882,7 @@
self.editorActGrp,
"vm_edit_scroll_start_text",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Home"))
)
@@ -2898,7 +2899,7 @@
self.editorActGrp,
"vm_edit_scroll_end_text",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "End"))
)
@@ -2919,7 +2920,7 @@
self.editorActGrp,
"vm_edit_scroll_vertically_center",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Meta+L"))
)
@@ -2936,7 +2937,7 @@
self.editorActGrp,
"vm_edit_move_end_next_word",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Alt+Right"))
)
@@ -2957,7 +2958,7 @@
self.editorActGrp,
"vm_edit_select_end_next_word",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(
QCoreApplication.translate("ViewManager", "Alt+Shift+Right")
@@ -3014,7 +3015,7 @@
self.editorActGrp,
"vm_edit_move_start_document_line",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Meta+A"))
)
@@ -3035,7 +3036,7 @@
self.editorActGrp,
"vm_edit_extend_selection_start_document_line",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(
QCoreApplication.translate("ViewManager", "Meta+Shift+A")
@@ -3060,7 +3061,7 @@
self.editorActGrp,
"vm_edit_select_rect_start_line",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(
QCoreApplication.translate("ViewManager", "Meta+Alt+Shift+A")
@@ -3083,7 +3084,7 @@
self.editorActGrp,
"vm_edit_extend_selection_start_display_line",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(
QCoreApplication.translate("ViewManager", "Ctrl+Shift+Left")
@@ -3280,7 +3281,7 @@
self.editorActGrp,
"vm_edit_delete_right_end_next_word",
)
- if isMacPlatform():
+ if OSUtilities.isMacPlatform():
act.setShortcut(
QKeySequence(QCoreApplication.translate("ViewManager", "Alt+Del"))
)
@@ -5436,7 +5437,7 @@
@rtype bool
"""
for editor in self.editors:
- if Utilities.samepath(fn, editor.getFileName()):
+ if FileSystemUtilities.samepath(fn, editor.getFileName()):
break
else:
return True
@@ -5530,7 +5531,7 @@
@rtype bool
"""
for editor in self.editors:
- if Utilities.samepath(fn, editor.getFileName()):
+ if FileSystemUtilities.samepath(fn, editor.getFileName()):
break
else:
return True
@@ -5748,7 +5749,7 @@
@param fn name of the file to be added
"""
for recent in self.recent[:]:
- if Utilities.samepath(fn, recent):
+ if FileSystemUtilities.samepath(fn, recent):
self.recent.remove(recent)
self.recent.insert(0, fn)
maxRecent = Preferences.getUI("RecentNumber")
@@ -5953,9 +5954,9 @@
"""
newWin = False
editor = self.activeWindow()
- if editor is None or not Utilities.samepath(fn, editor.getFileName()):
+ if editor is None or not FileSystemUtilities.samepath(fn, editor.getFileName()):
for editor in self.editors:
- if Utilities.samepath(fn, editor.getFileName()):
+ if FileSystemUtilities.samepath(fn, editor.getFileName()):
break
else:
assembly = EditorAssembly(
@@ -6006,7 +6007,7 @@
no editor was found
"""
for editor in self.editors:
- if Utilities.samepath(fn, editor.getFileName()):
+ if FileSystemUtilities.samepath(fn, editor.getFileName()):
return editor
return None
@@ -6020,7 +6021,7 @@
"""
count = 0
for editor in self.editors:
- if Utilities.samepath(fn, editor.getFileName()):
+ if FileSystemUtilities.samepath(fn, editor.getFileName()):
count += 1
return count
@@ -6058,7 +6059,7 @@
@return flag indicating success (boolean)
"""
for editor in self.editors:
- if Utilities.samepath(fn, editor.getFileName()):
+ if FileSystemUtilities.samepath(fn, editor.getFileName()):
break
else:
return True
@@ -6236,7 +6237,7 @@
formatStr = "&{0:d}. {1}" if idx < 10 else "{0:d}. {1}"
act = self.recentMenu.addAction(
formatStr.format(
- idx, Utilities.compactPath(rs, self.ui.maxMenuFilePathLen)
+ idx, FileSystemUtilities.compactPath(rs, self.ui.maxMenuFilePathLen)
)
)
act.setData(rs)
@@ -6272,7 +6273,7 @@
for rp in self.bookmarked:
act = self.bookmarkedMenu.addAction(
- Utilities.compactPath(rp, self.ui.maxMenuFilePathLen)
+ FileSystemUtilities.compactPath(rp, self.ui.maxMenuFilePathLen)
)
act.setData(rp)
act.setEnabled(pathlib.Path(rp).exists())
@@ -7033,7 +7034,7 @@
bmSuffix = " : {0:d}".format(bookmark)
act = self.bookmarksMenu.addAction(
"{0}{1}".format(
- Utilities.compactPath(
+ FileSystemUtilities.compactPath(
filename, self.ui.maxMenuFilePathLen - len(bmSuffix)
),
bmSuffix,
@@ -7853,7 +7854,7 @@
return ericApp().getObject("Project").ppath
else:
- return Preferences.getMultiProject("Workspace") or Utilities.getHomeDir()
+ return Preferences.getMultiProject("Workspace") or OSUtilities.getHomeDir()
def _getOpenFileFilter(self):
"""
