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

mq: introduce a toolbar for patch queue actions

Changeset af098827e0bb…

Parent 1408d349ac7e…

by Adrian Buehlmann

Changes to one file · Browse files at af098827e0bb Showing diff from parent 1408d349ac7e Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​mq.py Stacked
 
20
21
22
 
23
24
25
 
81
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
 
183
184
185
186
187
188
189
190
191
192
 
 
 
 
 
 
 
193
194
195
 
20
21
22
23
24
25
26
 
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
 
185
186
187
 
 
 
 
 
 
 
188
189
190
191
192
193
194
195
196
197
@@ -20,6 +20,7 @@
 from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import qtlib, cmdui, rejects, commit, qscilib  from tortoisehg.hgqt import qqueue, fileview +from tortoisehg.hgqt.qtlib import geticon    # TODO  # keep original file name in file list item @@ -81,36 +82,37 @@
  qtbarhbox.setSpacing(5)   layout.addLayout(qtbarhbox, 0)   qtbarhbox.setContentsMargins(0, 0, 0, 0) - self.qpushAllBtn = tb = QToolButton() - tb.setIcon(qtlib.geticon('hg-qpush-all')) - tb.setToolTip(_('Apply all patches')) - self.qpushBtn = tb = QToolButton() - tb.setIcon(qtlib.geticon('hg-qpush')) - tb.setToolTip(_('Apply one patch')) - self.setGuardsBtn = tb = QToolButton() - tb.setIcon(qtlib.geticon('hg-qguard')) - tb.setToolTip(_('Configure guards for selected patch')) - self.qpushMoveBtn = tb = QToolButton() - tb.setIcon(qtlib.geticon('thg-qreorder')) - tb.setToolTip(_('Apply selected patch next (change queue order)')) - self.qdeleteBtn = tb = QToolButton() - tb.setIcon(qtlib.geticon('hg-qdelete')) - tb.setToolTip(_('Delete selected patches')) - self.qpopBtn = tb = QToolButton() - tb.setIcon(qtlib.geticon('hg-qpop')) - tb.setToolTip(_('Unapply one patch')) - self.qpopAllBtn = tb = QToolButton() - tb.setIcon(qtlib.geticon('hg-qpop-all')) - tb.setToolTip(_('Unapply all patches')) - qtbarhbox.addWidget(self.qpushAllBtn) - qtbarhbox.addWidget(self.qpushBtn) - qtbarhbox.addStretch(1) - qtbarhbox.addWidget(self.setGuardsBtn) - qtbarhbox.addWidget(self.qpushMoveBtn) - qtbarhbox.addWidget(self.qdeleteBtn) - qtbarhbox.addStretch(1) - qtbarhbox.addWidget(self.qpopBtn) - qtbarhbox.addWidget(self.qpopAllBtn) + self.qpushAllBtn = a = QAction( + geticon('hg-qpush-all'), _('Push all'), self) + a.setToolTip(_('Apply all patches')) + self.qpushBtn = a = QAction( + geticon('hg-qpush'), _('Push'), self) + a.setToolTip(_('Apply one patch')) + self.setGuardsBtn = a = QAction( + geticon('hg-qguard'), _('Guards'), self) + a.setToolTip(_('Configure guards for selected patch')) + self.qpushMoveBtn = a = QAction( + geticon('hg-qreorder'), _('Push selected'), self) + a.setToolTip(_('Apply selected patch next (change queue order)')) + self.qdeleteBtn = a = QAction( + geticon('hg-qdelete'), _('Delete'), self) + a.setToolTip(_('Delete selected patches')) + self.qpopBtn = a = QAction( + geticon('hg-qpop'), _('Pop'), self) + a.setToolTip(_('Unapply one patch')) + self.qpopAllBtn = 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.qpushAllBtn) + tbar.addAction(self.qpushBtn) + tbar.addAction(self.setGuardsBtn) + tbar.addAction(self.qpushMoveBtn) + tbar.addAction(self.qdeleteBtn) + tbar.addAction(self.qpopBtn) + tbar.addAction(self.qpopAllBtn)     self.queueListWidget = QListWidget(self)   layout.addWidget(self.queueListWidget, 1) @@ -183,13 +185,13 @@
  self.queueListWidget.currentRowChanged.connect(self.onPatchSelected)   self.queueListWidget.itemActivated.connect(self.onGotoPatch)   self.queueListWidget.itemChanged.connect(self.onRenamePatch) - self.qpushAllBtn.clicked.connect(self.onPushAll) - self.qpushBtn.clicked.connect(self.onPush) - self.qpushMoveBtn.clicked.connect(self.onPushMove) - self.qpopAllBtn.clicked.connect(self.onPopAll) - self.qpopBtn.clicked.connect(self.onPop) - self.setGuardsBtn.clicked.connect(self.onGuardConfigure) - self.qdeleteBtn.clicked.connect(self.onDelete) + 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.newCheckBox.toggled.connect(self.onNewModeToggled)   self.qnewOrRefreshBtn.clicked.connect(self.onQNewOrQRefresh)