Commit 0d98e17b authored by Adrien Plazas's avatar Adrien Plazas
Browse files

main-window: Use CallsHistoryBox

This helps the window to be only a glue in between the actual UI
elements instead of handling a lot of the UI.
parent 70bafc20
...@@ -59,7 +59,6 @@ struct _CallsMainWindow ...@@ -59,7 +59,6 @@ struct _CallsMainWindow
HdyDialer *dial_pad; HdyDialer *dial_pad;
GtkListStore *origin_store; GtkListStore *origin_store;
GtkListStore *history_store;
}; };
enum { enum {
...@@ -730,7 +729,6 @@ calls_main_window_class_init (CallsMainWindowClass *klass) ...@@ -730,7 +729,6 @@ calls_main_window_class_init (CallsMainWindowClass *klass)
gtk_widget_class_bind_template_child (widget_class, CallsMainWindow, search); gtk_widget_class_bind_template_child (widget_class, CallsMainWindow, search);
gtk_widget_class_bind_template_child (widget_class, CallsMainWindow, dial_pad); gtk_widget_class_bind_template_child (widget_class, CallsMainWindow, dial_pad);
gtk_widget_class_bind_template_child (widget_class, CallsMainWindow, origin_store); gtk_widget_class_bind_template_child (widget_class, CallsMainWindow, origin_store);
gtk_widget_class_bind_template_child (widget_class, CallsMainWindow, history_store);
gtk_widget_class_bind_template_callback (widget_class, info_response_cb); gtk_widget_class_bind_template_callback (widget_class, info_response_cb);
gtk_widget_class_bind_template_callback (widget_class, new_call_expanded_notify_cb); gtk_widget_class_bind_template_callback (widget_class, new_call_expanded_notify_cb);
gtk_widget_class_bind_template_callback (widget_class, call_selector_child_activated_cb); gtk_widget_class_bind_template_callback (widget_class, call_selector_child_activated_cb);
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <handy.h> #include <handy.h>
#include "calls-encryption-indicator.h" #include "calls-encryption-indicator.h"
#include "calls-history-box.h"
#include "calls-main-window.h" #include "calls-main-window.h"
#include "calls-mm-provider.h" #include "calls-mm-provider.h"
...@@ -40,6 +41,7 @@ show_window (GtkApplication *app) ...@@ -40,6 +41,7 @@ show_window (GtkApplication *app)
CallsMainWindow *main_window; CallsMainWindow *main_window;
CALLS_TYPE_ENCRYPTION_INDICATOR; CALLS_TYPE_ENCRYPTION_INDICATOR;
CALLS_TYPE_HISTORY_BOX;
HDY_TYPE_DIALER; HDY_TYPE_DIALER;
connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error); connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<object class="GtkListStore" id="history_store"/> <object class="GtkListStore" id="history_store"/>
<template class="CallsHistoryBox" parent="GtkTreeView"> <template class="CallsHistoryBox" parent="GtkTreeView">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="model">history_store</property> <property name="model">history_store</property>
<property name="visible">True</property> <property name="visible">True</property>
<child internal-child="selection"> <child internal-child="selection">
<object class="GtkTreeSelection"/> <object class="GtkTreeSelection"/>
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<interface> <interface>
<requires lib="gtk+" version="3.20"/> <requires lib="gtk+" version="3.20"/>
<requires lib="libhandy" version="0.0"/> <requires lib="libhandy" version="0.0"/>
<object class="GtkListStore" id="history_store"/>
<object class="GtkListStore" id="origin_store"> <object class="GtkListStore" id="origin_store">
<columns> <columns>
<!-- column-name name --> <!-- column-name name -->
...@@ -259,13 +258,9 @@ ...@@ -259,13 +258,9 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkTreeView" id="history_view"> <object class="CallsHistoryBox" id="history_view">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="model">history_store</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
</object> </object>
<packing> <packing>
<property name="name">history</property> <property name="name">history</property>
......
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