Merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/bug-1366822 into lp:qtcreator-plugin-ubuntu

[Benjamin Zeller]

- Fix bug lp:1366822 "When creating the emulator it does not tell me what logs to check "
- Add a scope finalizer implementation

- Fix bug lp:1366822 "When creating the emulator it does not tell me what logs to check "
- Add a scope finalizer implementation

[Zoltan Balogh (bzoltan)]

OK

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:295
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/467/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-armhf-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/467/rebuild

review: Approve (continuous-integration)

=== modified file 'share/qtcreator/ubuntu/devicespage/DevicePage.qml'
--- share/qtcreator/ubuntu/devicespage/DevicePage.qml	2014-11-03 15:44:51 +0000
+++ share/qtcreator/ubuntu/devicespage/DevicePage.qml	2014-11-07 12:06:40 +0000
@@ -13,29 +13,64 @@
 
     Item {
         anchors.fill: parent
+        anchors.topMargin: units.gu(2)
+        anchors.bottomMargin: units.gu(2)
+        anchors.leftMargin: units.gu(2)
+        anchors.rightMargin: units.gu(4)
         visible: devicesModel.busy
+        RowLayout {
+            //anchors.centerIn: parent
+            id: busyIndicator
+            anchors.left: parent.left
+            anchors.top:  parent.top
+            anchors.right: parent.right
 
-        Column {
-            anchors.centerIn: parent
             spacing: units.gu(1)
+            height: childrenRect.height * 2
 
             ActivityIndicator{
-                anchors.horizontalCenter: parent.horizontalCenter
+                anchors.verticalCenter: parent.verticalCenter
                 running: devicesModel.busy
             }
             Label {
+                Layout.fillWidth: true
+                anchors.verticalCenter: parent.verticalCenter
                 text: i18n.tr("There is currently a process running in the background, please check the logs for details")
                 fontSize: "large"
-                anchors.left: parent.left
             }
             Button {
                 visible: devicesModel.cancellable
-                anchors.horizontalCenter: parent.horizontalCenter
+                anchors.verticalCenter: parent.verticalCenter
                 color: UbuntuColors.warmGrey
                 text: "Cancel"
                 onClicked: devicesModel.cancel()
             }
         }
+        Controls.TextArea {
+            id: logArea
+            anchors.left: parent.left
+            anchors.top:  busyIndicator.bottom
+            anchors.right: parent.right
+            anchors.bottom: parent.bottom
+
+            readOnly: true
+            textFormat: TextEdit.AutoText
+            Component.onCompleted: {
+                deviceMode.appendText.connect(appendToLog);
+            }
+
+            function appendToLog (txt) {
+                append(txt);
+            }
+
+            Connections{
+                target: devicesModel
+                onBusyChanged: {
+                    if(!devicesModel.busy)
+                        logArea.text = ""
+                }
+            }
+        }
     }
 
     Controls.SplitView {

=== modified file 'src/ubuntu/ubuntu.pro'
--- src/ubuntu/ubuntu.pro	2014-11-03 15:44:51 +0000
+++ src/ubuntu/ubuntu.pro	2014-11-07 12:06:40 +0000
@@ -217,5 +217,6 @@
     ubuntueditorfactory.h \
     ubuntucmakecache.h \
     ubuntutestcontrol.h \
-    ubuntupackageoutputparser.h
+    ubuntupackageoutputparser.h \
+    ubuntuscopefinalizer.h
 

=== modified file 'src/ubuntu/ubuntudevicesmodel.cpp'
--- src/ubuntu/ubuntudevicesmodel.cpp	2014-11-04 15:04:21 +0000
+++ src/ubuntu/ubuntudevicesmodel.cpp	2014-11-07 12:06:40 +0000
@@ -1,6 +1,25 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 2.1.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Benjamin Zeller <[e-mail]>
+ */
+
 #include "ubuntudevicesmodel.h"
 #include "ubuntuconstants.h"
 #include "ubuntukitmanager.h"
+#include "ubuntuscopefinalizer.h"
 
 #include <projectexplorer/devicesupport/devicemanager.h>
 #include <projectexplorer/kitmanager.h>
@@ -925,7 +944,11 @@
     State lastState = m_state;
     setCancellable(false);
 
-    setState(Idle);
+    OnScopeExit {
+        if(m_state == lastState)
+            setState(Idle);
+    };
+
     switch(lastState) {
         case CheckEmulatorInstalled: {
             QStringList lines = m_reply.trimmed().split(QLatin1String(Constants::LINEFEED));

=== modified file 'src/ubuntu/ubuntudevicesmodel.h'
--- src/ubuntu/ubuntudevicesmodel.h	2014-11-03 15:44:51 +0000
+++ src/ubuntu/ubuntudevicesmodel.h	2014-11-07 12:06:40 +0000
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 2.1.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Benjamin Zeller <[e-mail]>
+ */
+
 #ifndef UBUNTUDEVICESMODEL_H
 #define UBUNTUDEVICESMODEL_H
 

=== added file 'src/ubuntu/ubuntuscopefinalizer.h'
--- src/ubuntu/ubuntuscopefinalizer.h	1970-01-01 00:00:00 +0000
+++ src/ubuntu/ubuntuscopefinalizer.h	2014-11-07 12:06:40 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 2.1.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Benjamin Zeller <[e-mail]>
+ *
+ * Based on the information found on:
+ * http://stackoverflow.com/questions/10270328/the-simplest-and-neatest-c11-scopeguard
+ * http://stackoverflow.com/questions/1597007/creating-c-macro-with-and-line-token-concatenation-with-positioning-macr
+ */
+#ifndef UBUNTUSCOPEFINALIZER_H
+#define UBUNTUSCOPEFINALIZER_H
+
+#include <functional>
+
+/*!
+  \class ScopeFinalizer
+  Defines a way to clean up a scope nicely when its exited
+ */
+
+template <typename CleanupFunc>
+struct ScopeFinalizer
+{
+    inline ScopeFinalizer(){}
+    inline ScopeFinalizer& operator<<(CleanupFunc &&lambda){
+        m_lambda = std::move(lambda);
+        return *this;
+    }
+    inline ~ScopeFinalizer(){
+        m_lambda();
+    }
+
+    CleanupFunc m_lambda;
+};
+
+#define ScopeFinalizer_TOKENPASTE(x, y) x ## y
+#define ScopeFinalizer_TOKENPASTE2(x, y) ScopeFinalizer_TOKENPASTE(x, y)
+#define OnScopeExit ScopeFinalizer< std::function<void()> > ScopeFinalizer_TOKENPASTE2(OnScopeExit_,__LINE__); ScopeFinalizer_TOKENPASTE2(OnScopeExit_,__LINE__) << [&]()
+
+#endif // UBUNTUSCOPEFINALIZER_H