add default values to some dialogs

This commit is contained in:
Damien Elmes 2012-04-22 00:18:40 +09:00
parent 20dfa416d2
commit 257460dee0
2 changed files with 10 additions and 8 deletions

View file

@ -109,8 +109,9 @@ class DeckConf(QDialog):
self.loadConfs() self.loadConfs()
def renameGroup(self): def renameGroup(self):
name = getOnlyText(_("New name:")) old = self.conf['name']
if not name: name = getOnlyText(_("New name:"), default=old)
if not name or name == old:
return return
self.conf['name'] = name self.conf['name'] = name
self.loadConfs() self.loadConfs()

View file

@ -56,8 +56,8 @@ class FieldDialog(QDialog):
self.saveField() self.saveField()
self.loadField(idx) self.loadField(idx)
def _uniqueName(self, prompt, ignoreOrd=None): def _uniqueName(self, prompt, ignoreOrd=None, old=""):
txt = getOnlyText(prompt) txt = getOnlyText(prompt, default=old)
if not txt: if not txt:
return return
for f in self.model['flds']: for f in self.model['flds']:
@ -69,11 +69,11 @@ class FieldDialog(QDialog):
return txt return txt
def onRename(self): def onRename(self):
name = self._uniqueName(_("New name:"), self.currentIdx)
if not name:
return
idx = self.currentIdx idx = self.currentIdx
f = self.model['flds'][idx] 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.mm.renameField(self.model, f, name)
self.saveField() self.saveField()
self.fillFields() self.fillFields()
@ -104,8 +104,9 @@ class FieldDialog(QDialog):
self.form.fieldList.setCurrentRow(0) self.form.fieldList.setCurrentRow(0)
def onPosition(self, delta=-1): def onPosition(self, delta=-1):
idx = self.currentIdx
l = len(self.model['flds']) 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: if not txt:
return return
try: try: