diff --git a/examples/iot-dashboard/MenuBar.cpp b/examples/iot-dashboard/MenuBar.cpp index 0126d6ef..b78c4cac 100644 --- a/examples/iot-dashboard/MenuBar.cpp +++ b/examples/iot-dashboard/MenuBar.cpp @@ -12,12 +12,14 @@ MenuItem::MenuItem( const QString& name, QQuickItem* parent ) : QskLinearBox( Qt { setAutoLayoutChildren( true ); setAutoAddChildren( true ); + setPreferredWidth( 140 ); QString fileName = ":/images/" + name.toLower() + ".png"; QImage image( fileName ); auto graphic = QskGraphic::fromImage( image ); auto* graphicLabel = new QskGraphicLabel( graphic, this ); - graphicLabel->setFixedSize( 32, 32 ); + graphicLabel->setSizePolicy(QskSizePolicy::Fixed, QskSizePolicy::Fixed); +// graphicLabel->setFixedSize( 32, 32 ); auto* textLabel = new QskTextLabel( name, this ); textLabel->setTextColor( Qt::white ); // ### style @@ -28,12 +30,17 @@ MenuBar::MenuBar( QQuickItem *parent ) : QskLinearBox( Qt::Vertical, parent ) setSizePolicy( QskSizePolicy::Minimum, QskSizePolicy::Preferred ); setAutoLayoutChildren( true ); setAutoAddChildren( true ); - setMargins( 35 ); // ### style - setSpacing( 30 ); // ### style - setBackgroundColor( { 0, 35, 102 } ); // ### style + setBackgroundColor( "#6D7BFB" ); // ### style - m_entries = { "Home", "Details", "Statistics", "Settings" }; + auto* mainIcon = ":/images/main-icon.png"; + QImage image(mainIcon); + auto graphic = QskGraphic::fromImage( image ); + auto* graphicLabel = new QskGraphicLabel( graphic, this ); + graphicLabel->setMargins( { 50, 35, 50, 50 }); + + + m_entries = { "Dashboard", "Rooms", "Devices", "Statistics", "Storage", "Members" }; for( const auto entry : m_entries ) { diff --git a/examples/iot-dashboard/images.qrc b/examples/iot-dashboard/images.qrc index a12a5750..7543c5e6 100644 --- a/examples/iot-dashboard/images.qrc +++ b/examples/iot-dashboard/images.qrc @@ -1,8 +1,12 @@ + images/main-icon.png + images/dashboard.png + images/rooms.png + images/devices.png images/statistics.png - images/settings.png - images/home.png - images/details.png + images/storage.png + images/members.png + images/logout.png diff --git a/examples/iot-dashboard/images/dashboard.png b/examples/iot-dashboard/images/dashboard.png new file mode 100644 index 00000000..126322f0 Binary files /dev/null and b/examples/iot-dashboard/images/dashboard.png differ diff --git a/examples/iot-dashboard/images/dashboard.svg b/examples/iot-dashboard/images/dashboard.svg new file mode 100644 index 00000000..2cab6f30 --- /dev/null +++ b/examples/iot-dashboard/images/dashboard.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/examples/iot-dashboard/images/details.png b/examples/iot-dashboard/images/details.png deleted file mode 100644 index 77bc34a1..00000000 Binary files a/examples/iot-dashboard/images/details.png and /dev/null differ diff --git a/examples/iot-dashboard/images/devices.png b/examples/iot-dashboard/images/devices.png new file mode 100644 index 00000000..a84d68bf Binary files /dev/null and b/examples/iot-dashboard/images/devices.png differ diff --git a/examples/iot-dashboard/images/devices.svg b/examples/iot-dashboard/images/devices.svg new file mode 100644 index 00000000..eaa324dc --- /dev/null +++ b/examples/iot-dashboard/images/devices.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/examples/iot-dashboard/images/home.png b/examples/iot-dashboard/images/home.png deleted file mode 100644 index 82f22fb8..00000000 Binary files a/examples/iot-dashboard/images/home.png and /dev/null differ diff --git a/examples/iot-dashboard/images/logout.png b/examples/iot-dashboard/images/logout.png new file mode 100644 index 00000000..98d7a580 Binary files /dev/null and b/examples/iot-dashboard/images/logout.png differ diff --git a/examples/iot-dashboard/images/logout.svg b/examples/iot-dashboard/images/logout.svg new file mode 100644 index 00000000..05b0bbca --- /dev/null +++ b/examples/iot-dashboard/images/logout.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/examples/iot-dashboard/images/main-icon.png b/examples/iot-dashboard/images/main-icon.png new file mode 100644 index 00000000..38e9594b Binary files /dev/null and b/examples/iot-dashboard/images/main-icon.png differ diff --git a/examples/iot-dashboard/images/main-icon.svg b/examples/iot-dashboard/images/main-icon.svg new file mode 100644 index 00000000..fe502ab6 --- /dev/null +++ b/examples/iot-dashboard/images/main-icon.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/examples/iot-dashboard/images/members.png b/examples/iot-dashboard/images/members.png new file mode 100644 index 00000000..f408bb70 Binary files /dev/null and b/examples/iot-dashboard/images/members.png differ diff --git a/examples/iot-dashboard/images/members.svg b/examples/iot-dashboard/images/members.svg new file mode 100644 index 00000000..282d0b36 --- /dev/null +++ b/examples/iot-dashboard/images/members.svg @@ -0,0 +1,4 @@ + + + + diff --git a/examples/iot-dashboard/images/rooms.png b/examples/iot-dashboard/images/rooms.png new file mode 100644 index 00000000..d193e7a6 Binary files /dev/null and b/examples/iot-dashboard/images/rooms.png differ diff --git a/examples/iot-dashboard/images/rooms.svg b/examples/iot-dashboard/images/rooms.svg new file mode 100644 index 00000000..8ff84cb9 --- /dev/null +++ b/examples/iot-dashboard/images/rooms.svg @@ -0,0 +1,4 @@ + + + + diff --git a/examples/iot-dashboard/images/settings.png b/examples/iot-dashboard/images/settings.png deleted file mode 100644 index b184a885..00000000 Binary files a/examples/iot-dashboard/images/settings.png and /dev/null differ diff --git a/examples/iot-dashboard/images/statistics.png b/examples/iot-dashboard/images/statistics.png index 95669429..15829ec0 100644 Binary files a/examples/iot-dashboard/images/statistics.png and b/examples/iot-dashboard/images/statistics.png differ diff --git a/examples/iot-dashboard/images/statistics.svg b/examples/iot-dashboard/images/statistics.svg new file mode 100644 index 00000000..6cb5099c --- /dev/null +++ b/examples/iot-dashboard/images/statistics.svg @@ -0,0 +1,4 @@ + + + + diff --git a/examples/iot-dashboard/images/storage.png b/examples/iot-dashboard/images/storage.png new file mode 100644 index 00000000..d9908c96 Binary files /dev/null and b/examples/iot-dashboard/images/storage.png differ diff --git a/examples/iot-dashboard/images/storage.svg b/examples/iot-dashboard/images/storage.svg new file mode 100644 index 00000000..fe78b0e5 --- /dev/null +++ b/examples/iot-dashboard/images/storage.svg @@ -0,0 +1,4 @@ + + + +