lukechilds
/
ethminer
mirror of https://github.com/lukechilds/ethminer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

ui changes

cl-refactor
yann300 10 years ago
parent
bcb76ac2a7
commit
323a1aea0e
2 changed files with 161 additions and 85 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 244
      mix/qml/LogsPane.qml
  2. 2
      mix/qml/LogsPaneStyle.qml

244
mix/qml/LogsPane.qml
View File

@ -189,12 +189,13 @@ Rectangle
Rectangle
{
color: "transparent"
height: 20
width: 50
anchors.verticalCenter: parent.verticalCenter
height: parent.height
width: 40
DefaultLabel
{
anchors.verticalCenter: parent.verticalCenter
color: "#808080"
font.pointSize: Style.absoluteSize(-3)
font.family: LogsPaneStyle.generic.layout.logLabelFont
text: qsTr("Show:")
}
@ -204,7 +205,7 @@ Rectangle
anchors.verticalCenter: parent.verticalCenter
width: 1;
height: parent.height
color : "#808080"
color : "transparent"
}
ToolButton {
@ -232,7 +233,7 @@ Rectangle
}
background:
Rectangle {
color: javascriptButton.checked ? "#cfcfcf" : "transparent"
color: javascriptButton.checked ? "#dcdcdc" : "transparent"
}
}
}
@ -241,7 +242,14 @@ Rectangle
anchors.verticalCenter: parent.verticalCenter
width: 1;
height: parent.height
color : "#808080"
color : "#d3d0d0"
}
Rectangle {
anchors.verticalCenter: parent.verticalCenter
width: 1;
height: parent.height
color : "#f2f1f2"
}
ToolButton {
@ -269,7 +277,7 @@ Rectangle
}
background:
Rectangle {
color: runButton.checked ? "#cfcfcf" : "transparent"
color: runButton.checked ? "#dcdcdc" : "transparent"
}
}
}
@ -278,7 +286,14 @@ Rectangle
anchors.verticalCenter: parent.verticalCenter
width: 1;
height: parent.height
color : "#808080"
color : "#d3d0d0"
}
Rectangle {
anchors.verticalCenter: parent.verticalCenter
width: 1;
height: parent.height
color : "#f2f1f2"
}
ToolButton {
@ -306,7 +321,7 @@ Rectangle
}
background:
Rectangle {
color: stateButton.checked ? "#cfcfcf" : "transparent"
color: stateButton.checked ? "#dcdcdc" : "transparent"
}
}
}
@ -315,7 +330,14 @@ Rectangle
anchors.verticalCenter: parent.verticalCenter
width: 1;
height: parent.height
color : "#808080"
color : "#d3d0d0"
}
Rectangle {
anchors.verticalCenter: parent.verticalCenter
width: 1;
height: parent.height
color : "#f2f1f2"
}
}
@ -323,98 +345,97 @@ Rectangle
{
height: parent.height
anchors.right: parent.right
anchors.rightMargin: 4
spacing: 4
Button
anchors.rightMargin: 10
spacing: 10
Rectangle
{
id: clearButton
height: LogsPaneStyle.generic.layout.headerButtonHeight
anchors.verticalCenter: parent.verticalCenter
action: hideAction
iconSource: "qrc:/qml/img/cleariconactive.png"
style:
ButtonStyle {
background:
Rectangle {
height: LogsPaneStyle.generic.layout.headerButtonHeight
implicitHeight: LogsPaneStyle.generic.layout.headerButtonHeight
color: "transparent"
color: "transparent"
width: 20
Button
{
id: clearButton
action: clearAction
anchors.fill: parent
anchors.verticalCenter: parent.verticalCenter
height: 25
style:
ButtonStyle {
background:
Rectangle {
height: LogsPaneStyle.generic.layout.headerButtonHeight
implicitHeight: LogsPaneStyle.generic.layout.headerButtonHeight
color: "transparent"
}
}
}
}
Image {
id: clearImage
source: "qrc:/qml/img/cleariconactive.png"
anchors.centerIn: parent
fillMode: Image.PreserveAspectFit
width: 30
height: 30
}
Image {
id: clearImage
source: "qrc:/qml/img/cleariconactive.png"
anchors.centerIn: parent
fillMode: Image.PreserveAspectFit
width: 20
height: 20
}
Button
{
id: exitButton
height: LogsPaneStyle.generic.layout.headerButtonHeight
anchors.verticalCenter: parent.verticalCenter
action: exitAction
iconSource: "qrc:/qml/img/exit.png"
style:
ButtonStyle {
background:
Rectangle {
height: LogsPaneStyle.generic.layout.headerButtonHeight
color: "transparent"
Action {
id: clearAction
enabled: logsModel.count > 0
tooltip: qsTr("Clear")
onTriggered: {
logsModel.clear();
}
}
}
Button
Rectangle
{
id: copyButton
height: LogsPaneStyle.generic.layout.headerButtonHeight
anchors.verticalCenter: parent.verticalCenter
action: copytoClipBoardAction
iconSource: "qrc:/qml/img/copyiconactive.png"
style:
ButtonStyle {
background:
Rectangle {
height: LogsPaneStyle.generic.layout.headerButtonHeight
color: "transparent"
color: "transparent"
width: 20
Button
{
id: copyButton
action: copyAction
anchors.fill: parent
anchors.verticalCenter: parent.verticalCenter
height: 25
style:
ButtonStyle {
background:
Rectangle {
height: LogsPaneStyle.generic.layout.headerButtonHeight
implicitHeight: LogsPaneStyle.generic.layout.headerButtonHeight
color: "transparent"
}
}
}
}
Action {
id: clearAction
tooltip: qsTr("Hide")
onTriggered: {
logsPane.parent.toggle();
}
}
Action {
id: hideAction
enabled: logsModel.count > 0
tooltip: qsTr("Clear")
onTriggered: {
logsModel.clear()
Image {
id: copyImage
source: "qrc:/qml/img/copyiconactive.png"
anchors.centerIn: parent
fillMode: Image.PreserveAspectFit
width: 20
height: 20
}
}
Action {
id: copytoClipBoardAction
enabled: logsModel.count > 0
tooltip: qsTr("Copy to Clipboard")
onTriggered: {
var content = "";
for (var k = 0; k < logsModel.count; k++)
{
var log = logsModel.get(k);
content += log.type + "\t" + log.level + "\t" + log.date + "\t" + log.content + "\n";
Action {
id: copyAction
enabled: logsModel.count > 0
tooltip: qsTr("Copy to Clipboard")
onTriggered: {
var content = "";
for (var k = 0; k < logsModel.count; k++)
{
var log = logsModel.get(k);
content += log.type + "\t" + log.level + "\t" + log.date + "\t" + log.content + "\n";
}
clipboard.text = content;
}
clipboard.text = content;
}
}
@ -427,10 +448,22 @@ Rectangle
font.family: LogsPaneStyle.generic.layout.logLabelFont
font.pointSize: Style.absoluteSize(-3)
font.italic: true
text: qsTr("Search")
text: qsTr(" - Search - ")
onFocusChanged:
{
if (!focus && text === "")
text = qsTr(" - Search - ");
else if (focus && text === qsTr(" - Search - "))
text = "";
}
onTextChanged: {
proxyModel.search(text);
if (text === qsTr(" - Search - "))
proxyModel.search("");
else
proxyModel.search(text);
}
style:
TextFieldStyle {
background: Rectangle {
@ -438,6 +471,49 @@ Rectangle
}
}
}
Rectangle
{
height: LogsPaneStyle.generic.layout.headerButtonHeight
anchors.verticalCenter: parent.verticalCenter
color: "transparent"
width: 20
Button
{
id: hideButton
action: hideAction
anchors.fill: parent
anchors.verticalCenter: parent.verticalCenter
height: 25
style:
ButtonStyle {
background:
Rectangle {
height: LogsPaneStyle.generic.layout.headerButtonHeight
implicitHeight: LogsPaneStyle.generic.layout.headerButtonHeight
color: "transparent"
}
}
}
Image {
id: hideImage
source: "qrc:/qml/img/exit.png"
anchors.centerIn: parent
fillMode: Image.PreserveAspectFit
width: 20
height: 20
}
Action {
id: hideAction
tooltip: qsTr("Exit")
onTriggered: {
logsPane.parent.toggle();
}
}
}
}
}
}

2
mix/qml/LogsPaneStyle.qml
View File

@ -12,7 +12,7 @@ QtObject {
property QtObject layout: QtObject {
property string backgroundColor: "#f7f7f7"
property int headerHeight: 30
property int headerButtonSpacing: 1
property int headerButtonSpacing: 0
property int leftMargin: 10
property int headerButtonHeight: 30
property string logLabelColor: "#808080"

Write Preview
Loading…
Cancel
Save