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

Use the dialer icon for gprs(1) instead

Browse Source
This commit is contained in:
Pierre Pronchery 2014-09-09 02:32:40 +02:00
parent 29878be7fd
commit 0f2886cc50
21 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -43,13 +43,13 @@ dist:
$(PACKAGE)-$(VERSION)/data/star.wav \
$(PACKAGE)-$(VERSION)/data/project.conf \
$(PACKAGE)-$(VERSION)/data/16x16/Makefile \
$(PACKAGE)-$(VERSION)/data/16x16/phone-dialer.png \
$(PACKAGE)-$(VERSION)/data/16x16/phone-gprs.png \
$(PACKAGE)-$(VERSION)/data/16x16/phone-drafts.png \
$(PACKAGE)-$(VERSION)/data/16x16/phone-inbox.png \
$(PACKAGE)-$(VERSION)/data/16x16/phone-sent.png \
$(PACKAGE)-$(VERSION)/data/16x16/project.conf \
$(PACKAGE)-$(VERSION)/data/22x22/Makefile \
$(PACKAGE)-$(VERSION)/data/22x22/phone-dialer.png \
$(PACKAGE)-$(VERSION)/data/22x22/phone-gprs.png \
$(PACKAGE)-$(VERSION)/data/22x22/phone-signal-00.png \
$(PACKAGE)-$(VERSION)/data/22x22/phone-signal-25.png \
$(PACKAGE)-$(VERSION)/data/22x22/phone-signal-50.png \
@ -57,16 +57,16 @@ dist:
$(PACKAGE)-$(VERSION)/data/22x22/phone-signal-100.png \
$(PACKAGE)-$(VERSION)/data/22x22/project.conf \
$(PACKAGE)-$(VERSION)/data/24x24/Makefile \
$(PACKAGE)-$(VERSION)/data/24x24/phone-dialer.png \
$(PACKAGE)-$(VERSION)/data/24x24/phone-gprs.png \
$(PACKAGE)-$(VERSION)/data/24x24/phone-drafts.png \
$(PACKAGE)-$(VERSION)/data/24x24/phone-inbox.png \
$(PACKAGE)-$(VERSION)/data/24x24/phone-sent.png \
$(PACKAGE)-$(VERSION)/data/24x24/project.conf \
$(PACKAGE)-$(VERSION)/data/32x32/Makefile \
$(PACKAGE)-$(VERSION)/data/32x32/phone-dialer.png \
$(PACKAGE)-$(VERSION)/data/32x32/phone-gprs.png \
$(PACKAGE)-$(VERSION)/data/32x32/project.conf \
$(PACKAGE)-$(VERSION)/data/48x48/Makefile \
$(PACKAGE)-$(VERSION)/data/48x48/phone-dialer.png \
$(PACKAGE)-$(VERSION)/data/48x48/phone-gprs.png \
$(PACKAGE)-$(VERSION)/data/48x48/phone-inbox.png \
$(PACKAGE)-$(VERSION)/data/48x48/phone-sent.png \
$(PACKAGE)-$(VERSION)/data/48x48/project.conf \

4
data/16x16/Makefile
View File

@ -13,7 +13,7 @@ distclean: clean
install:
$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps
$(INSTALL) -m 0644 phone-dialer.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/phone-dialer.png
$(INSTALL) -m 0644 phone-gprs.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/phone-gprs.png
$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps
$(INSTALL) -m 0644 phone-drafts.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/phone-drafts.png
$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps
@ -22,7 +22,7 @@ install:
$(INSTALL) -m 0644 phone-sent.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/phone-sent.png
uninstall:
$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/phone-dialer.png
$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/phone-gprs.png
$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/phone-drafts.png
$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/phone-inbox.png
$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/phone-sent.png

0
data/16x16/phone-dialer.png → data/16x16/phone-gprs.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 779 B

After

Width:  |  Height:  |  Size: 779 B

4
data/16x16/project.conf
View File

@ -1,6 +1,6 @@
dist=Makefile,phone-dialer.png,phone-drafts.png,phone-inbox.png,phone-sent.png
dist=Makefile,phone-gprs.png,phone-drafts.png,phone-inbox.png,phone-sent.png
[phone-dialer.png]
[phone-gprs.png]
install=$(PREFIX)/share/icons/hicolor/16x16/apps
[phone-drafts.png]

