Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0, 2.0.1, and 2.0.2

stable icons: use getmenuicon() instead of geticon() when appropriate

This will remove the icon in front of menu items on Mac OS X.

Changeset 08f843cce08a…

Parent 20ebc6fcc55e…

by André Sintzoff

Changes to 4 files · Browse files at 08f843cce08a Showing diff from parent 20ebc6fcc55e Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​filelistview.py Stacked
 
18
19
20
21
 
22
23
24
 
195
196
197
198
 
199
200
201
 
238
239
240
241
 
242
243
244
 
18
19
20
 
21
22
23
24
 
195
196
197
 
198
199
200
201
 
238
239
240
 
241
242
243
244
@@ -18,7 +18,7 @@
   from tortoisehg.util import hglib  from tortoisehg.hgqt.i18n import _ -from tortoisehg.hgqt.qtlib import geticon +from tortoisehg.hgqt import qtlib  from tortoisehg.hgqt.filedialogs import FileLogDialog, FileDiffDialog  from tortoisehg.hgqt import visdiff, wctxactions, revert   @@ -195,7 +195,7 @@
  dlgdict[filename] = dlg   ufname = hglib.tounicode(filename)   dlg.setWindowTitle(_('Hg file log viewer - %s') % ufname) - dlg.setWindowIcon(geticon('hg-log')) + dlg.setWindowIcon(qtlib.geticon('hg-log'))   dlg = dlgdict[filename]   dlg.goto(model._ctx.rev())   dlg.show() @@ -238,7 +238,7 @@
  ]:   act = QAction(desc, self)   if icon: - act.setIcon(geticon(icon)) + act.setIcon(qtlib.getmenuicon(icon))   if key:   act.setShortcut(key)   if tip:
Change 1 of 8 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
15
16
17
18
 
19
20
21
 
152
153
154
155
 
156
157
158
159
 
160
161
162
163
 
164
165
166
167
 
168
169
170
171
 
172
173
174
175
176
 
177
178
179
 
181
182
183
184
 
185
186
187
 
901
902
903
904
 
905
906
907
 
1038
1039
1040
1041
 
1042
1043
1044
 
1090
1091
1092
1093
 
1094
1095
1096
 
1108
1109
1110
1111
 
1112
1113
1114
 
1126
1127
1128
1129
 
1130
1131
1132
 
15
16
17
 
18
19
20
21
 
152
153
154
 
155
156
157
158
 
159
160
161
162
 
163
164
165
166
 
167
168
169
170
 
171
172
173
174
175
 
176
177
178
179
 
181
182
183
 
184
185
186
187
 
901
902
903
 
904
905
906
907
 
1038
1039
1040
 
1041
1042
1043
1044
 
1090
1091
1092
 
1093
1094
1095
1096
 
1108
1109
1110
 
1111
1112
1113
1114
 
1126
1127
1128
 
