From e05f5306f50029b0f5f471b70cfe45749d0d21f6 Mon Sep 17 00:00:00 2001
From: bd <bdunahu@operationnull.com>
Date: Sun, 23 Mar 2025 21:48:12 -0400
Subject: Remove Python, combine main files

---
 src/gui/GUI.cc        | 39 ------------------------------------
 src/gui/GUI.h         | 27 -------------------------
 src/gui/GUI.ui        | 55 ---------------------------------------------------
 src/gui/gui.cc        | 39 ++++++++++++++++++++++++++++++++++++
 src/gui/gui.ui        | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/gui/main.cc       | 11 -----------
 src/gui/resources.qrc |  5 +++--
 src/main.cc           | 12 +++++++----
 8 files changed, 105 insertions(+), 138 deletions(-)
 delete mode 100644 src/gui/GUI.cc
 delete mode 100644 src/gui/GUI.h
 delete mode 100644 src/gui/GUI.ui
 create mode 100644 src/gui/gui.cc
 create mode 100644 src/gui/gui.ui
 delete mode 100644 src/gui/main.cc

(limited to 'src')

diff --git a/src/gui/GUI.cc b/src/gui/GUI.cc
deleted file mode 100644
index 5577e6e..0000000
--- a/src/gui/GUI.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "GUI.h"
-#include "./ui_GUI.h"
-#include <QFile>
-#include <QTextStream>
-
-GUI::GUI(QWidget *parent)
-    : QWidget(parent)
-    , ui(new Ui::GUI)
-{
-    ui->setupUi(this);
-    loadTxtFile();
-}
-
-GUI::~GUI()
-{
-    delete ui;
-}
-
-void GUI::loadTxtFile(){
-    QFile inputFile(":/resources/input.txt");
-    inputFile.open(QIODevice::ReadOnly);
-
-    QTextStream in(&inputFile);
-    QString line = in.readAll();
-    inputFile.close();
-
-    ui->textEdit->setPlainText(line);
-    QTextCursor cursor = ui->textEdit->textCursor();
-    cursor.movePosition(QTextCursor::Start, QTextCursor::MoveAnchor, 1);
-}
-
-void GUI::on_pushButton_clicked()
-{
-    QString searchString = ui->lineEdit->text();
-    ui->textEdit->find(searchString, QTextDocument::FindWholeWords);
-}
-
-
-
diff --git a/src/gui/GUI.h b/src/gui/GUI.h
deleted file mode 100644
index b06f310..0000000
--- a/src/gui/GUI.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef GUI_H
-#define GUI_H
-
-#include <QWidget>
-
-QT_BEGIN_NAMESPACE
-namespace Ui {
-class GUI;
-}
-QT_END_NAMESPACE
-
-class GUI : public QWidget
-{
-    Q_OBJECT
-
-public:
-    GUI(QWidget *parent = nullptr);
-    ~GUI();
-
-private slots:
-    void on_pushButton_clicked();
-
-private:
-    Ui::GUI *ui;
-    void loadTxtFile();
-};
-#endif // GUI_H
diff --git a/src/gui/GUI.ui b/src/gui/GUI.ui
deleted file mode 100644
index bce52c2..0000000
--- a/src/gui/GUI.ui
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>GUI</class>
- <widget class="QWidget" name="GUI">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>800</width>
-    <height>600</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>GUI</string>
-  </property>
-  <widget class="QWidget" name="">
-   <property name="geometry">
-    <rect>
-     <x>60</x>
-     <y>30</y>
-     <width>317</width>
-     <height>232</height>
-    </rect>
-   </property>
-   <layout class="QVBoxLayout" name="verticalLayout">
-    <item>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <item>
-       <widget class="QLabel" name="label">
-        <property name="text">
-         <string>keyword</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLineEdit" name="lineEdit"/>
-      </item>
-      <item>
-       <widget class="QPushButton" name="pushButton">
-        <property name="text">
-         <string>find</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </item>
-    <item>
-     <widget class="QTextEdit" name="textEdit"/>
-    </item>
-   </layout>
-  </widget>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/gui/gui.cc b/src/gui/gui.cc
new file mode 100644
index 0000000..9f2405d
--- /dev/null
+++ b/src/gui/gui.cc
@@ -0,0 +1,39 @@
+#include "gui.h"
+#include "ui_gui.h"
+#include <QFile>
+#include <QTextStream>
+
+Gui::Gui(QWidget *parent)
+    : QWidget(parent)
+    , ui(new Ui::gui)
+{
+    ui->setupUi(this);
+    loadTxtFile();
+}
+
+Gui::~Gui()
+{
+    delete ui;
+}
+
+void Gui::loadTxtFile(){
+    QFile inputFile(":/resources/input.txt");
+    inputFile.open(QIODevice::ReadOnly);
+
+    QTextStream in(&inputFile);
+    QString line = in.readAll();
+    inputFile.close();
+
+    ui->textEdit->setPlainText(line);
+    QTextCursor cursor = ui->textEdit->textCursor();
+    cursor.movePosition(QTextCursor::Start, QTextCursor::MoveAnchor, 1);
+}
+
+void Gui::on_pushButton_clicked()
+{
+    QString searchString = ui->lineEdit->text();
+    ui->textEdit->find(searchString, QTextDocument::FindWholeWords);
+}
+
+
+
diff --git a/src/gui/gui.ui b/src/gui/gui.ui
new file mode 100644
index 0000000..5f71c91
--- /dev/null
+++ b/src/gui/gui.ui
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>gui</class>
+ <widget class="QWidget" name="gui">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>600</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>gui</string>
+  </property>
+  <widget class="QWidget" name="">
+   <property name="geometry">
+    <rect>
+     <x>60</x>
+     <y>30</y>
+     <width>317</width>
+     <height>232</height>
+    </rect>
+   </property>
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <item>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>keyword</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="lineEdit"/>
+      </item>
+      <item>
+       <widget class="QPushButton" name="pushButton">
+        <property name="text">
+         <string>find</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+    <item>
+     <widget class="QTextEdit" name="textEdit"/>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/gui/main.cc b/src/gui/main.cc
deleted file mode 100644
index e592da9..0000000
--- a/src/gui/main.cc
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "GUI.h"
-
-#include <QApplication>
-
-int main(int argc, char *argv[])
-{
-    QApplication a(argc, argv);
-    GUI w;
-    w.show();
-    return a.exec();
-}
diff --git a/src/gui/resources.qrc b/src/gui/resources.qrc
index 44aaefa..8bfd4e7 100644
--- a/src/gui/resources.qrc
+++ b/src/gui/resources.qrc
@@ -1,5 +1,6 @@
-<RCC>
+<!DOCTYPE RCC>
+<RCC version="1.0">
     <qresource prefix="/resources">
