[gnome-calendar/calendar-management] sources-dialog: some work on the interface

From: Georges Basile Stavracas Neto <gbsneto src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-calendar/calendar-management] sources-dialog: some work on the interface
Date: Wed, 14 Jan 2015 03:20:25 +0000 (UTC)
commit c5adbd44c12dc21a4cd3510b9e9ecf29dfb7dec7
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Wed Jan 14 01:20:10 2015 -0200

    sources-dialog: some work on the interface

 data/ui/source-manager-dialog.ui |  164 +++++++++++++++++++++++--------------
 1 files changed, 102 insertions(+), 62 deletions(-)
---
diff --git a/data/ui/source-manager-dialog.ui b/data/ui/source-manager-dialog.ui
index a070094..c1d9004 100644
--- a/data/ui/source-manager-dialog.ui
+++ b/data/ui/source-manager-dialog.ui
@@ -3,8 +3,8 @@
 <interface>
   <requires lib="gtk+" version="3.14"/>
   <template class="GcalSourceManagerDialog" parent="GtkDialog">
-    <property name="width_request">500</property>
-    <property name="height_request">400</property>
+    <property name="width_request">600</property>
+    <property name="height_request">450</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="modal">True</property>
@@ -51,34 +51,24 @@
                     <property name="vexpand">True</property>
                     <property name="orientation">vertical</property>
                     <child>
-                      <object class="GtkFrame" id="left_frame">
+                      <object class="GtkScrolledWindow" id="scrolled_window">
                         <property name="width_request">240</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
+                        <property name="can_focus">True</property>
                         <property name="vexpand">True</property>
-                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">etched-in</property>
                         <child>
-                          <object class="GtkScrolledWindow" id="scrolled_window">
+                          <object class="GtkViewport" id="viewport">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
+                            <property name="can_focus">False</property>
                             <child>
-                              <object class="GtkViewport" id="viewport">
+                              <object class="GtkListBox" id="sources_listbox">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <child>
-                                  <object class="GtkListBox" id="sources_listbox">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                  </object>
-                                </child>
                               </object>
                             </child>
                           </object>
                         </child>
-                        <child type="label_item">
-                          <placeholder/>
-                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -164,66 +154,116 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkGrid" id="edit_grid">
+                  <object class="GtkStack" id="edit_stack">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="halign">center</property>
-                    <property name="margin_top">19</property>
-                    <property name="margin_bottom">18</property>
                     <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
-                    <property name="orientation">vertical</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
+                    <property name="transition_type">crossfade</property>
                     <child>
-                      <object class="GtkLabel" id="color_label2">
+                      <object class="GtkGrid" id="select_source_page">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Color</property>
-                        <property name="xalign">1</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkColorButton" id="edit_color_button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
+                        <property name="halign">center</property>
+                        <property name="valign">center</property>
+                        <property name="row_spacing">18</property>
+                        <child>
+                          <object class="GtkLabel" id="select_source_label">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Select a calendar or create a new 
one</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkImage" id="select_source_image">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="pixel_size">32</property>
+                            <property name="icon_name">x-office-calendar-symbolic</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
+                        <property name="name">grid</property>
+                        <property name="title" translatable="yes">grid</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="edit_default_label">
+                      <object class="GtkGrid" id="edit_grid">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Default calendar</property>
-                        <property name="xalign">1</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSwitch" id="switch1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="halign">center</property>
+                        <property name="margin_top">19</property>
+                        <property name="margin_bottom">18</property>
+                        <property name="hexpand">True</property>
+                        <property name="vexpand">True</property>
+                        <property name="orientation">vertical</property>
+                        <property name="row_spacing">6</property>
+                        <property name="column_spacing">12</property>
+                        <child>
+                          <object class="GtkLabel" id="color_label2">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Color</property>
+                            <property name="xalign">1</property>
+                            <style>
+                              <class name="dim-label"/>
+                            </style>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkColorButton" id="edit_color_button">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="edit_default_label">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Default calendar</property>
+                            <property name="xalign">1</property>
+                            <style>
+                              <class name="dim-label"/>
+                            </style>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSwitch" id="switch1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
+                        <property name="name">page1</property>
+                        <property name="title" translatable="yes">page1</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]