From ed57069a4dec1a4f622edfb8eb73d5154c8f38f4 Mon Sep 17 00:00:00 2001
From: Maurizio Bruccoleri <maurizio.bruccoleri@it.ibm.com>
Date: Fri, 4 Sep 2026 14:58:47 +0200
Subject: [PATCH 1/2] Fix UI layout and improve accessibility

- Redesigned settings interface with unified scrollable layout
- Fixed hidden controls in Advanced section (Delete buttons now accessible)
- Improved section titles visibility (Interface/Advanced)
- Optimized spacing and layout constraints for better MacPass integration
- All controls now properly visible and accessible via scroll
- Version bump to 0.3.3

Fixes: Controls in Advanced section were cut off and inaccessible
Resolves: Layout inconsistencies with MacPass preferences interface
---
 MacPassHTTP.xcodeproj/project.pbxproj         |   4 +-
 .../Base.lproj/MacPassHTTPSettings.xib        | 304 ++++++++++--------
 2 files changed, 178 insertions(+), 130 deletions(-)

diff --git a/MacPassHTTP.xcodeproj/project.pbxproj b/MacPassHTTP.xcodeproj/project.pbxproj
index 936f1ce..e85c01c 100644
--- a/MacPassHTTP.xcodeproj/project.pbxproj
+++ b/MacPassHTTP.xcodeproj/project.pbxproj
@@ -372,7 +372,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "";
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 0.3.2;
+				CURRENT_PROJECT_VERSION = 0.3.3;
 				DEPLOYMENT_LOCATION = YES;
 				DSTROOT = "$(HOME)";
 				FRAMEWORK_SEARCH_PATHS = (
@@ -400,7 +400,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "";
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 0.3.2;
+				CURRENT_PROJECT_VERSION = 0.3.3;
 				DEPLOYMENT_LOCATION = YES;
 				DSTROOT = "$(HOME)";
 				FRAMEWORK_SEARCH_PATHS = (
diff --git a/MacPassHTTP/Base.lproj/MacPassHTTPSettings.xib b/MacPassHTTP/Base.lproj/MacPassHTTPSettings.xib
index 964e8ff..14fe3ec 100644
--- a/MacPassHTTP/Base.lproj/MacPassHTTPSettings.xib
+++ b/MacPassHTTP/Base.lproj/MacPassHTTPSettings.xib
@@ -19,145 +19,193 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        
+        <!-- Main container view - compact layout -->
         <customView translatesAutoresizingMaskIntoConstraints="NO" id="Hz6-mo-xeY">
-            <rect key="frame" x="0.0" y="0.0" width="282" height="403"/>
             <subviews>
-                <box borderType="line" title="Advanced" translatesAutoresizingMaskIntoConstraints="NO" id="HBN-BZ-nLh">
-                    <rect key="frame" x="17" y="121" width="248" height="168"/>
-                    <view key="contentView" id="fYs-g6-gvy">
-                        <rect key="frame" x="1" y="1" width="246" height="152"/>
+                <!-- Single unified content area with scroll -->
+                <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="main-scroll">
+                    <clipView key="contentView" drawsBackground="NO" id="main-clip">
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="LcT-lm-YzQ">
-                                <rect key="frame" x="18" y="115" width="34" height="17"/>
-                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Port:" id="b3d-n3-wwe">
-                                    <font key="font" metaFont="system"/>
-                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                </textFieldCell>
-                            </textField>
-                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="r1I-t4-2dl">
-                                <rect key="frame" x="58" y="112" width="75" height="22"/>
+                            <!-- Unified content view -->
+                            <view translatesAutoresizingMaskIntoConstraints="NO" id="content-view">
+                                <subviews>
+                                    
+                                    <!-- Interface Section Title -->
+                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="interface-title">
+                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Interface" id="interface-title-cell">
+                                            <font key="font" metaFont="systemBold" size="13"/>
+                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
+                                    
+                                    <!-- Interface Controls -->
+                                    <button translatesAutoresizingMaskIntoConstraints="NO" id="Ph9-8D-46q">
+                                        <buttonCell key="cell" type="check" title="Show menu item" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="Ph9-cell">
+                                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                            <font key="font" metaFont="system"/>
+                                        </buttonCell>
+                                    </button>
+                                    
+                                    <button translatesAutoresizingMaskIntoConstraints="NO" id="7X4-aF-1sY">
+                                        <buttonCell key="cell" type="check" title="Show notifications" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="7X4-cell">
+                                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                            <font key="font" metaFont="system"/>
+                                        </buttonCell>
+                                    </button>
+                                    
+                                    <!-- Advanced Section Title -->
+                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="advanced-title">
+                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Advanced" id="advanced-title-cell">
+                                            <font key="font" metaFont="systemBold" size="13"/>
+                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
+                                    
+                                    <!-- Port Field -->
+                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="LcT-lm-YzQ">
+                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Port:" id="port-label-cell">
+                                            <font key="font" metaFont="system"/>
+                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
+                                    
+                                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="r1I-t4-2dl">
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="75" id="port-width"/>
+                                        </constraints>
+                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="port-field-cell">
+                                            <font key="font" metaFont="system"/>
+                                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
+                                    
+                                    <!-- Advanced Checkboxes -->
+                                    <button translatesAutoresizingMaskIntoConstraints="NO" id="1b8-d7-7dw">
+                                        <buttonCell key="cell" type="check" title="Allow remote connections" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="remote-cell">
+                                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                            <font key="font" metaFont="system"/>
+                                        </buttonCell>
+                                    </button>
+                                    
+                                    <button translatesAutoresizingMaskIntoConstraints="NO" id="nSj-5f-3Bs">
+                                        <buttonCell key="cell" type="check" title="Include custom fields" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="custom-cell">
+                                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                            <font key="font" metaFont="system"/>
+                                        </buttonCell>
+                                    </button>
+                                    
+                                    <!-- Help Text -->
+                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="sqS-ph-0i3">
+                                        <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="Custom fields need to start with KPH: to be included. The space after the colon is mandatory!" id="help-text-cell">
+                                            <font key="font" metaFont="smallSystem"/>
+                                            <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
+                                    
+                                    <!-- Action Buttons -->
+                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="BOb-dd-2DX">
+                                        <buttonCell key="cell" type="roundTextured" title="Delete shared encryption keys" bezelStyle="texturedRounded" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="delete-keys-cell">
+                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                            <font key="font" metaFont="system"/>
+                                        </buttonCell>
+                                        <connections>
+                                            <action selector="clearKeys:" target="-2" id="delete-keys-action"/>
+                                        </connections>
+                                    </button>
+                                    
+                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cDA-I7-ssZ">
+                                        <buttonCell key="cell" type="roundTextured" title="Delete stored permission" bezelStyle="texturedRounded" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="delete-permissions-cell">
+                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                            <font key="font" metaFont="system"/>
+                                        </buttonCell>
+                                        <connections>
+                                            <action selector="clearPermissions:" target="-2" id="delete-permissions-action"/>
+                                        </connections>
+                                    </button>
+                                    
+                                </subviews>
+                                
+                                <!-- Layout Constraints -->
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="75" id="JBr-2d-MHb"/>
+                                    <!-- Interface Section -->
+                                    <constraint firstItem="interface-title" firstAttribute="leading" secondItem="content-view" secondAttribute="leading" constant="20" id="interface-title-leading"/>
+                                    <constraint firstItem="interface-title" firstAttribute="top" secondItem="content-view" secondAttribute="top" constant="10" id="interface-title-top"/>
+                                    
+                                    <constraint firstItem="Ph9-8D-46q" firstAttribute="leading" secondItem="content-view" secondAttribute="leading" constant="20" id="menu-leading"/>
+                                    <constraint firstItem="Ph9-8D-46q" firstAttribute="top" secondItem="interface-title" secondAttribute="bottom" constant="8" id="menu-top"/>
+                                    
+                                    <constraint firstItem="7X4-aF-1sY" firstAttribute="leading" secondItem="content-view" secondAttribute="leading" constant="20" id="notifications-leading"/>
+                                    <constraint firstItem="7X4-aF-1sY" firstAttribute="top" secondItem="Ph9-8D-46q" secondAttribute="bottom" constant="6" id="notifications-top"/>
+                                    
+                                    <!-- Advanced Section -->
+                                    <constraint firstItem="advanced-title" firstAttribute="leading" secondItem="content-view" secondAttribute="leading" constant="20" id="advanced-title-leading"/>
+                                    <constraint firstItem="advanced-title" firstAttribute="top" secondItem="7X4-aF-1sY" secondAttribute="bottom" constant="20" id="advanced-title-top"/>
+                                    
+                                    <!-- Port -->
+                                    <constraint firstItem="LcT-lm-YzQ" firstAttribute="leading" secondItem="content-view" secondAttribute="leading" constant="20" id="port-label-leading"/>
+                                    <constraint firstItem="LcT-lm-YzQ" firstAttribute="top" secondItem="advanced-title" secondAttribute="bottom" constant="8" id="port-label-top"/>
+                                    <constraint firstItem="r1I-t4-2dl" firstAttribute="leading" secondItem="LcT-lm-YzQ" secondAttribute="trailing" constant="8" id="port-field-leading"/>
+                                    <constraint firstItem="r1I-t4-2dl" firstAttribute="baseline" secondItem="LcT-lm-YzQ" secondAttribute="baseline" id="port-baseline"/>
+                                    
+                                    <!-- Advanced Checkboxes -->
+                                    <constraint firstItem="1b8-d7-7dw" firstAttribute="leading" secondItem="content-view" secondAttribute="leading" constant="20" id="remote-leading"/>
+                                    <constraint firstItem="1b8-d7-7dw" firstAttribute="top" secondItem="r1I-t4-2dl" secondAttribute="bottom" constant="8" id="remote-top"/>
+                                    
+                                    <constraint firstItem="nSj-5f-3Bs" firstAttribute="leading" secondItem="content-view" secondAttribute="leading" constant="20" id="custom-leading"/>
+                                    <constraint firstItem="nSj-5f-3Bs" firstAttribute="top" secondItem="1b8-d7-7dw" secondAttribute="bottom" constant="6" id="custom-top"/>
+                                    
+                                    <!-- Help Text -->
+                                    <constraint firstItem="sqS-ph-0i3" firstAttribute="leading" secondItem="content-view" secondAttribute="leading" constant="20" id="help-leading"/>
+                                    <constraint firstAttribute="trailing" secondItem="sqS-ph-0i3" secondAttribute="trailing" constant="20" id="help-trailing"/>
+                                    <constraint firstItem="sqS-ph-0i3" firstAttribute="top" secondItem="nSj-5f-3Bs" secondAttribute="bottom" constant="8" id="help-top"/>
+                                    
+                                    <!-- Action Buttons -->
+                                    <constraint firstItem="BOb-dd-2DX" firstAttribute="leading" secondItem="content-view" secondAttribute="leading" constant="20" id="delete-keys-leading"/>
+                                    <constraint firstAttribute="trailing" secondItem="BOb-dd-2DX" secondAttribute="trailing" constant="20" id="delete-keys-trailing"/>
+                                    <constraint firstItem="BOb-dd-2DX" firstAttribute="top" secondItem="sqS-ph-0i3" secondAttribute="bottom" constant="8" id="delete-keys-top"/>
+                                    
+                                    <constraint firstItem="cDA-I7-ssZ" firstAttribute="leading" secondItem="content-view" secondAttribute="leading" constant="20" id="delete-permissions-leading"/>
+                                    <constraint firstAttribute="trailing" secondItem="cDA-I7-ssZ" secondAttribute="trailing" constant="20" id="delete-permissions-trailing"/>
+                                    <constraint firstItem="cDA-I7-ssZ" firstAttribute="top" secondItem="BOb-dd-2DX" secondAttribute="bottom" constant="6" id="delete-permissions-top"/>
+                                    
+                                    <!-- Content size -->
+                                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="interface-title" secondAttribute="trailing" constant="20" id="interface-title-trailing"/>
+                                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="advanced-title" secondAttribute="trailing" constant="20" id="advanced-title-trailing"/>
+                                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Ph9-8D-46q" secondAttribute="trailing" constant="20" id="menu-trailing"/>
+                                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="7X4-aF-1sY" secondAttribute="trailing" constant="20" id="notifications-trailing"/>
+                                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="r1I-t4-2dl" secondAttribute="trailing" constant="20" id="port-field-trailing"/>
+                                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="1b8-d7-7dw" secondAttribute="trailing" constant="20" id="remote-trailing"/>
+                                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="nSj-5f-3Bs" secondAttribute="trailing" constant="20" id="custom-trailing"/>
+                                    
+                                    <constraint firstAttribute="bottom" secondItem="cDA-I7-ssZ" secondAttribute="bottom" constant="20" id="main-content-bottom"/>
+                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="260" id="content-min-width"/>
                                 </constraints>
-                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="y4A-gl-fbo">
-                                    <font key="font" metaFont="system"/>
-                                    <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
-                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                </textFieldCell>
-                            </textField>
-                            <button translatesAutoresizingMaskIntoConstraints="NO" id="1b8-d7-7dw">
-                                <rect key="frame" x="18" y="88" width="179" height="18"/>
-                                <buttonCell key="cell" type="check" title="Allow remote connections" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="Ok6-S4-za1">
-                                    <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                    <font key="font" metaFont="system"/>
-                                </buttonCell>
-                            </button>
-                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nSj-5f-3Bs">
-                                <rect key="frame" x="18" y="68" width="151" height="18"/>
-                                <buttonCell key="cell" type="check" title="Include custom fields" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="sWW-1r-KXi">
-                                    <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                    <font key="font" metaFont="system"/>
-                                </buttonCell>
-                            </button>
-                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="sqS-ph-0i3">
-                                <rect key="frame" x="18" y="20" width="210" height="42"/>
-                                <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="Custom fields need to start with KPH: to be included. The space after the colon is mandatory!" id="f9j-XL-YST">
-                                    <font key="font" metaFont="smallSystem"/>
-                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                </textFieldCell>
-                            </textField>
+                            </view>
                         </subviews>
                         <constraints>
-                            <constraint firstItem="nSj-5f-3Bs" firstAttribute="top" secondItem="1b8-d7-7dw" secondAttribute="bottom" constant="6" symbolic="YES" id="30G-0Y-eQ0"/>
-                            <constraint firstItem="r1I-t4-2dl" firstAttribute="leading" secondItem="LcT-lm-YzQ" secondAttribute="trailing" constant="8" symbolic="YES" id="Bbm-5y-JQh"/>
-                            <constraint firstItem="r1I-t4-2dl" firstAttribute="baseline" secondItem="LcT-lm-YzQ" secondAttribute="baseline" id="Bve-gt-4F0"/>
-                            <constraint firstItem="1b8-d7-7dw" firstAttribute="leading" secondItem="fYs-g6-gvy" secondAttribute="leading" constant="20" symbolic="YES" id="CMs-7X-ApC"/>
-                            <constraint firstItem="sqS-ph-0i3" firstAttribute="leading" secondItem="fYs-g6-gvy" secondAttribute="leading" constant="20" symbolic="YES" id="LR6-FI-68w"/>
-                            <constraint firstAttribute="bottom" secondItem="sqS-ph-0i3" secondAttribute="bottom" constant="20" symbolic="YES" id="OHz-u2-719"/>
-                            <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="nSj-5f-3Bs" secondAttribute="trailing" constant="20" symbolic="YES" id="QXg-Vc-dZz"/>
-                            <constraint firstAttribute="trailing" secondItem="sqS-ph-0i3" secondAttribute="trailing" constant="20" symbolic="YES" id="XTI-CL-jLg"/>
-                            <constraint firstItem="1b8-d7-7dw" firstAttribute="top" secondItem="r1I-t4-2dl" secondAttribute="bottom" constant="8" symbolic="YES" id="ZkL-Hh-Nn3"/>
-                            <constraint firstItem="sqS-ph-0i3" firstAttribute="top" secondItem="nSj-5f-3Bs" secondAttribute="bottom" constant="8" symbolic="YES" id="cCf-ip-wsI"/>
-                            <constraint firstItem="nSj-5f-3Bs" firstAttribute="leading" secondItem="fYs-g6-gvy" secondAttribute="leading" constant="20" symbolic="YES" id="ctr-Lt-sHz"/>
-                            <constraint firstItem="LcT-lm-YzQ" firstAttribute="leading" secondItem="fYs-g6-gvy" secondAttribute="leading" constant="20" id="cu5-Se-24F"/>
-                            <constraint firstItem="LcT-lm-YzQ" firstAttribute="top" secondItem="fYs-g6-gvy" secondAttribute="top" constant="20" symbolic="YES" id="hYK-do-0xR"/>
-                            <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="r1I-t4-2dl" secondAttribute="trailing" constant="20" symbolic="YES" id="nCH-YW-oWB"/>
-                            <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="1b8-d7-7dw" secondAttribute="trailing" constant="20" symbolic="YES" id="yfk-sZ-Xye"/>
+                            <constraint firstItem="content-view" firstAttribute="leading" secondItem="main-clip" secondAttribute="leading" id="content-leading"/>
+                            <constraint firstItem="content-view" firstAttribute="trailing" secondItem="main-clip" secondAttribute="trailing" id="content-trailing"/>
+                            <constraint firstItem="content-view" firstAttribute="top" secondItem="main-clip" secondAttribute="top" id="content-top"/>
+                            <constraint firstItem="content-view" firstAttribute="bottom" secondItem="main-clip" secondAttribute="bottom" id="content-bottom"/>
                         </constraints>
-                    </view>
-                </box>
-                <box borderType="line" title="Interface" translatesAutoresizingMaskIntoConstraints="NO" id="91g-f4-0PT">
-                    <rect key="frame" x="17" y="293" width="248" height="90"/>
-                    <view key="contentView" id="G5m-fe-1oi">
-                        <rect key="frame" x="1" y="1" width="246" height="74"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <button translatesAutoresizingMaskIntoConstraints="NO" id="Ph9-8D-46q">
-                                <rect key="frame" x="18" y="38" width="126" height="18"/>
-                                <buttonCell key="cell" type="check" title="Show status item" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="pwH-GW-hUe">
-                                    <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                    <font key="font" metaFont="system"/>
-                                </buttonCell>
-                            </button>
-                            <button translatesAutoresizingMaskIntoConstraints="NO" id="7X4-aF-1sY">
-                                <rect key="frame" x="18" y="18" width="210" height="18"/>
-                                <buttonCell key="cell" type="check" title="Show notifications for requests" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="V3s-Sg-zYr">
-                                    <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                    <font key="font" metaFont="system"/>
-                                </buttonCell>
-                            </button>
-                        </subviews>
-                        <constraints>
-                            <constraint firstItem="Ph9-8D-46q" firstAttribute="leading" secondItem="G5m-fe-1oi" secondAttribute="leading" constant="20" symbolic="YES" id="DrS-om-gTF"/>
-                            <constraint firstAttribute="bottom" secondItem="7X4-aF-1sY" secondAttribute="bottom" constant="20" symbolic="YES" id="Mrj-v6-ecv"/>
-                            <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="7X4-aF-1sY" secondAttribute="trailing" constant="20" symbolic="YES" id="ObF-5t-Xk8"/>
-                            <constraint firstItem="Ph9-8D-46q" firstAttribute="top" secondItem="G5m-fe-1oi" secondAttribute="top" constant="20" symbolic="YES" id="RQY-vU-6oV"/>
-                            <constraint firstItem="7X4-aF-1sY" firstAttribute="leading" secondItem="G5m-fe-1oi" secondAttribute="leading" constant="20" id="iHn-il-ErV"/>
-                            <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Ph9-8D-46q" secondAttribute="trailing" constant="20" symbolic="YES" id="jFo-rq-sIF"/>
-                            <constraint firstItem="7X4-aF-1sY" firstAttribute="top" secondItem="Ph9-8D-46q" secondAttribute="bottom" constant="6" symbolic="YES" id="s0h-9r-tOI"/>
-                        </constraints>
-                    </view>
-                </box>
-                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="BOb-dd-2DX">
-                    <rect key="frame" x="20" y="78" width="242" height="25"/>
-                    <buttonCell key="cell" type="roundTextured" title="Delete shared encryption keys" bezelStyle="texturedRounded" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="nED-Ay-y6q">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                    <connections>
-                        <action selector="clearKeys:" target="-2" id="Ruv-Sn-g10"/>
-                    </connections>
-                </button>
-                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cDA-I7-ssZ">
-                    <rect key="frame" x="20" y="48" width="242" height="25"/>
-                    <buttonCell key="cell" type="roundTextured" title="Delete stored permission" bezelStyle="texturedRounded" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="W51-OY-2BU">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                    <connections>
-                        <action selector="clearPermissions:" target="-2" id="b9C-RA-IQ2"/>
-                    </connections>
-                </button>
+                    </clipView>
+                    <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="h-scroller"/>
+                    <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="v-scroller"/>
+                </scrollView>
             </subviews>
             <constraints>
-                <constraint firstItem="cDA-I7-ssZ" firstAttribute="top" secondItem="BOb-dd-2DX" secondAttribute="bottom" constant="8" id="Cwx-vA-LHD"/>
-                <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="cDA-I7-ssZ" secondAttribute="bottom" constant="20" id="EOY-oD-AqO"/>
-                <constraint firstItem="HBN-BZ-nLh" firstAttribute="top" secondItem="G5m-fe-1oi" secondAttribute="bottom" constant="5" id="GS6-kh-l8T"/>
-                <constraint firstAttribute="trailing" secondItem="91g-f4-0PT" secondAttribute="trailing" constant="20" id="JDh-6F-KzF"/>
-                <constraint firstItem="cDA-I7-ssZ" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="20" symbolic="YES" id="K1s-wq-b1P"/>
-                <constraint firstAttribute="trailing" secondItem="BOb-dd-2DX" secondAttribute="trailing" constant="20" id="Xya-io-cpL"/>
-                <constraint firstAttribute="trailing" secondItem="cDA-I7-ssZ" secondAttribute="trailing" constant="20" id="cbl-19-qss"/>
-                <constraint firstItem="HBN-BZ-nLh" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="20" id="fxH-oh-JX6"/>
-                <constraint firstItem="91g-f4-0PT" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="20" id="h28-Me-ERM"/>
-                <constraint firstItem="BOb-dd-2DX" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="20" symbolic="YES" id="moU-8r-owl"/>
-                <constraint firstItem="BOb-dd-2DX" firstAttribute="top" secondItem="fYs-g6-gvy" secondAttribute="bottom" constant="20" id="q7f-Is-uS2"/>
-                <constraint firstAttribute="trailing" secondItem="HBN-BZ-nLh" secondAttribute="trailing" constant="20" id="rKv-Mg-r6X"/>
-                <constraint firstItem="91g-f4-0PT" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="20" id="x9a-YR-SMO"/>
+                <constraint firstItem="main-scroll" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="scroll-leading"/>
+                <constraint firstItem="main-scroll" firstAttribute="trailing" secondItem="Hz6-mo-xeY" secondAttribute="trailing" id="scroll-trailing"/>
+                <constraint firstItem="main-scroll" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" id="scroll-top"/>
+                <constraint firstItem="main-scroll" firstAttribute="bottom" secondItem="Hz6-mo-xeY" secondAttribute="bottom" id="scroll-bottom"/>
             </constraints>
-            <point key="canvasLocation" x="360" y="113.5"/>
         </customView>
     </objects>
-</document>
+</document>
\ No newline at end of file

From 10e2df1a7461e6929f89e275381bfc7fc26947e8 Mon Sep 17 00:00:00 2001
From: Maurizio Bruccoleri <maurizio.bruccoleri@it.ibm.com>
Date: Fri, 4 Sep 2026 15:23:55 +0200
Subject: [PATCH 2/2] Fix version display in plugin info

- Changed CFBundleVersion from hardcoded 'UNKNOWN' to $(CURRENT_PROJECT_VERSION)
- Plugin now shows proper version number instead of 'Version: X.X.X (UNKNOWN)'
- Maintains compatibility with existing Versioning script for git commit counting

Fixes: Version display showing '(UNKNOWN)' instead of build number
---
 MacPassHTTP/Info.plist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MacPassHTTP/Info.plist b/MacPassHTTP/Info.plist
index 25ed4d6..75b4515 100644
--- a/MacPassHTTP/Info.plist
+++ b/MacPassHTTP/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>UNKNOWN</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2015-2017 HicknHack Software GmbH. All rights reserved.</string>
 	<key>NSPrincipalClass</key>