Commit 2722f806 authored by smorlat's avatar smorlat

- gui improvements (contributed patch)

- fix pkgconfig in mediastreamer2



git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@97 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
parent 44c66449
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
<!--Generated with glade3 3.4.5 on Thu Oct 2 16:20:18 2008 -->
<!--Generated with glade3 3.4.3 on Tue Oct 14 22:30:22 2008 -->
<glade-interface>
<widget class="GtkWindow" id="main">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
......@@ -280,65 +280,51 @@
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
<widget class="GtkFrame" id="frame7">
<widget class="GtkHBox" id="hbox4">
<property name="visible">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="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
<widget class="GtkAlignment" id="alignment7">
<widget class="GtkLabel" id="label2">
<property name="visible">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="label" translatable="yes">Lookup:</property>
</widget>
<packing>
<property name="padding">8</property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="search_bar">
<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="left_padding">12</property>
<child>
<widget class="GtkHBox" id="hbox5">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
<widget class="GtkComboBox" id="show_category">
<property name="visible">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="active">0</property>
<property name="items" translatable="yes">Show All
Show Online</property>
<signal name="changed" handler="linphone_gtk_show_friends"/>
</widget>
</child>
<child>
<widget class="GtkLabel" id="label14">
<property name="visible">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="label" translatable="yes">Search:</property>
</widget>
<packing>
<property name="padding">8</property>
<property name="position">1</property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="search_bar">
<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>
<signal name="changed" handler="linphone_gtk_show_friends"/>
</widget>
<packing>
<property name="position">2</property>
</packing>
</child>
</widget>
</child>
<signal name="changed" handler="linphone_gtk_show_friends"/>
</widget>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label4">
<property name="visible">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="label" translatable="yes">in</property>
</widget>
<packing>
<property name="padding">8</property>
<property name="position">2</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label13">
<widget class="GtkComboBox" id="show_category">
<property name="visible">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="label" translatable="yes">Display filters</property>
<property name="use_markup">True</property>
<property name="active">0</property>
<property name="items" translatable="yes">All users
Online users</property>
<signal name="changed" handler="linphone_gtk_show_friends"/>
</widget>
<packing>
<property name="type">label_item</property>
<property name="position">3</property>
</packing>
</child>
</widget>
......@@ -402,7 +388,6 @@ Show Online</property>
<widget class="GtkAlignment" id="alignment5">
<property name="visible">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="left_padding">15</property>
<child>
<widget class="GtkTable" id="dtmf_table">
<property name="visible">True</property>
......@@ -738,7 +723,7 @@ Show Online</property>
<widget class="GtkLabel" id="label17">
<property name="visible">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="label" translatable="yes">My identity :</property>
<property name="label" translatable="yes">My current identity:</property>
<property name="use_markup">True</property>
</widget>
<packing>
......
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
<!--Generated with glade3 3.4.5 on Sat Oct 11 20:34:33 2008 -->
<!--Generated with glade3 3.4.3 on Tue Oct 14 00:01:54 2008 -->
<glade-interface>
<widget class="GtkDialog" id="password">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
......@@ -24,7 +24,7 @@
<widget class="GtkLabel" id="message">
<property name="visible">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="label" translatable="yes">Please enter your password for domain...</property>
<property name="label" translatable="yes">Please enter the domain password</property>
<property name="wrap">True</property>
</widget>
</child>
......@@ -34,26 +34,27 @@
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<child>
<widget class="GtkEntry" id="password_entry">
<widget class="GtkEntry" id="username_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="is_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="visibility">False</property>
<signal name="activate" handler="linphone_gtk_password_ok"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="label" translatable="yes">Username:</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
</widget>
</child>
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="label" translatable="yes">Password:</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
</widget>
<packing>
<property name="top_attach">1</property>
......@@ -61,19 +62,20 @@
</packing>
</child>
<child>
<widget class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="label" translatable="yes">Username</property>
</widget>
</child>
<child>
<widget class="GtkEntry" id="username_entry">
<widget class="GtkEntry" id="password_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="is_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="visibility">False</property>
<signal name="activate" handler="linphone_gtk_password_ok"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</child>
</widget>
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
<!--Generated with glade3 3.4.5 on Tue Jul 22 15:48:19 2008 -->
<!--Generated with glade3 3.4.3 on Tue Oct 14 00:04:09 2008 -->
<glade-interface>
<widget class="GtkDialog" id="sip_account">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
......@@ -36,46 +36,42 @@
<property name="n_rows">4</property>
<property name="n_columns">2</property>
<child>
<widget class="GtkLabel" id="label38">
<property name="visible">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="label" translatable="yes">Your SIP identity:</property>
</widget>
</child>
<child>
<widget class="GtkEntry" id="identity">
<widget class="GtkSpinButton" id="regperiod">
<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">3600 0 100000 1 10 10</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label39">
<widget class="GtkLabel" id="label41">
<property name="visible">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="label" translatable="yes">SIP Proxy address:</property>
<property name="label" translatable="yes">Registration duration (sec):</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
</widget>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="proxy">
<widget class="GtkEntry" id="route">
<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="text" translatable="yes">sip:</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
</packing>
</child>
<child>
......@@ -83,6 +79,7 @@
<property name="visible">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="label" translatable="yes">Route (optional):</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
</widget>
<packing>
<property name="top_attach">2</property>
......@@ -90,43 +87,50 @@
</packing>
</child>
<child>
<widget class="GtkEntry" id="route">
<widget class="GtkEntry" id="proxy">
<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="text" translatable="yes">sip:</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label41">
<widget class="GtkLabel" id="label39">
<property name="visible">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="label" translatable="yes">Registration period (sec):</property>
<property name="label" translatable="yes">SIP Proxy address:</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
</widget>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</child>
<child>
<widget class="GtkSpinButton" id="regperiod">
<widget class="GtkEntry" id="identity">
<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">3600 0 100000 1 10 10</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label38">
<property name="visible">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="label" translatable="yes">Your SIP identity:</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
</widget>
</child>
</widget>
</child>
<child>
......
......@@ -188,6 +188,8 @@ AC_ARG_ENABLE(artsc,
arts_enabled=false
PKG_PROG_PKG_CONFIG()
if test "$artsc" = "true" ; then
dnl check for arts (kde sound daemon) support
......
EXTRA_DIST= winsnd2.c winsnd.c winvideo.c winvideods.c wincevideods.c dxfilter.h dxfilter.cpp msfileplayer_win.c msfilerec_win.c winsndds.cpp nowebcamCIF.jpg winsnd3.c
EXTRA_DIST= winsnd2.c winsnd.c winvideo.c winvideods.c wincevideods.c dxfilter.h dxfilter.cpp msfileplayer_win.c msfilerec_win.c winsndds.cpp nowebcamCIF.jpg winsnd3.c vfw-missing.h
BUILT_SOURCES=alldescs.h
......
This diff is collapsed.
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: linphone 0.7.1\n"
"Report-Msgid-Bugs-To: linphone-developers@nongnu.org\n"
"POT-Creation-Date: 2008-10-12 11:04+0200\n"
"POT-Creation-Date: 2008-10-16 18:38+0200\n"
"PO-Revision-Date: 2003-05-23 17:51-0400\n"
"Last-Translator: Jean-Jacques Sarton <jj.sarton@t-online.de>, Ursula Herles-"
"Hartz <UAHartz@t-online.de>\n"
......@@ -162,101 +162,100 @@ msgstr ""
msgid "Current call"
msgstr "Konnte kein Anruf vornehmen"
#: gtk-glade/main.glade:302
msgid ""
"Show All\n"
"Show Online"
#: gtk-glade/main.glade:289
msgid "Lookup:"
msgstr ""
#: gtk-glade/main.glade:311
msgid "Search:"
#: gtk-glade/main.glade:310
msgid "in"
msgstr ""
#: gtk-glade/main.glade:337
#, fuzzy
msgid "Display filters"
msgstr "Angezeigter Name:"
#: gtk-glade/main.glade:322
msgid ""
"All users\n"
"Online users"
msgstr ""
#: gtk-glade/main.glade:380
#: gtk-glade/main.glade:366
#, fuzzy
msgid "<b>Contact list</b>"
msgstr "Kontaktliste"
#: gtk-glade/main.glade:419
#: gtk-glade/main.glade:404
msgid "D"
msgstr ""
#: gtk-glade/main.glade:437
#: gtk-glade/main.glade:422
msgid "#"
msgstr ""
#: gtk-glade/main.glade:455
#: gtk-glade/main.glade:440
msgid "0"
msgstr ""
#: gtk-glade/main.glade:473
#: gtk-glade/main.glade:458
msgid "*"
msgstr ""
#: gtk-glade/main.glade:489
#: gtk-glade/main.glade:474
msgid "C"
msgstr ""
#: gtk-glade/main.glade:507
#: gtk-glade/main.glade:492
msgid "9"
msgstr ""
#: gtk-glade/main.glade:525
#: gtk-glade/main.glade:510
msgid "8"
msgstr ""
#: gtk-glade/main.glade:543
#: gtk-glade/main.glade:528
msgid "7"
msgstr ""
#: gtk-glade/main.glade:559
#: gtk-glade/main.glade:544
msgid "B"
msgstr ""
#: gtk-glade/main.glade:577
#: gtk-glade/main.glade:562
msgid "6"
msgstr ""
#: gtk-glade/main.glade:595
#: gtk-glade/main.glade:580
msgid "5"
msgstr "5"
#: gtk-glade/main.glade:613
#: gtk-glade/main.glade:598
msgid "4"
msgstr ""
#: gtk-glade/main.glade:629
#: gtk-glade/main.glade:614
msgid "A"
msgstr ""
#: gtk-glade/main.glade:645
#: gtk-glade/main.glade:630
msgid "3"
msgstr ""
#: gtk-glade/main.glade:661
#: gtk-glade/main.glade:646
msgid "2"
msgstr ""
#: gtk-glade/main.glade:677
#: gtk-glade/main.glade:662
msgid "1"
msgstr ""
#: gtk-glade/main.glade:693
#: gtk-glade/main.glade:678
msgid "Digits"
msgstr ""
#: gtk-glade/main.glade:731
#: gtk-glade/main.glade:716
msgid "Default"
msgstr ""
#: gtk-glade/main.glade:741
#: gtk-glade/main.glade:726
#, fuzzy
msgid "My identity :"
msgid "My current identity:"
msgstr "SIP Identität"
#: gtk-glade/about.glade:8
......@@ -304,13 +303,13 @@ msgstr ""
msgid "Contact information"
msgstr "Kontaktinformationen"
#: gtk-glade/contact.glade:149 gtk-glade/password.glade:112
#: gtk-glade/sip_account.glade:202
#: gtk-glade/contact.glade:149 gtk-glade/password.glade:114
#: gtk-glade/sip_account.glade:206
msgid "gtk-cancel"
msgstr ""
#: gtk-glade/contact.glade:161 gtk-glade/password.glade:100
#: gtk-glade/sip_account.glade:190
#: gtk-glade/contact.glade:161 gtk-glade/password.glade:102
#: gtk-glade/sip_account.glade:194
msgid "gtk-ok"
msgstr ""
......@@ -320,7 +319,7 @@ msgid "Linphone debug window"
msgstr "Linphone Ende"
#: gtk-glade/log.glade:54 gtk-glade/call_logs.glade:49
#: gtk-glade/chatroom.glade:82 gtk-glade/parameters.glade:1412
#: gtk-glade/chatroom.glade:82 gtk-glade/parameters.glade:1402
msgid "gtk-close"
msgstr ""
......@@ -330,56 +329,56 @@ msgid "Linphone - Authentication required"
msgstr "Authentifikation erfordert"
#: gtk-glade/password.glade:27
msgid "Please enter your password for domain..."
msgid "Please enter the domain password"
msgstr ""
#: gtk-glade/password.glade:49
#, fuzzy
msgid "Username:"
msgstr "Benutzername:"
#: gtk-glade/password.glade:56
#, fuzzy
msgid "Password:"
msgstr "Passwort"
#: gtk-glade/password.glade:66
#, fuzzy
msgid "Username"
msgstr "Benutzername:"
#: gtk-glade/sip_account.glade:8
msgid "Linphone - Configure a SIP account"
msgstr ""
#: gtk-glade/sip_account.glade:42
#: gtk-glade/sip_account.glade:56
#, fuzzy
msgid "Your SIP identity:"
msgstr "SIP Identität"
msgid "Registration duration (sec):"
msgstr "Registrierungsdauer."
#: gtk-glade/sip_account.glade:60
#, fuzzy
msgid "SIP Proxy address:"
msgstr "SIP Proxy:"
#: gtk-glade/sip_account.glade:81
msgid "Route (optional):"
msgstr "Route (optional):"
#: gtk-glade/sip_account.glade:72
#: gtk-glade/sip_account.glade:94
msgid "sip:"
msgstr "sip:"
#: gtk-glade/sip_account.glade:85
msgid "Route (optional):"
msgstr "Route (optional):"
#: gtk-glade/sip_account.glade:107
#, fuzzy
msgid "SIP Proxy address:"
msgstr "SIP Proxy:"
#: gtk-glade/sip_account.glade:109
#: gtk-glade/sip_account.glade:130
#, fuzzy
msgid "Registration period (sec):"
msgstr "Registrierungsdauer."
msgid "Your SIP identity:"
msgstr "SIP Identität"
#: gtk-glade/sip_account.glade:136
#: gtk-glade/sip_account.glade:140
msgid "Register at startup"
msgstr ""
#: gtk-glade/sip_account.glade:150
#: gtk-glade/sip_account.glade:154
#, fuzzy
msgid "Publish presence information"
msgstr "Anwesenheit Information publzieren"
#: gtk-glade/sip_account.glade:167
#: gtk-glade/sip_account.glade:171
msgid "Configure a SIP account"
msgstr ""
......@@ -411,243 +410,241 @@ msgstr "Annehmen"
msgid "Decline"
msgstr "Leitung"
#: gtk-glade/parameters.glade:36
msgid "Use IPv6 instead of IPv4"
msgstr ""
#: gtk-glade/parameters.glade:48
msgid "<b>IPv6 usage</b>"
#: gtk-glade/parameters.glade:41
msgid "Set Maximum Transmission Unit:"
msgstr ""
#: gtk-glade/parameters.glade:77
msgid "SIP (UDP)"
#: gtk-glade/parameters.glade:64
msgid "Send DTMFs as SIP info"
msgstr ""