Merge branch 'master' into 'master'

Refactorings Getting rid of the worst peculiarities of Fingerterm code. @rainemak perhaps? See merge request !11
sailfishos · Jun 10, 2016 · 4c98a6d · 4c98a6d
2 parents 1d07de6 + fdf9ab2
commit 4c98a6d
Show file tree

Hide file tree

Showing 15 changed files with 596 additions and 722 deletions.
diff --git a/main.cpp b/main.cpp
@@ -117,6 +117,9 @@ int main(int argc, char *argv[])
     Terminal term;
     Util util(settings);
     term.setUtil(&util);
+    TextRender::setUtil(&util);
+    TextRender::setTerminal(&term);
+
     QString startupErrorMsg;
 
     // copy the default config files to the config dir if they don't already exist
@@ -143,6 +146,7 @@ int main(int argc, char *argv[])
     context->setContextProperty( "term", &term );
     context->setContextProperty( "util", &util );
     context->setContextProperty( "keyLoader", &keyLoader );
+    context->setContextProperty( "startupErrorMessage", startupErrorMsg);
 
     view.setResizeMode(QQuickView::SizeRootObjectToView);
     view.setSource(QUrl("qrc:/qml/Main.qml"));
@@ -151,19 +155,9 @@ int main(int argc, char *argv[])
     if(!root)
         qFatal("no root object - qml error");
 
-    QObject* win = root->findChild<QObject*>("window");
-
-    if(!startupErrorMsg.isEmpty())
-        QMetaObject::invokeMethod(win, "showErrorMessage", Qt::QueuedConnection, Q_ARG(QVariant, startupErrorMsg));
-
-    TextRender *tr = root->findChild<TextRender*>("textrender");
-    tr->setUtil(&util);
-    tr->setTerminal(&term);
-    term.setRenderer(tr);
     term.setWindow(&view);
     util.setWindow(&view);
     util.setTerm(&term);
-    util.setRenderer(tr);
 
     QObject::connect(view.engine(),SIGNAL(quit()),&app,SLOT(quit()));
 

diff --git a/qml/Button.qml b/qml/Button.qml
@@ -30,9 +30,10 @@ Rectangle {
     // for custom user menu actions
     property bool isShellCommand
 
-    signal clicked();
+    signal clicked()
 
-    color: highlighted ? "#606060" : "#202020"
+    color: btnMouseArea.pressed ? "#ffffff"
+                                : highlighted ? "#606060" : "#202020"
     border.color: "#303030"
     border.width: 1
     radius: window.radiusSmall
@@ -41,13 +42,6 @@ Rectangle {
     width: window.buttonWidthLarge
     height: window.buttonHeightLarge
 
-    onHighlightedChanged: {
-        if(highlighted)
-            button.color = "#606060"
-        else
-            button.color = "#202020"
-    }
-
     Text {
         // decoration for user-defined command buttons
         visible: isShellCommand
@@ -67,21 +61,8 @@ Rectangle {
 
     MouseArea {
         id: btnMouseArea
-        enabled: button.enabled
+
         anchors.fill: parent
-        onClicked: {
-            button.clicked();
-        }
-        onPressedChanged: {
-            if(pressed) {
-                button.color = "#ffffff"
-            } else {
-                if(highlighted)
-                    button.color = "#606060"
-                else
-                    button.color = "#202020"
-            }
-        }
+        onClicked: button.clicked()
     }
-
 }
diff --git a/qml/Key.qml b/qml/Key.qml
@@ -113,7 +113,6 @@ Rectangle {
         anchors.fill: parent
         radius: key.radius
         opacity: 0.5
-        z: 1
         anchors.topMargin: key.height/2
     }
 
@@ -149,9 +148,10 @@ Rectangle {
         }
 
         if (key.isClick) {
-            if (Math.abs(x - key.pressMouseX) > key.clickThreshold ||
-            Math.abs(y - key.pressMouseY) > key.clickThreshold )
-            key.isClick = false
+            if (Math.abs(x - key.pressMouseX) > key.clickThreshold
+                    || Math.abs(y - key.pressMouseY) > key.clickThreshold) {
+                key.isClick = false
+            }
         }
 
         return true;

diff --git a/qml/LayoutWindow.qml b/qml/LayoutWindow.qml
@@ -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
@@ -124,10 +122,7 @@ Rectangle {
         Transition {
             from: "*"
             to: "*"
-            SequentialAnimation {
-                PropertyAnimation { target: layoutWindow; properties: "y"; duration: 200; easing.type: Easing.InOutCubic }
-                ScriptAction { script: window.updateGesturesAllowed(); }
-            }
+            PropertyAnimation { target: layoutWindow; properties: "y"; duration: 200; easing.type: Easing.InOutCubic }
         }
     ]
 }
diff --git a/qml/Lineview.qml b/qml/Lineview.qml
@@ -63,11 +63,9 @@ Rectangle {
         anchors.rightMargin: 2*window.pixelRatio
         Repeater {
             model: lines
-            delegate:
-                Rectangle {
+            delegate: Item {
                 height: fontHeightHack.height
                 width: lineTextCol.width
-                color: "transparent"
                 Text {
                     color: "#ffffff"
                     font.family: util.settingsValue("ui/fontFamily");