Skip to content

GitLab

J
jami-client-gnome
Commit 6eaaf0d8 authored by Philippe Gorley's avatar Philippe Gorley Committed by Sébastien Blin
Browse files
Options

ui: rename Ring to Jami 

Change-Id: I30996659ce276647c216e69e5392ea8e7214ac6e
Reviewed-by: Sébastien Blin's avatarSebastien Blin <sebastien.blin@savoirfairelinux.com>
parent 7a910e84
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1026 additions and 1429 deletions
CMakeLists.txt
View file @ 6eaaf0d8
......@@ -457,7 +457,7 @@ INSTALL(FILES ${PROJECT_SOURCE_DIR}/gnome-ring.desktop.autostart
gnome-ring.desktop
)
INSTALL(FILES pixmaps/ring.svg
INSTALL(FILES pixmaps/jami.svg
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps
)
......
CONTRIBUTING.md
View file @ 6eaaf0d8
# Contributing to Ring Gnome
# Contributing to Jami Gnome
GNU Ring welcomes contribution from everyone. Here are some ideas if you want
GNU Jami welcomes contribution from everyone. Here are some ideas if you want
to help:
## Packaging
Packaging Ring allows easier installation by end-users and in this sense it's an
excellent way of contributing to Ring!
Packaging Jami allows easier installation by end-users and in this sense it's an
excellent way of contributing to Jami!
If your distribution doesn't have a Ring package you can create one, and if
somebody is already maintaining a Ring package for your distribution,
If your distribution doesn't have a Jami package you can create one, and if
somebody is already maintaining a Jami package for your distribution,
you can help him out!
## Design
Ring aims to be a universal platform of communication, accessible and usable by
Jami aims to be a universal platform of communication, accessible and usable by
everybody. If you find issues with the client, or simply want to suggest
improvement ideas, the bug tracker is the perfect place to submit them.
## Documentation
The documentation should be as up-to-date as possible to help users, devs and
anyone who wants to get informations. This wiki is currently located [here](https://git.ring.cx/savoirfairelinux/ring-project/wikis/home).
anyone who wants to get informations. This wiki is currently located [here](https://git.jami.net/savoirfairelinux/ring-project/wikis/home).
## Testing
The client is under continuous development with new features, bugfixes, etc.
Because communications software depends on a lot of conditions, we need people
to test and fill tickets when necessary. To submit a new bug, go to https://git.ring.cx/savoirfairelinux/ring-client-gnome/issues.
to test and fill tickets when necessary. To submit a new bug, go to https://git.jami.net/savoirfairelinux/ring-client-gnome/issues.
Sometimes interpreting bug reports is difficult for us, for example because we
can't reproduce the bug or understand what exactly the issue is.
......@@ -35,7 +35,7 @@ This is usually because the bug report lacks of details / is too vague.
In order to make your bug report as helpful as possible, think about providing
as many details, clear explanations and scenarios as possible!
Also, we've written a [guide on how to report bugs](https://git.ring.cx/savoirfairelinux/ring-project/wikis/Bug-report-guide),
Also, we've written a [guide on how to report bugs](https://git.jami.net/savoirfairelinux/ring-project/wikis/Bug-report-guide),
if you're unsure, check it out!
## Support
......@@ -44,7 +44,7 @@ Helping users when they post issues or questions on a social network or IRC for
## Communication
Talk to Ring to other people is appreciated too!
Talk to Jami to other people is appreciated too!
## Translation
......@@ -54,8 +54,8 @@ We are currently using [Transifex](https://www.transifex.com/savoirfairelinux/ri
Finally and not the least, you can also try to develop new features for this client.
The best way is to communicate with current developers via the Contact section (see below)
or by filling a new issue [here](https://git.ring.cx/savoirfairelinux/ring-client-gnome/issues)
or by taking one. See the [`good-first-bug` label](https://git.ring.cx/savoirfairelinux/ring-client-gnome/issues?label_name%5B%5D=good+first+bug)
or by filling a new issue [here](https://git.jami.net/savoirfairelinux/ring-client-gnome/issues)
or by taking one. See the [`good-first-bug` label](https://git.jami.net/savoirfairelinux/ring-client-gnome/issues?label_name%5B%5D=good+first+bug)
if you don't know where to start.
# Contact
......
README.md
View file @ 6eaaf0d8
# Ring client Gnome
# Jami client Gnome
[![Build Status](https://jenkins.ring.cx/buildStatus/icon?job=client-gnome)](https://jenkins.ring.cx/job/client-gnome/)
[![Build Status](https://jenkins.jami.net/buildStatus/icon?job=client-gnome)](https://jenkins.jami.net/job/client-gnome/)
Ring-client-gnome is a Ring client written in GTK+3. It uses libRingClient to
communicate with the Ring daemon and for all of the underlying models and their
Jami-client-gnome is a Jami client written in GTK+3. It uses libRingClient to
communicate with the Jami daemon and for all of the underlying models and their
logic. Ideally ring-client-gnome should only contain UI related code and any
wrappers necessary for interacting with libRingClient.
Packages for Debian/Ubuntu/Fedora can be found at https://ring.cx
Packages for Debian/Ubuntu/Fedora can be found at https://jami.net
More info about the Ring project and the clients can be found on our Gitlab's instance:
https://git.ring.cx/
https://git.jami.net/
GNU Ring welcomes contribution from everyone. See [CONTRIBUTING.md](CONTRIBUTING.md) for help getting started.
......@@ -18,7 +18,7 @@ GNU Ring welcomes contribution from everyone. See [CONTRIBUTING.md](CONTRIBUTING
## Requirements
- Ring daemon
- Jami daemon
- libRingClient
- GTK+3 (3.10 or higher)
- Qt5 Core
......@@ -64,7 +64,7 @@ desktop integration. In this case you should perform a 'make install' after
building the client.
## Building without installing Ring daemon and libRingClient
## Building without installing Jami daemon and libRingClient
It is possible to build ring-client-gnome without installing the daemon and
libRingClient on your system (eg: in `/usr` or `/usr/local`):
......
data/cx.ring.RingGnome.gschema.xml
View file @ 6eaaf0d8
<?xml version="1.0" encoding="UTF-8"?>
<schemalist>
<schema path="/cx/ring/RingGnome/" id="cx.ring.RingGnome">
<schema path="/cx/jami/JamiGnome/" id="cx.ring.RingGnome">
<key name="start-on-login" type="b">
<default>true</default>
<summary>Start Ring on login.</summary>
<description>Start Ring on login. Only supported on XDG compliant desktop environments.</description>
<summary>Start Jami on login.</summary>
<description>Start Jami on login. Only supported on XDG compliant desktop environments.</description>
</key>
<key name="show-status-icon" type="b">
<default>true</default>
<summary>Show status (system tray) icon.</summary>
<description>When set to true Ring will continue to run if the main window is closed.</description>
<description>When set to true Jami will continue to run if the main window is closed.</description>
</key>
<key name="bring-window-to-front" type="b">
<default>true</default>
......@@ -19,7 +19,7 @@
<key name="show-main-window" type="b">
<default>true</default>
<summary>Saves whether or not the main window is currently visible or not.</summary>
<description>This is used when launching the application with the '--restore-last-window-state' option, which will launch the application with the main window in the same state as when Ring was last quit.</description>
<description>This is used when launching the application with the '--restore-last-window-state' option, which will launch the application with the main window in the same state as when Jami was last quit.</description>
</key>
<key name="chat-pane-horizontal" type="b">
<default>true</default>
......
gnome-ring.appdata.xml
View file @ 6eaaf0d8
......@@ -4,12 +4,12 @@
<id>gnome-ring.desktop</id>
<metadata_license>CC-BY-SA-3.0</metadata_license>
<project_license>GPL-3.0+</project_license>
<name>Ring</name>
<summary>Gnome client for Ring</summary>
<name>Jami</name>
<summary>Gnome client for Jami</summary>
<description>
<p>
Ring is a secure, distributed communication software and a SIP client.
Jami is a secure, distributed communication software and a SIP client.
</p>
</description>
<url type="homepage">https://www.ring.cx</url>
<url type="homepage">https://jami.net</url>
</component>
\ No newline at end of file
pixmaps/jami.svg 0 → 100644
View file @ 6eaaf0d8
This diff is collapsed.
pixmaps/logo-jami-standard-coul.svg 0 → 100644
View file @ 6eaaf0d8
This diff is collapsed.
pixmaps/logo-ring-standard-coul.svg deleted 100755 → 0
View file @ 7a910e84
This diff is collapsed.
pixmaps/pixmaps.gresource.xml
View file @ 6eaaf0d8
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/cx/ring/RingGnome">
<file alias="ring-symbol-blue">ring.svg</file>
<file alias="ring-logo-blue">logo-ring-standard-coul.svg</file>
<gresource prefix="/cx/jami/JamiGnome">
<file alias="jami-symbol-blue">jami.svg</file>
<file alias="jami-logo-blue">logo-jami-standard-coul.svg</file>
<file alias="addressbook_small">addressbook.svg</file>
<file alias="history_small">history.svg</file>
<file alias="clear_history">ic_delete_forever_black_24px.svg</file>
......@@ -50,5 +50,6 @@
<file alias="account">account.svg</file>
<file alias="bottom_arrow">bottom_arrow.svg</file>
<file alias="up_arrow">up_arrow.svg</file>
<file alias="qrcode">qrcode.svg</file>
</gresource>
</gresources>
pixmaps/qrcode.svg 0 → 100644
View file @ 6eaaf0d8
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="svg3767"
width="96"
height="96"
viewBox="0 0 96 96"
sodipodi:docname="qrcode.svg"
inkscape:version="0.92.3 (2405546, 2018-03-11)">
<metadata
id="metadata3773">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs3771" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1031"
id="namedview3769"
showgrid="false"
inkscape:zoom="2.9499611"
inkscape:cx="-41.749726"
inkscape:cy="48.73848"
inkscape:window-x="1608"
inkscape:window-y="49"
inkscape:window-maximized="0"
inkscape:current-layer="svg3767" />
<image
width="96"
height="96"
preserveAspectRatio="none"
xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAAAAXNSR0IArs4c6QAAAAlwSFlzAAAL EwAACxMBAJqcGAAAAVlpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6 eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYg eG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4K ICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6dGlm Zj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iPgogICAgICAgICA8dGlmZjpPcmllbnRh dGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9y ZGY6UkRGPgo8L3g6eG1wbWV0YT4KTMInWQAADiRJREFUeAHt2cuuXNURBmByNwGUCxjMA0SR8gjO 5Awd8RKZexyQ4oGZGDlifOZ+CCQY2oPkHfICCWByEzgh99S3u//t6t27d+9uHwaR/EvV61a3VVVr 7eXjF154jucReJYIfG1G+Os1h74K/GuidI2t/5QM6vhmH1xhf87Wjvq5gO0wXOHgFFun8D6rizu2 +kA2RfCi6FbRk6KrqKT/lh4Z/7zosuivRd8o+nfRRdEhW3x5qejDokdFkflu9W8XvVKkIvseangW prYSix1lKdv7NWtTV03/KJ3Xtxa/vW3X2MIDkaGDrqv2j77YSiyGzNb8DlQOfFkUxjgzLBz4kUl8 gTGSHZv7Q1HW087Zwg8q7MWiLwwKkdHSdaNIoGTbXNaruwrxD7NKvFYUf8wNSAAy1uZYWZtb77zH +pyOPkdkiqwt2UrldNnoItc32nnO6cefUXZNAGT0T0Vazth02uoOfW0yaA3vy0Xui8xX9yi6LRX0 apG7awnsyTzKBmPTGsyN8f6gKDL49rAUIM6C4Nws+qRINmOsurOg87Oie0VvF9noohO1fshWLY1l T88U0X1ZC3eKXiuaPiWmMoLmaDqivy6ShNiv7i6WAhROwoLzl0ysbKd3xxqxJVtzickcWwLz8Roj jedgYMKzJkAinnvA2adURejHweoOlWJM5z+Lck9UdzXYciwl4ztF9KkSZK3bq+GI2PpWzeTTnzlM ZOmI7/r2ZH4RawLEqTiWiMfpOeXhTRueo84UI/2PtwJ/j2C10+BMdcWWNhRfm5pBT+bD19f3+msC 1IVUjuBcFN0qUtoy0R+BU+dreUA2kXFvI+Nh6O6i15xqmj4Ua2pMmH5H9PTHpPvGB+OjoodFKsse VuHUAEW54LzTLDhSD4q8ks+BjQmgALnYp3hUE7E9XZsbJ9COXMfDGpyi5+jXpSvXTxXkQaU151ik dKt7MsjSo3WHIA9ViK3Y3swu/8YnbeTP+WisegimbLtLyYxStp6280z7c3pkE/IR0J8+CaZjPGsQ n7TQbWxmVvyuOWJzmXPnOFbeO/454BlwrIKW9Ping2AJxtHHW/EcA1/4BH8req3o2IMT7x7WBKgL 5XK7rMkHRdk0h/5cBJnbjOZ/p3pwrX68zascZmObLz8tStVqc9RiexA49nNqgOKAy/jcC5lPS3qO VeKxPVmnQ1XOIbbn1vbm1gRI9MOnZSCZ6QpjGI9LdunuII/fsULG3j25N6p7EmIrfhI+5KN51wPe OZ6afoqu8Onsbk823DVA8TEIDqSkN6NdZxJk5d5Lfu3XcLqx2MqXLzaXWns6Wq1LAYoTeVP4TMp2 KuWQcdnk8M+2DMlulzMnMBdF3lSOq3UPOvYg9jej3d/oiu7YInts0/SyvcrWsQBxhNG5x1tNHwV5 QYW+YXOcnD448QG5zj9Mtp+sJWEXtYbOwaKtpQDJhAxRYDPaJXC685C1AXrSVndA+PrRiC+pilRC eCOrzVp8dKwz1/mW+vzlF0R2z1ac2rBtfiPUH1ZxuvOt7c/pi2z08mPqS+xP58lmLbrneGJjTRt9 e3r2JkpbHoF5vPXKSGkzmmhnzrj38RjLDgfWPCbx5q+XqvbVoukDD08egd5Oghzbva3pWX+mPPgO 2drJWr4+lyXwoIiiq4SNHXpMWoPpXy/N5RjmC0rHzaJUH56rgGTGVmKxE6AYedZHYPSc06Y6lv56 ieeP5yg/R2buiDnXqFdQLmlRNi97U56aGoGPTCojC12nuazjBa3H4txfFK0H+cdyxnNtfJ5bM8fH 3GEZk4kv5vYqKBvbYRo4Nz82eIynsQ+806D09bx5XtxO/rDaPEqX/qKY49Z1ndrnVxLUZe1v9Nkg UBUELooO/bVQxAUvPM4suQ46bDx/CYzezpO5i5pka42e2FZht4teKXJX9D3YmFPhYr8scl3sbLiN u5781XHJ57Ga7pcShkKErxdBPodTnvD2Fg/MHWPzfWPG4OionDk9sc0XPnWeab/7PE1g7M7p2fN5 Klx2x5v8ydaJlLy1KLcG/tbCGSSbKP8ekj0gM6XYVRU27n8w8Pi7jeeFDcfG9C+B1h5veQSTbUeO bX2IDn38QD+7sW0OH9gHxOZmVL9z2c0FmH9Zux9y5uNAjOTuGBW2ThyLbFsanZ5eihyl02bYh1TO ZrT5jW8CG7AXv/rl29fjkzl7CV/ayEdmNkB5KKoczn5adH0rca3aRJ0Bn1vKKZ7+JdA/BiVAVcju EgREINlRHSBYZI89FPGyJWg9AOaBbvPW3Y3A9zeK9gJi8Rgo4ij6ftGPin5b5BH3uyJlfbdIpb1Z 9L2iHxcJKEdUhdbR+KTIhgU5rX4n8/joZ4c9duMDfzpsytdO8G4UScKviti0cS391iEn4hfVt/77 Iuv8ja+SQ+5uEYwna+xs5offuYfi67XCacGQEaD04yKKoX8yzckWOhUC5rV8COxMH4qSAfFlM9r9 faWGgiWoqzEXIAEIiTClyl1wBM+mEwz3g4rS4gXHSZY5u+RwLQ98jih9WhlOxjNPV5JS3QH46ea/ RGU9PqStpRGZYyP7zj74bC7jUSiM40R1srF+PpUrJ1IRaXsAXt0qmbtUt0uzDR2xlcBijLPZ2Jxw 7OcYujOBLwnaMNF+EnDrsZs4ZF8jexbGidaJ8Sc1d6dIicoWJR8VQZzvPJnbcMz/ckw13iq6KEoG Y7OmBufpuijC5xgJvkv7soh8+OMPP1QgHv05kBEc6/TQayzI0ZPk1NT5OJShUzS+U8wcdky1j4tU K6QS71ffWsgRuV4EfDjmR4rgbvHSEVs+DFmr7ogdfYcYMFEG+u6DwFhmRVkl4Jvy1NQsopPdL4ty JDJPJ12QNpWglWVfn4B9MvxD0VPd8QsVPWmtAVnJ8KFRdWTpQiPmAoSxG4rgKNQ64Vviaex7XU5C qkXrGINKgfAIjk0KanhynLXpV3cHU94s8jnvM232kvWhnQsQR9wzswI70qcNZMbnu2fIXWEDqsLG Py3K8blW/f4o1Z/yJPO1dBD2SP/LW45UUtqDghZ6gPRF8nbRvSIO9aNVw1kwdCiY1gREZXxSdLPI GyZBuqz+gyIQKMH5oMi7y9PC1+i9IptzHMx1HlV2bKPxIQHKng75XCqfogcos75WMnMjE1fY5rjE OV8i1CE4xx6l4elyX0l/LkA5y7KTdXPZ1CFHppUkGLKlWrS5U6o7ZJ0+84isdUdo+iitqQGOvmB2 HjLsTH2jj94gVYQvFW1P4bHPrKW6B9kEYBhMfhimGCXzE5ajQ0Yjm5aQeXo5mYRUd7grHCtr7sGO J9uB+yQ8/V/znTf92NEmGFnz77n8kyUXuTW28Q8wCATLHXS36N0iQo4axy6LvihiZBSu/hwEQqY9 7i6K6KTbG+cnRTZIj8BcFOFjowewhmchQXffuEsFOZXysPoegipxp0q2Y7wfFj0q4suUZzxOAiQI xx5UxbKId2q16/GFctFCPuv3q48nxKakdNytQda1czydX19CfBTCr327qIOd7DH6+QPkB6zJGp5s jFLC2imZR9eKQKY6erVyCHJs3Dug5GNLRjvwkvN17UcsfsQvMnRM95avGL18wUMXnfHji+rvgNJj oMAxAW02N0ws/OyV6AxvNpH7Qet4QpzejDYBtzGXtFc4P1RAR5Iw52fumeiVFLrIJJmp7FHnmgDF KCF9jlEoE4JgTjt9BNbUDtYEVsDe2Eqx4b4CXyvZtqHHRdeLQPWATQts/DMXv9OqIPslKzhausBY RX1u0LEmQH1jMiwYt4vuFTFgI877zSJHJA5VdzVSSf5s+5siNlyuvjRLD8Vs7E7xvV8U/6o7Vnqq k88/t1BQKZ8WvVVkDz3QNRxPzNPLyOwJyGPyzZJJQLLJE9TssdLhfpnC8fi4KMl6vfr9McmfJZB7 aUudT3BU/kGcu6mcZ2XNeNqDhlYu0EW3I6U6QDVB7gfZtha71nJH5kSomryvrOlHb75cdPigSLD3 FP2ptupuEIUZH2tTLbIBaZ3nc4M9KKofG6Y/5Z752LAeuC/wZi1+JaiOuuMJCexm9PRXpeYr1i97 ukZbpwYoWfHgApejDbnc9M9FgkPHZZHPLUfdb7EV23juFDlWmavu+D8S+vDepln8/eV2VZUK9odF j4oke6jcUwNEiOMPt1TNHsbo760cnohMNp8jEwk2EwzH+f0sbNu71b7b5hxRX61cBW1p7EqsREwr bCdAa48FByH8zirFjISs4Qtv2po6igQI4/Ut9/ReiH5tbPrsQ2zNHTG8CiEy9OJ3THPEJAYEbAdr K0hGIFnUpj8stJ9k7dB6Yx0vxWRRm032e4FMgqjNxT21lUt2eklHlp6AnSt5KMrYG1utNjBnbLs8 NILugafEIdndjHZ/3V02iZ+z3iapIBk/11a3qU+P+yyXOpvsPC4CwVJR/NnBUgUJDPTH22Zm9zcO ZNZYhhOgZLU7neq6LL4HRRCnP6i+d46q7TI13ENsZeOx1QNrjj+3i+4V9WS8VWNBkgzIURvvwKUA bUQ2945P4rOiO52+Cxd1CI5H4FXDV08gbhQl8IKz+FCcC1DO9xjFUmJD2VR1Z8Fo5zFOhh3NVE0X Do/Wug0od//NrYJUcddZw1lED98P2cp9JSGOmzaVkyqrqV17cwF6CVchf7bYjJ79VxXaCGgTdG2O szV3gfVjfy3EewhTW/iyr7S566zFF/0d9AClcvIwcx674zuCJw5kyAWYMz6tioyt3ymaPgJrajWm tlK5fV8qZ8mfg8aS4YMM/6cLZ+9rTlDVXFXlTOPZ77XpWsa9qjN3Tju1NbevKc85dp7LPI/AQgT+ B20zDNyIggcqAAAAAElFTkSuQmCC "
id="image3775"
x="0"
y="0" />
</svg>
pixmaps/ring.svg deleted 100644 → 0
View file @ 7a910e84
This diff is collapsed.
sounds/sounds.gresource.xml
View file @ 6eaaf0d8
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/cx/ring/RingGnome">
<gresource prefix="/cx/jami/JamiGnome">
<file>ringtone_notify.wav</file>
</gresource>
</gresources>
src/accountcreationwizard.cpp
View file @ 6eaaf0d8
......@@ -138,7 +138,7 @@ account_creation_wizard_class_init(AccountCreationWizardClass *klass)
G_OBJECT_CLASS(klass)->dispose = account_creation_wizard_dispose;
gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass),
"/cx/ring/RingGnome/accountcreationwizard.ui");
"/cx/jami/JamiGnome/accountcreationwizard.ui");
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountCreationWizard, stack_account_creation);
......@@ -515,7 +515,7 @@ build_creation_wizard_view(AccountCreationWizard *view, gboolean show_cancel_but
/* set ring logo */
GError *error = NULL;
GdkPixbuf* logo_ring = gdk_pixbuf_new_from_resource_at_scale("/cx/ring/RingGnome/ring-logo-blue",
GdkPixbuf* logo_ring = gdk_pixbuf_new_from_resource_at_scale("/cx/jami/JamiGnome/jami-logo-blue",
-1, 50, TRUE, &error);
if (logo_ring == NULL) {
g_debug("Could not load logo: %s", error->message);
......
src/accountgeneraltab.cpp
View file @ 6eaaf0d8
......@@ -126,7 +126,7 @@ account_general_tab_class_init(AccountGeneralTabClass *klass)
G_OBJECT_CLASS(klass)->dispose = account_general_tab_dispose;
gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass),
"/cx/ring/RingGnome/accountgeneraltab.ui");
"/cx/jami/JamiGnome/accountgeneraltab.ui");
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, stack_account_general);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, account_general);
......@@ -254,7 +254,7 @@ export_on_the_ring_clicked(G_GNUC_UNUSED GtkButton *button, AccountGeneralTab *v
if (!priv->account->exportOnRing(password))
{
QObject::disconnect(priv->export_on_ring_ended);
gtk_label_set_text(GTK_LABEL(priv->label_export_on_ring_error), _("Could not initiate export to the Ring, try again"));
gtk_label_set_text(GTK_LABEL(priv->label_export_on_ring_error), _("Could not initiate export to the Jami, try again"));
g_debug("Could not initiate exportOnRing operation");
show_export_on_ring_error(view);
}
......@@ -409,13 +409,13 @@ replace_name_from_row(GtkWidget* row, const std::string& name, const std::string
auto* new_label_name = gtk_label_new(name.c_str());
gtk_container_add(GTK_CONTAINER(box_info->data), new_label_name);
gtk_widget_set_halign(GTK_WIDGET(new_label_name), GTK_ALIGN_START);
auto image = gtk_image_new_from_resource("/cx/ring/RingGnome/edit");
auto image = gtk_image_new_from_resource("/cx/jami/JamiGnome/edit");
gtk_button_set_image(GTK_BUTTON(action_button->data), image);
} else {
auto* entry_name = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(entry_name), name.c_str());
gtk_container_add(GTK_CONTAINER(box_info->data), entry_name);
auto image = gtk_image_new_from_resource("/cx/ring/RingGnome/save");
auto image = gtk_image_new_from_resource("/cx/jami/JamiGnome/save");
gtk_button_set_image(GTK_BUTTON(action_button->data), image);
}
auto* new_label_id = gtk_label_new("");
......@@ -553,9 +553,9 @@ add_device(AccountGeneralTab *view, const lrc::api::Device& device)
gtk_container_add(GTK_CONTAINER(device_info_box), label_id);
gtk_container_add(GTK_CONTAINER(device_box), device_info_box);
// Add action button
auto image = gtk_image_new_from_resource("/cx/ring/RingGnome/edit");
auto image = gtk_image_new_from_resource("/cx/jami/JamiGnome/edit");
if (!device.isCurrent)
image = gtk_image_new_from_resource("/cx/ring/RingGnome/revoke");
image = gtk_image_new_from_resource("/cx/jami/JamiGnome/revoke");
auto* action_device_button = gtk_button_new();
gtk_widget_set_tooltip_text(action_device_button, device.isCurrent ? _("Save name") : _("Revoke device"));
gtk_button_set_image(GTK_BUTTON(action_device_button), image);
......
src/accountmigrationview.cpp
View file @ 6eaaf0d8
......@@ -105,7 +105,7 @@ account_migration_view_class_init(AccountMigrationViewClass *klass)
G_OBJECT_CLASS(klass)->dispose = account_migration_view_dispose;
gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass),
"/cx/ring/RingGnome/accountmigrationview.ui");
"/cx/jami/JamiGnome/accountmigrationview.ui");
/* main_view */
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountMigrationView, main_view);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountMigrationView, label_account_alias);
......
src/avatarmanipulation.cpp
View file @ 6eaaf0d8
......@@ -175,7 +175,7 @@ avatar_manipulation_class_init(AvatarManipulationClass *klass)
G_OBJECT_CLASS(klass)->finalize = avatar_manipulation_finalize;
G_OBJECT_CLASS(klass)->dispose = avatar_manipulation_dispose;
gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass), "/cx/ring/RingGnome/avatarmanipulation.ui");
gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass), "/cx/jami/JamiGnome/avatarmanipulation.ui");
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AvatarManipulation, box_views_and_controls);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AvatarManipulation, box_controls);
......
src/chatview.cpp
View file @ 6eaaf0d8
......@@ -319,7 +319,7 @@ chat_view_class_init(ChatViewClass *klass)
G_OBJECT_CLASS(klass)->dispose = chat_view_dispose;
gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass),
"/cx/ring/RingGnome/chatview.ui");
"/cx/jami/JamiGnome/chatview.ui");
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), ChatView, box_webkit_chat_container);
......
src/currentcallview.cpp
View file @ 6eaaf0d8
......@@ -381,9 +381,9 @@ on_togglebutton_muteaudio_clicked(CurrentCallView* view)
lrc::api::NewCallModel::Media::AUDIO);
auto togglebutton = GTK_TOGGLE_BUTTON(priv->togglebutton_muteaudio);
auto image = gtk_image_new_from_resource ("/cx/ring/RingGnome/mute_audio");
auto image = gtk_image_new_from_resource ("/cx/jami/JamiGnome/mute_audio");
if (gtk_toggle_button_get_active(togglebutton))
image = gtk_image_new_from_resource ("/cx/ring/RingGnome/unmute_audio");
image = gtk_image_new_from_resource ("/cx/jami/JamiGnome/unmute_audio");
gtk_button_set_image(GTK_BUTTON(togglebutton), image);
}
......@@ -401,9 +401,9 @@ on_togglebutton_mutevideo_clicked(CurrentCallView* view)
lrc::api::NewCallModel::Media::VIDEO);
auto togglebutton = GTK_TOGGLE_BUTTON(priv->togglebutton_mutevideo);
auto image = gtk_image_new_from_resource ("/cx/ring/RingGnome/mute_video");
auto image = gtk_image_new_from_resource ("/cx/jami/JamiGnome/mute_video");
if (gtk_toggle_button_get_active(togglebutton))
image = gtk_image_new_from_resource ("/cx/ring/RingGnome/unmute_video");
image = gtk_image_new_from_resource ("/cx/jami/JamiGnome/unmute_video");
gtk_button_set_image(GTK_BUTTON(togglebutton), image);
}
......@@ -1002,23 +1002,23 @@ CppImpl::updateState()
auto call = (*accountInfo)->callModel->getCall(callId);
auto pauseBtn = GTK_TOGGLE_BUTTON(widgets->togglebutton_hold);
auto image = gtk_image_new_from_resource ("/cx/ring/RingGnome/pause");
auto image = gtk_image_new_from_resource ("/cx/jami/JamiGnome/pause");
if (call.status == lrc::api::call::Status::PAUSED)
image = gtk_image_new_from_resource ("/cx/ring/RingGnome/play");
image = gtk_image_new_from_resource ("/cx/jami/JamiGnome/play");
gtk_button_set_image(GTK_BUTTON(pauseBtn), image);
auto audioButton = GTK_TOGGLE_BUTTON(widgets->togglebutton_muteaudio);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->togglebutton_muteaudio), call.audioMuted);
auto imageMuteAudio = gtk_image_new_from_resource ("/cx/ring/RingGnome/mute_audio");
auto imageMuteAudio = gtk_image_new_from_resource ("/cx/jami/JamiGnome/mute_audio");
if (call.audioMuted)
imageMuteAudio = gtk_image_new_from_resource ("/cx/ring/RingGnome/unmute_audio");
imageMuteAudio = gtk_image_new_from_resource ("/cx/jami/JamiGnome/unmute_audio");
gtk_button_set_image(GTK_BUTTON(audioButton), imageMuteAudio);
auto videoButton = GTK_TOGGLE_BUTTON(widgets->togglebutton_mutevideo);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->togglebutton_mutevideo), call.videoMuted);
auto imageMuteVideo = gtk_image_new_from_resource ("/cx/ring/RingGnome/mute_video");
auto imageMuteVideo = gtk_image_new_from_resource ("/cx/jami/JamiGnome/mute_video");
if (call.videoMuted)
imageMuteVideo = gtk_image_new_from_resource ("/cx/ring/RingGnome/unmute_video");
imageMuteVideo = gtk_image_new_from_resource ("/cx/jami/JamiGnome/unmute_video");
gtk_button_set_image(GTK_BUTTON(videoButton), imageMuteVideo);
gchar *status = g_strdup_printf("%s", lrc::api::call::to_string(call.status).c_str());
......@@ -1193,7 +1193,7 @@ current_call_view_class_init(CurrentCallViewClass *klass)
G_OBJECT_CLASS(klass)->dispose = current_call_view_dispose;
gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass),
"/cx/ring/RingGnome/currentcallview.ui");
"/cx/jami/JamiGnome/currentcallview.ui");
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), CurrentCallView, hbox_call_info);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), CurrentCallView, hbox_call_controls);
......
src/dialogs.c
View file @ 6eaaf0d8
......@@ -74,7 +74,7 @@ ring_about_dialog(GtkWidget *parent)
/* get logo */
GError *error = NULL;
GdkPixbuf* logo = gdk_pixbuf_new_from_resource("/cx/ring/RingGnome/ring-logo-blue", &error);
GdkPixbuf* logo = gdk_pixbuf_new_from_resource("/cx/jami/JamiGnome/jami-logo-blue", &error);
if (logo == NULL) {
g_debug("Could not load logo: %s", error->message);
g_clear_error(&error);
......@@ -134,10 +134,10 @@ ring_about_dialog(GtkWidget *parent)
"license-type", GTK_LICENSE_GPL_3_0,
"logo", logo,
"version", version,
"comments", _("The GNOME client for Ring.\nRing is free software for universal communication which respects the freedoms and privacy of its users."),
"comments", _("The GNOME client for Jami.\nJami is free software for universal communication which respects the freedoms and privacy of its users."),
"authors", authors,
"website", "https://www.ring.cx/",
"website-label", "www.ring.cx",
"website", "https://jami.net/",
"website-label", "jami.net",
"translator-credits", "https://www.transifex.com/savoirfairelinux/ring",
NULL
);
......
src/generalsettingsview.cpp
View file @ 6eaaf0d8
......@@ -313,7 +313,7 @@ general_settings_view_class_init(GeneralSettingsViewClass *klass)
object_class->dispose = general_settings_view_dispose;
gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass),
"/cx/ring/RingGnome/generalsettingsview.ui");
"/cx/jami/JamiGnome/generalsettingsview.ui");
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, checkbutton_autostart);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, checkbutton_showstatusicon);
......
src/incomingcallview.cpp
View file @ 6eaaf0d8
......@@ -201,7 +201,7 @@ incoming_call_view_class_init(IncomingCallViewClass *klass)
G_OBJECT_CLASS(klass)->dispose = incoming_call_view_dispose;
gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass),
"/cx/ring/RingGnome/incomingcallview.ui");
"/cx/jami/JamiGnome/incomingcallview.ui");
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), IncomingCallView, paned_call);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), IncomingCallView, image_incoming);
......
src/mediasettingsview.cpp
View file @ 6eaaf0d8
......@@ -249,7 +249,7 @@ media_settings_view_class_init(MediaSettingsViewClass *klass)
G_OBJECT_CLASS(klass)->dispose = media_settings_view_dispose;
gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass),
"/cx/ring/RingGnome/mediasettingsview.ui");
"/cx/jami/JamiGnome/mediasettingsview.ui");
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), MediaSettingsView, vbox_main);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), MediaSettingsView, combobox_manager);
......
src/messagingwidget.cpp
View file @ 6eaaf0d8
......@@ -303,7 +303,7 @@ messaging_widget_class_init(MessagingWidgetClass *klass)
G_OBJECT_CLASS(klass)->finalize = messaging_widget_finalize;
G_OBJECT_CLASS(klass)->dispose = messaging_widget_dispose;
gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass), "/cx/ring/RingGnome/messagingwidget.ui");
gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass), "/cx/jami/JamiGnome/messagingwidget.ui");
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), MessagingWidget, image_send);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), MessagingWidget, image_stop);
......
src/native/dbuserrorhandler.cpp
View file @ 6eaaf0d8
......@@ -33,7 +33,7 @@ dring_crash_dialog()
gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
gtk_window_set_decorated(GTK_WINDOW(dialog), FALSE);
gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
gtk_window_set_title(GTK_WINDOW(dialog), C_("Name of error window (dialog)","Ring Error"));
gtk_window_set_title(GTK_WINDOW(dialog), C_("Name of error window (dialog)","Jami Error"));
/* get the main window */
if (auto app = g_application_get_default()) {
......@@ -54,7 +54,7 @@ dring_crash_dialog()
gtk_widget_set_margin_top(content_area, 25);
auto message = gtk_label_new(
_("Trying to reconnect to the Ring daemon (dring)…")
_("Trying to reconnect to the Jami daemon (dring)…")
);
gtk_box_pack_start(GTK_BOX(content_area), message, FALSE, TRUE, 0);
......@@ -84,7 +84,7 @@ ring_quitting_dialog()
win,
(GtkDialogFlags)(GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT),
GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
_("Could not re-connect to the Ring daemon (dring).\nRing will now quit.")
_("Could not re-connect to the Jami daemon (dring).\nJami will now quit.")
);
if (win) {
......@@ -92,7 +92,7 @@ ring_quitting_dialog()
} else {
gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
}
gtk_window_set_title(GTK_WINDOW(dialog), C_("Name of error window (dialog)","Ring Error"));
gtk_window_set_title(GTK_WINDOW(dialog), C_("Name of error window (dialog)","Jami Error"));
gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
return dialog;
......
src/native/pixbufmanipulator.cpp
View file @ 6eaaf0d8
......@@ -48,7 +48,7 @@ PixbufManipulator::temporaryItemAvatar() const
{
GError *error = nullptr;
std::shared_ptr<GdkPixbuf> result(
gdk_pixbuf_new_from_resource("/cx/ring/RingGnome/temporary-item", &error),
gdk_pixbuf_new_from_resource("/cx/jami/JamiGnome/temporary-item", &error),
g_object_unref
);
......
src/newaccountsettingsview.cpp
View file @ 6eaaf0d8
......@@ -245,7 +245,7 @@ new_account_settings_view_class_init(NewAccountSettingsViewClass *klass)
object_class->dispose = new_account_settings_view_dispose;
gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS(klass),
"/cx/ring/RingGnome/newaccountsettingsview.ui");
"/cx/jami/JamiGnome/newaccountsettingsview.ui");
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS(klass), NewAccountSettingsView, stack_account);
......@@ -1726,7 +1726,7 @@ export_on_the_ring_clicked(G_GNUC_UNUSED GtkButton *button, NewAccountSettingsVi
if (!(*priv->accountInfo_)->accountModel->exportOnRing((*priv->accountInfo_)->id, passwordStr))
{
QObject::disconnect(priv->export_on_ring_ended);
gtk_label_set_text(GTK_LABEL(priv->label_export_on_ring_error), _("Could not initiate export to the Ring, try again"));
gtk_label_set_text(GTK_LABEL(priv->label_export_on_ring_error), _("Could not initiate export to the Jami, try again"));
g_debug("Could not initiate exportOnRing operation");
show_export_on_ring_error(view);
}
......
src/ring.cx
View file @ 6eaaf0d8
......@@ -32,7 +32,7 @@ fi
# No clients installd
if [ $HAS_KDE == "0" ] && [ $HAS_GNOME == "0" ]; then
echo "Ring not found" >&2
echo "Jami not found" >&2
exit 1
fi
......
src/ring_client.cpp
View file @ 6eaaf0d8
......@@ -138,10 +138,10 @@ exception_dialog(const char* msg)
GtkWidget *dialog = gtk_message_dialog_new(NULL,
(GtkDialogFlags)(GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT),
GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
_("Unable to initialize.\nMake sure the Ring daemon (dring) is running.\nError: %s"),
_("Unable to initialize.\nMake sure the Jami daemon (dring) is running.\nError: %s"),
msg);
gtk_window_set_title(GTK_WINDOW(dialog), _("Ring Error"));
gtk_window_set_title(GTK_WINDOW(dialog), _("Jami Error"));
gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(dialog);
}
......@@ -284,7 +284,7 @@ init_systray(RingClient *client)
priv->icon_menu = gtk_menu_new();
g_object_ref_sink(priv->icon_menu);
auto item = gtk_check_menu_item_new_with_label(C_("In the status icon menu, toggle action to show or hide the Ring main window", "Show Ring"));
auto item = gtk_check_menu_item_new_with_label(C_("In the status icon menu, toggle action to show or hide the Jami main window", "Show Jami"));
gtk_actionable_set_action_name(GTK_ACTIONABLE(item), "app.show-main-window");
gtk_menu_shell_append(GTK_MENU_SHELL(priv->icon_menu), item);
......@@ -464,7 +464,7 @@ ring_client_startup(GApplication *app)
RingClient *client = RING_CLIENT(app);
RingClientPrivate *priv = RING_CLIENT_GET_PRIVATE(client);
g_message("Ring GNOME client version: %d.%02d.%02d", VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH);
g_message("Jami GNOME client version: %d.%02d.%02d", VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH);
g_message("git ref: %s", RING_CLIENT_REVISION);
/* make sure that the system corresponds to the autostart setting */
......
src/ring_client_options.c
View file @ 6eaaf0d8
......@@ -82,7 +82,7 @@ ring_client_add_options(GApplication *app) {
GOptionContext *
ring_client_options_get_context()
{
GOptionContext *context = g_option_context_new(_("- GNOME client for Ring"));
GOptionContext *context = g_option_context_new(_("- GNOME client for Jami"));
g_option_context_set_ignore_unknown_options(context, TRUE);
g_option_context_add_main_entries(context, all_options, PACKAGE_NAME);
g_option_context_add_group(context, gtk_get_option_group(TRUE));
......
src/ringmainwindow.cpp
View file @ 6eaaf0d8
......@@ -233,7 +233,7 @@ render_account_avatar(G_GNUC_UNUSED GtkCellLayout* cell_layout,
g_free(avatar);
g_free(id);
GdkPixbuf* icon = gdk_pixbuf_new_from_resource("/cx/ring/RingGnome/add-device", nullptr);
GdkPixbuf* icon = gdk_pixbuf_new_from_resource("/cx/jami/JamiGnome/add-device", nullptr);
g_object_set(G_OBJECT(cell), "width", 32, nullptr);
g_object_set(G_OBJECT(cell), "height", 32, nullptr);
g_object_set(G_OBJECT(cell), "pixbuf", icon, nullptr);
......@@ -963,7 +963,7 @@ CppImpl::init()
/* set window icon */
GError *error = NULL;
GdkPixbuf* icon = gdk_pixbuf_new_from_resource("/cx/ring/RingGnome/ring-symbol-blue", &error);
GdkPixbuf* icon = gdk_pixbuf_new_from_resource("/cx/jami/JamiGnome/jami-symbol-blue", &error);
if (icon == NULL) {
g_debug("Could not load icon: %s", error->message);
g_clear_error(&error);
......@@ -971,7 +971,7 @@ CppImpl::init()
gtk_window_set_icon(GTK_WINDOW(self), icon);
/* set menu icon */
GdkPixbuf* image_ring = gdk_pixbuf_new_from_resource_at_scale("/cx/ring/RingGnome/ring-symbol-blue",
GdkPixbuf* image_ring = gdk_pixbuf_new_from_resource_at_scale("/cx/jami/JamiGnome/jami-symbol-blue",
<