depau/Purism-Calls
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/calls.git synced 2024-06-30 07:39:33 +00:00
Code Issues Releases Wiki Activity

call-display: Add a dial pad overlay

Browse source 
Put the call display in an GtkOverlay and add a dial pad sending DTMF
tones as an overlay. Also make the dial pad overlay be triggered by the
dial pad button.
This commit is contained in:
Adrien Plazas 2018-08-01 11:45:05 +02:00
parent 0d98e17b05
commit 6182961f07
3 changed files with 225 additions and 125 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/calls-call-display.c
View file

@ -35,7 +35,7 @@
struct _CallsCallDisplay struct _CallsCallDisplay
{ {
GtkBox parent_instance; GtkOverlay parent_instance;
CallsCall *call; CallsCall *call;
GTimer *timer; GTimer *timer;
@ -51,9 +51,11 @@ struct _CallsCallDisplay
GtkToggleButton *mute; GtkToggleButton *mute;
GtkButton *hang_up; GtkButton *hang_up;
GtkToggleButton *speaker; GtkToggleButton *speaker;
GtkRevealer *dial_pad_revealer;
}; };
G_DEFINE_TYPE (CallsCallDisplay, calls_call_display, GTK_TYPE_BOX); G_DEFINE_TYPE (CallsCallDisplay, calls_call_display, GTK_TYPE_OVERLAY);
enum { enum {
PROP_0, PROP_0,
@ -99,6 +101,20 @@ speaker_toggled_cb (GtkToggleButton *togglebutton,
} }
static void
dial_pad_symbol_clicked_cb (CallsCallDisplay *self,
gchar symbol,
HdyDialer *dialer)
{
calls_call_tone_start (self->call, symbol);
}
static void
hide_dial_pad_clicked_cb (CallsCallDisplay *self)
{
gtk_revealer_set_reveal_child (self->dial_pad_revealer, FALSE);
}
static gboolean static gboolean
timeout_cb (CallsCallDisplay *self) timeout_cb (CallsCallDisplay *self)
{ {
@ -213,7 +229,7 @@ set_party (CallsCallDisplay *self, CallsParty *party)
const gchar *name, *number; const gchar *name, *number;
image = calls_party_create_image (party); image = calls_party_create_image (party);
gtk_box_pack_start (self->party_box, image, TRUE, TRUE, 0); gtk_box_pack_end (self->party_box, image, TRUE, FALSE, 0);
gtk_image_set_pixel_size (GTK_IMAGE (image), 100); gtk_image_set_pixel_size (GTK_IMAGE (image), 100);
gtk_widget_show (image); gtk_widget_show (image);
@ -255,7 +271,7 @@ set_property (GObject *object,
static void static void
constructed (GObject *object) constructed (GObject *object)
{ {
GObjectClass *parent_class = g_type_class_peek (GTK_TYPE_BOX); GObjectClass *parent_class = g_type_class_peek (GTK_TYPE_OVERLAY);
CallsCallDisplay *self = CALLS_CALL_DISPLAY (object); CallsCallDisplay *self = CALLS_CALL_DISPLAY (object);
self->timer = g_timer_new (); self->timer = g_timer_new ();
@ -276,7 +292,7 @@ calls_call_display_init (CallsCallDisplay *self)
static void static void
dispose (GObject *object) dispose (GObject *object)
{ {
GObjectClass *parent_class = g_type_class_peek (GTK_TYPE_BOX); GObjectClass *parent_class = g_type_class_peek (GTK_TYPE_OVERLAY);
CallsCallDisplay *self = CALLS_CALL_DISPLAY (object); CallsCallDisplay *self = CALLS_CALL_DISPLAY (object);
g_clear_object (&self->call); g_clear_object (&self->call);
@ -287,7 +303,7 @@ dispose (GObject *object)
static void static void
finalize (GObject *object) finalize (GObject *object)
{ {
GObjectClass *parent_class = g_type_class_peek (GTK_TYPE_BOX); GObjectClass *parent_class = g_type_class_peek (GTK_TYPE_OVERLAY);
CallsCallDisplay *self = CALLS_CALL_DISPLAY (object); CallsCallDisplay *self = CALLS_CALL_DISPLAY (object);
g_source_remove (self->timeout); g_source_remove (self->timeout);
@ -327,8 +343,11 @@ calls_call_display_class_init (CallsCallDisplayClass *klass)
gtk_widget_class_bind_template_child (widget_class, CallsCallDisplay, mute); gtk_widget_class_bind_template_child (widget_class, CallsCallDisplay, mute);
gtk_widget_class_bind_template_child (widget_class, CallsCallDisplay, hang_up); gtk_widget_class_bind_template_child (widget_class, CallsCallDisplay, hang_up);
gtk_widget_class_bind_template_child (widget_class, CallsCallDisplay, speaker); gtk_widget_class_bind_template_child (widget_class, CallsCallDisplay, speaker);
gtk_widget_class_bind_template_child (widget_class, CallsCallDisplay, dial_pad_revealer);
gtk_widget_class_bind_template_callback (widget_class, answer_clicked_cb); gtk_widget_class_bind_template_callback (widget_class, answer_clicked_cb);
gtk_widget_class_bind_template_callback (widget_class, hang_up_clicked_cb); gtk_widget_class_bind_template_callback (widget_class, hang_up_clicked_cb);
gtk_widget_class_bind_template_callback (widget_class, mute_toggled_cb); gtk_widget_class_bind_template_callback (widget_class, mute_toggled_cb);
gtk_widget_class_bind_template_callback (widget_class, speaker_toggled_cb); gtk_widget_class_bind_template_callback (widget_class, speaker_toggled_cb);
gtk_widget_class_bind_template_callback (widget_class, dial_pad_symbol_clicked_cb);
gtk_widget_class_bind_template_callback (widget_class, hide_dial_pad_clicked_cb);
} }

2
src/calls-call-display.h
View file

@ -33,7 +33,7 @@ G_BEGIN_DECLS
#define CALLS_TYPE_CALL_DISPLAY (calls_call_display_get_type ()) #define CALLS_TYPE_CALL_DISPLAY (calls_call_display_get_type ())
G_DECLARE_FINAL_TYPE (CallsCallDisplay, calls_call_display, CALLS, CALL_DISPLAY, GtkBox); G_DECLARE_FINAL_TYPE (CallsCallDisplay, calls_call_display, CALLS, CALL_DISPLAY, GtkOverlay);
CallsCallDisplay *calls_call_display_new (CallsCallData *data); CallsCallDisplay *calls_call_display_new (CallsCallData *data);

83
src/ui/call-display.ui
View file

@ -2,8 +2,11 @@
<!-- Generated with glade 3.22.0 --> <!-- Generated with glade 3.22.0 -->
<interface> <interface>
<requires lib="gtk+" version="3.20"/> <requires lib="gtk+" version="3.20"/>
<template class="CallsCallDisplay" parent="GtkBox"> <template class="CallsCallDisplay" parent="GtkOverlay">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkBox">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">center</property> <property name="halign">center</property>
<property name="margin_bottom">8</property> <property name="margin_bottom">8</property>
@ -12,7 +15,9 @@
<property name="margin_top">8</property> <property name="margin_top">8</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="visible">True</property>
<property name="width_request">300</property> <property name="width_request">300</property>
<property name="sensitive" bind-source="dial_pad_revealer" bind-property="reveal-child" bind-flags="invert-boolean|bidirectional|sync-create"/>
<child> <child>
<object class="GtkBox" id="party_box"> <object class="GtkBox" id="party_box">
<property name="visible">True</property> <property name="visible">True</property>
@ -105,6 +110,7 @@
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="no_show_all">True</property> <property name="no_show_all">True</property>
<property name="active" bind-source="dial_pad_revealer" bind-property="reveal-child" bind-flags="bidirectional|sync-create"/>
<child> <child>
<object class="GtkImage"> <object class="GtkImage">
<property name="visible">True</property> <property name="visible">True</property>
@ -172,5 +178,80 @@
</child> </child>
</object> </object>
</child> </child>
</object>
</child>
<child type="overlay">
<object class="GtkRevealer" id="dial_pad_revealer">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">fill</property>
<property name="valign">end</property>
<property name="hexpand">True</property>
<property name="vexpand">False</property>
<property name="transition-type">slide-up</property>
<property name="reveal-child" bind-source="dial_pad" bind-property="active" bind-flags="bidirectional|sync-create"/>
<child>
<object class="GtkActionBar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<style>
<class name="background"/>
</style>
<child type="center">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="width_request">300</property>
<property name="margin_bottom">6</property>
<property name="margin_top">12</property>
<child>
<object class="HdyDialer">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="column_spacing">10</property>
<property name="margin_bottom">10</property>
<property name="receives_default">True</property>
<property name="row_spacing">8</property>
<property name="show_action_buttons">False</property>
<property name="hexpand">False</property>
<signal name="symbol-clicked" handler="dial_pad_symbol_clicked_cb" swapped="yes"/>
</object>
</child>
<child>
<object class="GtkButton">
<property name="always_show_image">True</property>
<property name="can_focus">True</property>
<property name="halign">center</property>
<property name="height_request">65</property>
<property name="receives_default">True</property>
<property name="valign">start</property>
<property name="relief">none</property>
<property name="visible">True</property>
<property name="width_request">150</property>
<signal name="clicked" handler="hide_dial_pad_clicked_cb" swapped="yes"/>
<style>
<class name="image-button"/>
</style>
<child internal-child="accessible">
<object class="AtkObject" id="a11y-hide-dial-pad">
<property name="accessible-name" translatable="yes">Hide the dial pad</property>
</object>
</child>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="icon-name">go-down-symbolic</property>
<property name="icon-size">5</property>
</object>
</child>
</object>
</child>
</object>
</child>
</object>
</child>
</object>
</child>
</template> </template>
</interface> </interface>