From 92c1981668c6574a9a1b4ac0a78bce934ba3f984 Mon Sep 17 00:00:00 2001 From: michael starke Date: Mon, 8 Dec 2014 15:35:29 +0100 Subject: [PATCH] Fixed issue wiht mixed disabled/enabled settings for group autotype property --- HNHUi | 2 +- KeePassKit | 2 +- MacPass/Base.lproj/GroupInspectorView.xib | 16 +++++----------- MacPass/MPGroupInspectorViewController.m | 13 +++++++++++++ MacPass/de.lproj/GroupInspectorView.strings | 9 --------- MacPass/de.lproj/Localizable.strings | Bin 12010 -> 12326 bytes MacPass/en.lproj/GroupInspectorView.strings | 9 --------- MacPass/en.lproj/Localizable.strings | Bin 11132 -> 11420 bytes MacPass/fr.lproj/GroupInspectorView.strings | 9 --------- MacPass/fr.lproj/Localizable.strings | Bin 11846 -> 12134 bytes MacPass/nl.lproj/GroupInspectorView.strings | 9 --------- MacPass/nl.lproj/Localizable.strings | Bin 11748 -> 12042 bytes .../zh-Hans.lproj/GroupInspectorView.strings | 9 --------- MacPass/zh-Hans.lproj/Localizable.strings | Bin 9420 -> 9638 bytes 14 files changed, 20 insertions(+), 58 deletions(-) diff --git a/HNHUi b/HNHUi index f056276a..0a0c4564 160000 --- a/HNHUi +++ b/HNHUi @@ -1 +1 @@ -Subproject commit f056276a89340b2cb16332279217b9a49da6c80a +Subproject commit 0a0c4564d14a2814f2d7e0196d479a8fb644e5ce diff --git a/KeePassKit b/KeePassKit index ab02bcab..8e317424 160000 --- a/KeePassKit +++ b/KeePassKit @@ -1 +1 @@ -Subproject commit ab02bcab6ff3b1d19f7cf519bd59e5b6bd60f319 +Subproject commit 8e3174244b07f7065eebdbd0c11eb6af621549a8 diff --git a/MacPass/Base.lproj/GroupInspectorView.xib b/MacPass/Base.lproj/GroupInspectorView.xib index e49c41d5..fcdd133c 100644 --- a/MacPass/Base.lproj/GroupInspectorView.xib +++ b/MacPass/Base.lproj/GroupInspectorView.xib @@ -1,8 +1,8 @@ - + - + @@ -76,7 +76,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -98,13 +98,7 @@ - - - - - - - + diff --git a/MacPass/MPGroupInspectorViewController.m b/MacPass/MPGroupInspectorViewController.m index e6b7712d..7e63361c 100644 --- a/MacPass/MPGroupInspectorViewController.m +++ b/MacPass/MPGroupInspectorViewController.m @@ -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 ]]; diff --git a/MacPass/de.lproj/GroupInspectorView.strings b/MacPass/de.lproj/GroupInspectorView.strings index 660fc3ac..2c6068f5 100644 --- a/MacPass/de.lproj/GroupInspectorView.strings +++ b/MacPass/de.lproj/GroupInspectorView.strings @@ -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"; diff --git a/MacPass/de.lproj/Localizable.strings b/MacPass/de.lproj/Localizable.strings index c6e6d70bcc7b7a21724f220fbb025372476409ae..7be89fbf22e2b0b1b3f7ca122ff6c41f73236018 100644 GIT binary patch delta 314 zcmaDAyDVYDB?)DH1}z2!26u)chJ1!nh5{hllOd0x7|2RxNMTA^bfO2)&>)~!Lhu^w3UngKvn4=NbAYfE$V&%1 WR{`$yB8DWO2rJkJo6k!~iva)%KRDC? delta 12 TcmZ3M@G5r0C5g>^QW9bSD0T$# diff --git a/MacPass/en.lproj/GroupInspectorView.strings b/MacPass/en.lproj/GroupInspectorView.strings index 660fc3ac..2c6068f5 100644 --- a/MacPass/en.lproj/GroupInspectorView.strings +++ b/MacPass/en.lproj/GroupInspectorView.strings @@ -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"; diff --git a/MacPass/en.lproj/Localizable.strings b/MacPass/en.lproj/Localizable.strings index 91d37ebcd362c9701e0721568dbdb2f2eb61d1b7..3342611bc0ee62eb92dd6e2491fea3306c414a3a 100644 GIT binary patch delta 256 zcmewpHYaiepSZ3*gBF7VgF8bJLq0<(LjjQO$&klT3}mG;Br}u%MT>x9S`7LOTntK+ z4Hbk<{TTcilz?KkK&-^z!jK76oyd^HkOS1Az~Bfp1*EHlp%QF{5`#5dXC#9wLokwF zSD;Nq>Gbqu@MG`*>J9?BE(FO0kXti=_7(wMQG&&G1)zPYK$#Mtd>%tOL-FK^lERy% H#FIn-kw7gp delta 12 TcmbOe`6p}xpZI1yi98ViBj^N} diff --git a/MacPass/fr.lproj/GroupInspectorView.strings b/MacPass/fr.lproj/GroupInspectorView.strings index 660fc3ac..2c6068f5 100644 --- a/MacPass/fr.lproj/GroupInspectorView.strings +++ b/MacPass/fr.lproj/GroupInspectorView.strings @@ -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"; diff --git a/MacPass/fr.lproj/Localizable.strings b/MacPass/fr.lproj/Localizable.strings index be5d7237bad7dbb668eeb0fc89fd3d7ad6ae7df3..bbe4151d65e7befa4d00a531a0f80b0709297be4 100644 GIT binary patch delta 300 zcmb7?|-Dx`wYu)jl-uN3qSJxY7f1N6&4Y-~8V zJMO;w?!I^|uP>|gaIqPZlTmO|9*}ZYmaxUBo2%#I(ZZomM94%DGsS1cSe2uRp2A_k zLAz@<9JOz2zNi?6OGR|({&LD16bm*2h0W>fO=!p;{LtTN6O2gtT1%@!7xj-*6WCI;u T3ZzpR@+Lb<3vWIqAtwp|g2Xf| delta 12 TcmeB*dlJ22m&E1=l3JnwDS`!+ diff --git a/MacPass/zh-Hans.lproj/GroupInspectorView.strings b/MacPass/zh-Hans.lproj/GroupInspectorView.strings index 6349ae2f..767ee822 100644 --- a/MacPass/zh-Hans.lproj/GroupInspectorView.strings +++ b/MacPass/zh-Hans.lproj/GroupInspectorView.strings @@ -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" = "搜索"; diff --git a/MacPass/zh-Hans.lproj/Localizable.strings b/MacPass/zh-Hans.lproj/Localizable.strings index 8b3e36a806f71ecdd8b838aa132fe334cda5e36f..db1753921d386902f8e6cc580d7c6dc3c62409da 100644 GIT binary patch delta 180 zcmX@(xy*Zmov^Y#gBF7VgF8bJLq0<(LjjQO$&klT3}mG;Br}u%MT;gUG7C?RQsGke zWAJBC0;;eDVkHJ%zj}X-(pQZug7l`Q1}ZUFGjK5|O%7BMR*qzFWe7%6i9?;XCxah@ f2T*Mg(9RGf_0Q|-lVIlV>&~kOn!VXtc%mQxEF~(D delta 12 TcmZ4Hea3Txo$zJ}kv>5HB7y{l