Rinma
/
Tough_Crowd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Create new utils.logErrorAndDialog function

This commit is contained in:
Romain Failliot 2021-11-18 12:05:10 -05:00
parent 50f0e431ee
commit 08942ea026
2 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main.py
View File

@ -905,9 +905,7 @@ class Preferences:
f.write(s) f.write(s)
f.close() f.close()
except IOError: except IOError:
m = utils.MessageDialog(parent, Gtk.MessageType.ERROR, _('Error writing %s.') % (self.path, )) utils.logErrorAndDialog(_('Error writing %s.') % (self.path, ), parent)
m.run()
m.destroy()
dialog.destroy() dialog.destroy()
return accept return accept
@ -6950,9 +6948,7 @@ class Diffuse(Gtk.Window):
msg = _('Error reading revision %(rev)s of %(file)s.') % { 'rev': rev, 'file': name } msg = _('Error reading revision %(rev)s of %(file)s.') % { 'rev': rev, 'file': name }
else: else:
msg = _('Error reading %s.') % (name, ) msg = _('Error reading %s.') % (name, )
dialog = utils.MessageDialog(self.get_toplevel(), Gtk.MessageType.ERROR, msg) utils.logErrorAndDialog(msg, self.get_toplevel())
dialog.run()
dialog.destroy()
return return
# update the panes contents, last modified time, and title # update the panes contents, last modified time, and title
self.replaceContents(f, ss) self.replaceContents(f, ss)
@ -7114,13 +7110,9 @@ class Diffuse(Gtk.Window):
self.setSyntax(syntax) self.setSyntax(syntax)
return True return True
except (UnicodeEncodeError, LookupError): except (UnicodeEncodeError, LookupError):
dialog = utils.MessageDialog(self.get_toplevel(), Gtk.MessageType.ERROR, _('Error encoding to %s.') % (encoding, )) utils.logErrorAndDialog(_('Error encoding to %s.') % (encoding, ), self.get_toplevel())
dialog.run()
dialog.destroy()
except IOError: except IOError:
dialog = utils.MessageDialog(self.get_toplevel(), Gtk.MessageType.ERROR, _('Error writing %s.') % (name, )) utils.logErrorAndDialog(_('Error writing %s.') % (name, ), self.get_toplevel())
dialog.run()
dialog.destroy()
return False return False
# callback for save file menu item # callback for save file menu item
@ -7782,9 +7774,7 @@ class Diffuse(Gtk.Window):
viewer.load(i, FileInfo(name, encoding, vcs, rev)) viewer.load(i, FileInfo(name, encoding, vcs, rev))
viewer.setOptions(options) viewer.setOptions(options)
except (IOError, OSError, WindowsError): except (IOError, OSError, WindowsError):
dialog = utils.MessageDialog(self.get_toplevel(), Gtk.MessageType.ERROR, _('Error retrieving commits for %s.') % (dn, )) utils.logErrorAndDialog(_('Error retrieving commits for %s.') % (dn, ), self.get_toplevel())
dialog.run()
dialog.destroy()
# create a new viewer for each modified file found in 'items' # create a new viewer for each modified file found in 'items'
def createModifiedFileTabs(self, items, labels, options): def createModifiedFileTabs(self, items, labels, options):
@ -7813,9 +7803,7 @@ class Diffuse(Gtk.Window):
viewer.load(i, FileInfo(name, encoding, vcs, rev)) viewer.load(i, FileInfo(name, encoding, vcs, rev))
viewer.setOptions(options) viewer.setOptions(options)
except (IOError, OSError, WindowsError): except (IOError, OSError, WindowsError):
dialog = utils.MessageDialog(self.get_toplevel(), Gtk.MessageType.ERROR, _('Error retrieving modifications for %s.') % (dn, )) utils.logErrorAndDialog(_('Error retrieving modifications for %s.') % (dn, ), self.get_toplevel())
dialog.run()
dialog.destroy()
# close all tabs without differences # close all tabs without differences
def closeOnSame(self): def closeOnSame(self):
@ -7874,9 +7862,7 @@ class Diffuse(Gtk.Window):
self.notebook.set_current_page(n) self.notebook.set_current_page(n)
self.getCurrentViewer().grab_focus() self.getCurrentViewer().grab_focus()
else: else:
m = utils.MessageDialog(parent, Gtk.MessageType.ERROR, _('No modified files found.')) utils.logErrorAndDialog(_('No modified files found.'), parent)
m.run()
m.destroy()
# callback for the open commit menu item # callback for the open commit menu item
def open_commit_cb(self, widget, data): def open_commit_cb(self, widget, data):
@ -7894,9 +7880,7 @@ class Diffuse(Gtk.Window):
self.notebook.set_current_page(n) self.notebook.set_current_page(n)
self.getCurrentViewer().grab_focus() self.getCurrentViewer().grab_focus()
else: else:
m = utils.MessageDialog(parent, Gtk.MessageType.ERROR, _('No committed files found.')) utils.logErrorAndDialog(_('No committed files found.'), parent)
m.run()
m.destroy()
# callback for the reload file menu item # callback for the reload file menu item
def reload_file_cb(self, widget, data): def reload_file_cb(self, widget, data):

18
src/utils.py
View File

@ -51,15 +51,19 @@ def _logPrintOutput(msg):
traceback.print_stack() traceback.print_stack()
# convenience function to display debug messages # convenience function to display debug messages
def logDebug(s): def logDebug(msg):
_logPrintOutput(f'DEBUG: {s}') _logPrintOutput(f'DEBUG: {msg}')
# report error messages # report error messages
def logError(s): def logError(msg):
_logPrintOutput(f'ERROR: {s}') _logPrintOutput(f'ERROR: {msg}')
m = MessageDialog(None, Gtk.MessageType.ERROR, s)
m.run() # report error messages and show dialog
m.destroy() def logErrorAndDialog(msg,parent=None):
logError(msg)
dialog = MessageDialog(parent, Gtk.MessageType.ERROR, msg)
dialog.run()
dialog.destroy()
# create nested subdirectories and return the complete path # create nested subdirectories and return the complete path
def make_subdirs(p, ss): def make_subdirs(p, ss):