From 9fb56417c8a76db4ab284bfaab26b175d9ed88c3 Mon Sep 17 00:00:00 2001 From: Per Christian Henden Date: Sun, 4 Feb 2024 12:29:34 +0100 Subject: [PATCH 1/2] Fix illegal font size for wxpython 4.2.x --- GoSync/GoSyncSelectionPage.py | 2 +- GoSync/GoSyncSettingsPage.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GoSync/GoSyncSelectionPage.py b/GoSync/GoSyncSelectionPage.py index 7c9af76..382d44d 100644 --- a/GoSync/GoSyncSelectionPage.py +++ b/GoSync/GoSyncSelectionPage.py @@ -34,7 +34,7 @@ class SelectionPage(wx.Panel): def __init__(self, parent, sync_model): wx.Panel.__init__(self, parent, style=wx.RAISED_BORDER) - headerFont = wx.Font(11.5, wx.SWISS, wx.NORMAL, wx.NORMAL) + headerFont = wx.Font(12, wx.SWISS, wx.NORMAL, wx.NORMAL) self.sync_model = sync_model self.dstc = GoSyncDriveTree(self, pos=(0,0)) diff --git a/GoSync/GoSyncSettingsPage.py b/GoSync/GoSyncSettingsPage.py index b16c6e2..a3cd233 100644 --- a/GoSync/GoSyncSettingsPage.py +++ b/GoSync/GoSyncSettingsPage.py @@ -34,7 +34,7 @@ class SettingsPage(wx.Panel): def __init__(self, parent, sync_model): wx.Panel.__init__(self, parent) - headerFont = wx.Font(11.5, wx.SWISS, wx.NORMAL, wx.NORMAL) + headerFont = wx.Font(12, wx.SWISS, wx.NORMAL, wx.NORMAL) self.sync_model = sync_model self.dstc = GoSyncDriveTree(self, pos=(0,0)) From 3f3db6f2b621deb384d30901aac37c2098c281ea Mon Sep 17 00:00:00 2001 From: Per Christian Henden Date: Sun, 4 Feb 2024 12:40:52 +0100 Subject: [PATCH 2/2] Fix wx.AssertionError - cannot both align and expand at the same time --- GoSync/DriveUsageBox.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GoSync/DriveUsageBox.py b/GoSync/DriveUsageBox.py index ec2676b..a5fedd2 100644 --- a/GoSync/DriveUsageBox.py +++ b/GoSync/DriveUsageBox.py @@ -72,7 +72,7 @@ def __init__(self, parent, drive_size_bytes, id=wx.ID_ANY): mainSizer = wx.BoxSizer(wx.VERTICAL) mainSizer.Add(self.t1, 0, wx.ALL|wx.EXPAND, 5) #mainSizer.Add(self.basePanel, 0, wx.ALL|wx.FIXED_MINSIZE, 5) - mainSizer.Add(self.basePanel, 0, wx.ALL|wx.EXPAND|wx.ALIGN_CENTER, 10) + mainSizer.Add(self.basePanel, 0, wx.ALL|wx.EXPAND, 10) legendAudio = wx.Panel(self, size=legendSize, style=legendStyle) legendAudio.SetBackgroundColour(self.audioPanelColor) @@ -125,7 +125,7 @@ def __init__(self, parent, drive_size_bytes, id=wx.ID_ANY): legendSizer.Add(legendFree, 0, wx.ALL|wx.EXPAND, 5) legendSizer.Add(legendFreeText, 0, wx.ALL|wx.EXPAND, 5) - mainSizer.Add(legendSizer, 1, wx.ALL|wx.ALIGN_CENTER|wx.EXPAND, 10) + mainSizer.Add(legendSizer, 1, wx.ALL|wx.EXPAND, 10) self.SetSizerAndFit(mainSizer) def FileSizeHumanize(self, size):