Skip to content

Commit

Permalink
Remove client-version icon with duplicating info
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ri0n
Ri0n committed May 8, 2024
1 parent 1cac7b0 commit c3427d1
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 42 deletions.
54 changes: 17 additions & 37 deletions src/chatdlg.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>455</width>
<width>463</width>
<height>344</height>
</rect>
</property>
Expand All @@ -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">
Expand All @@ -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">
Expand Down Expand Up @@ -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">
Expand All @@ -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>
Expand Down Expand Up @@ -216,7 +197,7 @@
</size>
</property>
<property name="popupMode">
<enum>QToolButton::InstantPopup</enum>
<enum>QToolButton::ToolButtonPopupMode::InstantPopup</enum>
</property>
</widget>
</item>
Expand All @@ -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>
Expand All @@ -253,7 +234,7 @@
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
<enum>Qt::FocusPolicy::NoFocus</enum>
</property>
</widget>
</item>
Expand All @@ -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">
Expand All @@ -294,7 +275,7 @@
</sizepolicy>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
</widget>
</item>
Expand All @@ -309,7 +290,6 @@
<widget class="QLabel" name="mini_prompt">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
Expand Down Expand Up @@ -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>
Expand All @@ -361,7 +341,7 @@
<string>Avatar</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget>
</item>
Expand Down
6 changes: 1 addition & 5 deletions src/psichatdlg.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_) {
Expand All @@ -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()) {
Expand Down Expand Up @@ -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());
}
}
}
Expand Down

0 comments on commit c3427d1

Please sign in to comment.