Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Loading screen changed #22

Merged
merged 1 commit into from
Nov 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ build
.DS_Store
__pycache__
.env
.venv2/*
.venv2
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"git.ignoreLimitWarning": true
}
Empty file added movement_log.txt
Empty file.
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,10 @@
"name": "@electron-forge/maker-squirrel",
"config": {
"name": "cameramouse",
"authors": "Manny and Hao",
"description": "Rewrite of cameramouse.org",
"certificateFile": "certificate.pfx"
"authors": "Manny, Hao and Farid",
"description": "Rewrite of cameramouse.org",
"certificateFile": "certificate.pfx",
"loadingGif": "src/assets/LOADING GIF 1.gif"
}
},
{
Expand Down
Binary file added src/assets/Loading GIF 1.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/loading-gif.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 1 addition & 9 deletions src/pyTracker/main.spec
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,13 @@ a = Analysis(
)
pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)

splash = Splash('src/assets/bu.png',
binaries=a.binaries,
datas=a.datas,
text_pos=(35, 50),
text_size=15,
text_color='white')

exe = EXE(
pyz,
a.scripts,
a.binaries,
a.zipfiles,
a.datas,
splash,
splash.binaries,

[],
name='main',
debug=False,
Expand Down
9 changes: 0 additions & 9 deletions src/pyTracker/src/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,6 @@

if __name__ == "__main__":

# close splash screen
try:
# pyi_splash may not be resolved in some environments.
import pyi_splash
# Update the text on the splash screen
pyi_splash.update_text("App is ready. You can start tracking now.")
pyi_splash.close()
except:
pass

frameSize = getFrameSize()
trackerState.setWebcamFrameSize(frameSize[0], frameSize[1])
Expand Down
Loading