Commit: a362cf184b42fff1067eb212a5902b0ddff099c9 - KanColleLevelManager (git)

艦これの経験値を管理するツール

Commit MetaInfo

• Revision: a362cf184b42fff1067eb212a5902b0ddff099c9 (tree)
• Zeit: 2014-02-03 00:11:14
• Autor: masakih <masakih@user...>
• Commiter: masakih

Log Message

ステータスが最大値の艦娘を隠せるようにした

Ändern Zusammenfassung

• modified: KanColleLevelManager/KCStatusCheckWindowController.h
• modified: KanColleLevelManager/KCStatusCheckWindowController.m
• modified: KanColleLevelManager/KCStatusCheckWindowController.xib

Diff

--- a/KanColleLevelManager/KCStatusCheckWindowController.h
+++ b/KanColleLevelManager/KCStatusCheckWindowController.h
@@ -12,6 +12,7 @@
 
 @property (nonatomic, readonly) NSManagedObjectContext *managedObjectContext;
 @property (nonatomic, retain) IBOutlet NSArrayController *collectionShip;
+@property (nonatomic, retain) IBOutlet NSSegmentedControl *typeSegment;
 
 
 - (IBAction)selectCategory:(id)sender;

--- a/KanColleLevelManager/KCStatusCheckWindowController.m
+++ b/KanColleLevelManager/KCStatusCheckWindowController.m
@@ -16,10 +16,18 @@
 
 @property (retain) NSDictionary *categoryList;
 
+@property (readonly) BOOL hideMaxFire;
+@property (readonly) BOOL hideMaxTorpedo;
+@property (readonly) BOOL hideMaxAA;
+@property (readonly) BOOL hideMaxArmor;
+@property (readonly) BOOL hideMaxLuck;
+
 @end
 
 @implementation KCStatusCheckWindowController
 
+@dynamic hideMaxFire, hideMaxTorpedo, hideMaxAA, hideMaxArmor, hideMaxLuck;
+
 - (id)init
 {
     self = [super initWithWindowNibName:NSStringFromClass([self class])];
@@ -43,16 +51,79 @@
 	return ((HMAppDelegate *)[NSApp delegate]).managedObjectContext;
 }
 
+- (id)valueForUndefinedKey:(NSString *)key
+{
+	NSArray *defindeKyes = @[@"hideMaxFire", @"hideMaxTorpedo", @"hideMaxAA", @"hideMaxArmor", @"hideMaxLuck"];
+	if([defindeKyes containsObject:key]) {
+		return [[NSUserDefaults standardUserDefaults] objectForKey:key];
+	}
+	
+	return [super valueForUndefinedKey:key];
+}
+- (BOOL)hideMaxFire
+{
+	return [[NSUserDefaults standardUserDefaults] boolForKey:@"hideMaxFire"];
+}
+- (BOOL)hideMaxTorpedo
+{
+	return [[NSUserDefaults standardUserDefaults] boolForKey:@"hideMaxTorpedo"];
+}
+- (BOOL)hideMaxAA
+{
+	return [[NSUserDefaults standardUserDefaults] boolForKey:@"hideMaxAA"];
+}
+- (BOOL)hideMaxArmor
+{
+	return [[NSUserDefaults standardUserDefaults] boolForKey:@"hideMaxArmor"];
+}
+- (BOOL)hideMaxLuck
+{
+	return [[NSUserDefaults standardUserDefaults] boolForKey:@"hideMaxLuck"];
+}
+
+- (NSPredicate *)omitPredicate
+{
+	NSMutableArray *hideKeys = [NSMutableArray array];
+	if(self.hideMaxFire) {
+		[hideKeys addObject:@"isMaxFire != TRUE"];
+	}
+	if(self.hideMaxTorpedo) {
+		[hideKeys addObject:@"isMaxTorpedo != TRUE"];
+	}
+	if(self.hideMaxAA) {
+		[hideKeys addObject:@"isMaxAA != TRUE"];
+	}
+	if(self.hideMaxArmor) {
+		[hideKeys addObject:@"isMaxArmor != TRUE"];
+	}
+	if(self.hideMaxLuck) {
+		[hideKeys addObject:@"isMaxLuck != TRUE"];
+	}
+	
+	if([hideKeys count] == 0) return nil;
+	
+	NSString *predicateString = [hideKeys componentsJoinedByString:@" AND "];
+	
+	return [NSPredicate predicateWithFormat:predicateString];
+}
+
 - (IBAction)selectCategory:(id)sender
 {
-	NSPredicate *predicate = nil;
-	NSInteger segment = [sender selectedSegment];
-	NSString *label = [sender labelForSegment:segment];
+	NSPredicate *predicate = [self omitPredicate];
+	NSInteger segment = [self.typeSegment selectedSegment];
+	NSString *label = [self.typeSegment labelForSegment:segment];
 	
 	NSDictionary *types = [self.categoryList objectForKey:label];
 	if(types) {
-		predicate = [NSPredicate predicateWithFormat:@"ship.type.name IN %@", types];
+		NSPredicate *catPredicate = [NSPredicate predicateWithFormat:@"ship.type.name IN %@", types];
+		if(predicate) {
+			NSArray *sub = @[predicate, catPredicate];
+			predicate = [NSCompoundPredicate andPredicateWithSubpredicates:sub];
+		} else {
+			predicate = catPredicate;
+		}
 	}
+
 	
 	[self.collectionShip setFetchPredicate:predicate];
 }

