4rkal/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-01-10 03:42:05 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

SettingsLog: fix TextArea layout, border, scrollbar

Browse Source
This commit is contained in:
xiphon 2018-12-19 04:54:43 +00:00
parent bac833c1dd
commit d2d4c21cde
2 changed files with 76 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
components/DaemonConsole.qml
View File

@ -87,10 +87,17 @@ Window {
anchors.margins: 35 * scaleRatio anchors.margins: 35 * scaleRatio
spacing: 20 * scaleRatio spacing: 20 * scaleRatio
RowLayout { Item {
id: content
Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true
Rectangle {
anchors.fill: parent
color: "transparent"
border.color: MoneroComponents.Style.inputBorderColorActive
border.width: 1
radius: 4
}
Flickable { Flickable {
id: flickable id: flickable
@ -101,20 +108,12 @@ Window {
textFormat: TextEdit.RichText textFormat: TextEdit.RichText
selectByMouse: true selectByMouse: true
selectByKeyboard: true selectByKeyboard: true
anchors.fill: parent font.family: MoneroComponents.Style.defaultFontColor
font.family: "Ariel"
font.pixelSize: 14 * scaleRatio font.pixelSize: 14 * scaleRatio
color: MoneroComponents.Style.defaultFontColor color: MoneroComponents.Style.defaultFontColor
selectionColor: MoneroComponents.Style.dimmedFontColor selectionColor: MoneroComponents.Style.dimmedFontColor
wrapMode: TextEdit.Wrap wrapMode: TextEdit.Wrap
readOnly: true readOnly: true
background: Rectangle {
color: "transparent"
anchors.fill: parent
border.color: Qt.rgba(255, 255, 255, 0.25);
border.width: 1
radius: 4
}
function logCommand(msg){ function logCommand(msg){
msg = log_color(msg, "lime"); msg = log_color(msg, "lime");
textArea.append(msg); textArea.append(msg);
@ -156,15 +155,7 @@ Window {
} }
} }
ScrollBar.vertical: ScrollBar { ScrollBar.vertical: ScrollBar {}
// TODO: scrollbar always visible is buggy.
// QT 5.9 introduces `policy: ScrollBar.AlwaysOn`
contentItem.opacity: 1
anchors.top: flickable.top
anchors.left: flickable.right
anchors.leftMargin: 10 * scaleRatio
anchors.bottom: flickable.bottom
}
} }
} }

131
pages/settings/SettingsLog.qml
View File

@ -138,79 +138,76 @@ Rectangle {
text: qsTr("Daemon log") + translationManager.emptyString text: qsTr("Daemon log") + translationManager.emptyString
} }
Flickable { Item {
id: flickable Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 240 * scaleRatio Layout.preferredHeight: 240 * scaleRatio
TextArea.flickable: TextArea { Rectangle {
id : consoleArea
anchors.fill: parent anchors.fill: parent
color: MoneroComponents.Style.defaultFontColor color: "transparent"
selectionColor: MoneroComponents.Style.dimmedFontColor border.color: MoneroComponents.Style.inputBorderColorActive
textFormat: TextEdit.RichText border.width: 1
selectByMouse: true radius: 4
selectByKeyboard: true
font.family: "Ariel"
font.pixelSize: 14 * scaleRatio
wrapMode: TextEdit.Wrap
readOnly: true
background: Rectangle {
color: "transparent"
anchors.fill: parent
border.color: Qt.rgba(255, 255, 255, 0.25);
border.width: 1
radius: 4
}
function logCommand(msg){
msg = log_color(msg, "lime");
consoleArea.append(msg);
}
function logMessage(msg){
msg = msg.trim();
var color = "white";
if(msg.toLowerCase().indexOf('error') >= 0){
color = "red";
} else if (msg.toLowerCase().indexOf('warning') >= 0){
color = "yellow";
}
// format multi-lines
if(msg.split("\n").length >= 2){
msg = msg.split("\n").join('<br>');
}
log(msg, color);
}
function log_color(msg, color){
return "<span style='color: " + color + ";' >" + msg + "</span>";
}
function log(msg, color){
var timestamp = Utils.formatDate(new Date(), {
weekday: undefined,
month: "numeric",
timeZoneName: undefined
});
var _timestamp = log_color("[" + timestamp + "]", "#FFFFFF");
var _msg = log_color(msg, color);
consoleArea.append(_timestamp + " " + _msg);
// scroll to bottom
//if(flickable.contentHeight > content.height){
// flickable.contentY = flickable.contentHeight;
//}
}
} }
ScrollBar.vertical: ScrollBar { Flickable {
// TODO: scrollbar always visible is buggy. id: flickable
// QT 5.9 introduces `policy: ScrollBar.AlwaysOn` anchors.fill: parent
contentItem.opacity: 1
anchors.top: flickable.top TextArea.flickable: TextArea {
anchors.left: flickable.right id : consoleArea
anchors.leftMargin: 10 * scaleRatio color: MoneroComponents.Style.defaultFontColor
anchors.bottom: flickable.bottom selectionColor: MoneroComponents.Style.dimmedFontColor
textFormat: TextEdit.RichText
selectByMouse: true
selectByKeyboard: true
font.family: MoneroComponents.Style.defaultFontColor
font.pixelSize: 14 * scaleRatio
wrapMode: TextEdit.Wrap
readOnly: true
function logCommand(msg){
msg = log_color(msg, "lime");
consoleArea.append(msg);
}
function logMessage(msg){
msg = msg.trim();
var color = "white";
if(msg.toLowerCase().indexOf('error') >= 0){
color = "red";
} else if (msg.toLowerCase().indexOf('warning') >= 0){
color = "yellow";
}
// format multi-lines
if(msg.split("\n").length >= 2){
msg = msg.split("\n").join('<br>');
}
log(msg, color);
}
function log_color(msg, color){
return "<span style='color: " + color + ";' >" + msg + "</span>";
}
function log(msg, color){
var timestamp = Utils.formatDate(new Date(), {
weekday: undefined,
month: "numeric",
timeZoneName: undefined
});
var _timestamp = log_color("[" + timestamp + "]", "#FFFFFF");
var _msg = log_color(msg, color);
consoleArea.append(_timestamp + " " + _msg);
// scroll to bottom
//if(flickable.contentHeight > content.height){
// flickable.contentY = flickable.contentHeight;
//}
}
}
ScrollBar.vertical: ScrollBar {}
} }
} }