[gnome-contacts] Window: No more need for view_switcher Stack
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-contacts] Window: No more need for view_switcher Stack
- Date: Sat, 13 Jan 2018 10:51:59 +0000 (UTC)
commit 78862a18ce585451001cec0b0945ca64cf32a896
Author: Niels De Graef <nielsdegraef gmail com>
Date: Sat Jan 13 11:51:26 2018 +0100
Window: No more need for view_switcher Stack
data/ui/contacts-window.ui | 133 ++++++++++++++++++++-----------------------
src/contacts-window.vala | 5 --
2 files changed, 62 insertions(+), 76 deletions(-)
---
diff --git a/data/ui/contacts-window.ui b/data/ui/contacts-window.ui
index c5858bc..f17b1b4 100644
--- a/data/ui/contacts-window.ui
+++ b/data/ui/contacts-window.ui
@@ -149,88 +149,79 @@
</object>
</child>
<child>
- <object class="GtkStack" id="view_switcher">
+ <object class="GtkOverlay" id="overlay">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkOverlay" id="overlay">
+ <object class="GtkGrid" id="content_grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkGrid" id="content_grid">
+ <object class="GtkOverlay" id="contact_pane_container">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <child>
- <object class="GtkOverlay" id="contact_pane_container">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="loading_box">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="orientation">vertical</property>
- <property name="width_request">300</property>
- <property name="row_homogeneous">True</property>
- <child>
- <object class="GtkSpinner">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="active">True</property>
- <property name="valign">end</property>
- <property name="halign">center</property>
- <style>
- <class name="contacts-watermark"/>
- </style>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="vexpand">True</property>
- <property name="valign">start</property>
- <property name="hexpand">True</property>
- <property name="halign">center</property>
- <property name="label" translatable="yes">Loading</property>
- <style>
- <class name="contacts-watermark"/>
- </style>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
</object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="loading_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="width_request">300</property>
+ <property name="row_homogeneous">True</property>
+ <child>
+ <object class="GtkSpinner">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="active">True</property>
+ <property name="valign">end</property>
+ <property name="halign">center</property>
+ <style>
+ <class name="contacts-watermark"/>
+ </style>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="vexpand">True</property>
+ <property name="valign">start</property>
+ <property name="hexpand">True</property>
+ <property name="halign">center</property>
+ <property name="label" translatable="yes">Loading</property>
+ <style>
+ <class name="contacts-watermark"/>
+ </style>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
</object>
- <packing>
- <property name="name">content-view</property>
- </packing>
</child>
</object>
</child>
diff --git a/src/contacts-window.vala b/src/contacts-window.vala
index 5422f30..9ce6c43 100644
--- a/src/contacts-window.vala
+++ b/src/contacts-window.vala
@@ -48,9 +48,6 @@ public class Contacts.Window : Gtk.ApplicationWindow {
[GtkChild]
private Button done_button;
- [GtkChild]
- private Stack view_switcher;
-
// The 2 panes the window consists of
private ListPane list_pane;
private ContactPane contact_pane;
@@ -72,8 +69,6 @@ public class Contacts.Window : Gtk.ApplicationWindow {
create_contact_pane ();
- view_switcher.visible_child_name = "content-view";
-
set_headerbar_layout ();
connect_button_signals ();
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]