From 9f0dc8ad8da08343bd52f97027a7939ad7df64c9 Mon Sep 17 00:00:00 2001 From: taynpg Date: Thu, 26 Jun 2025 00:19:45 +0800 Subject: [PATCH] change: auto load when start or connect. --- CMakeLists.txt | 2 +- Gui/Control/ConnectControl.cpp | 1 + Gui/Control/ConnectControl.h | 1 + Gui/Control/FileControl.cpp | 5 +++++ Gui/Control/FileControl.h | 2 +- Gui/frelayGUI.cpp | 5 +++++ 6 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b5e8f80..7533fcd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16) -project(frelay VERSION 0.1.5 LANGUAGES CXX) +project(frelay VERSION 0.1.6 LANGUAGES CXX) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/Gui/Control/ConnectControl.cpp b/Gui/Control/ConnectControl.cpp index 927591a..142cd23 100644 --- a/Gui/Control/ConnectControl.cpp +++ b/Gui/Control/ConnectControl.cpp @@ -167,6 +167,7 @@ void Connecter::InitControl() ui->elbClient->setText(name); ui->elbClient->setStyleSheet("color: green;"); remoteCall_(name); + emit sigConfirmUse(); }); setMaximumWidth(300); diff --git a/Gui/Control/ConnectControl.h b/Gui/Control/ConnectControl.h index eeb4d9f..99b578d 100644 --- a/Gui/Control/ConnectControl.h +++ b/Gui/Control/ConnectControl.h @@ -34,6 +34,7 @@ signals: void sendConnect(ConnectState cs); void sigDoConnect(const QString& ip, quint16 port); void sigDisConnect(); + void sigConfirmUse(); private: void InitControl(); diff --git a/Gui/Control/FileControl.cpp b/Gui/Control/FileControl.cpp index 900d5c6..ed93898 100644 --- a/Gui/Control/FileControl.cpp +++ b/Gui/Control/FileControl.cpp @@ -42,6 +42,11 @@ void FileManager::SetModeStr(const QString& modeStr, int type, ClientCore* clien connect(fileHelper_.get(), &DirFileHelper::sigHome, this, &FileManager::ShowPath); connect(fileHelper_.get(), &DirFileHelper::sigDirFile, this, &FileManager::ShowFile); + + if (type == 0) { + evtHome(); + evtFile(); + } } void FileManager::InitControl() diff --git a/Gui/Control/FileControl.h b/Gui/Control/FileControl.h index 312c20e..b27d607 100644 --- a/Gui/Control/FileControl.h +++ b/Gui/Control/FileControl.h @@ -37,7 +37,7 @@ private: void doubleClick(int row, int column); void SetRoot(const QString& path); -private: +public slots: void evtHome(); void evtFile(); void evtUp(); diff --git a/Gui/frelayGUI.cpp b/Gui/frelayGUI.cpp index fd197c4..a9c3ccd 100644 --- a/Gui/frelayGUI.cpp +++ b/Gui/frelayGUI.cpp @@ -54,6 +54,7 @@ void frelayGUI::InitControl() connect(localFile_, &FileManager::sigSendTasks, this, &frelayGUI::HandleTask); connect(remoteFile_, &FileManager::sigSendTasks, this, &frelayGUI::HandleTask); connect(compare_, &Compare::sigTasks, this, &frelayGUI::HandleTask); + connect(connecter_, &Connecter::sigConfirmUse, remoteFile_, &FileManager::evtHome); } void frelayGUI::ControlSignal() @@ -110,6 +111,10 @@ void frelayGUI::ControlMsgHander(QtMsgType type, const QMessageLogContext& conte void frelayGUI::HandleTask(const QVector& tasks) { + if (!clientCore_->IsConnect()) { + qCritical() << QString(tr("Not connect to server.")); + return; + } transform_->SetTasks(tasks); transform_->exec(); }