Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Refactoring #16

Merged
merged 4 commits into from

1 participant

This page is out of date. Refresh to see the latest.
Showing with 186 additions and 203 deletions.
  1. +54 −18 Lin.xcodeproj/project.pbxproj
  2. +0 −13 Lin/IDEWorkspace+Lin.h
  3. +0 −28 Lin/IDEWorkspace+Lin.m
  4. +0 −18 Lin/Images.xcassets/icon120.imageset/Contents.json
  5. +0 −18 Lin/Images.xcassets/icon_detach.imageset/Contents.json
  6. +0 −18 Lin/Images.xcassets/icon_minus.imageset/Contents.json
  7. +0 −18 Lin/Images.xcassets/icon_plus.imageset/Contents.json
  8. 0  Lin/{AlertAccessoryView.xib → LNAlertAccessoryView.xib}
  9. +13 −0 Lin/LNImageButtonCell.h
  10. +21 −0 Lin/LNImageButtonCell.m
  11. +3 −11 Lin/LNPopoverContentView.m
  12. +84 −37 Lin/{PopoverContentView.xib → LNPopoverContentView.xib}
  13. +0 −4 Lin/Lin.h
  14. +11 −20 Lin/Lin.m
  15. 0  Lin/{Images.xcassets/icon120.imageset → }/icon120.png
  16. 0  Lin/{Images.xcassets/icon120.imageset → }/icon120@2x.png
  17. 0  Lin/{Images.xcassets/icon_detach.imageset → }/icon_detach.png
  18. 0  Lin/{Images.xcassets/icon_detach.imageset → }/icon_detach@2x.png
  19. 0  Lin/{Images.xcassets/icon_minus.imageset → }/icon_minus.png
  20. 0  Lin/{Images.xcassets/icon_minus.imageset → }/icon_minus@2x.png
  21. 0  Lin/{Images.xcassets/icon_plus.imageset → }/icon_plus.png
  22. 0  Lin/{Images.xcassets/icon_plus.imageset → }/icon_plus@2x.png
