Skip to content

Commit 7e5313e

Browse files
author
Keny C
committed
Broke down time input in hours/minutes/seconds
1 parent 55a2803 commit 7e5313e

File tree

2 files changed

+217
-8
lines changed

2 files changed

+217
-8
lines changed

.gitignore

+160
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
1+
# Byte-compiled / optimized / DLL files
2+
__pycache__/
3+
*.py[cod]
4+
*$py.class
5+
6+
# C extensions
7+
*.so
8+
9+
# Distribution / packaging
10+
.Python
11+
build/
12+
develop-eggs/
13+
dist/
14+
downloads/
15+
eggs/
16+
.eggs/
17+
lib/
18+
lib64/
19+
parts/
20+
sdist/
21+
var/
22+
wheels/
23+
share/python-wheels/
24+
*.egg-info/
25+
.installed.cfg
26+
*.egg
27+
MANIFEST
28+
29+
# PyInstaller
30+
# Usually these files are written by a python script from a template
31+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
32+
*.manifest
33+
*.spec
34+
35+
# Installer logs
36+
pip-log.txt
37+
pip-delete-this-directory.txt
38+
39+
# Unit test / coverage reports
40+
htmlcov/
41+
.tox/
42+
.nox/
43+
.coverage
44+
.coverage.*
45+
.cache
46+
nosetests.xml
47+
coverage.xml
48+
*.cover
49+
*.py,cover
50+
.hypothesis/
51+
.pytest_cache/
52+
cover/
53+
54+
# Translations
55+
*.mo
56+
*.pot
57+
58+
# Django stuff:
59+
*.log
60+
local_settings.py
61+
db.sqlite3
62+
db.sqlite3-journal
63+
64+
# Flask stuff:
65+
instance/
66+
.webassets-cache
67+
68+
# Scrapy stuff:
69+
.scrapy
70+
71+
# Sphinx documentation
72+
docs/_build/
73+
74+
# PyBuilder
75+
.pybuilder/
76+
target/
77+
78+
# Jupyter Notebook
79+
.ipynb_checkpoints
80+
81+
# IPython
82+
profile_default/
83+
ipython_config.py
84+
85+
# pyenv
86+
# For a library or package, you might want to ignore these files since the code is
87+
# intended to run in multiple environments; otherwise, check them in:
88+
# .python-version
89+
90+
# pipenv
91+
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
92+
# However, in case of collaboration, if having platform-specific dependencies or dependencies
93+
# having no cross-platform support, pipenv may install dependencies that don't work, or not
94+
# install all needed dependencies.
95+
#Pipfile.lock
96+
97+
# poetry
98+
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
99+
# This is especially recommended for binary packages to ensure reproducibility, and is more
100+
# commonly ignored for libraries.
101+
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
102+
#poetry.lock
103+
104+
# pdm
105+
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
106+
#pdm.lock
107+
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
108+
# in version control.
109+
# https://pdm.fming.dev/#use-with-ide
110+
.pdm.toml
111+
112+
# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
113+
__pypackages__/
114+
115+
# Celery stuff
116+
celerybeat-schedule
117+
celerybeat.pid
118+
119+
# SageMath parsed files
120+
*.sage.py
121+
122+
# Environments
123+
.env
124+
.venv
125+
env/
126+
venv/
127+
ENV/
128+
env.bak/
129+
venv.bak/
130+
131+
# Spyder project settings
132+
.spyderproject
133+
.spyproject
134+
135+
# Rope project settings
136+
.ropeproject
137+
138+
# mkdocs documentation
139+
/site
140+
141+
# mypy
142+
.mypy_cache/
143+
.dmypy.json
144+
dmypy.json
145+
146+
# Pyre type checker
147+
.pyre/
148+
149+
# pytype static type analyzer
150+
.pytype/
151+
152+
# Cython debug symbols
153+
cython_debug/
154+
155+
# PyCharm
156+
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
157+
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
158+
# and can be added to the global gitignore or merged into this file. For a more nuclear
159+
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
160+
#.idea/

src/main.py

+57-8
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import sys
33
import json
44
import os
5+
from datetime import timedelta
56
sys.path.append('/app')
67
from timer import *
78
import gi
@@ -10,6 +11,12 @@
1011
gi.require_version("Adw", "1")
1112
from gi.repository import Gtk, GLib, Adw, Gio
1213

