Refactor css file.2

src/forms/TopBarWidget.cpp

@@ -23,7 +23,7 @@ TopBarWidget::TopBarWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent,
     company->setText(tr("浙江衡玖医疗科技"));
     QWidget* spacerLine0 = new QWidget(this);
     spacerLine0->setFixedWidth(2);
-    spacerLine0->setObjectName("smallSpacer");
+    spacerLine0->setObjectName("verSpaceLine");
     layout->addWidget(spacerLine0);
     QLabel * lbl_msglogo = new QLabel(this);
     lbl_msglogo->setObjectName("msglogo");
@@ -53,7 +53,7 @@ TopBarWidget::TopBarWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent,
     status_layout->addWidget(nowDate);
     QWidget* spacerLine = new QWidget(this);
     spacerLine->setFixedWidth(2);
-    spacerLine->setObjectName("smallSpacer");
+    spacerLine->setObjectName("verSpaceLine");
 
     layout->addWidget(spacerLine);
     layout->addWidget(linkIcon);

src/forms/select/SelectFormWidget.cpp

@@ -43,9 +43,8 @@ SelectFormWidget::SelectFormWidget(QWidget* parent)
     initPatEditButtons(layout);
     initDataModel();
     //Init content widget
-	auto* contentLayout = new QHBoxLayout();
+	auto* contentLayout = new QHBoxLayout(this->ui->contentWidget);
-	contentLayout->setContentsMargins(5, 5, 0, 5);
+	contentLayout->setContentsMargins(0, 0, 0, 0);
-	this->ui->contentWidget->setLayout(contentLayout);
     initTableView(contentLayout);
     addVerticalLine(contentLayout);
     initDetailPanel(contentLayout);

src/forms/settings/AboutWidget.cpp

@@ -66,30 +66,25 @@ void AboutWidget::initUiWidget()
     pCompanyCopyRight = new QLabel(this);
     pCompanyCopyRight->setObjectName("normal");
     pCompanyCopyRight->setText(tr("Copyright © 2017-2022 Zhejiang Equilibrium Nine Medical Equipment Co., Ltd. All Rights Reversed"));
-    pCompanyCopyRight->setContentsMargins(subContentMargin, 0, 0, 0);
     pMainLayout->addWidget(pCompanyCopyRight);
 
     pMainLayout->addSpacing(subContentSpacing);
 
     pGuiVer = new QLabel(this);
     pGuiVer->setText(QString(tr("GUI Software V%1")).arg(getGUIVersion()));
-    pGuiVer->setContentsMargins(subContentMargin, 0, 0, 0);
     pMainLayout->addWidget(pGuiVer);
 
     pEmbededSoftVer = new QLabel(this);
     pEmbededSoftVer->setText(tr("Embedded Software %1, Data store Path:%2").arg(getEmbVersion(), getDataStorePath()));
-    pEmbededSoftVer->setContentsMargins(subContentMargin, 0, 0, 0);
     pMainLayout->addWidget(pEmbededSoftVer);
 
     pReconSotfVer = new QLabel(this);
     pReconSotfVer->setText(tr("Reconstruction Software V1.2"));
-    pReconSotfVer->setContentsMargins(subContentMargin, 0, 0, 0);
     pMainLayout->addWidget(pReconSotfVer);
     pMainLayout->addSpacing(subContentSpacing);
 
     pFEBVer = new QLabel(this);
     pFEBVer->setText(tr("FEB Information"));
-    pFEBVer->setContentsMargins(subContentMargin, 0, 0, 0);
     pMainLayout->addWidget(pFEBVer);
     pMainLayout->addSpacing(subContentSpacing);
 
@@ -108,7 +103,6 @@ void AboutWidget::initUiWidget()
     pDcmtkCopyright = new QLabel(this);
     pDcmtkCopyright->setObjectName("normal");
     pDcmtkCopyright->setText(tr("Copyright (c) 1994-2021, OFFIS e.V."));
-    pDcmtkCopyright->setContentsMargins(subContentMargin, 0, 0, 0);
     pMainLayout->addWidget(pDcmtkCopyright);
     pMainLayout->addSpacing(subContentSpacing);
 
@@ -118,7 +112,6 @@ void AboutWidget::initUiWidget()
     pJsoncppCopyright = new QLabel(this);
     pJsoncppCopyright->setObjectName("normal");
     pJsoncppCopyright->setText(tr("Copyright (c) 2009-2017 Dave Gamble"));
-    pJsoncppCopyright->setContentsMargins(subContentMargin, 0, 0, 0);
     pMainLayout->addWidget(pJsoncppCopyright);
     pMainLayout->addSpacing(subContentSpacing);
     pMainLayout->addStretch();

src/forms/settings/AdminSettingForm.cpp

@@ -21,10 +21,10 @@ AdminSettingForm::AdminSettingForm(QWidget* aParent, Qt::WindowFlags f)
     : TabFormWidget(aParent)
 {
     QHBoxLayout* layout = new QHBoxLayout(ui->contentWidget);
-    layout->setMargin(0);
+//    layout->setMargin(0);
-    layout->setContentsMargins(0, 8, 0, 1);
+    layout->setContentsMargins(0, 0, 0, 0);
     ui->contentWidget->setObjectName("settingContentWidget");
-    QListWidget* widget = new QListWidget(this);
+    QListWidget* widget = new QListWidget(ui->contentWidget);
     widget->setFixedWidth(250);
     QStringList menus;
     menus << tr("General") << tr("Account") << tr("System") << tr("About");
@@ -35,26 +35,24 @@ AdminSettingForm::AdminSettingForm(QWidget* aParent, Qt::WindowFlags f)
         widget->item(i)->setTextAlignment(Qt::AlignCenter);
     }
     layout->addWidget(widget);
-    QStackedWidget* stackedWidget = new QStackedWidget(this);
+    QStackedWidget* stackedWidget = new QStackedWidget(ui->contentWidget);
 
     QWidget* spacerLine = new QWidget(this);
-    spacerLine->setFixedWidth(2);
     spacerLine->setObjectName("verSpaceLine");
-    spacerLine->setStyleSheet("margin-bottom:8px");
     layout->addWidget(spacerLine);
     layout->addWidget(stackedWidget);
     ui->commandWidget->hide();
 
-    GeneralForm* generalForm = new GeneralForm(this);
+    GeneralForm* generalForm = new GeneralForm(ui->commandWidget);
     stackedWidget->addWidget(generalForm);
 
-    AccountTableForm* acc = new AccountTableForm(this);
+    AccountTableForm* acc = new AccountTableForm(ui->commandWidget);
     stackedWidget->addWidget(acc);
 
-    SystemSettingForm* systemSetting = new SystemSettingForm(this);
+    SystemSettingForm* systemSetting = new SystemSettingForm(ui->commandWidget);
     stackedWidget->addWidget(systemSetting);
 
-    AboutWidget* about = new AboutWidget(this);
+    AboutWidget* about = new AboutWidget(ui->commandWidget);
     stackedWidget->addWidget(about);
 
     widget->setCurrentRow(0);

src/windows/MainWindow.cpp

@@ -198,7 +198,6 @@ void MainWindow::initializeLayout()
     layout->setMargin(0);
     layout->setSpacing(0);
     QWidget* topBarWidget = new TopBarWidget(this);
-    topBarWidget->setObjectName("topbarWidget");
     layout->addWidget(topBarWidget);
     layout->addWidget(mTabWidget);
 }