sunwen/GUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
xueyan hu
2021-12-20 15:38:52 +08:00
parent 94fc8892ac
commit 6cf1a1b556
1 changed files with 42 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/mainwindow.cpp
View File

@@ -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,7 +171,7 @@ MainWindow::MainWindow(QWidget* parent) :
}
});
connect(EventCenter::Default(), &EventCenter::InvokeOperationStart, [=](QObject*, QObject* msg) {
if (msgDialog){
if (msgDialog) {
msgDialog->hide();
delete msgDialog;
}
@@ -192,7 +188,7 @@ MainWindow::MainWindow(QWidget* parent) :
msgDialog->startLoading();
AppGlobalValues::setInProcessing(true);
// msgDialog->showFullScreen();
if (msgDialog->isHidden()){
if (msgDialog->isHidden()) {
msgDialog->show();
}
});
@@ -263,15 +259,16 @@ void MainWindow::centerWidgetHide() {
}
void MainWindow::centerWidgetShow() {
if (User::Current()->isAdmin() )
if (User::Current()->isAdmin())
{
if (admin_tab_index == -1)
{
AdminSettingForm * form = new AdminSettingForm(this);
admin_tab_index = tab->addTab(form,"Admin");
AdminSettingForm* form = new AdminSettingForm(this);
admin_tab_index = tab->addTab(form, "Admin");
}
} else{
if (admin_tab_index != -1){
}
else {
if (admin_tab_index != -1) {
tab->removeTab(admin_tab_index);
admin_tab_index = -1;
}
@@ -291,7 +288,7 @@ void MainWindow::requestLogin() {
l.setWindowModality(Qt::WindowModal);
l.showFullScreen();
this->centerWidgetHide();
while(l.result() != QDialog::Accepted)
while (l.result() != QDialog::Accepted)
{
l.exec();
}