Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 65 additions & 5 deletions QtScrcpy/ui/dialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,22 @@ void Dialog::initUI()
// 加载IP历史记录
loadIpHistory();

// 加载端口历史记录
loadPortHistory();

// 为deviceIpEdt添加右键菜单
if (ui->deviceIpEdt->lineEdit()) {
ui->deviceIpEdt->lineEdit()->setContextMenuPolicy(Qt::CustomContextMenu);
connect(ui->deviceIpEdt->lineEdit(), &QWidget::customContextMenuRequested,
this, &Dialog::showIpEditMenu);
}

// 为devicePortEdt添加右键菜单
if (ui->devicePortEdt->lineEdit()) {
ui->devicePortEdt->lineEdit()->setContextMenuPolicy(Qt::CustomContextMenu);
connect(ui->devicePortEdt->lineEdit(), &QWidget::customContextMenuRequested,
this, &Dialog::showPortEditMenu);
}
}

void Dialog::updateBootConfig(bool toView)
Expand Down Expand Up @@ -361,12 +371,14 @@ void Dialog::on_wirelessConnectBtn_clicked()
return;
}
QString addr = ui->deviceIpEdt->currentText().trimmed();
if (!ui->devicePortEdt->text().isEmpty()) {
addr += ":";
addr += ui->devicePortEdt->text().trimmed();
} else if (!ui->devicePortEdt->placeholderText().isEmpty()) {
if (addr.isEmpty()) {
outLog("error: device ip is null", false);
return;
}

if (!ui->devicePortEdt->currentText().isEmpty()) {
addr += ":";
addr += ui->devicePortEdt->placeholderText().trimmed();
addr += ui->devicePortEdt->currentText().trimmed();
} else {
outLog("error: device port is null", false);
return;
Expand All @@ -377,6 +389,12 @@ void Dialog::on_wirelessConnectBtn_clicked()
if (!ip.isEmpty()) {
saveIpHistory(ip);
}

// 保存端口历史记录
QString port = addr.split(":").last();
if (!port.isEmpty() && port != ip) {
savePortHistory(port);
}

outLog("wireless connect...", false);
QStringList adbArgs;
Expand Down Expand Up @@ -831,3 +849,45 @@ void Dialog::showIpEditMenu(const QPoint &pos)
menu->exec(ui->deviceIpEdt->lineEdit()->mapToGlobal(pos));
delete menu;
}

void Dialog::loadPortHistory()
{
QStringList portList = Config::getInstance().getPortHistory();
ui->devicePortEdt->clear();
ui->devicePortEdt->addItems(portList);
ui->devicePortEdt->setContentsMargins(0, 0, 0, 0);

if (ui->devicePortEdt->lineEdit()) {
ui->devicePortEdt->lineEdit()->setMaxLength(6);
ui->devicePortEdt->lineEdit()->setPlaceholderText("5555");
}
}

void Dialog::savePortHistory(const QString &port)
{
if (port.isEmpty()) {
return;
}

Config::getInstance().savePortHistory(port);

// 更新ComboBox
loadPortHistory();
ui->devicePortEdt->setCurrentText(port);
}

void Dialog::showPortEditMenu(const QPoint &pos)
{
QMenu *menu = ui->devicePortEdt->lineEdit()->createStandardContextMenu();
menu->addSeparator();

QAction *clearHistoryAction = new QAction(tr("Clear History"), menu);
connect(clearHistoryAction, &QAction::triggered, this, [this]() {
Config::getInstance().clearPortHistory();
loadPortHistory();
});

menu->addAction(clearHistoryAction);
menu->exec(ui->devicePortEdt->lineEdit()->mapToGlobal(pos));
delete menu;
}
4 changes: 4 additions & 0 deletions QtScrcpy/ui/dialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ private slots:
const QString &getServerPath();
void loadIpHistory();
void saveIpHistory(const QString &ip);
void loadPortHistory();
void savePortHistory(const QString &port);

void showPortEditMenu(const QPoint &pos);

protected:
void closeEvent(QCloseEvent *event);
Expand Down
17 changes: 10 additions & 7 deletions QtScrcpy/ui/dialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -1094,21 +1094,24 @@
</widget>
</item>
<item>
<widget class="QLineEdit" name="devicePortEdt">
<widget class="QComboBox" name="devicePortEdt">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="maxLength">
<number>6</number>
<property name="editable">
<bool>true</bool>
</property>
<property name="placeholderText">
<string notr="true">5555</string>
<property name="currentText">
<string/>
</property>
</widget>
</item>
Expand Down
38 changes: 38 additions & 0 deletions QtScrcpy/util/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,11 @@
#define IP_HISTORY_DEF ""
#define IP_HISTORY_MAX 10

// Port history
#define PORT_HISTORY_KEY "PortHistory"
#define PORT_HISTORY_DEF ""
#define PORT_HISTORY_MAX 10

QString Config::s_configPath = "";

Config::Config(QObject *parent) : QObject(parent)
Expand Down Expand Up @@ -412,6 +417,7 @@ void Config::saveIpHistory(const QString &ip)
QStringList Config::getIpHistory()
{
QStringList ipList = m_userData->value(IP_HISTORY_KEY, IP_HISTORY_DEF).toStringList();
ipList.removeAll("");
return ipList;
}

Expand All @@ -420,3 +426,35 @@ void Config::clearIpHistory()
m_userData->remove(IP_HISTORY_KEY);
m_userData->sync();
}

void Config::savePortHistory(const QString &port)
{
QStringList portList = getPortHistory();

// 移除已存在的相同Port(避免重复)
portList.removeAll(port);

// 将新Port添加到开头
portList.prepend(port);

// 限制历史记录数量
while (portList.size() > PORT_HISTORY_MAX) {
portList.removeLast();
}

m_userData->setValue(PORT_HISTORY_KEY, portList);
m_userData->sync();
}

QStringList Config::getPortHistory()
{
QStringList portList = m_userData->value(PORT_HISTORY_KEY, PORT_HISTORY_DEF).toStringList();
portList.removeAll("");
return portList;
}

void Config::clearPortHistory()
{
m_userData->remove(PORT_HISTORY_KEY);
m_userData->sync();
}
5 changes: 5 additions & 0 deletions QtScrcpy/util/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ class Config : public QObject
QStringList getIpHistory();
void clearIpHistory();

// Port history methods
void savePortHistory(const QString &port);
QStringList getPortHistory();
void clearPortHistory();

private:
explicit Config(QObject *parent = nullptr);
const QString &getConfigPath();
Expand Down
Loading