From ceafe787b25bcf1a77cbb136bc9cb09a5379329c Mon Sep 17 00:00:00 2001
From: MikeTheWatchGuy <mike_barnett@hotmail.com>
Date: Sun, 26 Aug 2018 15:29:12 -0400
Subject: [PATCH] New CANVAS Demo, updated PNG Viewer Demo

---
 Demo_Canvas.py     | 22 ++++++++++++++++++++++
 Demo_PNG_Viewer.py | 38 +++++++++++++++++++++++---------------
 2 files changed, 45 insertions(+), 15 deletions(-)
 create mode 100644 Demo_Canvas.py

diff --git a/Demo_Canvas.py b/Demo_Canvas.py
new file mode 100644
index 00000000..35eec494
--- /dev/null
+++ b/Demo_Canvas.py
@@ -0,0 +1,22 @@
+import PySimpleGUI as gui
+
+canvas = gui.Canvas(size=(100,100), background_color='red')
+
+layout = [
+           [canvas],
+           [gui.T('Change circle color to:'), gui.ReadFormButton('Red'), gui.ReadFormButton('Blue')]
+           ]
+
+form = gui.FlexForm('Canvas test')
+form.Layout(layout)
+form.ReadNonBlocking()
+
+cir = canvas.TKCanvas.create_oval(50, 50, 100, 100)
+
+while True:
+    button, values = form.Read()
+    if button is None: break
+    if button is 'Blue':
+        canvas.TKCanvas.itemconfig(cir, fill = "Blue")
+    elif button is 'Red':
+        canvas.TKCanvas.itemconfig(cir, fill = "Red")
diff --git a/Demo_PNG_Viewer.py b/Demo_PNG_Viewer.py
index 4729d9c3..7d6bcd7d 100644
--- a/Demo_PNG_Viewer.py
+++ b/Demo_PNG_Viewer.py
@@ -4,54 +4,62 @@ import os
 # Simple Image Browser based on PySimpleGUI
 
 # Get the folder containing the images from the user
-rc, folder = sg.GetPathBox('Image Browser', 'Image folder to open', default_path='A:/TEMP/PDFs')
+rc, folder = sg.GetPathBox('Image Browser', 'Image folder to open', default_path='')
 if rc is False or folder is '':
     sg.MsgBoxCancel('Cancelling')
     exit(0)
 
 # get list of PNG files in folder
 png_files = [folder + '\\' + f for f in os.listdir(folder) if '.png' in f]
+filenames_only = [f for f in os.listdir(folder) if '.png' in f]
 
 if len(png_files) == 0:
     sg.MsgBox('No PNG images in folder')
     exit(0)
 
 # create the form that also returns keyboard events
-form = sg.FlexForm('Image Browser', return_keyboard_events=True)
+form = sg.FlexForm('Image Browser', return_keyboard_events=True, location=(0,0), use_default_focus=False )
 
 # make these 2 elements outside the layout because want to "update" them later
 # initialize to the first PNG file in the list
 image_elem = sg.Image(filename=png_files[0])
 filename_display_elem = sg.Text(png_files[0], size=(80, 3))
-file_num_display_elem = sg.Text('File 1 of {}'.format(len(png_files)), size=(10,1))
+file_num_display_elem = sg.Text('File 1 of {}'.format(len(png_files)), size=(15,1))
 
 # define layout, show and read the form
-layout = [[filename_display_elem],
+col = [[filename_display_elem],
           [image_elem],
           [sg.ReadFormButton('Next', size=(8,2)), sg.ReadFormButton('Prev', size=(8,2)), file_num_display_elem]]
 
-form.LayoutAndRead(layout)          # Shows form on screen
+col_files = [[sg.Listbox(values=filenames_only, size=(60,30), key='listbox')],
+             [sg.ReadFormButton('Read')]]
+layout = [[sg.Column(col_files), sg.Column(col)]]
+button, values = form.LayoutAndRead(layout)          # Shows form on screen
 
 # loop reading the user input and displaying image, filename
 i=0
 while True:
-    f = png_files[i]
-    # update window with new image
-    image_elem.Update(filename=f)
-    # update window with filename
-    filename_display_elem.Update(f)
-    # update page display
-    file_num_display_elem.Update('File {} of {}'.format(i+1, len(png_files)))
-    # read the form
-    button, values = form.Read()
 
     # perform button and keyboard operations
     if button is None:
         break
-    elif button in ('Next', 'MouseWheel:Down', 'Down:40', 'Next:34') and i < len(png_files):
+    elif button in ('Next', 'MouseWheel:Down', 'Down:40', 'Next:34') and i < len(png_files)-1:
         i += 1
     elif button in ('Prev', 'MouseWheel:Up', 'Up:38', 'Prior:33') and i > 0:
         i -= 1
 
+    if button == 'Read':
+        filename = folder + '\\' + values['listbox'][0]
+        # print(filename)
+    else:
+        filename = png_files[i]
 
+    # update window with new image
+    image_elem.Update(filename=filename)
+    # update window with filename
+    filename_display_elem.Update(filename)
+    # update page display
+    file_num_display_elem.Update('File {} of {}'.format(i+1, len(png_files)))
 
+    # read the form
+    button, values = form.Read()