diff --git a/main.glade b/main.glade
deleted file mode 100644
index 1e0eafc..0000000
--- a/main.glade
+++ /dev/null
@@ -1,143 +0,0 @@
-
-
-
-
-
-
-
diff --git a/pom.glade b/pom.glade
new file mode 100644
index 0000000..b565566
--- /dev/null
+++ b/pom.glade
@@ -0,0 +1,401 @@
+
+
+
+
+
+ True
+ False
+ preferences-other
+
+
+ 100
+ 1
+ 10
+
+
+ 100
+ 1
+ 10
+
+
+ 100
+ 1
+ 10
+
+
+ 100
+ 1
+ 10
+
+
+ False
+ False
+ dialog-ok
+
+
+
+
+
+ True
+ False
+ slide-left-right
+
+
+ True
+ False
+ vertical
+
+
+ True
+ False
+ 12
+ 0:00:00
+
+
+
+
+
+
+
+ False
+ True
+ 4
+ 1
+
+
+
+
+ True
+ False
+ 18
+ 18
+ 8
+
+
+ Start
+ True
+ True
+ True
+
+
+
+ True
+ True
+ 4
+ 0
+
+
+
+
+ Pause
+ True
+ True
+ True
+ Pause the timer
+
+
+
+ True
+ True
+ 4
+ 1
+
+
+
+
+ Restart
+ True
+ True
+ True
+ Stop the timer
+
+
+
+ True
+ True
+ 4
+ 2
+
+
+
+
+ False
+ False
+ 8
+ 2
+
+
+
+
+ timerView
+ Timer
+
+
+
+
+ True
+ False
+
+
+ True
+ False
+ 4
+ 4
+ 8
+ vertical
+ True
+
+
+ True
+ False
+ start
+ Timer durations
+
+
+
+
+
+
+ False
+ True
+ 0
+
+
+
+
+ True
+ False
+ start
+ 4
+ Work (mins)
+
+
+ False
+ True
+ 1
+
+
+
+
+ True
+ True
+ workTime
+ 25
+
+
+ False
+ True
+ 2
+
+
+
+
+ True
+ False
+ start
+ 4
+ Short Break
+
+
+ False
+ True
+ 3
+
+
+
+
+ True
+ True
+ shortBreak
+ 5
+
+
+ False
+ True
+ 4
+
+
+
+
+ True
+ False
+ start
+ 4
+ Long Break
+
+
+ False
+ True
+ 5
+
+
+
+
+ True
+ True
+ longBreak
+ 15
+
+
+ False
+ True
+ 6
+
+
+
+
+ False
+ True
+ 8
+ 0
+
+
+
+
+ True
+ False
+ 4
+ 4
+ 4
+ 8
+ vertical
+
+
+ True
+ False
+ start
+ 4
+ 34
+ Long Break interval
+
+
+ False
+ True
+ 0
+
+
+
+
+ True
+ True
+ longBreakInterval
+ 3
+
+
+ False
+ True
+ 8
+ 1
+
+
+
+
+ Auto start next round
+ True
+ True
+ False
+ True
+
+
+ False
+ True
+ 8
+ 2
+
+
+
+
+ False
+ True
+ 7
+ 1
+
+
+
+
+ True
+ False
+ 4
+ 4
+ 8
+ vertical
+
+
+
+
+
+
+
+
+ Apply
+ True
+ True
+ True
+
+
+ False
+ True
+ end
+ 2
+
+
+
+
+ False
+ True
+ 8
+ 2
+
+
+
+
+ settingsView
+ Settings
+ 1
+
+
+
+
+
+
diff --git a/pom.py b/pom.py
index 3369c94..9f54088 100644
--- a/pom.py
+++ b/pom.py
@@ -3,7 +3,6 @@
import gi
import time
import datetime
-import timeit
import threading
gi.require_version("Gtk", "3.0")
@@ -16,7 +15,7 @@ class Main:
self.timer_running = False
self.builder = Gtk.Builder()
- self.builder.add_from_file('main.glade')
+ self.builder.add_from_file('pom.glade')
#self.builder.add_from_file('secondtry.glade')
self.builder.connect_signals(self)
@@ -29,6 +28,8 @@ class Main:
self.time_display = self.builder.get_object("time_display")
self.mode_switch = self.builder.get_object('modeSwitch')
+ self.stack = self.builder.get_object("mainStack")
+
self.mode_switch.connect('notify::active', self.work_break_switch)
self.POMTIME = 25 * 60
@@ -94,7 +95,6 @@ class Main:
def pauseCountdown(self,button):
print('Pressed stop')
self.event.set()
- self.timer.join()
self.timer_running = False
def restartCountdown(self, button):
@@ -104,6 +104,22 @@ class Main:
self.event.set()
self.startCountdown(button)
+# Settings windows
+
+ def openSettings(self, button):
+ current_page = self.stack.get_visible_child()
+ settingspage = self.stack.get_child_by_name('settingsView')
+
+ if current_page is settingspage:
+ self.closeSettings(button)
+ else:
+ self.stack.set_visible_child(settingspage)
+
+ def closeSettings(self, button):
+ mainPage = self.stack.get_child_by_name('timerView')
+ self.stack.set_visible_child(mainPage)
+
+
if __name__ == '__main__':