Detection of application deactivation now done from QML

diff --git a/chessclockview.cpp b/chessclockview.cpp
deleted file mode 100644 (file)
index d76605b..0000000
--- a/chessclockview.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "chessclockview.h"
-#include <QDeclarativeContext>
-#include <QDebug>
-#include <QGraphicsObject>
-
-ChessClockView::ChessClockView(QWidget *parent) :
-    QDeclarativeView(parent)
-{
-
-}
-
-bool ChessClockView::event(QEvent *event)
-{
-
-    if (event->type() == QEvent::WindowDeactivate)
-    {
-        QGraphicsObject *pObject = rootObject();
-        if (pObject)
-            pObject->setProperty("applicationActive",false);
-    }
-
-    else if (event->type() == QEvent::WindowActivate)
-    {
-        QGraphicsObject *pObject = rootObject();
-        if (pObject)
-            pObject->setProperty("applicationActive",true);
-    }
-
-
-    return QDeclarativeView::event(event);
-}

diff --git a/chessclockview.h b/chessclockview.h
deleted file mode 100644 (file)
index b35cb0d..0000000
--- a/chessclockview.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef CHESSCLOCKVIEW_H
-#define CHESSCLOCKVIEW_H
-
-#include <QDeclarativeView>
-
-class ChessClockView : public QDeclarativeView
-{
-    Q_OBJECT
-public:
-    explicit ChessClockView(QWidget *parent = 0);
-
-    bool event (QEvent *event);
-
-signals:
-
-public slots:
-
-};
-
-#endif // CHESSCLOCKVIEW_H

diff --git a/main.cpp b/main.cpp
index 394c7f4..b5107ad 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -22,7 +22,6 @@
 #include <QtGui/QApplication>
 #include <QtDeclarative>
 #include "classes/wrappedclockswidget.h"
-#include "chessclockview.h"
 #include "classes/settings.h"
 
 
@@ -38,7 +37,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
     qmlRegisterType<WrappedClocksWidget>("ChessClocks", 1, 0, "WrappedClocksWidget");
     qmlRegisterType<Settings>("ChessClocks", 1, 0, "Settings");
 
-    ChessClockView view;
+    QDeclarativeView view;
     view.setSource(QUrl("qrc:/qml/main.qml"));
 
     view.showFullScreen();

diff --git a/qml/main.qml b/qml/main.qml
index fb7208f..3e80d42 100644 (file)
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -27,7 +27,7 @@ PageStackWindow {
     id: appWindow
 
 
-    property bool applicationActive: true //This is supposed to be set from C++
+    property bool applicationActive: Qt.application.active
 
 
     Component.onCompleted: theme.inverted = true