DeforaOS/Phone
DeforaOS/Phone
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added missing WAV files (including for the busy tone)

Browse Source
This commit is contained in:
Pierre Pronchery 2014-10-21 23:30:12 +02:00
parent c1c7b9be34
commit 0df6980cb4
11 changed files with 55 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -32,6 +32,11 @@ dist:
$(PACKAGE)-$(VERSION)/data/7.wav \
$(PACKAGE)-$(VERSION)/data/8.wav \
$(PACKAGE)-$(VERSION)/data/9.wav \
$(PACKAGE)-$(VERSION)/data/a.wav \
$(PACKAGE)-$(VERSION)/data/b.wav \
$(PACKAGE)-$(VERSION)/data/busy.wav \
$(PACKAGE)-$(VERSION)/data/c.wav \
$(PACKAGE)-$(VERSION)/data/d.wav \
$(PACKAGE)-$(VERSION)/data/deforaos-phone-contacts.desktop \
$(PACKAGE)-$(VERSION)/data/deforaos-phone-dialer.desktop \
$(PACKAGE)-$(VERSION)/data/deforaos-phone-gprs.desktop \

15
data/Makefile
View File

@ -39,6 +39,16 @@ install:
$(INSTALL) -m 0644 8.wav $(DESTDIR)$(PREFIX)/share/sounds/Phone/8.wav
$(MKDIR) $(DESTDIR)$(PREFIX)/share/sounds/Phone
$(INSTALL) -m 0644 9.wav $(DESTDIR)$(PREFIX)/share/sounds/Phone/9.wav
$(MKDIR) $(DESTDIR)$(PREFIX)/share/sounds/Phone
$(INSTALL) -m 0644 a.wav $(DESTDIR)$(PREFIX)/share/sounds/Phone/a.wav
$(MKDIR) $(DESTDIR)$(PREFIX)/share/sounds/Phone
$(INSTALL) -m 0644 b.wav $(DESTDIR)$(PREFIX)/share/sounds/Phone/b.wav
$(MKDIR) $(DESTDIR)$(PREFIX)/share/sounds/Phone
$(INSTALL) -m 0644 busy.wav $(DESTDIR)$(PREFIX)/share/sounds/Phone/busy.wav
$(MKDIR) $(DESTDIR)$(PREFIX)/share/sounds/Phone
$(INSTALL) -m 0644 c.wav $(DESTDIR)$(PREFIX)/share/sounds/Phone/c.wav
$(MKDIR) $(DESTDIR)$(PREFIX)/share/sounds/Phone
$(INSTALL) -m 0644 d.wav $(DESTDIR)$(PREFIX)/share/sounds/Phone/d.wav
$(MKDIR) $(DESTDIR)$(PREFIX)/share/applications
$(INSTALL) -m 0644 deforaos-phone-contacts.desktop $(DESTDIR)$(PREFIX)/share/applications/deforaos-phone-contacts.desktop
$(MKDIR) $(DESTDIR)$(PREFIX)/share/applications
@ -74,6 +84,11 @@ uninstall:
$(RM) -- $(DESTDIR)$(PREFIX)/share/sounds/Phone/7.wav
$(RM) -- $(DESTDIR)$(PREFIX)/share/sounds/Phone/8.wav
$(RM) -- $(DESTDIR)$(PREFIX)/share/sounds/Phone/9.wav
$(RM) -- $(DESTDIR)$(PREFIX)/share/sounds/Phone/a.wav
$(RM) -- $(DESTDIR)$(PREFIX)/share/sounds/Phone/b.wav
$(RM) -- $(DESTDIR)$(PREFIX)/share/sounds/Phone/busy.wav
$(RM) -- $(DESTDIR)$(PREFIX)/share/sounds/Phone/c.wav
$(RM) -- $(DESTDIR)$(PREFIX)/share/sounds/Phone/d.wav
$(RM) -- $(DESTDIR)$(PREFIX)/share/applications/deforaos-phone-contacts.desktop
$(RM) -- $(DESTDIR)$(PREFIX)/share/applications/deforaos-phone-dialer.desktop
$(RM) -- $(DESTDIR)$(PREFIX)/share/applications/deforaos-phone-log.desktop

BIN
data/a.wav Normal file
View File

Binary file not shown.

BIN
data/b.wav Normal file
View File

Binary file not shown.

BIN
data/busy.wav Normal file
View File

Binary file not shown.

BIN
data/c.wav Normal file
View File

Binary file not shown.

BIN
data/d.wav Normal file
View File

