From 3ff995d5472384ba0d2434446ba1bc2520704a2d Mon Sep 17 00:00:00 2001 From: "PANIK\\chris" Date: Fri, 26 Dec 2025 12:04:02 +0100 Subject: [PATCH] Created new Layout prototype. --- BionxControl.pro | 5 + bcmainwindow.cpp | 9 +- bcmainwindow.ui | 231 +++++++++++------- .../.qtcreator/material_dummy.pro.user | 38 ++- main.cpp | 2 +- 5 files changed, 191 insertions(+), 94 deletions(-) diff --git a/BionxControl.pro b/BionxControl.pro index 8c4a8ff..ea8c77b 100644 --- a/BionxControl.pro +++ b/BionxControl.pro @@ -29,8 +29,10 @@ SOURCES += \ bcdatamanager.cpp \ bcdatamodel.cpp \ bcdatavalue.cpp \ + bcdevicepanel.cpp \ bcitemdelegate.cpp \ bclegacy.cpp \ + bctoolbutton.cpp \ bctransmitter.cpp \ bcvaluetype.cpp \ lib/can_drv_win.c \ @@ -46,12 +48,15 @@ HEADERS += \ bcdatamanager.h \ bcdatamodel.h \ bcdatavalue.h \ + bcdevicepanel.h \ bcitemdelegate.h \ bcmainwindow.h \ + bctoolbutton.h \ bctransmitter.h \ bcvaluetype.h FORMS += \ + bcdevicepanel.ui \ bcmainwindow.ui # Default rules for deployment. diff --git a/bcmainwindow.cpp b/bcmainwindow.cpp index 0907ffc..3763147 100644 --- a/bcmainwindow.cpp +++ b/bcmainwindow.cpp @@ -38,10 +38,14 @@ BCMainWindow::BCMainWindow(QWidget *parent) { setupUi(this); - _motorlButton->setDefaultAction( _actionMotor); + _motorButton->setDefaultAction( _motorAction); + _consoleButton->setDefaultAction( _consoleAction ); + _batteryButton->setDefaultAction( _batteryAction ); + _pimpButton->setDefaultAction( _pimpAction); _valueManager.loadXmlBikeData(); auto model = _valueManager.getModel( BCDevice::ID::Console ); +/* if( model) { _valueView->setModel( *model ); @@ -59,6 +63,7 @@ BCMainWindow::BCMainWindow(QWidget *parent) connect(_delegate, &BCItemDelegate::viewUpdateNeeded, _valueView->viewport(), QOverload<>::of(&QWidget::update)); + //_valueView->setItemDelegate(_delegate); // Highlight mit Fade-Out: @@ -70,7 +75,7 @@ BCMainWindow::BCMainWindow(QWidget *parent) connect( &_valueManager, &BCDataManager::valueTouched, _delegate, &BCItemDelegate::onHighlightRow ); connect( _connectButton, &QPushButton::clicked, transmitter, &BCTransmitter::onToggleConnectionState ); connect( _syncButton, &QPushButton::clicked, &_valueManager, &BCDataManager::onSyncFromDevice ); - +*/ } diff --git a/bcmainwindow.ui b/bcmainwindow.ui index 8e0694a..2058eec 100644 --- a/bcmainwindow.ui +++ b/bcmainwindow.ui @@ -14,45 +14,113 @@ BCMainWindow - + - - - - - - 200 - 0 - - - - QFrame::Shape::StyledPanel - - - QFrame::Shadow::Raised - - - - - 30 - 50 - 171 - 51 - - - - Sync + + + background-color: grey; + + + + + + background-color: #aaaaaa; + + + + + + 64 + 64 + + + + ... + + + + 64 + 64 + + + + + + + + + 64 + 64 + + + + ... + + + + 64 + 64 + + + + + + + + + 64 + 64 + + + + ... + + + + 64 + 64 + + + + + + + + + 64 + 64 + + + + ... + + + + 64 + 64 + + + + + - - - - 10 - 180 - 171 - 51 - + + + + + Qt::Orientation::Vertical + + + 20 + 227 + + + + + + Connect @@ -60,58 +128,38 @@ true - - - - 70 - 240 - 71 - 71 - - + + + - ... - - - - 64 - 64 - - - - true + Sync - - - - - - QFrame::Shape::NoFrame - - - QFrame::Shadow::Plain - - - false - - - false - - - Qt::PenStyle::NoPen - - - true - - - - + + + + + + + + + 200 + 0 + + + + 3 + + + + + + - + :restart.png:restart.png @@ -123,7 +171,7 @@ Pimp my Ride - + :bionx_motor.png:bionx_motor.png @@ -135,7 +183,7 @@ Show motor settings - + :bionx_akku.png:bionx_akku.png @@ -147,7 +195,7 @@ Show battery settings - + :bionx_console.png:bionx_console.png @@ -159,7 +207,7 @@ Show console settings - + :exit.png:exit.png @@ -171,7 +219,7 @@ Exit - + :/connected.png:/connected.png @@ -187,6 +235,19 @@ + + + BCDevicePanel + QWidget +
bcdevicepanel.h
+ 1 +
+ + BCToolButton + QToolButton +
bctoolbutton.h
+
+
diff --git a/doc/material_dummy/.qtcreator/material_dummy.pro.user b/doc/material_dummy/.qtcreator/material_dummy.pro.user index 10e74a3..52966d2 100644 --- a/doc/material_dummy/.qtcreator/material_dummy.pro.user +++ b/doc/material_dummy/.qtcreator/material_dummy.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -62,6 +62,30 @@ ProjectExplorer.Project.PluginSettings + + true + false + true + true + true + true + + false + + + 0 + true + + true + true + Builtin.DefaultTidyAndClazy + 16 + true + + + + true + 0 @@ -84,7 +108,7 @@ true QtProjectManager.QMakeBuildStep - false + true @@ -140,11 +164,12 @@ false -e cpu-cycles --call-graph "dwarf,4096" -F 250 - ProjectExplorer.CustomExecutableRunConfiguration - + Qt4ProjectManager.Qt4RunConfiguration: + C:/syncMePlease/projects.now/BionxControl/doc/material_dummy/material_dummy.pro false true + true true %{RunConfig:Executable:Path} @@ -176,11 +201,12 @@ false -e cpu-cycles --call-graph "dwarf,4096" -F 250 - ProjectExplorer.CustomExecutableRunConfiguration - + Qt4ProjectManager.Qt4RunConfiguration: + C:/syncMePlease/projects.now/BionxControl/doc/material_dummy/material_dummy.pro false true + true true %{RunConfig:Executable:Path} diff --git a/main.cpp b/main.cpp index 3f81bad..60c699b 100644 --- a/main.cpp +++ b/main.cpp @@ -145,7 +145,7 @@ struct mookoo2 : public mookoo int main(int argc, char *argv[]) { QApplication app(argc, argv); - setApplicationStyleSheet( ":/bionxcontrol.qss"_L1 ); + //setApplicationStyleSheet( ":/bionxcontrol.qss"_L1 ); mookoo myMookoo{"",1,1.0}; mookoo myMooko2{"",1};