Skip to content

Commit 4aaf2d2

Browse files
badabing2005badabing2005
committed
- Improved generic kernel image matching and downloading from even older releases.
1 parent d9bcdc3 commit 4aaf2d2

15 files changed

Lines changed: 336 additions & 164 deletions

File tree

‎build-on-mac-intel-only.spec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ exe = EXE(pyz,
5959
icon='images/icon-dark-256.icns')
6060
app = BUNDLE(exe,
6161
name='PixelFlasher.app',
62-
version='8.15.0.0',
62+
version='8.15.1.0',
6363
icon='./images/icon-dark-256.icns',
6464
bundle_identifier='com.badabing.pixelflasher')

‎build-on-mac.spec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,6 @@ exe = EXE(pyz,
6060
icon='images/icon-dark-256.icns')
6161
app = BUNDLE(exe,
6262
name='PixelFlasher.app',
63-
version='8.15.0.0',
63+
version='8.15.1.0',
6464
icon='./images/icon-dark-256.icns',
6565
bundle_identifier='com.badabing.pixelflasher')

‎build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
# <https://www.gnu.org/licenses/>.
3333

3434
rm -rf build dist
35-
VERSION=8.15.0.0
35+
VERSION=8.15.1.0
3636
NAME="PixelFlasher"
3737
DIST_NAME="PixelFlasher"
3838

‎constants.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
APPNAME = 'PixelFlasher'
3737
CONFIG_FILE_NAME = 'PixelFlasher.json'
38-
VERSION = '8.15.0.0'
38+
VERSION = '8.15.1.0'
3939
SDKVERSION = '33.0.3'
4040
MAIN_WIDTH = 1400
4141
MAIN_HEIGHT = 1040

‎ksu_asset_selector.py‎

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,21 @@ def init_ui(self, message, suggested_asset, initial_filter):
8181
self.asset_list = wx.ListCtrl(self, style=wx.LC_REPORT | wx.LC_SINGLE_SEL)
8282
self.asset_list.AppendColumn(_("Asset Name"), width=500)
8383
self.asset_list.AppendColumn(_("Version"), width=100)
84-
self.asset_list.AppendColumn(_("Size"), width=120)
84+
self.asset_list.AppendColumn(_("Release"), width=220)
85+
self.asset_list.AppendColumn(_("Size"), width=100)
8586

8687
main_sizer.Add(self.asset_list, 1, wx.ALL | wx.EXPAND, 10)
8788

8889
# Suggested text
8990
self.suggested_text = None
9091
if suggested_asset:
91-
self.suggested_text = wx.StaticText(self, label=_("Suggested: %s") % suggested_asset['name'])
92+
release_info = suggested_asset.get('release_tag', '')
93+
if suggested_asset.get('release_date'):
94+
release_info = f"{suggested_asset['release_tag']} ({suggested_asset['release_date']})"
95+
suggested_label = f"{suggested_asset['name']}"
96+
if release_info:
97+
suggested_label += f" [{release_info}]"
98+
self.suggested_text = wx.StaticText(self, label=_("Suggested: %s") % suggested_label)
9299
self.suggested_text.SetFont(self.suggested_text.GetFont().Bold())
93100
main_sizer.Add(self.suggested_text, 0, wx.LEFT | wx.RIGHT | wx.BOTTOM, 10)
94101

@@ -112,7 +119,7 @@ def init_ui(self, message, suggested_asset, initial_filter):
112119
screen_size = display.GetGeometry().GetSize()
113120

114121
# Desired size
115-
desired_width = 840
122+
desired_width = 1030
116123
desired_height = 950
117124

118125
# Leave some margin from screen edges
@@ -156,6 +163,7 @@ def apply_filter(self, filter_text):
156163
def populate_list(self, suggested_asset=None):
157164
self.asset_list.DeleteAllItems()
158165

166+
found_better_match = False
159167
for i, asset in enumerate(self.filtered_assets):
160168
index = self.asset_list.InsertItem(i, asset['name'])
161169

@@ -164,6 +172,19 @@ def populate_list(self, suggested_asset=None):
164172
version = match.group(1) if match else _("Unknown")
165173
self.asset_list.SetItem(index, 1, version)
166174

175+
# Format release info
176+
release_tag = asset.get('release_tag', '')
177+
release_date = asset.get('release_date', '')
178+
if release_tag and release_date:
179+
release_info = f"{release_tag} ({release_date})"
180+
elif release_tag:
181+
release_info = release_tag
182+
elif release_date:
183+
release_info = release_date
184+
else:
185+
release_info = _("Unknown")
186+
self.asset_list.SetItem(index, 2, release_info)
187+
167188
# Format size
168189
size_bytes = asset.get('size', 0)
169190
if size_bytes > 1024 * 1024:
@@ -172,12 +193,20 @@ def populate_list(self, suggested_asset=None):
172193
size_str = f"{size_bytes / 1024:.1f} KB"
173194
else:
174195
size_str = f"{size_bytes} B"
175-
self.asset_list.SetItem(index, 2, size_str)
196+
self.asset_list.SetItem(index, 3, size_str)
176197

