Commit cba5b527 authored by Sébastien Blin's avatar Sébastien Blin Committed by Andreas Traczyk

ui: change name from Ring to Jami

Change-Id: Ic65d774b336535b1ede9e52287608e18080b78cc
Reviewed-by: Andreas Traczyk's avatarAndreas Traczyk <andreas.traczyk@savoirfairelinux.com>
parent 7a3dfa4a
# 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
```
......
......@@ -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
......
......@@ -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">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;www.ring.cx&quot;&gt;&lt;span style=&quot; font-size:9pt; text-decoration: underline; color:#0000ff;&quot;&gt;www.ring.cx&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://jami.net&quot;&gt;&lt;span style=&quot; font-size:9pt; text-decoration: underline; color:#0000ff;&quot;&gt;jami.net&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</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">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;© 2015-2017 Savoir-faire Linux&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;© 2015-2019 Savoir-faire Linux&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="margin">
<number>5</number>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
:: Ring - native Windows client project build script
:: Jami - native Windows client project build script
@echo off
setlocal
......
......@@ -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
......
......@@ -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>
......
......@@ -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) {
......
IDI_ICON1 ICON DISCARDABLE "images/ring.ico"
IDI_ICON1 ICON DISCARDABLE "images/jami.ico"
......@@ -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>
......
......@@ -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()));
......
......@@ -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
}
......@@ -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">
......
......@@ -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>
......
......@@ -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" />
......
......@@ -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">
......
!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
......
......@@ -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"};
......
/***************************************************************************
* 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);
}
}
}
......@@ -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>
......
......@@ -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;}
......
......@@ -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);
}
......
......@@ -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 */
......
......@@ -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
......
......@@ -27,7 +27,7 @@
</property>
<property name="windowIcon">