diff --git a/Gui/Control/CompareControl.ui b/Gui/Control/CompareControl.ui
index 0d5be94..a44b3fa 100644
--- a/Gui/Control/CompareControl.ui
+++ b/Gui/Control/CompareControl.ui
@@ -6,13 +6,126 @@
0
0
- 400
- 300
+ 636
+ 277
Form
+
+ -
+
+
-
+
+
+ -
+
+
+ Load
+
+
+
+ -
+
+
+ Save
+
+
+
+ -
+
+
+ Qt::Orientation::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ Replace
+
+
+
+
+
+ -
+
+
+ -
+
+
-
+
+
+ ToLeft
+
+
+
+ -
+
+
+ Qt::Orientation::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ -
+
+
+ Search
+
+
+
+ -
+
+
+ Reset
+
+
+
+ -
+
+
+ Qt::Orientation::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ ToRight
+
+
+
+
+
+
diff --git a/Gui/Control/FileControl.cpp b/Gui/Control/FileControl.cpp
index 29c7e9b..e17d736 100644
--- a/Gui/Control/FileControl.cpp
+++ b/Gui/Control/FileControl.cpp
@@ -73,7 +73,10 @@ void FileManager::InitControl()
void FileManager::InitMenu(bool remote)
{
if (remote) {
- auto acDown = new QAction(tr("Download"));
+ //auto acDown = new QAction(tr("Download"));
+ }
+ else {
+ //auto acUp = new QAction(tr("Upload"));
}
}
diff --git a/Gui/Control/FileControl.h b/Gui/Control/FileControl.h
index 1b70be7..f291483 100644
--- a/Gui/Control/FileControl.h
+++ b/Gui/Control/FileControl.h
@@ -38,8 +38,7 @@ private:
private:
Ui::FileManager* ui;
QString curRoot_;
- QMenu* localMenu_;
- QMenu* remoteMenu_;
+ QMenu* menu_;
FileTrans* fileTrans_;
std::shared_ptr fileHelper_;
};
diff --git a/Gui/frelayGUI.cpp b/Gui/frelayGUI.cpp
index a2124b6..1d428f2 100644
--- a/Gui/frelayGUI.cpp
+++ b/Gui/frelayGUI.cpp
@@ -34,6 +34,8 @@ void frelayGUI::InitControl()
logPrint = new LogPrint(this);
clientCore_ = new ClientCore();
+ compare_ = new Compare(this);
+
connecter_ = new Connecter(this);
connecter_->SetClientCore(clientCore_);
connecter_->SetRemoteCall([this](const QString& id) { clientCore_->SetRemoteID(id); });
@@ -65,6 +67,7 @@ void frelayGUI::ControlLayout()
sTop->addWidget(tabWidget_);
sTop->addWidget(connecter_);
tabWidget_->addTab(logPrint, tr("Log"));
+ tabWidget_->addTab(compare_, tr("Compare"));
sFile->addWidget(localFile_);
sFile->addWidget(remoteFile_);
diff --git a/Gui/frelayGUI.h b/Gui/frelayGUI.h
index e7b5b60..3fb714d 100644
--- a/Gui/frelayGUI.h
+++ b/Gui/frelayGUI.h
@@ -10,6 +10,7 @@
#include "Control/ConnectControl.h"
#include "Control/FileControl.h"
#include "Control/LogControl.h"
+#include "Control/CompareControl.h"
QT_BEGIN_NAMESPACE
namespace Ui {
@@ -43,5 +44,6 @@ private:
FileManager* localFile_;
FileManager* remoteFile_;
ClientCore* clientCore_;
+ Compare* compare_;
};
#endif // FRELAYGUI_H