mirror of
https://github.com/MacPass/MacPass.git
synced 2025-12-14 02:22:28 +00:00
Fixed issue wiht mixed disabled/enabled settings for group autotype property
This commit is contained in:
2
HNHUi
2
HNHUi
Submodule HNHUi updated: f056276a89...0a0c4564d1
Submodule KeePassKit updated: ab02bcab6f...8e3174244b
@@ -1,8 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6250" systemVersion="13F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
|
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6254" systemVersion="13F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<deployment identifier="macosx"/>
|
<deployment identifier="macosx"/>
|
||||||
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6250"/>
|
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6254"/>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<objects>
|
<objects>
|
||||||
<customObject id="-2" userLabel="File's Owner" customClass="MPGroupInspectorViewController">
|
<customObject id="-2" userLabel="File's Owner" customClass="MPGroupInspectorViewController">
|
||||||
@@ -76,7 +76,7 @@
|
|||||||
</button>
|
</button>
|
||||||
<popUpButton verticalHuggingPriority="750" horizontalCompressionResistancePriority="249" translatesAutoresizingMaskIntoConstraints="NO" id="229">
|
<popUpButton verticalHuggingPriority="750" horizontalCompressionResistancePriority="249" translatesAutoresizingMaskIntoConstraints="NO" id="229">
|
||||||
<rect key="frame" x="18" y="128" width="222" height="26"/>
|
<rect key="frame" x="18" y="128" width="222" height="26"/>
|
||||||
<popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="230">
|
<popUpButtonCell key="cell" type="push" title="Exclude from Search" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="1" imageScaling="proportionallyDown" inset="2" selectedItem="234" id="230">
|
||||||
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
|
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
|
||||||
<font key="font" metaFont="menu"/>
|
<font key="font" metaFont="menu"/>
|
||||||
<menu key="menu" title="OtherViews" id="231">
|
<menu key="menu" title="OtherViews" id="231">
|
||||||
@@ -85,7 +85,7 @@
|
|||||||
<modifierMask key="keyEquivalentModifierMask"/>
|
<modifierMask key="keyEquivalentModifierMask"/>
|
||||||
</menuItem>
|
</menuItem>
|
||||||
<menuItem title="Include in Search" id="233"/>
|
<menuItem title="Include in Search" id="233"/>
|
||||||
<menuItem title="Exclude from Search" tag="1" id="234"/>
|
<menuItem title="Exclude from Search" state="on" tag="1" id="234"/>
|
||||||
</items>
|
</items>
|
||||||
</menu>
|
</menu>
|
||||||
</popUpButtonCell>
|
</popUpButtonCell>
|
||||||
@@ -98,13 +98,7 @@
|
|||||||
<popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="242">
|
<popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="242">
|
||||||
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
|
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
|
||||||
<font key="font" metaFont="menu"/>
|
<font key="font" metaFont="menu"/>
|
||||||
<menu key="menu" title="OtherViews" id="243">
|
<menu key="menu" title="OtherViews" id="243"/>
|
||||||
<items>
|
|
||||||
<menuItem title="Inherit Autotype Settings" tag="-1" id="246"/>
|
|
||||||
<menuItem title="Enable Autotype" id="245"/>
|
|
||||||
<menuItem title="Disable Autotype" tag="1" id="244"/>
|
|
||||||
</items>
|
|
||||||
</menu>
|
|
||||||
</popUpButtonCell>
|
</popUpButtonCell>
|
||||||
<connections>
|
<connections>
|
||||||
<outlet property="nextKeyView" destination="Fnw-qz-IZU" id="Q0q-HY-T34"/>
|
<outlet property="nextKeyView" destination="Fnw-qz-IZU" id="Q0q-HY-T34"/>
|
||||||
|
|||||||
@@ -56,6 +56,19 @@
|
|||||||
metrics:nil
|
metrics:nil
|
||||||
views:views]];
|
views:views]];
|
||||||
[[self view] layoutSubtreeIfNeeded];
|
[[self view] layoutSubtreeIfNeeded];
|
||||||
|
|
||||||
|
NSMenu *autotypeMenu = self.autotypePopupButton.menu;
|
||||||
|
NSMenuItem *inheritItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"AUTOTYPE_INHERIT", "") action:NULL keyEquivalent:@""];
|
||||||
|
inheritItem.tag = KPKInherit;
|
||||||
|
NSMenuItem *yesItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"AUTOTYPE_YES", "") action:NULL keyEquivalent:@""];
|
||||||
|
yesItem.tag = KPKInheritYES;
|
||||||
|
NSMenuItem *noItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"AUTOTYPE_NO", "") action:NULL keyEquivalent:@""];
|
||||||
|
noItem.tag = KPKInheritNO;
|
||||||
|
|
||||||
|
[autotypeMenu addItem:inheritItem];
|
||||||
|
[autotypeMenu addItem:yesItem];
|
||||||
|
[autotypeMenu addItem:noItem];
|
||||||
|
|
||||||
/*
|
/*
|
||||||
void(^copyBlock)(NSTextField *textField) = ^void(NSTextField *textField) {
|
void(^copyBlock)(NSTextField *textField) = ^void(NSTextField *textField) {
|
||||||
[[MPPasteBoardController defaultController] copyObjects:@[ textField.stringValue ]];
|
[[MPPasteBoardController defaultController] copyObjects:@[ textField.stringValue ]];
|
||||||
|
|||||||
@@ -20,15 +20,6 @@
|
|||||||
/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */
|
/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */
|
||||||
"243.title" = "OtherViews";
|
"243.title" = "OtherViews";
|
||||||
|
|
||||||
/* Class = "NSMenuItem"; title = "Disable Autotype"; ObjectID = "244"; */
|
|
||||||
"244.title" = "Disable Autotype";
|
|
||||||
|
|
||||||
/* Class = "NSMenuItem"; title = "Enable Autotype"; ObjectID = "245"; */
|
|
||||||
"245.title" = "Enable Autotype";
|
|
||||||
|
|
||||||
/* Class = "NSMenuItem"; title = "Inherit Autotype Settings"; ObjectID = "246"; */
|
|
||||||
"246.title" = "Inherit Autotype Settings";
|
|
||||||
|
|
||||||
/* Class = "NSTextFieldCell"; title = "Search"; ObjectID = "265"; */
|
/* Class = "NSTextFieldCell"; title = "Search"; ObjectID = "265"; */
|
||||||
"265.title" = "Search";
|
"265.title" = "Search";
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
@@ -20,15 +20,6 @@
|
|||||||
/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */
|
/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */
|
||||||
"243.title" = "OtherViews";
|
"243.title" = "OtherViews";
|
||||||
|
|
||||||
/* Class = "NSMenuItem"; title = "Disable Autotype"; ObjectID = "244"; */
|
|
||||||
"244.title" = "Disable Autotype";
|
|
||||||
|
|
||||||
/* Class = "NSMenuItem"; title = "Enable Autotype"; ObjectID = "245"; */
|
|
||||||
"245.title" = "Enable Autotype";
|
|
||||||
|
|
||||||
/* Class = "NSMenuItem"; title = "Inherit Autotype Settings"; ObjectID = "246"; */
|
|
||||||
"246.title" = "Inherit Autotype Settings";
|
|
||||||
|
|
||||||
/* Class = "NSTextFieldCell"; title = "Search"; ObjectID = "265"; */
|
/* Class = "NSTextFieldCell"; title = "Search"; ObjectID = "265"; */
|
||||||
"265.title" = "Search";
|
"265.title" = "Search";
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
@@ -20,15 +20,6 @@
|
|||||||
/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */
|
/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */
|
||||||
"243.title" = "OtherViews";
|
"243.title" = "OtherViews";
|
||||||
|
|
||||||
/* Class = "NSMenuItem"; title = "Disable Autotype"; ObjectID = "244"; */
|
|
||||||
"244.title" = "Disable Autotype";
|
|
||||||
|
|
||||||
/* Class = "NSMenuItem"; title = "Enable Autotype"; ObjectID = "245"; */
|
|
||||||
"245.title" = "Enable Autotype";
|
|
||||||
|
|
||||||
/* Class = "NSMenuItem"; title = "Inherit Autotype Settings"; ObjectID = "246"; */
|
|
||||||
"246.title" = "Inherit Autotype Settings";
|
|
||||||
|
|
||||||
/* Class = "NSTextFieldCell"; title = "Search"; ObjectID = "265"; */
|
/* Class = "NSTextFieldCell"; title = "Search"; ObjectID = "265"; */
|
||||||
"265.title" = "Search";
|
"265.title" = "Search";
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
@@ -20,15 +20,6 @@
|
|||||||
/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */
|
/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */
|
||||||
"243.title" = "OverigeViews";
|
"243.title" = "OverigeViews";
|
||||||
|
|
||||||
/* Class = "NSMenuItem"; title = "Disable Autotype"; ObjectID = "244"; */
|
|
||||||
"244.title" = "Deactiveer Autotype";
|
|
||||||
|
|
||||||
/* Class = "NSMenuItem"; title = "Enable Autotype"; ObjectID = "245"; */
|
|
||||||
"245.title" = "Activeer Autotype";
|
|
||||||
|
|
||||||
/* Class = "NSMenuItem"; title = "Inherit Autotype Settings"; ObjectID = "246"; */
|
|
||||||
"246.title" = "Erf Autotype Voorkeuren";
|
|
||||||
|
|
||||||
/* Class = "NSTextFieldCell"; title = "Search"; ObjectID = "265"; */
|
/* Class = "NSTextFieldCell"; title = "Search"; ObjectID = "265"; */
|
||||||
"265.title" = "Zoeken";
|
"265.title" = "Zoeken";
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
@@ -20,15 +20,6 @@
|
|||||||
/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */
|
/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */
|
||||||
"243.title" = "OtherViews";
|
"243.title" = "OtherViews";
|
||||||
|
|
||||||
/* Class = "NSMenuItem"; title = "Disable Autotype"; ObjectID = "244"; */
|
|
||||||
"244.title" = "不使用自动键入";
|
|
||||||
|
|
||||||
/* Class = "NSMenuItem"; title = "Enable Autotype"; ObjectID = "245"; */
|
|
||||||
"245.title" = "使用自动键入";
|
|
||||||
|
|
||||||
/* Class = "NSMenuItem"; title = "Inherit Autotype Settings"; ObjectID = "246"; */
|
|
||||||
"246.title" = "继承自动键入设置";
|
|
||||||
|
|
||||||
/* Class = "NSTextFieldCell"; title = "Search"; ObjectID = "265"; */
|
/* Class = "NSTextFieldCell"; title = "Search"; ObjectID = "265"; */
|
||||||
"265.title" = "搜索";
|
"265.title" = "搜索";
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user