X-Git-Url: http://pileus.org/git/?p=aweather;a=blobdiff_plain;f=data%2Fmain.ui.in;h=50c18fb9762e8fe1425bd59cdbf02647e96d512a;hp=148fd4ad9d151faa56e63ffd34dc73ed909c18ab;hb=72842797f3fddb8ddb3c309ba9ceec889c4ec4e2;hpb=a3b76a5f5ea0eae26585012e867f69bd9307c5ae

diff --git a/data/main.ui.in b/data/main.ui.in
index 148fd4a..50c18fb 100644
--- a/data/main.ui.in
+++ b/data/main.ui.in
@@ -15,18 +15,18 @@
     <property name="stock_id">gtk-clear</property>
     <signal name="activate" handler="on_cleancache" swapped="no"/>
   </object>
-  <object class="GtkAction" id="contents">
-    <property name="label">_Contents</property>
-    <property name="short_label">Contents</property>
-    <property name="tooltip">AWeather Reference Manual</property>
-    <property name="stock_id">gtk-help</property>
-    <signal name="activate" handler="on_contents" swapped="no"/>
-  </object>
   <object class="GtkToggleAction" id="fullscreen">
     <property name="label">_Fullscreen</property>
     <property name="stock_id">gtk-fullscreen</property>
     <signal name="toggled" handler="on_fullscreen" swapped="no"/>
   </object>
+  <object class="GtkAction" id="manpage">
+    <property name="label" translatable="yes">_Man Page</property>
+    <property name="short_label" translatable="yes">Man Page</property>
+    <property name="tooltip" translatable="yes">Unix Man Page</property>
+    <property name="stock_id">gtk-help</property>
+    <signal name="activate" handler="on_help" swapped="no"/>
+  </object>
   <object class="GtkToggleAction" id="offline">
     <property name="label">_Offline</property>
     <property name="stock_id">gtk-disconnect</property>
@@ -54,6 +54,13 @@
     <property name="stock_id">gtk-media-play</property>
     <signal name="toggled" handler="on_update" swapped="no"/>
   </object>
+  <object class="GtkAction" id="userguide">
+    <property name="label">_User Guide</property>
+    <property name="short_label">User Guide</property>
+    <property name="tooltip">AWeather User Guide</property>
+    <property name="stock_id">gtk-help</property>
+    <signal name="activate" handler="on_help" swapped="no"/>
+  </object>
   <object class="GtkAction" id="zoomin">
     <property name="label">Zoom _In</property>
     <property name="stock_id">gtk-zoom-in</property>
@@ -72,9 +79,9 @@
     <property name="type_hint">dialog</property>
     <property name="program_name">AWeather</property>
     <property name="version">@VERSION@</property>
-    <property name="copyright" translatable="yes">Copyright ©2008-2011 Andy Spencer</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
 
@@ -320,6 +327,7 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
   The GNU General Public License does not permit incorporating your program into proprietary programs.  If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library.  If this is what you want to do, use the GNU Lesser General Public License instead of this License.  But first, please read &lt;http://www.gnu.org/philosophy/why-not-lgpl.html&gt;.
 </property>
     <property name="authors">Andy Spencer &lt;andy753421@gmail.com&gt;</property>
+    <property name="documenters">Jason Holmes &lt;Doppler5@aol.com&gt;</property>
     <property name="logo">logo.svg</property>
     <property name="wrap_license">True</property>
     <signal name="delete-event" handler="gtk_widget_hide_on_delete" swapped="no"/>
@@ -353,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>
@@ -363,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">
@@ -374,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>
@@ -405,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>
@@ -420,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>
@@ -433,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">
@@ -444,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>
@@ -457,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">
@@ -468,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>
@@ -492,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>
@@ -504,10 +513,19 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
               </object>
             </child>
             <child>
-              <object class="GtkMenuItem" id="main_menu_help">
+              <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="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="label" translatable="yes">_Help</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
@@ -515,10 +533,19 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkImageMenuItem" id="main_menu_help_contents">
+                      <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="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">contents</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -531,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>
@@ -556,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>
@@ -567,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>
@@ -588,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>
@@ -611,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>
@@ -624,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>
@@ -636,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>
@@ -659,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>
@@ -837,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">
@@ -852,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>
@@ -899,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>