diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..c585111 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,18 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "Debug picpanel", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceFolder}/build/picpanel", + "args": [], + "cwd": "${workspaceFolder}", + "environment": [], + "MIMode": "lldb" + } + ] +} \ No newline at end of file diff --git a/libcrypto.a b/libcrypto.a deleted file mode 100644 index 6e51dc6..0000000 Binary files a/libcrypto.a and /dev/null differ diff --git a/libcrypto.dll.a b/libcrypto.dll.a deleted file mode 100644 index 1d9b900..0000000 Binary files a/libcrypto.dll.a and /dev/null differ diff --git a/libssl.a b/libssl.a deleted file mode 100644 index 8b0f7db..0000000 Binary files a/libssl.a and /dev/null differ diff --git a/libssl.dll.a b/libssl.dll.a deleted file mode 100644 index 315e6c1..0000000 Binary files a/libssl.dll.a and /dev/null differ diff --git a/main.cpp b/main.cpp index 1b7e802..620cbfc 100644 --- a/main.cpp +++ b/main.cpp @@ -1,8 +1,6 @@ #include "widget.h" #include -#include -#include #include int main(int argc, char *argv[]) diff --git a/picpanel.pro.user b/picpanel.pro.user index 825a513..50a3f4e 100644 --- a/picpanel.pro.user +++ b/picpanel.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {4f2ec396-c2e0-4f3d-a369-5968ecaf5cee} + {eff88622-f1f6-485c-90af-dd46e6d2c022} ProjectExplorer.Project.ActiveTarget @@ -33,6 +33,7 @@ false 4 false + 0 80 true true @@ -41,7 +42,7 @@ false true false - 0 + 2 true true 0 @@ -74,15 +75,11 @@ 0 true - - -fno-delayed-template-parsing - - true true true Builtin.DefaultTidyAndClazy - 16 + 8 true @@ -95,16 +92,16 @@ ProjectExplorer.Project.Target.0 Desktop - Desktop Qt 6.7.3 MinGW 64-bit - Desktop Qt 6.7.3 MinGW 64-bit - qt.qt6.673.win64_mingw_kit + Qt 6.7.3 for macOS + Qt 6.7.3 for macOS + qt.qt6.673.clang_64_kit 0 0 0 0 - D:\Workspaces\picpanel\build\Desktop_Qt_6_7_3_MinGW_64_bit-Debug - D:/Workspaces/picpanel/build/Desktop_Qt_6_7_3_MinGW_64_bit-Debug + /Users/lenn/Workspace/picpanel/build/Qt_6_7_3_for_macOS-Debug + /Users/lenn/Workspace/picpanel/build/Qt_6_7_3_for_macOS-Debug true @@ -142,8 +139,8 @@ 2 - D:\Workspaces\picpanel\build\Desktop_Qt_6_7_3_MinGW_64_bit-Release - D:/Workspaces/picpanel/build/Desktop_Qt_6_7_3_MinGW_64_bit-Release + /Users/lenn/Workspace/picpanel/build/Qt_6_7_3_for_macOS-Release + /Users/lenn/Workspace/picpanel/build/Qt_6_7_3_for_macOS-Release true @@ -183,8 +180,8 @@ 0 - D:\Workspaces\picpanel\build\Desktop_Qt_6_7_3_MinGW_64_bit-Profile - D:/Workspaces/picpanel/build/Desktop_Qt_6_7_3_MinGW_64_bit-Profile + /Users/lenn/Workspace/picpanel/build/Qt_6_7_3_for_macOS-Profile + /Users/lenn/Workspace/picpanel/build/Qt_6_7_3_for_macOS-Profile true @@ -242,270 +239,26 @@ true 0 true - 2 false - -e cpu-cycles --call-graph "dwarf,4096" -F 250 + -e cpu-cycles --call-graph dwarf,4096 -F 250 - Qt4ProjectManager.Qt4RunConfiguration:D:/Workspaces/picpanel/picpanel.pro - D:/Workspaces/picpanel/picpanel.pro + Qt4ProjectManager.Qt4RunConfiguration: + /Users/lenn/Workspace/picpanel/picpanel.pro false true true true - D:/Workspaces/picpanel/build/Desktop_Qt_6_7_3_MinGW_64_bit-Debug + /Users/lenn/Workspace/picpanel/build/Qt_6_7_3_for_macOS-Debug/picpanel.app/Contents/MacOS 1 - - ProjectExplorer.Project.Target.1 - - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit - 0 - 0 - 0 - - D:/Workspaces/build-picpanel-Desktop_Qt_5_14_2_MinGW_64_bit-Debug - - - true - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - - - D:/Workspaces/build-picpanel-Desktop_Qt_5_14_2_MinGW_64_bit-Release - - - true - QtProjectManager.QMakeBuildStep - false - - false - false - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - - D:/Workspaces/build-picpanel-Desktop_Qt_5_14_2_MinGW_64_bit-Profile - - - true - QtProjectManager.QMakeBuildStep - true - - false - true - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - 3 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - Qt4ProjectManager.Qt4RunConfiguration:D:/Workspaces/picpanel/picpanel.pro - D:/Workspaces/picpanel/picpanel.pro - - false - - false - true - true - false - false - true - - D:/Workspaces/build-picpanel-Desktop_Qt_5_14_2_MinGW_64_bit-Debug - - 1 - - ProjectExplorer.Project.TargetCount - 2 + 1 ProjectExplorer.Project.Updater.FileVersion diff --git a/picpanel.pro.user.4f2ec39 b/picpanel.pro.user.4f2ec39 deleted file mode 100644 index 5f44ba9..0000000 --- a/picpanel.pro.user.4f2ec39 +++ /dev/null @@ -1,319 +0,0 @@ - - - - - - EnvironmentId - {4f2ec396-c2e0-4f3d-a369-5968ecaf5cee} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - -fno-delayed-template-parsing - - true - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit - 0 - 0 - 0 - - D:/Workspaces/build-picpanel-Desktop_Qt_5_14_2_MinGW_64_bit-Debug - - - true - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - - - D:/Workspaces/build-picpanel-Desktop_Qt_5_14_2_MinGW_64_bit-Release - - - true - QtProjectManager.QMakeBuildStep - false - - false - false - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - - D:/Workspaces/build-picpanel-Desktop_Qt_5_14_2_MinGW_64_bit-Profile - - - true - QtProjectManager.QMakeBuildStep - true - - false - true - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - 3 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - Qt4ProjectManager.Qt4RunConfiguration:D:/Workspaces/picpanel/picpanel.pro - D:/Workspaces/picpanel/picpanel.pro - - false - - false - true - true - false - false - true - - D:/Workspaces/build-picpanel-Desktop_Qt_5_14_2_MinGW_64_bit-Debug - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 22 - - - Version - 22 - - diff --git a/picpanel.pro.user.631b589 b/picpanel.pro.user.631b589 deleted file mode 100644 index c75f21e..0000000 --- a/picpanel.pro.user.631b589 +++ /dev/null @@ -1,271 +0,0 @@ - - - - - - EnvironmentId - {631b5895-04c2-4f08-83d2-9e1277f189a1} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - 0 - false - true - false - 2 - true - true - 0 - 8 - true - false - 1 - true - true - true - *.md, *.MD, Makefile - false - true - true - - - - ProjectExplorer.Project.PluginSettings - - - true - false - true - true - true - true - - false - - - 0 - true - - true - true - Builtin.DefaultTidyAndClazy - 12 - true - - - - true - - - - - ProjectExplorer.Project.Target.0 - - Desktop - Desktop Qt 6.7.3 MinGW 64-bit - Desktop Qt 6.7.3 MinGW 64-bit - qt.qt6.673.win64_mingw_kit - 0 - 0 - 0 - - 0 - E:\picpanel\build\Desktop_Qt_6_7_3_MinGW_64_bit-Debug - E:/picpanel/build/Desktop_Qt_6_7_3_MinGW_64_bit-Debug - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 2 - 构建 - 构建 - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - clean - - 1 - 清除 - 清除 - ProjectExplorer.BuildSteps.Clean - - 2 - false - - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - - - E:\picpanel\build\Desktop_Qt_6_7_3_MinGW_64_bit-Release - E:/picpanel/build/Desktop_Qt_6_7_3_MinGW_64_bit-Release - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 2 - 构建 - 构建 - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - clean - - 1 - 清除 - 清除 - ProjectExplorer.BuildSteps.Clean - - 2 - false - - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - - - 0 - E:\picpanel\build\Desktop_Qt_6_7_3_MinGW_64_bit-Profile - E:/picpanel/build/Desktop_Qt_6_7_3_MinGW_64_bit-Profile - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 2 - 构建 - 构建 - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - clean - - 1 - 清除 - 清除 - ProjectExplorer.BuildSteps.Clean - - 2 - false - - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 0 - - 3 - - - 0 - 部署 - 部署 - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - ProjectExplorer.DefaultDeployConfiguration - - 1 - - true - true - 0 - true - - - 2 - - false - -e cpu-cycles --call-graph "dwarf,4096" -F 250 - - Qt4ProjectManager.Qt4RunConfiguration:E:/picpanel/picpanel.pro - E:/picpanel/picpanel.pro - false - true - true - true - E:/picpanel/build/Desktop_Qt_6_7_3_MinGW_64_bit-Debug - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 22 - - - Version - 22 - - diff --git a/picpanel.pro.user.eff8862 b/picpanel.pro.user.eff8862 deleted file mode 100644 index 3c1d0cb..0000000 --- a/picpanel.pro.user.eff8862 +++ /dev/null @@ -1,271 +0,0 @@ - - - - - - EnvironmentId - {eff88622-f1f6-485c-90af-dd46e6d2c022} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 0 - 80 - true - true - 1 - 0 - false - true - false - 2 - true - true - 0 - 8 - true - false - 1 - true - true - true - *.md, *.MD, Makefile - false - true - true - - - - ProjectExplorer.Project.PluginSettings - - - true - false - true - true - true - true - - false - - - 0 - true - - true - true - Builtin.DefaultTidyAndClazy - 8 - true - - - - true - - - - - ProjectExplorer.Project.Target.0 - - Desktop - Qt 6.7.3 for macOS - Qt 6.7.3 for macOS - qt.qt6.673.clang_64_kit - 0 - 0 - 0 - - 0 - /Users/lenn/Workspace/picpanel/build/Qt_6_7_3_for_macOS-Debug - /Users/lenn/Workspace/picpanel/build/Qt_6_7_3_for_macOS-Debug - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 2 - 构建 - 构建 - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - clean - - 1 - 清除 - 清除 - ProjectExplorer.BuildSteps.Clean - - 2 - false - - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - - - /Users/lenn/Workspace/picpanel/build/Qt_6_7_3_for_macOS-Release - /Users/lenn/Workspace/picpanel/build/Qt_6_7_3_for_macOS-Release - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 2 - 构建 - 构建 - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - clean - - 1 - 清除 - 清除 - ProjectExplorer.BuildSteps.Clean - - 2 - false - - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - - - 0 - /Users/lenn/Workspace/picpanel/build/Qt_6_7_3_for_macOS-Profile - /Users/lenn/Workspace/picpanel/build/Qt_6_7_3_for_macOS-Profile - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 2 - 构建 - 构建 - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - clean - - 1 - 清除 - 清除 - ProjectExplorer.BuildSteps.Clean - - 2 - false - - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 0 - - 3 - - - 0 - 部署 - 部署 - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - ProjectExplorer.DefaultDeployConfiguration - - 1 - - true - true - 0 - true - - 2 - - false - -e cpu-cycles --call-graph dwarf,4096 -F 250 - - Qt4ProjectManager.Qt4RunConfiguration: - /Users/lenn/Workspace/picpanel/picpanel.pro - false - true - true - true - /Users/lenn/Workspace/picpanel/build/Qt_6_7_3_for_macOS-Debug/picpanel.app/Contents/MacOS - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 22 - - - Version - 22 - - diff --git a/picpanel/picpanel.pro.user b/picpanel/picpanel.pro.user deleted file mode 100644 index c11eeb7..0000000 --- a/picpanel/picpanel.pro.user +++ /dev/null @@ -1,270 +0,0 @@ - - - - - - EnvironmentId - {d9771540-486d-4f49-8184-6e87d1101478} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - 0 - false - true - false - 2 - true - true - 0 - 8 - true - false - 1 - true - true - true - *.md, *.MD, Makefile - false - true - true - - - - ProjectExplorer.Project.PluginSettings - - - true - false - true - true - true - true - - false - - - 0 - true - - true - true - Builtin.DefaultTidyAndClazy - 8 - true - - - - true - - - - - ProjectExplorer.Project.Target.0 - - Desktop - Qt 6.7.3 for macOS - Qt 6.7.3 for macOS - qt.qt6.673.clang_64_kit - 0 - 0 - 0 - - 0 - /Users/lenn/Workspace/picpanel/picpanel/build/Qt_6_7_3_for_macOS-Debug - /Users/lenn/Workspace/picpanel/picpanel/build/Qt_6_7_3_for_macOS-Debug - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 2 - 构建 - 构建 - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - clean - - 1 - 清除 - 清除 - ProjectExplorer.BuildSteps.Clean - - 2 - false - - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - - - /Users/lenn/Workspace/picpanel/picpanel/build/Qt_6_7_3_for_macOS-Release - /Users/lenn/Workspace/picpanel/picpanel/build/Qt_6_7_3_for_macOS-Release - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 2 - 构建 - 构建 - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - clean - - 1 - 清除 - 清除 - ProjectExplorer.BuildSteps.Clean - - 2 - false - - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - - - 0 - /Users/lenn/Workspace/picpanel/picpanel/build/Qt_6_7_3_for_macOS-Profile - /Users/lenn/Workspace/picpanel/picpanel/build/Qt_6_7_3_for_macOS-Profile - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 2 - 构建 - 构建 - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - clean - - 1 - 清除 - 清除 - ProjectExplorer.BuildSteps.Clean - - 2 - false - - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 0 - - 3 - - - 0 - 部署 - 部署 - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - ProjectExplorer.DefaultDeployConfiguration - - 1 - - true - true - 0 - true - - 2 - - false - -e cpu-cycles --call-graph dwarf,4096 -F 250 - - Qt4ProjectManager.Qt4RunConfiguration:/Users/lenn/Workspace/picpanel/picpanel/picpanel.pro - /Users/lenn/Workspace/picpanel/picpanel/picpanel.pro - false - true - true - true - /Users/lenn/Workspace/picpanel/picpanel/build/Qt_6_7_3_for_macOS-Debug/picpanel.app/Contents/MacOS - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 22 - - - Version - 22 - - diff --git a/widget.cpp b/widget.cpp index 73c291b..d4a0769 100644 --- a/widget.cpp +++ b/widget.cpp @@ -156,8 +156,11 @@ void Widget::initWidgetForm() ui->btnMin->setFlat(true); ui->btnClose->setFlat(true); +#if _WIN32 IconHelper::setIconFontIndex(2); - +#elif __APPLE__ + IconHelper::setIconFontIndex(1); +#endif IconHelper::setIcon(ui->btnMin, QString("F068").toInt(nullptr, 16), 16); IconHelper::setIcon(ui->btnClose, QString("F00D").toInt(nullptr, 16), 16); diff --git a/widget.h b/widget.h index 6a3abdc..7d32354 100644 --- a/widget.h +++ b/widget.h @@ -15,7 +15,6 @@ #include #include #include -#include #include #include "fileconfigdecode.h" #include "frmalbum.h"