Skip to content

Commit

Permalink
Merge pull request #1406 from DivingDuck/upd_translation
Browse files Browse the repository at this point in the history
 * Update for translation strings and translation files
 * Make the consequences of exit a print more transparent (#1415)
 * Fix temp button Off for heater or bed conversion error
 * Fix Pronterface double-listing filaments for upper and lower case types
 * Added translation files to Windows releases
 * Fix Pronterface problem with keyboard shortcuts that prevent inputs of some characters
  • Loading branch information
rockstorm101 committed May 25, 2024
2 parents 182c959 + 7fe22cb commit fef3945
Show file tree
Hide file tree
Showing 28 changed files with 16,914 additions and 6,406 deletions.
17 changes: 11 additions & 6 deletions .github/workflows/buildpackage-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,16 @@ jobs:
- name: Make pyinstaller spec
run: |
pyi-makespec --hidden-import="pkg_resources.py2_warn" -F --add-data "images/*;images" --add-data "*.png;." --add-data "*.ico;." -w -i pronterface.ico pronterface.py
pyi-makespec --hidden-import="pkg_resources.py2_warn" -F --add-data "images/*;images" --add-data "*.png;." --add-data "*.ico;." -c -i pronsole.ico pronsole.py
pyi-makespec --hidden-import="pkg_resources.py2_warn" -F --name "Pronterface" --add-data "images/*;images" --add-data "*.png;." --add-data "*.ico;." -w -i pronterface.ico pronterface.py
pyi-makespec --hidden-import="pkg_resources.py2_warn" -F --name "Pronsole" --add-data "images/*;images" --add-data "*.png;." --add-data "*.ico;." -c -i pronsole.ico pronsole.py
- name: Make pyinstaller build
run: |
pyinstaller --clean pronterface.spec -y
pyinstaller --clean pronsole.spec -y
pyinstaller --clean Pronterface.spec -y
pyinstaller --clean Pronsole.spec -y
- name: Copy translation files
run: |
cp -r locale dist
- name: Configuration for releases
if: ${{ github.event_name == 'release' }}
Expand All @@ -81,5 +85,6 @@ jobs:
with:
name: ${{ env.EXE_NAME }}_windows_${{ matrix.architecture }}_py${{ matrix.python-version }}
path: |
dist/pronterface.exe
dist/pronsole.exe
dist/Pronterface.exe
dist/Pronsole.exe
dist/locale
14 changes: 7 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@
*.swp
*.bak
*.mo
*.spec
uploads
.DS_Store
.vagrant
prontserve-env
pronterface.spec
pronsole.spec
plater.spec
printrun/gcoder_line.c
printrun/gcoder_line*.so
printrun/gcoder_line*.pyd
Expand All @@ -18,15 +16,17 @@ printrun/gcoder_line*.pyd
/build/
/dist/
/venv/
/v3/

/.vscode/
/.vs/

/wheelhouse/
*.egg-info/
/.eggs

/v3/
/.vs/
/dist
/slic3rconf.ini
/PrusaSlicer.ini
/.eggs
/SuperSlicer.ini

/release_locale.bat
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ available at: https://github.com/kliment/Printrun/releases/latest
> **Note for OSX users**: if OSX tells you `"pronterface.app" cannot be opened
> because the developer cannot be verified.`, you don't need to re-download
> it. Instead, you need to allow OSX to run the unsigned app. To do this,
> right click the application in Finder and select `Open`. Then click `Open`
> right- or ctrl click the application in Finder and select `Open`. Then click `Open`
> in the popup window that appears. You only need to do this once.

Expand Down
94 changes: 0 additions & 94 deletions locale/ar/LC_MESSAGES/plater.po

This file was deleted.

Loading

0 comments on commit fef3945

Please sign in to comment.