[gnome-todo] Simplify UI files
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-todo] Simplify UI files
- Date: Tue, 23 Apr 2019 21:10:41 +0000 (UTC)
commit d92505ed2abf1805bf293de34828a09d1a42b1d4
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Tue Apr 23 18:09:38 2019 -0300
Simplify UI files
Run "gtk4-builder-tool simplify --3to4" on them and
save a few lines
plugins/background/ui/preferences.ui | 112 ++++++++++---------------
plugins/todoist/ui/preferences.ui | 31 ++-----
src/gtd-initial-setup-window.ui | 30 +++----
src/gtd-plugin-dialog-row.ui | 83 +++++++++----------
src/gtd-plugin-dialog.ui | 43 ++++------
src/gtd-task-list-panel.ui | 57 +++----------
src/gtd-window.ui | 65 +++++----------
src/notification/gtd-notification-widget.ui | 33 +++-----
src/provider/gtd-provider-popover.ui | 121 +++++++++++++---------------
src/provider/gtd-provider-row.ui | 61 +++++++-------
src/provider/gtd-provider-selector.ui | 33 +++-----
src/sidebar/gtd-sidebar-list-row.ui | 14 +---
src/sidebar/gtd-sidebar-panel-row.ui | 10 +--
src/sidebar/gtd-sidebar-provider-row.ui | 41 +++-------
src/sidebar/gtd-sidebar.ui | 14 +---
src/task-list-view/gtd-dnd-row.ui | 13 ++-
src/task-list-view/gtd-edit-pane.ui | 82 +++++++------------
src/task-list-view/gtd-new-task-row.ui | 20 ++---
src/task-list-view/gtd-task-list-popover.ui | 22 ++---
src/task-list-view/gtd-task-list-view.ui | 56 +++++--------
src/task-list-view/gtd-task-row.ui | 84 ++++++-------------
src/widgets/gtd-empty-list-widget.ui | 10 +--
22 files changed, 361 insertions(+), 674 deletions(-)
---
diff --git a/plugins/background/ui/preferences.ui b/plugins/background/ui/preferences.ui
index ec2fd68..eeb16a6 100644
--- a/plugins/background/ui/preferences.ui
+++ b/plugins/background/ui/preferences.ui
@@ -2,77 +2,61 @@
<interface>
<requires lib="gtk+" version="3.20"/>
<object class="GtkFrame" id="main_frame">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkFrame">
<property name="width_request">400</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="label_xalign">0</property>
+ <property name="hexpand">1</property>
+ <property name="vexpand">1</property>
<child>
<object class="GtkListBox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
+ <property name="hexpand">1</property>
+ <property name="vexpand">1</property>
<property name="selection-mode">none</property>
<child>
<object class="GtkListBoxRow">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">1</property>
<child>
<object class="GtkGrid">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="margin">12</property>
<property name="column_spacing">18</property>
<child>
<object class="GtkSwitch" id="startup_switch">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">1</property>
<property name="valign">center</property>
+ <layout>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="row-span">2</property>
+ </layout>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="height">2</property>
- </packing>
</child>
<child>
<object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="hexpand">1</property>
<property name="label" translatable="yes">Run on Startup</property>
<property name="xalign">0</property>
+ <layout>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </layout>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
</child>
<child>
<object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="hexpand">1</property>
<property name="label" translatable="yes">Run To Do automatically when you log
in</property>
<property name="xalign">0</property>
<style>
<class name="dim-label"/>
</style>
+ <layout>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </layout>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
</child>
</object>
</child>
@@ -80,68 +64,56 @@
</child>
<child>
<object class="GtkListBoxRow">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activatable">False</property>
- <property name="selectable">False</property>
+ <property name="can_focus">1</property>
+ <property name="activatable">0</property>
+ <property name="selectable">0</property>
<child>
- <object class="GtkSeparator">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
+ <object class="GtkSeparator"/>
</child>
</object>
</child>
<child>
<object class="GtkListBoxRow">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">1</property>
<child>
<object class="GtkGrid">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="margin">12</property>
<property name="column_spacing">18</property>
<child>
<object class="GtkSwitch" id="notifications_switch">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">1</property>
<property name="valign">center</property>
+ <layout>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="row-span">2</property>
+ </layout>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="height">2</property>
- </packing>
</child>
<child>
<object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="hexpand">1</property>
<property name="label" translatable="yes">Show Notifications</property>
<property name="xalign">0</property>
+ <layout>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </layout>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
</child>
<child>
<object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="hexpand">1</property>
<property name="label" translatable="yes">When To Do runs, show a startup
notification</property>
<property name="xalign">0</property>
<style>
<class name="dim-label"/>
</style>
+ <layout>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </layout>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
</child>
</object>
</child>
diff --git a/plugins/todoist/ui/preferences.ui b/plugins/todoist/ui/preferences.ui
index 29511af..fed9c68 100644
--- a/plugins/todoist/ui/preferences.ui
+++ b/plugins/todoist/ui/preferences.ui
@@ -1,15 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.16"/>
<template class="GtdTodoistPreferencesPanel" parent="GtkStack">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="transition_type">crossfade</property>
<child>
<object class="GtkBox" id="accounts_page">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="margin_start">80</property>
<property name="margin_end">80</property>
<property name="margin_top">24</property>
@@ -18,28 +13,21 @@
<property name="spacing">12</property>
<child>
<object class="GtkImage" id="logo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="pixel_size">64</property>
<property name="icon_name">org.gnome.Todo</property>
</object>
</child>
<child>
<object class="GtkScrolledWindow" id="scrolled_window">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">1</property>
<property name="shadow_type">in</property>
<property name="min_content_height">200</property>
<property name="max_content_height">300</property>
<child>
<object class="GtkViewport" id="viewport">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkListBox" id="accounts_listbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="selection-mode">none</property>
<signal name="row-activated" handler="account_row_clicked_cb"/>
</object>
@@ -55,8 +43,6 @@
</child>
<child>
<object class="GtkBox" id="empty_page">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="margin_start">24</property>
<property name="margin_end">24</property>
<property name="margin_top">80</property>
@@ -65,32 +51,27 @@
<property name="spacing">12</property>
<child>
<object class="GtkImage">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="pixel_size">96</property>
<property name="icon_name">edit-find-symbolic</property>
<style>
- <class name="dim-label" />
+ <class name="dim-label"/>
</style>
</object>
</child>
<child>
<object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label" translatable="yes">No Todoist accounts found</property>
<attributes>
- <attribute name="weight" value="bold"/>
- <attribute name="scale" value="1.44" />
+ <attribute name="weight" value="bold"></attribute>
+ <attribute name="scale" value="1.44"></attribute>
</attributes>
</object>
</child>
<child>
<object class="GtkButton" id="add_button">
<property name="label" translatable="yes">Add a Todoist account</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can_focus">1</property>
+ <property name="receives_default">1</property>
<property name="halign">center</property>
</object>
</child>
diff --git a/src/gtd-initial-setup-window.ui b/src/gtd-initial-setup-window.ui
index 466be7c..4f9a522 100644
--- a/src/gtd-initial-setup-window.ui
+++ b/src/gtd-initial-setup-window.ui
@@ -4,45 +4,37 @@
<template class="GtdInitialSetupWindow" parent="GtkApplicationWindow">
<property name="width_request">800</property>
<property name="height_request">600</property>
- <property name="can_focus">False</property>
- <property name="resizable">False</property>
+ <property name="resizable">0</property>
<property name="window_position">center</property>
<property name="default_width">800</property>
<property name="default_height">600</property>
<child>
<object class="GtkBox" id="box">
- <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="margin_bottom">48</property>
- <property name="vexpand">True</property>
+ <property name="vexpand">1</property>
<property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
<object class="GtkLabel" id="welcome_label">
- <property name="can_focus">False</property>
<property name="label" translatable="yes">Welcome</property>
<style>
<class name="main-title"/>
</style>
</object>
<packing>
- <property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="subtitle_label">
- <property name="can_focus">False</property>
<property name="label" translatable="yes">Log in to online accounts to access your
tasks</property>
<style>
<class name="main-subtitle"/>
</style>
</object>
<packing>
- <property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
</packing>
</child>
<child>
@@ -51,31 +43,30 @@
<property name="width_request">400</property>
<property name="valign">center</property>
<property name="halign">center</property>
- <signal name="storage-selected" handler="gtd_initial_setup_window__location_selected"
object="GtdInitialSetupWindow" swapped="yes" />
+ <signal name="storage-selected" handler="gtd_initial_setup_window__location_selected"
object="GtdInitialSetupWindow" swapped="yes"/>
</object>
</child>
</object>
</child>
<child type="titlebar">
<object class="GtkHeaderBar" id="headerbar">
- <property name="can_focus">False</property>
<property name="title" translatable="yes">To Do Setup</property>
<child>
<object class="GtkButton" id="cancel_button">
<property name="label" translatable="yes">_Cancel</property>
- <property name="use_underline">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="use_underline">1</property>
+ <property name="can_focus">1</property>
+ <property name="receives_default">1</property>
<signal name="clicked" handler="gtd_initial_setup_window__button_clicked"
object="GtdInitialSetupWindow" swapped="yes"/>
</object>
</child>
<child>
<object class="GtkButton" id="done_button">
<property name="label" translatable="yes">_Done</property>
- <property name="use_underline">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="use_underline">1</property>
+ <property name="sensitive">0</property>
+ <property name="can_focus">1</property>
+ <property name="receives_default">1</property>
<signal name="clicked" handler="gtd_initial_setup_window__button_clicked"
object="GtdInitialSetupWindow" swapped="yes"/>
<style>
<class name="suggested-action"/>
@@ -83,7 +74,6 @@
</object>
<packing>
<property name="pack_type">end</property>
- <property name="position">1</property>
</packing>
</child>
</object>
diff --git a/src/gtd-plugin-dialog-row.ui b/src/gtd-plugin-dialog-row.ui
index a013990..fe0fb5d 100644
--- a/src/gtd-plugin-dialog-row.ui
+++ b/src/gtd-plugin-dialog-row.ui
@@ -1,101 +1,94 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.19.0 -->
<interface>
<requires lib="gtk+" version="3.18"/>
<template class="GtdPluginDialogRow" parent="GtkListBoxRow">
- <property name="can_focus">True</property>
+ <property name="can_focus">1</property>
<child>
<object class="GtkGrid">
- <property name="can_focus">False</property>
<property name="margin">12</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkImage" id="icon_image">
- <property name="can_focus">False</property>
<property name="pixel_size">32</property>
<property name="icon_name">application-system-symbolic</property>
+ <layout>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="row-span">2</property>
+ </layout>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="height">2</property>
- </packing>
</child>
<child>
<object class="GtkLabel" id="name_label">
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="hexpand">1</property>
<property name="xalign">0</property>
+ <layout>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </layout>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
</child>
<child>
<object class="GtkLabel" id="description_label">
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="hexpand">1</property>
<property name="xalign">0</property>
<style>
<class name="dim-label"/>
</style>
+ <layout>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </layout>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
</child>
<child>
<object class="GtkImage" id="error_image">
- <property name="visible">False</property>
- <property name="can_focus">False</property>
+ <property name="visible">0</property>
<property name="valign">center</property>
<property name="halign">center</property>
<property name="icon_name">dialog-warning-symbolic</property>
<property name="pixel_size">16</property>
+ <layout>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="row-span">2</property>
+ </layout>
</object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- <property name="height">2</property>
- </packing>
</child>
<child>
<object class="GtkSwitch" id="loaded_switch">
- <property name="can_focus">True</property>
+ <property name="can_focus">1</property>
<property name="valign">center</property>
- <signal name="notify::active" handler="loaded_switch_changed" object="GtdPluginDialogRow"
swapped="yes" />
+ <signal name="notify::active" handler="loaded_switch_changed" object="GtdPluginDialogRow"
swapped="yes"/>
+ <layout>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="row-span">2</property>
+ </layout>
</object>
- <packing>
- <property name="left_attach">3</property>
- <property name="top_attach">0</property>
- <property name="height">2</property>
- </packing>
</child>
<child>
<object class="GtkButton" id="preferences_button">
- <property name="can_focus">True</property>
- <property name="sensitive">False</property>
+ <property name="can_focus">1</property>
+ <property name="sensitive">0</property>
<property name="halign">center</property>
<property name="valign">center</property>
- <signal name="clicked" handler="preferences_button_clicked" object="GtdPluginDialogRow"
swapped="yes" />
+ <signal name="clicked" handler="preferences_button_clicked" object="GtdPluginDialogRow"
swapped="yes"/>
<style>
- <class name="circle" />
+ <class name="circle"/>
</style>
<child>
<object class="GtkImage">
- <property name="can_focus">False</property>
<property name="icon_name">preferences-system-symbolic</property>
<property name="pixel_size">16</property>
</object>
</child>
+ <layout>
+ <property name="left_attach">4</property>
+ <property name="top_attach">0</property>
+ <property name="row-span">2</property>
+ </layout>
</object>
- <packing>
- <property name="left_attach">4</property>
- <property name="top_attach">0</property>
- <property name="height">2</property>
- </packing>
</child>
</object>
</child>
diff --git a/src/gtd-plugin-dialog.ui b/src/gtd-plugin-dialog.ui
index 274f47b..61aeb6a 100644
--- a/src/gtd-plugin-dialog.ui
+++ b/src/gtd-plugin-dialog.ui
@@ -2,41 +2,35 @@
<interface>
<requires lib="gtk+" version="3.16"/>
<template class="GtdPluginDialog" parent="GtkDialog">
- <property name="can_focus">False</property>
<property name="type_hint">dialog</property>
- <property name="destroy_with_parent">True</property>
- <property name="modal">True</property>
+ <property name="destroy_with_parent">1</property>
+ <property name="modal">1</property>
<property name="width_request">600</property>
<property name="height_request">450</property>
- <property name="hide-on-close">True</property>
+ <property name="hide-on-close">1</property>
<child internal-child="content_area">
<object class="GtkBox" id="dialog-vbox1">
- <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkStack" id="stack">
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="interpolate_size">True</property>
-
+ <property name="hexpand">1</property>
+ <property name="vexpand">1</property>
+ <property name="interpolate_size">1</property>
<child>
<object class="GtkStackPage">
<property name="name">list</property>
<property name="child">
<object class="GtkScrolledWindow">
- <property name="can_focus">True</property>
- <property name="propagate_natural_width">True</property>
+ <property name="can_focus">1</property>
+ <property name="propagate_natural_width">1</property>
<child>
<object class="GtkViewport">
- <property name="can_focus">False</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkListBox" id="listbox">
- <property name="can_focus">False</property>
<property name="selection_mode">none</property>
<style>
- <class name="extension-list" />
+ <class name="extension-list"/>
</style>
</object>
</child>
@@ -46,50 +40,44 @@
</property>
</object>
</child>
-
<child>
<object class="GtkStackPage">
<property name="name">config</property>
<property name="child">
<object class="GtkFrame" id="frame">
- <property name="can_focus">False</property>
<property name="shadow_type">none</property>
</object>
</property>
</object>
</child>
-
</object>
</child>
</object>
</child>
<child type="titlebar">
<object class="GtkHeaderBar" id="headerbar">
- <property name="can_focus">False</property>
<property name="title" translatable="yes">Extensions</property>
- <property name="show-title-buttons">True</property>
+ <property name="show-title-buttons">1</property>
<child>
<object class="GtkButton" id="back_button">
- <property name="visible">False</property>
- <property name="can_focus">True</property>
+ <property name="visible">0</property>
+ <property name="can_focus">1</property>
<property name="icon-name">go-previous-symbolic</property>
- <signal name="clicked" handler="back_button_clicked" object="GtdPluginDialog" swapped="no" />
+ <signal name="clicked" handler="back_button_clicked" object="GtdPluginDialog" swapped="no"/>
</object>
</child>
</object>
</child>
</template>
<object class="GtkBox" id="extension_list_placeholder">
- <property name="can_focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
+ <property name="hexpand">1</property>
+ <property name="vexpand">1</property>
<property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
<object class="GtkImage">
- <property name="can_focus">False</property>
<property name="pixel_size">64</property>
<property name="icon_name">preferences-system-symbolic</property>
<style>
@@ -99,7 +87,6 @@
</child>
<child>
<object class="GtkLabel">
- <property name="can_focus">False</property>
<property name="label" translatable="yes">No extensions found</property>
<style>
<class name="dim-label"/>
diff --git a/src/gtd-task-list-panel.ui b/src/gtd-task-list-panel.ui
index 01a23c2..28691a6 100644
--- a/src/gtd-task-list-panel.ui
+++ b/src/gtd-task-list-panel.ui
@@ -1,115 +1,84 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<template class="GtdTaskListPanel" parent="GtkBox">
- <property name="visible">true</property>
- <property name="can-focus">false</property>
-
- <!-- Main task list view -->
<child>
- <object class="GtdTaskListView" id="task_list_view">
- </object>
+ <object class="GtdTaskListView" id="task_list_view"/>
</child>
-
</template>
-
- <!-- Popover -->
<object class="GtkPopoverMenu" id="popover">
- <property name="visible">false</property>
- <signal name="hide" handler="on_popover_hidden_cb" object="GtdTaskListPanel" swapped="no" />
-
+ <property name="visible">0</property>
+ <signal name="hide" handler="on_popover_hidden_cb" object="GtdTaskListPanel" swapped="no"/>
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
<property name="spacing">12</property>
-
- <!-- Color grid -->
<child>
<object class="GtkFlowBox" id="colors_flowbox">
- <property name="expand">true</property>
+ <property name="expand">1</property>
<property name="selection-mode">none</property>
<property name="min-children-per-line">3</property>
<property name="max-children-per-line">3</property>
- <signal name="child-activated" handler="on_colors_flowbox_child_activated_cb"
object="GtdTaskListPanel" swapped="no" />
+ <signal name="child-activated" handler="on_colors_flowbox_child_activated_cb"
object="GtdTaskListPanel" swapped="no"/>
</object>
</child>
-
<child>
<object class="GtkModelButton">
<property name="text" translatable="yes">Rename</property>
<property name="menu-name">rename</property>
</object>
</child>
-
<child>
<object class="GtkModelButton">
<property name="text" translatable="yes">Clear completed tasks…</property>
<property name="action-name">list.clear-completed-tasks</property>
</object>
</child>
-
<child>
- <object class="GtkSeparator">
- </object>
+ <object class="GtkSeparator"/>
</child>
-
<child>
<object class="GtkModelButton">
<property name="text" translatable="yes">Delete</property>
- <signal name="clicked" handler="on_delete_button_clicked_cb" object="GtdTaskListPanel"
swapped="no" />
+ <signal name="clicked" handler="on_delete_button_clicked_cb" object="GtdTaskListPanel"
swapped="no"/>
</object>
</child>
</object>
</child>
-
- <!-- Rename submenu -->
<child>
<object class="GtkBox">
- <property name="can_focus">False</property>
+ <property name="name">rename</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<property name="margin">12</property>
-
<child>
<object class="GtkModelButton" id="rename_header_button">
<property name="text" translatable="yes">Rename</property>
<property name="menu-name">main</property>
- <property name="inverted">true</property>
- <property name="centered">true</property>
+ <property name="inverted">1</property>
+ <property name="centered">1</property>
</object>
</child>
-
<child>
<object class="GtkBox">
- <property name="can_focus">False</property>
<property name="spacing">12</property>
-
- <!-- Entry -->
<child>
<object class="GtkEntry" id="rename_entry">
- <signal name="activate" handler="on_rename_entry_activated_cb" object="GtdTaskListPanel"
swapped="no" />
- <signal name="notify::text" handler="on_rename_entry_text_changed_cb"
object="GtdTaskListPanel" swapped="no" />
+ <signal name="activate" handler="on_rename_entry_activated_cb" object="GtdTaskListPanel"
swapped="no"/>
+ <signal name="notify::text" handler="on_rename_entry_text_changed_cb"
object="GtdTaskListPanel" swapped="no"/>
</object>
</child>
-
- <!-- Button -->
<child>
<object class="GtkButton" id="rename_button">
- <property name="can_focus">False</property>
<property name="label" translatable="yes">Rename</property>
- <signal name="clicked" handler="on_rename_button_clicked_cb" object="GtdTaskListPanel"
swapped="no" />
+ <signal name="clicked" handler="on_rename_button_clicked_cb" object="GtdTaskListPanel"
swapped="no"/>
<style>
<class name="destructive-action"/>
</style>
</object>
</child>
-
</object>
</child>
-
</object>
- <packing>
- <property name="submenu">rename</property>
- </packing>
</child>
</object>
</interface>
diff --git a/src/gtd-window.ui b/src/gtd-window.ui
index 2bc2630..9eb3700 100644
--- a/src/gtd-window.ui
+++ b/src/gtd-window.ui
@@ -1,18 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
<interface>
<requires lib="gtk+" version="3.16"/>
<template class="GtdWindow" parent="GtkApplicationWindow">
- <property name="can_focus">False</property>
<property name="default_width">800</property>
<property name="default_height">600</property>
- <signal name="notify::is-active" handler="on_active_state_changed_cb" object="GtdWindow" swapped="no" />
+ <signal name="notify::is-active" handler="on_active_state_changed_cb" object="GtdWindow" swapped="no"/>
<style>
<class name="org-gnome-Todo"/>
</style>
<child>
<object class="GtkOverlay" id="overlay">
- <property name="can_focus">False</property>
<child type="overlay">
<object class="GtdNotificationWidget" id="notification_widget">
<property name="can_focus">False</property>
@@ -22,27 +19,21 @@
</child>
<child>
<object class="GtkBox">
- <property name="can_focus">False</property>
-
- <!-- Sidebar -->
<child>
<object class="GtdSidebar" id="sidebar">
<property name="can_focus">False</property>
<property name="vexpand">True</property>
</object>
</child>
-
- <!-- Main list -->
<child>
<object class="GtkStack" id="stack">
- <property name="can_focus">False</property>
- <property name="expand">True</property>
- <property name="homogeneous">False</property>
+ <property name="expand">1</property>
+ <property name="homogeneous">0</property>
<property name="transition_duration">250</property>
<property name="transition_type">crossfade</property>
- <signal name="notify::visible-child" handler="on_stack_visible_child_cb" object="GtdWindow"
swapped="yes" />
+ <signal name="notify::visible-child" handler="on_stack_visible_child_cb" object="GtdWindow"
swapped="yes"/>
<style>
- <class name="background" />
+ <class name="background"/>
</style>
</object>
</child>
@@ -52,24 +43,18 @@
</child>
<child type="titlebar">
<object class="GtkBox">
-
- <!-- First headerbar -->
<child>
<object class="GtkHeaderBar" id="start_headerbar">
- <property name="can_focus">False</property>
-
<child>
<object class="GtkMenuButton">
- <property name="can_focus">True</property>
+ <property name="can_focus">1</property>
<property name="label" translatable="yes">_New List</property>
- <property name="use-underline">True</property>
- <property name="receives_default">True</property>
+ <property name="use-underline">1</property>
+ <property name="receives_default">1</property>
<property name="popover">new_list_popover</property>
<property name="halign">start</property>
</object>
</child>
-
- <!-- App menu -->
<child type="end">
<object class="GtkMenuButton">
<property name="menu-model">app-menu</property>
@@ -78,56 +63,48 @@
</child>
</object>
</child>
-
<child>
<object class="GtkSeparator">
<property name="orientation">vertical</property>
</object>
</child>
-
- <!-- Second headerbar -->
<child>
<object class="GtkHeaderBar" id="headerbar">
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="show-title-buttons">True</property>
+ <property name="hexpand">1</property>
+ <property name="show-title-buttons">1</property>
<child>
<object class="GtkBox" id="panel_box_start">
- <property name="can_focus">False</property>
<property name="spacing">6</property>
</object>
</child>
<child>
<object class="GtkBox" id="extension_box_start">
- <property name="can_focus">False</property>
<property name="spacing">6</property>
</object>
</child>
<child type="end">
<object class="GtkButton" id="cancel_selection_button">
<property name="label" translatable="yes">_Cancel</property>
- <property name="use_underline">True</property>
- <property name="visible">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="on_cancel_selection_button_clicked" object="GtdWindow"
swapped="no" />
+ <property name="use_underline">1</property>
+ <property name="visible">0</property>
+ <property name="can_focus">1</property>
+ <property name="receives_default">1</property>
+ <signal name="clicked" handler="on_cancel_selection_button_clicked" object="GtdWindow"
swapped="no"/>
</object>
</child>
<child type="end">
<object class="GtkMenuButton" id="gear_menu_button">
- <property name="can_focus">True</property>
+ <property name="can_focus">1</property>
<property name="icon-name">view-more-symbolic</property>
</object>
</child>
<child type="end">
<object class="GtkBox" id="panel_box_end">
- <property name="can_focus">False</property>
<property name="spacing">6</property>
</object>
</child>
<child type="end">
<object class="GtkBox" id="extension_box_end">
- <property name="can_focus">False</property>
<property name="spacing">6</property>
</object>
</child>
@@ -136,22 +113,16 @@
</object>
</child>
</template>
-
- <!-- New List popover -->
<object class="GtdProviderPopover" id="new_list_popover">
<property name="can_focus">False</property>
<property name="position">bottom</property>
</object>
-
- <!-- Sizegroup to keep sidebar & headerbar aligned -->
<object class="GtkSizeGroup">
- <property name="mode">horizontal</property>
<widgets>
- <widget name="sidebar" />
- <widget name="start_headerbar" />
+ <widget name="sidebar"/>
+ <widget name="start_headerbar"/>
</widgets>
</object>
-
<menu id="app-menu">
<section>
<item>
diff --git a/src/notification/gtd-notification-widget.ui b/src/notification/gtd-notification-widget.ui
index 4765728..dbbdf08 100644
--- a/src/notification/gtd-notification-widget.ui
+++ b/src/notification/gtd-notification-widget.ui
@@ -2,37 +2,28 @@
<interface>
<requires lib="gtk+" version="3.16"/>
<template class="GtdNotificationWidget" parent="GtkRevealer">
- <property name="can_focus">False</property>
-
- <!-- Event Controller -->
<child>
<object class="GtkEventControllerMotion">
- <signal name="enter" handler="on_motion_controller_enter_cb" object="GtdNotificationWidget"
swapped="no" />
- <signal name="leave" handler="on_motion_controller_leave_cb" object="GtdNotificationWidget"
swapped="no" />
+ <signal name="enter" handler="on_motion_controller_enter_cb" object="GtdNotificationWidget"
swapped="no"/>
+ <signal name="leave" handler="on_motion_controller_leave_cb" object="GtdNotificationWidget"
swapped="no"/>
</object>
</child>
-
<child>
<object class="GtkFrame" id="frame">
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkBox" id="box">
- <property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkSpinner" id="spinner">
- <property name="visible">False</property>
- <property name="can_focus">False</property>
- <property name="active">True</property>
+ <property name="visible">0</property>
+ <property name="active">1</property>
</object>
</child>
<child>
<object class="GtkLabel" id="text_label">
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="use_markup">True</property>
+ <property name="hexpand">1</property>
+ <property name="use_markup">1</property>
<property name="xalign">0</property>
<property name="max-width-chars">30</property>
<property name="ellipsize">middle</property>
@@ -40,18 +31,18 @@
</child>
<child>
<object class="GtkButton" id="secondary_button">
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="on_secondary_button_clicked_cb"
object="GtdNotificationWidget" swapped="yes" />
+ <property name="can_focus">1</property>
+ <property name="receives_default">1</property>
+ <signal name="clicked" handler="on_secondary_button_clicked_cb"
object="GtdNotificationWidget" swapped="yes"/>
</object>
</child>
<child>
<object class="GtkButton" id="close_button">
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can_focus">1</property>
+ <property name="receives_default">1</property>
<property name="relief">none</property>
<property name="icon-name">window-close-symbolic</property>
- <signal name="clicked" handler="on_close_button_clicked_cb" object="GtdNotificationWidget"
swapped="yes" />
+ <signal name="clicked" handler="on_close_button_clicked_cb" object="GtdNotificationWidget"
swapped="yes"/>
</object>
</child>
</object>
diff --git a/src/provider/gtd-provider-popover.ui b/src/provider/gtd-provider-popover.ui
index e548a38..aa1b997 100644
--- a/src/provider/gtd-provider-popover.ui
+++ b/src/provider/gtd-provider-popover.ui
@@ -2,92 +2,84 @@
<interface>
<requires lib="gtk+" version="3.16"/>
<template class="GtdProviderPopover" parent="GtkPopover">
- <property name="can_focus">False</property>
- <signal name="closed" handler="gtd_provider_popover__closed" swapped="no" />
+ <signal name="closed" handler="gtd_provider_popover__closed" swapped="no"/>
<child>
<object class="GtkStack" id="stack">
- <property name="can_focus">False</property>
<property name="margin">18</property>
- <property name="vhomogeneous">False</property>
- <property name="interpolate_size">True</property>
+ <property name="vhomogeneous">0</property>
+ <property name="interpolate_size">1</property>
<property name="transition_duration">300</property>
<property name="transition_type">slide-left-right</property>
-
<child>
<object class="GtkStackPage">
<property name="name">main</property>
<property name="child">
<object class="GtkGrid" id="new_list_popover_grid">
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="hexpand">1</property>
<property name="row_spacing">12</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkButton" id="new_list_create_button">
<property name="label" translatable="yes">Create _List</property>
- <property name="use_underline">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="gtd_provider_popover__action_button_clicked"
object="GtdProviderPopover" swapped="yes" />
+ <property name="use_underline">1</property>
+ <property name="sensitive">0</property>
+ <property name="can_focus">1</property>
+ <property name="receives_default">1</property>
+ <signal name="clicked" handler="gtd_provider_popover__action_button_clicked"
object="GtdProviderPopover" swapped="yes"/>
<style>
<class name="suggested-action"/>
</style>
+ <layout>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </layout>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
</child>
<child>
<object class="GtkButton" id="new_list_cancel_button">
<property name="label" translatable="yes">_Cancel</property>
- <property name="use_underline">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="gtd_provider_popover__action_button_clicked"
object="GtdProviderPopover" swapped="yes" />
+ <property name="use_underline">1</property>
+ <property name="can_focus">1</property>
+ <property name="receives_default">1</property>
+ <signal name="clicked" handler="gtd_provider_popover__action_button_clicked"
object="GtdProviderPopover" swapped="yes"/>
+ <layout>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </layout>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
</child>
<child>
<object class="GtkLabel" id="new_list_popover_dim_label">
- <property name="can_focus">False</property>
<property name="label" translatable="yes">List Name</property>
<property name="xalign">0</property>
<style>
<class name="dim-label"/>
</style>
+ <layout>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="column-span">2</property>
+ </layout>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">2</property>
- </packing>
</child>
<child>
<object class="GtkBox" id="location_box">
- <property name="can_focus">False</property>
<child>
<object class="GtkEntry" id="new_list_name_entry">
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
+ <property name="can_focus">1</property>
+ <property name="hexpand">1</property>
<property name="width_chars">35</property>
- <signal name="notify::text" handler="gtd_provider_popover__text_changed_cb"
object="GtdProviderPopover" swapped="yes" />
- <signal name="activate" handler="gtd_provider_popover__entry_activate"
object="GtdProviderPopover" swapped="yes" />
+ <signal name="notify::text" handler="gtd_provider_popover__text_changed_cb"
object="GtdProviderPopover" swapped="yes"/>
+ <signal name="activate" handler="gtd_provider_popover__entry_activate"
object="GtdProviderPopover" swapped="yes"/>
</object>
</child>
<child>
<object class="GtkButton" id="change_location_button">
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="sensitive">True</property>
- <signal name="clicked" handler="gtd_provider_popover__change_location_clicked"
object="GtdProviderPopover" swapped="yes" />
+ <property name="can_focus">1</property>
+ <property name="receives_default">1</property>
+ <signal name="clicked" handler="gtd_provider_popover__change_location_clicked"
object="GtdProviderPopover" swapped="yes"/>
<child>
<object class="GtkImage" id="location_provider_image">
- <property name="can_focus">False</property>
<property name="pixel_size">16</property>
<property name="icon_name">goa-account</property>
</object>
@@ -97,18 +89,17 @@
<style>
<class name="linked"/>
</style>
+ <layout>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="column-span">2</property>
+ </layout>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">2</property>
- </packing>
</child>
</object>
</property>
</object>
</child>
-
<child>
<object class="GtkStackPage">
<property name="name">selector</property>
@@ -119,30 +110,30 @@
<child>
<object class="GtkButton" id="back_button">
<property name="halign">start</property>
- <signal name="clicked" handler="gtd_provider_popover__change_location_clicked"
object="GtdProviderPopover" swapped="yes" />
+ <signal name="clicked" handler="gtd_provider_popover__change_location_clicked"
object="GtdProviderPopover" swapped="yes"/>
<child>
<object class="GtkImage" id="back_image">
<property name="icon-name">go-previous-symbolic</property>
<property name="pixel-size">16</property>
</object>
</child>
+ <layout>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="column-span">1</property>
+ </layout>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- </packing>
</child>
<child>
<object class="GtkLabel" id="title_label">
- <property name="hexpand">True</property>
+ <property name="hexpand">1</property>
<property name="label" translatable="yes">Select a storage location</property>
+ <layout>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="column-span">1</property>
+ </layout>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- </packing>
</child>
<child>
<object class="GtdProviderSelector" id="provider_selector">
@@ -150,13 +141,13 @@
<property name="show_local">True</property>
<property name="select_default">True</property>
<property name="show_stub_rows">False</property>
- <signal name="provider-selected" handler="gtd_provider_popover__provider_selected"
object="GtdProviderPopover" swapped="yes" />
+ <signal name="provider-selected" handler="gtd_provider_popover__provider_selected"
object="GtdProviderPopover" swapped="yes"/>
+ <layout>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="column-span">2</property>
+ </layout>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">2</property>
- </packing>
</child>
</object>
</property>
diff --git a/src/provider/gtd-provider-row.ui b/src/provider/gtd-provider-row.ui
index 7e3338d..92df65e 100644
--- a/src/provider/gtd-provider-row.ui
+++ b/src/provider/gtd-provider-row.ui
@@ -1,73 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
<interface>
<requires lib="gtk+" version="3.16"/>
<template class="GtdProviderRow" parent="GtkListBoxRow">
- <property name="can_focus">True</property>
- <property name="selectable">False</property>
+ <property name="can_focus">1</property>
+ <property name="selectable">0</property>
<child>
<object class="GtkGrid" id="grid">
- <property name="can_focus">False</property>
<property name="margin">12</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkImage" id="selected">
- <property name="visible">False</property>
- <property name="can_focus">False</property>
+ <property name="visible">0</property>
<property name="icon_name">emblem-ok-symbolic</property>
+ <layout>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="row-span">2</property>
+ </layout>
</object>
- <packing>
- <property name="left_attach">3</property>
- <property name="top_attach">0</property>
- <property name="height">2</property>
- </packing>
</child>
<child>
<object class="GtkLabel" id="name">
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="hexpand">1</property>
<property name="xalign">0</property>
<style>
<class name="dim-label"/>
</style>
+ <layout>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </layout>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
</child>
<child>
<object class="GtkImage" id="icon">
- <property name="can_focus">False</property>
<property name="pixel_size">32</property>
<property name="icon_name">goa-account</property>
+ <layout>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="row-span">2</property>
+ </layout>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="height">2</property>
- </packing>
</child>
<child>
<object class="GtkLabel" id="description">
- <property name="can_focus">False</property>
<property name="xalign">0</property>
+ <layout>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </layout>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
</child>
<child>
<object class="GtkLabel" id="enabled">
- <property name="can_focus">False</property>
<property name="label" translatable="yes">Off</property>
+ <layout>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="row-span">2</property>
+ </layout>
</object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- <property name="height">2</property>
- </packing>
</child>
</object>
</child>
diff --git a/src/provider/gtd-provider-selector.ui b/src/provider/gtd-provider-selector.ui
index aa6b393..146b5be 100644
--- a/src/provider/gtd-provider-selector.ui
+++ b/src/provider/gtd-provider-selector.ui
@@ -2,40 +2,33 @@
<interface>
<requires lib="gtk+" version="3.16"/>
<template class="GtdProviderSelector" parent="GtkBox">
- <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame">
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
<child>
<object class="GtkListBox" id="listbox">
- <property name="sensitive" bind-source="local_check" bind-property="active"
bind-flags="default|sync-create|invert-boolean" />
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
+ <property name="sensitive" bind-source="local_check" bind-property="active"
bind-flags="default|sync-create|invert-boolean"/>
+ <property name="hexpand">1</property>
+ <property name="vexpand">1</property>
<property name="selection_mode">none</property>
- <signal name="row-activated" handler="gtd_provider_selector__listbox_row_activated"
object="GtdProviderSelector" swapped="yes" />
+ <signal name="row-activated" handler="gtd_provider_selector__listbox_row_activated"
object="GtdProviderSelector" swapped="yes"/>
<child>
<object class="GtkListBoxRow" id="google_stub_row">
- <property name="can_focus">True</property>
+ <property name="can_focus">1</property>
<property name="tooltip_text" translatable="yes">Click to add a new Google account</property>
<child>
<object class="GtkBox" id="google_stub_row_box">
- <property name="can_focus">False</property>
<property name="margin">12</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage" id="google_stub_row_icon_image">
- <property name="can_focus">False</property>
<property name="pixel_size">32</property>
<property name="icon_name">goa-account-google</property>
</object>
</child>
<child>
<object class="GtkLabel" id="google_stub_row_label">
- <property name="can_focus">False</property>
<property name="label" translatable="yes">Google</property>
</object>
</child>
@@ -45,23 +38,20 @@
</child>
<child>
<object class="GtkListBoxRow" id="owncloud_stub_row">
- <property name="can_focus">True</property>
+ <property name="can_focus">1</property>
<property name="tooltip_text" translatable="yes">Click to add a new ownCloud
account</property>
<child>
<object class="GtkBox" id="box3">
- <property name="can_focus">False</property>
<property name="margin">12</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage" id="image2">
- <property name="can_focus">False</property>
<property name="pixel_size">32</property>
<property name="icon_name">goa-account-owncloud</property>
</object>
</child>
<child>
<object class="GtkLabel" id="label2">
- <property name="can_focus">False</property>
<property name="label" translatable="yes">ownCloud</property>
</object>
</child>
@@ -71,23 +61,20 @@
</child>
<child>
<object class="GtkListBoxRow" id="exchange_stub_row">
- <property name="can_focus">True</property>
+ <property name="can_focus">1</property>
<property name="tooltip_text" translatable="yes">Click to add a new Microsoft Exchange
account</property>
<child>
<object class="GtkBox" id="box4">
- <property name="can_focus">False</property>
<property name="margin">12</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage" id="image3">
- <property name="can_focus">False</property>
<property name="pixel_size">32</property>
<property name="icon_name">goa-account</property>
</object>
</child>
<child>
<object class="GtkLabel" id="label3">
- <property name="can_focus">False</property>
<property name="label" translatable="yes">Microsoft Exchange</property>
</object>
</child>
@@ -102,10 +89,8 @@
<child>
<object class="GtkCheckButton" id="local_check">
<property name="label" translatable="yes">Or you can just store your tasks on this
computer</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="gtd_provider_selector__check_toggled" object="GtdProviderSelector"
swapped="yes" />
+ <property name="can_focus">1</property>
+ <signal name="toggled" handler="gtd_provider_selector__check_toggled" object="GtdProviderSelector"
swapped="yes"/>
</object>
</child>
</template>
diff --git a/src/sidebar/gtd-sidebar-list-row.ui b/src/sidebar/gtd-sidebar-list-row.ui
index 3b2a2a4..ada4894 100644
--- a/src/sidebar/gtd-sidebar-list-row.ui
+++ b/src/sidebar/gtd-sidebar-list-row.ui
@@ -2,37 +2,32 @@
<interface>
<requires lib="gtk+" version="3.20"/>
<template class="GtdSidebarListRow" parent="GtkListBoxRow">
- <property name="can_focus">True</property>
-
+ <property name="can_focus">1</property>
<child>
<object class="GtkBox">
- <property name="can_focus">False</property>
<property name="margin">10</property>
<property name="spacing">6</property>
<child>
<object class="GtkImage" id="color_icon">
- <property name="can_focus">False</property>
<property name="width-request">12</property>
<property name="height-request">12</property>
<property name="halign">center</property>
<property name="valign">center</property>
<style>
- <class name="color-circle-icon" />
+ <class name="color-circle-icon"/>
</style>
</object>
</child>
<child>
<object class="GtkLabel" id="name_label">
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="hexpand">1</property>
<property name="xalign">0</property>
</object>
</child>
<child>
<object class="GtkLabel" id="tasks_counter_label">
- <property name="can_focus">False</property>
<attributes>
- <attribute name="scale" value="0.88"/>
+ <attribute name="scale" value="0.88"></attribute>
</attributes>
<style>
<class name="dim-label"/>
@@ -42,5 +37,4 @@
</object>
</child>
</template>
-
</interface>
diff --git a/src/sidebar/gtd-sidebar-panel-row.ui b/src/sidebar/gtd-sidebar-panel-row.ui
index be9bb23..b1443d5 100644
--- a/src/sidebar/gtd-sidebar-panel-row.ui
+++ b/src/sidebar/gtd-sidebar-panel-row.ui
@@ -2,15 +2,13 @@
<interface>
<requires lib="gtk+" version="3.20"/>
<template class="GtdSidebarPanelRow" parent="GtkListBoxRow">
- <property name="can_focus">True</property>
+ <property name="can_focus">1</property>
<child>
<object class="GtkBox">
- <property name="can_focus">False</property>
<property name="margin">10</property>
<property name="spacing">6</property>
<child>
<object class="GtkImage" id="panel_icon">
- <property name="can_focus">False</property>
<style>
<class name="dim-label"/>
</style>
@@ -18,17 +16,15 @@
</child>
<child>
<object class="GtkLabel" id="title_label">
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="hexpand">1</property>
<property name="xalign">0</property>
</object>
</child>
<child>
<object class="GtkLabel" id="subtitle_label">
- <property name="can_focus">False</property>
<property name="xalign">1.0</property>
<attributes>
- <attribute name="scale" value="0.88"/>
+ <attribute name="scale" value="0.88"></attribute>
</attributes>
<style>
<class name="dim-label"/>
diff --git a/src/sidebar/gtd-sidebar-provider-row.ui b/src/sidebar/gtd-sidebar-provider-row.ui
index dc53970..2f0e484 100644
--- a/src/sidebar/gtd-sidebar-provider-row.ui
+++ b/src/sidebar/gtd-sidebar-provider-row.ui
@@ -2,13 +2,12 @@
<interface>
<requires lib="gtk+" version="3.20"/>
<template class="GtdSidebarProviderRow" parent="GtkListBoxRow">
- <property name="can_focus">True</property>
- <property name="selectable">False</property>
- <property name="activatable">False</property>
+ <property name="can_focus">1</property>
+ <property name="selectable">0</property>
+ <property name="activatable">0</property>
<property name="margin_top">6</property>
<child>
<object class="GtkBox">
- <property name="can_focus">False</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="margin_top">6</property>
@@ -16,71 +15,52 @@
<property name="orientation">vertical</property>
<child>
<object class="GtkBox">
- <property name="can_focus">False</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="spacing">12</property>
-
- <!-- Main label -->
<child>
<object class="GtkLabel" id="provider_label">
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="hexpand">1</property>
<property name="xalign">0.0</property>
<attributes>
- <attribute name="weight" value="bold"/>
- <attribute name="scale" value="0.88"/>
+ <attribute name="weight" value="bold"></attribute>
+ <attribute name="scale" value="0.88"></attribute>
</attributes>
<style>
<class name="dim-label"/>
</style>
</object>
</child>
-
- <!-- Stack with the loading spinner & pan-down arrow -->
<child>
<object class="GtkStack" id="stack">
- <property name="can_focus">False</property>
- <property name="homogeneous">True</property>
<property name="transition-type">crossfade</property>
-
- <!-- Loading spinner -->
<child>
<object class="GtkStackPage">
<property name="name">spinner</property>
<property name="child">
<object class="GtkSpinner">
- <property name="active">True</property>
+ <property name="active">1</property>
</object>
</property>
</object>
</child>
-
- <!-- Drop down icon -->
<child>
<object class="GtkStackPage">
<property name="name">empty</property>
<property name="child">
- <object class="GtkBox" />
+ <object class="GtkBox"/>
</property>
</object>
</child>
-
</object>
</child>
</object>
</child>
-
<child>
- <object class="GtkSeparator">
- <property name="can_focus">False</property>
- </object>
+ <object class="GtkSeparator"/>
</child>
-
- <!-- Loading label -->
<child>
<object class="GtkLabel" id="loading_label">
- <property name="can_focus">False</property>
<property name="margin-start">6</property>
<property name="margin-end">6</property>
<property name="margin-top">6</property>
@@ -88,14 +68,13 @@
<property name="xalign">0.0</property>
<property name="label" translatable="yes">Loading…</property>
<attributes>
- <attribute name="scale" value="0.88"/>
+ <attribute name="scale" value="0.88"></attribute>
</attributes>
<style>
<class name="dim-label"/>
</style>
</object>
</child>
-
</object>
</child>
</template>
diff --git a/src/sidebar/gtd-sidebar.ui b/src/sidebar/gtd-sidebar.ui
index 54ab93c..ce02f14 100644
--- a/src/sidebar/gtd-sidebar.ui
+++ b/src/sidebar/gtd-sidebar.ui
@@ -1,28 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<template class="GtdSidebar" parent="GtkBox">
- <property name="can_focus">False</property>
- <property name="hexpand">False</property>
+ <property name="hexpand">0</property>
<child>
<object class="GtkScrolledWindow">
- <property name="can_focus">True</property>
+ <property name="can_focus">1</property>
<property name="min-content-width">300</property>
<property name="hscrollbar-policy">never</property>
- <property name="vscrollbar-policy">automatic</property>
-
- <!-- Listbox -->
<child>
<object class="GtkListBox" id="listbox">
- <property name="can_focus">False</property>
- <property name="expand">True</property>
+ <property name="expand">1</property>
<property name="selection_mode">browse</property>
- <signal name="row-activated" handler="on_listbox_row_activated_cb" object="GtdSidebar"
swapped="no" />
+ <signal name="row-activated" handler="on_listbox_row_activated_cb" object="GtdSidebar"
swapped="no"/>
<style>
<class name="sidebar"/>
</style>
</object>
</child>
-
</object>
</child>
</template>
diff --git a/src/task-list-view/gtd-dnd-row.ui b/src/task-list-view/gtd-dnd-row.ui
index 53826c5..d5870b9 100644
--- a/src/task-list-view/gtd-dnd-row.ui
+++ b/src/task-list-view/gtd-dnd-row.ui
@@ -2,19 +2,16 @@
<interface>
<requires lib="gtk+" version="3.20"/>
<template class="GtdDndRow" parent="GtkListBoxRow">
- <property name="can_focus">True</property>
- <property name="activatable">False</property>
- <property name="selectable">False</property>
+ <property name="can_focus">1</property>
+ <property name="activatable">0</property>
+ <property name="selectable">0</property>
<property name="halign">center</property>
<property name="margin">3</property>
<child>
<object class="GtkBox" id="box">
- <property name="can_focus">False</property>
<child>
- <object class="GtkFrame" id='frame'>
- <property name="can_focus">False</property>
- <property name="expand">True</property>
- <property name="label_xalign">0</property>
+ <object class="GtkFrame" id="frame">
+ <property name="expand">1</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkBox">
diff --git a/src/task-list-view/gtd-edit-pane.ui b/src/task-list-view/gtd-edit-pane.ui
index 9c39418..8548a6f 100644
--- a/src/task-list-view/gtd-edit-pane.ui
+++ b/src/task-list-view/gtd-edit-pane.ui
@@ -3,28 +3,19 @@
<requires lib="gtk+" version="3.16"/>
<template class="GtdEditPane" parent="GtkBox">
<property name="orientation">vertical</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="hexpand">1</property>
<property name="spacing">6</property>
<property name="margin-start">12</property>
<property name="margin-end">12</property>
<property name="margin-bottom">12</property>
-
- <!-- Header separator -->
<child>
- <object class="GtkSeparator" id="separator">
- <property name="can_focus">False</property>
- </object>
+ <object class="GtkSeparator" id="separator"/>
</child>
-
-
- <!-- Due date -->
<child>
<object class="GtkLabel" id="due_date_dim_label">
<property name="label" translatable="yes">D_ue Date</property>
- <property name="use_underline">True</property>
+ <property name="use_underline">1</property>
<property name="mnemonic_widget">date_button</property>
- <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="margin-top">12</property>
<style>
@@ -32,46 +23,41 @@
</style>
</object>
</child>
-
<child>
<object class="GtkBox">
- <property name="can_focus">False</property>
<child>
<object class="GtkButton">
<property name="label" translatable="yes">_Today</property>
- <property name="use_underline">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked" handler="on_today_button_clicked_cb" object="GtdEditPane" swapped="no" />
+ <property name="use_underline">1</property>
+ <property name="can_focus">1</property>
+ <property name="receives_default">1</property>
+ <signal name="clicked" handler="on_today_button_clicked_cb" object="GtdEditPane" swapped="no"/>
</object>
</child>
<child>
<object class="GtkButton">
<property name="label" translatable="yes">To_morrow</property>
- <property name="use_underline">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="use_underline">1</property>
+ <property name="can_focus">1</property>
+ <property name="receives_default">1</property>
<signal name="clicked" handler="on_tomorrow_button_clicked_cb" object="GtdEditPane"
swapped="no"/>
</object>
</child>
<child>
<object class="GtkMenuButton" id="date_button">
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can_focus">1</property>
+ <property name="receives_default">1</property>
<property name="popover">date_popover</property>
<child>
<object class="GtkBox" id="date_button_box">
- <property name="can_focus">False</property>
<property name="spacing">7</property>
<child>
<object class="GtkLabel" id="date_label">
- <property name="can_focus">False</property>
<property name="width-chars">10</property>
</object>
</child>
<child>
<object class="GtkImage" id="date_button_image">
- <property name="can_focus">False</property>
<property name="icon_name">pan-down-symbolic</property>
</object>
</child>
@@ -84,14 +70,11 @@
</style>
</object>
</child>
-
- <!-- Notes -->
<child>
<object class="GtkLabel">
<property name="label" translatable="yes">_Notes</property>
- <property name="use_underline">True</property>
+ <property name="use_underline">1</property>
<property name="mnemonic_widget">notes_textview</property>
- <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="margin-top">12</property>
<style>
@@ -101,81 +84,72 @@
</child>
<child>
<object class="GtkScrolledWindow">
- <property name="expand">True</property>
- <property name="can-focus">True</property>
+ <property name="expand">1</property>
+ <property name="can-focus">1</property>
<property name="shadow-type">in</property>
<property name="min-content-height">200</property>
<child>
<object class="GtkTextView" id="notes_textview">
- <property name="can_focus">True</property>
- <property name="accepts_tab">False</property>
+ <property name="can_focus">1</property>
+ <property name="accepts_tab">0</property>
<property name="left-margin">6</property>
<property name="right-margin">6</property>
<property name="pixels-above-lines">6</property>
<property name="wrap-mode">word-char</property>
<property name="buffer">text_buffer</property>
-
<child>
<object class="GtkGestureMultiPress">
<property name="propagation-phase">capture</property>
- <signal name="pressed" handler="on_hyperlink_clicked_cb" object="GtdEditPane" swapped="no" />
+ <signal name="pressed" handler="on_hyperlink_clicked_cb" object="GtdEditPane" swapped="no"/>
</object>
</child>
<child>
<object class="GtkEventControllerMotion">
- <signal name="motion" handler="on_hyperlink_hover_cb" object="GtdEditPane" swapped="no" />
+ <signal name="motion" handler="on_hyperlink_hover_cb" object="GtdEditPane" swapped="no"/>
</object>
</child>
</object>
</child>
</object>
</child>
-
- <!-- Delete button -->
<child>
<object class="GtkButton" id="remove_button">
<property name="label" translatable="yes">_Delete</property>
- <property name="use_underline">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="vexpand">True</property>
+ <property name="use_underline">1</property>
+ <property name="can_focus">1</property>
+ <property name="receives_default">1</property>
+ <property name="vexpand">1</property>
<property name="valign">end</property>
<property name="halign">end</property>
<property name="margin-top">12</property>
- <signal name="clicked" handler="on_delete_button_clicked_cb" object="GtdEditPane" swapped="no" />
+ <signal name="clicked" handler="on_delete_button_clicked_cb" object="GtdEditPane" swapped="no"/>
<style>
<class name="destructive-action"/>
</style>
</object>
</child>
-
</template>
-
<object class="GtkTextBuffer" id="text_buffer">
- <signal name="notify::text" handler="on_text_buffer_changed_cb" object="GtdEditPane" swapped="no" />
+ <signal name="notify::text" handler="on_text_buffer_changed_cb" object="GtdEditPane" swapped="no"/>
</object>
-
<object class="GtkPopover" id="date_popover">
- <property name="can_focus">False</property>
<property name="position">bottom</property>
<child>
<object class="GtkBox" id="date_popover_box">
- <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="margin">12</property>
<property name="spacing">12</property>
<child>
<object class="GtkCalendar" id="calendar">
- <property name="can_focus">True</property>
- <property name="show_week_numbers">True</property>
+ <property name="can_focus">1</property>
+ <property name="show_week_numbers">1</property>
<signal name="day-selected" handler="on_date_selected_cb" object="GtdEditPane" swapped="no"/>
</object>
</child>
<child>
<object class="GtkButton" id="no_date_button">
<property name="label" translatable="yes" context="taskdate">None</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can_focus">1</property>
<signal name="clicked" handler="on_no_date_button_clicked_cb" object="GtdEditPane" swapped="no"/>
</object>
</child>
diff --git a/src/task-list-view/gtd-new-task-row.ui b/src/task-list-view/gtd-new-task-row.ui
index d7af358..7df7343 100644
--- a/src/task-list-view/gtd-new-task-row.ui
+++ b/src/task-list-view/gtd-new-task-row.ui
@@ -2,35 +2,31 @@
<interface>
<requires lib="gtk+" version="3.16"/>
<template class="GtdNewTaskRow" parent="GtkBin">
- <property name="can_focus">True</property>
+ <property name="can_focus">1</property>
<property name="margin-top">12</property>
<property name="height-request">42</property>
<property name="halign">center</property>
<property name="css-name">newtaskrow</property>
-
<child>
<object class="GtkEntry" id="entry">
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
+ <property name="can_focus">1</property>
+ <property name="hexpand">1</property>
<property name="placeholder-text" translatable="yes">New task…</property>
<property name="primary-icon-name">list-add-symbolic</property>
- <signal name="activate" handler="entry_activated_cb" object="GtdNewTaskRow" swapped="yes" />
- <signal name="icon-release" handler="on_entry_icon_released_cb" object="GtdNewTaskRow" swapped="no"
/>
-
+ <signal name="activate" handler="entry_activated_cb" object="GtdNewTaskRow" swapped="yes"/>
+ <signal name="icon-release" handler="on_entry_icon_released_cb" object="GtdNewTaskRow" swapped="no"/>
<child>
<object class="GtkEventControllerKey">
- <signal name="focus-in" handler="on_focus_in_cb" object="GtdNewTaskRow" swapped="no" />
+ <signal name="focus-in" handler="on_focus_in_cb" object="GtdNewTaskRow" swapped="no"/>
</object>
</child>
-
</object>
</child>
</template>
-
<object class="GtdTaskListPopover" id="tasklist_popover">
<property name="can_focus">False</property>
<property name="relative-to">entry</property>
- <signal name="notify::task-list" handler="on_tasklist_popover_changed_cb" object="GtdNewTaskRow"
swapped="no" />
- <signal name="closed" handler="on_tasklist_popover_closed_cb" object="GtdNewTaskRow" swapped="no"
after="yes" />
+ <signal name="notify::task-list" handler="on_tasklist_popover_changed_cb" object="GtdNewTaskRow"
swapped="no"/>
+ <signal name="closed" handler="on_tasklist_popover_closed_cb" object="GtdNewTaskRow" swapped="no"
after="yes"/>
</object>
</interface>
diff --git a/src/task-list-view/gtd-task-list-popover.ui b/src/task-list-view/gtd-task-list-popover.ui
index 1c21981..3b3a609 100644
--- a/src/task-list-view/gtd-task-list-popover.ui
+++ b/src/task-list-view/gtd-task-list-popover.ui
@@ -1,44 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<template class="GtdTaskListPopover" parent="GtkPopover">
- <signal name="closed" handler="on_popover_closed_cb" object="GtdTaskListPopover" swapped="no" />
+ <signal name="closed" handler="on_popover_closed_cb" object="GtdTaskListPopover" swapped="no"/>
<child>
<object class="GtkBox">
<property name="margin">18</property>
<property name="spacing">12</property>
<property name="orientation">vertical</property>
-
- <!-- Search entry -->
<child>
<object class="GtkSearchEntry" id="search_entry">
- <signal name="activate" handler="on_search_entry_activated_cb" object="GtdTaskListPopover"
swapped="no" />
- <signal name="search-changed" handler="on_search_entry_search_changed_cb"
object="GtdTaskListPopover" swapped="no" />
+ <signal name="activate" handler="on_search_entry_activated_cb" object="GtdTaskListPopover"
swapped="no"/>
+ <signal name="search-changed" handler="on_search_entry_search_changed_cb"
object="GtdTaskListPopover" swapped="no"/>
</object>
</child>
-
- <!-- Listbox -->
<child>
<object class="GtkScrolledWindow">
<property name="hscrollbar-policy">never</property>
<property name="max-content-height">480</property>
- <property name="propagate-natural-height">true</property>
+ <property name="propagate-natural-height">1</property>
<child>
<object class="GtkListBox" id="listbox">
<property name="selection_mode">none</property>
- <signal name="row-activated" handler="on_listbox_row_activated_cb"
object="GtdTaskListPopover" swapped="no" />
+ <signal name="row-activated" handler="on_listbox_row_activated_cb"
object="GtdTaskListPopover" swapped="no"/>
<style>
- <class name="background" />
+ <class name="background"/>
</style>
</object>
</child>
</object>
</child>
-
</object>
</child>
</template>
-
- <object class="GtkSizeGroup" id="sizegroup">
- <property name="mode">horizontal</property>
- </object>
+ <object class="GtkSizeGroup" id="sizegroup"/>
</interface>
diff --git a/src/task-list-view/gtd-task-list-view.ui b/src/task-list-view/gtd-task-list-view.ui
index 63281f0..8adb4bb 100644
--- a/src/task-list-view/gtd-task-list-view.ui
+++ b/src/task-list-view/gtd-task-list-view.ui
@@ -2,83 +2,67 @@
<interface>
<requires lib="gtk+" version="3.16"/>
<template class="GtdTaskListView" parent="GtkOverlay">
- <property name="can_focus">False</property>
<child>
<object class="GtkBox" id="main_box">
- <property name="can_focus">False</property>
- <property name="vexpand">True</property>
+ <property name="vexpand">1</property>
<property name="orientation">vertical</property>
-
<child>
<object class="GtkScrolledWindow" id="scrolled_window">
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
+ <property name="can_focus">1</property>
+ <property name="hexpand">1</property>
+ <property name="vexpand">1</property>
<property name="min-content-height">320</property>
-
- <!-- Stack -->
<child>
<object class="GtkStack" id="stack">
- <property name="can_focus">False</property>
- <property name="homogeneous">False</property>
- <property name="expand">True</property>
+ <property name="homogeneous">0</property>
+ <property name="expand">1</property>
<property name="transition-type">crossfade</property>
-
- <!-- Listbox -->
<child>
<object class="GtkStackPage">
<property name="name">listbox</property>
<property name="child">
<object class="GtkBox">
- <property name="can_focus">false</property>
<property name="margin-top">6</property>
<property name="margin-bottom">64</property>
<property name="margin-start">18</property>
<property name="margin-end">18</property>
<property name="orientation">vertical</property>
-
<child>
<object class="GtkListBox" id="listbox">
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="hexpand">1</property>
<property name="selection_mode">none</property>
- <signal name="drag-drop" handler="listbox_drag_drop" object="GtdTaskListView"
swapped="no" />
- <signal name="drag-leave" handler="listbox_drag_leave" object="GtdTaskListView"
swapped="no" />
- <signal name="drag-motion" handler="listbox_drag_motion"
object="GtdTaskListView" swapped="no" />
- <signal name="row-activated" handler="on_listbox_row_activated_cb"
object="GtdTaskListView" swapped="no" />
+ <signal name="drag-drop" handler="listbox_drag_drop" object="GtdTaskListView"
swapped="no"/>
+ <signal name="drag-leave" handler="listbox_drag_leave" object="GtdTaskListView"
swapped="no"/>
+ <signal name="drag-motion" handler="listbox_drag_motion"
object="GtdTaskListView" swapped="no"/>
+ <signal name="row-activated" handler="on_listbox_row_activated_cb"
object="GtdTaskListView" swapped="no"/>
<style>
- <class name="transparent" />
+ <class name="transparent"/>
</style>
</object>
</child>
-
<child>
<object class="GtdNewTaskRow" id="new_task_row">
<property name="margin-bottom">24</property>
- <signal name="enter" handler="on_new_task_row_entered_cb"
object="GtdTaskListView" swapped="yes" />
- <signal name="exit" handler="on_new_task_row_exited_cb" object="GtdTaskListView"
swapped="yes" />
+ <signal name="enter" handler="on_new_task_row_entered_cb"
object="GtdTaskListView" swapped="yes"/>
+ <signal name="exit" handler="on_new_task_row_exited_cb" object="GtdTaskListView"
swapped="yes"/>
</object>
</child>
</object>
- </property>,
+ </property>
</object>
</child>
-
- <!-- Spinner -->
<child>
<object class="GtkStackPage">
<property name="name">loading</property>
<property name="child">
<object class="GtkSpinner">
- <property name="can_focus">False</property>
- <property name="active">True</property>
+ <property name="active">1</property>
<property name="width-request">96</property>
<property name="height-request">96</property>
</object>
</property>
</object>
</child>
-
</object>
</child>
</object>
@@ -86,10 +70,6 @@
</object>
</child>
</template>
- <object class="GtkSizeGroup" id="tasklist_name_sizegroup">
- <property name="mode">horizontal</property>
- </object>
- <object class="GtkSizeGroup" id="due_date_sizegroup">
- <property name="mode">horizontal</property>
- </object>
+ <object class="GtkSizeGroup" id="tasklist_name_sizegroup"/>
+ <object class="GtkSizeGroup" id="due_date_sizegroup"/>
</interface>
diff --git a/src/task-list-view/gtd-task-row.ui b/src/task-list-view/gtd-task-row.ui
index 612090e..75c7404 100644
--- a/src/task-list-view/gtd-task-row.ui
+++ b/src/task-list-view/gtd-task-row.ui
@@ -3,112 +3,88 @@
<requires lib="gtk+" version="3.16"/>
<template class="GtdTaskRow" parent="GtkBin">
<property name="halign">center</property>
-
- <!-- Controllers -->
<child>
<object class="GtkEventControllerKey">
<property name="propagation-phase">capture</property>
- <signal name="key-pressed" handler="on_key_pressed_cb" object="GtdTaskRow" swapped="no" />
+ <signal name="key-pressed" handler="on_key_pressed_cb" object="GtdTaskRow" swapped="no"/>
</object>
</child>
-
<child>
<object class="GtkBox" id="main_box">
<property name="orientation">vertical</property>
-
<child>
<object class="GtkBox" id="content_box">
- <property name="can_focus">False</property>
<property name="orientation">vertical</property>
-
<child>
<object class="GtkBox">
- <property name="can_focus">False</property>
<property name="margin-end">18</property>
<property name="margin-start">5</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<property name="height-request">32</property>
<property name="spacing">6</property>
-
- <!-- Box with DnD margin -->
<child>
- <object class="GtkBox" id="dnd_box">
- <property name="can_focus">False</property>
- </object>
+ <object class="GtkBox" id="dnd_box"/>
</child>
-
<child>
<object class="GtkImage" id="dnd_icon">
<property name="icon-name">drag-handle-symbolic</property>
<property name="pixel-size">16</property>
- <signal name="drag-begin" handler="on_drag_begin_cb" object="GtdTaskRow" swapped="no" />
- <signal name="drag-end" handler="on_drag_end_cb" object="GtdTaskRow" swapped="no" />
- <signal name="drag-data-get" handler="on_drag_data_get_cb" object="GtdTaskRow"
swapped="no" />
- <signal name="drag-failed" handler="on_drag_failed_cb" object="GtdTaskRow" swapped="no"
/>
-
+ <signal name="drag-begin" handler="on_drag_begin_cb" object="GtdTaskRow" swapped="no"/>
+ <signal name="drag-end" handler="on_drag_end_cb" object="GtdTaskRow" swapped="no"/>
+ <signal name="drag-data-get" handler="on_drag_data_get_cb" object="GtdTaskRow"
swapped="no"/>
+ <signal name="drag-failed" handler="on_drag_failed_cb" object="GtdTaskRow" swapped="no"/>
<child>
<object class="GtkGestureMultiPress">
<property name="propagation-phase">capture</property>
- <signal name="pressed" handler="on_button_press_event_cb" object="GtdTaskRow"
swapped="no" />
+ <signal name="pressed" handler="on_button_press_event_cb" object="GtdTaskRow"
swapped="no"/>
</object>
</child>
<style>
- <class name="dim-label" />
+ <class name="dim-label"/>
</style>
</object>
</child>
-
- <!-- Done checkbutton -->
<child>
<object class="GtkCheckButton" id="done_check">
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can_focus">1</property>
<property name="halign">center</property>
<property name="valign">center</property>
- <property name="vexpand">True</property>
- <property name="draw_indicator">True</property>
+ <property name="vexpand">1</property>
<property name="margin-start">6</property>
- <signal name="toggled" handler="on_complete_check_toggled_cb" object="GtdTaskRow"
swapped="no" />
+ <signal name="toggled" handler="on_complete_check_toggled_cb" object="GtdTaskRow"
swapped="no"/>
</object>
</child>
-
<child>
<object class="GtkBox" id="header_event_box">
- <property name="can_focus">False</property>
- <signal name="drag-begin" handler="on_drag_begin_cb" object="GtdTaskRow" swapped="no" />
- <signal name="drag-end" handler="on_drag_end_cb" object="GtdTaskRow" swapped="no" />
- <signal name="drag-failed" handler="on_drag_failed_cb" object="GtdTaskRow" swapped="no"
/>
-
+ <signal name="drag-begin" handler="on_drag_begin_cb" object="GtdTaskRow" swapped="no"/>
+ <signal name="drag-end" handler="on_drag_end_cb" object="GtdTaskRow" swapped="no"/>
+ <signal name="drag-failed" handler="on_drag_failed_cb" object="GtdTaskRow" swapped="no"/>
<child>
<object class="GtkGestureMultiPress">
<property name="propagation-phase">capture</property>
- <signal name="pressed" handler="on_button_press_event_cb" object="GtdTaskRow"
swapped="no" />
+ <signal name="pressed" handler="on_button_press_event_cb" object="GtdTaskRow"
swapped="no"/>
</object>
</child>
-
- <!-- Task title entry -->
<child>
<object class="GtkBox">
- <property name="hexpand">True</property>
+ <property name="hexpand">1</property>
<child>
<object class="GtkText" id="title_entry">
<property name="width-chars">5</property>
<property name="max-width-chars">72</property>
- <property name="propagate-text-width">True</property>
- <signal name="activate" handler="on_task_changed_cb" object="GtdTaskRow"
swapped="yes" />
- <signal name="notify::text" handler="on_task_changed_cb" object="GtdTaskRow"
swapped="yes" />
+ <property name="propagate-text-width">1</property>
+ <signal name="activate" handler="on_task_changed_cb" object="GtdTaskRow"
swapped="yes"/>
+ <signal name="notify::text" handler="on_task_changed_cb" object="GtdTaskRow"
swapped="yes"/>
<style>
- <class name="title" />
+ <class name="title"/>
</style>
</object>
</child>
</object>
</child>
-
<child>
<object class="GtkLabel" id="task_date_label">
- <property name="can_focus">False</property>
<property name="xalign">1.0</property>
<property name="margin-start">6</property>
<style>
@@ -118,8 +94,7 @@
</child>
<child>
<object class="GtkLabel" id="task_list_label">
- <property name="visible">False</property>
- <property name="can_focus">False</property>
+ <property name="visible">0</property>
<property name="xalign">1.0</property>
<property name="max_width_chars">18</property>
<property name="ellipsize">middle</property>
@@ -128,36 +103,27 @@
</style>
</object>
</child>
-
</object>
</child>
</object>
</child>
-
- <!-- Edit Panel revealer -->
<child>
<object class="GtkRevealer" id="edit_panel_revealer">
- <property name="can_focus">False</property>
<property name="transition_type">slide-up</property>
- <property name="transition_duration">250</property>
</object>
</child>
-
</object>
</child>
-
- <!-- Drop indicator -->
<child>
- <object class="GtkBox" id='dnd_frame'>
- <property name="visible">false</property>
- <property name="expand">true</property>
+ <object class="GtkBox" id="dnd_frame">
+ <property name="visible">0</property>
+ <property name="expand">1</property>
<property name="margin-start">48</property>
<style>
- <class name="dnd" />
+ <class name="dnd"/>
</style>
</object>
</child>
-
</object>
</child>
</template>
diff --git a/src/widgets/gtd-empty-list-widget.ui b/src/widgets/gtd-empty-list-widget.ui
index 3718d9d..57f3bae 100644
--- a/src/widgets/gtd-empty-list-widget.ui
+++ b/src/widgets/gtd-empty-list-widget.ui
@@ -2,14 +2,12 @@
<interface>
<requires lib="gtk+" version="3.20"/>
<template class="GtdEmptyListWidget" parent="GtkBox">
- <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage" id="icon">
- <property name="can_focus">False</property>
<property name="margin_bottom">18</property>
- <property name="vexpand">True</property>
+ <property name="vexpand">1</property>
<property name="pixel_size">128</property>
<style>
<class name="dim-label"/>
@@ -18,16 +16,14 @@
</child>
<child>
<object class="GtkLabel" id="title_label">
- <property name="can_focus">False</property>
<attributes>
- <attribute name="weight" value="bold"/>
- <attribute name="scale" value="1.44"/>
+ <attribute name="weight" value="bold"></attribute>
+ <attribute name="scale" value="1.44"></attribute>
</attributes>
</object>
</child>
<child>
<object class="GtkLabel" id="subtitle_label">
- <property name="can_focus">False</property>
<style>
<class name="dim-label"/>
</style>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