177198
# Select suggested asset
178199
if suggested_asset and asset['name'] == suggested_asset['name']:
179-
self.asset_list.Select(index)
180-
self.asset_list.Focus(index)
200+
if suggested_asset['release_tag'] == asset.get('release_tag', ''):
201+
found_better_match = True
202+
self.asset_list.Select(index)
203+
self.asset_list.Focus(index)
204+
print(f"Suggested asset match: {suggested_asset['name']}, release: {suggested_asset['release_tag']} ({suggested_asset['release_date']})")
205+
wx.Yield()
206+
207+
if not found_better_match:
208+
self.asset_list.Select(index)
209+
self.asset_list.Focus(index)
181210

182211
def on_filter_changed(self, event):
183212
filter_text = self.filter_text.GetValue()
@@ -186,13 +215,16 @@ def on_filter_changed(self, event):
186215
self.populate_list()
187216

188217
def on_filter_cleared(self, event):
218+
self.filter_text.SetValue('')
189219
self.filtered_assets = self.assets.copy()
190220
self.populate_list()
221+
event.Skip()
191222

192223
def on_ok(self, event):
193224
selected_index = self.asset_list.GetFirstSelected()
194225
if selected_index != -1:
195226
self.selected_asset = self.filtered_assets[selected_index]
227+
print(f"User selected asset: {self.selected_asset['name']}, release: {self.selected_asset.get('release_tag', 'unknown')} ({self.selected_asset.get('release_date', '')})")
196228
self.EndModal(wx.ID_OK)
197229
else:
198230
wx.MessageBox(_("Please select an asset."), _("No Selection"), wx.OK | wx.ICON_WARNING)

‎locale/en/LC_MESSAGES/pixelflasher.po‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3034,3 +3034,7 @@ msgstr ""
30343034

30353035
msgid "Select a KSU asset:"
30363036
msgstr ""
3037+
3038+
msgid "All releases (including older ones)"
3039+
msgstr ""
3040+

‎locale/es/LC_MESSAGES/pixelflasher.po‎

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3009,64 +3009,68 @@ msgstr "Editar script antes de continuar"
30093009
# Download Progress Window
30103010
##############################################################################
30113011
msgid "Downloading: %s"
3012-
msgstr ""
3012+
msgstr "Descargando: %s"
30133013

30143014
##############################################################################
30153015
# File Editor Window
30163016
##############################################################################
30173017
msgid "Open Shell"
3018-
msgstr ""
3018+
msgstr "Abrir Shell"
30193019

30203020
msgid "Save and Continue"
3021-
msgstr ""
3021+
msgstr "Guardar y Continuar"
30223022

30233023
msgid "Cancel and Abort"
3024-
msgstr ""
3024+
msgstr "Cancelar y Abort"
30253025

30263026
msgid "Open Folder in working directory"
3027-
msgstr ""
3027+
msgstr "Abrir carpeta en el directorio de trabajo"
30283028

30293029
msgid "Open command shell in working directory"
3030-
msgstr ""
3030+
msgstr "Abrir shell de comandos en el directorio de trabajo"
30313031

30323032
msgid "Open Folder in working directory\nNote: PF_FILEMANAGER needs to be set."
3033-
msgstr ""
3033+
msgstr "Abrir carpeta en el directorio de trabajo\nNota: PF_FILEMANAGER debe estar configurado."
30343034

30353035
msgid "Open Terminal shell in working directory"
3036-
msgstr ""
3036+
msgstr "Abrir shell de Terminal en el directorio de trabajo"
30373037

30383038
msgid "Save the file and continue."
3039-
msgstr ""
3039+
msgstr "Guardar el archivo y continuar."
30403040

30413041
msgid "Cancel and Abort."
3042-
msgstr ""
3042+
msgstr "Cancelar y abortar."
30433043

30443044
##############################################################################
30453045
# Ksu Asset Selector
30463046
##############################################################################
30473047
msgid "Filter:"
3048-
msgstr ""
3048+
msgstr "Filtro:"
30493049

30503050
msgid "Search assets..."
3051-
msgstr ""
3051+
msgstr "Buscar activos..."
30523052

30533053
msgid "Asset Name"
3054-
msgstr ""
3054+
msgstr "Nombre del activo"
30553055

30563056
msgid "Size"
3057-
msgstr ""
3057+
msgstr "Tamaño"
30583058

