ver1.1 第一版

Author: 15dd

about.ui

@@ -96,7 +96,7 @@
          </font>
         </property>
         <property name="text">
-         <string>Version 1.0</string>
+         <string>Version 1.1</string>
         </property>
        </widget>
       </item>

aria2Launcher.cpp

@@ -7,16 +7,22 @@ aria2Launcher::aria2Launcher(QWidget *parent)
     ui->setupUi(this);
 
     checkFile();//检测所需文件是否存在
+    checkAria2Status();//检测是否已经有aria2c运行,可选择新建进程或kill已存在的进程再新建进程
     uiInitialize();//ui初始化
+    showWindow();
     showHide();//根据设置决定是显示窗口还是启动到托盘
-    checkAria2Status();//检测是否已经有aria2c运行,可选择新建进程或kill已存在的进程再新建进程
 
-    this->resize((this->width())+1,(this->height())+1);//界面刷新
+    //this->resize((this->width())+1,(this->height())+1);//界面刷新
 
     connect(ui->aboutqt, &QAction::triggered, [this]() {QMessageBox::aboutQt(this, tr("About Qt")); });//弹出qt版本
     connect(ui->aboutthis, &QAction::triggered, [this]() {aboutWin->exec(); });//弹出关于窗口
     connect(ui->set, &QAction::triggered, [this]() {settingWin->exec(); });//弹出设置窗口
     connect(ui->close, &QAction::triggered, [this]() {qApp->quit(); });
+
+    connect(settingWin->ui->radioButton_7, &QRadioButton::clicked, [this]() {ui->webui->setEnabled(true); });
+    connect(settingWin->ui->radioButton_8, &QRadioButton::clicked, [this]() {ui->webui->setEnabled(false); showCmd(); ui->cmd->setChecked(true); });
+    connect(ui->cmd, &QAction::triggered, this, &aria2Launcher::showCmd);
+    connect(ui->webui, &QAction::triggered, this, &aria2Launcher::showWebui);
 }
 
 aria2Launcher::~aria2Launcher()
@@ -28,6 +34,37 @@ aria2Launcher::~aria2Launcher()
     delete ui;
 }
 
