[hamster-applet] "renaming tools to widgets and keeping it all under one namespace widgets.

[Toms Baugis <tbaugis src gnome org>]

commit bd0721576719c49a921d1e1654908149768e28b1
Author: Toms Bauģis <toms baugis gmail com>
Date:   Thu Nov 19 16:09:50 2009 +0000

    "renaming tools to widgets and keeping it all under one namespace widgets.

 configure.ac                     |    2 +-
 hamster/Makefile.am              |    2 +-
 hamster/edit_activity.py         |    9 ++++-----
 hamster/preferences.py           |    5 ++---
 hamster/standalone.py            |   10 ++++------
 hamster/stats.py                 |    7 +++----
 hamster/widgets/Makefile.am      |    2 +-
 hamster/widgets/__init__.py      |    6 ++++++
 hamster/widgets/activityentry.py |    1 -
 9 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3021dbb..ebcb1f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,7 +169,7 @@ data/art/Makefile
 po/Makefile.in
 ])
 AC_OUTPUT(
-hamster/tools/Makefile
+hamster/widgets/Makefile
 )
 
 echo
diff --git a/hamster/Makefile.am b/hamster/Makefile.am
index d3201d1..a93c842 100644
--- a/hamster/Makefile.am
+++ b/hamster/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = keybinder tools
+SUBDIRS = keybinder widgets
 ACLOCAL_AMFLAGS = -I m4
 
 CPPFLAGS = \
diff --git a/hamster/edit_activity.py b/hamster/edit_activity.py
index a1e8986..d651307 100644
--- a/hamster/edit_activity.py
+++ b/hamster/edit_activity.py
@@ -28,8 +28,7 @@ import gobject
 import stuff
 import graphics
 
-from tools.dateinput import DateInput
-from tools.timeinput import TimeInput
+import widgets
 
 import eds
 from configuration import runtime
@@ -418,15 +417,15 @@ class CustomFactController:
         end_date = end_date or start_date + dt.timedelta(minutes = 30)
 
 
-        self.start_date = DateInput(start_date)
+        self.start_date = widgets.DateInput(start_date)
         self.get_widget("start_date_placeholder").add(self.start_date)
         self.start_date.connect("date-entered", self.on_start_date_entered)
 
-        self.start_time = TimeInput(start_date)
+        self.start_time = widgets.TimeInput(start_date)
         self.get_widget("start_time_placeholder").add(self.start_time)
         self.start_time.connect("time-entered", self.on_start_time_entered)
         
-        self.end_time = TimeInput(end_date, start_date)
+        self.end_time = widgets.TimeInput(end_date, start_date)
         self.get_widget("end_time_placeholder").add(self.end_time)
         self.end_time.connect("time-entered", self.on_end_time_entered)
         self.set_end_date_label(end_date)
diff --git a/hamster/preferences.py b/hamster/preferences.py
index e852f38..89b3e6a 100755
--- a/hamster/preferences.py
+++ b/hamster/preferences.py
@@ -27,8 +27,7 @@ import gtk
 import dispatcher, storage, stuff
 
 import datetime as dt
-from tools.timeinput import TimeInput
-
+import widgets
 
 from configuration import GconfStore, runtime
 
@@ -143,7 +142,7 @@ class PreferencesEditor:
         selection = self.category_tree.get_selection()
         selection.connect('changed', self.category_changed_cb, self.category_store)
 
-        self.day_start = TimeInput(dt.time(5,30))
+        self.day_start = widgets.TimeInput(dt.time(5,30))
         self.get_widget("day_start_placeholder").add(self.day_start)
         self.day_start.connect("time-entered", self.on_day_start_changed)
 
diff --git a/hamster/standalone.py b/hamster/standalone.py
index 306d8ff..a3457a9 100755
--- a/hamster/standalone.py
+++ b/hamster/standalone.py
@@ -27,9 +27,7 @@ import gtk
 #gtk.gdk.threads_init()
 
 from configuration import GconfStore, runtime
-import tools, stuff
-from tools.activityentry import ActivityEntry
-
+import widgets, stuff
 
 import gobject
 
@@ -59,14 +57,14 @@ class MainWindow(object):
         self.get_widget("todays_activities_ebox").modify_bg(gtk.STATE_NORMAL,
                                                                  gtk.gdk.Color(65536.0,65536.0,65536.0))
         
-        self.new_name = ActivityEntry()
-        tools.add_hint(self.new_name, _("Time and Name"))
+        self.new_name = widgets.ActivityEntry()
+        widgets.add_hint(self.new_name, _("Time and Name"))
         parent = self.get_widget("new_name").parent
         parent.remove(self.get_widget("new_name"))
         parent.add(self.new_name)
         
         self.new_description = self.get_widget("new_description")
-        tools.add_hint(self.new_description, _("Tags or Description"))
+        widgets.add_hint(self.new_description, _("Tags or Description"))
         
 
     def set_last_activity(self):
diff --git a/hamster/stats.py b/hamster/stats.py
index cc0da99..dfc449e 100644
--- a/hamster/stats.py
+++ b/hamster/stats.py
@@ -31,8 +31,7 @@ import charting
 from edit_activity import CustomFactController
 import reports, graphics
 
-import tools
-from tools.dateinput import DateInput
+import widgets
 
 from configuration import runtime, GconfStore
 import webbrowser
@@ -99,9 +98,9 @@ class ReportChooserDialog(gtk.Dialog):
         filter.add_pattern("*")
         self.dialog.add_filter(filter)
         
-        self.start_date = DateInput()
+        self.start_date = widgets.DateInput()
         ui.get_object('from_date_box').add(self.start_date)
-        self.end_date = DateInput()
+        self.end_date = widgets.DateInput()
         ui.get_object('to_date_box').add(self.end_date)
 
         self.category_box = ui.get_object('category_box')
diff --git a/hamster/widgets/Makefile.am b/hamster/widgets/Makefile.am
index 059791c..d422ee0 100644
--- a/hamster/widgets/Makefile.am
+++ b/hamster/widgets/Makefile.am
@@ -1,4 +1,4 @@
-hamsterdir = $(pyexecdir)/hamster/tools
+hamsterdir = $(pyexecdir)/hamster/widgets
 hamster_PYTHON = \
 	__init__.py \
 	activityentry.py \
diff --git a/hamster/widgets/__init__.py b/hamster/widgets/__init__.py
index ab921a2..b927f2d 100644
--- a/hamster/widgets/__init__.py
+++ b/hamster/widgets/__init__.py
@@ -20,6 +20,12 @@
 import datetime as dt
 import gtk, pango
 
+# import our children
+from activityentry import ActivityEntry
+from dateinput import DateInput
+from timeinput import TimeInput
+
+# handy wrappers
 def add_hint(entry, hint):
     entry.hint = hint        
     
diff --git a/hamster/widgets/activityentry.py b/hamster/widgets/activityentry.py
index 90ca3af..3b29740 100644
--- a/hamster/widgets/activityentry.py
+++ b/hamster/widgets/activityentry.py
@@ -17,7 +17,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Project Hamster.  If not, see <http://www.gnu.org/licenses/>.
 
-from hamster import tools
 from hamster.configuration import GconfStore, runtime
 
 from hamster import stuff