diff -r 9986ec0e559a -r 10516539f238 Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py Tue Oct 15 22:03:54 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py Fri Oct 18 23:00:41 2013 +0200
@@ -40,13 +40,20 @@
self.archiveEdit.setCompleter(self.__activeCompleter)
self.__activeCompleter.model().setNameFilters([])
- self.typeComboBox.addItem(self.trUtf8("Detect Automatically"), "")
- self.typeComboBox.addItem(self.trUtf8("Directory of Files"), "files")
- self.typeComboBox.addItem(self.trUtf8("Uncompressed TAR-Archive"), "tar")
- self.typeComboBox.addItem(self.trUtf8("Bzip2 compressed TAR-Archive"), "tbz2")
- self.typeComboBox.addItem(self.trUtf8("Gzip compressed TAR-Archive"), "tgz")
- self.typeComboBox.addItem(self.trUtf8("Uncompressed ZIP-Archive"), "uzip")
- self.typeComboBox.addItem(self.trUtf8("Compressed ZIP-Archive"), "zip")
+ self.typeComboBox.addItem(
+ self.trUtf8("Detect Automatically"), "")
+ self.typeComboBox.addItem(
+ self.trUtf8("Directory of Files"), "files")
+ self.typeComboBox.addItem(
+ self.trUtf8("Uncompressed TAR-Archive"), "tar")
+ self.typeComboBox.addItem(
+ self.trUtf8("Bzip2 compressed TAR-Archive"), "tbz2")
+ self.typeComboBox.addItem(
+ self.trUtf8("Gzip compressed TAR-Archive"), "tgz")
+ self.typeComboBox.addItem(
+ self.trUtf8("Uncompressed ZIP-Archive"), "uzip")
+ self.typeComboBox.addItem(
+ self.trUtf8("Compressed ZIP-Archive"), "zip")
self.__unixFileFilters = [
self.trUtf8("Bzip2 compressed TAR-Archive (*.tar.bz2)"),
@@ -84,6 +91,8 @@
def on_archiveEdit_textChanged(self, archive):
"""
Private slot to handle changes of the archive name.
+
+ @param archive name of the archive (string)
"""
self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(archive != "")
@@ -139,7 +148,8 @@
self.__activeCompleter = self.__archiveFileCompleter
self.archiveEdit.setCompleter(self.__activeCompleter)
if type_ in self.__typeFilters:
- self.__activeCompleter.model().setNameFilters(self.__typeFilters[type_])
+ self.__activeCompleter.model().setNameFilters(
+ self.__typeFilters[type_])
else:
self.__activeCompleter.model().setNameFilters([])
@@ -147,9 +157,9 @@
"""
Public method to retrieve the data.
- @return tuple giving the archive name (string), the archive type (string),
- the directory prefix 8string) and a flag indicating to recurse into
- subrepositories (boolean)
+ @return tuple giving the archive name (string), the archive type
+ (string), the directory prefix 8string) and a flag indicating
+ to recurse into subrepositories (boolean)
"""
return (
self.archiveEdit.text(),
