gnucash maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/8fb21116 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/24ac69d8 (commit)
	from  https://github.com/Gnucash/gnucash/commit/53e4e8a9 (commit)



commit 8fb2111636613ce134ce90622fe33f994c6e574b
Merge: 53e4e8a97 24ac69d8a
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri May 3 13:26:42 2019 -0700

    Merge Christoph Holtermann's  'pycons-more-verbose' into maint.

diff --cc gnucash/python/init.py
index 5659c6a57,bee795774..5cf1f99c9
--- a/gnucash/python/init.py
+++ b/gnucash/python/init.py
@@@ -95,10 -85,15 +95,15 @@@ class Console (cons.Console)
  
  # Change this to "if True:" to switch on a python console at gnucash
  # startup:
+ # shelltype can either be "python" or "ipython" (the latter is not yet fully functional)
  if False:
-     console = Console(argv = [], shelltype = 'python', banner = [['woop', 'title']], size = 100)
+     shelltype = "python"
+     title = "gnucash "+shelltype+" shell"
+     banner_style = 'title'
+     banner = "Welcome to "+title+"!\n"
+     console = Console(argv = [], shelltype = shelltype, banner = [[banner, banner_style]], size = 100)
  
 -    window = Gtk.Window(Gtk.WindowType.TOPLEVEL)
 +    window = Gtk.Window(type = Gtk.WindowType.TOPLEVEL)
      window.set_position(Gtk.WindowPosition.CENTER)
      window.set_default_size(800,600)
      window.set_border_width(0)

commit 24ac69d8a96ad44153fa1477a3bbf349aa687316
Author: c-holtermann <mail at c-holtermann.net>
Date:   Fri Apr 19 11:13:30 2019 +0200

    make python shell startup more understandable

diff --git a/gnucash/python/init.py b/gnucash/python/init.py
index ca96f1223..bee795774 100644
--- a/gnucash/python/init.py
+++ b/gnucash/python/init.py
@@ -85,8 +85,13 @@ class Console (cons.Console):
 
 # Change this to "if True:" to switch on a python console at gnucash
 # startup:
+# shelltype can either be "python" or "ipython" (the latter is not yet fully functional)
 if False:
-    console = Console(argv = [], shelltype = 'python', banner = [['woop', 'title']], size = 100)
+    shelltype = "python"
+    title = "gnucash "+shelltype+" shell"
+    banner_style = 'title'
+    banner = "Welcome to "+title+"!\n"
+    console = Console(argv = [], shelltype = shelltype, banner = [[banner, banner_style]], size = 100)
 
     window = Gtk.Window(Gtk.WindowType.TOPLEVEL)
     window.set_position(Gtk.WindowPosition.CENTER)



Summary of changes:
 gnucash/python/init.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)