diff --git a/AppController.m b/AppController.m index 57096bf..f2f607b 100755 --- a/AppController.m +++ b/AppController.m @@ -55,6 +55,8 @@ @"skipPasswordFields", [NSNumber numberWithBool:NO], @"removeDuplicates", + [NSNumber numberWithBool:YES], + @"popUpAnimation", nil]]; return [super init]; } @@ -406,7 +408,9 @@ } if ([bezel respondsToSelector:@selector(setCollectionBehavior:)]) [bezel setCollectionBehavior:NSWindowCollectionBehaviorCanJoinAllSpaces]; - [bezel makeKeyAndOrderFrontWithPopEffect]; + if ([[DBUserDefaults standardUserDefaults] boolForKey:@"popUpAnimation"]) + [bezel makeKeyAndOrderFrontWithPopEffect]; + else [bezel makeKeyAndOrderFront:self]; isBezelDisplayed = YES; } diff --git a/English.lproj/MainMenu.nib/designable.nib b/English.lproj/MainMenu.nib/designable.nib index 3ba57ca..0c9493f 100644 --- a/English.lproj/MainMenu.nib/designable.nib +++ b/English.lproj/MainMenu.nib/designable.nib @@ -162,13 +162,13 @@ {507, 471} - + YES net.sf.jumpcut.preferences.general.tiff - + 256 YES @@ -187,7 +187,6 @@ 256 {{14, 275}, {97, 18}} - YES @@ -220,7 +219,6 @@ 256 {{79, 133}, {189, 26}} - YES @@ -297,7 +295,6 @@ 256 {{14, 214}, {204, 18}} - YES @@ -321,7 +318,6 @@ 256 {{14, 194}, {247, 18}} - YES @@ -345,7 +341,6 @@ 256 {{14, 77}, {247, 18}} - YES @@ -369,8 +364,7 @@ 256 {{14, 57}, {247, 18}} - - + YES 67239424 @@ -393,7 +387,6 @@ 256 {{13, 161}, {76, 23}} - YES @@ -427,7 +420,6 @@ 256 {{13, 139}, {33, 14}} - YES @@ -449,7 +441,6 @@ 256 {{13, 113}, {62, 14}} - YES @@ -467,7 +458,6 @@ 256 {{134, 113}, {95, 14}} - YES @@ -485,7 +475,6 @@ 256 {{79, 108}, {25, 22}} - YES @@ -576,7 +565,6 @@ 256 {{224, 108}, {24, 22}} - YES @@ -644,7 +632,6 @@ 256 {{104, 106}, {19, 27}} - YES @@ -664,7 +651,6 @@ 256 {{249, 106}, {19, 27}} - YES @@ -684,7 +670,6 @@ 256 {{14, 255}, {162, 18}} - YES @@ -707,7 +692,6 @@ 256 {{14, 235}, {162, 18}} - YES @@ -728,13 +712,11 @@ {555, 305} - {{-3, 180}, {555, 305}} - {0, 0} @@ -756,8 +738,6 @@ {507, 471} - - General @@ -807,6 +787,7 @@ 256 {{247, 48}, {255, 61}} + YES 67239424 @@ -864,7 +845,7 @@ net.sf.jumpcut.preferences.appearance.tiff - + 256 YES @@ -881,8 +862,9 @@ 256 - {{119, 221}, {306, 25}} + {{119, 279}, {306, 25}} + YES @@ -910,8 +892,9 @@ 256 - {{121, 204}, {80, 13}} + {{121, 262}, {80, 13}} + YES @@ -927,8 +910,9 @@ 256 - {{381, 204}, {42, 13}} + {{381, 262}, {42, 13}} + YES @@ -944,8 +928,9 @@ 256 - {{119, 158}, {306, 25}} + {{119, 216}, {306, 25}} + YES @@ -969,8 +954,9 @@ 256 - {{121, 141}, {80, 13}} + {{121, 199}, {80, 13}} + YES @@ -986,8 +972,9 @@ 256 - {{381, 141}, {42, 13}} + {{381, 199}, {42, 13}} + YES @@ -1003,8 +990,10 @@ 256 - {{118, 42}, {130, 26}} + {{118, 100}, {130, 26}} + + YES -2076049856 @@ -1073,8 +1062,9 @@ 256 - {{16, 48}, {80, 13}} + {{16, 106}, {80, 13}} + YES @@ -1090,8 +1080,9 @@ 256 - {{16, 164}, {80, 17}} + {{16, 222}, {80, 17}} + YES @@ -1107,8 +1098,9 @@ 256 - {{119, 101}, {306, 25}} + {{119, 159}, {306, 25}} + YES @@ -1132,8 +1124,9 @@ 256 - {{121, 84}, {80, 13}} + {{121, 142}, {80, 13}} + YES @@ -1149,8 +1142,9 @@ 256 - {{381, 84}, {42, 13}} + {{381, 142}, {42, 13}} + YES @@ -1166,8 +1160,9 @@ 256 - {{16, 107}, {80, 17}} + {{16, 165}, {80, 17}} + YES @@ -1183,8 +1178,9 @@ 256 - {{16, 229}, {97, 13}} + {{16, 287}, {97, 13}} + YES @@ -1197,14 +1193,39 @@ + + + 256 + {{14, 68}, {189, 18}} + + + + YES + + 67239424 + 0 + Animate bezel appearance + + + 1211912703 + 2 + + + + 200 + 25 + + - {555, 258} + {555, 316} + - {{-3, 231}, {555, 258}} + {{-3, 173}, {555, 316}} + {0, 0} @@ -1226,6 +1247,8 @@ {507, 471} + + Appearance @@ -1501,14 +1524,14 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - + 6 YES YES YES - + @@ -1964,6 +1987,22 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 906 + + + value: values.popUpAnimation + + + + + + value: values.popUpAnimation + value + values.popUpAnimation + 2 + + + 913 + @@ -2179,6 +2218,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + Box - Box @@ -2787,6 +2827,20 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + + 910 + + + YES + + + + + + 911 + + + @@ -2910,6 +2964,9 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 898.IBPluginDependency 903.IBPluginDependency 904.IBPluginDependency + 910.IBAttributePlaceholdersKey + 910.IBPluginDependency + 911.IBPluginDependency YES @@ -3065,6 +3122,13 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + YES + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin @@ -3079,7 +3143,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - 906 + 913 diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib index db4b937..4cbe67a 100644 Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and b/English.lproj/MainMenu.nib/keyedobjects.nib differ