[chore]整理代码

SkyD666 · Mar 29, 2023 · ab1d1f6 · ab1d1f6
1 parent 7b633e8
commit ab1d1f6
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 12 deletions.
diff --git a/AutoFirewall/GlobalData.cpp b/AutoFirewall/GlobalData.cpp
@@ -36,8 +36,8 @@ void GlobalData::readSettings()
     settings.endGroup();
 
     settings.beginGroup("Sound");
-    startSound = settings.value("StartSound", "").toString();
-    stopSound = settings.value("StopSound", true).toString();
+    startSound = settings.value("StartSound", "./sound/chimes.wav").toString();
+    stopSound = settings.value("StopSound", "./sound/ding.wav").toString();
     playSound = settings.value("PlaySound", true).toBool();
     settings.endGroup();
 }

diff --git a/AutoFirewall/MainWindow.cpp b/AutoFirewall/MainWindow.cpp
@@ -49,21 +49,17 @@ MainWindow::MainWindow(QWidget* parent)
                 palette.setColor(QPalette::Window, Qt::green);
                 labState->setPalette(palette);
                 if (GlobalData::playSound) {
-                    wchar_t* path = new wchar_t[GlobalData::startSound.size()];
-                    GlobalData::startSound.toWCharArray(path);
-                    PlaySound(path, nullptr, SND_FILENAME | SND_ASYNC);
-                    delete[] path;
+                    PlaySound(GlobalData::startSound.toStdWString().c_str(),
+                        nullptr, SND_FILENAME | SND_ASYNC);
                 }
             } else {
                 ui.btnEnable->setText(tr("已关闭"));
                 QPalette palette = labState->palette();
                 palette.setColor(QPalette::Window, Qt::red);
                 labState->setPalette(palette);
                 if (GlobalData::playSound) {
-                    wchar_t* path = new wchar_t[GlobalData::stopSound.size()];
-                    GlobalData::stopSound.toWCharArray(path);
-                    PlaySound(path, nullptr, SND_FILENAME | SND_ASYNC);
-                    delete[] path;
+                    PlaySound(GlobalData::stopSound.toStdWString().c_str(),
+                        nullptr, SND_FILENAME | SND_ASYNC);
                 }
             }
         } else {

diff --git a/AutoFirewall/MainWindow.ui b/AutoFirewall/MainWindow.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="resource.qrc">
-    <normaloff>:/icon.ico</normaloff>:/icon.ico</iconset>
+    <normaloff>:/ico.png</normaloff>:/ico.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QVBoxLayout" name="verticalLayout">

diff --git a/AutoFirewall/ico.png b/AutoFirewall/ico.png
diff --git a/AutoFirewall/main.cpp b/AutoFirewall/main.cpp
@@ -2,10 +2,12 @@
 #include "MainWindow.h"
 
 #include <QApplication>
+#include <QIcon>
 
 int main(int argc, char* argv[])
 {
     QApplication a(argc, argv);
+    QApplication::setWindowIcon(QIcon(":/icon.png"));
     QApplication::setOrganizationName("SkyD666");
     QApplication::setApplicationName("AutoFirewall");
     QApplication::setApplicationVersion("1.2");

diff --git a/AutoFirewall/resource.qrc b/AutoFirewall/resource.qrc
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>icon.ico</file>
+        <file>ico.png</file>
     </qresource>
 </RCC>