From 928c54649bb00108988dc564c4674c06bb9dbf7f Mon Sep 17 00:00:00 2001
From: NekoSilverFox <weidufox@gmail.com>
Date: Sat, 10 Dec 2022 11:13:44 +0300
Subject: [PATCH] Optimize the interface

---
 PolyChatApp/chatboxwidget.ui      |   9 +--
 PolyChatApp/chatlist.ui           | 122 ++++++++++++++++++++----------
 PolyChatApp/icons/add.png         | Bin 0 -> 2885 bytes
 PolyChatApp/resource.qrc          |   1 +
 PolyChatApp/uil_chatboxwidget.cpp |   2 +-
 PolyChatApp/uil_chatlist.cpp      |   2 +-
 6 files changed, 86 insertions(+), 50 deletions(-)
 create mode 100644 PolyChatApp/icons/add.png

diff --git a/PolyChatApp/chatboxwidget.ui b/PolyChatApp/chatboxwidget.ui
index e6b325f..f693db3 100644
--- a/PolyChatApp/chatboxwidget.ui
+++ b/PolyChatApp/chatboxwidget.ui
@@ -93,13 +93,8 @@
             <item>
              <widget class="QComboBox" name="cbxFontSize">
               <property name="currentIndex">
-               <number>0</number>
+               <number>2</number>
               </property>
-              <item>
-               <property name="text">
-                <string>8</string>
-               </property>
-              </item>
               <item>
                <property name="text">
                 <string>10</string>
@@ -442,7 +437,7 @@
                </size>
               </property>
               <property name="shortcut">
-               <string>Return</string>
+               <string>Shift+Return</string>
               </property>
              </widget>
             </item>
diff --git a/PolyChatApp/chatlist.ui b/PolyChatApp/chatlist.ui
index 18da970..d8293df 100644
--- a/PolyChatApp/chatlist.ui
+++ b/PolyChatApp/chatlist.ui
@@ -28,17 +28,39 @@
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Expanding</enum>
-        </property>
         <property name="sizeHint" stdset="0">
          <size>
-          <width>20</width>
+          <width>40</width>
           <height>20</height>
          </size>
         </property>
        </spacer>
       </item>
+      <item>
+       <widget class="QLabel" name="label_6">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>50</width>
+          <height>50</height>
+         </size>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="pixmap">
+         <pixmap resource="resource.qrc">:/icon/icons/logo_fox.png</pixmap>
+        </property>
+        <property name="scaledContents">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QLabel" name="label">
         <property name="font">
@@ -57,37 +79,14 @@
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
         <property name="sizeHint" stdset="0">
          <size>
-          <width>25</width>
+          <width>40</width>
           <height>20</height>
          </size>
         </property>
        </spacer>
       </item>
-      <item>
-       <widget class="QToolButton" name="btnNewChat">
-        <property name="text">
-         <string>...</string>
-        </property>
-        <property name="icon">
-         <iconset resource="resource.qrc">
-          <normaloff>:/icon/icons/plus.png</normaloff>:/icon/icons/plus.png</iconset>
-        </property>
-        <property name="iconSize">
-         <size>
-          <width>20</width>
-          <height>16</height>
-         </size>
-        </property>
-        <property name="autoRaise">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
@@ -129,6 +128,41 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QToolButton" name="btnNewChat">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>25</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>25</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>+</string>
+        </property>
+        <property name="icon">
+         <iconset resource="resource.qrc">
+          <normaloff>:/icon/icons/add.png</normaloff>:/icon/icons/add.png</iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>20</width>
+          <height>25</height>
+         </size>
+        </property>
+        <property name="toolButtonStyle">
+         <enum>Qt::ToolButtonIconOnly</enum>
+        </property>
+        <property name="autoRaise">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -143,7 +177,7 @@
         <x>0</x>
         <y>0</y>
         <width>334</width>
-        <height>493</height>
+        <height>470</height>
        </rect>
       </property>
       <attribute name="label">
@@ -155,9 +189,15 @@
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox">
+     <property name="autoFillBackground">
+      <bool>false</bool>
+     </property>
      <property name="title">
       <string>Your info</string>
      </property>
+     <property name="flat">
+      <bool>false</bool>
+     </property>
      <layout class="QGridLayout" name="gridLayout">
       <item row="1" column="0">
        <widget class="QLabel" name="label_4">
@@ -172,10 +212,10 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_3">
+      <item row="0" column="1">
+       <widget class="QLabel" name="lbName">
         <property name="text">
-         <string>Name:</string>
+         <string>NO_NAME</string>
         </property>
        </widget>
       </item>
@@ -186,24 +226,24 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QLabel" name="lbName">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_3">
         <property name="text">
