Add icon.rc file and update CMakeLists.txt

Remove commented out code for boot screen in mainwindow.cpp and mainwindow.h

Remove commented out code for boot screen in mainwindow.cpp and mainwindow.h

Author: trv3wood

CMakeLists.txt

@@ -45,6 +45,7 @@ else()
             code.h
             titlescreen.h titlescreen.cpp titlescreen.ui
             aboutscreen.h aboutscreen.cpp aboutscreen.ui
+            icon.rc
         )
     endif()
 endif()

main.cpp

@@ -1,33 +1,6 @@
 #include <QApplication>
-#include <QDebug>
-#include <QObject>
-#include <cstddef>
 
 #include "mainwindow.h"
-struct MemoryManager {
-    size_t totalAllocated = 0;
-    size_t totalFreed = 0;
-} memoryManager;
-
-void* operator new(size_t size) {
-    void* p = malloc(size);
-    memoryManager.totalAllocated += size;
-    qDebug() << "allocated at " << p;
-    qDebug() << "total allocated " << memoryManager.totalAllocated << " bytes. Using "
-             << memoryManager.totalAllocated - memoryManager.totalFreed
-             << " bytes";
-    // qDebug() << "Allocated " << size << " bytes";
-    return p;
-}
-
-void operator delete(void* p, size_t size) noexcept {
-    free(p);
-    qDebug() << "Freed at " << p;
-    memoryManager.totalFreed += size;
-    qDebug() << "total freed " << memoryManager.totalFreed << " bytes. Using "
-             << memoryManager.totalAllocated - memoryManager.totalFreed
-             << " bytes";
-}
 
 int main(int argc, char* argv[]) {
     QApplication a(argc, argv);

mainwindow.cpp

@@ -8,6 +8,7 @@
 #include <QString>
 #include <QTextEdit>
 #include <QTimer>
+// #include <cassert>
 #include <chrono>
 #include <sstream>
 #include <string>
@@ -24,7 +25,6 @@ MainWindow::MainWindow(QWidget *parent)
       ui(new Ui::MainWindow),
       m_timer(new QTimer(this)),
       m_sysinfo(new SYSinfo()),
-    //   m_bootScreen(nullptr),
       m_effect(nullptr),
       m_animation(nullptr),
       m_label(nullptr),
@@ -61,6 +61,11 @@ MainWindow::MainWindow(QWidget *parent)
 MainWindow::~MainWindow() {
     delete ui;
     delete m_titlescreen;
+    // assert(m_sysinfo == nullptr);
+    // assert(m_effect == nullptr);
+    // assert(m_animation == nullptr);
+    // assert(m_label == nullptr);
+    // assert(m_timer == nullptr);
 }
 
 void MainWindow::selfTestUpdate() {
@@ -106,10 +111,6 @@ void MainWindow::loadBootScreen() {
     ui->textEdit->hide();
     // 设置启动画面
     m_label = new QLabel(this);
-    // m_bootScreen = new QPixmap(":/res/bootScreen.png");
-    // m_bootScreen->scaled(this->size(), Qt::KeepAspectRatio,
-                        //  Qt::SmoothTransformation);
-    // m_label->setPixmap(*m_bootScreen);
     QPixmap bootScreen(":/res/bootScreen.png");
     bootScreen = bootScreen.scaled(this->size(), Qt::KeepAspectRatio,
                                    Qt::SmoothTransformation);
@@ -130,11 +131,9 @@ void MainWindow::loadTitleScreen() {
     delete m_animation;
     delete m_effect;
     delete m_label;
-    // delete m_bootScreen;
     m_animation = nullptr;
     m_effect = nullptr;
     m_label = nullptr;
-    // m_bootScreen = nullptr;
     m_titlescreen = new TitleScreen(this);
     m_titlescreen->show();
     this->centralWidget()->hide();
@@ -157,4 +156,4 @@ void MainWindow::fadeIn() {
     m_animation->setStartValue(0);
     m_animation->setEndValue(1);
     m_animation->start();
-}
+}

mainwindow.h

@@ -29,7 +29,6 @@ class MainWindow : public QMainWindow {
     Ui::MainWindow* ui;
     QTimer* m_timer = nullptr;
     SYSinfo* m_sysinfo = nullptr;
-    // QPixmap* m_bootScreen = nullptr;
     QGraphicsOpacityEffect* m_effect = nullptr;
     QPropertyAnimation* m_animation = nullptr;
     QLabel* m_label = nullptr;
@@ -44,6 +43,5 @@ class MainWindow : public QMainWindow {
     void fadeIn();
 signals:
     void bootCompleted();
-    // void animationFinished();
 };
 #endif  // MAINWINDOW_H

titlescreen.cpp

@@ -1,4 +1,4 @@
-#include <cassert>
+// #include <cassert>
 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
 #include <windows.h>
 #endif
@@ -76,6 +76,9 @@ TitleScreen::~TitleScreen() {
     delete m_player;
     delete m_volumeAnimation;
     delete m_aboutScreen;
+    // assert(m_opacityEffect == nullptr);
+    // assert(m_opacityAnimation == nullptr);
+    // assert(m_timer == nullptr);
 }
 
 void TitleScreen::btnsOpacityEffect() {
@@ -128,12 +131,9 @@ void TitleScreen::playThemeMusic() {
 }
 
 void TitleScreen::jumpToAboutScreen() {
-    static int count = 0;
     if (!m_aboutScreen) {
         m_aboutScreen = new AboutScreen(this);
-        count++;
     }
-    assert(count == 1);
     m_aboutScreen->show();
 }
 
@@ -238,4 +238,4 @@ void TitleScreen::quieterThemeMusic() {
     m_volumeAnimation->setStartValue(30);
     m_volumeAnimation->setEndValue(0);
     m_volumeAnimation->start();
-}
+}