X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=data%2Fmain.ui.in;h=7f419aaa83e397f2c4fb3936f846a383aa4ecab9;hb=4e582af3ff02eebe2c5a1172dbd3052a0fafcf60;hp=eb543bd7ebdd530241da891fad1288b5e800fa47;hpb=f4c5990fbc61b3aa8632be9c3850125d91fccd2f;p=aweather

diff --git a/data/main.ui.in b/data/main.ui.in
index eb543bd..7f419aa 100644
--- 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>
@@ -10,7 +11,15 @@
       <column type="gboolean"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="times">
+  <object class="GtkTreeStore" id="sites">
+    <columns>
+      <!-- column-name code -->
+      <column type="gchararray"/>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkTreeStore" id="times">
     <columns>
       <!-- column-name string -->
       <column type="gchararray"/>
@@ -20,7 +29,7 @@
       <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">
@@ -54,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>
@@ -103,6 +121,19 @@
                         <property name="visible">True</property>
                       </object>
                     </child>
+                    <child>
+                      <object class="GtkCheckMenuItem" id="main_menu_view_fullscreen">
+                        <property name="visible">True</property>
+                        <property name="related_action">fullscreen</property>
+                        <property name="use_action_appearance">True</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem" id="main_menu_view_1">
+                        <property name="visible">True</property>
+                      </object>
+                    </child>
                     <child>
                       <object class="GtkImageMenuItem" id="main_menu_view_refresh">
                         <property name="visible">True</property>
@@ -124,6 +155,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>
@@ -178,6 +223,28 @@
                 <property name="homogeneous">True</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkToggleToolButton" id="main_tb_fullscreen">
+                <property name="visible">True</property>
+                <property name="related_action">fullscreen</property>
+                <property name="use_action_appearance">True</property>
+                <property name="label" translatable="yes">toolbutton1</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSeparatorToolItem" id="main_tb_1">
+                <property name="visible">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkToggleToolButton" id="main_tb_offline">
                 <property name="visible">True</property>
@@ -204,7 +271,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkSeparatorToolItem" id="main_tb_1">
+              <object class="GtkSeparatorToolItem" id="main_tb_2">
                 <property name="visible">True</property>
               </object>
               <packing>
@@ -240,19 +307,18 @@
                 <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>
                 <child>
-                  <object class="GtkVBox" id="main_1">
+                  <object class="GtkVBox" id="main_sidebar">
                     <property name="visible">True</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">5</property>
@@ -265,6 +331,7 @@
                           <object class="GtkCalendar" id="main_date_cal">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="show_details">False</property>
                           </object>
                         </child>
                         <child type="label">
@@ -298,6 +365,17 @@
                                 <property name="can_focus">True</property>
                                 <property name="model">times</property>
                                 <property name="headers_visible">False</property>
+                                <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>
@@ -383,10 +461,8 @@
     <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"/>
+    <signal name="response" handler="gtk_widget_hide" object="prefs_window"/>
     <child internal-child="vbox">
       <object class="GtkVBox" id="prefs_0">
         <property name="visible">True</property>
@@ -445,11 +521,12 @@
                                 <child>
                                   <object class="GtkComboBox" id="prefs_general_site">
                                     <property name="visible">True</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>
+                                        <attribute name="text">1</attribute>
                                       </attributes>
                                     </child>
                                   </object>
@@ -614,8 +691,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>
     <property name="copyright" translatable="yes">Copyright &#xA9;2008-2009 Andy Spencer</property>
@@ -867,8 +942,8 @@ 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_hide"/>
     <signal name="delete_event" handler="gtk_widget_hide_on_delete"/>
+    <signal name="response" handler="gtk_widget_hide"/>
     <child internal-child="vbox">
       <object class="GtkVBox" id="about_0">
         <property name="visible">True</property>
@@ -893,13 +968,32 @@ 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>
+  <object class="GtkToggleAction" id="fullscreen">
+    <property name="label">Fullscreen</property>
+    <property name="stock_id">gtk-fullscreen</property>
+    <signal name="toggled" handler="on_fullscreen"/>
+  </object>
 </interface>