playground
/
menu-clock-macos
mirror of https://github.com/n0shake/Clocker.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Minor corrections.

v1.2.2
Abhishek Banthia 9 years ago
parent
867cac0bcb
commit
0f1dc05972
9 changed files with 83 additions and 53 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate
  2. 2
      Clocker/AboutUsWindow/CLAboutUsView.xib
  3. 12
      Clocker/App Feedback/CLAppFeedbackWindow.xib
  4. 56
      Clocker/Appearance Tab/CLAppearanceView.xib
  5. 5
      Clocker/Model/CLTimezoneData.m
  6. 6
      Clocker/Panel.xib
  7. 2
      Clocker/PanelController.m
  8. 15
      Clocker/Preferences/CLPreferencesView.xib
  9. 38
      Clocker/Preferences/CLPreferencesViewController.m

BIN
Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

2
Clocker/AboutUsWindow/CLAboutUsView.xib
Unescape View File

@ -127,7 +127,7 @@
<constraints>
<constraint firstAttribute="height" constant="15" id="2sg-Q1-h9h"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="under the MIT license. Timezone search is powered by GEONAMES." id="JAy-Yp-MXm">
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="under the MIT license." id="JAy-Yp-MXm">
<font key="font" size="10" name="SFUIDisplay-Light"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>

12
Clocker/App Feedback/CLAppFeedbackWindow.xib
Unescape View File

@ -82,12 +82,12 @@
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="269" translatesAutoresizingMaskIntoConstraints="NO" id="LVY-Qw-MYC">
<rect key="frame" x="8" y="-3" width="273" height="45"/>
<rect key="frame" x="3" y="0.0" width="288" height="42"/>
<constraints>
<constraint firstAttribute="height" constant="45" id="dRi-pM-pWX"/>
<constraint firstAttribute="height" constant="42" id="dRi-pM-pWX"/>
</constraints>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Your contact information will let us contact you in case we need more information or can help!" placeholderString="" id="yEq-6I-HBq">
<font key="font" size="12" name="SFUIDisplay-Light"/>
<font key="font" size="10" name="SFUIDisplay-Regular"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
@ -98,8 +98,8 @@
<constraint firstItem="Qzm-kE-Igl" firstAttribute="top" secondItem="moX-Vc-vMc" secondAttribute="top" constant="11" id="Dpz-4F-hN7"/>
<constraint firstItem="Qzm-kE-Igl" firstAttribute="leading" secondItem="moX-Vc-vMc" secondAttribute="leading" constant="10" id="GKZ-24-t7t"/>
<constraint firstItem="LVY-Qw-MYC" firstAttribute="top" secondItem="zlM-Cf-OxV" secondAttribute="bottom" constant="3" id="Xck-iy-cZk"/>
<constraint firstItem="LVY-Qw-MYC" firstAttribute="leading" secondItem="moX-Vc-vMc" secondAttribute="leading" constant="10" id="iLs-Ob-MZC"/>
<constraint firstItem="LVY-Qw-MYC" firstAttribute="centerX" secondItem="moX-Vc-vMc" secondAttribute="centerX" id="k3n-00-eiV"/>
<constraint firstItem="LVY-Qw-MYC" firstAttribute="leading" secondItem="moX-Vc-vMc" secondAttribute="leading" constant="5" id="iLs-Ob-MZC"/>
<constraint firstItem="LVY-Qw-MYC" firstAttribute="centerX" secondItem="moX-Vc-vMc" secondAttribute="centerX" constant="2.5" id="k3n-00-eiV"/>
<constraint firstItem="zlM-Cf-OxV" firstAttribute="leading" secondItem="moX-Vc-vMc" secondAttribute="leading" constant="10" id="u3y-gI-YeL"/>
</constraints>
</view>
@ -182,7 +182,7 @@ DQ
<constraint firstAttribute="trailing" secondItem="Qzm-kE-Igl" secondAttribute="trailing" constant="30" id="5UG-sC-szG"/>
<constraint firstItem="W3a-Hi-ryk" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" constant="12" id="8UN-bn-s8Y"/>
<constraint firstAttribute="trailing" secondItem="zlM-Cf-OxV" secondAttribute="trailing" constant="30" id="Arj-b2-oje"/>
<constraint firstAttribute="trailing" secondItem="LVY-Qw-MYC" secondAttribute="trailing" constant="30" id="I39-jS-bL7"/>
<constraint firstAttribute="trailing" secondItem="LVY-Qw-MYC" secondAttribute="trailing" constant="20" id="I39-jS-bL7"/>
<constraint firstAttribute="trailing" secondItem="oNX-kV-RGt" secondAttribute="trailing" constant="12" id="IqR-EG-ga3"/>
<constraint firstItem="sJq-1o-Bft" firstAttribute="leading" secondItem="szs-8j-SMN" secondAttribute="trailing" constant="8" id="JSB-K6-cbX"/>
<constraint firstAttribute="trailing" secondItem="sJq-1o-Bft" secondAttribute="trailing" constant="20" id="KuW-ez-Od9"/>

