IOT dashboard: Rename MainContent to DashboardPage
This commit is contained in:
parent
d3e34f5f97
commit
520bb0a429
|
@ -3,7 +3,7 @@
|
||||||
* This file may be used under the terms of the 3-clause BSD License
|
* This file may be used under the terms of the 3-clause BSD License
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
#include "MainContent.h"
|
#include "DashboardPage.h"
|
||||||
|
|
||||||
#include "Box.h"
|
#include "Box.h"
|
||||||
#include "BoxWithButtons.h"
|
#include "BoxWithButtons.h"
|
||||||
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
|
|
||||||
QSK_SUBCONTROL( MainContent, Panel )
|
QSK_SUBCONTROL( DashboardPage, Panel )
|
||||||
QSK_SUBCONTROL( MainContentGridBox, Panel )
|
QSK_SUBCONTROL( MainContentGridBox, Panel )
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
|
@ -61,11 +61,11 @@ namespace
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
MainContent::MainContent( QQuickItem* parent )
|
DashboardPage::DashboardPage( QQuickItem* parent )
|
||||||
: QskLinearBox( Qt::Vertical, parent )
|
: QskLinearBox( Qt::Vertical, parent )
|
||||||
{
|
{
|
||||||
setPanel( true );
|
setPanel( true );
|
||||||
setSubcontrolProxy( QskBox::Panel, MainContent::Panel );
|
setSubcontrolProxy( QskBox::Panel, DashboardPage::Panel );
|
||||||
|
|
||||||
setAutoAddChildren( false );
|
setAutoAddChildren( false );
|
||||||
setSizePolicy( QskSizePolicy::Expanding, QskSizePolicy::Expanding );
|
setSizePolicy( QskSizePolicy::Expanding, QskSizePolicy::Expanding );
|
||||||
|
@ -93,4 +93,4 @@ MainContent::MainContent( QQuickItem* parent )
|
||||||
addItem( gridBox );
|
addItem( gridBox );
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "moc_MainContent.cpp"
|
#include "moc_DashboardPage.cpp"
|
|
@ -22,14 +22,14 @@ class MainContentGridBox : public QskGridBox
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
class MainContent : public QskLinearBox
|
class DashboardPage : public QskLinearBox
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
QSK_SUBCONTROLS( Panel )
|
QSK_SUBCONTROLS( Panel )
|
||||||
|
|
||||||
MainContent( QQuickItem* parent );
|
DashboardPage( QQuickItem* parent );
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QList< QskLinearBox* > m_columns;
|
QList< QskLinearBox* > m_columns;
|
|
@ -1,6 +1,6 @@
|
||||||
#include "MainItem.h"
|
#include "MainItem.h"
|
||||||
|
|
||||||
#include "MainContent.h"
|
#include "DashboardPage.h"
|
||||||
#include "MenuBar.h"
|
#include "MenuBar.h"
|
||||||
|
|
||||||
#include <QskGesture.h>
|
#include <QskGesture.h>
|
||||||
|
@ -28,7 +28,7 @@ MainItem::MainItem( QQuickItem* parent )
|
||||||
m_mainLayout->setSpacing( 0 );
|
m_mainLayout->setSpacing( 0 );
|
||||||
|
|
||||||
(void) new MenuBar( m_mainLayout );
|
(void) new MenuBar( m_mainLayout );
|
||||||
(void) new MainContent( m_mainLayout );
|
(void) new DashboardPage( m_mainLayout );
|
||||||
|
|
||||||
m_cube->addItem( m_mainLayout );
|
m_cube->addItem( m_mainLayout );
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
#include "DiagramSkinlet.h"
|
#include "DiagramSkinlet.h"
|
||||||
#include "LightDisplay.h"
|
#include "LightDisplay.h"
|
||||||
#include "LightDisplaySkinlet.h"
|
#include "LightDisplaySkinlet.h"
|
||||||
#include "MainContent.h"
|
#include "DashboardPage.h"
|
||||||
#include "MenuBar.h"
|
#include "MenuBar.h"
|
||||||
#include "PieChartPainted.h"
|
#include "PieChartPainted.h"
|
||||||
#include "RoundedIcon.h"
|
#include "RoundedIcon.h"
|
||||||
|
@ -206,7 +206,7 @@ void Skin::initHints( const Palette& palette )
|
||||||
|
|
||||||
// palette dependent skin hints:
|
// palette dependent skin hints:
|
||||||
ed.setGradient( MenuBar::Panel, palette.menuBar );
|
ed.setGradient( MenuBar::Panel, palette.menuBar );
|
||||||
ed.setGradient( MainContent::Panel, palette.mainContent );
|
ed.setGradient( DashboardPage::Panel, palette.mainContent );
|
||||||
ed.setGradient( Box::Panel, palette.box );
|
ed.setGradient( Box::Panel, palette.box );
|
||||||
ed.setGradient( BoxWithButtons::Panel, palette.box );
|
ed.setGradient( BoxWithButtons::Panel, palette.box );
|
||||||
ed.setGradient( UsageDiagramBox::Panel, palette.box );
|
ed.setGradient( UsageDiagramBox::Panel, palette.box );
|
||||||
|
|
|
@ -8,12 +8,12 @@ SOURCES += \
|
||||||
BoxWithButtons.cpp \
|
BoxWithButtons.cpp \
|
||||||
CircularProgressBar.cpp \
|
CircularProgressBar.cpp \
|
||||||
CircularProgressBarSkinlet.cpp \
|
CircularProgressBarSkinlet.cpp \
|
||||||
|
DashboardPage.cpp \
|
||||||
Diagram.cpp \
|
Diagram.cpp \
|
||||||
DiagramSkinlet.cpp \
|
DiagramSkinlet.cpp \
|
||||||
GraphicProvider.cpp \
|
GraphicProvider.cpp \
|
||||||
LightDisplaySkinlet.cpp \
|
LightDisplaySkinlet.cpp \
|
||||||
LightDisplay.cpp \
|
LightDisplay.cpp \
|
||||||
MainContent.cpp \
|
|
||||||
MainItem.cpp \
|
MainItem.cpp \
|
||||||
MenuBar.cpp \
|
MenuBar.cpp \
|
||||||
MyDevices.cpp \
|
MyDevices.cpp \
|
||||||
|
@ -45,7 +45,7 @@ HEADERS += \
|
||||||
GraphicProvider.h \
|
GraphicProvider.h \
|
||||||
LightDisplaySkinlet.h \
|
LightDisplaySkinlet.h \
|
||||||
LightDisplay.h \
|
LightDisplay.h \
|
||||||
MainContent.h \
|
DashboardPage.h \
|
||||||
MainItem.h \
|
MainItem.h \
|
||||||
MainWindow.h \
|
MainWindow.h \
|
||||||
MenuBar.h \
|
MenuBar.h \
|
||||||
|
|
Loading…
Reference in New Issue