X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=data%2Fmain.ui;h=18d705bf29f2c3c952a532a9d7efb7862d3a624a;hb=refs%2Fheads%2Fv0.3.x;hp=a5bed8176b181209ea72975dbbf8e7be21ee2a13;hpb=f705ad00b5d94f8ddc59575737b79feed191b404;p=aweather

diff --git a/data/main.ui b/data/main.ui
index a5bed81..18d705b 100644
--- a/data/main.ui
+++ b/data/main.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
+  <!-- interface-naming-policy project-wide -->
   <object class="GtkListStore" id="times">
     <columns>
       <!-- column-name time -->
@@ -25,22 +25,24 @@
     </columns>
   </object>
   <object class="GtkWindow" id="main_window">
+    <property name="title" translatable="yes">AWeather</property>
     <child>
-      <object class="GtkVBox" id="body">
+      <object class="GtkVBox" id="main_body">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
-          <object class="GtkMenuBar" id="menu">
+          <object class="GtkMenuBar" id="main_menu">
             <property name="visible">True</property>
             <child>
-              <object class="GtkMenuItem" id="file_item">
+              <object class="GtkMenuItem" id="main_menu_file">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_File</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
-                  <object class="GtkMenu" id="file_menu">
+                  <object class="GtkMenu" id="main_menu_file_menu">
                     <property name="visible">True</property>
                     <child>
-                      <object class="GtkCheckMenuItem" id="offline_item">
+                      <object class="GtkCheckMenuItem" id="main_menu_file_offline">
                         <property name="visible">True</property>
                         <property name="tooltip_text" translatable="yes">Work offline</property>
                         <property name="related_action">offline</property>
@@ -48,7 +50,7 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="prefs_item">
+                      <object class="GtkImageMenuItem" id="main_menu_file_prefs">
                         <property name="visible">True</property>
                         <property name="related_action">prefs</property>
                         <property name="use_action_appearance">True</property>
@@ -57,12 +59,12 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkSeparatorMenuItem" id="sep2">
+                      <object class="GtkSeparatorMenuItem" id="main_menu_file_0">
                         <property name="visible">True</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="quit_item">
+                      <object class="GtkImageMenuItem" id="main_menu_file_quit">
                         <property name="visible">True</property>
                         <property name="related_action">quit</property>
                         <property name="use_action_appearance">True</property>
@@ -75,15 +77,15 @@
               </object>
             </child>
             <child>
-              <object class="GtkMenuItem" id="view_item">
+              <object class="GtkMenuItem" id="main_menu_view">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_View</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
-                  <object class="GtkMenu" id="view_menu">
+                  <object class="GtkMenu" id="main_menu_view_menu">
                     <property name="visible">True</property>
                     <child>
-                      <object class="GtkImageMenuItem" id="zoomin_item">
+                      <object class="GtkImageMenuItem" id="main_menu_view_zoomin">
                         <property name="visible">True</property>
                         <property name="related_action">zoomin</property>
                         <property name="use_action_appearance">True</property>
@@ -92,7 +94,7 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="zoomout_item">
+                      <object class="GtkImageMenuItem" id="main_menu_view_zoomout">
                         <property name="visible">True</property>
                         <property name="related_action">zoomout</property>
                         <property name="use_action_appearance">True</property>
@@ -101,12 +103,12 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkSeparatorMenuItem" id="sep1">
+                      <object class="GtkSeparatorMenuItem" id="main_menu_view_0">
                         <property name="visible">True</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="refresh_item">
+                      <object class="GtkImageMenuItem" id="main_menu_view_refresh">
                         <property name="visible">True</property>
                         <property name="related_action">refresh</property>
                         <property name="use_action_appearance">True</property>
@@ -119,15 +121,15 @@
               </object>
             </child>
             <child>
-              <object class="GtkMenuItem" id="help_item">
+              <object class="GtkMenuItem" id="main_menu_help">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_Help</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
-                  <object class="GtkMenu" id="help_menu">
+                  <object class="GtkMenu" id="main_menu_help_menu">
                     <property name="visible">True</property>
                     <child>
-                      <object class="GtkImageMenuItem" id="about_item">
+                      <object class="GtkImageMenuItem" id="main_menu_help_about">
                         <property name="visible">True</property>
                         <property name="related_action">about</property>
                         <property name="use_action_appearance">True</property>
@@ -146,11 +148,11 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToolbar" id="toolbar">
+          <object class="GtkToolbar" id="main_toolbar">
             <property name="visible">True</property>
             <property name="toolbar_style">icons</property>
             <child>
