etc/clients
1
0
Fork 0
Code Issues Pull Requests Releases Activity

widget 클래스들의 기초 클래스를 QObject 에서 QWidget으로 변경

Browse Source 
git-svn-id: svn://192.168.0.12/source@299 8346c931-da38-4b9b-9d4c-e48b93cbd075
This commit is contained in:
admin
2016-10-07 10:05:37 +00:00
parent 522bebb88d
commit bdd6780920
7 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
EffectUI/sadddelwidget.cpp
View File

@@ -4,8 +4,9 @@
#include <QDebug>
SAddDelWidget::SAddDelWidget(QWidget *parent):
m_pbtnAdd(new QPushButton(parent)), m_pbtnDel(new QPushButton(parent)),
m_pParent(parent), m_playout(new QVBoxLayout(parent))
QWidget(parent),
m_pbtnAdd(new QPushButton(this)), m_pbtnDel(new QPushButton(this)),
m_pParent(this), m_playout(new QVBoxLayout(this))
{
initButton();
@@ -14,6 +15,7 @@ SAddDelWidget::SAddDelWidget(QWidget *parent):
SAddDelWidget::~SAddDelWidget()
{
/*
if (m_pParent == nullptr)
{
disconnect(m_pbtnAdd, 0, 0, 0);
@@ -21,6 +23,7 @@ SAddDelWidget::~SAddDelWidget()
delete m_pbtnAdd;
delete m_pbtnDel;
}
*/
}
void SAddDelWidget::initButton()

6
EffectUI/sadddelwidget.h
View File

@@ -1,14 +1,14 @@
#ifndef SADDDELWIDGET
#define SADDDELWIDGET
#include <QObject>
#include <QWidget>
class QPushButton;
class QVBoxLayout;
class QWidget;
class SAddDelWidget: public QObject
class SAddDelWidget: public QWidget
{
Q_OBJECT

9
EffectUI/scompanylistwidget.cpp
View File

@@ -33,6 +33,7 @@ enum class SCompanyListWidget::E_TABLE_HEADER
SCompanyListWidget::~SCompanyListWidget()
{
/*
if (m_pwParent == nullptr)
{
delete m_pbtnSearch;
@@ -41,12 +42,14 @@ SCompanyListWidget::~SCompanyListWidget()
delete m_pdeStart;
delete m_ptableWidget;
}
*/
}
SCompanyListWidget::SCompanyListWidget(QWidget* parent):
m_pbtnSearch(new QPushButton(parent)), m_pbtnRefresh(new QPushButton(parent)),
m_ptableWidget(new QTableWidget(parent)), m_pdeStart(new QDateEdit(parent)),
m_pdeEnd(new QDateEdit(parent)), m_playout(new QVBoxLayout(parent)), m_pwParent(parent),
QWidget(parent),
m_pbtnSearch(new QPushButton(this)), m_pbtnRefresh(new QPushButton(this)),
m_ptableWidget(new QTableWidget(this)), m_pdeStart(new QDateEdit(this)),
m_pdeEnd(new QDateEdit(this)), m_playout(new QVBoxLayout(this)), m_pwParent(this),
m_pslTableHeader(new QStringList)
{

5
EffectUI/scompanylistwidget.h
View File

@@ -1,10 +1,11 @@
#ifndef SCOMPANYLISTWIDGET
#define SCOMPANYLISTWIDGET
#include <QObject>
#include <QWidget>
#include <memory>
#include <QVector>
class QPushButton;
class QTableWidget;
class QDateEdit;
@@ -12,7 +13,7 @@ class QVBoxLayout;
class QStringList;
class QTableWidgetItem;
class SCompanyListWidget:public QObject
class SCompanyListWidget:public QWidget
{
Q_OBJECT

11
EffectUI/srunninglistwidget.cpp
View File

@@ -31,10 +31,11 @@ enum class SRunningListWidget::E_TABLE_HEADER
};
SRunningListWidget::SRunningListWidget(QWidget* parent) :
m_pwParent(parent), m_pbtnTimerStart(new QPushButton(parent)),
m_pbtnTimerStop(new QPushButton(parent)), m_pbtnForceStart(new QPushButton(parent)),
m_pbtnForceStop(new QPushButton(parent)), m_ptableWidget(new QTableWidget(parent)),
m_playout(new QVBoxLayout(parent)), m_pslTableHeader(new QStringList)
QWidget(parent),
m_pwParent(this), m_pbtnTimerStart(new QPushButton(this)),
m_pbtnTimerStop(new QPushButton(this)), m_pbtnForceStart(new QPushButton(this)),
m_pbtnForceStop(new QPushButton(this)), m_ptableWidget(new QTableWidget(this)),
m_playout(new QVBoxLayout(this)), m_pslTableHeader(new QStringList)
{
*m_pslTableHeader << "Company" << "Start date" << "End date"
<< "Event Num" << "Status" << "Last Update Time";
@@ -168,6 +169,7 @@ void SRunningListWidget::resetTableHeader()
SRunningListWidget::~SRunningListWidget()
{
/*
if (m_pwParent == nullptr)
{
disconnect(m_pbtnForceStart, &QPushButton::released,
@@ -188,6 +190,7 @@ SRunningListWidget::~SRunningListWidget()
delete m_ptableWidget;
delete m_playout;
}
*/
}

4
EffectUI/srunninglistwidget.h
View File

@@ -1,7 +1,7 @@
#ifndef SRUNNINGLISTWIDGET
#define SRUNNINGLISTWIDGET
#include <QObject>
#include <QWidget>
#include <memory>
#include <QVector>
#include <QSet>
@@ -13,7 +13,7 @@ class QDateEdit;
class QVBoxLayout;
class QStringList;
class SRunningListWidget:public QObject
class SRunningListWidget:public QWidget
{
Q_OBJECT
public:

16
EffectUI/widget.cpp
View File

@@ -10,17 +10,15 @@ Widget::Widget(QWidget *parent) :
ui(new Ui::Widget)
{
ui->setupUi(this);
QWidget *w1 = new QWidget;
QWidget *w2 = new QWidget;
QWidget *w3 = new QWidget;
SCompanyListWidget *c = new SCompanyListWidget(w1);
SRunningListWidget *d = new SRunningListWidget(w2);
SAddDelWidget *e = new SAddDelWidget(w3);
SCompanyListWidget *c = new SCompanyListWidget;
SRunningListWidget *d = new SRunningListWidget;
SAddDelWidget *e = new SAddDelWidget;
QHBoxLayout* mainLayout = new QHBoxLayout(this);
mainLayout->addWidget(w1);
mainLayout->addWidget(w3);
mainLayout->addWidget(w2);
mainLayout->addWidget(c);
mainLayout->addWidget(e);
mainLayout->addWidget(d);
setLayout(mainLayout);
show();