diff options
| author | Jonatan Pålsson <jonatan.palsson@pelagicore.com> | 2014-02-17 11:21:41 +0100 |
|---|---|---|
| committer | Jonatan Pålsson <jonatan.palsson@pelagicore.com> | 2014-02-17 11:21:41 +0100 |
| commit | 02a5c840fa62b7d7ee8b8e2f78a4430f869b8ddd (patch) | |
| tree | 737b272a52ea1315bca3d55ccd7784bd5d94225f | |
| parent | fb453c1e3e7d97613f8e227929a0361357982c76 (diff) | |
| download | browser-poc-02a5c840fa62b7d7ee8b8e2f78a4430f869b8ddd.tar.gz | |
Added some QML elements for ErrorLogger
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | testapp/main.cpp | 3 | ||||
| -rw-r--r-- | testapp/qml/testapp/main.qml | 14 | ||||
| -rw-r--r-- | testapp/testapp.pro | 12 |
4 files changed, 25 insertions, 5 deletions
@@ -7,7 +7,6 @@ browser.desktop browser64.png browser80.png browser_harmattan.desktop -testapp i*_interface.h i*_interface.cpp i*_adaptor.h diff --git a/testapp/main.cpp b/testapp/main.cpp index 1149390..6edd902 100644 --- a/testapp/main.cpp +++ b/testapp/main.cpp @@ -16,6 +16,8 @@ #include <QtQml> #include "../common/browserdbus.h" #include "../common/cachemanagerdbus.h" +#include "../common/errorloggerdbus.h" +#include "../common/browserdefs.h" int main(int argc, char *argv[]) { @@ -23,6 +25,7 @@ int main(int argc, char *argv[]) qmlRegisterType<BrowserDbus>("browserdbusinterface",1,0,"BrowserInterface"); qmlRegisterType<CacheManagerDbus>("browserdbusinterface",1,0,"CacheManagerInterface"); + qmlRegisterType<ErrorLoggerDbus>("browserdbusinterface",1,0,"ErrorLoggerInterface"); qmlRegisterType<Bookmark>("browserdbusinterface",1,0,"Tmp"); QQmlApplicationEngine engine("qml/testapp/main.qml"); diff --git a/testapp/qml/testapp/main.qml b/testapp/qml/testapp/main.qml index 9802b20..42909d3 100644 --- a/testapp/qml/testapp/main.qml +++ b/testapp/qml/testapp/main.qml @@ -17,6 +17,10 @@ ApplicationWindow { id: cachemanagerinterface } + ErrorLoggerInterface { + id: errorloggerinterface + } + Item { id: header width: parent.width @@ -54,7 +58,8 @@ ApplicationWindow { anchors.leftMargin: 20 text: "Connect" onClicked: { browserinterface.connectdbussession(inputstring.text); - cachemanagerinterface.connectdbussession(inputstring.text);} + cachemanagerinterface.connectdbussession(inputstring.text); + errorloggerinterface.connectdbussession(inputstring.text);} } Component { id: hallo @@ -160,5 +165,12 @@ ApplicationWindow { clip: true CacheManager {} } + Tab { + id: errorlogger + title: "IErrorLogger" + anchors.fill: parent + clip: true + ErrorLogger {} + } } } diff --git a/testapp/testapp.pro b/testapp/testapp.pro index 7966569..62907c0 100644 --- a/testapp/testapp.pro +++ b/testapp/testapp.pro @@ -22,15 +22,20 @@ my_dbus_interfaces.header_flags = -i ../common/browserdefs.h my_dbus_interfaces.files += ../common/ICacheManager.xml my_dbus_interfaces.header_flags = -i ../common/browserdefs.h +my_dbus_interfaces.files += ../common/IErrorLogger.xml +my_dbus_interfaces.header_flags += -l errorlogger -i ../browser/errorlogger.h -i ../common/browserdefs.h + DBUS_INTERFACES += my_dbus_interfaces include(../common/common.pri) SOURCES += main.cpp \ - ../common/cachemanagerdbus.cpp + ../common/cachemanagerdbus.cpp \ + ../common/errorloggerdbus.cpp HEADERS += ../common/cachemanagerdbus.h \ - ../common/browserdefs.h + ../common/browserdefs.h \ + ../common/errorloggerdbus.h OTHER_FILES += \ qml/testapp/main.qml \ @@ -38,5 +43,6 @@ OTHER_FILES += \ qml/testapp/Browser.qml \ qml/testapp/BookmarkManager.qml \ qml/testapp/WebPageWindow.qml \ - qml/testapp/CacheManager.qml + qml/testapp/CacheManager.qml \ + qml/testapp/ErrorLogger.qml |