Bläddra i källkod

mainwindow does a better job of parsing returned messages (where the server echoes back messages we sent it)
better escaping of messages

logicp 5 år sedan
förälder
incheckning
f04fd1a699
2 ändrade filer med 15 tillägg och 5 borttagningar
  1. 3 4
      src/mainwindow.cpp
  2. 12 1
      ui_argdialog.h

+ 3 - 4
src/mainwindow.cpp

@@ -100,7 +100,7 @@ void MainWindow::connectClient() {
       this->findChild<QPushButton*>("sendMessage");
   // Handle mouse
   QObject::connect(send_message_button, &QPushButton::clicked, this, [this]() {
-    q_client->sendMessage(escapeText(ui->inputText->toPlainText()));
+    q_client->sendMessage(escapeMessage(ui->inputText->toPlainText()));
     ui->inputText->clear();
   });
 
@@ -298,9 +298,8 @@ void MainWindow::updateMessages(int t, const QString& message, StringVec v) {
           event_message += app_name;
           event_message += ": ";
           event_message += v.at(2);
-        } else {
-          event_message += ": ";
-          event_message += v.at(1);
+        } else if (QString::compare(message, "Message Received") == 0) {
+          event_message += "\n" + v.at(1) + ": " + v.at(2);
         }
       }
     } else {

+ 12 - 1
ui_argdialog.h

@@ -210,6 +210,14 @@ public:
 "border-color: #00000f;\n"
 "min-width: 4em;\n"
 "padding: 4px;"));
+        QIcon icon1;
+        QString iconThemeName = QString::fromUtf8("clip.png");
+        if (QIcon::hasThemeIcon(iconThemeName)) {
+            icon1 = QIcon::fromTheme(iconThemeName);
+        } else {
+            icon1.addFile(QString::fromUtf8(":/icons/icons/clip.png"), QSize(), QIcon::Normal, QIcon::On);
+        }
+        addFile->setIcon(icon1);
 
         horizontalLayout_3->addWidget(addFile);
 
@@ -231,7 +239,7 @@ public:
 "color: rgb(131, 148, 150);\n"
 "font-weight: 700;\n"
 " qproperty-alignment: 'AlignHCenter';"));
-        label_5->setAlignment(Qt::AlignCenter);
+        label_5->setAlignment(Qt::AlignHCenter);
 
         horizontalLayout_4->addWidget(label_5, 0, Qt::AlignVCenter);
 
@@ -307,6 +315,9 @@ public:
 "border-color: #00000f;\n"
 "min-width: 4em;\n"
 "padding: 4px;"));
+        QIcon icon2;
+        icon2.addFile(QString::fromUtf8(":/icons/icons/trash.png"), QSize(), QIcon::Normal, QIcon::On);
+        clear->setIcon(icon2);
 
         horizontalLayout_5->addWidget(clear);