diff -r 50a03ff54b15 -r 8bc23ecb4ea3 Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py Fri Oct 21 23:14:16 2016 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py Sat Oct 22 17:09:08 2016 +0200
@@ -9,15 +9,25 @@
from __future__ import unicode_literals
-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog
+import os
+
+from PyQt5.QtCore import pyqtSlot, Qt, QEvent
+from PyQt5.QtWidgets import QDialog, QTreeWidgetItem
+from E5Gui.E5PathPicker import E5PathPickerModes
+from E5Gui import E5MessageBox
+
+import Globals
from Globals.E5ConfigParser import E5ConfigParser
from .HgUtilities import getConfigPath
+from .HgUserConfigHostFingerprintDialog import \
+ HgUserConfigHostFingerprintDialog
from .Ui_HgUserConfigDialog import Ui_HgUserConfigDialog
+import UI.PixmapCache
+
class HgUserConfigDialog(QDialog, Ui_HgUserConfigDialog):
"""
@@ -33,11 +43,29 @@
super(HgUserConfigDialog, self).__init__(parent)
self.setupUi(self)
- msh = self.minimumSizeHint()
- self.resize(max(self.width(), msh.width()), msh.height())
+ self.lfUserCachePicker.setMode(E5PathPickerModes.DirectoryMode)
+ if Globals.isLinuxPlatform():
+ self.lfUserCachePicker.setDefaultDirectory(os.path.expanduser(
+ "~/.cache/largefiles"))
+ elif Globals.isMacPlatform():
+ self.lfUserCachePicker.setDefaultDirectory(os.path.expanduser(
+ "~/Library/Caches/largefiles"))
+ else:
+ self.lfUserCachePicker.setDefaultDirectory(os.path.expanduser(
+ "~\\AppData\\Local\\largefiles"))
+
+ self.fpAddButton.setIcon(UI.PixmapCache.getIcon("plus.png"))
+ self.fpDeleteButton.setIcon(UI.PixmapCache.getIcon("minus.png"))
+ self.fpEditButton.setIcon(UI.PixmapCache.getIcon("edit.png"))
+
+ self.tabWidget.setCurrentIndex(0)
+
+ self.__editor = None
self.__config = None
self.readUserConfig()
+
+ self.__updateFingerprintsButtons()
def writeUserConfig(self):
"""
@@ -46,33 +74,112 @@
if self.__config is None:
self.__config = E5ConfigParser()
- self.__config["ui"] = {
- "username": "{0} <{1}>".format(
- self.userNameEdit.text(),
- self.emailEdit.text(),
- )
- }
- self.__config["extensions"] = {}
+ ###################################################################
+ ## ui section
+ ###################################################################
+ if "ui" not in self.__config:
+ self.__config["ui"] = {}
+ self.__config["ui"]["username"] = "{0} <{1}>".format(
+ self.userNameEdit.text(),
+ self.emailEdit.text(),
+ )
+ ###################################################################
+ ## extensions section
+ ###################################################################
+ if "extensions" not in self.__config:
+ self.__config["extensions"] = {}
if self.fetchCheckBox.isChecked():
self.__config["extensions"]["fetch"] = ""
+ else:
+ if "fetch" in self.__config["extensions"]:
+ del self.__config["extensions"]["fetch"]
+ self.__config["extensions"]["#fetch"] = ""
+
if self.gpgCheckBox.isChecked():
self.__config["extensions"]["gpg"] = ""
+ else:
+ if "gpg" in self.__config["extensions"]:
+ del self.__config["extensions"]["gpg"]
+ self.__config["extensions"]["#gpg"] = ""
+
if self.purgeCheckBox.isChecked():
self.__config["extensions"]["purge"] = ""
+ else:
+ if "purge" in self.__config["extensions"]:
+ del self.__config["extensions"]["purge"]
+ self.__config["extensions"]["#purge"] = ""
+
if self.queuesCheckBox.isChecked():
self.__config["extensions"]["mq"] = ""
+ else:
+ if "mq" in self.__config["extensions"]:
+ del self.__config["extensions"]["mq"]
+ self.__config["extensions"]["#mq"] = ""
+
if self.rebaseCheckBox.isChecked():
self.__config["extensions"]["rebase"] = ""
+ else:
+ if "rebase" in self.__config["extensions"]:
+ del self.__config["extensions"]["rebase"]
+ self.__config["extensions"]["#rebase"] = ""
+
if self.shelveCheckBox.isChecked():
self.__config["extensions"]["shelve"] = ""
+ else:
+ if "shelve" in self.__config["extensions"]:
+ del self.__config["extensions"]["shelve"]
+ self.__config["extensions"]["#shelve"] = ""
+
if self.largefilesCheckBox.isChecked():
self.__config["extensions"]["largefiles"] = ""
- self.__config["largefiles"] = {
- "minsize": self.lfFileSizeSpinBox.value(),
- }
+ ###############################################################
+ ## largefiles section
+ ###############################################################
+ if "largefiles" not in self.__config:
+ self.__config["largefiles"] = {}
+ self.__config["largefiles"]["minsize"] = \
+ str(self.lfFileSizeSpinBox.value())
lfFilePatterns = self.lfFilePatternsEdit.text()
if lfFilePatterns:
self.__config["largefiles"]["patterns"] = lfFilePatterns
+ elif "patterns" in self.__config["largefiles"]:
+ del self.__config["largefiles"]["patterns"]
+ lfUserCache = self.lfUserCachePicker.text()
+ if lfUserCache:
+ self.__config["largefiles"]["usercache"] = lfUserCache
+ elif "usercache" in self.__config["largefiles"]:
+ del self.__config["largefiles"]["usercache"]
+ else:
+ if "largefiles" in self.__config["extensions"]:
+ del self.__config["extensions"]["largefiles"]
+ self.__config["extensions"]["#largefiles"] = ""
+ ###################################################################
+ ## http_proxy section
+ ###################################################################
+ if self.proxyHostEdit.text():
+ self.__config["http_proxy"] = {
+ "host": self.proxyHostEdit.text(),
+ "user": self.proxyUserEdit.text(),
+ "passwd": self.proxyPasswordEdit.text()
+ }
+ if self.proxyBypassEdit.text():
+ self.__config["http_proxy"]["no"] = \
+ self.proxyBypassEdit.text()
+ else:
+ if "http_proxy" in self.__config:
+ del self.__config["http_proxy"]
+ ###################################################################
+ ## hostfingerprints section
+ ###################################################################
+ if self.fingerprintsList.topLevelItemCount() > 0:
+ self.__config["hostfingerprints"] = {}
+ for row in range(self.fingerprintsList.topLevelItemCount()):
+ itm = self.fingerprintsList.topLevelItem(row)
+ self.__config["hostfingerprints"][itm.text(0)] = itm.text(1)
+ else:
+ if "hostfingerprints" in self.__config:
+ del self.__config["hostfingerprints"]
+ ###################################################################
cfgFile = getConfigPath()
with open(cfgFile, "w") as configFile:
@@ -124,6 +231,33 @@
if "patterns" in self.__config["largefiles"]:
self.lfFilePatternsEdit.setText(
self.__config["largefiles"]["patterns"])
+ if "usercache" in self.__config["largefiles"]:
+ self.lfUserCachePicker.setText(
+ self.__config["largefiles"]["usercache"])
+
+ # step 4: extract http proxy information
+ if "http_proxy" in self.__config:
+ if "host" in self.__config["http_proxy"]:
+ self.proxyHostEdit.setText(
+ self.__config["http_proxy"]["host"])
+ if "user" in self.__config["http_proxy"]:
+ self.proxyUserEdit.setText(
+ self.__config["http_proxy"]["user"])
+ if "passwd" in self.__config["http_proxy"]:
+ self.proxyPasswordEdit.setText(
+ self.__config["http_proxy"]["passwd"])
+ if "no" in self.__config["http_proxy"]:
+ self.proxyBypassEdit.setText(
+ self.__config["http_proxy"]["no"])
+
+ # step 5: extract host fingerprints
+ if "hostfingerprints" in self.__config:
+ for host in self.__config["hostfingerprints"]:
+ QTreeWidgetItem(self.fingerprintsList, [
+ host,
+ self.__config["hostfingerprints"][host]
+ ])
+ self.__finalizeFingerprintsColumns()
@pyqtSlot()
def accept(self):
@@ -133,3 +267,156 @@
self.writeUserConfig()
super(HgUserConfigDialog, self).accept()
+
+ def __clearDialog(self):
+ """
+ Private method to clear the data of the dialog.
+ """
+ self.userNameEdit.clear()
+ self.emailEdit.clear()
+
+ self.fetchCheckBox.setChecked(False)
+ self.gpgCheckBox.setChecked(False)
+ self.purgeCheckBox.setChecked(False)
+ self.queuesCheckBox.setChecked(False)
+ self.rebaseCheckBox.setChecked(False)
+ self.shelveCheckBox.setChecked(False)
+ self.largefilesCheckBox.setChecked(False)
+ self.lfFileSizeSpinBox.setValue(10)
+ self.lfFilePatternsEdit.clear()
+ self.lfUserCachePicker.clear()
+
+ self.proxyHostEdit.clear()
+ self.proxyUserEdit.clear()
+ self.proxyPasswordEdit.clear()
+ self.proxyBypassEdit.clear()
+
+ self.fingerprintsList.clear()
+ self.__updateFingerprintsButtons()
+
+ #######################################################################
+ ## Methods and slots for the host fingerprint handling below
+ #######################################################################
+
+ @pyqtSlot(QTreeWidgetItem, QTreeWidgetItem)
+ def on_fingerprintsList_currentItemChanged(self, current, previous):
+ """
+ Private slot handling a change of the current fingerprints item.
+
+ @param current reference to the current item
+ @type QTreeWidgetItem
+ @param previous reference to the previous current item
+ @type QTreeWidgetItem
+ """
+ self.__updateFingerprintsButtons()
+
+ @pyqtSlot()
+ def on_fpAddButton_clicked(self):
+ """
+ Private slot to add a fingerprints entry.
+ """
+ dlg = HgUserConfigHostFingerprintDialog(self)
+ if dlg.exec_() == QDialog.Accepted:
+ host, fingerprint = dlg.getData()
+ itm = QTreeWidgetItem(self.fingerprintsList, [host, fingerprint])
+ self.__finalizeFingerprintsColumns()
+ self.fingerprintsList.setCurrentItem(itm)
+ self.fingerprintsList.scrollToItem(itm)
+
+ @pyqtSlot()
+ def on_fpDeleteButton_clicked(self):
+ """
+ Private slot to delete the current fingerprints item.
+ """
+ itm = self.fingerprintsList.currentItem()
+ if itm is not None:
+ host = itm.text(0)
+ yes = E5MessageBox.yesNo(
+ self,
+ self.tr("Delete Host Fingerprint"),
+ self.tr("""<p>Shall the fingerprint for host <b>{0}</b>"""
+ """ really be deleted?</p>""").format(host))
+ if yes:
+ self.fingerprintsList.takeTopLevelItem(
+ self.fingerprintsList.indexOfTopLevelItem(itm))
+ del itm
+
+ @pyqtSlot()
+ def on_fpEditButton_clicked(self):
+ """
+ Private slot to edit the current fingerprints item.
+ """
+ itm = self.fingerprintsList.currentItem()
+ if itm is not None:
+ host = itm.text(0)
+ fingerprint = itm.text(1)
+ dlg = HgUserConfigHostFingerprintDialog(self, host, fingerprint)
+ if dlg.exec_() == QDialog.Accepted:
+ host, fingerprint = dlg.getData()
+ itm.setText(0, host)
+ itm.setText(1, fingerprint)
+ self.__finalizeFingerprintsColumns()
+ self.fingerprintsList.scrollToItem(itm)
+
+ def __finalizeFingerprintsColumns(self):
+ """
+ Private method to resize and sort the host fingerprints columns.
+ """
+ for col in range(self.fingerprintsList.columnCount()):
+ self.fingerprintsList.resizeColumnToContents(col)
+ self.fingerprintsList.sortItems(0, Qt.AscendingOrder)
+
+ def __updateFingerprintsButtons(self):
+ """
+ Private slot to update the host fingerprints edit buttons.
+ """
+ enable = self.fingerprintsList.currentItem() is not None
+ self.fpDeleteButton.setEnabled(enable)
+ self.fpEditButton.setEnabled(enable)
+
+ #######################################################################
+ ## Slot to edit the user configuration in an editor below
+ #######################################################################
+
+ @pyqtSlot()
+ def on_editorButton_clicked(self):
+ """
+ Private slot to open the user configuration file in a text editor.
+ """
+ from QScintilla.MiniEditor import MiniEditor
+ cfgFile = getConfigPath()
+
+ yes = E5MessageBox.yesNo(
+ self,
+ self.tr("Edit User Configuration"),
+ self.tr("""You will loose all changes made in this dialog."""
+ """ Shall the data be saved first?"""),
+ icon=E5MessageBox.Warning,
+ yesDefault=True)
+ if yes:
+ self.writeUserConfig()
+
+ self.__editor = MiniEditor(cfgFile, "Properties", self)
+ self.__editor.setWindowModality(Qt.WindowModal)
+ self.__editor.installEventFilter(self)
+ self.__editor.show()
+
+ def eventFilter(self, watched, event):
+ """
+ Public method called to filter the event queue.
+
+ @param watched reference to the object being watched
+ @type QObject
+ @param event event to be handled
+ @type QEvent
+ @return flag indicating, if we handled the event
+ @rtype bool
+ """
+ if watched is self.__editor and event.type() == QEvent.Close:
+ self.__editor.closeEvent(event)
+ if event.isAccepted():
+ self.__clearDialog()
+ self.readUserConfig()
+ return True
+
+ return False
