X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=data%2Fmain.ui;h=f37784bf63f0485aeff620ce22271246651e203f;hp=a5bed8176b181209ea72975dbbf8e7be21ee2a13;hb=d01fb11de5bcf91224348bf41abb6788d0af2545;hpb=f705ad00b5d94f8ddc59575737b79feed191b404

diff --git a/data/main.ui b/data/main.ui
index a5bed81..f37784b 100644
--- a/data/main.ui
+++ b/data/main.ui
@@ -25,6 +25,7 @@
     </columns>
   </object>
   <object class="GtkWindow" id="main_window">
+    <property name="title" translatable="yes">AWeather</property>
     <child>
       <object class="GtkVBox" id="body">
         <property name="visible">True</property>
@@ -43,15 +44,15 @@
                       <object class="GtkCheckMenuItem" id="offline_item">
                         <property name="visible">True</property>
                         <property name="tooltip_text" translatable="yes">Work offline</property>
-                        <property name="related_action">offline</property>
                         <property name="use_action_appearance">True</property>
+                        <property name="related_action">offline</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="prefs_item">
                         <property name="visible">True</property>
-                        <property name="related_action">prefs</property>
                         <property name="use_action_appearance">True</property>
+                        <property name="related_action">prefs</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -64,8 +65,8 @@
                     <child>
                       <object class="GtkImageMenuItem" id="quit_item">
                         <property name="visible">True</property>
-                        <property name="related_action">quit</property>
                         <property name="use_action_appearance">True</property>
+                        <property name="related_action">quit</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -85,8 +86,8 @@
                     <child>
                       <object class="GtkImageMenuItem" id="zoomin_item">
                         <property name="visible">True</property>
-                        <property name="related_action">zoomin</property>
                         <property name="use_action_appearance">True</property>
+                        <property name="related_action">zoomin</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -94,8 +95,8 @@
                     <child>
                       <object class="GtkImageMenuItem" id="zoomout_item">
                         <property name="visible">True</property>
-                        <property name="related_action">zoomout</property>
                         <property name="use_action_appearance">True</property>
+                        <property name="related_action">zoomout</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -108,8 +109,8 @@
                     <child>
                       <object class="GtkImageMenuItem" id="refresh_item">
                         <property name="visible">True</property>
-                        <property name="related_action">refresh</property>
                         <property name="use_action_appearance">True</property>
+                        <property name="related_action">refresh</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -129,8 +130,8 @@
                     <child>
                       <object class="GtkImageMenuItem" id="about_item">
                         <property name="visible">True</property>
-                        <property name="related_action">about</property>
                         <property name="use_action_appearance">True</property>
+                        <property name="related_action">about</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -152,8 +153,8 @@
             <child>
               <object class="GtkToolButton" id="zoomin_button">
                 <property name="visible">True</property>
-                <property name="related_action">zoomin</property>
                 <property name="use_action_appearance">True</property>
+                <property name="related_action">zoomin</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -163,8 +164,8 @@
             <child>
               <object class="GtkToolButton" id="zoomout_button">
                 <property name="visible">True</property>
-                <property name="related_action">zoomout</property>
                 <property name="use_action_appearance">True</property>
+                <property name="related_action">zoomout</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -183,8 +184,8 @@
             <child>
               <object class="GtkToggleToolButton" id="offline_button">
                 <property name="visible">True</property>
-                <property name="related_action">offline</property>
                 <property name="use_action_appearance">True</property>
+                <property name="related_action">offline</property>
                 <property name="label" translatable="yes">toolbutton3</property>
                 <property name="use_underline">True</property>
               </object>
@@ -196,8 +197,8 @@
             <child>
               <object class="GtkToolButton" id="refresh_button">
                 <property name="visible">True</property>
-                <property name="related_action">refresh</property>
                 <property name="use_action_appearance">True</property>
+                <property name="related_action">refresh</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -217,8 +218,8 @@
             <child>
               <object class="GtkToolButton" id="prefs_button">
                 <property name="visible">True</property>
