Merge branch 'release/0.2.0'

Author: 6XGate

.editorconfig

@@ -0,0 +1,9 @@
+[*]
+charset=utf-8
+end_of_line=lf
+insert_final_newline=true
+indent_style=space
+indent_size=4
+
+[{.babelrc,.stylelintrc,.eslintrc,jest.config,*.json,*.jsb3,*.jsb2,*.bowerrc}]
+indent_size=2

README.md

@@ -8,12 +8,18 @@ several devices.
 The main goal of this project is to help retro console gamers using older
 professional matrix audio/video switch, such as Extron's Crosspoint series, and
 professional monitors, such as Sony's PVM and BVM series, better select the
-channels to which they have connected their
+channels to which they have connected consoles.
+
+## Installation
+
+Though this is designed for Raspian out of the box, it still requires one
+additional library.  You can install it by running
+`sudo apt install python3-pil.imagetk`
 
 ## Usage and Configuration
 
-See our [Wiki on GitHub](http://www.github.com/) for information on setting up,
-configuring, and using PiAvSwitchController.
+See the [Wiki on GitHub](http://www.github.com/6XGate/PiAvSwitchController/wiki)
+for information on setting up, configuring, and using PiAvSwitchController.
 
 ## Plans
 
@@ -23,4 +29,4 @@ configuring, and using PiAvSwitchController.
 
 ## Change Log
 
-See our [Project on GitHub](http://www.github.com/).
+See the [Project on GitHub](http://www.github.com/6XGate/PiAvSwitchController).

config/example/pigaswi.json config/example/piavswictrl.jsonconfig/example/pigaswi.json renamed to config/example/piavswictrl.json

@@ -102,5 +102,5 @@
         }
       }
     }
-  ]
+  ],
 }

extras/piavswictrl.desktop

@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Application
+Name=PiAvSwitchController
+Exec=/usr/bin/env python3 <PiAvSwitchController location>/piavswictrl.py

piavswictrl.py

@@ -1,22 +1,33 @@
 #!/usr/bin/env python3
 
 import sys
+import signal
 
 from support.Switch import load_switches
 from support.Device import load_devices
 from support.config import load_config
 from ui.Main        import Main
 
-__version__ = "0.1.0"
+__version__ = "0.2.0"
+
+root = None # type: Main
+
+# noinspection PyUnusedLocal
+def on_quit(signum: int, frame) -> None:
+    root.destroy()
 
 def main():
+    global root
+
     config = load_config()
     load_switches(config['switches'])
     load_devices(config['devices'])
 
+    signal.signal(signal.SIGTERM, on_quit)
+
     root = Main()
     root.mainloop()
+    return 0
 
 if __name__ == "__main__":
-    main()
-    sys.exit()
+    sys.exit(main())

support/config.py

@@ -24,7 +24,8 @@ def load_config() -> Dict[str, Any]:
     # Initialize the configuration paths or path resolution.
     program_path = os.path.abspath(str(main.__file__))
     program_dir  = os.path.dirname(program_path)
-    config_path  = os.path.abspath(os.path.join(program_dir, './config/pigaswi.json'))
+    # noinspection SpellCheckingInspection
+    config_path  = os.path.abspath(os.path.join(program_dir, './config/piavswictrl.json'))
     config_dir   = os.path.dirname(config_path)
 
     # Now load up the configuration data.

ui/Main.py

@@ -1,49 +1,88 @@
 import functools
 import tkinter as tk
-from tkinter        import ttk
-from PIL            import Image, ImageTk
+
+from typing         import List, Dict, Union
+from PIL            import Image, ImageEnhance, ImageTk
 from support.Device import devices, Device
 
-def select_input(device: Device):
-    device.select()
+class Colors:
+    FRAME           = "Black"
+    BUTTON_NORMAL   = "Dark Grey"
+    BUTTON_SELECTED = "White"
 
 class Main(tk.Tk):
 
     def __init__(self):
         super().__init__()
