diff --git a/.github/workflows/buildpackage-win.yml b/.github/workflows/buildpackage-win.yml index 21eb263d..fbaf5e28 100644 --- a/.github/workflows/buildpackage-win.yml +++ b/.github/workflows/buildpackage-win.yml @@ -54,12 +54,12 @@ 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: Configuration for releases if: ${{ github.event_name == 'release' }} @@ -81,5 +81,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 + local diff --git a/locale/de/LC_MESSAGES/pronterface.po b/locale/de/LC_MESSAGES/pronterface.po index 496432df..72d05820 100644 --- a/locale/de/LC_MESSAGES/pronterface.po +++ b/locale/de/LC_MESSAGES/pronterface.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: Pronterface\n" -"POT-Creation-Date: 2024-01-29 21:48+0100\n" -"PO-Revision-Date: 2024-01-30 11:20+0100\n" +"POT-Creation-Date: 2024-02-03 16:23+0100\n" +"PO-Revision-Date: 2024-02-03 16:25+0100\n" "Last-Translator: DivingDuck\n" "Language-Team: <>\n" "Language: de\n" @@ -278,6 +278,10 @@ msgstr "" "(Geben Sie 'help' für einfache\n" "Hilfefunktionen ein)" +#: printrun\gui\log.py:33 +msgid "Command to send" +msgstr "Befehl zum Senden" + #: printrun\gui\log.py:46 msgid "Send" msgstr "Senden" @@ -2134,8 +2138,8 @@ msgid " Open file" msgstr " Öffne Datei" #: printrun\pronterface.py:815 -msgid "&Open...\tCtrl+O" -msgstr "&Öffnen...\tStrg+O" +msgid "&Open..." +msgstr "&Öffnen..." #: printrun\pronterface.py:816 msgid " Save file" @@ -2154,8 +2158,8 @@ msgid " Clear output console" msgstr " Ausgabe Konsole leeren" #: printrun\pronterface.py:826 -msgid "Clear console\tCtrl+L" -msgstr "Konsole leeren\tStrg+L" +msgid "Clear console" +msgstr "Konsole leeren" #: printrun\pronterface.py:827 msgid " Closes the Window" diff --git a/locale/pronterface.pot b/locale/pronterface.pot index 46059cca..27d3ef72 100644 --- a/locale/pronterface.pot +++ b/locale/pronterface.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-01-29 21:48+0100\n" +"POT-Creation-Date: 2024-02-03 16:23+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -253,6 +253,10 @@ msgid "" "help function)" msgstr "" +#: printrun\gui\log.py:33 +msgid "Command to send" +msgstr "" + #: printrun\gui\log.py:46 msgid "Send" msgstr "" @@ -1871,7 +1875,7 @@ msgid " Open file" msgstr "" #: printrun\pronterface.py:815 -msgid "&Open...\tCtrl+O" +msgid "&Open..." msgstr "" #: printrun\pronterface.py:816 @@ -1891,7 +1895,7 @@ msgid " Clear output console" msgstr "" #: printrun\pronterface.py:826 -msgid "Clear console\tCtrl+L" +msgid "Clear console" msgstr "" #: printrun\pronterface.py:827 diff --git a/printrun/gcview.py b/printrun/gcview.py index f7bdf801..b4b3e77a 100755 --- a/printrun/gcview.py +++ b/printrun/gcview.py @@ -64,7 +64,7 @@ def set_gcview_params(self, path_width, path_height): for obj in self.objects[1:]: if isinstance(obj.model, actors.GcodeModel): obj.model.set_path_size(self.path_halfwidth, self.path_halfheight) - has_changed = True + has_changed = True return has_changed # E selected for Up because is above D diff --git a/printrun/gui/log.py b/printrun/gui/log.py index e3c72962..2743f034 100644 --- a/printrun/gui/log.py +++ b/printrun/gui/log.py @@ -30,7 +30,7 @@ def __init__(self, root, parentpanel = None): lbrs = wx.BoxSizer(wx.HORIZONTAL) root.commandbox = wx.TextCtrl(bottom_panel, style = wx.TE_PROCESS_ENTER) root.commandbox.SetToolTip(wx.ToolTip(_("Send commands to printer\n(Type 'help' for simple\nhelp function)"))) - root.commandbox.Hint = 'Command to [S]end' + root.commandbox.Hint = _("Command to send") root.commandbox.Bind(wx.EVT_TEXT_ENTER, root.sendline) root.commandbox.Bind(wx.EVT_CHAR, root.cbkey) def deselect(ev): diff --git a/printrun/pronterface.py b/printrun/pronterface.py index aea7be41..4d6c8a6b 100644 --- a/printrun/pronterface.py +++ b/printrun/pronterface.py @@ -812,7 +812,7 @@ def create_menu(self): # File menu m = wx.Menu() - self.Bind(wx.EVT_MENU, self.loadfile, m.Append(-1, _("&Open...\tCtrl+O"), _(" Open file"))) + self.Bind(wx.EVT_MENU, self.loadfile, m.Append(-1, _("&Open...")+"\tCtrl+O", _(" Open file"))) self.savebtn = m.Append(-1, _("&Save..."), _(" Save file")) self.savebtn.Enable(False) self.Bind(wx.EVT_MENU, self.savefile, self.savebtn) @@ -823,7 +823,7 @@ def create_menu(self): self.Bind(wx.EVT_MENU_RANGE, self.load_recent_file, id = wx.ID_FILE1, id2 = wx.ID_FILE9) m.Append(wx.ID_ANY, _("&Recent Files"), recent) - self.Bind(wx.EVT_MENU, self.clear_log, m.Append(-1, _("Clear console\tCtrl+L"), _(" Clear output console"))) + self.Bind(wx.EVT_MENU, self.clear_log, m.Append(-1, _("Clear console")+"\tCtrl+L", _(" Clear output console"))) self.Bind(wx.EVT_MENU, self.on_exit, m.Append(wx.ID_EXIT, _("E&xit"), _(" Closes the Window"))) self.menustrip.Append(m, _("&File")) diff --git a/release_windows.bat b/release_windows.bat index 31d6770b..44fbaa16 100644 --- a/release_windows.bat +++ b/release_windows.bat @@ -146,24 +146,24 @@ echo **************************************** echo ****** Collect all data for build ****** echo **************************************** -pyi-makespec -F --add-data images/*;images --add-data *.png;. --add-data *.ico;. -w -i pronterface.ico pronterface.py -pyi-makespec -F --add-data images/*;images --add-data *.png;. --add-data *.ico;. -c -i pronsole.ico pronsole.py +pyi-makespec -F --name "Pronterface" --add-data images/*;images --add-data *.png;. --add-data *.ico;. -w -i pronterface.ico pronterface.py +pyi-makespec -F --name "Pronsole" --add-data images/*;images --add-data *.png;. --add-data *.ico;. -c -i pronsole.ico pronsole.py rem Plater stand alone application is experimental only (See remark). -pyi-makespec -F --add-data images/*;images --add-data *.png;. --add-data *.ico;. -w -i plater.ico plater.py +pyi-makespec -F --name "Plater" --add-data images/*;images --add-data *.png;. --add-data *.ico;. -w -i plater.ico plater.py echo *************************************************************** echo ****** Build Pronterface, Pronsole and Plater executables ***** echo *************************************************************** echo echo ** Build Pronterface executable ** -pyinstaller --clean pronterface.spec -y +pyinstaller --clean Pronterface.spec -y echo echo ** Build Pronsole executable ** -pyinstaller --clean pronsole.spec -y +pyinstaller --clean Pronsole.spec -y echo echo ** Build Plater executable ** rem Plater stand alone application is experimental only (See remark). -pyinstaller --clean plater.spec -y +pyinstaller --clean Plater.spec -y echo ********************************