Mercurial Repositories > eric / file diff

--- a/Project/ProjectBaseBrowser.py	Sun Jun 29 14:00:30 2014 +0200
+++ b/Project/ProjectBaseBrowser.py	Sun Jun 29 20:13:56 2014 +0200
@@ -11,9 +11,11 @@
 
 import os
 
-from PyQt4.QtCore import QModelIndex, pyqtSignal, Qt
-from PyQt4.QtGui import QTreeView, QCursor, QItemSelection, \
-    QItemSelectionModel, QApplication, QMenu, QAbstractItemView, QDialog
+from PyQt5.QtCore import QModelIndex, pyqtSignal, Qt, QCoreApplication, \
+    QItemSelectionModel, QItemSelection
+from PyQt5.QtGui import QCursor
+from PyQt5.QtWidgets import QTreeView, QApplication, QMenu, QDialog, \
+    QAbstractItemView
 
 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
@@ -103,19 +105,19 @@
         # create the popup menu for source files
         self.sourceMenu = QMenu(self)
         self.sourceMenu.addAction(
-            QApplication.translate('ProjectBaseBrowser', 'Open'),
+            QCoreApplication.translate('ProjectBaseBrowser', 'Open'),
             self._openItem)
         
         # create the popup menu for general use
         self.menu = QMenu(self)
         self.menu.addAction(
-            QApplication.translate('ProjectBaseBrowser', 'Open'),
+            QCoreApplication.translate('ProjectBaseBrowser', 'Open'),
             self._openItem)
 
         # create the menu for multiple selected files
         self.multiMenu = QMenu(self)
         self.multiMenu.addAction(
-            QApplication.translate('ProjectBaseBrowser', 'Open'),
+            QCoreApplication.translate('ProjectBaseBrowser', 'Open'),
             self._openItem)
         
         # create the background menu
@@ -488,7 +490,7 @@
         
         if local:
             compareString = \
-                QApplication.translate('ProjectBaseBrowser', "local")
+                QCoreApplication.translate('ProjectBaseBrowser', "local")
         else:
             compareString = self.project.vcs.vcsName()
         
@@ -530,8 +532,9 @@
         if selectedEntries == 0:
             E5MessageBox.information(
                 self,
-                QApplication.translate('ProjectBaseBrowser', "Select entries"),
-                QApplication.translate(
+                QCoreApplication.translate(
+                    'ProjectBaseBrowser', "Select entries"),
+                QCoreApplication.translate(
                     'ProjectBaseBrowser',
                     """There were no matching entries found."""))