--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Tue Aug 31 13:39:24 2010 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Tue Aug 31 16:38:06 2010 +0200 @@ -1672,17 +1672,14 @@ ignoreName = os.path.join(name, ".hgignore") if os.path.exists(ignoreName): - res = E5MessageBox.warning(self.__ui, + res = E5MessageBox.yesNo(self.__ui, self.trUtf8("Create .hgignore file"), self.trUtf8("""<p>The file <b>{0}</b> exists already.""" """ Overwrite it?</p>""").format(ignoreName), - QMessageBox.StandardButtons(\ - QMessageBox.No | \ - QMessageBox.Yes), - QMessageBox.No) + type_ = E5MessageBox.Warning) else: - res = QMessageBox.Yes - if res == QMessageBox.Yes: + res = True + if res: try: # create a .hgignore file ignore = open(ignoreName, "w") @@ -1849,13 +1846,10 @@ repodir, self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)")) if files: - update = E5MessageBox.question(self.__ui, + update = E5MessageBox.yesNo(self.__ui, self.trUtf8("Apply changegroups"), self.trUtf8("""Shall the working directory be updated?"""), - QMessageBox.StandardButtons(\ - QMessageBox.No | \ - QMessageBox.Yes), - QMessageBox.Yes) == QMessageBox.Yes + yesDefault = True) args = [] args.append('unbundle') @@ -2047,4 +2041,4 @@ @param interval check interval for the monitor thread in seconds (integer) @return reference to the monitor thread (QThread) """ - return HgStatusMonitorThread(interval, project, self) \ No newline at end of file + return HgStatusMonitorThread(interval, project, self)