Binary file not shown.

17
data/project.conf
View File

@ -1,5 +1,5 @@
subdirs=16x16,22x22,24x24,32x32,48x48
dist=Makefile,0.wav,1.wav,2.wav,3.wav,4.wav,5.wav,6.wav,7.wav,8.wav,9.wav,deforaos-phone-contacts.desktop,deforaos-phone-dialer.desktop,deforaos-phone-gprs.desktop,deforaos-phone-log.desktop,deforaos-phone-messages.desktop,deforaos-phone-settings.desktop,deforaos-phone-sofia.desktop,hash.wav,keytone.wav,ringback.wav,ringtone.wav,star.wav
dist=Makefile,0.wav,1.wav,2.wav,3.wav,4.wav,5.wav,6.wav,7.wav,8.wav,9.wav,a.wav,b.wav,busy.wav,c.wav,d.wav,deforaos-phone-contacts.desktop,deforaos-phone-dialer.desktop,deforaos-phone-gprs.desktop,deforaos-phone-log.desktop,deforaos-phone-messages.desktop,deforaos-phone-settings.desktop,deforaos-phone-sofia.desktop,hash.wav,keytone.wav,ringback.wav,ringtone.wav,star.wav
[0.wav]
install=$(PREFIX)/share/sounds/Phone
@ -31,6 +31,21 @@ install=$(PREFIX)/share/sounds/Phone
[9.wav]
install=$(PREFIX)/share/sounds/Phone
[a.wav]
install=$(PREFIX)/share/sounds/Phone
[b.wav]
install=$(PREFIX)/share/sounds/Phone
[busy.wav]
install=$(PREFIX)/share/sounds/Phone
[c.wav]
install=$(PREFIX)/share/sounds/Phone
[d.wav]
install=$(PREFIX)/share/sounds/Phone
[deforaos-phone-contacts.desktop]
install=$(PREFIX)/share/applications

1
include/Phone/modem.h
View File

@ -73,6 +73,7 @@ typedef enum _ModemContactStatus
{
MODEM_CONTACT_STATUS_OFFLINE = 0,
MODEM_CONTACT_STATUS_AWAY,
MODEM_CONTACT_STATUS_BUSY,
MODEM_CONTACT_STATUS_IDLE,
MODEM_CONTACT_STATUS_ONLINE
} ModemContactStatus;

3
include/Phone/phone.h
View File

@ -30,7 +30,8 @@ typedef enum _PhoneCall
PHONE_CALL_ESTABLISHED = 0,
PHONE_CALL_INCOMING,
PHONE_CALL_OUTGOING,
PHONE_CALL_TERMINATED
PHONE_CALL_TERMINATED,
PHONE_CALL_BUSY
} PhoneCall;
typedef enum _PhoneCode

16
src/phone.c
View File

@ -451,6 +451,9 @@ Phone * phone_new(char const * plugin, int retry)
phone->co_status[MODEM_CONTACT_STATUS_AWAY]
= gtk_icon_theme_load_icon(icontheme, "user-away", 24,
GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);
phone->co_status[MODEM_CONTACT_STATUS_BUSY]
= gtk_icon_theme_load_icon(icontheme, "user-busy", 24,
GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);
phone->co_status[MODEM_CONTACT_STATUS_IDLE]
= gtk_icon_theme_load_icon(icontheme, "user-idle", 24,
GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);
@ -1642,10 +1645,23 @@ void phone_show_call(Phone * phone, gboolean show, ...)
else if(status == MODEM_CALL_STATUS_RINGING)
call = (me->call.direction == MODEM_CALL_DIRECTION_INCOMING)
? PHONE_CALL_INCOMING : PHONE_CALL_OUTGOING;
else if(status == MODEM_CALL_STATUS_BUSY)
call = PHONE_CALL_BUSY;
else
call = PHONE_CALL_TERMINATED;
switch(call)
{
case PHONE_CALL_BUSY:
#if GTK_CHECK_VERSION(2, 6, 0)
gtk_window_set_icon_name(GTK_WINDOW(phone->ca_window),
"user-busy");
#endif
gtk_window_set_title(GTK_WINDOW(phone->ca_window),
_("Busy"));
gtk_widget_hide(phone->ca_answer);
gtk_widget_hide(phone->ca_close);
gtk_widget_hide(phone->ca_reject);
break;
case PHONE_CALL_ESTABLISHED:
#if GTK_CHECK_VERSION(2, 6, 0)
gtk_window_set_icon_name(GTK_WINDOW(phone->ca_window),