feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Bazaar: fix code folding markers in the diff view

Browse Source 
The top-level marker is now centered on the line starting with '==='

Merge-request: 274
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
cerf
2011-03-14 19:32:42 +01:00
committed by Tobias Hunger
parent 2c088f06a0
commit d23d7cbc12
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/bazaar/bazaareditor.cpp
View File

@@ -57,7 +57,7 @@ using namespace Bazaar;
BazaarEditor::BazaarEditor(const VCSBase::VCSBaseEditorParameters *type, QWidget *parent) BazaarEditor::BazaarEditor(const VCSBase::VCSBaseEditorParameters *type, QWidget *parent)
: VCSBase::VCSBaseEditorWidget(type, parent), : VCSBase::VCSBaseEditorWidget(type, parent),
m_exactChangesetId(QLatin1String(Constants::CHANGESET_ID_EXACT)), m_exactChangesetId(QLatin1String(Constants::CHANGESET_ID_EXACT)),
m_diffIdentifier(QLatin1String(Constants::DIFFIDENTIFIER)) m_diffFileId(QLatin1String("^(=== modified file '.*'$)"))
{ {
setAnnotateRevisionTextFormat(tr("Annotate %1")); setAnnotateRevisionTextFormat(tr("Annotate %1"));
setAnnotatePreviousRevisionTextFormat(tr("Annotate parent revision %1")); setAnnotatePreviousRevisionTextFormat(tr("Annotate parent revision %1"));
@@ -99,7 +99,7 @@ QString BazaarEditor::changeUnderCursor(const QTextCursor &cursorIn) const
VCSBase::DiffHighlighter *BazaarEditor::createDiffHighlighter() const VCSBase::DiffHighlighter *BazaarEditor::createDiffHighlighter() const
{ {
return new VCSBase::DiffHighlighter(m_diffIdentifier); return new VCSBase::DiffHighlighter(m_diffFileId);
} }
VCSBase::BaseAnnotationHighlighter *BazaarEditor::createAnnotationHighlighter(const QSet<QString> &changes) const VCSBase::BaseAnnotationHighlighter *BazaarEditor::createAnnotationHighlighter(const QSet<QString> &changes) const

2
src/plugins/bazaar/bazaareditor.h
View File

@@ -55,7 +55,7 @@ private:
virtual QString fileNameFromDiffSpecification(const QTextBlock &diffFileSpec) const; virtual QString fileNameFromDiffSpecification(const QTextBlock &diffFileSpec) const;
const QRegExp m_exactChangesetId; const QRegExp m_exactChangesetId;
const QRegExp m_diffIdentifier; const QRegExp m_diffFileId;
}; };
} // namespace Internal } // namespace Internal

2
src/plugins/bazaar/constants.h
View File

@@ -44,7 +44,7 @@ const char * const BAZAARDEFAULT = "bzr";
//changeset identifiers //changeset identifiers
const char * const CHANGESET_ID = "([0-9]+)"; // match and capture const char * const CHANGESET_ID = "([0-9]+)"; // match and capture
const char * const CHANGESET_ID_EXACT = "[0-9]+"; // match const char * const CHANGESET_ID_EXACT = "[0-9]+"; // match
const char * const DIFFIDENTIFIER = "^[-+]{3,3} [ab]{1,1}.*"; // match e.g. +++ b/filename const char * const DIFF_ID = "^[-+]{3,3} [ab]{1,1}.*"; // match e.g. +++ b/filename
//BaseEditorParameters //BaseEditorParameters
const char * const COMMANDLOG_ID = "Bazaar Command Log Editor"; const char * const COMMANDLOG_ID = "Bazaar Command Log Editor";