+void aria2Launcher::showWindow() {
+    if (settingWin->ui->radioButton_7->isChecked()) {
+        showWebui();
+    }
+    else {
+        this->ui->webui->setEnabled(false);
+        this->ui->cmd->setChecked(true);
+        showCmd();
+    }
+}
+
+void aria2Launcher::showWebui() {
+    centralWidget()->setParent(NULL); //在切换窗口时，centralwidget一定要先置空（即在函数的最前面）不然会有问题
+    if (view != NULL) {
+        delete view;
+        view = NULL;
+    }
+    view = new QWebEngineView(this);
+    view->setUrl(QUrl(QApplication::applicationDirPath() + "/yaaw/index.html"));
+    setCentralWidget(view);
+}
+
+void aria2Launcher::showCmd() {
+    centralWidget()->setParent(NULL); //在切换窗口时，centralwidget一定要先置空（即在函数的最前面）不然会有问题
+    if (view != NULL) {
+        delete view;
+        view = NULL;
+    }
+    setCentralWidget(aria2CmdWidget);
+}
+
 void aria2Launcher::checkFile() { //检测所需文件是否存在
     //QFileInfo file1(QApplication::applicationDirPath() + "/aria2c.exe");
     QFileInfo file1("aria2c.exe");
@@ -78,8 +115,9 @@ void aria2Launcher::checkAria2Status() { //检测是否已经有aria2c运行,可
 }
 
 void aria2Launcher::showHide() { //根据设置决定是显示窗口还是启动到托盘
-    if (settingWin->sh == false) {
+    if (settingWin->ui->radioButton_6->isChecked()) {
         this->show();
+        this->resize((this->width()) + 1, (this->height()) + 1);//界面刷新
     }
     else {
         showWindowsMessage();
@@ -110,15 +148,9 @@ void aria2Launcher::uiInitialize() { //ui初始化
     connect(Close, &QAction::triggered, this, &aria2Launcher::quitApp);
     connect(trayIcon, &QSystemTrayIcon::activated, this, &aria2Launcher::on_activatedSysTrayIcon);
 
-    //设置打开webui按钮
-    QPushButton* openWeb = new QPushButton(this);
-    openWeb->setText("打开控制界面(Webui)");
-    statusBar()->addPermanentWidget(openWeb);
-
-    connect(openWeb, &QPushButton::clicked, [this]() {
-        QString path = "file:///" + QApplication::applicationDirPath() + "/yaaw/index.html";
-        QDesktopServices::openUrl(QUrl(path,QUrl::TolerantMode));
-        });
+    QActionGroup* group = new QActionGroup(this);
+    group->addAction(ui->cmd);
+    group->addAction(ui->webui);
 }
 
 void aria2Launcher::closeEvent(QCloseEvent* event) { //关闭事件
@@ -148,14 +180,15 @@ bool aria2Launcher::quitApp() { //退出询问
 }
 
 void aria2Launcher::showWindowsMessage() {//提示程序已进入托盘
-    if (settingWin->tn == true) {
+    if (settingWin->ui->radioButton_3->isChecked()) {
         trayIcon->showMessage("Aria2 Launcher已最小化到托盘", "如果您希望不再看到这个提示，请前往设置关闭");
     }
 }
 
-void aria2Launcher::showOrHide() {//显示主窗口或隐藏主窗口
+void aria2Launcher::showOrHide() {//显示主窗口或隐藏主窗口，托盘事件
     if (this->isHidden()) {
-        this->showNormal();
+        this->show();
+        this->resize((this->width()) + 1, (this->height()) + 1);//界面刷新
     }
     else {
         showWindowsMessage();
@@ -185,8 +218,6 @@ void aria2Launcher::Start() { //启动aria2c.exe,并嵌入窗口中
     QWindow* aria2Cmd = QWindow::fromWinId(getProcessWId(pid)); //根据pid，将aria2c.exe的窗口嵌入至主窗口中
     aria2Cmd->setFlags(aria2Cmd->flags() | Qt::CustomizeWindowHint | Qt::WindowTitleHint);
     aria2CmdWidget = QWidget::createWindowContainer(aria2Cmd);
-    aria2CmdWidget->setParent(this);
-    this->setCentralWidget(aria2CmdWidget);
 }
 
 //寻找是否有已存在的aria2c.exe========================================================================

aria2Launcher.h

@@ -14,6 +14,7 @@
 #include <QSystemTrayIcon>
 #include <QCloseEvent>
 #include <QFileInfo>
+#include <QWebEngineView>
 
 class aria2Launcher : public QMainWindow
 {
@@ -39,6 +40,7 @@ class aria2Launcher : public QMainWindow
     QWidget* aria2CmdWidget; //截获的aria2c.exe窗口
     QCloseEvent* event; //关闭事件
     QSystemTrayIcon* trayIcon; //托盘
+    QWebEngineView* view = NULL;
 private:
     Ui::aria2LauncherClass* ui;
     about* aboutWin = new about(this); //关于窗口
@@ -48,6 +50,9 @@ private slots:
     void showOrHide(); //显示主窗口或隐藏主窗口
     void showWindowsMessage(); //通知横幅，提示程序已进入托盘
     void showHide(); //根据设置决定是显示窗口还是启动到托盘
+    void showCmd();
+    void showWebui();
+    void showWindow();
 };
 
 

aria2Launcher.ui

@@ -41,6 +41,14 @@
     <addaction name="separator"/>
     <addaction name="close"/>
    </widget>
+   <widget class="QMenu" name="menu">
+    <property name="title">
+     <string>窗口切换</string>
+    </property>
+    <addaction name="cmd"/>
+    <addaction name="webui"/>
+   </widget>
+   <addaction name="menu"/>
    <addaction name="more"/>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
@@ -80,23 +88,23 @@
     <string>退出程序</string>
    </property>
   </action>
-  <action name="CMD">
+  <action name="cmd">
    <property name="checkable">
     <bool>true</bool>
    </property>
-   <property name="checked">
-    <bool>true</bool>
-   </property>
    <property name="text">
-    <string>CMD</string>
+    <string>cmd</string>
    </property>
   </action>
-  <action name="WebUI">
+  <action name="webui">
    <property name="checkable">
     <bool>true</bool>
    </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
    <property name="text">
-    <string>WebUI</string>
+    <string>webui</string>
    </property>
   </action>
  </widget>

settingWindow.cpp

@@ -18,11 +18,10 @@ setting::setting(QWidget* parent) :
         settingInitialize();
     }
     else { //如果没有ini，即第一次打开程序，配置默认选项
-        this->sh = false;
-        this->tn = true;
         startWithWindowsDisabled();
         startHideDisabled();
         trayNoticeEnabled();
+        showWebuiEnabled();
     }
 
     connect(ui->radioButton,   &QRadioButton::clicked, this, &setting::startWithWindowsEnabled);
@@ -31,6 +30,8 @@ setting::setting(QWidget* parent) :
     connect(ui->radioButton_6, &QRadioButton::clicked, this, &setting::startHideDisabled);
     connect(ui->radioButton_3, &QRadioButton::clicked, this, &setting::trayNoticeEnabled);
     connect(ui->radioButton_4, &QRadioButton::clicked, this, &setting::trayNoticeDisabled);
+    connect(ui->radioButton_7, &QRadioButton::clicked, this, &setting::showWebuiEnabled);
+    connect(ui->radioButton_8, &QRadioButton::clicked, this, &setting::showWebuiDisabled);
 }
 setting::~setting() {
     delete ui;
@@ -48,21 +49,25 @@ void setting::settingInitialize() { //读取数据，初始化单选项
     QVariant sh = iniSetting->value("setting/startHide").toString();
     if (sh.toBool() == true) {
         ui->radioButton_5->setChecked(true);
-        this->sh = true;
     }
     else {
         ui->radioButton_6->setChecked(true);
-        this->sh = false;
     }
 
     QVariant tn = iniSetting->value("setting/trayNotice").toString();
     if (tn.toBool() == true) {
         ui->radioButton_3->setChecked(true);
-        this->tn = true;
     }
     else {
         ui->radioButton_4->setChecked(true);
-        this->tn = false;
+    }
+
+    QVariant sw = iniSetting->value("setting/showWebui").toString();
+    if (sw.toBool() == true) {
+        ui->radioButton_7->setChecked(true);
+    }
+    else {
+        ui->radioButton_8->setChecked(true);
     }
 }
 
@@ -78,22 +83,26 @@ void setting::startWithWindowsDisabled() {
 
 void setting::startHideEnabled() {
     iniSetting->setValue("setting/startHide","true");
-    sh = true;
 }
 
 void setting::startHideDisabled() {
     iniSetting->setValue("setting/startHide", "false");
-    sh = false;
 }
 
 void setting::trayNoticeEnabled() {
     iniSetting->setValue("setting/trayNotice", "true");
-    tn = true;
 }
 
 void setting::trayNoticeDisabled() {
     iniSetting->setValue("setting/trayNotice", "false");
-    tn = false;
+}
+
+void setting::showWebuiEnabled() {
+    iniSetting->setValue("setting/showWebui", "true");
+}
+
+void setting::showWebuiDisabled() {
+    iniSetting->setValue("setting/showWebui", "false");
 }
 
 //开机启动=============================================================================================

settingWindow.h

@@ -20,10 +20,9 @@ public slots:
 	void startHideDisabled();
 	void trayNoticeEnabled();
 	void trayNoticeDisabled();
+	void showWebuiEnabled();
+	void showWebuiDisabled();
 public:
 	QSettings* iniSetting;
-	bool tn;
-	bool sh;
-private:
 	Ui::setting* ui;
 };

settingWindow.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>305</width>
-    <height>195</height>
+    <width>337</width>
+    <height>256</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -114,6 +114,32 @@
      </layout>
     </widget>
    </item>
+   <item row="3" column="0">
+    <widget class="QGroupBox" name="groupBox_4">
+     <property name="title">
+      <string>启用webui</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_5">
+      <item row="0" column="0">
+       <widget class="QRadioButton" name="radioButton_7">
+        <property name="text">
+         <string>启用</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QRadioButton" name="radioButton_8">
+        <property name="text">
+         <string>禁用</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources>