diff --git a/maintray.cpp b/maintray.cpp index c8437b5..1fea243 100644 --- a/maintray.cpp +++ b/maintray.cpp @@ -1,9 +1,12 @@ #include "maintray.h" MainTray::MainTray(QByteArray username, QByteArray password, QObject *parent): QSystemTrayIcon(parent), - menu(new QMenu()),infoMenu(new QMenu()), settingsMenu(new QMenu()), settings("TurnMeOn", "NEU-Dectect"), - opWindow(settings.value("id", "").toByteArray(), settings.value("password", "").toByteArray()), - user(username),passwd(password) + menu(new QMenu()),infoMenu(new QMenu()), + settingsMenu(new QMenu()), + settings(QSettings::IniFormat, QSettings::UserScope,"TurnMeOn", "NEU-Dectect"), + opWindow(settings.value("id", "").toByteArray(), settings.value("password", "").toByteArray()), + user(username), + passwd(password) { opWindow.hide(); diff --git a/optionswindow.cpp b/optionswindow.cpp index 4f2659e..6667c7a 100644 --- a/optionswindow.cpp +++ b/optionswindow.cpp @@ -1,10 +1,13 @@ #include "optionswindow.h" -OptionsWindow::OptionsWindow(QByteArray id, QByteArray pass, QWidget *parent) : QWidget(parent) +OptionsWindow::OptionsWindow(QByteArray id, QByteArray pass, QWidget *parent) : QMainWindow(parent) { setWindowTitle(tr("选项")); - vlayout = new QVBoxLayout(this); + tabWidget = new QTabWidget(this); + page1 = new QWidget(this); + + vlayout = new QVBoxLayout(page1); layout = new QFormLayout(); hlayout = new QHBoxLayout(); @@ -27,7 +30,10 @@ OptionsWindow::OptionsWindow(QByteArray id, QByteArray pass, QWidget *parent) : vlayout->addLayout(hlayout); vlayout->setSpacing(20); - setLayout(vlayout); + page1->setLayout(vlayout); + + tabWidget->addTab(page1, tr("常规")); + setCentralWidget(tabWidget); connect(saveButton, QPushButton::clicked, this, [this](){emit saveSettings(idEdit->text().toUtf8(), passwordEdit->text().toUtf8());}); connect(cancleButton, QPushButton::clicked, this, hide); diff --git a/optionswindow.h b/optionswindow.h index f9be93c..f40e4a8 100644 --- a/optionswindow.h +++ b/optionswindow.h @@ -1,20 +1,24 @@ #ifndef OPTIONSWINDOW_H #define OPTIONSWINDOW_H +#include #include +#include #include #include #include #include #include -class OptionsWindow : public QWidget +class OptionsWindow : public QMainWindow { Q_OBJECT public: explicit OptionsWindow(QByteArray id, QByteArray pass, QWidget *parent = nullptr); private: + QTabWidget *tabWidget; + QWidget *page1; QLineEdit *idEdit, *passwordEdit; QPushButton *saveButton, *cancleButton; QFormLayout *layout;