Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug 8128; Fix common error/warn dialogs to deal with modal parent

Browse Source 
Unmanaged dialogs are often called for errors, warnings, info etc.
On Windows, If called from a modal parent window, they can be a bit
confusing, since the parent window appears to still be active.  This
fix makes the parent window non-modal for the duration of the dialog,
and then returns it to its original state.
This commit is contained in:
prculley 2016-12-31 09:08:44 -06:00 committed by Nick Hall
parent cea4d15d7d
commit ba7eff6e67
1 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
gramps/gui/dialog.py
View File

@ -73,6 +73,9 @@ class SaveDialog:
label2.set_use_markup(True) label2.set_use_markup(True)
if parent: if parent:
self.top.set_transient_for(parent) self.top.set_transient_for(parent)
parent_modal = parent.get_modal()
if parent_modal:
parent.set_modal(False)
self.top.show() self.top.show()
response = self.top.run() response = self.top.run()
if response == Gtk.ResponseType.NO: if response == Gtk.ResponseType.NO:
@ -82,6 +85,8 @@ class SaveDialog:
config.set('interface.dont-ask', self.dontask.get_active()) config.set('interface.dont-ask', self.dontask.get_active())
self.top.destroy() self.top.destroy()
if parent and parent_modal:
parent.set_modal(True)
class QuestionDialog: class QuestionDialog:
def __init__(self, msg1, msg2, label, task, parent=None): def __init__(self, msg1, msg2, label, task, parent=None):
@ -103,9 +108,14 @@ class QuestionDialog:
if parent: if parent:
self.top.set_transient_for(parent) self.top.set_transient_for(parent)
parent_modal = parent.get_modal()
if parent_modal:
parent.set_modal(False)
self.top.show() self.top.show()
response = self.top.run() response = self.top.run()
self.top.destroy() self.top.destroy()
if parent and parent_modal:
parent.set_modal(True)
if response == Gtk.ResponseType.ACCEPT: if response == Gtk.ResponseType.ACCEPT:
task() task()
@ -138,13 +148,19 @@ class QuestionDialog2:
self.xml.get_object('no').set_label(label_msg2) self.xml.get_object('no').set_label(label_msg2)
self.xml.get_object('no').set_use_underline(True) self.xml.get_object('no').set_use_underline(True)
self.parent = parent
if parent: if parent:
self.top.set_transient_for(parent) self.top.set_transient_for(parent)
self.parent_modal = parent.get_modal()
if self.parent_modal:
parent.set_modal(False)
self.top.show() self.top.show()
def run(self): def run(self):
response = self.top.run() response = self.top.run()
self.top.destroy() self.top.destroy()
if self.parent and self.parent_modal:
self.parent.set_modal(True)
return (response == Gtk.ResponseType.ACCEPT) return (response == Gtk.ResponseType.ACCEPT)
class OptionDialog: class OptionDialog:
@ -167,6 +183,9 @@ class OptionDialog:
self.xml.get_object('option2').set_label(btnmsg2) self.xml.get_object('option2').set_label(btnmsg2)
if parent: if parent:
self.top.set_transient_for(parent) self.top.set_transient_for(parent)
parent_modal = parent.get_modal()
if parent_modal:
parent.set_modal(False)
self.top.show() self.top.show()
self.response = self.top.run() self.response = self.top.run()
if self.response == Gtk.ResponseType.NO: if self.response == Gtk.ResponseType.NO:
@ -176,6 +195,8 @@ class OptionDialog:
if task2: if task2:
task2() task2()
self.top.destroy() self.top.destroy()
if parent and parent_modal:
parent.set_modal(True)
def get_response(self): def get_response(self):
return self.response return self.response
@ -191,9 +212,15 @@ class ErrorDialog(Gtk.MessageDialog):
self.format_secondary_text(msg2) self.format_secondary_text(msg2)
self.set_icon(ICON) self.set_icon(ICON)
self.set_title("%s - Gramps" % str(msg1)) self.set_title("%s - Gramps" % str(msg1))
if parent:
parent_modal = parent.get_modal()
if parent_modal:
parent.set_modal(False)
self.show() self.show()
self.run() self.run()
self.destroy() self.destroy()
if parent and parent_modal:
parent.set_modal(True)
class RunDatabaseRepair(ErrorDialog): class RunDatabaseRepair(ErrorDialog):
def __init__(self, msg, parent=None): def __init__(self, msg, parent=None):
@ -236,9 +263,15 @@ class WarningDialog(Gtk.MessageDialog):
# <WarningDialog object at 0x4880300 (GtkMessageDialog at 0x5686010)>: unknown signal name: activate-link # <WarningDialog object at 0x4880300 (GtkMessageDialog at 0x5686010)>: unknown signal name: activate-link
self.set_icon(ICON) self.set_icon(ICON)
self.set_title("%s - Gramps" % msg1) self.set_title("%s - Gramps" % msg1)
if parent:
parent_modal = parent.get_modal()
if parent_modal:
parent.set_modal(False)
self.show() self.show()
self.run() self.run()
self.destroy() self.destroy()
if parent and parent_modal:
parent.set_modal(True)
class OkDialog(Gtk.MessageDialog): class OkDialog(Gtk.MessageDialog):
def __init__(self, msg1, msg2="", parent=None): def __init__(self, msg1, msg2="", parent=None):
@ -251,9 +284,15 @@ class OkDialog(Gtk.MessageDialog):
self.format_secondary_text(msg2) self.format_secondary_text(msg2)
self.set_icon(ICON) self.set_icon(ICON)
self.set_title("%s - Gramps" % msg1) self.set_title("%s - Gramps" % msg1)
if parent:
parent_modal = parent.get_modal()
if parent_modal:
parent.set_modal(False)
self.show() self.show()
self.run() self.run()
self.destroy() self.destroy()
if parent and parent_modal:
parent.set_modal(True)
class InfoDialog: class InfoDialog:
""" """
@ -312,6 +351,9 @@ class MissingMediaDialog:
if parent: if parent:
self.top.set_transient_for(parent) self.top.set_transient_for(parent)
parent_modal = parent.get_modal()
if parent_modal:
parent.set_modal(False)
self.top.show() self.top.show()
self.top.connect('delete_event', self.warn) self.top.connect('delete_event', self.warn)
response = Gtk.ResponseType.DELETE_EVENT response = Gtk.ResponseType.DELETE_EVENT
@ -333,6 +375,8 @@ class MissingMediaDialog:
else: else:
self.default_action = 0 self.default_action = 0
self.top.destroy() self.top.destroy()
if parent and parent_modal:
parent.set_modal(True)
def warn(self, obj, obj2): def warn(self, obj, obj2):
WarningDialog( WarningDialog(
@ -367,6 +411,9 @@ class MultiSelectDialog:
if parent: if parent:
self.top.set_transient_for(parent) self.top.set_transient_for(parent)
parent_modal = parent.get_modal()
if parent_modal:
parent.set_modal(False)
self.top.connect('delete_event', self.warn) self.top.connect('delete_event', self.warn)
default_action = 0 default_action = 0
@ -406,6 +453,8 @@ class MultiSelectDialog:
if self.yes_func: if self.yes_func:
self.yes_func(item) self.yes_func(item)
self.top.destroy() self.top.destroy()
if parent and parent_modal:
parent.set_modal(True)
def warn(self, obj, obj2): def warn(self, obj, obj2):
WarningDialog( WarningDialog(
@ -436,8 +485,13 @@ class MessageHideDialog:
dont_show.connect('toggled', self.update_checkbox, key) dont_show.connect('toggled', self.update_checkbox, key)
if parent: if parent:
self.top.set_transient_for(parent) self.top.set_transient_for(parent)
parent_modal = parent.get_modal()
if parent_modal:
parent.set_modal(False)
self.top.run() self.top.run()
self.top.destroy() self.top.destroy()
if parent and parent_modal:
parent.set_modal(True)
def update_checkbox(self, obj, constant): def update_checkbox(self, obj, constant):
config.set(constant, obj.get_active()) config.set(constant, obj.get_active())