diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index c659c42..bb52d0a 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1,88 +1,104 @@
/* 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
MainWindow::MainWindow(QWidget *parent) :
KXmlGuiWindow(parent),
ui(new Ui::MainWindow)
{
ui->setupUi(this);
setupActions();
}
MainWindow::~MainWindow()
{
delete ui;
}
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, [ = ]{
+ connect(action, &QAction::triggered, [ & ]{
std::unique_ptr csd(new ConnectSettingsDialog);
- connect(csd.get(), &ConnectSettingsDialog::startConnection, [ & ](QString port, QMap data) {
+ connect(csd.get(), &ConnectSettingsDialog::startConnection, [ & ](const QString& port, const QMap& data) {
+ newConnection(port, data);
});
csd->exec();
});
action = actionCollection()->addAction(QStringLiteral("profiles"));
action->setText(i18n("&Profiles"));
connect(action, &QAction::triggered, [ & ] {
std::unique_ptr pd(new ProfilesDialog);
pd->exec();
});
#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()) {
m_fileName = fileNameFromDialog;
ui->gcodeEditorWidget->loadFile(m_fileName);
guiFactory()->addClient(ui->gcodeEditorWidget->gcodeView());
ui->view3DWidget->drawModel(m_fileName.toString());
}
}
+
+void MainWindow::newConnection(const QString& port, const QMap& profile)
+{
+ const int tabs = ui->tabWidget->count();
+ if(tabs == 1){
+ auto instance = qobject_cast(ui->tabWidget->currentWidget());
+ if(!instance->connected()){
+ instance->startConnection(port, profile);
+ return;
+ }
+ }
+ auto newInstance = new AtCoreInstanceWidget();
+ ui->tabWidget->addTab(newInstance, QString::number(tabs+1));
+ newInstance->startConnection(port, profile);
+}
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 1c1c7ad..ea77c71 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -1,45 +1,46 @@
/* 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
namespace Ui
{
class MainWindow;
}
class MainWindow : public KXmlGuiWindow
{
Q_OBJECT
public:
explicit MainWindow(QWidget *parent = nullptr);
~MainWindow();
private:
Ui::MainWindow *ui;
- QUrl fileName;
+ QUrl m_fileName;
void setupActions();
void openFile();
+ void newConnection(const QString& port, const QMap& profile);
signals:
void extruderCountChanged(int count);
};