lpcmanager

Firmware update py2 => py3 (wxpy3 => wxpy4)

19 months ago, Edouard Tisserant
7c1c9a104bb3
Parents cc9644b8e7e2
Children 70f8f690580d
Firmware update py2 => py3 (wxpy3 => wxpy4)
1 files changed, 9 insertions(+), 9 deletions(-)
  • +9 -9
    FirmwareUpdateDialog.py
    • --- a/FirmwareUpdateDialog.py Mon Nov 11 15:33:01 2024 +0100
    +++ b/FirmwareUpdateDialog.py Mon Nov 11 16:03:30 2024 +0100
    @@ -52,7 +52,7 @@
    self.ButtonSizer = self.CreateButtonSizer(wx.OK|wx.CANCEL)
    # Sizers
    - self.SizerFirmwareUpdateImageFile = wx.FlexGridSizer(cols=2, rows=1)
    + self.SizerFirmwareUpdateImageFile = wx.FlexGridSizer(cols=2, hgap=0, rows=1, vgap=0)
    self.SizerFirmwareUpdateImageFile.AddGrowableCol(0)
    self.SizerFirmwareUpdateImageFile.AddGrowableRow(0)
    @@ -61,7 +61,7 @@
    self.SizerFirmwareUpdateImageFile.Add(self.ButtonFirmwareUpdateImageFile,
    flag=wx.RIGHT|wx.ALIGN_RIGHT)
    self.SizerFirmwareUpdateImageFileBoxSizer = wx.StaticBoxSizer(wx.StaticBox(self, label=_('Update image file:')), wx.VERTICAL)
    - self.SizerFirmwareUpdateImageFileBoxSizer.AddSizer(self.SizerFirmwareUpdateImageFile, flag=wx.EXPAND)
    + self.SizerFirmwareUpdateImageFileBoxSizer.Add(self.SizerFirmwareUpdateImageFile, flag=wx.EXPAND)
    self.RadioBoxFirmwareUpdateTypeChunks = wx.RadioBox(
    @@ -74,19 +74,19 @@
    self.SizerFirmwareUpdateSizeChunks.Add(self.SpinCtrlFirmwareUpdateChunksSize,
    flag=wx.EXPAND|wx.ALL)
    - self.SizerFirmwareUpdateChunks = wx.FlexGridSizer(cols=2, rows=1)
    + self.SizerFirmwareUpdateChunks = wx.FlexGridSizer(cols=2, hgap=0, rows=1, vgap=0)
    self.SizerFirmwareUpdateChunks.AddGrowableCol(0)
    self.SizerFirmwareUpdateChunks.AddGrowableCol(1)
    self.SizerFirmwareUpdateChunks.Add(self.RadioBoxFirmwareUpdateTypeChunks, flag=wx.EXPAND|wx.RIGHT, border=20)
    self.SizerFirmwareUpdateChunks.Add(self.SizerFirmwareUpdateSizeChunks, flag=wx.EXPAND)
    - self.MainSizer = wx.FlexGridSizer(cols=1, rows=4)
    + self.MainSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=4, vgap=0)
    self.MainSizer.AddGrowableCol(0)
    self.MainSizer.AddGrowableRow(1)
    - self.MainSizer.AddSizer(self.StaticVersionTextBoxSizer, flag=wx.EXPAND|wx.LEFT|wx.TOP|wx.RIGHT, border=20)
    - self.MainSizer.AddSizer(self.SizerFirmwareUpdateImageFileBoxSizer, flag=wx.EXPAND|wx.LEFT|wx.TOP|wx.RIGHT, border=20)
    - self.MainSizer.AddSizer(self.SizerFirmwareUpdateChunks, flag=wx.EXPAND|wx.LEFT|wx.TOP|wx.RIGHT, border=20)
    - self.MainSizer.AddSizer(self.ButtonSizer, flag=wx.ALIGN_RIGHT|wx.ALL, border=20)
    + self.MainSizer.Add(self.StaticVersionTextBoxSizer, flag=wx.EXPAND|wx.LEFT|wx.TOP|wx.RIGHT, border=20)
    + self.MainSizer.Add(self.SizerFirmwareUpdateImageFileBoxSizer, flag=wx.EXPAND|wx.LEFT|wx.TOP|wx.RIGHT, border=20)
    + self.MainSizer.Add(self.SizerFirmwareUpdateChunks, flag=wx.EXPAND|wx.LEFT|wx.TOP|wx.RIGHT, border=20)
    + self.MainSizer.Add(self.ButtonSizer, flag=wx.ALIGN_RIGHT|wx.ALL, border=20)
    # Set the main sizer
    @@ -94,7 +94,7 @@
    self.SetSizer(self.MainSizer)
    def OnButtonFirmwareUpdateImageFile(self, event):
    - dlg = wx.FileDialog(self, _("Choose a firmware image file"), expanduser("~"), "", "*", wx.OPEN)
    + dlg = wx.FileDialog(self, _("Choose a firmware image file"), expanduser("~"), "", "*", wx.FD_OPEN)
    if dlg.ShowModal() == wx.ID_OK:
    path = dlg.GetPath()
    self.TextCtrltFirmwareUpdateImageFile.SetValue(path)