#
#
# patch "res/forms/dialogs/preferences.ui"
# from [14f659f4b6ba836a6c3820328f18597530330f12]
# to [2d194aa7914728d2a400ca7dce283f878b19b63c]
#
# patch "src/model/GetBranchLog.cpp"
# from [b2c2d270c1214e885cdf42d627704abbccae1151]
# to [b118e62e7355a8e0f6bfe6178e304d4f30f54122]
#
# patch "src/model/GetBranchLog.h"
# from [7a2e0071fff1701f3e91e8ad5f77320194536cf5]
# to [9574b2dab0fafa4a8bc35c99bd927f0815f50dc2]
#
# patch "src/util/Settings.cpp"
# from [9d123c78416358019ef578c180fadf9a1a15b8af]
# to [b97572b9af33d21346538a6765f9d82d6f1611de]
#
# patch "src/view/dialogs/Preferences.cpp"
# from [a01968284cdcb12279a4f45d6e3765f3baf2d7ac]
# to [dcd25661e00b81d9b5347a225b257494763c65fd]
#
============================================================
--- res/forms/dialogs/preferences.ui 14f659f4b6ba836a6c3820328f18597530330f12
+++ res/forms/dialogs/preferences.ui 2d194aa7914728d2a400ca7dce283f878b19b63c
@@ -7,7 +7,7 @@
0
0
577
- 335
+ 375
@@ -426,6 +426,124 @@ The highlight color determines the backg
-
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
-
+
+
+ Pick a color for merge revisions and revisions which are not on the same branch in the changeset browser.
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+ true
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::MinimumExpanding
+
+
+
+ 10
+ 49
+
+
+
+
+ -
+
+
-
+
+
+ SizeableLabel {
+ qproperty-relativeSize: 0.85;
+}
+
+
+ merge revisions
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 30
+ 20
+
+
+
+ QFrame::Panel
+
+
+ QFrame::Sunken
+
+
+
+ -
+
+
+ SizeableLabel {
+ qproperty-relativeSize: 0.85;
+}
+
+
+ out-of-branch revisions
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 30
+ 20
+
+
+
+ QFrame::Panel
+
+
+ QFrame::Sunken
+
+
+
+
+
+
+
+ -
Qt::Vertical
============================================================
--- src/model/GetBranchLog.cpp b2c2d270c1214e885cdf42d627704abbccae1151
+++ src/model/GetBranchLog.cpp b118e62e7355a8e0f6bfe6178e304d4f30f54122
@@ -18,6 +18,7 @@
#include "GetBranchLog.h"
#include "BasicIOParser.h"
+#include "Settings.h"
#include
#include
@@ -39,6 +40,13 @@ void GetBranchLog::readMore(const QStrin
void GetBranchLog::readMore(const QString & branch, int count)
{
+ mergeRevsBrush = QBrush(QColor(
+ Settings::getString("ChangesetBrowserMergeRevisions")
+ ));
+ outOfBranchRevsBrush = QBrush(QColor(
+ Settings::getString("ChangesetBrowserOutOfBranchRevisions")
+ ));
+
revsRead = 0;
revsToRead = count;
@@ -231,13 +239,13 @@ QVariant GetBranchLog::data(const QModel
if (!branches.contains(currentBranch))
{
- return QVariant(QBrush(QColor("lightgrey")));
+ return QVariant(outOfBranchRevsBrush);
}
}
if (mergeRevs.contains(rev))
{
- return QVariant(QBrush(QColor("limegreen")));
+ return QVariant(mergeRevsBrush);
}
}
============================================================
--- src/model/GetBranchLog.h 7a2e0071fff1701f3e91e8ad5f77320194536cf5
+++ src/model/GetBranchLog.h 9574b2dab0fafa4a8bc35c99bd927f0815f50dc2
@@ -24,6 +24,7 @@
#include "Toposort.h"
#include
+#include
class GetBranchLog : public QAbstractItemModel, public AutomateCommand
{
@@ -59,6 +60,9 @@ private:
QSet mergeRevs;
QString currentBranch;
+ QBrush mergeRevsBrush;
+ QBrush outOfBranchRevsBrush;
+
int revsRead;
int revsToRead;
============================================================
--- src/util/Settings.cpp 9d123c78416358019ef578c180fadf9a1a15b8af
+++ src/util/Settings.cpp b97572b9af33d21346538a6765f9d82d6f1611de
@@ -43,6 +43,9 @@ Settings::Settings() : QSettings()
stringDefaults.insert("AnnotationColorHighlight", "#EEEEEE");
stringDefaults.insert("DiffColorAddedLines", "#90EE90");
stringDefaults.insert("DiffColorRemovedLines", "#FFCC99");
+ stringDefaults.insert("ChangesetBrowserMergeRevisions", "#32CD32");
+ stringDefaults.insert("ChangesetBrowserOutOfBranchRevisions", "#AAAAAA");
+
stringDefaults.insert("AskFileOpenExt",
"exe,com,bat,pif,hta,js,jse,inf,lnk," // Windows
"scr,wsc,wsf,wsh,vb,vbe,vbs,vbscript," // Windows, continued
============================================================
--- src/view/dialogs/Preferences.cpp a01968284cdcb12279a4f45d6e3765f3baf2d7ac
+++ src/view/dialogs/Preferences.cpp dcd25661e00b81d9b5347a225b257494763c65fd
@@ -130,6 +130,14 @@ void Preferences::init()
QColor(Settings::getString("DiffColorRemovedLines"))
);
+ colorPickerMergeRevisions->setSelectedColor(
+ QColor(Settings::getString("ChangesetBrowserMergeRevisions"))
+ );
+
+ colorPickerOutOfBranchRevisions->setSelectedColor(
+ QColor(Settings::getString("ChangesetBrowserOutOfBranchRevisions"))
+ );
+
relaxedVersionCheck->setCheckState(
Settings::getBool("RelaxedVersionCheck") ?
Qt::Checked : Qt::Unchecked
@@ -224,6 +232,11 @@ void Preferences::accept()
Settings::setString("DiffColorRemovedLines",
colorPickerRemovedLines->getSelectedColor().name());
+ Settings::setString("ChangesetBrowserMergeRevisions",
+ colorPickerMergeRevisions->getSelectedColor().name());
+ Settings::setString("ChangesetBrowserOutOfBranchRevisions",
+ colorPickerOutOfBranchRevisions->getSelectedColor().name());
+
if (Settings::getBool("ReadWorkspaceIncrementally") !=
readWorkspaceIncrementally->isChecked())
{