We are currently indexing your data, so search results may be incomplete until we finish.
logcolumns: allow different log columns in workbench, file history, file diff
Closes #454, #490
Changeset a9011b36e99e…
Parent a8d27ba47d50…
by
Changes to 7 files · Browse files at a9011b36e99e Showing diff from parent a8d27ba47d50 Diff from another changeset...
|
@@ -120,8 +120,8 @@
self.splitter = QSplitter(Qt.Vertical)
self.setCentralWidget(self.splitter)
- self.repoview = repoview.HgRepoView(self.repo, 'fileLogDialog',
- self.splitter)
+ cs = ('fileLogDialog', _('File History Log Columns'))
+ self.repoview = repoview.HgRepoView(self.repo, cs[0], cs, self.splitter)
self.contentframe = QFrame(self.splitter)
vbox = QVBoxLayout()
@@ -146,7 +146,9 @@ self.editToolbar.addAction(self.actionForward)
def setupModels(self):
- self.filerevmodel = filerevmodel.FileRevModel(self.repo, parent=self)
+ self.filerevmodel = filerevmodel.FileRevModel(self.repo,
+ self.repoview.colselect[0],
+ parent=self)
self.repoview.setModel(self.filerevmodel)
self.repoview.revisionSelected.connect(self.onRevisionSelected)
self.repoview.revisionActivated.connect(self.onRevisionActivated)
@@ -315,10 +317,12 @@ self.splitter = QSplitter(Qt.Vertical)
self.setCentralWidget(self.splitter)
self.horizontalLayout = QHBoxLayout()
- self.tableView_revisions_left = repoview.HgRepoView(self.repo,
- 'fileDiffDialogLeft', self)
+ cs = ('fileDiffDialogLeft', _('File Differences Log Columns'))
+ self.tableView_revisions_left = repoview.HgRepoView(self.repo, cs[0],
+ cs, self)
self.tableView_revisions_right = repoview.HgRepoView(self.repo,
- 'fileDiffDialogRight', self)
+ 'fileDiffDialogRight',
+ cs, self)
self.horizontalLayout.addWidget(self.tableView_revisions_left)
self.horizontalLayout.addWidget(self.tableView_revisions_right)
self.frame = QFrame()
@@ -406,7 +410,9 @@ def setupModels(self):
self.filedata = {'left': None, 'right': None}
self._invbarchanged = False
- self.filerevmodel = filerevmodel.FileRevModel(self.repo, self.filename, parent=self)
+ self.filerevmodel = filerevmodel.FileRevModel(self.repo,
+ self.tableView_revisions_left.colselect[0],
+ self.filename, parent=self)
self.filerevmodel.filled.connect(self.modelFilled)
self.tableView_revisions_left.setModel(self.filerevmodel)
self.tableView_revisions_right.setModel(self.filerevmodel)
|
||
|
@@ -14,12 +14,18 @@ # this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-from tortoisehg.hgqt.repomodel import HgRepoListModel, COLUMNNAMES
+from tortoisehg.hgqt.repomodel import HgRepoListModel, COLUMNHEADERS
from tortoisehg.hgqt.graph import Graph, filelog_grapher
from tortoisehg.hgqt.i18n import _
from PyQt4.QtCore import *
+FILE_HEADERS = (('Filename', _('Filename', 'column header')),)
+UNUSED_HEADERS = ('Graph', 'Changes')
+
+FILE_COLUMNHEADERS = tuple(c for c in COLUMNHEADERS
+ if c[0] not in UNUSED_HEADERS) + FILE_HEADERS
+
class FileRevModel(HgRepoListModel):
"""
Model used to manage the list of revisions of a file, in file
@@ -27,18 +33,18 @@ """
filled = pyqtSignal()
- _allcolumns = ('Rev', 'Branch', 'Description', 'Author', 'Age',
- 'LocalTime', 'UTCTime', 'Tags', 'Filename')
+ _allcolumns = tuple(h[0] for h in FILE_COLUMNHEADERS)
+ _allcolnames = dict(FILE_COLUMNHEADERS)
+
_columns = ('Rev', 'Branch', 'Description', 'Author', 'Age', 'Filename')
_stretchs = {'Description': 1, }
_getcolumns = "getFilelogColumns"
- def __init__(self, repo, filename=None, parent=None):
+ def __init__(self, repo, cfgname, filename=None, parent=None):
"""
data is a HgHLRepo instance
"""
- HgRepoListModel.__init__(self, repo, '', [], False, parent)
- COLUMNNAMES['Filename'] = _('Filename', 'column header')
+ HgRepoListModel.__init__(self, repo, cfgname, '', [], False, parent)
self.setFilename(filename)
def setRepo(self, repo, branch='', fromhead=None, follow=False):
|
||
|
@@ -16,20 +16,29 @@ from PyQt4.QtGui import *
class ColumnSelectDialog(QDialog):
- def __init__(self, all, curcolumns=None, parent=None):
+ def __init__(self, cfgname, name, model, parent=None):
QDialog.__init__(self, parent)
+ if model:
+ all = model._allcolumns
+ colnames = model._allcolnames
+ self.curcolumns = model._columns
+ else:
+ all = repomodel.HgRepoListModel._allcolumns
+ colnames = repomodel.HgRepoListModel._allcolnames
+ self.curcolumns = None
- self.setWindowTitle(_('Workbench Log Columns'))
+ self.setWindowTitle(name)
self.setWindowFlags(self.windowFlags() & \
~Qt.WindowContextHelpButtonHint)
self.setMinimumSize(250, 265)
- self.curcolumns = curcolumns
+ self.cfgname = cfgname
if not self.curcolumns:
s = QSettings()
- cols = s.value('workbench/columns').toStringList()
+ cols = s.value(self.cfgname + '/columns').toStringList()
if cols:
- self.curcolumns = [c for c in cols if c in all]
+ self.curcolumns = [hglib.fromunicode(c)
+ for c in cols if c in all]
else:
self.curcolumns = all
self.disabled = [c for c in all if c not in self.curcolumns]
@@ -41,7 +50,7 @@ list = QListWidget()
# enabled cols are listed in sorted order
for c in self.curcolumns:
- item = QListWidgetItem(repomodel.COLUMNNAMES[c])
+ item = QListWidgetItem(colnames[c])
item.columnid = c
item.setFlags(Qt.ItemIsSelectable |
Qt.ItemIsEnabled |
@@ -51,7 +60,7 @@ list.addItem(item)
# disabled cols are listed last
for c in self.disabled:
- item = QListWidgetItem(repomodel.COLUMNNAMES[c])
+ item = QListWidgetItem(colnames[c])
item.columnid = c
item.setFlags(Qt.ItemIsSelectable |
Qt.ItemIsEnabled |
@@ -81,11 +90,11 @@ item = self.list.item(i)
if item.checkState() == Qt.Checked:
cols.append(item.columnid)
- s.setValue('workbench/columns', cols)
+ s.setValue(self.cfgname + '/columns', cols)
QDialog.accept(self)
def reject(self):
QDialog.reject(self)
def run(ui, *pats, **opts):
- return ColumnSelectDialog(repomodel.ALLCOLUMNS)
+ return ColumnSelectDialog('workbench', _('Workbench'), None)
|
||
|
@@ -19,10 +19,16 @@ from tortoisehg.util import hglib
from tortoisehg.hgqt.i18n import _
from tortoisehg.hgqt import htmldelegate
+from tortoisehg.hgqt.logcolumns import ColumnSelectDialog
from PyQt4.QtCore import *
from PyQt4.QtGui import *
+class HgRepoViewHeader(QHeaderView):
+ menuRequested = pyqtSignal(QPoint)
+ def contextMenuEvent(self, event):
+ self.menuRequested.emit(event.globalPos())
+
class HgRepoView(QTableView):
revisionClicked = pyqtSignal(object)
@@ -32,19 +38,25 @@ menuRequested = pyqtSignal(QPoint, object)
showMessage = pyqtSignal(unicode)
- def __init__(self, repo, cfgname, parent=None):
+ def __init__(self, repo, cfgname, colselect, parent=None):
QTableView.__init__(self, parent)
self.repo = repo
self.current_rev = -1
self.resized = False
self.cfgname = cfgname
+ self.colselect = colselect
self.setShowGrid(False)
vh = self.verticalHeader()
vh.hide()
vh.setDefaultSectionSize(20)
- self.horizontalHeader().setHighlightSections(False)
+ header = HgRepoViewHeader(Qt.Horizontal, self)
+ header.setHighlightSections(False)
+ header.menuRequested.connect(self.headerMenuRequest)
+ self.setHorizontalHeader(header)
+
+ self.createActions()
self.standardDelegate = self.itemDelegate()
self.htmlDelegate = htmldelegate.HTMLDelegate(self)
@@ -70,6 +82,23 @@ def contextMenuEvent(self, event):
self.menuRequested.emit(event.globalPos(), self.selectedRevisions())
+ def createActions(self):
+ menu = QMenu(self)
+ act = QAction(_('Choose log columns...'), self)
+ act.triggered.connect(self.setHistoryColumns)
+ menu.addAction(act)
+ self.headermenu = menu
+
+ def headerMenuRequest(self, point):
+ self.headermenu.exec_(point)
+
+ def setHistoryColumns(self):
+ dlg = ColumnSelectDialog(self.colselect[0], self.colselect[1],
+ self.model())
+ if dlg.exec_() == QDialog.Accepted:
+ self.model().updateColumns()
+ self.resizeColumns()
+
def setModel(self, model):
QTableView.setModel(self, model)
#Check if the font contains the glyph needed by the model
@@ -129,6 +158,12 @@ key = '%s/column_widths/%s' % (self.cfgname, str(self.repo[0]))
col_widths = [int(w) for w in QSettings().value(key).toStringList()]
+ if len(model._columns) <> len(col_widths):
+ # If the columns and widths don't match, use the calculated
+ # widths as they will probably be a better fit (likely because
+ # columns were changed without updating the widths)
+ col_widths = []
+
for c in range(model.columnCount(QModelIndex())):
if c < len(col_widths) and col_widths[c] > 0:
w = col_widths[c]
|
||
|
@@ -132,7 +132,8 @@
self.layout().addWidget(self.repotabs_splitter)
- self.repoview = view = HgRepoView(self.repo, 'repoWidget', self)
+ cs = ('workbench', _('Workbench Log Columns'))
+ self.repoview = view = HgRepoView(self.repo, 'repoWidget', cs, self)
view.revisionClicked.connect(self.onRevisionClicked)
view.revisionSelected.connect(self.onRevisionSelected)
view.revisionAltClicked.connect(self.onRevisionSelected)
@@ -606,7 +607,8 @@ # Filter revision set in case revisions were removed
self.revset = [r for r in self.revset if r < len(self.repo)]
branch = hglib.fromunicode(self.ubranch)
- self.repomodel = HgRepoListModel(self.repo, branch, self.revset,
+ self.repomodel = HgRepoListModel(self.repo, self.repoview.colselect[0],
+ branch, self.revset,
self.revsetfilter, self)
self.repomodel.filled.connect(self.modelFilled)
self.repomodel.loaded.connect(self.modelLoaded)
@@ -779,7 +781,9 @@ self.rebuildGraph()
except (error.RevlogError, error.RepoError), e:
self.showMessage(hglib.tounicode(str(e)))
- self.repomodel = HgRepoListModel(None, None, None, False, self)
+ self.repomodel = HgRepoListModel(None,
+ self.repoview.colselect[0],
+ None, None, False, self)
self.repoview.setModel(self.repomodel)
else:
self.dirty = True
|
||
|
@@ -14,7 +14,7 @@ from mercurial.error import RepoError
from tortoisehg.util import paths, hglib
-from tortoisehg.hgqt import repomodel, thgrepo, cmdui, qtlib
+from tortoisehg.hgqt import thgrepo, cmdui, qtlib
from tortoisehg.hgqt.i18n import _
from tortoisehg.hgqt.repowidget import RepoWidget
from tortoisehg.hgqt.reporegistry import RepoRegistryView
@@ -639,8 +639,8 @@ def setHistoryColumns(self, *args):
"""Display the column selection dialog"""
w = self.repoTabsWidget.currentWidget()
- dlg = ColumnSelectDialog(repomodel.ALLCOLUMNS,
- w and w.repoview.model()._columns)
+ dlg = ColumnSelectDialog('workbench', _('Workbench'),
+ w and w.repoview.model() or None)
if dlg.exec_() == QDialog.Accepted:
if w:
w.repoview.model().updateColumns()
|
||
Add a tag
Loading...