Merge branch 'dev' into main

* The program now has new icons from Google's Material Icons * The program now switches to a 5-minute break timer when a task is completed, in accordance with what the pomodoro technique requires
nsh07 · Dec 28, 2022 · d5758b1 · d5758b1
2 parents b975589 + e6988e1
commit d5758b1
Show file tree

Hide file tree

Showing 30 changed files with 88 additions and 69 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.5)
 
-project(pomodoro VERSION 0.3 LANGUAGES CXX)
+project(pomodoro VERSION 0.4 LANGUAGES CXX)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 

diff --git a/icons/add_task-light.svg b/icons/add_task-light.svg
diff --git a/icons/add_task.svg b/icons/add_task.svg
diff --git a/icons/delete-light.svg b/icons/delete-light.svg
diff --git a/icons/delete.svg b/icons/delete.svg
diff --git a/icons/edit-delete-symbolic-light.svg b/icons/edit-delete-symbolic-light.svg
diff --git a/icons/edit-delete-symbolic.svg b/icons/edit-delete-symbolic.svg
diff --git a/icons/list-add-symbolic-light.svg b/icons/list-add-symbolic-light.svg
diff --git a/icons/list-add-symbolic.svg b/icons/list-add-symbolic.svg
diff --git a/icons/local_cafe-light.svg b/icons/local_cafe-light.svg
diff --git a/icons/local_cafe.svg b/icons/local_cafe.svg
diff --git a/icons/media-playback-start-symbolic-light.svg b/icons/media-playback-start-symbolic-light.svg
diff --git a/icons/media-playback-start-symbolic.svg b/icons/media-playback-start-symbolic.svg
diff --git a/icons/media-playback-stop-symbolic-light.svg b/icons/media-playback-stop-symbolic-light.svg
diff --git a/icons/media-playback-stop-symbolic.svg b/icons/media-playback-stop-symbolic.svg
diff --git a/icons/pause-light.svg b/icons/pause-light.svg
diff --git a/icons/pause.svg b/icons/pause.svg
diff --git a/icons/pending_actions-light.svg b/icons/pending_actions-light.svg
diff --git a/icons/pending_actions.svg b/icons/pending_actions.svg
diff --git a/icons/play_arrow-light.svg b/icons/play_arrow-light.svg
diff --git a/icons/play_arrow.svg b/icons/play_arrow.svg
diff --git a/icons/preferences-system-time-symbolic-light.svg b/icons/preferences-system-time-symbolic-light.svg
diff --git a/icons/preferences-system-time-symbolic.svg b/icons/preferences-system-time-symbolic.svg
diff --git a/icons/restart_alt-light.svg b/icons/restart_alt-light.svg
diff --git a/icons/restart_alt.svg b/icons/restart_alt.svg
diff --git a/icons/system-restart-symbolic-light.svg b/icons/system-restart-symbolic-light.svg
diff --git a/icons/system-restart-symbolic.svg b/icons/system-restart-symbolic.svg
diff --git a/include/mainwindow.h b/include/mainwindow.h
@@ -26,9 +26,13 @@ class MainWindow : public QMainWindow
         void remTask(int index=3);
         void remTask(QLabel *lbl);
         void subTime();
+        void subBreakTime();
         void resetTime();
 
     private:
+        void startBreak();
+        void endBreak();
+
         QScrollArea *scrAr;
         QWidget *base;
         QTabWidget *tabWid;
@@ -40,6 +44,8 @@ class MainWindow : public QMainWindow
         QString iconSuffix;
 
         int time;
+        int breakTime;
+        QLabel *breakTimeLbl;
         CustomTimer *timer;
         QFont timerFont;
         QFont taskFont;

diff --git a/resources.qrc b/resources.qrc
@@ -1,16 +1,18 @@
 <RCC>
     <qresource prefix="/">
-        <file>icons/media-playback-start-symbolic.svg</file>
-        <file>icons/media-playback-start-symbolic-light.svg</file>
-        <file>icons/media-playback-stop-symbolic.svg</file>
-        <file>icons/media-playback-stop-symbolic-light.svg</file>
-        <file>icons/preferences-system-time-symbolic.svg</file>
-        <file>icons/preferences-system-time-symbolic-light.svg</file>
-        <file>icons/system-restart-symbolic.svg</file>
-        <file>icons/system-restart-symbolic-light.svg</file>
-        <file>icons/list-add-symbolic.svg</file>
-        <file>icons/list-add-symbolic-light.svg</file>
-        <file>icons/edit-delete-symbolic.svg</file>
-        <file>icons/edit-delete-symbolic-light.svg</file>
+        <file>icons/play_arrow.svg</file>
+        <file>icons/play_arrow-light.svg</file>
+        <file>icons/pause.svg</file>
+        <file>icons/pause-light.svg</file>
+        <file>icons/pending_actions.svg</file>
+        <file>icons/pending_actions-light.svg</file>
+        <file>icons/restart_alt.svg</file>
+        <file>icons/restart_alt-light.svg</file>
+        <file>icons/add_task.svg</file>
+        <file>icons/add_task-light.svg</file>
+        <file>icons/delete.svg</file>
+        <file>icons/delete-light.svg</file>
+        <file>icons/local_cafe.svg</file>
+        <file>icons/local_cafe-light.svg</file>
     </qresource>
 </RCC>