From c9f84dc22d6120df1cb2aba578a82778effaedc3 Mon Sep 17 00:00:00 2001 From: quillford Date: Thu, 12 Mar 2015 15:06:09 -0700 Subject: [PATCH 1/6] Changed Step to Step increment --- mainwindow.ui | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/mainwindow.ui b/mainwindow.ui index 9db0f4a..1ba7c2c 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -376,19 +376,6 @@ - - - - - 16777215 - 15 - - - - Step - - - @@ -868,6 +855,19 @@ STOP + + + + + 16777215 + 15 + + + + Step Increment + + + From 20ab52821b140fd5d2e2c9d206b50881a977a5d3 Mon Sep 17 00:00:00 2001 From: quillford Date: Thu, 12 Mar 2015 15:14:19 -0700 Subject: [PATCH 2/6] Renamed Status to Temperature --- mainwindow.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mainwindow.ui b/mainwindow.ui index 1ba7c2c..4d9783d 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -1014,7 +1014,7 @@ STOP - Status + Temperature From 81b1a73fbb36ebddcdf6b4820368a7ca2758208d Mon Sep 17 00:00:00 2001 From: quillford Date: Thu, 12 Mar 2015 15:20:41 -0700 Subject: [PATCH 3/6] Changed case of buttons --- mainwindow.ui | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/mainwindow.ui b/mainwindow.ui index 4d9783d..09c0568 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -164,6 +164,9 @@ + + + H Y @@ -214,14 +217,14 @@ - OFF + Off - SET + Set @@ -235,14 +238,14 @@ - SET + Set - OFF + Off @@ -275,7 +278,7 @@ - SET + Set @@ -308,35 +311,35 @@ - SET + Set - FAN ON + Fan On - FAN OFF + Fan Off - ATX ON + ATX On - ATX OFF + ATX Off From d33612959bad4a77718b01850c1316092a69290b Mon Sep 17 00:00:00 2001 From: quillford Date: Thu, 12 Mar 2015 15:30:59 -0700 Subject: [PATCH 4/6] Centered speed and flow --- mainwindow.ui | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/mainwindow.ui b/mainwindow.ui index 09c0568..bb6ea36 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -43,13 +43,6 @@ Serial - - - - Ports - - - @@ -60,6 +53,16 @@ + + + + + + + Ports + + + @@ -67,9 +70,6 @@ - - - @@ -254,6 +254,9 @@ 100 + + Qt::AlignCenter + false @@ -284,9 +287,17 @@ + + + 13 + + 100 + + Qt::AlignCenter + false From 0b6b327b0e28b1319fb64712a9be040c58b6ea9c Mon Sep 17 00:00:00 2001 From: quillford Date: Thu, 12 Mar 2015 15:55:10 -0700 Subject: [PATCH 5/6] Disable/Enable Temperature UI with other elements --- mainwindow.cpp | 3 +++ mainwindow.ui | 16 ++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 7321e37..f58c0fb 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -18,6 +18,7 @@ MainWindow::MainWindow(QWidget *parent) : ui->actionPrint_from_SD->setDisabled(true); ui->actionSet_SD_printing_mode->setDisabled(true); ui->actionEEPROM_editor->setDisabled(true); + ui->statusGroup->setDisabled(true); ui->extruderlcd->setPalette(Qt::red); ui->bedlcd->setPalette(Qt::red); ui->sendtext->installEventFilter(this); @@ -267,6 +268,7 @@ void MainWindow::serialconnect() ui->progressBar->setValue(0); ui->controlBox->setDisabled(false); ui->consoleGroup->setDisabled(false); + ui->statusGroup->setDisabled(false); ui->actionPrint_from_SD->setEnabled(true); ui->actionSet_SD_printing_mode->setEnabled(true); if(firmware == Repetier) ui->actionEEPROM_editor->setDisabled(false); @@ -285,6 +287,7 @@ void MainWindow::serialconnect() ui->consoleGroup->setDisabled(true); ui->actionPrint_from_SD->setDisabled(true); ui->actionSet_SD_printing_mode->setDisabled(true); + ui->statusGroup->setDisabled(true); ui->actionEEPROM_editor->setDisabled(false); } } diff --git a/mainwindow.ui b/mainwindow.ui index bb6ea36..7f0030f 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -416,7 +416,7 @@ - B tmp + Bed tmp @@ -903,6 +903,13 @@ STOP Console + + + + Send + + + @@ -923,13 +930,6 @@ STOP - - - - Send - - - From 0942f54ab79a0d499f41ae35637d80a22bb09390 Mon Sep 17 00:00:00 2001 From: quillford Date: Thu, 12 Mar 2015 16:14:24 -0700 Subject: [PATCH 6/6] Centered temperatrue input fields --- mainwindow.ui | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/mainwindow.ui b/mainwindow.ui index 7f0030f..dff62a8 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -143,6 +143,15 @@ + + this is tool tip e0 + + + this is status e0 + + + this is e0 + E0 @@ -209,6 +218,9 @@ + + Qt::AlignCenter + 500 @@ -230,6 +242,9 @@ + + Qt::AlignCenter + 500