#
#
# patch "res/forms/dialogs/preferences.ui"
# from [327656a4a5ef7e0e3ae9d722e096ac2a5dcec7f8]
# to [c8d5fe2c755af7778eddbc3dffeb5389ef7f63cc]
#
# patch "src/util/Settings.cpp"
# from [780e06e95af4526a874f16c1c19f605c7c5f726e]
# to [9d123c78416358019ef578c180fadf9a1a15b8af]
#
# patch "src/view/dialogs/Preferences.cpp"
# from [c7710f84195312f06561d3c7c1dd231f7245953d]
# to [a01968284cdcb12279a4f45d6e3765f3baf2d7ac]
#
============================================================
--- res/forms/dialogs/preferences.ui 327656a4a5ef7e0e3ae9d722e096ac2a5dcec7f8
+++ res/forms/dialogs/preferences.ui c8d5fe2c755af7778eddbc3dffeb5389ef7f63cc
@@ -23,7 +23,7 @@
Preferences
-
+
:/icons/guitone.png:/icons/guitone.png
@@ -45,7 +45,7 @@
QTabWidget::Rounded
- 2
+ 0
false
@@ -159,94 +159,257 @@
-
-
+
-
-
+
- background color of added lines in diffs
+ Pick a color for the newest and oldest revision of an annotated file. The colors of the revisions in between are calculated automatically.
+The highlight color determines the background color of lines which have changed in the same revision.
+
+ true
+
-
-
+
Qt::Horizontal
- 40
- 20
+ 24
+ 49
-
-
-
-
- 0
- 0
-
-
-
-
- 60
- 20
-
-
-
- QFrame::Panel
-
-
- QFrame::Sunken
-
-
+
+
-
+
+
+
+ 11
+
+
+
+ oldest revision
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 30
+ 20
+
+
+
+ QFrame::Panel
+
+
+ QFrame::Sunken
+
+
+
+ -
+
+
+
+ 11
+
+
+
+ newest revision
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 30
+ 20
+
+
+
+ QFrame::Panel
+
+
+ QFrame::Sunken
+
+
+
+ -
+
+
+
+ 11
+
+
+
+ highlight
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 30
+ 20
+
+
+
+ QFrame::Panel
+
+
+ QFrame::Sunken
+
+
+
+
-
-
+
+
+ Qt::Horizontal
+
+
+
+ -
+
-
-
+
- background color of removed lines in diffs
+ Pick a color for added and removed lines of diffed files.
+
+ true
+
-
-
+
Qt::Horizontal
- 40
- 20
+ 36
+ 49
-
-
-
-
- 0
- 0
-
-
-
-
- 60
- 20
-
-
-
- QFrame::Panel
-
-
- QFrame::Sunken
-
-
+
+
-
+
+
+
+ 11
+
+
+
+ added lines
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 30
+ 20
+
+
+
+ QFrame::Panel
+
+
+ QFrame::Sunken
+
+
+
+ -
+
+
+
+ 11
+
+
+
+ removed lines
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 30
+ 20
+
+
+
+ QFrame::Panel
+
+
+ QFrame::Sunken
+
+
+
+
@@ -258,7 +421,7 @@
20
- 146
+ 32
@@ -380,7 +543,7 @@
selectMtnExecutable
-
+
============================================================
--- src/util/Settings.cpp 780e06e95af4526a874f16c1c19f605c7c5f726e
+++ src/util/Settings.cpp 9d123c78416358019ef578c180fadf9a1a15b8af
@@ -38,6 +38,9 @@ Settings::Settings() : QSettings()
Settings::Settings() : QSettings()
{
+ stringDefaults.insert("AnnotationColorOldestRevision", "#FCFFC0");
+ stringDefaults.insert("AnnotationColorNewestRevision", "#FF6609");
+ stringDefaults.insert("AnnotationColorHighlight", "#EEEEEE");
stringDefaults.insert("DiffColorAddedLines", "#90EE90");
stringDefaults.insert("DiffColorRemovedLines", "#FFCC99");
stringDefaults.insert("AskFileOpenExt",
============================================================
--- src/view/dialogs/Preferences.cpp c7710f84195312f06561d3c7c1dd231f7245953d
+++ src/view/dialogs/Preferences.cpp a01968284cdcb12279a4f45d6e3765f3baf2d7ac
@@ -110,6 +110,18 @@ void Preferences::init()
Qt::Checked : Qt::Unchecked
);
+ colorPickerOldestAnnotatedRevision->setSelectedColor(
+ QColor(Settings::getString("AnnotationColorOldestRevision"))
+ );
+
+ colorPickerNewestAnnotatedRevision->setSelectedColor(
+ QColor(Settings::getString("AnnotationColorNewestRevision"))
+ );
+
+ colorPickerHighlightAnnotatedRevision->setSelectedColor(
+ QColor(Settings::getString("AnnotationColorHighlight"))
+ );
+
colorPickerAddedLines->setSelectedColor(
QColor(Settings::getString("DiffColorAddedLines"))
);
@@ -117,6 +129,7 @@ void Preferences::init()
colorPickerRemovedLines->setSelectedColor(
QColor(Settings::getString("DiffColorRemovedLines"))
);
+
relaxedVersionCheck->setCheckState(
Settings::getBool("RelaxedVersionCheck") ?
Qt::Checked : Qt::Unchecked
@@ -199,9 +212,18 @@ void Preferences::accept()
Settings::setBool("AskFileOpen", askFileOpen->isChecked());
Settings::setString("AskFileOpenExt", askFileOpenExtensions->text());
- Settings::setString("DiffColorAddedLines", colorPickerAddedLines->getSelectedColor().name());
- Settings::setString("DiffColorRemovedLines", colorPickerRemovedLines->getSelectedColor().name());
+ Settings::setString("AnnotationColorOldestRevision",
+ colorPickerOldestAnnotatedRevision->getSelectedColor().name());
+ Settings::setString("AnnotationColorNewestRevision",
+ colorPickerNewestAnnotatedRevision->getSelectedColor().name());
+ Settings::setString("AnnotationColorHighlight",
+ colorPickerHighlightAnnotatedRevision->getSelectedColor().name());
+ Settings::setString("DiffColorAddedLines",
+ colorPickerAddedLines->getSelectedColor().name());
+ Settings::setString("DiffColorRemovedLines",
+ colorPickerRemovedLines->getSelectedColor().name());
+
if (Settings::getBool("ReadWorkspaceIncrementally") !=
readWorkspaceIncrementally->isChecked())
{