Browse Source

Finalized Base GUI - need CLI Feex now

Cyamond 5 năm trước cách đây
mục cha
commit
9cd2e45003
4 tập tin đã thay đổi với 18 bổ sung35 xóa
  1. 10 13
      gui/src/main.cpp
  2. 4 15
      gui/src/main.qml
  3. 3 5
      gui/src/qmlhandler.cpp
  4. 1 2
      gui/src/qmlhandler.h

+ 10 - 13
gui/src/main.cpp

@@ -35,7 +35,9 @@ int main(int argc, char *argv[]) {
     prctl(PR_SET_PDEATHSIG, SIGTERM);
 
     // Set the path to the CLI - pass argument h (help) for now
-    execl("../../cli/ccats-cli", "c", "127.0.0.1", (char *)NULL);
+    // TODO: Change hardcoded path
+    execl("../../cli/build/ccats-cli", "ccats-cli", "c", "127.0.0.1",
+          (char *)NULL);
 
     exit(1);
   }
@@ -43,7 +45,7 @@ int main(int argc, char *argv[]) {
   close(outpipefd[0]);
   close(inpipefd[1]);
 
-  // ########## GUI CODE; DO NOT TOUCH ##########
+  // ########## GUI CODE ##########
 
   QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
 
@@ -55,22 +57,17 @@ int main(int argc, char *argv[]) {
   if (engine.rootObjects().isEmpty())
     return -1;
 
-  QMLHandler fooBar;
+  QMLHandler qmlHandler;
 
-  QObject *item =
-      engine.rootObjects().first()->findChild<QObject *>("connectbutton");
-  QObject *item2 =
-      engine.rootObjects().first()->findChild<QObject *>("disconnectbutton");
+  QObject *statusButton =
+      engine.rootObjects().first()->findChild<QObject *>("getstatusbutton");
 
-  QObject::connect(item, SIGNAL(clicked()), &fooBar, SLOT(onConnectClick()));
-  QObject::connect(item2, SIGNAL(clicked()), &fooBar,
-                   SLOT(onDisconnectClick()));
+  QObject::connect(statusButton, SIGNAL(clicked()), &qmlHandler,
+                   SLOT(onGetStatusClick()));
 
-  QObject::connect(&fooBar, SIGNAL(setStatusMessage(QVariant)),
+  QObject::connect(&qmlHandler, SIGNAL(setStatusMessage(QVariant)),
                    engine.rootObjects().first(),
                    SLOT(setStatusMessage(QVariant)));
 
   return app.exec();
-
-  // ########## GUI CODE; DO NOT TOUCH ##########
 }

+ 4 - 15
gui/src/main.qml

@@ -10,7 +10,6 @@ Window {
     title: qsTr("Covert Channel | Control Panel")
 
     function setStatusMessage(text) {
-        console.log("BAM 3")
         statusmessage.text = text
     }
 
@@ -22,7 +21,7 @@ Window {
         width: 861
         height: 109
         color: "#ffffff"
-        text: qsTr("...Status Message...")
+        text: qsTr("")
         font.family: "Courier"
         horizontalAlignment: Text.AlignHCenter
         fontSizeMode: Text.FixedSize
@@ -30,22 +29,12 @@ Window {
     }
 
     Button {
-        id: connectbutton
-        objectName: "connectbutton"
+        id: getstatusbutton
+        objectName: "getstatusbutton"
         x: 504
         y: 183
         width: 273
         height: 73
-        text: qsTr("Connect")
-    }
-
-    Button {
-        id: disconnectbutton
-        objectName: "disconnectbutton"
-        x: 504
-        y: 304
-        width: 273
-        height: 73
-        text: qsTr("Disconnect")
+        text: qsTr("Get Daemon Status")
     }
 }

+ 3 - 5
gui/src/qmlhandler.cpp

@@ -8,12 +8,10 @@ extern char buf[1024];
 
 QMLHandler::QMLHandler(QObject *parent) : QObject(parent) {}
 
-void QMLHandler::onConnectClick() {
-  emit setStatusMessage("Connecting");
+void QMLHandler::onGetStatusClick() {
   read(inpipefd[0], buf, 1024);
   buf[1023] = 0;
   buf[strlen(buf)] = 0;
   qInfo() << buf;
-}
-
-void QMLHandler::onDisconnectClick() { qInfo() << "BAM 2"; }
+  emit setStatusMessage("Check Terminal plz");
+}

+ 1 - 2
gui/src/qmlhandler.h

@@ -14,8 +14,7 @@ signals:
   void setStatusMessage(QVariant text);
 
 public slots:
-  void onConnectClick();
-  void onDisconnectClick();
+  void onGetStatusClick();
 };
 
 #endif // CCATS_GUI_QMLHANDLER_H