Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py	Sat Jun 02 15:27:03 2012 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py	Sat Jun 02 16:36:16 2012 +0200
@@ -10,7 +10,7 @@
 import os.path
 
 from PyQt4.QtCore import pyqtSlot
-from PyQt4.QtGui import QDialog
+from PyQt4.QtGui import QDialog, QDialogButtonBox
 
 from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter
 from E5Gui import E5FileDialog
@@ -20,7 +20,7 @@
 
 class SvnCopyDialog(QDialog, Ui_SvnCopyDialog):
     """
-    Class implementing a dialog to enter the data for a copy operation.
+    Class implementing a dialog to enter the data for a copy or rename operation.
     """
     def __init__(self, source, parent=None, move=False, force=False):
         """
@@ -28,7 +28,7 @@
         
         @param source name of the source file/directory (string)
         @param parent parent widget (QWidget)
-        @param move flag indicating a move operation
+        @param move flag indicating a move operation (boolean)
         @param force flag indicating a forced operation (boolean)
         """
         super().__init__(parent)
@@ -48,6 +48,8 @@
         
         self.sourceEdit.setText(source)
         
+        self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)
+        
     def getData(self):
         """
         Public method to retrieve the copy data.
@@ -55,8 +57,11 @@
         @return the target name (string) and a flag indicating
             the operation should be enforced (boolean)
         """
-        # TODO: check if target is an absolute path. If not make it relative to source.
-        return self.targetEdit.text(), self.forceCheckBox.isChecked()
+        target = self.targetEdit.text()
+        if not os.path.isabs(target):
+            sourceDir = os.path.dirname(self.sourceEdit.text())
+            target = os.path.join(sourceDir, target)
+        return target, self.forceCheckBox.isChecked()
         
     @pyqtSlot()
     def on_dirButton_clicked(self):
@@ -80,3 +85,13 @@
         
         if target:
             self.targetEdit.setText(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) == "")