diff --git a/README.md b/README.md
index f8ac7b66760bdc317dfd940d3aff88fada9b3be0..774bc25fe5a1bd66ee384de1131e706a14a6cd91 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,14 @@
-# Windows client for Ring
+# Windows client for Jani
-For more information about the ring project, see the following:
+For more information about the jami project, see the following:
-- Main website: https://ring.cx/
-- Bug tracker: https://tuleap.ring.cx/projects/ring/
+- Main website: https://jami.net/
+- Bug tracker: https://git.jami.net/
- Repositories: https://gerrit-ring.savoirfairelinux.com
## Requirements
-- Ring client library and Ring daemon
+- Jami client library and Jami daemon
- Mingw-w64 build environment
- Qt5 (we link against Qt5Core, Qt5Widgets, Qt5Gui) built with Mingw
- Qt5 Svg, Qt5 ImageFormats & Qt5 WinExtras built with Mingw
@@ -27,11 +27,11 @@ mkdir build && cd build
export QTDIR=<path to mingw qt> (e.g. /usr/[i686 | x86_64]-w64-mingw32/lib/qt)
git submodule init && git submodule update
cd libqrencode
-./autogen.sh && ./configure --host=[i686 | x86_64]-w64-mingw32 --prefix=<Install dir of Ring and LRC>
+./autogen.sh && ./configure --host=[i686 | x86_64]-w64-mingw32 --prefix=<Install dir of Jami and LRC>
make
make install
cd ..
-qmake ../RingWinClient.pro -r -spec win32-g++ RING=<Install dir of Ring and LRC> [BUILD=Debug]
+qmake ../RingWinClient.pro -r -spec win32-g++ RING=<Install dir of Jami and LRC> [BUILD=Debug]
make
make install
```
@@ -45,7 +45,7 @@ If you want to enable auto-update
```
cd winsparkle
mkdir build && cd build
- cmake -DCMAKE_TOOLCHAIN_FILE=<LRC Directory>/cmake/winBuild.cmake -DCMAKE_INSTALL_PREFIX=Install dir of Ring and LRC> ../cmake",
+ cmake -DCMAKE_TOOLCHAIN_FILE=<LRC Directory>/cmake/winBuild.cmake -DCMAKE_INSTALL_PREFIX=Install dir of Jami and LRC> ../cmake",
make
make install
```
diff --git a/RingWinClient.pro b/RingWinClient.pro
index c4a06d832aa734cf46a760af5c65faa51066b342..ad4c510984106cc6c5de6cca6220ab8ac6ea7aed 100644
--- a/RingWinClient.pro
+++ b/RingWinClient.pro
@@ -26,7 +26,7 @@ DEFINES += RING_CLIENT_BUILD_DATE=\"\\\"$$RING_CLIENT_BUILD_DATE\\\"\"
DEFINES += LRC_IMPORT
BUILD=$${BUILD}
-TARGET = Ring
+TARGET = Jami
TEMPLATE = app
QMAKE_CXXFLAGS += -std=c++14
@@ -258,7 +258,7 @@ win32 {
RINGTONES.files = $${RING}/share/ring/ringtones
RINGTONES.path = $$OUT_PWD/release
- PACKAGING.files = ring.nsi images/ring.ico
+ PACKAGING.files = ring.nsi images/jami.ico
PACKAGING.path = $$OUT_PWD/release
LICENSE.files = License.rtf
diff --git a/aboutdialog.ui b/aboutdialog.ui
index cad909eb23256ba3296d73091a1c127ae2283aff..98cf0fecfe7567d37cfc780c81977b64ffac618d 100644
--- a/aboutdialog.ui
+++ b/aboutdialog.ui
@@ -512,7 +512,7 @@
<string/>
</property>
<property name="pixmap">
- <pixmap resource="ressources.qrc">:/images/logo-ring-standard-coul.png</pixmap>
+ <pixmap resource="ressources.qrc">:/images/logo-jami-standard-coul.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -560,8 +560,8 @@
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
- <string>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</string>
+ <string>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
@@ -585,7 +585,7 @@ Ring is a secured and distributed communication software.</string>
<cursorShape>PointingHandCursor</cursorShape>
</property>
<property name="text">
- <string notr="true"><html><head/><body><p><a href="www.ring.cx"><span style=" font-size:9pt; text-decoration: underline; color:#0000ff;">www.ring.cx</span></a></p></body></html></string>
+ <string notr="true"><html><head/><body><p><a href="https://jami.net"><span style=" font-size:9pt; text-decoration: underline; color:#0000ff;">jami.net</span></a></p></body></html></string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
@@ -622,7 +622,7 @@ Ring is a secured and distributed communication software.</string>
</font>
</property>
<property name="text">
- <string notr="true"><html><head/><body><p>© 2015-2017 Savoir-faire Linux</p></body></html></string>
+ <string notr="true"><html><head/><body><p>© 2015-2019 Savoir-faire Linux</p></body></html></string>
</property>
<property name="margin">
<number>5</number>
diff --git a/accountdetails.ui b/accountdetails.ui
new file mode 100644
index 0000000000000000000000000000000000000000..5f13eb79bd055f958704cc8fbf32569badd1a22f
--- /dev/null
+++ b/accountdetails.ui
@@ -0,0 +1,2954 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AccountDetails</class>
+ <widget class="QWidget" name="AccountDetails">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>847</width>
+ <height>760</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="windowTitle">
+ <string>Settings</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QTabWidget" name="tabWidget">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="autoFillBackground">
+ <bool>true</bool>
+ </property>
+ <property name="currentIndex">
+ <number>0</number>
+ </property>
+ <widget class="QWidget" name="gen_tab">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <attribute name="title">
+ <string>General</string>
+ </attribute>
+ <attribute name="toolTip">
+ <string>General account info configuration</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QScrollArea" name="scrollArea_2">
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Sunken</enum>
+ </property>
+ <property name="widgetResizable">
+ <bool>true</bool>
+ </property>
+ <widget class="QWidget" name="scrollAreaWidgetContents_2">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>829</width>
+ <height>912</height>
+ </rect>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_12">
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_5">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QLabel" name="accountLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>12</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Account</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="Line" name="line_4">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QFormLayout" name="formLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="aliasLabel">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Displayed name</string>
+ </property>
+ <property name="buddy">
+ <cstring>lrcfg_alias</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="lrcfg_alias">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Displayed alias input</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="typeLabel">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Type</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLabel" name="typeValueLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="paramLabel">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>12</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Parameters</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QFormLayout" name="formLayout_2">
+ <item row="0" column="0">
+ <widget class="QLabel" name="hostnameLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Hostname</string>
+ </property>
+ <property name="buddy">
+ <cstring>lrcfg_hostname</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="lrcfg_hostname">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Hostname URL for DHT bootstrap or SIP</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="registeredNameLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Public username</string>
+ </property>
+ <property name="buddy">
+ <cstring>lrcfg_registeredName</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_10">
+ <item>
+ <widget class="QLineEdit" name="lrcfg_registeredName">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Public registered username</string>
+ </property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="registerButton">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>Register username on blockchain button</string>
+ </property>
+ <property name="text">
+ <string>Register on blockchain</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="nameServiceURLLabel">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Name service URL</string>
+ </property>
+ <property name="buddy">
+ <cstring>lrcfg_nameServiceURL</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QLineEdit" name="lrcfg_nameServiceURL">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Nameservice URL input</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="usernameLabel">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Username</string>
+ </property>
+ <property name="buddy">
+ <cstring>lrcfg_username</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QLineEdit" name="lrcfg_username">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>SIP username input</string>
+ </property>
+ </widget>
+ </item>
+ <item row="12" column="0">
+ <widget class="QLabel" name="passwordLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Password</string>
+ </property>
+ <property name="buddy">
+ <cstring>lrcfg_password</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="12" column="1">
+ <widget class="QLineEdit" name="lrcfg_password">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>SIP password input</string>
+ </property>
+ <property name="echoMode">
+ <enum>QLineEdit::PasswordEchoOnEdit</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="13" column="0">
+ <widget class="QLabel" name="proxyLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Proxy</string>
+ </property>
+ <property name="buddy">
+ <cstring>lrcfg_proxy</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="13" column="1">
+ <widget class="QLineEdit" name="lrcfg_proxy">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>SIP proxy URL input</string>
+ </property>
+ </widget>
+ </item>
+ <item row="14" column="0">
+ <widget class="QLabel" name="voicemailLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Voicemail number</string>
+ </property>
+ <property name="buddy">
+ <cstring>lrcfg_mailbox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="14" column="1">
+ <widget class="QLineEdit" name="lrcfg_mailbox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>SIP voicemail number</string>
+ </property>
+ </widget>
+ </item>
+ <item row="15" column="0">
+ <widget class="QCheckBox" name="lrcfg_autoAnswer">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="toolTip">
+ <string>Autoanswer call checkbox</string>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Auto-answer calls</string>
+ </property>
+ </widget>
+ </item>
+ <item row="16" column="0">
+ <widget class="QCheckBox" name="lrcfg_upnpEnabled">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="toolTip">
+ <string>UPnP enabled checkbox</string>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>UPnP enabled</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QLineEdit" name="oldPasswordLineEdit">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Old password input line</string>
+ </property>
+ <property name="inputMask">
+ <string/>
+ </property>
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
+ </property>
+ <property name="placeholderText">
+ <string>Input old password</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="oldPasswordLabel">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Old Password</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <widget class="QLineEdit" name="newPasswordLineEdit">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>New password text input</string>
+ </property>
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
+ </property>
+ <property name="placeholderText">
+ <string>Input new password</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="newPasswordLabel">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ <weight>50</weight>
+ <bold>false</bold>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>New password</string>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="1">
+ <widget class="QLineEdit" name="newPassConfirmationLineEdit">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Password confirmation text input</string>
+ </property>
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
+ </property>
+ <property name="placeholderText">
+ <string>Input confirmation </string>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="0">
+ <widget class="QLabel" name="newPassConfirmationLabel">
+ <property name="font">
+ <font>
+ <family>Cantarell</family>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>New pass confirmation</string>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="changePassBtn">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>500</width>
+ <height>100</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Change password</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="confirmChangeBtn">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>500</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Ok</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="cancelChangeBtn">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Cancel password change button</string>
+ </property>
+ <property name="text">
+ <string>Cancel</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="8" column="1">
+ <widget class="QLabel" name="changePassInfo">
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Changing password ...</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_27">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>12</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Account Settings</string>
+ </property>
+ <property name="buddy">
+ <cstring>lrcfg_allowIncomingFromUnknown</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_6">
+ <item>
+ <widget class="QCheckBox" name="lrcfg_allowIncomingFromUnknown">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="toolTip">
+ <string>Allow call from unknown checkbox</string>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Allow Call From Unknown</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="lrcfg_allowIncomingFromHistory">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="toolTip">
+ <string>Allow Call From History checkbox</string>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Allow Call From History</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="lrcfg_allowIncomingFromContact">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="toolTip">
+ <string>Allow Call From Contact checkbox</string>
+ </property>
+ <property name="text">
+ <string>Allow Call From Contact</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_28">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>12</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Ringtone Selection</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="playButton">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>86</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Play ringtone button</string>
+ </property>
+ <property name="text">
+ <string>Play</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="ringtonesBox">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>ringtone file selector</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_6">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="audio_codec_tab">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <attribute name="title">
+ <string>Audio/Video</string>
+ </attribute>
+ <attribute name="toolTip">
+ <string>Audio/video codecs preferences configuration</string>
+ </attribute>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="1" column="0">
+ <widget class="QListView" name="audioCodecView">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="focusPolicy">
+ <enum>Qt::NoFocus</enum>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::LeftToRight</enum>
+ </property>
+ <property name="selectionBehavior">
+ <enum>QAbstractItemView::SelectRows</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="3">
+ <widget class="QListView" name="videoCodecView">
+ <property name="focusPolicy">
+ <enum>Qt::NoFocus</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="4">
+ <layout class="QVBoxLayout" name="verticalLayout_14">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="upVideoButton">
+ <property name="minimumSize">
+ <size>
+ <width>30</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>30</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="ressources.qrc">
+ <normaloff>:/images/icons/ic_arrow_drop_up_black_18dp_2x.png</normaloff>:/images/icons/ic_arrow_drop_up_black_18dp_2x.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>18</width>
+ <height>18</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="downVideoButton">
+ <property name="minimumSize">
+ <size>
+ <width>30</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>30</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="ressources.qrc">
+ <normaloff>:/images/icons/ic_arrow_drop_down_black_18dp_2x.png</normaloff>:/images/icons/ic_arrow_drop_down_black_18dp_2x.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>18</width>
+ <height>18</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_4">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::MinimumExpanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="2">
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="upAudioButton">
+ <property name="minimumSize">
+ <size>
+ <width>30</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>30</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="ressources.qrc">
+ <normaloff>:/images/icons/ic_arrow_drop_up_black_18dp_2x.png</normaloff>:/images/icons/ic_arrow_drop_up_black_18dp_2x.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>18</width>
+ <height>18</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="downAudioButton">
+ <property name="minimumSize">
+ <size>
+ <width>30</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>30</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="ressources.qrc">
+ <normaloff>:/images/icons/ic_arrow_drop_down_black_18dp_2x.png</normaloff>:/images/icons/ic_arrow_drop_down_black_18dp_2x.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>18</width>
+ <height>18</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::MinimumExpanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_29">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>12</pointsize>
+ <weight>50</weight>
+ <bold>false</bold>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Audio codecs</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="3">
+ <widget class="QLabel" name="label_30">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>16777215</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>12</pointsize>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Video codecs</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="advancedTab">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <attribute name="title">
+ <string>Advanced</string>
+ </attribute>
+ <attribute name="toolTip">
+ <string>Account advanced configuration</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_7">
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QScrollArea" name="scrollArea">
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="widgetResizable">
+ <bool>true</bool>
+ </property>
+ <widget class="QWidget" name="scrollAreaWidgetContents">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>811</width>
+ <height>956</height>
+ </rect>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_11">
+ <item>
+ <widget class="QLabel" name="label_2">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>12</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Registration</string>
+ </property>
+ <property name="buddy">
+ <cstring>lrcfg_registrationExpire</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QFormLayout" name="formLayout_3">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_9">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Registration expire timeout (seconds):</string>
+ </property>
+ <property name="buddy">
+ <cstring>lrcfg_registrationExpire</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="lrcfg_registrationExpire">
+ <property name="maximumSize">
+ <size>
+ <width>150</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Registration timeout selector spinbox</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_3">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>12</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Network Interface</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line_8">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QFormLayout" name="formLayout_4">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_10">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>Local Port:</string>
+ </property>
+ <property name="buddy">
+ <cstring>lrcfg_localPort</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_7">
+ <item>
+ <widget class="QSpinBox" name="lrcfg_localPort">
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>local port selector spinbox</string>
+ </property>
+ <property name="maximum">
+ <number>65535</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_4">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_10">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_4">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>12</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Published Address</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line_9">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_8">
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QRadioButton" name="puslishedSameAsLocalRadio">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="toolTip">
+ <string>same as local radio button</string>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Same as local parameters</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">publishGroup</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="customPublishedRadio">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="toolTip">
+ <string>personalise address and ports radio button</string>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Set published address and port:</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">publishGroup</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="publishAdressLayout">
+ <property name="leftMargin">
+ <number>30</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="label_12">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Address</string>
+ </property>
+ <property name="buddy">
+ <cstring>lrcfg_publishedAddress</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lrcfg_publishedAddress">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>200</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>ip address text input</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_11">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Port</string>
+ </property>
+ <property name="buddy">
+ <cstring>lrcfg_publishedPort</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="lrcfg_publishedPort">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>port selector spinbox</string>
+ </property>
+ <property name="maximum">
+ <number>65535</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_5">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_8">
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QCheckBox" name="lrcfg_sipStunEnabled">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="toolTip">
+ <string>use STUN checkbox</string>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Use STUN</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lrcfg_sipStunServer">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="placeholderText">
+ <string>Server URL</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QFormLayout" name="formLayout_6">
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="lrcfg_turnEnabled">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="toolTip">
+ <string>use TURN checkbox</string>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Use TURN</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="lrcfg_turnServer">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>TURN server URL input</string>
+ </property>
+ <property name="placeholderText">
+ <string>Server URL</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="lrcfg_turnServerUsername">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>TURN server username input</string>
+ </property>
+ <property name="placeholderText">
+ <string>Username</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QLineEdit" name="lrcfg_turnServerPassword">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>TURN server password input</string>
+ </property>
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
+ </property>
+ <property name="placeholderText">
+ <string>Password</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QLineEdit" name="lrcfg_turnServerRealm">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>TURN server Realm input</string>
+ </property>
+ <property name="placeholderText">
+ <string>Realm</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_11">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_5">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>12</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>SDP Session Negotiation (ICE Fallback)</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line_10">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_6">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_12">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_8">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>12</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Audio RTP Port Range</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line_11">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <property name="leftMargin">
+ <number>30</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="label_13">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Min</string>
+ </property>
+ <property name="buddy">
+ <cstring>lrcfg_audioPortMin</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="lrcfg_audioPortMin">
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Lower boundary for audio RTP port range selector</string>
+ </property>
+ <property name="maximum">
+ <number>65535</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_14">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Max</string>
+ </property>
+ <property name="buddy">
+ <cstring>lrcfg_audioPortMax</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="lrcfg_audioPortMax">
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>higher boundary for audio RTP port range selector</string>
+ </property>
+ <property name="maximum">
+ <number>65535</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::MinimumExpanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_13">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_7">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>12</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Video RTP Port Range</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line_12">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <property name="leftMargin">
+ <number>30</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="label_15">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Min</string>
+ </property>
+ <property name="buddy">
+ <cstring>lrcfg_videoPortMin</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="lrcfg_videoPortMin">
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Lower boundary for audio RTP port range selector</string>
+ </property>
+ <property name="maximum">
+ <number>65535</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_16">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Max</string>
+ </property>
+ <property name="buddy">
+ <cstring>lrcfg_videoPortMax</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="lrcfg_videoPortMax">
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>higher boundary for audio RTP port range selector</string>
+ </property>
+ <property name="maximum">
+ <number>65535</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::MinimumExpanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_14">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="securityTab">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <attribute name="title">
+ <string>Security</string>
+ </attribute>
+ <attribute name="toolTip">
+ <string>Account security configuration</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_9">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QScrollArea" name="scrollArea_3">
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="widgetResizable">
+ <bool>true</bool>
+ </property>
+ <widget class="QWidget" name="scrollAreaWidgetContents_3">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>829</width>
+ <height>760</height>
+ </rect>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_13">
+ <item>
+ <widget class="QWidget" name="accountEncry" native="true">
+ <layout class="QVBoxLayout" name="verticalLayout_10">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>20</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QWidget" name="negoEncry_2" native="true">
+ <layout class="QFormLayout" name="formLayout_5">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_20">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>CA certificate</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="RingButton" name="lrcfg_tlsCaListCertificate">
+ <property name="minimumSize">
+ <size>
+ <width>500</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>500</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="focusPolicy">
+ <enum>Qt::WheelFocus</enum>
+ </property>
+ <property name="toolTip">
+ <string>Certificate authaurity certificate selector</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_21">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>User certificate</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="RingButton" name="lrcfg_tlsCertificate">
+ <property name="minimumSize">
+ <size>
+ <width>500</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>500</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>User certificate selector</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_22">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Private key</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="label_23">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Private key password</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QLineEdit" name="lrcfg_tlsPassword">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>500</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>500</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>private key password input</string>
+ </property>
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="RingButton" name="lrcfg_tlsPrivateKeyCertificate">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>500</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>User private key selector</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="srtpEnabledChkBox">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="toolTip">
+ <string>Encrypt media stream (SRTP) checkbox</string>
+ </property>
+ <property name="text">
+ <string>Media Stream Encryption (SRTP)</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="defaultCipherCheckBox">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="toolTip">
+ <string>use default ciphers checkbox</string>
+ </property>
+ <property name="text">
+ <string>Use default ciphers</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QListView" name="cipherListView">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>640</width>
+ <height>480</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>640</width>
+ <height>480</height>
+ </size>
+ </property>
+ <property name="focusPolicy">
+ <enum>Qt::NoFocus</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_5">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="devicesTab">
+ <attribute name="title">
+ <string>Devices</string>
+ </attribute>
+ <attribute name="toolTip">
+ <string>Account devices management</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_15">
+ <item>
+ <widget class="QStackedWidget" name="devicesStackedWidget">
+ <property name="currentIndex">
+ <number>0</number>
+ </property>
+ <widget class="QWidget" name="devicesListPage">
+ <layout class="QVBoxLayout" name="verticalLayout_16">
+ <item>
+ <widget class="QTableView" name="tableView">
+ <property name="sizeAdjustPolicy">
+ <enum>QAbstractScrollArea::AdjustToContents</enum>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ <attribute name="horizontalHeaderCascadingSectionResizes">
+ <bool>false</bool>
+ </attribute>
+ <attribute name="horizontalHeaderDefaultSectionSize">
+ <number>255</number>
+ </attribute>
+ <attribute name="horizontalHeaderHighlightSections">
+ <bool>false</bool>
+ </attribute>
+ <attribute name="horizontalHeaderStretchLastSection">
+ <bool>false</bool>
+ </attribute>
+ <attribute name="verticalHeaderVisible">
+ <bool>false</bool>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="addDeviceButton">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Add device button</string>
+ </property>
+ <property name="text">
+ <string>Add device</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="passwordAskingPage">
+ <layout class="QVBoxLayout" name="verticalLayout_17">
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_18">
+ <property name="lineWidth">
+ <number>1</number>
+ </property>
+ <property name="text">
+ <string>To add a new device to your Jami account, you export your account on the network. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="passwordArchiveEdit">
+ <property name="toolTip">
+ <string>Password text input</string>
+ </property>
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
+ </property>
+ <property name="placeholderText">
+ <string>Password (required)</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <spacer name="horizontalSpacer_8">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="cancelAddButton">
+ <property name="minimumSize">
+ <size>
+ <width>80</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Cancel account export for linking button</string>
+ </property>
+ <property name="text">
+ <string>Cancel</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_7">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="exportOnRingButton">
+ <property name="minimumSize">
+ <size>
+ <width>150</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Validate export on DHT for device linking button</string>
+ </property>
+ <property name="text">
+ <string>Export on the network</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_9">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_9">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="pinDisplayPage">
+ <layout class="QVBoxLayout" name="verticalLayout_18">
+ <item>
+ <spacer name="verticalSpacer_15">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item alignment="Qt::AlignHCenter">
+ <widget class="QLabel" name="label_24">
+ <property name="text">
+ <string>Your generated pin:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="pinLabel">
+ <property name="font">
+ <font>
+ <pointsize>30</pointsize>
+ <stylestrategy>PreferAntialias</stylestrategy>
+ </font>
+ </property>
+ <property name="toolTip">
+ <string>Generated PIN for linking</string>
+ </property>
+ <property name="text">
+ <string>PIN</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item alignment="Qt::AlignHCenter">
+ <widget class="QLabel" name="label_25">
+ <property name="text">
+ <string>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</string>
+ </property>
+ </widget>
+ </item>
+ <item alignment="Qt::AlignHCenter">
+ <widget class="QPushButton" name="exportEndedOkButton">
+ <property name="minimumSize">
+ <size>
+ <width>40</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>200</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Accept PIN generation and quit button</string>
+ </property>
+ <property name="text">
+ <string>OK</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_16">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="bannedContactsTab">
+ <attribute name="title">
+ <string>Banned Contacts</string>
+ </attribute>
+ <attribute name="toolTip">
+ <string>Account banned contacts management tab</string>
+ </attribute>
+ <widget class="BannedContactsWidget" name="bannedContactsWidget" native="true">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>-1</y>
+ <width>841</width>
+ <height>691</height>
+ </rect>
+ </property>
+ </widget>
+ </widget>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <customwidgets>
+ <customwidget>
+ <class>RingButton</class>
+ <extends>QPushButton</extends>
+ <header>ringbutton.h</header>
+ </customwidget>
+ <customwidget>
+ <class>BannedContactsWidget</class>
+ <extends>QWidget</extends>
+ <header location="global">bannedcontactswidget.h</header>
+ <container>1</container>
+ </customwidget>
+ </customwidgets>
+ <resources>
+ <include location="ressources.qrc"/>
+ </resources>
+ <connections>
+ <connection>
+ <sender>lrcfg_sipStunEnabled</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>lrcfg_sipStunServer</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>33</x>
+ <y>355</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>252</x>
+ <y>355</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>customPublishedRadio</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>lrcfg_publishedPort</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>386</x>
+ <y>277</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>390</x>
+ <y>305</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>lrcfg_turnEnabled</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>lrcfg_turnServer</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>71</x>
+ <y>396</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>196</x>
+ <y>393</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>customPublishedRadio</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>lrcfg_publishedAddress</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>120</x>
+ <y>277</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>131</x>
+ <y>311</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>lrcfg_turnEnabled</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>lrcfg_turnServerUsername</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>90</x>
+ <y>380</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>187</x>
+ <y>432</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>lrcfg_turnEnabled</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>lrcfg_turnServerPassword</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>51</x>
+ <y>375</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>164</x>
+ <y>468</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>lrcfg_turnEnabled</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>lrcfg_turnServerRealm</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>39</x>
+ <y>378</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>170</x>
+ <y>503</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>lrcfg_allowIncomingFromUnknown</sender>
+ <signal>clicked(bool)</signal>
+ <receiver>lrcfg_allowIncomingFromHistory</receiver>
+ <slot>setDisabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>169</x>
+ <y>584</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>171</x>
+ <y>616</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>lrcfg_allowIncomingFromUnknown</sender>
+ <signal>clicked(bool)</signal>
+ <receiver>lrcfg_allowIncomingFromContact</receiver>
+ <slot>setDisabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>115</x>
+ <y>584</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>117</x>
+ <y>648</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+ <buttongroups>
+ <buttongroup name="publishGroup"/>
+ </buttongroups>
+</ui>
diff --git a/build-client.bat b/build-client.bat
index 6b293ae895f33ba54e7ebd1b3268893a8d0fa07a..9c206c0e2f976a39aec60f2aa826cf908bedb433 100644
--- a/build-client.bat
+++ b/build-client.bat
@@ -1,4 +1,4 @@
-:: Ring - native Windows client project build script
+:: Jami - native Windows client project build script
@echo off
setlocal
diff --git a/callwidget.cpp b/callwidget.cpp
index e192ecc7e392b7f2cdc97172d09c5c9ba6d899dc..0bf4c095caf39bee3ba3d075f24fa74b9629529a 100644
--- a/callwidget.cpp
+++ b/callwidget.cpp
@@ -65,7 +65,7 @@ CallWidget::CallWidget(QWidget* parent) :
QApplication::setEffectEnabled(Qt::UI_AnimateCombo, false);
- QPixmap logo(":/images/logo-ring-standard-coul.png");
+ QPixmap logo(":/images/logo-jami-standard-coul.png");
ui->ringLogo->setPixmap(logo.scaledToHeight(100, Qt::SmoothTransformation));
ui->ringLogo->setAlignment(Qt::AlignHCenter);
@@ -820,7 +820,7 @@ CallWidget::on_qrButton_toggled(bool checked)
void
CallWidget::on_shareButton_clicked()
{
- Utils::InvokeMailto(tr("Contact me on Ring"), tr("My RingId is : ") + ui->ringIdLabel->text());
+ Utils::InvokeMailto(tr("Contact me on Jami"), tr("My Id is : ") + ui->ringIdLabel->text());
}
void
diff --git a/callwidget.ui b/callwidget.ui
index 02dbdcf0c73df031f9cc3258f0632694768b68eb..36c4cdaa45709c4f188570123bf266f859b93cbd 100644
--- a/callwidget.ui
+++ b/callwidget.ui
@@ -231,7 +231,7 @@
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="placeholderText">
- <string>Search contacts or enter ring ID</string>
+ <string>Search contacts or enter ID</string>
</property>
<property name="clearButtonEnabled">
<bool>true</bool>
@@ -538,7 +538,7 @@
<string notr="true"/>
</property>
<property name="text">
- <string>Ring is free software for universal communication which respects the freedoms and privacy of its users.</string>
+ <string>Jami is free software for universal communication which respects the freedoms and privacy of its users.</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
@@ -577,7 +577,7 @@
</property>
<property name="text">
<string>
- This is your RingID.
+ This is your ID.
Copy and share it with your friends!
</string>
</property>
diff --git a/copy-runtime-files.ps1 b/copy-runtime-files.ps1
index 0aad212dc5245aa6c736bdc715ae164539c0e73b..b3fccad11f0564eefd9b6b8b12d1e1eab30dbf1a 100644
--- a/copy-runtime-files.ps1
+++ b/copy-runtime-files.ps1
@@ -33,7 +33,7 @@ $FilesToCopy = @(
"$daemonDir\contrib\build\restbed\dependency\openssl\out32dll\ssleay32.dll",
"$ClientDir\winsparkle\x64\Release\WinSparkle.dll",
"$ClientDir\ring.nsi",
- "$ClientDir\images\ring.ico"
+ "$ClientDir\images\jami.ico"
"$ClientDir\License.rtf"
)
foreach ($i in $FilesToCopy) {
diff --git a/ico.rc b/ico.rc
index c6791daa7fa5213d2e4bd32b155f180a9c231eed..ad48aa5125c717fa317d409f43365bdd3a3e0b76 100644
--- a/ico.rc
+++ b/ico.rc
@@ -1 +1 @@
-IDI_ICON1 ICON DISCARDABLE "images/ring.ico"
+IDI_ICON1 ICON DISCARDABLE "images/jami.ico"
diff --git a/images/jami.ico b/images/jami.ico
new file mode 100644
index 0000000000000000000000000000000000000000..468e452e44e4a712930decc791450e1ac0b0236e
Binary files /dev/null and b/images/jami.ico differ
diff --git a/images/jami.png b/images/jami.png
new file mode 100644
index 0000000000000000000000000000000000000000..aef46d27351a67bf8b10d63bc759c6a85387d41c
Binary files /dev/null and b/images/jami.png differ
diff --git a/images/logo-jami-standard-coul.png b/images/logo-jami-standard-coul.png
new file mode 100644
index 0000000000000000000000000000000000000000..0352b55ba88fc05d8b9c599262a3d8caad8aa9d3
Binary files /dev/null and b/images/logo-jami-standard-coul.png differ
diff --git a/images/logo-ring-standard-coul.png b/images/logo-ring-standard-coul.png
deleted file mode 100755
index 9e2e583dc0ebbd5d651b51edc1d611d5b6c82b1f..0000000000000000000000000000000000000000
Binary files a/images/logo-ring-standard-coul.png and /dev/null differ
diff --git a/images/ring.ico b/images/ring.ico
deleted file mode 100644
index 975ad413a9195b131fa17827818898ff3a75aa6b..0000000000000000000000000000000000000000
Binary files a/images/ring.ico and /dev/null differ
diff --git a/images/ring.png b/images/ring.png
deleted file mode 100644
index 3e14e2c3fa1edae376d631a8c3bce75a85e3bc57..0000000000000000000000000000000000000000
Binary files a/images/ring.png and /dev/null differ
diff --git a/linkdevwidget.ui b/linkdevwidget.ui
index 20be445d38a0021e1777e9be54873aa671985234..3c6f0d47fc1587745261706e83e67f81ee5a6e57 100644
--- a/linkdevwidget.ui
+++ b/linkdevwidget.ui
@@ -320,7 +320,7 @@
<item>
<widget class="QLabel" name="label_3">
<property name="text">
- <string>Exporting account on the ring</string>
+ <string>Exporting account on the network</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
diff --git a/main.cpp b/main.cpp
index 118fea425d8fcf5e52b55a2b05e25a868b6ea09a..0003b06191be41e7ed0ca02135bc9d83e924b3e3 100644
--- a/main.cpp
+++ b/main.cpp
@@ -86,8 +86,8 @@ main(int argc, char *argv[])
QApplication a(argc, argv);
- QCoreApplication::setOrganizationDomain("ring.cx");
- QCoreApplication::setApplicationName("Ring");
+ QCoreApplication::setOrganizationDomain("jami.net");
+ QCoreApplication::setApplicationName("Jami");
GlobalInstances::setPixmapManipulator(std::unique_ptr<PixbufManipulator>(new PixbufManipulator()));
diff --git a/mainwindow.cpp b/mainwindow.cpp
index f7ee38b33a62653e9c36f9f6403a67929f1ec43e..434b98b71e094b86697db6717b754adfada82de3 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -71,7 +71,7 @@ MainWindow::MainWindow(QWidget* parent) :
}
);
- QIcon icon(":images/ring.png");
+ QIcon icon(":images/jami.png");
this->setWindowIcon(icon);
@@ -109,8 +109,8 @@ MainWindow::MainWindow(QWidget* parent) :
readSettingsFromRegistry();
- win_sparkle_set_appcast_url("http://dl.ring.cx/windows/winsparkle-ring.xml");
- win_sparkle_set_app_details(L"Savoir-faire Linux", L"Ring", QString(VERSION_STRING).toStdWString().c_str());
+ win_sparkle_set_appcast_url("http://dl.jami.net/windows/winsparkle-ring.xml");
+ win_sparkle_set_app_details(L"Savoir-faire Linux", L"Jami", QString(VERSION_STRING).toStdWString().c_str());
win_sparkle_set_shutdown_request_callback([]() {QCoreApplication::exit();});
win_sparkle_set_did_find_update_callback([]() {MainWindow::instance().showNormal();});
win_sparkle_init();
@@ -266,4 +266,4 @@ MainWindow::readSettingsFromRegistry()
if (not settings.contains(SettingsKey::enableNotifications)) {
settings.setValue(SettingsKey::enableNotifications, true);
}
-}
\ No newline at end of file
+}
diff --git a/mainwindow.ui b/mainwindow.ui
index 383b7a28495f518b26305461668f4f461fdade5c..eaf362fe1a025b30dd100b8df6a73d99212337e1 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -432,11 +432,11 @@
</palette>
</property>
<property name="windowTitle">
- <string>Ring</string>
+ <string>Jami</string>
</property>
<property name="windowIcon">
<iconset resource="ressources.qrc">
- <normaloff>:/images/ring.png</normaloff>:/images/ring.png</iconset>
+ <normaloff>:/images/jami.png</normaloff>:/images/jami.png</iconset>
</property>
<widget class="QWidget" name="centralWidget">
<property name="sizePolicy">
diff --git a/ressources.qrc b/ressources.qrc
index 65db376b6a66fd71eb7298fd84537b08e2ac587b..d5c235b1f2a5cf1f49645848ad297ecd31a13198 100644
--- a/ressources.qrc
+++ b/ressources.qrc
@@ -7,10 +7,10 @@
<file>images/default_avatar_overlay.svg</file>
<file>images/FontAwesome.otf</file>
<file>images/loading.gif</file>
- <file>images/logo-ring-standard-coul.png</file>
+ <file>images/logo-jami-standard-coul.png</file>
<file>images/qrcode.png</file>
- <file>images/ring.ico</file>
- <file>images/ring.png</file>
+ <file>images/jami.ico</file>
+ <file>images/jami.png</file>
<file>images/spikeMask.png</file>
<file>images/waiting.gif</file>
<file>images/icons/ic_add_black_18dp_2x.png</file>
diff --git a/ring-client-windows.vcxproj b/ring-client-windows.vcxproj
index ebc28013eb4227b4cd8493188d5ce43a20b0c6f3..95c01368eb084a629d4118630764d6cee2a9e21f 100644
--- a/ring-client-windows.vcxproj
+++ b/ring-client-windows.vcxproj
@@ -12,7 +12,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{0F6318E4-4C06-384E-BCA8-F344DA187957}</ProjectGuid>
- <RootNamespace>Ring</RootNamespace>
+ <RootNamespace>Jami</RootNamespace>
<Keyword>Qt4VSv1.0</Keyword>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
@@ -24,7 +24,7 @@
<CharacterSet>NotSet</CharacterSet>
<ConfigurationType>Application</ConfigurationType>
<IntermediateDirectory>release\</IntermediateDirectory>
- <PrimaryOutput>Ring</PrimaryOutput>
+ <PrimaryOutput>Jami</PrimaryOutput>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCompile|x64'" Label="Configuration">
<PlatformToolset>v141</PlatformToolset>
@@ -33,7 +33,7 @@
<CharacterSet>NotSet</CharacterSet>
<ConfigurationType>StaticLibrary</ConfigurationType>
<IntermediateDirectory>release\</IntermediateDirectory>
- <PrimaryOutput>Ring</PrimaryOutput>
+ <PrimaryOutput>Jami</PrimaryOutput>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<PropertyGroup Condition="'$(QtMsBuild)'=='' or !Exists('$(QtMsBuild)\qt.targets')">
@@ -58,8 +58,8 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseCompile|x64'">$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseCompile|x64'">$(Platform)\$(Configuration)\</IntDir>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Ring</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseCompile|x64'">Ring</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Jami</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseCompile|x64'">Jami</TargetName>
<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</IgnoreImportLibrary>
<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='ReleaseCompile|x64'">true</IgnoreImportLibrary>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
@@ -99,7 +99,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<IgnoreImportLibrary>true</IgnoreImportLibrary>
<LinkIncremental>false</LinkIncremental>
- <OutputFile>$(OutDir)\Ring.exe</OutputFile>
+ <OutputFile>$(OutDir)\Jami.exe</OutputFile>
<RandomizedBaseAddress>true</RandomizedBaseAddress>
<SubSystem>Windows</SubSystem>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -174,7 +174,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<IgnoreImportLibrary>true</IgnoreImportLibrary>
<LinkIncremental>false</LinkIncremental>
- <OutputFile>$(OutDir)\Ring.exe</OutputFile>
+ <OutputFile>$(OutDir)\Jami.exe</OutputFile>
<RandomizedBaseAddress>true</RandomizedBaseAddress>
<SubSystem>Windows</SubSystem>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -620,12 +620,12 @@
<None Include="images\icons\ic_videocam_white.png" />
<None Include="images\icons\ic_voicemail_white_24dp_2x.png" />
<None Include="images\loading.gif" />
- <None Include="images\logo-ring-standard-coul.png" />
+ <None Include="images\logo-jami-standard-coul.png" />
<None Include="images\qrcode.png" />
<QtRcc Include="ressources.qrc">
<SubType>Designer</SubType>
</QtRcc>
- <None Include="images\ring.png" />
+ <None Include="images\jami.png" />
<None Include="images\spikeMask.png" />
<None Include="stylesheet.css" />
<None Include="images\waiting.gif" />
diff --git a/ring-client-windows.vcxproj.filters b/ring-client-windows.vcxproj.filters
index 8049dc705586ea59345341ccad87cd68065368fd..ef93bb3c1b9771daf4eb5119a87c4b156e377eae 100644
--- a/ring-client-windows.vcxproj.filters
+++ b/ring-client-windows.vcxproj.filters
@@ -727,7 +727,7 @@
<None Include="images\loading.gif">
<Filter>Resource Files</Filter>
</None>
- <None Include="images\logo-ring-standard-coul.png">
+ <None Include="images\logo-jami-standard-coul.png">
<Filter>Resource Files</Filter>
</None>
<None Include="images\qrcode.png">
@@ -736,7 +736,7 @@
<QtRcc Include="ressources.qrc">
<Filter>Resource Files</Filter>
</QtRcc>
- <None Include="images\ring.png">
+ <None Include="images\jami.png">
<Filter>Resource Files</Filter>
</None>
<None Include="images\spikeMask.png">
diff --git a/ring.nsi b/ring.nsi
index 2e5e435fb0584a63e41a4cca49052ec3f46701ee..59f5a885fd89558ca1c24f4a98aaa4ff3500a552 100644
--- a/ring.nsi
+++ b/ring.nsi
@@ -1,6 +1,6 @@
-!define APPNAME "Ring"
+!define APPNAME "Jami"
!define COMPANYNAME "Savoir-Faire Linux"
-!define DESCRIPTION "The Ring client for Windows"
+!define DESCRIPTION "The Jami client for Windows"
# These three must be integers
!define VERSIONMAJOR 1
!define VERSIONMINOR 0
@@ -8,8 +8,8 @@
# These will be displayed by the "Click here for support information" link in "Add/Remove Programs"
# It is possible to use "mailto:" links in here to open the email client
!define HELPURL "https://projects.savoirfairelinux.com/projects/ring/wiki" # "Support Information" link
-!define UPDATEURL "http://ring.cx/en/documentation/windows-installation" # "Product Updates" link
-!define ABOUTURL "http://ring.cx/en#about" # "Publisher" link
+!define UPDATEURL "http://jami.net/en/documentation/windows-installation" # "Product Updates" link
+!define ABOUTURL "http://jami.net/en#about" # "Publisher" link
!include "MUI2.nsh"
@@ -20,7 +20,7 @@
!define MUI_UNINSTALLER
!define MUI_UNCONFIRMPAGE
!define MUI_FINISHPAGE_RUN
- !define MUI_FINISHPAGE_RUN_TEXT "Launch Ring"
+ !define MUI_FINISHPAGE_RUN_TEXT "Launch Jami"
!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink"
!insertmacro MUI_PAGE_WELCOME
@@ -122,25 +122,25 @@ done:
functionEnd
Function LaunchLink
- ExecShell "" "$DESKTOP\Ring.lnk"
+ ExecShell "" "$DESKTOP\Jami.lnk"
FunctionEnd
section "install"
!addincludedir "../../NsProcess/Include"
!addplugindir "../../NsProcess/Plugin"
!include "nsProcess.nsh"
- # Kill all remaining Ring processes
- ${nsProcess::FindProcess} "Ring.exe" $R0
+ # Kill all remaining Jami processes
+ ${nsProcess::FindProcess} "Jami.exe" $R0
${If} $R0 == 0
- ${nsProcess::KillProcess} "Ring.exe" $R0
+ ${nsProcess::KillProcess} "Jami.exe" $R0
${EndIf}
Sleep 500
# Files for the install directory - to build the installer, these should be in the same directory as the install script (this file)
setOutPath $INSTDIR
# Files added here should be removed by the uninstaller (see section "uninstall")
- file "Ring.exe"
- file "ring.ico"
+ file "Jami.exe"
+ file "jami.ico"
file "qtwebengine_resources.pak"
file "QtWebEngineProcess.exe"
file "icudtl.dat"
@@ -163,18 +163,18 @@ section "install"
SetOutPath $INSTDIR
#Desktop
- CreateShortCut "$DESKTOP\Ring.lnk" "$INSTDIR\Ring.exe" ""
+ CreateShortCut "$DESKTOP\Jami.lnk" "$INSTDIR\Jami.exe" ""
# Start Menu
createDirectory "$SMPROGRAMS\${COMPANYNAME}"
- createShortCut "$SMPROGRAMS\${COMPANYNAME}\${APPNAME}.lnk" "$INSTDIR\Ring.exe" "" "$INSTDIR\ring.ico"
+ createShortCut "$SMPROGRAMS\${COMPANYNAME}\${APPNAME}.lnk" "$INSTDIR\Jami.exe" "" "$INSTDIR\jami.ico"
# Registry information for add/remove programs
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "DisplayName" ${APPNAME}
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "InstallLocation" $INSTDIR
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "DisplayIcon" "$\"$INSTDIR\ring.ico$\""
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "DisplayIcon" "$\"$INSTDIR\jami.ico$\""
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "Publisher" "${COMPANYNAME}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "HelpLink" "$\"${HELPURL}$\""
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "URLUpdateInfo" "$\"${UPDATEURL}$\""
@@ -191,8 +191,8 @@ section "install"
# Write ring protocol in registry
WriteRegStr HKCR "ring" "URL Protocol" "$\"$\""
- WriteRegStr HKCR "ring\DefaultIcon" "" "$\"$INSTDIR\Ring.exe,1$\""
- WriteRegStr HKCR "ring\shell\open\command" "" "$\"$INSTDIR\Ring.exe$\" $\"%1$\""
+ WriteRegStr HKCR "ring\DefaultIcon" "" "$\"$INSTDIR\Jami.exe,1$\""
+ WriteRegStr HKCR "ring\shell\open\command" "" "$\"$INSTDIR\Jami.exe$\" $\"%1$\""
sectionEnd
# Uninstaller
@@ -232,8 +232,8 @@ section "uninstall"
rmDir "$SMPROGRAMS\${COMPANYNAME}"
# Remove files
- delete $INSTDIR\Ring.exe
- delete $INSTDIR\ring.ico
+ delete $INSTDIR\Jami.exe
+ delete $INSTDIR\jami.ico
delete $INSTDIR\*.dll
rmDir /r $INSTDIR\platforms
rmDir /r $INSTDIR\imageformats
diff --git a/ringthemeutils.h b/ringthemeutils.h
index 5434aca3a1980a7447bd73e52f61ccaca186b413..5ab07bdd78f0725430f330100ce5cacc4c0b2b23 100644
--- a/ringthemeutils.h
+++ b/ringthemeutils.h
@@ -22,7 +22,7 @@
namespace RingTheme {
-static const QColor blue_ {"#3AC0D2"};
+static const QColor blue_ {"#109ede"};
static const QColor lightBlue_ {"#c1ebf0"};
static const QColor lightGrey_ {242, 242, 242};
static const QColor imGrey_ {"#dedee0"};
diff --git a/sendcontactrequestwidget.cpp b/sendcontactrequestwidget.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..8ac53bec20d7e8d14933c213c7d348df665d5a31
--- /dev/null
+++ b/sendcontactrequestwidget.cpp
@@ -0,0 +1,73 @@
+/***************************************************************************
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
+ * Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com> *
+ * Author: Olivier Soldano <olivier.soldano@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 3 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, see <http://www.gnu.org/licenses/>. *
+ **************************************************************************/
+
+#include <QDebug>
+
+#include "sendcontactrequestwidget.h"
+#include "ui_sendcontactrequestwidget.h"
+#include "account.h"
+#include "accountmodel.h"
+#include "availableaccountmodel.h"
+#include "recentmodel.h"
+#include "contactmethod.h"
+#include "phonedirectorymodel.h"
+
+SendContactRequestWidget::SendContactRequestWidget(QWidget *parent) :
+ QWidget(parent),
+ ui(new Ui::SendContactRequestWidget)
+{
+ ui->setupUi(this);
+ ui->peerContactID->setText("ContactID"); // TODO: Display ID/Username
+}
+
+SendContactRequestWidget::~SendContactRequestWidget()
+{
+ disconnect(sendCRClickedConnection_);
+ delete ui;
+}
+
+void
+SendContactRequestWidget::setup(const QModelIndex& nodeIdx)
+{
+ auto cmVector = RecentModel::instance().getContactMethods(nodeIdx);
+ disconnect(sendCRClickedConnection_);
+ QString number = cmVector[0]->uri();
+ ui->peerContactID->setText(number);
+ sendCRClickedConnection_ = connect(ui->sendContactRequestButton, &QPushButton::clicked, [this,nodeIdx]() {
+ sendCR(nodeIdx);
+ });
+}
+
+void SendContactRequestWidget::sendCR(const QModelIndex& nodeIdx)
+{
+ auto cmVector = RecentModel::instance().getContactMethods(nodeIdx);
+ QString number = cmVector[0]->uri();
+ auto cm = PhoneDirectoryModel::instance().getNumber(number);
+
+ if(cm->account() != nullptr){
+ cm->account()->sendContactRequest(cm);
+ } else {
+ qDebug() << "no account linked to contact method";
+ auto idx = AvailableAccountModel::instance().selectionModel()->currentIndex();
+ if (idx.isValid()) {
+ cm->setAccount(idx.data(static_cast<int>(Ring::Role::Object)).value<Account*>());
+ cm->account()->sendContactRequest(cm);
+ }
+ }
+}
diff --git a/settingswidget.ui b/settingswidget.ui
index 3ec76608b590eeec6db0c8c2acc1d73f51692eae..91801497469b1e8ac4c57942be5034d0d03e06ea 100644
--- a/settingswidget.ui
+++ b/settingswidget.ui
@@ -1357,7 +1357,7 @@ QPushButton:pressed {background: rgb(230,230, 230); border: 0px; border-radius:
</font>
</property>
<property name="text">
- <string>RingID</string>
+ <string>ID</string>
</property>
</widget>
</item>
diff --git a/stylesheet.css b/stylesheet.css
index 1b5294da08b14010730008d6b3ef8e9933f20335..c36e581cdd72defcf62a508acfa3704af8c5886c 100644
--- a/stylesheet.css
+++ b/stylesheet.css
@@ -129,8 +129,8 @@ QListView#cipherListView::indicator{
QListView#audioCodecView::indicator:checked, QListView#videoCodecView::indicator:checked,
QListView#accountView::indicator:checked, QListView#cipherListView::indicator:checked{
- border-color: #34acbd;
- background: #34acbd;
+ border-color: #2b4b7e;
+ background: #2b4b7e;
image: url(":/images/icons/ic_check_white_18dp_2x.png");
}
@@ -267,7 +267,7 @@ QToolButton#qrButton:checked {
}
QPushButton#btnvideo{
- background-color: #3AC0D2;
+ background-color: #109ede;
border-radius: 15px;
border:solid 1px;
}
@@ -316,7 +316,7 @@ QPushButton#existingPushButton, QPushButton#newAccountButton, QPushButton#previo
QPushButton#cancelAddButton, QPushButton#exportOnRingButton, QPushButton#addDeviceButton, QPushButton#exportEndedOkButton,
QPushButton#errorPushButton, QPushButton#registerButton, QPushButton#acceptCRButton, QPushButton#discardCRButton, QPushButton#deleteCancelBtn,
QPushButton#dhtImportBtn, QPushButton#fileImportBtn, QPushButton#changePassBtn, QPushButton#confirmChangeBtn {
- background-color: #3AC0D2;
+ background-color: #109ede;
border: 0px;
color: white;
font: 14px;
@@ -339,7 +339,7 @@ QPushButton#addDeviceButton:hover, QPushButton#exportEndedOkButton:hover, QPushB
QPushButton#registerButton:hover, QPushButton#acceptCRButton:hover, QPushButton#discardCRButton:hover,
QPushButton#deleteCancelBtn:hover, QPushButton#dhtImportBtn:hover, QPushButton#fileImportBtn:hover,
QPushButton#changePassBtn:hover, QPushButton#confirmChangeBtn:hover{
- background-color: #4dc6d6;
+ background-color: #2b4b7e;
}
QPushButton#blockCRButton:hover, QPushButton#deleteAcceptBtn:hover, QPushButton#debanButton:hover,
@@ -356,7 +356,7 @@ QPushButton#addDeviceButton:pressed, QPushButton#exportEndedOkButton:pressed, QP
QPushButton#registerButton:pressed, QPushButton#acceptCRButton:pressed, QPushButton#discardCRButton:pressed,
QPushButton#deleteCancelBtn:pressed, QPushButton#dhtImportBtn:pressed, QPushButton#fileImportBtn:pressed,
QPushButton#changePassBtn:pressed, QPushButton#confirmChangeBtn:pressed {
- background-color: #34acbd;
+ background-color: #2b4b7e;
}
QPushButton#blockCRButton:pressed, QPushButton#deleteAcceptBtn:pressed, QPushButton#debanButton:pressed,
@@ -426,8 +426,8 @@ QRadioButton::indicator:unchecked{
}
QRadioButton::indicator:checked{
- background: #3AC0D2;
- border-color: #3AC0D2;
+ background: #109ede;
+ border-color: #109ede;
image: url(":/images/icons/ic_check_white_18dp_2x.png");
}
@@ -531,7 +531,7 @@ QTabBar QToolButton::right-arrow{
QPushButton#generalTabButton:checked, QPushButton#videoTabButton:checked, QPushButton#accountTabButton:checked,
QTabBar::tab:selected{
- border-color: #3AC0D2;
+ border-color: #109ede;
}
QTabWidget::pane{
@@ -540,7 +540,7 @@ QTabWidget::pane{
QPushButton#generalTabButton:hover, QPushButton#videoTabButton:hover, QPushButton#accountTabButton:hover,
QTabBar::tab:hover{
- border-color:#4dc6d6;
+ border-color:#2b4b7e;
}
QSpinBox#historyDaySettingsSpinBox, QSpinBox#lrcfg_tlsNegotiationTimeoutSec, QSpinBox#lrcfg_registrationExpire,
@@ -562,7 +562,7 @@ QSpinBox#historyDaySettingsSpinBox:focus, QSpinBox#lrcfg_tlsNegotiationTimeoutSe
QSpinBox#lrcfg_registrationExpire:focus, QSpinBox#lrcfg_localPort:focus, QSpinBox#lrcfg_publishedPort:focus,
QSpinBox#lrcfg_audioPortMin:focus, QSpinBox#lrcfg_audioPortMax:focus, QSpinBox#lrcfg_videoPortMin:focus,
QSpinBox#lrcfg_videoPortMax:focus{
- border-color: #3AC0D2;
+ border-color: #109ede;
}
QCheckBox::indicator{
@@ -574,8 +574,8 @@ QCheckBox::indicator{
}
QCheckBox::indicator:checked{
- border-color: #34acbd;
- background: #34acbd;
+ border-color: #2b4b7e;
+ background: #2b4b7e;
image: url(":/images/icons/ic_check_white_18dp_2x.png");
}
@@ -621,7 +621,7 @@ QLineEdit#lrcfg_tlsServerName:focus, QLineEdit#lrcfg_turnServerRealm:focus, QLin
QLineEdit#lrcfg_turnServerPassword:focus, QLineEdit#lrcfg_turnServer:focus, QLineEdit#lrcfg_publishedAddress:focus,
QLineEdit#lrcfg_registeredName:focus, QLineEdit#lrcfg_nameServiceURL:focus, QLineEdit#lrcfg_username:focus,
QLineEdit#profileNameEdit:focus{
- border-color: #3AC0D2;
+ border-color: #109ede;
}
QTabWidget#tabWidget{
@@ -649,7 +649,7 @@ QSlider::groove:vertical{
QSlider::handle:vertical{
height: 10px;
- background: #3AC0D2;
+ background: #109ede;
border-radius: 5px;
margin: 0 -4px;
}
@@ -659,7 +659,7 @@ QSlider::sub-page:vertical{
}
QSlider::add-page:vertical{
- background: #3AC0D2;
+ background: #109ede;
}
QToolButton::menu-button {image:none;}
diff --git a/utils.cpp b/utils.cpp
index ad5a1b364fd1ab5413017cab23fee50a7757f1da..1e6923b8005d7302beba6a4b020af89bc8fec319 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -56,7 +56,7 @@ Utils::CreateStartupLink()
SHGetFolderPathW(NULL, CSIDL_STARTUP, NULL, 0, startupPath);
std::wstring linkPath(startupPath);
- linkPath += TEXT("\\Ring.lnk");
+ linkPath += TEXT("\\Jami.lnk");
return Utils::CreateLink(programPath.c_str(), linkPath.c_str());
#else
@@ -101,7 +101,7 @@ Utils::DeleteStartupLink() {
SHGetFolderPathW(NULL, CSIDL_STARTUP, NULL, 0, startupPath);
std::wstring linkPath(startupPath);
- linkPath += TEXT("\\Ring.lnk");
+ linkPath += TEXT("\\Jami.lnk");
DeleteFile(linkPath.c_str());
#endif
@@ -114,7 +114,7 @@ Utils::CheckStartupLink() {
SHGetFolderPathW(NULL, CSIDL_STARTUP, NULL, 0, startupPath);
std::wstring linkPath(startupPath);
- linkPath += TEXT("\\Ring.lnk");
+ linkPath += TEXT("\\Jami.lnk");
return PathFileExists(linkPath.c_str());
#else
return true;
@@ -228,7 +228,7 @@ Utils::setStackWidget(QStackedWidget* stack, QWidget* widget)
void Utils::showSystemNotification(QWidget* widget, const QString & message, long delay)
{
- GlobalSystemTray::instance().showMessage("Ring", message);
+ GlobalSystemTray::instance().showMessage("Jami", message);
QApplication::alert(widget, delay);
}
diff --git a/web/chatview.css b/web/chatview.css
index 5fa4156e23a1fff54083d5675d05819f664a3dce..2df1bf0da7ca5d777590fb09db66439c8f20b409 100644
--- a/web/chatview.css
+++ b/web/chatview.css
@@ -2,7 +2,7 @@
:root {
/* color definitions */
- --ring-light-blue: rgba(59, 193, 211, 0.3);
+ --jami-light-blue: rgba(59, 193, 211, 0.3);
/* main properties */
/* --bg-color: #f2f2f2; same as macOS client */
--bg-color: #ffffff; /* same as macOS client */
@@ -190,7 +190,7 @@ body {
#invitation {
visibility: hidden;
- background: var(--ring-light-blue);
+ background: var(--jami-light-blue);
position: absolute;
width: 100%;
/* hairline */
diff --git a/wizarddialog.cpp b/wizarddialog.cpp
index ce2eae8dd79f0efb3c3cccff6ca604fa3a662f97..eb2653c4593f509a7ca400458b8b10184b217b7b 100644
--- a/wizarddialog.cpp
+++ b/wizarddialog.cpp
@@ -34,7 +34,7 @@
#include "utils.h"
-const QString DEFAULT_RING_ACCT_ALIAS = QObject::tr("Ring account", "Default alias for new Ring account");
+const QString DEFAULT_RING_ACCT_ALIAS = QObject::tr("Jami account", "Default alias for new Jami account");
WizardDialog::WizardDialog(WizardMode wizardMode, AccountInfo* toBeMigrated, QWidget* parent) :
QDialog(parent),
@@ -50,7 +50,7 @@ WizardDialog::WizardDialog(WizardMode wizardMode, AccountInfo* toBeMigrated, QWi
setWindowFlags(flags);
- QPixmap logo(":/images/logo-ring-standard-coul.png");
+ QPixmap logo(":/images/logo-jami-standard-coul.png");
ui->welcomeLogo->setPixmap(logo.scaledToHeight(65, Qt::SmoothTransformation));
ui->welcomeLogo->setAlignment(Qt::AlignHCenter);
@@ -94,11 +94,11 @@ void
WizardDialog::processWizardInformations()
{
if (wizardMode_ == MIGRATION)
- ui->progressLabel->setText(tr("Migrating your Ring account..."));
+ ui->progressLabel->setText(tr("Migrating your Jami account..."));
else if (wizardMode_ == IMPORT)
ui->progressLabel->setText(tr("Importing account archive..."));
else
- ui->progressLabel->setText(tr("Generating your Ring account..."));
+ ui->progressLabel->setText(tr("Generating your Jami account..."));
if (wizardMode_ != IMPORT) {
if (ui->pinEdit->isVisible() && ui->pinEdit->text().isEmpty()) {
@@ -348,7 +348,7 @@ void WizardDialog::on_archivePathSelector_clicked()
filePath = QFileDialog::getOpenFileName(this,
tr("Open File"),
QString(),
- tr("Ring archive files (*.gz);; All files (*)"));
+ tr("Jami archive files (*.gz);; All files (*)"));
// for export get current account archive path
// for import use set path
diff --git a/wizarddialog.ui b/wizarddialog.ui
index de7d0d475d8598743275cf9f1fc8b11cea8c63de..1f5cccbaba172486dcb760e08a4a80fcd204e25e 100644
--- a/wizarddialog.ui
+++ b/wizarddialog.ui
@@ -27,7 +27,7 @@
</property>
<property name="windowIcon">
<iconset resource="ressources.qrc">
- <normaloff>:/images/ring.png</normaloff>:/images/ring.png</iconset>
+ <normaloff>:/images/jami.png</normaloff>:/images/jami.png</iconset>
</property>
<property name="accessibleName">
<string>Wizard Dialog</string>
@@ -136,19 +136,19 @@
</size>
</property>
<property name="toolTip">
- <string>Create Ring account button</string>
+ <string>Create Jami account button</string>
</property>
<property name="accessibleName">
<string/>
</property>
<property name="accessibleDescription">
- <string>Push button for Ring account creation start trigger</string>
+ <string>Push button for Jami account creation start trigger</string>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
- <string>Create Ring account</string>
+ <string>Create Jami account</string>
</property>
</widget>
</item>
@@ -332,7 +332,7 @@ p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p>
<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li>
-<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li>
+<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Jami account</span> you want to use</li>
<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li>
<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></string>
@@ -667,7 +667,7 @@ p, li { white-space: pre-wrap; }
<item alignment="Qt::AlignHCenter">
<widget class="QCheckBox" name="signUpCheckbox">
<property name="toolTip">
- <string>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</string>
+ <string>Register your username on the network. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</string>
</property>
<property name="accessibleName">
<string>Public username checkbox</string>
@@ -930,7 +930,7 @@ p, li { white-space: pre-wrap; }
</font>
</property>
<property name="text">
- <string>Generating your Ring account...</string>
+ <string>Generating your Jami account...</string>
</property>
</widget>
</item>
diff --git a/wizardwidget.cpp b/wizardwidget.cpp
index 32c2f39bbac936a025fc682a40077aec3ac217fd..772cf2ece127f7925a0d370a3e6a80084c54d59f 100644
--- a/wizardwidget.cpp
+++ b/wizardwidget.cpp
@@ -34,7 +34,7 @@
#include "utils.h"
-const QString DEFAULT_RING_ACCT_ALIAS = QObject::tr("Ring account", "Default alias for new Ring account");
+const QString DEFAULT_RING_ACCT_ALIAS = QObject::tr("Jami account", "Default alias for new Jami account");
WizardWidget::WizardWidget(WizardMode wizardMode, AccountInfo* toBeMigrated, QWidget* parent) :
NavWidget(parent),
@@ -50,7 +50,7 @@ WizardWidget::WizardWidget(WizardMode wizardMode, AccountInfo* toBeMigrated, QWi
setWindowFlags(flags);
- QPixmap logo(":/images/logo-ring-standard-coul.png");
+ QPixmap logo(":/images/logo-jami-standard-coul.png");
ui->welcomeLogo->setPixmap(logo.scaledToHeight(65, Qt::SmoothTransformation));
ui->welcomeLogo->setAlignment(Qt::AlignHCenter);
@@ -94,11 +94,11 @@ void
WizardWidget::processWizardInformations()
{
if (wizardMode_ == MIGRATION)
- ui->progressLabel->setText(tr("Migrating your Ring account..."));
+ ui->progressLabel->setText(tr("Migrating your Jami account..."));
else if (wizardMode_ == IMPORT)
ui->progressLabel->setText(tr("Importing account archive..."));
else
- ui->progressLabel->setText(tr("Generating your Ring account..."));
+ ui->progressLabel->setText(tr("Generating your Jami account..."));
if (wizardMode_ != IMPORT) {
if (ui->pinEdit->isVisible() && ui->pinEdit->text().isEmpty()) {
@@ -336,7 +336,7 @@ void WizardWidget::on_archivePathSelector_clicked()
filePath = QFileDialog::getOpenFileName(this,
tr("Open File"),
QString(),
- tr("Ring archive files (*.gz);; All files (*)"));
+ tr("Jami archive files (*.gz);; All files (*)"));
// for export get current account archive path
// for import use set path
diff --git a/wizardwidget.ui b/wizardwidget.ui
index 595b524abc63757497ce2e83dfa59deb45a7f441..9a286e48ecfae3a8dea72eb7befde92817517697 100644
--- a/wizardwidget.ui
+++ b/wizardwidget.ui
@@ -27,7 +27,7 @@
</property>
<property name="windowIcon">
<iconset resource="ressources.qrc">
- <normaloff>:/images/ring.png</normaloff>:/images/ring.png</iconset>
+ <normaloff>:/images/jami.png</normaloff>:/images/jami.png</iconset>
</property>
<property name="accessibleName">
<string>Wizard Dialog</string>
@@ -136,19 +136,19 @@
</size>
</property>
<property name="toolTip">
- <string>Create Ring account button</string>
+ <string>Create Jami account button</string>
</property>
<property name="accessibleName">
<string/>
</property>
<property name="accessibleDescription">
- <string>Push button for Ring account creation start trigger</string>
+ <string>Push button for Jami account creation start trigger</string>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
- <string>Create Ring account</string>
+ <string>Create Jami account</string>
</property>
</widget>
</item>
@@ -332,7 +332,7 @@ p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">To link this device to another account, you first </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">need to obtain a PIN</span><span style=" font-family:'Ubuntu'; font-size:12pt;"> code. To generate the PIN code:</span></p>
<ol style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Account management setting</span> of a previous device</li>
-<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Ring account</span> you want to use</li>
+<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Choose the <span style=" font-weight:600;">Jami account</span> you want to use</li>
<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Go to the <span style=" font-weight:600;">Devices</span> tab</li>
<li style=" font-family:'Ubuntu'; font-size:12pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Select <span style=" font-weight:600;">Add a device</span></li></ol>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:12pt;">You will get the necessary PIN to complete this form. The PIN is only valid for </span><span style=" font-family:'Ubuntu'; font-size:12pt; font-weight:600;">10 minutes</span><span style=" font-family:'Ubuntu'; font-size:12pt;">.</span></p></body></html></string>
@@ -667,7 +667,7 @@ p, li { white-space: pre-wrap; }
<item alignment="Qt::AlignHCenter">
<widget class="QCheckBox" name="signUpCheckbox">
<property name="toolTip">
- <string>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</string>
+ <string>Register your username on the Jami. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your ID.</string>
</property>
<property name="accessibleName">
<string>Public username checkbox</string>
@@ -930,7 +930,7 @@ p, li { white-space: pre-wrap; }
</font>
</property>
<property name="text">
- <string>Generating your Ring account...</string>
+ <string>Generating your Jami account...</string>
</property>
</widget>
</item>