diff --git a/ShiftIt/Base.lproj/Localizable.strings b/ShiftIt/Base.lproj/Localizable.strings index fbcce37b..9f1e9256 100644 --- a/ShiftIt/Base.lproj/Localizable.strings +++ b/ShiftIt/Base.lproj/Localizable.strings @@ -18,6 +18,7 @@ "Toggle Zoom" = "Toggle Zoom"; "Maximize" = "Maximize"; "Toggle Full Screen" = "Toggle Full Screen"; +"Full Height" = "Full Height"; "Increase" = "Increase"; "Reduce" = "Reduce"; "Next Screen" = "Next Screen"; diff --git a/ShiftIt/Base.lproj/MainMenu.xib b/ShiftIt/Base.lproj/MainMenu.xib index a8f0fa08..7ea7e06d 100644 --- a/ShiftIt/Base.lproj/MainMenu.xib +++ b/ShiftIt/Base.lproj/MainMenu.xib @@ -1,8 +1,8 @@ - + - - + + @@ -11,7 +11,7 @@ - + @@ -57,18 +57,21 @@ + + + - + - + - + - + diff --git a/ShiftIt/DefaultShiftItActions.h b/ShiftIt/DefaultShiftItActions.h index 0433c551..bf084790 100644 --- a/ShiftIt/DefaultShiftItActions.h +++ b/ShiftIt/DefaultShiftItActions.h @@ -31,6 +31,7 @@ const extern SimpleWindowGeometryChangeBlock shiftItBottomLeft; const extern SimpleWindowGeometryChangeBlock shiftItBottomRight; const extern SimpleWindowGeometryChangeBlock shiftItFullScreen; const extern SimpleWindowGeometryChangeBlock shiftItCenter; +const extern SimpleWindowGeometryChangeBlock shiftItFullHeight; @interface IncreaseReduceShiftItAction : AbstractWindowGeometryShiftItAction { @private diff --git a/ShiftIt/DefaultShiftItActions.m b/ShiftIt/DefaultShiftItActions.m index 5fe711e4..7c43a22a 100644 --- a/ShiftIt/DefaultShiftItActions.m +++ b/ShiftIt/DefaultShiftItActions.m @@ -129,6 +129,18 @@ return MakeAnchoredRect(r, 0); }; +const SimpleWindowGeometryChangeBlock shiftItFullHeight = ^AnchoredRect(NSRect windowRect, NSSize screenSize) { + NSRect r = NSMakeRect(0, 0, 0, 0); + + r.origin.x = windowRect.origin.x; + r.origin.y = 0; + + r.size.width = windowRect.size.width; + r.size.height = screenSize.height; + + return MakeAnchoredRect(r, 0); +}; + const SimpleWindowGeometryChangeBlock shiftItCenter = ^AnchoredRect(NSRect windowRect, NSSize screenSize) { NSRect r = NSMakeRect(0, 0, 0, 0); diff --git a/ShiftIt/FMT Tests/FMT Tests-Info.plist b/ShiftIt/FMT Tests/FMT Tests-Info.plist index 08bb4033..169b6f71 100644 --- a/ShiftIt/FMT Tests/FMT Tests-Info.plist +++ b/ShiftIt/FMT Tests/FMT Tests-Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - net.fikovnik.projects.FMT.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType diff --git a/ShiftIt/PreferencesWindowController.m b/ShiftIt/PreferencesWindowController.m index 07db9467..662dda0b 100644 --- a/ShiftIt/PreferencesWindowController.m +++ b/ShiftIt/PreferencesWindowController.m @@ -198,6 +198,7 @@ - (void)setShouldStartAtLogin:(BOOL)flag { @"zoom", @"maximize", @"fullScreen", + @"fullHeight", NULL, @"increase", @"reduce", diff --git a/ShiftIt/ShiftIt Tests/SIAdjacentRectanglesTest.m b/ShiftIt/ShiftIt Tests/SIAdjacentRectanglesTest.m index 9f7a2596..3606b31b 100644 --- a/ShiftIt/ShiftIt Tests/SIAdjacentRectanglesTest.m +++ b/ShiftIt/ShiftIt Tests/SIAdjacentRectanglesTest.m @@ -17,10 +17,10 @@ */ -#import +#import #import "SIAdjacentRectangles.h" -@interface SIAdjacentRectanglesTest : SenTestCase +@interface SIAdjacentRectanglesTest : XCTestCase @end @implementation SIAdjacentRectanglesTest @@ -65,7 +65,7 @@ - (void)testTwoRectangles { FMTDirection directions[] = {kRightDirection, kBottomDirection, kLeftDirection, kTopDirection}; NSArray *path = [adjr buildDirectionalPath:directions fromValue:@"A"]; - STAssertEquals((NSUInteger)11, [path count], @"There is only one rectangle in right direction from A"); + XCTAssertEqual((NSUInteger)11, [path count], @"There is only one rectangle in right direction from A"); NSLog(@"%@",path); } diff --git a/ShiftIt/ShiftIt Tests/ShiftIt Tests-Info.plist b/ShiftIt/ShiftIt Tests/ShiftIt Tests-Info.plist index 533e6a68..169b6f71 100644 --- a/ShiftIt/ShiftIt Tests/ShiftIt Tests-Info.plist +++ b/ShiftIt/ShiftIt Tests/ShiftIt Tests-Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - org.shiftitapp.shiftit.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType diff --git a/ShiftIt/ShiftIt-Info.plist b/ShiftIt/ShiftIt-Info.plist index 7a409bf4..07168b2d 100644 --- a/ShiftIt/ShiftIt-Info.plist +++ b/ShiftIt/ShiftIt-Info.plist @@ -9,7 +9,7 @@ CFBundleIconFile ShiftIt.icns CFBundleIdentifier - org.shiftitapp.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/ShiftIt/ShiftIt-defaults.plist b/ShiftIt/ShiftIt-defaults.plist index 85b5e979..87059709 100644 --- a/ShiftIt/ShiftIt-defaults.plist +++ b/ShiftIt/ShiftIt-defaults.plist @@ -30,6 +30,10 @@ 28 fixedSizeWidthDelta 50 + fullHeightKeyCode + 4 + fullHeightModifiers + 1 fullScreenKeyCode 3 fullScreenModifiers @@ -85,10 +89,10 @@ zoomKeyCode 6 zoomModifiers - 1835008 - nextscreenKeyCode - 45 - nextscreenModifiers + 1835008 + nextscreenKeyCode + 45 + nextscreenModifiers 1835008 previousscreenKeyCode 35 diff --git a/ShiftIt/ShiftIt.xcodeproj/project.pbxproj b/ShiftIt/ShiftIt.xcodeproj/project.pbxproj index 66908fcd..fe16391f 100644 --- a/ShiftIt/ShiftIt.xcodeproj/project.pbxproj +++ b/ShiftIt/ShiftIt.xcodeproj/project.pbxproj @@ -44,7 +44,6 @@ 27160C6D16C939FF002DA475 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; 27160C6F16C939FF002DA475 /* ShortcutRecorder.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 27A14D7F1269CCA200E68263 /* ShortcutRecorder.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 27160C7016C939FF002DA475 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F2708222117FCF9400C0A04C /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 2717BDAC1498B7FD0012EF87 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2714C0B21487F9BC00CC951D /* SenTestingKit.framework */; }; 2717BE18149933530012EF87 /* GTMLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 270DACA814098AE30080DFBD /* GTMLogger.m */; }; 2717BE1F149933840012EF87 /* SIAdjacentRectangles.m in Sources */ = {isa = PBXBuildFile; fileRef = F2DC61EF1127C862000E1A5F /* SIAdjacentRectangles.m */; }; 2717BE29149933E70012EF87 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2717BE28149933E70012EF87 /* Carbon.framework */; }; @@ -52,7 +51,6 @@ 2717BE39149935EC0012EF87 /* FMTNSArray+Functional.m in Sources */ = {isa = PBXBuildFile; fileRef = 2717BE36149935EB0012EF87 /* FMTNSArray+Functional.m */; }; 2717BE3A149935EC0012EF87 /* FMTNSArray+Functional.m in Sources */ = {isa = PBXBuildFile; fileRef = 2717BE36149935EB0012EF87 /* FMTNSArray+Functional.m */; }; 2717BE3B149935EC0012EF87 /* FMTNSError+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = 2717BE38149935EC0012EF87 /* FMTNSError+Extras.m */; }; - 2717BEAC14994C120012EF87 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2714C0B21487F9BC00CC951D /* SenTestingKit.framework */; }; 2717BEAE14994C120012EF87 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2717BEAD14994C120012EF87 /* Cocoa.framework */; }; 2717BEBA14994C120012EF87 /* FMTGeometryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2717BEB914994C120012EF87 /* FMTGeometryTests.m */; }; 2717BEBF14994CAE0012EF87 /* FMTGeometry.m in Sources */ = {isa = PBXBuildFile; fileRef = F2DC61EF1127C862000E1A67 /* FMTGeometry.m */; }; @@ -161,9 +159,8 @@ 270DACA714098AE30080DFBD /* GTMLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTMLogger.h; path = GTM/GTMLogger.h; sourceTree = ""; }; 270DACA814098AE30080DFBD /* GTMLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GTMLogger.m; path = GTM/GTMLogger.m; sourceTree = ""; }; 270DACAA14098B250080DFBD /* GTMDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTMDefines.h; path = GTM/GTMDefines.h; sourceTree = ""; }; - 2714C0B21487F9BC00CC951D /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; }; 27160C7416C939FF002DA475 /* ShiftIt.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ShiftIt.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 2717BDAB1498B7FD0012EF87 /* ShiftIt Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ShiftIt Tests.octest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 2717BDAB1498B7FD0012EF87 /* ShiftIt Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ShiftIt Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 2717BE28149933E70012EF87 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; }; 2717BE2A149933EE0012EF87 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; 2717BE34149935EB0012EF87 /* FMT.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FMT.h; path = FMT/FMT.h; sourceTree = ""; }; @@ -267,7 +264,6 @@ files = ( 2717BE2B149933EE0012EF87 /* Cocoa.framework in Frameworks */, 2717BE29149933E70012EF87 /* Carbon.framework in Frameworks */, - 2717BDAC1498B7FD0012EF87 /* SenTestingKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -275,7 +271,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 2717BEAC14994C120012EF87 /* SenTestingKit.framework in Frameworks */, 2717BEAE14994C120012EF87 /* Cocoa.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -337,7 +332,7 @@ isa = PBXGroup; children = ( 8D1107320486CEB800E47090 /* ShiftIt.app */, - 2717BDAB1498B7FD0012EF87 /* ShiftIt Tests.octest */, + 2717BDAB1498B7FD0012EF87 /* ShiftIt Tests.xctest */, 2717BEAB14994C120012EF87 /* FMT Tests.octest */, 27160C7416C939FF002DA475 /* ShiftIt.app */, ); @@ -528,7 +523,6 @@ children = ( 279AF8181943675F0048FE5F /* ScriptingBridge.framework */, 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */, - 2714C0B21487F9BC00CC951D /* SenTestingKit.framework */, 2717BEAD14994C120012EF87 /* Cocoa.framework */, 27B4F46A192CFB2B00D35063 /* CoreFoundation.framework */, 27B4F479192CFB4600D35063 /* Foundation.framework */, @@ -603,8 +597,8 @@ ); name = "ShiftIt Tests"; productName = "ShiftIt Tests"; - productReference = 2717BDAB1498B7FD0012EF87 /* ShiftIt Tests.octest */; - productType = "com.apple.product-type.bundle.ocunit-test"; + productReference = 2717BDAB1498B7FD0012EF87 /* ShiftIt Tests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; }; 2717BEAA14994C120012EF87 /* FMT Tests */ = { isa = PBXNativeTarget; @@ -650,8 +644,8 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastTestingUpgradeCheck = 0630; - LastUpgradeCheck = 0630; + LastTestingUpgradeCheck = 0700; + LastUpgradeCheck = 0700; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ShiftIt" */; compatibilityVersion = "Xcode 3.2"; @@ -902,6 +896,7 @@ GCC_PREFIX_HEADER = ShiftIt_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "_DEBUGPRINTS_=1"; INFOPLIST_FILE = "ShiftIt-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "org.shiftitapp.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = ShiftIt; }; name = Debug; @@ -915,6 +910,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ShiftIt_Prefix.pch; INFOPLIST_FILE = "ShiftIt-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "org.shiftitapp.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = ShiftIt; }; name = Release; @@ -925,8 +921,8 @@ ALWAYS_SEARCH_USER_PATHS = NO; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( - "$(DEVELOPER_LIBRARY_DIR)/Frameworks", - "\"$(SRCROOT)\"", + "$(SRCROOT)", + "$(inherited)", ); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "ShiftIt Tests/ShiftIt Tests-Prefix.pch"; @@ -935,8 +931,8 @@ "$(inherited)", ); INFOPLIST_FILE = "ShiftIt Tests/ShiftIt Tests-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "org.shiftitapp.shiftit.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; - WRAPPER_EXTENSION = octest; }; name = Debug; }; @@ -946,14 +942,14 @@ ALWAYS_SEARCH_USER_PATHS = NO; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( - "$(DEVELOPER_LIBRARY_DIR)/Frameworks", - "\"$(SRCROOT)\"", + "$(SRCROOT)", + "$(inherited)", ); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "ShiftIt Tests/ShiftIt Tests-Prefix.pch"; INFOPLIST_FILE = "ShiftIt Tests/ShiftIt Tests-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "org.shiftitapp.shiftit.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; - WRAPPER_EXTENSION = octest; }; name = Release; }; @@ -976,6 +972,7 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = YES; INFOPLIST_FILE = "FMT Tests/FMT Tests-Info.plist"; MACOSX_DEPLOYMENT_TARGET = 10.7; + PRODUCT_BUNDLE_IDENTIFIER = "net.fikovnik.projects.FMT.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = octest; }; @@ -995,6 +992,7 @@ GCC_WARN_64_TO_32_BIT_CONVERSION = YES; INFOPLIST_FILE = "FMT Tests/FMT Tests-Info.plist"; MACOSX_DEPLOYMENT_TARGET = 10.7; + PRODUCT_BUNDLE_IDENTIFIER = "net.fikovnik.projects.FMT.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = octest; }; @@ -1025,6 +1023,7 @@ "-DDEBUG", "-DX11", ); + PRODUCT_BUNDLE_IDENTIFIER = "org.shiftitapp.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = ShiftIt; }; name = Debug; @@ -1052,6 +1051,7 @@ "-DNDEBUG", "-DX11", ); + PRODUCT_BUNDLE_IDENTIFIER = "org.shiftitapp.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = ShiftIt; }; name = Release; @@ -1059,9 +1059,9 @@ C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; + ENABLE_TESTABILITY = YES; FRAMEWORK_SEARCH_PATHS = .; GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_OPTIMIZATION_LEVEL = 0; @@ -1096,7 +1096,6 @@ C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; FRAMEWORK_SEARCH_PATHS = .; diff --git a/ShiftIt/ShiftIt.xcodeproj/xcshareddata/xcschemes/FMT Tests.xcscheme b/ShiftIt/ShiftIt.xcodeproj/xcshareddata/xcschemes/FMT Tests.xcscheme index 8fd79651..05f6dd68 100644 --- a/ShiftIt/ShiftIt.xcodeproj/xcshareddata/xcschemes/FMT Tests.xcscheme +++ b/ShiftIt/ShiftIt.xcodeproj/xcshareddata/xcschemes/FMT Tests.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -39,15 +39,18 @@ + + + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -38,15 +38,18 @@ ReferencedContainer = "container:ShiftIt.xcodeproj"> + + @@ -62,10 +65,10 @@ diff --git a/ShiftIt/ShiftIt.xcodeproj/xcshareddata/xcschemes/ShiftIt.xcscheme b/ShiftIt/ShiftIt.xcodeproj/xcshareddata/xcschemes/ShiftIt.xcscheme index a2c00479..cc7d5be4 100644 --- a/ShiftIt/ShiftIt.xcodeproj/xcshareddata/xcschemes/ShiftIt.xcscheme +++ b/ShiftIt/ShiftIt.xcodeproj/xcshareddata/xcschemes/ShiftIt.xcscheme @@ -1,6 +1,6 @@ @@ -37,17 +37,17 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -62,15 +62,18 @@ ReferencedContainer = "container:ShiftIt.xcodeproj"> + + @@ -86,10 +89,10 @@ diff --git a/ShiftIt/ShiftItAppDelegate.m b/ShiftIt/ShiftItAppDelegate.m index e3502a1f..c1bbee46 100644 --- a/ShiftIt/ShiftItAppDelegate.m +++ b/ShiftIt/ShiftItAppDelegate.m @@ -587,10 +587,11 @@ - (void)initializeActions_ { REGISTER_ACTION(dict, @"zoom", NSLocalizedString(@"Toggle Zoom", nil), 10, [[[ToggleZoomShiftItAction alloc] init] autorelease]); REGISTER_ACTION(dict, @"maximize", NSLocalizedString(@"Maximize", nil), 11, [[[WindowGeometryShiftItAction alloc] initWithBlock:shiftItFullScreen] autorelease]); REGISTER_ACTION(dict, @"fullScreen", NSLocalizedString(@"Toggle Full Screen", nil), 12, [[[ToggleFullScreenShiftItAction alloc] init] autorelease]); - REGISTER_ACTION(dict, @"increase", NSLocalizedString(@"Increase", nil), 13, [[[IncreaseReduceShiftItAction alloc] initWithMode:YES] autorelease]); - REGISTER_ACTION(dict, @"reduce", NSLocalizedString(@"Reduce", nil), 14, [[[IncreaseReduceShiftItAction alloc] initWithMode:NO] autorelease]); - REGISTER_ACTION(dict, @"nextscreen", NSLocalizedString(@"Next Screen", nil), 15, [[[ScreenChangeShiftItAction alloc] initWithMode:YES] autorelease]); - REGISTER_ACTION(dict, @"previousscreen", NSLocalizedString(@"Previous Screen", nil), 16, [[[ScreenChangeShiftItAction alloc] initWithMode:NO] autorelease]); + REGISTER_ACTION(dict, @"fullHeight", NSLocalizedString(@"Full Height", nil), 13, [[[WindowGeometryShiftItAction alloc] initWithBlock:shiftItFullHeight] autorelease]); + REGISTER_ACTION(dict, @"increase", NSLocalizedString(@"Increase", nil), 14, [[[IncreaseReduceShiftItAction alloc] initWithMode:YES] autorelease]); + REGISTER_ACTION(dict, @"reduce", NSLocalizedString(@"Reduce", nil), 15, [[[IncreaseReduceShiftItAction alloc] initWithMode:NO] autorelease]); + REGISTER_ACTION(dict, @"nextscreen", NSLocalizedString(@"Next Screen", nil), 16, [[[ScreenChangeShiftItAction alloc] initWithMode:YES] autorelease]); + REGISTER_ACTION(dict, @"previousscreen", NSLocalizedString(@"Previous Screen", nil), 17, [[[ScreenChangeShiftItAction alloc] initWithMode:NO] autorelease]); #undef REGISTER_ACTION diff --git a/ShiftIt/ja.lproj/Localizable.strings b/ShiftIt/ja.lproj/Localizable.strings index 80c3270c..363fb321 100644 --- a/ShiftIt/ja.lproj/Localizable.strings +++ b/ShiftIt/ja.lproj/Localizable.strings @@ -18,6 +18,7 @@ "Toggle Zoom" = "ズームの切り替え"; "Maximize" = "最大化"; "Toggle Full Screen" = "フルスクリーンの切り替え"; +"Full Height" = "Full Height"; "Increase" = "ウインドウの拡大"; "Reduce" = "ウインドウの縮小"; "Next Screen" = "次のスクリーン";