Fix Conus double-loading crash

[aweather] / data / main.ui.in

diff --git a/data/main.ui.in b/data/main.ui.in
index 4588d3a959a9ff751712d9c4d693d40e38b5e625..986c02966520e37de99d144601bc17dda04e9db6 100644 (file)
--- a/data/main.ui.in
+++ b/data/main.ui.in
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
+  <!-- interface-requires AWeather 0.0 -->
   <!-- interface-naming-policy project-wide -->
   <object class="GtkListStore" id="plugins">
     <columns>
@@ -28,7 +29,7 @@
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkWindow" id="main_window">
+  <object class="AWeatherGui" id="main_window">
     <property name="title" translatable="yes">AWeather</property>
     <child>
       <object class="GtkVBox" id="main_body">
@@ -49,15 +50,15 @@
                       <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>
                         <property name="use_action_appearance">True</property>
+                        <property name="related_action">offline</property>
                       </object>
                     </child>
                     <child>
                       <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>
+                        <property name="related_action">prefs</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -70,8 +71,8 @@
                     <child>
                       <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>
+                        <property name="related_action">quit</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -91,8 +92,8 @@
                     <child>
                       <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>
+                        <property name="related_action">zoomin</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -100,8 +101,8 @@
                     <child>
                       <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>
+                        <property name="related_action">zoomout</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -114,8 +115,8 @@
                     <child>
                       <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>
+                        <property name="related_action">refresh</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -132,11 +133,26 @@
                 <child type="submenu">
                   <object class="GtkMenu" id="main_menu_help_menu">
                     <property name="visible">True</property>
+                    <child>
+                      <object class="GtkImageMenuItem" id="main_menu_help_contents">
+                        <property name="visible">True</property>
+                        <property name="use_action_appearance">True</property>
+                        <property name="related_action">contents</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="on_help_contents"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem" id="separatormenuitem1">
+                        <property name="visible">True</property>
+                      </object>
+                    </child>
                     <child>
                       <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>
+                        <property name="related_action">about</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -158,8 +174,8 @@
             <child>
               <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>
+                <property name="related_action">zoomin</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -169,8 +185,8 @@
             <child>
               <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>
+                <property name="related_action">zoomout</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -189,8 +205,8 @@
             <child>
               <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>
+                <property name="related_action">offline</property>
                 <property name="label" translatable="yes">toolbutton3</property>
                 <property name="use_underline">True</property>
               </object>
@@ -202,8 +218,8 @@
             <child>
               <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>
+                <property name="related_action">refresh</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -223,8 +239,8 @@
             <child>
               <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>
+                <property name="related_action">prefs</property>
                 <property name="label" translatable="yes">toolbutton1</property>
                 <property name="use_underline">True</property>
               </object>
@@ -248,11 +264,10 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <child>
-                  <object class="GtkLabel" id="main_placeholder">
+                  <object class="GisOpenGL" id="main_viewer">
+                    <property name="width_request">600</property>
+                    <property name="height_request">400</property>
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">placeholder
-(it's buggy with blank placeholders)</property>
-                    <property name="justify">center</property>
                   </object>
                   <packing>
                     <property name="resize">False</property>
@@ -391,7 +406,6 @@
     <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"/>
@@ -623,7 +637,6 @@
     <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">@VERSION@</property>
@@ -902,13 +915,19 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
   </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"/>
+      <widget name="prefs_general_url_label"/>
+      <widget name="prefs_general_log_label"/>
     </widgets>
   </object>
   <object class="GtkAdjustment" id="prefs_general_log_adj">
     <property name="upper">8</property>
     <property name="step_increment">1</property>
   </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>
+  </object>
 </interface>