14+
def strfdelta(tdelta, fmt):
15+
d = {"days": tdelta.days}
16+
d["hours"], rem = divmod(tdelta.seconds, 3600)
17+
d["minutes"], d["seconds"] = divmod(rem, 60)
18+
return fmt.format(**d)
19+
1320
class Dialog_settings(Gtk.Dialog):
1421
def __init__(self, parent, **kwargs):
1522
super().__init__(use_header_bar=True)
@@ -163,9 +170,7 @@ def __init__(self, *args, **kwargs):
163170
self.mainBox.append(self.label)
164171

165172
# Entry
166-
self.entry = Gtk.Entry()
167-
self.entry.set_text("10")
168-
self.mainBox.append(self.entry)
173+
self.make_timer_box()
169174

170175
# Start timer button
171176
self.buttonStart = Gtk.Button(label=run_timer)
@@ -181,6 +186,41 @@ def __init__(self, *args, **kwargs):
181186
self.timeout_id = None
182187
self.connect("destroy", self.on_SpinnerWindow_destroy)
183188

189+
def make_timer_box(self):
190+
self.timerBox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=3)
191+
self.timerBox.set_margin_start(50)
192+
self.timerBox.set_margin_end(50)
193+
194+
self.hour_entry = Gtk.Entry()
195+
self.hour_entry.set_text("0")
196+
self.hour_entry.set_alignment(xalign=1)
197+
self.timerBox.append(self.hour_entry)
198+
199+
label = Gtk.Label(label = "h")
200+
label.set_hexpand(False)
201+
self.timerBox.append(label)
202+
203+
self.minute_entry = Gtk.Entry()
204+
self.minute_entry.set_text("1")
205+
self.minute_entry.set_alignment(xalign=1)
206+
self.timerBox.append(self.minute_entry)
207+
208+
label = Gtk.Label(label = "m")
209+
label.set_hexpand(False)
210+
self.timerBox.append(label)
211+
212+
self.secs_entry = Gtk.Entry()
213+
self.secs_entry.set_text("0")
214+
self.secs_entry.set_alignment(xalign=1)
215+
self.timerBox.append(self.secs_entry)
216+
217+
label = Gtk.Label(label = "s")
218+
label.set_hexpand(False)
219+
self.timerBox.append(label)
220+
221+
self.mainBox.append(self.timerBox)
222+
223+
# Resizable of Window
184224
def resizable(self):
185225
if os.path.exists(os.path.expanduser('~') + '/.var/app/com.github.vikdevelop.timer/data/window.json'):
186226
with open(os.path.expanduser('~') + '/.var/app/com.github.vikdevelop.timer/data/window.json') as jr:
@@ -281,24 +321,33 @@ def on_SpinnerWindow_destroy(self, widget, *args):
281321
self.timeout_id = None
282322
Gtk.main_quit()
283323

324+
tick_counter = timedelta(milliseconds = 250) # static object so we don't recreate the object every time
325+
zero_counter = timedelta()
284326
def on_timeout(self, *args, **kwargs):
285-
self.counter -= 1
286-
if self.counter <= 0:
327+
self.counter -= self.tick_counter
328+
if self.counter <= self.zero_counter:
287329
self.stop_timer(timing_finished)
288330
self.label.set_markup("<b>" + timing_finished + "</b>")
289331
subprocess.call(['notify-send',timer_title,timing_finished,'-i','com.github.vikdevelop.timer'])
290332
print(timing_finished)
291333
return False
292-
self.label.set_label("%s\n<big><b>" % time_text + str(int(self.counter / 4)) + " s</b></big>")
334+
self.label.set_markup("{}\n<big><b>{}</b></big>".format(
335+
time_text,
336+
strfdelta(self.counter, "{hours} h {minutes} m {seconds} s")
337+
))
293338
return True
294339

295340
def start_timer(self):
296341
""" Run Timer. """
297342
self.buttonStart.set_sensitive(False)
298343
self.buttonStop.set_sensitive(True)
299-
self.counter = 4 * int(self.entry.get_text())
344+
# self.counter = 4 * int(self.entry.get_text())
345+
self.counter = timedelta(hours = int(self.hour_entry.get_text()), minutes = int(self.minute_entry.get_text()), seconds = int(self.secs_entry.get_text()))
300346
print('\a')
301-
self.label.set_markup("%s\n<big><b>" % time_text + str(int(self.counter / 4)) + " s</b></big>")
347+
self.label.set_markup("{}\n<big><b>{}</b></big>".format(
348+
time_text,
349+
strfdelta(self.counter, "{hours} h {minutes} m {seconds} s")
350+
))
302351
self.spinner.start()
303352
self.timeout_id = GLib.timeout_add(250, self.on_timeout, None)
304353

0 commit comments

Comments
 (0)