Minor updates being taken in from Dialcentral
[doneit] / src / doneit_glade.py
index a3aee2c..79b0ad3 100755 (executable)
@@ -2,19 +2,21 @@
 
 """
 @todo Add logging support to make debugging random user issues a lot easier
+@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
 import gtk.glade
 
@@ -29,6 +31,66 @@ import gtk_toolbox
 socket.setdefaulttimeout(10)
 
 
+class PreferencesDialog(object):
+
+       def __init__(self, widgetTree):
+               self._backendList = gtk.ListStore(gobject.TYPE_STRING)
+               self._backendCell = gtk.CellRendererText()
+
+               self._dialog = widgetTree.get_widget("preferencesDialog")
+               self._backendSelector = widgetTree.get_widget("prefsBackendSelector")
+               self._applyButton = widgetTree.get_widget("applyPrefsButton")
+               self._cancelButton = widgetTree.get_widget("cancelPrefsButton")
+
+               self._onApplyId = None
+               self._onCancelId = None
+
+       def enable(self):
+               self._dialog.set_default_size(800, 300)
+               self._onApplyId = self._applyButton.connect("clicked", self._on_apply_clicked)
+               self._onCancelId = self._cancelButton.connect("clicked", self._on_cancel_clicked)
+
+               cell = self._backendCell
+               self._backendSelector.pack_start(cell, True)
+               self._backendSelector.add_attribute(cell, 'text', 0)
+               self._backendSelector.set_model(self._backendList)
+
+       def disable(self):
+               self._applyButton.disconnect(self._onApplyId)
+               self._cancelButton.disconnect(self._onCancelId)
+
+               self._backendList.clear()
+               self._backendSelector.set_model(None)
+
+       def run(self, app, parentWindow = None):
+               if parentWindow is not None:
+                       self._dialog.set_transient_for(parentWindow)
+
+               self._backendList.clear()
+               activeIndex = 0
+               for i, (uiName, ui) in enumerate(app.get_uis()):
+                       self._backendList.append((uiName, ))
+                       if uiName == app.get_default_ui():
+                               activeIndex = i
+               self._backendSelector.set_active(activeIndex)
+
+               try:
+                       response = self._dialog.run()
+                       if response != gtk.RESPONSE_OK:
+                               raise RuntimeError("Edit Cancelled")
+               finally:
+                       self._dialog.hide()
+
+               backendName = self._backendSelector.get_active_text()
+               app.switch_ui(backendName)
+
+       def _on_apply_clicked(self, *args):
+               self._dialog.response(gtk.RESPONSE_OK)
+
+       def _on_cancel_clicked(self, *args):
+               self._dialog.response(gtk.RESPONSE_CANCEL)
+
+
 class DoneIt(object):
 
        __pretty_app_name__ = "DoneIt"
@@ -42,10 +104,11 @@ 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):
+               self._initDone = False
                self._todoUIs = {}
                self._todoUI = None
                self._osso = None
@@ -70,17 +133,22 @@ class DoneIt(object):
                self._clipboard = gtk.clipboard_get()
                self.__window = self._widgetTree.get_widget("mainWindow")
                self.__errorDisplay = gtk_toolbox.ErrorDisplay(self._widgetTree)
-               self._prefsDialog = gtk_toolbox.PreferencesDialog(self._widgetTree)
+               self._prefsDialog = PreferencesDialog(self._widgetTree)
 
                self._app = None
                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()
@@ -94,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)
@@ -148,9 +216,16 @@ class DoneIt(object):
                # Setup costly backends
                import rtm_view
                with gtk_toolbox.gtk_lock():
-                       rtmView = rtm_view.GtkRtMilk(self._widgetTree, self.__errorDisplay)
+                       rtmView = rtm_view.RtmView(self._widgetTree, self.__errorDisplay)
                self._todoUIs[rtmView.name()] = rtmView
-               self._defaultUIName = rtmView.name()
+
+               import file_view
+               defaultStoragePath = "%s/data.txt" % self._user_data
+               with gtk_toolbox.gtk_lock():
+                       fileView = file_view.FileView(self._widgetTree, self.__errorDisplay, defaultStoragePath)
+               self._todoUIs[fileView.name()] = fileView
+
+               self._defaultUIName = fileView.name()
 
                config = ConfigParser.SafeConfigParser()
                config.read(self._user_settings)
@@ -159,6 +234,8 @@ class DoneIt(object):
                        self._widgetTree.get_widget("connectMenuItem").connect("activate", lambda *args: self.switch_ui(self._defaultUIName))
                        self._widgetTree.get_widget("preferencesMenuItem").connect("activate", self._on_prefs)
 
+               self._initDone = True
+
        def display_error_message(self, msg):
                """
                @note UI Thread
@@ -271,10 +348,12 @@ class DoneIt(object):
 
                if status == conic.STATUS_CONNECTED:
                        self._deviceIsOnline = True
-                       self.switch_ui(self._defaultUIName)
+                       if self._initDone:
+                               self.switch_ui(self._defaultUIName)
                elif status == conic.STATUS_DISCONNECTED:
                        self._deviceIsOnline = False
-                       self.switch_ui(self._fallbackUIName)
+                       if self._initDone:
+                               self.switch_ui(self._fallbackUIName)
 
        def _on_window_state_change(self, widget, event, *args):
                """
@@ -290,13 +369,11 @@ class DoneIt(object):
                        if self._osso is not None:
                                self._osso.close()
 
-                       self._save_settings()
+                       if self._initDone:
+                               self._save_settings()
                finally:
                        gtk.main_quit()
 
-       def _on_paste(self, *args):
-               pass
-
        def _on_key_press(self, widget, event, *args):
                """
                @note Hildon specific
@@ -308,10 +385,16 @@ class DoneIt(object):
                                self.__window.fullscreen()
 
        def _on_logout(self, *args):
+               if not self._initDone:
+                       return
+
                self._todoUI.logout()
                self.switch_ui(self._fallbackUIName)
 
        def _on_prefs(self, *args):
+               if not self._initDone:
+                       return
+
                self._prefsDialog.enable()
                try:
                        self._prefsDialog.run(self)