--- a/KanColleLevelManager/KCStatusCheckWindowController.xib
+++ b/KanColleLevelManager/KCStatusCheckWindowController.xib
@@ -8,6 +8,7 @@
         <customObject id="-2" userLabel="File's Owner" customClass="KCStatusCheckWindowController">
             <connections>
                 <outlet property="collectionShip" destination="b5h-Jc-6Om" id="sS5-7K-uIT"/>
+                <outlet property="typeSegment" destination="YYD-QZ-qFG" id="OSS-Rc-COE"/>
                 <outlet property="window" destination="1" id="3"/>
             </connections>
         </customObject>
@@ -214,13 +215,74 @@
                         </tableHeaderView>
                     </scrollView>
                     <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="175-sD-FkB">
-                        <rect key="frame" x="18" y="360" width="126" height="18"/>
+                        <rect key="frame" x="143" y="361" width="48" height="18"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <buttonCell key="cell" type="check" title="最大の艦娘は隠す" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="NRl-Ed-dfv">
+                        <buttonCell key="cell" type="check" title="火力" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="NRl-Ed-dfv">
                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                             <font key="font" size="13" name="AquaKana"/>
                         </buttonCell>
+                        <connections>
+                            <action selector="selectCategory:" target="-2" id="H5w-Tb-SwM"/>
+                            <binding destination="bQa-hr-EKb" name="value" keyPath="values.hideMaxFire" id="0CD-Is-HCc"/>
+                        </connections>
+                    </button>
+                    <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mHC-Ii-S5A">
+                        <rect key="frame" x="195" y="361" width="48" height="18"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="check" title="雷装" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="h0E-Xu-bHD">
+                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                            <font key="font" size="13" name="AquaKana"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="selectCategory:" target="-2" id="MIt-Mj-8Uy"/>
+                            <binding destination="bQa-hr-EKb" name="value" keyPath="values.hideMaxTorpedo" id="bHU-PK-w4F"/>
+                        </connections>
+                    </button>
+                    <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GiW-Zb-LZA">
+                        <rect key="frame" x="247" y="361" width="48" height="18"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="check" title="対空" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="zXJ-A2-60m">
+                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                            <font key="font" size="13" name="AquaKana"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="selectCategory:" target="-2" id="oP1-JV-WCL"/>
+                            <binding destination="bQa-hr-EKb" name="value" keyPath="values.hideMaxAA" id="QeJ-Ny-XAU"/>
+                        </connections>
                     </button>
+                    <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="O9T-wc-PgY">
+                        <rect key="frame" x="299" y="361" width="48" height="18"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="check" title="装甲" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="0M2-OV-IHQ">
+                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                            <font key="font" size="13" name="AquaKana"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="selectCategory:" target="-2" id="Ocn-2S-6T8"/>
+                            <binding destination="bQa-hr-EKb" name="value" keyPath="values.hideMaxArmor" id="ipI-3n-Xe2"/>
+                        </connections>
+                    </button>
+                    <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Zwc-46-uuS">
+                        <rect key="frame" x="351" y="361" width="35" height="18"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="check" title="運" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="8oz-Ok-3e5">
+                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                            <font key="font" size="13" name="AquaKana"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="selectCategory:" target="-2" id="ibY-LD-g2j"/>
+                            <binding destination="bQa-hr-EKb" name="value" keyPath="values.hideMaxLuck" id="wLb-Sg-rcK"/>
+                        </connections>
+                    </button>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FIC-ZJ-kr2">
+                        <rect key="frame" x="18" y="362" width="121" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="最大の艦娘は隠す：" id="G9m-XF-G6U">
+                            <font key="font" size="13" name="AquaKana"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
                 </subviews>
             </view>
             <connections>
@@ -232,5 +294,6 @@
                 <binding destination="-2" name="managedObjectContext" keyPath="managedObjectContext" id="2A8-bK-70W"/>
             </connections>
         </arrayController>
+        <userDefaultsController id="bQa-hr-EKb"/>
     </objects>
 </document>
\ No newline at end of file