From 379990aef3927d9549ce7c90d4107061f060b8a5 Mon Sep 17 00:00:00 2001
From: llea <llea>
Date: Fri, 4 Feb 2005 21:45:35 +0000
Subject: [PATCH] Add alsa support but not yet operational. Change setup
directory name to ".sflphone". Fix volume control.
---
src/Makefile | 3 +-
src/audiodrivers.h | 2 -
src/audiodriversalsa.cpp | 272 ++++++++++++++
src/audiodriversalsa.h | 58 +++
src/audiodriversoss.cpp | 50 +--
src/audiodriversoss.h | 5 +-
src/audiortp.cpp | 35 +-
src/audiortp.h | 5 +-
src/configurationpanel.ui | 306 ++++++++++------
src/configurationpanel.ui.h | 14 +-
src/configurationpanelui.cpp | 688 ++++++++++++++++++-----------------
src/configurationpanelui.h | 18 +-
src/global.h | 3 +-
src/manager.cpp | 34 +-
src/manager.h | 7 +-
src/phonebookui.cpp | 2 +-
src/phonebookui.h | 2 +-
src/qtGUImainwindow.cpp | 24 +-
src/qtGUImainwindow.h | 12 +-
src/sip.cpp | 2 +-
src/tonegenerator.cpp | 1 -
src/url_inputui.cpp | 2 +-
src/url_inputui.h | 2 +-
23 files changed, 1002 insertions(+), 545 deletions(-)
create mode 100644 src/audiodriversalsa.cpp
create mode 100644 src/audiodriversalsa.h
diff --git a/src/Makefile b/src/Makefile
index 6bb42efa67..587852ada8 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -23,7 +23,7 @@ INCPATH = -I. -I$(QTDIR)/include -I$(CCPPDIR)/include/cc++2 -I$(CCRTPDIR)/inclu
CXXFLAGS = -pipe -Wall -W -g -pipe -march=i386 -mcpu=i686 -DQT_NO_DEBUG -DQT_SHARED -DQT_THREAD_SUPPORT -fpermissive -Wno-deprecated $(INCPATH)
-LIBS = -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm -L/opt/lib -losip2 -leXosip -lccrtp1 `ccgnu2-config --flags --stdlibs`
+LIBS = -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm -L/opt/lib -losip2 -leXosip -lccrtp1 -lasound `ccgnu2-config --flags --stdlibs`
CONFIGURE_CONF=$(shell ls ../configure.conf)
@@ -32,6 +32,7 @@ OBJS = \
audiocodec.o \
audiodrivers.o \
audiodriversoss.o \
+ audiodriversalsa.o \
audiortp.o \
configuration.o \
configitem.o \
diff --git a/src/audiodrivers.h b/src/audiodrivers.h
index 219d05f01f..2a82e88618 100644
--- a/src/audiodrivers.h
+++ b/src/audiodrivers.h
@@ -41,8 +41,6 @@ public:
virtual int initDevice (DeviceMode) = 0;
virtual int resetDevice (void) = 0;
- virtual int closeDevice (void) = 0;
- virtual int writeBuffer (void *, int) = 0;
virtual int writeBuffer (void) = 0;
virtual int readBuffer (void *, int) = 0;
virtual int readBuffer (int) = 0;
diff --git a/src/audiodriversalsa.cpp b/src/audiodriversalsa.cpp
new file mode 100644
index 0000000000..e425acbc8a
--- /dev/null
+++ b/src/audiodriversalsa.cpp
@@ -0,0 +1,272 @@
+/**
+ * Copyright (C) 2004 Savoir-Faire Linux inc.
+ * Author: Jerome Oufella <jerome.oufella@savoirfairelinux.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/soundcard.h>
+
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include "audiodriversalsa.h"
+#include "global.h"
+
+#define ALSA_DEVICE "plughw:0,0"
+
+AudioDriversALSA::AudioDriversALSA(DeviceMode mode) : AudioDrivers () {
+ audio_hdl = (snd_pcm_t *) NULL;
+ initDevice(mode);
+}
+
+AudioDriversALSA::~AudioDriversALSA (void) {
+ /* Close the audio handle */
+ snd_pcm_close (audio_hdl);
+}
+
+
+int
+AudioDriversALSA::initDevice (DeviceMode mode) {
+ int err;
+
+ if (devstate == DeviceOpened) {
+ printf ("ERROR: ALSA Device Already Open !\n");
+ return -1;
+ }
+
+ // Open the audio device
+ // Flags : blocking (else have to OR omode with SND_PCM_OPEN_NONBLOCK).
+ switch (mode) {
+ case ReadOnly:
+ /* Only read sound from the device */
+ err = snd_pcm_open (&audio_hdl, ALSA_DEVICE,SND_PCM_STREAM_CAPTURE, 0);
+ break;
+
+ case WriteOnly:
+ /* Only write sound to the device */
+ err = snd_pcm_open (&audio_hdl, ALSA_DEVICE,SND_PCM_STREAM_PLAYBACK,0);
+ break;
+ default:
+ break;
+ }
+
+ if (err < 0) {
+ printf ("ERROR: ALSA/snd_pcm_open: Cannot open audio device (%s)\n",
+ snd_strerror (err));
+ return -1;
+ }
+ ////////////////////////////////////////////////////////////////////////////
+ // BEGIN DEVICE SETUP
+ ////////////////////////////////////////////////////////////////////////////
+ // Allocate space for device configuration
+ snd_pcm_hw_params_t *hw_params;
+ err = snd_pcm_hw_params_malloc (&hw_params);
+ if (err < 0) {
+ printf ("Cannot allocate hardware parameter structure (%s)\n",
+ snd_strerror (err));
+ return -1;
+ }
+
+ if ((err = snd_pcm_hw_params_any (audio_hdl, hw_params)) < 0) {
+ printf ("Cannot initialize hardware parameter structure (%s)\n",
+ snd_strerror (err));
+ return -1;
+ }
+
+ err = snd_pcm_hw_params_set_access (audio_hdl, hw_params,
+ SND_PCM_ACCESS_RW_INTERLEAVED);
+ if (err < 0) {
+ printf ("Cannot set access type (%s)\n", snd_strerror (err));
+ }
+
+ // Set sample formats (Signed, 16Bits, little endian)
+ err = snd_pcm_hw_params_set_format (audio_hdl, hw_params,
+ SND_PCM_FORMAT_S16_LE);
+ if (err < 0) {
+ printf ("Cannot set sample format (%s)\n", snd_strerror (err));
+ return -1;
+ }
+ unsigned int rate = SAMPLING_RATE;
+ // Set sampling rate (8kHz)
+ err = snd_pcm_hw_params_set_rate_near (audio_hdl, hw_params,
+ &rate, 0);
+ if (err < 0) {
+ printf ("Cannot set sample rate (%s)\n", snd_strerror (err));
+ return -1;
+ }
+
+ // Set number of channels - Mono(1) or Stereo(2)
+ err = snd_pcm_hw_params_set_channels (audio_hdl, hw_params, MONO);
+ if (err < 0) {
+ printf ("Cannot set channel count (%s)\n", snd_strerror (err));
+ return -1;
+ }
+
+ // Apply previously setup parameters
+ err = snd_pcm_hw_params (audio_hdl, hw_params);
+ if (err < 0) {
+ printf ("Cannot set parameters (%s)\n", snd_strerror (err));
+ return -1;
+ }
+
+ // Free temp variable used for configuration.
+ snd_pcm_hw_params_free (hw_params);
+ ////////////////////////////////////////////////////////////////////////////
+ // END DEVICE SETUP
+ ////////////////////////////////////////////////////////////////////////////
+
+
+#if 0
+ // keep fragsize less than 20ms !!
+ int frag = ( ( 32767 << 16 ) | 7 );
+ if( ioctl( audio_fd, SNDCTL_DSP_SETFRAGMENT, &frag ) ) {
+ lasterror = QString( "SETFRAG" ) + QString( strerror( errno ) );
+ printf( "ERROR: %s\n", lasterror.ascii() );
+ return -1;
+ }
+
+ audio_buf_info info;
+ if( mode == WriteOnly ) {
+ if( ioctl( audio_fd, SNDCTL_DSP_GETOSPACE, &info ) == -1 ) {
+ lasterror = QString( "GETISPACE" ) + QString( strerror( errno ) );
+ printf( "ERROR: %s\n", lasterror.ascii() );
+ return -1;
+ }
+ } else {
+ if( ioctl( audio_fd, SNDCTL_DSP_GETISPACE, &info ) == -1 ) {
+ lasterror = QString( "GETOSPACE" ) + QString( strerror( errno ) );
+ printf( "ERROR: %s\n", lasterror.ascii() );
+ return -1;
+ }
+ }
+ audio_buf.resize( info.fragsize * sizeof( short ) );
+#endif
+
+ // Success
+ devstate = DeviceOpened;
+ return 0;
+}
+
+int
+AudioDriversALSA::writeBuffer (void) {
+ if (devstate != DeviceOpened) {
+ printf ("ALSA: writeBuffer(): Device Not Open\n");
+ return -1;
+ }
+
+ int rc;
+ size_t count = audio_buf.getSize();
+ short *buf = (short*)audio_buf.getData();
+ while (count > 0) {
+ rc = snd_pcm_writei(audio_hdl, buf, count);
+ if (rc == -EPIPE) {
+ snd_pcm_prepare(audio_hdl);
+ } else if (rc == -EAGAIN) {
+ continue;
+ } else if (rc < 0) {
+ printf ("ALSA: write(): %s\n", strerror(errno));
+ break;
+ }
+ buf += rc;
+ count -= rc;
+ }
+ return rc;
+}
+
+unsigned int
+AudioDriversALSA::readableBytes (void) {
+ audio_buf_info info;
+#if 0
+ struct timeval timeout;
+ fd_set read_fds;
+
+ if (devstate != DeviceOpened) {
+ return 0;
+ }
+ timeout.tv_sec = 0;
+ timeout.tv_usec = 0;
+ FD_ZERO (&read_fds);
+ FD_SET (audio_fd, &read_fds);
+ if (select (audio_fd + 1, &read_fds, NULL, NULL, &timeout) == -1) {
+ return 0;
+ }
+ if (!FD_ISSET ( audio_fd, &read_fds)) {
+ return 0;
+ }
+ if (ioctl (audio_fd, SNDCTL_DSP_GETISPACE, &info) == -1) {
+ printf ("ERROR: readableBytes %s\n", strerror(errno));
+ return 0;
+ }
+#endif
+ return info.bytes;
+}
+
+
+int
+AudioDriversALSA::readBuffer (int bytes) {
+ if (devstate != DeviceOpened) {
+ printf ("Device Not Open\n");
+ return false;
+ }
+
+ audio_buf.resize (bytes);
+ size_t count = bytes;
+
+ void *buf;
+ buf = audio_buf.getData ();
+ size_t rc = read (audio_fd, buf, count);
+ if (rc != count) {
+ printf ("warning: asked microphone for %d got %d\n", count, rc);
+ }
+ return true;
+}
+
+int
+AudioDriversALSA::readBuffer (void *ptr, int bytes) {
+ if( devstate != DeviceOpened ) {
+ printf ("ALSA: readBuffer(): Device Not Open\n");
+ return -1;
+ }
+
+ ssize_t count = bytes;
+ ssize_t rc;
+ rc = snd_pcm_readi(audio_hdl, ptr, count);
+ if (rc < 0) {
+ return -1;
+ } else if (rc != count) {
+ printf("warning: asked microphone for %d frames but got %d\n",
+ count, rc);
+ return -1;
+ }
+ return rc;
+}
+
+int
+AudioDriversALSA::resetDevice (void) {
+ printf ("ALSA: Resetting device.\n");
+
+ return 0;
+}
+
+// EOF
diff --git a/src/audiodriversalsa.h b/src/audiodriversalsa.h
new file mode 100644
index 0000000000..a690e05cab
--- /dev/null
+++ b/src/audiodriversalsa.h
@@ -0,0 +1,58 @@
+/**
+ * Copyright (C) 2004 Savoir-Faire Linux inc.
+ * Author: Jerome Oufella <jerome.oufella@savoirfairelinux.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef _AUDIO_DRIVERS_ALSA_H_
+#define _AUDIO_DRIVERS_ALSA_H_
+
+#include <alsa/asoundlib.h>
+
+#include "audiodrivers.h"
+
+/**
+ * This is the ALSA implementation of DspOut.
+ * Note that you cannot change how many fragments
+ * this class requests, yet.
+ */
+class AudioDriversALSA : public AudioDrivers {
+public:
+ /**
+ * Constructs a AudioDriversALSA object representing the given
+ * filename. Default is /dev/dsp.
+ */
+ AudioDriversALSA(DeviceMode);
+
+ /**
+ * Destructor. Will close the device if it is open.
+ */
+ virtual ~AudioDriversALSA( void );
+
+ int initDevice (DeviceMode);
+ int resetDevice (void);
+ int writeBuffer (void);
+ int readBuffer (int);
+ int readBuffer (void *, int);
+ unsigned int readableBytes(void);
+
+ int audio_fd;
+ snd_pcm_t *audio_hdl;
+
+private:
+};
+
+#endif // _AUDIO_DRIVERS_ALSA_H_
diff --git a/src/audiodriversoss.cpp b/src/audiodriversoss.cpp
index 85af0d3eff..88e353ce95 100644
--- a/src/audiodriversoss.cpp
+++ b/src/audiodriversoss.cpp
@@ -34,11 +34,10 @@
#include "audiodriversoss.h"
#include "global.h"
-#define MONO 1
-AudioDriversOSS::AudioDriversOSS (void) : AudioDrivers () {
+AudioDriversOSS::AudioDriversOSS (DeviceMode mode) : AudioDrivers () {
audio_fd = -1;
- initDevice(AudioDrivers::ReadWrite);
+ initDevice(mode);
}
AudioDriversOSS::~AudioDriversOSS (void) {
@@ -61,7 +60,6 @@ AudioDriversOSS::resetDevice (void) {
int
AudioDriversOSS::initDevice (DeviceMode mode) {
int oflag;
-
switch (mode) {
case ReadOnly:
oflag = O_RDONLY;
@@ -113,18 +111,18 @@ AudioDriversOSS::initDevice (DeviceMode mode) {
int channels = MONO;
if (ioctl(audio_fd, SNDCTL_DSP_CHANNELS, &channels) == -1) {
printf ("ERROR: DSP_STEREO %s\n", strerror(errno));
- return false;
+ return -1;
}
if (channels != MONO) {
printf ("ERROR: Unsupported Number of Channels\n");
- return false;
+ return -1;
}
- // Setup sampling rate
+ // Setup sampling rate 8KHz
int rate = SAMPLING_RATE;
if (ioctl(audio_fd, SNDCTL_DSP_SPEED, &rate ) == -1 ) {
printf ("ERROR: DSP_SPEED %s\n", strerror(errno));
- return false;
+ return -1;
}
if (rate != SAMPLING_RATE) {
@@ -137,12 +135,12 @@ AudioDriversOSS::initDevice (DeviceMode mode) {
if (mode == WriteOnly) {
if (ioctl(audio_fd, SNDCTL_DSP_GETOSPACE, &info) == -1) {
printf ("ERROR: GETISPACE %s\n", strerror(errno));
- return false;
+ return -1;
}
} else {
if (ioctl(audio_fd, SNDCTL_DSP_GETISPACE, &info ) == -1) {
printf ("ERROR: GETOSPACE %s\n", strerror(errno));
- return false;
+ return -1;
}
}
// audio_buf.resize (info.fragsize * sizeof(short));
@@ -178,31 +176,6 @@ AudioDriversOSS::openDevice (int exist_fd) {
return true;
}
-#if 0
-#ifndef min
-#define min(a,b) (a<b?a:b)
-#endif
-int
-AudioDriversOSS::readBuffer (void *buf, int read_bytes) {
- int read_len,
- available;
- audio_buf_info info;
-
- /* Figure out how many bytes we can read before blocking... */
- ioctl(audio_fd, SNDCTL_DSP_GETISPACE, &info);
- available = min(info.bytes, read_bytes);
-
- printf("info=%d, read_bytes=%d, available=%d\n", info.bytes, read_bytes,
- available);
- read_len = read (audio_fd, (char *)buf, available);
- if (read_len < 0) {
- perror("audio_read");
- return 0;
- }
-
- return read_len;
-}
-#endif
int
AudioDriversOSS::readBuffer (void *ptr, int bytes) {
@@ -210,12 +183,7 @@ AudioDriversOSS::readBuffer (void *ptr, int bytes) {
printf ("Device Not Open\n");
return false;
}
-
- //audio_buf.resize(bytes);
ssize_t count = bytes;
-
-// unsigned char *buf;
-// buf = audio_buf.getData();
ssize_t rc;
rc = read (audio_fd, ptr, count);
@@ -234,7 +202,7 @@ int
AudioDriversOSS::readBuffer (int bytes) {
if( devstate != DeviceOpened ) {
printf ("Device Not Open\n");
- return false;
+ return -1;
}
audio_buf.resize(bytes);
diff --git a/src/audiodriversoss.h b/src/audiodriversoss.h
index 7d6f082fb2..c1c8cfcc9a 100644
--- a/src/audiodriversoss.h
+++ b/src/audiodriversoss.h
@@ -31,12 +31,11 @@
class AudioDriversOSS : public AudioDrivers {
public:
- AudioDriversOSS (void);
+ AudioDriversOSS (DeviceMode);
~AudioDriversOSS (void);
int initDevice (DeviceMode);
int resetDevice (void);
- int closeDevice (void);
bool openDevice (int);
int writeBuffer (void *, int);
int writeBuffer (void);
@@ -45,8 +44,8 @@ public:
unsigned int readableBytes (void);
int audio_fd;
-
private:
+ int closeDevice (void);
};
diff --git a/src/audiortp.cpp b/src/audiortp.cpp
index 91eb95a623..34340c2c50 100644
--- a/src/audiortp.cpp
+++ b/src/audiortp.cpp
@@ -67,8 +67,15 @@ AudioRtp::createNewSession (SipCall *ca) {
} else {
symetric = true;
}
-
- RTXThread = new AudioRtpRTX (ca, manager->audiodriver, manager, symetric);
+
+ if (manager->useAlsa) {
+ RTXThread = new AudioRtpRTX (ca, manager->audiodriver,
+ manager->audiodriverReadAlsa, manager, symetric);
+ } else {
+ RTXThread = new AudioRtpRTX (ca, manager->audiodriver, NULL, manager,
+ symetric);
+ }
+
if (RTXThread->start() != 0) {
return -1;
}
@@ -98,11 +105,13 @@ AudioRtp::closeRtpSession (SipCall *ca) {
// AudioRtpRTX Class //
////////////////////////////////////////////////////////////////////////////////
AudioRtpRTX::AudioRtpRTX (SipCall *sipcall, AudioDrivers *driver,
- Manager *mngr, bool sym) {
- this->ca = sipcall;
- this->audioDevice = driver;
+ AudioDrivers *read_driver, Manager *mngr, bool sym) {
this->manager = mngr;
+ this->ca = sipcall;
this->sym =sym;
+ this->audioDevice = driver;
+ if (manager->useAlsa)
+ this->audioDeviceRead = read_driver;
// TODO: Change bind address according to user settings.
InetHostAddress local_ip("0.0.0.0");
@@ -245,13 +254,24 @@ AudioRtpRTX::run (void) {
// Send session
////////////////////////////
if (!manager->mute) {
- i = audioDevice->readBuffer (data_from_mic, 320);
+ if (manager->useAlsa) {
+ i = audioDeviceRead->readBuffer (data_from_mic, 320);
+ } else {
+ i = audioDevice->readBuffer (data_from_mic, 320);
+ }
} else {
// When IP-phone user click on mute button, we read buffer of a
// temp buffer to avoid delay in sound.
- i = audioDevice->readBuffer (data_mute, 320);
+ if (manager->useAlsa)
+ i = audioDeviceRead->readBuffer (data_mute, 320);
+ else
+ i = audioDevice->readBuffer (data_mute, 320);
}
+ // TODO : return an error because no sound
+ if (i < 0) {
+ break;
+ }
for (int j = 0; j < i; j++)
data_from_mic_tmp[j] = data_from_mic[j]*manager->getMicVolume()/100;
@@ -294,7 +314,6 @@ AudioRtpRTX::run (void) {
audioDevice->audio_buf.resize(expandedSize);
audioDevice->audio_buf.setData (data_for_speakers,
manager->getSpkrVolume());
- // i = audioDevice->writeBuffer (data_for_speakers, expandedSize);
i = audioDevice->writeBuffer ();
delete adu;
diff --git a/src/audiortp.h b/src/audiortp.h
index dcbf7b43c3..6400d2048c 100644
--- a/src/audiortp.h
+++ b/src/audiortp.h
@@ -38,13 +38,16 @@ class Manager;
///////////////////////////////////////////////////////////////////////////////
class AudioRtpRTX : public Thread, public TimerPort {
public:
- AudioRtpRTX (SipCall *, AudioDrivers *, Manager *, bool);
+ AudioRtpRTX (SipCall *, AudioDrivers *, AudioDrivers *, Manager *, bool);
~AudioRtpRTX();
virtual void run ();
private:
SipCall *ca;
AudioDrivers *audioDevice;
+#ifdef ALSA
+ AudioDrivers *audioDeviceRead;
+#endif
RTPSession *sessionSend;
RTPSession *sessionRecv;
SymmetricRTPSession *session;
diff --git a/src/configurationpanel.ui b/src/configurationpanel.ui
index fe0f1eeeba..4767d283cc 100644
--- a/src/configurationpanel.ui
+++ b/src/configurationpanel.ui
@@ -9,7 +9,7 @@
<x>0</x>
<y>0</y>
<width>560</width>
- <height>515</height>
+ <height>536</height>
</rect>
</property>
<property name="caption">
@@ -148,7 +148,7 @@
</widget>
<widget class="QLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>layout18</cstring>
+ <cstring>layout17</cstring>
</property>
<vbox>
<property name="name">
@@ -192,107 +192,190 @@
<attribute name="title">
<string>SIP Authentication</string>
</attribute>
- <widget class="QGroupBox">
+ <widget class="QLayoutWidget">
<property name="name">
- <cstring>groupBox1</cstring>
+ <cstring>layout24</cstring>
</property>
<property name="geometry">
<rect>
- <x>20</x>
- <y>10</y>
- <width>380</width>
- <height>322</height>
+ <x>16</x>
+ <y>12</y>
+ <width>401</width>
+ <height>393</height>
</rect>
</property>
- <property name="title">
- <string></string>
- </property>
- <grid>
+ <vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0">
- <property name="name">
- <cstring>textLabel2</cstring>
- </property>
- <property name="text">
- <string>Full name</string>
- </property>
- </widget>
- <widget class="QLineEdit" row="1" column="0">
- <property name="name">
- <cstring>fullName</cstring>
- </property>
- </widget>
- <widget class="QLineEdit" row="3" column="0">
- <property name="name">
- <cstring>userPart</cstring>
- </property>
- </widget>
- <widget class="QLabel" row="2" column="0">
- <property name="name">
- <cstring>textLabel3</cstring>
- </property>
- <property name="text">
- <string>User Part of SIP URL</string>
- </property>
- </widget>
- <widget class="QLabel" row="4" column="0">
- <property name="name">
- <cstring>textLabel2_3</cstring>
- </property>
- <property name="text">
- <string>Authorization user</string>
- </property>
- </widget>
- <widget class="QLineEdit" row="5" column="0">
+ <widget class="QGroupBox">
<property name="name">
- <cstring>username</cstring>
+ <cstring>groupBox1</cstring>
</property>
- </widget>
- <widget class="QLineEdit" row="9" column="0">
- <property name="name">
- <cstring>hostPart</cstring>
- </property>
- </widget>
- <widget class="QLineEdit" row="11" column="0">
- <property name="name">
- <cstring>sipproxy</cstring>
- </property>
- </widget>
- <widget class="QLabel" row="10" column="0">
- <property name="name">
- <cstring>textLabel3_2_2</cstring>
- </property>
- <property name="text">
- <string>SIP proxy</string>
- </property>
- </widget>
- <widget class="QLineEdit" row="7" column="0">
- <property name="name">
- <cstring>password</cstring>
- </property>
- <property name="echoMode">
- <enum>Password</enum>
- </property>
- </widget>
- <widget class="QLabel" row="6" column="0">
- <property name="name">
- <cstring>textLabel1_3</cstring>
- </property>
- <property name="text">
- <string>Password</string>
+ <property name="title">
+ <string></string>
</property>
+ <grid>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel" row="0" column="0">
+ <property name="name">
+ <cstring>textLabel2</cstring>
+ </property>
+ <property name="text">
+ <string>Full name</string>
+ </property>
+ </widget>
+ <widget class="QLineEdit" row="1" column="0">
+ <property name="name">
+ <cstring>fullName</cstring>
+ </property>
+ </widget>
+ <widget class="QLineEdit" row="3" column="0">
+ <property name="name">
+ <cstring>userPart</cstring>
+ </property>
+ </widget>
+ <widget class="QLabel" row="2" column="0">
+ <property name="name">
+ <cstring>textLabel3</cstring>
+ </property>
+ <property name="text">
+ <string>User Part of SIP URL</string>
+ </property>
+ </widget>
+ <widget class="QLabel" row="4" column="0">
+ <property name="name">
+ <cstring>textLabel2_3</cstring>
+ </property>
+ <property name="text">
+ <string>Authorization user</string>
+ </property>
+ </widget>
+ <widget class="QLineEdit" row="5" column="0">
+ <property name="name">
+ <cstring>username</cstring>
+ </property>
+ </widget>
+ <widget class="QLineEdit" row="9" column="0">
+ <property name="name">
+ <cstring>hostPart</cstring>
+ </property>
+ </widget>
+ <widget class="QLineEdit" row="11" column="0">
+ <property name="name">
+ <cstring>sipproxy</cstring>
+ </property>
+ </widget>
+ <widget class="QLabel" row="10" column="0">
+ <property name="name">
+ <cstring>textLabel3_2_2</cstring>
+ </property>
+ <property name="text">
+ <string>SIP proxy</string>
+ </property>
+ </widget>
+ <widget class="QLineEdit" row="7" column="0">
+ <property name="name">
+ <cstring>password</cstring>
+ </property>
+ <property name="echoMode">
+ <enum>Password</enum>
+ </property>
+ </widget>
+ <widget class="QLabel" row="6" column="0">
+ <property name="name">
+ <cstring>textLabel1_3</cstring>
+ </property>
+ <property name="text">
+ <string>Password</string>
+ </property>
+ </widget>
+ <widget class="QLabel" row="8" column="0">
+ <property name="name">
+ <cstring>textLabel3_2</cstring>
+ </property>
+ <property name="text">
+ <string>Host part of SIP URL</string>
+ </property>
+ </widget>
+ </grid>
</widget>
- <widget class="QLabel" row="8" column="0">
+ <widget class="QLayoutWidget">
<property name="name">
- <cstring>textLabel3_2</cstring>
- </property>
- <property name="text">
- <string>Host part of SIP URL</string>
+ <cstring>layout23</cstring>
</property>
+ <vbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout19</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QCheckBox">
+ <property name="name">
+ <cstring>autoregister</cstring>
+ </property>
+ <property name="text">
+ <string>Auto-register</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>spacer7</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>201</width>
+ <height>21</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="QPushButton">
+ <property name="name">
+ <cstring>Register</cstring>
+ </property>
+ <property name="text">
+ <string>Register</string>
+ </property>
+ </widget>
+ </hbox>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>spacer9</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
+ <height>21</height>
+ </size>
+ </property>
+ </spacer>
+ </vbox>
</widget>
- </grid>
+ </vbox>
</widget>
</widget>
<widget class="QWidget">
@@ -611,6 +694,9 @@
<property name="name">
<cstring>alsaButton</cstring>
</property>
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
<property name="text">
<string>ALSA</string>
</property>
@@ -867,6 +953,19 @@
<attribute name="title">
<string>Themes</string>
</attribute>
+ <widget class="QComboBox">
+ <property name="name">
+ <cstring>SkinChoice</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>12</x>
+ <y>42</y>
+ <width>110</width>
+ <height>27</height>
+ </rect>
+ </property>
+ </widget>
<widget class="QPushButton">
<property name="name">
<cstring>buttonApplySkin</cstring>
@@ -886,19 +985,6 @@
<string>Alt+A</string>
</property>
</widget>
- <widget class="QComboBox">
- <property name="name">
- <cstring>SkinChoice</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>12</x>
- <y>42</y>
- <width>110</width>
- <height>27</height>
- </rect>
- </property>
- </widget>
</widget>
<widget class="QWidget">
<property name="name">
@@ -914,9 +1000,9 @@
<property name="geometry">
<rect>
<x>10</x>
- <y>20</y>
- <width>220</width>
- <height>210</height>
+ <y>10</y>
+ <width>262</width>
+ <height>200</height>
</rect>
</property>
<vbox>
@@ -1017,17 +1103,6 @@
<string>Minimize to tray</string>
</property>
</widget>
- <widget class="QCheckBox">
- <property name="name">
- <cstring>autoregister</cstring>
- </property>
- <property name="text">
- <string>Auto-register</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
<widget class="QLayoutWidget">
<property name="name">
<cstring>layout16</cstring>
@@ -1155,7 +1230,7 @@ Montreal, Quebec H2T 1S6</p></string>
</widget>
<images>
<image name="image0">
- <data format="PNG" length="3586">89504e470d0a1a0a0000000d49484452000000ad0000003008060000006357fade00000dc949444154789ced5d5f681cc71dfe1d38452ea29c4b1fac108a149a80540839557938b5095e9197ca72484ec983ad360f77968ba5f625720245b68372f183235fc0ad94a2546730951210921fe4930aa2928bcc296057a7a2723238702a6a390551ce429893380c5f1ff6766fffccecceec9d1c39be79f9ecdbf9f39bd9df7cfbcd6f675604221a25a28a21006c0000902c220a40c5dba9e2538b653b68e27e1600101899075d026860928bca38d0379706007cdb1dafe2938b9e0aa6b75402f5c712a035802e4d4aa33f0384a75175e02a4aa35c0100ca7577469545651cc8eee4ab12a28a42289411059511bd30aa0c4617d355c7ada22bba66486fe511885796599d3030325f950c557444c70cd802fc99fd67582bfa6389aae356918bdc0be9ad3cfc310f8c399c00c5011a9907c581f61bcb0080c93535ca205a8ffff264f98e0b60686414e1b33d0877f714318cf0d91e0cc6060100d96cf6c991240012d3959dd0f99d3c066340b8bb07c1630ac2dd61eff5ef837d2cac0cc35e560dc50e1c533283c7c2b8c80358051a5b0248b764d0d81240a025c8fd7fff40f48960f6fe81a86e7fc5ec9d836d3cfadeeff33491f7c53e06da675e01d20c2b92c2b3cb9e34ae17c60d9fed31dd88f68e10864646010063e393400c503adaf5eb8196209653cb079f7135fb2be510303b6ca0258870774f594c5b51fb3868fb41c94b6ad0acbbc306279265695ce57a52dca16066582cf10710f7011480c46cc2b17edc47f937c2ad7c19f523ebc13e00c1638aed09840d97f17a0cf6b9e5f78d12518488e2441401e0fb688ae85027d123310c075214ff6533f152e4af29bab6d22c5c1f0fc74e6c52d74bcffae2467b19984a2de3f499dfd21eed510dd5505069a5e1c1986b391302e83cd545eb5fafebf518b15d69a7deee0835bcf8bcaff59882bd877b54535b434bb71628eef3f98cf52d2c2671fee279da7eb84d81c6466afbcb173ecdcee62f9ba9f56e1bed3ddc33d51f686ca4c0cb013af7de39737d31a0e9cb66aaa11abaf2e9156a7bede7bee19151c4ff1cd7cbfb8f1ea1ed6f1ed01eedd1da528ae2df33dba3a16637ab7f6b77536abb00da4e1cd7eb33e6aba9ada125658136bb37a9eed9e27d11b0afa6b646efaf6e1f80e1cfe3347b7396d6bf5937b5e33f7a8416de9aa1dd7776e9f00fbeef8b9365e67979c3e5946435acdb1b34a13d0cb06bb4f68e10b00124179342335e2b1f3ca6a81d29326ddffb7d3a23055f57803c907d3da7b7d7ded16eb32ff766de767d303664b76f0e089fed31d567d5862646cc157f676852edfffd0351fe7815d89a1f4b00f2ea389bec035409551c072d7feecd7c79f659183ff7665efd7d03089d3c651eef22d3eb4c1b995ec6b57f7960c41f2d10ceb43159b697883e93646e278c5eeca43a1f9b39ac4cd9f44ab38d41ac4cd1d8d8486dbf68a3ae539d664603905a495173f3cf6c0cddd412809191863f8f93914966a6a74acc63b163ed6e8a666eced0858f2ed11eed91bfd64fbdddbdd4d5f5b6b99d02d0d4da6c63bee19620b47622dd11eafdcd695fa4bb072b2b2b36a63ef5ce293afe46876f7c7c125dffeca4c87684e8500d35bfdc4cbd67226a7f2ded844e84a8e1c30beee3c0e89727fb4e1ca7c8995ed2aeb72bedd43878c9747fcf0f44317b7396f6688f82af04a9f54f9ff9540d51282f1eabed45b0a5adca31ad743401c0606c08b8211645d0998151df726a192800ed1d215379a4a033858d61485d4d5b194963de744b066313937c265c2d3194b69a67da3b67d1f0967eb0faabb58b14ecfd711857a4501c8776537dda2256d63edc37b71f3a79cac4e85884edfe0180cab41eb4ac1183bfefa4a56798644b57be5aa7f76f35548469556dbb4e5d2f3d2fa7518968339b455d5d1d2ddc5ea2b6af5ba9f36f76cd6ad472bd1f9ca395bb29da7eb8cd656c2dff831870ada8e5346dbbfef53a759d89e8e5a317fbe9f81b1d3e2b535b35b0510b9f7bef9ccec891bfdfe23059182b2bf774bb7afff1958da936bfd9247a444487886a6a0fd3f02757f47eb218d3c8a832e3206d9fc013d188fe5a3fcd4fcfa81e1f18299f119dd2e052e51837edc088b298984d98186374641446860b1e53541d5d5ccd8e4d4c3219065970195cd784c57659e5dda2205a7911cd28d3ffe5d432b33f5686d434ad711c580c2d6b9fb57dd178b92fbb93c7b37f3c5c36034ebeb5499d8d756cba25a2a97b9bf4f6cd3aa2bdf21917173bb90c65d2628166d77cc6991e3e99222b635acbb775b4435f9d1b98c9a8bd6c4c743645f1889acfa8f1581a4ec3ce93a7a03d09d64ea428fea19866b432ad8cf6373e69b4df99e35086a675625aa727cf66360b6dad404005187078de9169f5547c63566e7b63ab0eda0bf638edd844f149905721b9983431aaa639b1e8a0f1605e35b3aeb334b3166570b2cf14ff0463d59c2d3199ab6694605a9ea6353e8182af2b6606b6d827ad69ad766c94ae6bd11addbe3c805c69cda0470fc25ea3061afa67083dc7b90ccb4bbecf1788fed7e6a9ddbe8b9dd4c89991bb3b799cee3d4d2bf7ee096ba54063237d7ce1636a78a181acf159ffd123b4f77097a9e96ccc300034dd346b348d71ac0cc78b7f1ab1e168030d7d7a851a5e54357cfc9802cd0e96666c38da40a1c48d8a306dab628e1f8b8cc38d8e10b4382bcb3e4d9b5bed30ae0978e3d1f042034d7d314e719fcf4759d93760060c1537c3784dfd0b698f6fc81c98d6c00883b141f0e284b801b6864291998b7153cca90c8b4271559b83aa7d0b3033a8c60caba57283b141473b13b30953fe52b921bb5d5a7ecd1eed3a4ae5928b126f0e0dfdd5fac3fcdd6057ff4054ed770aa67110b5cff1cd23a3bdf0d91e60156a14c1909f3ced7bbd5adab5556e4a6672a061b9f6fdb183bfb9a58afb8724cb7479c075379774da013205c9688543c7b493167d7380922f1da6ac9e0afe6ea038d35e16dbcd556e12b5c7a963f51ce60ec4cb67e87c71422437720038f519ae273772159d2879cec4d3da8b2ea61145f1947405da1bba934118c54d4b00d25be6fe24ee67a18cabd7559c4714decffca5b77288c25c5fc8529f18d30e3f167fd553b94cebb59c08a673f6f8b4d5617971ecb21c08a5bd21811198b5f40e98fd4d6ea0acfe0eddb1d7ebcf98fb9177b85f7d731267fe00841c76031ac7cf9d691f13c35a53394cebb59cd0a3c9529ff530666822c9b55b1907784c29c278dc7e70c62b8af2fa1be5d46b74a07c0150c6f9e32d74e60f40fdd50477dcace55d99763f527a4bd5b0893517c73d804cebc6a08a4b3426902beed5906d1ffc7e2437d84c1b5df4d08e01a38b120c0efe2e41c73d230ee5ea87d9e5c8c9c38385fd70d9a2431ace940d02c831167721b0ed72d3a6df26d38a7c17c21f93d7bad1c5b434d3721d4566a2c8d40be72f0dd50f973477df5c1abcb5075d72fe12113f4e9b01374a10ba01504e950eb406d0750f4e9b65b45b14fb7ada0168c39e2f348103cbb432716fc7377b2c07e2f4035ca62def3b12d145761c1d2e5a99c7d022e8cfb8d76f9bc11ab65b5e1cf42da44157f9334fda697933d2a2a14337ec67cbac8e72b09896af6959189e163b9be685691f87a6e5617223277dd6301017d3fc8eab5dddc186e71d67889b36653a6d8e5f9fad7dc955f141d2b4811c90309e3183eae8c6fdcba109811315e0f7e340685a06ca9ceaaecf42388ece65a692c3f235efbe30ad45535bf3f92fbb3bde41d2b43ce6c817cc9add6d95dd37f704685ac1f22cacbf2abec19f4044a109fb8c0200123933e6f16dae1bd38ac4eb0e22d31a35add02962309e303b064707c08a979a18ed80695acd6ed93387a29fc42affe4c2734b84775b493679dde595fcf5036afdf10f1d4f2e9cbe04f0ca677fb74b75c5539d32271f34f40d4cc2585ff4d5353affda4ff5fadaae2771ebbfad448fa648f949277575899d693bf2c9146d3f121f87d17ef3fe56d6fd133e53c7c17b00628c7a9df633ef1680c3cf1079f527ffa1297af081f37e69dd83eb59ab7941e67b5c4c2bb4bb8bc89969056672a534ada8bd5e98c9583ecd398b27d53e03eb87d9f67035ec06e0e4478111f5de4717d57016af7eba34896cdef2c431de5fed1f63ab5921ede1166510765ac97664b4945b3d61b8ec1d709a10129a561997ff8086c817d559da9c176ff72a11c2d3ec2f0231a31d50e3aa4e51015e5c7ae84e861b65f0c780a13b195b39320fb8872fc1e43c78ac87ef2128797107f0f2c4709af109c3c9828a6b5aa6c3b88f8f0c532b5a1cdd6575aeed8ee3312053733ae4177db2610708383c7935fbcd9a96bc7f6146d3383249f67b08feda4e5aeb16d7a24e9ad62b6a1ad24dd31abf1f21ac691938be9ac1af6ef24f319b34ade1fe35fc6186fefdf038b79cf2dc121d79b79502b7d7885e6d22babd460bff69a2ed870bb4e2b0c6509e5ba08577db74adb95b002e3c43c4d2bca2dad48a4b00ae09d4e7ba9a15c1fe85b414d10a45250c28f5e6888ae1a10a31ad75156ed4ac4c26318c5fdf9c9cdd2c8dc862a0c0c8bc63bd63ab8075379a57cc831d97cd3bf889b68dd153bf1d9e18da78330b8621a9392fab27104492ecd71345df1859d1baefd52bf206d6ed7a45ff8684d52e897263ab19d3fe549ef60d8ccc4319575f74e8fb711d1c6f6c55dd47ebbfac9657ae27114285f6f142d5b2ca78e96f7cd45f4de87f9b83ab6d9c340613b3eab7bb9c92ecf70fbc6ac22a7eb7d191a9bcfcad05de61c7c0b8dc3b79a1579b557c2ad13d232aa70d45d1ab24a8e2d381621951d22e5ee2aba2e88fa91aec200c4c150f2e8a17288af9fd6258c5e10d4815ab6844e902c98d9ce39920592c2b3c52c5a712bd5700350ee965cf8276f6a7caac55f48295a908c0d8aa1ad70b4d246de7e043286d92a8fe0ddc2a968bff073b2dade7ee67c12d0000000049454e44ae426082</data>
+ <data format="PNG" length="3612">89504e470d0a1a0a0000000d49484452000000ad0000003008060000006357fade00000de349444154789ced5d5f685bd71dfe69a4e00e3394b18724946197b5600f4aafe73ec85b4baedb97ca4e49a57650bbeb831467c4de5eeab42f493c52350fa9a34286d5e1ce0a84d82d183b0f8eec419895a1221792591e1e7220057b78432ea638c618d998c0b787ab7b75ff9c73efb9574aea343a2f9fe57bfefcced1ef7cf73bbf7bce1581884688a86a0800ab0000644b883da0eaedd4f089c58a1d3475af00009086674117003a3fc145790ce8bf9907007cdf1dafe1e38b9e0ae6d71502f5c753a065802e4cb8467f01884ca1e6c035748dee0a0090af3a33aa5b94c780c256b126216a28844219b1a730a217467583b14cbee6b8357444c70cf9f522a4647599d50ea5e1d99a64a8a12dda66c03ae02f3c7c8635a33f9eaa396e0db9c8bd905f2fc21ff7c09889142809d0f02c280904afcf03002696942883683dfe8b13953b2e80a1e111444ef522d2d35bc20822a77a31181f0400140a85c7479200484d55774217b78a188c03919e5e048eca88f444bcd7ff10ec63617518f6a26228b6609bb2cb78248c8b22807b4053ab8442eb069a5a2548ad01eee733e7638f05b39f391fd3ecaf9abd1958c6a3ff837e4f13f9a1d8c740ebccdb836b8615499199794f1ad70be3464ef51abe8860670843c3230080d1b109200ec89d41edbad41ac07c6e7eff33ae6a7fb51c024687955a0388f4f456c4b455b58f83967fc870a941379c1d36309ead48e3ca57b3e20e0523c322c71f40dc53ec4bcda46ceb57f355ea20155db7b3afe0c13e0081a3b2e50e847587f17a04f639e5f78d1051948892441405e0fb6892e84098e8811846a41c255f6f215e8afe2d4757165a84ebe3e1e8b135ea7ee1882fa9b79781b9dc3c4e9cfc03edd22ed5511d05e4364a0cc61dcb191040b8ab9b56be59d1ead163500e525f4f941a9f7fd6d77654c6eef62ed5d5d7d1dcad34257d3e9fbebe74268bb3036769737b93a4a6266abff6854fb5b3e5cb166abbd34ebbdbbb86faa5a626925e94e8f4fba78df5c581e62f5ba88eeae8d2a797a8fd955ffb12c32348fe35a995f71f3a489bdfdea75ddaa5a53b398b3d2aaa76b3faa79503d07eac43ab4f9fafaebe8ee6e434adf5acd1e123a5ef45c0bebafa3aadbffa76129f2769e6c60cad7cbb6268c77fe820a5df9ca69db777e8e99ffcd89724d3ccf3f284cb2eb9d5b04e4fd084f630c0aad1829d21601dc866b242335e2d1f382a2b1d29316dff07fd1a23055e938122507caddc5eb03368b5efb8f5fa607cc86a5f06889cea35d467d68606462c96fecfd0a4eae733e763fcf1025bf32307a0a88cb3c13e409150a571d0f21fafd03e13e3e33894ffaf03a177ba8ce35d627a8d69a353f3b8f26f0f8cf8b334e1643b9365fb88e83397cc6d87b181301de6308799299b5f6ab1308899299a9a9aa8fd37edd4dd1536321280dc428e5a5a7e6561e8e656097a464a7c9e243d934c4f4d9699c764c7d29d1c4ddf98a6731f5da05dda257fbd9ffa7afaa8bbfb2d9f9dfd2a23255a0350db89f644a9eff7277cd19e5e2c2c2c5898baebed2eea78a3d337363681ee7f8529ba19253a50472d2fb650dfc9a8c670fa7642c742d4f8a773cee3502dfb8e7550f4641fa9d78372909a062f18bedfb3e76398b93143bbb44b819702d4f697cf7c8a86d8ab2c1eabee45b0a4f5ea31adeb680280c1f81030231645d09881519fca30c1ce90a13c72d098c2c230a4aca62d8c74bc6ccfe8f8049f09ef95194a5dcd33edcd9834bca91facfeaaed22076b7f6cc655ed6fb03368a84f5dc4bab50ff78ced87dee932303a32b07c7f00a030ad072dabc7c04098e6985c4b74e9eb15fae05663559856d1b62bd4fdc2b3ee342a11ad150a387cf830a5bf9aa3f66fda28fc77ab66d56bacbe0f4fd3c29d1c6d6e6f72195bcd7f3f0e5c29693955dbae7cb342dd27a35af9d8c019ea78a3d367666a9ee64c67b238fdfe698d91a3ffb8c561b2081616ee6a76f5fdf36b0b53ad7dbb46f480880e10d5d53f4d894f2e3199d6628fcb71706d9fc01d518ffe7a3fcd4e4d2b1e2f0d57ce88766970ae7a8c5bb06144b7989a491918636478047a86d3346d69353b3a3ec1641814c065704d1396da659577d29c6a7911cde8a6fff3b979667fcc0ca96a5afd38b018daad7de6f645e3e53f5adb2a62e13b22ba36494461cf3879778dc3b544a7034413bb6b0a6356d8ce91c1498a0270d2b4b9dc3c9cf275bcde41afd2abda4cbebf1da5e62e2363267d3e1f1df1f9923e9faffbb76ff9ba0fbdabe56f915a28494474c4e70b1e0b521dd519ea533f4fbf3959663ee9ac76fd8b2faf73ef0ce1aeee72f99794f2fafa13d792ca5ae45a9fa13d3777a016a9c560afda9f2880e6f7957108d78769fac6a4711cde0e1bfa471279b2cfdcfec70367b9779eb54201ea6702aac08089595ba6d552e98959a5ed8d2eda682f58e3b4a3e3a53b4151816c266b605455732263a3f1605c35b3aeb334b31a65b0b3cf10ff0463d55c283399a366b46128964665f5477f070abc261b19d8649f6b4d6bb663bd7c5dbdb369f61595ef4c5d3368d18388d7a8818afe69426f07976579c9f7799ae8bb764fedf60f84a989332377b68a38d1778216eede15d64a5253137d7cee636a7cae91ccf159ffa183b4bbbdc3d474160d781e68be61d468aab633df0978f14f3d361e6aa4a14f2f51e3f38a864f1e95a1dac1d28c8d871a2994baee1c5d21b6a6d46bfa36d9183f161987eb9d21a87156967daa3637dba15f13f0c6a3f1b9469afc624c61fc6205cc172a6d86f19acea4f31e9f90d930ad8e1106e383e0c5093103b6864289994b7153641486054aabda2214edab32b79eb94a7b1ed47283f1415b3b53332943fe72b921ab5d6a7e9d3daabd6ab96cc6c593435d7fd5fe30ffafb34b1d2f35966b2ee7649fed9347467b9153bd0abb668ce34c9ef6bd5e2eefdaaa34659737400977edfbe3fb7f734b0d1f1e92a72881c36e2ed7690bd8804b3b6c3aa69eb4e8bf09c8281fa6ac9d0afe61a038d35e14dbcd556912b5c7ae630d1ce69692953374b13421b2abca4e21663eddf5ecea4655274a9133f1d4f662993c62289d92ae427b43b797114169d31280fcbab13fa97b05c863ca7505671183f7337ff9f50dc460ac2f64aa4f8c69138fc45fb55429d37a2d278285a2f5ce637658de1daa220742796f88340ca396de02b3bfd95554d4dfa1dbd67afd05b1fed272e90ee7a27f219bdd80faf17366da47c4b0e65409d37a2d27746b32d5673e8c191acf72ed96c7001e538a301eb71f9cf18aa1b2fec638f5ea1da8b807c863fcf1163af307a0e1728a3b6ee6f28e4cfb30527e5dd1b0a92507c7dd874cebc4a04efb91a56269af86dbf6c1ef477695cdb4b18c87767418cbb86070f07709daee19b129d7906097233b0f0f54df5fcb0ea93b5336086083b1b80b816d979336fd3e9956e4bd10feb87bad1bcbe45d332dd751dc4c1437f5c2fe4d430d89b2e6eebf99076fed4117ecdf44c48fd316c08d1284ae035454a4032d0374d583d36e30da2d897d2d6d01b46ecd171ac7be655a37716fdb277b2c07e2f4035ca6adec3d12b10c3b8e0e07adcc636811f4179cebb7cc601583a60707fde93ce8327fe6b9765ade8c3469e8d075ebd932b3a3ec2fa6e56b5a1646a6c4cea67961da47a16979985ddd707dd6504a8a697edbd5aee6608959db19e2a44d994e5be4d76769dfe5aa783f695aa908a4f467cca038ba7eff72685ce04405f8fdd8179a96816e4e75376c40388ece65a6b2c3f235ef43615a93a636e7f35f7476bcfda46979cc51dc336a76a75576ffcdc740d30a966761c365f10dfe04220a8d5b67140090c8993181d3b84ca775605a9178dd7e645abda6153a450c6b7dd8d2393a0056bcd4c068fb4cd3aa76bb3d7328fa4aacca4f2e3c334778af8ddc26afbbbcb2bfbb4f6d3fffa9edc9851317005ef9c21f77e870e954a79b930f2aface4f405f5fece5253afbca2fb5fadaaf6671eb7f6d440f2649fe4598babbc5ceb41dfc6492361f888fc3c819e30903d6f7277ca68e837701c419f56220ccddf7bab3073cfd1491577ff21f98a4fb1ff2eb379cc66d60ade60599ef5131add0ee2e227ba61598c9d5d2b4a2f67a61267df93ce72c9eabf619d89060dbc3d5b0ab809d1f49c3ca771fcb28e12c5efd746142d9fabcc5b65ffb6374b120a43d9ca20cc24eebb21d375acaa99e081cf60ed84d08179a561e73ff020d9137aab3b4392fdeee552244a6d86f0462463ba0c455eda202bcb8f4d0ed656e94c11f07866e2f5bca9171c03dbc09a6e8c16397d9cc6087b20b07f372c7b09bf129ddc982aa6b5aa6c3388f8f1ba696d538bac3ea5cdd1dc76340a6e6b4c92f7a67c31620d9dc7955fb8d9a96bcbf6146d5386e92dbf721f8ebc3b4d423ae45ed34ad575435a493a6d5bf3f4258d332706c7119efdee09f6236685addf7d7f8e769facf7607b79cfccc1c1d7caf8da4af96885e6e26fa6a89d2ff6da6cded342dd8ac31e467d2947eaf5dd39a3b7bc0b9a788589a57549b9a710ec01581fa1c57b32278269d7745b44251091dba7a7244a5f0509598d6bc0a37c76159cca35eefbfe9ce6e9646643190343c6b5befe82260de8de61501fe5e033e330ac49d796873c750ed61168cc0a5e6bca89c4010496edf9e28fac4c88ce67daf5e9137b04ed7abfa1b1266bb5c941b5d5c36ec4fe5695f697816f298f2a043db8f6be378a38bca3e5aff45a5bc7c358b10aab48f178a9695c7cabff1d17039a5fd360757dbd8690c266e28efeeb24b6edf7fe05513d6f0878db64ce5e5b71678871da53177cfe4851e6dd6f08944e78ca89e361445af92a0864f068a654459bb7889af8aa23fae68b0fd303035dcbf285ea024e61f16c3ca00f709480d6ba847d705b2ab1bb66782dc6245e1911a3e91e8bd022871482f7b16d4b33f3566ada117ac4e4500461795b85e683c6b39071f42799344ed37706b5829fe1fab8c941d3590b5ea0000000049454e44ae426082</data>
</image>
</images>
<connections>
@@ -1210,7 +1285,6 @@ Montreal, Quebec H2T 1S6</p></string>
<tabstop>zoneToneChoice</tabstop>
<tabstop>confirmationToQuit</tabstop>
<tabstop>checkedTray</tabstop>
- <tabstop>autoregister</tabstop>
<tabstop>voicemailNumber</tabstop>
<tabstop>useStunNo</tabstop>
<tabstop>STUNserver</tabstop>
diff --git a/src/configurationpanel.ui.h b/src/configurationpanel.ui.h
index 981ffaa0f7..b1134a9bac 100644
--- a/src/configurationpanel.ui.h
+++ b/src/configurationpanel.ui.h
@@ -61,6 +61,7 @@ void ConfigurationPanel::init()
password->setText(QString(Config::getchar("Signalisations", "SIP.password", "")));
hostPart->setText(QString(Config::getchar("Signalisations", "SIP.hostPart", "")));
sipproxy->setText(QString(Config::getchar("Signalisations", "SIP.sipproxy", "")));
+ autoregister->setChecked(Config::get("Signalisations", "SIP.autoregister", (int)true));
playTones->setChecked(Config::get("Signalisations", "DTMF.playTones", (int)true));
pulseLength->setValue(Config::get("Signalisations", "DTMF.pulseLength", 250));
sendDTMFas->setCurrentItem(Config::get("Signalisations", "DTMF.sendDTMFas",0));
@@ -70,6 +71,11 @@ void ConfigurationPanel::init()
// For audio tab
ossButton->setChecked(Config::get("Audio", "Drivers.driverOSS", (int)true));
alsaButton->setChecked(Config::get("Audio", "Drivers.driverALSA", (int)false));
+#ifdef ALSA
+ alsaButton->setEnabled(true);
+#else
+ alsaButton->setEnabled(false);
+#endif
codec1->setCurrentText(QString(Config::getchar("Audio", "Codecs.codec1", "G711u")));
codec2->setCurrentText(QString(Config::getchar("Audio", "Codecs.codec2", "G711u")));
codec3->setCurrentText(QString(Config::getchar("Audio", "Codecs.codec3", "G711u")));
@@ -87,8 +93,7 @@ void ConfigurationPanel::init()
"Preferences", "Options.zoneToneChoice", "North America")));
checkedTray->setChecked(Config::get(
"Preferences", "Options.checkedTray", (int)false));
- autoregister->setChecked(Config::get(
- "Preferences", "Options.autoregister", (int)true));
+
voicemailNumber->setText(Config::get("Preferences", "Themes.voicemailNumber", "888"));
// Init tab view order
@@ -128,13 +133,14 @@ void ConfigurationPanel::saveSlot()
Config::set("Signalisations", "SIP.password", password->text());
Config::set("Signalisations", "SIP.hostPart", hostPart->text());
Config::set("Signalisations", "SIP.sipproxy", sipproxy->text());
+ Config::set("Signalisations", "SIP.autoregister",autoregister->isChecked());
Config::set("Signalisations", "DTMF.pulseLength", pulseLength->value());
Config::set("Signalisations", "DTMF.playTones", playTones->isChecked());
Config::set("Signalisations", "DTMF.sendDTMFas" , sendDTMFas->currentItem());
Config::set("Signalisations", "STUN.STUNserver", STUNserver->text());
- Config::set("Audio", "Drivers.driverOSS", ossButton->isChecked());
Config::set("Audio", "Drivers.driverALSA", alsaButton->isChecked());
+ Config::set("Audio", "Drivers.driverOSS", ossButton->isChecked());
Config::set("Audio", "Codecs.codec1", codec1->currentText());
Config::set("Audio", "Codecs.codec2", codec2->currentText());
@@ -149,7 +155,7 @@ void ConfigurationPanel::saveSlot()
Config::set("Preferences", "Options.confirmQuit",
confirmationToQuit->isChecked());
Config::set("Preferences", "Options.checkedTray", checkedTray->isChecked());
- Config::set("Preferences", "Options.autoregister",autoregister->isChecked());
+
Config::set("Preferences", "Options.voicemailNumber", voicemailNumber->text());
#if 0
QMessageBox::information(this, "Save settings",
diff --git a/src/configurationpanelui.cpp b/src/configurationpanelui.cpp
index 4661df4d23..8102023917 100644
--- a/src/configurationpanelui.cpp
+++ b/src/configurationpanelui.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
** Form implementation generated from reading ui file 'configurationpanel.ui'
**
-** Created: Wed Feb 2 17:25:45 2005
+** Created: Fri Feb 4 16:42:29 2005
** by: The User Interface Compiler ($Id$)
**
** WARNING! All changes made in this file will be lost!
@@ -18,9 +18,9 @@
#include <qwidget.h>
#include <qgroupbox.h>
#include <qlineedit.h>
+#include <qcheckbox.h>
#include <qbuttongroup.h>
#include <qradiobutton.h>
-#include <qcheckbox.h>
#include <qspinbox.h>
#include <qcombobox.h>
#include <qlayout.h>
@@ -34,302 +34,304 @@ static const unsigned char image0_data[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0xad, 0x00, 0x00, 0x00, 0x30,
0x08, 0x06, 0x00, 0x00, 0x00, 0x63, 0x57, 0xfa, 0xde, 0x00, 0x00, 0x0d,
- 0xc9, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0xed, 0x5d, 0x5f, 0x68, 0x1c,
- 0xc7, 0x1d, 0xfe, 0x1d, 0x38, 0x45, 0x2e, 0xa2, 0x9c, 0x4b, 0x1f, 0xac,
- 0x10, 0x8a, 0x14, 0x9a, 0x80, 0x54, 0x08, 0x39, 0x55, 0x79, 0x38, 0xb5,
- 0x09, 0x5e, 0x91, 0x97, 0xca, 0x72, 0x48, 0x4e, 0xc9, 0x83, 0xad, 0x36,
- 0x0f, 0x77, 0x96, 0x8b, 0xa5, 0xf6, 0x25, 0x72, 0x02, 0x45, 0xb6, 0x83,
- 0x72, 0xf1, 0x83, 0x23, 0x5f, 0xc0, 0xad, 0x94, 0xa2, 0x54, 0x67, 0x30,
- 0x95, 0x12, 0x10, 0x92, 0x1f, 0xe4, 0x93, 0x0a, 0xa2, 0x92, 0x8b, 0xcc,
- 0x29, 0x60, 0x57, 0xa7, 0xa2, 0x72, 0x32, 0x38, 0x70, 0x2a, 0x6a, 0x39,
- 0x05, 0x51, 0xce, 0x42, 0x98, 0x93, 0x38, 0x0c, 0x5f, 0x1f, 0xf6, 0x76,
- 0x6f, 0xff, 0xcc, 0xec, 0xce, 0xec, 0x9d, 0x1c, 0x39, 0xbe, 0x79, 0xf9,
- 0xec, 0xdb, 0xf9, 0xf3, 0x9b, 0xd9, 0xdf, 0x7c, 0xfb, 0xcd, 0x6f, 0x67,
- 0x56, 0x04, 0x22, 0x1a, 0x25, 0xa2, 0x8a, 0x21, 0x00, 0x6c, 0x00, 0x00,
- 0x90, 0x2c, 0x22, 0x0a, 0x40, 0xc5, 0xdb, 0xa9, 0xe2, 0x53, 0x8b, 0x65,
- 0x3b, 0x68, 0xe2, 0x7e, 0x16, 0x00, 0x10, 0x18, 0x99, 0x07, 0x5d, 0x02,
- 0x68, 0x60, 0x92, 0x8b, 0xca, 0x38, 0xd0, 0x37, 0x97, 0x06, 0x00, 0x7c,
- 0xdb, 0x1d, 0xaf, 0xe2, 0x93, 0x8b, 0x9e, 0x0a, 0xa6, 0xb7, 0x54, 0x02,
- 0xf5, 0xc7, 0x12, 0xa0, 0x35, 0x80, 0x2e, 0x4d, 0x4a, 0xa3, 0x3f, 0x03,
- 0x84, 0xa7, 0x51, 0x75, 0xe0, 0x2a, 0x4a, 0xa3, 0x5c, 0x01, 0x00, 0xca,
- 0x75, 0x77, 0x46, 0x95, 0x45, 0x65, 0x1c, 0xc8, 0xee, 0xe4, 0xab, 0x12,
- 0xa2, 0x8a, 0x42, 0x28, 0x94, 0x11, 0x05, 0x95, 0x11, 0xbd, 0x30, 0xaa,
- 0x0c, 0x46, 0x17, 0xd3, 0x55, 0xc7, 0xad, 0xa2, 0x2b, 0xba, 0x66, 0x48,
- 0x6f, 0xe5, 0x11, 0x88, 0x57, 0x96, 0x59, 0x9d, 0x30, 0x30, 0x32, 0x5f,
- 0x95, 0x0c, 0x55, 0x74, 0x44, 0xc7, 0x0c, 0xd8, 0x02, 0xfc, 0x99, 0xfd,
- 0x67, 0x58, 0x2b, 0xfa, 0x63, 0x89, 0xaa, 0xe3, 0x56, 0x91, 0x8b, 0xdc,
- 0x0b, 0xe9, 0xad, 0x3c, 0xfc, 0x31, 0x0f, 0x8c, 0x39, 0x9c, 0x00, 0xc5,
- 0x01, 0x1a, 0x99, 0x07, 0xc5, 0x81, 0xf6, 0x1b, 0xcb, 0x00, 0x80, 0xc9,
- 0x35, 0x35, 0xca, 0x20, 0x5a, 0x8f, 0xff, 0xf2, 0x64, 0xf9, 0x8e, 0x0b,
- 0x60, 0x68, 0x64, 0x14, 0xe1, 0xb3, 0x3d, 0x08, 0x77, 0xf7, 0x14, 0x31,
- 0x8c, 0xf0, 0xd9, 0x1e, 0x0c, 0xc6, 0x06, 0x01, 0x00, 0xd9, 0x6c, 0xf6,
- 0xc9, 0x91, 0x24, 0x00, 0x12, 0xd3, 0x95, 0x9d, 0xd0, 0xf9, 0x9d, 0x3c,
- 0x06, 0x63, 0x40, 0xb8, 0xbb, 0x07, 0xc1, 0x63, 0x0a, 0xc2, 0xdd, 0x61,
- 0xef, 0xf5, 0xef, 0x83, 0x7d, 0x2c, 0xac, 0x0c, 0xc3, 0x5e, 0x56, 0x0d,
- 0xc5, 0x0e, 0x1c, 0x53, 0x32, 0x83, 0xc7, 0xc2, 0xb8, 0xc8, 0x03, 0x58,
- 0x05, 0x1a, 0x5b, 0x02, 0x48, 0xb7, 0x64, 0xd0, 0xd8, 0x12, 0x40, 0xa0,
- 0x25, 0xc8, 0xfd, 0x7f, 0xff, 0x40, 0xf4, 0x89, 0x60, 0xf6, 0xfe, 0x81,
- 0xa8, 0x6e, 0x7f, 0xc5, 0xec, 0x9d, 0x83, 0x6d, 0x3c, 0xfa, 0xde, 0xef,
- 0xf3, 0x34, 0x91, 0xf7, 0xc5, 0x3e, 0x06, 0xda, 0x67, 0x5e, 0x01, 0xd2,
- 0x0c, 0x2b, 0x92, 0xc2, 0xb3, 0xcb, 0x9e, 0x34, 0xae, 0x17, 0xc6, 0x0d,
- 0x9f, 0xed, 0x31, 0xdd, 0x88, 0xf6, 0x8e, 0x10, 0x86, 0x46, 0x46, 0x01,
- 0x00, 0x63, 0xe3, 0x93, 0x40, 0x0c, 0x50, 0x3a, 0xda, 0xf5, 0xeb, 0x81,
- 0x96, 0x20, 0x96, 0x53, 0xcb, 0x07, 0x9f, 0x71, 0x35, 0xfb, 0x2b, 0xe5,
- 0x10, 0x30, 0x3b, 0x6c, 0xa0, 0x25, 0x88, 0x70, 0x77, 0x4f, 0x59, 0x4c,
- 0x5b, 0x51, 0xfb, 0x38, 0x68, 0xfb, 0x41, 0xc9, 0x4b, 0x6a, 0xd0, 0xac,
- 0xbb, 0xc3, 0x06, 0x27, 0x92, 0x65, 0x69, 0x5c, 0xe5, 0x7a, 0x52, 0xdc,
- 0xa1, 0x60, 0x66, 0x58, 0x2c, 0xf1, 0x07, 0x10, 0xf7, 0x01, 0x14, 0x80,
- 0xc4, 0x6c, 0xc2, 0xb1, 0x7e, 0xdc, 0x47, 0xf9, 0x37, 0xc2, 0xad, 0x7c,
- 0x19, 0xf5, 0x23, 0xeb, 0xc1, 0x3e, 0x00, 0xc1, 0x63, 0x8a, 0xed, 0x09,
- 0x84, 0x0d, 0x97, 0xf1, 0x7a, 0x0c, 0xf6, 0xb9, 0xe5, 0xf7, 0x8d, 0x12,
- 0x51, 0x84, 0x88, 0xe2, 0x44, 0x14, 0x01, 0xe0, 0xfb, 0x68, 0x8a, 0xe8,
- 0x50, 0x27, 0xd1, 0x23, 0x31, 0x0c, 0x07, 0x52, 0x14, 0xff, 0x65, 0x33,
- 0xf1, 0x52, 0xe4, 0xaf, 0x29, 0xba, 0xb6, 0xd2, 0x2c, 0x5c, 0x1f, 0x0f,
- 0xc7, 0x4e, 0x6c, 0x52, 0xd7, 0x4b, 0xcf, 0xfa, 0xe2, 0x46, 0x7b, 0x19,
- 0x98, 0x4a, 0x2d, 0xe3, 0xf4, 0x99, 0xdf, 0xd2, 0x1e, 0xed, 0x51, 0x0d,
- 0xd5, 0x50, 0x50, 0x69, 0xa5, 0xe1, 0xc1, 0x98, 0x6b, 0x39, 0x13, 0x02,
- 0xe8, 0x3c, 0xd5, 0x45, 0xeb, 0x5f, 0xaf, 0xeb, 0xf5, 0x18, 0xb1, 0x5d,
- 0x69, 0xa7, 0xde, 0xee, 0x08, 0x35, 0xbc, 0xf8, 0xbc, 0xaf, 0xf5, 0x98,
- 0x82, 0xbd, 0x87, 0x7b, 0x54, 0x53, 0x5b, 0x43, 0x4b, 0xb7, 0x16, 0x28,
- 0xee, 0xf3, 0xf9, 0x8c, 0xf5, 0x2d, 0x2c, 0x26, 0x71, 0xfe, 0xe2, 0x79,
- 0xda, 0x7e, 0xb8, 0x4d, 0x81, 0xc6, 0x46, 0x6a, 0xfb, 0xcb, 0x17, 0x3e,
- 0xcd, 0xce, 0xe6, 0x2f, 0x9b, 0xa9, 0xf5, 0x6e, 0x1b, 0xed, 0x3d, 0xdc,
- 0x33, 0xd5, 0x1f, 0x68, 0x6c, 0xa4, 0xc0, 0xcb, 0x01, 0x3a, 0xf7, 0xde,
- 0x39, 0x73, 0x7d, 0x31, 0xa0, 0xe9, 0xcb, 0x66, 0xaa, 0xa1, 0x1a, 0xba,
- 0xf2, 0xe9, 0x15, 0x6a, 0x7b, 0xed, 0xe7, 0xbe, 0xe1, 0x91, 0x51, 0xc4,
- 0xff, 0x1c, 0xd7, 0xcb, 0xfb, 0x8f, 0x1e, 0xa1, 0xed, 0x6f, 0x1e, 0xd0,
- 0x1e, 0xed, 0xd1, 0xda, 0x52, 0x8a, 0xe2, 0xdf, 0x33, 0xdb, 0xa3, 0xa1,
- 0x66, 0x37, 0xab, 0x7f, 0x6b, 0x77, 0x53, 0x6a, 0xbb, 0x00, 0xda, 0x4e,
- 0x1c, 0xd7, 0xeb, 0x33, 0xe6, 0xab, 0xa9, 0xad, 0xa1, 0x25, 0x65, 0x81,
- 0x36, 0xbb, 0x37, 0xa9, 0xee, 0xd9, 0xe2, 0x7d, 0x11, 0xb0, 0xaf, 0xa6,
- 0xb6, 0x46, 0xef, 0xaf, 0x6e, 0x1f, 0x80, 0xe1, 0xcf, 0xe3, 0x34, 0x7b,
- 0x73, 0x96, 0xd6, 0xbf, 0x59, 0x37, 0xb5, 0xe3, 0x3f, 0x7a, 0x84, 0x16,
- 0xde, 0x9a, 0xa1, 0xdd, 0x77, 0x76, 0xe9, 0xf0, 0x0f, 0xbe, 0xef, 0x8b,
- 0x93, 0x65, 0xe6, 0x79, 0x79, 0xc3, 0xe5, 0x94, 0x64, 0x35, 0xac, 0xdb,
- 0x1b, 0x34, 0xa1, 0x3d, 0x0c, 0xb0, 0x6b, 0xb4, 0xf6, 0x8e, 0x10, 0xb0,
- 0x01, 0x24, 0x17, 0x93, 0x42, 0x33, 0x5e, 0x2b, 0x1f, 0x3c, 0xa6, 0xa8,
- 0x1d, 0x29, 0x32, 0x6d, 0xdf, 0xfb, 0x7d, 0x3a, 0x23, 0x05, 0x5f, 0x57,
- 0x80, 0x3c, 0x90, 0x7d, 0x3d, 0xa7, 0xb7, 0xd7, 0xde, 0xd1, 0x6e, 0xb3,
- 0x2f, 0xf7, 0x66, 0xde, 0x76, 0x7d, 0x30, 0x36, 0x64, 0xb7, 0x6f, 0x0e,
- 0x08, 0x9f, 0xed, 0x31, 0xd5, 0x67, 0xd5, 0x86, 0x26, 0x46, 0xcc, 0x15,
- 0x7f, 0x67, 0x68, 0x52, 0xed, 0xff, 0xfd, 0x03, 0x51, 0xfe, 0x78, 0x15,
- 0xd8, 0x9a, 0x1f, 0x4b, 0x00, 0xf2, 0xea, 0x38, 0x9b, 0xec, 0x03, 0x54,
- 0x09, 0x55, 0x1c, 0x07, 0x2d, 0x7f, 0xee, 0xcd, 0x7c, 0x79, 0xf6, 0x59,
- 0x18, 0x3f, 0xf7, 0x66, 0x5e, 0xfd, 0x7d, 0x03, 0x08, 0x9d, 0x3c, 0x65,
- 0x1e, 0xef, 0x22, 0xd3, 0xeb, 0x4c, 0x1b, 0x99, 0x5e, 0xc6, 0xb5, 0x7f,
- 0x79, 0x60, 0xc4, 0x1f, 0x2d, 0x10, 0xce, 0xb4, 0x31, 0x59, 0xb6, 0x97,
- 0x88, 0x3e, 0x93, 0x64, 0x6e, 0x27, 0x8c, 0x5e, 0xec, 0xa4, 0x3a, 0x1f,
- 0x9b, 0x39, 0xac, 0x4c, 0xd9, 0xf4, 0x4a, 0xb3, 0x8d, 0x41, 0xac, 0x4c,
- 0xd1, 0xd8, 0xd8, 0x48, 0x6d, 0xbf, 0x68, 0xa3, 0xae, 0x53, 0x9d, 0x66,
- 0x46, 0x03, 0x90, 0x5a, 0x49, 0x51, 0x73, 0xf3, 0xcf, 0x6c, 0x0c, 0xdd,
- 0xd4, 0x12, 0x80, 0x91, 0x91, 0x86, 0x3f, 0x8f, 0x93, 0x91, 0x49, 0x66,
- 0xa6, 0xa7, 0x4a, 0xcc, 0x63, 0xb1, 0x63, 0xed, 0x6e, 0x8a, 0x66, 0x6e,
- 0xce, 0xd0, 0x85, 0x8f, 0x2e, 0xd1, 0x1e, 0xed, 0x91, 0xbf, 0xd6, 0x4f,
- 0xbd, 0xdd, 0xbd, 0xd4, 0xd5, 0xf5, 0xb6, 0xb9, 0x9d, 0x02, 0xd0, 0xd4,
- 0xda, 0x6c, 0x63, 0xbe, 0xe1, 0x96, 0x20, 0xb4, 0x76, 0x22, 0xdd, 0x11,
- 0xea, 0xfd, 0xcd, 0x69, 0x5f, 0xa4, 0xbb, 0x07, 0x2b, 0x2b, 0x2b, 0x36,
- 0xa6, 0x3e, 0xf5, 0xce, 0x29, 0x3a, 0xfe, 0x46, 0x87, 0x6f, 0x7c, 0x7c,
- 0x12, 0x5d, 0xff, 0xec, 0xa4, 0xc8, 0x76, 0x84, 0xe8, 0x50, 0x0d, 0x35,
- 0xbf, 0xdc, 0x4c, 0xbd, 0x67, 0x22, 0x6a, 0x7f, 0x2d, 0xed, 0x84, 0x4e,
- 0x84, 0xa8, 0xe1, 0xc3, 0x0b, 0xee, 0xe3, 0xc0, 0xe8, 0x97, 0x27, 0xfb,
- 0x4e, 0x1c, 0xa7, 0xc8, 0x99, 0x5e, 0xd2, 0xae, 0xb7, 0x2b, 0xed, 0xd4,
- 0x38, 0x78, 0xc9, 0x74, 0x7f, 0xcf, 0x0f, 0x44, 0x31, 0x7b, 0x73, 0x96,
- 0xf6, 0x68, 0x8f, 0x82, 0xaf, 0x04, 0xa9, 0xf5, 0x4f, 0x9f, 0xf9, 0x54,
- 0x0d, 0x51, 0x28, 0x2f, 0x1e, 0xab, 0xed, 0x45, 0xb0, 0xa5, 0xad, 0xca,
- 0x31, 0xad, 0x74, 0x34, 0x01, 0xc0, 0x60, 0x6c, 0x08, 0xb8, 0x21, 0x16,
- 0x45, 0xd0, 0x99, 0x81, 0x51, 0xdf, 0x72, 0x6a, 0x19, 0x28, 0x00, 0xed,
- 0x1d, 0x21, 0x53, 0x79, 0xa4, 0xa0, 0x33, 0x85, 0x8d, 0x61, 0x48, 0x5d,
- 0x4d, 0x5b, 0x19, 0x49, 0x63, 0xde, 0x74, 0x4b, 0x06, 0x63, 0x13, 0x93,
- 0x7c, 0x26, 0x5c, 0x2d, 0x31, 0x94, 0xb6, 0x9a, 0x67, 0xda, 0x3b, 0x67,
- 0xd1, 0xf0, 0x96, 0x7e, 0xb0, 0xfa, 0xab, 0xb5, 0x8b, 0x14, 0xec, 0xfd,
- 0x71, 0x18, 0x57, 0xa4, 0x50, 0x1c, 0x87, 0x76, 0x53, 0x7d, 0xda, 0x22,
- 0x56, 0xd6, 0x3e, 0xdc, 0x37, 0xb7, 0x1f, 0x3a, 0x79, 0xca, 0xc4, 0xe8,
- 0x58, 0x84, 0xed, 0xfe, 0x01, 0x80, 0xca, 0xb4, 0x1e, 0xb4, 0xac, 0x11,
- 0x83, 0xbf, 0xef, 0xa4, 0xa5, 0x67, 0x98, 0x64, 0x4b, 0x57, 0xbe, 0x5a,
- 0xa7, 0xf7, 0x6f, 0x35, 0x54, 0x84, 0x69, 0x55, 0x6d, 0xbb, 0x4e, 0x5d,
- 0x2f, 0x3d, 0x2f, 0xa7, 0x51, 0x89, 0x68, 0x33, 0x9b, 0x45, 0x5d, 0x5d,
- 0x1d, 0x2d, 0xdc, 0x5e, 0xa2, 0xb6, 0xaf, 0x5b, 0xa9, 0xf3, 0x6f, 0x76,
- 0xcd, 0x6a, 0xd4, 0x72, 0xbd, 0x1f, 0x9c, 0xa3, 0x95, 0xbb, 0x29, 0xda,
- 0x7e, 0xb8, 0xcd, 0x65, 0x6c, 0x2d, 0xff, 0x83, 0x18, 0x70, 0xad, 0xa8,
- 0xe5, 0x34, 0x6d, 0xbb, 0xfe, 0xf5, 0x3a, 0x75, 0x9d, 0x89, 0xe8, 0xe5,
- 0xa3, 0x17, 0xfb, 0xe9, 0xf8, 0x1b, 0x1d, 0x3e, 0x2b, 0x53, 0x5b, 0x35,
- 0xb0, 0x51, 0x0b, 0x9f, 0x7b, 0xef, 0x9c, 0xce, 0xc8, 0x91, 0xbf, 0xdf,
- 0xe2, 0x30, 0x59, 0x18, 0x2b, 0x2b, 0xf7, 0x74, 0xbb, 0x7a, 0xff, 0xf1,
- 0x95, 0x8d, 0xa9, 0x36, 0xbf, 0xd9, 0x24, 0x7a, 0x44, 0x44, 0x87, 0x88,
- 0x6a, 0x6a, 0x0f, 0xd3, 0xf0, 0x27, 0x57, 0xf4, 0x7e, 0xb2, 0x18, 0xd3,
- 0xc8, 0xa8, 0x32, 0xe3, 0x20, 0x6d, 0x9f, 0xc0, 0x13, 0xd1, 0x88, 0xfe,
- 0x5a, 0x3f, 0xcd, 0x4f, 0xcf, 0xa8, 0x1e, 0x1f, 0x18, 0x29, 0x9f, 0x11,
- 0x9d, 0xd2, 0xe0, 0x52, 0xe5, 0x18, 0x37, 0xed, 0xc0, 0x88, 0xb2, 0x98,
- 0x98, 0x4d, 0x98, 0x18, 0x63, 0x74, 0x64, 0x14, 0x46, 0x86, 0x0b, 0x1e,
- 0x53, 0x54, 0x1d, 0x5d, 0x5c, 0xcd, 0x8e, 0x4d, 0x4c, 0x32, 0x19, 0x06,
- 0x59, 0x70, 0x19, 0x5c, 0xd7, 0x84, 0xc5, 0x76, 0x59, 0xe5, 0xdd, 0xa2,
- 0x20, 0x5a, 0x79, 0x11, 0xcd, 0x28, 0xd3, 0xff, 0xe5, 0xd4, 0x32, 0xb3,
- 0x3f, 0x56, 0x86, 0xd4, 0x34, 0xad, 0x71, 0x1c, 0x58, 0x0c, 0x2d, 0x6b,
- 0x9f, 0xb5, 0x7d, 0xd1, 0x78, 0xb9, 0x2f, 0xbb, 0x93, 0xc7, 0xb3, 0x7f,
- 0x3c, 0x5c, 0x36, 0x03, 0x4e, 0xbe, 0xb5, 0x49, 0x9d, 0x8d, 0x75, 0x6c,
- 0xba, 0x25, 0xa2, 0xa9, 0x7b, 0x9b, 0xf4, 0xf6, 0xcd, 0x3a, 0xa2, 0xbd,
- 0xf2, 0x19, 0x17, 0x17, 0x3b, 0xb9, 0x0c, 0x65, 0xd2, 0x62, 0x81, 0x66,
- 0xd7, 0x7c, 0xc6, 0x99, 0x1e, 0x3e, 0x99, 0x22, 0x2b, 0x63, 0x5a, 0xcb,
- 0xb7, 0x75, 0xb4, 0x43, 0x5f, 0x9d, 0x1b, 0x98, 0xc9, 0xa8, 0xbd, 0x6c,
- 0x4c, 0x74, 0x36, 0x45, 0xf1, 0x88, 0x9a, 0xcf, 0xa8, 0xf1, 0x58, 0x1a,
- 0x4e, 0xc3, 0xce, 0x93, 0xa7, 0xa0, 0x3d, 0x09, 0xd6, 0x4e, 0xa4, 0x28,
- 0xfe, 0xa1, 0x98, 0x66, 0xb4, 0x32, 0xad, 0x8c, 0xf6, 0x37, 0x3e, 0x69,
- 0xb4, 0xdf, 0x99, 0xe3, 0x50, 0x86, 0xa6, 0x75, 0x62, 0x5a, 0xa7, 0x27,
- 0xcf, 0x66, 0x36, 0x0b, 0x6d, 0xad, 0x40, 0x40, 0x05, 0x18, 0x70, 0x78,
- 0xde, 0x91, 0x69, 0xf5, 0x54, 0x7c, 0x63, 0x56, 0x6e, 0x7b, 0x63, 0xab,
- 0x0e, 0xda, 0x0b, 0xf6, 0x38, 0xed, 0xd8, 0x44, 0xf1, 0x49, 0x90, 0x57,
- 0x21, 0xb9, 0x98, 0x34, 0x31, 0xaa, 0xa6, 0x39, 0xb1, 0xe8, 0xa0, 0xf1,
- 0x60, 0x5e, 0x35, 0xb3, 0xae, 0xb3, 0x34, 0xb3, 0x16, 0x65, 0x70, 0xb2,
- 0xcf, 0x14, 0xff, 0x04, 0x63, 0xd5, 0x9c, 0x2d, 0x31, 0x99, 0xab, 0x66,
- 0x94, 0x60, 0x5a, 0x9e, 0xa6, 0x35, 0x3e, 0x81, 0x82, 0xaf, 0x2b, 0x66,
- 0x06, 0xb6, 0xd8, 0x27, 0xad, 0x69, 0xad, 0x76, 0x6c, 0x94, 0xae, 0x6b,
- 0xd1, 0x1a, 0xdd, 0xbe, 0x3c, 0x80, 0x5c, 0x69, 0xcd, 0xa0, 0x47, 0x0f,
- 0xc2, 0x5e, 0xa3, 0x06, 0x1a, 0xfa, 0x67, 0x08, 0x3d, 0xc7, 0xb9, 0x0c,
- 0xcb, 0x4b, 0xbe, 0xcf, 0x17, 0x88, 0xfe, 0xd7, 0xe6, 0xa9, 0xdd, 0xbe,
- 0x8b, 0x9d, 0xd4, 0xc8, 0x99, 0x91, 0xbb, 0x3b, 0x79, 0x9c, 0xee, 0x3d,
- 0x4d, 0x2b, 0xf7, 0xee, 0x09, 0x6b, 0xa5, 0x40, 0x63, 0x23, 0x7d, 0x7c,
- 0xe1, 0x63, 0x6a, 0x78, 0xa1, 0x81, 0xac, 0xf1, 0x59, 0xff, 0xd1, 0x23,
- 0xb4, 0xf7, 0x70, 0x97, 0xa9, 0xe9, 0x6c, 0xcc, 0x30, 0x00, 0x34, 0xdd,
- 0x34, 0x6b, 0x34, 0x8d, 0x71, 0xac, 0x0c, 0xc7, 0x8b, 0x7f, 0x1a, 0xb1,
- 0xe1, 0x68, 0x03, 0x0d, 0x7d, 0x7a, 0x85, 0x1a, 0x5e, 0x54, 0x35, 0x7c,
- 0xfc, 0x98, 0x02, 0xcd, 0x0e, 0x96, 0x66, 0x6c, 0x38, 0xda, 0x40, 0xa1,
- 0xc4, 0x8d, 0x8a, 0x30, 0x6d, 0xab, 0x62, 0x8e, 0x1f, 0x8b, 0x8c, 0xc3,
- 0x8d, 0x8e, 0x10, 0xb4, 0x38, 0x2b, 0xcb, 0x3e, 0x4d, 0x9b, 0x5b, 0xed,
- 0x30, 0xae, 0x09, 0x78, 0xe3, 0xd1, 0xf0, 0x42, 0x03, 0x4d, 0x7d, 0x31,
- 0x4e, 0x71, 0x9f, 0xcf, 0x47, 0x59, 0xd9, 0x37, 0x60, 0x06, 0x0c, 0x15,
- 0x37, 0xc3, 0x78, 0x4d, 0xfd, 0x0b, 0x69, 0x8f, 0x6f, 0xc8, 0x1c, 0x98,
- 0xd6, 0xc0, 0x08, 0x83, 0xb1, 0x41, 0xf0, 0xe2, 0x84, 0xb8, 0x01, 0xb6,
- 0x86, 0x42, 0x91, 0x99, 0x8b, 0x71, 0x53, 0xcc, 0xa9, 0x0c, 0x8b, 0x42,
- 0x71, 0x55, 0x9b, 0x83, 0xaa, 0x7d, 0x0b, 0x30, 0x33, 0xa8, 0xc6, 0x0c,
- 0xab, 0xa5, 0x72, 0x83, 0xb1, 0x41, 0x47, 0x3b, 0x13, 0xb3, 0x09, 0x53,
- 0xfe, 0x52, 0xb9, 0x21, 0xbb, 0x5d, 0x5a, 0x7e, 0xcd, 0x1e, 0xed, 0x3a,
- 0x4a, 0xe5, 0x92, 0x8b, 0x12, 0x6f, 0x0e, 0x0d, 0xfd, 0xd5, 0xfa, 0xc3,
- 0xfc, 0xdd, 0x60, 0x57, 0xff, 0x40, 0x54, 0xed, 0x77, 0x0a, 0xa6, 0x71,
- 0x10, 0xb5, 0xcf, 0xf1, 0xcd, 0x23, 0xa3, 0xbd, 0xf0, 0xd9, 0x1e, 0x60,
- 0x15, 0x6a, 0x14, 0xc1, 0x90, 0x9f, 0x3c, 0xed, 0x7b, 0xbd, 0x5a, 0xda,
- 0xb5, 0x55, 0x6e, 0x4a, 0x66, 0x72, 0xa0, 0x61, 0xb9, 0xf6, 0xfd, 0xb1,
- 0x83, 0xbf, 0xb9, 0xa5, 0x8a, 0xfb, 0x87, 0x24, 0xcb, 0x74, 0x79, 0xc0,
- 0x75, 0x37, 0x97, 0x74, 0xda, 0x01, 0x32, 0x05, 0xc9, 0x68, 0x85, 0x43,
- 0xc7, 0xb4, 0x93, 0x16, 0x7d, 0x73, 0x80, 0x92, 0x2f, 0x1d, 0xa6, 0xac,
- 0x9e, 0x0a, 0xfe, 0x6e, 0xa0, 0x38, 0xd3, 0x5e, 0x16, 0xdb, 0xcd, 0x55,
- 0x6e, 0x12, 0xb5, 0xc7, 0xa9, 0x63, 0xf5, 0x1c, 0xe6, 0x0e, 0xc4, 0xcb,
- 0x67, 0xe8, 0x7c, 0x71, 0x42, 0x24, 0x37, 0x72, 0x00, 0x38, 0xf5, 0x19,
- 0xae, 0x27, 0x37, 0x72, 0x15, 0x9d, 0x28, 0x79, 0xce, 0xc4, 0xd3, 0xda,
- 0x8b, 0x2e, 0xa6, 0x11, 0x45, 0xf1, 0x94, 0x74, 0x05, 0xda, 0x1b, 0xba,
- 0x93, 0x41, 0x18, 0xc5, 0x4d, 0x4b, 0x00, 0xd2, 0x5b, 0xe6, 0xfe, 0x24,
- 0xee, 0x67, 0xa1, 0x8c, 0xab, 0xd7, 0x55, 0x9c, 0x47, 0x14, 0xde, 0xcf,
- 0xfc, 0xa5, 0xb7, 0x72, 0x88, 0xc2, 0x5c, 0x5f, 0xc8, 0x52, 0x9f, 0x18,
- 0xd3, 0x0e, 0x3f, 0x16, 0x7f, 0xd5, 0x53, 0xb9, 0x4c, 0xeb, 0xb5, 0x9c,
- 0x08, 0xa6, 0x73, 0xf6, 0xf8, 0xb4, 0xd5, 0x61, 0x79, 0x71, 0xec, 0xb2,
- 0x1c, 0x08, 0xa5, 0xbd, 0x21, 0x81, 0x11, 0x98, 0xb5, 0xf4, 0x0e, 0x98,
- 0xfd, 0x4d, 0x6e, 0xa0, 0xac, 0xfe, 0x0e, 0xdd, 0xb1, 0xd7, 0xeb, 0xcf,
- 0x98, 0xfb, 0x91, 0x77, 0xb8, 0x5f, 0x7d, 0x73, 0x12, 0x67, 0xfe, 0x00,
- 0x84, 0x1c, 0x76, 0x03, 0x1a, 0xc7, 0xcf, 0x9d, 0x69, 0x1f, 0x13, 0xc3,
- 0x5a, 0x53, 0x39, 0x4c, 0xeb, 0xb5, 0x9c, 0xd0, 0xa3, 0xc9, 0x52, 0x9f,
- 0xf5, 0x30, 0x66, 0x68, 0x22, 0xc9, 0xb5, 0x5b, 0x19, 0x07, 0x78, 0x4c,
- 0x29, 0xc2, 0x78, 0xdc, 0x7e, 0x70, 0xc6, 0x2b, 0x8a, 0xf2, 0xfa, 0x1b,
- 0xe5, 0xd4, 0x6b, 0x74, 0xa0, 0x7c, 0x01, 0x50, 0xc6, 0xf9, 0xe3, 0x2d,
- 0x74, 0xe6, 0x0f, 0x40, 0xfd, 0xd5, 0x04, 0x77, 0xdc, 0xac, 0xe5, 0x5d,
- 0x99, 0x76, 0x3f, 0x52, 0x7a, 0x4b, 0xd5, 0xb0, 0x89, 0x35, 0x17, 0xc7,
- 0x3d, 0x80, 0x4c, 0xeb, 0xc6, 0xa0, 0x8a, 0x4b, 0x34, 0x26, 0x90, 0x2b,
- 0xee, 0xd5, 0x90, 0x6d, 0x1f, 0xfc, 0x7e, 0x24, 0x37, 0xd8, 0x4c, 0x1b,
- 0x5d, 0xf4, 0xd0, 0x8e, 0x01, 0xa3, 0x8b, 0x12, 0x0c, 0x0e, 0xfe, 0x2e,
- 0x41, 0xc7, 0x3d, 0x23, 0x0e, 0xe5, 0xea, 0x87, 0xd9, 0xe5, 0xc8, 0xc9,
- 0xc3, 0x83, 0x85, 0xfd, 0x70, 0xd9, 0xa2, 0x43, 0x1a, 0xce, 0x94, 0x0d,
- 0x02, 0xc8, 0x31, 0x16, 0x77, 0x21, 0xb0, 0xed, 0x72, 0xd3, 0xa6, 0xdf,
- 0x26, 0xd3, 0x8a, 0x7c, 0x17, 0xc2, 0x1f, 0x93, 0xd7, 0xba, 0xd1, 0xc5,
- 0xb4, 0x34, 0xd3, 0x72, 0x1d, 0x45, 0x66, 0xa2, 0xc8, 0xd4, 0x0b, 0xe7,
- 0x2f, 0x0d, 0xd5, 0x0f, 0x97, 0x34, 0x77, 0xdf, 0x5c, 0x1a, 0xbc, 0xb5,
- 0x07, 0x5d, 0x72, 0xfe, 0x12, 0x11, 0x3f, 0x4e, 0x9b, 0x01, 0x37, 0x4a,
- 0x10, 0xba, 0x01, 0x50, 0x4e, 0x95, 0x0e, 0xb4, 0x06, 0xd0, 0x75, 0x0f,
- 0x4e, 0x9b, 0x65, 0xb4, 0x5b, 0x14, 0xfb, 0x7a, 0xda, 0x01, 0x68, 0xc3,
- 0x9e, 0x2f, 0x34, 0x81, 0x03, 0xcb, 0xb4, 0x32, 0x71, 0x6f, 0xc7, 0x37,
- 0x7b, 0x2c, 0x07, 0xe2, 0xf4, 0x03, 0x5c, 0xa6, 0x2d, 0xef, 0x3b, 0x12,
- 0xd1, 0x45, 0x76, 0x1c, 0x1d, 0x2e, 0x5a, 0x99, 0xc7, 0xd0, 0x22, 0xe8,
- 0xcf, 0xb8, 0xd7, 0x6f, 0x9b, 0xc1, 0x1a, 0xb6, 0x5b, 0x5e, 0x1c, 0xf4,
- 0x2d, 0xa4, 0x41, 0x57, 0xf9, 0x33, 0x4f, 0xda, 0x69, 0x79, 0x33, 0xd2,
- 0xa2, 0xa1, 0x43, 0x37, 0xec, 0x67, 0xcb, 0xac, 0x8e, 0x72, 0xb0, 0x98,
- 0x96, 0xaf, 0x69, 0x59, 0x18, 0x9e, 0x16, 0x3b, 0x9b, 0xe6, 0x85, 0x69,
- 0x1f, 0x87, 0xa6, 0xe5, 0x61, 0x72, 0x23, 0x27, 0x7d, 0xd6, 0x30, 0x10,
- 0x17, 0xd3, 0xfc, 0x8e, 0xab, 0x5d, 0xdd, 0xc1, 0x86, 0xe7, 0x1d, 0x67,
- 0x88, 0x9b, 0x36, 0x65, 0x3a, 0x6d, 0x8e, 0x5f, 0x9f, 0xad, 0x7d, 0xc9,
- 0x55, 0xf1, 0x41, 0xd2, 0xb4, 0x81, 0x1c, 0x90, 0x30, 0x9e, 0x31, 0x83,
- 0xea, 0xe8, 0xc6, 0xfd, 0xcb, 0xa1, 0x09, 0x81, 0x13, 0x15, 0xe0, 0xf7,
- 0xe3, 0x40, 0x68, 0x5a, 0x06, 0xca, 0x9c, 0xea, 0xae, 0xcf, 0x42, 0x38,
- 0x8e, 0xce, 0x65, 0xa6, 0x92, 0xc3, 0xf2, 0x35, 0xef, 0xbe, 0x30, 0xad,
- 0x45, 0x53, 0x5b, 0xf3, 0xf9, 0x2f, 0xbb, 0x3b, 0xde, 0x41, 0xd2, 0xb4,
- 0x3c, 0xe6, 0xc8, 0x17, 0xcc, 0x9a, 0xdd, 0x6d, 0x95, 0xdd, 0x37, 0xf7,
- 0x04, 0x68, 0x5a, 0xc1, 0xf2, 0x2c, 0xac, 0xbf, 0x2a, 0xbe, 0xc1, 0x9f,
- 0x40, 0x44, 0xa1, 0x09, 0xfb, 0x8c, 0x02, 0x00, 0x12, 0x39, 0x33, 0xe6,
- 0xf1, 0x6d, 0xae, 0x1b, 0xd3, 0x8a, 0xc4, 0xeb, 0x0e, 0x22, 0xd3, 0x1a,
- 0x35, 0xad, 0xd0, 0x29, 0x62, 0x30, 0x9e, 0x30, 0x3b, 0x06, 0x47, 0x07,
- 0xc0, 0x8a, 0x97, 0x9a, 0x18, 0xed, 0x80, 0x69, 0x5a, 0xcd, 0x6e, 0xd9,
- 0x33, 0x87, 0xa2, 0x9f, 0xc4, 0x2a, 0xff, 0xe4, 0xc2, 0x73, 0x4b, 0x84,
- 0x77, 0x5b, 0x49, 0x36, 0x79, 0xdd, 0xe5, 0x95, 0xfc, 0xf5, 0x03, 0x6a,
- 0xfd, 0xf1, 0x0f, 0x1d, 0x4f, 0x2e, 0x9c, 0xbe, 0x04, 0xf0, 0xca, 0x67,
- 0x7f, 0xb7, 0x4b, 0x75, 0xc5, 0x53, 0x9d, 0x32, 0x27, 0x1f, 0x34, 0xf4,
- 0x0d, 0x4c, 0xc2, 0x58, 0x5f, 0xf4, 0xd5, 0x35, 0x3a, 0xff, 0xda, 0x4f,
- 0xf5, 0xfa, 0xda, 0xae, 0x27, 0x71, 0xeb, 0xbf, 0xad, 0x44, 0x8f, 0xa6,
- 0x48, 0xf9, 0x49, 0x27, 0x75, 0x75, 0x89, 0x9d, 0x69, 0x3b, 0xf2, 0xc9,
- 0x14, 0x6d, 0x3f, 0x12, 0x1f, 0x87, 0xd1, 0x7e, 0xf3, 0xfe, 0x56, 0xd6,
- 0xfd, 0x13, 0x3e, 0x53, 0xc7, 0xc1, 0x7b, 0x00, 0x62, 0x8c, 0x7a, 0x9d,
- 0xf6, 0x33, 0xef, 0x16, 0x80, 0xc3, 0xcf, 0x10, 0x79, 0xf5, 0x27, 0xff,
- 0xa1, 0x29, 0x7a, 0xf0, 0x81, 0xf3, 0x7e, 0x69, 0xdd, 0x83, 0xeb, 0x59,
- 0xab, 0x79, 0x41, 0xe6, 0x7b, 0x5c, 0x4c, 0x2b, 0xb4, 0xbb, 0x8b, 0xc8,
- 0x99, 0x69, 0x05, 0x66, 0x72, 0xa5, 0x34, 0xad, 0xa8, 0xbd, 0x5e, 0x98,
- 0xc9, 0x58, 0x3e, 0xcd, 0x39, 0x8b, 0x27, 0xd5, 0x3e, 0x03, 0xeb, 0x87,
- 0xd9, 0xf6, 0x70, 0x35, 0xec, 0x06, 0xe0, 0xe4, 0x47, 0x81, 0x11, 0xf5,
- 0xde, 0x47, 0x17, 0xd5, 0x70, 0x16, 0xaf, 0x7e, 0xba, 0x34, 0x89, 0x6c,
- 0xde, 0xf2, 0xc4, 0x31, 0xde, 0x5f, 0xed, 0x1f, 0x63, 0xab, 0x59, 0x21,
- 0xed, 0xe1, 0x16, 0x65, 0x10, 0x76, 0x5a, 0xc9, 0x76, 0x64, 0xb4, 0x94,
- 0x5b, 0x3d, 0x61, 0xb8, 0xec, 0x1d, 0x70, 0x9a, 0x10, 0x12, 0x9a, 0x56,
- 0x19, 0x97, 0xff, 0x80, 0x86, 0xc8, 0x17, 0xd5, 0x59, 0xda, 0x9c, 0x17,
- 0x6f, 0xf7, 0x2a, 0x11, 0xc2, 0xd3, 0xec, 0x2f, 0x02, 0x31, 0xa3, 0x1d,
- 0x50, 0xe3, 0xaa, 0x4e, 0x51, 0x01, 0x5e, 0x5c, 0x7a, 0xe8, 0x4e, 0x86,
- 0x1b, 0x65, 0xf0, 0xc7, 0x80, 0xa1, 0x3b, 0x19, 0x5b, 0x39, 0x32, 0x0f,
- 0xb8, 0x87, 0x2f, 0xc1, 0xe4, 0x3c, 0x78, 0xac, 0x87, 0xef, 0x21, 0x28,
- 0x79, 0x71, 0x07, 0xf0, 0xf2, 0xc4, 0x70, 0x9a, 0xf1, 0x09, 0xc3, 0xc9,
- 0x82, 0x8a, 0x6b, 0x5a, 0xa6, 0xc3, 0xb8, 0x8f, 0x8f, 0x0c, 0x53, 0x2b,
- 0x5a, 0x1c, 0xdd, 0x65, 0x75, 0xae, 0xed, 0x8e, 0xe3, 0x31, 0x20, 0x53,
- 0x73, 0x3a, 0xe4, 0x17, 0x7d, 0xb2, 0x61, 0x07, 0x08, 0x38, 0x3c, 0x79,
- 0x35, 0xfb, 0xcd, 0x9a, 0x96, 0xbc, 0x7f, 0x61, 0x46, 0xd3, 0x38, 0x32,
- 0x49, 0xf6, 0x7b, 0x08, 0xfe, 0xda, 0x4e, 0x5a, 0xeb, 0x16, 0xd7, 0xa2,
- 0x4e, 0x9a, 0xd6, 0x2b, 0x6a, 0x1a, 0xd2, 0x4d, 0xd3, 0x1a, 0xbf, 0x1f,
- 0x21, 0xac, 0x69, 0x19, 0x38, 0xbe, 0x9a, 0xc1, 0xaf, 0x6e, 0xf2, 0x4f,
- 0x31, 0x9b, 0x34, 0xad, 0xe1, 0xfe, 0x35, 0xfc, 0x61, 0x86, 0xfe, 0xfd,
- 0xf0, 0x38, 0xb7, 0x9c, 0xf2, 0xdc, 0x12, 0x1d, 0x79, 0xb7, 0x95, 0x02,
- 0xb7, 0xd7, 0x88, 0x5e, 0x6d, 0x22, 0xba, 0xbd, 0x46, 0x0b, 0xff, 0x69,
- 0xa2, 0xed, 0x87, 0x0b, 0xb4, 0xe2, 0xb0, 0xc6, 0x50, 0x9e, 0x5b, 0xa0,
- 0x85, 0x77, 0xdb, 0x74, 0xad, 0xb9, 0x5b, 0x00, 0x2e, 0x3c, 0x43, 0xc4,
- 0xd2, 0xbc, 0xa2, 0xda, 0xd4, 0x8a, 0x4b, 0x00, 0xae, 0x09, 0xd4, 0xe7,
- 0xba, 0x9a, 0x15, 0xc1, 0xfe, 0x85, 0xb4, 0x14, 0xd1, 0x0a, 0x45, 0x25,
- 0x0c, 0x28, 0xf5, 0xe6, 0x88, 0x8a, 0xe1, 0xa1, 0x0a, 0x31, 0xad, 0x75,
- 0x15, 0x6e, 0xd4, 0xac, 0x4c, 0x26, 0x31, 0x8c, 0x5f, 0xdf, 0x9c, 0x9c,
- 0xdd, 0x2c, 0x8d, 0xc8, 0x62, 0xa0, 0xc0, 0xc8, 0xbc, 0x63, 0xbd, 0x63,
- 0xab, 0x80, 0x75, 0x37, 0x9a, 0x57, 0xcc, 0x83, 0x1d, 0x97, 0xcd, 0x3b,
- 0xf8, 0x89, 0xb6, 0x8d, 0xd1, 0x53, 0xbf, 0x1d, 0x9e, 0x18, 0xda, 0x78,
- 0x33, 0x0b, 0x86, 0x21, 0xa9, 0x39, 0x2f, 0xab, 0x27, 0x10, 0x44, 0x92,
- 0xec, 0xd7, 0x13, 0x45, 0xdf, 0x18, 0x59, 0xd1, 0xba, 0xef, 0xd5, 0x2b,
- 0xf2, 0x06, 0xd6, 0xed, 0x7a, 0x45, 0xff, 0x86, 0x84, 0xd5, 0x2e, 0x89,
- 0x72, 0x63, 0xab, 0x19, 0xd3, 0xfe, 0x54, 0x9e, 0xf6, 0x0d, 0x8c, 0xcc,
- 0x43, 0x19, 0x57, 0x5f, 0x74, 0xe8, 0xfb, 0x71, 0x1d, 0x1c, 0x6f, 0x6c,
- 0x55, 0xdd, 0x47, 0xeb, 0xbf, 0xac, 0x96, 0x57, 0xae, 0x27, 0x11, 0x42,
- 0x85, 0xf6, 0xf1, 0x42, 0xd5, 0xb2, 0xca, 0x78, 0xe9, 0x6f, 0x7c, 0xd4,
- 0x5f, 0x4d, 0xe8, 0x7f, 0x9b, 0x83, 0xab, 0x6d, 0x9c, 0x34, 0x06, 0x13,
- 0xb3, 0xea, 0xb7, 0xbb, 0x9c, 0x92, 0xec, 0xf7, 0x0f, 0xbc, 0x6a, 0xc2,
- 0x2a, 0x7e, 0xb7, 0xd1, 0x91, 0xa9, 0xbc, 0xfc, 0xad, 0x05, 0xde, 0x61,
- 0xc7, 0xc0, 0xb8, 0xdc, 0x3b, 0x79, 0xa1, 0x57, 0x9b, 0x55, 0x7c, 0x2a,
- 0xd1, 0x3d, 0x23, 0x2a, 0xa7, 0x0d, 0x45, 0xd1, 0xab, 0x24, 0xa8, 0xe2,
- 0xd3, 0x81, 0x62, 0x19, 0x51, 0xd2, 0x2e, 0x5e, 0xe2, 0xab, 0xa2, 0xe8,
- 0x8f, 0xa9, 0x1a, 0xec, 0x20, 0x0c, 0x4c, 0x15, 0x0f, 0x2e, 0x8a, 0x17,
- 0x28, 0x8a, 0xf9, 0xfd, 0x62, 0x58, 0xc5, 0xe1, 0x0d, 0x48, 0x15, 0xab,
- 0x68, 0x44, 0xe9, 0x02, 0xc9, 0x8d, 0x9c, 0xe3, 0x99, 0x20, 0x59, 0x2c,
- 0x2b, 0x3c, 0x52, 0xc5, 0xa7, 0x12, 0xbd, 0x57, 0x00, 0x35, 0x0e, 0xe9,
- 0x65, 0xcf, 0x82, 0x76, 0xf6, 0xa7, 0xca, 0xac, 0x55, 0xf4, 0x82, 0x95,
- 0xa9, 0x08, 0xc0, 0xd8, 0xaa, 0x1a, 0xd7, 0x0b, 0x4d, 0x24, 0x6d, 0xe7,
- 0xe0, 0x43, 0x28, 0x6d, 0x92, 0xa8, 0xfe, 0x0d, 0xdc, 0x2a, 0x96, 0x8b,
- 0xff, 0x07, 0x3b, 0x2d, 0xad, 0xe7, 0xee, 0x67, 0xc1, 0x2d, 0x00, 0x00,
- 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+ 0xe3, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0xed, 0x5d, 0x5f, 0x68, 0x5b,
+ 0xd7, 0x1d, 0xfe, 0x69, 0xa4, 0xe0, 0x0e, 0x33, 0x94, 0xb1, 0x87, 0x24,
+ 0x94, 0x61, 0x97, 0xb5, 0x60, 0x0f, 0x4a, 0xaf, 0xe7, 0x3e, 0xc8, 0x5b,
+ 0x4b, 0xae, 0xdb, 0x97, 0xca, 0x4e, 0x49, 0xa5, 0x76, 0x50, 0xbb, 0xeb,
+ 0x83, 0x14, 0x67, 0xc4, 0xde, 0x5e, 0xea, 0xb4, 0x2f, 0x49, 0x3c, 0x52,
+ 0x35, 0x0f, 0xa9, 0xa3, 0x42, 0x86, 0xd5, 0xe1, 0xce, 0x0a, 0x84, 0xd8,
+ 0x2d, 0x18, 0x3b, 0x0f, 0x8e, 0xec, 0x41, 0x98, 0x95, 0xa1, 0x22, 0x17,
+ 0x92, 0x59, 0x1e, 0x1e, 0x72, 0x20, 0x05, 0x7b, 0x78, 0x43, 0x2e, 0xa6,
+ 0x38, 0xc6, 0x18, 0xd9, 0x98, 0xc0, 0xb7, 0x87, 0xab, 0x7b, 0x75, 0xff,
+ 0x9c, 0x73, 0xef, 0xb9, 0x57, 0x4a, 0xea, 0x34, 0x3a, 0x2f, 0x9f, 0xe5,
+ 0x7b, 0xfe, 0xfc, 0xce, 0xd1, 0xef, 0x7c, 0xf7, 0x3b, 0xbf, 0x7b, 0xce,
+ 0x15, 0x81, 0x88, 0x46, 0x88, 0xa8, 0x6a, 0x08, 0x00, 0xab, 0x00, 0x00,
+ 0x64, 0x4b, 0x88, 0x3d, 0xa0, 0xea, 0xed, 0xd4, 0xf0, 0x89, 0xc5, 0x8a,
+ 0x1d, 0x34, 0x75, 0xaf, 0x00, 0x00, 0x90, 0x86, 0x67, 0x41, 0x17, 0x00,
+ 0x3a, 0x3f, 0xc1, 0x45, 0x79, 0x0c, 0xe8, 0xbf, 0x99, 0x07, 0x00, 0x7c,
+ 0xdf, 0x1d, 0xaf, 0xe1, 0xe3, 0x8b, 0x9e, 0x0a, 0xe6, 0xd7, 0x15, 0x02,
+ 0xf5, 0xc7, 0x53, 0xa0, 0x65, 0x80, 0x2e, 0x4c, 0xb8, 0x46, 0x7f, 0x01,
+ 0x88, 0x4c, 0xa1, 0xe6, 0xc0, 0x35, 0x74, 0x8d, 0xee, 0x0a, 0x00, 0x90,
+ 0xaf, 0x3a, 0x33, 0xaa, 0x5b, 0x94, 0xc7, 0x80, 0xc2, 0x56, 0xb1, 0x26,
+ 0x21, 0x6a, 0x28, 0x84, 0x42, 0x19, 0xb1, 0xa7, 0x30, 0xa2, 0x17, 0x46,
+ 0x75, 0x83, 0xb1, 0x4c, 0xbe, 0xe6, 0xb8, 0x35, 0x74, 0x44, 0xc7, 0x0c,
+ 0xf9, 0xf5, 0x22, 0xa4, 0x64, 0x75, 0x99, 0xd5, 0x0e, 0xa5, 0xe1, 0xd9,
+ 0x9a, 0x64, 0xa8, 0xa1, 0x2d, 0xda, 0x66, 0xc0, 0x3a, 0xe0, 0x2f, 0x3c,
+ 0x7c, 0x86, 0x35, 0xa3, 0x3f, 0x9e, 0xaa, 0x39, 0x6e, 0x0d, 0xb9, 0xc8,
+ 0xbd, 0x90, 0x5f, 0x2f, 0xc2, 0x1f, 0xf7, 0xc0, 0x98, 0x89, 0x14, 0x28,
+ 0x09, 0xd0, 0xf0, 0x2c, 0x28, 0x09, 0x04, 0xaf, 0xcf, 0x03, 0x00, 0x26,
+ 0x96, 0x94, 0x28, 0x83, 0x68, 0x3d, 0xfe, 0x8b, 0x13, 0x95, 0x3b, 0x2e,
+ 0x80, 0xa1, 0xe1, 0x11, 0x44, 0x4e, 0xf5, 0x22, 0xd2, 0xd3, 0x5b, 0xc2,
+ 0x08, 0x22, 0xa7, 0x7a, 0x31, 0x18, 0x1f, 0x04, 0x00, 0x14, 0x0a, 0x85,
+ 0xc7, 0x47, 0x92, 0x00, 0x48, 0x4d, 0x55, 0x77, 0x42, 0x17, 0xb7, 0x8a,
+ 0x18, 0x8c, 0x03, 0x91, 0x9e, 0x5e, 0x04, 0x8e, 0xca, 0x88, 0xf4, 0x44,
+ 0xbc, 0xd7, 0xff, 0x10, 0xec, 0x63, 0x61, 0x75, 0x18, 0xf6, 0xa2, 0x62,
+ 0x28, 0xb6, 0x60, 0x9b, 0xb2, 0xcb, 0x78, 0x24, 0x8c, 0x8b, 0x22, 0x80,
+ 0x7b, 0x40, 0x53, 0xab, 0x84, 0x42, 0xeb, 0x06, 0x9a, 0x5a, 0x25, 0x48,
+ 0xad, 0x01, 0xee, 0xe7, 0x33, 0xe7, 0x63, 0x8f, 0x05, 0xb3, 0x9f, 0x39,
+ 0x1f, 0xd3, 0xec, 0xaf, 0x9a, 0xbd, 0x19, 0x58, 0xc6, 0xa3, 0xff, 0x83,
+ 0x7e, 0x4f, 0x13, 0xf9, 0xa1, 0xd8, 0xc7, 0x40, 0xeb, 0xcc, 0xdb, 0x83,
+ 0x6b, 0x86, 0x15, 0x49, 0x91, 0x99, 0x79, 0x4f, 0x1a, 0xd7, 0x0b, 0xe3,
+ 0x46, 0x4e, 0xf5, 0x1a, 0xbe, 0x88, 0x60, 0x67, 0x08, 0x43, 0xc3, 0x23,
+ 0x00, 0x80, 0xd1, 0xb1, 0x09, 0x20, 0x0e, 0xc8, 0x9d, 0x41, 0xed, 0xba,
+ 0xd4, 0x1a, 0xc0, 0x7c, 0x6e, 0x7e, 0xff, 0x33, 0xae, 0x6a, 0x7f, 0xb5,
+ 0x1c, 0x02, 0x46, 0x87, 0x95, 0x5a, 0x03, 0x88, 0xf4, 0xf4, 0x56, 0xc4,
+ 0xb4, 0x55, 0xb5, 0x8f, 0x83, 0x96, 0x7f, 0xc8, 0x70, 0xa9, 0x41, 0x37,
+ 0x9c, 0x1d, 0x36, 0x30, 0x9e, 0xad, 0x48, 0xe3, 0xca, 0x57, 0xb3, 0xe2,
+ 0x0e, 0x05, 0x23, 0xc3, 0x22, 0xc7, 0x1f, 0x40, 0xdc, 0x53, 0xec, 0x4b,
+ 0xcd, 0xa4, 0x6c, 0xeb, 0x57, 0xf3, 0x55, 0xea, 0x20, 0x15, 0x5d, 0xb7,
+ 0xb3, 0xaf, 0xe0, 0xc1, 0x3e, 0x00, 0x81, 0xa3, 0xb2, 0xe5, 0x0e, 0x84,
+ 0x75, 0x87, 0xf1, 0x7a, 0x04, 0xf6, 0x39, 0xe5, 0xf7, 0x8d, 0x10, 0x51,
+ 0x94, 0x88, 0x92, 0x44, 0x14, 0x05, 0xe0, 0xfb, 0x68, 0x92, 0xe8, 0x40,
+ 0x98, 0xe8, 0x81, 0x18, 0x46, 0xa4, 0x1c, 0x25, 0x5f, 0x6f, 0x21, 0x5e,
+ 0x8a, 0xfe, 0x2d, 0x47, 0x57, 0x16, 0x5a, 0x84, 0xeb, 0xe3, 0xe1, 0xe8,
+ 0xb1, 0x35, 0xea, 0x7e, 0xe1, 0x88, 0x2f, 0xa9, 0xb7, 0x97, 0x81, 0xb9,
+ 0xdc, 0x3c, 0x4e, 0x9c, 0xfc, 0x03, 0xed, 0xd2, 0x2e, 0xd5, 0x51, 0x1d,
+ 0x05, 0xe4, 0x36, 0x4a, 0x0c, 0xc6, 0x1d, 0xcb, 0x19, 0x10, 0x40, 0xb8,
+ 0xab, 0x9b, 0x56, 0xbe, 0x59, 0xd1, 0xea, 0xd1, 0x63, 0x50, 0x0e, 0x52,
+ 0x5f, 0x4f, 0x94, 0x1a, 0x9f, 0x7f, 0xd6, 0xd7, 0x76, 0x54, 0xc6, 0xee,
+ 0xf6, 0x2e, 0xd5, 0xd5, 0xd7, 0xd1, 0xdc, 0xad, 0x34, 0x25, 0x7d, 0x3e,
+ 0x9f, 0xbe, 0xbe, 0x74, 0x26, 0x8b, 0xb3, 0x03, 0x67, 0x69, 0x73, 0x7b,
+ 0x93, 0xa4, 0xa6, 0x26, 0x6a, 0xbf, 0xf6, 0x85, 0x4f, 0xb5, 0xb3, 0xe5,
+ 0xcb, 0x16, 0x6a, 0xbb, 0xd3, 0x4e, 0xbb, 0xdb, 0xbb, 0x86, 0xfa, 0xa5,
+ 0xa6, 0x26, 0x92, 0x5e, 0x94, 0xe8, 0xf4, 0xfb, 0xa7, 0x8d, 0xf5, 0xc5,
+ 0x81, 0xe6, 0x2f, 0x5b, 0xa8, 0x8e, 0xea, 0xe8, 0xd2, 0xa7, 0x97, 0xa8,
+ 0xfd, 0x95, 0x5f, 0xfb, 0x12, 0xc3, 0x23, 0x48, 0xfe, 0x35, 0xa9, 0x95,
+ 0xf7, 0x1f, 0x3a, 0x48, 0x9b, 0xdf, 0xde, 0xa7, 0x5d, 0xda, 0xa5, 0xa5,
+ 0x3b, 0x39, 0x8b, 0x3d, 0x2a, 0xaa, 0x76, 0xb3, 0xfa, 0xa7, 0x95, 0x03,
+ 0xd0, 0x7e, 0xac, 0x43, 0xab, 0x4f, 0x9f, 0xaf, 0xae, 0xbe, 0x8e, 0xe6,
+ 0xe4, 0x34, 0xad, 0xf5, 0xac, 0xd1, 0xe1, 0x23, 0xa5, 0xef, 0x45, 0xc0,
+ 0xbe, 0xba, 0xfa, 0x3a, 0xad, 0xbf, 0xfa, 0x76, 0x12, 0x9f, 0x27, 0x69,
+ 0xe6, 0xc6, 0x0c, 0xad, 0x7c, 0xbb, 0x62, 0x68, 0xc7, 0x7f, 0xe8, 0x20,
+ 0xa5, 0xdf, 0x9c, 0xa6, 0x9d, 0xb7, 0x77, 0xe8, 0xe9, 0x9f, 0xfc, 0xd8,
+ 0x97, 0x24, 0xd3, 0xcc, 0xf3, 0xf2, 0x84, 0xcb, 0x2e, 0xb9, 0xd5, 0xb0,
+ 0x4e, 0x4f, 0xd0, 0x84, 0xf6, 0x30, 0xc0, 0xaa, 0xd1, 0x82, 0x9d, 0x21,
+ 0x60, 0x1d, 0xc8, 0x66, 0xb2, 0x42, 0x33, 0x5e, 0x2d, 0x1f, 0x38, 0x2a,
+ 0x2b, 0x1d, 0x29, 0x31, 0x6d, 0xff, 0x07, 0xfd, 0x1a, 0x23, 0x05, 0x5e,
+ 0x93, 0x81, 0x22, 0x50, 0x7c, 0xad, 0xdc, 0x5e, 0xb0, 0x33, 0x68, 0xb5,
+ 0xef, 0xb8, 0xf5, 0xfa, 0x60, 0x7c, 0xc8, 0x6a, 0x5f, 0x06, 0x88, 0x9c,
+ 0xea, 0x35, 0xd4, 0x67, 0xd6, 0x86, 0x06, 0x46, 0x2c, 0x96, 0xfe, 0xcf,
+ 0xd0, 0xa4, 0xea, 0xe7, 0x33, 0xe7, 0x63, 0xfc, 0xf1, 0x02, 0x5b, 0xf3,
+ 0x23, 0x07, 0xa0, 0xa8, 0x8c, 0xb3, 0xc1, 0x3e, 0x40, 0x91, 0x50, 0xa5,
+ 0x71, 0xd0, 0xf2, 0x1f, 0xaf, 0xd0, 0x3e, 0x13, 0xe3, 0xe3, 0x38, 0x94,
+ 0xff, 0xaf, 0x03, 0xa1, 0x77, 0xba, 0x8c, 0xe3, 0x5d, 0x62, 0x7a, 0x8d,
+ 0x69, 0xa3, 0x53, 0xf3, 0xb8, 0xf2, 0x6f, 0x0f, 0x8c, 0xf8, 0xb3, 0x34,
+ 0xe1, 0x64, 0x3b, 0x93, 0x65, 0xfb, 0x88, 0xe8, 0x33, 0x97, 0xcc, 0x6d,
+ 0x87, 0xb1, 0x81, 0x30, 0x1d, 0xe6, 0x30, 0x87, 0x99, 0x29, 0x9b, 0x5f,
+ 0x6a, 0xb1, 0x30, 0x88, 0x99, 0x29, 0x9a, 0x9a, 0x9a, 0xa8, 0xfd, 0x37,
+ 0xed, 0xd4, 0xdd, 0x15, 0x36, 0x32, 0x12, 0x80, 0xdc, 0x42, 0x8e, 0x5a,
+ 0x5a, 0x7e, 0x65, 0x61, 0xe8, 0xe6, 0x56, 0x09, 0x7a, 0x46, 0x4a, 0x7c,
+ 0x9e, 0x24, 0x3d, 0x93, 0x4c, 0x4f, 0x4d, 0x96, 0x99, 0xc7, 0x64, 0xc7,
+ 0xd2, 0x9d, 0x1c, 0x4d, 0xdf, 0x98, 0xa6, 0x73, 0x1f, 0x5d, 0xa0, 0x5d,
+ 0xda, 0x25, 0x7f, 0xbd, 0x9f, 0xfa, 0x7a, 0xfa, 0xa8, 0xbb, 0xfb, 0x2d,
+ 0x9f, 0x9d, 0xfd, 0x2a, 0x23, 0x25, 0x5a, 0x03, 0x50, 0xdb, 0x89, 0xf6,
+ 0x44, 0xa9, 0xef, 0xf7, 0x27, 0x7c, 0xd1, 0x9e, 0x5e, 0x2c, 0x2c, 0x2c,
+ 0x58, 0x98, 0xba, 0xeb, 0xed, 0x2e, 0xea, 0x78, 0xa3, 0xd3, 0x37, 0x36,
+ 0x36, 0x81, 0xee, 0x7f, 0x85, 0x29, 0xba, 0x19, 0x25, 0x3a, 0x50, 0x47,
+ 0x2d, 0x2f, 0xb6, 0x50, 0xdf, 0xc9, 0xa8, 0xc6, 0x70, 0xfa, 0x76, 0x42,
+ 0xc7, 0x42, 0xd4, 0xf8, 0xa7, 0x73, 0xce, 0xe3, 0x50, 0x2d, 0xfb, 0x8e,
+ 0x75, 0x50, 0xf4, 0x64, 0x1f, 0xa9, 0xd7, 0x83, 0x72, 0x90, 0x9a, 0x06,
+ 0x2f, 0x18, 0xbe, 0xdf, 0xb3, 0xe7, 0x63, 0x98, 0xb9, 0x31, 0x43, 0xbb,
+ 0xb4, 0x4b, 0x81, 0x97, 0x02, 0xd4, 0xf6, 0x97, 0xcf, 0x7c, 0x8a, 0x86,
+ 0xd8, 0xab, 0x2c, 0x1e, 0xab, 0xee, 0x45, 0xb0, 0xa4, 0xf5, 0xea, 0x31,
+ 0xad, 0xeb, 0x68, 0x02, 0x80, 0xc1, 0xf8, 0x10, 0x30, 0x23, 0x16, 0x45,
+ 0xd0, 0x98, 0x81, 0x51, 0x9f, 0xca, 0x30, 0xc1, 0xce, 0x90, 0xa1, 0x3c,
+ 0x72, 0xd0, 0x98, 0xc2, 0xc2, 0x30, 0xa4, 0xac, 0xa6, 0x2d, 0x8c, 0x74,
+ 0xbc, 0x6c, 0xcf, 0xe8, 0xf8, 0x04, 0x9f, 0x09, 0xef, 0x95, 0x19, 0x4a,
+ 0x5d, 0xcd, 0x33, 0xed, 0xcd, 0x98, 0x34, 0xbc, 0xa9, 0x1f, 0xac, 0xfe,
+ 0xaa, 0xed, 0x22, 0x07, 0x6b, 0x7f, 0x6c, 0xc6, 0x55, 0xed, 0x6f, 0xb0,
+ 0x33, 0x68, 0xa8, 0x4f, 0x5d, 0xc4, 0xba, 0xb5, 0x0f, 0xf7, 0x8c, 0xed,
+ 0x87, 0xde, 0xe9, 0x32, 0x30, 0x3a, 0x32, 0xb0, 0x7c, 0x7f, 0x00, 0xa0,
+ 0x30, 0xad, 0x07, 0x2d, 0xab, 0xc7, 0xc0, 0x40, 0x98, 0xe6, 0x98, 0x5c,
+ 0x4b, 0x74, 0xe9, 0xeb, 0x15, 0xfa, 0xe0, 0x56, 0x63, 0x55, 0x98, 0x56,
+ 0xd1, 0xb6, 0x2b, 0xd4, 0xfd, 0xc2, 0xb3, 0xee, 0x34, 0x2a, 0x11, 0xad,
+ 0x15, 0x0a, 0x38, 0x7c, 0xf8, 0x30, 0xa5, 0xbf, 0x9a, 0xa3, 0xf6, 0x6f,
+ 0xda, 0x28, 0xfc, 0x77, 0xab, 0x66, 0xd5, 0x6b, 0xac, 0xbe, 0x0f, 0x4f,
+ 0xd3, 0xc2, 0x9d, 0x1c, 0x6d, 0x6e, 0x6f, 0x72, 0x19, 0x5b, 0xcd, 0x7f,
+ 0x3f, 0x0e, 0x5c, 0x29, 0x69, 0x39, 0x55, 0xdb, 0xae, 0x7c, 0xb3, 0x42,
+ 0xdd, 0x27, 0xa3, 0x5a, 0xf9, 0xd8, 0xc0, 0x19, 0xea, 0x78, 0xa3, 0xd3,
+ 0x67, 0x66, 0x6a, 0x9e, 0xe6, 0x4c, 0x67, 0xb2, 0x38, 0xfd, 0xfe, 0x69,
+ 0x8d, 0x91, 0xa3, 0xff, 0xb8, 0xc5, 0x61, 0xb2, 0x08, 0x16, 0x16, 0xee,
+ 0x6a, 0x76, 0xf5, 0xfd, 0xf3, 0x6b, 0x0b, 0x53, 0xad, 0x7d, 0xbb, 0x46,
+ 0xf4, 0x80, 0x88, 0x0e, 0x10, 0xd5, 0xd5, 0x3f, 0x4d, 0x89, 0x4f, 0x2e,
+ 0x31, 0x99, 0xd6, 0x62, 0x8f, 0xcb, 0x71, 0x70, 0x6d, 0x9f, 0xc0, 0x1d,
+ 0x51, 0x8f, 0xfe, 0x7a, 0x3f, 0xcd, 0x4e, 0x4d, 0x2b, 0x1e, 0x2f, 0x0d,
+ 0x57, 0xce, 0x88, 0x76, 0x69, 0x70, 0xae, 0x7a, 0x8c, 0x5b, 0xb0, 0x61,
+ 0x44, 0xb7, 0x98, 0x9a, 0x49, 0x19, 0x18, 0x63, 0x64, 0x78, 0x04, 0x7a,
+ 0x86, 0xd3, 0x34, 0x6d, 0x69, 0x35, 0x3b, 0x3a, 0x3e, 0xc1, 0x64, 0x18,
+ 0x14, 0xc0, 0x65, 0x70, 0x4d, 0x13, 0x96, 0xda, 0x65, 0x95, 0x77, 0xd2,
+ 0x9c, 0x6a, 0x79, 0x11, 0xcd, 0xe8, 0xa6, 0xff, 0xf3, 0xb9, 0x79, 0x66,
+ 0x7f, 0xcc, 0x0c, 0xa9, 0x6a, 0x5a, 0xfd, 0x38, 0xb0, 0x18, 0xda, 0xad,
+ 0x7d, 0xe6, 0xf6, 0x45, 0xe3, 0xe5, 0x3f, 0x5a, 0xdb, 0x2a, 0x62, 0xe1,
+ 0x3b, 0x22, 0xba, 0x36, 0x49, 0x44, 0x61, 0xcf, 0x38, 0x79, 0x77, 0x8d,
+ 0xc3, 0xb5, 0x44, 0xa7, 0x03, 0x44, 0x13, 0xbb, 0x6b, 0x0a, 0x63, 0x56,
+ 0xd8, 0xce, 0x91, 0xc1, 0x49, 0x8a, 0x02, 0x70, 0xd2, 0xb4, 0xb9, 0xdc,
+ 0x3c, 0x9c, 0xf2, 0x75, 0xbc, 0xde, 0x41, 0xaf, 0xd2, 0xab, 0xda, 0x4c,
+ 0xbe, 0xbf, 0x1d, 0xa5, 0xe6, 0x2e, 0x23, 0x63, 0x26, 0x7d, 0x3e, 0x1f,
+ 0x1d, 0xf1, 0xf9, 0x92, 0x3e, 0x9f, 0xaf, 0xfb, 0xb7, 0x6f, 0xf9, 0xba,
+ 0x0f, 0xbd, 0xab, 0xe5, 0x6f, 0x91, 0x5a, 0x28, 0x49, 0x44, 0x74, 0xc4,
+ 0xe7, 0x0b, 0x1e, 0x0b, 0x52, 0x1d, 0xd5, 0x19, 0xea, 0x53, 0x3f, 0x4f,
+ 0xbf, 0x39, 0x59, 0x66, 0x3e, 0xe9, 0xac, 0x76, 0xfd, 0x8b, 0x2f, 0xaf,
+ 0x73, 0xef, 0x0c, 0xe1, 0xae, 0xee, 0x72, 0xf9, 0x97, 0x94, 0xf2, 0xfa,
+ 0xfa, 0x13, 0xd7, 0x92, 0xca, 0x5a, 0xe4, 0x5a, 0x9f, 0xa1, 0x3d, 0x37,
+ 0x77, 0xa0, 0x16, 0xa9, 0xc5, 0x60, 0xaf, 0xda, 0x9f, 0x28, 0x80, 0xe6,
+ 0xf7, 0x95, 0x71, 0x08, 0xd7, 0x87, 0x69, 0xfa, 0xc6, 0xa4, 0x71, 0x1c,
+ 0xde, 0x0e, 0x1b, 0xfa, 0x47, 0x12, 0x79, 0xb2, 0xcf, 0xdc, 0xfe, 0xc7,
+ 0x03, 0x67, 0xb9, 0x77, 0x9e, 0xb5, 0x42, 0x01, 0xea, 0x67, 0x02, 0xaa,
+ 0xc0, 0x80, 0x89, 0x59, 0x5b, 0xa6, 0xd5, 0x52, 0xe9, 0x89, 0x59, 0xa5,
+ 0xed, 0x8d, 0x2e, 0xda, 0x68, 0x2f, 0x58, 0xe3, 0xb4, 0xa3, 0xe3, 0xa5,
+ 0x3b, 0x41, 0x51, 0x81, 0x6c, 0x26, 0x6b, 0x60, 0x54, 0x55, 0x73, 0x22,
+ 0x63, 0xa3, 0xf1, 0x60, 0x5c, 0x35, 0xb3, 0xae, 0xb3, 0x34, 0xb3, 0x1a,
+ 0x65, 0xb0, 0xb3, 0xcf, 0x10, 0xff, 0x04, 0x63, 0xd5, 0x5c, 0x28, 0x33,
+ 0x99, 0xa3, 0x66, 0xb4, 0x61, 0x28, 0x96, 0x46, 0x65, 0xf5, 0x47, 0x7f,
+ 0x07, 0x0a, 0xbc, 0x26, 0x1b, 0x19, 0xd8, 0x64, 0x9f, 0x6b, 0x4d, 0x6b,
+ 0xb6, 0x63, 0xbd, 0x7c, 0x5d, 0xbd, 0xb3, 0x69, 0xf6, 0x15, 0x95, 0xef,
+ 0x4c, 0x5d, 0x33, 0x68, 0xd1, 0x83, 0x88, 0xd7, 0xa8, 0x81, 0x8a, 0xfe,
+ 0x69, 0x42, 0x6f, 0x07, 0x97, 0x65, 0x79, 0xc9, 0xf7, 0x79, 0x9a, 0xe8,
+ 0xbb, 0x76, 0x4f, 0xed, 0xf6, 0x0f, 0x84, 0xa9, 0x89, 0x33, 0x23, 0x77,
+ 0xb6, 0x8a, 0x38, 0xd1, 0x77, 0x82, 0x16, 0xee, 0xde, 0x15, 0xd6, 0x4a,
+ 0x52, 0x53, 0x13, 0x7d, 0x7c, 0xee, 0x63, 0x6a, 0x7c, 0xae, 0x91, 0xcc,
+ 0xf1, 0x59, 0xff, 0xa1, 0x83, 0xb4, 0xbb, 0xbd, 0xc3, 0xd4, 0x74, 0x16,
+ 0x0d, 0x78, 0x1e, 0x68, 0xbe, 0x61, 0xd4, 0x68, 0xaa, 0xb6, 0x33, 0xdf,
+ 0x09, 0x78, 0xf1, 0x4f, 0x3d, 0x36, 0x1e, 0x6a, 0xa4, 0xa1, 0x4f, 0x2f,
+ 0x51, 0xe3, 0xf3, 0x8a, 0x86, 0x4f, 0x1e, 0x95, 0xa1, 0xda, 0xc1, 0xd2,
+ 0x8c, 0x8d, 0x87, 0x1a, 0x29, 0x94, 0xba, 0xee, 0x1c, 0x5d, 0x21, 0xb6,
+ 0xa6, 0xd4, 0x6b, 0xfa, 0x36, 0xd9, 0x18, 0x3f, 0x16, 0x19, 0x87, 0xeb,
+ 0x9d, 0x21, 0xa8, 0x71, 0x56, 0x96, 0x7d, 0xaa, 0x36, 0x37, 0xdb, 0xa1,
+ 0x5f, 0x13, 0xf0, 0xc6, 0xa3, 0xf1, 0xb9, 0x46, 0x9a, 0xfc, 0x62, 0x4c,
+ 0x61, 0xfc, 0x62, 0x05, 0xcc, 0x17, 0x2a, 0x6d, 0x86, 0xf1, 0x9a, 0xce,
+ 0xa4, 0xf3, 0x1e, 0x9f, 0x90, 0xd9, 0x30, 0xad, 0x8e, 0x11, 0x06, 0xe3,
+ 0x83, 0xe0, 0xc5, 0x09, 0x31, 0x03, 0xb6, 0x86, 0x42, 0x89, 0x99, 0x4b,
+ 0x71, 0x53, 0x64, 0x14, 0x86, 0x05, 0x4a, 0xab, 0xda, 0x22, 0x14, 0xed,
+ 0xab, 0x32, 0xb7, 0x9e, 0xb9, 0x4a, 0x7b, 0x1e, 0xd4, 0x72, 0x83, 0xf1,
+ 0x41, 0x5b, 0x3b, 0x53, 0x33, 0x29, 0x43, 0xfe, 0x72, 0xb9, 0x21, 0xab,
+ 0x5d, 0x6a, 0x7e, 0x9d, 0x3d, 0xaa, 0xbd, 0x6a, 0xb9, 0x6c, 0xc6, 0xc5,
+ 0x93, 0x43, 0x5d, 0x7f, 0xd5, 0xfe, 0x30, 0xff, 0xaf, 0xb3, 0x4b, 0x1d,
+ 0x2f, 0x35, 0x96, 0x6b, 0x2e, 0xe7, 0x64, 0x9f, 0xed, 0x93, 0x47, 0x46,
+ 0x7b, 0x91, 0x53, 0xbd, 0x0a, 0xbb, 0x66, 0x8c, 0xe3, 0x4c, 0x9e, 0xf6,
+ 0xbd, 0x5e, 0x2e, 0xef, 0xda, 0xaa, 0x34, 0x65, 0x97, 0x37, 0x40, 0x09,
+ 0x77, 0xed, 0xfb, 0xe3, 0xfb, 0x7f, 0x73, 0x4b, 0x0d, 0x1f, 0x1e, 0x92,
+ 0xa7, 0x28, 0x81, 0xc3, 0x6e, 0x2e, 0xd7, 0x69, 0x0b, 0xd8, 0x80, 0x4b,
+ 0x3b, 0x6c, 0x3a, 0xa6, 0x9e, 0xb4, 0xe8, 0xbf, 0x09, 0xc8, 0x28, 0x1f,
+ 0xa6, 0xac, 0x9d, 0x0a, 0xfe, 0x61, 0xa0, 0x38, 0xd3, 0x5e, 0x14, 0xdb,
+ 0xcd, 0x55, 0x69, 0x12, 0xb5, 0xc7, 0xae, 0x63, 0x0d, 0x1c, 0xe6, 0x96,
+ 0x92, 0x95, 0x33, 0x74, 0xb1, 0x34, 0x21, 0xb2, 0xab, 0xca, 0x4e, 0x21,
+ 0x66, 0x3e, 0xdd, 0xf5, 0xec, 0xea, 0x46, 0x55, 0x27, 0x4a, 0x91, 0x33,
+ 0xf1, 0xd4, 0xf6, 0x62, 0x99, 0x3c, 0x62, 0x28, 0x9d, 0x92, 0xae, 0x42,
+ 0x7b, 0x43, 0xb7, 0x97, 0x11, 0x41, 0x69, 0xd3, 0x12, 0x80, 0xfc, 0xba,
+ 0xb1, 0x3f, 0xa9, 0x7b, 0x05, 0xc8, 0x63, 0xca, 0x75, 0x05, 0x67, 0x11,
+ 0x83, 0xf7, 0x33, 0x7f, 0xf9, 0xf5, 0x0d, 0xc4, 0x60, 0xac, 0x2f, 0x64,
+ 0xaa, 0x4f, 0x8c, 0x69, 0x13, 0x8f, 0xc4, 0x5f, 0xb5, 0x54, 0x29, 0xd3,
+ 0x7a, 0x2d, 0x27, 0x82, 0x85, 0xa2, 0xf5, 0xce, 0x63, 0x76, 0x58, 0xde,
+ 0x1d, 0xaa, 0x22, 0x07, 0x42, 0x79, 0x6f, 0x88, 0x34, 0x0c, 0xa3, 0x96,
+ 0xde, 0x02, 0xb3, 0xbf, 0xd9, 0x55, 0x54, 0xd4, 0xdf, 0xa1, 0xdb, 0xd6,
+ 0x7a, 0xfd, 0x05, 0xb1, 0xfe, 0xd2, 0x72, 0xe9, 0x0e, 0xe7, 0xa2, 0x7f,
+ 0x21, 0x9b, 0xdd, 0x80, 0xfa, 0xf1, 0x73, 0x66, 0xda, 0x47, 0xc4, 0xb0,
+ 0xe6, 0x54, 0x09, 0xd3, 0x7a, 0x2d, 0x27, 0x74, 0x6b, 0x32, 0xd5, 0x67,
+ 0x3e, 0x8c, 0x19, 0x1a, 0xcf, 0x72, 0xed, 0x96, 0xc7, 0x00, 0x1e, 0x53,
+ 0x8a, 0x30, 0x1e, 0xb7, 0x1f, 0x9c, 0xf1, 0x8a, 0xa1, 0xb2, 0xfe, 0xc6,
+ 0x38, 0xf5, 0xea, 0x1d, 0xa8, 0xb8, 0x07, 0xc8, 0x63, 0xfc, 0xf1, 0x16,
+ 0x3a, 0xf3, 0x07, 0xa0, 0xe1, 0x72, 0x8a, 0x3b, 0x6e, 0xe6, 0xf2, 0x8e,
+ 0x4c, 0xfb, 0x30, 0x52, 0x7e, 0x5d, 0xd1, 0xb0, 0xa9, 0x25, 0x07, 0xc7,
+ 0xdd, 0x87, 0x4c, 0xeb, 0xc4, 0xa0, 0x4e, 0xfb, 0x91, 0xa5, 0x62, 0x69,
+ 0xaf, 0x86, 0xdb, 0xf6, 0xc1, 0xef, 0x47, 0x76, 0x95, 0xcd, 0xb4, 0xb1,
+ 0x8c, 0x87, 0x76, 0x74, 0x18, 0xcb, 0xb8, 0x60, 0x70, 0xf0, 0x77, 0x09,
+ 0xda, 0xee, 0x19, 0xb1, 0x29, 0xd7, 0x90, 0x60, 0x97, 0x23, 0x3b, 0x0f,
+ 0x0f, 0x54, 0xdf, 0x5f, 0xcb, 0x0e, 0xa9, 0x3b, 0x53, 0x36, 0x08, 0x60,
+ 0x83, 0xb1, 0xb8, 0x0b, 0x81, 0x6d, 0x97, 0x93, 0x36, 0xfd, 0x3e, 0x99,
+ 0x56, 0xe4, 0xbd, 0x10, 0xfe, 0xb8, 0x7b, 0xad, 0x1b, 0xcb, 0xe4, 0x5d,
+ 0x33, 0x2d, 0xd7, 0x51, 0xdc, 0x4c, 0x14, 0x37, 0xf5, 0xc2, 0xfe, 0x4d,
+ 0x43, 0x0d, 0x89, 0xb2, 0xe6, 0xee, 0xbf, 0x99, 0x07, 0x6f, 0xed, 0x41,
+ 0x17, 0xec, 0xdf, 0x44, 0xc4, 0x8f, 0xd3, 0x16, 0xc0, 0x8d, 0x12, 0x84,
+ 0xae, 0x03, 0x54, 0x54, 0xa4, 0x03, 0x2d, 0x03, 0x74, 0xd5, 0x83, 0xd3,
+ 0x6e, 0x30, 0xda, 0x2d, 0x89, 0x7d, 0x2d, 0x6d, 0x01, 0xb4, 0x6e, 0xcd,
+ 0x17, 0x1a, 0xc7, 0xbe, 0x65, 0x5a, 0x37, 0x71, 0x6f, 0xdb, 0x27, 0x7b,
+ 0x2c, 0x07, 0xe2, 0xf4, 0x03, 0x5c, 0xa6, 0xad, 0xec, 0x3d, 0x12, 0xb1,
+ 0x0c, 0x3b, 0x8e, 0x0e, 0x07, 0xad, 0xcc, 0x63, 0x68, 0x11, 0xf4, 0x17,
+ 0x9c, 0xeb, 0xb7, 0xcc, 0x60, 0x15, 0x83, 0xa6, 0x07, 0x07, 0xfd, 0xe9,
+ 0x3c, 0xe8, 0x32, 0x7f, 0xe6, 0xb9, 0x76, 0x5a, 0xde, 0x8c, 0x34, 0x69,
+ 0xe8, 0xd0, 0x75, 0xeb, 0xd9, 0x32, 0xb3, 0xa3, 0xec, 0x2f, 0xa6, 0xe5,
+ 0x6b, 0x5a, 0x16, 0x46, 0xa6, 0xc4, 0xce, 0xa6, 0x79, 0x61, 0xda, 0x47,
+ 0xa1, 0x69, 0x79, 0x98, 0x5d, 0xdd, 0x70, 0x7d, 0xd6, 0x50, 0x4a, 0x8a,
+ 0x69, 0x7e, 0xdb, 0xd5, 0xae, 0xe6, 0x60, 0x89, 0x59, 0xdb, 0x19, 0xe2,
+ 0xa4, 0x4d, 0x99, 0x4e, 0x5b, 0xe4, 0xd7, 0x67, 0x69, 0xdf, 0xe5, 0xaa,
+ 0x78, 0x3f, 0x69, 0x5a, 0xa9, 0x08, 0xa4, 0xf4, 0x67, 0xcc, 0xa0, 0x38,
+ 0xba, 0x7e, 0xff, 0x72, 0x68, 0x5c, 0xe0, 0x44, 0x05, 0xf8, 0xfd, 0xd8,
+ 0x17, 0x9a, 0x96, 0x81, 0x6e, 0x4e, 0x75, 0x37, 0x6c, 0x40, 0x38, 0x8e,
+ 0xce, 0x65, 0xa6, 0xb2, 0xc3, 0xf2, 0x35, 0xef, 0x43, 0x61, 0x5a, 0x93,
+ 0xa6, 0x36, 0xe7, 0xf3, 0x5f, 0x74, 0x76, 0xbc, 0xfd, 0xa4, 0x69, 0x79,
+ 0xcc, 0x51, 0xdc, 0x33, 0x6a, 0x76, 0xa7, 0x55, 0x76, 0xff, 0xcd, 0xc7,
+ 0x40, 0xd3, 0x0a, 0x96, 0x67, 0x61, 0xc3, 0x65, 0xf1, 0x0d, 0xfe, 0x04,
+ 0x22, 0x0a, 0x8d, 0x5b, 0x67, 0x14, 0x00, 0x90, 0xc8, 0x99, 0x31, 0x81,
+ 0xd3, 0xb8, 0x4c, 0xa7, 0x75, 0x60, 0x5a, 0x91, 0x78, 0xdd, 0x7e, 0x64,
+ 0x5a, 0xbd, 0xa6, 0x15, 0x3a, 0x45, 0x0c, 0x6b, 0x7d, 0xd8, 0xd2, 0x39,
+ 0x3a, 0x00, 0x56, 0xbc, 0xd4, 0xc0, 0x68, 0xfb, 0x4c, 0xd3, 0xaa, 0x76,
+ 0xbb, 0x3d, 0x73, 0x28, 0xfa, 0x4a, 0xac, 0xca, 0x4f, 0x2e, 0x3c, 0x33,
+ 0x47, 0x78, 0xaf, 0x8d, 0xdc, 0x26, 0xaf, 0xbb, 0xbc, 0xb2, 0xbf, 0xbb,
+ 0x4f, 0x6d, 0x3f, 0xff, 0xa9, 0xed, 0xc9, 0x85, 0x13, 0x17, 0x00, 0x5e,
+ 0xf9, 0xc2, 0x1f, 0x77, 0xe8, 0x70, 0xe9, 0x54, 0xa7, 0x9b, 0x93, 0x0f,
+ 0x2a, 0xfa, 0xce, 0x4f, 0x40, 0x5f, 0x5f, 0xec, 0xe5, 0x25, 0x3a, 0xfb,
+ 0xca, 0x2f, 0xb5, 0xfa, 0xda, 0xaf, 0x66, 0x71, 0xeb, 0x7f, 0x6d, 0x44,
+ 0x0f, 0x26, 0x49, 0xfe, 0x45, 0x98, 0xba, 0xbb, 0xc5, 0xce, 0xb4, 0x1d,
+ 0xfc, 0x64, 0x92, 0x36, 0x1f, 0x88, 0x8f, 0xc3, 0xc8, 0x19, 0xe3, 0x09,
+ 0x03, 0xd6, 0xf7, 0x27, 0x7c, 0xa6, 0x8e, 0x83, 0x77, 0x01, 0xc4, 0x19,
+ 0xf5, 0x62, 0x20, 0xcc, 0xdd, 0xf7, 0xba, 0xb3, 0x07, 0x3c, 0xfd, 0x14,
+ 0x91, 0x57, 0x7f, 0xf2, 0x1f, 0x98, 0xa4, 0xfb, 0x1f, 0xf2, 0xeb, 0x37,
+ 0x9c, 0xc6, 0x6d, 0x60, 0xad, 0xe6, 0x05, 0x99, 0xef, 0x51, 0x31, 0xad,
+ 0xd0, 0xee, 0x2e, 0x22, 0x7b, 0xa6, 0x15, 0x98, 0xc9, 0xd5, 0xd2, 0xb4,
+ 0xa2, 0xf6, 0x7a, 0x61, 0x26, 0x7d, 0xf9, 0x3c, 0xe7, 0x2c, 0x9e, 0xab,
+ 0xf6, 0x19, 0xd8, 0x90, 0x60, 0xdb, 0xc3, 0xd5, 0xb0, 0xab, 0x80, 0x9d,
+ 0x1f, 0x49, 0xc3, 0xca, 0x77, 0x1f, 0xcb, 0x28, 0xe1, 0x2c, 0x5e, 0xfd,
+ 0x74, 0x61, 0x42, 0xd9, 0xfa, 0xbc, 0xc5, 0xb6, 0x5f, 0xfb, 0x63, 0x74,
+ 0xb1, 0x20, 0xa4, 0x3d, 0x9c, 0xa2, 0x0c, 0xc2, 0x4e, 0xeb, 0xb2, 0x1d,
+ 0x37, 0x5a, 0xca, 0xa9, 0x9e, 0x08, 0x1c, 0xf6, 0x0e, 0xd8, 0x4d, 0x08,
+ 0x17, 0x9a, 0x56, 0x1e, 0x73, 0xff, 0x02, 0x0d, 0x91, 0x37, 0xaa, 0xb3,
+ 0xb4, 0x39, 0x2f, 0xde, 0xee, 0x55, 0x22, 0x44, 0xa6, 0xd8, 0x6f, 0x04,
+ 0x62, 0x46, 0x3b, 0xa0, 0xc4, 0x55, 0xed, 0xa2, 0x02, 0xbc, 0xb8, 0xf4,
+ 0xd0, 0xed, 0x65, 0x6e, 0x94, 0xc1, 0x1f, 0x07, 0x86, 0x6e, 0x2f, 0x5b,
+ 0xca, 0x91, 0x71, 0xc0, 0x3d, 0xbc, 0x09, 0xa6, 0xe8, 0xc1, 0x63, 0x97,
+ 0xd9, 0xcc, 0x60, 0x87, 0xb2, 0x0b, 0x07, 0xf3, 0x72, 0xc7, 0xb0, 0x9b,
+ 0xf1, 0x29, 0xdd, 0xc9, 0x82, 0xaa, 0x6b, 0x5a, 0xa6, 0xc3, 0x38, 0x8f,
+ 0x8f, 0x1b, 0xa6, 0x96, 0xd5, 0x38, 0xba, 0xc3, 0xea, 0x5c, 0xdd, 0x1d,
+ 0xc7, 0x63, 0x40, 0xa6, 0xe6, 0xb4, 0xc9, 0x2f, 0x7a, 0x67, 0xc3, 0x16,
+ 0x20, 0xd9, 0xdc, 0x79, 0x55, 0xfb, 0x8d, 0x9a, 0x96, 0xbc, 0xbf, 0x61,
+ 0x46, 0xd5, 0x38, 0x6e, 0x92, 0xdb, 0xf7, 0x21, 0xf8, 0xeb, 0xc3, 0xb4,
+ 0xd4, 0x23, 0xae, 0x45, 0xed, 0x34, 0xad, 0x57, 0x54, 0x35, 0xa4, 0x93,
+ 0xa6, 0xd5, 0xbf, 0x3f, 0x42, 0x58, 0xd3, 0x32, 0x70, 0x6c, 0x71, 0x19,
+ 0xef, 0xde, 0xe0, 0x9f, 0x62, 0x36, 0x68, 0x5a, 0xdd, 0xf7, 0xd7, 0xf8,
+ 0xe7, 0x69, 0xfa, 0xcf, 0x76, 0x07, 0xb7, 0x9c, 0xfc, 0xcc, 0x1c, 0x1d,
+ 0x7c, 0xaf, 0x8d, 0xa4, 0xaf, 0x96, 0x88, 0x5e, 0x6e, 0x26, 0xfa, 0x6a,
+ 0x89, 0xd2, 0xff, 0x6d, 0xa6, 0xcd, 0xed, 0x34, 0x2d, 0xd8, 0xac, 0x31,
+ 0xe4, 0x67, 0xd2, 0x94, 0x7e, 0xaf, 0x5d, 0xd3, 0x9a, 0x3b, 0x7b, 0xc0,
+ 0xb9, 0xa7, 0x88, 0x58, 0x9a, 0x57, 0x54, 0x9b, 0x9a, 0x71, 0x0e, 0xc0,
+ 0x15, 0x81, 0xfa, 0x1c, 0x57, 0xb3, 0x22, 0x78, 0x26, 0x9d, 0x77, 0x45,
+ 0xb4, 0x42, 0x51, 0x09, 0x1d, 0xba, 0x7a, 0x72, 0x44, 0xa5, 0xf0, 0x50,
+ 0x95, 0x98, 0xd6, 0xbc, 0x0a, 0x37, 0xc7, 0x61, 0x59, 0xcc, 0xa3, 0x5e,
+ 0xef, 0xbf, 0xe9, 0xce, 0x6e, 0x96, 0x46, 0x64, 0x31, 0x90, 0x34, 0x3c,
+ 0x6b, 0x5b, 0xef, 0xe8, 0x22, 0x60, 0xde, 0x8d, 0xe6, 0x15, 0x01, 0xfe,
+ 0x5e, 0x03, 0x3e, 0x33, 0x0a, 0xc4, 0x9d, 0x79, 0x68, 0x73, 0xc7, 0x50,
+ 0xed, 0x61, 0x16, 0x8c, 0xc0, 0xa5, 0xe6, 0xbc, 0xa8, 0x9c, 0x40, 0x10,
+ 0x49, 0x6e, 0xdf, 0x9e, 0x28, 0xfa, 0xc4, 0xc8, 0x8c, 0xe6, 0x7d, 0xaf,
+ 0x5e, 0x91, 0x37, 0xb0, 0x4e, 0xd7, 0xab, 0xfa, 0x1b, 0x12, 0x66, 0xbb,
+ 0x5c, 0x94, 0x1b, 0x5d, 0x5c, 0x36, 0xec, 0x4f, 0xe5, 0x69, 0x5f, 0x69,
+ 0x78, 0x16, 0xf2, 0x98, 0xf2, 0xa0, 0x43, 0xdb, 0x8f, 0x6b, 0xe3, 0x78,
+ 0xa3, 0x8b, 0xca, 0x3e, 0x5a, 0xff, 0x45, 0xa5, 0xbc, 0x7c, 0x35, 0x8b,
+ 0x10, 0xaa, 0xb4, 0x8f, 0x17, 0x8a, 0x96, 0x95, 0xc7, 0xca, 0xbf, 0xf1,
+ 0xd1, 0x70, 0x39, 0xa5, 0xfd, 0x36, 0x07, 0x57, 0xdb, 0xd8, 0x69, 0x0c,
+ 0x26, 0x6e, 0x28, 0xef, 0xee, 0xb2, 0x4b, 0x6e, 0xdf, 0x7f, 0xe0, 0x55,
+ 0x13, 0xd6, 0xf0, 0x87, 0x8d, 0xb6, 0x4c, 0xe5, 0xe5, 0xb7, 0x16, 0x78,
+ 0x87, 0x1d, 0xa5, 0x31, 0x77, 0xcf, 0xe4, 0x85, 0x1e, 0x6d, 0xd6, 0xf0,
+ 0x89, 0x44, 0xe7, 0x8c, 0xa8, 0x9e, 0x36, 0x14, 0x45, 0xaf, 0x92, 0xa0,
+ 0x86, 0x4f, 0x06, 0x8a, 0x65, 0x44, 0x59, 0xbb, 0x78, 0x89, 0xaf, 0x8a,
+ 0xa2, 0x3f, 0xae, 0x68, 0xb0, 0xfd, 0x30, 0x30, 0x35, 0xdc, 0xbf, 0x28,
+ 0x5e, 0xa0, 0x24, 0xe6, 0x1f, 0x16, 0xc3, 0xca, 0x00, 0xf7, 0x09, 0x48,
+ 0x0d, 0x6b, 0xa8, 0x47, 0xd7, 0x05, 0xb2, 0xab, 0x1b, 0xb6, 0x67, 0x82,
+ 0xdc, 0x62, 0x45, 0xe1, 0x91, 0x1a, 0x3e, 0x91, 0xe8, 0xbd, 0x02, 0x28,
+ 0x71, 0x48, 0x2f, 0x7b, 0x16, 0xd4, 0xb3, 0x3f, 0x35, 0x66, 0xad, 0xa1,
+ 0x17, 0xac, 0x4e, 0x45, 0x00, 0x46, 0x17, 0x95, 0xb8, 0x5e, 0x68, 0x3c,
+ 0x6b, 0x39, 0x07, 0x1f, 0x42, 0x79, 0x93, 0x44, 0xed, 0x37, 0x70, 0x6b,
+ 0x58, 0x29, 0xfe, 0x1f, 0xab, 0x8c, 0x94, 0x1d, 0x35, 0x90, 0xb5, 0xea,
+ 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
};
@@ -386,26 +388,29 @@ ConfigurationPanel::ConfigurationPanel( QWidget* parent, const char* name, bool
ConfigurationPanelLayout->addWidget( Menu, 0, 0 );
- layout18 = new QVBoxLayout( 0, 0, 6, "layout18");
+ layout17 = new QVBoxLayout( 0, 0, 6, "layout17");
TitleTab = new QLabel( this, "TitleTab" );
QFont TitleTab_font( TitleTab->font() );
TitleTab_font.setBold( TRUE );
TitleTab->setFont( TitleTab_font );
- layout18->addWidget( TitleTab );
+ layout17->addWidget( TitleTab );
line2 = new QFrame( this, "line2" );
line2->setFrameShape( QFrame::HLine );
line2->setFrameShadow( QFrame::Sunken );
line2->setFrameShape( QFrame::HLine );
- layout18->addWidget( line2 );
+ layout17->addWidget( line2 );
Tab_Signalisations = new QTabWidget( this, "Tab_Signalisations" );
SIPPage = new QWidget( Tab_Signalisations, "SIPPage" );
- groupBox1 = new QGroupBox( SIPPage, "groupBox1" );
- groupBox1->setGeometry( QRect( 20, 10, 380, 322 ) );
+ QWidget* privateLayoutWidget = new QWidget( SIPPage, "layout24" );
+ privateLayoutWidget->setGeometry( QRect( 16, 12, 401, 393 ) );
+ layout24 = new QVBoxLayout( privateLayoutWidget, 11, 6, "layout24");
+
+ groupBox1 = new QGroupBox( privateLayoutWidget, "groupBox1" );
groupBox1->setColumnLayout(0, Qt::Vertical );
groupBox1->layout()->setSpacing( 6 );
groupBox1->layout()->setMargin( 11 );
@@ -460,6 +465,24 @@ ConfigurationPanel::ConfigurationPanel( QWidget* parent, const char* name, bool
textLabel3_2 = new QLabel( groupBox1, "textLabel3_2" );
groupBox1Layout->addWidget( textLabel3_2, 8, 0 );
+ layout24->addWidget( groupBox1 );
+
+ layout23 = new QVBoxLayout( 0, 0, 6, "layout23");
+
+ layout19 = new QHBoxLayout( 0, 0, 6, "layout19");
+
+ autoregister = new QCheckBox( privateLayoutWidget, "autoregister" );
+ autoregister->setChecked( TRUE );
+ layout19->addWidget( autoregister );
+ spacer7 = new QSpacerItem( 201, 21, QSizePolicy::Expanding, QSizePolicy::Minimum );
+ layout19->addItem( spacer7 );
+
+ Register = new QPushButton( privateLayoutWidget, "Register" );
+ layout19->addWidget( Register );
+ layout23->addLayout( layout19 );
+ spacer9 = new QSpacerItem( 20, 21, QSizePolicy::Minimum, QSizePolicy::Expanding );
+ layout23->addItem( spacer9 );
+ layout24->addLayout( layout23 );
Tab_Signalisations->insertTab( SIPPage, QString("") );
STUNPage = new QWidget( Tab_Signalisations, "STUNPage" );
@@ -537,7 +560,7 @@ ConfigurationPanel::ConfigurationPanel( QWidget* parent, const char* name, bool
SettingsDTMFLayout->addLayout( layout11, 0, 0 );
Tab_Signalisations->insertTab( DTMFPage, QString("") );
- layout18->addWidget( Tab_Signalisations );
+ layout17->addWidget( Tab_Signalisations );
Tab_Audio = new QTabWidget( this, "Tab_Audio" );
@@ -556,6 +579,7 @@ ConfigurationPanel::ConfigurationPanel( QWidget* parent, const char* name, bool
DriverChoiceLayout->addWidget( ossButton );
alsaButton = new QRadioButton( DriverChoice, "alsaButton" );
+ alsaButton->setEnabled( TRUE );
DriverChoiceLayout->addWidget( alsaButton );
Tab_Audio->insertTab( DriversPage, QString("") );
@@ -615,7 +639,7 @@ ConfigurationPanel::ConfigurationPanel( QWidget* parent, const char* name, bool
ringsChoice = new QComboBox( FALSE, RingPage, "ringsChoice" );
ringsChoice->setGeometry( QRect( 20, 21, 150, 20 ) );
Tab_Audio->insertTab( RingPage, QString("") );
- layout18->addWidget( Tab_Audio );
+ layout17->addWidget( Tab_Audio );
Tab_Video = new QTabWidget( this, "Tab_Video" );
@@ -624,7 +648,7 @@ ConfigurationPanel::ConfigurationPanel( QWidget* parent, const char* name, bool
CodecsPage_2 = new QWidget( Tab_Video, "CodecsPage_2" );
Tab_Video->insertTab( CodecsPage_2, QString("") );
- layout18->addWidget( Tab_Video );
+ layout17->addWidget( Tab_Video );
Tab_Network = new QTabWidget( this, "Tab_Network" );
@@ -633,59 +657,55 @@ ConfigurationPanel::ConfigurationPanel( QWidget* parent, const char* name, bool
CodecsPage_3 = new QWidget( Tab_Network, "CodecsPage_3" );
Tab_Network->insertTab( CodecsPage_3, QString("") );
- layout18->addWidget( Tab_Network );
+ layout17->addWidget( Tab_Network );
Tab_Preferences = new QTabWidget( this, "Tab_Preferences" );
DriversPage_4 = new QWidget( Tab_Preferences, "DriversPage_4" );
- buttonApplySkin = new QPushButton( DriversPage_4, "buttonApplySkin" );
- buttonApplySkin->setGeometry( QRect( 136, 40, 80, 32 ) );
-
SkinChoice = new QComboBox( FALSE, DriversPage_4, "SkinChoice" );
SkinChoice->setGeometry( QRect( 12, 42, 110, 27 ) );
+
+ buttonApplySkin = new QPushButton( DriversPage_4, "buttonApplySkin" );
+ buttonApplySkin->setGeometry( QRect( 136, 40, 80, 32 ) );
Tab_Preferences->insertTab( DriversPage_4, QString("") );
TabPage = new QWidget( Tab_Preferences, "TabPage" );
- QWidget* privateLayoutWidget = new QWidget( TabPage, "layout17" );
- privateLayoutWidget->setGeometry( QRect( 10, 20, 220, 210 ) );
- layout17 = new QVBoxLayout( privateLayoutWidget, 11, 6, "layout17");
+ QWidget* privateLayoutWidget_2 = new QWidget( TabPage, "layout17" );
+ privateLayoutWidget_2->setGeometry( QRect( 10, 10, 262, 200 ) );
+ layout17_2 = new QVBoxLayout( privateLayoutWidget_2, 11, 6, "layout17_2");
layout16 = new QHBoxLayout( 0, 0, 6, "layout16");
- textLabel1_2 = new QLabel( privateLayoutWidget, "textLabel1_2" );
+ textLabel1_2 = new QLabel( privateLayoutWidget_2, "textLabel1_2" );
layout16->addWidget( textLabel1_2 );
- zoneToneChoice = new QComboBox( FALSE, privateLayoutWidget, "zoneToneChoice" );
+ zoneToneChoice = new QComboBox( FALSE, privateLayoutWidget_2, "zoneToneChoice" );
layout16->addWidget( zoneToneChoice );
spacer5 = new QSpacerItem( 31, 21, QSizePolicy::Expanding, QSizePolicy::Minimum );
layout16->addItem( spacer5 );
- layout17->addLayout( layout16 );
+ layout17_2->addLayout( layout16 );
- confirmationToQuit = new QCheckBox( privateLayoutWidget, "confirmationToQuit" );
+ confirmationToQuit = new QCheckBox( privateLayoutWidget_2, "confirmationToQuit" );
confirmationToQuit->setChecked( TRUE );
- layout17->addWidget( confirmationToQuit );
+ layout17_2->addWidget( confirmationToQuit );
- checkedTray = new QCheckBox( privateLayoutWidget, "checkedTray" );
- layout17->addWidget( checkedTray );
-
- autoregister = new QCheckBox( privateLayoutWidget, "autoregister" );
- autoregister->setChecked( TRUE );
- layout17->addWidget( autoregister );
+ checkedTray = new QCheckBox( privateLayoutWidget_2, "checkedTray" );
+ layout17_2->addWidget( checkedTray );
layout16_2 = new QHBoxLayout( 0, 0, 6, "layout16_2");
- textLabel1_6 = new QLabel( privateLayoutWidget, "textLabel1_6" );
+ textLabel1_6 = new QLabel( privateLayoutWidget_2, "textLabel1_6" );
layout16_2->addWidget( textLabel1_6 );
- voicemailNumber = new QLineEdit( privateLayoutWidget, "voicemailNumber" );
+ voicemailNumber = new QLineEdit( privateLayoutWidget_2, "voicemailNumber" );
layout16_2->addWidget( voicemailNumber );
spacer6_2 = new QSpacerItem( 61, 21, QSizePolicy::Expanding, QSizePolicy::Minimum );
layout16_2->addItem( spacer6_2 );
- layout17->addLayout( layout16_2 );
+ layout17_2->addLayout( layout16_2 );
Tab_Preferences->insertTab( TabPage, QString("") );
- layout18->addWidget( Tab_Preferences );
+ layout17->addWidget( Tab_Preferences );
Tab_About = new QTabWidget( this, "Tab_About" );
@@ -705,11 +725,11 @@ ConfigurationPanel::ConfigurationPanel( QWidget* parent, const char* name, bool
textLabel1 = new QLabel( CodecsPage_4, "textLabel1" );
textLabel1->setGeometry( QRect( 85, 126, 291, 131 ) );
Tab_About->insertTab( CodecsPage_4, QString("") );
- layout18->addWidget( Tab_About );
+ layout17->addWidget( Tab_About );
- ConfigurationPanelLayout->addLayout( layout18, 0, 1 );
+ ConfigurationPanelLayout->addLayout( layout17, 0, 1 );
languageChange();
- resize( QSize(560, 515).expandedTo(minimumSizeHint()) );
+ resize( QSize(560, 536).expandedTo(minimumSizeHint()) );
clearWState( WState_Polished );
// signals and slots connections
@@ -733,8 +753,7 @@ ConfigurationPanel::ConfigurationPanel( QWidget* parent, const char* name, bool
setTabOrder( SkinChoice, zoneToneChoice );
setTabOrder( zoneToneChoice, confirmationToQuit );
setTabOrder( confirmationToQuit, checkedTray );
- setTabOrder( checkedTray, autoregister );
- setTabOrder( autoregister, voicemailNumber );
+ setTabOrder( checkedTray, voicemailNumber );
setTabOrder( voicemailNumber, useStunNo );
setTabOrder( useStunNo, STUNserver );
setTabOrder( STUNserver, playTones );
@@ -786,6 +805,8 @@ void ConfigurationPanel::languageChange()
textLabel3_2_2->setText( tr( "SIP proxy" ) );
textLabel1_3->setText( tr( "Password" ) );
textLabel3_2->setText( tr( "Host part of SIP URL" ) );
+ autoregister->setText( tr( "Auto-register" ) );
+ Register->setText( tr( "Register" ) );
Tab_Signalisations->changeTab( SIPPage, tr( "SIP Authentication" ) );
groupBox3->setTitle( tr( "Settings " ) );
textLabel1_5->setText( tr( "STUN server (address:port)" ) );
@@ -847,7 +868,6 @@ void ConfigurationPanel::languageChange()
zoneToneChoice->insertItem( tr( "Japan" ) );
confirmationToQuit->setText( tr( "Show confirmation to quit." ) );
checkedTray->setText( tr( "Minimize to tray" ) );
- autoregister->setText( tr( "Auto-register" ) );
textLabel1_6->setText( tr( "Voicemail:" ) );
Tab_Preferences->changeTab( TabPage, tr( "Options" ) );
textLabel2_2->setText( tr( "<p align=\"center\">Copyright (C) 2004 Savoir-faire Linux inc.<br><br>\n"
diff --git a/src/configurationpanelui.h b/src/configurationpanelui.h
index 35e4dafb6b..d7a457b8f5 100644
--- a/src/configurationpanelui.h
+++ b/src/configurationpanelui.h
@@ -1,7 +1,7 @@
/****************************************************************************
** Form interface generated from reading ui file 'configurationpanel.ui'
**
-** Created: Wed Feb 2 17:25:45 2005
+** Created: Fri Feb 4 16:42:29 2005
** by: The User Interface Compiler ($Id$)
**
** WARNING! All changes made in this file will be lost!
@@ -27,9 +27,9 @@ class QTabWidget;
class QWidget;
class QGroupBox;
class QLineEdit;
+class QCheckBox;
class QButtonGroup;
class QRadioButton;
-class QCheckBox;
class QSpinBox;
class QComboBox;
@@ -63,6 +63,8 @@ public:
QLineEdit* password;
QLabel* textLabel1_3;
QLabel* textLabel3_2;
+ QCheckBox* autoregister;
+ QPushButton* Register;
QWidget* STUNPage;
QGroupBox* groupBox3;
QLabel* textLabel1_5;
@@ -104,14 +106,13 @@ public:
QWidget* CodecsPage_3;
QTabWidget* Tab_Preferences;
QWidget* DriversPage_4;
- QPushButton* buttonApplySkin;
QComboBox* SkinChoice;
+ QPushButton* buttonApplySkin;
QWidget* TabPage;
QLabel* textLabel1_2;
QComboBox* zoneToneChoice;
QCheckBox* confirmationToQuit;
QCheckBox* checkedTray;
- QCheckBox* autoregister;
QLabel* textLabel1_6;
QLineEdit* voicemailNumber;
QTabWidget* Tab_About;
@@ -132,8 +133,13 @@ protected:
QVBoxLayout* layout8;
QHBoxLayout* layout7;
QSpacerItem* Horizontal_Spacing2;
- QVBoxLayout* layout18;
+ QVBoxLayout* layout17;
+ QVBoxLayout* layout24;
QGridLayout* groupBox1Layout;
+ QVBoxLayout* layout23;
+ QSpacerItem* spacer9;
+ QHBoxLayout* layout19;
+ QSpacerItem* spacer7;
QVBoxLayout* stunButtonGroupLayout;
QGridLayout* SettingsDTMFLayout;
QVBoxLayout* layout11;
@@ -148,7 +154,7 @@ protected:
QHBoxLayout* layout11_2;
QVBoxLayout* layout9;
QVBoxLayout* layout10_2;
- QVBoxLayout* layout17;
+ QVBoxLayout* layout17_2;
QHBoxLayout* layout16;
QSpacerItem* spacer5;
QHBoxLayout* layout16_2;
diff --git a/src/global.h b/src/global.h
index d6082031a4..e2c9e953a8 100644
--- a/src/global.h
+++ b/src/global.h
@@ -25,7 +25,7 @@
#endif
#define VERSION "0.2"
-#define PROGNAME "SFLPhone"
+#define PROGNAME "sflphone"
#define SKINDIR "skins"
#define PIXDIR "pixmaps"
#define RINGDIR "rings"
@@ -39,6 +39,7 @@
#define PIXMAP_PREFERENCES "preferences.png"
#define PIXMAP_ABOUT "about.png"
+#define MONO 1
#define SAMPLING_RATE 8000
#define AMPLITUDE 8192
#define SIZEBUF 1024*1024
diff --git a/src/manager.cpp b/src/manager.cpp
index 4a93b7ce75..ee41e5d2f7 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -34,6 +34,11 @@
#include "../stund/stun.h"
#include "audiodriversoss.h"
+
+#ifdef ALSA
+#include "audiodriversalsa.h"
+#endif
+
#include "configuration.h"
#include "configurationtree.h"
#include "global.h"
@@ -85,8 +90,7 @@ Manager::Manager (QString *Dc = NULL) {
gui()->configuration();
}
- spkr_volume = 100;
- mic_volume = 100;
+ initVolume ();
}
Manager::~Manager (void) {
@@ -94,6 +98,9 @@ Manager::~Manager (void) {
delete sip;
delete audioRTP;
delete audiodriver;
+#ifdef ALSA
+ delete audiodriverReadAlsa;
+#endif
delete tone;
delete[] phLines;
}
@@ -133,16 +140,23 @@ Manager::createSettingsPath (void) {
*/
void
Manager::selectAudioDriver (void) {
- this->audiodriver = new AudioDriversOSS ();
-
- // TODO remplacer par ce qui suit qd ALSA sera implementé
-#if 0
if (Config::getb("Audio", "Drivers.driverOSS")) {
- this->audiodriver = new AudioDriversOSS ();
- } else if (Config::getb("Audio", "Drivers.driverALSA")) {
- this->audiodriver = new AudioDriversALSA ();
+ useAlsa = false;
+ this->audiodriver = new AudioDriversOSS (AudioDrivers::ReadWrite);
}
+ if (Config::getb("Audio", "Drivers.driverALSA")) {
+#ifdef ALSA
+ useAlsa = true;
+ this->audiodriver = new AudioDriversALSA (AudioDrivers::WriteOnly);
+ this->audiodriverReadAlsa = new AudioDriversALSA (AudioDrivers::ReadOnly);
#endif
+ }
+}
+
+void
+Manager::initVolume (void) {
+ spkr_volume = gui()->spkrVolVector->Y() - gui()->vol_spkr_y;
+ mic_volume = gui()->micVolVector->Y() - gui()->vol_mic_y;
}
/**
@@ -154,7 +168,7 @@ Manager::sip_init (void) {
sip->initRtpmapCodec ();
}
- if (Config::getb("Preferences", "Options.autoregister")) {
+ if (Config::getb("Signalisations", "SIP.autoregister")) {
// Register to the known proxies if available
if (Config::gets("Signalisations", "SIP.password").length() > 0) {
sip->setRegister ();
diff --git a/src/manager.h b/src/manager.h
index 85b79fcacd..6f145c69af 100644
--- a/src/manager.h
+++ b/src/manager.h
@@ -43,6 +43,10 @@ public:
PhoneLine *phLines[NUMBER_OF_LINES];
AudioRtp *audioRTP;
AudioDrivers *audiodriver;
+#ifdef ALSA
+ AudioDrivers *audiodriverReadAlsa;
+#endif
+ bool useAlsa;
ToneGenerator *tone;
QString *DirectCall; // from -p argv
bool mute;
@@ -104,7 +108,8 @@ private:
int mic_volume;
void sip_init (void);
- bool createSettingsPath (void);
+ void initVolume (void);
+ bool createSettingsPath (void);
};
diff --git a/src/phonebookui.cpp b/src/phonebookui.cpp
index 204596f471..3cb1d49fb5 100644
--- a/src/phonebookui.cpp
+++ b/src/phonebookui.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
** Form implementation generated from reading ui file 'phonebook.ui'
**
-** Created: Wed Feb 2 17:25:45 2005
+** Created: Fri Feb 4 16:42:28 2005
** by: The User Interface Compiler ($Id$)
**
** WARNING! All changes made in this file will be lost!
diff --git a/src/phonebookui.h b/src/phonebookui.h
index 98923ad0cd..44b49401e7 100644
--- a/src/phonebookui.h
+++ b/src/phonebookui.h
@@ -1,7 +1,7 @@
/****************************************************************************
** Form interface generated from reading ui file 'phonebook.ui'
**
-** Created: Wed Feb 2 17:25:44 2005
+** Created: Fri Feb 4 16:42:28 2005
** by: The User Interface Compiler ($Id$)
**
** WARNING! All changes made in this file will be lost!
diff --git a/src/qtGUImainwindow.cpp b/src/qtGUImainwindow.cpp
index cf088db544..6bc478074b 100644
--- a/src/qtGUImainwindow.cpp
+++ b/src/qtGUImainwindow.cpp
@@ -171,6 +171,8 @@ QtGUIMainWindow::QtGUIMainWindow (QWidget *parent, const char *name, WFlags f,
connect (panel->buttonSave, SIGNAL(clicked()), this, SLOT(save()));
// Connect to apply skin
connect (panel->buttonApplySkin, SIGNAL(clicked()), this,SLOT(applySkin()));
+ // Connect to register manually
+ connect (panel->Register, SIGNAL(clicked()), this, SLOT(registerSlot()));
}
/**
@@ -363,7 +365,7 @@ QtGUIMainWindow::initButtons (void) {
QToolTip::add(hangup_button, tr("Hangup"));
QToolTip::add(dial_button, tr("Dial"));
QToolTip::add(mute_button, tr("Mute"));
- QToolTip::add(dtmf_button, tr("Show DTMF keypad"));
+ QToolTip::add(dtmf_button, tr("Show DTMF keypad (Ctrl+D)"));
// Buttons position
phoneKey_msg->move (pt->getX(VOICEMAIL), pt->getY(VOICEMAIL));
@@ -800,13 +802,18 @@ QtGUIMainWindow::startCallTimer (int line) {
// Public slot implementations //
///////////////////////////////////////////////////////////////////////////////
void
-QtGUIMainWindow::volumeSpkrChanged(int val) {
- callmanager->spkrSoundVolume(val);
+QtGUIMainWindow::volumeSpkrChanged (int val) {
+ callmanager->spkrSoundVolume (val);
}
void
-QtGUIMainWindow::volumeMicChanged(int val) {
- callmanager->micSoundVolume(val);
+QtGUIMainWindow::volumeMicChanged (int val) {
+ callmanager->micSoundVolume (val);
+}
+
+void
+QtGUIMainWindow::registerSlot (void) {
+ callmanager->sip->setRegister();
}
/**
@@ -1113,7 +1120,6 @@ QtGUIMainWindow::pressedKeySlot (int id) {
buf, callmanager->getSpkrVolume());
pulselen = Config::get("Signalisations", "DTMF.pulseLength", 250);
callmanager->audiodriver->audio_buf.resize(pulselen * (OCTETS/1000));
-// a = callmanager->audiodriver->writeBuffer(buf, pulselen * (OCTETS/1000));
a = callmanager->audiodriver->writeBuffer();
if (a == 1) {
pressedKeySlot(id);
@@ -1279,6 +1285,12 @@ QtGUIMainWindow::keyPressEvent(QKeyEvent *e) {
return;
}
break;
+ case Qt::Key_D :
+ if (e->state() == Qt::ControlButton ) {
+ dtmfKeypad();
+ return;
+ }
+ break;
case Qt::Key_Space:
if (this->isInNumMode()) {
this->setMode(TEXT_MODE);
diff --git a/src/qtGUImainwindow.h b/src/qtGUImainwindow.h
index a5168b4a58..ecb2fa0b7d 100644
--- a/src/qtGUImainwindow.h
+++ b/src/qtGUImainwindow.h
@@ -124,6 +124,10 @@ public:
QPopupMenu *mypop;
MyTrayIcon *trayicon;
+ Vector *micVolVector;
+ Vector *spkrVolVector;
+ int vol_mic_x, vol_mic_y;
+ int vol_spkr_x, vol_spkr_y;
// Public functions
void setMainLCD (void);
@@ -187,7 +191,8 @@ public slots:
void volumeSpkrChanged (int);
void volumeMicChanged (int);
-
+ void registerSlot (void);
+
protected:
// To handle the key pressed event
void keyPressEvent (QKeyEvent *);
@@ -195,10 +200,7 @@ protected:
private:
// Configuration skin file
Point *pt;
- Vector *micVolVector;
- Vector *spkrVolVector;
- int vol_mic_x, vol_mic_y;
- int vol_spkr_x, vol_spkr_y;
+
// To construct ring rect pixmap
QImage imageRing;
diff --git a/src/sip.cpp b/src/sip.cpp
index c0e6d4d2c0..7c32f3bba8 100644
--- a/src/sip.cpp
+++ b/src/sip.cpp
@@ -502,7 +502,7 @@ SIP::outgoingInvite (void) {
qto = toHeader(string(callmanager->bufferTextRender().ascii()));
if (qto.find("@") == string::npos and
- Config::getb("Preferences", "Options.autoregister")) {
+ Config::getb("Signalisations", "SIP.autoregister")) {
qto = qto + "@" + Config::gets("Signalisations", "SIP.hostPart");
}
to = (char*)qto.data();
diff --git a/src/tonegenerator.cpp b/src/tonegenerator.cpp
index 1ffcc01547..47f1db70e7 100644
--- a/src/tonegenerator.cpp
+++ b/src/tonegenerator.cpp
@@ -51,7 +51,6 @@ ToneThread::run (void) {
while (mngr->tonezone) {
mngr->audiodriver->audio_buf.setData (buffer, mngr->getSpkrVolume());
mngr->audiodriver->writeBuffer();
- //mngr->audiodriver->writeBuffer(buf, totalbytes);
}
}
diff --git a/src/url_inputui.cpp b/src/url_inputui.cpp
index 97810d78a3..dde3a9bcb2 100644
--- a/src/url_inputui.cpp
+++ b/src/url_inputui.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
** Form implementation generated from reading ui file 'url_input.ui'
**
-** Created: Wed Feb 2 17:25:45 2005
+** Created: Fri Feb 4 16:42:29 2005
** by: The User Interface Compiler ($Id$)
**
** WARNING! All changes made in this file will be lost!
diff --git a/src/url_inputui.h b/src/url_inputui.h
index 71d724d102..aa24272414 100644
--- a/src/url_inputui.h
+++ b/src/url_inputui.h
@@ -1,7 +1,7 @@
/****************************************************************************
** Form interface generated from reading ui file 'url_input.ui'
**
-** Created: Wed Feb 2 17:25:45 2005
+** Created: Fri Feb 4 16:42:29 2005
** by: The User Interface Compiler ($Id$)
**
** WARNING! All changes made in this file will be lost!
--
GitLab