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

stable icons: move most hg/thg-specific icons to be xdg-theme-like structure

- rename Checkmark.svg to hg-commit.svg. tortoisehg/icons/commit.svg isn't
used.
- loadall.svg and showlog.svg are renamed, but loadall.png and showlog.png are
kept untouched because their size, seems uncommon.
- showlog.svg is renamed to thg-console.svg to avoid confusion with hg-log.svg.

Changeset f757843e8eb3…

Parent 0308f916217a…

by Yuya Nishihara

Changes to 32 files · Browse files at f757843e8eb3 Showing diff from parent 0308f916217a Diff from another changeset...

Show Entire File icons/​scalable/​actions/​hg-annotate.svg Stacked
renamed from tortoisehg/hgqt/icons/annotate.svg
(No changes)
Show Entire File icons/​scalable/​actions/​hg-archive.svg Stacked
renamed from tortoisehg/hgqt/icons/archive.svg
(No changes)
Show Entire File icons/​scalable/​actions/​hg-clone.svg Stacked
renamed from tortoisehg/hgqt/icons/clone.svg
(No changes)
Show Entire File icons/​scalable/​actions/​hg-commit.svg Stacked
renamed from tortoisehg/hgqt/icons/Checkmark.svg
(No changes)
Show Entire File icons/​scalable/​actions/​hg-grep.svg Stacked
renamed from tortoisehg/hgqt/icons/repobrowse.svg
(No changes)
Show Entire File icons/​scalable/​actions/​hg-log.svg Stacked
renamed from tortoisehg/hgqt/icons/log.svg
(No changes)
Show Entire File icons/​scalable/​actions/​hg-merge.svg Stacked
renamed from tortoisehg/hgqt/icons/merge.svg
(No changes)
Show Entire File icons/​scalable/​actions/​hg-qguard.svg Stacked
renamed from tortoisehg/hgqt/icons/qguards.svg
(No changes)
Show Entire File icons/​scalable/​actions/​hg-qpop-all.svg Stacked
renamed from tortoisehg/hgqt/icons/qpopall.svg
(No changes)
Show Entire File icons/​scalable/​actions/​hg-qpop.svg Stacked
renamed from tortoisehg/hgqt/icons/qpop.svg
(No changes)
Show Entire File icons/​scalable/​actions/​hg-qpush-all.svg Stacked
renamed from tortoisehg/hgqt/icons/qpushall.svg
(No changes)
Show Entire File icons/​scalable/​actions/​hg-qpush.svg Stacked
renamed from tortoisehg/hgqt/icons/qpush.svg
(No changes)
Show Entire File icons/​scalable/​actions/​hg-rename.svg Stacked
renamed from tortoisehg/hgqt/icons/rename.svg
(No changes)
Show Entire File icons/​scalable/​actions/​hg-status.svg Stacked
renamed from tortoisehg/hgqt/icons/status.svg
(No changes)
Show Entire File icons/​scalable/​actions/​hg-tag.svg Stacked
renamed from tortoisehg/hgqt/icons/tag.svg
(No changes)
Show Entire File icons/​scalable/​actions/​hg-update.svg Stacked
renamed from tortoisehg/hgqt/icons/update.svg
(No changes)
Show Entire File icons/​scalable/​actions/​thg-console.svg Stacked
renamed from tortoisehg/hgqt/icons/showlog.svg
(No changes)
Show Entire File icons/​scalable/​actions/​thg-log-load-all.svg Stacked
renamed from tortoisehg/hgqt/icons/loadall.svg
(No changes)
Show Entire File icons/​scalable/​actions/​thg-mq.svg Stacked
renamed from tortoisehg/hgqt/icons/mq.svg
(No changes)
Show Entire File icons/​scalable/​actions/​thg-qreorder.svg Stacked
renamed from tortoisehg/hgqt/icons/qreorder.svg
(No changes)
Show Entire File icons/​scalable/​actions/​thg-reporegistry.svg Stacked
renamed from tortoisehg/hgqt/icons/repotree.svg
(No changes)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​archive.py Stacked
 
162
163
164
165
 
166
167
168
 
162
163
164
 
165
166
167
168
@@ -162,7 +162,7 @@
    # dialog setting   self.setWindowTitle(_('Archive - %s') % self.repo.displayname) - self.setWindowIcon(qtlib.geticon('archive')) + self.setWindowIcon(qtlib.geticon('hg-archive'))   self.setWindowFlags(self.windowFlags() & ~Qt.WindowContextHelpButtonHint)   self.setLayout(self.vbox)   self.layout().setSizeConstraint(QLayout.SetFixedSize)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​clone.py Stacked
 
