def __init__(self, parent):
QFrame.__init__(self, parent)
self.curchunks = []
self.countselected = 0
self._ctx = None
self._lastfile = None
self._status = None
vbox = QVBoxLayout()
vbox.setContentsMargins(0,0,0,0)
vbox.setSpacing(0)
self.setLayout(vbox)
self.labelhbox = hbox = QHBoxLayout()
hbox.setContentsMargins(0,0,0,0)
hbox.setSpacing(2)
self.layout().addLayout(hbox)
self.filenamelabel = w = QLabel()
self.filenamelabel.hide()
hbox.addWidget(w)
w.setWordWrap(True)
f = w.textInteractionFlags()
w.setTextInteractionFlags(f | Qt.TextSelectableByMouse)
w.linkActivated.connect(self.linkActivated)
self.searchbar = qscilib.SearchToolBar(hidable=True)
self.searchbar.hide()
self.searchbar.searchRequested.connect(self.find)
self.searchbar.conditionChanged.connect(self.highlightText)
guifont = qtlib.getfont('fontlist').font()
self.sumlabel = QLabel()
self.sumlabel.setFont(guifont)
self.allbutton = QToolButton()
self.allbutton.setFont(guifont)
self.allbutton.setText(_('All', 'files'))
self.allbutton.setShortcut(QKeySequence.SelectAll)
self.allbutton.clicked.connect(self.selectAll)
self.nonebutton = QToolButton()
self.nonebutton.setFont(guifont)
self.nonebutton.setText(_('None', 'files'))
self.nonebutton.setShortcut(QKeySequence.New)
self.nonebutton.clicked.connect(self.selectNone)
self.actionFind = self.searchbar.toggleViewAction()
self.actionFind.setIcon(qtlib.geticon('edit-find'))
self.actionFind.setToolTip(_('Toggle display of text search bar'))
qtlib.newshortcutsforstdkey(QKeySequence.Find, self, self.searchbar.show)
self.diffToolbar = QToolBar(_('Diff Toolbar'))
self.diffToolbar.setIconSize(QSize(16, 16))
self.diffToolbar.setStyleSheet(qtlib.tbstylesheet)
self.diffToolbar.addAction(self.actionFind)
hbox.addWidget(self.diffToolbar)
hbox.addStretch(1)
hbox.addWidget(self.sumlabel)
hbox.addWidget(self.allbutton)
hbox.addWidget(self.nonebutton)
self.extralabel = w = QLabel()
w.setWordWrap(True)
w.linkActivated.connect(self.linkActivated)
self.layout().addWidget(w)
self.layout().addSpacing(2)
w.hide()
self._forceviewindicator = None
self.sci = qscilib.Scintilla(self)
self.sci.setReadOnly(True)
self.sci.setUtf8(True)
self.sci.installEventFilter(qscilib.KeyPressInterceptor(self))
self.sci.setContextMenuPolicy(Qt.CustomContextMenu)
self.sci.customContextMenuRequested.connect(self.menuRequested)
self.sci.setCaretLineVisible(False)
self.sci.setMarginType(1, qsci.SymbolMargin)
self.sci.setMarginLineNumbers(1, False)
self.sci.setMarginWidth(1, QFontMetrics(self.font()).width('XX'))
self.sci.setMarginSensitivity(1, True)
self.sci.marginClicked.connect(self.marginClicked)
self._checkedpix = qtlib.getcheckboxpixmap(QStyle.State_On,
Qt.gray, self)
self.selected = self.sci.markerDefine(self._checkedpix, -1)
self._uncheckedpix = qtlib.getcheckboxpixmap(QStyle.State_Off,
Qt.gray, self)
self.unselected = self.sci.markerDefine(self._uncheckedpix, -1)
self.vertical = self.sci.markerDefine(qsci.VerticalLine, -1)
self.divider = self.sci.markerDefine(qsci.Background, -1)
self.selcolor = self.sci.markerDefine(qsci.Background, -1)
self.sci.setMarkerBackgroundColor(QColor('#BBFFFF'), self.selcolor)
self.sci.setMarkerBackgroundColor(QColor('#AAAAAA'), self.divider)
mask = (1 << self.selected) | (1 << self.unselected) | \
(1 << self.vertical) | (1 << self.selcolor) | (1 << self.divider)
self.sci.setMarginMarkerMask(1, mask)
self.blksearch = blockmatcher.BlockList(self)
self.blksearch.linkScrollBar(self.sci.verticalScrollBar())
self.blksearch.setVisible(False)
hbox = QHBoxLayout()
hbox.addWidget(self.sci)
hbox.addWidget(self.blksearch)
lexer = lexers.difflexer(self)
self.sci.setLexer(lexer)
self.layout().addLayout(hbox)
self.layout().addWidget(self.searchbar)
self.clearDisplay()
def __init__(self, parent):
QFrame.__init__(self, parent)
self.curchunks = []
self.countselected = 0
self._ctx = None
self._lastfile = None
self._status = None
vbox = QVBoxLayout()
vbox.setContentsMargins(0, 0, 0, 0)
vbox.setSpacing(0)
self.setLayout(vbox)
self.labelhbox = hbox = QHBoxLayout()
hbox.setContentsMargins(0, 0, 0, 0)
hbox.setSpacing(2)
self.layout().addLayout(hbox)
self.filenamelabel = w = QLabel()
self.filenamelabel.hide()
hbox.addWidget(w)
w.setWordWrap(True)
f = w.textInteractionFlags()
w.setTextInteractionFlags(f | Qt.TextSelectableByMouse)
w.linkActivated.connect(self.linkActivated)
self.searchbar = qscilib.SearchToolBar(hidable=True)
self.searchbar.hide()
self.searchbar.searchRequested.connect(self.find)
self.searchbar.conditionChanged.connect(self.highlightText)
guifont = qtlib.getfont('fontlist').font()
self.sumlabel = QLabel()
self.sumlabel.setFont(guifont)
self.allbutton = QToolButton()
self.allbutton.setFont(guifont)
self.allbutton.setText(_('All', 'files'))
self.allbutton.setShortcut(QKeySequence.SelectAll)
self.allbutton.clicked.connect(self.selectAll)
self.nonebutton = QToolButton()
self.nonebutton.setFont(guifont)
self.nonebutton.setText(_('None', 'files'))
self.nonebutton.setShortcut(QKeySequence.New)
self.nonebutton.clicked.connect(self.selectNone)
self.actionFind = self.searchbar.toggleViewAction()
self.actionFind.setIcon(qtlib.geticon('edit-find'))
self.actionFind.setToolTip(_('Toggle display of text search bar'))
qtlib.newshortcutsforstdkey(QKeySequence.Find, self,
self.searchbar.show)
self.diffToolbar = QToolBar(_('Diff Toolbar'))
self.diffToolbar.setIconSize(QSize(16, 16))
self.diffToolbar.setStyleSheet(qtlib.tbstylesheet)
self.diffToolbar.addAction(self.actionFind)
hbox.addWidget(self.diffToolbar)
hbox.addStretch(1)
hbox.addWidget(self.sumlabel)
hbox.addWidget(self.allbutton)
hbox.addWidget(self.nonebutton)
self.extralabel = w = QLabel()
w.setWordWrap(True)
w.linkActivated.connect(self.linkActivated)
self.layout().addWidget(w)
self.layout().addSpacing(2)
w.hide()
self._forceviewindicator = None
self.sci = qscilib.Scintilla(self)
self.sci.setReadOnly(True)
self.sci.setUtf8(True)
self.sci.installEventFilter(qscilib.KeyPressInterceptor(self))
self.sci.setContextMenuPolicy(Qt.CustomContextMenu)
self.sci.customContextMenuRequested.connect(self.menuRequested)
self.sci.setCaretLineVisible(False)
self.sci.setMarginType(1, qsci.SymbolMargin)
self.sci.setMarginLineNumbers(1, False)
self.sci.setMarginWidth(1, QFontMetrics(self.font()).width('XX'))
self.sci.setMarginSensitivity(1, True)
self.sci.marginClicked.connect(self.marginClicked)
self._checkedpix = qtlib.getcheckboxpixmap(QStyle.State_On, Qt.gray,
self)
self.selected = self.sci.markerDefine(self._checkedpix, -1)
self._uncheckedpix = qtlib.getcheckboxpixmap(QStyle.State_Off, Qt.gray,
self)
self.unselected = self.sci.markerDefine(self._uncheckedpix, -1)
self.vertical = self.sci.markerDefine(qsci.VerticalLine, -1)
self.divider = self.sci.markerDefine(qsci.Background, -1)
self.selcolor = self.sci.markerDefine(qsci.Background, -1)
self.sci.setMarkerBackgroundColor(QColor('#BBFFFF'), self.selcolor)
self.sci.setMarkerBackgroundColor(QColor('#AAAAAA'), self.divider)
mask = (1 << self.selected) | (1 << self.unselected) | \
(1 << self.vertical) | (1 << self.selcolor) | (1 << self.divider)
self.sci.setMarginMarkerMask(1, mask)
self.blksearch = blockmatcher.BlockList(self)
self.blksearch.linkScrollBar(self.sci.verticalScrollBar())
self.blksearch.setVisible(False)
hbox = QHBoxLayout()
hbox.addWidget(self.sci)
hbox.addWidget(self.blksearch)
lexer = lexers.difflexer(self)
self.sci.setLexer(lexer)
self.layout().addLayout(hbox)
self.layout().addWidget(self.searchbar)
self.clearDisplay()
def __init__(self, repoagent, parent):
QFrame.__init__(self, parent)
framelayout = QVBoxLayout(self)
framelayout.setContentsMargins(0,0,0,0)
l = QHBoxLayout()
l.setContentsMargins(0,0,0,0)
l.setSpacing(0)
self._repoagent = repoagent
repo = repoagent.rawRepo()
# TODO: replace by repoagent if setRepo(bundlerepo) can be removed
self.repo = repo
self._diffs = []
self.changes = None
self.changeselection = False
self.chunkatline = {}
self.excludemsg = _(' (excluded from the next commit)')
self.topLayout = QVBoxLayout()
self.labelhbox = hbox = QHBoxLayout()
hbox.setContentsMargins(0,0,0,0)
hbox.setSpacing(2)
self.topLayout.addLayout(hbox)
self.diffToolbar = QToolBar(_('Diff Toolbar'))
self.diffToolbar.setIconSize(QSize(16,16))
self.diffToolbar.setStyleSheet(qtlib.tbstylesheet)
hbox.addWidget(self.diffToolbar)
self.filenamelabel = w = QLabel()
w.setWordWrap(True)
f = w.textInteractionFlags()
w.setTextInteractionFlags(f | Qt.TextSelectableByMouse)
w.linkActivated.connect(self.linkActivated)
hbox.addWidget(w, 1)
self.extralabel = w = QLabel()
w.setWordWrap(True)
w.linkActivated.connect(self.linkActivated)
self.topLayout.addWidget(w)
w.hide()
framelayout.addLayout(self.topLayout)
framelayout.addLayout(l, 1)
hbox = QHBoxLayout()
hbox.setContentsMargins(0, 0, 0, 0)
hbox.setSpacing(0)
l.addLayout(hbox)
self.blk = blockmatcher.BlockList(self)
self.blksearch = blockmatcher.BlockList(self)
self.sci = AnnotateView(repoagent, self)
self._forceviewindicator = None
hbox.addWidget(self.blk)
hbox.addWidget(self.sci, 1)
hbox.addWidget(self.blksearch)
self.sci.showMessage.connect(self.showMessage)
self.sci.setAnnotationEnabled(False)
self.sci.setContextMenuPolicy(Qt.CustomContextMenu)
self.sci.customContextMenuRequested.connect(self.menuRequest)
self.annmarginclicked = False
self.sci.marginClicked.connect(self.marginClicked)
self.blk.linkScrollBar(self.sci.verticalScrollBar())
self.blk.setVisible(False)
self.blksearch.linkScrollBar(self.sci.verticalScrollBar())
self.blksearch.setVisible(False)
self.sci.setReadOnly(True)
self.sci.setUtf8(True)
keys = set((Qt.Key_Space,))
self.sci.installEventFilter(qscilib.KeyPressInterceptor(self, keys))
self.sci.setCaretLineVisible(False)
# define markers for colorize zones of diff
self.markerplus = self.sci.markerDefine(qsci.Background)
self.markerminus = self.sci.markerDefine(qsci.Background)
self.markertriangle = self.sci.markerDefine(qsci.Background)
self.sci.setMarkerBackgroundColor(QColor('#B0FFA0'), self.markerplus)
self.sci.setMarkerBackgroundColor(QColor('#A0A0FF'), self.markerminus)
self.sci.setMarkerBackgroundColor(QColor('#FFA0A0'), self.markertriangle)
self._checkedpix = qtlib.getcheckboxpixmap(QStyle.State_On,
QColor('#B0FFA0'), self)
self.inclmarker = self.sci.markerDefine(self._checkedpix, -1)
self._uncheckedpix = qtlib.getcheckboxpixmap(QStyle.State_Off,
QColor('#B0FFA0'), self)
self.exclmarker = self.sci.markerDefine(self._uncheckedpix, -1)
self.exclcolor = self.sci.markerDefine(qsci.Background, -1)
self.sci.setMarkerBackgroundColor(QColor('lightgrey'), self.exclcolor)
self.sci.setMarkerForegroundColor(QColor('darkgrey'), self.exclcolor)
mask = (1 << self.inclmarker) | (1 << self.exclmarker) | \
(1 << self.exclcolor)
self.sci.setMarginType(4, qsci.SymbolMargin)
self.sci.setMarginMarkerMask(4, mask)
self.markexcluded = QSettings().value('changes-mark-excluded').toBool()
self.excludeindicator = -1
self.updateChunkIndicatorMarks()
self.sci.setIndicatorDrawUnder(True, self.excludeindicator)
self.sci.setIndicatorForegroundColor(QColor('gray'), self.excludeindicator)
# hide margin 0 (markers)
self.sci.setMarginType(0, qsci.SymbolMargin)
self.sci.setMarginWidth(0, 0)
self.searchbar = qscilib.SearchToolBar(hidable=True)
self.searchbar.hide()
self.searchbar.searchRequested.connect(self.find)
self.searchbar.conditionChanged.connect(self.highlightText)
self.layout().addWidget(self.searchbar)
self._ctx = None
self._filename = None
self._status = None
self._mode = None
self._parent = 0
self._lostMode = None
self._lastSearch = u'', False
self.actionDiffMode = QAction(qtlib.geticon('view-diff'),
_('View change as unified diff output'),
self)
self.actionDiffMode.setCheckable(True)
self.actionDiffMode._mode = DiffMode
self.actionFileMode = QAction(qtlib.geticon('view-file'),
_('View change in context of file'),
self)
self.actionFileMode.setCheckable(True)
self.actionFileMode._mode = FileMode
self.actionAnnMode = QAction(qtlib.geticon('view-annotate'),
_('annotate with revision numbers'),
self)
self.actionAnnMode.setCheckable(True)
self.actionAnnMode._mode = AnnMode
self.modeToggleGroup = QActionGroup(self)
self.modeToggleGroup.addAction(self.actionDiffMode)
self.modeToggleGroup.addAction(self.actionFileMode)
self.modeToggleGroup.addAction(self.actionAnnMode)
self.modeToggleGroup.triggered.connect(self._setModeByAction)
# Next/Prev diff (in full file mode)
self.actionNextDiff = QAction(qtlib.geticon('go-down'),
_('Next diff (alt+down)'), self)
self.actionNextDiff.setShortcut('Alt+Down')
self.actionNextDiff.triggered.connect(self.nextDiff)
self.actionPrevDiff = QAction(qtlib.geticon('go-up'),
_('Previous diff (alt+up)'), self)
self.actionPrevDiff.setShortcut('Alt+Up')
self.actionPrevDiff.triggered.connect(self.prevDiff)
self._setModeByAction(self.actionDiffMode)
self.actionFirstParent = QAction('1', self)
self.actionFirstParent.setCheckable(True)
self.actionFirstParent.setChecked(True)
self.actionFirstParent.setShortcut('CTRL+1')
self.actionFirstParent.setToolTip(_('Show changes from first parent'))
self.actionSecondParent = QAction('2', self)
self.actionSecondParent.setCheckable(True)
self.actionSecondParent.setShortcut('CTRL+2')
self.actionSecondParent.setToolTip(_('Show changes from second parent'))
self.parentToggleGroup = QActionGroup(self)
self.parentToggleGroup.addAction(self.actionFirstParent)
self.parentToggleGroup.addAction(self.actionSecondParent)
self.parentToggleGroup.triggered.connect(self.setParent)
self.actionFind = self.searchbar.toggleViewAction()
self.actionFind.setIcon(qtlib.geticon('edit-find'))
self.actionFind.setToolTip(_('Toggle display of text search bar'))
self.actionFind.triggered.connect(self.searchbarTriggered)
qtlib.newshortcutsforstdkey(QKeySequence.Find, self, self.showsearchbar)
self.actionShelf = QAction('Shelve', self)
self.actionShelf.setIcon(qtlib.geticon('shelve'))
self.actionShelf.setToolTip(_('Open shelve tool'))
self.actionShelf.triggered.connect(self.launchShelve)
tb = self.diffToolbar
tb.addAction(self.actionFirstParent)
tb.addAction(self.actionSecondParent)
tb.addSeparator()
tb.addAction(self.actionDiffMode)
tb.addAction(self.actionFileMode)
tb.addAction(self.actionAnnMode)
tb.addSeparator()
tb.addAction(self.actionNextDiff)
tb.addAction(self.actionPrevDiff)
tb.addSeparator()
tb.addAction(self.actionFind)
tb.addAction(self.actionShelf)
self.timer = QTimer(self)
self.timer.setSingleShot(False)
self.timer.timeout.connect(self.timerBuildDiffMarkers)
