Miscellaneous bug fixes

[aweather] / data / main.ui.in

diff --git a/data/main.ui.in b/data/main.ui.in
index 88ffe2702c57da0cdd7137eb99dde824246e016b..4588d3a959a9ff751712d9c4d693d40e38b5e625 100644 (file)
--- a/data/main.ui.in
+++ b/data/main.ui.in
@@ -2,26 +2,30 @@
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- 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">
+  <object class="GtkListStore" id="times">
     <columns>
-      <!-- column-name label -->
-      <column type="gchararray"/>
-      <!-- column-name code -->
+      <!-- column-name string -->
       <column type="gchararray"/>
+      <!-- column-name hour -->
+      <column type="gint"/>
+      <!-- column-name min -->
+      <column type="gint"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="plugins">
+  <object class="GtkTreeStore" id="sites">
     <columns>
-      <!-- column-name plugin -->
+      <!-- column-name code -->
+      <column type="gchararray"/>
+      <!-- column-name name -->
       <column type="gchararray"/>
-      <!-- column-name enabled -->
-      <column type="gboolean"/>
     </columns>
   </object>
   <object class="GtkWindow" id="main_window">
@@ -261,29 +265,20 @@
                     <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>
                           </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 +306,6 @@
                                 <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"/>
                               </object>
                             </child>
                           </object>
@@ -464,7 +458,7 @@
                                     <child>
                                       <object class="GtkCellRendererText" id="prefs_general_site_rend"/>
                                       <attributes>
-                                        <attribute name="text">0</attribute>
+                                        <attribute name="text">1</attribute>
                                       </attributes>
                                     </child>
                                   </object>
@@ -908,9 +902,9 @@ 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">