Skip to content

Commit

Permalink
update ubuntu install script
Browse files Browse the repository at this point in the history
  • Loading branch information
SiwatS committed Dec 11, 2023
1 parent dd67eb6 commit 28ea36b
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 12 deletions.
4 changes: 2 additions & 2 deletions installer_ubuntu.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# Install Python3 and espmega_lightshow
sudo apt-get install -y python3 python3-pip python3-tk
sudo apt-get install -y python3 python3-pip python3-tk python3-pil python3-pil.imagetk
pip3 install --upgrade espmega_lightshow

# Get python3 path
Expand All @@ -20,7 +20,7 @@ Version=1.0
Type=Application
Name=ESPMega Lightshow
Exec=$pythonPath -m espmega_lightshow
Icon=$pythonRootPath/espmega_lightshow/icon.ico
Icon=$pythonRootPath/espmega_lightshow/logo.png
Path=$HOME/.espmega_lightshow
Terminal=false" > "$targetFile"

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def readme():

setup(
name='espmega_lightshow',
version='3.8',
version='3.9',
license='Apache 2.0',
author="Siwat Sirichai",
author_email='[email protected]',
Expand Down
3 changes: 1 addition & 2 deletions src/espmega_lightshow.egg-info/PKG-INFO
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
Metadata-Version: 2.1
Name: espmega-lightshow
Version: 3.8
Version: 3.9
Home-page: https://github.com/SiwatINC/espmega-lightshow
Author: Siwat Sirichai
Author-email: [email protected]
License: Apache 2.0
Keywords: light mqtt espmega
Description-Content-Type: text/markdown
Requires-Dist: espmega

# ESPMega Light Show
This is a program made for the ESPMega PLCs for easily programming light show and running light show script
Expand Down
1 change: 1 addition & 0 deletions src/espmega_lightshow.egg-info/requires.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
espmega
pillow
19 changes: 12 additions & 7 deletions src/espmega_lightshow/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@ def restart():
# Create a tkinter gui window ask for the light server ip and port and whether to enable rapid response mode
root = tk.Tk()
root.title("ELS Pre-Flight")
icon_image = ImageTk.PhotoImage(icon_image)
root.wm_iconphoto(True, icon_image)
icon = ImageTk.PhotoImage(icon_image)
root.wm_iconphoto(True, icon)
root.geometry("600x360")
root.resizable(False, False)

Expand Down Expand Up @@ -305,7 +305,8 @@ def open_light_map_file_chooser_dialog():
def open_generate_light_map_template_window():
light_map_generator_window = tk.Toplevel(root)
light_map_generator_window.title("Generate Map")
light_map_generator_window.wm_iconphoto(True, icon_image)
icon = ImageTk.PhotoImage(icon_image)
light_map_generator_window.wm_iconphoto(True, icon)
light_map_generator_window.geometry("250x130")
light_map_generator_window.resizable(False, False)

Expand Down Expand Up @@ -613,7 +614,8 @@ def change_light_config(event):
light_config_window = tk.Toplevel(root)
light_config_window.geometry("250x190")
light_config_window.title("Light Config")
light_config_window.wm_iconphoto(True, icon_image)
icon = ImageTk.PhotoImage(icon_image)
light_config_window.wm_iconphoto(True, icon)
light_config_window.resizable(False, False)

# Define variables for the disable checkbox
Expand Down Expand Up @@ -755,7 +757,8 @@ def reconnect_light_controllers():
root = tk.Tk()

root.title("ESPMega Light Show")
root.wm_iconphoto(True, icon_image)
icon = ImageTk.PhotoImage(icon_image)
root.wm_iconphoto(True, icon)


# Create a label for the title
Expand Down Expand Up @@ -1103,7 +1106,8 @@ def logger_func(message: any):
# Create a new window to display the script controls
script_controls_window = tk.Toplevel(root)
script_controls_window.title("Script Runner")
script_controls_window.wm_iconphoto(True, icon_image)
icon = ImageTk.PhotoImage(icon_image)
script_controls_window.wm_iconphoto(True, icon)
script_controls_window.geometry("500x130")

# Set minimum size
Expand Down Expand Up @@ -1411,7 +1415,8 @@ def clear_script_slot(slot: int):
def open_about_popup():
about_popup = tk.Toplevel(root)
about_popup.title("About")
about_popup.iconbitmap.wm_iconphoto(True, icon_image)
icon = ImageTk.PhotoImage(icon_image)
about_popup.iconbitmap.wm_iconphoto(True, icon)
about_popup.geometry("350x110")
about_popup.resizable(False, False)

Expand Down

0 comments on commit 28ea36b

Please sign in to comment.