Fixed known bugs

capp-adocia · May 6, 2024 · e5f0ad2 · e5f0ad2
1 parent e028f92
commit e5f0ad2
Show file tree

Hide file tree

Showing 59 changed files with 823 additions and 411 deletions.
diff --git a/DeskBar.pro b/DeskBar.pro
@@ -82,6 +82,7 @@ RESOURCES += \
 RC_FILE = ico.rc
 
 DISTFILES += \
+    Image/KeepExpect.png \
     Image/微信图片_20240505105514.jpg \
     Image/微信图片_20240505105521.jpg \
     ico.rc
diff --git a/DeskBar.pro.user b/DeskBar.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 13.0.0, 2024-05-05T11:37:32. -->
+<!-- Written by QtCreator 13.0.0, 2024-05-05T23:29:36. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -84,7 +84,7 @@
     <value type="bool" key="ClangTools.UseGlobalSettings">true</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ClangdSettings">
-    <value type="bool" key="blockIndexing">true</value>
+    <value type="bool" key="blockIndexing">false</value>
     <value type="bool" key="useGlobalSettings">true</value>
    </valuemap>
    <valuemap type="QVariantMap" key="CppEditor.QuickFix">
@@ -99,7 +99,7 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 6.7.0 MinGW 64-bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 6.7.0 MinGW 64-bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt6.670.win64_mingw_kit</value>
-   <value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
    <value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
@@ -255,7 +255,7 @@
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
     <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Users/26364/Documents/QT_APP/DeskBar</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Users/26364/Documents/QT_APP/DeskBar/build/Desktop_Qt_6_7_0_MinGW_64_bit-Release</value>
    </valuemap>
    <value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
   </valuemap>

