From 493c87ada136aa0e5c933d506051aa20a66f624c Mon Sep 17 00:00:00 2001
From: Barry <870709864@qq.com>
Date: Sun, 27 Jun 2021 13:16:06 +0800
Subject: [PATCH] feat: nickname for videoform title

---
 QtScrcpy/device/device.cpp | 8 ++++++--
 QtScrcpy/dialog.cpp        | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/QtScrcpy/device/device.cpp b/QtScrcpy/device/device.cpp
index 5005032..7c833a9 100644
--- a/QtScrcpy/device/device.cpp
+++ b/QtScrcpy/device/device.cpp
@@ -212,6 +212,7 @@ void Device::initSignals()
             }
         });
         connect(m_server, &Server::connectToResult, this, [this](bool success, const QString &deviceName, const QSize &size) {
+            Q_UNUSED(deviceName);
             if (success) {
                 double diff = m_startTimeCount.elapsed() / 1000.0;
                 qInfo() << QString("server start finish in %1s").arg(diff).toStdString().c_str();
@@ -220,8 +221,11 @@ void Device::initSignals()
                 if (m_videoForm) {
                     // must be show before updateShowSize
                     m_videoForm->show();
-
-                    m_videoForm->setWindowTitle(Config::getInstance().getTitle() + "-" + deviceName);
+                    QString name = Config::getInstance().getNickName(m_params.serial);
+                    if (name.isEmpty()) {
+                        name = Config::getInstance().getTitle();
+                    }
+                    m_videoForm->setWindowTitle(name + "-" + m_params.serial);
                     m_videoForm->updateShowSize(size);
 
                     bool deviceVer = size.height() > size.width();
diff --git a/QtScrcpy/dialog.cpp b/QtScrcpy/dialog.cpp
index bbea1b4..0667a0c 100644
--- a/QtScrcpy/dialog.cpp
+++ b/QtScrcpy/dialog.cpp
@@ -46,7 +46,7 @@ Dialog::Dialog(QWidget *parent) : QDialog(parent), ui(new Ui::Dialog)
                 ui->connectedPhoneList->clear();
                 for (auto &item : devices) {
                     ui->serialBox->addItem(item);
-                    ui->connectedPhoneList->addItem(item+"-"+Config::getInstance().getNickName(item));
+                    ui->connectedPhoneList->addItem(Config::getInstance().getNickName(item) + "-" + item);
                 }
             } else if (args.contains("show") && args.contains("wlan0")) {
                 QString ip = m_adb.getDeviceIPFromStdOut();