Browse Source

better event display
modified UI

logicp 5 years ago
parent
commit
385b7f780b
2 changed files with 47 additions and 37 deletions
  1. 8 7
      mainwindow.cpp
  2. 39 30
      mainwindow.ui

+ 8 - 7
mainwindow.cpp

@@ -160,9 +160,10 @@ QString MainWindow::parseMessage(const QString& message, StringVec v) {
  * @param s
  */
 void MainWindow::updateMessages(int t, const QString& message, StringVec v) {
+    QString timestamp_prefix = QDateTime::currentDateTime().toString("hh:mm:ss") + " - ";
     if (t == MESSAGE_UPDATE_TYPE) {
         qDebug() << "Updating message area";
-        auto simple_message = parseMessage(message, v);
+        auto simple_message = timestamp_prefix + parseMessage(message, v);
         ui->messages->append(simple_message);
         m_console.updateText(message);
     } else if (t == COMMANDS_UPDATE_TYPE) {
@@ -184,21 +185,21 @@ void MainWindow::updateMessages(int t, const QString& message, StringVec v) {
         //TODO: We do this because a CommandLinkButton turns transparent by default, except when hovered or checked
         ui->connect->setChecked(true);
     } else if (t == EVENT_UPDATE_TYPE) {
-        QString event_message{QDateTime::currentDateTime().toString("hh:mm:ss") + " - "};
+        QString event_message{timestamp_prefix};
         if (!v.empty()) {
             // TODO: extract process result handling from here. This should handle any event
             if (v.size() == 1) {
                 event_message += message + "\n" + v.at(0);
             } else {
-                auto mask = std::stoi(v.at(0).toUtf8().constData());
                 event_message += message;
-                event_message += "\n";
-                event_message += q_client->getAppName(mask);
-                event_message += ": ";
-                event_message += v.at(1);
                 if (message == "Process Result") {
+                    event_message += "\n";
+                    auto mask = std::stoi(v.at(0).toUtf8().constData());
                     updateProcessResult(mask);
+                    event_message += q_client->getAppName(mask);
                 }
+                event_message += ": ";
+                event_message += v.at(1);
             }
         } else {
             event_message += message;

+ 39 - 30
mainwindow.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>742</width>
-    <height>887</height>
+    <height>872</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -50,12 +50,12 @@ background-color: rgb(0, 43, 54);</string>
     <property name="geometry">
      <rect>
       <x>30</x>
-      <y>60</y>
+      <y>50</y>
       <width>681</width>
       <height>750</height>
      </rect>
     </property>
-    <layout class="QVBoxLayout" name="verticalLayout" stretch="6,0,0,3,0,0">
+    <layout class="QVBoxLayout" name="verticalLayout" stretch="5,0,0,3,1,5">
      <property name="spacing">
       <number>12</number>
      </property>
@@ -68,9 +68,9 @@ background-color: rgb(0, 43, 54);</string>
         <number>0</number>
        </property>
        <item row="0" column="0">
-        <layout class="QVBoxLayout" name="verticalLayout_2">
+        <layout class="QVBoxLayout" name="verticalLayout_2" stretch="2,2,2,1,5,2,2,2">
          <property name="spacing">
-          <number>12</number>
+          <number>6</number>
          </property>
          <item>
           <widget class="QPushButton" name="connect">
@@ -173,19 +173,28 @@ padding: 4px;</string>
           </layout>
          </item>
          <item>
-          <widget class="QLabel" name="eventListTitle">
+          <widget class="QLabel" name="messagesTitle">
            <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>Events</string>
+            <string>History</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QListWidget" name="eventList">
+          <widget class="QTextEdit" name="messages">
+           <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: rgb(7, 54, 66);
@@ -193,11 +202,14 @@ color: rgb(131, 148, 150);
 font-weight: 700;
 </string>
            </property>
-           <property name="alternatingRowColors">
-            <bool>false</bool>
+           <property name="lineWrapMode">
+            <enum>QTextEdit::WidgetWidth</enum>
            </property>
-           <property name="isWrapping" stdset="0">
-            <bool>false</bool>
+           <property name="readOnly">
+            <bool>true</bool>
+           </property>
+           <property name="placeholderText">
+            <string/>
            </property>
           </widget>
          </item>
@@ -235,28 +247,19 @@ font-weight: 700;
       </layout>
      </item>
      <item>
-      <widget class="QLabel" name="messagesTitle">
+      <widget class="QLabel" name="eventListTitle">
        <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>Messages</string>
+        <string>Events</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QTextEdit" name="messages">
-       <property name="toolTip">
-        <string>Messages</string>
-       </property>
-       <property name="toolTipDuration">
-        <number>1</number>
-       </property>
-       <property name="autoFillBackground">
-        <bool>false</bool>
-       </property>
+      <widget class="QListWidget" name="eventList">
        <property name="styleSheet">
         <string notr="true">font: 87 11pt &quot;Noto Sans&quot;;
 background-color: rgb(7, 54, 66);
@@ -264,14 +267,20 @@ color: rgb(131, 148, 150);
 font-weight: 700;
 </string>
        </property>
-       <property name="lineWrapMode">
-        <enum>QTextEdit::WidgetWidth</enum>
+       <property name="alternatingRowColors">
+        <bool>false</bool>
+       </property>
+       <property name="isWrapping" stdset="0">
+        <bool>false</bool>
+       </property>
+       <property name="resizeMode">
+        <enum>QListView::Adjust</enum>
        </property>
-       <property name="readOnly">
-        <bool>true</bool>
+       <property name="modelColumn">
+        <number>0</number>
        </property>
-       <property name="placeholderText">
-        <string/>
+       <property name="wordWrap">
+        <bool>false</bool>
        </property>
       </widget>
      </item>