Commit 0d2a69a0 authored by Sébastien Blin's avatar Sébastien Blin

conference: handle conferences informations

Remove the change layout button and improve the UX.
Add the possibility to hangup a conference or a participant.

Gitlab: #1187
Change-Id: Ie7052c75a1dd75e3f96d659c97a3653e6145a882
parent 804cbdc7
......@@ -11,7 +11,7 @@ IF (CMAKE_COMPILER_IS_GNUCC)
ENDIF()
ENDIF()
set (CMAKE_CXX_STANDARD 14)
set (CMAKE_CXX_STANDARD 17)
# set project name and version
PROJECT(jami-client-gnome)
......
<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/>
<path fill="white" d="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"/>
</svg>
\ No newline at end of file
......@@ -61,5 +61,6 @@
<file alias="retry-white">retry-white.svg</file>
<file alias="plugin_white">extension_white_24dp.svg</file>
<file alias="view">view.svg</file>
<file alias="more">more_vert-24px.svg</file>
</gresource>
</gresources>
This diff is collapsed.
......@@ -2409,9 +2409,6 @@ CppImpl::slotShowCallView(const std::string& id, lrc::api::conversation::Info or
return;
}
if (!origin.confId.isEmpty())
accountInfo_->callModel->setActiveParticipant(origin.confId, origin.callId);
changeView(CURRENT_CALL_VIEW_TYPE, origin);
}
......
This diff is collapsed.
......@@ -23,6 +23,9 @@
#include <gtk/gtk.h>
#include <video/renderer.h>
#include <api/newvideo.h>
#include <QJsonObject>
#include "../accountinfopointer.h"
namespace lrc
{
......@@ -67,6 +70,10 @@ gboolean video_widget_on_button_press_in_screen_event (VideoWidget *self,
void video_widget_take_snapshot (VideoWidget *self);
GdkPixbuf* video_widget_get_snapshot (VideoWidget *self);
void video_widget_set_preview_visible (VideoWidget *self, bool show);
void video_widget_add_participant_hover(VideoWidget *self, const QJsonObject& participant);
void video_widget_set_call_info(VideoWidget *self, AccountInfoPointer const & accountInfo, const QString& callId);
void video_widget_remove_hovers(VideoWidget *self);
void video_widget_on_event(VideoWidget *self, GdkEvent* event);
G_END_DECLS
......
......@@ -442,31 +442,6 @@
<property name="fill">True</property>
</packing>
</child>
<child>
<object class="GtkToggleButton" id="togglebutton_view">
<style>
<class name="call-button"/>
</style>
<property name="visible">True</property>
<property name="sensitive">True</property>
<property name="can_focus">True</property>
<property name="width-request">48</property>
<property name="height-request">48</property>
<property name="has_tooltip">True</property>
<property name="relief">normal</property>
<property name="tooltip-text" translatable="yes">Toggle view</property>
<property name="image">image_view</property>
<child internal-child="accessible">
<object class="AtkObject" id="togglebutton_view-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Change video layout</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<object class="GtkToggleButton" id="togglebutton_chat">
<style>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment