From fc3fab4909ce5398969eedd51e55ba9873d01bba Mon Sep 17 00:00:00 2001
From: Krad <kradchen123@163.com>
Date: Wed, 13 Jul 2022 10:13:07 +0800
Subject: [PATCH] Rename tabformwidget to TabFormWidget. Fix layout add bug.

---
 src/forms/{tabformwidget.cpp => TabFormWidget.cpp} | 2 +-
 src/forms/{tabformwidget.h => TabFormWidget.h}     | 0
 src/forms/{tabformwidget.ui => TabFormWidget.ui}   | 0
 src/forms/scan/ScanFormWidget.h                    | 2 +-
 src/forms/select/SelectFormWidget.h                | 2 +-
 src/forms/settings/AboutWidget.cpp                 | 2 +-
 src/forms/settings/AdminSettingForm.cpp            | 3 +--
 src/forms/settings/AdminSettingForm.h              | 2 +-
 src/windows/MainWindow.cpp                         | 9 ++-------
 9 files changed, 8 insertions(+), 14 deletions(-)
 rename src/forms/{tabformwidget.cpp => TabFormWidget.cpp} (94%)
 rename src/forms/{tabformwidget.h => TabFormWidget.h} (100%)
 rename src/forms/{tabformwidget.ui => TabFormWidget.ui} (100%)

diff --git a/src/forms/tabformwidget.cpp b/src/forms/TabFormWidget.cpp
similarity index 94%
rename from src/forms/tabformwidget.cpp
rename to src/forms/TabFormWidget.cpp
index 37e4276..8d3fc8d 100644
--- a/src/forms/tabformwidget.cpp
+++ b/src/forms/TabFormWidget.cpp
@@ -1,4 +1,4 @@
-#include "tabformwidget.h"
+#include "TabFormWidget.h"
 #include "ui_tabformwidget.h"
 #include <QDateTime>
 
diff --git a/src/forms/tabformwidget.h b/src/forms/TabFormWidget.h
similarity index 100%
rename from src/forms/tabformwidget.h
rename to src/forms/TabFormWidget.h
diff --git a/src/forms/tabformwidget.ui b/src/forms/TabFormWidget.ui
similarity index 100%
rename from src/forms/tabformwidget.ui
rename to src/forms/TabFormWidget.ui
diff --git a/src/forms/scan/ScanFormWidget.h b/src/forms/scan/ScanFormWidget.h
index bd36136..184ddc7 100644
--- a/src/forms/scan/ScanFormWidget.h
+++ b/src/forms/scan/ScanFormWidget.h
@@ -5,7 +5,7 @@
 #ifndef GUI_SCANFORMWIDGET_H
 #define GUI_SCANFORMWIDGET_H
 
-#include "src/forms/tabformwidget.h"
+#include "src/forms/TabFormWidget.h"
 #include <functional>
 #include <QtWidgets/QLabel>
 
diff --git a/src/forms/select/SelectFormWidget.h b/src/forms/select/SelectFormWidget.h
index 401c2cf..0d95c52 100644
--- a/src/forms/select/SelectFormWidget.h
+++ b/src/forms/select/SelectFormWidget.h
@@ -6,7 +6,7 @@
 #define GUI_SELECTFORMWIDGET_H
 
 
-#include "forms/tabformwidget.h"
+#include "forms/TabFormWidget.h"
 #include "EditPatientDialog.h"
 
 class PatientDetailForm;
diff --git a/src/forms/settings/AboutWidget.cpp b/src/forms/settings/AboutWidget.cpp
index 6032cb4..6db7475 100644
--- a/src/forms/settings/AboutWidget.cpp
+++ b/src/forms/settings/AboutWidget.cpp
@@ -51,7 +51,7 @@ void AboutWidget::initUiWidget()
     pMainLayout->setAlignment(Qt::AlignLeft);
     pMainLayout->setSpacing(10);
 
-    pProductVerLayout = new QHBoxLayout(this);
+    pProductVerLayout = new QHBoxLayout;
     pMainLayout->addLayout(pProductVerLayout);
 
     pProductVer = new QLabel(this);
diff --git a/src/forms/settings/AdminSettingForm.cpp b/src/forms/settings/AdminSettingForm.cpp
index 6033c18..dbbf841 100644
--- a/src/forms/settings/AdminSettingForm.cpp
+++ b/src/forms/settings/AdminSettingForm.cpp
@@ -20,10 +20,9 @@
 AdminSettingForm::AdminSettingForm(QWidget* aParent, Qt::WindowFlags f)
     : TabFormWidget(aParent)
 {
-    QHBoxLayout* layout = new QHBoxLayout(this);
+    QHBoxLayout* layout = new QHBoxLayout(ui->contentWidget);
     layout->setMargin(0);
     layout->setContentsMargins(0, 8, 0, 1);
-    ui->contentWidget->setLayout(layout);
     ui->contentWidget->setObjectName("settingContentWidget");
     QListWidget* widget = new QListWidget(this);
     widget->setFixedWidth(250);
diff --git a/src/forms/settings/AdminSettingForm.h b/src/forms/settings/AdminSettingForm.h
index aba7557..9a99f6c 100644
--- a/src/forms/settings/AdminSettingForm.h
+++ b/src/forms/settings/AdminSettingForm.h
@@ -5,7 +5,7 @@
 #ifndef ADMINSETTINGFORM_H
 #define ADMINSETTINGFORM_H
 
-#include "forms/tabformwidget.h"
+#include "forms/TabFormWidget.h"
 
 class AdminSettingForm :public TabFormWidget
 {
diff --git a/src/windows/MainWindow.cpp b/src/windows/MainWindow.cpp
index 2702dd2..f5e348a 100644
--- a/src/windows/MainWindow.cpp
+++ b/src/windows/MainWindow.cpp
@@ -1,19 +1,16 @@
 #include "MainWindow.h"
 
 #include <qtabwidget.h>
-#include <QSizePolicy>
 #include <QHBoxLayout>
 #include <QScrollBar>
 #include <QDateTime>
 #include <QGestureEvent>
 #include <QDockWidget>
 #include <fstream>
-#include <sstream>
-#include <QKeyEvent>
 
 #include "ui_MainWindow.h"
 #include "event/EventCenter.h"
-#include "forms/tabformwidget.h"
+#include "forms/TabFormWidget.h"
 #include "forms/select/SelectFormWidget.h"
 #include "forms/scan/ScanFormWidget.h"
 #include "forms/settings/AdminSettingForm.h"
@@ -219,15 +216,13 @@ void MainWindow::initializeTabWidget()
 
 void MainWindow::initializeLayout()
 {
-    QVBoxLayout* layout = new QVBoxLayout(this);
+    QVBoxLayout* layout = new QVBoxLayout(mUI->mCentralWidget);
     layout->setMargin(0);
     layout->setSpacing(0);
     QWidget* topBarWidget = new TopBarWidget(this);
     topBarWidget->setObjectName("topbarWidget");
     layout->addWidget(topBarWidget);
     layout->addWidget(mTabWidget);
-
-    mUI->mCentralWidget->setLayout(layout);
 }
 
 void MainWindow::QMessageOutput(QtMsgType aType, const QMessageLogContext& aContext, const QString& msg)