diff --git a/clipboard/CMakeLists.txt b/clipboard/CMakeLists.txt index 2334b1e..174028d 100644 --- a/clipboard/CMakeLists.txt +++ b/clipboard/CMakeLists.txt @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 3.5) -project(clipboard VERSION 0.1 LANGUAGES CXX) +project(clipboard VERSION 1.0.1 LANGUAGES CXX) -#set(CMAKE_OSX_ARCHITECTURES "x86_64") +set(CMAKE_OSX_ARCHITECTURES "x86_64") set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -19,7 +19,7 @@ set(app_icon_macos "${CMAKE_CURRENT_SOURCE_DIR}/AppIcon.icns") set_source_files_properties(${app_icon_macos} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") -set(CMAKE_PREFIX_PATH "/Users/zhiyuan/Qt/6.3.0/macos/lib/cmake") +#set(CMAKE_PREFIX_PATH "/usr/local/Qt-6.3.0/lib/cmake") find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets LinguistTools Network WebSockets Gui Core) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets LinguistTools Network WebSockets Gui Core) diff --git a/clipboard/CMakeLists.txt.user b/clipboard/CMakeLists.txt.user index 339deba..5dcbeb5 100644 --- a/clipboard/CMakeLists.txt.user +++ b/clipboard/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -83,255 +83,32 @@ true + + true + ProjectExplorer.Project.Target.0 Desktop - x86-darwin-generic-mach_o-64bit - x86-darwin-generic-mach_o-64bit - {aa14ffd8-ab35-4922-a504-dc79e8941360} - 0 + x86_static + x86_static + {0cc1f20e-c8cf-4a2e-8ef4-c5d20cee2242} + 1 0 0 Debug - -DCMAKE_GENERATOR:STRING=Unix Makefiles + -DCMAKE_GENERATOR:STRING=Ninja -DCMAKE_BUILD_TYPE:STRING=Debug -DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{IDE:ResourcePath}/package-manager/auto-setup.cmake -DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable} -DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX} -DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C} --DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx} - /Users/zhiyuan/Documents/project/clipboard_desktop_cpp/build-clipboard-x86_darwin_generic_mach_o_64bit-Debug - - - - all - - true - Build - CMakeProjectManager.MakeStep - - 1 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - - clean - - true - Build - CMakeProjectManager.MakeStep - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - false - - Debug - CMakeProjectManager.CMakeBuildConfiguration - - - Release - -DCMAKE_GENERATOR:STRING=Unix Makefiles --DCMAKE_BUILD_TYPE:STRING=Release --DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{IDE:ResourcePath}/package-manager/auto-setup.cmake --DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable} --DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX} --DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C} --DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx} - /Users/zhiyuan/Documents/project/clipboard_desktop_cpp/build-clipboard-x86_darwin_generic_mach_o_64bit-Release - - - - all - - true - Build - CMakeProjectManager.MakeStep - - 1 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - - clean - - true - Build - CMakeProjectManager.MakeStep - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - false - - Release - CMakeProjectManager.CMakeBuildConfiguration - - - RelWithDebInfo - -DCMAKE_GENERATOR:STRING=Unix Makefiles --DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo --DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{IDE:ResourcePath}/package-manager/auto-setup.cmake --DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable} --DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX} --DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C} --DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx} - /Users/zhiyuan/Documents/project/clipboard_desktop_cpp/build-clipboard-x86_darwin_generic_mach_o_64bit-RelWithDebInfo - - - - all - - true - CMakeProjectManager.MakeStep - - 1 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - - clean - - true - CMakeProjectManager.MakeStep - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - false - - Release with Debug Information - CMakeProjectManager.CMakeBuildConfiguration - - - MinSizeRel - -DCMAKE_GENERATOR:STRING=Unix Makefiles --DCMAKE_BUILD_TYPE:STRING=MinSizeRel --DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{IDE:ResourcePath}/package-manager/auto-setup.cmake --DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable} --DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX} --DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C} --DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx} - /Users/zhiyuan/Documents/project/clipboard_desktop_cpp/build-clipboard-x86_darwin_generic_mach_o_64bit-MinSizeRel - - - - all - - true - Build - CMakeProjectManager.MakeStep - - 1 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - - clean - - true - Build - CMakeProjectManager.MakeStep - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - false - - Minimum Size Release - CMakeProjectManager.CMakeBuildConfiguration - - 4 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - ProjectExplorer.DefaultDeployConfiguration - - 1 - - true - true - true - - 2 - - clipboard2 - CMakeProjectManager.CMakeRunConfiguration.clipboard - clipboard - false - true - true - false - true - /Users/zhiyuan/Documents/project/clipboard_desktop_cpp/build-clipboard-x86_darwin_generic_mach_o_64bit-Debug/clipboard.app/Contents/MacOS - - 1 - - - - ProjectExplorer.Project.Target.1 - - Desktop - Desktop (arm-darwin-generic-mach_o-64bit) - Desktop (arm-darwin-generic-mach_o-64bit) - {4505a7c4-d6a0-44e9-9875-cce20bacf1e0} - 0 - 0 - 0 - - Debug - -DCMAKE_BUILD_TYPE:STRING=Debug --DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{IDE:ResourcePath}/package-manager/auto-setup.cmake --DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable} --DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX} --DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C} -DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx} --DCMAKE_GENERATOR:STRING=Unix Makefiles %{CMAKE_OSX_ARCHITECTURES:DefaultFlag} - /Users/zhiyuan/Documents/project/clipboard_desktop_cpp/build-clipboard-Desktop_arm_darwin_generic_mach_o_64bit-Debug + /Users/zhiyuan/Documents/project/clipboard_desktop_cpp/build-clipboard-x86_static-Debug @@ -370,15 +147,15 @@ Release - -DCMAKE_BUILD_TYPE:STRING=Release + -DCMAKE_GENERATOR:STRING=Ninja +-DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{IDE:ResourcePath}/package-manager/auto-setup.cmake -DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable} -DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX} -DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C} -DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx} --DCMAKE_GENERATOR:STRING=Unix Makefiles %{CMAKE_OSX_ARCHITECTURES:DefaultFlag} - /Users/zhiyuan/Documents/project/clipboard_desktop_cpp/build-clipboard-Desktop_arm_darwin_generic_mach_o_64bit-Release + /Users/zhiyuan/Documents/project/clipboard_desktop_cpp/build-clipboard-x86_static-Release @@ -417,14 +194,15 @@ RelWithDebInfo - -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo + -DCMAKE_GENERATOR:STRING=Ninja +-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo -DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{IDE:ResourcePath}/package-manager/auto-setup.cmake -DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable} -DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX} -DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C} -DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx} %{CMAKE_OSX_ARCHITECTURES:DefaultFlag} - /Users/zhiyuan/Documents/project/clipboard_desktop_cpp/build-clipboard-Desktop_arm_darwin_generic_mach_o_64bit-RelWithDebInfo + /Users/zhiyuan/Documents/project/clipboard_desktop_cpp/build-clipboard-x86_static-RelWithDebInfo @@ -461,22 +239,21 @@ MinSizeRel - -DCMAKE_BUILD_TYPE:STRING=MinSizeRel + -DCMAKE_GENERATOR:STRING=Ninja +-DCMAKE_BUILD_TYPE:STRING=MinSizeRel -DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{IDE:ResourcePath}/package-manager/auto-setup.cmake -DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable} -DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX} -DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C} -DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx} --DCMAKE_GENERATOR:STRING=Unix Makefiles %{CMAKE_OSX_ARCHITECTURES:DefaultFlag} - /Users/zhiyuan/Documents/project/clipboard_desktop_cpp/build-clipboard-Desktop_arm_darwin_generic_mach_o_64bit-MinSizeRel + /Users/zhiyuan/Documents/project/clipboard_desktop_cpp/build-clipboard-x86_static-MinSizeRel all true - Build CMakeProjectManager.MakeStep 1 @@ -490,7 +267,6 @@ clean true - Build CMakeProjectManager.MakeStep 1 @@ -535,266 +311,14 @@ true false true - - 1 - - - - ProjectExplorer.Project.Target.2 - - GenericLinuxOsType - x86-darwin-generic-mach_o-32bit - x86-darwin-generic-mach_o-32bit - {fc376a5a-013b-435e-8cc1-666a55a225fa} - 1 - 0 - 0 - - Debug - -DCMAKE_GENERATOR:STRING=Unix Makefiles --DCMAKE_BUILD_TYPE:STRING=Debug --DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{IDE:ResourcePath}/package-manager/auto-setup.cmake --DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable} --DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX} --DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C} --DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx} - /Users/zhiyuan/Documents/project/clipboard_desktop_cpp/build-clipboard-x86_darwin_generic_mach_o_32bit-Debug - - - - all - - true - Build - CMakeProjectManager.MakeStep - - 1 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - - clean - - true - Build - CMakeProjectManager.MakeStep - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - false - - Debug - CMakeProjectManager.CMakeBuildConfiguration - - - Release - -DCMAKE_GENERATOR:STRING=Unix Makefiles --DCMAKE_BUILD_TYPE:STRING=Release --DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{IDE:ResourcePath}/package-manager/auto-setup.cmake --DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable} --DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX} --DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C} --DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx} - /Users/zhiyuan/Documents/project/clipboard_desktop_cpp/build-clipboard-x86_darwin_generic_mach_o_32bit-Release - - - - all - - true - Build - CMakeProjectManager.MakeStep - - 1 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - - clean - - true - Build - CMakeProjectManager.MakeStep - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - false - - Release - CMakeProjectManager.CMakeBuildConfiguration - - - RelWithDebInfo - -DCMAKE_GENERATOR:STRING=Unix Makefiles --DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo --DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{IDE:ResourcePath}/package-manager/auto-setup.cmake --DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable} --DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX} --DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C} --DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx} - /Users/zhiyuan/Documents/project/clipboard_desktop_cpp/build-clipboard-x86_darwin_generic_mach_o_32bit-RelWithDebInfo - - - - all - - true - CMakeProjectManager.MakeStep - - 1 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - - clean - - true - CMakeProjectManager.MakeStep - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - false - - Release with Debug Information - CMakeProjectManager.CMakeBuildConfiguration - - - MinSizeRel - -DCMAKE_GENERATOR:STRING=Unix Makefiles --DCMAKE_BUILD_TYPE:STRING=MinSizeRel --DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{IDE:ResourcePath}/package-manager/auto-setup.cmake --DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable} --DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX} --DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C} --DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx} - /Users/zhiyuan/Documents/project/clipboard_desktop_cpp/build-clipboard-x86_darwin_generic_mach_o_32bit-MinSizeRel - - - - all - - true - CMakeProjectManager.MakeStep - - 1 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - - clean - - true - CMakeProjectManager.MakeStep - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - false - - Minimum Size Release - CMakeProjectManager.CMakeBuildConfiguration - - 4 - - - - true - RemoteLinux.MakeInstall - /private/var/folders/11/wz8x2lfn0yl364p3wn7l0qt80000gn/T/QtCreator-AdvSsp - /opt/homebrew/Cellar/cmake/3.22.1/bin/cmake - --build /Users/zhiyuan/Documents/project/clipboard_desktop_cpp/build-clipboard-x86_darwin_generic_mach_o_32bit-Release --target install - /opt/homebrew/Cellar/cmake/3.22.1/bin/cmake - - - true - RemoteLinux.CheckForFreeDiskSpaceStep - - - - - / - 5242880 - - - - - true - RemoteLinux.KillAppStep - - - - - - - - 3 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - DeployToGenericLinux - - 1 - - true - true - true - - 1 - - clipboard - RemoteLinuxRunConfiguration:clipboard - clipboard - 1 - false - true - false - true + /Users/zhiyuan/Documents/project/clipboard_desktop_cpp/build-clipboard-x86_static-Release/clipboard.app/Contents/MacOS 1 ProjectExplorer.Project.TargetCount - 3 + 1 ProjectExplorer.Project.Updater.FileVersion diff --git a/clipboard/downfilehelper.h b/clipboard/downfilehelper.h index f0004f8..c88819d 100644 --- a/clipboard/downfilehelper.h +++ b/clipboard/downfilehelper.h @@ -21,7 +21,6 @@ private slots: QNetworkAccessManager *downloadMgr; QNetworkReply *downloadReply; QFile *currentFile; - void downloadFile(); }; diff --git a/clipboard/mainwindow.cpp b/clipboard/mainwindow.cpp index a4a4993..6a622a9 100644 --- a/clipboard/mainwindow.cpp +++ b/clipboard/mainwindow.cpp @@ -32,15 +32,23 @@ MainWindow::~MainWindow() void MainWindow::on_btnConnect_clicked() { - loginWeb(); + try { + loginWeb(); + } catch (...) { + } } void MainWindow::initWithApp(QApplication* app) { + this->app = app; + auto lastToken = this->settings.value("token").toString(); + if (lastToken != nullptr && lastToken.size() > 0) { + this->token = new QString(lastToken); + } this->ui->label->setText(QString("Please enter the server address\nsuch as:192.168.0.2:5050")); connect(QApplication::clipboard(), SIGNAL(dataChanged()),this,SLOT(onClipboardDataChanged())); @@ -118,7 +126,10 @@ void MainWindow::networkFinish(QNetworkReply *response) if (o.contains("token")) { QJsonValue value = o.value("token"); if (value.isString()) { + auto valStr = value.toString(); this->token = new QString(value.toString()); + settings.setValue("token", valStr); + settings.sync(); } } if (o.contains("ws")) { @@ -129,6 +140,8 @@ void MainWindow::networkFinish(QNetworkReply *response) } } else { // json error + response->deleteLater(); + return; } response->deleteLater(); this->connectWs(); diff --git a/clipboard/mainwindow.h b/clipboard/mainwindow.h index 2e2b99e..71217b5 100644 --- a/clipboard/mainwindow.h +++ b/clipboard/mainwindow.h @@ -5,6 +5,7 @@ #include #include #include +#include QT_BEGIN_NAMESPACE namespace Ui { class MainWindow; } @@ -46,6 +47,7 @@ private slots: private: QWebSocket m_webSocket; + QSettings settings; void connectWs(); };