Sat, 05 Feb 2011 16:32:34 +0100
Added the option to not use the native file dialog to prevent crashes on Linux.
--- a/Cooperation/ChatWidget.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Cooperation/ChatWidget.py Sat Feb 05 16:32:34 2011 +0100 @@ -535,7 +535,8 @@ "", self.trUtf8("Text Files (*.txt);;All Files (*)"), None, - QFileDialog.Options(QFileDialog.DontConfirmOverwrite)) + QFileDialog.Options(QFileDialog.DontConfirmOverwrite | + QFileDialog.DontUseNativeDialog)) if fname: ext = QFileInfo(fname).suffix() if not ext: @@ -668,4 +669,4 @@ QDateTime.currentDateTime().toString(Qt.SystemLocaleLongDate) + ":") self.chatEdit.append(self.trUtf8("* {0} has been banned and kicked.\n").format( itm.text().split(":")[0])) - self.chatEdit.setTextColor(color) \ No newline at end of file + self.chatEdit.setTextColor(color)
--- a/Debugger/EditBreakpointDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Debugger/EditBreakpointDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -114,7 +114,8 @@ self, self.trUtf8("Select filename of the breakpoint"), self.filenameCombo.currentText(), - "") + "", + QFileDialog.DontUseNativeDialog) if file: self.filenameCombo.setEditText(Utilities.toNativeSeparators(file)) @@ -157,4 +158,4 @@ return (fn, self.linenoSpinBox.value(), self.conditionCombo.currentText(), self.temporaryCheckBox.isChecked(), self.enabledCheckBox.isChecked(), - self.ignoreSpinBox.value()) \ No newline at end of file + self.ignoreSpinBox.value())
--- a/Debugger/StartDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Debugger/StartDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -119,7 +119,8 @@ self, self.trUtf8("Working directory"), cwd, - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly | + QFileDialog.DontUseNativeDialog)) if d: self.ui.workdirCombo.setEditText(Utilities.toNativeSeparators(d)) @@ -223,4 +224,4 @@ @param button button that was clicked (QAbstractButton) """ if button == self.clearButton: - self.__clearHistories() \ No newline at end of file + self.__clearHistories()
--- a/Graphics/UMLGraphicsView.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Graphics/UMLGraphicsView.py Sat Feb 05 16:32:34 2011 +0100 @@ -329,7 +329,8 @@ self.trUtf8("Portable Network Graphics (*.png);;" "Scalable Vector Graphics (*.svg)"), "", - QFileDialog.Options(QFileDialog.DontConfirmOverwrite)) + QFileDialog.Options(QFileDialog.DontConfirmOverwrite | + QFileDialog.DontUseNativeDialog)) if fname: ext = QFileInfo(fname).suffix() if not ext:
--- a/Helpviewer/Bookmarks/BookmarksManager.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Helpviewer/Bookmarks/BookmarksManager.py Sat Feb 05 16:32:34 2011 +0100 @@ -338,7 +338,8 @@ None, self.trUtf8("Import Bookmarks"), "", - ";;".join(supportedFormats)) + ";;".join(supportedFormats), + QFileDialog.DontUseNativeDialog) if not fileName: return @@ -386,7 +387,8 @@ None, self.trUtf8("Export Bookmarks"), "eric5_bookmarks.xbel", - self.trUtf8("XBEL bookmarks (*.xbel);;XBEL bookmarks (*.xml)")) + self.trUtf8("XBEL bookmarks (*.xbel);;XBEL bookmarks (*.xml)"), + QFileDialog.DontUseNativeDialog) if not fileName: return
--- a/Helpviewer/Download/DownloadItem.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Helpviewer/Download/DownloadItem.py Sat Feb 05 16:32:34 2011 +0100 @@ -175,7 +175,8 @@ None, self.trUtf8("Save File"), defaultFileName, - "") + "", + QFileDialog.DontUseNativeDialog) self.__gettingFileName = False if not fileName: self.progressBar.setVisible(False)
--- a/Helpviewer/HelpWindow.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Helpviewer/HelpWindow.py Sat Feb 05 16:32:34 2011 +0100 @@ -1462,7 +1462,8 @@ "PDF Files (*.pdf);;" "CHM Files (*.chm);;" "All Files (*)" - )) + ), + QFileDialog.DontUseNativeDialog) if fn: if Utilities.isWindowsPlatform(): url = "file:///" + Utilities.fromNativeSeparators(fn) @@ -1482,7 +1483,8 @@ "PDF Files (*.pdf);;" "CHM Files (*.chm);;" "All Files (*)" - )) + ), + QFileDialog.DontUseNativeDialog) if fn: if Utilities.isWindowsPlatform(): url = "file:///" + Utilities.fromNativeSeparators(fn)
--- a/Helpviewer/OpenSearch/OpenSearchDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Helpviewer/OpenSearch/OpenSearchDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -54,7 +54,8 @@ self, self.trUtf8("Add search engine"), "", - self.trUtf8("OpenSearch (*.xml);;All Files (*)")) + self.trUtf8("OpenSearch (*.xml);;All Files (*)"), + QFileDialog.DontUseNativeDialog) osm = self.__mw.openSearchManager() for fileName in fileNames: @@ -109,4 +110,4 @@ @param deselected item selection of deselected items (QItemSelection) """ self.editButton.setEnabled( - len(self.enginesTable.selectionModel().selectedRows()) <= 1) \ No newline at end of file + len(self.enginesTable.selectionModel().selectedRows()) <= 1)
--- a/Helpviewer/QtHelpDocumentationDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Helpviewer/QtHelpDocumentationDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -57,7 +57,8 @@ self, self.trUtf8("Add Documentation"), "", - self.trUtf8("Qt Compressed Help Files (*.qch)")) + self.trUtf8("Qt Compressed Help Files (*.qch)"), + QFileDialog.DontUseNativeDialog) if not fileNames: return @@ -139,4 +140,4 @@ @return list of tab ids to be closed (list of integers) """ - return self.__tabsToClose \ No newline at end of file + return self.__tabsToClose
--- a/Helpviewer/SslCertificatesDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Helpviewer/SslCertificatesDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -378,7 +378,8 @@ self.trUtf8("Certificate File (PEM) (*.pem);;" "Certificate File (DER) (*.der)"), None, - QFileDialog.Options(QFileDialog.DontConfirmOverwrite)) + QFileDialog.Options(QFileDialog.DontConfirmOverwrite | + QFileDialog.DontUseNativeDialog)) if fname: ext = QFileInfo(fname).suffix() @@ -422,7 +423,8 @@ self.trUtf8("Import Certificate"), "", self.trUtf8("Certificate Files (*.pem *.crt *.der *.cer *.ca);;" - "All Files (*)")) + "All Files (*)"), + QFileDialog.DontUseNativeDialog) if fname: f = QFile(fname)
--- a/IconEditor/IconEditorWindow.py Sat Feb 05 14:21:37 2011 +0100 +++ b/IconEditor/IconEditorWindow.py Sat Feb 05 16:32:34 2011 +0100 @@ -969,7 +969,8 @@ self.trUtf8("Open icon file"), "", self.__inputFilter, - self.__defaultFilter)[0] + self.__defaultFilter, + QFileDialog.DontUseNativeDialog)[0] if fileName: self.__loadIconFile(fileName) self.__checkActions() @@ -993,7 +994,8 @@ "", self.__outputFilter, self.__defaultFilter, - QFileDialog.Options(QFileDialog.DontConfirmOverwrite)) + QFileDialog.Options(QFileDialog.DontConfirmOverwrite | + QFileDialog.DontUseNativeDialog)) if not fileName: return False
--- a/MultiProject/AddProjectDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/MultiProject/AddProjectDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -61,7 +61,8 @@ self, self.trUtf8("Add Project"), startdir, - self.trUtf8("Project Files (*.e4p)")) + self.trUtf8("Project Files (*.e4p)"), + QFileDialog.DontUseNativeDialog) if projectFile: self.filenameEdit.setText(Utilities.toNativeSeparators(projectFile))
--- a/MultiProject/MultiProject.py Sat Feb 05 14:21:37 2011 +0100 +++ b/MultiProject/MultiProject.py Sat Feb 05 16:32:34 2011 +0100 @@ -407,7 +407,8 @@ self.parent(), self.trUtf8("Open multiproject"), "", - self.trUtf8("Multiproject Files (*.e4m)")) + self.trUtf8("Multiproject Files (*.e4m)"), + QFileDialog.DontUseNativeDialog) if fn == "": fn = None @@ -463,7 +464,8 @@ self.ppath, self.trUtf8("Multiproject Files (*.e4m)"), defaultFilter, - QFileDialog.Options(QFileDialog.DontConfirmOverwrite)) + QFileDialog.Options(QFileDialog.DontConfirmOverwrite | + QFileDialog.DontUseNativeDialog)) if fn: ext = QFileInfo(fn).suffix()
--- a/PluginManager/PluginInstallDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/PluginManager/PluginInstallDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -146,7 +146,8 @@ self, self.trUtf8("Select plugin ZIP-archives"), dn, - self.trUtf8("Plugin archive (*.zip)")) + self.trUtf8("Plugin archive (*.zip)"), + QFileDialog.DontUseNativeDialog) if archives: matchflags = Qt.MatchFixedString @@ -557,4 +558,4 @@ self.resize(size) self.cw.buttonBox.accepted[()].connect(self.close) - self.cw.buttonBox.rejected[()].connect(self.close) \ No newline at end of file + self.cw.buttonBox.rejected[()].connect(self.close)
--- a/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -169,7 +169,8 @@ self, self.trUtf8("Select output file"), self.outputFileEdit.text(), - self.trUtf8("API files (*.api);;All files (*)")) + self.trUtf8("API files (*.api);;All files (*)"), + QFileDialog.DontUseNativeDialog) if filename: # make it relative, if it is in a subdirectory of the project path @@ -200,7 +201,8 @@ self, self.trUtf8("Select directory to exclude"), startDir, - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly | + QFileDialog.DontUseNativeDialog)) if directory: # make it relative, if it is a subdirectory of the project path
--- a/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -261,7 +261,8 @@ self, self.trUtf8("Select output directory"), self.outputDirEdit.text(), - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly | + QFileDialog.DontUseNativeDialog)) if directory: # make it relative, if it is a subdirectory of the project path @@ -286,7 +287,8 @@ self, self.trUtf8("Select directory to exclude"), startDir, - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly | + QFileDialog.DontUseNativeDialog)) if directory: # make it relative, if it is a subdirectory of the project path @@ -324,7 +326,8 @@ self, self.trUtf8("Select CSS style sheet"), getConfig('ericCSSDir'), - self.trUtf8("Style sheet (*.css);;All files (*)")) + self.trUtf8("Style sheet (*.css);;All files (*)"), + QFileDialog.DontUseNativeDialog) if cssFile: # make it relative, if it is in a subdirectory of the project path @@ -472,7 +475,8 @@ self, self.trUtf8("Select output directory for QtHelp files"), self.qtHelpDirEdit.text(), - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly | + QFileDialog.DontUseNativeDialog)) if directory: # make it relative, if it is a subdirectory of the project path @@ -525,4 +529,4 @@ self.qtHelpGenerateCollectionCheckBox.isChecked() # call the accept slot of the base class - QDialog.accept(self) \ No newline at end of file + QDialog.accept(self)
--- a/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -66,14 +66,16 @@ self, self.trUtf8("Select target"), self.targetEdit.text(), - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly | + QFileDialog.DontUseNativeDialog)) else: target = QFileDialog.getSaveFileName( self, self.trUtf8("Select target"), self.targetEdit.text(), "", - QFileDialog.Options(QFileDialog.DontConfirmOverwrite)) + QFileDialog.Options(QFileDialog.DontConfirmOverwrite | + QFileDialog.DontUseNativeDialog)) if target: - self.targetEdit.setText(target) \ No newline at end of file + self.targetEdit.setText(target)
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -269,7 +269,8 @@ fname, self.trUtf8("Patch Files (*.diff)"), None, - QFileDialog.Options(QFileDialog.DontConfirmOverwrite)) + QFileDialog.Options(QFileDialog.DontConfirmOverwrite | + QFileDialog.DontUseNativeDialog)) if not fname: return # user aborted
--- a/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -58,7 +58,8 @@ self, self.trUtf8("Select Repository-Directory"), self.vcsUrlEdit.text(), - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly | + QFileDialog.DontUseNativeDialog)) if directory: self.vcsUrlEdit.setText(Utilities.toNativeSeparators(directory)) @@ -72,7 +73,8 @@ self, self.trUtf8("Select Project Directory"), self.vcsProjectDirEdit.text(), - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly | + QFileDialog.DontUseNativeDialog)) if directory: self.vcsProjectDirEdit.setText(Utilities.toNativeSeparators(directory)) @@ -110,4 +112,4 @@ "url" : '{0}{1}'.format(scheme, url), "revision" : self.vcsRevisionEdit.text(), } - return (self.vcsProjectDirEdit.text(), vcsdatadict) \ No newline at end of file + return (self.vcsProjectDirEdit.text(), vcsdatadict)
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Feb 05 16:32:34 2011 +0100 @@ -1727,7 +1727,8 @@ repodir, self.trUtf8("Mercurial Changegroup Files (*.hg)"), None, - QFileDialog.Options(QFileDialog.DontConfirmOverwrite)) + QFileDialog.Options(QFileDialog.DontConfirmOverwrite | + QFileDialog.DontUseNativeDialog)) if not fname: return # user aborted @@ -1785,7 +1786,8 @@ None, self.trUtf8("Preview changegroup"), repodir, - self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)")) + self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)"), + QFileDialog.DontUseNativeDialog) if file: if self.getPlugin().getPreferences("UseLogBrowser"): self.logBrowser = \ @@ -1816,7 +1818,8 @@ None, self.trUtf8("Preview changegroup"), repodir, - self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)")) + self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)"), + QFileDialog.DontUseNativeDialog) if file: args = [] args.append('identify') @@ -1846,7 +1849,8 @@ None, self.trUtf8("Apply changegroups"), repodir, - self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)")) + self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)"), + QFileDialog.DontUseNativeDialog) if files: update = E5MessageBox.yesNo(self.__ui, self.trUtf8("Apply changegroups"),
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -69,7 +69,8 @@ self, self.trUtf8("Working directory"), cwd, - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly | + QFileDialog.DontUseNativeDialog)) if d: self.workdirCombo.setEditText(Utilities.toNativeSeparators(d)) @@ -89,4 +90,4 @@ @return a tuple of argv, workdir """ return (self.commandCombo.currentText(), - self.workdirCombo.currentText()) \ No newline at end of file + self.workdirCombo.currentText())
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -66,14 +66,16 @@ None, self.trUtf8("Select target"), self.targetEdit.text(), - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly | + QFileDialog.DontUseNativeDialog)) else: target = QFileDialog.getSaveFileName( None, self.trUtf8("Select target"), self.targetEdit.text(), "", - QFileDialog.Options(QFileDialog.DontConfirmOverwrite)) + QFileDialog.Options(QFileDialog.DontConfirmOverwrite | + QFileDialog.DontUseNativeDialog)) if target: - self.targetEdit.setText(target) \ No newline at end of file + self.targetEdit.setText(target)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -319,7 +319,8 @@ fname, self.trUtf8("Patch Files (*.diff)"), None, - QFileDialog.Options(QFileDialog.DontConfirmOverwrite)) + QFileDialog.Options(QFileDialog.DontConfirmOverwrite | + QFileDialog.DontUseNativeDialog)) if not fname: return # user aborted @@ -357,4 +358,4 @@ """ self.errorGroup.show() self.errors.insertPlainText(msg) - self.errors.ensureCursorVisible() \ No newline at end of file + self.errors.ensureCursorVisible()
--- a/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -59,7 +59,8 @@ self, self.trUtf8("Select Repository-Directory"), self.vcsUrlEdit.text(), - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly | + QFileDialog.DontUseNativeDialog)) if directory: self.vcsUrlEdit.setText(Utilities.toNativeSeparators(directory)) @@ -84,7 +85,8 @@ self, self.trUtf8("Select Project Directory"), self.vcsProjectDirEdit.text(), - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly | + QFileDialog.DontUseNativeDialog)) if directory: self.vcsProjectDirEdit.setText(Utilities.toNativeSeparators(directory)) @@ -133,4 +135,4 @@ "tag" : self.vcsTagEdit.text(), "standardLayout" : self.layoutCheckBox.isChecked(), } - return (self.vcsProjectDirEdit.text(), vcsdatadict) \ No newline at end of file + return (self.vcsProjectDirEdit.text(), vcsdatadict)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -62,7 +62,8 @@ self, self.trUtf8("Select Repository-Directory"), self.vcsUrlEdit.text(), - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly | + QFileDialog.DontUseNativeDialog)) if directory: self.vcsUrlEdit.setText(Utilities.toNativeSeparators(directory)) @@ -108,4 +109,4 @@ "message" : self.vcsLogEdit.text(), "standardLayout" : self.layoutCheckBox.isChecked(), } - return vcsdatadict \ No newline at end of file + return vcsdatadict
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -69,7 +69,8 @@ self, self.trUtf8("Working directory"), cwd, - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly) | + QFileDialog.DontUseNativeDialog) if d: self.workdirCombo.setEditText(Utilities.toNativeSeparators(d)) @@ -89,4 +90,4 @@ @return a tuple of argv, workdir """ return (self.commandCombo.currentText(), - self.workdirCombo.currentText()) \ No newline at end of file + self.workdirCombo.currentText())
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -66,14 +66,16 @@ None, self.trUtf8("Select target"), self.targetEdit.text(), - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly | + QFileDialog.DontUseNativeDialog)) else: target = QFileDialog.getSaveFileName( None, self.trUtf8("Select target"), self.targetEdit.text(), "", - QFileDialog.Options(QFileDialog.DontConfirmOverwrite)) + QFileDialog.Options(QFileDialog.DontConfirmOverwrite | + QFileDialog.DontUseNativeDialog)) if target: - self.targetEdit.setText(target) \ No newline at end of file + self.targetEdit.setText(target)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -279,7 +279,8 @@ fname, self.trUtf8("Patch Files (*.diff)"), None, - QFileDialog.Options(QFileDialog.DontConfirmOverwrite)) + QFileDialog.Options(QFileDialog.DontConfirmOverwrite | + QFileDialog.DontUseNativeDialog)) if not fname: return # user aborted @@ -357,4 +358,4 @@ self.intercept = False evt.accept() return - QWidget.keyPressEvent(self, evt) \ No newline at end of file + QWidget.keyPressEvent(self, evt)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -59,7 +59,8 @@ self, self.trUtf8("Select Repository-Directory"), self.vcsUrlEdit.text(), - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly | + QFileDialog.DontUseNativeDialog)) if directory: self.vcsUrlEdit.setText(Utilities.toNativeSeparators(directory)) @@ -84,7 +85,8 @@ self, self.trUtf8("Select Project Directory"), self.vcsProjectDirEdit.text(), - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly | + QFileDialog.DontUseNativeDialog)) if directory: self.vcsProjectDirEdit.setText(Utilities.toNativeSeparators(directory)) @@ -133,4 +135,4 @@ "tag" : self.vcsTagEdit.text(), "standardLayout" : self.layoutCheckBox.isChecked(), } - return (self.vcsProjectDirEdit.text(), vcsdatadict) \ No newline at end of file + return (self.vcsProjectDirEdit.text(), vcsdatadict)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -62,7 +62,8 @@ self, self.trUtf8("Select Repository-Directory"), self.vcsUrlEdit.text(), - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly | + QFileDialog.DontUseNativeDialog)) if directory: self.vcsUrlEdit.setText(Utilities.toNativeSeparators(directory)) @@ -108,4 +109,4 @@ "message" : self.vcsLogEdit.text(), "standardLayout" : self.layoutCheckBox.isChecked(), } - return vcsdatadict \ No newline at end of file + return vcsdatadict
--- a/Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -40,7 +40,8 @@ self, self.trUtf8("Select file for property"), self.propFileEdit.text(), - "") + "", + QFileDialog.DontUseNativeDialog) if fn: self.propFileEdit.setText(Utilities.toNativeSeparators(fn)) @@ -56,4 +57,4 @@ if self.fileRadioButton.isChecked(): return (self.propNameEdit.text(), True, self.propFileEdit.text()) else: - return (self.propNameEdit.text(), False, self.propTextEdit.toPlainText()) \ No newline at end of file + return (self.propNameEdit.text(), False, self.propTextEdit.toPlainText())
--- a/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -64,6 +64,7 @@ options = QFileDialog.Options(QFileDialog.DontResolveSymlinks) else: options = QFileDialog.Options() + options |= QFileDialog.Options(QFileDialog.DontUseNativeDialog) QFileDialog.getOpenFileName( None, self.eCaption.text(), @@ -75,6 +76,7 @@ options = QFileDialog.Options(QFileDialog.DontResolveSymlinks) else: options = QFileDialog.Options() + options |= QFileDialog.Options(QFileDialog.DontUseNativeDialog) QFileDialog.getOpenFileNames( None, self.eCaption.text(), @@ -86,6 +88,7 @@ options = QFileDialog.Options(QFileDialog.DontResolveSymlinks) else: options = QFileDialog.Options() + options |= QFileDialog.Options(QFileDialog.DontUseNativeDialog) QFileDialog.getSaveFileName( None, self.eCaption.text(), @@ -100,6 +103,7 @@ options |= QFileDialog.Options(QFileDialog.ShowDirsOnly) else: options |= QFileDialog.Options(QFileDialog.Option(0)) + options |= QFileDialog.Options(QFileDialog.DontUseNativeDialog) QFileDialog.getExistingDirectory( None, self.eCaption.text(), @@ -284,4 +288,4 @@ @param indString string used for indentation (space or tab) (string) @return generated code (string) """ - return self.__getCode4(indLevel, indString) \ No newline at end of file + return self.__getCode4(indLevel, indString)
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -303,7 +303,8 @@ "", self.trUtf8("RegExp Files (*.rx);;All Files (*)"), None, - QFileDialog.Options(QFileDialog.DontConfirmOverwrite)) + QFileDialog.Options(QFileDialog.DontConfirmOverwrite | + QFileDialog.DontUseNativeDialog)) if fname: ext = QFileInfo(fname).suffix() if not ext: @@ -338,7 +339,8 @@ self, self.trUtf8("Load regular expression"), "", - self.trUtf8("RegExp Files (*.rx);;All Files (*)")) + self.trUtf8("RegExp Files (*.rx);;All Files (*)"), + QFileDialog.DontUseNativeDialog) if fname: try: f=open(Utilities.toNativeSeparators(fname), "r", encoding = "utf-8") @@ -677,4 +679,4 @@ self.resize(size) self.cw.buttonBox.accepted[()].connect(self.close) - self.cw.buttonBox.rejected[()].connect(self.close) \ No newline at end of file + self.cw.buttonBox.rejected[()].connect(self.close)
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -217,7 +217,8 @@ "", self.trUtf8("RegExp Files (*.rx);;All Files (*)"), None, - QFileDialog.Options(QFileDialog.DontConfirmOverwrite)) + QFileDialog.Options(QFileDialog.DontConfirmOverwrite | + QFileDialog.DontUseNativeDialog)) if fname: ext = QFileInfo(fname).suffix() if not ext: @@ -252,7 +253,8 @@ self, self.trUtf8("Load regular expression"), "", - self.trUtf8("RegExp Files (*.rx);;All Files (*)")) + self.trUtf8("RegExp Files (*.rx);;All Files (*)"), + QFileDialog.DontUseNativeDialog) if fname: try: f=open(Utilities.toNativeSeparators(fname), "r", encoding = "utf-8") @@ -525,4 +527,4 @@ self.resize(size) self.cw.buttonBox.accepted[()].connect(self.close) - self.cw.buttonBox.rejected[()].connect(self.close) \ No newline at end of file + self.cw.buttonBox.rejected[()].connect(self.close)
--- a/Preferences/ConfigurationPages/CorbaPage.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Preferences/ConfigurationPages/CorbaPage.py Sat Feb 05 16:32:34 2011 +0100 @@ -50,7 +50,8 @@ self, self.trUtf8("Select IDL compiler"), self.idlEdit.text(), - "") + "", + QFileDialog.DontUseNativeDialog) if file: self.idlEdit.setText(Utilities.toNativeSeparators(file)) @@ -62,4 +63,4 @@ @param dlg reference to the configuration dialog """ page = CorbaPage() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/DebuggerPython3Page.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Preferences/ConfigurationPages/DebuggerPython3Page.py Sat Feb 05 16:32:34 2011 +0100 @@ -87,7 +87,8 @@ self, self.trUtf8("Select Python interpreter for Debug Client"), self.interpreterEdit.text(), - "") + "", + QFileDialog.DontUseNativeDialog) if file: self.interpreterEdit.setText( @@ -102,7 +103,8 @@ None, self.trUtf8("Select Debug Client"), self.debugClientEdit.text(), - self.trUtf8("Python Files (*.py *.py3)")) + self.trUtf8("Python Files (*.py *.py3)"), + QFileDialog.DontUseNativeDialog) if file: self.debugClientEdit.setText( @@ -115,4 +117,4 @@ @param dlg reference to the configuration dialog """ page = DebuggerPython3Page() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/DebuggerPythonPage.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Preferences/ConfigurationPages/DebuggerPythonPage.py Sat Feb 05 16:32:34 2011 +0100 @@ -83,7 +83,8 @@ self, self.trUtf8("Select Python interpreter for Debug Client"), self.interpreterEdit.text(), - "") + "", + QFileDialog.DontUseNativeDialog) if file: self.interpreterEdit.setText( @@ -98,7 +99,8 @@ None, self.trUtf8("Select Debug Client"), self.debugClientEdit.text(), - self.trUtf8("Python Files (*.py *.py2)")) + self.trUtf8("Python Files (*.py *.py2)"), + QFileDialog.DontUseNativeDialog) if file: self.debugClientEdit.setText( @@ -111,4 +113,4 @@ @param dlg reference to the configuration dialog """ page = DebuggerPythonPage() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/DebuggerRubyPage.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Preferences/ConfigurationPages/DebuggerRubyPage.py Sat Feb 05 16:32:34 2011 +0100 @@ -55,7 +55,8 @@ file = QFileDialog.getOpenFileName( self, self.trUtf8("Select Ruby interpreter for Debug Client"), - self.rubyInterpreterEdit.text()) + self.rubyInterpreterEdit.text(), + QFileDialog.DontUseNativeDialog) if file: self.rubyInterpreterEdit.setText( @@ -68,4 +69,4 @@ @param dlg reference to the configuration dialog """ page = DebuggerRubyPage() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/EditorAPIsPage.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Preferences/ConfigurationPages/EditorAPIsPage.py Sat Feb 05 16:32:34 2011 +0100 @@ -129,7 +129,8 @@ self, self.trUtf8("Select API file"), self.apiFileEdit.text(), - self.trUtf8("API File (*.api);;All Files (*)")) + self.trUtf8("API File (*.api);;All Files (*)"), + QFileDialog.DontUseNativeDialog) if file: self.apiFileEdit.setText(Utilities.toNativeSeparators(file)) @@ -258,4 +259,4 @@ @param dlg reference to the configuration dialog """ page = EditorAPIsPage() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py Sat Feb 05 16:32:34 2011 +0100 @@ -369,7 +369,8 @@ "", self.trUtf8("Highlighting styles file (*.e4h)"), "", - QFileDialog.Options(QFileDialog.DontConfirmOverwrite)) + QFileDialog.Options(QFileDialog.DontConfirmOverwrite | + QFileDialog.DontUseNativeDialog)) if not fn: return @@ -402,7 +403,8 @@ self, self.trUtf8("Import Highlighting Styles"), "", - self.trUtf8("Highlighting styles file (*.e4h)")) + self.trUtf8("Highlighting styles file (*.e4h)"), + QFileDialog.DontUseNativeDialog) if not fn: return
--- a/Preferences/ConfigurationPages/EditorSpellCheckingPage.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Preferences/ConfigurationPages/EditorSpellCheckingPage.py Sat Feb 05 16:32:34 2011 +0100 @@ -114,7 +114,8 @@ self, self.trUtf8("Select personal word list"), self.pwlEdit.text(), - self.trUtf8("Dictionary File (*.dic);;All Files (*)")) + self.trUtf8("Dictionary File (*.dic);;All Files (*)"), + QFileDialog.DontUseNativeDialog) if file: self.pwlEdit.setText(Utilities.toNativeSeparators(file)) @@ -128,7 +129,8 @@ self, self.trUtf8("Select personal exclude list"), self.pelEdit.text(), - self.trUtf8("Dictionary File (*.dic);;All Files (*)")) + self.trUtf8("Dictionary File (*.dic);;All Files (*)"), + QFileDialog.DontUseNativeDialog) if file: self.pelEdit.setText(Utilities.toNativeSeparators(file)) @@ -140,4 +142,4 @@ @param dlg reference to the configuration dialog """ page = EditorSpellCheckingPage() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/HelpAppearancePage.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Preferences/ConfigurationPages/HelpAppearancePage.py Sat Feb 05 16:32:34 2011 +0100 @@ -104,7 +104,8 @@ self, self.trUtf8("Select Style Sheet"), self.styleSheetEdit.text(), - "") + "", + QFileDialog.DontUseNativeDialog) if file: self.styleSheetEdit.setText(Utilities.toNativeSeparators(file)) @@ -116,4 +117,4 @@ @param dlg reference to the configuration dialog """ page = HelpAppearancePage() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/HelpDocumentationPage.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Preferences/ConfigurationPages/HelpDocumentationPage.py Sat Feb 05 16:32:34 2011 +0100 @@ -81,7 +81,8 @@ QUrl(self.python2DocDirEdit.text()).path(), self.trUtf8("HTML Files (*.html *.htm);;" "Compressed Help Files (*.chm);;" - "All Files (*)")) + "All Files (*)"), + QFileDialog.DontUseNativeDialog) if entry: self.python2DocDirEdit.setText(Utilities.toNativeSeparators(entry)) @@ -97,7 +98,8 @@ QUrl(self.pythonDocDirEdit.text()).path(), self.trUtf8("HTML Files (*.html *.htm);;" "Compressed Help Files (*.chm);;" - "All Files (*)")) + "All Files (*)"), + QFileDialog.DontUseNativeDialog) if entry: self.pythonDocDirEdit.setText(Utilities.toNativeSeparators(entry)) @@ -111,7 +113,8 @@ self, self.trUtf8("Select Qt4 documentation entry"), QUrl(self.qt4DocDirEdit.text()).path(), - self.trUtf8("HTML Files (*.html *.htm);;All Files (*)")) + self.trUtf8("HTML Files (*.html *.htm);;All Files (*)"), + QFileDialog.DontUseNativeDialog) if entry: self.qt4DocDirEdit.setText(Utilities.toNativeSeparators(entry)) @@ -125,7 +128,8 @@ self, self.trUtf8("Select PyQt4 documentation entry"), QUrl(self.pyqt4DocDirEdit.text()).path(), - self.trUtf8("HTML Files (*.html *.htm);;All Files (*)")) + self.trUtf8("HTML Files (*.html *.htm);;All Files (*)"), + QFileDialog.DontUseNativeDialog) if entry: self.pyqt4DocDirEdit.setText(Utilities.toNativeSeparators(entry)) @@ -139,7 +143,8 @@ self, self.trUtf8("Select PySide documentation entry"), QUrl(self.pysideDocDirEdit.text()).path(), - self.trUtf8("HTML Files (*.html *.htm);;All Files (*)")) + self.trUtf8("HTML Files (*.html *.htm);;All Files (*)"), + QFileDialog.DontUseNativeDialog) if entry: self.pysideDocDirEdit.setText(Utilities.toNativeSeparators(entry))
--- a/Preferences/ConfigurationPages/HelpViewersPage.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Preferences/ConfigurationPages/HelpViewersPage.py Sat Feb 05 16:32:34 2011 +0100 @@ -76,7 +76,8 @@ self, self.trUtf8("Select Custom Viewer"), self.customViewerEdit.text(), - "") + "", + QFileDialog.DontUseNativeDialog) if file: self.customViewerEdit.setText(Utilities.toNativeSeparators(file)) @@ -90,7 +91,8 @@ self, self.trUtf8("Select Web-Browser"), self.webbrowserEdit.text(), - "") + "", + QFileDialog.DontUseNativeDialog) if file: self.webbrowserEdit.setText(Utilities.toNativeSeparators(file)) @@ -104,7 +106,8 @@ self, self.trUtf8("Select PDF-Viewer"), self.pdfviewerEdit.text(), - "") + "", + QFileDialog.DontUseNativeDialog) if file: self.pdfviewerEdit.setText(Utilities.toNativeSeparators(file)) @@ -118,7 +121,8 @@ self, self.trUtf8("Select CHM-Viewer"), self.chmviewerEdit.text(), - "") + "", + QFileDialog.DontUseNativeDialog) if file: self.chmviewerEdit.setText(Utilities.toNativeSeparators(file)) @@ -130,4 +134,4 @@ @param dlg reference to the configuration dialog """ page = HelpViewersPage() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/IconsPage.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Preferences/ConfigurationPages/IconsPage.py Sat Feb 05 16:32:34 2011 +0100 @@ -125,7 +125,8 @@ None, self.trUtf8("Select icon directory"), "", - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly | + QFileDialog.DontUseNativeDialog)) if dir: self.iconDirectoryEdit.setText(Utilities.toNativeSeparators(dir)) @@ -174,4 +175,4 @@ @param dlg reference to the configuration dialog """ page = IconsPage() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/InterfacePage.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Preferences/ConfigurationPages/InterfacePage.py Sat Feb 05 16:32:34 2011 +0100 @@ -252,7 +252,8 @@ self.trUtf8("Select style sheet file"), self.styleSheetEdit.text(), self.trUtf8("Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;" - "All files (*)")) + "All files (*)"), + QFileDialog.DontUseNativeDialog) if file: self.styleSheetEdit.setText(Utilities.toNativeSeparators(file)) @@ -280,4 +281,4 @@ @param dlg reference to the configuration dialog """ page = InterfacePage() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/NetworkPage.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Preferences/ConfigurationPages/NetworkPage.py Sat Feb 05 16:32:34 2011 +0100 @@ -113,7 +113,8 @@ self, self.trUtf8("Select download directory"), self.downloadDirEdit.text(), - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly | + QFileDialog.DontUseNativeDialog)) if directory: dn = Utilities.toNativeSeparators(directory)
--- a/Preferences/ConfigurationPages/PluginManagerPage.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Preferences/ConfigurationPages/PluginManagerPage.py Sat Feb 05 16:32:34 2011 +0100 @@ -58,7 +58,8 @@ self, self.trUtf8("Select plugins download directory"), self.downloadDirEdit.text(), - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly | + QFileDialog.DontUseNativeDialog)) if directory: dn = Utilities.toNativeSeparators(directory) @@ -73,4 +74,4 @@ @param dlg reference to the configuration dialog """ page = PluginManagerPage() - return page \ No newline at end of file + return page
--- a/Preferences/ConfigurationPages/QtPage.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Preferences/ConfigurationPages/QtPage.py Sat Feb 05 16:32:34 2011 +0100 @@ -63,7 +63,8 @@ self, self.trUtf8("Select Qt4 Directory"), self.qt4Edit.text(), - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly | + QFileDialog.DontUseNativeDialog)) if dir: self.qt4Edit.setText(Utilities.toNativeSeparators(dir)) @@ -77,7 +78,8 @@ self, self.trUtf8("Select Qt4 Translations Directory"), self.qt4TransEdit.text(), - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly | + QFileDialog.DontUseNativeDialog)) if dir: self.qt4TransEdit.setText(Utilities.toNativeSeparators(dir)) @@ -115,4 +117,4 @@ @param dlg reference to the configuration dialog """ page = QtPage() - return page \ No newline at end of file + return page
--- a/Preferences/ToolConfigurationDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Preferences/ToolConfigurationDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -251,7 +251,8 @@ self, self.trUtf8("Select executable"), self.executableEdit.text(), - "") + "", + QFileDialog.DontUseNativeDialog) if execfile: execfile = Utilities.toNativeSeparators(execfile) if not Utilities.isinpath(execfile): @@ -272,7 +273,8 @@ self, self.trUtf8("Select icon file"), self.iconEdit.text(), - self.trUtf8("Icon files (*.png)")) + self.trUtf8("Icon files (*.png)"), + QFileDialog.DontUseNativeDialog) if icon: self.iconEdit.setText(icon) @@ -388,4 +390,4 @@ """ tmp = self.toollist[itm1] self.toollist[itm1] = self.toollist[itm2] - self.toollist[itm2] = tmp \ No newline at end of file + self.toollist[itm2] = tmp
--- a/Preferences/__init__.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Preferences/__init__.py Sat Feb 05 16:32:34 2011 +0100 @@ -899,7 +899,8 @@ QtCore.QCoreApplication.translate("Preferences", "Properties File (*.ini);;All Files (*)"), None, - QtGui.QFileDialog.Options(QtGui.QFileDialog.DontConfirmOverwrite)) + QtGui.QFileDialog.Options(QtGui.QFileDialog.DontConfirmOverwrite | + QtGui.QFileDialog.DontUseNativeDialog)) if filename: ext = QtCore.QFileInfo(filename).suffix() if not ext: @@ -923,7 +924,8 @@ QtCore.QCoreApplication.translate("Preferences", "Import Preferences"), "", QtCore.QCoreApplication.translate("Preferences", - "Properties File (*.ini);;All Files (*)")) + "Properties File (*.ini);;All Files (*)"), + QtGui.QFileDialog.DontUseNativeDialog) if filename: settingsFile = prefClass.settings.fileName() shutil.copy(filename, settingsFile)
--- a/Project/AddDirectoryDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Project/AddDirectoryDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -95,7 +95,8 @@ self, self.trUtf8("Select directory"), startdir, - QFileDialog.Options(QFileDialog.Option(0))) + QFileDialog.Options(QFileDialog.Option( + QFileDialog.DontUseNativeDialog))) if directory: textEdit.setText(Utilities.toNativeSeparators(directory)) @@ -141,4 +142,4 @@ self.filterComboBox.itemData(self.filterComboBox.currentIndex()) return (filetype, self.sourceDirEdit.text(), self.targetDirEdit.text(), - self.recursiveCheckBox.isChecked()) \ No newline at end of file + self.recursiveCheckBox.isChecked())
--- a/Project/AddFileDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Project/AddFileDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -61,7 +61,8 @@ self, self.trUtf8("Select target directory"), startdir, - QFileDialog.Options(QFileDialog.Option(0))) + QFileDialog.Options(QFileDialog.Option( + QFileDialog.DontUseNativeDialog))) if directory: self.targetDirEdit.setText(Utilities.toNativeSeparators(directory)) @@ -147,7 +148,8 @@ else: return - fnames = QFileDialog.getOpenFileNames(self, caption, dir, dfilter) + fnames = QFileDialog.getOpenFileNames(self, caption, dir, dfilter, + QFileDialog.DontUseNativeDialog) if len(fnames): self.sourceFileEdit.setText(Utilities.toNativeSeparators( @@ -182,4 +184,4 @@ the files shall be added as source code """ return (self.sourceFileEdit.text().split(os.pathsep), - self.targetDirEdit.text(), self.sourcecodeCheckBox.isChecked()) \ No newline at end of file + self.targetDirEdit.text(), self.sourcecodeCheckBox.isChecked())
--- a/Project/DebuggerPropertiesDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Project/DebuggerPropertiesDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -101,7 +101,8 @@ self, self.trUtf8("Select interpreter for Debug Client"), self.interpreterEdit.text(), - "") + "", + QFileDialog.DontUseNativeDialog) if file: self.interpreterEdit.setText(Utilities.toNativeSeparators(file)) @@ -117,7 +118,8 @@ self, self.trUtf8("Select Debug Client"), self.debugClientEdit.text(), - filters) + filters, + QFileDialog.DontUseNativeDialog) if file: self.debugClientEdit.setText(Utilities.toNativeSeparators(file))
--- a/Project/NewDialogClassDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Project/NewDialogClassDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -50,7 +50,8 @@ self, self.trUtf8("Select source directory"), QDir.fromNativeSeparators(self.pathnameEdit.text()), - QFileDialog.Options(QFileDialog.Option(0))) + QFileDialog.Options(QFileDialog.Option( + QFileDialog.DontUseNativeDialog))) if path: self.pathnameEdit.setText(QDir.toNativeSeparators(path)) @@ -95,4 +96,4 @@ """ return self.classnameEdit.text(), \ os.path.join(self.pathnameEdit.text(), \ - self.filenameEdit.text()) \ No newline at end of file + self.filenameEdit.text())
--- a/Project/Project.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Project/Project.py Sat Feb 05 16:32:34 2011 +0100 @@ -1525,7 +1525,8 @@ self.trUtf8("Rename file"), os.path.dirname(oldfn), "", - QFileDialog.Options(QFileDialog.DontConfirmOverwrite)) + QFileDialog.Options(QFileDialog.DontConfirmOverwrite | + QFileDialog.DontUseNativeDialog)) if not newfn: return False newfn = Utilities.toNativeSeparators(newfn) @@ -2225,7 +2226,8 @@ self.parent(), self.trUtf8("Open project"), "", - self.trUtf8("Project Files (*.e4p)")) + self.trUtf8("Project Files (*.e4p)"), + QFileDialog.DontUseNativeDialog) QApplication.processEvents() @@ -2388,7 +2390,8 @@ self.ppath, self.trUtf8("Project Files (*.e4p)"), defaultFilter, - QFileDialog.Options(QFileDialog.DontConfirmOverwrite)) + QFileDialog.Options(QFileDialog.DontConfirmOverwrite | + QFileDialog.DontUseNativeDialog)) if fn: ext = QFileInfo(fn).suffix()
--- a/Project/ProjectFormsBrowser.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Project/ProjectFormsBrowser.py Sat Feb 05 16:32:34 2011 +0100 @@ -498,7 +498,8 @@ path, self.trUtf8("Qt User-Interface Files (*.ui);;All Files (*)"), "", - QFileDialog.Options(QFileDialog.DontConfirmOverwrite)) + QFileDialog.Options(QFileDialog.DontConfirmOverwrite | + QFileDialog.DontUseNativeDialog)) if not fname: # user aborted or didn't enter a filename
--- a/Project/ProjectResourcesBrowser.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Project/ProjectResourcesBrowser.py Sat Feb 05 16:32:34 2011 +0100 @@ -392,7 +392,8 @@ path, self.trUtf8("Qt Resource Files (*.qrc)"), "", - QFileDialog.Options(QFileDialog.DontConfirmOverwrite)) + QFileDialog.Options(QFileDialog.DontConfirmOverwrite | + QFileDialog.DontUseNativeDialog)) if not fname: # user aborted or didn't enter a filename
--- a/Project/PropertiesDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Project/PropertiesDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -135,7 +135,8 @@ self, self.trUtf8("Select project directory"), self.dirEdit.text(), - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly | + QFileDialog.DontUseNativeDialog)) if directory: self.dirEdit.setText(Utilities.toNativeSeparators(directory)) @@ -184,7 +185,8 @@ self, self.trUtf8("Select main script file"), dir, - filters) + filters, + QFileDialog.DontUseNativeDialog) if fn: ppath = self.dirEdit.text()
--- a/Project/SpellingPropertiesDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Project/SpellingPropertiesDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -75,7 +75,8 @@ self, self.trUtf8("Select project word list"), pwl, - self.trUtf8("Dictionary File (*.dic);;All Files (*)")) + self.trUtf8("Dictionary File (*.dic);;All Files (*)"), + QFileDialog.DontUseNativeDialog) if file: self.pwlEdit.setText(Utilities.toNativeSeparators(file)) @@ -92,7 +93,8 @@ self, self.trUtf8("Select project exclude list"), pel, - self.trUtf8("Dictionary File (*.dic);;All Files (*)")) + self.trUtf8("Dictionary File (*.dic);;All Files (*)"), + QFileDialog.DontUseNativeDialog) if file: self.pelEdit.setText(Utilities.toNativeSeparators(file)) @@ -110,4 +112,4 @@ self.project.pdata["SPELLWORDS"] = \ [self.project.getRelativePath(self.pwlEdit.text())] self.project.pdata["SPELLEXCLUDES"] = \ - [self.project.getRelativePath(self.pelEdit.text())] \ No newline at end of file + [self.project.getRelativePath(self.pelEdit.text())]
--- a/Project/TranslationPropertiesDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Project/TranslationPropertiesDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -94,7 +94,8 @@ self, self.trUtf8("Select translation file"), tp, - "") + "", + QFileDialog.DontUseNativeDialog) if tsfile: self.transPatternEdit.setText(Utilities.toNativeSeparators(tsfile)) @@ -118,7 +119,8 @@ self, self.trUtf8("Select directory for binary translations"), self.transBinPathEdit.text(), - QFileDialog.Options(QFileDialog.Option(0))) + QFileDialog.Options(QFileDialog.Option( + QFileDialog.DontUseNativeDialog))) if directory: self.transBinPathEdit.setText(Utilities.toNativeSeparators(directory)) @@ -161,7 +163,8 @@ self, self.trUtf8("Exempt file from translation"), self.project.ppath, - self.filters) + self.filters, + QFileDialog.DontUseNativeDialog) if texcept: self.exceptionEdit.setText(Utilities.toNativeSeparators(texcept)) @@ -174,7 +177,8 @@ self, self.trUtf8("Exempt directory from translation"), self.project.ppath, - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly | + QFileDialog.DontUseNativeDialog)) if texcept: self.exceptionEdit.setText(Utilities.toNativeSeparators(texcept)) @@ -217,4 +221,4 @@ exceptList = [] for i in range(self.exceptionsList.count()): exceptList.append(self.exceptionsList.item(i).text()) - self.project.pdata["TRANSLATIONEXCEPTIONS"] = exceptList[:] \ No newline at end of file + self.project.pdata["TRANSLATIONEXCEPTIONS"] = exceptList[:]
--- a/PyUnit/UnittestDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/PyUnit/UnittestDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -164,7 +164,8 @@ self, "", self.testsuiteComboBox.currentText(), - filter) + filter, + QFileDialog.DontUseNativeDialog) if not prog: return
--- a/QScintilla/Editor.py Sat Feb 05 14:21:37 2011 +0100 +++ b/QScintilla/Editor.py Sat Feb 05 16:32:34 2011 +0100 @@ -2469,7 +2469,8 @@ path, Lexers.getSaveFileFiltersList(True, True), defaultFilter, - QFileDialog.Options(QFileDialog.DontConfirmOverwrite)) + QFileDialog.Options(QFileDialog.DontConfirmOverwrite | + QFileDialog.DontUseNativeDialog)) if fn: if fn.endswith("."): @@ -4819,7 +4820,8 @@ self, self.trUtf8("Load macro file"), configDir, - self.trUtf8("Macro files (*.macro)")) + self.trUtf8("Macro files (*.macro)"), + QFileDialog.DontUseNativeDialog) if not fname: return # user aborted @@ -4861,7 +4863,8 @@ configDir, self.trUtf8("Macro files (*.macro)"), "", - QFileDialog.Options(QFileDialog.DontConfirmOverwrite)) + QFileDialog.Options(QFileDialog.DontConfirmOverwrite | + QFileDialog.DontUseNativeDialog)) if not fname: return # user aborted @@ -5292,7 +5295,8 @@ self, self.trUtf8("Add file resource"), dirStr, - "") + "", + QFileDialog.DontUseNativeDialog) if file: relFile = QDir(dirStr).relativeFilePath(file) line, index = self.getCursorPosition() @@ -5308,7 +5312,8 @@ self, self.trUtf8("Add file resources"), dirStr, - "") + "", + QFileDialog.DontUseNativeDialog) if files: myDir = QDir(dirStr) filesText = "" @@ -5328,7 +5333,8 @@ self, self.trUtf8("Add aliased file resource"), dirStr, - "") + "", + QFileDialog.DontUseNativeDialog) if file: relFile = QDir(dirStr).relativeFilePath(file) alias, ok = QInputDialog.getText(
--- a/QScintilla/Exporters/ExporterBase.py Sat Feb 05 14:21:37 2011 +0100 +++ b/QScintilla/Exporters/ExporterBase.py Sat Feb 05 16:32:34 2011 +0100 @@ -44,7 +44,8 @@ "", filter_, "", - QFileDialog.Options(QFileDialog.DontConfirmOverwrite)) + QFileDialog.Options(QFileDialog.DontConfirmOverwrite | + QFileDialog.DontUseNativeDialog)) if fn: ext = QFileInfo(fn).suffix() @@ -71,4 +72,4 @@ This method must be overridden by the real exporters. """ - raise NotImplementedError \ No newline at end of file + raise NotImplementedError
--- a/QScintilla/MiniEditor.py Sat Feb 05 14:21:37 2011 +0100 +++ b/QScintilla/MiniEditor.py Sat Feb 05 16:32:34 2011 +0100 @@ -202,7 +202,8 @@ Private slot to open a file. """ if self.__maybeSave(): - fileName = QFileDialog.getOpenFileName(self) + fileName = QFileDialog.getOpenFileName(self, + options = QFileDialog.DontUseNativeDialog) if fileName: self.__loadFile(fileName) self.__checkActions() @@ -220,7 +221,8 @@ """ Private slot to save a file with a new name. """ - fileName = QFileDialog.getSaveFileName(self) + fileName = QFileDialog.getSaveFileName(self, + options = QFileDialog.DontUseNativeDialog) if not fileName: return False
--- a/SqlBrowser/SqlConnectionDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/SqlBrowser/SqlConnectionDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -91,7 +91,8 @@ self, self.trUtf8("Select Database File"), startdir, - self.trUtf8("All Files (*)")) + self.trUtf8("All Files (*)"), + QFileDialog.DontUseNativeDialog) if dbFile: self.databaseEdit.setText(Utilities.toNativeSeparators(dbFile))
--- a/Templates/TemplateViewer.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Templates/TemplateViewer.py Sat Feb 05 16:32:34 2011 +0100 @@ -524,7 +524,8 @@ self, self.trUtf8("Import Templates"), "", - self.trUtf8("Templates Files (*.e4c);; All Files (*)")) + self.trUtf8("Templates Files (*.e4c);; All Files (*)"), + QFileDialog.DontUseNativeDialog) if fn: self.readTemplates(fn) @@ -539,7 +540,8 @@ "", self.trUtf8("Templates Files (*.e4c);; All Files (*)"), "", - QFileDialog.Options(QFileDialog.DontConfirmOverwrite)) + QFileDialog.Options(QFileDialog.DontConfirmOverwrite | + QFileDialog.DontUseNativeDialog)) if fn: ext = QFileInfo(fn).suffix()
--- a/Tools/TRPreviewer.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Tools/TRPreviewer.py Sat Feb 05 16:32:34 2011 +0100 @@ -342,7 +342,8 @@ None, self.trUtf8("Select UI files"), "", - self.trUtf8("Qt User-Interface Files (*.ui)")) + self.trUtf8("Qt User-Interface Files (*.ui)"), + QFileDialog.DontUseNativeDialog) for fileName in fileNameList: self.preview.loadWidget(fileName) @@ -357,7 +358,8 @@ None, self.trUtf8("Select translation files"), "", - self.trUtf8("Qt Translation Files (*.qm)")) + self.trUtf8("Qt Translation Files (*.qm)"), + QFileDialog.DontUseNativeDialog) first = True for fileName in fileNameList:
--- a/Tools/UIPreviewer.py Sat Feb 05 14:21:37 2011 +0100 +++ b/Tools/UIPreviewer.py Sat Feb 05 16:32:34 2011 +0100 @@ -293,7 +293,8 @@ self, self.trUtf8("Select UI file"), self.currentFile, - self.trUtf8("Qt User-Interface Files (*.ui)")) + self.trUtf8("Qt User-Interface Files (*.ui)"), + QFileDialog.DontUseNativeDialog) if fn: self.__loadFile(fn) @@ -429,7 +430,8 @@ self, self.trUtf8("Save Image"), "", - filter) + filter, + QFileDialog.DontUseNativeDialog) if not fname: return @@ -550,4 +552,4 @@ p.drawImage(marginX, marginY, img.scaled(width, height, Qt.KeepAspectRatio, Qt.SmoothTransformation)) - p.end() \ No newline at end of file + p.end()
--- a/UI/Browser.py Sat Feb 05 14:21:37 2011 +0100 +++ b/UI/Browser.py Sat Feb 05 16:32:34 2011 +0100 @@ -416,7 +416,8 @@ None, QApplication.translate('Browser', "New toplevel directory"), "", - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly | + QFileDialog.DontUseNativeDialog)) if dname: dname = os.path.abspath(Utilities.toNativeSeparators(dname)) self.__model.addTopLevelDir(dname)
--- a/UI/CompareDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/UI/CompareDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -385,7 +385,8 @@ self, self.trUtf8("Select file to compare"), lineEdit.text(), - "") + "", + QFileDialog.DontUseNativeDialog) if filename: lineEdit.setText(Utilities.toNativeSeparators(filename)) @@ -450,4 +451,4 @@ QApplication.exit() return True - return False \ No newline at end of file + return False
--- a/UI/DiffDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/UI/DiffDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -275,7 +275,8 @@ fname, self.trUtf8("Patch Files (*.diff)"), None, - QFileDialog.Options(QFileDialog.DontConfirmOverwrite)) + QFileDialog.Options(QFileDialog.DontConfirmOverwrite | + QFileDialog.DontUseNativeDialog)) if not fname: return @@ -461,7 +462,8 @@ self, self.trUtf8("Select file to compare"), lineEdit.text(), - "") + "", + QFileDialog.DontUseNativeDialog) if filename: lineEdit.setText(Utilities.toNativeSeparators(filename))
--- a/UI/EmailDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/UI/EmailDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -317,7 +317,8 @@ """ fname = QFileDialog.getOpenFileName( self, - self.trUtf8("Attach file")) + self.trUtf8("Attach file"), + options = QFileDialog.DontUseNativeDialog) if fname: self.attachFile(fname, False) @@ -368,4 +369,4 @@ """ self.sendButton.setEnabled( self.subject.text() != "" and \ - self.message.toPlainText() != "") \ No newline at end of file + self.message.toPlainText() != "")
--- a/UI/FindFileDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/UI/FindFileDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -534,7 +534,8 @@ self, self.trUtf8("Select directory"), self.dirCombo.currentText(), - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly | + QFileDialog.DontUseNativeDialog)) if directory: self.dirCombo.setEditText(Utilities.toNativeSeparators(directory))
--- a/UI/FindFileNameDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/UI/FindFileNameDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -184,7 +184,8 @@ None, self.trUtf8("Select search directory"), self.searchDirEdit.text(), - QFileDialog.Options(QFileDialog.ShowDirsOnly)) + QFileDialog.Options(QFileDialog.ShowDirsOnly | + QFileDialog.DontUseNativeDialog)) if searchDir: self.searchDirEdit.setText(Utilities.toNativeSeparators(searchDir)) @@ -240,4 +241,4 @@ self.fileNameEdit.selectAll() self.fileNameEdit.setFocus() - QWidget.show(self) \ No newline at end of file + QWidget.show(self)
--- a/UI/UserInterface.py Sat Feb 05 14:21:37 2011 +0100 +++ b/UI/UserInterface.py Sat Feb 05 16:32:34 2011 +0100 @@ -4994,7 +4994,8 @@ "", self.trUtf8("Keyboard shortcut file (*.e4k)"), "", - QFileDialog.Options(QFileDialog.DontConfirmOverwrite)) + QFileDialog.Options(QFileDialog.DontConfirmOverwrite | + QFileDialog.DontUseNativeDialog)) if not fn: return @@ -5015,7 +5016,8 @@ None, self.trUtf8("Import Keyboard Shortcuts"), "", - self.trUtf8("Keyboard shortcut file (*.e4k)")) + self.trUtf8("Keyboard shortcut file (*.e4k)"), + QFileDialog.DontUseNativeDialog) if fn: Shortcuts.importShortcuts(fn)
--- a/ViewManager/BookmarkedFilesDialog.py Sat Feb 05 14:21:37 2011 +0100 +++ b/ViewManager/BookmarkedFilesDialog.py Sat Feb 05 16:32:34 2011 +0100 @@ -163,7 +163,8 @@ """ Private slot to handle the file selection via a file selection dialog. """ - bookmark = QFileDialog.getOpenFileName() + bookmark = QFileDialog.getOpenFileName( + options = QFileDialog.DontUseNativeDialog) if bookmark: bookmark = Utilities.toNativeSeparators(bookmark) self.fileEdit.setText(bookmark) @@ -185,4 +186,4 @@ """ tmp = self.bookmarks[itm1] self.bookmarks[itm1] = self.bookmarks[itm2] - self.bookmarks[itm2] = tmp \ No newline at end of file + self.bookmarks[itm2] = tmp
--- a/ViewManager/ViewManager.py Sat Feb 05 14:21:37 2011 +0100 +++ b/ViewManager/ViewManager.py Sat Feb 05 16:32:34 2011 +0100 @@ -2947,7 +2947,8 @@ QApplication.translate('ViewManager', "Open files"), self._getOpenStartDir(), QScintilla.Lexers.getOpenFileFiltersList(True, True), - filter + filter, + QFileDialog.DontUseNativeDialog )[0] else: progs = [prog]