30593059
msgid "Suggested: %s"
3060-
msgstr ""
3060+
msgstr "Sugerido: %s"
30613061

30623062
msgid "Please select an asset."
3063-
msgstr ""
3063+
msgstr "Por favor seleccione un activo."
30643064

30653065
msgid "No Selection"
3066-
msgstr ""
3066+
msgstr "Sin selección"
30673067

30683068
msgid "Select KSU Asset"
3069-
msgstr ""
3069+
msgstr "Seleccionar activo KSU"
30703070

30713071
msgid "Select a KSU asset:"
3072-
msgstr ""
3072+
msgstr "Seleccionar un activo KSU:"
3073+
3074+
msgid "All releases (including older ones)"
3075+
msgstr "Todas las versiones (incluidas las anteriores)"
3076+

‎locale/fr/LC_MESSAGES/pixelflasher.po‎

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3008,64 +3008,68 @@ msgstr "Éditer le script avant de continuer"
30083008
# Download Progress Window
30093009
##############################################################################
30103010
msgid "Downloading: %s"
3011-
msgstr ""
3011+
msgstr "Téléchargement : %s"
30123012

30133013
##############################################################################
30143014
# File Editor Window
30153015
##############################################################################
30163016
msgid "Open Shell"
3017-
msgstr ""
3017+
msgstr "Ouvrir le shell"
30183018

30193019
msgid "Save and Continue"
3020-
msgstr ""
3020+
msgstr "Enregistrer et continuer"
30213021

30223022
msgid "Cancel and Abort"
3023-
msgstr ""
3023+
msgstr "Annuler et abandonner"
30243024

30253025
msgid "Open Folder in working directory"
3026-
msgstr ""
3026+
msgstr "Ouvrir le dossier dans le répertoire de travail"
30273027

30283028
msgid "Open command shell in working directory"
3029-
msgstr ""
3029+
msgstr "Ouvrir le shell de commande dans le répertoire de travail"
30303030

30313031
msgid "Open Folder in working directory\nNote: PF_FILEMANAGER needs to be set."
3032-
msgstr ""
3032+
msgstr "Ouvrir le dossier dans le répertoire de travail\nNote : PF_FILEMANAGER doit être défini."
30333033

30343034
msgid "Open Terminal shell in working directory"
3035-
msgstr ""
3035+
msgstr "Ouvrir le shell Terminal dans le répertoire de travail"
30363036

30373037
msgid "Save the file and continue."
3038-
msgstr ""
3038+
msgstr "Enregistrer le fichier et continuer."
30393039

30403040
msgid "Cancel and Abort."
3041-
msgstr ""
3041+
msgstr "Annuler et abandonner."
30423042

30433043
##############################################################################
30443044
# Ksu Asset Selector
30453045
##############################################################################
30463046
msgid "Filter:"
3047-
msgstr ""
3047+
msgstr "Filtrer :"
30483048

30493049
msgid "Search assets..."
3050-
msgstr ""
3050+
msgstr "Rechercher des actifs..."
30513051

30523052
msgid "Asset Name"
3053-
msgstr ""
3053+
msgstr "Nom de l'actif"
30543054

30553055
msgid "Size"
3056-
msgstr ""
3056+
msgstr "Taille"
30573057

30583058
msgid "Suggested: %s"
3059-
msgstr ""
3059+
msgstr "Suggéré : %s"
30603060

30613061
msgid "Please select an asset."
3062-
msgstr ""
3062+
msgstr "Veuillez sélectionner un actif."
30633063

30643064
msgid "No Selection"
3065-
msgstr ""
3065+
msgstr "Aucune sélection"
30663066

30673067
msgid "Select KSU Asset"
3068-
msgstr ""
3068+
msgstr "Sélectionner l'actif KSU"
30693069

30703070
msgid "Select a KSU asset:"
3071-
msgstr ""
3071+
msgstr "Sélectionnez un actif KSU :"
3072+
3073+
msgid "All releases (including older ones)"
3074+
msgstr "Toutes les versions (y compris les anciennes)"
3075+

‎locale/it/LC_MESSAGES/pixelflasher.po‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3070,3 +3070,7 @@ msgstr "Selezione Asset KSU"
30703070

30713071
msgid "Select a KSU asset:"
30723072
msgstr "Selezioona un asset KSU:"
3073+
3074+
msgid "All releases (including older ones)"
3075+
msgstr "Tutte le release (incluse quelle più vecchie)"
3076+

‎locale/zh_CN/LC_MESSAGES/pixelflasher.po‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3076,3 +3076,7 @@ msgstr ""
30763076

30773077
msgid "Select a KSU asset:"
30783078
msgstr ""
3079+
3080+
msgid "All releases (including older ones)"
3081+
msgstr ""
3082+

0 commit comments

Comments
 (0)