nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-13 21:42:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue wiht mixed disabled/enabled settings for group autotype property

Browse Source
This commit is contained in:
michael starke
2014-12-08 15:35:29 +01:00
parent 1729a9dcf1
commit 92c1981668
14 changed files with 20 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HNHUi

Submodule HNHUi updated: f056276a89...0a0c4564d1

2
KeePassKit

Submodule KeePassKit updated: ab02bcab6f...8e3174244b

16
MacPass/Base.lproj/GroupInspectorView.xib
View File

@@ -1,8 +1,8 @@
<?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>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6250"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6254"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="MPGroupInspectorViewController">
@@ -76,7 +76,7 @@
</button>
<popUpButton verticalHuggingPriority="750" horizontalCompressionResistancePriority="249" translatesAutoresizingMaskIntoConstraints="NO" id="229">
<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"/>
<font key="font" metaFont="menu"/>
<menu key="menu" title="OtherViews" id="231">
@@ -85,7 +85,7 @@
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
<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>
</menu>
</popUpButtonCell>
@@ -98,13 +98,7 @@
<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"/>
<font key="font" metaFont="menu"/>
<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>
<menu key="menu" title="OtherViews" id="243"/>
</popUpButtonCell>
<connections>
<outlet property="nextKeyView" destination="Fnw-qz-IZU" id="Q0q-HY-T34"/>

13
MacPass/MPGroupInspectorViewController.m
View File

@@ -56,6 +56,19 @@
metrics:nil
views:views]];
[[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) {
[[MPPasteBoardController defaultController] copyObjects:@[ textField.stringValue ]];

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

@@ -20,15 +20,6 @@
/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */
"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"; */
"265.title" = "Search";

BIN
MacPass/de.lproj/Localizable.strings
View File

Binary file not shown.

9
MacPass/en.lproj/GroupInspectorView.strings
View File

@@ -20,15 +20,6 @@
/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */
"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"; */
"265.title" = "Search";

BIN
MacPass/en.lproj/Localizable.strings
View File

Binary file not shown.

9
MacPass/fr.lproj/GroupInspectorView.strings
View File

@@ -20,15 +20,6 @@
/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */
"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"; */
"265.title" = "Search";

BIN
MacPass/fr.lproj/Localizable.strings
View File

Binary file not shown.

9
MacPass/nl.lproj/GroupInspectorView.strings
View File

@@ -20,15 +20,6 @@
/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */
"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"; */
"265.title" = "Zoeken";

BIN
MacPass/nl.lproj/Localizable.strings
View File

Binary file not shown.

9
MacPass/zh-Hans.lproj/GroupInspectorView.strings
View File

@@ -20,15 +20,6 @@
/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */
"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"; */
"265.title" = "搜索";

BIN
MacPass/zh-Hans.lproj/Localizable.strings
View File

Binary file not shown.