156
157
158
159
 
160
161
162
 
156
157
158
 
159
160
161
162
@@ -156,7 +156,7 @@
  self.setLayout(box)   self.layout().setSizeConstraint(QLayout.SetFixedSize)   self.setWindowTitle(_('Clone - %s') % cwd) - self.setWindowIcon(qtlib.geticon('clone')) + self.setWindowIcon(qtlib.geticon('hg-clone'))     # prepare to show   self.cmd.setHidden(True)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​manifestdialog.py Stacked
 
400
401
402
403
 
404
405
406
 
400
401
402
 
403
404
405
406
@@ -400,7 +400,7 @@
  kwargs['text'] = _('Status')   super(_StatusFilterButton, self).__init__(   parent, popupMode=QToolButton.InstantPopup, - icon=qtlib.geticon('status'), + icon=qtlib.geticon('hg-status'),   toolButtonStyle=Qt.ToolButtonTextBesideIcon, **kwargs)     self._initactions(statustext)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
34
35
36
37
 
38
39
40
 
34
35
36
 
37
38
39
40
@@ -34,7 +34,7 @@
  self.local = str(self.repo['.'].rev())     self.setWindowTitle(_('Merge - %s') % self.repo.displayname) - self.setWindowIcon(qtlib.geticon('merge')) + self.setWindowIcon(qtlib.geticon('hg-merge'))   self.setMinimumSize(600, 528)   self.setOption(QWizard.DisabledBackButtonOnLastPage, True)   self.setOption(QWizard.HelpButtonOnRight, False)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​mq.py Stacked
 
76
77
78
79
 
80
81
82
 
83
84
85
 
86
87
88
 
89
90
91
92
93
94
 
95
96
97
 
98
99
100
 
76
77
78
 
79
80
81
 
82
83
84
 
85
86
87
 
88
89
90
91
92
93
 
94
95
96
 
97
98
99
100
@@ -76,25 +76,25 @@
  layout.addLayout(qtbarhbox, 0)   qtbarhbox.setContentsMargins(0, 0, 0, 0)   self.qpushAllBtn = tb = QToolButton() - tb.setIcon(qtlib.geticon('qpushall')) + tb.setIcon(qtlib.geticon('hg-qpush-all'))   tb.setToolTip(_('Apply all patches'))   self.qpushBtn = tb = QToolButton() - tb.setIcon(qtlib.geticon('qpush')) + tb.setIcon(qtlib.geticon('hg-qpush'))   tb.setToolTip(_('Apply one patch'))   self.setGuardsBtn = tb = QToolButton() - tb.setIcon(qtlib.geticon('qguards')) + tb.setIcon(qtlib.geticon('hg-qguard'))   tb.setToolTip(_('Configure guards for selected patch'))   self.qpushMoveBtn = tb = QToolButton() - tb.setIcon(qtlib.geticon('qreorder')) + tb.setIcon(qtlib.geticon('thg-qreorder'))   tb.setToolTip(_('Apply selected patch next (change queue order)'))   self.qdeleteBtn = tb = QToolButton()   tb.setIcon(qtlib.geticon('filedelete'))   tb.setToolTip(_('Delete selected patches'))   self.qpopBtn = tb = QToolButton() - tb.setIcon(qtlib.geticon('qpop')) + tb.setIcon(qtlib.geticon('hg-qpop'))   tb.setToolTip(_('Unapply one patch'))   self.qpopAllBtn = tb = QToolButton() - tb.setIcon(qtlib.geticon('qpopall')) + tb.setIcon(qtlib.geticon('hg-qpop-all'))   tb.setToolTip(_('Unapply all patches'))   qtbarhbox.addWidget(self.qpushAllBtn)   qtbarhbox.addWidget(self.qpushBtn)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​rename.py Stacked
 
142
143
144
145
 
146
147
148
 
142
143
144
 
145
146
147
148
@@ -142,7 +142,7 @@
  self.vbox.addLayout(self.hbox)     # dialog setting - self.setWindowIcon(qtlib.geticon('rename')) + self.setWindowIcon(qtlib.geticon('hg-rename'))   self.setWindowFlags(self.windowFlags() & ~Qt.WindowContextHelpButtonHint)   self.copy_chk.setChecked(self.iscopy)   self.setLayout(self.vbox)
Change 1 of 3 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
157
158
159
160
 
161
162
163
164
 
