Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

hggtk: use Apple (command) key as modifier on Darwin platform

This improves TortoiseHg's Mac integration, it now behaves a little
bit closer to an actual Mac application.

Changeset f7b3f619689a…

Parent 894a6d366064…

by Steve Borho

Changes to 4 files · Browse files at f7b3f619689a Showing diff from parent 894a6d366064 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​changeset.py Stacked
 
499
500
501
502
 
 
503
504
505
 
499
500
501
 
502
503
504
505
506
@@ -499,7 +499,8 @@
  self.glog_parent.add_accel_group(accelgroup)   else:   self.add_accel_group(accelgroup) - key, modifier = gtk.accelerator_parse('<Control>d') + mod = shlib.get_thg_modifier() + key, modifier = gtk.accelerator_parse(mod+'d')   filelist_tree.add_accelerator('thg-diff', accelgroup, key,   modifier, gtk.ACCEL_VISIBLE)   filelist_tree.connect('thg-diff', self.thgdiff)
Change 1 of 1 Show Entire File hggtk/​history.py Stacked
 
386
387
388
389
 
 
390
391
392
393
 
394
395
396
 
386
387
388
 
389
390
391
392
393
 
394
395
396
397
@@ -386,11 +386,12 @@
    accelgroup = gtk.AccelGroup()   self.add_accel_group(accelgroup) - key, modifier = gtk.accelerator_parse('<Control>d') + mod = shlib.get_thg_modifier() + key, modifier = gtk.accelerator_parse(mod+'d')   self.tree.add_accelerator('thg-diff', accelgroup, key,   modifier, gtk.ACCEL_VISIBLE)   self.tree.connect('thg-diff', self.thgdiff) - key, modifier = gtk.accelerator_parse('<Control>p') + key, modifier = gtk.accelerator_parse(mod+'p')   self.tree.add_accelerator('thg-parent', accelgroup, key,   modifier, gtk.ACCEL_VISIBLE)   self.tree.connect('thg-parent', self.thgparent)
Change 1 of 2 Show Entire File hggtk/​shlib.py Stacked
 
11
12
13
 
14
15
16
 
133
134
135
 
 
 
 
 
 
136
137
 
 
 
 
 
138
139
140
 
141
142
143
 
144
145
146
147
148
149
 
150
151
152
 
11
12
13
14
15
16
17
 
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
 
152
153
154
 
155
156
157
158
159
160
 
161
162
163
164
@@ -11,6 +11,7 @@
 anydbm._defaultmod = dumbdbm    import os +import sys  import gtk  import shelve  import time @@ -133,20 +134,31 @@
  ico = get_tortoise_icon(thgicon)   if ico: window.set_icon_from_file(ico)   +def get_thg_modifier(): + if sys.platform == 'darwin': + return '<Mod1>' + else: + return '<Control>' +  def set_tortoise_keys(window):   'Set default TortoiseHg keyboard accelerators' + if sys.platform == 'darwin': + mask = gtk.accelerator_get_default_mod_mask() + mask |= gtk.gdk.MOD1_MASK; + gtk.accelerator_set_default_mod_mask(mask) + mod = get_thg_modifier()   accelgroup = gtk.AccelGroup()   window.add_accel_group(accelgroup) - key, modifier = gtk.accelerator_parse('<Control>w') + key, modifier = gtk.accelerator_parse(mod+'w')   window.add_accelerator('thg-close', accelgroup, key, modifier,   gtk.ACCEL_VISIBLE) - key, modifier = gtk.accelerator_parse('<Control>q') + key, modifier = gtk.accelerator_parse(mod+'q')   window.add_accelerator('thg-exit', accelgroup, key, modifier,   gtk.ACCEL_VISIBLE)   key, modifier = gtk.accelerator_parse('F5')   window.add_accelerator('thg-refresh', accelgroup, key, modifier,   gtk.ACCEL_VISIBLE) - key, modifier = gtk.accelerator_parse('<Control>Return') + key, modifier = gtk.accelerator_parse(mod+'Return')   window.add_accelerator('thg-accept', accelgroup, key, modifier,   gtk.ACCEL_VISIBLE)  
Change 1 of 6 Show Entire File hggtk/​status.py Stacked
 
16
17
18
19
20
21
22
 
 
23
24
25
 
261
262
263
264
 
 
265
266
267
 
341
342
343
344
 
 
345
346
347
 
717
718
719
720
 
721
722
723
 
1093
1094
1095
1096
 
1097
1098
1099
 
1119
1120
1121
1122
 
1123
1124
1125
 
16
17
18
 
19
20
 
21
22
23
24
25
 
261
262
263
 
264
265
266
267
268
 
342
343
344
 
345
346
347
348
349
 
719
720
721
 
722
723
724
725
 
1095
1096
1097
 
1098
1099
1100
1101
 
1121
1122
1123
 
1124
1125
1126
1127
@@ -16,10 +16,10 @@
 from mercurial.i18n import _  from mercurial import cmdutil, util, ui, hg, commands, patch, mdiff, extensions  from mercurial import merge as merge_ -from shlib import shell_notify  from hglib import toutf, fromutf, rootpath, diffexpand  from gdialog import GDialog, Confirm, Prompt -from dialog import entry_dialog +import dialog +import shlib  import hgshelve    # file model row enumerations @@ -261,7 +261,8 @@
    accelgroup = gtk.AccelGroup()   self.add_accel_group(accelgroup) - key, modifier = gtk.accelerator_parse('<Control>d') + mod = shlib.get_thg_modifier() + key, modifier = gtk.accelerator_parse(mod+'d')   self.filetree.add_accelerator('thg-diff', accelgroup, key,   modifier, gtk.ACCEL_VISIBLE)   self.filetree.connect('thg-diff', self.thgdiff) @@ -341,7 +342,8 @@
  self.diff_tree = gtk.TreeView(self.diff_model)     # set CTRL-c accelerator for copy-clipboard - key, modifier = gtk.accelerator_parse('<Control>c') + mod = shlib.get_thg_modifier() + key, modifier = gtk.accelerator_parse(mod+'c')   self.diff_tree.add_accelerator('copy-clipboard', accelgroup, key,   modifier, gtk.ACCEL_VISIBLE)   self.diff_tree.connect('copy-clipboard', self.copy_to_clipboard) @@ -717,7 +719,7 @@
    def _rename_file(self, stat, wfile):   fdir, fname = os.path.split(wfile) - newfile = entry_dialog(self, _('Rename file to:'), True, fname) + newfile = dialog.entry_dialog(self, _('Rename file to:'), True, fname)   if newfile and newfile != fname:   self._hg_move([wfile, os.path.join(fdir, newfile)])   return True @@ -1093,7 +1095,7 @@
  if dialog.run() == gtk.RESPONSE_YES:   success, outtext = self._hg_call_wrapper('Revert', dohgrevert)   if success: - shell_notify(wfiles) + shlib.shell_notify(wfiles)   self.reload_status()     def _add_clicked(self, toolbutton, data=None): @@ -1119,7 +1121,7 @@
  commands.add(self.ui, self.repo, *wfiles, **addopts)   success, outtext = self._hg_call_wrapper('Add', dohgadd)   if success: - shell_notify(wfiles) + shlib.shell_notify(wfiles)   self.reload_status()     def _remove_clicked(self, toolbutton, data=None):