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

[Benjamin Zeller]

- Fix error warnings about overriding Actions
- Fix missing devicepage icons on trusty
- Fix bug lp:1379644 "I can only get the test configuration for scope
development"

- Fix error warnings about overriding Actions
- Fix missing devicepage icons on trusty
- Fix bug lp:1379644 "I can only get the test configuration for scope
development"

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:285
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/446/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-amd64-ci/214
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-armhf-ci/214

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

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

review: Approve

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/scope/CMakeLists.txt	2014-10-09 07:03:22 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/CMakeLists.txt	2014-10-10 07:47:39 +0000
@@ -2,6 +2,9 @@
 cmake_minimum_required(VERSION 2.8.10)
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
 
+#do not remove this line, its required for the correct functionality of the Ubuntu-SDK
+set(UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Tells QtCreator location and name of the manifest file")
+
 # We require g++ 4.9, to avoid ABI breakage with earlier version.
 set(cxx_version_required 4.9)
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")

=== modified file 'share/qtcreator/ubuntu/devicespage/DevicePage.qml'
--- share/qtcreator/ubuntu/devicespage/DevicePage.qml	2014-10-09 07:03:22 +0000
+++ share/qtcreator/ubuntu/devicespage/DevicePage.qml	2014-10-10 07:47:39 +0000
@@ -2,10 +2,10 @@
 import QtQuick.Layouts 1.0
 import QtQuick.Controls 1.0 as Controls
 
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components 1.0
+import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.DevicesModel 0.1
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.Popups 1.0
 
 Page {
     id: devicePage
@@ -217,18 +217,18 @@
                         clip: true
 
                         ListItem.Empty {
+                            id: errorContainer
                             divider.visible: false
                             visible: detectionError
+                            height: errorText.contentHeight + units.gu(4)
                             RowLayout {
                                 anchors.fill: parent
-                                anchors.leftMargin: units.gu(2)
                                 anchors.rightMargin: units.gu(4)
-                                Icon {
+                                Image {
                                     id: errorIcon
-                                    anchors.left: parent.left
-                                    name: "security-alert"
-                                    height:parent.height - units.gu(2)
-                                    width: height
+                                    source: "qrc:/ubuntu/images/security-alert.svg"
+                                    fillMode: Image.PreserveAspectFit
+                                    Layout.maximumHeight: errorContainer.height
                                 }
                                 Label {
                                     id: errorText

=== modified file 'share/qtcreator/ubuntu/devicespage/DeviceStatusTab.qml'
--- share/qtcreator/ubuntu/devicespage/DeviceStatusTab.qml	2014-08-11 10:46:51 +0000
+++ share/qtcreator/ubuntu/devicespage/DeviceStatusTab.qml	2014-10-10 07:47:39 +0000
@@ -1,8 +1,8 @@
 import QtQuick 2.0
 import QtQuick.Controls 1.0 as Controls
 import QtQuick.Layouts 1.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components 1.0
+import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.DevicesModel 0.1
 
 RowLayout {

=== modified file 'share/qtcreator/ubuntu/devicespage/FeatureStateItem.qml'
--- share/qtcreator/ubuntu/devicespage/FeatureStateItem.qml	2014-08-06 16:00:53 +0000
+++ share/qtcreator/ubuntu/devicespage/FeatureStateItem.qml	2014-10-10 07:47:39 +0000
@@ -1,7 +1,7 @@
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components 1.0
+import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.DevicesModel 0.1
 
 ListItem.Standard {

=== modified file 'share/qtcreator/ubuntu/devicespage/ScrollableView.qml'
--- share/qtcreator/ubuntu/devicespage/ScrollableView.qml	2014-10-08 10:06:04 +0000
+++ share/qtcreator/ubuntu/devicespage/ScrollableView.qml	2014-10-10 07:47:39 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Item {
     id: template

=== modified file 'share/qtcreator/ubuntu/devicespage/SectionItem.qml'
--- share/qtcreator/ubuntu/devicespage/SectionItem.qml	2014-10-08 10:06:04 +0000
+++ share/qtcreator/ubuntu/devicespage/SectionItem.qml	2014-10-10 07:47:39 +0000
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components 1.0
+import Ubuntu.Components.ListItems 1.0 as ListItem
 
 ListItem.Expandable {
     id: expandingColumnItem
@@ -38,9 +38,8 @@
             id: headerRow
             anchors { left: parent.left; right: parent.right}
             height: childrenRect.height
-            Icon {
-                name: expandingColumnItem.expanded ? "view-collapse" : "view-expand"
-                color: UbuntuColors.orange
+            Image {
+                source:  expandingColumnItem.expanded ? "qrc:/ubuntu/images/view-collapse.svg" : "qrc:/ubuntu/images/view-expand.svg"
                 width: 24
                 height: 24
             }

=== modified file 'share/qtcreator/ubuntu/devicespage/main.qml'
--- share/qtcreator/ubuntu/devicespage/main.qml	2014-06-03 12:04:26 +0000
+++ share/qtcreator/ubuntu/devicespage/main.qml	2014-10-10 07:47:39 +0000
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 
 MainView {

=== added file 'src/ubuntu/images/security-alert.svg'
--- src/ubuntu/images/security-alert.svg	1970-01-01 00:00:00 +0000
+++ src/ubuntu/images/security-alert.svg	2014-10-10 07:47:39 +0000
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="90"
+   height="90"
+   id="svg4874"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   viewBox="0 0 90 90.000001"
+   sodipodi:docname="browser-alert02.svg">
+  <defs
+     id="defs4876" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="9.9475983"
+     inkscape:cx="46.126712"
+     inkscape:cy="47.142033"
+     inkscape:document-units="px"
+     inkscape:current-layer="g1311"
+     showgrid="true"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5451"
+       empspacing="6" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="6,77"
+       id="guide4063" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="3,78"
+       id="guide4065" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="55,84"
+       id="guide4067" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="53,87"
+       id="guide4069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,3"
+       id="guide4071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,6"
+       id="guide4073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="87,7"
+       id="guide4075" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="84,7"
+       id="guide4077" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="58,81"
+       id="guide4074" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="9,74"
+       id="guide4076" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="21,9"
+       id="guide4078" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="81,4"
+       id="guide4080" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4879">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(67.857146,-84.50504)">
+    <g
+       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
+       id="g4845"
+       style="display:inline">
+      <g
+         transform="matrix(0,-1,-1,0,567.36222,615.36221)"
+         id="g1311"
+         inkscape:export-filename="envelope02.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90">
+        <g
+           id="g1313"
+           transform="matrix(1.875,0,0,1.875,-366,-1657.8169)">
+          <rect
+             transform="translate(0,804.3622)"
+             y="152"
+             x="288"
+             height="48"
+             width="48"
+             id="rect1315"
+             style="opacity:0.21171169;fill:none;stroke:none" />
+        </g>
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#df382c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;enable-background:accumulate"
+           d="m 215,162.36222 0,8.9668 c 0,2.63533 0.12502,5.07657 0.37305,7.32617 0.248,2.21747 0.5808,4.45146 0.99414,6.70117 l 5.32812,0 c 0.37204,-2.24971 0.68364,-4.4837 0.93164,-6.70117 C 222.87497,176.4376 223,173.99659 223,171.32902 l 0,-8.9668 -8,0 z m 4,27 c -1.23751,0 -2.30703,0.43478 -3.20703,1.30273 -0.86251,0.83022 -1.29297,1.904 -1.29297,3.22461 0,1.32094 0.43046,2.39635 1.29297,3.22657 0.9,0.83022 1.96952,1.24609 3.20703,1.24609 1.27501,0 2.34452,-0.41587 3.20703,-1.24609 0.86251,-0.83022 1.29297,-1.90563 1.29297,-3.22657 0,-1.32061 -0.43046,-2.39439 -1.29297,-3.22461 -0.86251,-0.86795 -1.93202,-1.30273 -3.20703,-1.30273 z"
+           id="path4116"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#df382c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;enable-background:accumulate"
+           d="M 45 0 C 45 0 35.356858 16.072266 9.6425781 16.072266 C 9.6425781 70.715115 45 90 45 90 C 45 90 80.357422 70.715115 80.357422 16.072266 C 54.643142 16.072266 45 0 45 0 z M 45 9.4726562 L 45.673828 10.085938 C 46.798488 11.110356 47.985902 12.142591 49.388672 13.144531 C 54.684312 16.927151 62.604557 20.501476 72.935547 21.759766 L 73.869141 21.873047 L 73.814453 22.810547 C 72.519263 44.972167 65.068544 59.989992 57.677734 69.732422 C 52.592794 76.435292 48.497251 79.867214 45.587891 81.976562 L 45 82.402344 L 44.412109 81.976562 C 41.502749 79.867214 37.407206 76.435292 32.322266 69.732422 C 24.931456 59.989992 17.480737 44.972167 16.185547 22.810547 L 16.130859 21.873047 L 17.064453 21.759766 C 27.395443 20.501476 35.315688 16.927151 40.611328 13.144531 C 42.014098 12.142591 43.201512 11.110356 44.326172 10.085938 L 45 9.4726562 z "
+           transform="translate(174,135.36222)"
+           id="path4155" />
+      </g>
+    </g>
+  </g>
+</svg>

=== added file 'src/ubuntu/images/view-collapse.svg'
--- src/ubuntu/images/view-collapse.svg	1970-01-01 00:00:00 +0000
+++ src/ubuntu/images/view-collapse.svg	2014-10-10 07:47:39 +0000
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="90"
+   height="90"
+   id="svg4874"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   viewBox="0 0 90 90.000001"
+   sodipodi:docname="view-collapse.svg">
+  <defs
+     id="defs4876" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="9.9475984"
+     inkscape:cx="9.5249119"
+     inkscape:cy="33.239179"
+     inkscape:document-units="px"
+     inkscape:current-layer="g1726"
+     showgrid="true"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5451"
+       empspacing="6" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="6,77"
+       id="guide4063" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="3,78"
+       id="guide4065" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="55,84"
+       id="guide4067" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="53,87"
+       id="guide4069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,3"
+       id="guide4071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,6"
+       id="guide4073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="87,7"
+       id="guide4075" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="84,7"
+       id="guide4077" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="58,81"
+       id="guide4074" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="9,74"
+       id="guide4076" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="21,9"
+       id="guide4078" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="81,4"
+       id="guide4080" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4879">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(67.857146,-84.50504)">
+    <g
+       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
+       id="g4845"
+       style="display:inline">
+      <g
+         inkscape:label="Layer 1"
+         id="g1724"
+         transform="matrix(0,-1,-1,0,1394.3622,441.36221)"
+         style="display:inline"
+         inkscape:export-filename="search01.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90">
+        <g
+           transform="matrix(0.99934414,0,0,1,-106.92982,549.00002)"
+           id="g1726"
+           style="display:inline">
+          <rect
+             style="opacity:0.05;color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="rect1728"
+             width="90.059067"
+             height="90.000015"
+             x="107"
+             y="-503.36218"
+             transform="scale(1,-1)" />
+          <path
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+             d="m 134.01772,455.33488 0,6.0546 36.02363,0 0,-6.0546 z"
+             id="path825"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             inkscape:connector-curvature="0"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:none"
+             d="m 142.02297,425.36218 c -12.00787,0 -23.0151,0 -23.0151,21.62695 l 0,22.7461 c 0,21.62695 11.00723,21.62695 23.0151,21.62695 l 20.01312,0 c 12.00788,0 23.01509,0 23.01509,-21.62695 l 0,-22.7461 c 0,-21.62695 -11.00721,-21.62695 -23.01509,-21.62695 z m 1.86841,6 16.27629,0 c 11.87499,0 18.87957,0 18.87957,18.19141 l 0,17.61718 c 0,18.19141 -7.00458,18.19141 -18.87957,18.19141 l -16.27629,0 c -11.87497,0 -18.87957,0 -18.87957,-18.19141 l 0,-17.61718 c 0,-18.19141 7.0046,-18.19141 18.87957,-18.19141 z"
+             id="path4098"
+             sodipodi:nodetypes="ssssssssssssssssss" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

=== added file 'src/ubuntu/images/view-expand.svg'
--- src/ubuntu/images/view-expand.svg	1970-01-01 00:00:00 +0000
+++ src/ubuntu/images/view-expand.svg	2014-10-10 07:47:39 +0000
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="90"
+   height="90"
+   id="svg4874"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   viewBox="0 0 90 90.000001"
+   sodipodi:docname="view-expand.svg">
+  <defs
+     id="defs4876" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="9.9475984"
+     inkscape:cx="9.5249119"
+     inkscape:cy="33.239179"
+     inkscape:document-units="px"
+     inkscape:current-layer="g1726"
+     showgrid="true"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5451"
+       empspacing="6" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="6,77"
+       id="guide4063" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="3,78"
+       id="guide4065" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="55,84"
+       id="guide4067" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="53,87"
+       id="guide4069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,3"
+       id="guide4071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,6"
+       id="guide4073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="87,7"
+       id="guide4075" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="84,7"
+       id="guide4077" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="58,81"
+       id="guide4074" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="9,74"
+       id="guide4076" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="21,9"
+       id="guide4078" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="81,4"
+       id="guide4080" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4879">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(67.857146,-84.50504)">
+    <g
+       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
+       id="g4845"
+       style="display:inline">
+      <g
+         inkscape:label="Layer 1"
+         id="g1724"
+         transform="matrix(0,-1,-1,0,1394.3622,441.36221)"
+         style="display:inline"
+         inkscape:export-filename="search01.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90">
+        <g
+           transform="matrix(0.99934414,0,0,1,-106.92982,549.00002)"
+           id="g1726"
+           style="display:inline">
+          <rect
+             style="opacity:0.05;color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="rect1728"
+             width="90.059067"
+             height="90.000015"
+             x="107"
+             y="-503.36218"
+             transform="scale(1,-1)" />
+          <path
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+             d="m 155.05882,440.36218 -6.05857,0 0,14.9727 -14.98253,0 0,6.0546 14.98253,0 0,14.9727 6.05857,0 0,-14.9727 14.98253,0 0,-6.0546 -14.98253,0 z"
+             id="path825"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccccccccccc" />
+          <path
+             inkscape:connector-curvature="0"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;opacity:1;fill:#808080;fill-opacity:1;stroke:none"
+             d="m 142.02297,425.36218 c -12.00787,0 -23.0151,0 -23.0151,21.62695 l 0,22.7461 c 0,21.62695 11.00723,21.62695 23.0151,21.62695 l 20.01312,0 c 12.00788,0 23.01509,0 23.01509,-21.62695 l 0,-22.7461 c 0,-21.62695 -11.00721,-21.62695 -23.01509,-21.62695 z m 1.86841,6 16.27629,0 c 11.87499,0 18.87957,0 18.87957,18.19141 l 0,17.61718 c 0,18.19141 -7.00458,18.19141 -18.87957,18.19141 l -16.27629,0 c -11.87497,0 -18.87957,0 -18.87957,-18.19141 l 0,-17.61718 c 0,-18.19141 7.0046,-18.19141 18.87957,-18.19141 z"
+             id="path4098"
+             sodipodi:nodetypes="ssssssssssssssssss" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

=== modified file 'src/ubuntu/resources.qrc'
--- src/ubuntu/resources.qrc	2014-08-11 11:58:08 +0000
+++ src/ubuntu/resources.qrc	2014-10-10 07:47:39 +0000
@@ -19,5 +19,8 @@
         <file>images/reload.svg</file>
         <file>images/list-add.svg</file>
         <file>images/list-remove.svg</file>
+        <file>images/security-alert.svg</file>
+        <file>images/view-expand.svg</file>
+        <file>images/view-collapse.svg</file>
     </qresource>
 </RCC>

=== modified file 'src/ubuntu/ubuntueditorfactory.cpp'
--- src/ubuntu/ubuntueditorfactory.cpp	2014-08-18 12:29:43 +0000
+++ src/ubuntu/ubuntueditorfactory.cpp	2014-10-10 07:47:39 +0000
@@ -13,8 +13,8 @@
 class UbuntuTextEditorActionHandler : public TextEditor::TextEditorActionHandler
 {
 public:
-    explicit UbuntuTextEditorActionHandler(QObject *parent)
-        : TextEditorActionHandler(parent, Constants::UBUNTU_MANIFEST_EDITOR_CONTEXT)
+    explicit UbuntuTextEditorActionHandler(QObject *parent, Core::Id editorContext)
+        : TextEditorActionHandler(parent,editorContext)
     {}
 private:
     TextEditor::BaseTextEditorWidget *resolveTextEditorWidget(Core::IEditor *editor) const
@@ -29,7 +29,7 @@
     setId(Constants::UBUNTU_MANIFEST_EDITOR_ID);
     setDisplayName(tr("Ubuntu Manifest editor"));
     addMimeType(Constants::UBUNTU_MANIFEST_MIME_TYPE);
-    new UbuntuTextEditorActionHandler(this);
+    new UbuntuTextEditorActionHandler(this,Constants::UBUNTU_MANIFEST_EDITOR_ID);
 }
 
 Core::IEditor *UbuntuManifestEditorFactory::createEditor()
@@ -42,7 +42,7 @@
     setId(Constants::UBUNTU_APPARMOR_EDITOR_ID);
     setDisplayName(tr("Ubuntu Apparmor editor"));
     addMimeType(Constants::UBUNTU_APPARMOR_MIME_TYPE);
-    new UbuntuTextEditorActionHandler(this);
+    new UbuntuTextEditorActionHandler(this,Constants::UBUNTU_APPARMOR_EDITOR_ID);
 }
 
 Core::IEditor *UbuntuApparmorEditorFactory::createEditor()