Skip to content

Commit

Permalink
fixed bugs with pause, added new button in tray
Browse files Browse the repository at this point in the history
  • Loading branch information
ShadowZ1xy committed Nov 24, 2020
1 parent 5eb3f9f commit 4e0f28f
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 4 deletions.
11 changes: 11 additions & 0 deletions chillify/chillify_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ def tray_start():

menu.addSeparator()

media_pause = menu.addAction("Остановить медиа во время отдыха")
media_pause.triggered.connect(lambda: media_pause_toggle(media_pause))
media_pause.setCheckable(True)
media_pause.setChecked(pause_multimedia)

exit_ = menu.addAction("Выход")
exit_.triggered.connect(lambda: sys.exit())

Expand Down Expand Up @@ -123,6 +128,12 @@ def pause_toggle(pause):
pause.setChecked(user_pause)


def media_pause_toggle(media):
global pause_multimedia
pause_multimedia = not pause_multimedia
media.setChecked(pause_multimedia)


def update_settings():
global settings_vars, duration, periodicity, pause_multimedia, user_reset
settings_vars = timer_settings.get_settings()
Expand Down
9 changes: 5 additions & 4 deletions chillify/os_tool.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@ def __ignore_word(string):
def __check_audio_status():
try:
p = subprocess.Popen([
"START",
"/B",
audio_command
], shell=True, stdout=subprocess.PIPE)
'start',
'/B',
'/WAIT ""',
audio_command],
shell=True, stdout=subprocess.PIPE)
except FileNotFoundError:
return None
arr = []
Expand Down
1 change: 1 addition & 0 deletions settings/os_tool.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ def get_program_list():
program_list.append(line.decode().rstrip())
proc.terminate()
del program_list[:2]
program_list = set(program_list)
program_list = [x for x in program_list if not __ignore_word(x)]
return program_list

Expand Down

0 comments on commit 4e0f28f

Please sign in to comment.