Changeset 4c19c31688d0…
Parent 16b8b55c261b…
by
Changes to 2 files · Browse files at 4c19c31688d0 Showing diff from parent 16b8b55c261b Diff from another changeset...
@@ -30,7 +30,6 @@ from tortoisehg.hgqt.manifestdialog import ManifestTaskWidget
from tortoisehg.hgqt.sync import SyncWidget
from tortoisehg.hgqt.grep import SearchWidget
-from tortoisehg.hgqt.quickbar import GotoQuickBar
from tortoisehg.hgqt.pbranch import PatchBranchWidget
from PyQt4.QtCore import *
@@ -104,28 +103,18 @@ b.setShown(False)
hbox.addWidget(b)
- self.bar_splitter = QSplitter(self)
- self.bar_splitter.setChildrenCollapsible(False)
- hbox.addWidget(self.bar_splitter, 1)
+ self.filterbar = RepoFilterBar(self.repo, self)
+ hbox.addWidget(self.filterbar)
- self.filterbar = RepoFilterBar(self.repo, self.bar_splitter)
self.filterbar.branchChanged.connect(self.setBranch)
self.filterbar.progress.connect(self.progress)
self.filterbar.showMessage.connect(self.showMessage)
self.filterbar.setRevisionSet.connect(self.setRevisionSet)
self.filterbar.clearRevisionSet.connect(self.clearRevisionSet)
self.filterbar.filterToggled.connect(self.filterToggled)
- self.bar_splitter.addWidget(self.filterbar)
-
self.filterbar.hide()
-
self.revsetfilter = self.filterbar.filtercb.isChecked()
- self.gototb = tb = GotoQuickBar(self.bar_splitter)
- tb.setObjectName('gototb')
- tb.gotoSignal.connect(self.goto)
- self.bar_splitter.addWidget(tb)
-
self.layout().addWidget(self.repotabs_splitter)
self.repoview = view = HgRepoView(self.repo, self)
@@ -209,19 +198,12 @@
def filterBarVisible(self):
return self.filterbar.isVisible()
- def gotoBarVisible(self):
- return self.gototb.isVisible()
@pyqtSlot(bool)
def toggleFilterBar(self, checked):
"""Toggle display repowidget filter bar"""
self.filterbar.setVisible(checked)
- @pyqtSlot(bool)
- def toggleGotoBar(self, checked):
- """Toggle display repowidget goto bar"""
- self.gototb.setVisible(checked)
-
@pyqtSlot(unicode)
def _openLink(self, link):
link = unicode(link)
@@ -570,7 +552,6 @@ self.repomodel.loaded.connect(self.modelLoaded)
self.repomodel.showMessage.connect(self.showMessage)
self.repoview.setModel(self.repomodel)
- self.gototb.setCompletionKeys(self.repo.tags().keys())
def modelFilled(self):
'initial batch of revisions loaded'
|
@@ -295,13 +295,6 @@ toolbar='edit', menu='View', checkable=True,
tooltip=_('Filter graph with revision sets or branches'))
- self.gototbaction = \
- newaction(_('Goto Toolbar'), self._repotogglefwd('toggleGotoBar'),
- icon='go-jump', shortcut='Ctrl+T', enabled='repoopen',
- toolbar='edit', menu='View', checkable=True,
- tooltip=_('Jump to a specific revision'))
- newseparator(menu='View')
-
menu = QMenu(_('Workbench Toolbars'), self)
menu.addAction(self.edittbar.toggleViewAction())
menu.addAction(self.docktbar.toggleViewAction())
@@ -414,7 +407,6 @@ w = self.repoTabsWidget.currentWidget()
if w:
self.filtertbaction.setChecked(w.filterBarVisible())
- self.gototbaction.setChecked(w.gotoBarVisible())
def updateTaskViewMenu(self, taskIndex=0):
'Update task tab menu for current repository'
|
Loading...