From 91c69d07871f2c081f8eb7d5e199b7997070f185 Mon Sep 17 00:00:00 2001 From: Janne Koschinski Date: Thu, 21 Dec 2017 21:43:18 +0100 Subject: [PATCH 1/1] Polish session list UI - Only show disconnect button if available - Show if client is connected securely - Make the UI look more native Closes GH-316. --- src/qtui/coresessionwidget.cpp | 15 +- src/qtui/ui/coresessionwidget.ui | 289 ++++++++++++------------------- 2 files changed, 120 insertions(+), 184 deletions(-) diff --git a/src/qtui/coresessionwidget.cpp b/src/qtui/coresessionwidget.cpp index fa6d1760..f3f987db 100644 --- a/src/qtui/coresessionwidget.cpp +++ b/src/qtui/coresessionwidget.cpp @@ -28,27 +28,24 @@ CoreSessionWidget::CoreSessionWidget(QWidget *parent) : QWidget(parent) { ui.setupUi(this); - layout()->setContentsMargins(0, 0, 0, 0); - layout()->setSpacing(0); connect(ui.disconnectButton, SIGNAL(released()), this, SLOT(disconnectClicked())); } void CoreSessionWidget::setData(QMap map) { - QLabel *iconSecure = ui.iconSecure; - // TODO: Implement "secure" icon - Q_UNUSED(iconSecure); - - ui.labelRemoteAddress->setText(map["remoteAddress"].toString()); + ui.sessionGroup->setTitle(map["remoteAddress"].toString()); ui.labelLocation->setText(map["location"].toString()); ui.labelClient->setText(map["clientVersion"].toString()); ui.labelVersionDate->setText(map["clientVersionDate"].toString()); - ui.labelUptime - ->setText(map["connectedSince"].toDateTime().toLocalTime().toString(Qt::DateFormat::SystemLocaleShortDate)); + ui.labelUptime->setText(map["connectedSince"].toDateTime().toLocalTime().toString(Qt::DateFormat::SystemLocaleShortDate)); if (map["location"].toString().isEmpty()) { ui.labelLocation->hide(); ui.labelLocationTitle->hide(); } + ui.labelSecure->setText(map["secure"].toBool() ? tr("Yes") : tr("No")); + + auto features = Quassel::Features(map["features"].toInt()); + ui.disconnectButton->setVisible(features.testFlag(Quassel::Feature::RemoteDisconnect)); bool success = false; _peerId = map["id"].toInt(&success); diff --git a/src/qtui/ui/coresessionwidget.ui b/src/qtui/ui/coresessionwidget.ui index 203d62e9..1f3c1e8c 100644 --- a/src/qtui/ui/coresessionwidget.ui +++ b/src/qtui/ui/coresessionwidget.ui @@ -6,193 +6,132 @@ 0 0 - 509 - 204 + 480 + 212 - - - 0 - 0 - - 480 0 - - - 16777215 - 16777215 - - - + - - - - - - - - 13 - 75 - true - - - - 10.104.241.277 - - - - - - - - 0 - 0 - - - - - 32 - 32 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - Qt::NoTextInteraction - - - - - - - - - - - opacity: 0.66; - - - Client: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - v0.13-pre (0.12.0+372 git-12df418) - - - - - - - color: rgb(119, 119, 119); - - - Version Date: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Sun Aug 27 04:29:53 2017 - - - - - - - opacity: 0.66; - - - Location: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Kiel, Germany - - - - - - - color: rgb(119, 119, 119); - - - Connected Since: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Sun Aug 27 15:03:10 2017 - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - End Session - - - - - - - - - - - Qt::Horizontal + + + + 0 + 0 + + + + 12.34.56.78 + + + + + + + Client: + + + + + + + v0.13-pre (0.12.0+372 git-12df418) + + + + + + + Version Date: + + + + + + + Sun Aug 27 04:29:53 2017 + + + + + + + Location: + + + + + + + Kiel, Germany + + + + + + + Connected Since: + + + + + + + Sun Aug 27 15:03:10 2017 + + + + + + + Secure: + + + + + + + No + + + + + + + + + + + Qt::Horizontal + + + + 40 + 0 + + + + + + + + End Session + + + + + + - - + + -- 2.20.1