-        <file alias = "input.txt">resources/input.txt</file>
+        <file alias="input.txt">resources/input.txt</file>
     </qresource>
 </RCC>
diff --git a/src/main.cc b/src/main.cc
index f5eecac..be0a6f0 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,6 +1,8 @@
 #include "cli.h"
 #include "definitions.h"
+#include "gui.h"
 #include "logger.h"
+#include <QApplication>
 #include <getopt.h>
 #include <iostream>
 
@@ -36,8 +38,7 @@ static void err()
 			  << std::endl;
 }
 
-static void
-parseArguments(int argc, char **argv, bool &memory_only)
+static void parseArguments(int argc, char **argv, bool &memory_only)
 {
 	struct option long_options[] = {
 		{"debug", no_argument, 0, 'd'},
@@ -74,10 +75,13 @@ int main(int argc, char **argv)
 	if (memory_only) {
 		Cli cli;
 		cli.run();
+	} else {
+		QApplication a(argc, argv);
+		Gui w;
+		w.show();
+		return a.exec();
 	}
 
-	// fork off python here
-	global_log->log(INFO, "Python started.");
 	global_log->log(INFO, "Cleaning up...");
 	global_log->log(INFO, "Goodbye!");
 	return EXIT_SUCCESS;
-- 
cgit v1.2.3