summaryrefslogtreecommitdiffstats
path: root/interfaces/include
diff options
context:
space:
mode:
authorBocklage, Jens <Jens_Bocklage@mentor.com>2016-11-08 19:46:21 +0100
committerBocklage, Jens <Jens_Bocklage@mentor.com>2016-11-08 19:46:21 +0100
commitdd8c90f87463d370c3076e13b7c6cc0e27c0d2f5 (patch)
treef5ec587cfda6ea802ebf0a87ad0fca5712968d3d /interfaces/include
parentd364a5eea428db2eadbb77f3e5da7b74dc36127f (diff)
-Make the SampleNav app yellow.
-Preparation for the new ApplicationFramework binding. The App Framework provides more information. --Adding afm D-Bus-interface introspection --Updating the AppInfo datatype to hold the new data: The application info consists of: string id; string version; int width; int height; string name; string description; string shortname; string author; string iconPath; -When pressing the AppLauncher Button or the Settings Button, the app layer is hidden. --Therefore, shideLayer and showLayer is introduced in the WindowManager API -If an application does not create its surface instantly, the HomeScreen retries to show the surface related to the pid. -New WindowManager function deleteLayoutById -Implement the complete HomeScreen API in the libhomescreen Signed-off-by: Bocklage, Jens <Jens_Bocklage@mentor.com>
Diffstat (limited to 'interfaces/include')
-rw-r--r--interfaces/include/afm_user_daemon.hpp21
-rw-r--r--interfaces/include/appframework.hpp40
-rw-r--r--interfaces/include/windowmanager.hpp1
3 files changed, 39 insertions, 23 deletions
diff --git a/interfaces/include/afm_user_daemon.hpp b/interfaces/include/afm_user_daemon.hpp
new file mode 100644
index 0000000..256292b
--- /dev/null
+++ b/interfaces/include/afm_user_daemon.hpp
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef AFM_USER_DAEMON_HPP
+#define AFM_USER_DAEMON_HPP
+
+
+#endif // AFM_USER_DAEMON_HPP
diff --git a/interfaces/include/appframework.hpp b/interfaces/include/appframework.hpp
index d95cd9d..d4abefb 100644
--- a/interfaces/include/appframework.hpp
+++ b/interfaces/include/appframework.hpp
@@ -17,38 +17,32 @@
#ifndef APPFRAMEWORK_HPP
#define APPFRAMEWORK_HPP
-#include <QObject>
#include <QtDBus>
-#include <QString>
-class AppInfo : public QObject
+class AppInfo
{
- Q_OBJECT
public:
- explicit AppInfo(QObject *parent = 0);
- AppInfo(const AppInfo &other);
- AppInfo& operator=(const AppInfo &other);
- ~AppInfo();
+ AppInfo();
+ virtual ~AppInfo();
- //register Message with the Qt type system
- static void registerMetaType();
-
- friend QDBusArgument &operator<<(QDBusArgument &argument, const AppInfo &appInfo);
- friend const QDBusArgument &operator>>(const QDBusArgument &argument, AppInfo &appInfo);
-
- void setName(const QString name) {this->name = name;}
- QString getName() const {return name;}
- void setIconPath(const QString iconPath) {this->iconPath = iconPath;}
- QString getIconPath() const {return iconPath;}
- void setDescription(const QString description) {this->description = description;}
- QString getDescription() const {return description;}
-
-private:
+ QString id;
+ QString version;
+ int width;
+ int height;
QString name;
- QString iconPath;
QString description;
+ QString shortname;
+ QString author;
+ QString iconPath;
+
+ void read(const QJsonObject &json);
+
+ friend QDBusArgument &operator <<(QDBusArgument &argument, const AppInfo &mAppInfo);
+ friend const QDBusArgument &operator >>(const QDBusArgument &argument, AppInfo &mAppInfo);
};
+
Q_DECLARE_METATYPE(AppInfo)
+Q_DECLARE_METATYPE(QList<AppInfo>)
#endif // APPFRAMEWORK_HPP
diff --git a/interfaces/include/windowmanager.hpp b/interfaces/include/windowmanager.hpp
index 45c7c6e..ebab2d7 100644
--- a/interfaces/include/windowmanager.hpp
+++ b/interfaces/include/windowmanager.hpp
@@ -24,6 +24,7 @@
#define WINDOWMANAGER_ERROR_NAME_ALREADY_DEFINED 2
#define WINDOWMANAGER_ERROR_ID_NOT_FOUND 3
#define WINDOWMANAGER_ERROR_NAME_NOT_FOUND 4
+#define WINDOWMANAGER_ERROR_ID_IN_USE 5
class SimplePoint
{