Merge branch 'master' into Eeems-patch-2

Eeems-Org · Jan 15, 2024 · d00d763 · d00d763
2 parents e302ee5 + f4b81ed
commit d00d763
Show file tree

Hide file tree

Showing 58 changed files with 1,593 additions and 1,011 deletions.
diff --git a/applications/gio/common.h b/applications/gio/common.h
@@ -74,7 +74,10 @@ class ICommand {
 
     ICommand(bool allowEmpty);
     virtual int arguments(){ return EXIT_FAILURE; }
-    virtual int command(const QStringList& args){ return EXIT_FAILURE; }
+    virtual int command(const QStringList& args){
+        Q_UNUSED(args);
+        return EXIT_FAILURE;
+    }
 
 protected:
     bool allowEmpty = false;

diff --git a/applications/launcher/controller.h b/applications/launcher/controller.h
@@ -6,7 +6,6 @@
 #include <QGuiApplication>
 #include <QMutableListIterator>
 #include <liboxide.h>
-#include <liboxide/eventfilter.h>
 #include <liboxide/sysobject.h>
 
 #include "appitem.h"
@@ -19,7 +18,6 @@
 using namespace codes::eeems::oxide1;
 using codes::eeems::oxide1::Power;
 using Oxide::SysObject;
-using Oxide::EventFilter;
 using namespace Oxide::Sentry;
 
 enum State { Normal, PowerSaving };
@@ -61,7 +59,6 @@ class Controller : public QObject
     Q_PROPERTY(int maxTouchHeight READ maxTouchHeight)
 public:
     static std::string exec(const char* cmd);
-    EventFilter* filter;
     QObject* stateController;
     QObject* root = nullptr;
     explicit Controller(QObject* parent = 0)

diff --git a/applications/launcher/main.cpp b/applications/launcher/main.cpp
@@ -16,11 +16,14 @@
 #include <cstdlib>
 #include <signal.h>
 #include <liboxide.h>
+#include <liboxide/oxideqml.h>
+#include <liboxide/eventfilter.h>
 
 #include "controller.h"
 
 using namespace std;
 using namespace Oxide;
+using namespace Oxide::QML;
 using namespace Oxide::Sentry;
 
 function<void(int)> shutdown_handler;
@@ -30,19 +33,16 @@ int main(int argc, char* argv[]){
     deviceSettings.setupQtEnvironment();
     QGuiApplication app(argc, argv);
     sentry_init("oxide", argv);
-    auto filter = new EventFilter(&app);
     app.setOrganizationName("Eeems");
     app.setOrganizationDomain(OXIDE_SERVICE);
     app.setApplicationName("oxide");
     app.setApplicationDisplayName("Launcher");
-    app.installEventFilter(filter);
     QQmlApplicationEngine engine;
     QQmlContext* context = engine.rootContext();
     Controller* controller = new Controller();
-    controller->filter = filter;
     qmlRegisterAnonymousType<AppItem>("codes.eeems.oxide", 2);
     qmlRegisterAnonymousType<Controller>("codes.eeems.oxide", 2);
-    context->setContextProperty("screenGeometry", app.primaryScreen()->geometry());
+    registerQML(&engine);
     context->setContextProperty("apps", QVariant::fromValue(controller->getApps()));
     context->setContextProperty("controller", controller);
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
@@ -52,7 +52,7 @@ int main(int argc, char* argv[]){
     }
     QObject* root = engine.rootObjects().first();
     controller->root = root;
-    filter->root = (QQuickItem*)root;
+    root->installEventFilter(new EventFilter(&app));
     QObject* stateController = root->findChild<QObject*>("stateController");
     if(!stateController){
         qDebug() << "Can't find stateController";