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

main-window,new-call-box: Move origin store from MainWindow to NewCallBox

Browse source 
The main window has no need to store origins now so this simplifies
things dramatically.
This commit is contained in:
Bob Ham 2018-10-05 11:27:55 +00:00
parent 21d45ec9d7
commit f4eae98458
5 changed files with 137 additions and 222 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

101
src/calls-main-window.c
View file

@ -50,13 +50,6 @@ struct _CallsMainWindow
GtkStack *main_stack;
GtkStack *header_bar_stack;
GtkListStore *origin_store;
};
enum {
ORIGIN_STORE_COLUMN_NAME,
ORIGIN_STORE_COLUMN_ORIGIN
};
G_DEFINE_TYPE (CallsMainWindow, calls_main_window, GTK_TYPE_APPLICATION_WINDOW);
@ -181,18 +174,6 @@ info_response_cb (GtkInfoBar *infobar,
}
static void
new_call_submitted_cb (CallsMainWindow *self,
CallsOrigin *origin,
const gchar *number,
CallsNewCallBox *new_call_box)
{
g_return_if_fail (CALLS_IS_MAIN_WINDOW (self));
calls_origin_dial (origin, number);
}
typedef gboolean (*FindCallHolderFunc) (CallsCallHolder *holder,
gpointer user_data);
@ -362,15 +343,6 @@ add_origin_calls (CallsMainWindow *self, CallsOrigin *origin)
static void
add_origin (CallsMainWindow *self, CallsOrigin *origin)
{
GtkTreeIter iter;
gtk_list_store_append (self->origin_store, &iter);
gtk_list_store_set (self->origin_store, &iter,
ORIGIN_STORE_COLUMN_NAME, calls_origin_get_name(origin),
ORIGIN_STORE_COLUMN_ORIGIN, G_OBJECT (origin),
-1);
g_signal_connect_swapped (origin, "message",
G_CALLBACK (show_message), self);
g_signal_connect_swapped (origin, "call-added",
@ -382,59 +354,6 @@ add_origin (CallsMainWindow *self, CallsOrigin *origin)
}
static void
dump_list_store (GtkListStore *store)
{
GtkTreeIter iter;
GtkTreeModel *model = GTK_TREE_MODEL (store);
gboolean ok;
ok = gtk_tree_model_get_iter_first (model, &iter);
if (!ok)
{
return;
}
g_debug ("List store:");
do
{
gchararray name;
gtk_tree_model_get (model, &iter,
ORIGIN_STORE_COLUMN_NAME, &name,
-1);
g_debug (" name: `%s'", name);
}
while (gtk_tree_model_iter_next (model, &iter));
}
static void
remove_origin (CallsMainWindow *self, CallsOrigin *origin)
{
GtkTreeIter iter;
gboolean ok;
ok = calls_list_store_find (self->origin_store, origin,
ORIGIN_STORE_COLUMN_ORIGIN, &iter);
g_return_if_fail (ok);
gtk_list_store_remove (self->origin_store, &iter);
}
static void
remove_origins (CallsMainWindow *self)
{
GtkTreeModel *model = GTK_TREE_MODEL (self->origin_store);
GtkTreeIter iter;
while (gtk_tree_model_get_iter_first (model, &iter))
{
gtk_list_store_remove (self->origin_store, &iter);
}
}
static void
add_provider_origins (CallsMainWindow *self, CallsProvider *provider)
{
@ -448,8 +367,6 @@ add_provider_origins (CallsMainWindow *self, CallsProvider *provider)
}
g_list_free (origins);
dump_list_store (self->origin_store);
}
@ -460,11 +377,8 @@ set_provider (CallsMainWindow *self, CallsProvider *provider)
G_CALLBACK (show_message), self);
g_signal_connect_swapped (provider, "origin-added",
G_CALLBACK (add_origin), self);
g_signal_connect_swapped (provider, "origin-removed",
G_CALLBACK (remove_origin), self);
self->provider = provider;
g_object_ref (G_OBJECT (provider));
g_set_object (&self->provider, provider);
add_provider_origins (self, provider);
}
@ -506,6 +420,12 @@ constructed (GObject *object)
GObjectClass *parent_class = g_type_class_peek (GTK_TYPE_APPLICATION_WINDOW);
CallsMainWindow *self = CALLS_MAIN_WINDOW (object);
GSimpleActionGroup *simple_action_group;
CallsNewCallBox *new_call_box;
/* Add new call box */
new_call_box = calls_new_call_box_new (self->provider);
gtk_stack_add_titled (self->main_stack, GTK_WIDGET (new_call_box),
"new-call", _("New call"));
/* Add actions */
simple_action_group = g_simple_action_group_new ();
@ -547,11 +467,6 @@ dispose (GObject *object)
remove_calls (self);
}
if (self->origin_store)
{
remove_origins (self);
}
g_clear_object (&self->call_holders);
g_clear_object (&self->provider);
@ -606,7 +521,5 @@ calls_main_window_class_init (CallsMainWindowClass *klass)
gtk_widget_class_bind_template_child (widget_class, CallsMainWindow, info_label);
gtk_widget_class_bind_template_child (widget_class, CallsMainWindow, main_stack);
gtk_widget_class_bind_template_child (widget_class, CallsMainWindow, header_bar_stack);
gtk_widget_class_bind_template_child (widget_class, CallsMainWindow, origin_store);
gtk_widget_class_bind_template_callback (widget_class, info_response_cb);
gtk_widget_class_bind_template_callback (widget_class, new_call_submitted_cb);
}