1129
1130
1131
1132
@@ -15,7 +15,7 @@
   from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import qtlib -from tortoisehg.hgqt.qtlib import geticon, getfont, QuestionMsgBox, InfoMsgBox +from tortoisehg.hgqt.qtlib import QuestionMsgBox, InfoMsgBox  from tortoisehg.hgqt.qtlib import CustomPrompt, SharedWidget, DemandWidget  from tortoisehg.hgqt.repomodel import HgRepoListModel  from tortoisehg.hgqt import cmdui, update, tag, backout, merge, visdiff @@ -152,28 +152,28 @@
  w.revisionSelected.connect(self.repoview.goto)   w.grepRequested.connect(self.grep)   w.showMessage.connect(self.showMessage) - self.logTabIndex = idx = tt.addTab(w, geticon('hg-log'), '') + self.logTabIndex = idx = tt.addTab(w, qtlib.geticon('hg-log'), '')   tt.setTabToolTip(idx, _("Revision details"))     self.commitDemand = w = DemandWidget(self.createCommitWidget) - self.commitTabIndex = idx = tt.addTab(w, geticon('hg-commit'), '') + self.commitTabIndex = idx = tt.addTab(w, qtlib.geticon('hg-commit'), '')   tt.setTabToolTip(idx, _("Commit"))     self.syncDemand = w = DemandWidget(self.createSyncWidget) - self.syncTabIndex = idx = tt.addTab(w, geticon('thg-sync'), '') + self.syncTabIndex = idx = tt.addTab(w, qtlib.geticon('thg-sync'), '')   tt.setTabToolTip(idx, _("Synchronize"))     self.manifestDemand = w = DemandWidget(self.createManifestWidget) - self.manifestTabIndex = idx = tt.addTab(w, geticon('hg-annotate'), '') + self.manifestTabIndex = idx = tt.addTab(w, qtlib.geticon('hg-annotate'), '')   tt.setTabToolTip(idx, _('Manifest'))     self.grepDemand = w = DemandWidget(self.createGrepWidget) - self.grepTabIndex = idx = tt.addTab(w, geticon('hg-grep'), '') + self.grepTabIndex = idx = tt.addTab(w, qtlib.geticon('hg-grep'), '')   tt.setTabToolTip(idx, _("Search"))     self.mqDemand = w = DemandWidget(self.createMQWidget)   if 'mq' in self.repo.extensions(): - self.mqTabIndex = idx = tt.addTab(w, geticon('thg-mq'), '') + self.mqTabIndex = idx = tt.addTab(w, qtlib.geticon('thg-mq'), '')   tt.setTabToolTip(idx, _("Patch Queue"))   self.namedTabs['mq'] = idx   else: @@ -181,7 +181,7 @@
    self.pbranchDemand = w = DemandWidget(self.createPatchBranchWidget)   if 'pbranch' in self.repo.extensions(): - self.pbranchTabIndex = idx = tt.addTab(w, geticon('branch'), '') + self.pbranchTabIndex = idx = tt.addTab(w, qtlib.geticon('branch'), '')   tt.setTabToolTip(idx, _("Patch Branch"))   self.namedTabs['pbranch'] = idx   else: @@ -901,7 +901,7 @@
  act = QAction(desc, self)   act.triggered.connect(cb)   if icon: - act.setIcon(geticon(icon)) + act.setIcon(qtlib.getmenuicon(icon))   act.enableFunc = func   menu.addAction(act)   items.append(act) @@ -1038,7 +1038,7 @@
  ):   a = QAction(name, self)   if icon: - a.setIcon(qtlib.geticon(icon)) + a.setIcon(qtlib.getmenuicon(icon))   a.triggered.connect(cb)   menu.addAction(a)   if 'reviewboard' in self.repo.extensions(): @@ -1090,7 +1090,7 @@
  act = QAction(name, self)   act.triggered.connect(cb)   if icon: - act.setIcon(qtlib.geticon(icon)) + act.setIcon(qtlib.getmenuicon(icon))   acts.append(act)   menu.addAction(act)   self.unappcmenu = menu @@ -1108,7 +1108,7 @@
  ):   a = QAction(name, self)   if icon: - a.setIcon(qtlib.geticon(icon)) + a.setIcon(qtlib.getmenuicon(icon))   a.triggered.connect(cb)   menu.addAction(a)   if 'reviewboard' in self.repo.extensions(): @@ -1126,7 +1126,7 @@
  a = QAction(name, self)   a.triggered.connect(cb)   if icon: - a.setIcon(geticon(icon)) + a.setIcon(qtlib.getmenuicon(icon))   menu.addAction(a)   self.bundlemenu = menu  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
442
443
444
445
 
446
447
448
 
442
443
444
 
445
446
447
448
@@ -442,7 +442,7 @@
  (_('Terminal'), self.terminalurl, 'utilities-terminal'),   (_('Remove'), self.removeurl, 'menudelete')):   act = QAction(text, self) - act.setIcon(qtlib.geticon(icon)) + act.setIcon(qtlib.getmenuicon(icon))   act.triggered.connect(cb)   acts.append(act)   menu.addAction(act)
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​wctxactions.py Stacked
 
42
43
44
45
46
47
 
 
 
48
49
50
51
52
53
 
 
54
55
56
 
 
57
58
59
60
61
62
63
 
 
 
 
 
 
64
65
66
 
