Compare commits

..

No commits in common. "08231fde30baf20fbe568d09f8784117ae674820" and "4bf6d6eb20161abf863ad30763b6e51d33c7eb28" have entirely different histories.

5 changed files with 9 additions and 26 deletions

View File

@ -24,13 +24,11 @@ connect to Navpoint Desktop.
## Licensing ## Licensing
Navpoint Desktop is released under the [GNU General Public License Navpoint Desktop is released under the [GNU General Public License
v3.0](https://www.gnu.org/licenses/gpl-3.0.en.html), except the files v3.0](https://www.gnu.org/licenses/gpl-3.0.en.html), except the file
`navpoint/get_ip.py` and `navpoint.fix_path`, which are released under `navpoint/get_ip.py`, which is released under [Creative Commons
[Creative Commons Attribution-ShareAlike 4.0 Attribution-ShareAlike 4.0
International](https://creativecommons.org/licenses/by-sa/4.0/) due to use of International](https://creativecommons.org/licenses/by-sa/4.0/) due to use of
code published on Stack Overflow [code published on Stack Overflow](https://stackoverflow.com/a/28950776).
([`get_ip.py`](https://stackoverflow.com/a/28950776) and
[`fix_path.py`](https://stackoverflow.com/a/53605128)).
Navpoint Mobile is released under the [GNU General Public License Navpoint Mobile is released under the [GNU General Public License
v3.0](https://www.gnu.org/licenses/gpl-3.0.en.html). v3.0](https://www.gnu.org/licenses/gpl-3.0.en.html).

View File

@ -1 +1,3 @@
pyinstaller -i=icon.ico --windowed --onefile --hidden-import tornado.web --add-data icon.ico:files --name=navpoint-windows-%PROCESSOR_ARCHITECTURE%.exe main.py pyinstaller -w -F --hidden-import tornado.web main.py
move dist/main.exe dist/navpoint-windows-%PROCESSOR_ARCHITECTURE%.exe

BIN
icon.ico

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 175 KiB

View File

@ -1,16 +0,0 @@
# Copyright 2018 Stack Overflow user "Kamal"
# Copyright 2024 Samuel Sloniker
#
# https://stackoverflow.com/a/53605128
#
# Used, modified, and released under CC BY-SA 4.0:
# https://creativecommons.org/licenses/by-sa/4.0/
import sys
import os.path
def fix_path(path):
if getattr(sys, 'frozen', False):
return os.path.join(sys._MEIPASS, "files", path)
else:
return path

View File

@ -1,6 +1,5 @@
import tkinter as tk import tkinter as tk
import pyqrcode import pyqrcode
import navpoint.fix_path
def run(link): def run(link):
@ -20,8 +19,8 @@ def run(link):
label.config(image=image) label.config(image=image)
try: try:
window.iconbitmap(navpoint.fix_path.fix_path("icon.ico")) window.iconbitmap("icon.ico")
except ImportError:#tk.TclError: except tk.TclError:
pass pass