good morning!!!!

Skip to content
Snippets Groups Projects
Commit 6b5f4ed2 authored by Alexandre Van de Sande's avatar Alexandre Van de Sande
Browse files

Recreated the changes on a new branch

parent ddccea75
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 1067 additions and 878 deletions
cmd/mist/assets/backButton.png 0 → 100644
+ 0
− 0
View file @ 6b5f4ed2
cmd/mist/assets/backButton.png

663 B

cmd/mist/assets/backButton@2x.png 0 → 100644
+ 0
− 0
View file @ 6b5f4ed2
cmd/mist/assets/backButton@2x.png

1.46 KiB

cmd/mist/assets/qml/fonts/Simple-Line-Icons.ttf 0 → 100755
+ 0
− 0
View file @ 6b5f4ed2
File added
cmd/mist/assets/qml/fonts/SourceSansPro-Black.ttf 0 → 100644
+ 0
− 0
View file @ 6b5f4ed2
File added
cmd/mist/assets/qml/fonts/SourceSansPro-BlackIt.ttf 0 → 100644
+ 0
− 0
View file @ 6b5f4ed2
File added
cmd/mist/assets/qml/fonts/SourceSansPro-Bold.ttf 0 → 100644
+ 0
− 0
View file @ 6b5f4ed2
File added
cmd/mist/assets/qml/fonts/SourceSansPro-BoldIt.ttf 0 → 100644
+ 0
− 0
View file @ 6b5f4ed2
File added
cmd/mist/assets/qml/fonts/SourceSansPro-ExtraLight.ttf 0 → 100644
+ 0
− 0
View file @ 6b5f4ed2
File added
cmd/mist/assets/qml/fonts/SourceSansPro-ExtraLightIt.ttf 0 → 100644
+ 0
− 0
View file @ 6b5f4ed2
File added
cmd/mist/assets/qml/fonts/SourceSansPro-It.ttf 0 → 100644
+ 0
− 0
View file @ 6b5f4ed2
File added
cmd/mist/assets/qml/fonts/SourceSansPro-Light.ttf 0 → 100644
+ 0
− 0
View file @ 6b5f4ed2
File added
cmd/mist/assets/qml/fonts/SourceSansPro-LightIt.ttf 0 → 100644
+ 0
− 0
View file @ 6b5f4ed2
File added
cmd/mist/assets/qml/fonts/SourceSansPro-Regular.ttf 0 → 100644
+ 0
− 0
View file @ 6b5f4ed2
File added
cmd/mist/assets/qml/fonts/SourceSansPro-Semibold.ttf 0 → 100644
+ 0
− 0
View file @ 6b5f4ed2
File added
cmd/mist/assets/qml/fonts/SourceSansPro-SemiboldIt.ttf 0 → 100644
+ 0
− 0
View file @ 6b5f4ed2
File added
cmd/mist/assets/qml/fonts/SourceSerifPro-Bold.ttf 0 → 100644
+ 0
− 0
View file @ 6b5f4ed2
File added
cmd/mist/assets/qml/fonts/SourceSerifPro-Regular.ttf 0 → 100644
+ 0
− 0
View file @ 6b5f4ed2
File added
cmd/mist/assets/qml/fonts/SourceSerifPro-Semibold.ttf 0 → 100644
+ 0
− 0
View file @ 6b5f4ed2
File added
cmd/mist/assets/qml/fonts/icomoon.ttf 0 → 100755
+ 0
− 0
View file @ 6b5f4ed2
File added
cmd/mist/assets/qml/main.qml
+ 1067
− 878
View file @ 6b5f4ed2
......@@ -9,14 +9,19 @@ import Ethereum 1.0
import "../ext/filter.js" as Eth
import "../ext/http.js" as Http
ApplicationWindow {
id: root
//flags: Qt.FramelessWindowHint
// Use this to make the window frameless. But then you'll need to do move and resize by hand
property var ethx : Eth.ethx
width: 1200
height: 820
minimumWidth: 300
minimumHeight: 600
minimumWidth: 800
title: "Mist"
......@@ -33,9 +38,11 @@ ApplicationWindow {
// Takes care of loading all default plugins
Component.onCompleted: {
addPlugin("./views/catalog.qml", {noAdd: true, close: false, section: "begin"});
var wallet = addPlugin("./views/wallet.qml", {noAdd: true, close: false, section: "ethereum", active: true});
addPlugin("./views/miner.qml", {noAdd: true, close: false, section: "ethereum", active: true});
addPlugin("./views/miner.qml", {noAdd: true, close: false, section: "ethereum", active: true});
addPlugin("./views/transaction.qml", {noAdd: true, close: false, section: "legacy"});
addPlugin("./views/whisper.qml", {noAdd: true, close: false, section: "legacy"});
addPlugin("./views/chain.qml", {noAdd: true, close: false, section: "legacy"});
......@@ -44,7 +51,7 @@ ApplicationWindow {
mainSplit.setView(wallet.view, wallet.menuItem);
newBrowserTab(eth.assetPath("html/home.html"));
newBrowserTab("http://ethereum-dapp-whisper-client.meteor.com/chat/amsteam");
// Command setup
gui.sendCommand(0)
......@@ -113,6 +120,8 @@ ApplicationWindow {
activeView(window.view, window.menuItem);
}
menuBar: MenuBar {
Menu {
title: "File"
......@@ -137,7 +146,7 @@ ApplicationWindow {
text: "New tab"
shortcut: "Ctrl+t"
onTriggered: {
newBrowserTab("about:blank");
newBrowserTab("http://etherian.io");
}
}
......@@ -245,6 +254,8 @@ ApplicationWindow {
statusBar: StatusBar {
//height: 32
visible: false
id: statusBar
Label {
//y: 6
......@@ -264,11 +275,10 @@ ApplicationWindow {
}
Label {
//y: 6
id: lastBlockLabel
objectName: "lastBlockLabel"
visible: true
text: ""
text: "---"
font.pixelSize: 10
anchors.right: peerGroup.left
anchors.rightMargin: 5
......@@ -323,6 +333,11 @@ ApplicationWindow {
id: mainSplit
anchors.fill: parent
resizing: false
handleDelegate: Item {
Rectangle {
anchors.fill: parent
}
}
function setView(view, menu) {
for(var i = 0; i < views.length; i++) {
......@@ -359,10 +374,71 @@ ApplicationWindow {
********************/
Rectangle {
id: menu
Layout.minimumWidth: 210
Layout.maximumWidth: 210
Layout.minimumWidth: 192
Layout.maximumWidth: 192
FontLoader {
id: sourceSansPro
source: "fonts/SourceSansPro-Regular.ttf"
}
FontLoader {
source: "fonts/SourceSansPro-Semibold.ttf"
}
FontLoader {
source: "fonts/SourceSansPro-Bold.ttf"
}
FontLoader {
source: "fonts/SourceSansPro-Black.ttf"
}
FontLoader {
source: "fonts/SourceSansPro-Light.ttf"
}
FontLoader {
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
color: "#ececec"
Rectangle {
width: parent.height
height: parent.width
anchors.centerIn: parent
rotation: 90
gradient: Gradient {
GradientStop { position: 0.0; color: "#E2DEDE" }
GradientStop { position: 0.1; color: "#EBE8E8" }
GradientStop { position: 1.0; color: "#EBE8E8" }
}
}
Component {
id: menuItemTemplate
......@@ -377,10 +453,20 @@ ApplicationWindow {
property alias secondaryTitle: secondary.text
function setSelection(on) {
sel.visible = on
if (this.closable == true) {
closeIcon.visible = on
}
}
width: 206
height: 28
function setAsBigButton(on) {
newAppButton.visible = on
label.visible = !on
buttonLabel.visible = on
}
width: 192
height: 55
color: "#00000000"
anchors {
......@@ -388,6 +474,19 @@ ApplicationWindow {
leftMargin: 4
}
Rectangle {
// New App Button
id: newAppButton
visible: false
anchors.fill: parent
anchors.rightMargin: 8
border.width: 0
radius: 5
height: 55
width: 180
color: "#F3F1F3"
}
Rectangle {
id: sel
visible: false
......@@ -396,8 +495,7 @@ ApplicationWindow {
Rectangle {
id: r
anchors.fill: parent
border.color: "#CCCCCC"
border.width: 1
border.width: 0
radius: 5
color: "#FFFFFFFF"
}
......@@ -409,76 +507,130 @@ ApplicationWindow {
}
width: 10
color: "#FFFFFFFF"
border.width:0
Rectangle {
// Small line on top of selection. What's this for?
anchors {
left: parent.left
right: parent.right
top: parent.top
}
height: 1
color: "#CCCCCC"
color: "#FFFFFF"
}
Rectangle {
// Small line on bottom of selection. What's this for again?
anchors {
left: parent.left
right: parent.right
bottom: parent.bottom
}
height: 1
color: "#CCCCCC"
color: "#FFFFFF"
}
}
}
MouseArea {
anchors.fill: parent
hoverEnabled: true
onClicked: {
activeView(view, menuItem);
}
onEntered: {
if (parent.closable == true) {
closeIcon.visible = sel.visible
}
}
onExited: {
closeIcon.visible = false
}
}
Image {
id: icon
height: 20
width: 20
height: 24
width: 24
anchors {
left: parent.left
verticalCenter: parent.verticalCenter
leftMargin: 3
}
MouseArea {
anchors.fill: parent
onClicked: {
menuItem.closeApp()
leftMargin: 6
}
}
Text {
id: buttonLabel
visible: false
text: "GO TO NEW APP"
font.family: sourceSansPro.name
font.weight: Font.DemiBold
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
color: "#AAA0A0"
}
Text {
id: label
font.family: sourceSansPro.name
font.weight: Font.DemiBold
anchors {
left: icon.right
verticalCenter: parent.verticalCenter
leftMargin: 3
leftMargin: 6
// verticalCenterOffset: -10
}
color: "#0D0A01"
font.pixelSize: 12
x:250
color: "#665F5F"
font.pixelSize: 14
}
Text {
id: secondary
font.family: sourceSansPro.name
font.weight: Font.Light
anchors {
right: parent.right
rightMargin: 8
verticalCenter: parent.verticalCenter
left: icon.right
leftMargin: 6
top: label.bottom
}
color: "#AEADBE"
color: "#6691C2"
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() {
if(!this.closable) { return; }
......@@ -509,6 +661,9 @@ ApplicationWindow {
var section;
switch(options.section) {
case "begin":
section = menuBegin
break;
case "ethereum":
section = menuDefault;
break;
......@@ -529,6 +684,10 @@ ApplicationWindow {
}
comp.closable = options.close;
if (options.section === "begin") {
comp.setAsBigButton(true)
}
return comp
}
......@@ -540,15 +699,33 @@ ApplicationWindow {
anchors.right: parent.right
spacing: 3
ColumnLayout {
id: menuBegin
spacing: 3
anchors {
left: parent.left
right: parent.right
}
}
Rectangle {
height: 55
color: "transparent"
Text {
text: "ETHEREUM"
font.bold: true
font.family: sourceSansPro.name
font.weight: Font.DemiBold
anchors {
left: parent.left
leftMargin: 5
top: parent.verticalCenter
leftMargin: 16
}
color: "#888888"
color: "#AAA0A0"
}
}
ColumnLayout {
id: menuDefault
......@@ -559,15 +736,20 @@ ApplicationWindow {
}
}
Rectangle {
height: 55
color: "transparent"
Text {
text: "NET"
font.bold: true
text: "APPS"
font.family: sourceSansPro.name
font.weight: Font.DemiBold
anchors {
left: parent.left
leftMargin: 5
top: parent.verticalCenter
leftMargin: 16
}
color: "#AAA0A0"
}
color: "#888888"
}
ColumnLayout {
......@@ -579,16 +761,23 @@ ApplicationWindow {
}
}
Rectangle {
height: 55
color: "transparent"
Text {
text: "DEBUG"
font.bold: true
font.family: sourceSansPro.name
font.weight: Font.DemiBold
anchors {
left: parent.left
leftMargin: 5
top: parent.verticalCenter
leftMargin: 16
}
color: "#AAA0A0"
}
color: "#888888"
}
ColumnLayout {
id: menuLegacy
spacing: 3
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment