Revert "current"

This reverts commit 170e391549275cea0b717197cb2b2763b4ce576e.

argdialog.ui

@@ -318,7 +318,7 @@ padding-left: 2px;</string>
          <bool>true</bool>
         </property>
         <property name="columnCount">
-         <number>4</number>
+         <number>3</number>
         </property>
         <attribute name="horizontalHeaderCascadingSectionResizes">
          <bool>false</bool>
@@ -338,28 +338,23 @@ padding-left: 2px;</string>
         <column/>
         <column/>
         <column/>
-        <column/>
        </widget>
       </item>
       <item>
-       <layout class="QVBoxLayout" name="verticalLayout_2">
-        <item>
-         <spacer name="horizontalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Maximum</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
+       <spacer name="horizontalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Maximum</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
       </item>
      </layout>
     </item>
@@ -386,30 +381,6 @@ padding: 4px;</string>
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QPushButton" name="clear">
-        <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>Clear</string>
-        </property>
-        <property name="icon">
-         <iconset>
-          <normaloff>icons/erase.png</normaloff>icons/erase.png</iconset>
-        </property>
-       </widget>
-      </item>
       <item>
        <widget class="QDialogButtonBox" name="argCommandButtons">
         <property name="sizePolicy">

consoledialog.ui

@@ -29,10 +29,10 @@
   <widget class="QLabel" name="consoleTitle">
    <property name="geometry">
     <rect>
-     <x>290</x>
+     <x>300</x>
      <y>20</y>
-     <width>91</width>
-     <height>20</height>
+     <width>51</width>
+     <height>18</height>
     </rect>
    </property>
    <property name="text">

headers/util.hpp

