Skip to content

Commit e529471

Browse files
authored
Merge pull request #2 from jacobczsk/dev
dev
2 parents aca812f + d1cb09c commit e529471

File tree

122 files changed

+31851
-3055
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+31851
-3055
lines changed

.idea/.gitignore

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/ARDFEvent.iml

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/dictionaries/project.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/inspectionProfiles/profiles_settings.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.vscode/launch.json

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

ARDFEvent.spec

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# -*- mode: python ; coding: utf-8 -*-
22
from PyInstaller.utils.hooks import collect_all
33

4-
datas = [('src/web/static', 'web/static/')]
4+
datas = [('src/web/static', 'web/static/'), ('src/exports/templates', 'exports/templates/')]
55
binaries = []
66
hiddenimports = []
77
tmp_ret = collect_all('escpos')
88
datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
99

1010

1111
a = Analysis(
12-
['src\\main.py'],
12+
['src/main.py'],
1313
pathex=[],
1414
binaries=binaries,
1515
datas=datas,
@@ -33,14 +33,13 @@ exe = EXE(
3333
bootloader_ignore_signals=False,
3434
strip=False,
3535
upx=True,
36-
console=True,
36+
console=False,
3737
disable_windowed_traceback=False,
3838
argv_emulation=False,
3939
target_arch=None,
4040
codesign_identity=None,
4141
entitlements_file=None,
42-
icon=['icons\\icon.ico'],
43-
hide_console='hide-early',
42+
icon=['icons/icon.ico'],
4443
)
4544
coll = COLLECT(
4645
exe,

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
# JJ ARDFEvent
22

33
Open-source and simple ARDF event manager.
4+
5+
Code author: Jakub Jiroutek
6+
Logo author: Dan Zeman

0 commit comments

Comments
 (0)