Skip to content

Commit

Permalink
feat: generated v1.5.1 executables for macos (#77)
Browse files Browse the repository at this point in the history
* feat: generated v1.5.1 executables for macos

* wip: created a modal for randomized segments

* feat: updated menu fonts.

* chore: added vscode settings

* test: added test mp4 file

* feat: added timeline util methods

* feat: added random timeline generation

* feat: allow random segment generation

* chore: updated doc

* chore: generated executable v1.6.0 for win32

---------

Co-authored-by: Hanxiong Shi <[email protected]>
  • Loading branch information
shihanxiong and Hanxiong Shi authored Apr 21, 2023
1 parent bfe874c commit 6937866
Show file tree
Hide file tree
Showing 16 changed files with 369 additions and 32 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
# testing
/coverage
/src/Test/__pycache__/
/src/test/

# production
src/build/
Expand All @@ -30,3 +29,6 @@ yarn-error.log*
*.aac
*.wav
*.log

# do not ignore
!/src/test/*.mp4
132 changes: 132 additions & 0 deletions .vscode_config/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
{
"workbench.iconTheme": "material-icon-theme",
"workbench.colorTheme": "Blackboard",
"editor.tabSize": 2,
"editor.minimap.enabled": false,
"javascript.updateImportsOnFileMove.enabled": "always",
"javascript.validate.enable": false,
"files.eol": "\n",
"extensions.ignoreRecommendations": false,
"colorize.include": ["**/*.js"],
"editor.suggestSelection": "first",
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[ruby]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[typescriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[python]": {
"editor.formatOnSave": true,
"editor.formatOnType": true
},
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[jsonc]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"git.enableSmartCommit": true,
"sonarlint.rules": {
"typescript:S3699": {
"level": "off"
},
"typescript:S1488": {
"level": "off"
},
"javascript:S4138": {
"level": "off"
}
},
"[html]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"diffEditor.ignoreTrimWhitespace": false,
"typescript.updateImportsOnFileMove.enabled": "always",
"explorer.confirmDelete": false,
"[markdown]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"editor.fontFamily": "Consolas, 'Courier New', monospace",
"jupyter.askForKernelRestart": false,
"json.maxItemsComputed": 50000,
"workbench.editorAssociations": {
"*.ipynb": "jupyter-notebook"
},
"security.workspace.trust.untrustedFiles": "open",
"search.showLineNumbers": true,
"editor.bracketPairColorization.enabled": true,
"[dockercompose]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"code-runner.clearPreviousOutput": true,
"prettier.singleQuote": true,
"prettier.trailingComma": "all",
"prettier.printWidth": 120,
"[dockerfile]": {
"editor.defaultFormatter": "ms-azuretools.vscode-docker"
},
"code-runner.runInTerminal": false,
"code-runner.executorMap": {
"javascript": "node",
"java": "cd $dir && javac $fileName && java $fileNameWithoutExt",
"c": "cd $dir && gcc $fileName -o $fileNameWithoutExt && $dir$fileNameWithoutExt",
"cpp": "cd $dir && g++ $fileName -o $fileNameWithoutExt && $dir$fileNameWithoutExt",
"objective-c": "cd $dir && gcc -framework Cocoa $fileName -o $fileNameWithoutExt && $dir$fileNameWithoutExt",
"php": "php",
"python": "python -u",
"perl": "perl",
"perl6": "perl6",
"ruby": "ruby",
"go": "go run",
"lua": "lua",
"groovy": "groovy",
"powershell": "powershell -ExecutionPolicy ByPass -File",
"bat": "cmd /c",
"shellscript": "bash",
"fsharp": "fsi",
"csharp": "scriptcs",
"vbscript": "cscript //Nologo",
"typescript": "ts-node",
"coffeescript": "coffee",
"scala": "scala",
"swift": "swift",
"julia": "julia",
"crystal": "crystal",
"ocaml": "ocaml",
"r": "Rscript",
"applescript": "osascript",
"clojure": "lein exec",
"haxe": "haxe --cwd $dirWithoutTrailingSlash --run $fileNameWithoutExt",
"rust": "cd $dir && rustc $fileName && $dir$fileNameWithoutExt",
"racket": "racket",
"scheme": "csi -script",
"ahk": "autohotkey",
"autoit": "autoit3",
"dart": "dart",
"pascal": "cd $dir && fpc $fileName && $dir$fileNameWithoutExt",
"d": "cd $dir && dmd $fileName && $dir$fileNameWithoutExt",
"haskell": "runhaskell",
"nim": "nim compile --verbosity:0 --hints:off --run",
"lisp": "sbcl --script",
"kit": "kitc --run",
"v": "v run",
"sass": "sass --style expanded",
"scss": "scss --style expanded",
"less": "cd $dir && lessc $fileName $fileNameWithoutExt.css",
"FortranFreeForm": "cd $dir && gfortran $fileName -o $fileNameWithoutExt && $dir$fileNameWithoutExt",
"fortran-modern": "cd $dir && gfortran $fileName -o $fileNameWithoutExt && $dir$fileNameWithoutExt",
"fortran_fixed-form": "cd $dir && gfortran $fileName -o $fileNameWithoutExt && $dir$fileNameWithoutExt",
"fortran": "cd $dir && gfortran $fileName -o $fileNameWithoutExt && $dir$fileNameWithoutExt",
"sml": "cd $dir && sml $fileName"
}
}
8 changes: 8 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Versions

### v1.6.0

- added application menu
- now application supports random :game_die: timeline generation with
- number of videos
- minutes per segment
- total number of segments

### v1.5.1

- application now disables play / pause buttons to dis-allow double clicking
Expand Down
4 changes: 4 additions & 0 deletions src/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import logging
from tkinter import ttk
from windows import set_dpi_awareness
from menu_frame import MenuFrame
from video_frame import VideoFrame
from settings_frame import SettingsFrame
from timeline_frame import TimelineFrame
Expand Down Expand Up @@ -56,6 +57,7 @@ def __init__(self):

# components
component_padding = (10, 10)
self.menu_component = MenuFrame(self)
self.video_component = VideoFrame(self, padding=component_padding)
self.video_component.grid(row=0, sticky="NEWS")
self.settings_component = SettingsFrame(
Expand All @@ -71,6 +73,7 @@ def __init__(self):

# register all components
self.components = [
self.menu_component,
self.video_component,
self.settings_component,
self.timeline_component,
Expand Down Expand Up @@ -101,6 +104,7 @@ def app_refresh(self):
# start app
root = VideoLoom()


# set app logo in UI
if SysUtils.is_running_in_pyinstaller_bundle():
root.iconbitmap(FileUtils.get_bundled_file_path(
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<dict>
<key>Resources/generated-8cb2455f77fe4dc4a5ecf642c291c7e8ac9c966e5b7b85adf5f6464564b20f75.icns</key>
<data>
vuogYLBsDN4KOSfIVakhe84bxgw=
oM7H8UklRdw0H0YMvFEF3dfqHWY=
</data>
</dict>
<key>files2</key>
Expand All @@ -15,7 +15,7 @@
<dict>
<key>hash2</key>
<data>
aGzZEtk7F3RQEFyxOxU+AKIGAppEH8dfbBSYW1zFm7A=
kqm5nZ+R5z8eDS92FO1eh5hywsKSS3koBjNbybm2dbE=
</data>
</dict>
</dict>
Expand Down
Loading

0 comments on commit 6937866

Please sign in to comment.