Skip to content

Commit

Permalink
Get rid of explicit z values
Browse files Browse the repository at this point in the history
  • Loading branch information
@pvuorela
pvuorela committed Jun 8, 2016
1 parent 0a5b02d commit 3cbe263
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 67 deletions.
1 change: 0 additions & 1 deletion qml/Key.qml
View file
Expand Up @@ -113,7 +113,6 @@ Rectangle {
anchors.fill: parent
radius: key.radius
opacity: 0.5
z: 1
anchors.topMargin: key.height/2
}

Expand Down
2 changes: 0 additions & 2 deletions qml/LayoutWindow.qml
View file
Expand Up @@ -28,8 +28,6 @@ Rectangle {
width: window.width-1
height: window.height-1
color: "#000000"
z: 100
state: ""
y: -(height+1)
border.color: "#c0c0c0"
border.width: 1
Expand Down
102 changes: 45 additions & 57 deletions qml/Main.qml
View file
Expand Up @@ -110,59 +110,12 @@ Item {
objectName: "window"
color: bellTimer.running ? "#ffffff" : bgcolor

NotifyWin {
id: aboutDialog

property int termW
property int termH

text: {
var str = "<font size=\"+3\">FingerTerm " + util.versionString() + "</font><br>\n" +
"<font size=\"+1\">" +
"by Heikki Holstila &lt;<a href=\"mailto:heikki.holstila@gmail.com?subject=FingerTerm\">heikki.holstila@gmail.com</a>&gt;<br><br>\n\n" +
"Config files for adjusting settings are at:<br>\n" +
util.configPath() + "/<br><br>\n" +
"Documentation:<br>\n<a href=\"http://hqh.unlink.org/harmattan\">http://hqh.unlink.org/harmattan</a>"
if (termH != 0 && termW != 0) {
str += "<br><br>Current window title: <font color=\"gray\">" + util.windowTitle.substring(0,40) + "</font>"; //cut long window title
if(util.windowTitle.length>40)
str += "...";
str += "<br>Current terminal size: <font color=\"gray\">" + termW + "x" + termH + "</font>";
str += "<br>Charset: <font color=\"gray\">" + util.settingsValue("terminal/charset") + "</font>";
}
str += "</font>";
return str;
}
onDismissed: {
util.setSettingsValue("state/showWelcomeScreen", false);
}
z: 1001
}

NotifyWin {
id: errorDialog

z: 1002
}

UrlWindow {
id: urlWindow
z: 1000
}

LayoutWindow {
id: layoutWindow
z: 1000
}


Lineview {
id: lineView

property int duration

y: -(height+1)
z: 20
onFontPointSizeChanged: {
lineView.setPosition(vkb.active)
}
Expand Down Expand Up @@ -249,7 +202,6 @@ Item {
Rectangle {
//top right corner menu button
x: window.width - width
z: 1
width: menuImg.width + 60*window.pixelRatio
height: menuImg.height + 30*window.pixelRatio
color: "transparent"
Expand All @@ -276,15 +228,9 @@ Item {
anchors.horizontalCenter: parent.horizontalCenter
anchors.bottom: parent.bottom
visible: textrender.showBufferScrollIndicator
z: 5
scale: window.pixelRatio
}

MenuFingerterm {
id: menu
anchors.fill: parent
}

TextRender {
id: textrender

Expand All @@ -294,7 +240,6 @@ Item {
objectName: "textrender"
height: parent.height
width: parent.width
z: 10

Behavior on opacity {
NumberAnimation { duration: textrender.duration; easing.type: Easing.InOutQuad }
Expand Down Expand Up @@ -341,13 +286,17 @@ Item {
}
}

MenuFingerterm {
id: menu
anchors.fill: parent
}

Text {
// shows large text notification in the middle of the screen (for gestures)
id: textNotify

anchors.centerIn: parent
color: "#ffffff"
z: 100
opacity: 0
font.pointSize: 40*window.pixelRatio

Expand All @@ -365,7 +314,6 @@ Item {
property string label

visible: false
z: 200
radius: window.radiusSmall
color: "#ffffff"

Expand All @@ -377,6 +325,46 @@ Item {
}
}

NotifyWin {
id: aboutDialog

property int termW
property int termH

text: {
var str = "<font size=\"+3\">FingerTerm " + util.versionString() + "</font><br>\n" +
"<font size=\"+1\">" +
"by Heikki Holstila &lt;<a href=\"mailto:heikki.holstila@gmail.com?subject=FingerTerm\">heikki.holstila@gmail.com</a>&gt;<br><br>\n\n" +
"Config files for adjusting settings are at:<br>\n" +
util.configPath() + "/<br><br>\n" +
"Documentation:<br>\n<a href=\"http://hqh.unlink.org/harmattan\">http://hqh.unlink.org/harmattan</a>"
if (termH != 0 && termW != 0) {
str += "<br><br>Current window title: <font color=\"gray\">" + util.windowTitle.substring(0,40) + "</font>"; //cut long window title
if(util.windowTitle.length>40)
str += "...";
str += "<br>Current terminal size: <font color=\"gray\">" + termW + "x" + termH + "</font>";
str += "<br>Charset: <font color=\"gray\">" + util.settingsValue("terminal/charset") + "</font>";
}
str += "</font>";
return str;
}
onDismissed: {
util.setSettingsValue("state/showWelcomeScreen", false);
}
}

NotifyWin {
id: errorDialog
}

UrlWindow {
id: urlWindow
}

LayoutWindow {
id: layoutWindow
}

Connections {
target: term
onDisplayBufferChanged: window.displayBufferChanged()
Expand Down
4 changes: 0 additions & 4 deletions qml/MenuFingerterm.qml
View file
Expand Up @@ -29,7 +29,6 @@ Item {
property string currentOrientationLockMode: util.settingsValue("ui/orientationLockMode")
property int keyboardFadeOutDelay: util.settingsValue("ui/keyboardFadeOutDelay")

z: 30
visible: rect.x < menuWin.width

Rectangle {
Expand All @@ -53,7 +52,6 @@ Item {
x: menuWin.showing ? menuWin.width-rect.width : menuWin.width+1
width: flickableContent.width + 22*window.pixelRatio;
height: menuWin.height
z: 35

MouseArea {
// event eater
Expand Down Expand Up @@ -421,7 +419,6 @@ Item {
width: menuBlocksRow.width - window.paddingMedium
height: window.paddingMedium
radius: window.radiusSmall
z: 1
color: "#909090"
}
Rectangle {
Expand All @@ -435,7 +432,6 @@ Item {
radius: window.radiusLarge
height: parent.height-window.headerHeight
color: "#202020"
z: 2
onXChanged: {
if (vkbDelaySliderMA.drag.active)
vkbDelaySlider.keyboardFadeOutDelayLabel =
Expand Down
1 change: 0 additions & 1 deletion qml/NotifyWin.qml
View file
Expand Up @@ -29,7 +29,6 @@ Rectangle {
width: window.width-1
height: window.height-1
color: "#000000"
z: 100
y: -(height+1)
state: ""
border.color: "#c0c0c0"
Expand Down
2 changes: 0 additions & 2 deletions qml/UrlWindow.qml
View file
Expand Up @@ -27,8 +27,6 @@ Rectangle {
width: window.width-1
height: window.height-1
color: "#000000"
z: 100
state: ""
y: -(height+1)
border.color: "#c0c0c0"
border.width: 1
Expand Down

0 comments on commit 3cbe263

Please sign in to comment.