From 623e5b6d2c603692a2a4aebf760cbc13c5173ef2 Mon Sep 17 00:00:00 2001
From: DenioD <41270280+DenioD@users.noreply.github.com>
Date: Thu, 30 Apr 2020 21:45:54 +0200
Subject: [PATCH] change some gui elements

---
 src/chatmodel.cpp  |  4 ++--
 src/mainwindow.cpp |  1 +
 src/mainwindow.ui  | 12 ++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/chatmodel.cpp b/src/chatmodel.cpp
index f449b99..1c43495 100644
--- a/src/chatmodel.cpp
+++ b/src/chatmodel.cpp
@@ -91,7 +91,7 @@ void ChatModel::renderChatBox(Ui::MainWindow* ui, QListWidget *view)
         //////Render only Memos for selected contacts. Do not render empty Memos
         if ((ui->ContactZaddr->text().trimmed() == c.second.getAddress())  && (c.second.getMemo().startsWith("{") == false) && (c.second.getMemo().isEmpty() == false)) {
         line += QString("[") + myDateTime.toString("dd.MM.yyyy hh:mm:ss ") +  QString("] ");
-        line += QString("<") + QString(c.second.getContact()) + QString("> :\n");
+        line += QString("<") + QString("Outgoing") + QString("> :\n");
         line += QString(c.second.getMemo()) + QString("\n");      
         view->addItem(line);
         line ="";
@@ -99,7 +99,7 @@ void ChatModel::renderChatBox(Ui::MainWindow* ui, QListWidget *view)
 
         if ((ui->MyZaddr->text().trimmed() == c.second.getAddress()) && (c.second.getMemo().startsWith("{") == false) && (c.second.getMemo().isEmpty() == false)){
         line += QString("[") + myDateTime.toString("dd.MM.yyyy hh:mm:ss ") +  QString("] ");
-        line += QString("<") + QString(c.second.getContact()) + QString("> :\n");
+        line += QString("<") + QString("incoming") + QString("> :\n");
         line += QString(c.second.getMemo()) + QString("\n");      
         view->addItem(line);
         line ="";
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index f6bb131..ce474cc 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1000,6 +1000,7 @@ void MainWindow::setupchatTab() {
         if (label_contact == p.getName()) {
         ui->ContactZaddr->setText(p.getPartnerAddress());
         ui->MyZaddr->setText(p.getMyAddress());
+        ui->contactNameMemo->setText(p.getName());
         
     rpc->refresh(true);
         }
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 1a0bb02..2de859e 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -1348,7 +1348,7 @@
          </rect>
         </property>
         <property name="text">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;Contact&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;Hushchat Contactlist&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
        </widget>
        <widget class="QLabel" name="label_40">
@@ -1390,17 +1390,17 @@
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
        </widget>
-       <widget class="QLabel" name="label_41">
+       <widget class="QLabel" name="contactNameMemo">
         <property name="geometry">
          <rect>
-          <x>340</x>
+          <x>720</x>
           <y>50</y>
-          <width>861</width>
+          <width>481</width>
           <height>20</height>
          </rect>
         </property>
         <property name="text">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;Messages&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
        </widget>
        <widget class="QListWidget" name="listChatMemo">
@@ -1505,7 +1505,7 @@
          </size>
         </property>
         <property name="text">
-         <string>Sicheren Kontakt hinzufügen</string>
+         <string>Add conversation contact</string>
         </property>
         <property name="flat">
          <bool>false</bool>