165
166
167
168
 
169
170
171
172
 
173
174
175
 
178
179
180
181
 
182
183
184
 
851
852
853
854
 
855
856
857
 
858
859
 
860
861
862
 
157
158
159
 
160
161
162
163
 
164
165
166
167
 
168
169
170
171
 
172
173
174
175
 
178
179
180
 
181
182
183
184
 
851
852
853
 
854
855
856
 
857
858
 
859
860
861
862
@@ -157,19 +157,19 @@
  w.revisionSelected.connect(self.repoview.goto)   w.grepRequested.connect(self.grep)   w.showMessage.connect(self.showMessage) - self.logTabIndex = idx = tt.addTab(w, geticon('log'), '') + self.logTabIndex = idx = tt.addTab(w, geticon('hg-log'), '')   tt.setTabToolTip(idx, _("Revision details"))     self.commitDemand = w = DemandWidget(self.createCommitWidget) - self.commitTabIndex = idx = tt.addTab(w, geticon('Checkmark'), '') + self.commitTabIndex = idx = tt.addTab(w, geticon('hg-commit'), '')   tt.setTabToolTip(idx, _("Commit"))     self.manifestDemand = w = DemandWidget(self.createManifestWidget) - self.manifestTabIndex = idx = tt.addTab(w, geticon('annotate'), '') + self.manifestTabIndex = idx = tt.addTab(w, geticon('hg-annotate'), '')   tt.setTabToolTip(idx, _('Manifest'))     self.grepDemand = w = DemandWidget(self.createGrepWidget) - self.grepTabIndex = idx = tt.addTab(w, geticon('repobrowse'), '') + self.grepTabIndex = idx = tt.addTab(w, geticon('hg-grep'), '')   tt.setTabToolTip(idx, _("Search"))     self.syncDemand = w = DemandWidget(self.createSyncWidget) @@ -178,7 +178,7 @@
    self.mqDemand = w = DemandWidget(self.createMQWidget)   if 'mq' in self.repo.extensions(): - self.mqTabIndex = idx = tt.addTab(w, geticon('mq'), '') + self.mqTabIndex = idx = tt.addTab(w, geticon('thg-mq'), '')   tt.setTabToolTip(idx, _("Patch Queue"))   self.namedTabs['mq'] = idx   else: @@ -851,12 +851,12 @@
  exs = self.repo.extensions()   menu = QMenu(self)   for ext, func, desc, icon, cb in ( - (None, isrev, _('Update...'), 'update', self.updateToRevision), + (None, isrev, _('Update...'), 'hg-update', self.updateToRevision),   (None, isctx, _('Visual diff...'), None, self.visualDiffRevision),   (None, isrev, _('Diff to local...'), None, self.visualDiffToLocal), - (None, fixed, _('Merge with...'), 'merge', self.mergeWithRevision), + (None, fixed, _('Merge with...'), 'hg-merge', self.mergeWithRevision),   (None, isctx, _('Browse at rev...'), None, self.manifestRevision), - (None, fixed, _('Tag...'), 'tag', self.tagToRevision), + (None, fixed, _('Tag...'), 'hg-tag', self.tagToRevision),   (None, fixed, _('Bookmark...'), 'bookmark', self.bookmarkRevision),   (None, fixed, _('Backout...'), None, self.backoutToRevision),   (None, isrev, _('Export patch'), None, self.exportRevisions),
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​resolve.py Stacked
 
23
24
25
26
 
27
28
29
 
23
24
25
 
26
27
28
29
@@ -23,7 +23,7 @@
  super(ResolveDialog, self).__init__(parent)   self.setWindowFlags(Qt.Window)   self.setWindowTitle(_('Resolve conflicts - %s') % repo.displayname) - self.setWindowIcon(qtlib.geticon('merge')) + self.setWindowIcon(qtlib.geticon('hg-merge'))   self.repo = repo     s = QSettings()
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​tag.py Stacked
 
133
134
135
136
 
137
138
139
 
133
134
135
 
136
137
138
139
@@ -133,7 +133,7 @@
  self.setLayout(base)   self.layout().setSizeConstraint(QLayout.SetFixedSize)   self.setWindowTitle(_('Tag - %s') % repo.displayname) - self.setWindowIcon(qtlib.geticon('tag')) + self.setWindowIcon(qtlib.geticon('hg-tag'))     # prepare to show   self.custom_text.setDisabled(True)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​update.py Stacked
 
141
142
143
144
 
145
146
147
 
141
142
143
 
144
145
146
147
@@ -141,7 +141,7 @@
  self.setLayout(box)   self.layout().setSizeConstraint(QLayout.SetFixedSize)   self.setWindowTitle(_('Update - %s') % self.repo.displayname) - self.setWindowIcon(qtlib.geticon('update')) + self.setWindowIcon(qtlib.geticon('hg-update'))     # prepare to show   self.rev_combo.lineEdit().selectAll()
Change 1 of 7 Show Entire File tortoisehg/​hgqt/​workbench.py Stacked
 
73
74
75
76
 
77
78
79
 
176
177
178
179
 
180
181
182
 
191
192
193
194
 
195
196
197
 
202
203
204
205
 
206
207
208
 
226
227
228
229
230
231
 
 
 
232
233
234
 
235
236
237
 
245
246
247
248
 
249
250
251
 
264
265
266
267
 
268
269
270
 
73
74
75
 
76
77
78
79
 
176
177
178
 
179
180
181
182
 
191
192
193
 
194
195
196
197
 
202
203
204
 
205
206
207
208
 
226
227
228
 
 
 
229
230
231
232
233
 
234
235
236
237
 
245
246
247
 
248
249
250
251
 
264
265
266
 
267
268
269
270
@@ -73,7 +73,7 @@
  desktopgeom = qApp.desktop().availableGeometry()   self.resize(desktopgeom.size() * 0.8)   - self.setWindowIcon(geticon('log')) + self.setWindowIcon(geticon('hg-log'))     self.repoTabsWidget = tw = QTabWidget()   tw.setDocumentMode(True) @@ -176,7 +176,7 @@
  shortcut='New', menu='file', icon='init')   newaction(_("Clone Repository..."), self.cloneRepository,   shortcut=modifiedkeysequence('New', modifier='Shift'), - menu='file', icon='clone') + menu='file', icon='hg-clone')   newaction(_("&Open Repository..."), self.openRepository,   shortcut='Open', menu='file', icon='plus')   newaction(_("&Close Repository"), self.closeRepository, icon='window-close', @@ -191,7 +191,7 @@
  a = self.reporegistry.toggleViewAction()   a.setText(_('Show Repository Registry'))   a.setShortcut('Ctrl+Shift+O') - a.setIcon(geticon('repotree')) + a.setIcon(geticon('thg-reporegistry'))   self.docktbar.addAction(a)   self.menuView.addAction(a)   @@ -202,7 +202,7 @@
  a = self.log.toggleViewAction()   a.setText(_('Show Output &Log'))   a.setShortcut('Ctrl+L') - a.setIcon(geticon('showlog')) + a.setIcon(geticon('thg-console'))   self.docktbar.addAction(a)   self.menuView.addAction(a)   @@ -226,12 +226,12 @@
  return a   # NOTE: Sequence must match that in repowidget.py   addtaskview('log', _("Revision &Details")) - addtaskview('Checkmark', _('&Commit')) - addtaskview('annotate', _('&Manifest')) - addtaskview('repobrowse', _('&Search')) + addtaskview('hg-commit', _('&Commit')) + addtaskview('hg-annotate', _('&Manifest')) + addtaskview('hg-grep', _('&Search'))   addtaskview('thg-sync', _('S&ynchronize'))   self.actionSelectTaskMQ = \ - addtaskview('mq', _('Patch &Queue'), 'mq') + addtaskview('thg-mq', _('Patch &Queue'), 'mq')   self.actionSelectTaskPbranch = \   addtaskview('branch', _('&Patch Branch'), 'pbranch')   newseparator(menu='view') @@ -245,7 +245,7 @@
  shortcut=modifiedkeysequence('Refresh', modifier='Shift'),   tooltip=_('Refresh only the current task tab'),   menu='view') - newaction(_("Load all"), self.loadall, icon='loadall', + newaction(_("Load all"), self.loadall, icon='thg-log-load-all',   enabled='repoopen', menu='view', shortcut='Shift+Ctrl+A',   tooltip=_('Load all revisions into graph'))   @@ -264,7 +264,7 @@
  newaction(_("Recover"), self._repofwd('recover'), enabled='repoopen',   menu='repository')   newseparator(menu='repository') - newaction(_("Resolve"), self._repofwd('resolve'), icon='merge', + newaction(_("Resolve"), self._repofwd('resolve'), icon='hg-merge',   enabled='repoopen', menu='repository')   newaction(_("Rollback/Undo"), self._repofwd('rollback'),   enabled='repoopen', menu='repository')