-         <string>name</string>
+         <string>Name:</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QLabel" name="lbGroupNumber">
+      <item row="2" column="1">
+       <widget class="QLabel" name="lbIP">
         <property name="text">
-         <string>XXXX/XXXXXX</string>
+         <string>000.000.0.0</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
-       <widget class="QLabel" name="lbIP">
+      <item row="1" column="1">
+       <widget class="QLabel" name="lbGroupNumber">
         <property name="text">
-         <string>000.000.0.0</string>
+         <string>XXXX/XXXXXX</string>
         </property>
        </widget>
       </item>
diff --git a/PolyChatApp/icons/add.png b/PolyChatApp/icons/add.png
new file mode 100644
index 0000000000000000000000000000000000000000..13572f51251feb6b4d934b4858126b6dd8923cc6
GIT binary patch
literal 2885
zcmeHJYcLz=8jd6zmj(%ATcm_zOErkbhH(uWO|&i@TX&_Ti>gaYwN*l6-F1s~Z56Ab
zrv#P8Jyn_@RHH>*in<iFinzx$a<b>lxy+n@=SR=Xne*fO-kI;6@11#{@BN<VNjYy%
zkd{)C0ssKgHblImD0cm^Bp{-_%C)*k6vV<E308pWUc>?bASJZHTVA;BwOr^B;5n>F
zXf+|_=)Olgbc*RnmAu2L85CqVKGm0i>PR>~x^X5K{l4DMs=4dQyO3tR?3-DB1Bz}k
zV1e>jFvz{2@q6&u5)Cj=M<)S=@U1kgb&n@v8oJ6s>i5lJnp@xYM{zt_qj=2uDDe;L
z14j97+?@n5==d-W2`hp^qnpHl(+h2FASg^CT^u42?+*ZVKvxw?^9`My+5wacm){{6
z`C`D6pMP;u(8nPa6b(2izq`29NRpE^6h^d$aP`v^kr}=du1;_e*fG;G{EaU};y=8;
zeoS1@{<>rS%hui%+J}Vz?D04|4}-M6kZ;l&P>HnbI}6-bEaerm&aukPA@KUK&Pms+
zZxfsAxU8kyV;rtg?Zi}2X!wi8ChZ(Cpv_NVw)P}y3*74Vl{Y=x7r#Xv_|SHlR#(%O
zI7%4c^=K(20pH{mYeRf|y*QGwzbU4OQXK$L?w$PdTi#EC-e63DvDQ3qFF^Hk74JtI
zSDZ?~T^vFsBdBHL$zYKAg0udiap+b|QMTmL5r_o-;Jj^>PEpF%s6q$U$A4tpz43<K
ztHj+0VnDcsq?>TAf&0m(8`~EmDt1y*S&Q<tm=e_TvDV!+iziQ*UmxnPxREZ!-jz~E
z#MDnjehlQNUOU3btoj`OF}&YQ8>$JLUS-70{|RHFHts9il4HpHV%APDdT|>F=lX^1
z9;~Hwr=(l&kVgua3pE?`JYUYxT?Y9`SYJD1u)}}Jb@?JZ#^UC!%^>sE&6ho13S;p&
zJSepChJAu0Q<t^E?hL^E?7W@G@p2mb8HbnGgk`$=qbSMo^2x+XOfC-3lEiBaDV{^B
zPlMIv7Vmur%e)4Jr$lthB@>M($?e7@QT`DQ?^{S0<?WH`^j=pWT=M^A{tX+Rau@H-
zZ*^~kS-Sb(Q6x%vYF`Oi)vL&?p80f#=sNS`i`1EpUUKEg>2xQipAV}#DoA05XG<r`
z&@C`W*nNeC4v7u*q9OWmDO%inPK8)cHwvZmL9`Fs+@LR0guCa(Kn=l{UAUi$*PFa1
zH(rELY^yw@^;KxCfv;Z9N8<R}4=4eKY~E^JRl>PpQ~S?yL=t(;rNnu^oI@F*szc7y
zKYSbUw%p;Atj5^y2V-&Mi)7eNjzNuRt~IkY^B})&nF!I0P%T*ia}@HpqZRtFWu*eu
z1?<Ke52Hq8oeX7;g0`XU$DYZ!x8$;tH8MKgqp<JU9;wQSDU^N1WcChAL<N|-<2FdQ
zRza>?z8#sdie8<AeDa%EYRMQqzm8KnWpQ{jf9Lh2<D`};)bvf;HUFJLA<A=akzE~?
zJ?S9odSW+aaH%0ZOx`n%q5(O>Pm8YJ@6o6f{?ISpzp~WgbzOVTj>T$oh4{Y6Y`F7{
zH?v77(+#?^X`%{d{F!46JL-chp#<=^EgAb&@x*f~#G7T9ngH)}ky$lpbS~wRkQ@6x
z_+G?v{?Rho(n-a9cvt>m6RM0tg%L^A4NHjw_^G*ZpI`i^0uJC;spOAVQ+f+C+-zFE
zQe&neGihIMA-ceDxxK_JjzV1x_Bt$Cg+pGK*+?T&VztIi^q)P{C^V^|LlK!ScKlve
zPb$eSJ55f>$Wiaqgg~3M$dlyAezAnyA7A8c%dll_*Dled5g%0Z_e|wtW}OB1E<A{>
zjh*FB%<jBP)V5$hX5`KNpv+r%;O=26zqloOeVfeFH92V5AtI4IT;HoJn3!qop6s|Y
zVz=??x-6!BWs-y2wJ_qvkc0<R0;y_>kgmc@>RzT2ZlM+y6_PpvB@_;R?_;ZblT}};
zdIkTLf%a^jW|=}bP5W2LQbg7XSRdjm{g3~70{c7j#Da9bF7x~=vPD(8<|IzwO6ux9
zok{iI*e%<>$gdbV0ajPqnO)zVk<XG>O<UcsF&Q&)2=Q)==8&FMEL$R3DgFXJ!EZYL
zTAJCW^TblcHcWMT^^+vts33^E7C{^If`|BEpASY?N7*+M5=0{Phm3}}>r_fMpwp<~
zkyo!c{q0;OW+-+ym~q?jxm|5RBrWPJ3vy=|KuK1OFR$ys(7l+CM@}q33p|eGRi7L|
zTVQZV83!woA`b*&i^FI}N&-K0!zLr!*45hphqQOF9$Fd4GRif^toPBO5yfX&z;zr5
z{AuT|!QS$%xP*Dx#<|vYzwH9?%QexqAn@rYPcP(sj~!K3i_eo<do0iojqpa*=2|C+
zyp&q7xX1f{8k*8Z#iSwSN6W$YZ<)E2oyH-{ZNHr|rH8FG-D!y#wK6@fW1DnoAZiku
zBJxKJ5A5@Q_#=fjh6Y7sfRJ!}q%@2e>EF{WcMO>Umb1(jb((#v{t@cGnx+WFiWiG=
UrXtPFMZOqdV{MPGwz?Ge7h+rNO8@`>

literal 0
HcmV?d00001

diff --git a/PolyChatApp/resource.qrc b/PolyChatApp/resource.qrc
index 3d8e238..5548edb 100644
--- a/PolyChatApp/resource.qrc
+++ b/PolyChatApp/resource.qrc
@@ -16,5 +16,6 @@
         <file>icons/register-add-friend.png</file>
         <file>icons/logo_fox.png</file>
         <file>icons/send-file.png</file>
+        <file>icons/add.png</file>
     </qresource>
 </RCC>
diff --git a/PolyChatApp/uil_chatboxwidget.cpp b/PolyChatApp/uil_chatboxwidget.cpp
index c03df9a..c8466f5 100644
--- a/PolyChatApp/uil_chatboxwidget.cpp
+++ b/PolyChatApp/uil_chatboxwidget.cpp
@@ -290,7 +290,7 @@ void ChatBoxWidget::receiveUDPMessage()
         // 追加聊天记录
         ui->msgTextBrowser->setTextColor(Qt::red);
         ui->msgTextBrowser->append(">>> [FILE] " + time);
-        ui->msgTextBrowser->append(QString("<p><a href=\"%1\" target=\"_blank\">[Name]: %2    [Size]: %3Kb</a></p>").arg(msg_7).arg(QFileInfo(msg_7).fileName()).arg(QFileInfo(msg_7).size()));
+        ui->msgTextBrowser->append(QString("<div><p><a href=\"%1\" target=\"_blank\">[Name]: %2    [Size]: %3Kb</a></p></div>").arg(msg_7).arg(QFileInfo(msg_7).fileName()).arg(QFileInfo(msg_7).size()));
         break;
 
     case SignalType::UserJoin:
diff --git a/PolyChatApp/uil_chatlist.cpp b/PolyChatApp/uil_chatlist.cpp
index 178e082..152df77 100644
--- a/PolyChatApp/uil_chatlist.cpp
+++ b/PolyChatApp/uil_chatlist.cpp
@@ -14,7 +14,7 @@ ChatList::ChatList(QWidget* parent, QString localUserName, QString localUserGrou
     ui(new Ui::ChatList)
 {
     ui->setupUi(this);
-    this->setWindowTitle("Chat list");
+    this->setWindowTitle("PolyChat Chat list");
     this->setWindowIcon(QIcon(":/icon/icons/logo_fox.png"));