223
src/calls-new-call-box.c
View file

@ -35,12 +35,9 @@ struct _CallsNewCallBox
{
GtkBox parent_instance;
GtkListStore *origin_store;
GtkComboBox *origin_box;
GtkSearchEntry *number_entry;
HdyDialer *dial_pad;
gulong origin_store_row_deleted_id;
gulong origin_store_row_inserted_id;
};
G_DEFINE_TYPE (CallsNewCallBox, calls_new_call_box, GTK_TYPE_BOX);
@ -48,19 +45,12 @@ G_DEFINE_TYPE (CallsNewCallBox, calls_new_call_box, GTK_TYPE_BOX);
enum {
PROP_0,
PROP_ORIGIN_STORE,
PROP_PROVIDER,
PROP_LAST_PROP,
};
static GParamSpec *props[PROP_LAST_PROP];
enum {
SIGNAL_SUBMITTED,
SIGNAL_LAST_SIGNAL,
};
static guint signals[SIGNAL_LAST_SIGNAL];
enum {
ORIGIN_STORE_COLUMN_NAME,
ORIGIN_STORE_COLUMN_ORIGIN
@ -96,55 +86,50 @@ dial_clicked_cb (CallsNewCallBox *self,
GtkButton *button)
{
GtkTreeIter iter;
GtkTreeModel *origin_store;
gboolean ok;
CallsOrigin *origin;
const gchar *number;
gtk_combo_box_get_active_iter (self->origin_box, &iter);
if (!gtk_combo_box_get_active_iter (self->origin_box, &iter))
ok = gtk_combo_box_get_active_iter (self->origin_box, &iter);
if (!ok)
{
g_debug ("Can't submit call with no origin.");
g_debug ("Can't submit call with no origin");
return;
}
origin_store = gtk_combo_box_get_model (self->origin_box);
gtk_tree_model_get (origin_store, &iter,
gtk_tree_model_get (GTK_TREE_MODEL (self->origin_store), &iter,
ORIGIN_STORE_COLUMN_ORIGIN, &origin,
-1);
g_assert (CALLS_IS_ORIGIN (origin));
number = gtk_entry_get_text (GTK_ENTRY (self->number_entry));
g_signal_emit (self, signals[SIGNAL_SUBMITTED], 0, origin, number);
calls_origin_dial (origin, number);
}
void
update_origin_box (CallsNewCallBox *self)
{
GtkTreeModel *origin_store = gtk_combo_box_get_model (self->origin_box);
GtkTreeModel *origin_store = GTK_TREE_MODEL (self->origin_store);
GtkTreeIter iter;
if (origin_store == NULL ||
!gtk_tree_model_get_iter_first (origin_store, &iter))
if (!gtk_tree_model_get_iter_first (origin_store, &iter))
{
gtk_widget_hide (GTK_WIDGET (self->origin_box));
return;
}
/* We know there is a model and it's not empty. */
/* We know there is at least one origin. */
if (!gtk_tree_model_iter_next (origin_store, &iter))
{
gtk_combo_box_set_active (self->origin_box, 0);
gtk_widget_hide (GTK_WIDGET (self->origin_box));
return;
}
/* We know there are multiple origins in the model. */
/* We know there are multiple origins. */
if (gtk_combo_box_get_active (self->origin_box) < 0)
{
@ -158,31 +143,93 @@ update_origin_box (CallsNewCallBox *self)
static void
calls_new_call_box_set_origin_store (CallsNewCallBox *self,
GtkListStore *origin_store)
add_origin (CallsNewCallBox *self, CallsOrigin *origin)
{
g_return_if_fail (CALLS_IS_NEW_CALL_BOX (self));
g_return_if_fail (origin_store == NULL || GTK_IS_LIST_STORE (origin_store));
GtkTreeIter iter;
if (self->origin_store_row_deleted_id != 0)
gtk_list_store_append (self->origin_store, &iter);
gtk_list_store_set (self->origin_store, &iter,
ORIGIN_STORE_COLUMN_NAME, calls_origin_get_name (origin),
ORIGIN_STORE_COLUMN_ORIGIN, G_OBJECT (origin),
-1);
update_origin_box (self);
}
static void
remove_origin (CallsNewCallBox *self, CallsOrigin *origin)
{
GtkTreeIter iter;
gboolean ok;
ok = calls_list_store_find (self->origin_store, origin,
ORIGIN_STORE_COLUMN_ORIGIN, &iter);
g_return_if_fail (ok);
gtk_list_store_remove (self->origin_store, &iter);
update_origin_box (self);
}
static void
remove_origins (CallsNewCallBox *self)
{
GtkTreeModel *model = GTK_TREE_MODEL (self->origin_store);
GtkTreeIter iter;
while (gtk_tree_model_get_iter_first (model, &iter))
{
g_signal_handler_disconnect (gtk_combo_box_get_model (self->origin_box),
self->origin_store_row_deleted_id);
g_signal_handler_disconnect (gtk_combo_box_get_model (self->origin_box),
self->origin_store_row_inserted_id);
gtk_list_store_remove (self->origin_store, &iter);
}
}
static void
add_provider_origins (CallsNewCallBox *self, CallsProvider *provider)
{
GList *origins, *node;
origins = calls_provider_get_origins (provider);
for (node = origins; node; node = node->next)
{
add_origin (self, CALLS_ORIGIN (node->data));
}
gtk_combo_box_set_model (self->origin_box, GTK_TREE_MODEL (origin_store));
g_list_free (origins);
}
if (origin_store != NULL)
static void
set_provider (CallsNewCallBox *self, CallsProvider *provider)
{
g_signal_connect_swapped (provider, "origin-added",
G_CALLBACK (add_origin), self);
g_signal_connect_swapped (provider, "origin-removed",
G_CALLBACK (remove_origin), self);
add_provider_origins (self, provider);
}
static void
set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec)
{
CallsNewCallBox *self = CALLS_NEW_CALL_BOX (object);
switch (property_id)
{
self->origin_store_row_deleted_id = g_signal_connect_swapped (origin_store, "row-deleted", G_CALLBACK (update_origin_box), self);
self->origin_store_row_inserted_id = g_signal_connect_swapped (origin_store, "row-inserted", G_CALLBACK (update_origin_box), self);
}
else
{
self->origin_store_row_deleted_id = 0;
self->origin_store_row_inserted_id = 0;
case PROP_PROVIDER:
set_provider (self, CALLS_PROVIDER (g_value_get_object (value)));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
}
}
@ -197,45 +244,17 @@ calls_new_call_box_init (CallsNewCallBox *self)
static void
calls_new_call_box_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec)
dispose (GObject *object)
{
GObjectClass *parent_class = g_type_class_peek (GTK_TYPE_BOX);
CallsNewCallBox *self = CALLS_NEW_CALL_BOX (object);
switch (property_id)
if (self->origin_store)
{
case PROP_ORIGIN_STORE:
calls_new_call_box_set_origin_store (self, g_value_get_object (value));
g_object_notify_by_pspec (object, pspec);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
remove_origins (self);
}
}
static void
calls_new_call_box_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec)
{
CallsNewCallBox *self = CALLS_NEW_CALL_BOX (object);
switch (property_id)
{
case PROP_ORIGIN_STORE:
g_value_set_object (value, gtk_combo_box_get_model (self->origin_box));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
}
parent_class->dispose (object);
}
@ -245,44 +264,34 @@ calls_new_call_box_class_init (CallsNewCallBoxClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
object_class->set_property = calls_new_call_box_set_property;
object_class->get_property = calls_new_call_box_get_property;
object_class->set_property = set_property;
object_class->dispose = dispose;
props[PROP_ORIGIN_STORE] =
g_param_spec_object ("origin-store",
_("Origin store"),
_("The storage for origins"),
GTK_TYPE_LIST_STORE,
G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
props[PROP_PROVIDER] =
g_param_spec_object ("provider",
_("Provider"),
_("An object implementing low-level call-making functionality"),
CALLS_TYPE_PROVIDER,
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
g_object_class_install_properties (object_class, PROP_LAST_PROP, props);
/**
* CallsNewCallBox::submitted:
* @self: The # CallsNewCallBox instance.
* @origin: The origin of the call.
* @number: The number at the time of activation.
*
* This signal is emitted when the dialer's 'dial' button is activated.
* Connect to this signal to perform to get notified when the user
* wants to submit the dialed number for a given call origin.
*/
signals[SIGNAL_SUBMITTED] =
g_signal_new ("submitted",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0,
NULL, NULL, NULL,
G_TYPE_NONE,
2,
CALLS_TYPE_ORIGIN,
G_TYPE_STRING);
gtk_widget_class_set_template_from_resource (widget_class, "/sm/puri/calls/ui/new-call-box.ui");
gtk_widget_class_bind_template_child (widget_class, CallsNewCallBox, origin_store);
gtk_widget_class_bind_template_child (widget_class, CallsNewCallBox, origin_box);
gtk_widget_class_bind_template_child (widget_class, CallsNewCallBox, number_entry);
gtk_widget_class_bind_template_child (widget_class, CallsNewCallBox, dial_pad);
gtk_widget_class_bind_template_callback (widget_class, dial_clicked_cb);
gtk_widget_class_bind_template_callback (widget_class, dial_pad_deleted_cb);
gtk_widget_class_bind_template_callback (widget_class, dial_pad_symbol_clicked_cb);
}
CallsNewCallBox *
calls_new_call_box_new (CallsProvider *provider)
{
return g_object_new (CALLS_TYPE_NEW_CALL_BOX,
"provider", provider,
NULL);
}

4
src/calls-new-call-box.h
View file

@ -25,6 +25,8 @@
#ifndef CALLS_NEW_CALL_BOX_H__
#define CALLS_NEW_CALL_BOX_H__
#include "calls-provider.h"
#include <gtk/gtk.h>
G_BEGIN_DECLS
@ -33,6 +35,8 @@ G_BEGIN_DECLS
G_DECLARE_FINAL_TYPE (CallsNewCallBox, calls_new_call_box, CALLS, NEW_CALL_BOX, GtkBox);
CallsNewCallBox * calls_new_call_box_new (CallsProvider *provider);
G_END_DECLS
#endif /* CALLS_NEW_CALL_BOX_H__ */

22
src/ui/main-window.ui
View file

@ -3,14 +3,6 @@
<interface>
<requires lib="gtk+" version="3.20"/>
<requires lib="libhandy" version="0.0"/>
<object class="GtkListStore" id="origin_store">
<columns>
<!-- column-name name -->
<column type="gchararray"/>
<!-- column-name origin -->
<column type="GObject"/>
</columns>
</object>
<template class="CallsMainWindow" parent="GtkApplicationWindow">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Calls</property>
@ -87,18 +79,6 @@
<property name="title" translatable="yes">History</property>
</packing>
</child>
<child>
<object class="CallsNewCallBox" id="new_call_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="origin_store">origin_store</property>
<signal name="submitted" handler="new_call_submitted_cb" swapped="yes"/>
</object>
<packing>
<property name="name">new-call</property>
<property name="title" translatable="yes">New call</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
@ -134,4 +114,4 @@
</object>
</child>
</template>
</interface>
</interface>

9
src/ui/new-call-box.ui
View file

@ -3,6 +3,14 @@
<interface>
<requires lib="gtk+" version="3.22"/>
<requires lib="libhandy" version="0.0"/>
<object class="GtkListStore" id="origin_store">
<columns>
<!-- column-name name -->
<column type="gchararray"/>
<!-- column-name origin -->
<column type="GObject"/>
</columns>
</object>
<template class="CallsNewCallBox" parent="GtkBox">
<property name="can_focus">False</property>
<property name="halign">center</property>
@ -16,6 +24,7 @@
<child>
<object class="GtkComboBox" id="origin_box">
<property name="can_focus">False</property>
<property name="model">origin_store</property>
<property name="id_column">0</property>
<property name="margin_bottom">8</property>
<property name="no_show_all">True</property>