[lipstick] Restore API for window properties and add new for closing …

…windows. Contributes to JB#42170
sailfishos · Jul 24, 2018 · 68f0fb1 · 68f0fb1
1 parent c7c596f
commit 68f0fb1
Show file tree

Hide file tree

Showing 23 changed files with 1,241 additions and 507 deletions.
diff --git a/plugin/lipstickplugin.cpp b/plugin/lipstickplugin.cpp
@@ -30,7 +30,7 @@
 #include <compositor/lipstickcompositorwindow.h>
 #include <compositor/windowmodel.h>
 #include <compositor/windowpixmapitem.h>
-#include <compositor/windowproperty.h>
+#include <compositor/windowpropertymap.h>
 #include <lipstickapi.h>
 #include <hwcimage.h>
 
@@ -67,11 +67,11 @@ void LipstickPlugin::registerTypes(const char *uri)
     qmlRegisterUncreatableType<QWaylandSurface>("org.nemomobile.lipstick", 0, 1, "WaylandSurface", "This type is created by the compositor");
     qmlRegisterType<WindowModel>("org.nemomobile.lipstick", 0, 1, "WindowModel");
     qmlRegisterType<WindowPixmapItem>("org.nemomobile.lipstick", 0, 1, "WindowPixmapItem");
-    qmlRegisterType<WindowProperty>("org.nemomobile.lipstick", 0, 1, "WindowProperty");
     qmlRegisterSingletonType<LipstickApi>("org.nemomobile.lipstick", 0, 1, "Lipstick", lipstickApi_callback);
 
     qmlRegisterType<LipstickCompositorWindow>();
     qmlRegisterType<QObjectListModel>();
+    qmlRegisterType<WindowPropertyMap>();
 
     qmlRegisterRevision<QQuickWindow,1>("org.nemomobile.lipstick", 0, 1);
 }
diff --git a/rpm/lipstick-qt5.spec b/rpm/lipstick-qt5.spec
@@ -40,6 +40,7 @@ BuildRequires:  pkgconfig(wayland-server)
 BuildRequires:  pkgconfig(usb-moded-qt5) >= 1.6
 BuildRequires:  pkgconfig(systemsettings)
 BuildRequires:  pkgconfig(nemodevicelock)
+BuildRequires:  pkgconfig(ssu-sysinfo)
 BuildRequires:  qt5-qttools-linguist
 BuildRequires:  qt5-qtgui-devel >= 5.2.1+git24
 BuildRequires:  qt5-qtwayland-compositor-devel >= 5.9.5
@@ -152,11 +153,11 @@ mkdir -p %{buildroot}/%{icondirectory}
 
 %files doc
 %defattr(-,root,root,-)
-%{_datadir}/doc/lipstick/*
+#%{_datadir}/doc/lipstick/*
 
 %files notification-doc
 %defattr(-,root,root,-)
-%{_datadir}/doc/lipstick-notification/*
+#%{_datadir}/doc/lipstick-notification/*
 
 %files ts-devel
 %defattr(-,root,root,-)

diff --git a/src/compositor/compositor.pri b/src/compositor/compositor.pri
@@ -8,7 +8,7 @@ PUBLICHEADERS += \
     $$PWD/lipstickcompositorprocwindow.h \
     $$PWD/lipstickcompositoradaptor.h \
     $$PWD/windowmodel.h \
-    $$PWD/windowproperty.h
+    $$PWD/windowpropertymap.h
 
 HEADERS += \
     $$PWD/windowpixmapitem.h \
@@ -23,7 +23,7 @@ SOURCES += \
     $$PWD/lipstickcompositoradaptor.cpp \
     $$PWD/windowmodel.cpp \
     $$PWD/windowpixmapitem.cpp \
-    $$PWD/windowproperty.cpp \
+    $$PWD/windowpropertymap.cpp \
     $$PWD/hwcrenderstage.cpp \
     $$PWD/hwcimage.cpp \