56
Clocker/Appearance Tab/CLAppearanceView.xib
Unescape View File

@ -19,24 +19,24 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iVw-cq-zLz">
<rect key="frame" x="198" y="349" width="44" height="18"/>
<rect key="frame" x="188" y="349" width="64" height="18"/>
<constraints>
<constraint firstAttribute="height" constant="18" id="2DP-wK-Ga8"/>
<constraint firstAttribute="width" constant="40" id="KEa-ei-G2i"/>
<constraint firstAttribute="width" constant="60" id="KEa-ei-G2i"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Theme" id="hCb-NM-To8">
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Theme" id="hCb-NM-To8">
<font key="font" size="13" name="SFUIDisplay-Light"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5TC-RQ-gzI">
<rect key="frame" x="183" y="411" width="74" height="18"/>
<rect key="frame" x="168" y="411" width="104" height="18"/>
<constraints>
<constraint firstAttribute="height" constant="18" id="gWc-u4-D8E"/>
<constraint firstAttribute="width" constant="70" id="nh0-5K-Aa0"/>
<constraint firstAttribute="width" constant="100" id="nh0-5K-Aa0"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Time Format" id="Hza-PB-FEf">
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Time Format" id="Hza-PB-FEf">
<font key="font" size="13" name="SFUIDisplay-Light"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@ -60,12 +60,12 @@
</connections>
</segmentedControl>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YQi-x8-6f8">
<rect key="frame" x="175" y="287" width="89" height="18"/>
<rect key="frame" x="168" y="287" width="104" height="18"/>
<constraints>
<constraint firstAttribute="height" constant="18" id="eY8-bV-QLM"/>
<constraint firstAttribute="width" constant="85" id="n8S-fR-UtY"/>
<constraint firstAttribute="width" constant="100" id="n8S-fR-UtY"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Display Options" id="KTv-74-itf">
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Display Options" id="KTv-74-itf">
<font key="font" size="13" name="SFUIDisplay-Light"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@ -173,27 +173,10 @@
<binding destination="WGI-5h-l6M" name="selectedIndex" keyPath="values.displayFutureSlider" id="zRQ-mQ-qBp"/>
</connections>
</segmentedControl>
<segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1eh-BT-2fK">
<rect key="frame" x="98" y="256" width="244" height="24"/>
<constraints>
<constraint firstAttribute="width" constant="240" id="uU1-9Q-cqa"/>
</constraints>
<segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="ZV9-ih-faz">
<font key="font" size="12" name="SFUIDisplay-Light"/>
<segments>
<segment label="Show Relative Dates"/>
<segment label="Show actual day" selected="YES" tag="1"/>
</segments>
</segmentedCell>
<connections>
<action selector="changeRelativeDayDisplay:" target="-2" id="7Af-BH-qFq"/>
<binding destination="WGI-5h-l6M" name="selectedIndex" keyPath="values.relativeDate" id="eKo-sG-1eE"/>
</connections>
</segmentedControl>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="HTZ-1V-qZb">
<rect key="frame" x="165" y="232" width="109" height="19"/>
<rect key="frame" x="158" y="232" width="124" height="19"/>
<constraints>
<constraint firstAttribute="width" constant="105" id="1Lv-wC-hEM"/>
<constraint firstAttribute="width" constant="120" id="1Lv-wC-hEM"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Show Future Slider" id="PE4-Ua-hkI">
<font key="font" size="13" name="SFUIDisplay-Light"/>
@ -248,6 +231,23 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1eh-BT-2fK">
<rect key="frame" x="133" y="256" width="174" height="24"/>
<constraints>
<constraint firstAttribute="width" constant="170" id="u9T-ks-rqA"/>
</constraints>
<segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="ZV9-ih-faz">
<font key="font" size="12" name="SFUIDisplay-Light"/>
<segments>
<segment label="Relative Dates"/>
<segment label="Actual day" selected="YES" tag="1"/>
</segments>
</segmentedCell>
<connections>
<action selector="changeRelativeDayDisplay:" target="-2" id="7Af-BH-qFq"/>
<binding destination="WGI-5h-l6M" name="selectedIndex" keyPath="values.relativeDate" id="eKo-sG-1eE"/>
</connections>
</segmentedControl>
</subviews>
<constraints>
<constraint firstItem="5TC-RQ-gzI" firstAttribute="top" secondItem="X5s-Mc-Yfo" secondAttribute="bottom" constant="8" id="1Wi-S2-cSq"/>

5
Clocker/Model/CLTimezoneData.m
Unescape View File

