From c3427d18e71732e92941c844c21d6f86cafe171d Mon Sep 17 00:00:00 2001
From: Sergei Ilinykh <rion4ik@gmail.com>
Date: Thu, 9 May 2024 01:38:17 +0300
Subject: [PATCH] Remove client-version icon with duplicating info

---
 src/chatdlg.ui     | 54 +++++++++++++++-------------------------------
 src/psichatdlg.cpp |  6 +-----
 2 files changed, 18 insertions(+), 42 deletions(-)

diff --git a/src/chatdlg.ui b/src/chatdlg.ui
index 99ebe99f4..3e1cee12f 100644
--- a/src/chatdlg.ui
+++ b/src/chatdlg.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>455</width>
+    <width>463</width>
     <height>344</height>
    </rect>
   </property>
@@ -29,7 +29,7 @@
    <item>
     <widget class="ChatSplitter" name="splitter">
      <property name="orientation">
-      <enum>Qt::Vertical</enum>
+      <enum>Qt::Orientation::Vertical</enum>
      </property>
      <widget class="QFrame" name="topFrame">
       <property name="sizePolicy">
@@ -39,10 +39,10 @@
        </sizepolicy>
       </property>
       <property name="frameShape">
-       <enum>QFrame::NoFrame</enum>
+       <enum>QFrame::Shape::NoFrame</enum>
       </property>
       <property name="frameShadow">
-       <enum>QFrame::Plain</enum>
+       <enum>QFrame::Shadow::Plain</enum>
       </property>
       <layout class="QVBoxLayout">
        <property name="spacing">
@@ -93,32 +93,13 @@
             <bool>true</bool>
            </property>
            <property name="sizeAdjustPolicy">
-            <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
+            <enum>QComboBox::SizeAdjustPolicy::AdjustToMinimumContentsLengthWithIcon</enum>
            </property>
            <property name="minimumContentsLength">
             <number>10</number>
            </property>
           </widget>
          </item>
-         <item>
-          <widget class="QLabel" name="lb_client">
-           <property name="minimumSize">
-            <size>
-             <width>16</width>
-             <height>16</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>16</width>
-             <height>16</height>
-            </size>
-           </property>
-           <property name="text">
-            <string/>
-           </property>
-          </widget>
-         </item>
          <item>
           <widget class="QLabel" name="lb_count">
            <property name="sizePolicy">
@@ -143,16 +124,16 @@
             <string>Message length</string>
            </property>
            <property name="frameShape">
-            <enum>QFrame::Panel</enum>
+            <enum>QFrame::Shape::Panel</enum>
            </property>
            <property name="frameShadow">
-            <enum>QFrame::Sunken</enum>
+            <enum>QFrame::Shadow::Sunken</enum>
            </property>
            <property name="text">
             <string>0</string>
            </property>
            <property name="alignment">
-            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
            </property>
           </widget>
          </item>
@@ -216,7 +197,7 @@
             </size>
            </property>
            <property name="popupMode">
-            <enum>QToolButton::InstantPopup</enum>
+            <enum>QToolButton::ToolButtonPopupMode::InstantPopup</enum>
            </property>
           </widget>
          </item>
@@ -235,10 +216,10 @@
             </size>
            </property>
            <property name="popupMode">
-            <enum>QToolButton::InstantPopup</enum>
+            <enum>QToolButton::ToolButtonPopupMode::InstantPopup</enum>
            </property>
            <property name="arrowType">
-            <enum>Qt::NoArrow</enum>
+            <enum>Qt::ArrowType::NoArrow</enum>
            </property>
           </widget>
          </item>
@@ -253,7 +234,7 @@
           </sizepolicy>
          </property>
          <property name="focusPolicy">
-          <enum>Qt::NoFocus</enum>
+          <enum>Qt::FocusPolicy::NoFocus</enum>
          </property>
         </widget>
        </item>
@@ -267,10 +248,10 @@
        </sizepolicy>
       </property>
       <property name="frameShape">
-       <enum>QFrame::NoFrame</enum>
+       <enum>QFrame::Shape::NoFrame</enum>
       </property>
       <property name="frameShadow">
-       <enum>QFrame::Plain</enum>
+       <enum>QFrame::Shadow::Plain</enum>
       </property>
       <layout class="QVBoxLayout">
        <property name="leftMargin">
@@ -294,7 +275,7 @@
           </sizepolicy>
          </property>
          <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+          <enum>Qt::Orientation::Horizontal</enum>
          </property>
         </widget>
        </item>
@@ -309,7 +290,6 @@
             <widget class="QLabel" name="mini_prompt">
              <property name="font">
               <font>
-               <weight>75</weight>
                <bold>true</bold>
               </font>
              </property>
@@ -348,7 +328,7 @@
             </size>
            </property>
            <property name="contextMenuPolicy">
-            <enum>Qt::CustomContextMenu</enum>
+            <enum>Qt::ContextMenuPolicy::CustomContextMenu</enum>
            </property>
            <property name="toolTip">
             <string>Send</string>
@@ -361,7 +341,7 @@
             <string>Avatar</string>
            </property>
            <property name="alignment">
-            <set>Qt::AlignCenter</set>
+            <set>Qt::AlignmentFlag::AlignCenter</set>
            </property>
           </widget>
          </item>
diff --git a/src/psichatdlg.cpp b/src/psichatdlg.cpp
index f1a3e9f95..e76f2f9d5 100644
--- a/src/psichatdlg.cpp
+++ b/src/psichatdlg.cpp
@@ -374,7 +374,6 @@ void PsiChatDlg::setLooks()
 
     int s = PsiIconset::instance()->system().iconSize();
     ui_.lb_status->setFixedSize(s, s);
-    ui_.lb_client->setFixedSize(s, s);
 
     ui_.tb_pgp->hide();
     if (smallChat_) {
@@ -384,9 +383,7 @@ void PsiChatDlg::setLooks()
         ui_.tb_emoticons->hide();
         ui_.toolbar->hide();
         ui_.tb_voice->hide();
-        ui_.lb_client->hide();
     } else {
-        ui_.lb_client->show();
         ui_.lb_status->show();
         ui_.le_jid->show();
         if (PsiOptions::instance()->getOption("options.ui.contactlist.toolbars.m0.visible").toBool()) {
@@ -824,9 +821,8 @@ void PsiChatDlg::contactUpdated(UserListItem *u, int status, const QString &stat
             if (!client.isEmpty()) {
                 const QPixmap &pix
                     = IconsetFactory::iconPixmap("clients/" + client, int(fontInfo().pixelSize() * EqTextIconK + .5));
-                ui_.lb_client->setPixmap(pix);
             }
-            ui_.lb_client->setToolTip(r.versionString());
+            ui_.le_jid->setToolTip(r.versionString());
         }
     }
 }