def offer_auto_merge(self, *args): try: option = dialog_extras.getOption( label=_('Auto-Merge recipes'), options=[ (_('Always use newest recipe'), NEWER), (_('Always use oldest recipe'), OLDER), # The following would be nice to add eventually... #_('Always use longer field'), #_('Ignore differences in ingredient keys') ]) if not option: return self.do_auto_merge(NEWER) except dialog_extras.UserCancelledError: pass
def offer_auto_merge (self, *args): try: option =dialog_extras.getOption( label=_('Auto-Merge recipes'), options=[ (_('Always use newest recipe'),NEWER), (_('Always use oldest recipe'),OLDER), # The following would be nice to add eventually... #_('Always use longer field'), #_('Ignore differences in ingredient keys') ] ) if not option: return self.do_auto_merge(NEWER) except dialog_extras.UserCancelledError: pass