Minor updates being taken in from Dialcentral

[doneit] / src / doneit_glade.py

diff --git a/src/doneit_glade.py b/src/doneit_glade.py
index 6cd28d1..79b0ad3 100755 (executable)
--- a/src/doneit_glade.py
+++ b/src/doneit_glade.py
@@ -5,16 +5,16 @@
 @todo See Tasque for UI ideas http://live.gnome.org/Tasque/Screenshots
 """
 
-from __future__ import with_statement
 
+from __future__ import with_statement
 
 import sys
 import gc
 import os
 import threading
-import warnings
 import ConfigParser
 import socket
+import warnings
 
 import gobject
 import gtk
@@ -104,7 +104,7 @@ class DoneIt(object):
                os.path.join(os.path.dirname(__file__), "../lib/doneit.glade"),
        ]
 
-       _user_data = os.path.expanduser("~/.%s/" % __app_name__)
+       _user_data = os.path.join(os.path.expanduser("~"), ".%s" % __app_name__)
        _user_settings = "%s/settings.ini" % _user_data
 
        def __init__(self):
@@ -139,11 +139,16 @@ class DoneIt(object):
                self._isFullScreen = False
                if hildon is not None:
                        self._app = hildon.Program()
+                       oldWindow = self.__window
                        self.__window = hildon.Window()
-                       self._widgetTree.get_widget("mainLayout").reparent(self.__window)
+                       oldWindow.get_child().reparent(self.__window)
                        self._app.add_window(self.__window)
-                       self._widgetTree.get_widget("usernameentry").set_property('hildon-input-mode', 7)
-                       self._widgetTree.get_widget("passwordentry").set_property('hildon-input-mode', 7|(1 << 29))
+
+                       try:
+                               self._widgetTree.get_widget("usernameentry").set_property('hildon-input-mode', 7)
+                               self._widgetTree.get_widget("passwordentry").set_property('hildon-input-mode', 7|(1 << 29))
+                       except TypeError, e:
+                               warnings.warn(e.message)
 
                        gtkMenu = self._widgetTree.get_widget("mainMenubar")
                        menu = gtk.Menu()
@@ -157,17 +162,17 @@ class DoneIt(object):
                else:
                        pass # warnings.warn("No Hildon", UserWarning, 2)
 
+               if hildon is None:
+                       self.__window.set_title("%s" % self.__pretty_app_name__)
+
                callbackMapping = {
                        "on_doneit_quit": self._on_close,
                        "on_about": self._on_about_activate,
                }
                self._widgetTree.signal_autoconnect(callbackMapping)
 
-               if self.__window:
-                       if hildon is None:
-                               self.__window.set_title("%s" % self.__pretty_app_name__)
-                       self.__window.connect("destroy", self._on_close)
-                       self.__window.show_all()
+               self.__window.connect("destroy", self._on_close)
+               self.__window.show_all()
 
                backgroundSetup = threading.Thread(target=self._idle_setup)
                backgroundSetup.setDaemon(True)