4
data/22x22/Makefile
View File

@ -13,7 +13,7 @@ distclean: clean
install:
$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps
$(INSTALL) -m 0644 phone-dialer.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps/phone-dialer.png
$(INSTALL) -m 0644 phone-gprs.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps/phone-gprs.png
$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps
$(INSTALL) -m 0644 phone-signal-00.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps/phone-signal-00.png
$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps
@ -26,7 +26,7 @@ install:
$(INSTALL) -m 0644 phone-signal-100.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps/phone-signal-100.png
uninstall:
$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps/phone-dialer.png
$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps/phone-gprs.png
$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps/phone-signal-00.png
$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps/phone-signal-25.png
$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps/phone-signal-50.png

0
data/22x22/phone-dialer.png → data/22x22/phone-gprs.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

4
data/22x22/project.conf
View File

@ -1,6 +1,6 @@
dist=Makefile,phone-dialer.png,phone-signal-00.png,phone-signal-25.png,phone-signal-50.png,phone-signal-75.png,phone-signal-100.png
dist=Makefile,phone-gprs.png,phone-signal-00.png,phone-signal-25.png,phone-signal-50.png,phone-signal-75.png,phone-signal-100.png
[phone-dialer.png]
[phone-gprs.png]
install=$(PREFIX)/share/icons/hicolor/22x22/apps
[phone-signal-00.png]

4
data/24x24/Makefile
View File

@ -13,7 +13,7 @@ distclean: clean
install:
$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps
$(INSTALL) -m 0644 phone-dialer.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/phone-dialer.png
$(INSTALL) -m 0644 phone-gprs.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/phone-gprs.png
$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps
$(INSTALL) -m 0644 phone-drafts.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/phone-drafts.png
$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps
@ -22,7 +22,7 @@ install:
$(INSTALL) -m 0644 phone-sent.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/phone-sent.png
uninstall:
$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/phone-dialer.png
$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/phone-gprs.png
$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/phone-drafts.png
$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/phone-inbox.png
$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/phone-sent.png

0
data/24x24/phone-dialer.png → data/24x24/phone-gprs.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

4
data/24x24/project.conf
View File

@ -1,6 +1,6 @@
dist=Makefile,phone-dialer.png,phone-drafts.png,phone-inbox.png,phone-sent.png
dist=Makefile,phone-gprs.png,phone-drafts.png,phone-inbox.png,phone-sent.png
[phone-dialer.png]
[phone-gprs.png]
install=$(PREFIX)/share/icons/hicolor/24x24/apps
[phone-drafts.png]

4
data/32x32/Makefile
View File

@ -13,9 +13,9 @@ distclean: clean
install:
$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps
$(INSTALL) -m 0644 phone-dialer.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/phone-dialer.png
$(INSTALL) -m 0644 phone-gprs.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/phone-gprs.png
uninstall:
$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/phone-dialer.png
$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/phone-gprs.png
.PHONY: all clean distclean install uninstall

0
data/32x32/phone-dialer.png → data/32x32/phone-gprs.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

4
data/32x32/project.conf
View File

@ -1,4 +1,4 @@
dist=Makefile,phone-dialer.png
dist=Makefile,phone-gprs.png
[phone-dialer.png]
[phone-gprs.png]
install=$(PREFIX)/share/icons/hicolor/32x32/apps

4
data/48x48/Makefile
View File

@ -13,14 +13,14 @@ distclean: clean
install:
$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps
$(INSTALL) -m 0644 phone-dialer.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/phone-dialer.png
$(INSTALL) -m 0644 phone-gprs.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/phone-gprs.png
$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps
$(INSTALL) -m 0644 phone-inbox.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/phone-inbox.png
$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps
$(INSTALL) -m 0644 phone-sent.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/phone-sent.png
uninstall:
$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/phone-dialer.png
$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/phone-gprs.png
$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/phone-inbox.png
$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/phone-sent.png

0
data/48x48/phone-dialer.png → data/48x48/phone-gprs.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

4
data/48x48/project.conf
View File

@ -1,6 +1,6 @@
dist=Makefile,phone-dialer.png,phone-inbox.png,phone-sent.png
dist=Makefile,phone-gprs.png,phone-inbox.png,phone-sent.png
[phone-dialer.png]
[phone-gprs.png]
install=$(PREFIX)/share/icons/hicolor/48x48/apps
[phone-inbox.png]