-              <object class="GtkToolButton" id="zoomin_button">
+              <object class="GtkToolButton" id="main_tb_zoomin">
                 <property name="visible">True</property>
                 <property name="related_action">zoomin</property>
                 <property name="use_action_appearance">True</property>
@@ -161,7 +163,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkToolButton" id="zoomout_button">
+              <object class="GtkToolButton" id="main_tb_zoomout">
                 <property name="visible">True</property>
                 <property name="related_action">zoomout</property>
                 <property name="use_action_appearance">True</property>
@@ -172,7 +174,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkSeparatorToolItem" id="sep">
+              <object class="GtkSeparatorToolItem" id="main_tb_0">
                 <property name="visible">True</property>
               </object>
               <packing>
@@ -181,7 +183,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkToggleToolButton" id="offline_button">
+              <object class="GtkToggleToolButton" id="main_tb_offline">
                 <property name="visible">True</property>
                 <property name="related_action">offline</property>
                 <property name="use_action_appearance">True</property>
@@ -194,7 +196,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkToolButton" id="refresh_button">
+              <object class="GtkToolButton" id="main_tb_refresh">
                 <property name="visible">True</property>
                 <property name="related_action">refresh</property>
                 <property name="use_action_appearance">True</property>
@@ -206,7 +208,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkSeparatorToolItem" id="sep3">
+              <object class="GtkSeparatorToolItem" id="main_tb_1">
                 <property name="visible">True</property>
               </object>
               <packing>
@@ -215,7 +217,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkToolButton" id="prefs_button">
+              <object class="GtkToolButton" id="main_tb_prefs">
                 <property name="visible">True</property>
                 <property name="related_action">prefs</property>
                 <property name="use_action_appearance">True</property>
@@ -234,49 +236,44 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVPaned" id="vpaned1">
+          <object class="GtkVPaned" id="main_0">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <child>
-              <object class="GtkHPaned" id="hpaned1">
+              <object class="GtkHPaned" id="main_paned">
                 <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="main_placeholder">
                     <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>
-                  <object class="GtkVBox" id="vbox2">
+                  <object class="GtkVBox" id="main_1">
                     <property name="visible">True</property>
+                    <property name="orientation">vertical</property>
                     <property name="spacing">5</property>
                     <child>
-                      <object class="GtkExpander" id="expander1">
+                      <object class="GtkExpander" id="main_site_0">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="expanded">True</property>
                         <property name="use_markup">True</property>
                         <child>
-                          <object class="GtkComboBox" id="site">
+                          <object class="GtkComboBox" id="main_site">
                             <property name="visible">True</property>
                             <property name="model">sites</property>
                             <property name="add_tearoffs">True</property>
                             <signal name="changed" handler="on_site_changed"/>
                             <child>
-                              <object class="GtkCellRendererText" id="site_rend"/>
+                              <object class="GtkCellRendererText" id="main_site_rend"/>
                               <attributes>
                                 <attribute name="text">0</attribute>
                               </attributes>
@@ -284,7 +281,7 @@
                           </object>
                         </child>
                         <child type="label">
-                          <object class="GtkLabel" id="label1">
+                          <object class="GtkLabel" id="main_site_label">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">&lt;b&gt;Site&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
@@ -297,19 +294,19 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkExpander" id="expander2">
+                      <object class="GtkExpander" id="main_time_0">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="expanded">True</property>
                         <child>
-                          <object class="GtkScrolledWindow" id="scrolledwindow1">
+                          <object class="GtkScrolledWindow" id="main_time_1">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="hscrollbar_policy">never</property>
                             <property name="vscrollbar_policy">automatic</property>
                             <property name="shadow_type">in</property>
                             <child>
-                              <object class="GtkTreeView" id="time">
+                              <object class="GtkTreeView" id="main_time">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="model">times</property>
@@ -320,7 +317,7 @@
                           </object>
                         </child>
                         <child type="label">
-                          <object class="GtkLabel" id="label2">
+                          <object class="GtkLabel" id="main_time_label">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">&lt;b&gt;Time&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
@@ -344,7 +341,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkNotebook" id="tabs">
+              <object class="GtkNotebook" id="main_tabs">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="tab_pos">bottom</property>
@@ -390,45 +387,49 @@
   <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">
+      <object class="GtkVBox" id="prefs_0">
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
-          <object class="GtkNotebook" id="notebook">
+          <object class="GtkNotebook" id="prefs_notebook">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <child>
-              <object class="GtkVBox" id="vbox1">
+              <object class="GtkVBox" id="prefs_general_0">
                 <property name="visible">True</property>
                 <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkFrame" id="frame1">
+                  <object class="GtkFrame" id="prefs_general_1">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment1">
+                      <object class="GtkAlignment" id="prefs_general_2">
                         <property name="visible">True</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <object class="GtkVBox" id="vbox2">