-                <property name="related_action">prefs</property>
                 <property name="use_action_appearance">True</property>
+                <property name="related_action">prefs</property>
                 <property name="label" translatable="yes">toolbutton1</property>
                 <property name="use_underline">True</property>
               </object>
@@ -238,25 +239,19 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <child>
-              <object class="GtkHPaned" id="hpaned1">
+              <object class="GtkHPaned" id="hpaned">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <child>
-                  <object class="GtkDrawingArea" id="drawing">
-                    <property name="width_request">600</property>
-                    <property name="height_request">550</property>
+                  <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="has_focus">True</property>
-                    <property name="is_focus">True</property>
-                    <property name="can_default">True</property>
-                    <property name="has_default">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_STRUCTURE_MASK</property>
+                    <property name="label" translatable="yes">placeholder
+(it's buggy with blank placeholders)</property>
+                    <property name="justify">center</property>
                   </object>
                   <packing>
-                    <property name="resize">True</property>
-                    <property name="shrink">False</property>
+                    <property name="resize">False</property>
+                    <property name="shrink">True</property>
                   </packing>
                 </child>
                 <child>
@@ -390,16 +385,20 @@
   <object class="GtkAction" id="about">
     <property name="label">About</property>
     <property name="stock_id">gtk-about</property>
-    <signal name="activate" handler="on_about"/>
+    <signal name="activate" handler="gtk_window_present" object="about_window"/>
   </object>
   <object class="GtkAction" id="prefs">
     <property name="stock_id">gtk-preferences</property>
-    <signal name="activate" handler="on_prefs"/>
+    <signal name="activate" handler="gtk_window_present" object="prefs_window"/>
   </object>
   <object class="GtkDialog" id="prefs_window">
     <property name="border_width">5</property>
+    <property name="title" translatable="yes">Preferences - AWeather</property>
     <property name="type_hint">normal</property>
+    <property name="transient_for">main_window</property>
     <property name="has_separator">False</property>
+    <signal name="response" handler="gtk_widget_hide" object="prefs_window"/>
+    <signal name="delete_event" handler="gtk_widget_hide_on_delete"/>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
@@ -456,11 +455,16 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkEntry" id="initial_site">
+                                  <object class="GtkComboBox" id="initial_site">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="invisible_char">&#x25CF;</property>
+                                    <property name="model">sites</property>
                                     <signal name="changed" handler="on_initial_site_changed"/>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="site_rend"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
                                   </object>
                                   <packing>
                                     <property name="position">1</property>
@@ -620,14 +624,14 @@
   </object>
   <object class="GtkAboutDialog" id="about_window">
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">About AWeather</property>
-    <property name="resizable">False</property>
+    <property name="title" translatable="yes">About - AWeather</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
+    <property name="transient_for">main_window</property>
     <property name="has_separator">False</property>
     <property name="program_name">AWeather</property>
-    <property name="version">0.1</property>
-    <property name="copyright" translatable="yes">Copyright &#xA9;2008-2008 Andy Spencer</property>
+    <property name="version">(beta)</property>
+    <property name="copyright" translatable="yes">Copyright &#xA9;2008-2009 Andy Spencer</property>
     <property name="comments" translatable="yes">A semi-advanced weather viewer</property>
     <property name="website">http://lug.rose-hulman.edu/wiki/AWeather</property>
     <property name="license" translatable="yes">                    GNU GENERAL PUBLIC LICENSE
@@ -876,7 +880,8 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
 </property>
     <property name="authors">Andy Spencer &lt;andy753421@gmail.com&gt;</property>
     <property name="wrap_license">True</property>
-    <signal name="response" handler="gtk_widget_destroy" object="about_window"/>
+    <signal name="response" handler="gtk_widget_hide"/>
+    <signal name="delete_event" handler="gtk_widget_hide_on_delete"/>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox3">
         <property name="visible">True</property>