Mercurial Repositories > eric / file diff

--- a/src/eric7/UI/Browser.py	Sun Dec 10 17:49:42 2023 +0100
+++ b/src/eric7/UI/Browser.py	Mon Dec 11 10:30:24 2023 +0100
@@ -50,6 +50,7 @@
     BrowserItemDirectory,
     BrowserMethodItem,
     BrowserModel,
+    BrowserSimpleDirectoryItem,
     BrowserSysPathItem,
 )
 from .BrowserSortFilterProxyModel import BrowserSortFilterProxyModel
@@ -250,10 +251,6 @@
         self.sourceMenu.addAction(
             QCoreApplication.translate("Browser", "Open"), self._openItem
         )
-        self.sourceMenu.addAction(
-            QCoreApplication.translate("Browser", "Show in File Manager"),
-            self._showInFileManager,
-        )
         self.testingAct = self.sourceMenu.addAction(
             QCoreApplication.translate("Browser", "Run Test..."), self.handleTesting
         )
@@ -268,6 +265,10 @@
         )
         self.sourceMenu.addSeparator()
         self.sourceMenu.addAction(
+            QCoreApplication.translate("Browser", "Show in File Manager"),
+            self._showInFileManager,
+        )
+        self.sourceMenu.addAction(
             QCoreApplication.translate("Browser", "Copy Path to Clipboard"),
             self._copyToClipboard,
         )
@@ -300,16 +301,16 @@
             QCoreApplication.translate("Browser", "Open in PDF Viewer"),
             self._openPdfViewer,
         )
-        self.menu.addAction(
-            QCoreApplication.translate("Browser", "Show in File Manager"),
-            self._showInFileManager,
-        )
         self.menu.addSeparator()
         self.mimeTypeAct = self.menu.addAction(
             QCoreApplication.translate("Browser", "Show Mime-Type"), self.__showMimeType
         )
         self.menu.addSeparator()
         self.menu.addAction(
+            QCoreApplication.translate("Browser", "Show in File Manager"),
+            self._showInFileManager,
+        )
+        self.menu.addAction(
             QCoreApplication.translate("Browser", "Copy Path to Clipboard"),
             self._copyToClipboard,
         )
@@ -349,11 +350,6 @@
         )
         self.dirMenu.addSeparator()
         self.dirMenu.addAction(
-            QCoreApplication.translate("Browser", "Show in File Manager"),
-            self._showInFileManager,
-        )
-        self.dirMenu.addSeparator()
-        self.dirMenu.addAction(
             QCoreApplication.translate("Browser", "Refresh directory"),
             self.__refreshDirectory,
         )
@@ -366,6 +362,11 @@
             QCoreApplication.translate("Browser", "Find && Replace in this directory"),
             self.__replaceInDirectory,
         )
+        self.dirMenu.addSeparator()
+        self.dirMenu.addAction(
+            QCoreApplication.translate("Browser", "Show in File Manager"),
+            self._showInFileManager,
+        )
         self.dirMenu.addAction(
             QCoreApplication.translate("Browser", "Copy Path to Clipboard"),
             self._copyToClipboard,
@@ -595,13 +596,15 @@
                 BrowserClassAttributeItem,
                 BrowserImportItem,
                 BrowserDirectoryItem,
+                BrowserSimpleDirectoryItem,
             ]
         )
         for itm in itmList:
-            if isinstance(itm, BrowserDirectoryItem):
-                directory = itm.dirName()
-            else:
-                directory = os.path.dirname(itm.fileName())
+            directory = (
+                itm.dirName()
+                if isinstance(itm, (BrowserDirectoryItem, BrowserSimpleDirectoryItem))
+                else os.path.dirname(itm.fileName())
+            )
             ok = FileSystemUtilities.startfile(directory)
 
             if not ok:
@@ -609,7 +612,7 @@
                     self,
                     self.tr("Show in File Manager"),
                     self.tr(
-                        "<p>The directory of the selected item (<b>{0}</b>could not be"
+                        "<p>The directory of the selected item (<b>{0}</b>) cannot be"
                         " shown in a file manager application.</p>"
                     ).format(directory),
                 )