Index: deploy/atelierui.rc =================================================================== --- deploy/atelierui.rc +++ deploy/atelierui.rc @@ -12,6 +12,8 @@ + + Index: src/mainwindow.h =================================================================== --- src/mainwindow.h +++ src/mainwindow.h @@ -58,6 +58,7 @@ void handlePrinterStatusChanged(AtCore::STATES newState); void checkTemperature(uint sensorType, uint number, uint temp); void axisControlClicked(QChar axis, int value); + void toggleDockTitles(bool checked); signals: void extruderCountChanged(int count); Index: src/mainwindow.cpp =================================================================== --- src/mainwindow.cpp +++ src/mainwindow.cpp @@ -37,6 +37,7 @@ setupActions(); initConnectsToAtCore(); initWidgets(); + setCentralWidget(nullptr); } MainWindow::~MainWindow() @@ -125,6 +126,7 @@ ui->homeZPB->setIcon(style()->standardIcon(QStyle::SP_DirHomeIcon)); tabifyDockWidget(ui->axisDockWidget, ui->controlDockWidget); + tabifyDockWidget(ui->view3DdockWidget, ui->gcodeDockWidget); } void MainWindow::setupActions() @@ -194,6 +196,16 @@ actionCollection()->action(QStringLiteral("stop"))->setIcon(style()->standardIcon(QStyle::SP_MediaStop)); // Actions for the Docks + action = actionCollection()->addAction(QStringLiteral("dock_labels")); + action->setText(i18n("&Show Dock Labels")); + action->setCheckable(true); + action->setChecked(true); + connect(action, &QAction::triggered, [=](bool checked){ + toggleDockTitles(checked); + }); + + action = actionCollection()->addAction(QStringLiteral("3d"), ui->view3DdockWidget->toggleViewAction()); + action->setText(i18n("&3DView")); action = actionCollection()->addAction(QStringLiteral("gcode"), ui->gcodeDockWidget->toggleViewAction()); action->setText(i18n("&GCode")); @@ -355,3 +367,22 @@ core.pushCommand(GCode::toCommand(GCode::G1, QStringLiteral("%1%2").arg(axis, QString::number(value)))); core.setAbsolutePosition(); } + +void MainWindow::toggleDockTitles(bool checked) +{ + if(checked){ + delete ui->axisDockWidget->titleBarWidget(); + delete ui->view3DdockWidget->titleBarWidget(); + delete ui->plotDockWidget->titleBarWidget(); + delete ui->logDockWidget->titleBarWidget(); + delete ui->controlDockWidget->titleBarWidget(); + delete ui->gcodeDockWidget->titleBarWidget(); + }else{ + ui->axisDockWidget->setTitleBarWidget(new QWidget()); + ui->view3DdockWidget->setTitleBarWidget(new QWidget()); + ui->plotDockWidget->setTitleBarWidget(new QWidget()); + ui->logDockWidget->setTitleBarWidget(new QWidget()); + ui->controlDockWidget->setTitleBarWidget(new QWidget()); + ui->gcodeDockWidget->setTitleBarWidget(new QWidget()); + } +} Index: src/mainwindow.ui =================================================================== --- src/mainwindow.ui +++ src/mainwindow.ui @@ -6,19 +6,15 @@ 0 0 - 490 + 484 446 Atelier - - - - - + @@ -85,7 +81,7 @@ 0 0 - 490 + 484 30 @@ -232,6 +228,15 @@ + + + &3DView + + + 1 + + +