diff --git a/aboutwindow.ui b/aboutwindow.ui
index 9e1c1c8..064d63c 100644
--- a/aboutwindow.ui
+++ b/aboutwindow.ui
@@ -34,13 +34,12 @@
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><img src=":/icons/logo.png" /></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">RepRaptor</span> is a free and open source software for controlling RepRap and similar mashines. This software is distributed by terms of <a href="https://www.gnu.org/licenses/gpl-2.0.html"><span style=" text-decoration: underline; color:#0000ff;">GPL v2 licence.</span></a></p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; text-decoration: underline; color:#0000ff;"><br /></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">RepRaptor's main goal is to be as simple as possible and fast, yet functional. This software is being developed as a primary host software for <span style=" font-weight:600;">MGTU MIREA</span> university's 3D printing labratory by</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="mailto:repraptor-dev@repraptor.33mail.com"><span style=" text-decoration: underline; color:#0000ff;">Nickolay (aka "NeoTheFox") Mardanov.</span></a></p>
+<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;"> RepRaptor</span> is a free and open source software for controlling RepRap and similar mashines. This software is distributed by terms of <a href="https://www.gnu.org/licenses/gpl-2.0.html"><span style=" text-decoration: underline; color:#0000ff;">GPL v2 licence.</span></a> Some graphical images (Fugue Icons) are distributed by terms of <a href="https://creativecommons.org/licenses/by/3.0/deed.ru"><span style=" text-decoration: underline; color:#0000ff;">Creative Commons 3 licence</span></a>.</p>
+<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> RepRaptor's main goal is to be as simple as possible and fast, yet functional. This software is being developed as a primary host software for <span style=" font-weight:600;">MGTU MIREA</span> university's 3D printing labratory by</p>
+<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="mailto:repraptor-dev@repraptor.33mail.com"><span style=" text-decoration: underline; color:#0000ff;">Nickolay (aka "NeoTheFox") Mardanov.</span></a></p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://github.com/NeoTheFox/RepRaptor"><span style=" text-decoration: underline; color:#0000ff;">GitHub</span></a></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.reprap.org"><span style=" text-decoration: underline; color:#0000ff;">RepRap</span></a></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.reprap.org"><span style=" text-decoration: underline; color:#0000ff;">RepRap wiki</span></a></p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; text-decoration: underline; color:#0000ff;"><br /></p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; text-decoration: underline; color:#0000ff;"><br /></p></body></html>
diff --git a/graphics.qrc b/graphics.qrc
index 1cfb75b..d10ffa5 100644
--- a/graphics.qrc
+++ b/graphics.qrc
@@ -4,5 +4,8 @@
icons/logo.png
icons/error_a.png
icons/error_b.png
+ icons/g.png
+ icons/sd.png
+ icons/settings.png
diff --git a/icons/g.png b/icons/g.png
new file mode 100644
index 0000000..1f943c5
Binary files /dev/null and b/icons/g.png differ
diff --git a/icons/sd.png b/icons/sd.png
new file mode 100644
index 0000000..2615d95
Binary files /dev/null and b/icons/sd.png differ
diff --git a/icons/settings.png b/icons/settings.png
new file mode 100644
index 0000000..89ab15f
Binary files /dev/null and b/icons/settings.png differ
diff --git a/mainwindow.cpp b/mainwindow.cpp
index ba00fd7..288ce5f 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -689,3 +689,17 @@ void MainWindow::checkSDStatus()
{
if(sdWatcher.isFinished() && sdprinting) injectCommand("M27");
}
+
+void MainWindow::on_stepspin_valueChanged(double arg1)
+{
+ if(arg1 < 1) ui->stepspin->setSingleStep(0.1);
+ else if(arg1 >=10) ui->stepspin->setSingleStep(10);
+ else if((int)arg1 >= 1) ui->stepspin->setSingleStep(1);
+}
+
+void MainWindow::on_estepspin_valueChanged(double arg1)
+{
+ if(arg1 < 1l) ui->estepspin->setSingleStep(0.1);
+ else if(arg1 >=10) ui->estepspin->setSingleStep(10);
+ else if((int)arg1 >= 1) ui->estepspin->setSingleStep(1);
+}
diff --git a/mainwindow.h b/mainwindow.h
index bd2a420..52c10cb 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -120,6 +120,10 @@ private slots:
void checkSDStatus();
void updateSDStatus();
+ void on_stepspin_valueChanged(double arg1);
+
+ void on_estepspin_valueChanged(double arg1);
+
signals:
void sdReady();
};
diff --git a/mainwindow.ui b/mainwindow.ui
index e2427c7..438ce59 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -61,296 +61,6 @@
- -
-
-
-
- 0
- 0
-
-
-
-
- 261
- 500
-
-
-
- Control
-
-
- true
-
-
-
-
-
-
-
- 0
- 0
-
-
-
- H X
-
-
-
- -
-
-
- X-
-
-
-
- -
-
-
- H Y
-
-
-
- -
-
-
- H Z
-
-
-
- -
-
-
-
-
-
- 0.100000000000000
-
-
- 150.000000000000000
-
-
-
- -
-
-
- SET
-
-
-
- -
-
-
- E tmp
-
-
-
- -
-
-
- B tmp
-
-
-
- -
-
-
- SET
-
-
-
- -
-
-
- OFF
-
-
-
- -
-
-
- FAN ON
-
-
-
- -
-
-
- FAN OFF
-
-
-
- -
-
-
- ATX ON
-
-
-
- -
-
-
- E+
-
-
-
- -
-
-
- ATX OFF
-
-
-
- -
-
-
- Z+
-
-
-
- -
-
-
- E0
-
-
-
- -
-
-
- C
-
-
-
- -
-
-
- Y+
-
-
-
- -
-
-
- Y-
-
-
-
- -
-
-
- E-
-
-
-
- -
-
-
- Z-
-
-
-
- -
-
-
- 500
-
-
-
- -
-
-
- 500
-
-
-
- -
-
-
- Home All
-
-
-
- -
-
-
- Release
-
-
-
- -
-
-
-
-
-
- 0.100000000000000
-
-
- 100.000000000000000
-
-
- 1.000000000000000
-
-
-
- -
-
-
- X+
-
-
-
- -
-
-
-
- 16777215
- 15
-
-
-
- Step
-
-
-
- -
-
-
-
- 16777215
- 15
-
-
-
- E Step
-
-
-
- -
-
-
- Qt::Vertical
-
-
- QSizePolicy::Expanding
-
-
-
- 20
- 20
-
-
-
-
- -
-
-
- OFF
-
-
-
-
-
-
-
@@ -511,6 +221,299 @@
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 261
+ 500
+
+
+
+ Control
+
+
+ true
+
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ H X
+
+
+
+ -
+
+
+ X-
+
+
+
+ -
+
+
+ H Y
+
+
+
+ -
+
+
+ H Z
+
+
+
+ -
+
+
+
+
+
+ 0.100000000000000
+
+
+ 150.000000000000000
+
+
+ 1.000000000000000
+
+
+
+ -
+
+
+ B tmp
+
+
+
+ -
+
+
+ E tmp
+
+
+
+ -
+
+
+ SET
+
+
+
+ -
+
+
+ SET
+
+
+
+ -
+
+
+ OFF
+
+
+
+ -
+
+
+ FAN ON
+
+
+
+ -
+
+
+ FAN OFF
+
+
+
+ -
+
+
+ ATX ON
+
+
+
+ -
+
+
+ E+
+
+
+
+ -
+
+
+ Z+
+
+
+
+ -
+
+
+ ATX OFF
+
+
+
+ -
+
+
+ E0
+
+
+
+ -
+
+
+ C
+
+
+
+ -
+
+
+ Y+
+
+
+
+ -
+
+
+ Y-
+
+
+
+ -
+
+
+ E-
+
+
+
+ -
+
+
+ Z-
+
+
+
+ -
+
+
+ 500
+
+
+
+ -
+
+
+ 500
+
+
+
+ -
+
+
+ Home All
+
+
+
+ -
+
+
+ Release
+
+
+
+ -
+
+
+ X+
+
+
+
+ -
+
+
+
+ 16777215
+ 15
+
+
+
+ Step
+
+
+
+ -
+
+
+
+
+
+ 0.100000000000000
+
+
+ 100.000000000000000
+
+
+ 1.000000000000000
+
+
+
+ -
+
+
+
+ 16777215
+ 15
+
+
+
+ E Step
+
+
+
+ -
+
+
+ OFF
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Expanding
+
+
+
+ 20
+ 20
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 16777215
+ 26
+
+
+
+ Toolbar
+
+
+ true
+
+
+ Qt::AllToolBarAreas
+
+
+
+ 16
+ 16
+
+
+
+ Qt::ToolButtonTextOnly
+
+
+ true
+
+
+ TopToolBarArea
+
+
+ false
+
+
+
+
+
+
+
+ :/icons/g.png:/icons/g.png
+
Open...
@@ -578,6 +629,10 @@
+
+
+ :/icons/settings.png:/icons/settings.png
+
Settings
@@ -594,6 +649,10 @@
true
+
+
+ :/icons/sd.png:/icons/sd.png
+
Print from SD...