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

fix tray again &&

Browse Source 
fix table item update &&
improve cmake
This commit is contained in:
Nova 2024-12-29 00:47:59 +03:30
parent 62035c5049
commit 183c5e4236
No known key found for this signature in database
GPG Key ID: 389787EC83F5D73A
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -7,7 +7,9 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_POLICY_DEFAULT_CMP0069 NEW) set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON) if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND WIN32)
set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)
endif ()
find_package(Qt6 REQUIRED COMPONENTS Widgets Network Svg LinguistTools QuickControls2) find_package(Qt6 REQUIRED COMPONENTS Widgets Network Svg LinguistTools QuickControls2)

2
cmake/myproto.cmake
View File

@ -1,7 +1,7 @@
find_package(Protobuf CONFIG REQUIRED) find_package(Protobuf CONFIG REQUIRED)
set(PROTO_FILES set(PROTO_FILES
core/grpc_server/gen/libcore.proto core/cmd/nekobox_core/server/gen/libcore.proto
) )
add_library(myproto STATIC ${PROTO_FILES}) add_library(myproto STATIC ${PROTO_FILES})

11
src/ui/mainwindow.cpp
View File

@ -245,10 +245,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
connect(tray, &QSystemTrayIcon::activated, this, [=](QSystemTrayIcon::ActivationReason reason) { connect(tray, &QSystemTrayIcon::activated, this, [=](QSystemTrayIcon::ActivationReason reason) {
if (reason == QSystemTrayIcon::Context) if (reason == QSystemTrayIcon::Context)
{ {
QTimer::singleShot(100, this, [=] ui->menu_program->exec(QCursor::pos());
{
ui->menu_program->popup(QCursor::pos());
});
} }
if (reason == QSystemTrayIcon::Trigger) { if (reason == QSystemTrayIcon::Trigger) {
if (this->isVisible()) { if (this->isVisible()) {
@ -1048,12 +1045,12 @@ void MainWindow::refresh_proxy_list_impl(const int &id, GroupSortAction groupSor
void MainWindow::refresh_proxy_list_impl_refresh_data(const int &id, bool stopping) { void MainWindow::refresh_proxy_list_impl_refresh_data(const int &id, bool stopping) {
if (id >= 0) if (id >= 0)
{ {
auto rowID = ui->proxyListTable->id2Row[id]; if (ui->proxyListTable->id2Row.count(id) == 0)
if (rowID < 0)
{ {
MW_show_log("Invalid proxy list id, data might be corrupted"); qDebug("Invalid proxy list id, data might be corrupted");
return; return;
} }
auto rowID = ui->proxyListTable->id2Row[id];
auto profile = NekoGui::profileManager->GetProfile(id); auto profile = NekoGui::profileManager->GetProfile(id);
refresh_table_item(rowID, profile, stopping); refresh_table_item(rowID, profile, stopping);
} else } else