linuxer/alarm-clock
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: linuxer:0.2.4
Branches Tags
linuxer:master linuxer:1.0.2
linuxer:1.0.1 linuxer:0.3.4 linuxer:0.3.3 linuxer:0.3.2 linuxer:0.3.1 linuxer:0.3.0 linuxer:0.2.6 linuxer:0.2.5 linuxer:0.2.4 linuxer:0.2.3 linuxer:0.2.2 linuxer:0.2.1 linuxer:0.2.0 linuxer:0.1.1
..
compare: linuxer:0.2.5
Branches Tags
linuxer:1.0.2 linuxer:master
linuxer:1.0.1 linuxer:0.3.4 linuxer:0.3.3 linuxer:0.3.2 linuxer:0.3.1 linuxer:0.3.0 linuxer:0.2.6 linuxer:0.2.5 linuxer:0.2.4 linuxer:0.2.3 linuxer:0.2.2 linuxer:0.2.1 linuxer:0.2.0 linuxer:0.1.1

5 Commits
0.2.4 ... 0.2.5

Author SHA1 Message Date
Johannes H. Jensen
95778fc0ac 0.2.5 release. 2009-04-19 18:28:12 +02:00
Johannes H. Jensen
1389d6a506 Fix tests so that they succeed on intrepid. 
Remove non-GTest sources from TEST_PROGS.
Fix bug LP:#330092.
 2009-02-22 22:41:10 +01:00
Johannes H. Jensen
b2fb6ec7e0 Stop playing preview sound when changing notification to "Start application". 
Patch by Arnaud Soyez <weboide@codealpha.net>.
Fix bug LP:#332756.
 2009-02-22 21:58:26 +01:00
