From 257460dee0ce027445e8b55faac51816fb7bdf45 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Sun, 22 Apr 2012 00:18:40 +0900
Subject: [PATCH] add default values to some dialogs

---
 aqt/deckconf.py |  5 +++--
 aqt/fields.py   | 13 +++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/aqt/deckconf.py b/aqt/deckconf.py
index 8877b5cbd..50999b981 100644
--- a/aqt/deckconf.py
+++ b/aqt/deckconf.py
@@ -109,8 +109,9 @@ class DeckConf(QDialog):
             self.loadConfs()
 
     def renameGroup(self):
-        name = getOnlyText(_("New name:"))
-        if not name:
+        old = self.conf['name']
+        name = getOnlyText(_("New name:"), default=old)
+        if not name or name == old:
             return
         self.conf['name'] = name
         self.loadConfs()
diff --git a/aqt/fields.py b/aqt/fields.py
index 62ea0ff97..24818d420 100644
--- a/aqt/fields.py
+++ b/aqt/fields.py
@@ -56,8 +56,8 @@ class FieldDialog(QDialog):
         self.saveField()
         self.loadField(idx)
 
-    def _uniqueName(self, prompt, ignoreOrd=None):
-        txt = getOnlyText(prompt)
+    def _uniqueName(self, prompt, ignoreOrd=None, old=""):
+        txt = getOnlyText(prompt, default=old)
         if not txt:
             return
         for f in self.model['flds']:
@@ -69,11 +69,11 @@ class FieldDialog(QDialog):
         return txt
 
     def onRename(self):
-        name = self._uniqueName(_("New name:"), self.currentIdx)
-        if not name:
-            return
         idx = self.currentIdx
         f = self.model['flds'][idx]
+        name = self._uniqueName(_("New name:"), self.currentIdx, f['name'])
+        if not name:
+            return
         self.mm.renameField(self.model, f, name)
         self.saveField()
         self.fillFields()
@@ -104,8 +104,9 @@ class FieldDialog(QDialog):
         self.form.fieldList.setCurrentRow(0)
 
     def onPosition(self, delta=-1):
+        idx = self.currentIdx
         l = len(self.model['flds'])
-        txt = getOnlyText(_("New position (1...%d):") % l)
+        txt = getOnlyText(_("New position (1...%d):") % l, default=str(idx+1))
         if not txt:
             return
         try: