Cleaning up modality and what windows is set as parent

git-svn-id: file:///svnroot/gc-dialer/trunk@320 c39d3808-3fe2-4d86-a59f-b7f623ee9f21

diff --git a/src/dc_glade.py b/src/dc_glade.py
index 4f36345..8c85729 100755 (executable)
--- a/src/dc_glade.py
+++ b/src/dc_glade.py
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-@bug Completely broken on Maemo
+@bug SMS Dialog issues on Hildon
 @bug Session timeouts are bad, possible solutions:
        @li For every X minutes, if logged in, attempt login
        @li Restructure so code handling login/dial/sms is beneath everything else and login attempts are made if those fail

diff --git a/src/gc_views.py b/src/gc_views.py
index de7369b..c4bb483 100644 (file)
--- a/src/gc_views.py
+++ b/src/gc_views.py
@@ -340,7 +340,7 @@ class PhoneTypeSelector(object):
 
                self._action = self.ACTION_CANCEL
 
-       def run(self, contactDetails, message = ""):
+       def run(self, contactDetails, message = "", parent = None):
                self._action = self.ACTION_CANCEL
                self._typemodel.clear()
                self._typeview.set_model(self._typemodel)
@@ -371,7 +371,13 @@ class PhoneTypeSelector(object):
                        self._message.set_markup("")
                        self._message.hide()
 
-               userResponse = self._dialog.run()
+               if parent is not None:
+                       self._dialog.set_transient_for(parent)
+
+               try:
+                       userResponse = self._dialog.run()
+               finally:
+                       self._dialog.hide()
 
                if userResponse == gtk.RESPONSE_OK:
                        phoneNumber = self._get_number()
@@ -382,7 +388,7 @@ class PhoneTypeSelector(object):
                        self._action = self.ACTION_CANCEL
 
                if self._action == self.ACTION_SEND_SMS:
-                       smsMessage = self._smsDialog.run(phoneNumber, message)
+                       smsMessage = self._smsDialog.run(phoneNumber, message, parent)
                        if not smsMessage:
                                phoneNumber = ""
                                self._action = self.ACTION_CANCEL
@@ -393,7 +399,7 @@ class PhoneTypeSelector(object):
                self._typeview.remove_column(numberColumn)
                self._typeview.remove_column(typeColumn)
                self._typeview.set_model(None)
-               self._dialog.hide()
+
                return self._action, phoneNumber, smsMessage
 
        def _get_number(self):
@@ -441,7 +447,7 @@ class SmsEntryDialog(object):
                self._smsEntry = self._widgetTree.get_widget("smsEntry")
                self._smsEntry.get_buffer().connect("changed", self._on_entry_changed)
 
-       def run(self, number, message = ""):
+       def run(self, number, message = "", parent = None):
                if message:
                        self._message.set_markup(message)
                        self._message.show()
@@ -451,7 +457,14 @@ class SmsEntryDialog(object):
                self._smsEntry.get_buffer().set_text("")
                self._update_letter_count()
 
-               userResponse = self._dialog.run()
+               if parent is not None:
+                       self._dialog.set_transient_for(parent)
+
+               try:
+                       userResponse = self._dialog.run()
+               finally:
+                       self._dialog.hide()
+
                if userResponse == gtk.RESPONSE_OK:
                        entryBuffer = self._smsEntry.get_buffer()
                        enteredMessage = entryBuffer.get_text(entryBuffer.get_start_iter(), entryBuffer.get_end_iter())
@@ -459,7 +472,6 @@ class SmsEntryDialog(object):
                else:
                        enteredMessage = ""
 
-               self._dialog.hide()
                return enteredMessage
 
        def _update_letter_count(self, *args):
@@ -692,6 +704,7 @@ class RecentCallsView(object):
                self._recentviewColumn.add_attribute(textrenderer, "text", 1)
                self._recentviewColumn.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
+               self._window = gtk_toolbox.find_parent_window(self._recentview)
                self._phoneTypeSelector = PhoneTypeSelector(widgetTree, self._backend)
 
        def enable(self):
@@ -771,7 +784,11 @@ class RecentCallsView(object):
                contactPhoneNumbers = [("Phone", number)]
                description = self._recentmodel.get_value(itr, 1)
 
-               action, phoneNumber, message = self._phoneTypeSelector.run(contactPhoneNumbers, message = description)
+               action, phoneNumber, message = self._phoneTypeSelector.run(
+                       contactPhoneNumbers,
+                       message = description,
+                       parent = self._window,
+               )
                if action == PhoneTypeSelector.ACTION_CANCEL:
                        return
                assert phoneNumber
@@ -799,6 +816,7 @@ class MessagesView(object):
                self._messageviewColumn.add_attribute(textrenderer, "markup", 1)
                self._messageviewColumn.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
+               self._window = gtk_toolbox.find_parent_window(self._messageview)
                self._phoneTypeSelector = PhoneTypeSelector(widgetTree, self._backend)
 
        def enable(self):
@@ -876,7 +894,11 @@ class MessagesView(object):
                contactPhoneNumbers = [("Phone", self._messagemodel.get_value(itr, 0))]
                description = self._messagemodel.get_value(itr, 1)
 
-               action, phoneNumber, message = self._phoneTypeSelector.run(contactPhoneNumbers, message = description)
+               action, phoneNumber, message = self._phoneTypeSelector.run(
+                       contactPhoneNumbers,
+                       message = description,
+                       parent = self._window,
+               )
                if action == PhoneTypeSelector.ACTION_CANCEL:
                        return
                assert phoneNumber
@@ -920,6 +942,7 @@ class ContactsView(object):
 
                self._onContactsviewRowActivatedId = 0
                self._onAddressbookComboChangedId = 0
+               self._window = gtk_toolbox.find_parent_window(self._contactsview)
                self._phoneTypeSelector = PhoneTypeSelector(widgetTree, self._backend)
 
        def enable(self):
@@ -1065,7 +1088,11 @@ class ContactsView(object):
                if len(contactPhoneNumbers) == 0:
                        return
 
-               action, phoneNumber, message = self._phoneTypeSelector.run(contactPhoneNumbers, message = contactName)
+               action, phoneNumber, message = self._phoneTypeSelector.run(
+                       contactPhoneNumbers,
+                       message = contactName,
+                       parent = self._window,
+               )
                if action == PhoneTypeSelector.ACTION_CANCEL:
                        return
                assert phoneNumber

diff --git a/src/gtk_toolbox.py b/src/gtk_toolbox.py
index 2a04efd..1c9dd88 100644 (file)
--- a/src/gtk_toolbox.py
+++ b/src/gtk_toolbox.py
@@ -21,6 +21,14 @@ def gtk_lock():
                gtk.gdk.threads_leave()
 
 
+def find_parent_window(widget):
+       while True:
+               parent = widget.get_parent()
+               if isinstance(parent, gtk.Window):
+                       return parent
+               widget = parent
+
+
 def make_idler(func):
        """
        Decorator that makes a generator-function into a function that will continue execution on next call