Skip to content

更换更符合新系统风格的 icon，优化个别页面显示细节。 #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fisher158163 wants to merge 1 commit into
base: Develop
Choose a base branch
from
Open

更换更符合新系统风格的 icon，优化个别页面显示细节。 #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Lookin.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1626,12 +1626,12 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = LookinClient/Lookin.entitlements;
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 14;
CURRENT_PROJECT_VERSION = 15;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 5V3Z8FVWHU;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -1650,7 +1650,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 11.0;
MARKETING_VERSION = 1.0.7;
MARKETING_VERSION = 1.0.8;
PRODUCT_BUNDLE_IDENTIFIER = hughkli.Lookin;
PRODUCT_NAME = Lookin;
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -1667,12 +1667,12 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = LookinClient/Lookin.entitlements;
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 14;
CURRENT_PROJECT_VERSION = 15;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 5V3Z8FVWHU;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -1691,7 +1691,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 11.0;
MARKETING_VERSION = 1.0.7;
MARKETING_VERSION = 1.0.8;
PRODUCT_BUNDLE_IDENTIFIER = hughkli.Lookin;
PRODUCT_NAME = Lookin;
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
4 changes: 4 additions & 0 deletions LookinClient/About/LKAboutViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,8 @@ - (void)viewDidAppear {
});
}

- (void)mouseDown:(NSEvent *)event {
[self.view.window performWindowDragWithEvent: event];
}

