nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-22 17:39:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed minor autolayout issues on change password window

Browse Source
This commit is contained in:
Michael Starke
2021-01-27 18:02:51 +01:00
parent 0078fae707
commit 059c794b9b
7 changed files with 54 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
MacPass/Base.lproj/PasswordEditWindow.xib
View File

@@ -24,14 +24,13 @@
<window title="Change Password" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="1">
<windowStyleMask key="styleMask" titled="YES" closable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="196" y="240" width="369" height="149"/>
<rect key="contentRect" x="196" y="240" width="369" height="164"/>
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
<view key="contentView" id="2">
<rect key="frame" x="0.0" y="0.0" width="369" height="231"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2">
<rect key="frame" x="0.0" y="0.0" width="363" height="225"/>
<subviews>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="68">
<rect key="frame" x="206" y="13" width="149" height="32"/>
<rect key="frame" x="200" y="13" width="149" height="32"/>
<buttonCell key="cell" type="push" title="Change Password" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="69">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -41,7 +40,7 @@
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="72">
<rect key="frame" x="124" y="13" width="82" height="32"/>
<rect key="frame" x="118" y="13" width="82" height="32"/>
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="73">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -53,8 +52,8 @@ Gw
<action selector="cancel:" target="-2" id="84"/>
</connections>
</button>
<gridView xPlacement="leading" yPlacement="bottom" rowAlignment="none" translatesAutoresizingMaskIntoConstraints="NO" id="0Iv-td-ACj">
<rect key="frame" x="20" y="67" width="329" height="144"/>
<gridView horizontalHuggingPriority="251" verticalHuggingPriority="251" xPlacement="leading" yPlacement="bottom" rowAlignment="none" translatesAutoresizingMaskIntoConstraints="NO" id="0Iv-td-ACj">
<rect key="frame" x="20" y="61" width="323" height="144"/>
<rows>
<gridRow id="Ljm-xA-9NW"/>
<gridRow id="Dv9-ND-6rX"/>
@@ -72,8 +71,8 @@ Gw
<gridCell row="Ljm-xA-9NW" column="uaf-ph-2zN" id="1U3-Im-v9n"/>
<gridCell row="Ljm-xA-9NW" column="7oF-Xq-5de" id="2bp-dG-V6t">
<textField key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="12">
<rect key="frame" x="90" y="130" width="204" height="14"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="PASSWORD_ERROR" id="14">
<rect key="frame" x="84" y="130" width="204" height="14"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" title="PASSWORD_ERROR" id="14">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -82,8 +81,8 @@ Gw
</gridCell>
<gridCell row="Ljm-xA-9NW" column="clB-mU-Eba" id="blk-az-oHS"/>
<gridCell row="Dv9-ND-6rX" column="uaf-ph-2zN" id="JUU-XQ-60P">
<button key="contentView" horizontalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="yKc-I9-uzv">
<rect key="frame" x="4" y="102" width="84" height="18"/>
<button key="contentView" horizontalHuggingPriority="252" translatesAutoresizingMaskIntoConstraints="NO" id="yKc-I9-uzv">
<rect key="frame" x="-2" y="102" width="84" height="24"/>
<buttonCell key="cell" type="check" title="Password:" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="OQz-DA-SoY">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@@ -91,10 +90,10 @@ Gw
</button>
</gridCell>
<gridCell row="Dv9-ND-6rX" column="7oF-Xq-5de" id="cw2-er-epO">
<secureTextField key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9" customClass="HNHUISecureTextField">
<rect key="frame" x="92" y="104" width="200" height="20"/>
<secureTextField key="contentView" horizontalHuggingPriority="253" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9" customClass="HNHUISecureTextField">
<rect key="frame" x="86" y="104" width="200" height="20"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="200" id="Gin-yR-DMk"/>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="200" id="gTV-5A-Fyo"/>
</constraints>
<secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="Enter Password" drawsBackground="YES" usesSingleLineMode="YES" id="18">
<font key="font" size="13" name="Menlo-Regular"/>
@@ -108,8 +107,8 @@ Gw
</gridCell>
<gridCell row="Dv9-ND-6rX" column="clB-mU-Eba" id="ykQ-xV-MfJ"/>
<gridCell row="mNb-JP-3YX" column="uaf-ph-2zN" id="DTm-fw-duK">
<textField key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="10">
<rect key="frame" x="37" y="76" width="51" height="16"/>
<textField key="contentView" horizontalHuggingPriority="252" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="10">
<rect key="frame" x="31" y="76" width="51" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Repeat:" id="16">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -119,7 +118,7 @@ Gw
</gridCell>
<gridCell row="mNb-JP-3YX" column="7oF-Xq-5de" id="OBv-b8-DJs">
<secureTextField key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="11" customClass="HNHUISecureTextField">
<rect key="frame" x="92" y="76" width="200" height="20"/>
<rect key="frame" x="86" y="76" width="200" height="20"/>
<secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="Repeat Password" drawsBackground="YES" usesSingleLineMode="YES" id="15">
<font key="font" size="13" name="Menlo-Regular"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -132,7 +131,7 @@ Gw
</gridCell>
<gridCell row="mNb-JP-3YX" column="clB-mU-Eba" id="erv-Ur-nvi">
<button key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7">
<rect key="frame" x="298" y="75" width="31" height="23"/>
<rect key="frame" x="292" y="75" width="31" height="23"/>
<constraints>
<constraint firstAttribute="width" constant="31" id="59"/>
</constraints>
@@ -145,8 +144,8 @@ Gw
<gridCell row="vQK-bD-mNH" column="uaf-ph-2zN" id="5U0-j9-rrv"/>
<gridCell row="vQK-bD-mNH" column="7oF-Xq-5de" id="8JE-Wh-Sad">
<textField key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ibK-Px-Fvt">
<rect key="frame" x="90" y="56" width="204" height="14"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="KEY_ERROR" id="EOD-dE-TFa">
<rect key="frame" x="84" y="56" width="204" height="14"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" title="KEY_ERROR" id="EOD-dE-TFa">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -155,8 +154,8 @@ Gw
</gridCell>
<gridCell row="vQK-bD-mNH" column="clB-mU-Eba" id="fyu-1E-DpO"/>
<gridCell row="DIe-Hz-bd0" column="uaf-ph-2zN" id="Pjk-hs-Pb5">
<textField key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5">
<rect key="frame" x="39" y="28" width="49" height="16"/>
<textField key="contentView" horizontalHuggingPriority="252" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5">
<rect key="frame" x="33" y="28" width="49" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Keyfile:" id="22">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -166,7 +165,7 @@ Gw
</gridCell>
<gridCell row="DIe-Hz-bd0" column="7oF-Xq-5de" id="o9J-f7-adq">
<pathControl key="contentView" verticalHuggingPriority="750" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4" customClass="MPPathControl">
<rect key="frame" x="89" y="24" width="206" height="25"/>
<rect key="frame" x="83" y="24" width="206" height="25"/>
<pathCell key="cell" selectable="YES" editable="YES" alignment="left" pathStyle="popUp" id="23" customClass="MPPathCell">
<font key="font" metaFont="system"/>
</pathCell>
@@ -174,7 +173,7 @@ Gw
</gridCell>
<gridCell row="DIe-Hz-bd0" column="clB-mU-Eba" id="miK-hQ-pkN">
<button key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8">
<rect key="frame" x="298" y="27" width="31" height="23"/>
<rect key="frame" x="292" y="27" width="31" height="23"/>
<buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="NSStopProgressTemplate" imagePosition="only" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="19">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -187,7 +186,7 @@ Gw
<gridCell row="TQt-iq-lMT" column="uaf-ph-2zN" id="nAI-ge-Vjb"/>
<gridCell row="TQt-iq-lMT" column="7oF-Xq-5de" id="dT5-pB-M7d">
<button key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6">
<rect key="frame" x="92" y="-1" width="200" height="23"/>
<rect key="frame" x="86" y="-1" width="200" height="23"/>
<buttonCell key="cell" type="roundTextured" title="Generate Keyfile" bezelStyle="texturedRounded" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="21">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -209,11 +208,12 @@ Gw
<constraint firstItem="0Iv-td-ACj" firstAttribute="leading" secondItem="2" secondAttribute="leading" constant="20" symbolic="YES" id="4Gf-qW-X3R"/>
<constraint firstItem="72" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="2" secondAttribute="leading" constant="20" symbolic="YES" id="5JM-Ve-z5Y"/>
<constraint firstItem="0Iv-td-ACj" firstAttribute="top" secondItem="2" secondAttribute="top" constant="20" symbolic="YES" id="FVY-mT-b2G"/>
<constraint firstAttribute="width" relation="lessThanOrEqual" constant="400" id="mhj-K7-dob"/>
<constraint firstAttribute="trailing" secondItem="0Iv-td-ACj" secondAttribute="trailing" constant="20" symbolic="YES" id="q2z-sU-YCn"/>
<constraint firstItem="68" firstAttribute="top" relation="greaterThanOrEqual" secondItem="0Iv-td-ACj" secondAttribute="bottom" constant="20" symbolic="YES" id="s84-KY-RXX"/>
<constraint firstItem="68" firstAttribute="top" secondItem="0Iv-td-ACj" secondAttribute="bottom" constant="20" symbolic="YES" id="s84-KY-RXX"/>
</constraints>
</view>
<point key="canvasLocation" x="-329.5" y="-293.5"/>
<point key="canvasLocation" x="-264" y="-392"/>
</window>
</objects>
<resources>

