From fabbc91fae92a70d908b94bc255144162f8fc33a Mon Sep 17 00:00:00 2001 From: Maxetto Date: Fri, 5 Sep 2025 12:08:32 +0200 Subject: [PATCH 1/5] Add x86 in Forms --- rdgenerator/forms.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rdgenerator/forms.py b/rdgenerator/forms.py index 9adb080..07f3818 100644 --- a/rdgenerator/forms.py +++ b/rdgenerator/forms.py @@ -3,7 +3,7 @@ from PIL import Image class GenerateForm(forms.Form): #Platform - platform = forms.ChoiceField(choices=[('windows','Windows'),('linux','Linux (currently unavailable)'),('android','Android'),('macos','macOS')], initial='windows') + platform = forms.ChoiceField(choices=[('windows','Windows 64Bit'),('windows-x86','Windows 32Bit'),('linux','Linux (currently unavailable)'),('android','Android'),('macos','macOS')], initial='windows') version = forms.ChoiceField(choices=[('master','nightly'),('1.4.1','1.4.1'),('1.4.0','1.4.0'),('1.3.9','1.3.9'),('1.3.8','1.3.8'),('1.3.7','1.3.7'),('1.3.6','1.3.6'),('1.3.5','1.3.5'),('1.3.4','1.3.4'),('1.3.3','1.3.3')], initial='1.4.1') help_text="'master' is the development version (nightly build) with the latest features but may be less stable" delayFix = forms.BooleanField(initial=True, required=False) @@ -66,6 +66,7 @@ class GenerateForm(forms.Form): enableRecording = forms.BooleanField(initial=True, required=False) enableBlockingInput = forms.BooleanField(initial=True, required=False) enableRemoteModi = forms.BooleanField(initial=False, required=False) + hidecm = forms.BooleanField(initial=False, required=False) #Other removeWallpaper = forms.BooleanField(initial=True, required=False) @@ -76,7 +77,6 @@ class GenerateForm(forms.Form): #custom added features cycleMonitor = forms.BooleanField(initial=False, required=False) xOffline = forms.BooleanField(initial=False, required=False) - hidecm = forms.BooleanField(initial=False, required=False) removeNewVersionNotif = forms.BooleanField(initial=False, required=False) def clean_iconfile(self): From 668998e390c6d20c74680023701a659cbc06ada2 Mon Sep 17 00:00:00 2001 From: Maxetto Date: Fri, 5 Sep 2025 12:12:48 +0200 Subject: [PATCH 2/5] Update Views --- rdgenerator/views.py | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/rdgenerator/views.py b/rdgenerator/views.py index ccf6242..b99e147 100644 --- a/rdgenerator/views.py +++ b/rdgenerator/views.py @@ -119,14 +119,18 @@ def generator_view(request): decodedCustom['password'] = permPass if theme != "system": if themeDorO == "default": - decodedCustom['default-settings']['theme'] = theme + if platform == "windows-x86": + decodedCustom['default-settings']['allow-darktheme'] = 'Y' if theme == "dark" else 'N' + else: + decodedCustom['default-settings']['theme'] = theme elif themeDorO == "override": - decodedCustom['override-settings']['theme'] = theme - #decodedCustom['approve-mode'] = passApproveMode + if platform == "windows-x86": + decodedCustom['override-settings']['allow-darktheme'] = 'Y' if theme == "dark" else 'N' + else: + decodedCustom['override-settings']['theme'] = theme decodedCustom['enable-lan-discovery'] = 'N' if denyLan else 'Y' #decodedCustom['direct-server'] = 'Y' if enableDirectIP else 'N' decodedCustom['allow-auto-disconnect'] = 'Y' if autoClose else 'N' - decodedCustom['allow-remove-wallpaper'] = 'Y' if removeWallpaper else 'N' if permissionsDorO == "default": decodedCustom['default-settings']['access-mode'] = permissionsType decodedCustom['default-settings']['enable-keyboard'] = 'Y' if enableKeyboard else 'N' @@ -139,9 +143,10 @@ def generator_view(request): decodedCustom['default-settings']['enable-block-input'] = 'Y' if enableBlockingInput else 'N' decodedCustom['default-settings']['allow-remote-config-modification'] = 'Y' if enableRemoteModi else 'N' decodedCustom['default-settings']['direct-server'] = 'Y' if enableDirectIP else 'N' - decodedCustom['default-settings']['hide-cm'] = 'Y' if hidecm else 'N' decodedCustom['default-settings']['verification-method'] = 'use-permanent-password' if hidecm else 'use-both-passwords' decodedCustom['default-settings']['approve-mode'] = passApproveMode + decodedCustom['default-settings']['allow-hide-cm'] = 'Y' if hidecm else 'N' + decodedCustom['default-settings']['allow-remove-wallpaper'] = 'Y' if removeWallpaper else 'N' else: decodedCustom['override-settings']['access-mode'] = permissionsType decodedCustom['override-settings']['enable-keyboard'] = 'Y' if enableKeyboard else 'N' @@ -153,6 +158,11 @@ def generator_view(request): decodedCustom['override-settings']['enable-record-session'] = 'Y' if enableRecording else 'N' decodedCustom['override-settings']['enable-block-input'] = 'Y' if enableBlockingInput else 'N' decodedCustom['override-settings']['allow-remote-config-modification'] = 'Y' if enableRemoteModi else 'N' + decodedCustom['override-settings']['direct-server'] = 'Y' if enableDirectIP else 'N' + decodedCustom['override-settings']['verification-method'] = 'use-permanent-password' if hidecm else 'use-both-passwords' + decodedCustom['override-settings']['approve-mode'] = passApproveMode + decodedCustom['override-settings']['allow-hide-cm'] = 'Y' if hidecm else 'N' + decodedCustom['override-settings']['allow-remove-wallpaper'] = 'Y' if removeWallpaper else 'N' for line in defaultManual.splitlines(): k, value = line.split('=') @@ -179,16 +189,17 @@ def generator_view(request): extras['rdgen'] = 'true' extras['cycleMonitor'] = 'true' if cycleMonitor else 'false' extras['xOffline'] = 'true' if xOffline else 'false' - extras['hidecm'] = 'true' if hidecm else 'false' extras['removeNewVersionNotif'] = 'true' if removeNewVersionNotif else 'false' extras['compname'] = compname extra_input = json.dumps(extras) ####from here run the github action, we need user, repo, access token. if platform == 'windows': - url = 'https://api.github.com/repos/'+_settings.GHUSER+'/'+_settings.REPONAME+'/actions/workflows/generator-windows.yml/dispatches' + url = 'https://api.github.com/repos/'+_settings.GHUSER+'/'+_settings.REPONAME+'/actions/workflows/generator-windows.yml/dispatches' + if platform == 'windows-x86': + url = 'https://api.github.com/repos/'+_settings.GHUSER+'/'+_settings.REPONAME+'/actions/workflows/generator-windows-x86.yml/dispatches' elif platform == 'linux': - url = 'https://api.github.com/repos/'+_settings.GHUSER+'/'+_settings.REPONAME+'/actions/workflows/generator-linux.yml/dispatches' + url = 'https://api.github.com/repos/'+_settings.GHUSER+'/'+_settings.REPONAME+'/actions/workflows/generator-linux.yml/dispatches' elif platform == 'android': url = 'https://api.github.com/repos/'+_settings.GHUSER+'/'+_settings.REPONAME+'/actions/workflows/generator-android.yml/dispatches' elif platform == 'macos': @@ -392,4 +403,4 @@ def save_custom_client(request): for chunk in file.chunks(): f.write(chunk) - return HttpResponse("File saved successfully!") \ No newline at end of file + return HttpResponse("File saved successfully!") From be47bcbe466020e3c0320e08b640b29f5efbb8a0 Mon Sep 17 00:00:00 2001 From: Maxetto Date: Fri, 5 Sep 2025 12:14:05 +0200 Subject: [PATCH 3/5] Update Generated page --- rdgenerator/templates/generated.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rdgenerator/templates/generated.html b/rdgenerator/templates/generated.html index 609a407..5f7ecce 100644 --- a/rdgenerator/templates/generated.html +++ b/rdgenerator/templates/generated.html @@ -129,6 +129,8 @@ {% if platform == 'windows' %} Download {{filename}}.exe Download {{filename}}.msi + {% elif platform == 'windows-x86' %} + Download {{filename}}.exe {% elif platform == 'linux' %} Download {{filename}}-x86_64.deb Download {{filename}}-x86_64.rpm @@ -177,7 +179,7 @@ platformLogos.macos.style.display = 'block'; platformNote.textContent = 'Note: For macOS, you may need to adjust security settings to run the application.'; platformNote.style.display = 'block'; - } else if (platform === 'windows') { + } else if (platform === 'windows' || platform === 'windows-x86') { document.getElementById('pageTitle').textContent = 'Windows Build Generated'; platformLogos.windows.style.display = 'block'; platformNote.textContent = 'Note: You might need to disable SmartScreen or adjust Windows security settings.'; @@ -199,4 +201,4 @@ updatePlatformUI(); -{{ ... }} \ No newline at end of file +{{ ... }} From 23e91a5ea7f9178df1142f378c5edc847c20ce4d Mon Sep 17 00:00:00 2001 From: Maxetto Date: Fri, 5 Sep 2025 12:16:40 +0200 Subject: [PATCH 4/5] Update Generator Page --- rdgenerator/templates/generator.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/rdgenerator/templates/generator.html b/rdgenerator/templates/generator.html index 44dee9e..1c70d96 100644 --- a/rdgenerator/templates/generator.html +++ b/rdgenerator/templates/generator.html @@ -233,7 +233,8 @@