Merge branch 'main' of https://github.com/LawPlusThree/QSyncUi

.gitignore

@@ -3,3 +3,4 @@ CMakeLists.txt.user
 .vs
 CMakeUserPresets.json
 CMakePresets.json
+.vscode/settings.json

CMakeLists.txt

@@ -69,6 +69,7 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
         avatarImage.qrc
         filequeue.h filequeue.cpp
         storage.h storage.cpp
+        linknewfolder_window.h linknewfolder_window.cpp
         tasktoken.h tasktoken.cpp
         filecard.h filecard.cpp
         historycard.h historycard.cpp

filemange_view.cpp

@@ -69,6 +69,9 @@ FileManagePage::FileManagePage(QWidget* parent):ElaScrollPage(parent)
     pushButtonLayout->addWidget(_pushButton3);
     // 在布局中添加一个弹性空间，使得所有控件靠左对齐
     pushButtonLayout->addStretch();
+    connect(_pushButton3,&ElaPushButton::clicked,[=](){
+        linknewfolderwindow->show();
+    });
 
     QWidget* catalogueArea = new QWidget();
     catalogueArea->setWindowFlags(Qt::FramelessWindowHint); // 去除窗口边框

filemange_view.h

@@ -3,6 +3,7 @@
 
 #include "ElaScrollPage.h"
 #include "ElaProgressBar.h"
+#include "linknewfolder_window.h"
 
 class ElaToggleButton;
 class ElaPushButton;
@@ -21,6 +22,7 @@ class FileManagePage:public ElaScrollPage
     ElaPushButton* _pushButton2{nullptr};
     ElaPushButton* _pushButton3{nullptr};
     ElaToggleButton* _toggleButton{nullptr};
+    linkNewFolder_window* linknewfolderwindow=new linkNewFolder_window();
 };
 
 #endif // FILEMANGE_VIEW_H

linknewfolder_window.cpp

@@ -0,0 +1,23 @@
+#include "linknewfolder_window.h"
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+
+linkNewFolder_window::linkNewFolder_window(QWidget *parent)
+    : ElaWidget(parent,600,400)
+{
+    this->setWindowTitle("珞珈云"); // 设置窗口标题
+    this->setWindowModality(Qt::ApplicationModal); // 设置窗口模态
+    this->hide(); // 初始隐藏当前窗口
+    this->setWindowFlags(Qt::WindowMinimizeButtonHint); // 设置窗口标志，允许最小化
+    QWidget*centerarea=new QWidget(); // 创建一个新的QWidget对象作为主区域
+    QVBoxLayout* centerVLayout = new QVBoxLayout(centerarea); // 为中心部件设置垂直布局
+    centerVLayout->setContentsMargins(0, 0, 0, 0); // 设置布局边距,5为到右边的距离
+    centerarea->setWindowTitle("链接新文件夹"); // 设置窗口标题
+
+    this->setCentralWidget(centerarea);// 将中心部件添加到窗口
+}
+
+linkNewFolder_window::~linkNewFolder_window()
+{
+
+}

linknewfolder_window.h

@@ -0,0 +1,15 @@
+#ifndef LINKNEWFOLDER_WINDOW_H
+#define LINKNEWFOLDER_WINDOW_H
+
+#include <QWidget>
+#include "ElaWidget.h"
+
+class linkNewFolder_window : public ElaWidget
+{
+public:
+    linkNewFolder_window(QWidget *parent = nullptr);
+    ~linkNewFolder_window();
+
+};
+
+#endif // LINKNEWFOLDER_WINDOW_H

loginwin.cpp

@@ -17,7 +17,7 @@
 #include"ElaText.h"
 #include"ElaImageCard.h"
 
