import base64
import ConfigParser
import itertools
+import shutil
import logging
import gtk
self._dialpads = None
self._accountViews = None
self._messagesViews = None
- self._recentViews = None
+ self._historyViews = None
self._contactsViews = None
self._alarmHandler = None
self._ledHandler = None
self._originalCurrentLabels = []
+ self._fsContactsPath = os.path.join(constants._data_path_, "contacts")
for path in self._glade_files:
if os.path.isfile(path):
self._notebook = self._widgetTree.get_widget("notebook")
self._errorDisplay = gtk_toolbox.ErrorDisplay(self._widgetTree)
self._credentialsDialog = gtk_toolbox.LoginWindow(self._widgetTree)
+ self._smsEntryWindow = None
self._isFullScreen = False
self._app = hildonize.get_app_class()()
hildonize.hildonize_password_entry(self._widgetTree.get_widget("passwordentry"))
for scrollingWidgetName in (
- 'recent_scrolledwindow',
+ 'history_scrolledwindow',
'message_scrolledwindow',
'contacts_scrolledwindow',
"smsMessages_scrolledwindow",
"addressbookSelectButton",
"sendSmsButton",
"dialButton",
- "cancelSmsButton",
"callbackSelectButton",
"minutesEntryButton",
"clearcookies",
assert button is not None, buttonName
hildonize.set_button_thumb_selectable(button)
- replacementButtons = [gtk.Button("Test")]
menu = hildonize.hildonize_menu(
self._window,
self._widgetTree.get_widget("dialpad_menubar"),
- replacementButtons
)
+ if not hildonize.GTK_MENU_USED:
+ button = gtk.Button("New Login")
+ button.connect("clicked", self._on_clearcookies_clicked)
+ menu.append(button)
+
+ button = gtk.Button("Refresh")
+ button.connect("clicked", self._on_menu_refresh)
+ menu.append(button)
+
+ menu.show_all()
self._window.connect("key-press-event", self._on_key_press)
self._window.connect("window-state-event", self._on_window_state_change)
with gtk_toolbox.gtk_lock():
self._dialpads = {self.NULL_BACKEND: null_views.Dialpad(self._widgetTree)}
self._accountViews = {self.NULL_BACKEND: null_views.AccountInfo(self._widgetTree)}
- self._recentViews = {self.NULL_BACKEND: null_views.RecentCallsView(self._widgetTree)}
+ self._historyViews = {self.NULL_BACKEND: null_views.CallHistoryView(self._widgetTree)}
self._messagesViews = {self.NULL_BACKEND: null_views.MessagesView(self._widgetTree)}
self._contactsViews = {self.NULL_BACKEND: null_views.ContactsView(self._widgetTree)}
self._dialpads[self._selectedBackendId].enable()
self._accountViews[self._selectedBackendId].enable()
- self._recentViews[self._selectedBackendId].enable()
+ self._historyViews[self._selectedBackendId].enable()
self._messagesViews[self._selectedBackendId].enable()
self._contactsViews[self._selectedBackendId].enable()
except Exception, e:
import gv_views
from backends import merge_backend
+ self._smsEntryWindow = gv_views.SmsEntryWindow(self._widgetTree, self._window)
try:
os.makedirs(constants._data_path_)
except OSError, e:
),
})
self._accountViews[self.GV_BACKEND].save_everything = self._save_settings
- self._recentViews.update({
- self.GV_BACKEND: gv_views.RecentCallsView(
+ self._historyViews.update({
+ self.GV_BACKEND: gv_views.CallHistoryView(
self._widgetTree, self._phoneBackends[self.GV_BACKEND], self._errorDisplay
),
})
),
})
- fsContactsPath = os.path.join(constants._data_path_, "contacts")
- fileBackend = file_backend.FilesystemAddressBookFactory(fsContactsPath)
+ fileBackend = file_backend.FilesystemAddressBookFactory(self._fsContactsPath)
- self._dialpads[self.GV_BACKEND].number_selected = self._select_action
- self._recentViews[self.GV_BACKEND].number_selected = self._select_action
- self._messagesViews[self.GV_BACKEND].number_selected = self._select_action
- self._contactsViews[self.GV_BACKEND].number_selected = self._select_action
+ self._smsEntryWindow.send_sms = self._on_sms_clicked
+ self._smsEntryWindow.dial = self._on_dial_clicked
+ self._dialpads[self.GV_BACKEND].add_contact = self._add_contact
+ self._historyViews[self.GV_BACKEND].add_contact = self._add_contact
+ self._messagesViews[self.GV_BACKEND].add_contact = self._add_contact
+ self._contactsViews[self.GV_BACKEND].add_contact = self._add_contact
addressBooks = [
self._phoneBackends[self.GV_BACKEND],
fileBackend,
]
- mergedBook = merge_backend.MergedAddressBook(addressBooks, merge_backend.MergedAddressBook.advanced_lastname_sorter)
+ mergedBook = merge_backend.MergedAddressBook(addressBooks, merge_backend.MergedAddressBook.basic_firtname_sorter)
self._contactsViews[self.GV_BACKEND].append(mergedBook)
self._contactsViews[self.GV_BACKEND].extend(addressBooks)
self._contactsViews[self.GV_BACKEND].open_addressbook(*self._contactsViews[self.GV_BACKEND].get_addressbooks().next()[0][0:2])
return loggedIn, serviceId
- def _select_action(self, action, number, message):
- self.refresh_session()
- if action == "dial":
- self._on_dial_clicked(number)
- elif action == "sms":
- self._on_sms_clicked(number, message)
- else:
- assert False, "Unknown action: %s" % action
+ def _add_contact(self, *args, **kwds):
+ self._smsEntryWindow.add_contact(*args, **kwds)
def _change_loggedin_status(self, newStatus):
oldStatus = self._selectedBackendId
self._dialpads[oldStatus].disable()
self._accountViews[oldStatus].disable()
- self._recentViews[oldStatus].disable()
+ self._historyViews[oldStatus].disable()
self._messagesViews[oldStatus].disable()
self._contactsViews[oldStatus].disable()
self._dialpads[newStatus].enable()
self._accountViews[newStatus].enable()
- self._recentViews[newStatus].enable()
+ self._historyViews[newStatus].enable()
self._messagesViews[newStatus].enable()
self._contactsViews[newStatus].enable()
if self._alarmHandler is not None:
self._alarmHandler.load_settings(config, "alarm")
+
+ isFullscreen = config.getboolean(constants.__pretty_app_name__, "fullscreen")
+ if isFullscreen:
+ self._window.fullscreen()
except ConfigParser.NoOptionError, e:
_moduleLogger.exception(
"Settings file %s is missing section %s" % (
self._dialpads.iteritems(),
self._accountViews.iteritems(),
self._messagesViews.iteritems(),
- self._recentViews.iteritems(),
+ self._historyViews.iteritems(),
self._contactsViews.iteritems(),
):
sectionName = "%s - %s" % (backendId, view.name())
config.add_section(constants.__pretty_app_name__)
config.set(constants.__pretty_app_name__, "active", str(backend))
config.set(constants.__pretty_app_name__, "orientation", str(int(gtk_toolbox.get_screen_orientation())))
+ config.set(constants.__pretty_app_name__, "fullscreen", str(self._isFullScreen))
for i, value in enumerate(self._credentials):
blob = base64.b64encode(value)
config.set(constants.__pretty_app_name__, "bin_blob_%i" % i, blob)
self._dialpads.iteritems(),
self._accountViews.iteritems(),
self._messagesViews.iteritems(),
- self._recentViews.iteritems(),
+ self._historyViews.iteritems(),
self._contactsViews.iteritems(),
):
sectionName = "%s - %s" % (backendId, view.name())
if pageIndex == self.CONTACTS_TAB:
self._contactsViews[self._selectedBackendId].update(force=True)
elif pageIndex == self.RECENT_TAB:
- self._recentViews[self._selectedBackendId].update(force=True)
+ self._historyViews[self._selectedBackendId].update(force=True)
elif pageIndex == self.MESSAGES_TAB:
self._messagesViews[self._selectedBackendId].update(force=True)
self._window.unfullscreen()
else:
self._window.fullscreen()
- elif event.keyval == ord("l") and event.get_state() & gtk.gdk.CONTROL_MASK:
+ elif event.keyval == gtk.keysyms.l and event.get_state() & gtk.gdk.CONTROL_MASK:
with open(constants._user_logpath_, "r") as f:
logLines = f.xreadlines()
log = "".join(logLines)
self._clipboard.set_text(str(log))
- elif event.keyval == ord("r") and event.get_state() & gtk.gdk.CONTROL_MASK:
+ elif (
+ event.keyval in (gtk.keysyms.w, gtk.keysyms.q) and
+ event.get_state() & gtk.gdk.CONTROL_MASK
+ ):
+ self._window.destroy()
+ elif event.keyval == gtk.keysyms.r and event.get_state() & gtk.gdk.CONTROL_MASK:
self._refresh_active_tab()
+ elif event.keyval == gtk.keysyms.i and event.get_state() & gtk.gdk.CONTROL_MASK:
+ self._import_contacts()
except Exception, e:
self._errorDisplay.push_exception()
try:
self._phoneBackends[self._selectedBackendId].logout()
self._accountViews[self._selectedBackendId].clear()
- self._recentViews[self._selectedBackendId].clear()
+ self._historyViews[self._selectedBackendId].clear()
self._messagesViews[self._selectedBackendId].clear()
self._contactsViews[self._selectedBackendId].clear()
self._change_loggedin_status(self.NULL_BACKEND)
didMessagesUpdate = False
if pageIndex == self.RECENT_TAB:
- didRecentUpdate = self._recentViews[self._selectedBackendId].update()
+ didRecentUpdate = self._historyViews[self._selectedBackendId].update()
elif pageIndex == self.MESSAGES_TAB:
didMessagesUpdate = self._messagesViews[self._selectedBackendId].update()
elif pageIndex == self.CONTACTS_TAB:
self._errorDisplay.push_exception()
return False
- def _on_sms_clicked(self, number, message):
+ def _on_sms_clicked(self, numbers, message):
try:
- assert number, "No number specified"
+ assert numbers, "No number specified"
assert message, "Empty message"
+ self.refresh_session()
try:
loggedIn = self._phoneBackends[self._selectedBackendId].is_authed()
except Exception, e:
dialed = False
try:
- self._phoneBackends[self._selectedBackendId].send_sms(number, message)
- hildonize.show_information_banner(self._window, "Sending to %s" % number)
- _moduleLogger.info("Sending SMS to %s" % number)
+ self._phoneBackends[self._selectedBackendId].send_sms(numbers, message)
+ hildonize.show_information_banner(self._window, "Sending to %s" % ", ".join(numbers))
+ _moduleLogger.info("Sending SMS to %r" % numbers)
dialed = True
except Exception, e:
self._errorDisplay.push_exception()
def _on_dial_clicked(self, number):
try:
assert number, "No number to call"
+ self.refresh_session()
try:
loggedIn = self._phoneBackends[self._selectedBackendId].is_authed()
except Exception, e:
except Exception, e:
self._errorDisplay.push_exception()
+ def _import_contacts(self):
+ csvFilter = gtk.FileFilter()
+ csvFilter.set_name("Contacts")
+ csvFilter.add_pattern("*.csv")
+ importFileChooser = gtk.FileChooserDialog(
+ title="Contacts",
+ parent=self._window,
+ )
+ importFileChooser.add_button(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)
+ importFileChooser.add_button(gtk.STOCK_OK, gtk.RESPONSE_OK)
+
+ importFileChooser.set_property("filter", csvFilter)
+ userResponse = importFileChooser.run()
+ importFileChooser.hide()
+ if userResponse == gtk.RESPONSE_OK:
+ filename = importFileChooser.get_filename()
+ shutil.copy2(filename, self._fsContactsPath)
+
def _on_menu_refresh(self, *args):
try:
self._refresh_active_tab()
projects / gc-dialer / blobdiff