[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace/plasma/sreich/sal-qml] plasma/netbook/containments/sal: Reimplement the close button
From:       Aurélien Gâteau <agateau () kde ! org>
Date:       2012-05-10 16:32:16
Message-ID: 20120510163216.9F4DDA60BB () git ! kde ! org
[Download RAW message or body]

Git commit 976eb18c4990db44552eb664addd7cdacc6af0d6 by Aurélien Gâteau.
Committed on 10/05/2012 at 18:31.
Pushed by gateau into branch 'plasma/sreich/sal-qml'.

Reimplement the close button from the QML side

M  +12   -0    plasma/netbook/containments/sal/package/contents/ui/main.qml
M  +1    -0    plasma/netbook/containments/sal/shell/fullview.cpp

http://commits.kde.org/kde-workspace/976eb18c4990db44552eb664addd7cdacc6af0d6

diff --git a/plasma/netbook/containments/sal/package/contents/ui/main.qml \
b/plasma/netbook/containments/sal/package/contents/ui/main.qml index 9fce3ae..ff1939b \
                100644
--- a/plasma/netbook/containments/sal/package/contents/ui/main.qml
+++ b/plasma/netbook/containments/sal/package/contents/ui/main.qml
@@ -27,6 +27,7 @@ import org.kde.qtextracomponents 0.1 as QtExtra
 
 Item {
     id: main
+    signal closeClicked
 
     Component.onCompleted: {
         plasmoid.writeConfig("favorites", "TEST", "TEST2");
@@ -39,6 +40,17 @@ Item {
         imagePath: "dialogs/background"
     }
 
+    PlasmaComponents.ToolButton {
+        anchors {
+            right: main.right
+            top: main.top
+            rightMargin: background.margins.right
+            topMargin: background.margins.top
+        }
+        iconSource: "window-close"
+        onClicked: main.closeClicked()
+    }
+
     PlasmaComponents.TextField {
         id: searchField
 
diff --git a/plasma/netbook/containments/sal/shell/fullview.cpp \
b/plasma/netbook/containments/sal/shell/fullview.cpp index 338155c..635fecf 100644
--- a/plasma/netbook/containments/sal/shell/fullview.cpp
+++ b/plasma/netbook/containments/sal/shell/fullview.cpp
@@ -71,6 +71,7 @@ FullView::FullView(const QString &ff, const QString &loc, bool \
                persistent, QWidg
     KUrl source = KGlobal::dirs()->locate("data", \
"plasma/plasmoids/org.kde.sal/contents/ui/main.qml");  setSource(source);
 
+    connect(rootObject(), SIGNAL(closeClicked()), SLOT(hide()));
     updateGeometry();
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]