-loginwin::loginwin(QWidget* parent):ElaWidget(parent)
+loginwin::loginwin(QWidget* parent):ElaWidget(parent,400,500)
 {
     setWindowTitle("珞珈云");
     connect(resetWin,&resetwin::goback,this,[=](){
@@ -32,7 +32,7 @@ loginwin::loginwin(QWidget* parent):ElaWidget(parent)
     this->setWindowModality(Qt::ApplicationModal);
     this->setCentralWidget(area);
     this->hide();
-    this->setFixedSize(250,700);
+    //this->setFixedSize(250,700);
     this->setWindowFlags(Qt::WindowMinimizeButtonHint);
 
     QImage image;

mainwindow.cpp

@@ -41,7 +41,7 @@ MainWindow::MainWindow(QWidget *parent)
     _historysyncPage = new HistorysyncPage(this);
     _userinfopage = new UserInfoPage(this);
 
-    connect(this, &ElaWindow::userInfoCardClicked, this, [=]() {
+    connect(this, &ElaWindow::userInfoCardClicked, [=]() {
         if(CurrentUser==nullptr)
             login->show();
     });

resetwin.cpp

@@ -14,7 +14,7 @@
 #include"ElaText.h"
 #include"ElaImageCard.h"
 
-resetwin::resetwin(QWidget* parent):ElaWidget(parent)
+resetwin::resetwin(QWidget* parent):ElaWidget(parent,400,500)
 {
     setWindowTitle("珞珈云");
     QWidget*area=new QWidget();

signinwin.cpp

@@ -15,7 +15,7 @@
 #include"ElaText.h"
 #include"ElaInteractiveCard.h"
 
-signinwin::signinwin(QWidget* parent):ElaWidget(parent)
+signinwin::signinwin(QWidget* parent):ElaWidget(parent,400,500)
 {
     setWindowTitle("珞珈云");
     QWidget*area=new QWidget();

thirdParty/ElaWidgetTools/ElaWidget.cpp

@@ -7,12 +7,12 @@
 #include "ElaAppBar.h"
 #include "ElaApplication.h"
 #include "private/ElaWidgetPrivate.h"
-ElaWidget::ElaWidget(QWidget* parent)
+ElaWidget::ElaWidget(QWidget* parent, int wi, int he)
     : QWidget{parent}, d_ptr(new ElaWidgetPrivate())
 {
     Q_D(ElaWidget);
     d->q_ptr = this;
-    resize(500, 500); // 默认宽高
+    resize(wi, he); // 默认宽高
     setObjectName("ElaWidget");
 
     d->_windowLinearGradient = new QLinearGradient(0, 0, width(), height());

thirdParty/ElaWidgetTools/include/ElaWidget.h

@@ -11,7 +11,7 @@ class ELA_EXPORT ElaWidget : public QWidget
     Q_OBJECT
     Q_Q_CREATE(ElaWidget)
 public:
-    explicit ElaWidget(QWidget* parent = nullptr);
+    explicit ElaWidget(QWidget* parent = nullptr,int wi=500,int he=500);
     ~ElaWidget();
     void setCentralWidget(QWidget* centralWidget);
 

user.cpp

@@ -31,6 +31,15 @@ User::User(const User &user)
 
 
 bool User::enroll()
+{
+    QString postData
+        = QString("username=%1&email=%2&password=%3").arg(username).arg(account).arg(hashedPassword);
+    ApiResponse response=apiRequest->post("/register",postData.toUtf8());
+    emit enrollResponse(response.getCode(),response.getData(),response.getMessage());
+    return response.isSuccess();
+}
+
+bool User::enroll(const QString &avatarpath)
 {
     QImageReader reader(avatarpath);
     if (!reader.canRead()) {

user.h

@@ -24,7 +24,6 @@ class User : public QObject
     QString hashedPassword; //password
     bool isLogin=false;
     ApiRequest *apiRequest;
-public:
     QString avatarpath;
 
 public:
@@ -37,6 +36,7 @@ class User : public QObject
          QObject *parent = nullptr);
     User(const User &user);
     bool enroll();         //执行post请求，实现注册功能
+    bool enroll(const QString &avatarpath);//注册带头像
     bool login();          //执行post请求，实现登录功能
     bool forgetPassword(); //执行post请求，实现找回密码功能
     bool updateAvatar(const QString &filePath);//更新头像