Northern_Lights/nekoray_Mahdi-zarei
1
0
Fork 0
mirror of https://github.com/Mahdi-zarei/nekoray.git synced 2025-12-26 03:11:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve proxy list management

Browse Source
This commit is contained in:
Nova 2024-12-21 02:53:59 +03:30
parent 4ad92254c3
commit b8dc8be90e
No known key found for this signature in database
GPG Key ID: 389787EC83F5D73A
2 changed files with 69 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/ui/mainwindow.h
View File

@ -185,6 +185,8 @@ private:
void refresh_proxy_list_impl_refresh_data(const int &id = -1); void refresh_proxy_list_impl_refresh_data(const int &id = -1);
void refresh_table_item(int row, const std::shared_ptr<NekoGui::ProxyEntity>& profile);
void keyPressEvent(QKeyEvent *event) override; void keyPressEvent(QKeyEvent *event) override;
void closeEvent(QCloseEvent *event) override; void closeEvent(QCloseEvent *event) override;

116
src/ui/mainwindow.cpp
View File

@ -474,6 +474,7 @@ void MainWindow::show_group(int gid) {
NekoGui::dataStore->current_group = gid; NekoGui::dataStore->current_group = gid;
NekoGui::dataStore->Save(); NekoGui::dataStore->Save();
} }
ui->tabWidget->widget(groupId2TabIndex(gid))->layout()->addWidget(ui->proxyListTable); ui->tabWidget->widget(groupId2TabIndex(gid))->layout()->addWidget(ui->proxyListTable);
// 列宽是否可调 // 列宽是否可调
@ -964,7 +965,8 @@ void MainWindow::refresh_proxy_list_impl(const int &id, GroupSortAction groupSor
ui->proxyListTable->setRowCount(0); ui->proxyListTable->setRowCount(0);
// 添加行 // 添加行
int row = -1; int row = -1;
for (const auto ent: NekoGui::profileManager->GetGroup(NekoGui::dataStore->current_group)->Profiles()) { auto profiles = NekoGui::profileManager->GetGroup(NekoGui::dataStore->current_group)->Profiles();
for (const auto& ent: profiles) {
row++; row++;
ui->proxyListTable->insertRow(row); ui->proxyListTable->insertRow(row);
ui->proxyListTable->row2Id += ent->id; ui->proxyListTable->row2Id += ent->id;
@ -1044,58 +1046,74 @@ void MainWindow::refresh_proxy_list_impl(const int &id, GroupSortAction groupSor
} }
void MainWindow::refresh_proxy_list_impl_refresh_data(const int &id) { void MainWindow::refresh_proxy_list_impl_refresh_data(const int &id) {
// 绘制或更新item(s) if (id >= 0)
for (int row = 0; row < ui->proxyListTable->rowCount(); row++) { {
auto profileId = ui->proxyListTable->row2Id[row]; auto rowID = ui->proxyListTable->id2Row[id];
if (id >= 0 && profileId != id) continue; // refresh ONE item if (rowID < 0)
auto profile = NekoGui::profileManager->GetProfile(profileId); {
if (profile == nullptr) continue; MW_show_log("Invalid proxy list id, data might be corrupted");
return;
auto isRunning = profileId == NekoGui::dataStore->started_id; }
auto f0 = std::make_unique<QTableWidgetItem>(); auto profile = NekoGui::profileManager->GetProfile(id);
f0->setData(114514, profileId); refresh_table_item(rowID, profile);
} else
// Check state {
auto check = f0->clone(); for (int row = 0; row < ui->proxyListTable->rowCount(); row++) {
check->setText(isRunning ? "✓" : Int2String(row + 1)); auto profileId = ui->proxyListTable->row2Id[row];
ui->proxyListTable->setVerticalHeaderItem(row, check); auto profile = NekoGui::profileManager->GetProfile(profileId);
refresh_table_item(row, profile);
// C0: Type
auto f = f0->clone();
f->setText(profile->bean->DisplayType());
if (isRunning) f->setForeground(palette().link());
ui->proxyListTable->setItem(row, 0, f);
// C1: Address+Port
f = f0->clone();
f->setText(profile->bean->DisplayAddress());
if (isRunning) f->setForeground(palette().link());
ui->proxyListTable->setItem(row, 1, f);
// C2: Name
f = f0->clone();
f->setText(profile->bean->name);
if (isRunning) f->setForeground(palette().link());
ui->proxyListTable->setItem(row, 2, f);
// C3: Test Result
f = f0->clone();
if (profile->full_test_report.isEmpty()) {
auto color = profile->DisplayLatencyColor();
if (color.isValid()) f->setForeground(color);
f->setText(profile->DisplayLatency());
} else {
f->setText(profile->full_test_report);
} }
ui->proxyListTable->setItem(row, 3, f);
// C4: Traffic
f = f0->clone();
f->setText(profile->traffic_data->DisplayTraffic());
ui->proxyListTable->setItem(row, 4, f);
} }
} }
void MainWindow::refresh_table_item(const int row, const std::shared_ptr<NekoGui::ProxyEntity>& profile)
{
if (profile == nullptr) return;
auto isRunning = profile->id == NekoGui::dataStore->started_id;
auto f0 = std::make_unique<QTableWidgetItem>();
f0->setData(114514, profile->id);
// Check state
auto check = f0->clone();
check->setText(isRunning ? "✓" : Int2String(row + 1) + " ");
ui->proxyListTable->setVerticalHeaderItem(row, check);
// C0: Type
auto f = f0->clone();
f->setText(profile->bean->DisplayType());
if (isRunning) f->setForeground(palette().link());
ui->proxyListTable->setItem(row, 0, f);
// C1: Address+Port
f = f0->clone();
f->setText(profile->bean->DisplayAddress());
if (isRunning) f->setForeground(palette().link());
ui->proxyListTable->setItem(row, 1, f);
// C2: Name
f = f0->clone();
f->setText(profile->bean->name);
if (isRunning) f->setForeground(palette().link());
ui->proxyListTable->setItem(row, 2, f);
// C3: Test Result
f = f0->clone();
if (profile->full_test_report.isEmpty()) {
auto color = profile->DisplayLatencyColor();
if (color.isValid()) f->setForeground(color);
f->setText(profile->DisplayLatency());
} else {
f->setText(profile->full_test_report);
}
ui->proxyListTable->setItem(row, 3, f);
// C4: Traffic
f = f0->clone();
f->setText(profile->traffic_data->DisplayTraffic());
ui->proxyListTable->setItem(row, 4, f);
}
// table菜单相关 // table菜单相关
void MainWindow::on_proxyListTable_itemDoubleClicked(QTableWidgetItem *item) { void MainWindow::on_proxyListTable_itemDoubleClicked(QTableWidgetItem *item) {