fixed a bug in the refresh button

Also, moved the version/authors/etc.. info into mevemon.py

diff --git a/package/src/mevemon.py b/package/src/mevemon.py
index f45b831..17c4ca1 100755 (executable)
--- a/package/src/mevemon.py
+++ b/package/src/mevemon.py
@@ -48,6 +48,15 @@ class mEveMon():
 
     """
 
+    about_name = 'mEveMon'
+    about_text = ('Mobile character monitor for EVE Online')
+    about_authors = ['Ryan Campbell <campbellr@gmail.com>',
+                     'Danny Campbell <danny.campbell@gmail.com>']
+
+    about_website = 'http://mevemon.garage.maemo.org'
+    app_version = '0.4'
+
+
     GCONF_DIR = "/apps/maemo/mevemon"
 
     def __init__(self):

diff --git a/package/src/ui/diablo/gui.py b/package/src/ui/diablo/gui.py
index 3598479..a744e48 100644 (file)
--- a/package/src/ui/diablo/gui.py
+++ b/package/src/ui/diablo/gui.py
@@ -27,12 +27,6 @@ import gobject
 from ui import models
 
 class BaseUI():
-    
-    about_name = 'mEveMon'
-    about_text = ('Mobile character monitor for EVE Online')
-    about_authors = ['Ryan Campbell', 'Danny Campbell']
-    about_website = 'http://mevemon.garage.maemo.org'
-    app_version = '0.3'
 
     menu_items = ("Settings", "About", "Refresh")
 
@@ -191,12 +185,12 @@ class BaseUI():
 
     def about_clicked(self, button):
         dialog = gtk.AboutDialog()
-        dialog.set_website(self.about_website)
-        dialog.set_website_label(self.about_website)
-        dialog.set_name(self.about_name)
-        dialog.set_authors(self.about_authors)
-        dialog.set_comments(self.about_text)
-        dialog.set_version(self.app_version)
+        dialog.set_website(self.controller.about_website)
+        dialog.set_website_label(self.controller.about_website)
+        dialog.set_name(self.controller.about_name)
+        dialog.set_authors(self.controller.about_authors)
+        dialog.set_comments(self.controller.about_text)
+        dialog.set_version(self.controller.app_version)
         dialog.run()
         dialog.destroy()
 

diff --git a/package/src/ui/fremantle/gui.py b/package/src/ui/fremantle/gui.py
index eff19eb..268ef41 100644 (file)
--- a/package/src/ui/fremantle/gui.py
+++ b/package/src/ui/fremantle/gui.py
@@ -30,13 +30,6 @@ from ui import models
 
 class BaseUI():
     
-    about_name = 'mEveMon'
-    about_text = ('Mobile character monitor for EVE Online')
-    about_authors = ['Ryan Campbell <campbellr@gmail.com>',
-                     'Danny Campbell <danny.campbell@gmail.com>']
-
-    about_website = 'http://mevemon.garage.maemo.org'
-    app_version = '0.4'
 
     menu_items = ("Settings", "About", "Refresh")
 
@@ -53,7 +46,7 @@ class BaseUI():
             elif command == "Settings":
                 button.connect("clicked", self.settings_clicked, window)
             elif command == "Refresh":
-                button.connect("clicked", self.refresh_clicked, window)
+                button.connect("clicked", self.refresh_clicked)
             else:
                 assert False, command
 
@@ -220,12 +213,12 @@ class BaseUI():
 
     def about_clicked(self, button):
         dialog = gtk.AboutDialog()
-        dialog.set_website(self.about_website)
-        dialog.set_website_label(self.about_website)
-        dialog.set_name(self.about_name)
-        dialog.set_authors(self.about_authors)
-        dialog.set_comments(self.about_text)
-        dialog.set_version(self.app_version)
+        dialog.set_website(self.controller.about_website)
+        dialog.set_website_label(self.controller.about_website)
+        dialog.set_name(self.controller.about_name)
+        dialog.set_authors(self.controller.about_authors)
+        dialog.set_comments(self.controller.about_text)
+        dialog.set_version(self.controller.app_version)
         dialog.run()
         dialog.destroy()
 
@@ -298,10 +291,10 @@ class mEveMonUI(BaseUI):
         treeview.append_column(column)
  
       
-    def refresh_clicked(self, button, window):
-        hildon.hildon_gtk_window_set_progress_indicator(window, 1)
+    def refresh_clicked(self, button):
+        hildon.hildon_gtk_window_set_progress_indicator(self.win, 1)
         self.char_model.get_characters()
-        hildon.hildon_gtk_window_set_progress_indicator(window, 0)
+        hildon.hildon_gtk_window_set_progress_indicator(self.win, 0)
     
 
 class CharacterSheetUI(BaseUI):