diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 49a1270..7ecce68 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1,184 +1,184 @@
/* Atelier KDE Printer Host for 3D Printing
Copyright (C) <2016>
Author: Lays Rodrigues - laysrodrigues@gmail.com
Chris Rizzitello - rizzitello@kde.org
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
+
#include "mainwindow.h"
#include "ui_mainwindow.h"
#include
#include
#include
#include
#include
#include
#include
#include
#include
-
+#include "widgets/atcoreinstancewidget.h"
#include "widgets/gcodeeditorwidget.h"
#include
#include "widgets/3dview/viewer3d.h"
#include "widgets/videomonitorwidget.h"
MainWindow::MainWindow(QWidget *parent) :
KXmlGuiWindow(parent),
ui(new Ui::MainWindow),
profilesDialog(new ProfilesDialog(this)),
connectSettingsDialog(new ConnectSettingsDialog(this)),
- m_curr_editor_view(nullptr)
+ m_curr_editor_view(nullptr),
+ m_instances(new QTabWidget(this))
{
ui->setupUi(this);
setupActions();
initWidgets();
}
MainWindow::~MainWindow()
{
delete ui;
}
void MainWindow::initWidgets()
{
+ auto *newInstanceWidget = new AtCoreInstanceWidget();
+ m_instances->addTab(newInstanceWidget, i18n("Connect your printer"));
+
// When a new profile is added on the Profile Dialog it needs to update the profiles on connection dialog
connect(profilesDialog, &ProfilesDialog::updateProfiles,
connectSettingsDialog, &ConnectSettingsDialog::updateProfiles);
connect(connectSettingsDialog, &ConnectSettingsDialog::startConnection, this, &MainWindow::newConnection);
- /*
- auto instance = qobject_cast(ui->tabWidget->currentWidget());
- connectSettingsDialog->setFirmwareList(instance->firmwares());
- profilesDialog->setBaudRates(instance->baudRates());
- */
+ connectSettingsDialog->setFirmwareList(newInstanceWidget->firmwares());
+ profilesDialog->setBaudRates(newInstanceWidget->baudRates());
setupLateralArea();
// View:
// Sidebar, Sidevar Controls, Printer Tabs.
// Sidevar Controls and Printer Tabs can be resized, Sidebar cant.
auto *centralLayout = new QHBoxLayout();
auto splitter = new QSplitter();
splitter->addWidget(m_lateral.m_stack);
- splitter->addWidget(new QTabWidget());
+ splitter->addWidget(m_instances);
centralLayout->addWidget(m_lateral.m_toolBar);
centralLayout->addWidget(splitter);
ui->centralwidget->setLayout(centralLayout);
}
// Move to LateralArea.
void MainWindow::setupLateralArea()
{
m_lateral.m_toolBar = new QWidget();
m_lateral.m_stack = new QStackedWidget();
auto *buttonLayout = new QVBoxLayout();
auto setupButton = [this, buttonLayout](const QString& s, QWidget *w) {
QToolButton *btn = nullptr;
btn = new QToolButton(m_lateral.m_toolBar);
btn->setText(s);
btn->setAutoExclusive(true);
btn->setCheckable(true);
m_lateral.m_stack->addWidget(w);
m_lateral.m_map[s] = {btn, w};
buttonLayout->addWidget(btn);
connect(btn, &QToolButton::toggled, [this, w](bool checked) {
if (checked)
m_lateral.m_stack->setCurrentWidget(w);
});
};
auto *gcodeEditor = new GCodeEditorWidget(this);
connect(gcodeEditor, &GCodeEditorWidget::updateClientFactory, this, [=](KTextEditor::View* view){
guiFactory()->removeClient(m_curr_editor_view);
guiFactory()->addClient(view);
m_curr_editor_view = view;
});
setupButton(i18n("&3D"), new Viewer3D(this));
setupButton(i18n("&GCode"), gcodeEditor);
setupButton(i18n("&Video"), new VideoMonitorWidget(this));
buttonLayout->addStretch();
m_lateral.m_toolBar->setLayout(buttonLayout);
- m_lateral.m_toolBar->show();
- m_lateral.m_stack->show();
}
void MainWindow::setupActions()
{
// Actions for the Toolbar
QAction *action;
action = actionCollection()->addAction(QStringLiteral("open_gcode"));
action->setText(i18n("&Open GCode"));
connect(action, &QAction::triggered, this, &MainWindow::openFile);
action = actionCollection()->addAction(QStringLiteral("connect"));
action->setText(i18n("&Connect"));
connect(action, &QAction::triggered, connectSettingsDialog, &ConnectSettingsDialog::show);
action = actionCollection()->addAction(QStringLiteral("profiles"));
action->setText(i18n("&Profiles"));
connect(action, &QAction::triggered, profilesDialog, &ProfilesDialog::show);
#ifdef Q_OS_LINUX
//only set icons from theme on linux
actionCollection()->action(QStringLiteral("profiles"))->setIcon(QIcon::fromTheme("emblem-favorite"));
#endif
//use style's standardIcon for the icons we can.
actionCollection()->action(QStringLiteral("open_gcode"))->setIcon(style()->standardIcon(QStyle::SP_DirOpenIcon));
action = KStandardAction::quit(qApp, SLOT(quit()), actionCollection());
setupGUI(Default, ":/atelierui");
}
void MainWindow::openFile()
{
QUrl fileNameFromDialog = QFileDialog::getOpenFileUrl(this, i18n("Open GCode"),
QDir::homePath(), i18n("GCode (*.gco *.gcode)"));
/*
if (!fileNameFromDialog.isEmpty()) {
ui->gcodeEditorWidget->loadFile(fileNameFromDialog);
ui->view3DWidget->drawModel(fileNameFromDialog.toString());
const int tabs = ui->tabWidget->count();
m_openFiles.append(fileNameFromDialog);
for(int i=0; i < tabs; ++i){
auto instance = qobject_cast(ui->tabWidget->widget(i));
instance->setOpenFiles(m_openFiles);
}
}
*/
}
void MainWindow::newConnection(const QString& port, const QMap& profile)
{
/*
const int tabs = ui->tabWidget->count();
if(ui->tabWidget->count() == 1){
auto instance = qobject_cast(ui->tabWidget->currentWidget());
if(!instance->connected()){
instance->startConnection(port, profile);
ui->tabWidget->setTabText(ui->tabWidget->currentIndex(), profile["name"].toString());
return;
}
}
auto newInstanceWidget = new AtCoreInstanceWidget();
int index = ui->tabWidget->addTab(newInstanceWidget, QString::number(tabs+1));
newInstanceWidget->startConnection(port, profile);
ui->tabWidget->setTabText(index, profile["name"].toString());
*/
}
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 6a0b506..62cb464 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -1,72 +1,74 @@
/* Atelier KDE Printer Host for 3D Printing
Copyright (C) <2016>
Author: Lays Rodrigues - laysrodrigues@gmail.com
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
#pragma once
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
namespace Ui
{
class MainWindow;
}
struct LateralArea {
// Area with the the lateral buttons that will open the views.
// Kind like the KDevelop stuff but way simpler.
using Btn2Widget = QPair;
using WidgetMap = QMap;
QWidget *m_toolBar;
QStackedWidget *m_stack;
WidgetMap m_map;
};
class MainWindow : public KXmlGuiWindow
{
Q_OBJECT
public:
explicit MainWindow(QWidget *parent = nullptr);
~MainWindow();
private:
Ui::MainWindow *ui;
QStringList firmwaresList;
QList m_openFiles;
ProfilesDialog *profilesDialog;
ConnectSettingsDialog *connectSettingsDialog;
KTextEditor::View *m_curr_editor_view;
LateralArea m_lateral;
+ QTabWidget *m_instances;
+
void setupLateralArea();
void initWidgets();
void setupActions();
void openFile();
void newConnection(const QString& port, const QMap& profile);
};