Working pyinstaller

README.md

@@ -2,8 +2,8 @@
 Elite Dangerous Fleet Carrier Macros
 There are 3 primary macros:
 * Ctrl+F11: Refill your ship with Tritium and donate it to the carrier.
-* Alt+F9: Schedule the next jump on the route
-* Ctrl+F9: Auto jump the remaining route
+* Ctrl+F9: Schedule the next jump on the route
+* Alt+F9: Auto jump the remaining route
  * Ctrl+F10: Stop auto jumping
 * Ctrl+F5: Empty your ship's cargo to the carrier.
 

__main__.py

@@ -1,4 +1,4 @@
-from macros import run_ui
+from fcmacros import run_ui
 
 
 def main():

macros.py → fcmacros.py

@@ -1,4 +1,4 @@
-# macros.py
+# fcmacros.py
 # Elite Dangerous Fleet Carrier Macros - autopilot/auto jumper
 # Copyright (c) 2022 Seth Osher
 #
@@ -13,6 +13,8 @@
 import getpass
 import os
 import usersettings
+import PIL
+import cv2
 from keymaps import *
 
 
@@ -349,14 +351,14 @@ def dark_style2(root):
 row += 1
 
 ttk.Label(frame, text="Enable autojump:").grid(column=0, row=row, sticky="e")
-ttk.Label(frame, text="Ctrl+F9").grid(column=1, row=row, sticky="w")
+ttk.Label(frame, text="Alt+F9").grid(column=1, row=row, sticky="w")
 
 ttk.Label(frame, text="Cancel autojump:").grid(column=2, row=row, sticky="e")
 ttk.Label(frame, text="Ctrl+F10").grid(column=3, row=row, sticky="w")
 row += 1
 
 ttk.Label(frame, text="Engage next jump on route:").grid(column=0, row=row, sticky="e")
-ttk.Label(frame, text="Alt+F9").grid(column=1, row=row, sticky="w")
+ttk.Label(frame, text="Ctrl+F9").grid(column=1, row=row, sticky="w")
 row += 1
 
 
@@ -494,14 +496,14 @@ def check_keys():
  root.after(100, empty_cargo)
  root.after(1000, check_keys)
  return
- if kb.is_pressed('ctrl+f9'):
+ if kb.is_pressed('alt+f9'):
  set_status("Enable auto jump")
  auto_jump = True
  auto_jump_label.config(text="Auto Jump Enabled")
  root.after(100, schedule_jump)
  root.after(1000, check_keys)
  return
- if kb.is_pressed('alt+f9'):
+ if kb.is_pressed('ctrl+f9'):
  set_status("Scheduling next jump")
  jump_one = True
  root.after(100, schedule_jump)

fcmacros.spec

@@ -0,0 +1,49 @@
+# -*- mode: python ; coding: utf-8 -*-
+
+
+block_cipher = None
+
+added_files = [
+ ( 'images/*', 'images' ),
+ ( 'awthemes-10.4.0/*', 'awthemes-10.4.0' ),
+ ]
+
+a = Analysis(['fcmacros.py'],
+ pathex=[],
+ binaries=[],
+ datas=added_files,
+ hiddenimports=[],
+ hookspath=[],
+ hooksconfig={},
+ runtime_hooks=[],
+ excludes=[],
+ win_no_prefer_redirects=False,
+ win_private_assemblies=False,
+ cipher=block_cipher,
+ noarchive=False)
+pyz = PYZ(a.pure, a.zipped_data,
+ cipher=block_cipher)
+
+exe = EXE(pyz,
+ a.scripts, 
+ [],
+ exclude_binaries=True,
+ name='fcmacros',
+ debug=False,
+ bootloader_ignore_signals=False,
+ strip=False,
+ upx=True,
+ console=False,
+ icon='images/fc_icon.ico',
+ disable_windowed_traceback=False,
+ target_arch=None,
+ codesign_identity=None,
+ entitlements_file=None )
+coll = COLLECT(exe,
+ a.binaries,
+ a.zipfiles,
+ a.datas, 
+ strip=False,
+ upx=True,
+ upx_exclude=[],
+ name='fcmacros')

make_dist.cmd

@@ -0,0 +1,2 @@
+pyinstaller fcmacros.spec --noconfirm
+