X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=data%2Fmain.ui.in;h=23a049438d3efa46c5ae866c088a7f5ef4971cf3;hb=62239c1f2419f1fb7d6adc263b1e11dcefddc737;hp=88ffe2702c57da0cdd7137eb99dde824246e016b;hpb=5b5ea8dedbee50cdc6c633c47f11f7e183227aa1;p=aweather

diff --git a/data/main.ui.in b/data/main.ui.in
index 88ffe27..23a0494 100644
--- a/data/main.ui.in
+++ b/data/main.ui.in
@@ -1,30 +1,35 @@
 <?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="times">
+  <object class="GtkListStore" id="plugins">
     <columns>
-      <!-- column-name time -->
+      <!-- column-name plugin -->
       <column type="gchararray"/>
+      <!-- column-name enabled -->
+      <column type="gboolean"/>
     </columns>
   </object>
   <object class="GtkTreeStore" id="sites">
     <columns>
-      <!-- column-name label -->
-      <column type="gchararray"/>
       <!-- column-name code -->
       <column type="gchararray"/>
+      <!-- column-name name -->
+      <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="plugins">
+  <object class="GtkTreeStore" id="times">
     <columns>
-      <!-- column-name plugin -->
+      <!-- column-name string -->
       <column type="gchararray"/>
-      <!-- column-name enabled -->
-      <column type="gboolean"/>
+      <!-- column-name hour -->
+      <column type="gint"/>
+      <!-- column-name min -->
+      <column type="gint"/>
     </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">
@@ -58,6 +63,15 @@
                         <property name="use_stock">True</property>
                       </object>
                     </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="main_menu_file_cleancache">
+                        <property name="visible">True</property>
+                        <property name="related_action">cleancache</property>
+                        <property name="use_action_appearance">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                    </child>
                     <child>
                       <object class="GtkSeparatorMenuItem" id="main_menu_file_0">
                         <property name="visible">True</property>
@@ -128,6 +142,20 @@
                 <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="related_action">contents</property>
+                        <property name="use_action_appearance">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </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>
@@ -244,14 +272,13 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <child>
-                  <object class="GtkLabel" id="main_placeholder">
+                  <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="label" translatable="yes">placeholder
-(it's buggy with blank placeholders)</property>
-                    <property name="justify">center</property>
                   </object>
                   <packing>
-                    <property name="resize">False</property>
+                    <property name="resize">True</property>
                     <property name="shrink">True</property>
                   </packing>
                 </child>
@@ -261,29 +288,21 @@
                     <property name="orientation">vertical</property>
                     <property name="spacing">5</property>
                     <child>
-                      <object class="GtkExpander" id="main_site_0">
+                      <object class="GtkExpander" id="main_date_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="main_site">
+                          <object class="GtkCalendar" id="main_date_cal">
                             <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="main_site_rend"/>
-                              <attributes>
-                                <attribute name="text">0</attribute>
-                              </attributes>
-                            </child>
+                            <property name="can_focus">True</property>
+                            <property name="show_details">False</property>
                           </object>
                         </child>
                         <child type="label">
-                          <object class="GtkLabel" id="main_site_label">
+                          <object class="GtkLabel" id="main_date_label">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Site&lt;/b&gt;</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Date&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </object>
                         </child>
@@ -311,7 +330,17 @@
                                 <property name="can_focus">True</property>
                                 <property name="model">times</property>
                                 <property name="headers_visible">False</property>
-                                <signal name="row_activated" handler="on_time_changed"/>
+                                <child>
+                                  <object class="GtkTreeViewColumn" id="main_time_text">
+                                    <property name="title">Time</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="main_time_rend"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
+                                </child>
                               </object>
                             </child>
                           </object>
@@ -397,7 +426,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"/>
@@ -464,7 +492,7 @@
                                     <child>
                                       <object class="GtkCellRendererText" id="prefs_general_site_rend"/>
                                       <attributes>
-                                        <attribute name="text">0</attribute>
+                                        <attribute name="text">1</attribute>
                                       </attributes>
                                     </child>
                                   </object>
@@ -629,7 +657,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>
@@ -908,13 +935,27 @@ 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_site_label"/>
-      <widget name="prefs_general_url_label"/>
       <widget name="prefs_general_log_label"/>
+      <widget name="prefs_general_url_label"/>
+      <widget name="prefs_general_site_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>
+    <signal name="activate" handler="on_contents"/>
+  </object>
+  <object class="GtkAction" id="cleancache">
+    <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"/>
+  </object>
 </interface>