Rename tabformwidget to TabFormWidget.
Fix layout add bug.
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
#include "tabformwidget.h"
|
#include "TabFormWidget.h"
|
||||||
#include "ui_tabformwidget.h"
|
#include "ui_tabformwidget.h"
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
|
|
||||||
@@ -5,7 +5,7 @@
|
|||||||
#ifndef GUI_SCANFORMWIDGET_H
|
#ifndef GUI_SCANFORMWIDGET_H
|
||||||
#define GUI_SCANFORMWIDGET_H
|
#define GUI_SCANFORMWIDGET_H
|
||||||
|
|
||||||
#include "src/forms/tabformwidget.h"
|
#include "src/forms/TabFormWidget.h"
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <QtWidgets/QLabel>
|
#include <QtWidgets/QLabel>
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
#define GUI_SELECTFORMWIDGET_H
|
#define GUI_SELECTFORMWIDGET_H
|
||||||
|
|
||||||
|
|
||||||
#include "forms/tabformwidget.h"
|
#include "forms/TabFormWidget.h"
|
||||||
#include "EditPatientDialog.h"
|
#include "EditPatientDialog.h"
|
||||||
|
|
||||||
class PatientDetailForm;
|
class PatientDetailForm;
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ void AboutWidget::initUiWidget()
|
|||||||
pMainLayout->setAlignment(Qt::AlignLeft);
|
pMainLayout->setAlignment(Qt::AlignLeft);
|
||||||
pMainLayout->setSpacing(10);
|
pMainLayout->setSpacing(10);
|
||||||
|
|
||||||
pProductVerLayout = new QHBoxLayout(this);
|
pProductVerLayout = new QHBoxLayout;
|
||||||
pMainLayout->addLayout(pProductVerLayout);
|
pMainLayout->addLayout(pProductVerLayout);
|
||||||
|
|
||||||
pProductVer = new QLabel(this);
|
pProductVer = new QLabel(this);
|
||||||
|
|||||||
@@ -20,10 +20,9 @@
|
|||||||
AdminSettingForm::AdminSettingForm(QWidget* aParent, Qt::WindowFlags f)
|
AdminSettingForm::AdminSettingForm(QWidget* aParent, Qt::WindowFlags f)
|
||||||
: TabFormWidget(aParent)
|
: TabFormWidget(aParent)
|
||||||
{
|
{
|
||||||
QHBoxLayout* layout = new QHBoxLayout(this);
|
QHBoxLayout* layout = new QHBoxLayout(ui->contentWidget);
|
||||||
layout->setMargin(0);
|
layout->setMargin(0);
|
||||||
layout->setContentsMargins(0, 8, 0, 1);
|
layout->setContentsMargins(0, 8, 0, 1);
|
||||||
ui->contentWidget->setLayout(layout);
|
|
||||||
ui->contentWidget->setObjectName("settingContentWidget");
|
ui->contentWidget->setObjectName("settingContentWidget");
|
||||||
QListWidget* widget = new QListWidget(this);
|
QListWidget* widget = new QListWidget(this);
|
||||||
widget->setFixedWidth(250);
|
widget->setFixedWidth(250);
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
#ifndef ADMINSETTINGFORM_H
|
#ifndef ADMINSETTINGFORM_H
|
||||||
#define ADMINSETTINGFORM_H
|
#define ADMINSETTINGFORM_H
|
||||||
|
|
||||||
#include "forms/tabformwidget.h"
|
#include "forms/TabFormWidget.h"
|
||||||
|
|
||||||
class AdminSettingForm :public TabFormWidget
|
class AdminSettingForm :public TabFormWidget
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,19 +1,16 @@
|
|||||||
#include "MainWindow.h"
|
#include "MainWindow.h"
|
||||||
|
|
||||||
#include <qtabwidget.h>
|
#include <qtabwidget.h>
|
||||||
#include <QSizePolicy>
|
|
||||||
#include <QHBoxLayout>
|
#include <QHBoxLayout>
|
||||||
#include <QScrollBar>
|
#include <QScrollBar>
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
#include <QGestureEvent>
|
#include <QGestureEvent>
|
||||||
#include <QDockWidget>
|
#include <QDockWidget>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <sstream>
|
|
||||||
#include <QKeyEvent>
|
|
||||||
|
|
||||||
#include "ui_MainWindow.h"
|
#include "ui_MainWindow.h"
|
||||||
#include "event/EventCenter.h"
|
#include "event/EventCenter.h"
|
||||||
#include "forms/tabformwidget.h"
|
#include "forms/TabFormWidget.h"
|
||||||
#include "forms/select/SelectFormWidget.h"
|
#include "forms/select/SelectFormWidget.h"
|
||||||
#include "forms/scan/ScanFormWidget.h"
|
#include "forms/scan/ScanFormWidget.h"
|
||||||
#include "forms/settings/AdminSettingForm.h"
|
#include "forms/settings/AdminSettingForm.h"
|
||||||
@@ -219,15 +216,13 @@ void MainWindow::initializeTabWidget()
|
|||||||
|
|
||||||
void MainWindow::initializeLayout()
|
void MainWindow::initializeLayout()
|
||||||
{
|
{
|
||||||
QVBoxLayout* layout = new QVBoxLayout(this);
|
QVBoxLayout* layout = new QVBoxLayout(mUI->mCentralWidget);
|
||||||
layout->setMargin(0);
|
layout->setMargin(0);
|
||||||
layout->setSpacing(0);
|
layout->setSpacing(0);
|
||||||
QWidget* topBarWidget = new TopBarWidget(this);
|
QWidget* topBarWidget = new TopBarWidget(this);
|
||||||
topBarWidget->setObjectName("topbarWidget");
|
topBarWidget->setObjectName("topbarWidget");
|
||||||
layout->addWidget(topBarWidget);
|
layout->addWidget(topBarWidget);
|
||||||
layout->addWidget(mTabWidget);
|
layout->addWidget(mTabWidget);
|
||||||
|
|
||||||
mUI->mCentralWidget->setLayout(layout);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::QMessageOutput(QtMsgType aType, const QMessageLogContext& aContext, const QString& msg)
|
void MainWindow::QMessageOutput(QtMsgType aType, const QMessageLogContext& aContext, const QString& msg)
|
||||||
|
|||||||
Reference in New Issue
Block a user