removing messages from main UI, and making them available from a dialog accessible via Messages button

smaller mainwindow size

.gitignore

@@ -19,3 +19,4 @@ qdoc.conf
 ui_mainwindow.h
 ui_argdialog.h
 ui_consoledialog.h
+ui_messagedialog.h

include/ui/mainwindow.h

@@ -3,6 +3,7 @@
 
 #include <include/ui/argdialog.h>
 #include <include/ui/consoledialog.h>
+#include <include/ui/messagedialog.hpp>
 #include <QList>
 #include <QListView>
 #include <QListWidgetItem>
@@ -84,6 +85,7 @@ public:
     Ui::MainWindow *ui;
     ArgDialog *arg_ui;
     ConsoleDialog console_ui;
+    MessageDialog message_ui;
     /** Client member */
     Client* q_client;
     /** Models */

include/ui/messagedialog.hpp

@@ -0,0 +1,25 @@
+#ifndef MESSAGEDIALOG_HPP
+#define MESSAGEDIALOG_HPP
+
+#include <QDialog>
+#include <QPushButton>
+
+namespace Ui {
+class MessageDialog;
+}
+
+class MessageDialog : public QDialog
+{
+  Q_OBJECT
+
+ public:
+  explicit MessageDialog(QWidget *parent = nullptr);
+  void append(QString message);
+  ~MessageDialog();
+
+ private:
+  Ui::MessageDialog *ui;
+
+};
+
+#endif // MESSAGEDIALOG_HPP

kres.qrc

@@ -11,6 +11,7 @@
         <file>icons/clip.png</file>
         <file>favicon.ico</file>
         <file>icons/log.svg</file>
+        <file>icons/messages.png</file>
     </qresource>
     <qresource prefix="/">
         <file>icons/log.png</file>

ky_gui.pro

@@ -33,6 +33,7 @@ SOURCES += \
         src/client.cpp \
         src/instagram_task.cpp\
         src/argdialog.cpp \
+        src/messagedialog.cpp \
         src/consoledialog.cpp \
         src/connection_indicator.cpp \
         src/kfiledialog.cpp \
@@ -41,6 +42,7 @@ SOURCES += \
 HEADERS += \
         include/ui/argdialog.h \
         include/ui/consoledialog.h \
+        include/ui/messagedialog.hpp \
         include/ui/mainwindow.h \
         include/ui/connection_indicator.h \
         include/ui/kfiledialog.h \
@@ -53,13 +55,14 @@ HEADERS += \
         headers/kiq_types.hpp \
         headers/rapidjson/writer.h \
         headers/rapidjson/stringbuffer.h \
-        headers/rapidjson/document.h \
+        headers/rapidjson/document.h
 
 
 FORMS += \
         argdialog.ui \
         consoledialog.ui \
-        mainwindow.ui
+        mainwindow.ui \
+        messagedialog.ui
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin

messagedialog.ui

@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MessageDialog</class>
+ <widget class="QDialog" name="MessageDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>480</width>
+    <height>640</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <property name="styleSheet">
+   <string notr="true">border-color: rgb(0, 0, 0);
+background-color: rgb(0, 43, 54);
+</string>
+  </property>
+  <widget class="QWidget" name="layoutWidget">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>481</width>
+     <height>641</height>
+    </rect>
+   </property>
+   <layout class="QVBoxLayout" name="verticalLayout_3" stretch="0,3,0">
+    <property name="spacing">
+     <number>3</number>
+    </property>
+    <property name="leftMargin">
+     <number>8</number>
+    </property>
+    <property name="topMargin">
+     <number>4</number>
+    </property>
+    <property name="rightMargin">
+     <number>8</number>
+    </property>
+    <property name="bottomMargin">
+     <number>8</number>
+    </property>
+    <item>
+     <widget class="QLabel" name="messagesTitle">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="styleSheet">
+       <string notr="true">font: 75 11pt &quot;Noto Sans&quot;;
+color: rgb(131, 148, 150);
+font-weight: 700;</string>
+      </property>
+      <property name="text">
+       <string>History</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QTextEdit" name="messages">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="toolTip">
+       <string>Messages</string>
+      </property>
+      <property name="toolTipDuration">
+       <number>1</number>
+      </property>
+      <property name="autoFillBackground">
+       <bool>false</bool>
+      </property>
+      <property name="styleSheet">
+       <string notr="true">font: 87 11pt &quot;Noto Sans&quot;;
+background-color: #2f535f;
+color: rgb(131, 148, 150);
+font-weight: 700;
+background-color: rgb(29, 51, 59);
+color: rgb(223, 252, 255);</string>
+      </property>
+      <property name="lineWrapMode">
+       <enum>QTextEdit::WidgetWidth</enum>
+      </property>
+      <property name="readOnly">
+       <bool>true</bool>
+      </property>
+      <property name="placeholderText">
+       <string notr="true"/>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QPushButton" name="close">
+      <property name="styleSheet">
+       <string notr="true">background-color: rgb(255, 85, 0);
+font: 87 11pt &quot;Noto Sans&quot;;
+color: rgb(0, 43, 54);
+font-weight: 700;
+padding: 4px;
+border-style: outset;
+border-width: 2px;
+border-radius: 4px;
+border-color: #00000f;
+min-width: 4em;
+padding: 4px;</string>
+      </property>
+      <property name="text">
+       <string>Done</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

