diff -Nru anoise-gui-0.0.3/anoise/anoise.ui anoise-gui-0.0.4/anoise/anoise.ui --- anoise-gui-0.0.3/anoise/anoise.ui 2015-04-09 17:37:31.000000000 +0000 +++ anoise-gui-0.0.4/anoise/anoise.ui 2015-04-15 08:05:52.000000000 +0000 @@ -1,92 +1,93 @@ - + - + False Anoise False + anoise - + True False - 12 - 12 vertical - + True False - + True False - 0 - none - - + _File + True + + + True + False + + + gtk-quit + True + False + True + True + + + + - - True - True - 0 - - + True False - vertical - - - 80 - 80 - True - False - - - False - False - 0 - - - - + _Edit + True + + True False - 6 - ANoise + + + gtk-preferences + True + False + True + True + + + - - False - True - 1 - - - False - False - 1 - - + True False - 0 - none - - + _Help + True + + + True + False + + + gtk-about + True + False + True + True + + + + - - True - True - 2 - @@ -96,108 +97,203 @@ - + True False 12 + 12 + vertical - + True False - 0 - none - + + True + False + 0 + none + + + + + + True + True + 0 + - - - True - True - 0 - - - - - True - True - True - - + True False - go-previous + vertical + + + 80 + 80 + True + False + + + False + False + 0 + + + + + True + False + 6 + ANoise + + + False + True + 1 + + + + False + False + 1 + - - - False - True - 12 - 1 - - - - - True - True - True - - + True False - media-playback-pause + 0 + none + + + + + True + True + 2 + False True - 2 + 0 - + True - True - True - + False + 12 - + True False - go-next + 0 + none + + + + + True + True + 0 + - - - False - True - 12 - 3 - - - - - True - False - 0 - none - + + True + True + True + + + + True + False + go-previous + + + + + False + True + 12 + 1 + + + + + True + True + True + + + + True + False + media-playback-pause + + + + + False + True + 2 + + + + + True + True + True + + + + True + False + go-next + + + + + False + True + 12 + 3 + + + + + True + False + 0 + none + + + + + + True + True + 4 + - True - True - 4 + False + False + 1 False - False + True 1 diff -Nru anoise-gui-0.0.3/anoise/view.py anoise-gui-0.0.4/anoise/view.py --- anoise-gui-0.0.3/anoise/view.py 2015-04-09 17:06:35.000000000 +0000 +++ anoise-gui-0.0.4/anoise/view.py 2015-04-15 10:24:54.000000000 +0000 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# ANoise 0.0.18 (Ambient Noise) +# ANoise 0.0.4 (Ambient Noise) # Copyright (C) 2015 Marcos Alvarez Costales https://launchpad.net/~costales # # ANoise is free software; you can redistribute it and/or modify @@ -16,15 +16,18 @@ # along with ANoise; if not, see http://www.gnu.org/licenses # for more information. +import os, webbrowser, threading from gi.repository import Gtk +from preferences import Preferences -class ExtraWindow: +class GUI: """This will be for DE as MATE 14.10+ which hasn't sound indicator with Gtk3""" def __init__(self, player): self.player = player - builder = Gtk.Builder() + self.win_preferences = Preferences(self) + builder = Gtk.Builder() builder.add_from_file('/usr/share/anoise/anoise.ui') self.win_icon = builder.get_object('icon_noise') self.btn_play = builder.get_object('btn_play') @@ -55,19 +58,45 @@ self.btn_play.set_image(image) self._set_window_icon() + def _play(self): + self.player.is_playing = True + self.player._sound_menu_play() + image = Gtk.Image(stock=Gtk.STOCK_MEDIA_PAUSE) + self.btn_play.set_image(image) + + def _pause(self): + if self.player.is_playing: + self.player.is_playing = False + self.player._sound_menu_pause() + image = Gtk.Image(stock=Gtk.STOCK_MEDIA_PLAY) + self.btn_play.set_image(image) + def on_btn_play_pause_clicked(self, widget, data=None): - self.player.is_playing = not self.player.is_playing - if not self.player.is_playing: - self.player._sound_menu_pause() - image = Gtk.Image(stock=Gtk.STOCK_MEDIA_PLAY) - self.btn_play.set_image(image) + if self.player.is_playing: + self._pause() else: - self.player._sound_menu_play() - image = Gtk.Image(stock=Gtk.STOCK_MEDIA_PAUSE) - self.btn_play.set_image(image) + self._play() - def on_main_win_delete_event(self, widget, data=None): - Gtk.main_quit() + def on_menu_preferences_activate(self, widget, data=None): + self.win_preferences.show() + + def set_timer(self, enable, seconds): + if enable: + self.timer = threading.Timer(seconds, self._set_future_pause) + self.timer.start() + else: + self.timer.cancel() + + def _set_future_pause(self): + self.win_preferences.set_show_timer() + self._pause() def on_menu_about_activate(self, widget, data=None): - self.player._sound_menu_raise() + webbrowser.open_new('http://anoise.tuxfamily.org') + + def on_main_win_delete_event(self, widget, data=None): + try: + self.timer.cancel() + except: + pass + Gtk.main_quit() diff -Nru anoise-gui-0.0.3/debian/changelog anoise-gui-0.0.4/debian/changelog --- anoise-gui-0.0.3/debian/changelog 2015-04-09 17:42:00.000000000 +0000 +++ anoise-gui-0.0.4/debian/changelog 2015-04-15 17:34:43.000000000 +0000 @@ -1,6 +1,7 @@ -anoise-gui (0.0.3) trusty; urgency=low +anoise-gui (0.0.4) trusty; urgency=low - * Removed menu (deprecated) + * Precise Gtk + * Preferences - -- costales Wed, 1 Apr 2015 22:20:31 +0000 + -- costales Wed, 1 Apr 2015 22:19:31 +0000 diff -Nru anoise-gui-0.0.3/debian/control anoise-gui-0.0.4/debian/control --- anoise-gui-0.0.3/debian/control 2015-04-09 17:11:02.000000000 +0000 +++ anoise-gui-0.0.4/debian/control 2015-04-15 17:34:12.000000000 +0000 @@ -1,7 +1,7 @@ Source: anoise-gui Section: sound Priority: extra -Standards-Version: 0.0.3 +Standards-Version: 0.0.4 Maintainer: costales Build-Depends: python-distutils-extra, debhelper (>=7) Homepage: https://code.launchpad.net/anoise diff -Nru anoise-gui-0.0.3/setup.py anoise-gui-0.0.4/setup.py --- anoise-gui-0.0.3/setup.py 2015-04-09 17:11:02.000000000 +0000 +++ anoise-gui-0.0.4/setup.py 2015-04-15 17:34:12.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/env python -# ANoise GUI 0.0.3 - http://launchpad.net/anoise +# ANoise GUI 0.0.4 - http://launchpad.net/anoise # Copyright (C) 2012-2015 Marcos Alvarez Costales https://launchpad.net/~costales # # ANoise is free software; you can redistribute it and/or modify @@ -26,7 +26,7 @@ # Setup stage DistUtilsExtra.auto.setup( name = "anoise-gui", - version = "0.0.3", + version = "0.0.4", description = "Ambient Noise GUI", author = "Marcos Alvarez Costales https://launchpad.net/~costales", author_email = "https://launchpad.net/~costales",