commit 9c403549728e331c22ecaf1c86e6cdd5d460495f
Author: Maximiliano Sandoval R <msandova gnome org>
Date: Sun Oct 10 14:13:38 2021 +0200
Port UI files
In this commit:
- Hdy was replaced with Adw
- StackPages are used to define the name
- templates for final classes now subclass widget
- packing type end was replaced by the corresponding type="end"
- unnecesary packings were removed
data/gl-categorylist.ui | 232 +++----
data/gl-eventtoolbar.ui | 124 ++--
data/gl-eventviewdetail.ui | 6 -
data/gl-eventviewlist.ui | 2 +-
data/gl-searchpopover.ui | 1618 +++++++++++++++++++++-----------------------
data/gl-window.ui | 14 +-
6 files changed, 957 insertions(+), 1039 deletions(-)
---
diff --git a/data/gl-categorylist.ui b/data/gl-categorylist.ui
index b6a118f..1790bb5 100644
--- a/data/gl-categorylist.ui
+++ b/data/gl-categorylist.ui
@@ -1,155 +1,159 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface domain="gnome-logs">
- <template class="GlCategoryList" parent="GtkListBox">
- <property name="selection-mode">browse</property>
- <property name="visible">True</property>
- <signal name="row-selected" handler="on_gl_category_list_row_selected" />
+ <template class="GlCategoryList">
<child>
- <object class="GtkListBoxRow" id="important">
+ <object class="GtkListBox" id="list_box">
+ <property name="selection-mode">browse</property>
<property name="visible">True</property>
- <style>
- <class name="category"/>
- </style>
+ <signal name="row-selected" handler="on_gl_category_list_row_selected" />
<child>
- <object class="GtkLabel" id="important_label">
- <property name="halign">start</property>
- <property name="label" translatable="yes">Important</property>
+ <object class="GtkListBoxRow" id="important">
<property name="visible">True</property>
+ <style>
+ <class name="category"/>
+ </style>
+ <child>
+ <object class="GtkLabel" id="important_label">
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Important</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
</object>
</child>
- </object>
- </child>
- <child>
- <object class="GtkListBoxRow" id="alerts">
- <property name="visible">False</property>
- <style>
- <class name="category"/>
- </style>
<child>
- <object class="GtkLabel" id="alerts_label">
- <property name="halign">start</property>
- <property name="label" translatable="yes">Alerts</property>
- <property name="visible">True</property>
+ <object class="GtkListBoxRow" id="alerts">
+ <property name="visible">False</property>
+ <style>
+ <class name="category"/>
+ </style>
+ <child>
+ <object class="GtkLabel" id="alerts_label">
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Alerts</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
</object>
</child>
- </object>
- </child>
- <child>
- <object class="GtkListBoxRow" id="starred">
- <property name="visible">False</property>
- <style>
- <class name="category"/>
- </style>
<child>
- <object class="GtkLabel" id="starred_label">
- <property name="halign">start</property>
- <property name="label" translatable="yes">Starred</property>
- <property name="visible">True</property>
+ <object class="GtkListBoxRow" id="starred">
+ <property name="visible">False</property>
+ <style>
+ <class name="category"/>
+ </style>
+ <child>
+ <object class="GtkLabel" id="starred_label">
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Starred</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
</object>
</child>
- </object>
- </child>
- <child>
- <object class="GtkListBoxRow" id="all">
- <property name="visible">True</property>
- <style>
- <class name="category"/>
- </style>
<child>
- <object class="GtkLabel" id="all_label">
- <property name="halign">start</property>
- <property name="label" translatable="yes">All</property>
+ <object class="GtkListBoxRow" id="all">
<property name="visible">True</property>
+ <style>
+ <class name="category"/>
+ </style>
+ <child>
+ <object class="GtkLabel" id="all_label">
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">All</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
</object>
</child>
- </object>
- </child>
- <child>
- <object class="GtkListBoxRow" id="applications">
- <property name="visible">True</property>
- <style>
- <class name="category"/>
- </style>
<child>
- <object class="GtkLabel" id="applications_label">
- <property name="halign">start</property>
- <property name="label" translatable="yes">Applications</property>
+ <object class="GtkListBoxRow" id="applications">
<property name="visible">True</property>
+ <style>
+ <class name="category"/>
+ </style>
+ <child>
+ <object class="GtkLabel" id="applications_label">
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Applications</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
</object>
</child>
- </object>
- </child>
- <child>
- <object class="GtkListBoxRow" id="system">
- <property name="visible">True</property>
- <style>
- <class name="category"/>
- </style>
<child>
- <object class="GtkLabel" id="system_label">
- <property name="halign">start</property>
- <property name="label" translatable="yes">System</property>
+ <object class="GtkListBoxRow" id="system">
<property name="visible">True</property>
+ <style>
+ <class name="category"/>
+ </style>
+ <child>
+ <object class="GtkLabel" id="system_label">
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">System</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
</object>
</child>
- </object>
- </child>
- <child>
- <object class="GtkListBoxRow" id="security">
- <property name="visible">True</property>
- <style>
- <class name="category"/>
- </style>
<child>
- <object class="GtkLabel" id="security_label">
- <property name="halign">start</property>
- <property name="label" translatable="yes">Security</property>
+ <object class="GtkListBoxRow" id="security">
<property name="visible">True</property>
+ <style>
+ <class name="category"/>
+ </style>
+ <child>
+ <object class="GtkLabel" id="security_label">
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Security</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
</object>
</child>
- </object>
- </child>
- <child>
- <object class="GtkListBoxRow" id="hardware">
- <property name="visible">True</property>
- <style>
- <class name="category"/>
- </style>
<child>
- <object class="GtkLabel" id="hardware_label">
- <property name="halign">start</property>
- <property name="label" translatable="yes">Hardware</property>
+ <object class="GtkListBoxRow" id="hardware">
<property name="visible">True</property>
+ <style>
+ <class name="category"/>
+ </style>
+ <child>
+ <object class="GtkLabel" id="hardware_label">
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Hardware</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
</object>
</child>
- </object>
- </child>
- <child>
- <object class="GtkListBoxRow" id="updates">
- <property name="visible">False</property>
- <style>
- <class name="category"/>
- </style>
<child>
- <object class="GtkLabel" id="updates_label">
- <property name="halign">start</property>
- <property name="label" translatable="yes">Updates</property>
- <property name="visible">True</property>
+ <object class="GtkListBoxRow" id="updates">
+ <property name="visible">False</property>
+ <style>
+ <class name="category"/>
+ </style>
+ <child>
+ <object class="GtkLabel" id="updates_label">
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Updates</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
</object>
</child>
- </object>
- </child>
- <child>
- <object class="GtkListBoxRow" id="usage">
- <property name="visible">False</property>
- <style>
- <class name="category"/>
- </style>
<child>
- <object class="GtkLabel" id="usage_label">
- <property name="halign">start</property>
- <property name="label" translatable="yes">Usage</property>
- <property name="visible">True</property>
+ <object class="GtkListBoxRow" id="usage">
+ <property name="visible">False</property>
+ <style>
+ <class name="category"/>
+ </style>
+ <child>
+ <object class="GtkLabel" id="usage_label">
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Usage</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
</object>
</child>
</object>
diff --git a/data/gl-eventtoolbar.ui b/data/gl-eventtoolbar.ui
index df1cd3f..f4ec873 100644
--- a/data/gl-eventtoolbar.ui
+++ b/data/gl-eventtoolbar.ui
@@ -24,83 +24,77 @@
</item>
</section>
</menu>
- <template class="GlEventToolbar" parent="HdyHeaderBar">
- <property name="hexpand">True</property>
- <property name="show-close-button">True</property>
- <property name="visible">True</property>
+ <template class="GlEventToolbar">
<child>
- <object class="GtkMenuButton" id="main_menu">
- <property name="valign">center</property>
+ <object class="AdwHeaderBar">
+ <property name="hexpand">True</property>
<property name="visible">True</property>
- <property name="menu_model">primary-menu</property>
- <style>
- <class name="image-button" />
- </style>
- <child>
- <object class="GtkImage">
- <property name="icon-name">open-menu-symbolic</property>
- <property name="icon-size">1</property>
+ <child type="end">
+ <object class="GtkMenuButton" id="main_menu">
+ <property name="valign">center</property>
<property name="visible">True</property>
+ <property name="menu_model">primary-menu</property>
+ <style>
+ <class name="image-button" />
+ </style>
+ <child>
+ <object class="GtkImage">
+ <property name="icon-name">open-menu-symbolic</property>
+ <property name="icon-size">1</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
</object>
</child>
- </object>
- <packing>
- <property name="pack-type">end</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="output_button">
- <property name="action-name">win.export</property>
- <property name="tooltip-text" translatable="yes">Export logs to a file</property>
- <property name="valign">center</property>
- <property name="visible">True</property>
- <style>
- <class name="image-button" />
- </style>
- <child>
- <object class="GtkImage" id="output_icon">
- <property name="icon-name">document-save-symbolic</property>
- <property name="icon-size">1</property>
+ <child type="end">
+ <object class="GtkButton" id="output_button">
+ <property name="action-name">win.export</property>
+ <property name="tooltip-text" translatable="yes">Export logs to a file</property>
+ <property name="valign">center</property>
<property name="visible">True</property>
+ <style>
+ <class name="image-button" />
+ </style>
+ <child>
+ <object class="GtkImage" id="output_icon">
+ <property name="icon-name">document-save-symbolic</property>
+ <property name="icon-size">1</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
</object>
</child>
- </object>
- <packing>
- <property name="pack-type">end</property>
- </packing>
- </child>
- <child type="title">
- <object class="GtkMenuButton" id="menu_button">
- <property name="direction">none</property>
- <property name="tooltip-text" translatable="yes">Choose the boot from which to view
logs</property>
- <property name="valign">center</property>
- <property name="visible">True</property>
- <property name="relief">GTK_RELIEF_NONE</property>
- <style>
- <class name="title-menu-button"/>
- </style>
- </object>
- </child>
- <child>
- <object class="GtkToggleButton" id="search_button">
- <property name="action-name">win.search</property>
- <property name="tooltip-text" translatable="yes">Search all the logs of the current
category</property>
- <property name="valign">center</property>
- <property name="visible">True</property>
- <style>
- <class name="image-button"/>
- </style>
- <child>
- <object class="GtkImage" id="search_icon">
- <property name="icon-name">edit-find-symbolic</property>
- <property name="icon-size">1</property>
+ <child type="title">
+ <object class="GtkMenuButton" id="menu_button">
+ <property name="direction">none</property>
+ <property name="tooltip-text" translatable="yes">Choose the boot from which to view
logs</property>
+ <property name="valign">center</property>
+ <property name="visible">True</property>
+ <property name="relief">GTK_RELIEF_NONE</property>
+ <style>
+ <class name="title-menu-button"/>
+ </style>
+ </object>
+ </child>
+ <child type="end">
+ <object class="GtkToggleButton" id="search_button">
+ <property name="action-name">win.search</property>
+ <property name="tooltip-text" translatable="yes">Search all the logs of the current
category</property>
+ <property name="valign">center</property>
<property name="visible">True</property>
+ <style>
+ <class name="image-button"/>
+ </style>
+ <child>
+ <object class="GtkImage" id="search_icon">
+ <property name="icon-name">edit-find-symbolic</property>
+ <property name="icon-size">1</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
</object>
</child>
</object>
- <packing>
- <property name="pack-type">end</property>
- </packing>
</child>
</template>
</interface>
diff --git a/data/gl-eventviewdetail.ui b/data/gl-eventviewdetail.ui
index 9ccbcde..5b9291a 100644
--- a/data/gl-eventviewdetail.ui
+++ b/data/gl-eventviewdetail.ui
@@ -85,8 +85,6 @@
</child>
<child>
<object class="GtkLabel" id="message_field_label">
- <property name="visible">True</property>
- <property name="no_show_all">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="valign">baseline</property>
@@ -103,8 +101,6 @@
</child>
<child>
<object class="GtkLabel" id="message_label">
- <property name="visible">True</property>
- <property name="no_show_all">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="valign">baseline</property>
@@ -123,7 +119,6 @@
<child>
<object class="GtkLabel" id="audit_field_label">
<property name="visible">False</property>
- <property name="no_show_all">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Audit Session</property>
@@ -346,7 +341,6 @@
<child>
<object class="GtkLabel" id="documentation_label">
<property name="visible">False</property>
- <property name="no_show_all">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="selectable">True</property>
diff --git a/data/gl-eventviewlist.ui b/data/gl-eventviewlist.ui
index 9c31522..9944f8e 100644
--- a/data/gl-eventviewlist.ui
+++ b/data/gl-eventviewlist.ui
@@ -4,7 +4,7 @@
<property name="orientation">horizontal</property>
<property name="visible">True</property>
<child>
- <object class="HdyFlap">
+ <object class="AdwFlap">
<property name="visible">True</property>
<child type="flap">
<object class="GlCategoryList" id="categories">
diff --git a/data/gl-searchpopover.ui b/data/gl-searchpopover.ui
index 24e4fe0..f4bc8e6 100644
--- a/data/gl-searchpopover.ui
+++ b/data/gl-searchpopover.ui
@@ -9,1011 +9,939 @@
<property name="transition_duration">250</property>
<property name="transition_type">GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT_RIGHT</property>
<child>
- <object class="GtkGrid" id="popover_grid">
- <property name="visible">True</property>
- <property name="border_width">20</property>
- <property name="row_spacing">8</property>
- <property name="column_spacing">18</property>
- <child>
- <object class="GtkStack" id="parameter_stack">
+ <object class="GtkStackPage">
+ <property name="name">main</property>
+ <property name="child">
+ <object class="GtkGrid" id="popover_grid">
<property name="visible">True</property>
- <property name="vhomogeneous">False</property>
- <property name="transition_type">crossfade</property>
- <child>
- <object class="GtkButton" id="select_parameter_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Select a Journal
Field to filter the Logs according to it</property>
- <signal name="clicked" handler="select_parameter_button_clicked"/>
- <child>
- <object class="GtkBox" id="parameter_filter_box">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="parameter_button_label">
- <property name="visible">True</property>
- <property name="hexpand">True</property>
- <property name="label" translatable="yes">All
Available Fields</property>
- <property name="width_chars">30</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="parameter_button_image">
- <property name="visible">True</property>
- <property
name="icon_name">pan-down-symbolic</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="name">parameter-button</property>
- </packing>
- </child>
+ <property name="border_width">20</property>
+ <property name="row_spacing">8</property>
+ <property name="column_spacing">18</property>
<child>
- <object class="GtkScrolledWindow" id="parameter_scrolled_window">
- <property name="height_request">150</property>
+ <object class="GtkStack" id="parameter_stack">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">in</property>
+ <property name="vhomogeneous">False</property>
+ <property name="transition_type">crossfade</property>
<child>
- <object class="GtkTreeView" id="parameter_treeview">
- <property name="visible">True</property>
- <property name="model">parameter_liststore</property>
- <property name="headers-visible">False</property>
- <property name="activate-on-single-click">True</property>
- <signal name="row-activated"
handler="on_parameter_treeview_row_activated"/>
- <child>
- <object class="GtkTreeViewColumn" id="parameter-column">
- <property name="title"
translatable="yes">Parameters</property>
+ <object class="GtkStackPage">
+ <property name="name">parameter-button</property>
+ <property name="child">
+ <object class="GtkButton" id="select_parameter_button">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text"
translatable="yes">Select a Journal Field to filter the Logs according to it</property>
+ <signal name="clicked"
handler="select_parameter_button_clicked"/>
<child>
- <object class="GtkCellRendererText"
id="test-renderer"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
+ <object class="GtkBox" id="parameter_filter_box">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel"
id="parameter_button_label">
+ <property
name="visible">True</property>
+ <property
name="hexpand">True</property>
+ <property name="label"
translatable="yes">All Available Fields</property>
+ <property
name="width_chars">30</property>
+ <property name="xalign">0</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImage"
id="parameter_button_image">
+ <property
name="visible">True</property>
+ <property
name="icon_name">pan-down-symbolic</property>
+ </object>
+ </child>
+ </object>
</child>
</object>
- </child>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="selection">
- <property name="mode">GTK_SELECTION_BROWSE</property>
+ </property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkStackPage">
+ <property name="name">parameter-list</property>
+ <property name="child">
+ <object class="GtkScrolledWindow"
id="parameter_scrolled_window">
+ <property name="height_request">150</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView"
id="parameter_treeview">
+ <property name="visible">True</property>
+ <property
name="model">parameter_liststore</property>
+ <property
name="headers-visible">False</property>
+ <property
name="activate-on-single-click">True</property>
+ <signal name="row-activated"
handler="on_parameter_treeview_row_activated"/>
+ <child>
+ <object class="GtkTreeViewColumn"
id="parameter-column">
+ <property name="title"
translatable="yes">Parameters</property>
+ <property
name="visible">True</property>
+ <child>
+ <object
class="GtkCellRendererText" id="test-renderer"/>
+ <attributes>
+ <attribute
name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="selection">
+ <property
name="mode">GTK_SELECTION_BROWSE</property>
+ </object>
+ </child>
+ </object>
+ </child>
</object>
- </child>
+ </property>
</object>
</child>
</object>
<packing>
- <property name="name">parameter-list</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkStack" id="parameter_label_stack">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="what_dim_label">
- <property name="visible">True</property>
- <property name="margin_top">10</property>
- <property name="label" translatable="yes" comments="Translators:
What [journal fields to search in]">What</property>
- <property name="xalign">0</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- <packing>
- <property name="name">what-label</property>
- <property name="title">page0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="select_parameter_dim_label">
- <property name="visible">True</property>
- <property name="margin_top">10</property>
- <property name="label" translatable="yes">Select Journal
Field…</property>
- <property name="xalign">0</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- <packing>
- <property name="name">select-parameter-label</property>
- <property name="title">page1</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkStack" id="range_label_stack">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="when_dim_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes" comments="When [log
entries to be shown for a given timestamp range]">When</property>
- <property name="xalign">0</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- <packing>
- <property name="name">when-label</property>
- <property name="title">page0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="show_logs_from_dim_label">
+ <object class="GtkStack" id="parameter_label_stack">
<property name="visible">True</property>
- <property name="margin_top">10</property>
- <property name="label" translatable="yes">Show Logs from…</property>
- <property name="xalign">0</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- <packing>
- <property name="name">show-log-from-label</property>
- <property name="title">page1</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkStack" id="range_stack">
- <property name="visible">True</property>
- <property name="vhomogeneous">False</property>
- <property name="transition_type">crossfade</property>
- <child>
- <object class="GtkButton" id="select_range_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Select Timestamp
Range of the Log Entries to be shown</property>
- <property name="hexpand">True</property>
- <signal name="clicked" handler="select_range_button_clicked"/>
<child>
- <object class="GtkBox">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="range_button_label">
+ <object class="GtkStackPage">
+ <property name="title">page0</property>
+ <property name="name">what-label</property>
+ <property name="child">
+ <object class="GtkLabel" id="what_dim_label">
<property name="visible">True</property>
- <property name="label" translatable="yes">Current
Boot</property>
+ <property name="margin_top">10</property>
+ <property name="label" translatable="yes"
comments="Translators: What [journal fields to search in]">What</property>
+ <property name="xalign">0</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage"
id="range_button_drop_down_image">
+ </property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkStackPage">
+ <property name="title">page1</property>
+ <property name="name">select-parameter-label</property>
+ <property name="child">
+ <object class="GtkLabel" id="select_parameter_dim_label">
<property name="visible">True</property>
- <property
name="icon_name">pan-down-symbolic</property>
+ <property name="margin_top">10</property>
+ <property name="label" translatable="yes">Select
Journal Field…</property>
+ <property name="xalign">0</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
+ </property>
</object>
</child>
</object>
<packing>
- <property name="name">range-button</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkScrolledWindow" id="range_scrolled_window">
- <property name="height_request">176</property>
+ <object class="GtkStack" id="range_label_stack">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="shadow_type">in</property>
<child>
- <object class="GtkTreeView" id="range_treeview">
- <property name="visible">True</property>
- <property name="model">range_liststore</property>
- <property name="headers-visible">False</property>
- <property name="activate-on-single-click">True</property>
- <signal name="row-activated"
handler="on_range_treeview_row_activated"/>
- <child>
- <object class="GtkTreeViewColumn" id="range-column">
- <property name="title"
translatable="yes">Parameters</property>
+ <object class="GtkStackPage">
+ <property name="name">when-label</property>
+ <property name="title">page0</property>
+ <property name="child">
+ <object class="GtkLabel" id="when_dim_label">
<property name="visible">True</property>
- <child>
- <object class="GtkCellRendererText"
id="range-text-renderer"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
+ <property name="label" translatable="yes"
comments="When [log entries to be shown for a given timestamp range]">When</property>
+ <property name="xalign">0</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
</object>
- </child>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="range-selection">
- <property name="mode">GTK_SELECTION_BROWSE</property>
+ </property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkStackPage">
+ <property name="name">show-log-from-label</property>
+ <property name="title">page1</property>
+ <property name="child">
+ <object class="GtkLabel" id="show_logs_from_dim_label">
+ <property name="visible">True</property>
+ <property name="margin_top">10</property>
+ <property name="label" translatable="yes">Show Logs
from…</property>
+ <property name="xalign">0</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
</object>
- </child>
+ </property>
</object>
</child>
</object>
<packing>
- <property name="name">range-list</property>
- <property name="title">page0</property>
- <property name="position">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">2</property>
</packing>
</child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkRevealer" id="search_type_revealer">
<child>
- <object class="GtkBox">
+ <object class="GtkStack" id="range_stack">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">8</property>
- <child>
- <object class="GtkLabel" id="search_type_dim_label">
- <property name="visible">True</property>
- <property name="margin_top">10</property>
- <property name="label" translatable="yes">Search
Type</property>
- <property name="xalign">0</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="vhomogeneous">False</property>
+ <property name="transition_type">crossfade</property>
<child>
- <object class="GtkBox">
- <property name="visible">True</property>
- <child>
- <object class="GtkRadioButton"
id="radiobutton_substring">
- <property name="label"
translatable="yes">Substring</property>
+ <object class="GtkStackPage">
+ <property name="name">range-button</property>
+ <property name="child">
+ <object class="GtkButton" id="select_range_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text"
translatable="yes">Match in any part of the string</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text"
translatable="yes">Select Timestamp Range of the Log Entries to be shown</property>
<property name="hexpand">True</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">False</property>
+ <signal name="clicked"
handler="select_range_button_clicked"/>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel"
id="range_button_label">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">Current Boot</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImage"
id="range_button_drop_down_image">
+ <property
name="visible">True</property>
+ <property
name="icon_name">pan-down-symbolic</property>
+ </object>
+ </child>
+ </object>
+ </child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="radiobutton_exact">
- <property name="label"
translatable="yes">Exact</property>
+ </property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkStackPage">
+ <property name="name">range-list</property>
+ <property name="title">page0</property>
+ <property name="child">
+ <object class="GtkScrolledWindow"
id="range_scrolled_window">
+ <property name="height_request">176</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text"
translatable="yes">Match complete string only</property>
<property name="hexpand">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">False</property>
- <property
name="group">radiobutton_substring</property>
- <signal name="toggled"
handler="search_type_changed"/>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="range_treeview">
+ <property name="visible">True</property>
+ <property
name="model">range_liststore</property>
+ <property
name="headers-visible">False</property>
+ <property
name="activate-on-single-click">True</property>
+ <signal name="row-activated"
handler="on_range_treeview_row_activated"/>
+ <child>
+ <object class="GtkTreeViewColumn"
id="range-column">
+ <property name="title"
translatable="yes">Parameters</property>
+ <property
name="visible">True</property>
+ <child>
+ <object
class="GtkCellRendererText" id="range-text-renderer"/>
+ <attributes>
+ <attribute
name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="range-selection">
+ <property
name="mode">GTK_SELECTION_BROWSE</property>
+ </object>
+ </child>
+ </object>
+ </child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <style>
- <class name="linked"/>
- </style>
+ </property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
- <property name="width">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="name">main</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="set_custom_range_vbox">
- <property name="orientation">vertical</property>
- <property name="visible">True</property>
- <child>
- <object class="GtkModelButton" id="submenu_back_button">
- <property name="visible">True</property>
- <property name="centered">True</property>
- <property name="inverted">True</property>
- <property name="menu-name">main</property>
- <property name="text" translatable="yes">Back</property>
- <signal name="clicked" handler="custom_range_submenu_back_button_clicked"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="start_end_date_time_grid">
- <property name="visible">True</property>
- <property name="border_width">20</property>
- <property name="row_spacing">8</property>
- <property name="column_spacing">18</property>
- <child>
- <object class="GtkLabel" id="start_date_dim_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Show Logs Starting
From…</property>
- <property name="xalign">0</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="top_attach">3</property>
<property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkStack" id="start_date_stack">
- <property name="visible">True</property>
- <property name="transition_duration">250</property>
- <property name="transition_type">crossfade</property>
+ <object class="GtkRevealer" id="search_type_revealer">
<child>
- <object class="GtkButton" id="start_date_button">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Select a
start date</property>
- <property name="hexpand">True</property>
- <signal name="clicked" handler="start_date_button_clicked"/>
+ <property name="orientation">vertical</property>
+ <property name="spacing">8</property>
<child>
- <object class="GtkBox" id="start_date_button_label_hbox">
+ <object class="GtkLabel" id="search_type_dim_label">
+ <property name="visible">True</property>
+ <property name="margin_top">10</property>
+ <property name="label" translatable="yes">Search
Type</property>
+ <property name="xalign">0</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox">
<property name="visible">True</property>
<child>
- <object class="GtkLabel"
id="start_date_button_label">
+ <object class="GtkRadioButton"
id="radiobutton_substring">
+ <property name="label"
translatable="yes">Substring</property>
<property name="visible">True</property>
- <property name="label"
translatable="yes">Select Start Date…</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="tooltip_text"
translatable="yes">Match in any part of the string</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property
name="draw_indicator">False</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <object class="GtkImage"
id="start_date_button_drop_down_image">
+ <object class="GtkRadioButton"
id="radiobutton_exact">
+ <property name="label"
translatable="yes">Exact</property>
<property name="visible">True</property>
- <property
name="icon_name">pan-down-symbolic</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="tooltip_text"
translatable="yes">Match complete string only</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property
name="draw_indicator">False</property>
+ <property
name="group">radiobutton_substring</property>
+ <signal name="toggled"
handler="search_type_changed"/>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
</child>
+ <style>
+ <class name="linked"/>
+ </style>
</object>
</child>
</object>
- <packing>
- <property name="name">start-date-button</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="start_date_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="placeholder-text" translatable="yes">22
January 2016 or 1/22/2016</property>
- <signal name="activate" handler="start_date_entry_activate"/>
- </object>
- <packing>
- <property name="name">start-date-entry</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">4</property>
<property name="width">2</property>
</packing>
</child>
+ </object>
+ </property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkStackPage">
+ <property name="name">custom-range-submenu</property>
+ <property name="child">
+ <object class="GtkBox" id="set_custom_range_vbox">
+ <property name="orientation">vertical</property>
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkModelButton" id="submenu_back_button">
+ <property name="visible">True</property>
+ <property name="centered">True</property>
+ <property name="inverted">True</property>
+ <property name="menu-name">main</property>
+ <property name="text" translatable="yes">Back</property>
+ <signal name="clicked"
handler="custom_range_submenu_back_button_clicked"/>
+ </object>
+ </child>
<child>
- <object class="GtkRevealer" id="start_date_calendar_revealer">
+ <object class="GtkGrid" id="start_end_date_time_grid">
+ <property name="visible">True</property>
+ <property name="border_width">20</property>
+ <property name="row_spacing">8</property>
+ <property name="column_spacing">18</property>
<child>
- <object class="GtkCalendar" id="start_date_calendar">
+ <object class="GtkLabel" id="start_date_dim_label">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="valign">start</property>
- <property name="show_week_numbers">True</property>
- <signal name="day-selected"
handler="start_date_calendar_day_selected"/>
+ <property name="label" translatable="yes">Show Logs Starting
From…</property>
+ <property name="xalign">0</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkStack" id="start_time_stack">
- <property name="visible">True</property>
- <property name="transition_duration">250</property>
- <property name="transition_type">crossfade</property>
- <property name="vhomogeneous">False</property>
- <property
name="transition_type">GTK_STACK_TRANSITION_TYPE_SLIDE_UP_DOWN</property>
<child>
- <object class="GtkButton" id="start_time_button">
+ <object class="GtkStack" id="start_date_stack">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Select
start time</property>
- <property name="hexpand">True</property>
- <signal name="clicked" handler="start_time_button_clicked"/>
+ <property name="transition_duration">250</property>
+ <property name="transition_type">crossfade</property>
<child>
- <object class="GtkBox" id="start_time_button_label_hbox">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel"
id="start_time_button_label">
+ <object class="GtkStackPage">
+ <property name="name">start-date-button</property>
+ <property name="child">
+ <object class="GtkButton" id="start_date_button">
<property name="visible">True</property>
- <property name="label"
translatable="yes">Select Start Time…</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property name="tooltip_text"
translatable="yes">Select a start date</property>
+ <property name="hexpand">True</property>
+ <signal name="clicked"
handler="start_date_button_clicked"/>
+ <child>
+ <object class="GtkBox"
id="start_date_button_label_hbox">
+ <property
name="visible">True</property>
+ <child>
+ <object class="GtkLabel"
id="start_date_button_label">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">Select Start Date…</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImage"
id="start_date_button_drop_down_image">
+ <property
name="visible">True</property>
+ <property
name="icon_name">pan-down-symbolic</property>
+ </object>
+ </child>
+ </object>
+ </child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage"
id="start_time_button_drop_down_image">
+ </property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkStackPage">
+ <property name="name">start-date-entry</property>
+ <property name="child">
+ <object class="GtkEntry" id="start_date_entry">
<property name="visible">True</property>
- <property
name="icon_name">pan-down-symbolic</property>
+ <property name="can_focus">True</property>
+ <property name="placeholder-text"
translatable="yes">22 January 2016 or 1/22/2016</property>
+ <signal name="activate"
handler="start_date_entry_activate"/>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
+ </property>
</object>
</child>
</object>
<packing>
- <property name="name">start-time-select-button</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkGrid" id="start-time-spinbox-grid">
- <property name="visible">True</property>
- <property name="border_width">10</property>
- <property name="row_spacing">15</property>
- <property name="column_spacing">10</property>
- <property name="column-homogeneous">True</property>
+ <object class="GtkRevealer" id="start_date_calendar_revealer">
<child>
- <object class="GtkLabel" id="start_time_hour_label">
+ <object class="GtkCalendar" id="start_date_calendar">
<property name="visible">True</property>
- <property name="label"
translatable="yes">Hr</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="start_time_hour_spin">
- <property name="visible">1</property>
- <property name="orientation">vertical</property>
- <property name="width_chars">2</property>
- <property
name="adjustment">start_time_hour_adjustment</property>
- <property name="wrap">1</property>
- <property name="max-length">2</property>
- <property name="numeric">True</property>
- <property name="halign">GTK_ALIGN_CENTER</property>
- <property name="hexpand">True</property>
- <signal name="output"
handler="spinbox_entry_format_two_digits"/>
- <signal name="input"
handler="spinbox_entry_validate_hour_min_sec"/>
- <signal name="value-changed"
handler="start_time_spinbox_value_changed"/>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="start_time_minute_label">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">Min</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton"
id="start_time_minute_spin">
- <property name="visible">1</property>
- <property name="orientation">vertical</property>
- <property name="width_chars">2</property>
- <property
name="adjustment">start_time_minute_adjustment</property>
- <property name="wrap">1</property>
- <property name="max-length">2</property>
- <property name="numeric">True</property>
- <property name="hexpand">True</property>
- <property name="halign">GTK_ALIGN_CENTER</property>
- <signal name="output"
handler="spinbox_entry_format_two_digits"/>
- <signal name="input"
handler="spinbox_entry_validate_hour_min_sec"/>
- <signal name="value-changed"
handler="start_time_spinbox_value_changed"/>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="start_time_second_label">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">Sec</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton"
id="start_time_second_spin">
- <property name="visible">1</property>
- <property name="orientation">vertical</property>
- <property name="width_chars">2</property>
- <property
name="adjustment">start_time_second_adjustment</property>
- <property name="wrap">1</property>
- <property name="max-length">2</property>
- <property name="numeric">True</property>
- <property name="hexpand">True</property>
- <property name="halign">GTK_ALIGN_CENTER</property>
- <signal name="output"
handler="spinbox_entry_format_two_digits"/>
- <signal name="input"
handler="spinbox_entry_validate_hour_min_sec"/>
- <signal name="value-changed"
handler="start_time_spinbox_value_changed"/>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="start_time_period_label">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">AM/PM</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton"
id="start_time_period_spin">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="width_chars">2</property>
- <property name="editable">True</property>
- <property
name="adjustment">start_time_period_adjustment</property>
- <property name="wrap">1</property>
- <property name="max-length">2</property>
- <property name="halign">GTK_ALIGN_CENTER</property>
- <signal name="input"
handler="spinbox_format_time_period_to_int"/>
- <signal name="output"
handler="spinbox_format_time_period_to_text"/>
- <signal name="value-changed"
handler="start_time_spinbox_value_changed"/>
+ <property name="can_focus">True</property>
+ <property name="valign">start</property>
+ <property name="show_week_numbers">True</property>
+ <signal name="day-selected"
handler="start_date_calendar_day_selected"/>
</object>
- <packing>
- <property name="left_attach">3</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- </packing>
</child>
</object>
<packing>
- <property name="name">start-time-spinbutton</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">2</property>
</packing>
</child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="end_date_dim_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Until…</property>
- <property name="xalign">0</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkStack" id="end_date_stack">
- <property name="visible">True</property>
- <property name="transition_duration">250</property>
- <property name="transition_type">crossfade</property>
<child>
- <object class="GtkButton" id="end_date_button">
+ <object class="GtkStack" id="start_time_stack">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Select an
end date</property>
- <property name="hexpand">True</property>
- <signal name="clicked" handler="end_date_button_clicked"/>
+ <property name="transition_duration">250</property>
+ <property name="transition_type">crossfade</property>
+ <property name="vhomogeneous">False</property>
+ <property
name="transition_type">GTK_STACK_TRANSITION_TYPE_SLIDE_UP_DOWN</property>
<child>
- <object class="GtkBox" id="end_date_button_label_hbox">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel"
id="end_date_button_label">
+ <object class="GtkStackPage">
+ <property
name="name">start-time-select-button</property>
+ <property name="child">
+ <object class="GtkButton" id="start_time_button">
<property name="visible">True</property>
- <property name="label"
translatable="yes">Select End Date…</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property name="tooltip_text"
translatable="yes">Select start time</property>
+ <property name="hexpand">True</property>
+ <signal name="clicked"
handler="start_time_button_clicked"/>
+ <child>
+ <object class="GtkBox"
id="start_time_button_label_hbox">
+ <property
name="visible">True</property>
+ <child>
+ <object class="GtkLabel"
id="start_time_button_label">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">Select Start Time…</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImage"
id="start_time_button_drop_down_image">
+ <property
name="visible">True</property>
+ <property
name="icon_name">pan-down-symbolic</property>
+ </object>
+ </child>
+ </object>
+ </child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage"
id="end_date_button_drop_down_image">
+ </property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkStackPage">
+ <property
name="name">start-time-spinbutton</property>
+ <property name="child">
+ <object class="GtkGrid"
id="start-time-spinbox-grid">
<property name="visible">True</property>
- <property
name="icon_name">pan-down-symbolic</property>
+ <property name="border_width">10</property>
+ <property name="row_spacing">15</property>
+ <property name="column_spacing">10</property>
+ <property
name="column-homogeneous">True</property>
+ <child>
+ <object class="GtkLabel"
id="start_time_hour_label">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">Hr</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSpinButton"
id="start_time_hour_spin">
+ <property name="visible">1</property>
+ <property
name="orientation">vertical</property>
+ <property
name="width_chars">2</property>
+ <property
name="adjustment">start_time_hour_adjustment</property>
+ <property name="wrap">1</property>
+ <property
name="max-length">2</property>
+ <property
name="numeric">True</property>
+ <property
name="halign">GTK_ALIGN_CENTER</property>
+ <property
name="hexpand">True</property>
+ <signal name="output"
handler="spinbox_entry_format_two_digits"/>
+ <signal name="input"
handler="spinbox_entry_validate_hour_min_sec"/>
+ <signal name="value-changed"
handler="start_time_spinbox_value_changed"/>
+ </object>
+ <packing>
+ <property
name="left_attach">0</property>
+ <property
name="top_attach">1</property>
+ <property name="width">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="start_time_minute_label">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">Min</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ <packing>
+ <property
name="left_attach">1</property>
+ <property
name="top_attach">0</property>
+ <property name="width">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton"
id="start_time_minute_spin">
+ <property name="visible">1</property>
+ <property
name="orientation">vertical</property>
+ <property
name="width_chars">2</property>
+ <property
name="adjustment">start_time_minute_adjustment</property>
+ <property name="wrap">1</property>
+ <property
name="max-length">2</property>
+ <property
name="numeric">True</property>
+ <property
name="hexpand">True</property>
+ <property
name="halign">GTK_ALIGN_CENTER</property>
+ <signal name="output"
handler="spinbox_entry_format_two_digits"/>
+ <signal name="input"
handler="spinbox_entry_validate_hour_min_sec"/>
+ <signal name="value-changed"
handler="start_time_spinbox_value_changed"/>
+ </object>
+ <packing>
+ <property
name="left_attach">1</property>
+ <property
name="top_attach">1</property>
+ <property name="width">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="start_time_second_label">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">Sec</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ <packing>
+ <property
name="left_attach">2</property>
+ <property
name="top_attach">0</property>
+ <property name="width">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton"
id="start_time_second_spin">
+ <property name="visible">1</property>
+ <property
name="orientation">vertical</property>
+ <property
name="width_chars">2</property>
+ <property
name="adjustment">start_time_second_adjustment</property>
+ <property name="wrap">1</property>
+ <property
name="max-length">2</property>
+ <property
name="numeric">True</property>
+ <property
name="hexpand">True</property>
+ <property
name="halign">GTK_ALIGN_CENTER</property>
+ <signal name="output"
handler="spinbox_entry_format_two_digits"/>
+ <signal name="input"
handler="spinbox_entry_validate_hour_min_sec"/>
+ <signal name="value-changed"
handler="start_time_spinbox_value_changed"/>
+ </object>
+ <packing>
+ <property
name="left_attach">2</property>
+ <property
name="top_attach">1</property>
+ <property name="width">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="start_time_period_label">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">AM/PM</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ <packing>
+ <property
name="left_attach">3</property>
+ <property
name="top_attach">0</property>
+ <property name="width">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton"
id="start_time_period_spin">
+ <property
name="visible">True</property>
+ <property
name="orientation">vertical</property>
+ <property
name="width_chars">2</property>
+ <property
name="editable">True</property>
+ <property
name="adjustment">start_time_period_adjustment</property>
+ <property name="wrap">1</property>
+ <property
name="max-length">2</property>
+ <property
name="halign">GTK_ALIGN_CENTER</property>
+ <signal name="input"
handler="spinbox_format_time_period_to_int"/>
+ <signal name="output"
handler="spinbox_format_time_period_to_text"/>
+ <signal name="value-changed"
handler="start_time_spinbox_value_changed"/>
+ </object>
+ <packing>
+ <property
name="left_attach">3</property>
+ <property
name="top_attach">1</property>
+ <property name="width">1</property>
+ </packing>
+ </child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
+ </property>
</object>
</child>
</object>
<packing>
- <property name="name">end-date-button</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkEntry" id="end_date_entry">
+ <object class="GtkLabel" id="end_date_dim_label">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="placeholder-text" translatable="yes">22
January 2016 or 1/22/2016</property>
- <signal name="activate" handler="end_date_entry_activate"/>
+ <property name="label" translatable="yes">Until…</property>
+ <property name="xalign">0</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
</object>
<packing>
- <property name="name">end-date-entry</property>
- <property name="position">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">2</property>
</packing>
</child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkRevealer" id="end_date_calendar_revealer">
<child>
- <object class="GtkCalendar" id="end_date_calendar">
+ <object class="GtkStack" id="end_date_stack">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="valign">start</property>
- <property name="year">2016</property>
- <property name="month">5</property>
- <property name="day">1</property>
- <property name="show_week_numbers">True</property>
- <signal name="day-selected"
handler="end_date_calendar_day_selected"/>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">6</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkStack" id="end_time_stack">
- <property name="visible">True</property>
- <property name="transition_duration">250</property>
- <property name="transition_type">crossfade</property>
- <property name="vhomogeneous">False</property>
- <property
name="transition_type">GTK_STACK_TRANSITION_TYPE_SLIDE_UP_DOWN</property>
- <child>
- <object class="GtkButton" id="end_time_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Select end
time</property>
- <property name="hexpand">True</property>
- <signal name="clicked" handler="end_time_button_clicked"/>
+ <property name="transition_duration">250</property>
+ <property name="transition_type">crossfade</property>
<child>
- <object class="GtkBox" id="end_time_button_label_hbox">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel"
id="end_time_button_label">
+ <object class="GtkStackPage">
+ <property name="name">end-date-button</property>
+ <property name="child">
+ <object class="GtkButton" id="end_date_button">
<property name="visible">True</property>
- <property name="label"
translatable="yes">Select End Time…</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property name="tooltip_text"
translatable="yes">Select an end date</property>
+ <property name="hexpand">True</property>
+ <signal name="clicked"
handler="end_date_button_clicked"/>
+ <child>
+ <object class="GtkBox"
id="end_date_button_label_hbox">
+ <property
name="visible">True</property>
+ <child>
+ <object class="GtkLabel"
id="end_date_button_label">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">Select End Date…</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImage"
id="end_date_button_drop_down_image">
+ <property
name="visible">True</property>
+ <property
name="icon_name">pan-down-symbolic</property>
+ </object>
+ </child>
+ </object>
+ </child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage"
id="end_time_button_drop_down_image">
+ </property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkStackPage">
+ <property name="name">end-date-entry</property>
+ <property name="child">
+ <object class="GtkEntry" id="end_date_entry">
<property name="visible">True</property>
- <property
name="icon_name">pan-down-symbolic</property>
+ <property name="can_focus">True</property>
+ <property name="placeholder-text"
translatable="yes">22 January 2016 or 1/22/2016</property>
+ <signal name="activate"
handler="end_date_entry_activate"/>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
+ </property>
</object>
</child>
</object>
<packing>
- <property name="name">end-time-select-button</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkGrid" id="end-time-spinbox-grid">
- <property name="visible">True</property>
- <property name="border_width">10</property>
- <property name="row_spacing">15</property>
- <property name="column_spacing">10</property>
- <property name="column-homogeneous">True</property>
- <child>
- <object class="GtkLabel" id="end_time_hour_label">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">Hr</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="end_time_hour_spin">
- <property name="visible">1</property>
- <property name="orientation">vertical</property>
- <property name="width_chars">2</property>
- <property
name="adjustment">end_time_hour_adjustment</property>
- <property name="wrap">1</property>
- <property name="max-length">2</property>
- <property name="numeric">True</property>
- <property name="halign">GTK_ALIGN_CENTER</property>
- <property name="hexpand">True</property>
- <signal name="output"
handler="spinbox_entry_format_two_digits"/>
- <signal name="input"
handler="spinbox_entry_validate_hour_min_sec"/>
- <signal name="value-changed"
handler="end_time_spinbox_value_changed"/>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- </packing>
- </child>
+ <object class="GtkRevealer" id="end_date_calendar_revealer">
<child>
- <object class="GtkLabel" id="end_time_minute_label">
+ <object class="GtkCalendar" id="end_date_calendar">
<property name="visible">True</property>
- <property name="label"
translatable="yes">Min</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="end_time_minute_spin">
- <property name="visible">1</property>
- <property name="orientation">vertical</property>
- <property name="width_chars">2</property>
- <property
name="adjustment">end_time_minute_adjustment</property>
- <property name="wrap">1</property>
- <property name="max-length">2</property>
- <property name="numeric">True</property>
- <property name="hexpand">True</property>
- <property name="halign">GTK_ALIGN_CENTER</property>
- <signal name="output"
handler="spinbox_entry_format_two_digits"/>
- <signal name="input"
handler="spinbox_entry_validate_hour_min_sec"/>
- <signal name="value-changed"
handler="end_time_spinbox_value_changed"/>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="end_time_second_label">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">Sec</property>
- <style>
- <class name="dim-label"/>
- </style>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="end_time_second_spin">
- <property name="visible">1</property>
- <property name="orientation">vertical</property>
- <property name="width_chars">2</property>
- <property
name="adjustment">end_time_second_adjustment</property>
- <property name="wrap">1</property>
- <property name="max-length">2</property>
- <property name="numeric">True</property>
- <property name="hexpand">True</property>
- <property name="halign">GTK_ALIGN_CENTER</property>
- <signal name="output"
handler="spinbox_entry_format_two_digits"/>
- <signal name="input"
handler="spinbox_entry_validate_hour_min_sec"/>
- <signal name="value-changed"
handler="end_time_spinbox_value_changed"/>
+ <property name="can_focus">True</property>
+ <property name="valign">start</property>
+ <property name="year">2016</property>
+ <property name="month">5</property>
+ <property name="day">1</property>
+ <property name="show_week_numbers">True</property>
+ <signal name="day-selected"
handler="end_date_calendar_day_selected"/>
</object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- </packing>
</child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkStack" id="end_time_stack">
+ <property name="visible">True</property>
+ <property name="transition_duration">250</property>
+ <property name="transition_type">crossfade</property>
+ <property name="vhomogeneous">False</property>
+ <property
name="transition_type">GTK_STACK_TRANSITION_TYPE_SLIDE_UP_DOWN</property>
<child>
- <object class="GtkLabel" id="end_time_period_label">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">AM/PM</property>
- <style>
- <class name="dim-label"/>
- </style>
+ <object class="GtkStackPage">
+ <property
name="name">end-time-select-button</property>
+ <property name="child">
+ <object class="GtkButton" id="end_time_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property name="tooltip_text"
translatable="yes">Select end time</property>
+ <property name="hexpand">True</property>
+ <signal name="clicked"
handler="end_time_button_clicked"/>
+ <child>
+ <object class="GtkBox"
id="end_time_button_label_hbox">
+ <property
name="visible">True</property>
+ <child>
+ <object class="GtkLabel"
id="end_time_button_label">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">Select End Time…</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImage"
id="end_time_button_drop_down_image">
+ <property
name="visible">True</property>
+ <property
name="icon_name">pan-down-symbolic</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </property>
</object>
- <packing>
- <property name="left_attach">3</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- </packing>
</child>
<child>
- <object class="GtkSpinButton" id="end_time_period_spin">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="width_chars">2</property>
- <property name="editable">True</property>
- <property
name="adjustment">end_time_period_adjustment</property>
- <property name="wrap">1</property>
- <property name="max-length">2</property>
- <property name="halign">GTK_ALIGN_CENTER</property>
- <signal name="input"
handler="spinbox_format_time_period_to_int"/>
- <signal name="output"
handler="spinbox_format_time_period_to_text"/>
- <signal name="value-changed"
handler="end_time_spinbox_value_changed"/>
+ <object class="GtkStackPage">
+ <property name="name">end-time-spinbutton</property>
+ <property name="child">
+ <object class="GtkGrid"
id="end-time-spinbox-grid">
+ <property name="visible">True</property>
+ <property name="border_width">10</property>
+ <property name="row_spacing">15</property>
+ <property name="column_spacing">10</property>
+ <property
name="column-homogeneous">True</property>
+ <child>
+ <object class="GtkLabel"
id="end_time_hour_label">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">Hr</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ <packing>
+ <property
name="left_attach">0</property>
+ <property
name="top_attach">0</property>
+ <property name="width">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton"
id="end_time_hour_spin">
+ <property name="visible">1</property>
+ <property
name="orientation">vertical</property>
+ <property
name="width_chars">2</property>
+ <property
name="adjustment">end_time_hour_adjustment</property>
+ <property name="wrap">1</property>
+ <property
name="max-length">2</property>
+ <property
name="numeric">True</property>
+ <property
name="halign">GTK_ALIGN_CENTER</property>
+ <property
name="hexpand">True</property>
+ <signal name="output"
handler="spinbox_entry_format_two_digits"/>
+ <signal name="input"
handler="spinbox_entry_validate_hour_min_sec"/>
+ <signal name="value-changed"
handler="end_time_spinbox_value_changed"/>
+ </object>
+ <packing>
+ <property
name="left_attach">0</property>
+ <property
name="top_attach">1</property>
+ <property name="width">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="end_time_minute_label">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">Min</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ <packing>
+ <property
name="left_attach">1</property>
+ <property
name="top_attach">0</property>
+ <property name="width">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton"
id="end_time_minute_spin">
+ <property name="visible">1</property>
+ <property
name="orientation">vertical</property>
+ <property
name="width_chars">2</property>
+ <property
name="adjustment">end_time_minute_adjustment</property>
+ <property name="wrap">1</property>
+ <property
name="max-length">2</property>
+ <property
name="numeric">True</property>
+ <property
name="hexpand">True</property>
+ <property
name="halign">GTK_ALIGN_CENTER</property>
+ <signal name="output"
handler="spinbox_entry_format_two_digits"/>
+ <signal name="input"
handler="spinbox_entry_validate_hour_min_sec"/>
+ <signal name="value-changed"
handler="end_time_spinbox_value_changed"/>
+ </object>
+ <packing>
+ <property
name="left_attach">1</property>
+ <property
name="top_attach">1</property>
+ <property name="width">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="end_time_second_label">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">Sec</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ <packing>
+ <property
name="left_attach">2</property>
+ <property
name="top_attach">0</property>
+ <property name="width">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton"
id="end_time_second_spin">
+ <property name="visible">1</property>
+ <property
name="orientation">vertical</property>
+ <property
name="width_chars">2</property>
+ <property
name="adjustment">end_time_second_adjustment</property>
+ <property name="wrap">1</property>
+ <property
name="max-length">2</property>
+ <property
name="numeric">True</property>
+ <property
name="hexpand">True</property>
+ <property
name="halign">GTK_ALIGN_CENTER</property>
+ <signal name="output"
handler="spinbox_entry_format_two_digits"/>
+ <signal name="input"
handler="spinbox_entry_validate_hour_min_sec"/>
+ <signal name="value-changed"
handler="end_time_spinbox_value_changed"/>
+ </object>
+ <packing>
+ <property
name="left_attach">2</property>
+ <property
name="top_attach">1</property>
+ <property name="width">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="end_time_period_label">
+ <property
name="visible">True</property>
+ <property name="label"
translatable="yes">AM/PM</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ <packing>
+ <property
name="left_attach">3</property>
+ <property
name="top_attach">0</property>
+ <property name="width">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton"
id="end_time_period_spin">
+ <property
name="visible">True</property>
+ <property
name="orientation">vertical</property>
+ <property
name="width_chars">2</property>
+ <property
name="editable">True</property>
+ <property
name="adjustment">end_time_period_adjustment</property>
+ <property name="wrap">1</property>
+ <property
name="max-length">2</property>
+ <property
name="halign">GTK_ALIGN_CENTER</property>
+ <signal name="input"
handler="spinbox_format_time_period_to_int"/>
+ <signal name="output"
handler="spinbox_format_time_period_to_text"/>
+ <signal name="value-changed"
handler="end_time_spinbox_value_changed"/>
+ </object>
+ <packing>
+ <property
name="left_attach">3</property>
+ <property
name="top_attach">1</property>
+ <property name="width">1</property>
+ </packing>
+ </child>
+ </object>
+ </property>
</object>
- <packing>
- <property name="left_attach">3</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- </packing>
</child>
</object>
<packing>
- <property name="name">end-time-spinbutton</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
+ <property name="width">2</property>
</packing>
</child>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">7</property>
- <property name="width">2</property>
- </packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ </property>
</object>
- <packing>
- <property name="name">custom-range-submenu</property>
- </packing>
</child>
</object>
</child>
diff --git a/data/gl-window.ui b/data/gl-window.ui
index d0f929e..5e40309 100644
--- a/data/gl-window.ui
+++ b/data/gl-window.ui
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface domain="gnome-logs">
- <template class="GlWindow" parent="HdyApplicationWindow">
+ <template class="GlWindow" parent="AdwApplicationWindow">
<property name="default-width">1200</property>
<property name="default-height">600</property>
- <signal name="key-press-event" handler="on_gl_window_key_press_event"/>
+ <!-- TODO -->
+ <!-- <signal name="key-press-event" handler="on_gl_window_key_press_event"/> -->
<child>
<object class="GtkBox" id="event_box">
<property name="orientation">vertical</property>
@@ -16,10 +17,11 @@
<object class="GtkInfoBar" id="info_bar">
<property name="message-type">GTK_MESSAGE_ERROR</property>
<child>
- <object class="GtkButtonBox" id="action_area">
+ <object class="GtkBox" id="action_area">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
- <property name="layout_style">center</property>
+ <!-- TODO -->
+ <!-- <property name="layout_style">center</property> -->
<child>
<object class="GtkButton" id="help_button">
<property name="visible">True</property>
@@ -37,10 +39,6 @@
</object>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
</child>
</object>
</child>