src/mainwindow.cpp

@@ -132,12 +132,16 @@ MainWindow::~MainWindow() {
  */
 void MainWindow::setConnectScreen(bool visible) {
   if (visible) {
-    ui->startScreen->setMaximumSize(1366, 825);
+    ui->startScreen->activateWindow();
-    ui->startScreen->setMinimumSize(1366, 825);
+    ui->startScreen->raise();
-    ui->connect->setMaximumSize(1366, 725);
+    ui->kyConfig->activateWindow();
-    ui->connect->setMinimumSize(1366, 725);
+    ui->kyConfig->raise();
-    ui->kyConfig->setMaximumSize(1366, 75);
+    ui->startScreen->setMaximumSize(1080, 690);
-    ui->kyConfig->setMinimumSize(1366, 75);
+    ui->startScreen->setMinimumSize(1080, 690);
+    ui->connect->setMaximumSize(1080, 615);
+    ui->connect->setMinimumSize(1080, 615);
+    ui->kyConfig->setMaximumSize(1080, 75);
+    ui->kyConfig->setMinimumSize(1080, 75);
     QFile file(QCoreApplication::applicationDirPath() + "/config/config.json");
     file.open(QIODevice::ReadOnly | QFile::ReadOnly);
     QString config_json = QString::fromUtf8(file.readAll());
@@ -207,6 +211,10 @@ void MainWindow::connectClient() {
     }
   });
 
+  QObject::connect(ui->openMessages, &QPushButton::clicked, this, [this]() {
+    message_ui.show();
+  });
+
   QObject::connect(
       arg_ui, &ArgDialog::taskRequestReady, this,
       [this](Task* task) {
@@ -216,11 +224,6 @@ void MainWindow::connectClient() {
         }
       });
 
-  QObject::connect(ui->tasks, &QPushButton::clicked, this, [this]() {
-    // TODO: Change this to a complete implementation
-    q_client->sendMessage("scheduler");
-  });
-
   QObject::connect(ui->viewConsole, &QPushButton::clicked, this,
                    [this]() { console_ui.show(); });
 
@@ -393,7 +396,7 @@ void MainWindow::MessageParser::handleCommands(StringVec commands,
  */
 void MainWindow::MessageParser::handleMessage(QString message, StringVec v) {
   auto simple_message = timestampPrefix() + parseMessage(message, v);
-  window->ui->messages->append(simple_message);
+  window->message_ui.append(simple_message);
 }
 
 /**

src/messagedialog.cpp

@@ -0,0 +1,19 @@
+#include "include/ui/messagedialog.hpp"
+#include "ui_messagedialog.h"
+
+MessageDialog::MessageDialog(QWidget *parent) :
+                                                QDialog(parent),
+                                                ui(new Ui::MessageDialog) {
+  ui->setupUi(this);
+  QObject::connect(ui->close, &QPushButton::clicked, this, [this]() {
+    this->close();
+  });
+}
+
+void MessageDialog::append(QString message) {
+  ui->messages->append(message);
+}
+
+MessageDialog::~MessageDialog() {
+  delete ui;
+}