74
75
76
77
78
 
 
79
80
81
 
42
43
44
 
 
 
45
46
47
48
49
50
51
 
 
52
53
54
 
 
55
56
57
 
 
 
 
 
 
58
59
60
61
62
63
64
65
66
 
74
75
76
 
 
77
78
79
80
81
@@ -42,25 +42,25 @@
  else:   menu = QMenu(parent)   parent.contextmenu = menu - make(_('&Visual Diff'), vdiff, frozenset('MAR!'), qtlib.geticon('visualdiff')) - make(_('Copy patch'), copyPatch, frozenset('MAR!'), qtlib.geticon('copy-patch')) - make(_('Edit'), edit, frozenset('MACI?'), qtlib.geticon('edit-file')) + make(_('&Visual Diff'), vdiff, frozenset('MAR!'), qtlib.getmenuicon('visualdiff')) + make(_('Copy patch'), copyPatch, frozenset('MAR!'), qtlib.getmenuicon('copy-patch')) + make(_('Edit'), edit, frozenset('MACI?'), qtlib.getmenuicon('edit-file'))   make(_('View missing'), viewmissing, frozenset('R!'))   if len(repo.parents()) > 1:   make(_('View other'), viewother, frozenset('MA'))   menu.addSeparator() - make(_('&Revert'), revert, frozenset('MAR!'), qtlib.geticon('hg-revert')) - make(_('&Add'), add, frozenset('R'), qtlib.geticon('add')) + make(_('&Revert'), revert, frozenset('MAR!'), qtlib.getmenuicon('hg-revert')) + make(_('&Add'), add, frozenset('R'), qtlib.getmenuicon('add'))   menu.addSeparator() - make(_('File History'), log, frozenset('MARC!'), qtlib.geticon('hg-log')) - make(_('&Annotate'), annotate, frozenset('MARC!'), qtlib.geticon('hg-annotate')) + make(_('File History'), log, frozenset('MARC!'), qtlib.getmenuicon('hg-log')) + make(_('&Annotate'), annotate, frozenset('MARC!'), qtlib.getmenuicon('hg-annotate'))   menu.addSeparator() - make(_('&Forget'), forget, frozenset('MAC!'), qtlib.geticon('remove')) - make(_('&Add'), add, frozenset('I?'), qtlib.geticon('add')) - make(_('&Detect Renames...'), guessRename, frozenset('A?!'), qtlib.geticon('detect_rename')) - make(_('&Ignore'), ignore, frozenset('?'), qtlib.geticon('ignore')) - make(_('Remove versioned'), remove, frozenset('C'), qtlib.geticon('remove')) - make(_('&Delete unversioned'), delete, frozenset('?I'), qtlib.geticon('hg-purge')) + make(_('&Forget'), forget, frozenset('MAC!'), qtlib.getmenuicon('remove')) + make(_('&Add'), add, frozenset('I?'), qtlib.getmenuicon('add')) + make(_('&Detect Renames...'), guessRename, frozenset('A?!'), qtlib.getmenuicon('detect_rename')) + make(_('&Ignore'), ignore, frozenset('?'), qtlib.getmenuicon('ignore')) + make(_('Remove versioned'), remove, frozenset('C'), qtlib.getmenuicon('remove')) + make(_('&Delete unversioned'), delete, frozenset('?I'), qtlib.getmenuicon('hg-purge'))   if len(selrows) == 1:   menu.addSeparator()   t, path = selrows[0] @@ -74,8 +74,8 @@
  mkaction(d)   menu.addMenu(rmenu)   else: - make(_('&Copy...'), copy, frozenset('MC'), qtlib.geticon('edit-copy')) - make(_('Rename...'), rename, frozenset('MC'), qtlib.geticon('hg-rename')) + make(_('&Copy...'), copy, frozenset('MC'), qtlib.getmenuicon('edit-copy')) + make(_('Rename...'), rename, frozenset('MC'), qtlib.getmenuicon('hg-rename'))   menu.addSeparator()   make(_('Mark unresolved'), unmark, frozenset('r'))   make(_('Mark resolved'), mark, frozenset('u'))