From d9f9d2416555668e1a2e356c2d601a713636f032 Mon Sep 17 00:00:00 2001 From: rogo Date: Mon, 14 Oct 2019 15:13:05 +0200 Subject: [PATCH] ui overhaul --- mainwindow.cpp | 36 ++- mainwindow.ui | 639 +++++++++------------------------------------ mwicon.png | Bin 0 -> 15371 bytes resources.qrc | 5 +- shutdown2.pro.user | 337 ------------------------ style.css | 62 ++--- 6 files changed, 178 insertions(+), 901 deletions(-) create mode 100644 mwicon.png delete mode 100644 shutdown2.pro.user diff --git a/mainwindow.cpp b/mainwindow.cpp index 3537b9f..97a12c7 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -7,6 +7,7 @@ #include #include +#include class QNetworkReply; namespace shutdown2 { @@ -29,6 +30,21 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi mCss = css.readAll(); setStyleSheet(mCss); + // init timers + QApplication::setEffectEnabled(Qt::UI_AnimateCombo, false); + ui->cb_timers->setValidator(new QIntValidator(0, 99999, this)); + ui->cb_timers->setAutoCompletion(false); + ui->cb_timers->lineEdit()->setAlignment(Qt::AlignRight); + ui->cb_timers->addItem("0"); + ui->cb_timers->addItem("11"); + ui->cb_timers->addItem("22"); + ui->cb_timers->addItem("30"); + ui->cb_timers->addItem("45"); + ui->cb_timers->addItem("60"); + ui->cb_timers->addItem("90"); + ui->cb_timers->addItem("120"); + ui->cb_timers->addItem("240"); + // init state machine initStateMachine(); connect(&mTimer, &QTimer::timeout, this, &MainWindow::updateTime); @@ -78,6 +94,7 @@ void MainWindow::shutdown() void MainWindow::updateTime() { if (mTimeLeft == 0) { + ui->lbl_timer->setText("00:00"); shutdown(); mTimer.stop(); return; @@ -93,27 +110,20 @@ void MainWindow::updateTime() } void MainWindow::timerToggled() { + if (ui->btn_startstop->property("on").toBool()) { - - int time = 0; - foreach (QRadioButton* r, ui->groupBox->findChildren()) { - if (r->isChecked()) { - time = r->property("value").toInt(); - break; - } - } - - if (time == -1) - time = ui->spinBox->value(); - + int time = ui->cb_timers->currentText().toInt(); time *= 60; // convert to seconds mTimeLeft = time; updateTime(); mTimer.start(1000); + ui->stackedWidget->setCurrentIndex(1); + } else { - mTimeLeft = -2; + mTimeLeft = -1; mTimer.stop(); ui->lbl_timer->setText("-- : --"); + ui->stackedWidget->setCurrentIndex(0); } } diff --git a/mainwindow.ui b/mainwindow.ui index fb72b3b..ee9a126 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -6,8 +6,8 @@ 0 0 - 365 - 269 + 279 + 118 @@ -29,26 +29,137 @@ false - + - 10 + 8 - 10 + 8 - 10 + 8 - 10 + 8 0 - 10 + 8 - + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 15 + + + 0 + + + + + + 0 + 0 + + + + + 28 + + + + Qt::RightToLeft + + + true + + + QComboBox::InsertAtTop + + + + + + + + 20 + + + + minutes + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 28 + + + + QFrame::StyledPanel + + + QFrame::Sunken + + + -- : -- + + + Qt::AlignCenter + + + false + + + + + + + + @@ -64,9 +175,12 @@ - 10 + 20 + + Qt::LeftToRight + Start @@ -81,517 +195,12 @@ - - - - - 0 - 0 - - - - - 28 - - - - QFrame::StyledPanel - - - QFrame::Sunken - - - -- : -- - - - Qt::AlignCenter - - - false - - - - - - - - 0 - 0 - - - - - - - Qt::AlignCenter - - - - 5 - - - 0 - - - 5 - - - 5 - - - 5 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 5 - - - 0 - - - - - 10 - - - QLayout::SetDefaultConstraint - - - 10 - - - 0 - - - 10 - - - 0 - - - - - - 0 - 0 - - - - - 10 - - - - 90 min - - - 90 - - - - - - - - - 10 - - - QLayout::SetDefaultConstraint - - - 10 - - - 0 - - - 10 - - - 0 - - - - - - 0 - 0 - - - - - 10 - - - - 22 min - - - 22 - - - - - - - - - 10 - - - QLayout::SetDefaultConstraint - - - 10 - - - 0 - - - 10 - - - 0 - - - - - - 0 - 0 - - - - - 10 - - - - 60 min - - - 60 - - - - - - - - - 10 - - - QLayout::SetDefaultConstraint - - - 10 - - - 0 - - - 10 - - - 0 - - - - - - 0 - 0 - - - - - 10 - - - - 11 min - - - 11 - - - - - - - - - 10 - - - QLayout::SetDefaultConstraint - - - 10 - - - 0 - - - 10 - - - 0 - - - - - - 0 - 0 - - - - - 10 - - - - 45 min - - - 45 - - - - - - - - - 10 - - - QLayout::SetDefaultConstraint - - - 10 - - - 0 - - - 10 - - - 0 - - - - - - 0 - 0 - - - - - 10 - - - - 30 min - - - 30 - - - - - - - - - 10 - - - QLayout::SetDefaultConstraint - - - 10 - - - 0 - - - 10 - - - 0 - - - - - - 0 - 0 - - - - - 10 - - - - 120 min - - - 120 - - - - - - - - - 5 - - - QLayout::SetDefaultConstraint - - - 10 - - - 0 - - - 10 - - - 0 - - - - - - 0 - 0 - - - - - 10 - - - - - - - -1 - - - - - - - - 0 - 0 - - - - - 10 - - - - 999 - - - 240 - - - - - - - - - 10 - - - QLayout::SetDefaultConstraint - - - 10 - - - 0 - - - 10 - - - 0 - - - - - - 0 - 0 - - - - - 10 - - - - Now - - - true - - - 0 - - - - - - - - - - btn_startstop - r_0 - r_11 - r_22 - r_30 - r_45 - r_60 - r_90 - r_120 - r_custom diff --git a/mwicon.png b/mwicon.png new file mode 100644 index 0000000000000000000000000000000000000000..6b15ef344d1d2f7631a8254562a09a5f9a46f919 GIT binary patch literal 15371 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%0AIe^( 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 brt?l8b1k&UGZTE|3)`@E)0*5>dr$lyYd3sc literal 0 HcmV?d00001 diff --git a/resources.qrc b/resources.qrc index 6827504..4e6388f 100644 --- a/resources.qrc +++ b/resources.qrc @@ -1,5 +1,6 @@ - - + + style.css + mwicon.png diff --git a/shutdown2.pro.user b/shutdown2.pro.user deleted file mode 100644 index 2c0c045..0000000 --- a/shutdown2.pro.user +++ /dev/null @@ -1,337 +0,0 @@ - - - - - - EnvironmentId - {2eab4085-7443-4062-b54e-64c18ac87c35} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - -fno-delayed-template-parsing - - true - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.12.2 MinGW 64-bit - Desktop Qt 5.12.2 MinGW 64-bit - qt.qt5.5122.win64_mingw73_kit - 0 - 0 - 0 - - L:/workspace/shutdown2/build-shutdown2-Desktop_Qt_5_12_2_MinGW_64_bit-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - L:/workspace/build-yremote-Desktop_Qt_5_12_2_MinGW_64_bit-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - true - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - L:/workspace/build-yremote-Desktop_Qt_5_12_2_MinGW_64_bit-Profile - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - true - true - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 3 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy Configuration - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - dwarf - - cpu-cycles - - - 250 - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - shutdown2 - - Qt4ProjectManager.Qt4RunConfiguration:L:/workspace/shutdown2/shutdown2.pro - - 3768 - false - true - true - false - false - true - - L:/workspace/shutdown2/build-shutdown2-Desktop_Qt_5_12_2_MinGW_64_bit-Debug - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 22 - - - Version - 22 - - diff --git a/style.css b/style.css index 2fa19ed..ba489a1 100644 --- a/style.css +++ b/style.css @@ -12,6 +12,10 @@ QMainWindow { border-color: #edf2f4; } +QPushButton { + padding-bottom: 5px; +} + QPushButton[on=true] { background-color: #d63429; color: #edf2f4; @@ -22,39 +26,44 @@ QPushButton[on=false] { color: #404040; } -QPushButton:hover { +QPushButton::hover { border: 1px solid #edf2f4; } -QRadioButton { - color: #edf2f4; - background-color: #404040; -} - -QSpinBox { +QComboBox { color: #edf2f4; background-color: #404040; + padding-top: 10px; + padding-bottom: 10px; } -QSpinBox::up-button { - color: #404040; +QComboBox:hover { + border: 1px solid #edf2f4; } -QSpinBox::down-button { - color: #404040; +QComboBox::drop-down { + color: #edf2f4; + background-color: #999999; + margin: 2px; + + subcontrol-origin: padding; + subcontrol-position: top right; + width: 15px; } -QSpinBox:hover { - border: 1px solid #0077fd; +QComboBox::down-arrow +{ + image: url(:/mwicon.png); + width: 48px; + height: 48px; } -QLineEdit { +QComboBox QAbstractItemView{ background-color: #404040; color: #edf2f4; - border: 1px solid #0077fd; -} -QLineEdit:hover { + selection-background-color: #999999; + selection-color: #24e895; } QLabel { @@ -62,25 +71,10 @@ QLabel { } QLabel#lbl_timer[on=false] { - border: 1px solid #d63429; -} - -QLabel#lbl_timer[on=true] { border: 1px solid #24e895; } -QGroupBox { - color: #edf2f4; - border: 1px solid #edf2f4; - margin-top: 5px; +QLabel#lbl_timer[on=true] { + border: 1px solid #d63429; } -QGroupBox::title { - subcontrol-origin: margin; - left: 5px; - padding: 0px 5px 0px 5px; - } -/* -QLabel#lbl_volume:hover { - border: 1px solid var(--highlight-blue); -}*/