Thu, 18 Jan 2018 11:10:57 +0100
Fixed an issue in GitSubModuleAddDialog caused by PyQt5 prior to 5.6.0 not defining QUrl.None_.
(grafted from 84e868de5a248f38b97e110054c50733c6f382a8)
# -*- coding: utf-8 -*- # Copyright (c) 2014 - 2018 Detlev Offenbach <detlev@die-offenbachs.de> # """ Module implementing a dialog to enter the data for applying a bundle. """ from __future__ import unicode_literals from PyQt5.QtWidgets import QDialog from .Ui_GitApplyBundleDataDialog import Ui_GitApplyBundleDataDialog class GitApplyBundleDataDialog(QDialog, Ui_GitApplyBundleDataDialog): """ Class implementing a dialog to enter the data for applying a bundle. """ def __init__(self, bundleHeads, branches, parent=None): """ Constructor @param bundleHeads list of heads contained in a bundle (list of strings) @param branches list of available branch names (list of strings) @param parent reference to the parent widget (QWidget) """ super(GitApplyBundleDataDialog, self).__init__(parent) self.setupUi(self) self.headCombo.addItems(sorted(bundleHeads)) self.branchCombo.addItems([""] + sorted(branches)) def getData(self): """ Public method to get the entered data. @return tuple with the bundle head (string) and the local branch name (string) """ return self.headCombo.currentText(), self.branchCombo.currentText()