[billreminder/fresh] incorporated the tree into the glade

[Toms Baugis <tbaugis src gnome org>]

commit 86c754be494a22473f707b5aa3df7b6b1a2f4009
Author: Toms Bauģis <toms baugis gmail com>
Date:   Fri Jan 15 15:09:30 2010 +0000

    incorporated the tree into the glade

 data/new.ui         |   11 ++++++++---
 src/billreminder.py |    4 ++--
 src/gui/new.py      |   43 ++++++++++++++++++++-----------------------
 3 files changed, 30 insertions(+), 28 deletions(-)
---
diff --git a/data/new.ui b/data/new.ui
index e821cf6..6500c73 100644
--- a/data/new.ui
+++ b/data/new.ui
@@ -3,6 +3,8 @@
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkWindow" id="main_window">
+    <property name="default_width">600</property>
+    <property name="default_height">400</property>
     <signal name="delete_event" handler="on_delete_event"/>
     <child>
       <object class="GtkVBox" id="vbox1">
@@ -294,15 +296,18 @@
                             <property name="visible">True</property>
                             <property name="left_padding">12</property>
                             <child>
-                              <object class="GtkScrolledWindow" id="upcomingBillsContainer">
+                              <object class="GtkScrolledWindow" id="scrollbox99">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="hscrollbar_policy">automatic</property>
                                 <property name="vscrollbar_policy">automatic</property>
                                 <child>
-                                  <object class="GtkTreeView" id="upcoming_tree">
+                                  <object class="GtkViewport" id="upcoming_box">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
+                                    <property name="resize_mode">queue</property>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
                                   </object>
                                 </child>
                               </object>
diff --git a/src/billreminder.py b/src/billreminder.py
index 18a4683..6b8ad6a 100755
--- a/src/billreminder.py
+++ b/src/billreminder.py
@@ -61,8 +61,8 @@ def main():
 
 
     if options.new_main:
-        from gui.new import BasicWindow
-        app = BasicWindow()
+        from gui.new import MainWindow
+        app = MainWindow()
         gtk.main()
 
     elif options.app_about:
diff --git a/src/gui/new.py b/src/gui/new.py
index 85d82ca..e04d0a6 100755
--- a/src/gui/new.py
+++ b/src/gui/new.py
@@ -3,40 +3,37 @@
 
 import gtk
 from db import entities
+from lib import utils
 import widgets
 
-class BasicWindow:
-
-    # close the window and quit
-    def delete_event(self, widget, event, data=None):
-        gtk.main_quit()
-        return False
+import datetime as dt
 
+class MainWindow:
     def __init__(self):
         # Create a new window
-        self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
+        self.ui = utils.load_ui_file("new.ui")
+        self.window = self.ui.get_object("main_window")
 
-        self.window.set_title("Basic Window")
+        self.upcoming = widgets.BillTree()
+        self.ui.get_object("upcoming_box").add(self.upcoming)
 
-        self.window.set_size_request(500, 300)
+        self.window.show_all()
+        self.ui.connect_signals(self)
+        
+        self.load_bills()
 
-        self.window.connect("delete_event", self.delete_event)
+    def load_bills(self):
+        self.upcoming.clear()
 
-        from datetime import date
-        dt = date.today()
-        ht = entities.Bill('Harris Teeter', 123.94, dt)
+        ht = entities.Bill('Harris Teeter', 123.94, dt.date.today())
         food = entities.Category('Groceries')
         ht.category = food
 
-        bt = widgets.BillTree()
-        bt.add_bill(ht)
+        self.upcoming.add_bill(ht)
+        
 
-        self.window.add(bt)
-        self.window.show_all()
-
-def main():
-    gtk.main()
+    # close the window and quit
+    def on_delete_event(self, widget, event, data=None):
+        gtk.main_quit()
+        return False
 
-if __name__ == "__main__":
-    example = BasicWindow()
-    main()