@ -47,6 +47,11 @@
+ (instancetype)getCustomObject:(NSData *)encodedData
{
if ([encodedData isKindOfClass:[NSDictionary class]])
{
CLTimezoneData *newObject = [[self alloc] initWithDictionary:(NSDictionary *)encodedData];
return newObject;
}
CLTimezoneData *object = [NSKeyedUnarchiver unarchiveObjectWithData:encodedData];
return object;

6
Clocker/Panel.xib
Unescape View File

@ -203,7 +203,7 @@
</scroller>
</scrollView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="75" translatesAutoresizingMaskIntoConstraints="NO" id="rGL-w7-iSa">
<rect key="frame" x="97" y="24" width="84" height="17"/>
<rect key="frame" x="97" y="29" width="84" height="17"/>
<constraints>
<constraint firstAttribute="width" constant="80" id="XLu-0I-ACL"/>
<constraint firstAttribute="height" constant="17" id="j4s-Vf-pQQ"/>
@ -215,7 +215,7 @@
</textFieldCell>
</textField>
<slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="T7e-RS-eTE">
<rect key="frame" x="29" y="11" width="217" height="16"/>
<rect key="frame" x="29" y="16" width="217" height="16"/>
<constraints>
<constraint firstAttribute="height" constant="12" id="tQw-lm-Ify"/>
</constraints>
@ -257,7 +257,7 @@
<constraints>
<constraint firstItem="4Gd-Nv-fXr" firstAttribute="top" secondItem="6" secondAttribute="top" constant="8" id="1g0-Hm-7Gh"/>
<constraint firstItem="rGL-w7-iSa" firstAttribute="centerX" secondItem="T7e-RS-eTE" secondAttribute="centerX" constant="1" id="5NW-NQ-wPO"/>
<constraint firstItem="T7e-RS-eTE" firstAttribute="top" secondItem="dFw-ts-8OZ" secondAttribute="bottom" constant="-25" id="96B-lf-iFV"/>
<constraint firstItem="T7e-RS-eTE" firstAttribute="top" secondItem="dFw-ts-8OZ" secondAttribute="bottom" constant="-30" id="96B-lf-iFV"/>
<constraint firstItem="T7e-RS-eTE" firstAttribute="leading" secondItem="nTt-pf-Hw2" secondAttribute="trailing" constant="2" id="GgQ-58-tbc"/>
<constraint firstAttribute="bottom" secondItem="nTt-pf-Hw2" secondAttribute="bottom" constant="2" id="QoV-TI-KVJ"/>
<constraint firstAttribute="bottom" secondItem="OFy-u1-TnH" secondAttribute="bottom" constant="2" id="Ubf-Mv-WMp"/>

2
Clocker/PanelController.m
Unescape View File

@ -109,6 +109,8 @@ NSString *const CLTimezoneCellViewIdentifier = @"timeZoneCell";
//Register for drag and drop
[self.mainTableview registerForDraggedTypes: [NSArray arrayWithObject:CLDragSessionKey]];
[self updatePanelColor];
}

15
Clocker/Preferences/CLPreferencesView.xib
Unescape View File

@ -198,15 +198,22 @@ CA
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Wb6-yr-Pw4">
<rect key="frame" x="11" y="118" width="321" height="20"/>
<rect key="frame" x="13" y="118" width="317" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="QQQ-at-c1H"/>
</constraints>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" placeholderString="Please enter a timezone name" id="l4k-Vi-z4I">
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="Please enter a timezone name" placeholderString="Please enter a timezone name" drawsBackground="YES" id="l4k-Vi-z4I">
<font key="font" size="13" name="SFUIDisplay-Light"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
</textFieldCell>
<connections>
<binding destination="-2" name="hidden" keyPath="self.activityInProgress" id="62r-5u-wa3">
<dictionary key="options">
<string key="NSValueTransformerName">NSNegateBoolean</string>
</dictionary>
</binding>
</connections>
</textField>
<progressIndicator wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="ifx-PO-gfq">
<rect key="frame" x="164" y="143" width="16" height="16"/>

38
Clocker/Preferences/CLPreferencesViewController.m
Unescape View File

@ -399,6 +399,16 @@ NSString *const CLTryAgainMessage = @"Try again, maybe?";
[self.timezoneTableView.selectedRowIndexes enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL * _Nonnull stop) {
CLTimezoneData *dataObject = [CLTimezoneData getCustomObject:self.selectedTimeZones[idx]];
if (dataObject.isFavourite.integerValue == 1)
{
//Remove favourite from standard defaults
[[NSUserDefaults standardUserDefaults] setObject:nil
forKey:@"favouriteTimezone"];
}
[itemsToRemove addObject:self.selectedTimeZones[idx]];
}];
@ -544,17 +554,23 @@ NSString *const CLTryAgainMessage = @"Try again, maybe?";
[self.dataTask cancel];
}
if (self.availableTimezoneTableView.isHidden)
{
self.availableTimezoneTableView.hidden = NO;
}
self.placeholderLabel.hidden = NO;
if (![CLAPI isUserConnectedToInternet]) {
self.placeholderLabel.placeholderString = CLNoInternetConnectivityError;
return;
}
dispatch_async(dispatch_get_main_queue(), ^{
if (self.availableTimezoneTableView.isHidden)
{
self.availableTimezoneTableView.hidden = NO;
}
self.placeholderLabel.hidden = NO;
if (![CLAPI isUserConnectedToInternet]) {
self.placeholderLabel.stringValue = CLNoInternetConnectivityError;
return;
}
});
self.activityInProgress = YES;

Write Preview
Loading…
Cancel
Save