+                          <object class="GtkVBox" id="prefs_general_3">
                             <property name="visible">True</property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">5</property>
                             <child>
-                              <object class="GtkCheckButton" id="checkbutton1">
+                              <object class="GtkCheckButton" id="prefs_general_offline">
                                 <property name="label" translatable="yes">Work offline</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -441,11 +442,11 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHBox" id="hbox1">
+                              <object class="GtkHBox" id="prefs_general_site_0">
                                 <property name="visible">True</property>
                                 <property name="spacing">5</property>
                                 <child>
-                                  <object class="GtkLabel" id="site_label">
+                                  <object class="GtkLabel" id="prefs_general_site_label">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Initial site</property>
@@ -456,11 +457,16 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkEntry" id="initial_site">
+                                  <object class="GtkComboBox" id="prefs_general_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="prefs_general_site_rend"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
                                   </object>
                                   <packing>
                                     <property name="position">1</property>
@@ -472,11 +478,11 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHBox" id="hbox3">
+                              <object class="GtkHBox" id="prefs_general_url_0">
                                 <property name="visible">True</property>
                                 <property name="spacing">5</property>
                                 <child>
-                                  <object class="GtkLabel" id="nexrad_label">
+                                  <object class="GtkLabel" id="prefs_general_url_label">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">NEXRAD URL</property>
@@ -487,7 +493,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkEntry" id="nexrad_url">
+                                  <object class="GtkEntry" id="prefs_general_url">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="invisible_char">&#x25CF;</property>
@@ -503,11 +509,11 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHBox" id="hbox2">
+                              <object class="GtkHBox" id="prefs_general_log_0">
                                 <property name="visible">True</property>
                                 <property name="spacing">5</property>
                                 <child>
-                                  <object class="GtkLabel" id="log_label">
+                                  <object class="GtkLabel" id="prefs_general_log_label">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Debug level</property>
@@ -518,11 +524,11 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkSpinButton" id="log_level">
+                                  <object class="GtkSpinButton" id="prefs_general_log">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="invisible_char">&#x25CF;</property>
-                                    <property name="adjustment">adjustment</property>
+                                    <property name="adjustment">prefs_general_log_adj</property>
                                     <property name="numeric">True</property>
                                     <signal name="value_changed" handler="on_log_level_changed"/>
                                   </object>
@@ -540,7 +546,7 @@
                       </object>
                     </child>
                     <child type="label">
-                      <object class="GtkLabel" id="label1">
+                      <object class="GtkLabel" id="prefs_general_prefs_label">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">&lt;b&gt;Preferences&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
@@ -555,7 +561,7 @@
               </object>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="general_label">
+              <object class="GtkLabel" id="prefs_general_label">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">General</property>
               </object>
@@ -564,7 +570,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkTreeView" id="plugins_view">
+              <object class="GtkTreeView" id="prefs_plugins_view">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
               </object>
@@ -573,7 +579,7 @@
               </packing>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="plugins_label">
+              <object class="GtkLabel" id="prefs_plugins_label">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Plugins</property>
               </object>
@@ -588,12 +594,12 @@
           </packing>
         </child>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
+          <object class="GtkHButtonBox" id="prefs_action">
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="button1">
-                <property name="label" translatable="yes">gtk-close</property>
+              <object class="GtkButton" id="prefs_action_close">
+                <property name="label">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -615,19 +621,19 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">button1</action-widget>
+      <action-widget response="0">prefs_action_close</action-widget>
     </action-widgets>
   </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,16 +882,18 @@ 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">
+      <object class="GtkVBox" id="about_0">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
           <placeholder/>
         </child>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area3">
+          <object class="GtkHButtonBox" id="about_action">
             <property name="visible">True</property>
             <property name="layout_style">end</property>
           </object>
@@ -898,17 +906,15 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
       </object>
     </child>
   </object>
-  <object class="GtkSizeGroup" id="prefs_size">
+  <object class="GtkSizeGroup" id="prefs_general_size">
     <widgets>
-      <widget name="site_label"/>
-      <widget name="nexrad_label"/>
-      <widget name="log_label"/>
+      <widget name="prefs_general_site_label"/>
+      <widget name="prefs_general_url_label"/>
+      <widget name="prefs_general_log_label"/>
     </widgets>
   </object>
-  <object class="GtkAdjustment" id="adjustment">
+  <object class="GtkAdjustment" id="prefs_general_log_adj">
     <property name="upper">8</property>
     <property name="step_increment">1</property>
-    <property name="page_increment">1</property>
-    <property name="page_size">1</property>
   </object>
 </interface>