headrush
/
go-ethereum
forked from mirror/go-ethereum
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changed url bar behaviour. Failed attempt at icon

Browse Source
release/1.0.1
Alexandre Van de Sande 10 years ago
parent d73dff4d5b
commit 7aef0fed29
3 changed files with 77 additions and 75 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 14
      cmd/mist/assets/qml/main.qml
  2. 110
      cmd/mist/assets/qml/views/browser.qml
  3. 28
      cmd/mist/assets/qml/views/catalog.qml

14
cmd/mist/assets/qml/main.qml
Unescape View File

@ -59,13 +59,13 @@ ApplicationWindow {
function activeView(view, menuItem) {
mainSplit.setView(view, menuItem)
if (view.hideUrl) {
/*if (view.hideUrl) {
urlPane.visible = false;
mainView.anchors.top = rootView.top
} else {
urlPane.visible = true;
mainView.anchors.top = divider.bottom
}
}*/
}
function addViews(view, path, options) {
@ -120,13 +120,10 @@ ApplicationWindow {
var domainAlreadyOpen = false;
console.log("requested: " + requestedDomain )
for(var i = 0; i < mainSplit.views.length; i++) {
if (mainSplit.views[i].view.url) {
var matches = mainSplit.views[i].view.url.toString().match(/^[a-z]*\:\/\/(?:www\.)?([^\/?#]+)(?:[\/?#]|$)/i);
var existingDomain = matches && matches[1];
console.log("exists: " + existingDomain);
if (requestedDomain == existingDomain) {
domainAlreadyOpen = true;
mainSplit.views[i].view.url = url;
@ -567,7 +564,9 @@ ApplicationWindow {
if (parent.closable == true) {
closeIcon.visible = sel.visible
}
/*if(view.hasOwnProperty("iconSource")) {
icon.source = view.iconSource;
}*/
}
onExited: {
closeIcon.visible = false
@ -600,10 +599,13 @@ ApplicationWindow {
id: label
font.family: sourceSansPro.name
font.weight: Font.DemiBold
elide: Text.ElideRight
anchors {
left: icon.right
right: parent.right
verticalCenter: parent.verticalCenter
leftMargin: 6
rightMargin: 8
// verticalCenterOffset: -10
}
x:250

110
cmd/mist/assets/qml/views/browser.qml
Unescape View File

@ -64,23 +64,15 @@ Rectangle {
}
function showFullUrlBar(on){
if (on) {
//appTitle.visible = false
//appDomain.visible = false
//uriNav.visible = true
clickAnywhereOnApp.visible = true
navBar.state = "fullUrlVisible"
} else {
//appTitle.visible = true
//appDomain.visible = true
//uriNav.visible = false
clickAnywhereOnApp.visible = false
navBar.state = "titleVisible"
}
if (uriNav.focus == false ) {
if (on == false) {
clickAnywhereOnApp.visible = false
navBar.state = "titleVisible"
} else {
clickAnywhereOnApp.visible = true
navBar.state = "fullUrlVisible"
}
}
}
@ -90,24 +82,40 @@ Rectangle {
Item {
objectName: "root"
id: root
anchors.fill: parent
anchors {
fill: parent
}
state: "inspectorShown"
MouseArea {
id: clickAnywhereOnApp
z:15
//hoverEnabled: true
anchors.fill: parent
/*hoverEnabled: true*/
// Using a secondary screen to catch on mouse exits for the area, because
// there are many hover actions conflicting
anchors {
top: parent.top
topMargin: 50
right: parent.right
bottom: parent.bottom
left: parent.left
}
hoverEnabled: true
onClicked: {
onEntered: {
showFullUrlBar(false);
}
/*Rectangle {
anchors.fill: parent
color: "#88888888"
}*/
onClicked: {
uriNav.focus = false
showFullUrlBar(false);
}
// Rectangle {
// anchors.fill: parent
// color: "#88888888"
// }
}
RowLayout {
@ -126,7 +134,7 @@ Rectangle {
webview.goBack()
}
anchors{
anchors {
left: parent.left
leftMargin: 6
}
@ -146,15 +154,17 @@ Rectangle {
color: "#FFFFFF"
radius: 6
MouseArea {
anchors.fill: parent
z: 10
hoverEnabled: true
onEntered: {
showFullUrlBar(true);
}
showFullUrlBar(true);
}
/*onExited: {
showFullUrlBar(false);
}*/
}
@ -171,14 +181,15 @@ Rectangle {
font.bold: true
font.capitalization: Font.AllUppercase
horizontalAlignment: Text.AlignRight
verticalAlignment: Text.AlignVCenter
verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight
anchors {
left: parent.left
right: parent.horizontalCenter
top: parent.top
bottom: parent.bottom
rightMargin: 10
leftMargin: 32
}
color: "#928484"
}
@ -189,13 +200,15 @@ Rectangle {
font.bold: false
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
elide: Text.ElideLeft
anchors {
left: parent.horizontalCenter
right: parent.right
top: parent.top
bottom: parent.bottom
leftMargin: 10
leftMargin: 32
}
color: "#C0AFAF"
}
@ -212,7 +225,7 @@ Rectangle {
}
horizontalAlignment: Text.AlignHCenter
style: TextFieldStyle {
textColor: "#928484"
background: Rectangle {
@ -227,11 +240,6 @@ Rectangle {
Keys.onReturnPressed: {
webview.url = this.text;
}
/* onFocusedChanged: {
if (focused) {
//uriNav.selectAll();
}
}*/
}
z:2
@ -332,18 +340,19 @@ Rectangle {
bottom: parent.bottom
top: navBar.bottom
}
z: 10
onLoadingChanged: {
z: 10
onLoadingChanged: {
// this checks if your app has special header tags
if (loadRequest.status == WebEngineView.LoadSucceededStatus) {
webview.runJavaScript("document.title", function(pageTitle) {
menuItem.title = pageTitle;
});
//var topBarStyle
webView.runJavaScript("document.querySelector(\"meta[name='ethereum-dapp-url-bar-style']\").getAttribute(\"content\")", function(topBarStyle){
if (topBarStyle=="transparent") {
// Adjust for a transparent sidebar Dapp
navBarBackground.visible = false;
back.visible = false;
@ -362,8 +371,13 @@ Rectangle {
};
});
// webView.runJavaScript("document.querySelector(\"link[rel='icon']\").getAttribute(\"href\")", function(sideIcon){
// if(sideIcon){
// window.iconSource = "http://localhost:3000/whisper-icon@2x.png" //webview.url + sideIcon
// console.log(iconSource)
// };
// });
webview.runJavaScript(eth.readFile("bignumber.min.js"));
webview.runJavaScript(eth.readFile("ethereum.js/dist/ethereum.js"));
@ -371,7 +385,7 @@ Rectangle {
var matches = cleanTitle.match(/^[a-z]*\:\/\/([^\/?#]+)(?:[\/?#]|$)/i);
var domain = matches && matches[1];
appDomain.text = domain //webview.url.replace("a", "z")
appDomain.text = domain
appTitle.text = webview.title
showFullUrlBar(false);

28
cmd/mist/assets/qml/views/catalog.qml
Unescape View File

@ -85,35 +85,21 @@ Rectangle {
property var domain: "ethereum-dapp-catalog.meteor.com"
url: protocol + domain
//navigationRequest: WebEngineView.IgnoreRequest
// onLoadingChanged: {
// if (loadRequest.status == WebEngineView.LoadSucceededStatus) {
// webview.runJavaScript(eth.readFile("bignumber.min.js"));
// webview.runJavaScript(eth.readFile("ethereum.js/dist/ethereum.js"));
// }
// }
//onNavigationRequested: {
// detect URL scheme prefix, most likely an external link
//var schemaRE = /^\w+:/;
//if (schemaRE.test(request.url)) {
// request.action = WebView.AcceptRequest;
//} else {
//request.action = WebView.IgnoreRequest;
// delegate request.url here
//}
//}
onJavaScriptConsoleMessage: {
console.log(sourceID + ":" + lineNumber + ":" + JSON.stringify(message));
}
onNavigationRequested: {
onNavigationRequested: {
// this checks if the domain of the requested link is the same as the catalog's
// If it is, it opens on the same window, if it's not it opens a new tab
var cleanTitle = request.url.toString()
var matches = cleanTitle.match(/^[a-z]*\:\/\/([^\/?#]+)(?:[\/?#]|$)/i);
var requestedDomain = matches && matches[1];
console.debug ("NavigationRequested: " + request.url + " navigationType=" + request.navigationType)
if(request.navigationType==0){
@ -137,7 +123,7 @@ Rectangle {
anchors {
left: root.left
right: root.right
top: sizeGrip.bottom
top: root.top
bottom: root.bottom
}

Write Preview
Loading…
Cancel
Save