@end
13 changes: 10 additions & 3 deletions LookinClient/About/LKAboutWindowController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,17 @@ - (instancetype)init {
CGFloat width = 500;
CGFloat height = width * 0.54;

LKWindow *window = [[LKWindow alloc] initWithContentRect:NSMakeRect(0, 0, width, height) styleMask:NSWindowStyleMaskTitled|NSWindowStyleMaskClosable backing:NSBackingStoreBuffered defer:YES];
LKWindow *window = [[LKWindow alloc] initWithContentRect: NSMakeRect(0, 0, width, height)
styleMask: NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskFullSizeContentView
backing: NSBackingStoreBuffered
defer: YES];

window.titlebarAppearsTransparent = YES;
window.movable = YES;
window.movableByWindowBackground = YES;
[window standardWindowButton: NSWindowZoomButton].hidden = YES;
[window standardWindowButton: NSWindowMiniaturizeButton].hidden = YES;

[window center];

if (self = [self initWithWindow:window]) {
Expand All @@ -32,6 +41,4 @@ - (instancetype)init {
return self;
}



@end
66 changes: 33 additions & 33 deletions LookinClient/Assets.xcassets/AppIcon.appiconset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,68 +1,68 @@
{
"images" : [
{
"size" : "16x16",
"filename" : "icon_16x16.png",
"idiom" : "mac",
"filename" : "Logo_16.png",
"scale" : "1x"
"scale" : "1x",
"size" : "16x16"
},
{
"size" : "16x16",
"filename" : "icon_16x16@2x.png",
"idiom" : "mac",
"filename" : "Logo_32.png",
"scale" : "2x"
"scale" : "2x",
"size" : "16x16"
},
{
"size" : "32x32",
"filename" : "icon_32x32.png",
"idiom" : "mac",
"filename" : "Logo_32-1.png",
"scale" : "1x"
"scale" : "1x",
"size" : "32x32"
},
{
"size" : "32x32",
"filename" : "icon_32x32@2x.png",
"idiom" : "mac",
"filename" : "Logo_64.png",
"scale" : "2x"
"scale" : "2x",
"size" : "32x32"
},
{
"size" : "128x128",
"filename" : "icon_128x128.png",
"idiom" : "mac",
"filename" : "Logo_128.png",
"scale" : "1x"
"scale" : "1x",
"size" : "128x128"
},
{
"size" : "128x128",
"filename" : "icon_128x128@2x.png",
"idiom" : "mac",
"filename" : "Logo_256-1.png",
"scale" : "2x"
"scale" : "2x",
"size" : "128x128"
},
{
"size" : "256x256",
"filename" : "icon_256x256.png",
"idiom" : "mac",
"filename" : "Logo_256.png",
"scale" : "1x"
"scale" : "1x",
"size" : "256x256"
},
{
"size" : "256x256",
"filename" : "icon_256x256@2x.png",
"idiom" : "mac",
"filename" : "Logo_512-1.png",
"scale" : "2x"
"scale" : "2x",
"size" : "256x256"
},
{
"size" : "512x512",
"filename" : "icon_512x512.png",
"idiom" : "mac",
"filename" : "Logo_512.png",
"scale" : "1x"
"scale" : "1x",
"size" : "512x512"
},
{
"size" : "512x512",
"filename" : "icon_512x512@2x.png",
"idiom" : "mac",
"filename" : "Logo_1024.png",
"scale" : "2x"
"scale" : "2x",
"size" : "512x512"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}
Binary file removed LookinClient/Assets.xcassets/AppIcon.appiconset/Logo_1024.png
View file
Open in desktop
Binary file not shown.
Binary file removed LookinClient/Assets.xcassets/AppIcon.appiconset/Logo_128.png
View file
Open in desktop
Binary file not shown.
Binary file removed LookinClient/Assets.xcassets/AppIcon.appiconset/Logo_16.png
View file
Open in desktop
Binary file not shown.
Binary file removed LookinClient/Assets.xcassets/AppIcon.appiconset/Logo_256-1.png
View file
Open in desktop
Binary file not shown.
Binary file removed LookinClient/Assets.xcassets/AppIcon.appiconset/Logo_256.png
View file
Open in desktop
Binary file not shown.
Binary file removed LookinClient/Assets.xcassets/AppIcon.appiconset/Logo_32-1.png
View file
Open in desktop
Binary file not shown.
Binary file removed LookinClient/Assets.xcassets/AppIcon.appiconset/Logo_32.png
View file
Open in desktop
Binary file not shown.
Binary file removed LookinClient/Assets.xcassets/AppIcon.appiconset/Logo_512-1.png
View file
Open in desktop
Binary file not shown.
Binary file removed LookinClient/Assets.xcassets/AppIcon.appiconset/Logo_512.png
View file
Open in desktop
Binary file not shown.
Binary file removed LookinClient/Assets.xcassets/AppIcon.appiconset/Logo_64.png
View file
Open in desktop
Binary file not shown.
Binary file added LookinClient/Assets.xcassets/AppIcon.appiconset/icon_128x128.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added LookinClient/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added LookinClient/Assets.xcassets/AppIcon.appiconset/icon_16x16.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added LookinClient/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added LookinClient/Assets.xcassets/AppIcon.appiconset/icon_256x256.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added LookinClient/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added LookinClient/Assets.xcassets/AppIcon.appiconset/icon_32x32.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added LookinClient/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added LookinClient/Assets.xcassets/AppIcon.appiconset/icon_512x512.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added LookinClient/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 8 additions & 1 deletion LookinClient/Launch/LKLaunchWindowController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,17 @@ @interface LKLaunchWindowController ()
@implementation LKLaunchWindowController

- (instancetype)init {
LKWindow *window = [[LKWindow alloc] initWithContentRect:NSMakeRect(0, 0, 252, 400) styleMask:NSWindowStyleMaskTitled|NSWindowStyleMaskClosable|NSWindowStyleMaskMiniaturizable|NSWindowStyleMaskFullSizeContentView backing:NSBackingStoreBuffered defer:YES];
LKWindow *window = [[LKWindow alloc] initWithContentRect: NSMakeRect(0, 0, 252, 400)
styleMask: NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskFullSizeContentView
backing: NSBackingStoreBuffered
defer: YES];
window.backgroundColor = [NSColor clearColor];
window.titlebarAppearsTransparent = YES;

window.movable = YES;
window.movableByWindowBackground = YES;
[window standardWindowButton: NSWindowZoomButton].hidden = YES;

[window center];

if (self = [self initWithWindow:window]) {
Expand Down
11 changes: 10 additions & 1 deletion LookinClient/Preference/LKPreferenceWindowController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,18 @@
@implementation LKPreferenceWindowController

- (instancetype)init {
LKWindow *window = [[LKWindow alloc] initWithContentRect:NSMakeRect(0, 0, 600, 380) styleMask:NSWindowStyleMaskTitled|NSWindowStyleMaskClosable|NSWindowStyleMaskMiniaturizable backing:NSBackingStoreBuffered defer:YES];
LKWindow *window = [[LKWindow alloc] initWithContentRect: NSMakeRect(0, 0, 600, 380)
styleMask: NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable
backing: NSBackingStoreBuffered
defer: YES];
window.movableByWindowBackground = YES;
window.title = NSLocalizedString(@"Preferences", nil);

window.titlebarAppearsTransparent = YES;
window.movable = YES;
window.movableByWindowBackground = YES;
[window standardWindowButton: NSWindowZoomButton].hidden = YES;

[window center];

if (self = [self initWithWindow:window]) {
Expand Down
2 changes: 1 addition & 1 deletion Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: a8b13d75f888afecfc295c9bf857d0ca031665e9

COCOAPODS: 1.13.0
COCOAPODS: 1.15.2