kbe/calls
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 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
Download Patch File Download Diff File Expand all files Collapse all files

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>