diff --git a/Frame/achievementframe.cpp b/Frame/achievementframe.cpp
@@ -1,4 +1,4 @@
-#include "achievementframe.h"
+#include "Frame/achievementframe.h"
 
 QString AchievementFrame::NoFinshedAchievementStyle = QStringLiteral(
         "color:white;"

diff --git a/Frame/objectframe.cpp b/Frame/objectframe.cpp
@@ -1,4 +1,4 @@
-#include "objectframe.h"
+#include "Frame/objectframe.h"
 
 Objectframe::Objectframe(QWidget *parent, const QString &objectName) :
     QFrame(parent)

diff --git a/Frame/storageframe.cpp b/Frame/storageframe.cpp
@@ -1,4 +1,4 @@
-#include "storageframe.h"
+#include "Frame/storageframe.h"
 
 Storageframe::Storageframe(QWidget *parent, const QString &objectName) :
     QFrame(parent)

diff --git a/Help/queryapp.cpp b/Help/queryapp.cpp
@@ -1,9 +1,6 @@
-#include "queryapp.h"
+#include "Help/queryapp.h"
 
-Queryapp::Queryapp()
-{
-
-}
+Queryapp::Queryapp() {}
 
 void Queryapp::searchDirectory(const QDir &dir, QStringList &foundFilePaths) {
     QStringList fileList = dir.entryList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot);

diff --git a/Help/queryimglabel.cpp b/Help/queryimglabel.cpp
@@ -1,4 +1,4 @@
-#include "queryimglabel.h"
+#include "Help/queryimglabel.h"
 
 QueryImgLabel *QueryImgLabel::m_lastClickedLabel = nullptr; // 存储上一次点击的对象
 QString QueryImgLabel::originalStyleSheet = QStringLiteral(

diff --git a/Help/tips.cpp b/Help/tips.cpp
@@ -1,4 +1,4 @@
-#include "tips.h"
+#include "Help/tips.h"
 #include "ui_tips.h"
 
 QList<Tips*> Tips::allTipsObject;

diff --git a/Image/AchievementIcon/ControlBreak/Reach_Traitor.png b/Image/AchievementIcon/ControlBreak/Reach_Traitor.png
diff --git a/Image/Alipay.png b/Image/Alipay.png
diff --git a/Image/KeepExpect.png b/Image/KeepExpect.png
diff --git a/Image/QuestionMark.png b/Image/QuestionMark.png
diff --git a/Image/backpack.png b/Image/backpack.png
diff --git a/Image/full.png b/Image/full.png
diff --git a/Makefile.Debug b/Makefile.Debug
@@ -132,7 +132,8 @@ OBJECTS       = debug/achievementframe.o \
 		debug/moc_rest.o \
 		debug/moc_signalmanger.o
 
-DIST          = Image/寰俊鍥剧墖_20240505105514.jpg \
+DIST          = Image/KeepExpect.png \
+		Image/寰俊鍥剧墖_20240505105514.jpg \
 		Image/寰俊鍥剧墖_20240505105521.jpg \
 		ico.rc Frame\achievementframe.h \
 		Frame\customframe.h \
@@ -223,14 +224,14 @@ compiler_rcc_clean:
 debug/qrc_res.cpp: res.qrc \
 		D:/Qt/6.7.0/mingw_64/bin/rcc.exe \
 		Image/whiteBorder.png \
-		Image/QuestionMark.png \
 		Image/health.png \
 		Image/queryIcon.png \
 		Image/darkWhiteBorder_half.png \
 		Image/rockBackground.png \
 		Image/whiteBorderHalf_health.png \
 		Image/TextRockBackground.png \
 		Image/half_health.png \
+		Image/KeepExpect.png \
 		Image/switchExeFrameIcon.png \
 		Image/soilBackground.png \
 		Image/Alipay.png \
@@ -4258,6 +4259,8 @@ debug/moc_rest.cpp: Rest/rest.h \
 		D:/Qt/6.7.0/mingw_64/include/QtGui/QKeyEvent \
 		D:/Qt/6.7.0/mingw_64/include/QtCore/QRandomGenerator \
 		D:/Qt/6.7.0/mingw_64/include/QtCore/qrandom.h \
+		D:/Qt/6.7.0/mingw_64/include/QtCore/QSettings \
+		D:/Qt/6.7.0/mingw_64/include/QtCore/qsettings.h \
 		debug/moc_predefs.h \
 		D:/Qt/6.7.0/mingw_64/bin/moc.exe
 	D:\Qt\6.7.0\mingw_64\bin\moc.exe $(DEFINES) --include C:/Users/26364/Documents/QT_APP/DeskBar/debug/moc_predefs.h -ID:/Qt/6.7.0/mingw_64/mkspecs/win32-g++ -IC:/Users/26364/Documents/QT_APP/DeskBar -ID:/Qt/6.7.0/mingw_64/include -ID:/Qt/6.7.0/mingw_64/include/QtWidgets -ID:/Qt/6.7.0/mingw_64/include/QtGui -ID:/Qt/6.7.0/mingw_64/include/QtCore -ID:/Qt/Tools/mingw1120_64/lib/gcc/x86_64-w64-mingw32/11.2.0/include/c++ -ID:/Qt/Tools/mingw1120_64/lib/gcc/x86_64-w64-mingw32/11.2.0/include/c++/x86_64-w64-mingw32 -ID:/Qt/Tools/mingw1120_64/lib/gcc/x86_64-w64-mingw32/11.2.0/include/c++/backward -ID:/Qt/Tools/mingw1120_64/lib/gcc/x86_64-w64-mingw32/11.2.0/include -ID:/Qt/Tools/mingw1120_64/lib/gcc/x86_64-w64-mingw32/11.2.0/include-fixed -ID:/Qt/Tools/mingw1120_64/x86_64-w64-mingw32/include Rest\rest.h -o debug\moc_rest.cpp
@@ -7964,8 +7967,7 @@ debug/backpack.o: ObjectBar/backpack.cpp ObjectBar/backpack.h \
 		D:/Qt/6.7.0/mingw_64/include/QtWidgets/qabstractbutton.h \
 		D:/Qt/6.7.0/mingw_64/include/QtWidgets/QScrollArea \
 		D:/Qt/6.7.0/mingw_64/include/QtWidgets/qscrollarea.h \
-		D:/Qt/6.7.0/mingw_64/include/QtWidgets/qabstractscrollarea.h \
-		D:/Qt/6.7.0/mingw_64/include/QtWidgets/QSpacerItem
+		D:/Qt/6.7.0/mingw_64/include/QtWidgets/qabstractscrollarea.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\backpack.o ObjectBar\backpack.cpp
 
 debug/bar.o: ObjectBar/bar.cpp ObjectBar/bar.h \
@@ -8708,6 +8710,8 @@ debug/rest.o: Rest/rest.cpp Rest/rest.h \
 		D:/Qt/6.7.0/mingw_64/include/QtGui/QKeyEvent \
 		D:/Qt/6.7.0/mingw_64/include/QtCore/QRandomGenerator \
 		D:/Qt/6.7.0/mingw_64/include/QtCore/qrandom.h \
+		D:/Qt/6.7.0/mingw_64/include/QtCore/QSettings \
+		D:/Qt/6.7.0/mingw_64/include/QtCore/qsettings.h \
 		ui_rest.h \
 		D:/Qt/6.7.0/mingw_64/include/QtCore/QVariant \
 		D:/Qt/6.7.0/mingw_64/include/QtWidgets/QApplication \

diff --git a/Makefile.Release b/Makefile.Release
@@ -132,7 +132,8 @@ OBJECTS       = release/achievementframe.o \
 		release/moc_rest.o \
 		release/moc_signalmanger.o
 
-DIST          = Image/寰俊鍥剧墖_20240505105514.jpg \
+DIST          = Image/KeepExpect.png \
+		Image/寰俊鍥剧墖_20240505105514.jpg \
 		Image/寰俊鍥剧墖_20240505105521.jpg \
 		ico.rc Frame\achievementframe.h \
 		Frame\customframe.h \
@@ -223,14 +224,14 @@ compiler_rcc_clean:
 release/qrc_res.cpp: res.qrc \
 		D:/Qt/6.7.0/mingw_64/bin/rcc.exe \
 		Image/whiteBorder.png \
-		Image/QuestionMark.png \
 		Image/health.png \
 		Image/queryIcon.png \
 		Image/darkWhiteBorder_half.png \
 		Image/rockBackground.png \
 		Image/whiteBorderHalf_health.png \
 		Image/TextRockBackground.png \
 		Image/half_health.png \
+		Image/KeepExpect.png \
 		Image/switchExeFrameIcon.png \
 		Image/soilBackground.png \
 		Image/Alipay.png \
@@ -4258,6 +4259,8 @@ release/moc_rest.cpp: Rest/rest.h \
 		D:/Qt/6.7.0/mingw_64/include/QtGui/QKeyEvent \
 		D:/Qt/6.7.0/mingw_64/include/QtCore/QRandomGenerator \
 		D:/Qt/6.7.0/mingw_64/include/QtCore/qrandom.h \
+		D:/Qt/6.7.0/mingw_64/include/QtCore/QSettings \
+		D:/Qt/6.7.0/mingw_64/include/QtCore/qsettings.h \
 		release/moc_predefs.h \
 		D:/Qt/6.7.0/mingw_64/bin/moc.exe
 	D:\Qt\6.7.0\mingw_64\bin\moc.exe $(DEFINES) --include C:/Users/26364/Documents/QT_APP/DeskBar/release/moc_predefs.h -ID:/Qt/6.7.0/mingw_64/mkspecs/win32-g++ -IC:/Users/26364/Documents/QT_APP/DeskBar -ID:/Qt/6.7.0/mingw_64/include -ID:/Qt/6.7.0/mingw_64/include/QtWidgets -ID:/Qt/6.7.0/mingw_64/include/QtGui -ID:/Qt/6.7.0/mingw_64/include/QtCore -ID:/Qt/Tools/mingw1120_64/lib/gcc/x86_64-w64-mingw32/11.2.0/include/c++ -ID:/Qt/Tools/mingw1120_64/lib/gcc/x86_64-w64-mingw32/11.2.0/include/c++/x86_64-w64-mingw32 -ID:/Qt/Tools/mingw1120_64/lib/gcc/x86_64-w64-mingw32/11.2.0/include/c++/backward -ID:/Qt/Tools/mingw1120_64/lib/gcc/x86_64-w64-mingw32/11.2.0/include -ID:/Qt/Tools/mingw1120_64/lib/gcc/x86_64-w64-mingw32/11.2.0/include-fixed -ID:/Qt/Tools/mingw1120_64/x86_64-w64-mingw32/include Rest\rest.h -o release\moc_rest.cpp
@@ -7964,8 +7967,7 @@ release/backpack.o: ObjectBar/backpack.cpp ObjectBar/backpack.h \
 		D:/Qt/6.7.0/mingw_64/include/QtWidgets/qabstractbutton.h \
 		D:/Qt/6.7.0/mingw_64/include/QtWidgets/QScrollArea \
 		D:/Qt/6.7.0/mingw_64/include/QtWidgets/qscrollarea.h \
-		D:/Qt/6.7.0/mingw_64/include/QtWidgets/qabstractscrollarea.h \
-		D:/Qt/6.7.0/mingw_64/include/QtWidgets/QSpacerItem
+		D:/Qt/6.7.0/mingw_64/include/QtWidgets/qabstractscrollarea.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\backpack.o ObjectBar\backpack.cpp
 
 release/bar.o: ObjectBar/bar.cpp ObjectBar/bar.h \
@@ -8708,6 +8710,8 @@ release/rest.o: Rest/rest.cpp Rest/rest.h \
 		D:/Qt/6.7.0/mingw_64/include/QtGui/QKeyEvent \
 		D:/Qt/6.7.0/mingw_64/include/QtCore/QRandomGenerator \
 		D:/Qt/6.7.0/mingw_64/include/QtCore/qrandom.h \
+		D:/Qt/6.7.0/mingw_64/include/QtCore/QSettings \
+		D:/Qt/6.7.0/mingw_64/include/QtCore/qsettings.h \
 		ui_rest.h \
 		D:/Qt/6.7.0/mingw_64/include/QtCore/QVariant \
 		D:/Qt/6.7.0/mingw_64/include/QtWidgets/QApplication \

diff --git a/Markdown/About.md b/Markdown/About.md
@@ -44,7 +44,7 @@
 ## 联系方式
 
 -  球球: 请通过 2636427505 联系我。
--  球球email: 请发送邮件至 [[email protected]](mailto:2636427505@qq.com) 联系我。
+-  球球email: 请发送邮件至 [[email protected]](https://mail.qq.com/) 联系我。
 -  B站: **是Kapa呀**
 -  ......
 

diff --git a/Markdown/Suggest.md b/Markdown/Suggest.md
@@ -7,7 +7,7 @@
 ## 联系方式
 
 -  球球: 请通过 2636427505 联系我。
--  球球email: 请发送邮件至 [[email protected]](mailto:2636427505@qq.com) 联系我。
+-  球球email: 请发送邮件至 [[email protected]](https://mail.qq.com/) 联系我。
 -  B站: **是Kapa呀**
 -  ......
 

diff --git a/Menu/function/about.cpp b/Menu/function/about.cpp
@@ -1,4 +1,4 @@
-#include "about.h"
+#include "Menu/function/about.h"
 #include "ui_about.h"
 
 bool About::isShowLargeScreen = false;
@@ -35,11 +35,7 @@ About::About(QWidget *parent)
     ui->LargeScreendisplayButton->setStyleSheet(buttonStyleSheet);
 
     // 链接跳转
-    // connect(ui->textBrowser, &QTextBrowser::anchorClicked, [](const QUrl& link){
-    //     if (link.scheme() == "http" || link.scheme() == "https") {
-    //         QDesktopServices::openUrl(link);
-    //     }
-    // });
+    ui->textBrowser->setOpenExternalLinks(true);
     // 加载md文档
     ui->textBrowser->setSource(QUrl::fromLocalFile(":/Markdown/About.md"));
 

diff --git a/Menu/function/achievement.cpp b/Menu/function/achievement.cpp
@@ -1,4 +1,4 @@
-#include "achievement.h"
+#include "Menu/function/achievement.h"
 #include "ui_achievement.h"
 
 Achievement::Achievement(QWidget *parent)