rummage 4.26__tar.gz → 4.26.1__tar.gz

{rummage-4.26 → rummage-4.26.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rummage
-Version: 4.26
+Version: 4.26.1
 Summary: A GUI search and replace app.
 Project-URL: Homepage, https://github.com/facelessuser/Rummage
 Author-email: Isaac Muse <Isaac.Muse@gmail.com>
@@ -24,7 +24,7 @@ Classifier: Topic :: Text Processing :: Filters
 Classifier: Topic :: Text Processing :: Markup :: HTML
 Requires-Python: >=3.10
 Requires-Dist: backrefs>=7.0
-Requires-Dist: bracex>=3.0
+Requires-Dist: bracex>=3.0.1
 Requires-Dist: chardet>=7.4.3
 Requires-Dist: coloraide>=8.10
 Requires-Dist: filelock>=3.29.7

{rummage-4.26 → rummage-4.26.1}/docs/src/markdown/about/changelog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 4.26.1
+
+-   **FIX**: Require `bracex` 3.0.1 for a bug fix related to an edge case with numerical and character sequences.
+-   **FIX**: Fix formatting of size limit controls.
+-   **FIX**: Color adjustments for latest macOS releases.
+
 ## 4.26
 
 -   **NEW**: Show file sizes in proper, various increments: bytes, KB, MB, and GB.

{rummage-4.26 → rummage-4.26.1}/gui.fbp

@@ -2879,7 +2879,7 @@
                                       <object class="wxGridBagSizer" expanded="false">
                                         <property name="empty_cell_size"></property>
                                         <property name="flexible_direction">wxBOTH</property>
-                                        <property name="growablecols">7</property>
+                                        <property name="growablecols">6</property>
                                         <property name="growablerows">0,1,2,3</property>
                                         <property name="hgap">0</property>
                                         <property name="minimum_size"></property>
@@ -3022,159 +3022,144 @@
                                         </object>
                                         <object class="gbsizeritem" expanded="false">
                                           <property name="border">5</property>
-                                          <property name="colspan">3</property>
+                                          <property name="colspan">1</property>
+                                          <property name="column">3</property>
+                                          <property name="flag">wxALL|wxEXPAND</property>
+                                          <property name="row">0</property>
+                                          <property name="rowspan">1</property>
+                                          <object class="wxChoice" expanded="false">
+                                            <property name="BottomDockable">1</property>
+                                            <property name="LeftDockable">1</property>
+                                            <property name="RightDockable">1</property>
+                                            <property name="TopDockable">1</property>
+                                            <property name="aui_layer">0</property>
+                                            <property name="aui_name"></property>
+                                            <property name="aui_position">0</property>
+                                            <property name="aui_row">0</property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</property>
+                                            <property name="center_pane">0</property>
+                                            <property name="choices">&quot;bytes&quot; &quot;KB&quot; &quot;MB&quot; &quot;GB&quot; &quot;TB&quot;</property>
+                                            <property name="close_button">1</property>
+                                            <property name="context_help"></property>
+                                            <property name="context_menu">1</property>
+                                            <property name="default_pane">0</property>
+                                            <property name="dock">Dock</property>
+                                            <property name="dock_fixed">0</property>
+                                            <property name="docking">Left</property>
+                                            <property name="drag_accept_files">0</property>
+                                            <property name="enabled">1</property>
+                                            <property name="fg"></property>
+                                            <property name="floatable">1</property>
+                                            <property name="font"></property>
+                                            <property name="gripper">0</property>
+                                            <property name="hidden">0</property>
+                                            <property name="id">wxID_ANY</property>
+                                            <property name="max_size"></property>
+                                            <property name="maximize_button">0</property>
+                                            <property name="maximum_size"></property>
+                                            <property name="min_size"></property>
+                                            <property name="minimize_button">0</property>
+                                            <property name="minimum_size"></property>
+                                            <property name="moveable">1</property>
+                                            <property name="name">m_size_type_choice</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="selection">1</property>
+                                            <property name="show">1</property>
+                                            <property name="size"></property>
+                                            <property name="style"></property>
+                                            <property name="subclass">; ; forward_declare</property>
+                                            <property name="toolbar_pane">0</property>
+                                            <property name="tooltip"></property>
+                                            <property name="validator_data_type"></property>
+                                            <property name="validator_style">wxFILTER_NONE</property>
+                                            <property name="validator_type">wxDefaultValidator</property>
+                                            <property name="validator_variable"></property>
+                                            <property name="window_extra_style"></property>
+                                            <property name="window_name"></property>
+                                            <property name="window_style"></property>
+                                          </object>
+                                        </object>
+                                        <object class="gbsizeritem" expanded="false">
+                                          <property name="border">5</property>
+                                          <property name="colspan">1</property>
                                           <property name="column">2</property>
-                                          <property name="flag">wxEXPAND</property>
+                                          <property name="flag">wxALL|wxEXPAND</property>
                                           <property name="row">0</property>
                                           <property name="rowspan">1</property>
-                                          <object class="wxFlexGridSizer" expanded="false">
-                                            <property name="cols">2</property>
-                                            <property name="flexible_direction">wxHORIZONTAL</property>
-                                            <property name="growablecols"></property>
-                                            <property name="growablerows"></property>
-                                            <property name="hgap">0</property>
+                                          <object class="wxTextCtrl" expanded="false">
+                                            <property name="BottomDockable">1</property>
+                                            <property name="LeftDockable">1</property>
+                                            <property name="RightDockable">1</property>
+                                            <property name="TopDockable">1</property>
+                                            <property name="aui_layer">0</property>
+                                            <property name="aui_name"></property>
+                                            <property name="aui_position">0</property>
+                                            <property name="aui_row">0</property>
+                                            <property name="best_size"></property>
+                                            <property name="bg"></property>
+                                            <property name="caption"></property>
+                                            <property name="caption_visible">1</property>
+                                            <property name="center_pane">0</property>
+                                            <property name="close_button">1</property>
+                                            <property name="context_help"></property>
+                                            <property name="context_menu">1</property>
+                                            <property name="default_pane">0</property>
+                                            <property name="dock">Dock</property>
+                                            <property name="dock_fixed">0</property>
+                                            <property name="docking">Left</property>
+                                            <property name="drag_accept_files">0</property>
+                                            <property name="enabled">1</property>
+                                            <property name="fg"></property>
+                                            <property name="floatable">1</property>
+                                            <property name="font"></property>
+                                            <property name="gripper">0</property>
+                                            <property name="hidden">0</property>
+                                            <property name="id">wxID_ANY</property>
+                                            <property name="max_size"></property>
+                                            <property name="maximize_button">0</property>
+                                            <property name="maximum_size">-1,-1</property>
+                                            <property name="maxlength">0</property>
+                                            <property name="min_size"></property>
+                                            <property name="minimize_button">0</property>
                                             <property name="minimum_size"></property>
-                                            <property name="name">fgSizer37</property>
-                                            <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
-                                            <property name="permission">none</property>
-                                            <property name="rows">0</property>
-                                            <property name="vgap">0</property>
-                                            <object class="sizeritem" expanded="false">
-                                              <property name="border">5</property>
-                                              <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
-                                              <property name="proportion">1</property>
-                                              <object class="wxTextCtrl" expanded="false">
-                                                <property name="BottomDockable">1</property>
-                                                <property name="LeftDockable">1</property>
-                                                <property name="RightDockable">1</property>
-                                                <property name="TopDockable">1</property>
-                                                <property name="aui_layer">0</property>
-                                                <property name="aui_name"></property>
-                                                <property name="aui_position">0</property>
-                                                <property name="aui_row">0</property>
-                                                <property name="best_size"></property>
-                                                <property name="bg"></property>
-                                                <property name="caption"></property>
-                                                <property name="caption_visible">1</property>
-                                                <property name="center_pane">0</property>
-                                                <property name="close_button">1</property>
-                                                <property name="context_help"></property>
-                                                <property name="context_menu">1</property>
-                                                <property name="default_pane">0</property>
-                                                <property name="dock">Dock</property>
-                                                <property name="dock_fixed">0</property>
-                                                <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
-                                                <property name="enabled">1</property>
-                                                <property name="fg"></property>
-                                                <property name="floatable">1</property>
-                                                <property name="font"></property>
-                                                <property name="gripper">0</property>
-                                                <property name="hidden">0</property>
-                                                <property name="id">wxID_ANY</property>
-                                                <property name="max_size"></property>
-                                                <property name="maximize_button">0</property>
-                                                <property name="maximum_size">-1,-1</property>
-                                                <property name="maxlength">0</property>
-                                                <property name="min_size"></property>
-                                                <property name="minimize_button">0</property>
-                                                <property name="minimum_size"></property>
-                                                <property name="moveable">1</property>
-                                                <property name="name">m_size_text</property>
-                                                <property name="pane_border">1</property>
-                                                <property name="pane_position"></property>
-                                                <property name="pane_size"></property>
-                                                <property name="permission">protected</property>
-                                                <property name="pin_button">1</property>
-                                                <property name="pos"></property>
-                                                <property name="resize">Resizable</property>
-                                                <property name="show">1</property>
-                                                <property name="size">-1,-1</property>
-                                                <property name="style"></property>
-                                                <property name="subclass"></property>
-                                                <property name="toolbar_pane">0</property>
-                                                <property name="tooltip"></property>
-                                                <property name="validator_data_type"></property>
-                                                <property name="validator_style">wxFILTER_NONE|wxFILTER_NUMERIC</property>
-                                                <property name="validator_type">wxDefaultValidator</property>
-                                                <property name="validator_variable"></property>
-                                                <property name="value">1000</property>
-                                                <property name="window_extra_style"></property>
-                                                <property name="window_name"></property>
-                                                <property name="window_style"></property>
-                                              </object>
-                                            </object>
-                                            <object class="sizeritem" expanded="false">
-                                              <property name="border">5</property>
-                                              <property name="flag">wxALL</property>
-                                              <property name="proportion">0</property>
-                                              <object class="wxChoice" expanded="false">
-                                                <property name="BottomDockable">1</property>
-                                                <property name="LeftDockable">1</property>
-                                                <property name="RightDockable">1</property>
-                                                <property name="TopDockable">1</property>
-                                                <property name="aui_layer">0</property>
-                                                <property name="aui_name"></property>
-                                                <property name="aui_position">0</property>
-                                                <property name="aui_row">0</property>
-                                                <property name="best_size"></property>
-                                                <property name="bg"></property>
-                                                <property name="caption"></property>
-                                                <property name="caption_visible">1</property>
-                                                <property name="center_pane">0</property>
-                                                <property name="choices">&quot;bytes&quot; &quot;KB&quot; &quot;MB&quot; &quot;GB&quot; &quot;TB&quot;</property>
-                                                <property name="close_button">1</property>
-                                                <property name="context_help"></property>
-                                                <property name="context_menu">1</property>
-                                                <property name="default_pane">0</property>
-                                                <property name="dock">Dock</property>
-                                                <property name="dock_fixed">0</property>
-                                                <property name="docking">Left</property>
-                                                <property name="drag_accept_files">0</property>
-                                                <property name="enabled">1</property>
-                                                <property name="fg"></property>
-                                                <property name="floatable">1</property>
-                                                <property name="font"></property>
-                                                <property name="gripper">0</property>
-                                                <property name="hidden">0</property>
-                                                <property name="id">wxID_ANY</property>
-                                                <property name="max_size"></property>
-                                                <property name="maximize_button">0</property>
-                                                <property name="maximum_size"></property>
-                                                <property name="min_size"></property>
-                                                <property name="minimize_button">0</property>
-                                                <property name="minimum_size"></property>
-                                                <property name="moveable">1</property>
-                                                <property name="name">m_size_type_choice</property>
-                                                <property name="pane_border">1</property>
-                                                <property name="pane_position"></property>
-                                                <property name="pane_size"></property>
-                                                <property name="permission">protected</property>
-                                                <property name="pin_button">1</property>
-                                                <property name="pos"></property>
-                                                <property name="resize">Resizable</property>
-                                                <property name="selection">1</property>
-                                                <property name="show">1</property>
-                                                <property name="size"></property>
-                                                <property name="style"></property>
-                                                <property name="subclass">; ; forward_declare</property>
-                                                <property name="toolbar_pane">0</property>
-                                                <property name="tooltip"></property>
-                                                <property name="validator_data_type"></property>
-                                                <property name="validator_style">wxFILTER_NONE</property>
-                                                <property name="validator_type">wxDefaultValidator</property>
-                                                <property name="validator_variable"></property>
-                                                <property name="window_extra_style"></property>
-                                                <property name="window_name"></property>
-                                                <property name="window_style"></property>
-                                              </object>
-                                            </object>
+                                            <property name="moveable">1</property>
+                                            <property name="name">m_size_text</property>
+                                            <property name="pane_border">1</property>
+                                            <property name="pane_position"></property>
+                                            <property name="pane_size"></property>
+                                            <property name="permission">protected</property>
+                                            <property name="pin_button">1</property>
+                                            <property name="pos"></property>
+                                            <property name="resize">Resizable</property>
+                                            <property name="show">1</property>
+                                            <property name="size">-1,-1</property>
+                                            <property name="style"></property>
+                                            <property name="subclass"></property>
+                                            <property name="toolbar_pane">0</property>
+                                            <property name="tooltip"></property>
+                                            <property name="validator_data_type"></property>
+                                            <property name="validator_style">wxFILTER_NONE|wxFILTER_NUMERIC</property>
+                                            <property name="validator_type">wxDefaultValidator</property>
+                                            <property name="validator_variable"></property>
+                                            <property name="value">1000</property>
+                                            <property name="window_extra_style"></property>
+                                            <property name="window_name"></property>
+                                            <property name="window_style"></property>
                                           </object>
                                         </object>
                                         <object class="gbsizeritem" expanded="false">
                                           <property name="border">5</property>
                                           <property name="colspan">1</property>
-                                          <property name="column">6</property>
+                                          <property name="column">5</property>
                                           <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT</property>
                                           <property name="row">0</property>
                                           <property name="rowspan">1</property>
@@ -3239,7 +3224,7 @@
                                         <object class="gbsizeritem" expanded="false">
                                           <property name="border">5</property>
                                           <property name="colspan">1</property>
-                                          <property name="column">7</property>
+                                          <property name="column">6</property>
                                           <property name="flag">wxALL|wxEXPAND</property>
                                           <property name="row">0</property>
                                           <property name="rowspan">1</property>
@@ -3305,7 +3290,7 @@
                                         <object class="gbsizeritem" expanded="false">
                                           <property name="border">5</property>
                                           <property name="colspan">1</property>
-                                          <property name="column">8</property>
+                                          <property name="column">7</property>
                                           <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
                                           <property name="row">0</property>
                                           <property name="rowspan">1</property>
@@ -3639,7 +3624,7 @@
                                         <object class="gbsizeritem" expanded="false">
                                           <property name="border">5</property>
                                           <property name="colspan">1</property>
-                                          <property name="column">6</property>
+                                          <property name="column">5</property>
                                           <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT</property>
                                           <property name="row">1</property>
                                           <property name="rowspan">1</property>
@@ -3704,7 +3689,7 @@
                                         <object class="gbsizeritem" expanded="false">
                                           <property name="border">5</property>
                                           <property name="colspan">1</property>
-                                          <property name="column">7</property>
+                                          <property name="column">6</property>
                                           <property name="flag">wxALL|wxEXPAND</property>
                                           <property name="row">1</property>
                                           <property name="rowspan">1</property>
@@ -3770,7 +3755,7 @@
                                         <object class="gbsizeritem" expanded="false">
                                           <property name="border">5</property>
                                           <property name="colspan">1</property>
-                                          <property name="column">8</property>
+                                          <property name="column">7</property>
                                           <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
                                           <property name="row">1</property>
                                           <property name="rowspan">1</property>
@@ -4104,7 +4089,7 @@
                                         <object class="gbsizeritem" expanded="false">
                                           <property name="border">5</property>
                                           <property name="colspan">1</property>
-                                          <property name="column">5</property>
+                                          <property name="column">4</property>
                                           <property name="flag">wxALL|wxEXPAND|wxRESERVE_SPACE_EVEN_IF_HIDDEN</property>
                                           <property name="row">0</property>
                                           <property name="rowspan">3</property>

{rummage-4.26 → rummage-4.26.1}/requirements/project.txt

@@ -1,6 +1,6 @@
 chardet>=7.4.3
 backrefs>=7.0
-bracex>=3.0
+bracex>=3.0.1
 wcmatch>=11.0,<12.0
 wxpython>=4.1.0
 filelock>=3.29.7

{rummage-4.26 → rummage-4.26.1}/rummage/lib/__meta__.py

@@ -189,7 +189,7 @@ def parse_version(ver):
 
 
 #   (major, minor, micro, release type, pre-release build, post-release build, development-release)
-__version_info__ = Version(4, 26, 0, 'final')
+__version_info__ = Version(4, 26, 1, 'final')
 __version__ = __version_info__._get_canonical()
 __app__ = "Rummage"
 __status__ = __version_info__[3]

{rummage-4.26 → rummage-4.26.1}/rummage/lib/gui/data/docs/about/changelog.html

@@ -25,6 +25,12 @@
 
   <!-- Table of Content (Don't show for static sites) -->
     <h1 id="changelog">Changelog</h1>
+<h2 id="4261">4.26.1</h2>
+<ul>
+<li><strong>FIX</strong>: Require <code>bracex</code> 3.0.1 for a bug fix related to an edge case with numerical and character sequences.</li>
+<li><strong>FIX</strong>: Fix formatting of size limit controls.</li>
+<li><strong>FIX</strong>: Color adjustments for latest macOS releases.</li>
+</ul>
 <h2 id="426">4.26</h2>
 <ul>
 <li><strong>NEW</strong>: Show file sizes in proper, various increments: bytes, KB, MB, and GB.</li>

{rummage-4.26 → rummage-4.26.1}/rummage/lib/gui/gui.py

@@ -252,31 +252,24 @@ class RummageFrame ( wx.Frame ):
         self.m_logic_choice.SetSelection( 0 )
         gbSizer3.Add( self.m_logic_choice, wx.GBPosition( 0, 1 ), wx.GBSpan( 1, 1 ), wx.ALL, 5 )
 
-        fgSizer37 = wx.FlexGridSizer( 0, 2, 0, 0 )
-        fgSizer37.SetFlexibleDirection( wx.HORIZONTAL )
-        fgSizer37.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED )
-
-        self.m_size_text = wx.TextCtrl( self.m_limit_panel, wx.ID_ANY, u"1000", wx.DefaultPosition, wx.Size( -1,-1 ), 0 )
-        fgSizer37.Add( self.m_size_text, 1, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )
-
         m_size_type_choiceChoices = [ u"bytes", u"KB", u"MB", u"GB", u"TB" ]
         self.m_size_type_choice = wx.Choice( self.m_limit_panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_size_type_choiceChoices, 0 )
         self.m_size_type_choice.SetSelection( 1 )
-        fgSizer37.Add( self.m_size_type_choice, 0, wx.ALL, 5 )
-
+        gbSizer3.Add( self.m_size_type_choice, wx.GBPosition( 0, 3 ), wx.GBSpan( 1, 1 ), wx.ALL|wx.EXPAND, 5 )
 
-        gbSizer3.Add( fgSizer37, wx.GBPosition( 0, 2 ), wx.GBSpan( 1, 3 ), wx.EXPAND, 5 )
+        self.m_size_text = wx.TextCtrl( self.m_limit_panel, wx.ID_ANY, u"1000", wx.DefaultPosition, wx.Size( -1,-1 ), 0 )
+        gbSizer3.Add( self.m_size_text, wx.GBPosition( 0, 2 ), wx.GBSpan( 1, 1 ), wx.ALL|wx.EXPAND, 5 )
 
         self.m_exclude_label = wx.StaticText( self.m_limit_panel, wx.ID_ANY, u"Exclude folders", wx.DefaultPosition, wx.DefaultSize, 0 )
         self.m_exclude_label.Wrap( -1 )
 
-        gbSizer3.Add( self.m_exclude_label, wx.GBPosition( 0, 6 ), wx.GBSpan( 1, 1 ), wx.ALL|wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT, 5 )
+        gbSizer3.Add( self.m_exclude_label, wx.GBPosition( 0, 5 ), wx.GBSpan( 1, 1 ), wx.ALL|wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT, 5 )
 
         self.m_exclude_textbox = AutoCompleteCombo(self.m_limit_panel, wx.ID_ANY)
-        gbSizer3.Add( self.m_exclude_textbox, wx.GBPosition( 0, 7 ), wx.GBSpan( 1, 1 ), wx.ALL|wx.EXPAND, 5 )
+        gbSizer3.Add( self.m_exclude_textbox, wx.GBPosition( 0, 6 ), wx.GBSpan( 1, 1 ), wx.ALL|wx.EXPAND, 5 )
 
         self.m_dirregex_checkbox = wx.CheckBox( self.m_limit_panel, wx.ID_ANY, u"Regex", wx.DefaultPosition, wx.DefaultSize, 0 )
-        gbSizer3.Add( self.m_dirregex_checkbox, wx.GBPosition( 0, 8 ), wx.GBSpan( 1, 1 ), wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )
+        gbSizer3.Add( self.m_dirregex_checkbox, wx.GBPosition( 0, 7 ), wx.GBSpan( 1, 1 ), wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )
 
         self.m_modified_label = wx.StaticText( self.m_limit_panel, wx.ID_ANY, u"Modified", wx.DefaultPosition, wx.DefaultSize, 0 )
         self.m_modified_label.Wrap( -1 )
@@ -297,13 +290,13 @@ class RummageFrame ( wx.Frame ):
         self.m_filematch_label = wx.StaticText( self.m_limit_panel, wx.ID_ANY, u"Files which match", wx.DefaultPosition, wx.DefaultSize, 0 )
         self.m_filematch_label.Wrap( -1 )
 
-        gbSizer3.Add( self.m_filematch_label, wx.GBPosition( 1, 6 ), wx.GBSpan( 1, 1 ), wx.ALL|wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT, 5 )
+        gbSizer3.Add( self.m_filematch_label, wx.GBPosition( 1, 5 ), wx.GBSpan( 1, 1 ), wx.ALL|wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT, 5 )
 
         self.m_filematch_textbox = AutoCompleteCombo(self.m_limit_panel, wx.ID_ANY)
-        gbSizer3.Add( self.m_filematch_textbox, wx.GBPosition( 1, 7 ), wx.GBSpan( 1, 1 ), wx.ALL|wx.EXPAND, 5 )
+        gbSizer3.Add( self.m_filematch_textbox, wx.GBPosition( 1, 6 ), wx.GBSpan( 1, 1 ), wx.ALL|wx.EXPAND, 5 )
 
         self.m_fileregex_checkbox = wx.CheckBox( self.m_limit_panel, wx.ID_ANY, u"Regex", wx.DefaultPosition, wx.DefaultSize, 0 )
-        gbSizer3.Add( self.m_fileregex_checkbox, wx.GBPosition( 1, 8 ), wx.GBSpan( 1, 1 ), wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )
+        gbSizer3.Add( self.m_fileregex_checkbox, wx.GBPosition( 1, 7 ), wx.GBSpan( 1, 1 ), wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )
 
         self.m_created_label = wx.StaticText( self.m_limit_panel, wx.ID_ANY, u"Created", wx.DefaultPosition, wx.DefaultSize, 0 )
         self.m_created_label.Wrap( -1 )
@@ -322,7 +315,7 @@ class RummageFrame ( wx.Frame ):
         gbSizer3.Add( self.m_created_time_picker, wx.GBPosition( 2, 3 ), wx.GBSpan( 1, 1 ), wx.BOTTOM|wx.LEFT|wx.TOP|wx.ALIGN_CENTER_VERTICAL, 5 )
 
         self.m_staticline41 = wx.StaticLine( self.m_limit_panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_VERTICAL )
-        gbSizer3.Add( self.m_staticline41, wx.GBPosition( 0, 5 ), wx.GBSpan( 3, 1 ), wx.ALL|wx.EXPAND|wx.RESERVE_SPACE_EVEN_IF_HIDDEN, 5 )
+        gbSizer3.Add( self.m_staticline41, wx.GBPosition( 0, 4 ), wx.GBSpan( 3, 1 ), wx.ALL|wx.EXPAND|wx.RESERVE_SPACE_EVEN_IF_HIDDEN, 5 )
 
         fgSizer32 = wx.FlexGridSizer( 0, 6, 0, 0 )
         fgSizer32.AddGrowableCol( 0 )
@@ -353,7 +346,7 @@ class RummageFrame ( wx.Frame ):
         gbSizer3.Add( fgSizer32, wx.GBPosition( 3, 0 ), wx.GBSpan( 1, 9 ), wx.EXPAND, 5 )
 
 
-        gbSizer3.AddGrowableCol( 7 )
+        gbSizer3.AddGrowableCol( 6 )
         gbSizer3.AddGrowableRow( 0 )
         gbSizer3.AddGrowableRow( 1 )
         gbSizer3.AddGrowableRow( 2 )

{rummage-4.26 → rummage-4.26.1}/rummage/lib/gui/util/__init__.py

@@ -22,8 +22,8 @@ WX_420 = wx.__version__ >= '4.2.0'
 
 # High Sierra and below
 MAC_OLD = _MAC_VER < (10, 14)
-MAC_LIGHT = 0.025
-MAC_DARK = 0.075
+MAC_LIGHT = 0.032
+MAC_DARK = 0.062
 
 def mac_ver():
     """Get macOS version."""