From f3487fae38de6ddc7fa9cefda83201110dfe2b51 Mon Sep 17 00:00:00 2001 From: NeoTheFox Date: Wed, 4 Mar 2015 14:29:09 +0300 Subject: [PATCH] UI tweaks Fixed settings --- aboutwindow.ui | 60 +++++++++++++++++++++------------------------- graphics.qrc | 1 + icons/about.png | Bin 0 -> 766 bytes mainwindow.cpp | 8 +++---- sdwindow.ui | 8 ++++++- settingswindow.ui | 8 ++++++- 6 files changed, 46 insertions(+), 39 deletions(-) create mode 100644 icons/about.png diff --git a/aboutwindow.ui b/aboutwindow.ui index 064d63c..a65634b 100644 --- a/aboutwindow.ui +++ b/aboutwindow.ui @@ -11,25 +11,30 @@ - About + About RepRaptor + + + + :/icons/about.png:/icons/about.png - - - - About RepRaptor + + + + Qt::Horizontal - + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + false - - - - - false - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> @@ -42,31 +47,20 @@ p, li { white-space: pre-wrap; } <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> - - - true - - - true - - - - - - - - - - Qt::Horizontal - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + true + + + true - + + + buttonBox diff --git a/graphics.qrc b/graphics.qrc index d10ffa5..84edab9 100644 --- a/graphics.qrc +++ b/graphics.qrc @@ -7,5 +7,6 @@ icons/g.png icons/sd.png icons/settings.png + icons/about.png diff --git a/icons/about.png b/icons/about.png new file mode 100644 index 0000000000000000000000000000000000000000..30a47032a41d7cd11430c2a3e6020f6f363b92f7 GIT binary patch literal 766 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7BuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFfH(OaSW-rwIukwzp$f7-R9kQ^={{Cvo;DX%Gh`% zp}E6QZc2uUSCVq4`+p|koikn>o!wb3)T7Qn>j%3;M~8c|s-em(g-Z;sfj4$w@k(MrRvxI+hmp! z^(}bT_iqlYrbQYnZ1zm;_%7IB_U)N#tM+a9e{|z_Hg%pa&lb4G zwtoqd3(}Nz@oY)huyJZ(#;whJ;}v!|i#U|Zup5*)=ubJY<n9KxUucl)2@>iXV#es`mg_UDpxCuA?4`##uo{`w)Te) zzL_;&alUq%nFc`qX6Y*$*0wA1eMToXo0?S$VdG=LTDHc53Ow!dLqrO!7Hu zi*l=rmu2XEey(|2j(^XJ_+W-7bPRx4+$ z(7X3x#m4Hl8}AA0#@hO38C==merKE6^k+q{KO1M>o+Hm_ZTT>4+K)X~SRzz?Mb0Xe zY-_ww&lph6AIcMcdm3YTE#Had{0?|kJEVDNPHb6Mw<&;$UUabCUv literal 0 HcmV?d00001 diff --git a/mainwindow.cpp b/mainwindow.cpp index b66aa14..d3e20c9 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -23,8 +23,8 @@ MainWindow::MainWindow(QWidget *parent) : ui->baudbox->addItem(QString::number(250000)); ui->baudbox->addItem(QString::number(460800)); ui->baudbox->addItem(QString::number(500000)); - if(settings.value("printer/baudrateIndex").toInt()) ui->baudbox->setCurrentIndex(settings.value("printer/baudrateIndex").toInt()); - ui->baudbox->setCurrentIndex(2); + if(settings.value("printer/baudrateindex").toInt()) ui->baudbox->setCurrentIndex(settings.value("printer/baudrateindex").toInt()); + else ui->baudbox->setCurrentIndex(2); ui->extruderlcd->setPalette(Qt::red); ui->bedlcd->setPalette(Qt::red); @@ -82,9 +82,9 @@ MainWindow::~MainWindow() if(gfile.isOpen()) gfile.close(); if(printer.isOpen()) printer.close(); - settings.setValue("printer/baudrateIndex", ui->baudbox->currentIndex()); + settings.setValue("printer/baudrateindex", ui->baudbox->currentIndex()); settings.setValue("core/checktemperature", ui->checktemp->isChecked()); - settings.setValue("user/extrudertemp", ui->estepspin->value()); + settings.setValue("user/extrudertemp", ui->etmpspin->value()); settings.setValue("user/bedtemp", ui->btmpspin->value()); if(firstrun) settings.setValue("core/firstrun", true); diff --git a/sdwindow.ui b/sdwindow.ui index 365abc0..d295862 100644 --- a/sdwindow.ui +++ b/sdwindow.ui @@ -13,6 +13,10 @@ Dialog + + + :/icons/sd.png:/icons/sd.png + @@ -43,7 +47,9 @@ - + + + buttonBox diff --git a/settingswindow.ui b/settingswindow.ui index 4508041..55c54dc 100644 --- a/settingswindow.ui +++ b/settingswindow.ui @@ -13,6 +13,10 @@ Settings + + + :/icons/settings.png:/icons/settings.png + @@ -154,7 +158,9 @@ - + + + buttonBox