[hamster-applet] just progress

[Toms Baugis <tbaugis src gnome org>]

commit a0a92b30d6145b232c119f6e1ee2abdbb70240f5
Author: Toms Bauģis <toms baugis gmail com>
Date:   Wed Nov 25 01:18:42 2009 +0000

    just progress

 data/hamster.ui       |   20 ++++++++++++++++----
 hamster/standalone.py |   27 +++++++++++++++++----------
 2 files changed, 33 insertions(+), 14 deletions(-)
---
diff --git a/data/hamster.ui b/data/hamster.ui
index e831299..2805338 100644
--- a/data/hamster.ui
+++ b/data/hamster.ui
@@ -53,9 +53,23 @@
                             </attributes>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="GtkAlignment" id="tag_box">
+                            <property name="visible">True</property>
+                            <property name="left_padding">4</property>
+                            <property name="right_padding">4</property>
+                            <child>
+                              <placeholder/>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
                         <property name="position">0</property>
@@ -231,11 +245,9 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <child>
-                      <object class="GtkAlignment" id="tag_box">
+                      <object class="GtkLabel" id="label9">
                         <property name="visible">True</property>
-                        <child>
-                          <placeholder/>
-                        </child>
+                        <property name="label" translatable="yes">label</property>
                       </object>
                     </child>
                     <child type="tab">
diff --git a/hamster/standalone.py b/hamster/standalone.py
index a9d2220..152268a 100755
--- a/hamster/standalone.py
+++ b/hamster/standalone.py
@@ -48,22 +48,20 @@ class MainWindow(object):
         self.get_widget("new_name_box").add(self.new_name)
         self.new_name.connect("changed", self.on_activity_text_changed)
 
-
-
         self.new_tags = widgets.TagsEntry()
-        
         widgets.add_hint(self.new_tags, _("Tags or Description"))
         self.get_widget("new_tags_box").add(self.new_tags)
+
+        self.tag_box = widgets.TagBox(interactive = False)
+        self.get_widget("tag_box").add(self.tag_box)
         
-        self.get_widget("tabs").set_current_page(0)
+        self.get_widget("tabs").set_current_page(1)
 
         self.set_last_activity()
         self.load_today()
         
         gtk.link_button_set_uri_hook(self.magic)
         
-        self.tag_box = widgets.TagBox()
-        self.get_widget("tag_box").add(self.tag_box)
 
         runtime.dispatcher.add_handler('activity_updated', self.after_activity_update)
         runtime.dispatcher.add_handler('day_updated', self.after_fact_update)
@@ -95,6 +93,8 @@ class MainWindow(object):
                     .set_text(" - %s" % activity['category'])
 
             self.get_widget("last_activity_description").set_text(activity['description'])
+            
+            self.tag_box.draw(activity["tags"])
         else:
             self.get_widget("switch_activity").hide()
             self.get_widget("start_tracking").show()
@@ -133,16 +133,23 @@ class MainWindow(object):
 
             add_cell(fact_time, 0, rownum)
 
-            name_tags = gtk.VBox()
+            name_tags = gtk.HBox()
             name_label = gtk.Label(fact['name'])
             name_label.set_alignment(0, 0)
             name_tags.pack_start(name_label)
 
-            description_label = gtk.Label(fact['category'])
-            description_label.set_alignment(0, 0)
-            name_tags.pack_start(description_label)
+            tags = widgets.TagBox()
+            tags.set_size_request(-1, 27)
+            tags.draw(fact["tags"])
+            tags.modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(65536.0,65536.0,65536.0))
+
+            name_tags.pack_start(tags)
+            
+            name_tags.pack_start(tags)
 
             add_cell(name_tags, 1, rownum, (gtk.EXPAND | gtk.FILL), ())
+            
+            
 
             add_cell(stuff.format_duration(duration), 2, rownum, gtk.FILL, ())