diff --git a/examples/iotdashboard/MainContent.cpp b/examples/iotdashboard/DashboardPage.cpp similarity index 91% rename from examples/iotdashboard/MainContent.cpp rename to examples/iotdashboard/DashboardPage.cpp index b3133d6c..cc3ece19 100644 --- a/examples/iotdashboard/MainContent.cpp +++ b/examples/iotdashboard/DashboardPage.cpp @@ -3,7 +3,7 @@ * This file may be used under the terms of the 3-clause BSD License *****************************************************************************/ -#include "MainContent.h" +#include "DashboardPage.h" #include "Box.h" #include "BoxWithButtons.h" @@ -25,7 +25,7 @@ #include -QSK_SUBCONTROL( MainContent, Panel ) +QSK_SUBCONTROL( DashboardPage, Panel ) QSK_SUBCONTROL( MainContentGridBox, Panel ) namespace @@ -61,11 +61,11 @@ namespace }; } -MainContent::MainContent( QQuickItem* parent ) +DashboardPage::DashboardPage( QQuickItem* parent ) : QskLinearBox( Qt::Vertical, parent ) { setPanel( true ); - setSubcontrolProxy( QskBox::Panel, MainContent::Panel ); + setSubcontrolProxy( QskBox::Panel, DashboardPage::Panel ); setAutoAddChildren( false ); setSizePolicy( QskSizePolicy::Expanding, QskSizePolicy::Expanding ); @@ -93,4 +93,4 @@ MainContent::MainContent( QQuickItem* parent ) addItem( gridBox ); } -#include "moc_MainContent.cpp" +#include "moc_DashboardPage.cpp" diff --git a/examples/iotdashboard/MainContent.h b/examples/iotdashboard/DashboardPage.h similarity index 89% rename from examples/iotdashboard/MainContent.h rename to examples/iotdashboard/DashboardPage.h index e4119785..9b11ff23 100644 --- a/examples/iotdashboard/MainContent.h +++ b/examples/iotdashboard/DashboardPage.h @@ -22,14 +22,14 @@ class MainContentGridBox : public QskGridBox } }; -class MainContent : public QskLinearBox +class DashboardPage : public QskLinearBox { Q_OBJECT public: QSK_SUBCONTROLS( Panel ) - MainContent( QQuickItem* parent ); + DashboardPage( QQuickItem* parent ); private: QList< QskLinearBox* > m_columns; diff --git a/examples/iotdashboard/MainItem.cpp b/examples/iotdashboard/MainItem.cpp index 7ded215b..f913c099 100644 --- a/examples/iotdashboard/MainItem.cpp +++ b/examples/iotdashboard/MainItem.cpp @@ -1,6 +1,6 @@ #include "MainItem.h" -#include "MainContent.h" +#include "DashboardPage.h" #include "MenuBar.h" #include @@ -28,7 +28,7 @@ MainItem::MainItem( QQuickItem* parent ) m_mainLayout->setSpacing( 0 ); (void) new MenuBar( m_mainLayout ); - (void) new MainContent( m_mainLayout ); + (void) new DashboardPage( m_mainLayout ); m_cube->addItem( m_mainLayout ); } diff --git a/examples/iotdashboard/Skin.cpp b/examples/iotdashboard/Skin.cpp index be18ee9b..b4ab3c96 100644 --- a/examples/iotdashboard/Skin.cpp +++ b/examples/iotdashboard/Skin.cpp @@ -13,7 +13,7 @@ #include "DiagramSkinlet.h" #include "LightDisplay.h" #include "LightDisplaySkinlet.h" -#include "MainContent.h" +#include "DashboardPage.h" #include "MenuBar.h" #include "PieChartPainted.h" #include "RoundedIcon.h" @@ -206,7 +206,7 @@ void Skin::initHints( const Palette& palette ) // palette dependent skin hints: 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( BoxWithButtons::Panel, palette.box ); ed.setGradient( UsageDiagramBox::Panel, palette.box ); diff --git a/examples/iotdashboard/iotdashboard.pro b/examples/iotdashboard/iotdashboard.pro index 9d0c63cf..9f373565 100644 --- a/examples/iotdashboard/iotdashboard.pro +++ b/examples/iotdashboard/iotdashboard.pro @@ -8,12 +8,12 @@ SOURCES += \ BoxWithButtons.cpp \ CircularProgressBar.cpp \ CircularProgressBarSkinlet.cpp \ + DashboardPage.cpp \ Diagram.cpp \ DiagramSkinlet.cpp \ GraphicProvider.cpp \ LightDisplaySkinlet.cpp \ LightDisplay.cpp \ - MainContent.cpp \ MainItem.cpp \ MenuBar.cpp \ MyDevices.cpp \ @@ -45,7 +45,7 @@ HEADERS += \ GraphicProvider.h \ LightDisplaySkinlet.h \ LightDisplay.h \ - MainContent.h \ + DashboardPage.h \ MainItem.h \ MainWindow.h \ MenuBar.h \