Browse Source

Added action method.

v1.2.4
Abhishek Banthia 9 years ago
parent
commit
ec765cc109
  1. 1
      Clocker/CLParentPanelController.h
  2. 34
      Clocker/CLParentPanelController.m
  3. 0
      Clocker/Onboarding/Onboarding Animated Views/QCMethod.h
  4. 0
      Clocker/Onboarding/Onboarding Animated Views/QCMethod.m
  5. 4
      Media.xcassets/ActualScreen.imageset/Contents.json
  6. 3
      Media.xcassets/MainScreen.imageset/Contents.json
  7. 4
      Media.xcassets/MenuBar.imageset/Contents.json
  8. 3
      Media.xcassets/Screen Shot 2016-05-15 at 11.31.12 PM.imageset/Contents.json

1
Clocker/CLParentPanelController.h

@ -28,5 +28,6 @@
- (void)showOptions:(BOOL)value;
- (void)removeContextHelpForSlider;
- (void)updatePanelColor;
- (void)openPreferenceWindowWithValue:(BOOL)value;
@end

34
Clocker/CLParentPanelController.m

@ -11,6 +11,7 @@
#import "CLTimezoneData.h"
#import "CommonStrings.h"
#import "CLOneWindowController.h"
#import <pop/POP.h>
@interface CLParentPanelController ()
@ -155,11 +156,44 @@
#pragma mark -
- (IBAction)openPreferences:(id)sender
{
[self openPreferenceWindowWithValue:NO];
}
- (void)openPreferenceWindowWithValue:(BOOL)value
{
self.oneWindow = [CLOneWindowController sharedWindow];
[self.oneWindow showWindow:nil];
CGRect originalFrame = self.oneWindow.window.frame;
CGRect oldFrame = CGRectMake(self.oneWindow.window.frame.origin.x, 730,self.oneWindow.window.frame.size.width, self.oneWindow.window.frame.size.height);
[self performBoundsAnimationWithOldRect:oldFrame andNewRect:originalFrame];
if (value)
{
[self.oneWindow.preferencesView addTimeZone:self];
}
[NSApp activateIgnoringOtherApps:YES];
}
- (void)performBoundsAnimationWithOldRect:(CGRect)fromRect andNewRect:(CGRect)newRect
{
[self.oneWindow.window setFrame:fromRect display:NO animate:NO];
self.window.contentView.wantsLayer = YES;
POPSpringAnimation *anim = [POPSpringAnimation animationWithPropertyNamed:kPOPWindowFrame];
anim.toValue = [NSValue valueWithCGRect:newRect];
anim.springSpeed = 1;
[self.oneWindow.window pop_addAnimation:anim forKey:@"popBounds"];
}
@end

0
Clocker/QCMethod.h → Clocker/Onboarding/Onboarding Animated Views/QCMethod.h

0
Clocker/QCMethod.m → Clocker/Onboarding/Onboarding Animated Views/QCMethod.m

4
Media.xcassets/HongKong.imageset/Contents.json → Media.xcassets/ActualScreen.imageset/Contents.json vendored

@ -2,15 +2,17 @@
"images" : [
{
"idiom" : "universal",
"filename" : "HongKong.jpg",
"filename" : "ActualScreen.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ActualScreen@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ActualScreen@3x.png",
"scale" : "3x"
}
],

3
Media.xcassets/NYC.imageset/Contents.json → Media.xcassets/MainScreen.imageset/Contents.json vendored

@ -2,11 +2,12 @@
"images" : [
{
"idiom" : "universal",
"filename" : "NYC.jpg",
"filename" : "MainScreen.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "MainScreen@2x.png",
"scale" : "2x"
},
{

4
Media.xcassets/london.imageset/Contents.json → Media.xcassets/MenuBar.imageset/Contents.json vendored

@ -2,15 +2,17 @@
"images" : [
{
"idiom" : "universal",
"filename" : "london.jpg",
"filename" : "MenuBar.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "MenuBar@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "MenuBar@3x.png",
"scale" : "3x"
}
],

3
Media.xcassets/LA.imageset/Contents.json → Media.xcassets/Screen Shot 2016-05-15 at 11.31.12 PM.imageset/Contents.json vendored

@ -2,11 +2,12 @@
"images" : [
{
"idiom" : "universal",
"filename" : "LA.jpg",
"filename" : "Screen Shot 2016-05-15 at 11.31.12 PM.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "Screen Shot 2016-05-15 at 11.31.12 PM@2x.png",
"scale" : "2x"
},
{
Loading…
Cancel
Save