Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

hgqt: remove accelerators from Cancel buttons

I've been informed these are frowned upon my UI experts

Changeset 9ff648792eb6…

Parent 3d485b6f3604…

by Steve Borho

Changes to 4 files · Browse files at 9ff648792eb6 Showing diff from parent 3d485b6f3604 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
433
434
435
436
 
437
438
439
440
441
442
443
 
444
445
446
 
478
479
480
481
 
482
483
484
 
489
490
491
492
 
493
494
495
 
433
434
435
 
436
437
438
439
440
441
442
 
443
444
445
446
 
478
479
480
 
481
482
483
484
 
489
490
491
 
492
493
494
495
@@ -433,14 +433,14 @@
  'Yes\t- Make commit restarting this named branch\n'   'No\t- Make commit without changing branch\n'   'Cancel\t- Cancel this commit') % (newbranch, rev), - self, (_('&Yes'), _('&No'), _('&Cancel')), 2, 2).run() + self, (_('&Yes'), _('&No'), _('Cancel')), 2, 2).run()   else:   resp = qtlib.CustomPrompt(_('Confirm New Branch'),   _('Create new named branch "%s" with this commit?\n'   'Yes\t- Start new branch with this commit\n'   'No\t- Make commit without branch change\n'   'Cancel\t- Cancel this commit') % newbranch, - self, (_('&Yes'), _('&No'), _('&Cancel')), 2, 2).run() + self, (_('&Yes'), _('&No'), _('Cancel')), 2, 2).run()   if resp == 0:   repo.dirstate.setbranch(newbranch)   elif resp == 2: @@ -478,7 +478,7 @@
  res = qtlib.CustomPrompt(   _('Confirm Add'),   _('Add checked untracked files?'), self, - (_('&OK'), _('&Cancel')), 0, 1, + (_('&OK'), _('Cancel')), 0, 1,   checkedUnknowns).run()   if res == 0:   dispatch._dispatch(_ui, ['add'] + checkedUnknowns) @@ -489,7 +489,7 @@
  res = qtlib.CustomPrompt(   _('Confirm Remove'),   _('Remove checked deleted files?'), self, - (_('&OK'), _('&Cancel')), 0, 1, + (_('&OK'), _('Cancel')), 0, 1,   checkedMissing).run()   if res == 0:   dispatch._dispatch(_ui, ['remove'] + checkedMissing)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
268
269
270
271
 
272
273
274
 
268
269
270
 
271
272
273
274
@@ -268,7 +268,7 @@
  _('%d unknown files\n'   '%d files ignored by .hgignore filter\n'   'Purge unknown, ignored, or both?') % (len(U), len(I)), self, - (_('&Unknown'), _('&Ignored'), _('&Both'), _('&Cancel')), + (_('&Unknown'), _('&Ignored'), _('&Both'), _('Cancel')),   0, 3, U+I).run()   if res == 3:   return
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​settings.py Stacked
 
553
554
555
556
 
557
558
559
 
649
650
651
652
 
653
654
655
 
553
554
555
 
556
557
558
559
 
649
650
651
 
652
653
654
655
@@ -553,7 +553,7 @@
  ret = qtlib.CustomPrompt(_('Confirm Exit'),   _('Apply changes before exit?'), self,   (_('&Yes'), _('&No (discard changes)'), - _ ('&Cancel')), default=2, esc=2).run() + _ ('Cancel')), default=2, esc=2).run()   if ret == 2:   return False   elif ret == 0: @@ -649,7 +649,7 @@
  if self.isDirty():   ret = qtlib.CustomPrompt(_('Confirm Save'),   _('Save changes before edit?'), self, - (_('&Save'), _('&Discard'), _('&Cancel')), + (_('&Save'), _('&Discard'), _('Cancel')),   default=2, esc=2).run()   if ret == 0:   self.applyChanges()
Change 1 of 3 Show Entire File tortoisehg/​hgqt/​wctxactions.py Stacked
 
196
197
198
199
 
200
201
202
 
209
210
211
212
 
213
214
215
 
257
258
259
260
 
261
262
263
 
196
197
198
 
199
200
201
202
 
209
210
211
 
212
213
214
215
 
257
258
259
 
260
261
262
263
@@ -196,7 +196,7 @@
  res = qtlib.CustomPrompt(   _('Uncommited merge - please select a parent revision'),   _('Revert files to local or other parent?'), parent, - (_('&Local'), _('&Other'), _('&Cancel')), 0, 2, files).run() + (_('&Local'), _('&Other'), _('Cancel')), 0, 2, files).run()   if res == 0:   revertopts['rev'] = repo[None].p1().rev()   elif res == 1: @@ -209,7 +209,7 @@
  _('Confirm Revert'),   _('Revert changes to files?'), parent,   (_('&Yes (backup changes)'), _('Yes (&discard changes)'), - _('&Cancel')), 2, 2, files).run() + _('Cancel')), 2, 2, files).run()   if res == 2:   return False   if res == 1: @@ -257,7 +257,7 @@
  res = qtlib.CustomPrompt(   _('Confirm Delete Unrevisioned'),   _('Delete the following unrevisioned files?'), - parent, (_('&Delete'), _('&Cancel')), 1, 1, files).run() + parent, (_('&Delete'), _('Cancel')), 1, 1, files).run()   if res == 1:   return   for wfile in files: