add hide window & hide popup welcome

Author: code4lala

constants.h

@@ -62,7 +62,9 @@ ID_ACCOUNT = "account",
 ID_PASSWORD = "password",
 ID_MAC = "mac",
 ID_REMEMBER = "remember",
-ID_AUTO_LOGIN = "autoLogin";
+ID_AUTO_LOGIN = "autoLogin",
+ID_HIDE_WINDOW = "showWindow",
+ID_NOT_SHOW_WELCOME = "showWelcome";
 const QString ID_RESTART_TIMES = "restartTimes";
 const int RETRY_TIMES = 3;
 

main.cpp

@@ -90,16 +90,18 @@ int main(int argc, char *argv[])
 		qDebug() << "One instance had started. Its window will be shown by the next line of the source code.";
 		w.ShowLoginWindow();
 	});
+
+    QSettings s(SETTINGS_FILE_NAME);
+    bool bHideWindow=s.value(ID_HIDE_WINDOW, false).toBool();
 	// 如果是软件自行重启的就不显示窗口
-	QSettings s(SETTINGS_FILE_NAME);
 	int restartTimes = s.value(ID_RESTART_TIMES, 0).toInt();
 	qDebug() << "main: restartTimes=" << restartTimes;
-	if (restartTimes > 0) {
-		// 是自行重启
-		qDebug() << "showMinimized caused by self-restart";
-		w.showMinimized();
-	}
-	else {
+    if(bHideWindow){
+        qDebug()<<"not show window caused user settings";
+    } else if (restartTimes > 0) {
+        // 是自行重启不显示窗口
+        qDebug()<<"not show window caused by self restart";
+    } else {
 		qDebug() << "show caused by normal start";
 		w.show();
 	}

mainwindow.cpp

@@ -100,7 +100,7 @@ MainWindow::MainWindow(QWidget *parent) :
 	int restartTimes = s.value(ID_RESTART_TIMES, 0).toInt();
 	qDebug() << "MainWindow constructor: restartTimes=" << restartTimes;
 	if (restartTimes == 0) {
-		if (auto_login) {
+        if (bAutoLogin) {
 			emit ui->pushButtonLogin->click();
 		}
 	}
@@ -196,28 +196,38 @@ void MainWindow::LoadSettings() {
 	account = s.value(ID_ACCOUNT, "").toString();
 	password = s.value(ID_PASSWORD, "").toString();
 	mac_addr = s.value(ID_MAC, "").toString();
-	remember = s.value(ID_REMEMBER, false).toBool();
-	auto_login = s.value(ID_AUTO_LOGIN, false).toBool();
+    bRemember = s.value(ID_REMEMBER, false).toBool();
+    bAutoLogin = s.value(ID_AUTO_LOGIN, false).toBool();
+    bHideWindow = s.value(ID_HIDE_WINDOW, false).toBool();
+    bNotShowWelcome = s.value(ID_NOT_SHOW_WELCOME, false).toBool();
 	ui->lineEditAccount->setText(account);
 	ui->lineEditPass->setText(password);
 	SetMAC(mac_addr);
-	if (remember)
+    if (bRemember)
 		ui->checkBoxRemember->setCheckState(Qt::CheckState::Checked);
 	else
 		ui->checkBoxRemember->setCheckState(Qt::CheckState::Unchecked);
-	if (auto_login)
+    if (bAutoLogin)
 		ui->checkBoxAutoLogin->setCheckState(Qt::CheckState::Checked);
 	else
 		ui->checkBoxAutoLogin->setCheckState(Qt::CheckState::Unchecked);
+    if(bHideWindow)
+        ui->checkBoxHideLoginWindow->setCheckState(Qt::CheckState::Checked);
+    else
+        ui->checkBoxHideLoginWindow->setCheckState(Qt::CheckState::Unchecked);
+    if(bNotShowWelcome)
+        ui->checkBoxNotShowWelcome->setCheckState(Qt::CheckState::Checked);
+    else
+        ui->checkBoxNotShowWelcome->setCheckState(Qt::CheckState::Unchecked);
 }
 
 void MainWindow::SaveSettings() {
 	QSettings s(SETTINGS_FILE_NAME);
 	s.setValue(ID_ACCOUNT, account);
 	s.setValue(ID_PASSWORD, password);
 	s.setValue(ID_MAC, mac_addr);
-	s.setValue(ID_REMEMBER, remember);
-	s.setValue(ID_AUTO_LOGIN, auto_login);
+    s.setValue(ID_REMEMBER, bRemember);
+    s.setValue(ID_AUTO_LOGIN, bAutoLogin);
 }
 
 void MainWindow::SetMAC(const QString &m)
@@ -342,8 +352,8 @@ void MainWindow::GetInputs() {
 		mac_addr = ui->comboBoxMAC->currentText();
 	}
 	mac_addr = mac_addr.remove(17, mac_addr.length()).toUpper();
-	remember = ui->checkBoxRemember->checkState();
-	auto_login = ui->checkBoxAutoLogin->checkState();
+    bRemember = ui->checkBoxRemember->checkState();
+    bAutoLogin = ui->checkBoxAutoLogin->checkState();
 }
 
 void MainWindow::HandleOffline(int reason)
@@ -432,7 +442,7 @@ void MainWindow::HandleOffline(int reason)
 	case OFF_TIMEOUT: {
 		// 先尝试自己重启若干次，自个重启还不行的话再提示用户
 		// 自己重启的话需要用户提前勾选记住密码
-		if (remember) {
+        if (bRemember) {
 			QSettings s(SETTINGS_FILE_NAME);
 			int restartTimes = s.value(ID_RESTART_TIMES, 0).toInt();
 			qDebug() << "case OFF_TIMEOUT: restartTimes=" << restartTimes;
@@ -471,8 +481,8 @@ void MainWindow::HandleOffline(int reason)
 		// 清除已保存的密码
 		account = "";
 		password = "";
-		remember = false;
-		auto_login = false;
+        bRemember = false;
+        bAutoLogin = false;
 		SaveSettings();
 	}
 	// 重新启用输入
@@ -492,14 +502,16 @@ void MainWindow::HandleLoggedIn()
 
 	CURR_STATE = STATE_ONLINE;
 	// 显示欢迎页
-	if (restartTimes == 0) {
+    bool bNotShowWelcome = s.value(ID_NOT_SHOW_WELCOME, false).toBool();
+    if (restartTimes == 0 && !bNotShowWelcome) {
+        qDebug()<<"open welcome page";
 		QDesktopServices::openUrl(QUrl("http://login.jlu.edu.cn/notice.php"));
 	}
 	else {
 		// 自行尝试重启的，不显示欢迎页
 	}
 	// 登录成功，保存密码
-	if (remember) {
+    if (bRemember) {
 		SaveSettings();
 	}
 	else {
@@ -538,3 +550,15 @@ void MainWindow::DisableLogOutButton(bool yes) {
 		logOutAction->setEnabled(true);
 	}
 }
+
+void MainWindow::on_checkBoxNotShowWelcome_toggled(bool checked)
+{
+    QSettings s(SETTINGS_FILE_NAME);
+    s.setValue(ID_NOT_SHOW_WELCOME, checked);
+}
+
+void MainWindow::on_checkBoxHideLoginWindow_toggled(bool checked)
+{
+    QSettings s(SETTINGS_FILE_NAME);
+    s.setValue(ID_HIDE_WINDOW, checked);
+}

mainwindow.h

@@ -29,6 +29,10 @@ private slots:
 	void IconActivated(QSystemTrayIcon::ActivationReason reason);
 	void UserLogOut();
 
+    void on_checkBoxNotShowWelcome_toggled(bool checked);
+
+    void on_checkBoxHideLoginWindow_toggled(bool checked);
+
 public slots:
 	void HandleOffline(int reason);
 	void HandleLoggedIn();
@@ -49,7 +53,8 @@ public slots:
 
 	// 记录用户保存的信息
 	QString account, password, mac_addr;
-	bool remember, auto_login;
+    bool bRemember, bAutoLogin;
+    bool bHideWindow, bNotShowWelcome;
 
 	// 用于在未登录时关闭窗口就退出
 	int CURR_STATE;

mainwindow.ui

@@ -108,6 +108,20 @@
             </property>
            </widget>
           </item>
+          <item row="1" column="0">
+           <widget class="QCheckBox" name="checkBoxNotShowWelcome">
+            <property name="text">
+             <string>NotShowWelcomePage</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QCheckBox" name="checkBoxHideLoginWindow">
+            <property name="text">
+             <string>HideLoginWindow</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </item>
         <item>