diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2021-06-10 11:06:31 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2021-06-10 11:06:31 -0500 |
| commit | 0e561de0a902a90edce84af408ba5641547b9aa3 (patch) | |
| tree | a7f81eec7047dfbff5d06926068e3ff1fa92b057 | |
| parent | ceac6c8a478bd94b3f1faea4b77f1ca5536d7a87 (diff) | |
| parent | c5bad8ec49fee2bdea7469a2b5ccc6287a42d728 (diff) | |
| download | monzero-gui-0e561de0a902a90edce84af408ba5641547b9aa3.tar.gz monzero-gui-0e561de0a902a90edce84af408ba5641547b9aa3.tar.xz monzero-gui-0e561de0a902a90edce84af408ba5641547b9aa3.zip | |
Merge pull request #3543
c5bad8e SettingsLog: fix text color bug on theme switch; new warning and green text colors (rating89us)
| -rw-r--r-- | pages/settings/SettingsLog.qml | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/pages/settings/SettingsLog.qml b/pages/settings/SettingsLog.qml index 8870a564..2b84ed60 100644 --- a/pages/settings/SettingsLog.qml +++ b/pages/settings/SettingsLog.qml @@ -132,6 +132,18 @@ Rectangle { font.pixelSize: 18 font.family: MoneroComponents.Style.fontRegular.name text: qsTr("Daemon log") + translationManager.emptyString + themeTransition: false + onColorChanged: { + var flickableContentYBefore = flickable.contentY + var daemonLogText = consoleArea.text + consoleArea.clear(); + if (MoneroComponents.Style.blackTheme) { + consoleArea.append(daemonLogText.replace(/#000000/g, '#ffffff').replace(/#008000/g, '#00ff00')); + } else { + consoleArea.append(daemonLogText.replace(/#ffffff/g, '#000000').replace(/#00ff00/g, '#008000')); + } + flickable.contentY = flickableContentYBefore + } } Item { @@ -164,7 +176,7 @@ Rectangle { wrapMode: TextEdit.Wrap readOnly: true function logCommand(msg){ - msg = log_color(msg, "lime"); + msg = log_color(msg, MoneroComponents.Style.blackTheme ? "lime" : "green"); consoleArea.append(msg); } function logMessage(msg){ @@ -173,7 +185,7 @@ Rectangle { if(msg.toLowerCase().indexOf('error') >= 0){ color = MoneroComponents.Style.errorColor; } else if (msg.toLowerCase().indexOf('warning') >= 0){ - color = MoneroComponents.Style.warningColor; + color = "#fa6800" } // format multi-lines |