From c56adc6db58be39c219946479efd3f1aba4ea09e Mon Sep 17 00:00:00 2001
From: Brandon Lewis <brandon@collabora.co.uk>
Date: Tue, 20 Jul 2010 13:57:28 +0200
Subject: [PATCH] flesh out ui design a bit more

---
 tools/ges-ui.c     |  12 +++++
 tools/ges-ui.glade | 130 +++++++++++++++++++++++++++++++++------------
 2 files changed, 107 insertions(+), 35 deletions(-)

diff --git a/tools/ges-ui.c b/tools/ges-ui.c
index cc8d83654b..c32ef61856 100644
--- a/tools/ges-ui.c
+++ b/tools/ges-ui.c
@@ -6,6 +6,18 @@ window_destroy_cb (GtkObject * window, gpointer user)
   gtk_main_quit ();
 }
 
+void
+quit_item_activate_cb (GtkMenuItem * item, gpointer user)
+{
+  gtk_main_quit ();
+}
+
+void
+delete_item_activate_cb (GtkMenuItem * item, gpointer user)
+{
+  g_print ("beleted!");
+}
+
 int
 main (int argc, char *argv[])
 {
diff --git a/tools/ges-ui.glade b/tools/ges-ui.glade
index 1e4fddc815..42232aa5fd 100644
--- a/tools/ges-ui.glade
+++ b/tools/ges-ui.glade
@@ -11,6 +11,8 @@
     </columns>
   </object>
   <object class="GtkWindow" id="window">
+    <property name="default_width">540</property>
+    <property name="default_height">450</property>
     <signal name="destroy" handler="window_destroy_cb"/>
     <child>
       <object class="GtkVBox" id="vbox1">
@@ -19,7 +21,7 @@
           <object class="GtkMenuBar" id="menubar1">
             <property name="visible">True</property>
             <child>
-              <object class="GtkMenuItem" id="File">
+              <object class="GtkMenuItem" id="file">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_File</property>
                 <property name="use_underline">True</property>
@@ -27,33 +29,29 @@
                   <object class="GtkMenu" id="menu1">
                     <property name="visible">True</property>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem1">
+                      <object class="GtkImageMenuItem" id="new_item">
                         <property name="label">gtk-new</property>
-                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem2">
+                      <object class="GtkImageMenuItem" id="open_item">
                         <property name="label">gtk-open</property>
-                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem3">
+                      <object class="GtkImageMenuItem" id="save_item">
                         <property name="label">gtk-save</property>
-                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem4">
+                      <object class="GtkImageMenuItem" id="as_item">
                         <property name="label">gtk-save-as</property>
-                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -64,11 +62,12 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem5">
+                      <object class="GtkImageMenuItem" id="quit_item">
                         <property name="label">gtk-quit</property>
                         <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
+                        <signal name="activate" handler="quit_item_activate_cb"/>
                       </object>
                     </child>
                   </object>
@@ -76,7 +75,7 @@
               </object>
             </child>
             <child>
-              <object class="GtkMenuItem" id="menuitem2">
+              <object class="GtkMenuItem" id="Edit">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_Edit</property>
                 <property name="use_underline">True</property>
@@ -84,35 +83,33 @@
                   <object class="GtkMenu" id="menu2">
                     <property name="visible">True</property>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem6">
+                      <object class="GtkImageMenuItem" id="cut_item">
                         <property name="label">gtk-cut</property>
-                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem7">
+                      <object class="GtkImageMenuItem" id="copy_item">
                         <property name="label">gtk-copy</property>
-                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem8">
+                      <object class="GtkImageMenuItem" id="paste_item">
                         <property name="label">gtk-paste</property>
-                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem9">
+                      <object class="GtkImageMenuItem" id="delete_item">
                         <property name="label">gtk-delete</property>
                         <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
+                        <signal name="activate" handler="delete_item_activate_cb"/>
                       </object>
                     </child>
                   </object>
@@ -127,7 +124,7 @@
               </object>
             </child>
             <child>
-              <object class="GtkMenuItem" id="menuitem4">
+              <object class="GtkMenuItem" id="Help">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_Help</property>
                 <property name="use_underline">True</property>
@@ -153,35 +150,98 @@
           </packing>
         </child>
         <child>
-          <placeholder/>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow1">
+          <object class="GtkVPaned" id="vpaned1">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">automatic</property>
-            <property name="vscrollbar_policy">automatic</property>
+            <property name="border_width">12</property>
             <child>
-              <object class="GtkTreeView" id="treeview1">
+              <object class="GtkScrolledWindow" id="scrolledwindow1">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="model">timeline</property>
-                <property name="show_expanders">False</property>
+                <property name="shadow_type">in</property>
+                <child>
+                  <object class="GtkTreeView" id="treeview1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="model">timeline</property>
+                    <property name="search_column">0</property>
+                    <property name="show_expanders">False</property>
+                  </object>
+                </child>
               </object>
+              <packing>
+                <property name="resize">False</property>
+                <property name="shrink">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFrame" id="frame1">
+                <property name="visible">True</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
+                <child>
+                  <object class="GtkVBox" id="vbox2">
+                    <property name="visible">True</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkHBox" id="hbox1">
+                        <property name="visible">True</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkLabel" id="label_duration">
+                            <property name="visible">True</property>
+                            <property name="yalign">0</property>
+                            <property name="xpad">12</property>
+                            <property name="ypad">3</property>
+                            <property name="label" translatable="yes">Duration:</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkHScale" id="duration_scale">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="value_pos">bottom</property>
+                          </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label1">
+                    <property name="visible">True</property>
+                    <property name="ypad">3</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Edit Object&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="resize">True</property>
+                <property name="shrink">True</property>
+              </packing>
             </child>
           </object>
           <packing>
-            <property name="position">2</property>
+            <property name="position">1</property>
           </packing>
         </child>
-        <child>
-          <placeholder/>
-        </child>
       </object>
     </child>
   </object>
   <object class="GtkTreeSelection" id="treeselection1"/>
-  <object class="GtkUIManager" id="uimanager1"/>
-  <object class="GtkActionGroup" id="actions"/>
-  <object class="GtkAction" id="AddObject"/>
+  <object class="GtkSizeGroup" id="LabelSizeGroup"/>
 </interface>