View
72 Lin.xcodeproj/project.pbxproj
@@ -7,14 +7,13 @@
objects = {
/* Begin PBXBuildFile section */
- AA02CE8B17EE08240041C2BD /* AlertAccessoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = AA02CE8A17EE08240041C2BD /* AlertAccessoryView.xib */; };
+ AA02CE8B17EE08240041C2BD /* LNAlertAccessoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = AA02CE8A17EE08240041C2BD /* LNAlertAccessoryView.xib */; };
AA02CE8E17EE083A0041C2BD /* LNAlertAccessoryView.m in Sources */ = {isa = PBXBuildFile; fileRef = AA02CE8D17EE083A0041C2BD /* LNAlertAccessoryView.m */; };
AA1B7DA717C3C1EC00A3A6D7 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA1B7DA617C3C1EC00A3A6D7 /* Cocoa.framework */; };
AA1B7DB117C3C1EC00A3A6D7 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = AA1B7DAF17C3C1EC00A3A6D7 /* InfoPlist.strings */; };
AA1B7DBA17C3C20F00A3A6D7 /* Lin.m in Sources */ = {isa = PBXBuildFile; fileRef = AA1B7DB917C3C20F00A3A6D7 /* Lin.m */; };
AA20D87F17ECB12A006B7CA2 /* NSPopoverFrame+Lin.m in Sources */ = {isa = PBXBuildFile; fileRef = AA20D87E17ECB12A006B7CA2 /* NSPopoverFrame+Lin.m */; };
AA2980B417EE2C5300CF46E3 /* LNUserDefaultsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = AA2980B317EE2C5300CF46E3 /* LNUserDefaultsManager.m */; };
- AA31DF3918C5C07E00AAA101 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AA31DF3818C5C07E00AAA101 /* Images.xcassets */; };
AA36376617D9EF9E003C5E55 /* LNPopoverContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = AA36376517D9EF9E003C5E55 /* LNPopoverContentView.m */; };
AA3EC36F17EB2A290003A180 /* DVTFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA3EC36D17EB2A290003A180 /* DVTFoundation.framework */; };
AA3EC37017EB2A290003A180 /* DVTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA3EC36E17EB2A290003A180 /* DVTKit.framework */; };
@@ -25,10 +24,19 @@
AA470D6517C3D380005CBB7F /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA470D6417C3D380005CBB7F /* XCTest.framework */; };
AA470D6B17C3D380005CBB7F /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = AA470D6917C3D380005CBB7F /* InfoPlist.strings */; };
AA470D7D17C3DE31005CBB7F /* LNDetectorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = AA470D7C17C3DE31005CBB7F /* LNDetectorTests.m */; };
+ AA6377CE18C5CCFC005EADC7 /* LNImageButtonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = AA6377CD18C5CCFC005EADC7 /* LNImageButtonCell.m */; };
+ AA63897918C6019A0061C2C4 /* icon_plus@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA63897118C6019A0061C2C4 /* icon_plus@2x.png */; };
+ AA63897A18C6019A0061C2C4 /* icon_minus.png in Resources */ = {isa = PBXBuildFile; fileRef = AA63897218C6019A0061C2C4 /* icon_minus.png */; };
+ AA63897B18C6019A0061C2C4 /* icon_minus@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA63897318C6019A0061C2C4 /* icon_minus@2x.png */; };
+ AA63897C18C6019A0061C2C4 /* icon120.png in Resources */ = {isa = PBXBuildFile; fileRef = AA63897418C6019A0061C2C4 /* icon120.png */; };
+ AA63897D18C6019A0061C2C4 /* icon_plus.png in Resources */ = {isa = PBXBuildFile; fileRef = AA63897518C6019A0061C2C4 /* icon_plus.png */; };
+ AA63897E18C6019A0061C2C4 /* icon_detach@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA63897618C6019A0061C2C4 /* icon_detach@2x.png */; };
+ AA63897F18C6019A0061C2C4 /* icon120@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AA63897718C6019A0061C2C4 /* icon120@2x.png */; };
+ AA63898018C6019A0061C2C4 /* icon_detach.png in Resources */ = {isa = PBXBuildFile; fileRef = AA63897818C6019A0061C2C4 /* icon_detach.png */; };
AA7D4DB117C74CFE0092DF8A /* LNLocalizationCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = AA7D4DB017C74CFE0092DF8A /* LNLocalizationCollection.m */; };
AA7D4DB417C74D0A0092DF8A /* LNLocalization.m in Sources */ = {isa = PBXBuildFile; fileRef = AA7D4DB317C74D0A0092DF8A /* LNLocalization.m */; };
AA8F8EF017EDFC68004964FB /* NSTableView+editedColumnIdentifier.m in Sources */ = {isa = PBXBuildFile; fileRef = AA8F8EEF17EDFC68004964FB /* NSTableView+editedColumnIdentifier.m */; };
- AA95FDEC17EB48A9007D33D4 /* PopoverContentView.xib in Resources */ = {isa = PBXBuildFile; fileRef = AA95FDEB17EB48A9007D33D4 /* PopoverContentView.xib */; };
+ AA95FDEC17EB48A9007D33D4 /* LNPopoverContentView.xib in Resources */ = {isa = PBXBuildFile; fileRef = AA95FDEB17EB48A9007D33D4 /* LNPopoverContentView.xib */; };
AA95FDEF17EB4E77007D33D4 /* LNPopoverWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = AA95FDEE17EB4E77007D33D4 /* LNPopoverWindowController.m */; };
AAAC873317ED9D4F00BF251D /* LNHorizontalLine.m in Sources */ = {isa = PBXBuildFile; fileRef = AAAC873217ED9D4F00BF251D /* LNHorizontalLine.m */; };
AAAC873B17EDA9CF00BF251D /* LNPopoverWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = AAAC873A17EDA9CF00BF251D /* LNPopoverWindow.m */; };
@@ -43,7 +51,6 @@
AADEADB317C7B6D3001E0C65 /* LNLocalizationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = AADEADB217C7B6D3001E0C65 /* LNLocalizationTests.m */; };
AADEADB417C7B838001E0C65 /* LNLocalization.m in Sources */ = {isa = PBXBuildFile; fileRef = AA7D4DB317C74D0A0092DF8A /* LNLocalization.m */; };
AADEADB717C87298001E0C65 /* IDEIndex+Lin.m in Sources */ = {isa = PBXBuildFile; fileRef = AADEADB617C87298001E0C65 /* IDEIndex+Lin.m */; };
- AADEADBA17C872A5001E0C65 /* IDEWorkspace+Lin.m in Sources */ = {isa = PBXBuildFile; fileRef = AADEADB917C872A5001E0C65 /* IDEWorkspace+Lin.m */; };
AADEADC017C87392001E0C65 /* MethodSwizzle.m in Sources */ = {isa = PBXBuildFile; fileRef = AADEADBF17C87392001E0C65 /* MethodSwizzle.m */; };
AAF0D6AB17ECB87100B4318B /* LNTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = AAF0D6AA17ECB87100B4318B /* LNTableView.m */; };
AAF0D6AE17ECB89800B4318B /* LNTableHeaderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = AAF0D6AD17ECB89800B4318B /* LNTableHeaderCell.m */; };
@@ -64,7 +71,7 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
- AA02CE8A17EE08240041C2BD /* AlertAccessoryView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AlertAccessoryView.xib; sourceTree = "<group>"; };
+ AA02CE8A17EE08240041C2BD /* LNAlertAccessoryView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LNAlertAccessoryView.xib; sourceTree = "<group>"; };
AA02CE8C17EE083A0041C2BD /* LNAlertAccessoryView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LNAlertAccessoryView.h; sourceTree = "<group>"; };
AA02CE8D17EE083A0041C2BD /* LNAlertAccessoryView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LNAlertAccessoryView.m; sourceTree = "<group>"; };
AA11AC4017C66F0200889DFB /* DVTFilePath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVTFilePath.h; sourceTree = "<group>"; };
@@ -85,7 +92,6 @@
AA20D88017ECB1AD006B7CA2 /* NSPopoverFrame.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NSPopoverFrame.h; sourceTree = "<group>"; };
AA2980B217EE2C5300CF46E3 /* LNUserDefaultsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LNUserDefaultsManager.h; sourceTree = "<group>"; };
AA2980B317EE2C5300CF46E3 /* LNUserDefaultsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LNUserDefaultsManager.m; sourceTree = "<group>"; };
- AA31DF3818C5C07E00AAA101 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
AA36376417D9EF9E003C5E55 /* LNPopoverContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LNPopoverContentView.h; sourceTree = "<group>"; };
AA36376517D9EF9E003C5E55 /* LNPopoverContentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LNPopoverContentView.m; sourceTree = "<group>"; };
AA3EC36D17EB2A290003A180 /* DVTFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DVTFoundation.framework; path = ../../../../Applications/Xcode.app/Contents/SharedFrameworks/DVTFoundation.framework; sourceTree = "<group>"; };
@@ -102,6 +108,16 @@
AA470D6A17C3D380005CBB7F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
AA470D6E17C3D380005CBB7F /* LinTests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "LinTests-Prefix.pch"; sourceTree = "<group>"; };
AA470D7C17C3DE31005CBB7F /* LNDetectorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LNDetectorTests.m; sourceTree = "<group>"; };
+ AA6377CC18C5CCFC005EADC7 /* LNImageButtonCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LNImageButtonCell.h; sourceTree = "<group>"; };
+ AA6377CD18C5CCFC005EADC7 /* LNImageButtonCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LNImageButtonCell.m; sourceTree = "<group>"; };
+ AA63897118C6019A0061C2C4 /* icon_plus@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_plus@2x.png"; sourceTree = "<group>"; };
+ AA63897218C6019A0061C2C4 /* icon_minus.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_minus.png; sourceTree = "<group>"; };
+ AA63897318C6019A0061C2C4 /* icon_minus@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_minus@2x.png"; sourceTree = "<group>"; };
+ AA63897418C6019A0061C2C4 /* icon120.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon120.png; sourceTree = "<group>"; };
+ AA63897518C6019A0061C2C4 /* icon_plus.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_plus.png; sourceTree = "<group>"; };
+ AA63897618C6019A0061C2C4 /* icon_detach@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_detach@2x.png"; sourceTree = "<group>"; };
+ AA63897718C6019A0061C2C4 /* icon120@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon120@2x.png"; sourceTree = "<group>"; };
+ AA63897818C6019A0061C2C4 /* icon_detach.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_detach.png; sourceTree = "<group>"; };
AA7B0CAD17F4228E0004FE3B /* DVTDualProxyWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVTDualProxyWindow.h; sourceTree = "<group>"; };
AA7B0CB017F4229D0004FE3B /* IDEWorkspaceWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDEWorkspaceWindow.h; sourceTree = "<group>"; };
AA7B0CB317F422BB0004FE3B /* DVTSourceTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVTSourceTextView.h; sourceTree = "<group>"; };
@@ -112,7 +128,7 @@
AA8F8EEE17EDFC68004964FB /* NSTableView+editedColumnIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSTableView+editedColumnIdentifier.h"; sourceTree = "<group>"; };
AA8F8EEF17EDFC68004964FB /* NSTableView+editedColumnIdentifier.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSTableView+editedColumnIdentifier.m"; sourceTree = "<group>"; };
AA93691517C4E4C000E94318 /* IDEWorkspace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDEWorkspace.h; sourceTree = "<group>"; };
- AA95FDEB17EB48A9007D33D4 /* PopoverContentView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PopoverContentView.xib; sourceTree = "<group>"; };
+ AA95FDEB17EB48A9007D33D4 /* LNPopoverContentView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LNPopoverContentView.xib; sourceTree = "<group>"; };
AA95FDED17EB4E77007D33D4 /* LNPopoverWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LNPopoverWindowController.h; sourceTree = "<group>"; };
AA95FDEE17EB4E77007D33D4 /* LNPopoverWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LNPopoverWindowController.m; sourceTree = "<group>"; };
AAAC873117ED9D4F00BF251D /* LNHorizontalLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LNHorizontalLine.h; sourceTree = "<group>"; };
@@ -130,8 +146,6 @@
AADEADB217C7B6D3001E0C65 /* LNLocalizationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LNLocalizationTests.m; sourceTree = "<group>"; };
AADEADB517C87298001E0C65 /* IDEIndex+Lin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "IDEIndex+Lin.h"; sourceTree = "<group>"; };
AADEADB617C87298001E0C65 /* IDEIndex+Lin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "IDEIndex+Lin.m"; sourceTree = "<group>"; };
- AADEADB817C872A5001E0C65 /* IDEWorkspace+Lin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "IDEWorkspace+Lin.h"; sourceTree = "<group>"; };
- AADEADB917C872A5001E0C65 /* IDEWorkspace+Lin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "IDEWorkspace+Lin.m"; sourceTree = "<group>"; };
AADEADBB17C872EB001E0C65 /* IDEEditorDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDEEditorDocument.h; sourceTree = "<group>"; };
AADEADBE17C87392001E0C65 /* MethodSwizzle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MethodSwizzle.h; sourceTree = "<group>"; };
AADEADBF17C87392001E0C65 /* MethodSwizzle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MethodSwizzle.m; sourceTree = "<group>"; };
@@ -299,6 +313,21 @@
name = Models;
sourceTree = "<group>";
};
+ AA63898118C6019F0061C2C4 /* Images */ = {
+ isa = PBXGroup;
+ children = (
+ AA63897118C6019A0061C2C4 /* icon_plus@2x.png */,
+ AA63897518C6019A0061C2C4 /* icon_plus.png */,
+ AA63897218C6019A0061C2C4 /* icon_minus.png */,
+ AA63897318C6019A0061C2C4 /* icon_minus@2x.png */,
+ AA63897618C6019A0061C2C4 /* icon_detach@2x.png */,
+ AA63897818C6019A0061C2C4 /* icon_detach.png */,
+ AA63897718C6019A0061C2C4 /* icon120@2x.png */,
+ AA63897418C6019A0061C2C4 /* icon120.png */,
+ );
+ name = Images;
+ sourceTree = "<group>";
+ };
AA93691817C4E4C700E94318 /* Xcode-Private-Classes */ = {
isa = PBXGroup;
children = (
@@ -332,8 +361,6 @@
AADDDA9317C49D4800BBA67C /* NSBundle+versions.m */,
AADEADB517C87298001E0C65 /* IDEIndex+Lin.h */,
AADEADB617C87298001E0C65 /* IDEIndex+Lin.m */,
- AADEADB817C872A5001E0C65 /* IDEWorkspace+Lin.h */,
- AADEADB917C872A5001E0C65 /* IDEWorkspace+Lin.m */,
AA20D87D17ECB12A006B7CA2 /* NSPopoverFrame+Lin.h */,
AA20D87E17ECB12A006B7CA2 /* NSPopoverFrame+Lin.m */,
AA8F8EEE17EDFC68004964FB /* NSTableView+editedColumnIdentifier.h */,
@@ -345,9 +372,9 @@
AADDDA9B17C4A0DA00BBA67C /* Resources */ = {
isa = PBXGroup;
children = (
- AA95FDEB17EB48A9007D33D4 /* PopoverContentView.xib */,
- AA02CE8A17EE08240041C2BD /* AlertAccessoryView.xib */,
- AA31DF3818C5C07E00AAA101 /* Images.xcassets */,
+ AA95FDEB17EB48A9007D33D4 /* LNPopoverContentView.xib */,
+ AA02CE8A17EE08240041C2BD /* LNAlertAccessoryView.xib */,
+ AA63898118C6019F0061C2C4 /* Images */,
);
name = Resources;
sourceTree = "<group>";
@@ -380,6 +407,8 @@
AAAC873217ED9D4F00BF251D /* LNHorizontalLine.m */,
AA02CE8C17EE083A0041C2BD /* LNAlertAccessoryView.h */,
AA02CE8D17EE083A0041C2BD /* LNAlertAccessoryView.m */,
+ AA6377CC18C5CCFC005EADC7 /* LNImageButtonCell.h */,
+ AA6377CD18C5CCFC005EADC7 /* LNImageButtonCell.m */,
);
name = Views;
sourceTree = "<group>";
@@ -467,10 +496,17 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- AA95FDEC17EB48A9007D33D4 /* PopoverContentView.xib in Resources */,
- AA02CE8B17EE08240041C2BD /* AlertAccessoryView.xib in Resources */,
+ AA63897B18C6019A0061C2C4 /* icon_minus@2x.png in Resources */,
+ AA63897F18C6019A0061C2C4 /* icon120@2x.png in Resources */,
+ AA63898018C6019A0061C2C4 /* icon_detach.png in Resources */,
+ AA63897A18C6019A0061C2C4 /* icon_minus.png in Resources */,
+ AA95FDEC17EB48A9007D33D4 /* LNPopoverContentView.xib in Resources */,
+ AA63897C18C6019A0061C2C4 /* icon120.png in Resources */,
+ AA63897D18C6019A0061C2C4 /* icon_plus.png in Resources */,
+ AA63897E18C6019A0061C2C4 /* icon_detach@2x.png in Resources */,
+ AA63897918C6019A0061C2C4 /* icon_plus@2x.png in Resources */,
+ AA02CE8B17EE08240041C2BD /* LNAlertAccessoryView.xib in Resources */,
AA1B7DB117C3C1EC00A3A6D7 /* InfoPlist.strings in Resources */,
- AA31DF3918C5C07E00AAA101 /* Images.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -497,6 +533,7 @@
AADDDA9417C49D4800BBA67C /* NSBundle+versions.m in Sources */,
AAAC873B17EDA9CF00BF251D /* LNPopoverWindow.m in Sources */,
AA8F8EF017EDFC68004964FB /* NSTableView+editedColumnIdentifier.m in Sources */,
+ AA6377CE18C5CCFC005EADC7 /* LNImageButtonCell.m in Sources */,
AA20D87F17ECB12A006B7CA2 /* NSPopoverFrame+Lin.m in Sources */,
AA02CE8E17EE083A0041C2BD /* LNAlertAccessoryView.m in Sources */,
AA36376617D9EF9E003C5E55 /* LNPopoverContentView.m in Sources */,
@@ -506,7 +543,6 @@
AA1B7DBA17C3C20F00A3A6D7 /* Lin.m in Sources */,
AAF0D6AE17ECB89800B4318B /* LNTableHeaderCell.m in Sources */,
AAAC873317ED9D4F00BF251D /* LNHorizontalLine.m in Sources */,
- AADEADBA17C872A5001E0C65 /* IDEWorkspace+Lin.m in Sources */,
AADEADB717C87298001E0C65 /* IDEIndex+Lin.m in Sources */,
AAF0D6AB17ECB87100B4318B /* LNTableView.m in Sources */,
AA2980B417EE2C5300CF46E3 /* LNUserDefaultsManager.m in Sources */,
View
13 Lin/IDEWorkspace+Lin.h
@@ -1,13 +0,0 @@
-//
-// IDEWorkspace+Lin.h
-// Lin
-//
-// Created by Tanaka Katsuma on 2013/08/24.
-// Copyright (c) 2013年 Tanaka Katsuma. All rights reserved.
-//
-
-#import "IDEWorkspace.h"
-
-@interface IDEWorkspace (Lin)
-
-@end
View
28 Lin/IDEWorkspace+Lin.m
@@ -1,28 +0,0 @@
-//
-// IDEWorkspace+Lin.m
-// Lin
-//
-// Created by Tanaka Katsuma on 2013/08/24.
-// Copyright (c) 2013年 Tanaka Katsuma. All rights reserved.
-//
-
-#import "IDEWorkspace+Lin.h"
-
-#import "MethodSwizzle.h"
-#import "Lin.h"
-
-@implementation IDEWorkspace (Lin)
-
-+ (void)load
-{
- MethodSwizzle(self, @selector(_updateIndexableFiles:), @selector(jp_questbeat_lin_updateIndexableFiles:));
-}
-
-- (void)jp_questbeat_lin_updateIndexableFiles:(id)arg1
-{
- [self jp_questbeat_lin_updateIndexableFiles:arg1];
-
- [[Lin sharedPlugIn] indexNeedsUpdate:self.index];
-}
-
-@end
View
18 Lin/Images.xcassets/icon120.imageset/Contents.json
@@ -1,18 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "scale" : "1x",
- "filename" : "icon120.png"
- },
- {
- "idiom" : "universal",
- "scale" : "2x",
- "filename" : "icon120@2x.png"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
View
18 Lin/Images.xcassets/icon_detach.imageset/Contents.json
@@ -1,18 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "scale" : "1x",
- "filename" : "icon_detach.png"
- },
- {
- "idiom" : "universal",
- "scale" : "2x",
- "filename" : "icon_detach@2x.png"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
View
18 Lin/Images.xcassets/icon_minus.imageset/Contents.json
@@ -1,18 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "scale" : "1x",
- "filename" : "icon_minus.png"
- },
- {
- "idiom" : "universal",
- "scale" : "2x",
- "filename" : "icon_minus@2x.png"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
View
18 Lin/Images.xcassets/icon_plus.imageset/Contents.json
@@ -1,18 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "scale" : "1x",
- "filename" : "icon_plus.png"
- },
- {
- "idiom" : "universal",
- "scale" : "2x",
- "filename" : "icon_plus@2x.png"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
View
0  Lin/AlertAccessoryView.xib → Lin/LNAlertAccessoryView.xib
File renamed without changes
View
13 Lin/LNImageButtonCell.h
@@ -0,0 +1,13 @@
+//
+// LNImageButtonCell.h
+// Lin
+//
+// Created by Tanaka Katsuma on 2014/03/04.
+// Copyright (c) 2014年 Tanaka Katsuma. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+@interface LNImageButtonCell : NSButtonCell
+
+@end
View
21 Lin/LNImageButtonCell.m
@@ -0,0 +1,21 @@
+//
+// LNImageButtonCell.m
+// Lin
+//
+// Created by Tanaka Katsuma on 2014/03/04.
+// Copyright (c) 2014年 Tanaka Katsuma. All rights reserved.
+//
+
+#import "LNImageButtonCell.h"
+
+@implementation LNImageButtonCell
+
+- (void)drawImage:(NSImage *)image withFrame:(NSRect)frame inView:(NSView *)controlView
+{
+ // Adjustment
+ frame.origin.y += 2;
+
+ [super drawImage:image withFrame:frame inView:controlView];
+}
+
+@end
View
14 Lin/LNPopoverContentView.m
@@ -11,9 +11,6 @@
// Categories
#import "NSTableView+editedColumnIdentifier.h"
-// Shared
-#import "Lin.h"
-
// Models
#import "LNLocalizationCollection.h"
#import "LNLocalization.h"
@@ -157,8 +154,8 @@ - (void)tableViewDidDoubleClick:(id)sender
- (IBAction)addLocalization:(id)sender
{
// Create alert
- NSViewController *viewController = [[NSViewController alloc] initWithNibName:@"AlertAccessoryView"
- bundle:[[Lin sharedPlugIn] bundle]];
+ NSBundle *bundle = [NSBundle bundleForClass:[self class]];
+ NSViewController *viewController = [[NSViewController alloc] initWithNibName:@"LNAlertAccessoryView" bundle:bundle];
LNAlertAccessoryView *accessoryView = (LNAlertAccessoryView *)viewController.view;
accessoryView.collections = self.collections;
@@ -173,12 +170,7 @@ - (IBAction)addLocalization:(id)sender
accessoryView.button = button;
// Set icon
- NSString *filePath;
- if ([[NSScreen mainScreen] backingScaleFactor] == 2.0) {
- filePath = [[[Lin sharedPlugIn] bundle] pathForResource:@"icon120@2x" ofType:@"png"];
- } else {
- filePath = [[[Lin sharedPlugIn] bundle] pathForResource:@"icon120" ofType:@"png"];
- }
+ NSString *filePath = [bundle pathForResource:@"icon120" ofType:@"tiff"];
NSImage *icon = [[NSImage alloc] initWithContentsOfFile:filePath];
[alert setIcon:icon];
View
121 Lin/PopoverContentView.xib → Lin/LNPopoverContentView.xib
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment defaultVersion="1070" identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
@@ -16,7 +16,7 @@
<rect key="frame" x="0.0" y="0.0" width="500" height="200"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
- <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="22" horizontalPageScroll="10" verticalLineScroll="22" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="3v3-Ru-fHe">
+ <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="22" horizontalPageScroll="10" verticalLineScroll="22" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3v3-Ru-fHe">
<rect key="frame" x="0.0" y="26" width="500" height="165"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<clipView key="contentView" id="4Zc-RR-q53">
@@ -109,49 +109,96 @@
<autoresizingMask key="autoresizingMask"/>
</tableHeaderView>
</scrollView>
- <box autoresizesSubviews="NO" verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="M5Y-vQ-slM" customClass="LNHorizontalLine">
+ <box autoresizesSubviews="NO" verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="M5Y-vQ-slM" customClass="LNHorizontalLine">
<rect key="frame" x="0.0" y="23" width="500" height="5"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
<color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<font key="titleFont" metaFont="system"/>
</box>
- <button id="fuI-el-Y6W">
- <rect key="frame" x="4" y="0.0" width="23" height="23"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="icon_plus" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" inset="2" id="z8t-zM-71W" customClass="LNButtonCell">
- <behavior key="behavior" lightByContents="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- <connections>
- <action selector="addLocalization:" target="JhI-Tt-sI6" id="O7w-xF-FJB"/>
- </connections>
- </button>
- <button id="e63-vb-Gxn">
- <rect key="frame" x="27" y="0.0" width="23" height="23"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="icon_minus" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" inset="2" id="Cac-ML-KQH" customClass="LNButtonCell">
- <behavior key="behavior" lightByContents="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- <connections>
- <action selector="deleteLocalization:" target="JhI-Tt-sI6" id="Xiv-yn-mJd"/>
- </connections>
- </button>
- <button id="qoN-IK-VSK">
- <rect key="frame" x="473" y="0.0" width="23" height="23"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="icon_detach" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" inset="2" id="0GO-Pw-l5v" customClass="LNButtonCell">
- <behavior key="behavior" lightByContents="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- <connections>
- <action selector="detachPopover:" target="JhI-Tt-sI6" id="9sN-ZQ-DFT"/>
- </connections>
- </button>
+ <box autoresizesSubviews="NO" boxType="custom" borderType="none" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="cAa-PZ-3Fm">
+ <rect key="frame" x="0.0" y="0.0" width="500" height="25"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <view key="contentView">
+ <rect key="frame" x="0.0" y="0.0" width="500" height="25"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="WtB-AR-lfY">
+ <rect key="frame" x="4" y="1" width="23" height="23"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="23" id="VSY-Ea-som"/>
+ <constraint firstAttribute="width" constant="23" id="vGo-Tv-NV0"/>
+ </constraints>
+ <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="icon_plus" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" inset="2" id="Vfs-qd-LwL" customClass="LNImageButtonCell">
+ <behavior key="behavior" lightByContents="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <connections>
+ <action selector="addLocalization:" target="JhI-Tt-sI6" id="dgA-Bo-Yol"/>
+ </connections>
+ </button>
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="Xwg-el-W0l">
+ <rect key="frame" x="27" y="1" width="23" height="23"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="23" id="0kD-WZ-161"/>
+ <constraint firstAttribute="height" constant="23" id="D5h-qU-aRQ"/>
+ </constraints>
+ <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="icon_minus" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" inset="2" id="jgd-uF-zMf" customClass="LNImageButtonCell">
+ <behavior key="behavior" lightByContents="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <connections>
+ <action selector="deleteLocalization:" target="JhI-Tt-sI6" id="tFN-bB-EZ9"/>
+ </connections>
+ </button>
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="X12-7a-tbY">
+ <rect key="frame" x="473" y="1" width="23" height="23"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="23" id="Fjw-Dz-IYH"/>
+ <constraint firstAttribute="width" constant="23" id="PsO-Ia-HA2"/>
+ </constraints>
+ <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="icon_detach" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" inset="2" id="VUs-dt-MMw" customClass="LNImageButtonCell">
+ <behavior key="behavior" lightByContents="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <connections>
+ <action selector="detachPopover:" target="JhI-Tt-sI6" id="uOQ-V9-dBd"/>
+ </connections>
+ </button>
+ </subviews>
+ </view>
+ <constraints>
+ <constraint firstItem="Xwg-el-W0l" firstAttribute="leading" secondItem="WtB-AR-lfY" secondAttribute="trailing" id="5pw-fJ-d8R"/>
+ <constraint firstAttribute="trailing" secondItem="X12-7a-tbY" secondAttribute="trailing" constant="4" id="6xU-Pd-Agd"/>
+ <constraint firstItem="WtB-AR-lfY" firstAttribute="leading" secondItem="cAa-PZ-3Fm" secondAttribute="leading" constant="4" id="Kry-Fq-New"/>
+ <constraint firstAttribute="centerY" secondItem="X12-7a-tbY" secondAttribute="centerY" id="oUR-CY-xSP"/>
+ <constraint firstAttribute="centerY" secondItem="Xwg-el-W0l" secondAttribute="centerY" id="omo-Dh-2fO"/>
+ <constraint firstAttribute="height" constant="25" id="qFh-OU-mVW"/>
+ <constraint firstAttribute="centerY" secondItem="WtB-AR-lfY" secondAttribute="centerY" id="ucy-2R-CBm"/>
+ </constraints>
+ <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+ <color key="fillColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="calibratedRGB"/>
+ </box>
</subviews>
+ <constraints>
+ <constraint firstAttribute="trailing" secondItem="3v3-Ru-fHe" secondAttribute="trailing" id="0L7-81-bdN"/>
+ <constraint firstItem="M5Y-vQ-slM" firstAttribute="top" secondItem="3v3-Ru-fHe" secondAttribute="bottom" id="1WQ-Ef-TZV"/>
+ <constraint firstAttribute="trailing" secondItem="M5Y-vQ-slM" secondAttribute="trailing" id="5Yh-4m-jQy"/>
+ <constraint firstItem="cAa-PZ-3Fm" firstAttribute="top" secondItem="M5Y-vQ-slM" secondAttribute="bottom" id="Fna-Xj-XEe"/>
+ <constraint firstItem="cAa-PZ-3Fm" firstAttribute="leading" secondItem="JhI-Tt-sI6" secondAttribute="leading" id="Kgt-Ih-fU7"/>
+ <constraint firstAttribute="trailing" secondItem="cAa-PZ-3Fm" secondAttribute="trailing" id="NNz-sZ-Vbd"/>
+ <constraint firstItem="3v3-Ru-fHe" firstAttribute="top" secondItem="JhI-Tt-sI6" secondAttribute="top" constant="9" id="cCW-AF-6OE"/>
+ <constraint firstAttribute="bottom" secondItem="cAa-PZ-3Fm" secondAttribute="bottom" id="feW-oG-u69"/>
+ <constraint firstItem="3v3-Ru-fHe" firstAttribute="leading" secondItem="JhI-Tt-sI6" secondAttribute="leading" id="frT-O8-fDd"/>
+ <constraint firstItem="M5Y-vQ-slM" firstAttribute="leading" secondItem="JhI-Tt-sI6" secondAttribute="leading" id="gtc-0Y-ztA"/>
+ <constraint firstItem="M5Y-vQ-slM" firstAttribute="top" secondItem="3v3-Ru-fHe" secondAttribute="bottom" id="ibB-DG-WcF"/>
+ <constraint firstItem="cAa-PZ-3Fm" firstAttribute="top" secondItem="M5Y-vQ-slM" secondAttribute="bottom" id="ruW-IO-Hhr"/>
+ </constraints>
<connections>
- <outlet property="detachButton" destination="qoN-IK-VSK" id="XQw-Fb-NYn"/>
+ <outlet property="detachButton" destination="X12-7a-tbY" id="BqK-21-FHB"/>
<outlet property="tableView" destination="Bwg-zH-Dly" id="KYr-er-9ip"/>
</connections>
</customView>
View
4 Lin/Lin.h
@@ -12,13 +12,9 @@
@interface Lin : NSObject <NSPopoverDelegate>
-@property (nonatomic, strong, readonly) NSBundle *bundle;
-
+ (void)pluginDidLoad:(NSBundle *)bundle;
+ (instancetype)sharedPlugIn;
-- (instancetype)initWithBundle:(NSBundle *)bundle;
-
- (void)indexNeedsUpdate:(IDEIndex *)index;
- (void)removeLocalizationsForIndex:(IDEIndex *)index;
View
31 Lin/Lin.m
@@ -45,8 +45,6 @@ - (id)_popoverWindow;
@interface Lin ()
-@property (nonatomic, strong, readwrite) NSBundle *bundle;
-
@property (nonatomic, strong) NSPopover *popover;
@property (nonatomic, strong) LNPopoverWindowController *popoverWindowController;
@@ -69,7 +67,7 @@ + (void)pluginDidLoad:(NSBundle *)bundle
{
static dispatch_once_t _onceToken;
dispatch_once(&_onceToken, ^{
- _sharedPlugin = [[Lin alloc] initWithBundle:bundle];
+ _sharedPlugin = [[self alloc] init];
});
}
@@ -80,16 +78,10 @@ + (instancetype)sharedPlugIn
- (instancetype)init
{
- return [self initWithBundle:nil];
-}
-
-- (instancetype)initWithBundle:(NSBundle *)bundle
-{
self = [super init];
if (self) {
// Initialization
- self.bundle = bundle;
self.detector = [LNDetector detector];
self.workspaceLocalizations = [NSMutableDictionary dictionary];
@@ -138,7 +130,8 @@ - (instancetype)initWithBundle:(NSBundle *)bundle
object:nil];
// Show the version information
- NSLog(@"Lin v%@ was successfully loaded.", [self.bundle shortVersionString]);
+ NSBundle *bundle = [NSBundle bundleForClass:[self class]];
+ NSLog(@"Lin ver.%@ was successfully loaded.", [bundle shortVersionString]);
// Activate if enabled
if ([[LNUserDefaultsManager sharedManager] isEnabled]) {
@@ -151,7 +144,8 @@ - (instancetype)initWithBundle:(NSBundle *)bundle
- (void)instantiatePopover
{
- NSViewController *contentViewController = [[NSViewController alloc] initWithNibName:@"PopoverContentView" bundle:self.bundle];
+ NSBundle *bundle = [NSBundle bundleForClass:[self class]];
+ NSViewController *contentViewController = [[NSViewController alloc] initWithNibName:@"LNPopoverContentView" bundle:bundle];
NSPopover *popover = [[NSPopover alloc] init];
popover.delegate = self;
@@ -165,7 +159,8 @@ - (void)instantiatePopover
- (void)instantiatePopoverWindowController
{
- NSViewController *contentViewController = [[NSViewController alloc] initWithNibName:@"PopoverContentView" bundle:self.bundle];
+ NSBundle *bundle = [NSBundle bundleForClass:[self class]];
+ NSViewController *contentViewController = [[NSViewController alloc] initWithNibName:@"LNPopoverContentView" bundle:bundle];
LNPopoverContentView *contentView = (LNPopoverContentView *)contentViewController.view;
[contentView.detachButton setHidden:YES];
@@ -364,7 +359,7 @@ - (void)menuDidChange:(NSNotification *)notification
}
-#pragma mark - Detachig the Popover
+#pragma mark - Detachig Popover
- (void)preparePopoverWindow
{
@@ -509,19 +504,15 @@ - (void)showWindow:(id)sender
- (void)showVersionInfo:(id)sender
{
// Create alert
+ NSBundle *bundle = [NSBundle bundleForClass:[self class]];
NSAlert *alert = [NSAlert alertWithMessageText:@"Lin"
defaultButton:@"OK"
alternateButton:nil
otherButton:@"Open Website"
- informativeTextWithFormat:@"Version %@\n\nCopyright (c) 2013 Katsuma Tanaka\n\nEmail: questbeat@gmail.com\nTwitter: @questbeat", [self.bundle shortVersionString]];
+ informativeTextWithFormat:@"Version %@\n\nCopyright (c) 2013 Katsuma Tanaka\n\nEmail: questbeat@gmail.com\nTwitter: @questbeat", [bundle shortVersionString]];
// Set icon
- NSString *filePath;
- if ([[NSScreen mainScreen] backingScaleFactor] == 2.0) {
- filePath = [self.bundle pathForResource:@"icon120@2x" ofType:@"png"];
- } else {
- filePath = [self.bundle pathForResource:@"icon120" ofType:@"png"];
- }
+ NSString *filePath = [bundle pathForResource:@"icon120" ofType:@"tiff"];
NSImage *icon = [[NSImage alloc] initWithContentsOfFile:filePath];
[alert setIcon:icon];
View
0  Lin/Images.xcassets/icon120.imageset/icon120.png → Lin/icon120.png
File renamed without changes
View
0  Lin/Images.xcassets/icon120.imageset/icon120@2x.png → Lin/icon120@2x.png
File renamed without changes
View
0  ...ges.xcassets/icon_detach.imageset/icon_detach.png → Lin/icon_detach.png
File renamed without changes
View
0  ....xcassets/icon_detach.imageset/icon_detach@2x.png → Lin/icon_detach@2x.png
File renamed without changes
View
0  ...mages.xcassets/icon_minus.imageset/icon_minus.png → Lin/icon_minus.png
File renamed without changes
View
0  ...es.xcassets/icon_minus.imageset/icon_minus@2x.png → Lin/icon_minus@2x.png
File renamed without changes
View
0  Lin/Images.xcassets/icon_plus.imageset/icon_plus.png → Lin/icon_plus.png
File renamed without changes
View
0  ...ages.xcassets/icon_plus.imageset/icon_plus@2x.png → Lin/icon_plus@2x.png
File renamed without changes
Something went wrong with that request. Please try again.