@@ -57,7 +57,7 @@ struct KSession {
 };
 
 static QString escapeText(QString s) {
-    qDebug() << "Escaping text: " << s;
+    qDebug() << "Escaping text";
     if (s.contains("'")) {
         qDebug() << "Replacing single quote";
         s.replace("'", "'\"'\"'");
@@ -68,7 +68,6 @@ static QString escapeText(QString s) {
     if (s.contains('"')) {
         s.replace('"', "\\\"");
     }
-    qDebug() << "Result escaped text: " << s;
     return s;
 }
 
@@ -110,13 +109,9 @@ bool isUploadCompleteEvent(const char* event) {
 }
 
 bool isEvent(const char* data) {
-    if (data != NULL && data[0] != '\0') {
-        Document d;
-        d.Parse(data);
-        if (d.HasMember("type")) {
-            return strcmp(d["type"].GetString(), "event") == 0;
-        }
-    }
+    Document d;
+    d.Parse(data);
+    return strcmp(d["type"].GetString(), "event") == 0;
 }
 
 bool isPong(const char* data) {
@@ -357,7 +352,7 @@ QString generatePreview(QString video_path, QString video_name) {
 //    QString command{
 //        "ffmpeg -ss 0 -i " + video_path + " -vf select=\"eq(pict_type\\,I)\" -vframes 1 ./assets/previews/" + preview_name};
     QString command {
-        "ffmpeg -y -ss 0 -i " + video_path + " -vf \"scale=w=640:h=640:force_original_aspect_ratio=decrease,pad=w=640:h=640:x=(iw-ow)/2:y=(ih-oh/2):color=white\" -vframes 1 ./assets/previews/" + preview_name
+        "ffmpeg -ss 0 -i " + video_path + " -vf \"scale=w=640:h=640:force_original_aspect_ratio=decrease,pad=w=640:h=640:x=(iw-ow)/2:y=(ih-oh/2):color=white\" -vframes 1 ./assets/previews/" + preview_name
     };
 
     std::system(command.toUtf8());

icons/trash.svg

@@ -1 +0,0 @@
-<svg height="427pt" viewBox="-40 0 427 427.00131" width="427pt" xmlns="http://www.w3.org/2000/svg"><path d="m232.398438 154.703125c-5.523438 0-10 4.476563-10 10v189c0 5.519531 4.476562 10 10 10 5.523437 0 10-4.480469 10-10v-189c0-5.523437-4.476563-10-10-10zm0 0"/><path d="m114.398438 154.703125c-5.523438 0-10 4.476563-10 10v189c0 5.519531 4.476562 10 10 10 5.523437 0 10-4.480469 10-10v-189c0-5.523437-4.476563-10-10-10zm0 0"/><path d="m28.398438 127.121094v246.378906c0 14.5625 5.339843 28.238281 14.667968 38.050781 9.285156 9.839844 22.207032 15.425781 35.730469 15.449219h189.203125c13.527344-.023438 26.449219-5.609375 35.730469-15.449219 9.328125-9.8125 14.667969-23.488281 14.667969-38.050781v-246.378906c18.542968-4.921875 30.558593-22.835938 28.078124-41.863282-2.484374-19.023437-18.691406-33.253906-37.878906-33.257812h-51.199218v-12.5c.058593-10.511719-4.097657-20.605469-11.539063-28.03125-7.441406-7.421875-17.550781-11.5546875-28.0625-11.46875h-88.796875c-10.511719-.0859375-20.621094 4.046875-28.0625 11.46875-7.441406 7.425781-11.597656 17.519531-11.539062 28.03125v12.5h-51.199219c-19.1875.003906-35.394531 14.234375-37.878907 33.257812-2.480468 19.027344 9.535157 36.941407 28.078126 41.863282zm239.601562 279.878906h-189.203125c-17.097656 0-30.398437-14.6875-30.398437-33.5v-245.5h250v245.5c0 18.8125-13.300782 33.5-30.398438 33.5zm-158.601562-367.5c-.066407-5.207031 1.980468-10.21875 5.675781-13.894531 3.691406-3.675781 8.714843-5.695313 13.925781-5.605469h88.796875c5.210937-.089844 10.234375 1.929688 13.925781 5.605469 3.695313 3.671875 5.742188 8.6875 5.675782 13.894531v12.5h-128zm-71.199219 32.5h270.398437c9.941406 0 18 8.058594 18 18s-8.058594 18-18 18h-270.398437c-9.941407 0-18-8.058594-18-18s8.058593-18 18-18zm0 0"/><path d="m173.398438 154.703125c-5.523438 0-10 4.476563-10 10v189c0 5.519531 4.476562 10 10 10 5.523437 0 10-4.480469 10-10v-189c0-5.523437-4.476563-10-10-10zm0 0"/></svg>

include/argdialog.h

@@ -3,7 +3,6 @@
 
 #include <QDialog>
 #include <QFile>
-#include <QIcon>
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QPushButton>
@@ -79,7 +78,6 @@ class ArgDialog : public QDialog {
   void addFile(QString path);
   Task m_task;
   IGPost m_ig_post;
-  int arg_index;
 };
 
 #endif  // ARGDIALOG_H

include/client.hpp

@@ -85,7 +85,6 @@ public slots:
 signals:
     void messageReceived(int t, QString s, QVector<QString> args);
     void eventReceived(int t, std::string event, StringVec args);
-    void startTimer();
 
 private:
     void sendEncoded(std::string message);

include/mainwindow.h

@@ -70,15 +70,12 @@ private:
     QList<QString> m_events;
     QStandardItemModel* m_process_model;
     QStandardItemModel* m_event_model;
-    /** Utilities */
-    QTimer* m_timer;
 
 private slots:
     /** Receivers */
     void connectClient();
     void updateMessages(int t, const QString& s, StringVec v);
     void handleKey();
-    void startTimer();
 };
 
 

kres.qrc

@@ -12,6 +12,5 @@
         <file>icons/disconnect.png</file>
         <file>style/style.css</file>
         <file>style/messagebox.css</file>
-        <file>icons/trash.svg</file>
     </qresource>
 </RCC>

ky_gui.pro

@@ -25,8 +25,6 @@ DEFINES += QT_DEPRECATED_WARNINGS
 
 CONFIG += c++17
 
-QMAKE_CXXFLAGS += "-fno-sized-deallocation"
-
 SOURCES += \
         src/argdialog.cpp \
         src/consoledialog.cpp \

ky_gui.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.0, 2020-02-19T08:07:37. -->
+<!-- Written by QtCreator 4.11.0, 2020-01-24T08:02:46. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -8,7 +8,7 @@
  </data>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
-  <value type="int">2</value>
+  <value type="int">0</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.EditorSettings</variable>
@@ -625,252 +625,9 @@
    <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
   </valuemap>
  </data>
- <data>
-  <variable>ProjectExplorer.Project.Target.2</variable>
-  <valuemap type="QVariantMap">
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 5.14.0 in PATH (System)</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Qt 5.14.0 in PATH (System)</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{7ce0bd6b-bfe8-4f97-8813-1bc67f50c14f}</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/data/c/build-ky_gui-Qt_5_14_0_in_PATH_System-Debug</value>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
-      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
-     </valuemap>
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
-     </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
-    </valuemap>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
-     </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
-    </valuemap>
-    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
-    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
-    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
-    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
-   </valuemap>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/data/c/build-ky_gui-Qt_5_14_0_in_PATH_System-Release</value>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
-      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">true</value>
-     </valuemap>
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
-     </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
-    </valuemap>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
-     </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
-    </valuemap>
-    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
-    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
-    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
-    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
-   </valuemap>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/data/c/build-ky_gui-Qt_5_14_0_in_PATH_System-Profile</value>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
-      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">true</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">true</value>
-     </valuemap>
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
-     </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
-    </valuemap>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
-     </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
-    </valuemap>
-    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
-    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
-    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
-    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
-   </valuemap>
-   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
-    </valuemap>
-    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
-   </valuemap>
-   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
-    <value type="QString" key="Analyzer.Perf.CallgraphMode">dwarf</value>
-    <valuelist type="QVariantList" key="Analyzer.Perf.Events">
-     <value type="QString">cpu-cycles</value>
-    </valuelist>
-    <valuelist type="QVariantList" key="Analyzer.Perf.ExtraArguments"/>
-    <value type="int" key="Analyzer.Perf.Frequency">250</value>
-    <valuelist type="QVariantList" key="Analyzer.Perf.RecordArguments">
-     <value type="QString">-e</value>
-     <value type="QString">cpu-cycles</value>
-     <value type="QString">--call-graph</value>
-     <value type="QString">dwarf,4096</value>
-     <value type="QString">-F</value>
-     <value type="QString">250</value>
-    </valuelist>
-    <value type="QString" key="Analyzer.Perf.SampleMode">-F</value>
-    <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
-    <value type="int" key="Analyzer.Perf.StackSize">4096</value>
-    <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
-    <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
-    <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
-    <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
-    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
-    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
-    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
-    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
-    <value type="QString" key="Analyzer.Valgrind.KCachegrindExecutable">kcachegrind</value>
-    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
-    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
-    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
-    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
-    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
-    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
-    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
-     <value type="int">0</value>
-     <value type="int">1</value>
-     <value type="int">2</value>
-     <value type="int">3</value>
-     <value type="int">4</value>
-     <value type="int">5</value>
-     <value type="int">6</value>
-     <value type="int">7</value>
-     <value type="int">8</value>
-     <value type="int">9</value>
-     <value type="int">10</value>
-     <value type="int">11</value>
-     <value type="int">12</value>
-     <value type="int">13</value>
-     <value type="int">14</value>
-    </valuelist>
-    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
-    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/data/c/ky_gui/ky_gui.pro</value>
-    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">/data/c/ky_gui/ky_gui.pro</value>
-    <value type="QString" key="RunConfiguration.Arguments"></value>
-    <value type="bool" key="RunConfiguration.Arguments.multi">false</value>
-    <value type="QString" key="RunConfiguration.OverrideDebuggerStartup"></value>
-    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
-    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
-    <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
-    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
-    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
-    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/data/c/build-ky_gui-Qt_5_14_0_in_PATH_System-Debug</value>
-   </valuemap>
-   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
-  </valuemap>
- </data>
  <data>
   <variable>ProjectExplorer.Project.TargetCount</variable>
-  <value type="int">3</value>
+  <value type="int">2</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.Updater.FileVersion</variable>

src/argdialog.cpp

@@ -33,7 +33,7 @@ ArgDialog::ArgDialog(QWidget *parent) :
                 .name=file_name, .path=file_path, .type = is_video ? FileType::VIDEO : FileType::IMAGE
             });
 
-            if (is_video) {
+            if (!m_ig_post.is_video && is_video) {
                 qDebug() << "File discovered to be video";
                 m_ig_post.is_video = true; // rename to "sending_video"
                 QString preview_filename = FileUtils::generatePreview(file_path, file_name);
@@ -50,11 +50,9 @@ ArgDialog::ArgDialog(QWidget *parent) :
         }
     });
 