2
data/deforaos-phone-dialer.desktop
View File

@ -3,6 +3,6 @@ Name=Dialer
Comment=Telephony dialer
TryExec=phonectl
Exec=phonectl -D
Icon=phone-dialer
Icon=call-start
Type=Application
Categories=Network;Telephony;GTK;

6
data/deforaos-phone-gprs.desktop
View File

@ -1,8 +1,8 @@
[Desktop Entry]
Name=GPRS
Comment=Connect to Internet with a 2G/3G/4G modem connection
Name=Dial-up networking
Comment=Connect to Internet with a modem or cell phone
TryExec=gprs
Exec=gprs
Icon=stock_connect
Icon=phone-gprs
Type=Application
Categories=Network;Telephony;GTK;

2
data/deforaos-phone-sofia.desktop
View File

@ -3,6 +3,6 @@ Name=VoIP telephony
Comment=Voice over IP telephony application (SIP)
TryExec=phone
Exec=phone -m sofia
Icon=phone-dialer
Icon=call-start
Type=Application
Categories=Network;Telephony;GTK;

12
src/plugins/gprs.c
View File

@ -109,8 +109,8 @@ static gboolean _gprs_on_timeout(gpointer data);
/* variables */
PhonePluginDefinition plugin =
{
"GPRS",
"stock_internet",
"Dial-up networking",
"phone-gprs",
NULL,
_gprs_init,
_gprs_destroy,
@ -145,12 +145,12 @@ static GPRS * _gprs_init(PhonePluginHelper * helper)
gprs->active = FALSE;
gprs->window = NULL;
#if GTK_CHECK_VERSION(2, 10, 0)
gprs->icon = gtk_status_icon_new_from_icon_name("stock_internet");
gprs->icon = gtk_status_icon_new_from_icon_name("phone-gprs");
# if GTK_CHECK_VERSION(2, 16, 0)
gtk_status_icon_set_tooltip_text(gprs->icon, "Not connected");
# endif
# if GTK_CHECK_VERSION(2, 18, 0)
gtk_status_icon_set_title(gprs->icon, "GPRS");
gtk_status_icon_set_title(gprs->icon, "Dial-up networking");
# if GTK_CHECK_VERSION(2, 20, 0)
gtk_status_icon_set_name(gprs->icon, "phone-gprs");
# endif
@ -297,9 +297,9 @@ static void _gprs_settings(GPRS * gprs)
gtk_container_set_border_width(GTK_CONTAINER(gprs->window), 4);
gtk_window_set_default_size(GTK_WINDOW(gprs->window), 200, 300);
#if GTK_CHECK_VERSION(2, 6, 0)
gtk_window_set_icon_name(GTK_WINDOW(gprs->window), "stock_internet");
gtk_window_set_icon_name(GTK_WINDOW(gprs->window), "phone-gprs");
#endif
gtk_window_set_title(GTK_WINDOW(gprs->window), "GPRS");
gtk_window_set_title(GTK_WINDOW(gprs->window), "Dial-up networking");
g_signal_connect_swapped(gprs->window, "delete-event", G_CALLBACK(
_settings_on_closex), gprs);
vbox = gtk_vbox_new(FALSE, 4);

4
src/plugins/systray.c
View File

@ -77,7 +77,7 @@ static Systray * _systray_init(PhonePluginHelper * helper)
if((systray = object_new(sizeof(*systray))) == NULL)
return NULL;
systray->helper = helper;
systray->icon = gtk_status_icon_new_from_icon_name("phone-dialer");
systray->icon = gtk_status_icon_new_from_icon_name("call-start");
# if GTK_CHECK_VERSION(2, 16, 0)
gtk_status_icon_set_tooltip_text(systray->icon, "Phone");
# endif
@ -142,7 +142,7 @@ static void _systray_on_popup_menu(GtkStatusIcon * icon, guint button,
} items[] = {
{ "stock_addressbook", "Show _contacts",
_popup_menu_on_show_contacts },
{ "phone-dialer", "Show _dialer", _popup_menu_on_show_dialer },
{ "call-start", "Show _dialer", _popup_menu_on_show_dialer },
{ "logviewer", "Show _logs", _popup_menu_on_show_logs },
{ "stock_mail-compose", "Show _messages",
_popup_menu_on_show_messages },