Johannes H. Jensen
5be98106d5 Remove "ghost" object from alarm-clock.svg icon. 2008-10-04 22:36:00 +02:00
Johannes H. Jensen
ff5326df22 Set page_size to 0 in edit-alarm dialog. (Workaround for GNOME bug #307963) 2008-08-29 00:49:06 +02:00
14 changed files with 34 additions and 26 deletions
Expand all files Collapse all files

2
configure.ac
View File

@@ -2,7 +2,7 @@ dnl ***************************************************************************
dnl *** configure.ac for ALARM-CLOCK ***
dnl ***************************************************************************
AC_INIT([Alarm Clock], [0.2.4],
AC_INIT([Alarm Clock], [0.2.5],
[Johannes H. Jensen <joh@pseudoberries.com>],
[alarm-clock])

6
src/edit-alarm.c
View File

@@ -189,6 +189,12 @@ alarm_settings_update_notify_type (AlarmSettingsDialog *dialog)
// Disable others
g_object_set (dialog->notify_sound_box, "sensitive", FALSE, NULL);
if (dialog->player && dialog->player->state == MEDIA_PLAYER_PLAYING) {
// Stop preview player
media_player_stop (dialog->player);
}
break;
default:
// NOTIFY_SOUND

BIN
src/icons/alarm-clock.16.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 906 B

After

Width:  |  Height:  |  Size: 904 B

BIN
src/icons/alarm-clock.22.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
src/icons/alarm-clock.24.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
src/icons/alarm-clock.32.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
src/icons/alarm-clock.36.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
src/icons/alarm-clock.48.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
src/icons/alarm-clock.64.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

32
src/icons/alarm-clock.svg
View File

@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:ns="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://web.resource.org/cc/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
@@ -14,16 +13,23 @@
height="22"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.45.1"
inkscape:version="0.46"
version="1.0"
inkscape:export-filename="/home/joh/workspace/alarm-applet/src/icons/alarm-clock.64.png"
inkscape:export-xdpi="261.82001"
inkscape:export-ydpi="261.82001"
sodipodi:docname="alarm22x22.svg"
sodipodi:docname="alarm-clock.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
sodipodi:docbase="/home/joh/Pictures">
<defs
id="defs4">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 11 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="22 : 11 : 1"
inkscape:persp3d-origin="11 : 7.3333333 : 1"
id="perspective35" />
<linearGradient
id="linearGradient14243">
<stop
@@ -98,10 +104,11 @@
height="24px"
inkscape:snap-bbox="true"
inkscape:snap-guide="true"
inkscape:window-width="1680"
inkscape:window-height="1022"
inkscape:window-x="1680"
inkscape:window-y="28">
inkscape:window-width="1024"
inkscape:window-height="698"
inkscape:window-x="0"
inkscape:window-y="47"
showgrid="false">
<inkscape:grid
type="xygrid"
id="grid2293" />
@@ -109,12 +116,12 @@
<metadata
id="metadata7">
<rdf:RDF>
<ns:Work
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</ns:Work>
</cc:Work>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
@@ -170,11 +177,6 @@
inkscape:export-filename="/home/lasse/Bilder/alarm-applet/path14231.png"
inkscape:export-xdpi="98.18"
inkscape:export-ydpi="98.18" />
<path
style="opacity:0.26530612;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 21.051798,0.6490485 C 22.051798,0.6490485 22.047682,0.4239611 22.797682,1.1739611 C 23.547682,1.9239611 23.499371,1.9750874 23.499371,2.9750874 C 23.499371,3.9750874 23.129138,4.5 23.129138,4.5 C 23.129138,4.5 22.584944,3.7361359 22.084944,2.9861359 C 21.584944,2.2361359 21.084944,1.9861359 21.084944,1.9861359 L 19.814148,0.9529903 C 19.814148,0.9529903 20.051798,0.6490485 21.051798,0.6490485 z"
id="path14223"
sodipodi:nodetypes="czzczccz" />
<path
style="fill:#ea8686;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 2.4545455,2.5656566 C 3.7272727,1.2929293 5,2.5656566 5,2.5656566 C 3.9857955,2.8937816 2.8636363,4.0656566 2.4545455,5.1111111 C 2.4545455,5.1111111 1.1818182,3.8383838 2.4545455,2.5656566 z"
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

6
src/tests/Makefile.am
View File

@@ -12,9 +12,9 @@ INCLUDES = \
-I$(includedir) \
-I$(top_srcdir)/src
check_PROGRAMS = $(TEST_PROGS)
check_PROGRAMS = $(TEST_PROGS) test_player test_list_entry test_util glade_view test_gconf_recursive
TEST_PROGS += test_alarm test_player test_list_entry test_util test_alarm glade_view test_gconf_recursive
TEST_PROGS += test_alarm
test_player_SOURCES = $(top_srcdir)/src/player.c $(top_srcdir)/src/player.h test_player.c
test_player_LDADD = \
@@ -56,4 +56,4 @@ glade_view_LDADD = \
test_gconf_recursive_SOURCES = test_gconf_recursive.c
test_gconf_recursive_LDADD = \
$(GLIB_LIBS) \
$(GCONF_LIBS)
$(GCONF_LIBS)

4
src/tests/test_alarm.c
View File

@@ -26,7 +26,7 @@
#include <glib.h>
#include <string.h>
#define GCONF_DIR "/apps/alarm-clock"
#define GCONF_DIR "/apps/alarm-clock/test"
/* Fixture */
typedef struct {
@@ -330,7 +330,7 @@ test_alarm_notify (AlarmFixture *fix,
//
g_object_set (alarm,
"notify_type", ALARM_NOTIFY_SOUND,
"sound_file", "file:///usr/share/sounds/generic.wav",
"sound_file", "file:///usr/share/sounds/question.wav",
"sound_repeat", FALSE,
NULL);

2
src/tests/test_list_entry.c
View File

@@ -52,7 +52,7 @@ int main (void)
alarm_list_entry_free(entry);
// Test alarm list entry from file
entry = alarm_list_entry_new_file("file:///usr/share/sounds/login.wav", &result, &mime);
entry = alarm_list_entry_new_file("file:///usr/share/sounds/question.wav", &result, &mime);
entry_dump (entry);
g_print ("VFSResult: %s, MIME: %s\n", gnome_vfs_result_to_string(result), mime);
alarm_list_entry_free (entry);

8
src/ui/alarm-clock.glade
View File

@@ -311,7 +311,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="adjustment">0 0 23 1 10 10</property>
<property name="adjustment">0 0 23 1 10 0</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
</widget>
@@ -335,7 +335,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="adjustment">0 0 59 1 10 10</property>
<property name="adjustment">0 0 59 1 10 0</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
</widget>
@@ -360,7 +360,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="adjustment">0 0 59 1 10 10</property>
<property name="adjustment">0 0 59 1 10 0</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
</widget>
@@ -575,7 +575,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="adjustment">0 0 99 1 10 10</property>
<property name="adjustment">0 0 99 1 10 0</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
</widget>