-    ui->argList->setHorizontalHeaderLabels(QStringList{"Value", "Type", "Preview", "Remove"});
-    ui->argList->setColumnWidth(0, 275);
+    ui->argList->setHorizontalHeaderLabels(QStringList{"Value", "Type"});
+    ui->argList->setColumnWidth(0, 400);
     ui->argList->setColumnWidth(1, 40);
-    ui->argList->setColumnWidth(2, 30);
-    ui->argList->setColumnWidth(3, 10);
     ui->argList->verticalHeader()->setDefaultSectionSize(100);
 
     QObject::connect(ui->addArgument, &QPushButton::clicked, this, [this]() {
@@ -79,21 +77,6 @@ ArgDialog::ArgDialog(QWidget *parent) :
         }
     });
 
-    QObject::connect(ui->clear, &QPushButton::clicked, this, [this]() {
-        for (int i = ui->argList->rowCount(); i >= 0; i--) {
-            ui->argList->removeRow(i);
-        }
-        m_task.args.clear();
-        m_task.mask = -1;
-        m_ig_post.files.clear();
-        m_ig_post.datetime = -1;
-        m_ig_post.description = "";
-        m_ig_post.requested_by_phrase= "";
-        m_ig_post.link_in_bio = "";
-        m_ig_post.requested_by.clear();
-        m_ig_post.hashtags.clear();
-    });
-
     QDateTime date_time = QDateTime::currentDateTime();
 //    date_time.
     ui->dateTime->setDateTime(QDateTime::currentDateTime());
