From 620050462778aae97a5db080b51cf738681f4bcb Mon Sep 17 00:00:00 2001
From: Dmytro Bogovych <dmytro.bogovych@gmail.com>
Date: Mon, 28 Nov 2022 21:21:44 +0300
Subject: [PATCH] - minor fixes + renamed audio alarms + increased version to
 0.1.12

---
 app/config.h           | 2 +-
 app/main.cpp           | 2 +-
 app/mainwindow.cpp     | 2 +-
 app/mainwindow.h       | 4 ++--
 app/settings.h         | 8 ++++----
 app/settingsdialog.cpp | 2 +-
 app/settingsdialog.ui  | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/config.h b/app/config.h
index dfd3eb7..6e6cc0c 100644
--- a/app/config.h
+++ b/app/config.h
@@ -4,7 +4,7 @@
 // App version
 #define QBREAK_VERSION_MAJOR    0
 #define QBREAK_VERSION_MINOR    1
-#define QBREAK_VERSION_SUFFIX   11
+#define QBREAK_VERSION_SUFFIX   12
 
 // How often UI is updated - interval in seconds
 #define INTERVAL_UPDATE_UI          (60)
diff --git a/app/main.cpp b/app/main.cpp
index a992b80..93e26d2 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -9,7 +9,7 @@
 
 int main(int argc, char *argv[])
 {
-    RunGuard guard("adjfaifaif");
+    RunGuard guard("QBreak app - runguard");
     if ( !guard.tryToRun() )
         return 0;
 
diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
index e49dbec..d207817 100644
--- a/app/mainwindow.cpp
+++ b/app/mainwindow.cpp
@@ -454,7 +454,7 @@ void MainWindow::onLongBreakEnd()
     }
 
     // Play selected audio. When break is postponed - audio is not played
-    if (!mPostponeCount)
+    if (0 == mPostponeCount)
         play_audio(mAppConfig.play_audio);
 
     // Run script
diff --git a/app/mainwindow.h b/app/mainwindow.h
index 7c31d6c..4894a21 100644
--- a/app/mainwindow.h
+++ b/app/mainwindow.h
@@ -53,12 +53,12 @@ private:
     std::optional<int> mRemainingWorkInterval;
 
     app_settings::config mAppConfig;
-    int mPostponeCount;
+    int mPostponeCount = 0;
 
     // Time when idle was started
     std::optional<std::chrono::steady_clock::time_point> mIdleStart;
 
-    int mLastIdleMilliseconds;
+    int mLastIdleMilliseconds = 0;
 
     AppState mState = AppState::None;
 
diff --git a/app/settings.h b/app/settings.h
index 01eaeee..2472188 100644
--- a/app/settings.h
+++ b/app/settings.h
@@ -27,8 +27,8 @@ const QString Primary_Monitor = "[Primary]";
 
 // Default behavior is not play any audio on break end.
 const QString Audio_Empty = "None";
-const QString Audio_Default_1 = "Default 1";
-const QString Audio_Default_2 = "Default 2";
+const QString Audio_Retro = "Retro";
+const QString Audio_Gagarin = "Gagarin";
 const QString Audio_Custom = "Custom...";
 
 struct audio_item
@@ -38,8 +38,8 @@ struct audio_item
 };
 
 const std::map<QString, QString> AudioMap {
-    {Audio_Default_1, ":/assets/sound/alarm-retro.wav"},
-    {Audio_Default_2, ":/assets/sound/alarm-poehali.wav"},
+    {Audio_Retro, ":/assets/sound/alarm-retro.wav"},
+    {Audio_Gagarin, ":/assets/sound/alarm-poehali.wav"},
 };
 
 
diff --git a/app/settingsdialog.cpp b/app/settingsdialog.cpp
index ed458d8..2d9b687 100644
--- a/app/settingsdialog.cpp
+++ b/app/settingsdialog.cpp
@@ -55,7 +55,7 @@ void SettingsDialog::init()
     ui->mPreferredMonitorCombobox->setCurrentIndex(found_idx);
 
     // Fill audio combo box
-    auto audios = {Audio_Empty, Audio_Default_1, Audio_Default_2, Audio_Custom};
+    auto audios = {Audio_Empty, Audio_Retro, Audio_Gagarin, Audio_Custom};
     ui->mAudioComboBox->addItems(audios);
     mCustomAudioIdx = audios.size() - 1;
 
diff --git a/app/settingsdialog.ui b/app/settingsdialog.ui
index d5045ff..81411be 100644
--- a/app/settingsdialog.ui
+++ b/app/settingsdialog.ui
@@ -131,7 +131,7 @@
      <item row="9" column="0">
       <widget class="QLabel" name="label_8">
        <property name="text">
-        <string>Command to run when break finish</string>
+        <string>Shell command to run when break finish</string>
        </property>
       </widget>
      </item>