diff --git a/cmd/mist/assets/qml/fonts/SourceSansPro-Black.ttf b/cmd/mist/assets/qml/fonts/SourceSansPro-Black.ttf new file mode 100644 index 0000000000..be1a3108ed Binary files /dev/null and b/cmd/mist/assets/qml/fonts/SourceSansPro-Black.ttf differ diff --git a/cmd/mist/assets/qml/fonts/SourceSansPro-BlackIt.ttf b/cmd/mist/assets/qml/fonts/SourceSansPro-BlackIt.ttf new file mode 100644 index 0000000000..ac5c4ef7c7 Binary files /dev/null and b/cmd/mist/assets/qml/fonts/SourceSansPro-BlackIt.ttf differ diff --git a/cmd/mist/assets/qml/fonts/SourceSansPro-Bold.ttf b/cmd/mist/assets/qml/fonts/SourceSansPro-Bold.ttf new file mode 100644 index 0000000000..f47161c6bd Binary files /dev/null and b/cmd/mist/assets/qml/fonts/SourceSansPro-Bold.ttf differ diff --git a/cmd/mist/assets/qml/fonts/SourceSansPro-BoldIt.ttf b/cmd/mist/assets/qml/fonts/SourceSansPro-BoldIt.ttf new file mode 100644 index 0000000000..6b3db698bb Binary files /dev/null and b/cmd/mist/assets/qml/fonts/SourceSansPro-BoldIt.ttf differ diff --git a/cmd/mist/assets/qml/fonts/SourceSansPro-ExtraLight.ttf b/cmd/mist/assets/qml/fonts/SourceSansPro-ExtraLight.ttf new file mode 100644 index 0000000000..0a3e51fdb6 Binary files /dev/null and b/cmd/mist/assets/qml/fonts/SourceSansPro-ExtraLight.ttf differ diff --git a/cmd/mist/assets/qml/fonts/SourceSansPro-ExtraLightIt.ttf b/cmd/mist/assets/qml/fonts/SourceSansPro-ExtraLightIt.ttf new file mode 100644 index 0000000000..a0eb86aca9 Binary files /dev/null and b/cmd/mist/assets/qml/fonts/SourceSansPro-ExtraLightIt.ttf differ diff --git a/cmd/mist/assets/qml/fonts/SourceSansPro-It.ttf b/cmd/mist/assets/qml/fonts/SourceSansPro-It.ttf new file mode 100644 index 0000000000..fcc95fc7cd Binary files /dev/null and b/cmd/mist/assets/qml/fonts/SourceSansPro-It.ttf differ diff --git a/cmd/mist/assets/qml/fonts/SourceSansPro-Light.ttf b/cmd/mist/assets/qml/fonts/SourceSansPro-Light.ttf new file mode 100644 index 0000000000..9cae13c97b Binary files /dev/null and b/cmd/mist/assets/qml/fonts/SourceSansPro-Light.ttf differ diff --git a/cmd/mist/assets/qml/fonts/SourceSansPro-LightIt.ttf b/cmd/mist/assets/qml/fonts/SourceSansPro-LightIt.ttf new file mode 100644 index 0000000000..2ed7842840 Binary files /dev/null and b/cmd/mist/assets/qml/fonts/SourceSansPro-LightIt.ttf differ diff --git a/cmd/mist/assets/qml/fonts/SourceSansPro-Regular.ttf b/cmd/mist/assets/qml/fonts/SourceSansPro-Regular.ttf new file mode 100644 index 0000000000..8e8255e173 Binary files /dev/null and b/cmd/mist/assets/qml/fonts/SourceSansPro-Regular.ttf differ diff --git a/cmd/mist/assets/qml/fonts/SourceSansPro-Semibold.ttf b/cmd/mist/assets/qml/fonts/SourceSansPro-Semibold.ttf new file mode 100644 index 0000000000..121ee9bbfa Binary files /dev/null and b/cmd/mist/assets/qml/fonts/SourceSansPro-Semibold.ttf differ diff --git a/cmd/mist/assets/qml/fonts/SourceSansPro-SemiboldIt.ttf b/cmd/mist/assets/qml/fonts/SourceSansPro-SemiboldIt.ttf new file mode 100644 index 0000000000..6ceaa885f3 Binary files /dev/null and b/cmd/mist/assets/qml/fonts/SourceSansPro-SemiboldIt.ttf differ diff --git a/cmd/mist/assets/qml/fonts/SourceSerifPro-Bold.ttf b/cmd/mist/assets/qml/fonts/SourceSerifPro-Bold.ttf new file mode 100644 index 0000000000..ac7837fd9e Binary files /dev/null and b/cmd/mist/assets/qml/fonts/SourceSerifPro-Bold.ttf differ diff --git a/cmd/mist/assets/qml/fonts/SourceSerifPro-Regular.ttf b/cmd/mist/assets/qml/fonts/SourceSerifPro-Regular.ttf new file mode 100644 index 0000000000..7201a88904 Binary files /dev/null and b/cmd/mist/assets/qml/fonts/SourceSerifPro-Regular.ttf differ diff --git a/cmd/mist/assets/qml/fonts/SourceSerifPro-Semibold.ttf b/cmd/mist/assets/qml/fonts/SourceSerifPro-Semibold.ttf new file mode 100644 index 0000000000..db2fc804b6 Binary files /dev/null and b/cmd/mist/assets/qml/fonts/SourceSerifPro-Semibold.ttf differ diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml index bda2b17253..3c3017290d 100644 --- a/cmd/mist/assets/qml/main.qml +++ b/cmd/mist/assets/qml/main.qml @@ -9,6 +9,7 @@ import Ethereum 1.0 import "../ext/filter.js" as Eth import "../ext/http.js" as Http + ApplicationWindow { id: root @@ -375,6 +376,25 @@ ApplicationWindow { 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" + } anchors.top: parent.top Rectangle { width: parent.height @@ -503,7 +523,21 @@ ApplicationWindow { } 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" + //font.family: SourceSansProRegular.name + } + + Text { id: label + font.family: sourceSansPro.name + font.weight: Font.DemiBold anchors { left: icon.right verticalCenter: parent.verticalCenter @@ -513,19 +547,12 @@ ApplicationWindow { color: "#665F5F" font.pixelSize: 14 } - - Text { - id: buttonLabel - visible: false - text: "GO TO NEW APP" - font.bold: true - anchors.horizontalCenter: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter - color: "#AAA0A0" - } + Text { id: secondary + font.family: sourceSansPro.name + font.weight: Font.Light anchors { right: parent.right rightMargin: 8 @@ -619,7 +646,8 @@ ApplicationWindow { color: "transparent" Text { text: "ETHEREUM" - font.bold: true + font.family: sourceSansPro.name + font.weight: Font.DemiBold anchors { left: parent.left top: parent.verticalCenter @@ -644,7 +672,8 @@ ApplicationWindow { color: "transparent" Text { text: "APPS" - font.bold: true + font.family: sourceSansPro.name + font.weight: Font.DemiBold anchors { left: parent.left top: parent.verticalCenter @@ -668,7 +697,8 @@ ApplicationWindow { color: "transparent" Text { text: "DEBUG" - font.bold: true + font.family: sourceSansPro.name + font.weight: Font.DemiBold anchors { left: parent.left top: parent.verticalCenter diff --git a/cmd/mist/assets/qml/views/catalog.qml b/cmd/mist/assets/qml/views/catalog.qml index 8aeb8b3712..7f42c25dc2 100644 --- a/cmd/mist/assets/qml/views/catalog.qml +++ b/cmd/mist/assets/qml/views/catalog.qml @@ -6,6 +6,7 @@ import QtWebEngine 1.0 //import QtWebEngine.experimental 1.0 import QtQuick.Window 2.0; + Rectangle { id: window anchors.fill: parent @@ -20,6 +21,8 @@ Rectangle { property alias windowTitle: webview.title property alias webView: webview + + property var cleanPath: false property var open: function(url) { if(!window.cleanPath) {