4
MacPass/MPPasswordEditWindowController.m
View File

@@ -215,12 +215,12 @@ typedef NS_ENUM(NSUInteger, MPPasswordEditKeyError) {
self.keyErrorGridRow.hidden = NO;
break;
case MPPasswordEditKeyErrorIsCurrentDatabase:
self.keyErrorTextField.stringValue = NSLocalizedString(@"ERROR_KEYFILE_IS_CURRENT_DATABASE", "The new key file is the current database.");
self.keyErrorTextField.stringValue = NSLocalizedString(@"WARNING_CURRENT_DATABASE_FILE_SELECTED_AS_KEY_FILE", "Error message displayed when the current database file is also set as the key file");
self.keyErrorTextField.textColor = NSColor.redColor;
self.keyErrorGridRow.hidden = NO;
break;
case MPPasswordEditKeyErrorIsKeePassDatabase:
self.keyErrorTextField.stringValue = NSLocalizedString(@"ERROR_KEYFILE_IS_KEEPASS_FILE", "Keyfile is a KeePass database.");
self.keyErrorTextField.stringValue = NSLocalizedString(@"WARNING_DATABASE_FILE_SELECTED_AS_KEY_FILE", "Error message displayed when a keepass database file is set as the key file");
self.keyErrorTextField.textColor = NSColor.redColor;
self.keyErrorGridRow.hidden = NO;
break;

5
MacPass/de.lproj/AutotypeCandidateSelectionView.strings
View File

@@ -1,13 +1,16 @@
/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "60p-7v-Nje"; */
"60p-7v-Nje.title" = "Abbrechen";
/* Class = "NSTextFieldCell"; title = "Sequence"; ObjectID = "bvJ-2i-eMc"; */
"bvJ-2i-eMc.title" = "Tastenfolge";
/* Class = "NSTextFieldCell"; title = "There are multiple matches for the current window. Please select which match should be used."; ObjectID = "gcf-gb-ZsF"; */
"gcf-gb-ZsF.title" = "Es gibt mehrere Treffer für den aktuellen Fenstertitel. Bitte wählen Sie denjenigen Eintrag aus der Liste aus, der verwendet werden soll!";
/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "PKW-gr-yqN"; */
"PKW-gr-yqN.title" = "Text-Element";
/* Class = "NSTextFieldCell"; title = "Content"; ObjectID = "TN3-3a-LaA"; */
/* Class = "NSTextFieldCell"; title = "Title"; ObjectID = "TN3-3a-LaA"; */
"TN3-3a-LaA.title" = "Inhalt";
/* Class = "NSButtonCell"; title = "Perform Autotype"; ObjectID = "w7H-hx-CUF"; */

9
MacPass/de.lproj/GeneralPreferences.strings
View File

@@ -58,6 +58,9 @@
/* Class = "NSTextFieldCell"; title = "Enabling this compromises security. If enabled, your preferences will contain mappings from database to keyfile. Key locations for databases without a password will not be saved."; ObjectID = "ACh-7H-42N"; */
"ACh-7H-42N.title" = "Das Einschalten dieser Option beeinträchtigt die Sicherheit. Wird diese Option aktiviert, werden Pfadangaben von Datenbank und Schlüsseldatei in den persönlichen Einstellungen gespeichert. Zu Datenbanken ohne Passwort wird kein Schlüsseldatei-Pfad gespeichert.";
/* Class = "NSTextFieldCell"; title = "By default web site icon is downloaded directly from entry's host URL. For some websites it doesn't work and you might prefer using 3rdparty APIs. In this case only host from the URL will be used to get the icon from selected service."; ObjectID = "DaG-1a-SET"; */
"DaG-1a-SET.title" = "Icons für Webseiten werden im Normallfall direkt von der im Eintrag hinterlegten URL heruntergeladen. Bei einigen Seiten funktioniert diese Methode nicht zufriedenstellend und Sie könnten die Verwendung eines Dienstes eines Dritten bevorzugen. In diesem Fall wird nur der Host der URL an diesen Dienst übermittelt, um ein Icon herunterzuladen.";
/* Class = "NSButtonCell"; title = "Lock after log out"; ObjectID = "Dzn-9R-JjE"; */
"Dzn-9R-JjE.title" = "Nach Abmelden (logout) sperren";
@@ -76,9 +79,15 @@
/* Class = "NSButtonCell"; title = "Remember Keyfile for Databases"; ObjectID = "r6q-He-nYU"; */
"r6q-He-nYU.title" = "Schlüsseldatei merken";
/* Class = "NSBox"; title = "Network"; ObjectID = "wD1-ag-7V5"; */
"wD1-ag-7V5.title" = "Neztwerk";
/* Class = "NSButtonCell"; title = "Enable Autosave"; ObjectID = "wG7-bi-2fi"; */
"wG7-bi-2fi.title" = "Automatisches Speichern aktivieren";
/* Class = "NSTextFieldCell"; title = "Close and open all documents for changes to take effect"; ObjectID = "ya5-ps-c4W"; */
"ya5-ps-c4W.title" = "Die Änderungen werden erst für Dokumente wirksam, welche geschlossen und erneut geöffnet werden.";
/* Class = "NSTextFieldCell"; title = "Favicon download"; ObjectID = "YGj-dH-duz"; */
"YGj-dH-duz.title" = "Favicon herunterladen";

6
MacPass/de.lproj/IntegrationPreferences.strings
View File

@@ -31,12 +31,18 @@
/* Class = "NSButtonCell"; title = "Include Entry Tags for matches"; ObjectID = "rbu-G7-MT8"; */
"rbu-G7-MT8.title" = "Tags beim Suchen von Einträgen berücksichtigen";
/* Class = "NSButtonCell"; title = "Always show confirmation before executing Autotype"; ObjectID = "rrU-70-Ara"; */
"rrU-70-Ara.title" = "Vor dem Ausführen von Global Autotype immer Nachfragen.";
/* Class = "NSButtonCell"; title = "Include Entry Title for matches"; ObjectID = "tmL-dT-D0G"; */
"tmL-dT-D0G.title" = "Titel beim Suchen von Einträgen berücksichtigen";
/* Class = "NSButtonCell"; title = "Include Entry URL for matches"; ObjectID = "TzR-00-Vp3"; */
"TzR-00-Vp3.title" = "URL beim Suchen von Einträgen berücksichtigen";
/* Class = "NSTextFieldCell"; title = "If enabled, a dialog will show up before Autotype is executed even if only a single match was found to prevent accidental input and wrong matches"; ObjectID = "VjU-Hz-cu4"; */
"VjU-Hz-cu4.title" = "Um die Sicherheit vor ungewollter Eingabe von sensiblen Daten zu verbessern, wird vor jedem Ausführen von Global Autotype ein Dialog zur Bestätigung angezeigt.";
/* Class = "NSBox"; title = "Preview"; ObjectID = "VVs-b5-cX9"; */
"VVs-b5-cX9.title" = "Vorschau";

5
MacPass/de.lproj/PasswordEditWindow.strings
View File

@@ -1,7 +1,7 @@
/* Class = "NSWindow"; title = "Change Password"; ObjectID = "1"; */
"1.title" = "Fenster";
/* Class = "NSTextFieldCell"; title = "Mismatching Passwords"; ObjectID = "14"; */
/* Class = "NSTextFieldCell"; title = "PASSWORD_ERROR"; ObjectID = "14"; */
"14.title" = "Passwörter stimmen nicht überein";
/* Class = "NSSecureTextFieldCell"; placeholderString = "Repeat Password"; ObjectID = "15"; */
@@ -25,6 +25,9 @@
/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "73"; */
"73.title" = "Abbrechen";
/* Class = "NSTextFieldCell"; title = "KEY_ERROR"; ObjectID = "EOD-dE-TFa"; */
"EOD-dE-TFa.title" = "Keine Passwortdatei ausgewählt";
/* Class = "NSButtonCell"; title = "Password:"; ObjectID = "OQz-DA-SoY"; */
"OQz-DA-SoY.title" = "Passwort:";

2
MacPass/de.lproj/WelcomeView.strings
View File

@@ -4,7 +4,7 @@
/* Class = "NSButtonCell"; title = "Open Database…"; ObjectID = "Jj3-zy-gaz"; */
"Jj3-zy-gaz.title" = "Datenbank öffnen…";
/* Class = "NSButtonCell"; title = "Create new Database"; ObjectID = "Vxx-Ql-eI5"; */
/* Class = "NSButtonCell"; title = "Create Database"; ObjectID = "Vxx-Ql-eI5"; */
"Vxx-Ql-eI5.title" = "Neue Datenbank erstellen";
/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "vzM-ly-CYn"; */