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

mq: rename button variables

Changeset 5e0fe2141237…

Parent 5df8bcb46c23…

by Adrian Buehlmann

Changes to one file · Browse files at 5e0fe2141237 Showing diff from parent 5df8bcb46c23 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​mq.py Stacked
 
82
83
84
85
 
86
87
88
 
89
90
91
 
92
93
94
 
95
96
97
 
98
99
100
 
101
102
103
 
104
105
106
107
108
109
110
 
 
111
112
113
 
 
114
115
 
116
117
 
118
119
 
120
121
122
 
189
190
191
192
193
194
195
196
197
198
 
 
 
 
 
 
 
199
200
201
 
434
435
436
437
438
439
 
 
 
440
441
442
443
 
 
 
444
445
446
 
641
642
643
644
645
646
647
648
649
650
 
 
 
 
 
 
 
651
652
653
 
82
83
84
 
85
86
87
 
88
89
90
 
91
92
93
 
94
95
96
 
97
98
99
 
100
101
102
 
103
104
105
106
107
108
 
 
109
110
111
 
 
112
113
114
 
115
116
 
117
118
 
119
120
121
122
 
189
190
191
 
 
 
 
 
 
 
192
193
194
195
196
197
198
199
200
201
 
434
435
436
 
 
 
437
438
439
440
 
 
 
441
442
443
444
445
446
 
641
642
643
 
 
 
 
 
 
 
644
645
646
647
648
649
650
651
652
653
@@ -82,41 +82,41 @@
  qtbarhbox.setSpacing(5)   layout.addLayout(qtbarhbox, 0)   qtbarhbox.setContentsMargins(0, 0, 0, 0) - self.qpushAllBtn = a = QAction( + self.qpushAllAct = a = QAction(   geticon('hg-qpush-all'), _('Push all'), self)   a.setToolTip(_('Apply all patches')) - self.qpushBtn = a = QAction( + self.qpushAct = a = QAction(   geticon('hg-qpush'), _('Push'), self)   a.setToolTip(_('Apply one patch')) - self.setGuardsBtn = a = QAction( + self.setGuardsAct = a = QAction(   geticon('hg-qguard'), _('Guards'), self)   a.setToolTip(_('Configure guards for selected patch')) - self.qpushMoveBtn = a = QAction( + self.qpushMoveAct = a = QAction(   geticon('hg-qreorder'), _('Push selected'), self)   a.setToolTip(_('Apply selected patch next (change queue order)')) - self.qdeleteBtn = a = QAction( + self.qdeleteAct = a = QAction(   geticon('hg-qdelete'), _('Delete'), self)   a.setToolTip(_('Delete selected patches')) - self.qpopBtn = a = QAction( + self.qpopAct = a = QAction(   geticon('hg-qpop'), _('Pop'), self)   a.setToolTip(_('Unapply one patch')) - self.qpopAllBtn = a = QAction( + self.qpopAllAct = a = QAction(   geticon('hg-qpop-all'), _('Pop all'), self)   a.setToolTip(_('Unapply all patches'))   tbar = QToolBar(_('Patch Queue Actions Toolbar'))   tbar.setIconSize(QSize(18, 18))   qtbarhbox.addWidget(tbar) - tbar.addAction(self.qpushBtn) - tbar.addAction(self.qpushAllBtn) + tbar.addAction(self.qpushAct) + tbar.addAction(self.qpushAllAct)   tbar.addSeparator() - tbar.addAction(self.qpopBtn) - tbar.addAction(self.qpopAllBtn) + tbar.addAction(self.qpopAct) + tbar.addAction(self.qpopAllAct)   tbar.addSeparator() - tbar.addAction(self.qpushMoveBtn) + tbar.addAction(self.qpushMoveAct)   tbar.addSeparator() - tbar.addAction(self.qdeleteBtn) + tbar.addAction(self.qdeleteAct)   tbar.addSeparator() - tbar.addAction(self.setGuardsBtn) + tbar.addAction(self.setGuardsAct)     self.queueListWidget = QListWidget(self)   layout.addWidget(self.queueListWidget, 1) @@ -189,13 +189,13 @@
  self.queueListWidget.currentRowChanged.connect(self.onPatchSelected)   self.queueListWidget.itemActivated.connect(self.onGotoPatch)   self.queueListWidget.itemChanged.connect(self.onRenamePatch) - self.qpushAllBtn.triggered.connect(self.onPushAll) - self.qpushBtn.triggered.connect(self.onPush) - self.qpushMoveBtn.triggered.connect(self.onPushMove) - self.qpopAllBtn.triggered.connect(self.onPopAll) - self.qpopBtn.triggered.connect(self.onPop) - self.setGuardsBtn.triggered.connect(self.onGuardConfigure) - self.qdeleteBtn.triggered.connect(self.onDelete) + self.qpushAllAct.triggered.connect(self.onPushAll) + self.qpushAct.triggered.connect(self.onPush) + self.qpushMoveAct.triggered.connect(self.onPushMove) + self.qpopAllAct.triggered.connect(self.onPopAll) + self.qpopAct.triggered.connect(self.onPop) + self.setGuardsAct.triggered.connect(self.onGuardConfigure) + self.qdeleteAct.triggered.connect(self.onDelete)   self.newCheckBox.toggled.connect(self.onNewModeToggled)   self.qnewOrRefreshBtn.clicked.connect(self.onQNewOrQRefresh)   @@ -434,13 +434,13 @@
  if row >= 0:   patch = self.queueListWidget.item(row)._thgpatch   applied = set([p.name for p in self.repo.mq.applied]) - self.qdeleteBtn.setEnabled(patch not in applied) - self.qpushMoveBtn.setEnabled(patch not in applied) - self.setGuardsBtn.setEnabled(True) + self.qdeleteAct.setEnabled(patch not in applied) + self.qpushMoveAct.setEnabled(patch not in applied) + self.setGuardsAct.setEnabled(True)   else: - self.qdeleteBtn.setEnabled(False) - self.qpushMoveBtn.setEnabled(False) - self.setGuardsBtn.setEnabled(False) + self.qdeleteAct.setEnabled(False) + self.qpushMoveAct.setEnabled(False) + self.setGuardsAct.setEnabled(False)     @pyqtSlot(int)   def onFileSelected(self, row): @@ -641,13 +641,13 @@
  else:   self.revisionOrCommitBtn.setText(_('Create MQ repo'))   - self.qpushAllBtn.setEnabled(bool(repo.thgmqunappliedpatches)) - self.qpushBtn.setEnabled(bool(repo.thgmqunappliedpatches)) - self.qpushMoveBtn.setEnabled(False) - self.qdeleteBtn.setEnabled(False) - self.setGuardsBtn.setEnabled(False) - self.qpopBtn.setEnabled(bool(applied)) - self.qpopAllBtn.setEnabled(bool(applied)) + self.qpushAllAct.setEnabled(bool(repo.thgmqunappliedpatches)) + self.qpushAct.setEnabled(bool(repo.thgmqunappliedpatches)) + self.qpushMoveAct.setEnabled(False) + self.qdeleteAct.setEnabled(False) + self.setGuardsAct.setEnabled(False) + self.qpopAct.setEnabled(bool(applied)) + self.qpopAllAct.setEnabled(bool(applied))     pctx = repo.changectx('.')   newmode = self.newCheckBox.isChecked()