X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;ds=sidebyside;f=data%2Fmain.ui.in;h=50c18fb9762e8fe1425bd59cdbf02647e96d512a;hb=14e94d9dd058feaf1da86a1e6e011828db14155a;hp=cd9d2160956e5849ca6a808b022cfc34e01f123d;hpb=f45856566635a97514c4ddb89522ffa35ecc3fba;p=aweather

diff --git a/data/main.ui.in b/data/main.ui.in
index cd9d216..50c18fb 100644
--- a/data/main.ui.in
+++ b/data/main.ui.in
@@ -81,7 +81,7 @@
     <property name="version">@VERSION@</property>
     <property name="copyright" translatable="yes">Copyright ©2008-2012 Andy Spencer</property>
     <property name="comments" translatable="yes">A weather monitoring program</property>
-    <property name="website">http://lug.rose-hulman.edu/proj/aweather</property>
+    <property name="website">http://pileus.org/aweather</property>
     <property name="license" translatable="yes">                    GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
@@ -361,6 +361,7 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
     <property name="title" translatable="yes">AWeather</property>
     <property name="default_width">600</property>
     <property name="default_height">400</property>
+    <signal name="configure-event" handler="on_configure" swapped="no"/>
     <child>
       <object class="GtkVBox" id="main_body">
         <property name="visible">True</property>
@@ -371,9 +372,9 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
             <property name="can_focus">False</property>
             <child>
               <object class="GtkMenuItem" id="main_menu_file">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_File</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
@@ -382,26 +383,26 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkCheckMenuItem" id="main_menu_file_offline">
+                        <property name="related_action">offline</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Work offline</property>
-                        <property name="related_action">offline</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="main_menu_file_refresh">
+                        <property name="related_action">refresh</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="related_action">refresh</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkCheckMenuItem" id="main_menu_file_update">
+                        <property name="related_action">update</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="related_action">update</property>
                         <property name="use_underline">True</property>
                       </object>
                     </child>
@@ -413,9 +414,9 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="main_menu_file_cleancache">
+                        <property name="related_action">cleancache</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="related_action">cleancache</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -428,9 +429,9 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="main_menu_file_quit">
+                        <property name="related_action">quit</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="related_action">quit</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -441,9 +442,9 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
             </child>
             <child>
               <object class="GtkMenuItem" id="main_menu_edit">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_Edit</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
@@ -452,9 +453,9 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" id="main_menu_edit_prefs">
+                        <property name="related_action">prefs</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="related_action">prefs</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -465,9 +466,9 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
             </child>
             <child>
               <object class="GtkMenuItem" id="main_menu_view">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_View</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
@@ -476,18 +477,18 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" id="main_menu_view_zoomin">
+                        <property name="related_action">zoomin</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="related_action">zoomin</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="main_menu_view_zoomout">
+                        <property name="related_action">zoomout</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="related_action">zoomout</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -500,9 +501,9 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="main_menu_view_fullscreen">
+                        <property name="related_action">fullscreen</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="related_action">fullscreen</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -513,18 +514,18 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
             </child>
             <child>
               <object class="GtkMenuItem" id="main_menu_radar">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_Radar</property>
                 <property name="use_underline">True</property>
               </object>
             </child>
             <child>
               <object class="GtkMenuItem" id="main_menu_help">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_Help</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
@@ -533,18 +534,18 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" id="main_menu_help_userguide">
+                        <property name="related_action">userguide</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="related_action">userguide</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="main_menu_help_manpage">
+                        <property name="related_action">manpage</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="related_action">manpage</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -557,9 +558,9 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="main_menu_help_about">
+                        <property name="related_action">about</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="related_action">about</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -582,9 +583,9 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
             <property name="toolbar_style">icons</property>
             <child>
               <object class="GtkToolButton" id="main_tb_zoomin">
+                <property name="related_action">zoomin</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="related_action">zoomin</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -593,9 +594,9 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
             </child>
             <child>
               <object class="GtkToolButton" id="main_tb_zoomout">
+                <property name="related_action">zoomout</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="related_action">zoomout</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -614,9 +615,9 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
             </child>
             <child>
               <object class="GtkToggleToolButton" id="main_tb_fullscreen">
+                <property name="related_action">fullscreen</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="related_action">fullscreen</property>
                 <property name="label" translatable="yes">toolbutton1</property>
                 <property name="use_underline">True</property>
               </object>
@@ -637,9 +638,9 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
             </child>
             <child>
               <object class="GtkToggleToolButton" id="main_tb_offline">
+                <property name="related_action">offline</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="related_action">offline</property>
                 <property name="label" translatable="yes">toolbutton3</property>
                 <property name="use_underline">True</property>
               </object>
@@ -650,9 +651,9 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
             </child>
             <child>
               <object class="GtkToolButton" id="main_tb_refresh">
+                <property name="related_action">refresh</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="related_action">refresh</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -662,9 +663,9 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
             </child>
             <child>
               <object class="GtkToggleToolButton" id="main_tb_update">
+                <property name="related_action">update</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="related_action">update</property>
                 <property name="label" translatable="yes">toolbutton1</property>
                 <property name="use_underline">True</property>
               </object>
@@ -685,9 +686,9 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
             </child>
             <child>
               <object class="GtkToolButton" id="main_tb_prefs">
+                <property name="related_action">prefs</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="related_action">prefs</property>
                 <property name="label" translatable="yes">toolbutton1</property>
                 <property name="use_underline">True</property>
               </object>
@@ -863,6 +864,7 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
     <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>
     <signal name="delete-event" handler="gtk_widget_hide_on_delete" swapped="no"/>
     <signal name="response" handler="gtk_widget_hide" object="prefs_window" swapped="yes"/>
     <child internal-child="vbox">
@@ -878,10 +880,10 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
             <child>
               <object class="GtkButton" id="prefs_action_close">
                 <property name="label">gtk-close</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -925,10 +927,10 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
                             <child>
                               <object class="GtkCheckButton" id="prefs_general_offline">
                                 <property name="label" translatable="yes">Work offline</property>
+                                <property name="related_action">offline</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
-                                <property name="related_action">offline</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>