From: epage Date: Fri, 9 Oct 2009 00:21:31 +0000 (+0000) Subject: Random tweak, see changelist for details X-Git-Url: http://git.maemo.org/git/?a=commitdiff_plain;ds=sidebyside;h=92ac82d5a2e07d9937a28b374f26b094cbe20744;p=gc-dialer Random tweak, see changelist for details git-svn-id: file:///svnroot/gc-dialer/trunk@507 c39d3808-3fe2-4d86-a59f-b7f623ee9f21 --- diff --git a/src/constants.py b/src/constants.py index af11825..6918f6d 100644 --- a/src/constants.py +++ b/src/constants.py @@ -3,7 +3,7 @@ import os __pretty_app_name__ = "DialCentral" __app_name__ = "dialcentral" __version__ = "1.0.7" -__build__ = 4 +__build__ = 5 __app_magic__ = 0xdeadbeef _data_path_ = os.path.join(os.path.expanduser("~"), ".dialcentral") _user_settings_ = "%s/settings.ini" % _data_path_ diff --git a/src/dc_glade.py b/src/dc_glade.py index cee25f1..bded528 100755 --- a/src/dc_glade.py +++ b/src/dc_glade.py @@ -679,10 +679,11 @@ class Dialcentral(object): """ @note Hildon specific """ + RETURN_TYPES = (gtk.keysyms.Return, gtk.keysyms.ISO_Enter, gtk.keysyms.KP_Enter) try: if ( event.keyval == gtk.keysyms.F6 or - event.keyval == gtk.keysyms.Return and event.get_state() & gtk.gdk.CONTROL_MASK + event.keyval in RETURN_TYPES and event.get_state() & gtk.gdk.CONTROL_MASK ): if self._isFullScreen: self._window.unfullscreen() diff --git a/src/gv_backend.py b/src/gv_backend.py index 210ef5c..dc1d865 100644 --- a/src/gv_backend.py +++ b/src/gv_backend.py @@ -667,7 +667,7 @@ def test_backend(username, password): #print "Account: ", backend.get_account_number() #print "Callback: ", backend.get_callback_number() #print "All Callback: ", - #import pprint + import pprint #pprint.pprint(backend.get_callback_numbers()) #print "Recent: " @@ -682,9 +682,10 @@ def test_backend(username, password): # print contact # pprint.pprint(list(backend.get_contact_details(contact[0]))) - #print "Messages: ", - #for message in backend.get_messages(): - # pprint.pprint(message) + print "Messages: ", + for message in backend.get_messages(): + message["messageParts"] = list(message["messageParts"]) + pprint.pprint(message) #for message in sort_messages(backend.get_messages()): # pprint.pprint(decorate_message(message)) diff --git a/src/gv_views.py b/src/gv_views.py index 3fdeb37..64efa26 100644 --- a/src/gv_views.py +++ b/src/gv_views.py @@ -273,6 +273,7 @@ class PhoneTypeSelector(object): ACTION_SEND_SMS = "sms" def __init__(self, widgetTree, gcBackend): + self._clipboard = gtk.clipboard_get() self._gcBackend = gcBackend self._widgetTree = widgetTree @@ -300,6 +301,8 @@ class PhoneTypeSelector(object): self._typeview = self._widgetTree.get_widget("phonetypes") self._typeview.connect("row-activated", self._on_phonetype_select) + self._keyPressEventId = self._dialog.connect("key-press-event", self._on_key_press) + self._action = self.ACTION_CANCEL def run(self, contactDetails, messages = (), parent = None): @@ -324,7 +327,7 @@ class PhoneTypeSelector(object): self._typemodel.append(row) self._typeviewselection = self._typeview.get_selection() - self._typeviewselection.set_mode(gtk.SELECTION_SINGLE) + self._typeviewselection.set_mode(gtk.SELECTION_NONE) self._typeviewselection.select_iter(self._typemodel.get_iter_first()) # Add the column to the messages tree view @@ -415,6 +418,18 @@ class PhoneTypeSelector(object): self._dialog.response(gtk.RESPONSE_CANCEL) self._action = self.ACTION_CANCEL + def _on_key_press(self, widget, event): + try: + if event.keyval == ord("c") and event.get_state() & gtk.gdk.CONTROL_MASK: + message = "\n".join( + messagePart[0] + for messagePart in self._messagemodel + ) + # For some reason this kills clipboard stuff + #self._clipboard.set_text(message) + except Exception, e: + _moduleLogger.exception(str(e)) + class SmsEntryDialog(object): """ @@ -424,6 +439,7 @@ class SmsEntryDialog(object): MAX_CHAR = 160 def __init__(self, widgetTree): + self._clipboard = gtk.clipboard_get() self._widgetTree = widgetTree self._dialog = self._widgetTree.get_widget("smsDialog") @@ -442,6 +458,8 @@ class SmsEntryDialog(object): self._smsEntry = self._widgetTree.get_widget("smsEntry") self._smsEntry.get_buffer().connect("changed", self._on_entry_changed) + self._keyPressEventId = self._dialog.connect("key-press-event", self._on_key_press) + def run(self, number, messages = (), parent = None): # Add the column to the messages tree view self._messagemodel.clear() @@ -515,6 +533,18 @@ class SmsEntryDialog(object): def _on_cancel(self, *args): self._dialog.response(gtk.RESPONSE_CANCEL) + def _on_key_press(self, widget, event): + try: + if event.keyval == ord("c") and event.get_state() & gtk.gdk.CONTROL_MASK: + message = "\n".join( + messagePart[0] + for messagePart in self._messagemodel + ) + # For some reason this kills clipboard stuff + #self._clipboard.set_text(message) + except Exception, e: + _moduleLogger.exception(str(e)) + class Dialpad(object): @@ -1025,7 +1055,7 @@ class RecentCallsView(object): self._recentview.append_column(self._numberColumn) self._recentview.append_column(self._nameColumn) self._recentviewselection = self._recentview.get_selection() - self._recentviewselection.set_mode(gtk.SELECTION_SINGLE) + self._recentviewselection.set_mode(gtk.SELECTION_NONE) self._onRecentviewRowActivatedId = self._recentview.connect("row-activated", self._on_recentview_row_activated) @@ -1180,7 +1210,7 @@ class MessagesView(object): self._messageview.append_column(self._messageColumn) self._messageviewselection = self._messageview.get_selection() - self._messageviewselection.set_mode(gtk.SELECTION_SINGLE) + self._messageviewselection.set_mode(gtk.SELECTION_NONE) self._onMessageviewRowActivatedId = self._messageview.connect("row-activated", self._on_messageview_row_activated) @@ -1347,7 +1377,7 @@ class ContactsView(object): self._contactsview.set_model(self._contactsmodel) self._contactsview.append_column(self._contactColumn) self._contactsviewselection = self._contactsview.get_selection() - self._contactsviewselection.set_mode(gtk.SELECTION_SINGLE) + self._contactsviewselection.set_mode(gtk.SELECTION_NONE) del self._booksList[:] for (factoryId, bookId), (factoryName, bookName) in self.get_addressbooks(): diff --git a/support/builddeb.py b/support/builddeb.py index 5f2b60a..4323b62 100755 --- a/support/builddeb.py +++ b/support/builddeb.py @@ -28,6 +28,8 @@ __changelog__ = """ * Collapsed conversations in the messages tab * UI Tweak: Added more login status notifications * UI Tweak: When no characters are entered, you can't send a text +* UI Tweak: Switched to TreeView's using no selection to match Fremantle +* Bug Fix: Expanded the types of the Enter key that are supported for going to full screen * Bug Fix: Random people were reporting login issues * Bug Fix: Hardened against issues with grabbing possible callback numbers * Bug Fix: Fremantle GTK doesn't allow TreeView rows to be selected, so row-activated handlers have to read their path