diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,7 @@
I18n
XmlGui
ConfigWidgets
+ TextEditor
)
find_package(Qt5 REQUIRED COMPONENTS
diff --git a/atelierui.rc b/atelierui.rc
--- a/atelierui.rc
+++ b/atelierui.rc
@@ -25,5 +25,6 @@
+
diff --git a/src/mainwindow.h b/src/mainwindow.h
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -18,11 +18,13 @@
#pragma once
#include
+#include
#include
#include
#include
#include
+
namespace Ui
{
class MainWindow;
@@ -40,7 +42,7 @@
Ui::MainWindow *ui;
AtCore core;
QStringList firmwaresList;
- QString fileName;
+ QUrl fileName;
void initConnectsToAtCore();
void initLocalVariables();
void initWidgets();
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -21,6 +21,7 @@
#include
#include
#include
+#include
MainWindow::MainWindow(QWidget *parent) :
KXmlGuiWindow(parent),
@@ -91,12 +92,11 @@
action->setText(i18n("&Edit GCode"));
connect(action, &QAction::triggered, this, [ = ] {
ui->gcodeEditorWidget->setVisible(!ui->gcodeEditorWidget->isVisible());
- });
-
- action = actionCollection()->addAction(QStringLiteral("edit_gcode"));
- action->setText(i18n("&Edit GCode"));
- connect(action, &QAction::triggered, this, [ = ] {
- ui->gcodeEditorWidget->setVisible(!ui->gcodeEditorWidget->isVisible());
+ if(ui->gcodeEditorWidget->isVisible()) {
+ guiFactory()->addClient(ui->gcodeEditorWidget->gcodeView());
+ } else {
+ guiFactory()->removeClient(ui->gcodeEditorWidget->gcodeView());
+ }
});
QAction *quit = KStandardAction::quit(qApp, SLOT(quit()), actionCollection());
@@ -109,7 +109,7 @@
QUrl fileNameFromDialog = QFileDialog::getOpenFileUrl(this, i18n("Open GCode"),
QDir::homePath(), i18n("GCode (*.gco *.gcode)"));
if (!fileNameFromDialog.isEmpty()) {
- fileName = fileNameFromDialog.toLocalFile();
+ fileName = fileNameFromDialog;
ui->gcodeEditorWidget->loadFile(fileName);
}
}
@@ -127,7 +127,8 @@
void MainWindow::printFile()
{
if (!fileName.isEmpty() && (core.state() == PrinterState::IDLE)) {
- core.print(fileName);
+ QString f = fileName.toLocalFile();
+ core.print(f);
}
}
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -6,8 +6,8 @@
0
0
- 102
- 132
+ 94
+ 123
@@ -21,7 +21,7 @@
-
- -
+
-
@@ -31,8 +31,8 @@
0
0
- 102
- 30
+ 94
+ 19