Skip to content

Commit

Permalink
#Bug fix: #99 Settings not opening on linux/arch based distro
Browse files Browse the repository at this point in the history
  • Loading branch information
Bing committed Sep 24, 2023
1 parent e6eb909 commit 172eb3d
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 13 deletions.
6 changes: 3 additions & 3 deletions Main.py
Original file line number Diff line number Diff line change
Expand Up @@ -3252,8 +3252,7 @@ def _add_mode_radio_button(sizer, index, flash_mode, label, tooltip):
panel = wx.Panel(self)
vbox = wx.BoxSizer(orient=wx.VERTICAL)

NUMROWS = 12
fgs1 = wx.FlexGridSizer(rows=NUMROWS, cols=2, vgap=10, hgap=10)
fgs1 = wx.FlexGridSizer(cols=2, vgap=10, hgap=10)

# Add the toolbar
self._build_toolbar(self.toolbar_flags)
Expand Down Expand Up @@ -3556,8 +3555,9 @@ def _add_mode_radio_button(sizer, index, flash_mode, label, tooltip):
# this makes the second column expandable (index starts at 0)
fgs1.AddGrowableCol(1, 1)

row_count = fgs1.EffectiveRowsCount
# this makes the console row expandable (index starts at 0)
fgs1.AddGrowableRow(NUMROWS - 2, 1)
fgs1.AddGrowableRow(row_count - 2, 1)

# add flexgrid to vbox
vbox.Add(fgs1, proportion=1, flag=wx.ALL | wx.EXPAND, border=10)
Expand Down
3 changes: 1 addition & 2 deletions advanced_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ def __init__(self, *args, **kwargs):
# gap
# vSizer.Add((0, 20), proportion=0, flag=0, border=5)

NUMROWS = 9
fgs1 = wx.FlexGridSizer(rows=NUMROWS, cols=2, vgap=10, hgap=10)
fgs1 = wx.FlexGridSizer(cols=2, vgap=10, hgap=10)
# this makes the second column expandable (index starts at 0)
fgs1.AddGrowableCol(1, 1)

Expand Down
2 changes: 1 addition & 1 deletion build-on-mac.spec
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ exe = EXE(pyz,
icon='images/icon-256.icns')
app = BUNDLE(exe,
name='PixelFlasher.app',
version='5.8.0.0',
version='5.8.0.1',
icon='./images/icon-256.icns',
bundle_identifier='com.badabing.pixelflasher')
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
rm -rf build dist
VERSION=5.8.0.0
VERSION=5.8.0.1
NAME="PixelFlasher"
DIST_NAME="PixelFlasher"

Expand Down
2 changes: 1 addition & 1 deletion constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

APPNAME = 'PixelFlasher'
CONFIG_FILE_NAME = 'PixelFlasher.json'
VERSION = '5.8.0.0'
VERSION = '5.8.0.1'
SDKVERSION = '33.0.3'
WIDTH = 1400
HEIGHT = 1040
Expand Down
2 changes: 1 addition & 1 deletion windows-metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# https://github.com/DudeNr33/pyinstaller-versionfile
# create-version-file windows-metadata.yaml --outfile windows-version-info.txt
Version: 5.8.0.0
Version: 5.8.0.1
FileDescription: PixelFlasher
InternalName: PixelFlasher
OriginalFilename: PixelFlasher.exe
Expand Down
8 changes: 4 additions & 4 deletions windows-version-info.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ VSVersionInfo(
ffi=FixedFileInfo(
# filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
# Set not needed items to zero 0. Must always contain 4 elements.
filevers=(5,8,0,0),
prodvers=(5,8,0,0),
filevers=(5,8,0,1),
prodvers=(5,8,0,1),
# Contains a bitmask that specifies the valid bits 'flags'r
mask=0x3f,
# Contains a bitmask that specifies the Boolean attributes of the file.
Expand All @@ -32,12 +32,12 @@ VSVersionInfo(
u'040904B0',
[StringStruct(u'CompanyName', u''),
StringStruct(u'FileDescription', u'PixelFlasher'),
StringStruct(u'FileVersion', u'5.8.0.0'),
StringStruct(u'FileVersion', u'5.8.0.1'),
StringStruct(u'InternalName', u'PixelFlasher'),
StringStruct(u'LegalCopyright', u''),
StringStruct(u'OriginalFilename', u'PixelFlasher.exe'),
StringStruct(u'ProductName', u'PixelFlasher'),
StringStruct(u'ProductVersion', u'5.8.0.0')])
StringStruct(u'ProductVersion', u'5.8.0.1')])
]),
VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
]
Expand Down

0 comments on commit 172eb3d

Please sign in to comment.