adaptions for app image

Author: mcphatty

src/test/ui_test_cmd.cpp

@@ -191,6 +191,11 @@ void RTCommandUIGet::assignVariables_impl(const VariablesMap& variables)
  *************************************************************************/
 
 /**
+ * Inject UI events into UI objects, e.g.
+ * uiinject mouse(left,click,50,40)  => inject a mouse click at (50,40)
+ *          mouse(right,click,-1,-1) => inject a mouse click at the middle of the widget
+ *          mouse(left,click,50%,50%) => inject a mouse click at the middle of the widget
+ *          mouse(left,rect,0,0,100,100) => press the mouse at (0,0), move to (100,100) and release the mouse
  */
 bool RTCommandUIInject::run_impl()
 {

src/test/ui_test_event_injections.cpp

@@ -166,7 +166,7 @@ bool injectKeyCmdEvent(QWidget* root,
 
     auto injectionMsg = [ & ] (const std::string& obj_type) 
     {
-        loginf << "Injecting command";
+        loginf << "Injecting key into " << obj_type;
     };
 
     if (obj.second->isWidgetType())
@@ -183,6 +183,46 @@ bool injectKeyCmdEvent(QWidget* root,
     return true;
 }
 
+/**
+*/
+bool injectKeySequenceEvent(QWidget* root,
+                            const QString& obj_name,
+                            const QKeySequence& keys,
+                            int delay)
+{
+    auto obj = findObject(root, obj_name);
+    if (obj.first != rtcommand::FindObjectErrCode::NoError)
+    {
+        logObjectError("injectKeySequenceEvent", obj_name, obj.first);
+        return false;
+    }
+    if (!obj.second->isWidgetType() && !obj.second->isWindowType())
+    {
+        logObjectError("injectKeySequenceEvent", obj_name, rtcommand::FindObjectErrCode::WrongType);
+        return false;
+    }
+    
+    auto injectionMsg = [ & ] (const std::string& obj_type) 
+    {
+        loginf << "Injecting key sequence into " << obj_type;
+    };
+ 
+    if (obj.second->isWidgetType())
+    {
+        injectionMsg("widget");
+        //@TODO: keySequence not available in appimage qt
+        //QTest::keySequence(dynamic_cast<QWidget*>(obj.second), keys);
+    }
+    else //window
+    {
+        injectionMsg("window");
+        //@TODO: keySequence not available in appimage qt
+        //QTest::keySequence(dynamic_cast<QWindow*>(obj.second), keys);
+    }
+
+    return true;
+}
+
 /**
  * Injects mouse clicks into widgets or windows.
  */

src/test/ui_test_event_injections.h

@@ -56,6 +56,10 @@ namespace ui_test
                            const Qt::Key& key,
                            Qt::KeyboardModifiers modifier,
                            int delay = -1);
+    bool injectKeySequenceEvent(QWidget* root,
+                                const QString& obj_name,
+                                const QKeySequence& keys,
+                                int delay = -1);
     bool injectClickEvent(QWidget* root,
                           const QString& obj_name, 
                           int x = -1, 

src/test/ui_test_inject.cpp

@@ -37,6 +37,25 @@ bool injectUIEvent(QWidget* parent,
     if (w.first != rtcommand::FindObjectErrCode::NoError)
         return false;
 
+    auto splitEvent = [ & ] (QString& evt_type, QStringList& params, const QString& str)
+    {
+        int idx = str.indexOf("(", 0);
+        if (idx < 1)
+            return false;
+
+        evt_type = str.mid(0, idx);
+
+        auto param_str = str.mid(idx);
+        if (!param_str.startsWith("(") || !param_str.endsWith(")"))
+            return false;
+
+        param_str = param_str.mid(1, param_str.count() - 2);
+
+        params = param_str.split(",");
+
+        return true;
+    };
+
     auto mouseButtonFromString = [ & ] (const QString& str)
     {
         if (str == "left")
@@ -78,13 +97,12 @@ bool injectUIEvent(QWidget* parent,
         if (s.endsWith("%"))
         {
             percent = true;
-            s = s.chopped(1);
+            s.chop(1);
         }
 
         if (s.isEmpty())
             return c;
 
-        
         bool ok;
         double v = s.toDouble(&ok);
 
@@ -97,23 +115,21 @@ bool injectUIEvent(QWidget* parent,
         return c;
     };
 
-    if (event.startsWith("mouse"))
-    {
-        auto param_str = QString(event).remove("mouse");
-
-        if (!param_str.startsWith("(") || !param_str.endsWith(")"))
-            return false;
-
-        param_str = param_str.mid(1, param_str.count() - 2);
+    QString evt_type;
+    QStringList params;
+    if (!splitEvent(evt_type, params, event))
+        return false;
 
-        auto params = param_str.split(",");
+    if (evt_type == "mouse")
+    {
         if (params.size() < 2)
             return false;
 
         auto button = mouseButtonFromString(params[ 0 ]);
         auto action = mouseActionFromString(params[ 1 ]);
 
-        if (button == Qt::NoButton || action == MouseAction::NoAction)
+        if (button == Qt::NoButton || 
+            action == MouseAction::NoAction)
             return false;
 
         if (action == MouseAction::Click)
@@ -144,15 +160,17 @@ bool injectUIEvent(QWidget* parent,
             return false;
         }
     }
-    else if (event.endsWith("wheel"))
+    else if (evt_type == "wheel")
     {
         //@TODO
         return false;
     }
-    else if (event.endsWith("keys"))
+    else if (evt_type == "keys")
     {
-        //@TODO
-        return false;
+        if (params.size() != 1)
+            return false;
+
+        return injectKeySequenceEvent(w.second, "", QKeySequence(params[ 0 ]));
     }
 
     //unknown event