@@ -181,30 +164,10 @@ void ArgDialog::setTaskArguments() {
 void ArgDialog::addItem(QString value, QString type) {
     QTableWidgetItem* item = new QTableWidgetItem(value);
     QTableWidgetItem* item2 = new QTableWidgetItem(type);
-    QPushButton* delete_button = new QPushButton();
-    delete_button->setStyleSheet("QPushButton{ color: transparent}");
-    delete_button->setText(QString{arg_index});
-    QIcon* delete_icon = new QIcon(":/icons/trash.svg");
-    delete_button->setIcon(*delete_icon);
     auto row = ui->argList->rowCount();
     ui->argList->insertRow(row);
     ui->argList->setItem(row, 0, item);
     ui->argList->setItem(row, 1, item2);
-    ui->argList->setCellWidget(row, 3, delete_button);
-    arg_index++;
-
-    QObject::connect(delete_button, &QPushButton::clicked, this, [this, delete_button]() {
-        for (int i = ui->argList->rowCount(); i >= 0; i--) {
-            auto item = ui->argList->item(i, 3);
-            auto text = item->text();
-            qDebug() << "Item has text: " << text;
-//            if (ui->argList->item(i, 3)->text() == delete_button->text()) {
-//                qDebug() << "Deleting arg item: " << delete_button->text();
-//                ui->argList->removeRow(i);
-//                break;
-//            }
-        }
-    });
 }
 
 void ArgDialog::addFile(QString path) {

src/client.cpp

@@ -66,10 +66,6 @@ void Client::handleMessages() {
         if (bytes_received == 0) { // Finish message loop
             break;
         }
-        if (receive_buffer == NULL || receive_buffer[0] == '\0') {
-            qDebug() << "Received null buffer";
-            continue;
-        }
         size_t end_idx = findNullIndex(receive_buffer);
         std::string data_string{receive_buffer, receive_buffer + end_idx};
         qDebug() << "Received data from KServer: \n" << data_string.c_str();
@@ -95,7 +91,6 @@ void Client::handleMessages() {
                     sent_files.at(sent_files.size() - 1).timestamp = std::stoi(args.at(0).toUtf8().constData());
                     if (outgoing_files.isEmpty()) {
                         sendTaskEncoded(TaskType::INSTAGRAM, m_task);
-                        emit Client::startTimer();
                     } else {
                         sendEncoded(createOperation("FileUpload", {"Subsequent file"}));
                     }
@@ -168,7 +163,9 @@ void Client::start() {
  */
 void Client::sendMessage(const QString& s) {
     if (m_client_socket_fd != -1) {
-        std::string json_string = createMessage(s.toUtf8(), "");
+        std::string json_string {"{\"type\":\"custom\", \"message\": \""};
+        json_string += s.toUtf8().data();
+        json_string += "\", \"args\":\"placeholder\"}";
         // Send custom message as an encoded message
         sendEncoded(json_string);
     } else {
@@ -181,9 +178,7 @@ void Client::sendMessage(const QString& s) {
  * @param [in] {std::string message} The message to send
  */
 void Client::sendEncoded(std::string message) {
-    uint8_t* message_bytes = reinterpret_cast<uint8_t *>(
-        const_cast<char *>(message.c_str()));
-    std::vector<uint8_t> fb_byte_vector{message_bytes, message_bytes + message.size()};
+    std::vector<uint8_t> fb_byte_vector{message.begin(), message.end()};
     auto byte_vector = builder.CreateVector(fb_byte_vector);
     auto k_message = CreateMessage(builder, 69, byte_vector);
 
@@ -452,7 +447,6 @@ void Client::sendFiles(QVector<KFileData> files) {
         for (const auto & file : files) {
             outgoing_files.enqueue(file);
         }
-
         std::string send_file_operation = createOperation("FileUpload", {});
         sendEncoded(send_file_operation);
     } else {

src/mainwindow.cpp

@@ -66,7 +66,6 @@ void MainWindow::connectClient() {
     qDebug() << "Connecting to KServer";
 
     QObject::connect(q_client, &Client::messageReceived, this, &MainWindow::updateMessages);
-    QObject::connect(q_client, &Client::startTimer, this, &MainWindow::startTimer);
 
     QProgressBar* progressBar = ui->progressBar;
     q_client->start();
@@ -81,8 +80,6 @@ void MainWindow::connectClient() {
     QPushButton* send_message_button = this->findChild<QPushButton*>("sendMessage");
     // Handle mouse
     QObject::connect(send_message_button, &QPushButton::clicked, this, [this, send_message_box]() {
-        QString msg = escapeText(send_message_box->toPlainText());
-        qDebug() << "Sending message: " << msg;
         q_client->sendMessage(escapeText(send_message_box->toPlainText()));
         send_message_box->clear();
     });
@@ -113,7 +110,6 @@ void MainWindow::connectClient() {
     });
 
     QObject::connect(arg_ui, &ArgDialog::uploadFiles, this, [this](QVector<KFileData> files) {
-        m_timer->stop();
         q_client->sendFiles(files);
     });
 
@@ -164,9 +160,9 @@ void MainWindow::connectClient() {
         infoMessageBox(event, "Event");
     });
 
-    m_timer = new QTimer(this);
-    connect(m_timer, &QTimer::timeout, q_client, &Client::ping);
-    m_timer->start(30000);
+    QTimer *timer = new QTimer(this);
+    connect(timer, &QTimer::timeout, q_client, &Client::ping);
+    timer->start(30000);
 }
 
 void MainWindow::handleKey() {
@@ -257,19 +253,13 @@ void MainWindow::updateMessages(int t, const QString& message, StringVec v) {
         } else {
             event_message += message;
         }
-        m_events.push_back(event_message);
+        m_events.push_front(event_message);
         m_event_model->setItem(m_event_model->rowCount(), createEventListItem(event_message));
     } else {
         qDebug() << "Unknown update type. Cannot update UI";
     }
 }
 
-void MainWindow::startTimer() {
-    if (m_timer != nullptr) {
-        m_timer->start(30000);
-    }
-}
-
 void MainWindow::updateProcessResult(QString id, QString result) { // We need to start matching processes with a unique identifier
     for (int i = m_processes.size() - 1; i >= 0; i--) {
         if (m_processes.at(i).id == id) {

ui_argdialog.h

@@ -51,11 +51,9 @@ public:
     QHBoxLayout *horizontalLayout_6;
     QSpacerItem *horizontalSpacer;
     QTableWidget *argList;
-    QVBoxLayout *verticalLayout_2;
     QSpacerItem *horizontalSpacer_2;
     QHBoxLayout *horizontalLayout_5;
     QPushButton *devTestButton;
-    QPushButton *clear;
     QDialogButtonBox *argCommandButtons;
 
     void setupUi(QDialog *ArgDialog)
@@ -248,8 +246,8 @@ public:
         horizontalLayout_6->addItem(horizontalSpacer);
 
         argList = new QTableWidget(verticalLayoutWidget);
-        if (argList->columnCount() < 4)
-            argList->setColumnCount(4);
+        if (argList->columnCount() < 3)
+            argList->setColumnCount(3);
         argList->setObjectName(QString::fromUtf8("argList"));
         argList->setStyleSheet(QString::fromUtf8("font: 87 11pt \"Noto Sans\";\n"
 "background-color: #2f535f;\n"
@@ -257,7 +255,7 @@ public:
 "font-weight: 700;\n"
 "padding-left: 2px;"));
         argList->setShowGrid(true);
-        argList->setColumnCount(4);
+        argList->setColumnCount(3);
         argList->horizontalHeader()->setCascadingSectionResizes(false);
         argList->horizontalHeader()->setMinimumSectionSize(100);
         argList->horizontalHeader()->setDefaultSectionSize(200);
@@ -266,14 +264,9 @@ public:
 
         horizontalLayout_6->addWidget(argList);
 
-        verticalLayout_2 = new QVBoxLayout();
-        verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2"));
         horizontalSpacer_2 = new QSpacerItem(40, 20, QSizePolicy::Maximum, QSizePolicy::Minimum);
 
-        verticalLayout_2->addItem(horizontalSpacer_2);
-
-
-        horizontalLayout_6->addLayout(verticalLayout_2);
+        horizontalLayout_6->addItem(horizontalSpacer_2);
 
 
         verticalLayout->addLayout(horizontalLayout_6);
@@ -297,25 +290,6 @@ public:
 
         horizontalLayout_5->addWidget(devTestButton);
 
-        clear = new QPushButton(verticalLayoutWidget);
-        clear->setObjectName(QString::fromUtf8("clear"));
-        clear->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 85, 0);\n"
-"font: 87 11pt \"Noto Sans\";\n"
-"color: rgb(0, 43, 54);\n"
-"font-weight: 700;\n"
-"padding: 4px;\n"
-"border-style: outset;\n"
-"border-width: 2px;\n"
-"border-radius: 4px;\n"
-"border-color: #00000f;\n"
-"min-width: 4em;\n"
-"padding: 4px;"));
-        QIcon icon1;
-        icon1.addFile(QString::fromUtf8("icons/erase.png"), QSize(), QIcon::Normal, QIcon::Off);
-        clear->setIcon(icon1);
-
-        horizontalLayout_5->addWidget(clear);
-
         argCommandButtons = new QDialogButtonBox(verticalLayoutWidget);
         argCommandButtons->setObjectName(QString::fromUtf8("argCommandButtons"));
         QSizePolicy sizePolicy3(QSizePolicy::Fixed, QSizePolicy::Fixed);
@@ -373,7 +347,6 @@ public:
         label_5->setText(QCoreApplication::translate("ArgDialog", "Time", nullptr));
         label->setText(QCoreApplication::translate("ArgDialog", "Items to send", nullptr));
         devTestButton->setText(QCoreApplication::translate("ArgDialog", "DEV TEST", nullptr));
-        clear->setText(QCoreApplication::translate("ArgDialog", "Clear", nullptr));
     } // retranslateUi
 
 };

ui_consoledialog.h

@@ -36,7 +36,7 @@ public:
         consoleText->setReadOnly(false);
         consoleTitle = new QLabel(ConsoleDialog);
         consoleTitle->setObjectName(QString::fromUtf8("consoleTitle"));
-        consoleTitle->setGeometry(QRect(290, 20, 91, 20));
+        consoleTitle->setGeometry(QRect(300, 20, 51, 18));
         closeConsole = new QPushButton(ConsoleDialog);
         closeConsole->setObjectName(QString::fromUtf8("closeConsole"));
         closeConsole->setGeometry(QRect(600, 800, 80, 26));