+        self.after_idle(self.__idle_poll)
         self.title('Pi Game Switch')
         self.attributes('-fullscreen', True)
-
-        # Get the number of columns and rows we will have.
-        columns = int(self.winfo_screenwidth() / 128) - 1
-        rows    = int(self.winfo_screenheight() / 128) - 1
+        self.__normal_images   = {} # type: Dict[tk.Button, tk.PhotoImage]
+        self.__selected_images = {} # type: Dict[tk.Button, tk.PhotoImage]
+        self.__buttons         = [] # type: List[tk.Button]
+        self.__frame           = tk.Frame(self, cursor='none', background=Colors.FRAME)
+        self.__selected        = None # type: Union[None, tk.Button]
 
         # Configure the layout
-        self.__frame = ttk.Frame(self)
-        self.__frame.grid(columns=columns, rows=rows, sticky=(tk.N, tk.W, tk.E, tk.S))
+        self.__frame.grid(column=0, row=0, sticky=(tk.N, tk.W, tk.E, tk.S))
         self.columnconfigure(0, weight=1)
         self.rowconfigure(0, weight=1)
 
-        self.__buttons = []
-        self.__images  = []
+        # Get the number of columns we will have.
+        columns = int(self.winfo_screenwidth() / 130)
 
         column = 0
         row    = 0
         for device in devices:
-            command = functools.partial(select_input, device)
+            # Create the button.
+            # noinspection SpellCheckingInspection
+            button_config = {
+                'borderwidth':         0,
+                'highlightthickness':  0,
+                'activebackground':    Colors.BUTTON_NORMAL,
+                'background':          Colors.BUTTON_NORMAL
+            }
             if len(device.image) > 0:
-                image = ImageTk.PhotoImage(Image.open(device.image))
-                self.__images.append(image)
-                button = ttk.Button(self.__frame, image=image, command=command)
-                button.grid(column=column, row=row, sticky=(tk.N, tk.W))
-                self.__buttons.append(button)
+                # Get the selected image.
+                selected = ImageTk.PhotoImage(Image.open(device.image))
+                # Generate the normal image.
+                enhancer = ImageEnhance.Brightness(Image.open(device.image))
+                normal   = ImageTk.PhotoImage(enhancer.enhance(0.66))
+
+                button = tk.Button(self.__frame, image=normal, **button_config)
+                self.__selected_images[button] = selected
+                self.__normal_images[button]   = normal
             else:
                 text   = device.title
-                button = ttk.Button(self.__frame, text=text, command=command)
-                button.grid(column=column, row=row, sticky=(tk.N, tk.W))
-                self.__buttons.append(button)
+                button = tk.Button(self.__frame, text=text, **button_config)
+
+            # Generate a partial to bind the command to the device.
+            command = functools.partial(self.__select_device, button, device)
 
+            # Add the new button.
+            button.config(command=command)
+            button.grid(column=column, row=row, sticky=(tk.N, tk.W))
+            button.grid_configure(padx=1, pady=1)
+            self.__buttons.append(button)
+
+            # Move the column and row positions as necessary.
             column = column + 1
             if column == columns:
                 row    = row + 1
                 column = 0
+
+    def __select_device(self, button: tk.Button, device: Device):
+        selected = self.__selected
+        if selected:
+            selected.config(activebackground=Colors.BUTTON_NORMAL, background=Colors.BUTTON_NORMAL)
+            if selected in self.__normal_images:
+                selected.config(image=self.__normal_images[selected])
+
+        device.select()
+        self.__selected = button
+        button.config(activebackground=Colors.BUTTON_SELECTED, background=Colors.BUTTON_SELECTED)
+        if button in self.__selected_images:
+            button.config(image=self.__selected_images[button])
+
+    def __idle_poll(self) -> None:
+        self.after(500, self.__idle_poll)