diff --git a/mainwindow.cpp b/mainwindow.cpp
index 5c2d093..3d72201 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -44,10 +44,12 @@ void MainWindow::initStateMachine()
QState* on = new QState();
on->assignProperty(ui->btn_startstop, "on", false);
on->assignProperty(ui->lbl_timer, "on", false);
+ on->assignProperty(ui->btn_startstop, "text", "Stop");
QState* off = new QState();
off->assignProperty(ui->btn_startstop, "on", true);
off->assignProperty(ui->lbl_timer, "on", true);
+ off->assignProperty(ui->btn_startstop, "text", "Start");
// transistions
on->addTransition(ui->btn_startstop, SIGNAL(clicked()), off);
@@ -66,9 +68,9 @@ void MainWindow::triggerCssUpdate()
setStyleSheet(mCss);
}
-}
-
-void shutdown2::MainWindow::on_btn_startstop_clicked()
+void MainWindow::on_btn_startstop_clicked()
{
triggerCssUpdate();
}
+
+}
diff --git a/mainwindow.ui b/mainwindow.ui
index 381f6a8..f1c5053 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -6,10 +6,16 @@
0
0
- 283
- 254
+ 365
+ 269
+
+
+ 0
+ 0
+
+
Qt::NoContextMenu
@@ -20,18 +26,18 @@
false
-
+
- 5
+ 10
10
- 5
+ 10
- 5
+ 10
0
@@ -98,13 +104,19 @@
-
+
+
+ 0
+ 0
+
+
Qt::AlignCenter
-
+
5
@@ -134,7 +146,10 @@
0
-
+
+ 5
+
+
0
-
@@ -142,6 +157,9 @@
10
+
+ QLayout::SetDefaultConstraint
+
10
@@ -149,7 +167,7 @@
0
- 0
+ 10
0
@@ -167,19 +185,6 @@
10
-
-
-
-
-
- -
-
-
-
- 2
- 1
-
-
90 min
@@ -192,6 +197,9 @@
10
+
+ QLayout::SetDefaultConstraint
+
10
@@ -199,7 +207,7 @@
0
- 0
+ 10
0
@@ -217,19 +225,6 @@
10
-
-
-
-
-
- -
-
-
-
- 2
- 1
-
-
22 min
@@ -242,6 +237,9 @@
10
+
+ QLayout::SetDefaultConstraint
+
10
@@ -249,7 +247,7 @@
0
- 0
+ 10
0
@@ -267,19 +265,6 @@
10
-
-
-
-
-
- -
-
-
-
- 2
- 1
-
-
60 min
@@ -292,6 +277,9 @@
10
+
+ QLayout::SetDefaultConstraint
+
10
@@ -299,7 +287,7 @@
0
- 0
+ 10
0
@@ -317,19 +305,6 @@
10
-
-
-
-
-
- -
-
-
-
- 2
- 1
-
-
11 min
@@ -342,6 +317,9 @@
10
+
+ QLayout::SetDefaultConstraint
+
10
@@ -349,7 +327,7 @@
0
- 0
+ 10
0
@@ -367,19 +345,6 @@
10
-
-
-
-
-
- -
-
-
-
- 2
- 1
-
-
45 min
@@ -392,6 +357,9 @@
10
+
+ QLayout::SetDefaultConstraint
+
10
@@ -399,7 +367,7 @@
0
- 0
+ 10
0
@@ -417,19 +385,6 @@
10
-
-
-
-
-
- -
-
-
-
- 2
- 1
-
-
30 min
@@ -442,6 +397,9 @@
10
+
+ QLayout::SetDefaultConstraint
+
10
@@ -449,7 +407,7 @@
0
- 0
+ 10
0
@@ -467,19 +425,6 @@
10
-
-
-
-
-
- -
-
-
-
- 2
- 1
-
-
120 min
@@ -490,10 +435,10 @@
-
- 10
+ 5
- QLayout::SetFixedSize
+ QLayout::SetDefaultConstraint
10
@@ -528,7 +473,7 @@
-
-
+
0
0
@@ -541,6 +486,9 @@
999
+
+ 240
+
@@ -550,6 +498,9 @@
10
+
+ QLayout::SetDefaultConstraint
+
10
@@ -557,7 +508,7 @@
0
- 0
+ 10
0
@@ -576,26 +527,13 @@
-
+ Now
true
- -
-
-
-
- 2
- 1
-
-
-
- Now
-
-
-
diff --git a/shutdown2.pro.user b/shutdown2.pro.user
index ab683fe..8a69f2f 100644
--- a/shutdown2.pro.user
+++ b/shutdown2.pro.user
@@ -1,10 +1,10 @@
-
+
EnvironmentId
- {2eab4085-7443-4062-b54e-64c18ac87c35}
+ {1042e94e-a121-467f-86f8-548b0504a650}
ProjectExplorer.Project.ActiveTarget
@@ -39,39 +39,37 @@
1
true
false
- 0
+ 1
true
true
- 0
+ 1
8
true
1
true
true
true
- false
+ true
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
+ Desktop Qt 5.12.2 Clang 64bit
+ Desktop Qt 5.12.2 Clang 64bit
+ {3623dadc-96df-4513-a832-6bb4de7f7933}
0
0
0
- L:/workspace/shutdown2/build-shutdown2-Desktop_Qt_5_12_2_MinGW_64_bit-Debug
+ /home/rogo/workspace/shutdown2/build-shutdown2-Desktop_Qt_5_12_2_Clang_64bit-Debug
true
@@ -126,119 +124,7 @@
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
+ 1
0
@@ -281,11 +167,11 @@
1
25
- 1
+ 0
true
false
true
- valgrind
+ /usr/bin/valgrind
0
1
@@ -305,19 +191,19 @@
2
- shutdown2
+
+ Custom Executable
- Qt4ProjectManager.Qt4RunConfiguration:L:/workspace/shutdown2/shutdown2.pro
+ ProjectExplorer.CustomExecutableRunConfiguration
3768
false
true
- true
false
false
true
- L:/workspace/shutdown2/build-shutdown2-Desktop_Qt_5_12_2_MinGW_64_bit-Debug
+
1