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

diff --git a/data/main.ui.in b/data/main.ui.in
index 79c028a..50c18fb 100644
--- a/data/main.ui.in
+++ b/data/main.ui.in
@@ -4,55 +4,70 @@
   <!-- interface-requires AWeather 0.0 -->
   <!-- interface-naming-policy project-wide -->
   <object class="GtkAction" id="about">
-    <property name="label">About</property>
+    <property name="label">_About</property>
     <property name="stock_id">gtk-about</property>
     <signal name="activate" handler="gtk_window_present" object="about_window" swapped="yes"/>
   </object>
   <object class="GtkAction" id="cleancache">
-    <property name="label">Clean cache</property>
+    <property name="label">_Clean cache</property>
     <property name="short_label">Clean cache</property>
     <property name="tooltip">Clean out old cached files</property>
     <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="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="label">_Offline</property>
     <property name="stock_id">gtk-disconnect</property>
     <signal name="toggled" handler="on_offline" swapped="no"/>
   </object>
   <object class="GtkAction" id="prefs">
+    <property name="label" translatable="yes">_Preferences</property>
     <property name="stock_id">gtk-preferences</property>
     <signal name="activate" handler="gtk_window_present" object="prefs_window" swapped="yes"/>
   </object>
   <object class="GtkAction" id="quit">
-    <property name="label">Quit</property>
+    <property name="label">_Quit</property>
     <property name="stock_id">gtk-quit</property>
     <signal name="activate" handler="on_quit" swapped="no"/>
   </object>
   <object class="GtkAction" id="refresh">
-    <property name="label">Refresh</property>
+    <property name="label">_Refresh</property>
     <property name="stock_id">gtk-refresh</property>
     <signal name="activate" handler="on_refresh" swapped="no"/>
   </object>
+  <object class="GtkToggleAction" id="update">
+    <property name="label" translatable="yes">_Auto-update</property>
+    <property name="short_label" translatable="yes">Auto-update</property>
+    <property name="tooltip" translatable="yes">Automatically refresh after a timeout</property>
+    <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="label">Zoom _In</property>
     <property name="stock_id">gtk-zoom-in</property>
     <signal name="activate" handler="on_zoomin" swapped="no"/>
   </object>
   <object class="GtkAction" id="zoomout">
-    <property name="label">Zoom Out</property>
+    <property name="label">Zoom _Out</property>
     <property name="stock_id">gtk-zoom-out</property>
     <signal name="activate" handler="on_zoomout" swapped="no"/>
   </object>
@@ -64,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-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="copyright" translatable="yes">Copyright ©2008-2012 Andy Spencer</property>
+    <property name="comments" translatable="yes">A weather monitoring program</property>
+    <property name="website">http://pileus.org/aweather</property>
     <property name="license" translatable="yes">                    GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
@@ -312,6 +327,8 @@ 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"/>
     <signal name="response" handler="gtk_widget_hide" swapped="no"/>
@@ -342,6 +359,9 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
   <object class="AWeatherGui" id="main_window">
     <property name="can_focus">False</property>
     <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>
@@ -352,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">
@@ -363,41 +383,55 @@ 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_prefs">
+                      <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">prefs</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="main_menu_file_cleancache">
+                      <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="use_underline">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem" id="main_menu_file_0">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                      </object>
+                    </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="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkSeparatorMenuItem" id="main_menu_file_0">
+                      <object class="GtkSeparatorMenuItem" id="main_menu_file_1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                       </object>
                     </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>
@@ -407,10 +441,34 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
               </object>
             </child>
             <child>
-              <object class="GtkMenuItem" id="main_menu_view">
+              <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="label" translatable="yes">_Edit</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="main_menu_edit_menu">
+                    <property name="visible">True</property>
+                    <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="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </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="label" translatable="yes">_View</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
@@ -419,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>
@@ -442,24 +500,10 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
                       </object>
                     </child>
                     <child>
-                      <object class="GtkCheckMenuItem" id="main_menu_view_fullscreen">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                      <object class="GtkImageMenuItem" id="main_menu_view_fullscreen">
                         <property name="related_action">fullscreen</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSeparatorMenuItem" id="main_menu_view_1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="main_menu_view_refresh">
