add tooltip, merge->overwrite

This commit is contained in:
Damien Elmes 2009-06-23 05:42:50 +09:00
parent 6067afe85f
commit 938abea109
2 changed files with 2 additions and 1 deletions

View file

@ -1999,6 +1999,7 @@ it to your friends.
if interactive: if interactive:
self.onDeckProperties() self.onDeckProperties()
self.deckProperties.dialog.qtabwidget.setCurrentIndex(1) self.deckProperties.dialog.qtabwidget.setCurrentIndex(1)
self.showToolTip(_("Enable syncing, choose a name, then sync again."))
return return
if self.deck is None and self.deckPath is None: if self.deck is None and self.deckPath is None:
# qt on linux incorrectly accepts shortcuts for disabled actions # qt on linux incorrectly accepts shortcuts for disabled actions

View file

@ -214,7 +214,7 @@ class DeckChooser(QDialog):
for name in decks: for name in decks:
name = os.path.splitext(name)[0] name = os.path.splitext(name)[0]
if self.create: if self.create:
msg = _("Merge with '%s' on server") % name msg = _("Overwrite '%s' on server") % name
else: else:
msg = name msg = name
item = QListWidgetItem(msg) item = QListWidgetItem(msg)