resolve conflict

src/mainwindow.cpp

@@ -82,14 +82,14 @@ MainWindow::MainWindow(QWidget* parent) :
 		"QComboBox QAbstractItemView::item {min-height:60px;max-height:60px;  border:1px solid white;}"
 		//"QScrollBar:vertical {min-width: 50px;}"
 		"QLabel{color:white; font-weight:bold; font-size:16px;}\n"
-        "QLabel#sliderPickerLabel{color:silver;padding:0;background:#505050;font-weight:normal;font-size:50px;}\n"
+		"QLabel#sliderPickerLabel{color:silver;padding:0;background:#505050;font-weight:normal;font-size:50px;}\n"
 		"QWidget#topbarWidget{min-height:36px;max-height:36px;}\n"
 		"QWidget#contentWidget{border-top:1px solid #515151;}\n"
 		"QWidget#commandWidget{min-height:123px;max-height:123px;border-top:1px solid #515151; border-bottom:1px solid #323232;}\n"
 		"QLabel#logo{min-width:30px;max-width:30px}\n"
 		"QLabel#company{min-width:150px;max-width:150px; }\n"
 		"QLabel#systemMsgBar{min-width:500px;}"
-        "QLabel#warn{color:#CCCC00;background:transparent;font-size:20px;}"
+		"QLabel#warn{color:#CCCC00;background:transparent;font-size:20px;}"
 		"QWidget QWidget#statusBarWidget{min-width:300px;}\n"
 		"QWidget QToolButton{border:none;border-radius:10%;font-size:26px; font-weight:Bold;padding:5px;}\n"
 		"QToolButton#btn_main{border:2px solid #0078d8;border-radius:10%;font-size:26px; font-weight:Bold;padding:5px;}\n"
@@ -103,8 +103,8 @@ MainWindow::MainWindow(QWidget* parent) :
 		"QDialog QWidget#innerWidget{ background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,"
 		"stop: 0.0 darkgray, stop: 0.5 lightgray, stop: 1.0 darkgray);"
 		"border-radius:20px;border:5px solid #0078d8; }"
-        "QDialog#MessageDialog QWidget QWidget{ background:transparent;color:#3078d8}"
+		"QDialog#MessageDialog QWidget QWidget{ background:transparent;color:#3078d8}"
-        "QDialog#MessageDialog QWidget QWidget QLabel{ font-size:30px}"
+		"QDialog#MessageDialog QWidget QWidget QLabel{ font-size:30px}"
 		"#spacer_1, #spacer_2{min-width:2px;max-width:2px;margin-top:6px;margin-bottom:6px;border-right:1px solid #0078d8;}"
 		//FormDialog
         "QPushButton{border:1px solid silver ;padding-left:50px;padding-right:50px; border-radius:5px; min-height:28px; max-height:28px; background:#4c5052}"
@@ -147,10 +147,6 @@ MainWindow::MainWindow(QWidget* parent) :
 	tab->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 	QVBoxLayout* layout = new QVBoxLayout(this);
 	layout->setMargin(0);
-    layout->setSpacing(0);
-    QWidget * top = new TopBarWidget(this);
-    top->setObjectName("topbarWidget");
-	layout->addWidget(top);
 	layout->addWidget(tab);
 
 	ui->centralWidget->setLayout(layout);
@@ -175,11 +171,11 @@ MainWindow::MainWindow(QWidget* parent) :
         }
     });
 	connect(EventCenter::Default(), &EventCenter::InvokeOperationStart, [=](QObject*, QObject* msg) {
-        if (msgDialog){
+		if (msgDialog) {
-            msgDialog->hide();
+			msgDialog->hide();
-            delete msgDialog;
+			delete msgDialog;
-        }
+		}
-        msgDialog = new GUIMessageDialog(this);
+		msgDialog = new GUIMessageDialog(this);
 		if (msg)
 		{
 			QString* str = (QString*)msg;
@@ -191,11 +187,11 @@ MainWindow::MainWindow(QWidget* parent) :
 		msgDialog->hideExitButton();
 		msgDialog->startLoading();
 		AppGlobalValues::setInProcessing(true);
-        //		msgDialog->showFullScreen();
+		//		msgDialog->showFullScreen();
-        if (msgDialog->isHidden()){
+		if (msgDialog->isHidden()) {
-            msgDialog->show();
+			msgDialog->show();
-        }
+		}
-	});
+		});
 	connect(EventCenter::Default(), &EventCenter::InvokeOperationProgress, [=](QObject*, QObject* msg) {
 		if (!msgDialog) msgDialog = new GUIMessageDialog(this);
 		if (msg)
@@ -206,8 +202,8 @@ MainWindow::MainWindow(QWidget* parent) :
 		else {
 			msgDialog->hideMessage();
 		}
-        //		msgDialog->showFullScreen();
+		//		msgDialog->showFullScreen();
-        if (msgDialog->isHidden())msgDialog->show();
+		if (msgDialog->isHidden())msgDialog->show();
 		});
 	connect(EventCenter::Default(), &EventCenter::InvokeOperationEnd, [=]() {
 		if (!msgDialog) return;
@@ -259,24 +255,25 @@ void MainWindow::changeEvent(QEvent* event)
 }
 
 void MainWindow::centerWidgetHide() {
-    ui->centralWidget->setVisible(false);
+	ui->centralWidget->setVisible(false);
 }
 
 void MainWindow::centerWidgetShow() {
-    if (User::Current()->isAdmin() )
+	if (User::Current()->isAdmin())
-    {
+	{
-        if (admin_tab_index == -1)
+		if (admin_tab_index == -1)
-        {
+		{
-            AdminSettingForm * form = new AdminSettingForm(this);
+			AdminSettingForm* form = new AdminSettingForm(this);
-            admin_tab_index = tab->addTab(form,"Admin");
+			admin_tab_index = tab->addTab(form, "Admin");
-        }
+		}
-    } else{
+	}
-        if (admin_tab_index != -1){
+	else {
-            tab->removeTab(admin_tab_index);
+		if (admin_tab_index != -1) {
-            admin_tab_index = -1;
+			tab->removeTab(admin_tab_index);
-        }
+			admin_tab_index = -1;
-    }
+		}
-    qApp->processEvents();
+	}
+	qApp->processEvents();
 	ui->centralWidget->setVisible(true);
 }
 
@@ -287,19 +284,19 @@ QTextEdit* MainWindow::getEdit()
 }
 
 void MainWindow::requestLogin() {
-    LoginWindow l(this);
+	LoginWindow l(this);
-    l.setWindowModality(Qt::WindowModal);
+	l.setWindowModality(Qt::WindowModal);
-    l.showFullScreen();
+	l.showFullScreen();
-    this->centerWidgetHide();
+	this->centerWidgetHide();
-    while(l.result() != QDialog::Accepted)
+	while (l.result() != QDialog::Accepted)
-    {
+	{
-        l.exec();
+		l.exec();
-    }
+	}
-    this->centerWidgetShow();
+	this->centerWidgetShow();
 }
 
 void MainWindow::debugConsoleOn() {
-    QTextEdit* text_edit = new QTextEdit(this);
+	QTextEdit* text_edit = new QTextEdit(this);
 	ui->centralWidget->layout()->addWidget(text_edit);
 	const QString edit_style =
 		"QScrollBar:vertical{border: 0px solid grey; background:#2d2d2d; width: 15px; margin: 0px 0 0px 0; }"