Skip to content
Snippets Groups Projects
Commit afc43a9f authored by Alexandre Savard's avatar Alexandre Savard
Browse files

Merge branch 'master' into conference

parents 5fae7f59 a32f9e98
Branches
Tags
No related merge requests found
......@@ -2,7 +2,43 @@ icondir = $(datadir)/pixmaps
icon_DATA = sflphone.svg
buttons_DATA = accept.svg current.svg transfert.svg hang_up.svg hold.svg unhold.svg refuse.svg call.svg ring.svg dial.svg mic.svg mic_25.svg mic_50.svg mic_75.svg speaker.svg speaker_25.svg speaker_50.svg speaker_75.svg fail.svg incoming.svg outgoing.svg missed.svg mailbox.svg busy.svg icon_accept.svg icon_hold.svg icon_unhold.svg icon_hangup.svg icon_call.svg icon_dialpad.svg icon_volume.svg icon_dialpad_off.svg icon_volume_off.svg history2.svg sflphone.svg sflphone_small.svg stock_person.svg icon_rec.svg rec_call.svg addressbook.svg contact_default.svg face-monkey.svg users.svg usersActive.svg home.svg wait-on.gif lock_certified.svg lock_confirmed.svg lock_error.svg lock_off.svg lock_unconfirmed.svg
buttons_DATA = current.svg \
transfert.svg \
hold.svg \
unhold.svg \
refuse.svg \
call.svg \
ring.svg \
dial.svg \
mic.svg \
mic_25.svg \
mic_50.svg \
mic_75.svg \
speaker.svg \
speaker_25.svg \
speaker_50.svg \
speaker_75.svg \
fail.svg \
incoming.svg \
outgoing.svg \
missed.svg \
busy.svg \
sflphone.svg \
sflphone_small.svg \
stock_person.svg \
icon_rec.svg \
rec_call.svg \
contact_default.svg \
face-monkey.svg \
users.svg \
usersActive.svg \
home.svg \
wait-on.gif \
lock_certified.svg \
lock_confirmed.svg \
lock_error.svg \
lock_off.svg \
lock_unconfirmed.svg
buttonsdir = $(datadir)/sflphone
EXTRA_DIST = $(buttons_DATA) $(icon_DATA)
......@@ -30,8 +30,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = x86_64-unknown-linux-gnu
host_triplet = x86_64-unknown-linux-gnu
build_triplet = i686-pc-linux-gnu
host_triplet = i686-pc-linux-gnu
DIST_COMMON = $(srcdir)/../../globals.mak $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
subdir = src/icons
......@@ -66,13 +66,13 @@ DIST_SOURCES = $(libicons_la_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = ${SHELL} /home/emilou/git-repos/sflphone/sflphone-client-gnome/missing --run aclocal-1.10
AMTAR = ${SHELL} /home/emilou/git-repos/sflphone/sflphone-client-gnome/missing --run tar
ACLOCAL = ${SHELL} /home/manu/git-repos/sflphone/sflphone-client-gnome/missing --run aclocal-1.10
AMTAR = ${SHELL} /home/manu/git-repos/sflphone/sflphone-client-gnome/missing --run tar
AR = ar
AUTOCONF = ${SHELL} /home/emilou/git-repos/sflphone/sflphone-client-gnome/missing --run autoconf
AUTOHEADER = ${SHELL} /home/emilou/git-repos/sflphone/sflphone-client-gnome/missing --run autoheader
AUTOMAKE = ${SHELL} /home/emilou/git-repos/sflphone/sflphone-client-gnome/missing --run automake-1.10
AWK = gawk
AUTOCONF = ${SHELL} /home/manu/git-repos/sflphone/sflphone-client-gnome/missing --run autoconf
AUTOHEADER = ${SHELL} /home/manu/git-repos/sflphone/sflphone-client-gnome/missing --run autoheader
AUTOMAKE = ${SHELL} /home/manu/git-repos/sflphone/sflphone-client-gnome/missing --run automake-1.10
AWK = mawk
CC = gcc
CCDEPMODE = depmode=gcc3
CFLAGS = -g -O2
......@@ -106,7 +106,7 @@ INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
LD = /usr/bin/ld -m elf_x86_64
LD = /usr/bin/ld
LDFLAGS =
LIBOBJS =
LIBS =
......@@ -116,7 +116,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool
LIPO =
LN_S = ln -s
LTLIBOBJS =
MAKEINFO = ${SHELL} /home/emilou/git-repos/sflphone/sflphone-client-gnome/missing --run makeinfo
MAKEINFO = ${SHELL} /home/manu/git-repos/sflphone/sflphone-client-gnome/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
NM = /usr/bin/nm -B
NMEDIT =
......@@ -139,10 +139,10 @@ SET_MAKE =
SHELL = /bin/bash
STRIP = strip
VERSION = 0.9.7~beta
abs_builddir = /home/emilou/git-repos/sflphone/sflphone-client-gnome/src/icons
abs_srcdir = /home/emilou/git-repos/sflphone/sflphone-client-gnome/src/icons
abs_top_builddir = /home/emilou/git-repos/sflphone/sflphone-client-gnome
abs_top_srcdir = /home/emilou/git-repos/sflphone/sflphone-client-gnome
abs_builddir = /home/manu/git-repos/sflphone/sflphone-client-gnome/src/icons
abs_srcdir = /home/manu/git-repos/sflphone/sflphone-client-gnome/src/icons
abs_top_builddir = /home/manu/git-repos/sflphone/sflphone-client-gnome
abs_top_srcdir = /home/manu/git-repos/sflphone/sflphone-client-gnome
ac_ct_CC = gcc
ac_ct_DUMPBIN =
am__include = include
......@@ -151,26 +151,26 @@ am__quote =
am__tar = ${AMTAR} chof - "$$tardir"
am__untar = ${AMTAR} xf -
bindir = ${exec_prefix}/bin
build = x86_64-unknown-linux-gnu
build = i686-pc-linux-gnu
build_alias =
build_cpu = x86_64
build_cpu = i686
build_os = linux-gnu
build_vendor = unknown
build_vendor = pc
builddir = .
datadir = ${datarootdir}
datarootdir = ${prefix}/share
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
dvidir = ${docdir}
exec_prefix = ${prefix}
host = x86_64-unknown-linux-gnu
host = i686-pc-linux-gnu
host_alias =
host_cpu = x86_64
host_cpu = i686
host_os = linux-gnu
host_vendor = unknown
host_vendor = pc
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
install_sh = $(SHELL) /home/emilou/git-repos/sflphone/sflphone-client-gnome/install-sh
install_sh = $(SHELL) /home/manu/git-repos/sflphone/sflphone-client-gnome/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
......
To add a svg icon as a stock icon:
1. Dump the raw data from the svg:
gdk-pixbuf-csource --raw --name=gnome_stock_example example.svg
2. Copy the output in the file sflphone-client-gnome/src/icons/pixmaps_data.h
3. Create the alias in sflphone-client-gnome/src/icons/icon_factory.h :
#define GTK_STOCK_EXAMPLE "gnome-stock-example"
4. Add the icon to the factory. In sflphone-client-gnome/src/icons/icon_factory.c, function register_sflphone_stock_icons, add the line:
add_icon (factory, GTK_STOCK_EXAMPLE, gnome_stock_example, GTK_ICON_SIZE_SMALL_TOOLBAR)
You may now use this icon in the code just like a GTK stock icon, the stock id being GTK_STOCK_EXAMPLE.
......@@ -70,5 +70,6 @@ void register_sflphone_stock_icons (GtkIconFactory *factory)
add_icon (factory, GTK_STOCK_OFFHOLD, gnome_stock_offhold, GTK_ICON_SIZE_SMALL_TOOLBAR);
add_icon (factory, GTK_STOCK_CALL_CURRENT, gnome_stock_call_current, GTK_ICON_SIZE_SMALL_TOOLBAR);
add_icon (factory, GTK_STOCK_ADDRESSBOOK, gnome_stock_addressbook, GTK_ICON_SIZE_SMALL_TOOLBAR);
add_icon (factory, GTK_STOCK_CALLS, gnome_stock_calls, GTK_ICON_SIZE_SMALL_TOOLBAR);
}
......@@ -34,6 +34,7 @@ G_BEGIN_DECLS
#define GTK_STOCK_DIAL "gnome-stock-dial"
#define GTK_STOCK_CALL_CURRENT "gnome-stock-call-current"
#define GTK_STOCK_ADDRESSBOOK "gnome-stock-addressbook"
#define GTK_STOCK_CALLS "gnome-stock-calls"
void init_icon_factory (void);
......
......@@ -788,7 +788,7 @@ static const guint8 gnome_stock_addressbook[] =
"\375}\235\304\377\202\241\305\377\202\241\305\377\202\241\305\377\202"
"\241\305\377\202\241\305\377\202\241\305\377\201\240\305\377\201\240"
"\305\377\201\240\305\377\201\240\305\377\201\240\305\377\200\237\304"
"\377\177\236\304\377~\235\303\377Z~\257\374(U\2179\0\0\0\0\0\0\0\0\0"
"\377\177\236\304\377~\235\303\377Z~\257\374(U\2179\1\0\0\0\0\0\0\0\0"
"\0\0\0\326\330\324\376\326\330\322\373Dj\237\314\221\265\331\377a\215"
"\300\377q\236\316\377r\237\317\377r\237\317\377r\237\317\377r\237\317"
"\377r\237\317\377r\237\317\377r\237\317\377r\237\317\377p\235\315\377"
......@@ -883,6 +883,116 @@ static const guint8 gnome_stock_addressbook[] =
"\271\364b\212\271\364a\211\271\364a\211\270\364a\210\270\364`\210\270"
"\364Fo\242\344\21\37;J\0\0\0\32\0\0\0\0\0\0\0\0"};
/* GdkPixbuf RGBA C-Source image dump */
#ifdef __SUNPRO_C
#pragma align 4 (gnome_stock_calls)
#endif
#ifdef __GNUC__
static const guint8 gnome_stock_calls[] __attribute__ ((__aligned__ (4))) =
#else
static const guint8 gnome_stock_calls[] =
#endif
{ ""
/* Pixbuf magic (0x47646b50) */
"GdkP"
/* length: header (24) + pixel_data (2304) */
"\0\0\11\30"
/* pixdata_type (0x1010002) */
"\1\1\0\2"
/* rowstride (96) */
"\0\0\0`"
/* width (24) */
"\0\0\0\30"
/* height (24) */
"\0\0\0\30"
/* pixel_data: */
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\34\0\0\0\2\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\22\11.\0p\20^\0\311\12\77\0\202\0\0\0\13\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\34q\34\11\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3"
"\4\14\0>\15Z\0\275\23p\0\365\24w\0\361\24v\0\353\11<\0\210\0\0\0\4\0"
"\0\0\0\0\0\0\0\0\0\0\0\377\377\377\3\377\377\370#\377\377\370H\224\267"
"\207\206\377\377\366U\377\377\3655\377\377\355\16\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5\31\0e\22s\0\344\32\241\0\376\31\234\0"
"\377\24y\0\367\22p\0\364\21c\0\335\4\21\0;\0\0\0\0\0\0\0\0\377\377\346"
"\12\377\377\365P\377\377\360{\375\375\360\225\261\312\242\272\375\375"
"\357\234\375\375\360\211\377\377\365h\377\377\370&\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\5\36\0]\24}\0\352\31\234\0\377\31\227\0\377\26"
"\210\0\377\21c\0\363\22o\0\375\14E\0\233\0\0\0\0t\242t\13\275\323\263"
"h\375\375\360\212\376\376\353\267\376\376\350\326\301\325\254\352\376"
"\376\347\340\376\376\352\307\375\375\355\240\360\364\345t\206\260}7\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""8\21o\0\333\30\225\0\377\27\221"
"\0\377\24\203\0\377\22i\0\375\20d\0\364\15Q\0\300\0\0\0\2\377\377\370"
"&\277\324\261\223\262\313\243\313\357\365\331\335\376\376\354\262\346"
"\356\330\244\375\375\354\245\374\374\351\306\314\335\272\331\256\311"
"\240\263\344\354\327_\377\377\377\2\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0!\20"
"g\0\313\31\230\0\377\27\216\0\377\25\203\0\377\22o\0\377\17W\0\365\13"
"A\0\244\0\0\0\4\377\377\365N\375\375\360\227\372\373\343\332\315\335"
"\276\275\377\377\362z\377\377\366Y\377\377\365f\336\347\321\240\346\356"
"\322\326\376\376\353\264\377\377\362r\377\377\377\22\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\5\16U\0\261\30\226\0\377\27\221\0\377\25\205\0\377\17"
"Y\0\347\7(\0r\0\0\0\26\377\377\377\1\377\377\364_\375\375\354\243\376"
"\376\347\337\375\375\356\232\377\377\366V\377\377\377\30\377\377\372"
"8\377\377\360{\376\376\352\300\376\376\352\303\377\377\361}\377\377\366"
"\35\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\7-\0l\25\203\0\361\30\225\0\377\26"
"\212\0\377\21^\0\330\0\0\0!\0\0\0\0\377\377\377\1\377\377\364[\375\375"
"\355\240\376\376\350\344\347\356\326\250\377\377\364a\377\377\3724\377"
"\377\370I\351\360\335\211\367\372\345\306\376\376\352\276\377\377\362"
"z\377\377\377\31\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5\0""3\23m\0\330\31"
"\230\0\377\27\216\0\377\22q\0\361\7""1\0n\0\0\0\0\0\0\0\0\377\377\367"
"=\347\356\333\223\270\320\246\331\321\340\277\314\375\375\357\222\377"
"\377\362x\375\375\361\202\356\363\335\257\276\323\253\351\311\333\272"
"\270\377\377\363i\377\377\377\12\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\11\17W\0\265\30\226\0\377\27\221\0\377\25\204\0\377\17V\0\314\0\0"
"\0\11\0\0\0\0\272\316\261\32\246\303\234\215\371\372\350\245\376\376"
"\350\324\376\376\351\315\270\317\247\316\376\376\352\303\376\376\347"
"\340\376\376\353\273\324\342\306\224\236\277\224_\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\6\36\0\\\25{\0\351\30\225\0\377\26\212\0"
"\377\21k\0\354\10/\0b\0\0\0\0\0\0\0\0\377\377\364.\377\377\362s\375\375"
"\357\234\376\376\352\271\273\320\251\325\376\376\352\301\376\376\355"
"\253\375\375\360\207\377\377\366U\377\377\377\7\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\32\20a\0\313\30\226\0\377\27\215\0\377"
"\24\202\0\377\17V\0\317\0\0\0\13\0\0\0\0\0\0\0\0\377\377\370#\377\377"
"\364^\377\377\362w\245\302\231\242\377\377\361}\377\377\363k\377\377"
"\367@\377\377\377\7\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\7,\0m\25|\0\354\27\221\0\377\25\206\0\377\21l\0\360\13"
"=\0\206\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\4\377\377\363\26\230\274"
"\2179\377\377\366\35\377\377\377\13\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\31\20_\0\312\30"
"\221\0\377\26\212\0\377\24\177\0\377\17\\\0\336\5\31\0""3\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\6\40"
"\0Y\22n\0\341\27\215\0\377\25\203\0\377\23s\0\376\15P\0\305\0\0\0\21"
"\0\0\0\0\0\0\0\7\0\0\0\31\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\10\15G\0\232\24\177\0\363\25\206\0\377\23{\0\377\22i\0\364\15"
"H\0\256\7\25\0I\16U\0\267\21b\0\323\12""1\0i\0\0\0\3\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\40\17[\0\310\26\204\0\376\24\177\0\377\22"
"t\0\377\17`\0\357\20`\0\352\23m\0\367\26\202\0\364\22k\0\337\6#\0X\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\14\0>\20`\0\324\25\177\0"
"\377\23w\0\377\21m\0\377\21j\0\377\24w\0\377\23t\0\370\24\201\0\374\17"
"]\0\311\0\0\0\27\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\6\35\0Y"
"\20c\0\334\22z\0\377\22p\0\377\20e\0\377\21j\0\377\24y\0\377\21g\0\364"
"\22l\0\347\6\34\0R\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\3\5$\0b\20`\0\334\22s\0\377\20i\0\377\17_\0\377\22l\0\377\22i\0\363"
"\22q\0\377\12;\0z\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\3\5\40\0a\17^\0\331\21j\0\377\17b\0\377\17_\0\377\22b\0\365\17"
"Z\0\336\3\30\0V\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\3\3\26\0R\17X\0\320\20_\0\366\16W\0\327\13C\0\235\0\6\0"
"+\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\11\0<\13""5\0\213\0\5\0""0\0\0\0\2\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"};
G_END_DECLS
......
......@@ -47,9 +47,9 @@
<toolitem name="NewCallToolbar" action="NewCall"/>
<toolitem name="PickUpToolbar" action="PickUp"/>
<toolitem action="HangUp"/>
<toolitem name="TransferToolbar" action="Transfer"/>
<toolitem name="OnHoldToolbar" action="OnHold"/>
<toolitem name="OffHoldToolbar" action="OffHold"/>
<toolitem name="TransferToolbar" action="Transfer"/>
<separator/>
<toolitem action="Voicemail"/>
</toolbar>
......
......@@ -212,6 +212,7 @@ void update_actions()
gtk_action_set_sensitive (GTK_ACTION (hangUpAction), FALSE);
gtk_widget_set_sensitive (GTK_WIDGET (holdMenu), FALSE);
gtk_widget_set_sensitive (GTK_WIDGET (holdToolbar), FALSE);
gtk_widget_set_sensitive (GTK_WIDGET (offHoldToolbar), FALSE);
gtk_action_set_sensitive (GTK_ACTION (recordAction), FALSE);
gtk_action_set_sensitive (GTK_ACTION (copyAction), FALSE);
gtk_action_set_sensitive (GTK_ACTION (voicemailAction), FALSE);
......@@ -793,7 +794,7 @@ static const GtkToggleActionEntry toggle_menu_entries[] = {
static const GtkRadioActionEntry radio_menu_entries[] = {
{"CallWindow", GTK_STOCK_HOME, "_Call window", NULL, "Calls list", CALLTREE_CALLS},
{"CallWindow", GTK_STOCK_CALLS, "_Call window", NULL, "Calls list", CALLTREE_CALLS},
{"History", "appointment-soon", "_History", NULL, "Calls history", CALLTREE_HISTORY},
{"Addressbook", GTK_STOCK_ADDRESSBOOK, "_Address book", NULL, "Address book", CALLTREE_CONTACTS}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment