Tiny display / behavior cleanups to "Set Binds Location" dialog

Author: emersonrp

BindControl.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 import sys, os, platform, re
-from pathlib import Path, PureWindowsPath
+from pathlib import Path
 
 import wx
 import wx.lib.mixins.inspection
@@ -395,6 +395,7 @@ def OnProfDirButton(self, _ = None):
         config = wx.ConfigBase.Get()
         bindpath = config.Read('BindPath')
         separator = "\\" if platform.system() == "Windows" else "/"
+        if bindpath[-1:] == separator: separator = ''
 
         dirSizer = wx.BoxSizer(wx.HORIZONTAL)
         dirSizer.Add(wx.StaticText(ProfDirDialog, -1,
@@ -443,6 +444,10 @@ def OnProfDirButton(self, _ = None):
 
         # need this out here in case we cancelled on a previously-blank one.
         # This is very very unlikely to happen and awful if it does.
+        #
+        # TODO-ish:  if they erase an existing valid one or otherwise cause an
+        # error, and then hit "cancel" this gets triggered, which is not
+        # perfect - this logic needs a little smartening.
         if PathText.HasErrors(): return self.OnProfDirButton()
 
         self.CheckProfDirButtonErrors()
@@ -501,10 +506,11 @@ def OnPathTextChanged(self, evt):
         else:
             textctrl.RemoveError('spaces')
 
-        if PureWindowsPath(value).is_reserved():
-            textctrl.AddError('reserved', 'The name you have selected is a reserved filename in Windows.  Please select another.')
-        else:
-            textctrl.RemoveError('reserved')
+        if platform.system() == 'Windows':
+            if os.path.isreserved(value):
+                textctrl.AddError('reserved', 'The name you have selected is a reserved filename in Windows.  Please select another.')
+            else:
+                textctrl.RemoveError('reserved')
 
         if value: # don't do this check if it's blank
             exists = None

UI/ErrorControls.py

@@ -7,6 +7,7 @@ class ErrorControlMixin:
     SetToolTip             : Callable
     GetTextCtrl            : Callable
     HasTextCtrl            : Callable
+    Refresh                 : Callable
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -24,6 +25,7 @@ def AddWarning(self, errname, tooltip = None):
             self.StylingTarget().SetBackgroundColour((255,255,200))
         self.Warnings[errname] = tooltip
         self.SetErrorToolTip()
+        self.Refresh()
 
     def RemoveWarning(self, errname):
         self.Warnings.pop(errname, None)
@@ -32,11 +34,13 @@ def RemoveWarning(self, errname):
         elif not self.Errors:
             self.StylingTarget().SetOwnBackgroundColour((255,255,200))
         self.SetErrorToolTip()
+        self.Refresh()
 
     def AddError(self, errname, tooltip = None):
         self.StylingTarget().SetBackgroundColour((255,200,200))
         self.Errors[errname] = tooltip
         self.SetErrorToolTip()
+        self.Refresh()
 
     def RemoveError(self, errname):
         self.Errors.pop(errname, None)
@@ -45,6 +49,7 @@ def RemoveError(self, errname):
         elif not self.Errors:
             self.StylingTarget().SetOwnBackgroundColour((255,255,200))
         self.SetErrorToolTip()
+        self.Refresh()
 
     # TODO pick one of these next two and stick with it
     def HasAnyError(self): return self.Errors != {}
@@ -56,6 +61,7 @@ def ClearErrors(self):
         errors = list(self.Errors)
         for error in errors: self.RemoveError(error)
         self.SetErrorToolTip()
+        self.Refresh()
 
     def StylingTarget(self):
         return self.GetTextCtrl() if (isinstance(self, wx.PickerBase) and self.HasTextCtrl()) else self