-                        <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>
@@ -469,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">
@@ -480,25 +533,34 @@ 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="related_action">contents</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkSeparatorMenuItem" id="separatormenuitem1">
+                      <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="use_underline">True</property>
+                        <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="main_menu_help_about">
+                      <object class="GtkSeparatorMenuItem" id="main_menu_help_0">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                      </object>
+                    </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="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -521,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>
@@ -532,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>
@@ -553,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>
@@ -576,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>
@@ -589,9 +651,22 @@ 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>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </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="label" translatable="yes">toolbutton1</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -611,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>
@@ -639,8 +714,6 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
                 <property name="can_focus">True</property>
                 <child>
                   <object class="GritsOpenGL" id="main_viewer">
-                    <property name="width_request">600</property>
-                    <property name="height_request">400</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_focus">True</property>
@@ -775,8 +848,15 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
       <column type="gboolean"/>
     </columns>
   </object>
+  <object class="GtkAdjustment" id="prefs_general_freq_adj">
+    <property name="lower">1</property>
+    <property name="upper">60</property>
+    <property name="value">5</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">5</property>
+  </object>
   <object class="GtkAdjustment" id="prefs_general_log_adj">
-    <property name="upper">8</property>
+    <property name="upper">5</property>
     <property name="step_increment">1</property>
   </object>
   <object class="GtkDialog" id="prefs_window">
@@ -784,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">
@@ -799,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>
@@ -846,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>
@@ -858,6 +939,49 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
                                 <property name="position">0</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkHBox" id="prefs_general_freq_0">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">5</property>
+                                <child>
+                                  <object class="GtkLabel" id="prefs_general_freq_label">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Update Freq</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinButton" id="prefs_general_freq">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">●</property>
+                                    <property name="primary_icon_activatable">False</property>
+                                    <property name="secondary_icon_activatable">False</property>
+                                    <property name="primary_icon_sensitive">True</property>
+                                    <property name="secondary_icon_sensitive">True</property>
+                                    <property name="adjustment">prefs_general_freq_adj</property>
+                                    <signal name="value-changed" handler="on_update_freq_changed" swapped="no"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
                             <child>
                               <object class="GtkHBox" id="prefs_general_site_0">
                                 <property name="visible">True</property>
@@ -899,7 +1023,7 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
                               <packing>
                                 <property name="expand">True</property>
                                 <property name="fill">True</property>
-                                <property name="position">1</property>
+                                <property name="position">2</property>
                               </packing>
                             </child>
                             <child>
@@ -941,7 +1065,7 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
                               <packing>
                                 <property name="expand">True</property>
                                 <property name="fill">True</property>
-                                <property name="position">2</property>
+                                <property name="position">3</property>
                               </packing>
                             </child>
                             <child>
@@ -985,7 +1109,7 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
                               <packing>
                                 <property name="expand">True</property>
                                 <property name="fill">True</property>
-                                <property name="position">3</property>
+                                <property name="position">4</property>
                               </packing>
                             </child>
                           </object>
@@ -1052,6 +1176,14 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
       <action-widget response="0">prefs_action_close</action-widget>
     </action-widgets>
   </object>
+  <object class="GtkSizeGroup" id="prefs_general_size">
+    <widgets>
+      <widget name="prefs_general_freq_label"/>
+      <widget name="prefs_general_log_label"/>
+      <widget name="prefs_general_url_label"/>
+      <widget name="prefs_general_site_label"/>
+    </widgets>
+  </object>
   <object class="GtkTreeStore" id="sites">
     <columns>
       <!-- column-name code -->
@@ -1070,11 +1202,4 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
       <column type="gint"/>
     </columns>
   </object>
-  <object class="GtkSizeGroup" id="prefs_general_size">
-    <widgets>
-      <widget name="prefs_general_log_label"/>
-      <widget name="prefs_general_url_label"/>
-      <widget name="prefs_general_site_label"/>
-    </widgets>
-  </object>
 </interface>