Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes and release #4

Merged
merged 5 commits into from Jul 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions JAMClock.py
Expand Up @@ -19,6 +19,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

import gi
gi.require_version('Gtk', '3.0')
from Main import Main
from sugar3.activity.widgets import ActivityToolbarButton
from sugar3.activity.widgets import StopButton
Expand All @@ -34,8 +36,6 @@
import sys
from gi.repository import Gtk, GObject, Gdk
import os
import gi
gi.require_version('Gtk', '3.0')


class JAMClock(activity.Activity):
Expand Down
13 changes: 8 additions & 5 deletions Main.py
Expand Up @@ -237,11 +237,14 @@ def run(self):
pygame.display.update()

def handle_event(self):
for event in pygame.event.get(pygame.KEYDOWN):
tecla = event.key
if tecla == pygame.K_ESCAPE:
pygame.event.clear()
return self.selecciona_mensaje_salir()
for event in pygame.event.get():
if event.type == pygame.QUIT:
self.estado = False
elif event.type == pygame.KEYDOWN:
tecla = event.key
if tecla == pygame.K_ESCAPE:
pygame.event.clear()
return self.selecciona_mensaje_salir()

def pause_game(self):
while self.mensaje.sprites():
Expand Down
15 changes: 15 additions & 0 deletions NEWS
@@ -0,0 +1,15 @@
v3

* Add Screnshots and README.md (Jui Pradhan),
* Fix PyGIWarning (Jui Pradhan),
* Exit using sugar toolbar stop button (Jui Pradhan),
* Port to python3 (Srevin Saju),
* Port to Gtk3 (Srevin Saju)

v2

* Release (Tony Anderson)

v1

* Initail release (Tony Anderson)
21 changes: 21 additions & 0 deletions README.md
@@ -0,0 +1,21 @@
Jam-Clock activity
===============

JAM-Clock is a simple clock activity where you can set alarms and also view the calender.

How to use?
===============

JAM-Clock activity is not a part of Sugar Desktop but can be added. Refer to the following links-

* [How to Get Sugar on sugarlabs.org](https://sugarlabs.org/),
* [How to use Sugar](https://help.sugarlabs.org/)

<img src="Screenshots/jam-clock.png" title="Jam-Clock Activity">

How to upgrade?
===============
On Sugar Desktop systems;

* [Use My Settings,](https://help.sugarlabs.org/my_settings.html) [Software Update](https://help.sugarlabs.org/my_settings.html#software-update)
* [Use GitHub to open](https://github.com/sugarlabs/jam-clock-activity), Check the tags, then download the latest version.
Binary file added Screenshots/jam-clock.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion activity/activity.info
@@ -1,6 +1,6 @@
[Activity]
name = JAMClock
activity_version = 2
activity_version = 3
bundle_id = org.laptop.JAMClock
service_name = org.laptop.JAMClock
icon = JAMClock
Expand Down