Move the event filter from KonvergoWindow to it's own file.

src/system/SystemComponent.h

@@ -33,8 +33,6 @@ public:
 
   Q_INVOKABLE QString debugInformation();
 
-  Q_INVOKABLE QString logFilePath() { return Paths::logDir(Names::MainName() + ".log"); }
-
   Q_INVOKABLE QStringList networkAddresses() const;
   Q_INVOKABLE int networkPort() const;
 

src/ui/EventFilter.cpp

@@ -0,0 +1,63 @@
+//
+// Created by Tobias Hieta on 07/03/16.
+//
+
+#include "EventFilter.h"
+#include "system/SystemComponent.h"
+#include "settings/SettingsComponent.h"
+#include "input/InputKeyboard.h"
+
+#include <QKeyEvent>
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool EventFilter::eventFilter(QObject* watched, QEvent* event)
+{
+  SystemComponent& system = SystemComponent::Get();
+
+  // ignore mouse events if mouse is disabled
+  if  (SettingsComponent::Get().value(SETTINGS_SECTION_MAIN, "disablemouse").toBool() &&
+       ((event->type() == QEvent::MouseMove) ||
+        (event->type() == QEvent::MouseButtonPress) ||
+        (event->type() == QEvent::MouseButtonRelease) ||
+        (event->type() == QEvent::MouseButtonDblClick)))
+  {
+    return true;
+  }
+
+  if (event->type() == QEvent::KeyPress)
+  {
+    // In konvergo we intercept all keyboard events and translate them
+    // into web client actions. We need to do this so that we can remap
+    // keyboard buttons to different events.
+    //
+    QKeyEvent* kevent = dynamic_cast<QKeyEvent*>(event);
+    if (kevent)
+    {
+      system.setCursorVisibility(false);
+      if (kevent->spontaneous())
+      {
+        // We ignore the KeypadModifier here since it's practically useless
+        QKeySequence key(kevent->key() | (kevent->modifiers() &= ~Qt::KeypadModifier));
+        InputKeyboard::Get().keyPress(key);
+        return true;
+      }
+    }
+  }
+  else if (event->type() == QEvent::MouseMove)
+  {
+    system.setCursorVisibility(true);
+  }
+  else if (event->type() == QEvent::Wheel)
+  {
+    return true;
+  }
+  else if (event->type() == QEvent::MouseButtonPress)
+  {
+    // ignore right clicks that would show context menu
+    QMouseEvent *mouseEvent = dynamic_cast<QMouseEvent*>(event);
+    if ((mouseEvent) && (mouseEvent->button() == Qt::RightButton))
+      return true;
+  }
+
+  return QObject::eventFilter(watched, event);
+}

src/ui/EventFilter.h

@@ -0,0 +1,21 @@
+//
+// Created by Tobias Hieta on 07/03/16.
+//
+
+#ifndef PLEXMEDIAPLAYER_EVENTFILTER_H
+#define PLEXMEDIAPLAYER_EVENTFILTER_H
+
+#include <QObject>
+#include <QEvent>
+
+class EventFilter : public QObject
+{
+  Q_OBJECT
+public:
+  EventFilter(QObject* parent = 0) : QObject(parent) {}
+
+protected:
+  bool eventFilter(QObject* watched, QEvent* event);
+};
+
+#endif //PLEXMEDIAPLAYER_EVENTFILTER_H

src/ui/KonvergoWindow.cpp

@@ -16,59 +16,7 @@
 #include "power/PowerComponent.h"
 #include "utils/Utils.h"
 #include "KonvergoEngine.h"
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-bool MouseEventFilter::eventFilter(QObject* watched, QEvent* event)
-{
-  SystemComponent& system = SystemComponent::Get();
-
-  // ignore mouse events if mouse is disabled
-  if  (SettingsComponent::Get().value(SETTINGS_SECTION_MAIN, "disablemouse").toBool() &&
-       ((event->type() == QEvent::MouseMove) ||
-        (event->type() == QEvent::MouseButtonPress) ||
-        (event->type() == QEvent::MouseButtonRelease) ||
-        (event->type() == QEvent::MouseButtonDblClick)))
-  {
-    return true;
-  }
-
-  if (event->type() == QEvent::KeyPress)
-  {
-    // In konvergo we intercept all keyboard events and translate them
-    // into web client actions. We need to do this so that we can remap
-    // keyboard buttons to different events.
-    //
-    QKeyEvent* kevent = dynamic_cast<QKeyEvent*>(event);
-    if (kevent)
-    {
-      system.setCursorVisibility(false);
-      if (kevent->spontaneous())
-      {
-        // We ignore the KeypadModifier here since it's practically useless
-        QKeySequence key(kevent->key() | (kevent->modifiers() &= ~Qt::KeypadModifier));
-        InputKeyboard::Get().keyPress(key);
-        return true;
-      }
-    }
-  }
-  else if (event->type() == QEvent::MouseMove)
-  {
-    system.setCursorVisibility(true);
-  }
-  else if (event->type() == QEvent::Wheel)
-  {
-    return true;
-  }
-  else if (event->type() == QEvent::MouseButtonPress)
-  {
-    // ignore right clicks that would show context menu
-    QMouseEvent *mouseEvent = dynamic_cast<QMouseEvent*>(event);
-    if ((mouseEvent) && (mouseEvent->button() == Qt::RightButton))
-      return true;
-  }
-
-  return QObject::eventFilter(watched, event);
-}
+#include "EventFilter.h"
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 KonvergoWindow::KonvergoWindow(QWindow* parent) : QQuickWindow(parent), m_debugLayer(false)
@@ -76,12 +24,11 @@ KonvergoWindow::KonvergoWindow(QWindow* parent) : QQuickWindow(parent), m_debugL
   // NSWindowCollectionBehaviorFullScreenPrimary is only set on OSX if Qt::WindowFullscreenButtonHint is set on the window.
   setFlags(flags() | Qt::WindowFullscreenButtonHint);
 
-  m_eventFilter = new MouseEventFilter(this);
-  installEventFilter(m_eventFilter);
-
   m_infoTimer = new QTimer(this);
   m_infoTimer->setInterval(1000);
 
+  installEventFilter(new EventFilter(this));
+
   connect(m_infoTimer, &QTimer::timeout, this, &KonvergoWindow::updateDebugInfo);
 
   InputComponent::Get().registerHostCommand("close", this, "close");
@@ -152,7 +99,6 @@ void KonvergoWindow::closingWindow()
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 KonvergoWindow::~KonvergoWindow()
 {
-  removeEventFilter(m_eventFilter);
   DisplayComponent::Get().setApplicationWindow(0);
 }
 

src/ui/KonvergoWindow.h

@@ -4,17 +4,6 @@
 #include <QQuickWindow>
 #include <QEvent>
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-class MouseEventFilter : public QObject
-{
-  Q_OBJECT
-public:
-  MouseEventFilter(QObject* parent = 0) : QObject(parent) {}
-
-protected:
-  bool eventFilter(QObject* watched, QEvent* event);
-};
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 class KonvergoWindow : public QQuickWindow
 {
@@ -82,7 +71,6 @@ private:
 
 private:
   bool m_debugLayer;
-  MouseEventFilter* m_eventFilter;
   QTimer* m_infoTimer;
   QString m_debugInfo, m_systemDebugInfo, m_videoInfo;
 };