import sys
+#import gc
import os
import re
import time
import threading
-import contextlib
import gobject
import gtk
-import gc
-#import hildon
+import gtk.glade
+
+try:
+ import hildon
+except ImportError:
+ hildon = None
+
+#try:
+# if hasattr(gtk, "Builder"):
+# #detected that this is not a legacy system
+# raise ImportError
+# #Legacy support
+# import gtk.glade
+#except ImportError:
+# gtk.glade = None
+
+try:
+ import osso
+ try:
+ import abook
+ import evolution.ebook as evobook
+ except ImportError:
+ abook = None
+ evobook = None
+except ImportError:
+ osso = None
try:
import doctest
import optparse
-except:
- pass
+except ImportError:
+ doctest = None
+ optparse = None
from gcbackend import GCDialer
import socket
-socket.setdefaulttimeout(5)
-@contextlib.contextmanager
-def gtk_critical_section():
- #The API changed and I hope these are the right calls
- gtk.gdk.threads_enter()
- yield
- gtk.gdk.threads_leave()
+
+socket.setdefaulttimeout(5)
def makeugly(prettynumber):
'12'
>>> makepretty("1234567")
'123-4567'
- >>> makepretty("1234567890")
- '(123)-456-7890'
+ >>> makepretty("2345678901")
+ '(234)-567-8901'
+ >>> makepretty("12345678901")
+ '1 (234)-567-8901'
>>> makepretty("01234567890")
'+012-(345)-678-90'
"""
return prettynumber
elif len(phonenumber) <= 7:
prettynumber = "%s-%s" % (phonenumber[0:3], phonenumber[3:])
- elif len(phonenumber) > 8 and phonenumber[0] == 1:
+ elif len(phonenumber) > 8 and phonenumber[0] == "1":
prettynumber = "1 (%s)-%s-%s" %(phonenumber[1:4], phonenumber[4:7], phonenumber[7:])
elif len(phonenumber) > 7:
prettynumber = "(%s)-%s-%s" % (phonenumber[0:3], phonenumber[3:6], phonenumber[6:])
class Dialpad(object):
+ __app_name__ = "gc_dialer"
+ __version__ = "0.7.0"
+
+
def __init__(self):
self.phonenumber = ""
self.prettynumber = ""
self.areacode = "518"
- self.gcd = GCDialer()
self.clipboard = gtk.clipboard_get()
- self.wTree = gtk.Builder()
+ self.recentmodel = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
+ self.recentviewselection = None
+ self.callbackNeedsSetup = True
+ self.recenttime = 0.0
- for path in [ './gc_dialer.xml',
- '../lib/gc_dialer.xml',
- '/usr/local/lib/gc_dialer.xml' ]:
+ for path in [ './gc_dialer.glade',
+ '../lib/gc_dialer.glade',
+ '/usr/local/lib/gc_dialer.glade' ]:
if os.path.isfile(path):
- self.wTree.add_from_file(path)
+ #if gtk.glade is None:
+ # self.wTree = gtk.Builder()
+ # self.wTree.add_from_file(path)
+ #else:
+ self.wTree = gtk.glade.XML(path)
break
else:
- self.ErrPopUp("Cannot find gc_dialer.xml")
- sys.exit(1)#@todo Is this the best way to force a quit on error?
+ self.ErrPopUp("Cannot find gc_dialer.glade")
+ gtk.main_quit()
+ return
+
+ self.wTree.get_widget("about_title").set_label(self.wTree.get_widget("about_title").get_label()+"\nVersion "+Dialpad.__version__)
- self.window = self.wTree.get_object("Dialpad")
#Get the buffer associated with the number display
- self.numberdisplay = self.wTree.get_object("numberdisplay")
+ self.numberdisplay = self.wTree.get_widget("numberdisplay")
self.setNumber("")
+ self.notebook = self.wTree.get_widget("notebook")
- self.recentview = self.wTree.get_object("recentview")
- self.recentmodel = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
- self.recentview.set_model(self.recentmodel)
- textrenderer = gtk.CellRendererText()
-
- # Add the column to the treeview
- column = gtk.TreeViewColumn("Calls", textrenderer, text=1)
- column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
- self.recentview.append_column(column)
-
- self.recentviewselection = self.recentview.get_selection()
- self.recentviewselection.set_mode(gtk.SELECTION_SINGLE)
- self.recenttime = 0.0
-
- self.notebook = self.wTree.get_object("notebook")
-
- self.isHildon = False
- #if True:
- try:
- #self.osso = osso.Context("gc_dialer", "0.6.0", False)
- #device = osso.DeviceState(self.osso)
- #device.set_device_state_callback(self.on_device_state_change, None)
- #abook.init_with_name("gc_dialer", self.osso)
- #self.ebook = evo.open_addressbook("default")
+ self.window = self.wTree.get_widget("Dialpad")
+ if hildon is not None:
self.app = hildon.Program()
- self.wTree.get_object("callbackentry").set_property('hildon-input-mode', 1|(1 << 4))
- self.isHildon = True
- except:
- print "No hildon"
+ self.window.set_title("Keypad")
+ self.app.add_window(self.window)
+ self.wTree.get_widget("callbackcombo").get_child().set_property('hildon-input-mode', (1 << 4))
+ self.wTree.get_widget("usernameentry").set_property('hildon-input-mode', 7)
+ self.wTree.get_widget("passwordentry").set_property('hildon-input-mode', 7|(1 << 29))
+ else:
+ print "No Hildon"
+
+ if osso is not None:
+ self.osso = osso.Context(__name__, Dialpad.__version__, False)
+ device = osso.DeviceState(self.osso)
+ device.set_device_state_callback(self.on_device_state_change, 0)
+ if abook is not None and evobook is not None:
+ abook.init_with_name(__name__, self.osso)
+ self.ebook = evo.open_addressbook("default")
+ else:
+ print "No abook and No evolution address book support"
+ else:
+ print "No OSSO"
if self.window:
self.window.connect("destroy", gtk.main_quit)
"on_digit_clicked" : self.on_digit_clicked,
"on_dial_clicked" : self.on_dial_clicked,
"on_loginbutton_clicked" : self.on_loginbutton_clicked,
+ "on_loginclose_clicked" : self.on_loginclose_clicked,
"on_clearcookies_clicked" : self.on_clearcookies_clicked,
- "on_callbackentry_changed" : self.on_callbackentry_changed,
+ # "on_callbackentry_changed" : self.on_callbackentry_changed,
"on_notebook_switch_page" : self.on_notebook_switch_page,
"on_recentview_row_activated" : self.on_recentview_row_activated,
"on_back_clicked" : self.Backspace
}
- self.wTree.connect_signals(callbackMapping)
+ self.wTree.signal_autoconnect(callbackMapping)
+ self.wTree.get_widget("callbackcombo").get_child().connect("changed", self.on_callbackentry_changed)
- self.attemptLogin(3)
- if self.gcd.getCallbackNumber() is None:
- self.gcd.setSaneCallback()
+ # Defer initalization of recent view
+ self.gcd = GCDialer()
+
+ self.attemptLogin(2)
+ gobject.idle_add(self.init_grandcentral)
+ #self.init_grandcentral()
+ gobject.idle_add(self.init_recentview)
+
+ #self.reduce_memory()
+ def init_grandcentral(self):
+ """ deferred initalization of the grandcentral info """
+
+ try:
+ #self.attemptLogin(2)
+ if self.gcd.isAuthed():
+ if self.gcd.getCallbackNumber() is None:
+ self.gcd.setSaneCallback()
+ except:
+ pass
+
self.setAccountNumber()
- self.setupCallbackCombo()
- self.reduce_memory()
+ print "exit init_gc"
+ return False
+
+ def init_recentview(self):
+ """ deferred initalization of the recent view treeview """
+
+ recentview = self.wTree.get_widget("recentview")
+ recentview.set_model(self.recentmodel)
+ textrenderer = gtk.CellRendererText()
+
+ # Add the column to the treeview
+ column = gtk.TreeViewColumn("Calls", textrenderer, text=1)
+ column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
+
+ recentview.append_column(column)
+
+ self.recentviewselection = recentview.get_selection()
+ self.recentviewselection.set_mode(gtk.SELECTION_SINGLE)
- def reduce_memory(self):
- re.purge()
- num = gc.collect()
- #print "collect %d objects" % ( num )
+ return False
def on_recentview_row_activated(self, treeview, path, view_column):
model, itr = self.recentviewselection.get_selected()
def on_notebook_switch_page(self, notebook, page, page_num):
if page_num == 1 and (time.time() - self.recenttime) > 300:
- self.populate_recentview()
+ gobject.idle_add(self.populate_recentview)
+ elif page_num ==2 and self.callbackNeedsSetup:
+ gobject.idle_add(self.setupCallbackCombo)
+ if hildon:
+ try:
+ self.window.set_title(self.notebook.get_tab_label(self.notebook.get_nth_page(page_num)).get_text())
+ except:
+ self.window.set_title("")
def populate_recentview(self):
print "Populating"
self.recentmodel.append(item)
self.recenttime = time.time()
+ return False
+
def on_clearcookies_clicked(self, data=None):
self.gcd.reset()
- self.attemptLogin(3)
+ self.callbackNeedsSetup = True
+ self.recenttime = 0.0
+ self.recentmodel.clear()
+ self.wTree.get_widget("callbackcombo").get_child().set_text("")
+
+ # re-run the inital grandcentral setup
+ self.attemptLogin(2)
+ gobject.idle_add(self.init_grandcentral)
def setupCallbackCombo(self):
- combobox = self.wTree.get_object("callbackcombo")
+ combobox = self.wTree.get_widget("callbackcombo")
self.callbacklist = gtk.ListStore(gobject.TYPE_STRING)
combobox.set_model(self.callbacklist)
combobox.set_text_column(0)
for number, description in self.gcd.getCallbackNumbers().iteritems():
self.callbacklist.append([makepretty(number)] )
- self.wTree.get_object("callbackentry").set_text(makepretty(self.gcd.getCallbackNumber()))
+ self.wTree.get_widget("callbackcombo").get_child().set_text(makepretty(self.gcd.getCallbackNumber()))
+ self.callbackNeedsSetup = False
def on_callbackentry_changed(self, data=None):
- text = makeugly(self.wTree.get_object("callbackentry").get_text())
+ text = makeugly(self.wTree.get_widget("callbackcombo").get_child().get_text())
if self.gcd.validate(text) and text != self.gcd.getCallbackNumber():
self.gcd.setCallbackNumber(text)
- self.wTree.get_object("callbackentry").set_text(self.wTree.get_object("callbackentry").get_text())
- self.reduce_memory()
+ #self.wTree.get_widget("callbackentry").set_text(self.wTree.get_object("callbackentry").get_text())
+ #self.reduce_memory()
def attemptLogin(self, times = 1):
- if self.isHildon:
- dialog = hildon.LoginDialog(self.window)
- dialog.set_message("Grandcentral Login")
- else:
- dialog = self.wTree.get_object("login_dialog")
+ #if self.isHildon:
+ # dialog = hildon.LoginDialog(self.window)
+ # dialog.set_message("Grandcentral Login")
+ #else:
+ dialog = self.wTree.get_widget("login_dialog")
while (0 < times) and not self.gcd.isAuthed():
if dialog.run() != gtk.RESPONSE_OK:
times = 0
continue
- if self.isHildon:
- username = dialog.get_username()
- password = dialog.get_password()
- else:
- username = self.wTree.get_object("usernameentry").get_text()
- password = self.wTree.get_object("passwordentry").get_text()
- self.wTree.get_object("passwordentry").set_text("")
+ #if self.isHildon:
+ # username = dialog.get_username()
+ # password = dialog.get_password()
+ #else:
+ username = self.wTree.get_widget("usernameentry").get_text()
+ password = self.wTree.get_widget("passwordentry").get_text()
+ self.wTree.get_widget("passwordentry").set_text("")
print "Attempting login"
self.gcd.login(username, password)
+ print "hiding dialog"
dialog.hide()
- times -= 1
+ times = times - 1
- if self.isHildon:
- dialog.destroy()
+ #if self.isHildon:
+ # print "destroy dialog"
+ # dialog.destroy()
+
+ return False
def ErrPopUp(self, msg):
error_dialog = gtk.MessageDialog(None, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_CLOSE, msg)
self.setNumber(phoneNumber)
def on_loginbutton_clicked(self, data=None):
- self.wTree.get_object("login_dialog").response(gtk.RESPONSE_OK)
+ self.wTree.get_widget("login_dialog").response(gtk.RESPONSE_OK)
+
+ def on_loginclose_clicked(self, data=None):
+ sys.exit(0)
def on_dial_clicked(self, widget):
self.attemptLogin(3)
# #add default area code
# self.phonenumber = self.areacode + self.phonenumber
- if self.gcd.dial(self.phonenumber) is False:
+ try:
+ callSuccess = self.gcd.dial(self.phonenumber)
+ except ValueError, e:
+ self.gcd._msg = e.message
+ callSuccess = False
+
+ if not callSuccess:
self.ErrPopUp(self.gcd._msg)
else:
self.setNumber("")
self.recentmodel.clear()
self.recenttime = 0.0
- self.reduce_memory()
+ #self.reduce_memory()
- #def on_device_state_change(self, shutdown, save_unsaved_data, memory_low, system_inactivity, message, userData):
- # """
- # @todo Might be useful to do something when going in offline mode or low memory
- # @note Hildon specific
- # """
- # pass
+ def on_device_state_change(self, shutdown, save_unsaved_data, memory_low, system_inactivity, message, userData):
+ """
+ @todo Might be useful to do something when going in offline mode or low memory
+ @note Hildon specific
+ """
+ pass
def setNumber(self, number):
self.phonenumber = makeugly(number)
def setAccountNumber(self):
accountnumber = self.gcd.getAccountNumber()
- self.wTree.get_object("gcnumberlabel").set_label("<span size='23000' weight='bold'>%s</span>" % (accountnumber))
+ self.wTree.get_widget("gcnumberlabel").set_label("<span size='23000' weight='bold'>%s</span>" % (accountnumber))
def Backspace(self, widget):
self.setNumber(self.phonenumber[:-1])
def run_dialpad():
- gc.set_threshold(50, 3, 3)
+ #gc.set_threshold(50, 3, 3)
gtk.gdk.threads_init()
title = 'Dialpad'
handle = Dialpad()
if __name__ == "__main__":
+ if hildon:
+ gtk.set_application_name("Dialer")
+
try:
parser = optparse.OptionParser()
parser.add_option("-t", "--test", action="store_true", dest="test", help="Run tests")
projects / gc-dialer / blobdiff