Skip to content

Commit c477cb9

Browse files
Merge pull request #72 from isotopp/isotopp-pyqt
Move from tkinter to pyqt6, fix a few things
2 parents f27c8a8 + 64013fb commit c477cb9

21 files changed

Lines changed: 704 additions & 757 deletions

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,3 @@ samples/*.mp4
2525
test/parse.py
2626
ffmpeg.exe
2727
ffprobe.exe
28-
keks.00.bin

‎README.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,12 @@ My idea is process the file in python, extract the data, and build a file in a k
105105
uv run gopro2gpx -s -vvv samples/hero6.mp4 hero6
106106
```
107107

108+
Start the Qt GUI (auto language from system locale, or override with `--lang en|es`):
109+
110+
```shell
111+
uv run gopro2gpx-gui
112+
```
113+
108114
5. With custom path for FFMPEG
109115

110116
```
@@ -255,7 +261,7 @@ please extract the raw data and send me them (see [extracting data](#extracting-
255261

256262
## Test harnesses
257263

258-
[Pytest](https://docs.pytest.org/) test harnesses exist in the `test` directory. Install dev dependencies with `uv sync --group dev`, then run:
264+
[Pytest](https://docs.pytest.org/) test harnesses exist in the `tests` directory. Install dev dependencies with `uv sync --group dev`, then run:
259265

260266
```sh
261267
uv run pytest

‎gopro2gpx_gui.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
from gopro2gpx.gui.qt_app import main
2+
3+
4+
if __name__ == "__main__":
5+
raise SystemExit(main())

‎gopro2gpx_gui_ENG.py‎

Lines changed: 0 additions & 370 deletions
This file was deleted.

‎gopro2gpx_gui_SPA.py‎

Lines changed: 0 additions & 374 deletions
This file was deleted.

‎instalador.spec‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def collect_tree(src, dest):
2323
return data_files
2424

2525
# Incluir de forma recursiva todo el contenido del directorio del paquete "gopro2gpx"
26-
datas = collect_tree(os.path.join(base_path, "gopro2gpx"), "gopro2gpx")
26+
datas = collect_tree(os.path.join(base_path, "src", "gopro2gpx"), "gopro2gpx")
2727

2828
# Incluir los ejecutables externos
2929
binaries = []
@@ -35,11 +35,14 @@ if os.path.exists(os.path.join(base_path, "ffprobe.exe")):
3535
# Recolectar importaciones ocultas
3636
hiddenimports = collect_submodules('gopro2gpx')
3737
hiddenimports.extend([
38-
'tkinter',
39-
'tkinter.filedialog',
40-
'tkinter.messagebox',
41-
'tkinter.scrolledtext',
42-
'tkinter.ttk',
38+
'gopro2gpx.gui',
39+
'gopro2gpx.gui.qt_app',
40+
'gopro2gpx.gui.i18n',
41+
'PyQt6',
42+
'PyQt6.QtCore',
43+
'PyQt6.QtGui',
44+
'PyQt6.QtWidgets',
45+
'PyQt6.sip',
4346
'csv',
4447
're',
4548
'threading',
@@ -64,8 +67,8 @@ excludes = [
6467
]
6568

6669
a = Analysis(
67-
['gopro2gpx_gui_SPA.py'], # Script principal de entrada
68-
pathex=[base_path],
70+
['gopro2gpx_gui.py'], # Script principal de entrada
71+
pathex=[base_path, os.path.join(base_path, "src")],
6972
binaries=binaries,
7073
datas=datas,
7174
hiddenimports=hiddenimports,
@@ -105,4 +108,4 @@ exe = EXE(
105108
entitlements_file=None,
106109
icon="E:/MIS NUBES/OneDrive/CURSAO/PY/APP PYTHON OK/gopro2gpx/icon.ico", # Ruta con barras inclinadas para evitar problemas
107110
win32manifest="app.manifest"
108-
)
111+
)

‎pyproject.toml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,21 @@ license = { text = "GPL-3.0-or-later" }
1212
authors = [
1313
{ name = "Juan M. Casillas" },
1414
]
15-
dependencies = []
15+
dependencies = [
16+
"PyQt6>=6.6.0",
17+
]
1618

1719
[project.urls]
1820
Homepage = "https://github.com/juanmcasillas/gopro2gpx"
1921

2022
[project.scripts]
2123
gopro2gpx = "gopro2gpx.gopro2gpx:main"
24+
gopro2gpx-gui = "gopro2gpx.gui.qt_app:main"
2225

2326
[dependency-groups]
2427
dev = [
2528
"pytest>=8.0.0",
2629
]
2730

2831
[tool.hatch.build.targets.wheel]
29-
packages = ["gopro2gpx"]
32+
packages = ["src/gopro2gpx"]

0 commit comments

Comments
 (0)