Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

repowidget: use names for all task tabs

Changeset 8d9d556ecd53…

Parent 64f8b9279d8c…

by Steve Borho

Changes to 2 files · Browse files at 8d9d556ecd53 Showing diff from parent 64f8b9279d8c Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
156
157
158
 
159
160
161
162
 
163
164
165
166
167
168
 
 
169
170
171
 
173
174
175
 
176
177
178
179
 
180
181
182
183
 
184
185
186
187
188
189
 
 
190
191
192
 
156
157
158
159
160
161
162
163
164
165
166
 
 
167
 
168
169
170
171
172
 
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
 
 
190
 
191
192
193
194
195
@@ -156,16 +156,17 @@
  w.showMessage.connect(self.showMessage)   w.updateToRevision.connect(lambda rev: self.updateToRevision())   self.logTabIndex = idx = tt.addTab(w, qtlib.geticon('hg-log'), '') + self.namedTabs['log'] = idx   tt.setTabToolTip(idx, _("Revision details"))     self.commitDemand = w = DemandWidget('createCommitWidget', self)   self.commitTabIndex = idx = tt.addTab(w, qtlib.geticon('hg-commit'), '') + self.namedTabs['commit'] = idx   tt.setTabToolTip(idx, _("Commit"))   - self.mqDemand = w = DemandWidget('createMQWidget', self) - idx = tt.addTab(w, qtlib.geticon('thg-mq'), '')   if 'mq' in self.repo.extensions(): - self.mqTabIndex = idx + self.mqDemand = w = DemandWidget('createMQWidget', self) + self.mqTabIndex = idx = tt.addTab(w, qtlib.geticon('thg-mq'), '')   tt.setTabToolTip(idx, _("Patch Queue"))   self.namedTabs['mq'] = idx   else: @@ -173,20 +174,22 @@
    self.syncDemand = w = DemandWidget('createSyncWidget', self)   self.syncTabIndex = idx = tt.addTab(w, qtlib.geticon('thg-sync'), '') + self.namedTabs['sync'] = idx   tt.setTabToolTip(idx, _("Synchronize"))     self.manifestDemand = w = DemandWidget('createManifestWidget', self)   self.manifestTabIndex = idx = tt.addTab(w, qtlib.geticon('hg-annotate'), '') + self.namedTabs['manifest'] = idx   tt.setTabToolTip(idx, _('Manifest'))     self.grepDemand = w = DemandWidget('createGrepWidget', self)   self.grepTabIndex = idx = tt.addTab(w, qtlib.geticon('hg-grep'), '') + self.namedTabs['grep'] = idx   tt.setTabToolTip(idx, _("Search"))   - self.pbranchDemand = w = DemandWidget('createPatchBranchWidget', self) - idx = tt.addTab(w, qtlib.geticon('branch'), '')   if 'pbranch' in self.repo.extensions(): - self.pbranchTabIndex = idx + self.pbranchDemand = w = DemandWidget('createPatchBranchWidget', self) + self.pbranchTabIndex = tt.addTab(w, qtlib.geticon('branch'), '')   tt.setTabToolTip(idx, _("Patch Branch"))   self.namedTabs['pbranch'] = idx   else:
Change 1 of 4 Show Entire File tortoisehg/​hgqt/​workbench.py Stacked
 
226
227
228
229
230
231
232
 
 
233
234
235
236
237
238
239
240
 
 
241
242
243
244
245
 
 
 
246
247
248
 
335
336
337
338
339
340
341
342
 
343
344
345
 
430
431
432
433
 
434
435
436
 
443
444
445
446
447
448
449
450
451
 
 
 
 
 
 
452
453
454
 
226
227
228
 
 
 
 
229
230
231
232
233
234
235
 
 
 
236
237
238
239
 
 
 
240
241
242
243
244
245
 
332
333
334
 
 
 
 
 
335
336
337
338
 
423
424
425
 
426
427
428
429
 
436
437
438
 
 
 
 
 
 
439
440
441
442
443
444
445
446
447
@@ -226,23 +226,20 @@
    self.actionGroupTaskView = QActionGroup(self)   self.actionGroupTaskView.triggered.connect(self.onSwitchRepoTaskTab) - def addtaskview(icon, label, data=None): - if data is None: - data = len(self.actionGroupTaskView.actions()) - a = newaction(label, icon=None, checkable=True, data=data, + def addtaskview(icon, label, name): + a = newaction(label, icon=None, checkable=True, data=name,   enabled='repoopen', menu='view')   a.setIcon(qtlib.geticon(icon))   self.actionGroupTaskView.addAction(a)   self.tasktbar.addAction(a)   return a - # NOTE: Sequence must match that in repowidget.py - addtaskview('hg-log', _("Revision &Details")) - addtaskview('hg-commit', _('&Commit')) + addtaskview('hg-log', _("Revision &Details"), 'log') + addtaskview('hg-commit', _('&Commit'), 'commit')   self.actionSelectTaskMQ = \   addtaskview('thg-mq', _('Patch &Queue'), 'mq') - addtaskview('thg-sync', _('S&ynchronize')) - addtaskview('hg-annotate', _('&Manifest')) - addtaskview('hg-grep', _('&Search')) + addtaskview('thg-sync', _('S&ynchronize'), 'sync') + addtaskview('hg-annotate', _('&Manifest'), 'manifest') + addtaskview('hg-grep', _('&Search'), 'grep')   self.actionSelectTaskPbranch = \   addtaskview('branch', _('&Patch Branch'), 'pbranch')   newseparator(menu='view') @@ -335,11 +332,7 @@
  @pyqtSlot(QAction)   def onSwitchRepoTaskTab(self, action):   rw = self.repoTabsWidget.currentWidget() - if not rw: return - index, wasint = action.data().toInt() - if wasint: - rw.taskTabsWidget.setCurrentIndex(index) - else: + if rw:   rw.switchToNamedTaskTab(str(action.data().toString()))     def openRepo(self, repopath, reuse=False): @@ -430,7 +423,7 @@
  if w:   self.filtertbaction.setChecked(w.filterBarVisible())   - def updateTaskViewMenu(self, taskIndex=0): + def updateTaskViewMenu(self):   'Update task tab menu for current repository'   if self.repoTabsWidget.count() == 0:   for a in self.actionGroupTaskView.actions(): @@ -443,12 +436,12 @@
  self.actionSelectTaskMQ.setVisible('mq' in exts)   self.actionSelectTaskPbranch.setVisible('pbranch' in exts)   taskIndex = repoWidget.taskTabsWidget.currentIndex() - if taskIndex <= 4: # count of standard task tabs - self.actionGroupTaskView.actions()[taskIndex].setChecked(True) - elif taskIndex == repoWidget.namedTabs.get('mq', None): - self.actionSelectTaskMQ.setChecked(True) - elif taskIndex == repoWidget.namedTabs.get('pbranch', None): - self.actionSelectTaskPbranch.setChecked(True) + for name, idx in repoWidget.namedTabs.iteritems(): + if idx == taskIndex: + break + for action in self.actionGroupTaskView.actions(): + if str(action.data().toString()) == name: + action.setChecked(True)     @pyqtSlot()   def updateHistoryActions(self):