Skip to content
Snippets Groups Projects
Commit 5a0dcd91 authored by Panu Artimo's avatar Panu Artimo
Browse files

added result url link, some re-organization within the code for the panels

parent c848bbfc
Branches
Tags v0.1
No related merge requests found
......@@ -5,7 +5,7 @@ import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.1
import QtProcess 0.1
import HttpUp 1.0
import JsonFile 1.0
//import JsonFile 1.0
ApplicationWindow {
......@@ -67,16 +67,16 @@ ApplicationWindow {
xhr.send();
}
JsonFile {
id: jsonFile
name: "settings.json"
}
//JsonFile {
//id: jsonFile
//name: "settings.json"
//}
var settings = {uploadserver:"http://ismara.unibas.ch/fcgi/mara_dev/client", email:"panu.artimo@isb-sib.ch"};
jsonFile.write(settings) // write any JavaScript array or object
var data = jsonFile.read() // read JSON file into JavaScript object or array
outputDisplayText.append('settings email: '+email);
//var settings = {uploadserver:"http://ismara.unibas.ch/fcgi/mara_dev/client", email:"panu.artimo@isb-sib.ch"};
//jsonFile.write(settings) // write any JavaScript array or object
//var data = jsonFile.read() // read JSON file into JavaScript object or array
//outputDisplayText.append('settings email: '+email);
Process {
......@@ -178,11 +178,45 @@ ApplicationWindow {
id: container
anchors.fill: parent
columns: 2
rows: 2
rows: 3
anchors.leftMargin: 5
anchors.rightMargin: 5
// top of the page: Title + ISMARA help + Contact us
Rectangle {
id: rectangleHeader
Layout.column: 1
Layout.row: 1
Layout.columnSpan: 2
x: 0
y: 0
width: parent.width
height: parent.height / 10
Text {
id: topRightText
x: parent.width - 170
y: 10
height: 20
width: 80
text: "<a href='http://mara.unibas.ch/MARA/FAQ/faq.html'>ISMARA help</a> | <a href='mailto:helpdesk%40expasy.org'>Contact us</a>"
}
Text {
id: appTitle
// THis text may have to be changed!
text: "ISMARA-app"
font.bold: true
font.pixelSize: 28
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
}
} // end top of the page + ISMARA help + Contact us
ColumnLayout
{
......@@ -259,38 +293,6 @@ ApplicationWindow {
// End Panels
} // end ColumnLayout
// top of the page: Title + ISMARA help + Contact us
Rectangle {
id: rectangleHeader
Layout.column: 1
Layout.row: 1
Layout.columnSpan: 2
x: 0
y: 0
width: parent.width
height: parent.height / 10
Text {
id: topRightText
x: parent.width - 170
y: 10
height: 20
width: 80
text: "<a href='http://mara.unibas.ch/MARA/FAQ/faq.html'>ISMARA help</a> | <a href='mailto:helpdesk%40expasy.org'>Contact us</a>"
}
Text {
id: appTitle
// THis text may have to be changed!
text: "ISMARA-app"
font.bold: true
font.pixelSize: 28
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
}
} // end top of the page + ISMARA help + Contact us
Rectangle {
// id
......@@ -383,6 +385,36 @@ ApplicationWindow {
} // end of outputdisplay
Rectangle {
id: resultBox
Layout.column: 1
Layout.row: 3
Layout.columnSpan: 2
width: parent.width
y: app.height - 90
height: 90
Text {
id: link_Text
text: 'Result: <a href="'+resultUrl+'">'+resultUrl+'</a>'
textFormat: Text.RichText
onLinkHovered: {
cursorShape: Qt.OpenHandCursor
}
onLinkActivated: {
Qt.openUrlExternally(link)
console.log(link + " link activated")
}
}
}
} // end GridLayout
// menuBar + Action types
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment