Fri, 18 Jan 2013 19:31:43 +0100
Fixed a bug in the VCS copy dialogs causing a failure on Windows systems.
(grafted from f6a2cbf3f5146c15e3acc3aa91bf61ae87d00b8a)
# -*- coding: utf-8 -*- # Copyright (c) 2003 - 2013 Detlev Offenbach <detlev@die-offenbachs.de> # """ Module implementing a dialog to enter the data for a copy operation. """ import os.path from PyQt4.QtCore import pyqtSlot from PyQt4.QtGui import QDialog, QDialogButtonBox from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter from E5Gui import E5FileDialog from .Ui_SvnCopyDialog import Ui_SvnCopyDialog import Utilities class SvnCopyDialog(QDialog, Ui_SvnCopyDialog): """ Class implementing a dialog to enter the data for a copy or rename operation. """ def __init__(self, source, parent=None, move=False, force=False): """ Constructor @param source name of the source file/directory (string) @param parent parent widget (QWidget) @param move flag indicating a move operation (boolean) @param force flag indicating a forced operation (boolean) """ super().__init__(parent) self.setupUi(self) self.source = source if os.path.isdir(self.source): self.targetCompleter = E5DirCompleter(self.targetEdit) else: self.targetCompleter = E5FileCompleter(self.targetEdit) if move: self.setWindowTitle(self.trUtf8('Subversion Move')) else: self.forceCheckBox.setEnabled(False) self.forceCheckBox.setChecked(force) self.sourceEdit.setText(source) self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) def getData(self): """ Public method to retrieve the copy data. @return the target name (string) and a flag indicating the operation should be enforced (boolean) """ target = self.targetEdit.text() if not os.path.isabs(target): sourceDir = os.path.dirname(self.sourceEdit.text()) target = os.path.join(sourceDir, target) return Utilities.toNativeSeparators(target), self.forceCheckBox.isChecked() @pyqtSlot() def on_dirButton_clicked(self): """ Private slot to handle the button press for selecting the target via a selection dialog. """ if os.path.isdir(self.source): target = E5FileDialog.getExistingDirectory( None, self.trUtf8("Select target"), self.targetEdit.text(), E5FileDialog.Options(E5FileDialog.ShowDirsOnly)) else: target = E5FileDialog.getSaveFileName( None, self.trUtf8("Select target"), self.targetEdit.text(), "", E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite)) if target: self.targetEdit.setText(Utilities.toNativeSeparators(target)) @pyqtSlot(str) def on_targetEdit_textChanged(self, txt): """ Private slot to handle changes of the target. @param txt contents of the target edit (string) """ self.buttonBox.button(QDialogButtonBox.Ok).setEnabled( os.path.isabs(txt) or os.path.dirname(txt) == "")