mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-22 20:56:42 +00:00
changed icomoon to simple line icons
This commit is contained in:
parent
b979ab0ae2
commit
c591a8a18e
4 changed files with 86 additions and 17 deletions
BIN
cmd/mist/assets/qml/fonts/Simple-Line-Icons.ttf
Executable file
BIN
cmd/mist/assets/qml/fonts/Simple-Line-Icons.ttf
Executable file
Binary file not shown.
BIN
cmd/mist/assets/qml/fonts/icomoon.ttf
Executable file
BIN
cmd/mist/assets/qml/fonts/icomoon.ttf
Executable file
Binary file not shown.
|
|
@ -20,8 +20,8 @@ ApplicationWindow {
|
||||||
|
|
||||||
width: 1200
|
width: 1200
|
||||||
height: 820
|
height: 820
|
||||||
minimumHeight: 800
|
minimumHeight: 600
|
||||||
minimumWidth: 600
|
minimumWidth: 800
|
||||||
|
|
||||||
title: "Mist"
|
title: "Mist"
|
||||||
|
|
||||||
|
|
@ -254,6 +254,8 @@ ApplicationWindow {
|
||||||
|
|
||||||
statusBar: StatusBar {
|
statusBar: StatusBar {
|
||||||
//height: 32
|
//height: 32
|
||||||
|
visible: false
|
||||||
|
|
||||||
id: statusBar
|
id: statusBar
|
||||||
Label {
|
Label {
|
||||||
//y: 6
|
//y: 6
|
||||||
|
|
@ -273,11 +275,10 @@ ApplicationWindow {
|
||||||
}
|
}
|
||||||
|
|
||||||
Label {
|
Label {
|
||||||
//y: 6
|
|
||||||
id: lastBlockLabel
|
id: lastBlockLabel
|
||||||
objectName: "lastBlockLabel"
|
objectName: "lastBlockLabel"
|
||||||
visible: true
|
visible: true
|
||||||
text: ""
|
text: "---"
|
||||||
font.pixelSize: 10
|
font.pixelSize: 10
|
||||||
anchors.right: peerGroup.left
|
anchors.right: peerGroup.left
|
||||||
anchors.rightMargin: 5
|
anchors.rightMargin: 5
|
||||||
|
|
@ -395,6 +396,36 @@ ApplicationWindow {
|
||||||
FontLoader {
|
FontLoader {
|
||||||
source: "fonts/SourceSansPro-ExtraLight.ttf"
|
source: "fonts/SourceSansPro-ExtraLight.ttf"
|
||||||
}
|
}
|
||||||
|
FontLoader {
|
||||||
|
id: simpleLineIcons
|
||||||
|
source: "fonts/Simple-Line-Icons.ttf"
|
||||||
|
}
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
color: "steelblue"
|
||||||
|
anchors.fill: parent
|
||||||
|
|
||||||
|
MouseArea {
|
||||||
|
anchors.fill: parent
|
||||||
|
property real lastMouseX: 0
|
||||||
|
property real lastMouseY: 0
|
||||||
|
onPressed: {
|
||||||
|
lastMouseX = mouseX
|
||||||
|
lastMouseY = mouseY
|
||||||
|
}
|
||||||
|
onPositionChanged: {
|
||||||
|
root.x += (mouseX - lastMouseX)
|
||||||
|
root.y += (mouseY - lastMouseY)
|
||||||
|
}
|
||||||
|
/*onDoubleClicked: {
|
||||||
|
//!maximized ? view.set_max() : view.set_normal()}
|
||||||
|
visibility = "Minimized"
|
||||||
|
}*/
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
Rectangle {
|
Rectangle {
|
||||||
width: parent.height
|
width: parent.height
|
||||||
|
|
@ -422,6 +453,10 @@ ApplicationWindow {
|
||||||
property alias secondaryTitle: secondary.text
|
property alias secondaryTitle: secondary.text
|
||||||
function setSelection(on) {
|
function setSelection(on) {
|
||||||
sel.visible = on
|
sel.visible = on
|
||||||
|
|
||||||
|
if (this.closable == true) {
|
||||||
|
closeIcon.visible = on
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function setAsBigButton(on) {
|
function setAsBigButton(on) {
|
||||||
|
|
@ -500,9 +535,19 @@ ApplicationWindow {
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
hoverEnabled: true
|
||||||
onClicked: {
|
onClicked: {
|
||||||
activeView(view, menuItem);
|
activeView(view, menuItem);
|
||||||
}
|
}
|
||||||
|
onEntered: {
|
||||||
|
if (parent.closable == true) {
|
||||||
|
closeIcon.visible = sel.visible
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
onExited: {
|
||||||
|
closeIcon.visible = false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Image {
|
Image {
|
||||||
|
|
@ -514,12 +559,6 @@ ApplicationWindow {
|
||||||
verticalCenter: parent.verticalCenter
|
verticalCenter: parent.verticalCenter
|
||||||
leftMargin: 6
|
leftMargin: 6
|
||||||
}
|
}
|
||||||
MouseArea {
|
|
||||||
anchors.fill: parent
|
|
||||||
onClicked: {
|
|
||||||
menuItem.closeApp()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
|
|
@ -531,7 +570,6 @@ ApplicationWindow {
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
color: "#AAA0A0"
|
color: "#AAA0A0"
|
||||||
//font.family: SourceSansProRegular.name
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
|
|
@ -542,8 +580,9 @@ ApplicationWindow {
|
||||||
left: icon.right
|
left: icon.right
|
||||||
verticalCenter: parent.verticalCenter
|
verticalCenter: parent.verticalCenter
|
||||||
leftMargin: 6
|
leftMargin: 6
|
||||||
|
// verticalCenterOffset: -10
|
||||||
}
|
}
|
||||||
|
x:250
|
||||||
color: "#665F5F"
|
color: "#665F5F"
|
||||||
font.pixelSize: 14
|
font.pixelSize: 14
|
||||||
}
|
}
|
||||||
|
|
@ -554,14 +593,44 @@ ApplicationWindow {
|
||||||
font.family: sourceSansPro.name
|
font.family: sourceSansPro.name
|
||||||
font.weight: Font.Light
|
font.weight: Font.Light
|
||||||
anchors {
|
anchors {
|
||||||
right: parent.right
|
left: icon.right
|
||||||
rightMargin: 8
|
leftMargin: 6
|
||||||
verticalCenter: parent.verticalCenter
|
top: label.bottom
|
||||||
}
|
}
|
||||||
color: "#6691C2"
|
color: "#6691C2"
|
||||||
font.pixelSize: 12
|
font.pixelSize: 12
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
id: closeIcon
|
||||||
|
visible: false
|
||||||
|
width: 10
|
||||||
|
height: 10
|
||||||
|
color: "#FFFFFF"
|
||||||
|
anchors {
|
||||||
|
fill: icon
|
||||||
|
}
|
||||||
|
|
||||||
|
MouseArea {
|
||||||
|
anchors.fill: parent
|
||||||
|
onClicked: {
|
||||||
|
menuItem.closeApp()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Text {
|
||||||
|
|
||||||
|
font.family: simpleLineIcons.name
|
||||||
|
anchors {
|
||||||
|
centerIn: parent
|
||||||
|
}
|
||||||
|
color: "#665F5F"
|
||||||
|
font.pixelSize: 18
|
||||||
|
text: "\ue082"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function closeApp() {
|
function closeApp() {
|
||||||
if(!this.closable) { return; }
|
if(!this.closable) { return; }
|
||||||
|
|
@ -608,7 +677,7 @@ ApplicationWindow {
|
||||||
|
|
||||||
var comp = menuItemTemplate.createObject(section)
|
var comp = menuItemTemplate.createObject(section)
|
||||||
comp.view = view
|
comp.view = view
|
||||||
comp.title = options.section // view.title
|
comp.title = view.title
|
||||||
|
|
||||||
if(view.hasOwnProperty("iconSource")) {
|
if(view.hasOwnProperty("iconSource")) {
|
||||||
comp.icon = view.iconSource;
|
comp.icon = view.iconSource;
|
||||||
|
|
|
||||||
|
|
@ -96,7 +96,7 @@ Rectangle {
|
||||||
MouseArea {
|
MouseArea {
|
||||||
id: clickAnywhereOnApp
|
id: clickAnywhereOnApp
|
||||||
z:15
|
z:15
|
||||||
hoverEnabled: true
|
//hoverEnabled: true
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
/*hoverEnabled: true*/
|
/*hoverEnabled: true*/
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue