taynpg/frelay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove: get root callback.

Browse Source
This commit is contained in:
taynpg
2025-06-20 16:05:37 +08:00
parent a019a5ea78
commit 6941e1b893
6 changed files with 5 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ClientCore/ClientCore.cpp
View File

@@ -20,7 +20,7 @@ ClientCore::~ClientCore()
void ClientCore::DoConnect(const QString& ip, quint16 port) void ClientCore::DoConnect(const QString& ip, quint16 port)
{ {
qDebug() << "doConnect thread:" << QThread::currentThread(); //qDebug() << "doConnect thread:" << QThread::currentThread();
emit connecting(); emit connecting();
if (!Connect(ip, port)) { if (!Connect(ip, port)) {
emit conFailed(); emit conFailed();

6
Gui/Control/FileControl.cpp
View File

@@ -39,17 +39,11 @@ void FileManager::SetModeStr(const QString& modeStr, int type, ClientCore* clien
ui->tableWidget->setOwnIDCall([this]() { return cliCore_->GetOwnID(); }); ui->tableWidget->setOwnIDCall([this]() { return cliCore_->GetOwnID(); });
ui->tableWidget->setRemoteIDCall([this]() { return cliCore_->GetRemoteID(); }); ui->tableWidget->setRemoteIDCall([this]() { return cliCore_->GetRemoteID(); });
ui->tableWidget->setBasePathCall([this]() { return GetRoot(); });
connect(fileHelper_.get(), &DirFileHelper::sigHome, this, &FileManager::ShowPath); connect(fileHelper_.get(), &DirFileHelper::sigHome, this, &FileManager::ShowPath);
connect(fileHelper_.get(), &DirFileHelper::sigDirFile, this, &FileManager::ShowFile); connect(fileHelper_.get(), &DirFileHelper::sigDirFile, this, &FileManager::ShowFile);
} }
void FileManager::SetOtherSideCall(const std::function<QString()>& call)
{
ui->tableWidget->setOtherSideCall(call);
}
void FileManager::InitControl() void FileManager::InitControl()
{ {
QStringList headers; QStringList headers;

1
Gui/Control/FileControl.h
View File

@@ -24,7 +24,6 @@ public:
public: public:
QString GetRoot(); QString GetRoot();
void SetModeStr(const QString& modeStr, int type = 0, ClientCore* clientCore = nullptr); void SetModeStr(const QString& modeStr, int type = 0, ClientCore* clientCore = nullptr);
void SetOtherSideCall(const std::function<QString()>& call);
signals: signals:
void sigSendTasks(const QVector<TransTask>& tasks); void sigSendTasks(const QVector<TransTask>& tasks);

18
Gui/Control/cusTableWidget.cpp
View File

@@ -22,11 +22,6 @@ void CustomTableWidget::setIsRemote(bool isRemote)
isRemote_ = isRemote; isRemote_ = isRemote;
} }
void CustomTableWidget::setBasePathCall(const std::function<QString()>& call)
{
basePathCall_ = call;
}
void CustomTableWidget::setOwnIDCall(const std::function<QString()>& call) void CustomTableWidget::setOwnIDCall(const std::function<QString()>& call)
{ {
oidCall_ = call; oidCall_ = call;
@@ -37,11 +32,6 @@ void CustomTableWidget::setRemoteIDCall(const std::function<QString()>& call)
ridCall_ = call; ridCall_ = call;
} }
void CustomTableWidget::setOtherSideCall(const std::function<QString()>& call)
{
otherSideCall_ = call;
}
void CustomTableWidget::dropEvent(QDropEvent* event) void CustomTableWidget::dropEvent(QDropEvent* event)
{ {
if (!event->mimeData()->hasFormat("application/x-qabstractitemmodeldatalist")) { if (!event->mimeData()->hasFormat("application/x-qabstractitemmodeldatalist")) {
@@ -65,11 +55,11 @@ void CustomTableWidget::dropEvent(QDropEvent* event)
task.localId = oidCall_(); task.localId = oidCall_();
task.remoteId = ridCall_(); task.remoteId = ridCall_();
if (isRemote_) { if (isRemote_) {
task.remotePath = basePathCall_(); task.remotePath = GlobalData::Ins()->GetRemoteRoot();
task.localPath = Util::Join(otherSideCall_(), roleData[Qt::DisplayRole].toString()); task.localPath = Util::Join(GlobalData::Ins()->GetLocalRoot(), roleData[Qt::DisplayRole].toString());
} else { } else {
task.localPath = basePathCall_(); task.localPath = GlobalData::Ins()->GetLocalRoot();
task.remotePath = Util::Join(otherSideCall_(), roleData[Qt::DisplayRole].toString()); task.remotePath = Util::Join(GlobalData::Ins()->GetRemoteRoot(), roleData[Qt::DisplayRole].toString());
} }
tasks.push_back(task); tasks.push_back(task);
} }

4
Gui/Control/cusTableWidget.h
View File

@@ -17,10 +17,8 @@ signals:
public: public:
void setIsRemote(bool isRemote); void setIsRemote(bool isRemote);
void setBasePathCall(const std::function<QString()>& call);
void setOwnIDCall(const std::function<QString()>& call); void setOwnIDCall(const std::function<QString()>& call);
void setRemoteIDCall(const std::function<QString()>& call); void setRemoteIDCall(const std::function<QString()>& call);
void setOtherSideCall(const std::function<QString()>& call);
protected: protected:
void dropEvent(QDropEvent* event) override; void dropEvent(QDropEvent* event) override;
@@ -29,8 +27,6 @@ protected:
protected: protected:
bool isRemote_{false}; bool isRemote_{false};
QPoint startPos_; QPoint startPos_;
std::function<QString()> basePathCall_;
std::function<QString()> otherSideCall_;
std::function<QString()> oidCall_; std::function<QString()> oidCall_;
std::function<QString()> ridCall_; std::function<QString()> ridCall_;
}; };

2
Gui/frelayGUI.cpp
View File

@@ -47,9 +47,7 @@ void frelayGUI::InitControl()
remoteFile_ = new FileManager(this); remoteFile_ = new FileManager(this);
localFile_->SetModeStr(tr("Local:"), 0, clientCore_); localFile_->SetModeStr(tr("Local:"), 0, clientCore_);
localFile_->SetOtherSideCall([this]() { return remoteFile_->GetRoot(); });
remoteFile_->SetModeStr(tr("Remote:"), 1, clientCore_); remoteFile_->SetModeStr(tr("Remote:"), 1, clientCore_);
remoteFile_->SetOtherSideCall([this]() { return localFile_->GetRoot(); });
tabWidget_ = new QTabWidget(this); tabWidget_ = new QTabWidget(this);