Mercurial Repositories > cx_freeze Packager / changeset

--- a/.hgtags	Sun Apr 28 18:03:57 2013 +0200
+++ b/.hgtags	Sun Apr 28 18:06:40 2013 +0200
@@ -8,4 +8,8 @@
 bbcf4437e32afc9617bedc28f967c2032b10eb26 release-5.0.5
 caf61887223eba7b44d5e83e779da1f84ea7ca3f release-5.0.6
 94949c60ef54ec495366f7817780edd90009f78f release-5.1.0
+<<<<<<< local
 394efa0e059cd225f2afa7c171f028c0a14607cd release-5.1.1
+=======
+27dcfe29985b53e7a0036a88e868262d62520c79 release-5.1.1
+>>>>>>> other

--- a/CxFreeze/CxfreezeConfigDialog.py	Sun Apr 28 18:03:57 2013 +0200
+++ b/CxFreeze/CxfreezeConfigDialog.py	Sun Apr 28 18:06:40 2013 +0200
@@ -12,8 +12,9 @@
 import copy
 
 from PyQt4.QtCore import pyqtSlot, QDir
-from PyQt4.QtGui import QDialog, QFileDialog
+from PyQt4.QtGui import QDialog
 
+from E5Gui import E5FileDialog
 from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter
 
 from .Ui_CxfreezeConfigDialog import Ui_CxfreezeConfigDialog
@@ -216,12 +217,11 @@
         It displays a file selection dialog to select the external list file,
         the list of include modules is written to.
         """
-        extList = QFileDialog.getOpenFileName(
+        extList = E5FileDialog.getOpenFileName(
             self,
             self.trUtf8("Select external list file"),
             self.extListFileEdit.text(),
-            "",
-            QFileDialog.DontUseNativeDialog)
+            "")
         
         if extList:
             # make it relative, if it is in a subdirectory of the project path 
@@ -237,12 +237,11 @@
         It displays a directory selection dialog to
         select the directory the files are written to.
         """
-        directory = QFileDialog.getExistingDirectory(
+        directory = E5FileDialog.getExistingDirectory(
             self,
             self.trUtf8("Select target directory"),
             self.targetDirEdit.text(),
-            QFileDialog.Options(QFileDialog.ShowDirsOnly |
-                                QFileDialog.DontUseNativeDialog))
+            E5FileDialog.Options(E5FileDialog.ShowDirsOnly))
         
         if directory:
             # make it relative, if it is a subdirectory of the project path 

--- a/CxFreeze/CxfreezeExecDialog.py	Sun Apr 28 18:03:57 2013 +0200
+++ b/CxFreeze/CxfreezeExecDialog.py	Sun Apr 28 18:06:40 2013 +0200
@@ -10,7 +10,9 @@
 import os.path
 
 from PyQt4.QtCore import pyqtSlot, QProcess, QTimer
-from PyQt4.QtGui import QDialog, QDialogButtonBox, QMessageBox, QAbstractButton
+from PyQt4.QtGui import QDialog, QDialogButtonBox, QAbstractButton
+
+from E5Gui import E5MessageBox
 
 from .Ui_CxfreezeExecDialog import Ui_CxfreezeExecDialog
 
@@ -73,7 +75,7 @@
         self.process.start(program, args)
         procStarted = self.process.waitForStarted()
         if not procStarted:
-            QMessageBox.critical(None,
+            E5MessageBox.critical(None,
                 self.trUtf8('Process Generation Error'),
                 self.trUtf8(
                     'The process {0} could not be started. '

--- a/PluginCxFreeze.py	Sun Apr 28 18:03:57 2013 +0200
+++ b/PluginCxFreeze.py	Sun Apr 28 18:06:40 2013 +0200
@@ -11,8 +11,9 @@
 import sys
 
 from PyQt4.QtCore import QObject, QTranslator, QCoreApplication
-from PyQt4.QtGui import QDialog, QMessageBox
+from PyQt4.QtGui import QDialog
 
+from E5Gui import E5MessageBox
 from E5Gui.E5Action import E5Action
 from E5Gui.E5Application import e5App
 
@@ -259,18 +260,17 @@
         project = e5App().getObject("Project")
         if len(project.pdata["MAINSCRIPT"]) == 0:
             # no main script defined
-            QMessageBox.critical(None,
+            E5MessageBox.critical(None,
                 self.trUtf8("cxfreeze"),
                 self.trUtf8(
                     """There is no main script defined for the current project."""),
-                QMessageBox.StandardButtons(
-                    QMessageBox.Abort))
+                E5MessageBox.StandardButtons(E5MessageBox.Abort))
             return
         
         parms = project.getData('PACKAGERSPARMS', "CXFREEZE")
         exe = _findExecutable()
         if exe is None:
-            QMessageBox.critical(None,
+            E5MessageBox.critical(None,
                 self.trUtf8("cxfreeze"),
                 self.trUtf8("""The cxfreeze executable could not be found."""))
             return