|
@@ -109,14 +109,14 @@ class LabelDialog(QDialog):
|
|
|
self.edit.setText(self.edit.text().trimmed())
|
|
|
|
|
|
def popUp(self, text=None, move=True):
|
|
|
- if text is None:
|
|
|
- text = ''
|
|
|
- self.edit.setText(text)
|
|
|
- self.edit.setSelection(0, len(text))
|
|
|
- items = self.labelList.findItems(text, Qt.MatchFixedString)
|
|
|
- if items:
|
|
|
- assert len(items) == 1
|
|
|
- self.labelList.setCurrentItem(items[0])
|
|
|
+ # if text is None, the previous label in self.edit is kept
|
|
|
+ if text is not None:
|
|
|
+ self.edit.setText(text)
|
|
|
+ self.edit.setSelection(0, len(text))
|
|
|
+ items = self.labelList.findItems(text, Qt.MatchFixedString)
|
|
|
+ if items:
|
|
|
+ assert len(items) == 1
|
|
|
+ self.labelList.setCurrentItem(items[0])
|
|
|
self.edit.setFocus(Qt.PopupFocusReason)
|
|
|
if move:
|
|
|
self.move(QCursor.pos())
|