Changeset 68c1c4ab3eeb…
Parent dfc4b5259041…
by
Changes to 3 files · Browse files at 68c1c4ab3eeb Showing diff from parent dfc4b5259041 Diff from another changeset...
@@ -17,7 +17,7 @@
from tortoisehg.util import hglib, patchctx
from tortoisehg.hgqt.i18n import _
-from tortoisehg.hgqt import qtlib, cmdui, rejects, commit, shelve, qscilib
+from tortoisehg.hgqt import qtlib, cmdui, rejects, commit, qscilib
from tortoisehg.hgqt import qqueue, fileview
# TODO: Disable MQ toolbar while cmdui.Runner is busy
@@ -63,6 +63,7 @@
self.fileview.showMessage.connect(self.showMessage)
self.fileview.setContext(repo[None])
+ self.fileview.shelveToolExited.connect(self.reload)
# Patch Queue Frame
layout = QVBoxLayout()
@@ -143,11 +144,9 @@ qrefhbox.setContentsMargins(0, 0, 0, 0)
self.qqueueBtn = QPushButton(_('Manage queues'))
self.qqueueBtn.setMinimumWidth(150)
- self.shelveBtn = QPushButton(_('Shelve'))
self.qnewOrRefreshBtn = QPushButton(_('QRefresh'))
qrefhbox.addWidget(self.qqueueBtn)
qrefhbox.addStretch(1)
- qrefhbox.addWidget(self.shelveBtn)
qrefhbox.addWidget(self.qnewOrRefreshBtn)
# Command runner and connections...
@@ -158,7 +157,6 @@ self.cmd.commandFinished.connect(self.onCommandFinished)
self.qqueueBtn.clicked.connect(self.launchQQueueTool)
- self.shelveBtn.clicked.connect(self.launchShelveTool)
self.optionsBtn.clicked.connect(self.launchOptionsDialog)
self.revisionOrCommitBtn.clicked.connect(self.qinitOrCommit)
self.msgSelectCombo.activated.connect(self.onMessageSelected)
@@ -439,13 +437,6 @@ self.reload()
@pyqtSlot()
- def launchShelveTool(self):
- dlg = shelve.ShelveDialog(self.repo, self)
- dlg.finished.connect(dlg.deleteLater)
- dlg.exec_()
- self.reload()
-
- @pyqtSlot()
def launchOptionsDialog(self):
dlg = OptionsDialog(self)
dlg.finished.connect(dlg.deleteLater)
|
@@ -178,15 +178,10 @@ self.fileview.showMessage.connect(self.showMessage)
self.fileview.linkActivated.connect(self.linkActivated)
self.fileview.fileDisplayed.connect(self.fileDisplayed)
+ self.fileview.shelveToolExited.connect(self.refreshWctx)
self.fileview.setContext(self.repo[None])
vbox.addWidget(self.fileview, 1)
- lbltext = u'<a href="shelve:">' + _('shelve tool') + u'</a>'
- self.shelflabel = QLabel(lbltext)
- self.shelflabel.linkActivated.connect(self.linkActivated)
- self.fileview.labelhbox.addStretch(1)
- self.fileview.labelhbox.addWidget(self.shelflabel)
-
self.split = split
self.diffvbox = vbox
@@ -701,23 +696,11 @@ layout.addWidget(self.statusbar)
self.stwidget.showMessage.connect(self.statusbar.showMessage)
self.stwidget.progress.connect(self.statusbar.progress)
- self.stwidget.linkActivated.connect(self.linkActivated)
self.stwidget.titleTextChanged.connect(self.setWindowTitle)
self.setWindowTitle(self.stwidget.getTitle())
QTimer.singleShot(0, self.stwidget.refreshWctx)
- @pyqtSlot(QString)
- def linkActivated(self, link):
- link = unicode(link)
- repo = self.stwidget.repo
- if link.startswith('shelve:'):
- from tortoisehg.hgqt import shelve
- dlg = shelve.ShelveDialog(self.stwidget.repo, self)
- dlg.finished.connect(dlg.deleteLater)
- dlg.exec_()
- self.stwidget.refreshWctx()
-
def keyPressEvent(self, event):
if event.matches(QKeySequence.Refresh):
self.stwidget.refreshWctx()
|
Loading...