UIを調整

diff --git a/KCD/HMStrengthenListItemCellView.h b/KCD/HMStrengthenListItemCellView.h
index 1ee0de4..b8fb579 100644 (file)
--- a/KCD/HMStrengthenListItemCellView.h
+++ b/KCD/HMStrengthenListItemCellView.h
@@ -10,15 +10,8 @@
 
 #import "HMEnhancementListItem.h"
 
-typedef NS_ENUM(NSUInteger, HMStrengthenListItemBackgoudColorType) {
-       nomal,
-       alternate,
-};
-
 @interface HMStrengthenListItemCellView : NSTableCellView
 
-@property (nonatomic) HMStrengthenListItemBackgoudColorType backgroundColorType;
-
 @property (strong) HMEnhancementListItem *item;
 
 // for Cocoa Bindings

diff --git a/KCD/HMStrengthenListItemCellView.m b/KCD/HMStrengthenListItemCellView.m
index 5f93361..314f24a 100644 (file)
--- a/KCD/HMStrengthenListItemCellView.m
+++ b/KCD/HMStrengthenListItemCellView.m
@@ -17,21 +17,6 @@
 
 @implementation HMStrengthenListItemCellView
 
-- (void)setBackgroundColorType:(HMStrengthenListItemBackgoudColorType)backgroundColorType
-{
-       _backgroundColorType = backgroundColorType;
-       self.itemBox.fillColor = [NSColor whiteColor];
-       
-       NSArray<NSColor *> *colors = [NSColor controlAlternatingRowBackgroundColors];
-       if(colors.count < 2) {
-               return;
-       }
-       
-       if(_backgroundColorType == alternate) {
-               self.itemBox.fillColor = colors[1];
-       }
-}
-
 - (HMEnhancementListItem *)item
 {
        return (HMEnhancementListItem *)self.objectValue;

diff --git a/KCD/HMStrengthenListItemView.m b/KCD/HMStrengthenListItemView.m
index 98f3bfa..0c3a7bf 100644 (file)
--- a/KCD/HMStrengthenListItemView.m
+++ b/KCD/HMStrengthenListItemView.m
@@ -16,11 +16,8 @@
        
        NSRect bounds = self.bounds;
        
-//     [[NSColor controlLightHighlightColor] setFill];
        [[NSColor gridColor] setStroke];
        
-//     [NSBezierPath fillRect:bounds];
-       
        [NSBezierPath setDefaultLineWidth:1.0];
        [NSBezierPath strokeRect:bounds];
        

diff --git a/KCD/HMStrengthenListViewController.xib b/KCD/HMStrengthenListViewController.xib
index febf51f..471cf8d 100644 (file)
--- a/KCD/HMStrengthenListViewController.xib
+++ b/KCD/HMStrengthenListViewController.xib
@@ -97,7 +97,7 @@
                                                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="dtt-Ip-R0L">
                                                         <rect key="frame" x="0.0" y="82" width="161" height="17"/>
                                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="OTO 152mm三連装速射砲" id="wH1-vC-nSw">
+                                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="OTO 152mm三連装速射砲" id="wH1-vC-nSw">
                                                             <font key="font" metaFont="systemBold"/>
                                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -109,7 +109,7 @@
                                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="BKP-sY-VKc">
                                                         <rect key="frame" x="160" y="82" width="146" height="14"/>
                                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                                        <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Label" id="jwK-Iu-KBX">
+                                                        <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Label" id="jwK-Iu-KBX">
                                                             <font key="font" metaFont="smallSystem"/>
                                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -142,7 +142,7 @@
                                                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="4eG-2g-uyx">
                                                                     <rect key="frame" x="0.0" y="35" width="27" height="14"/>
                                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                                                    <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="0-5" id="W3y-Ux-ymV">
+                                                                    <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="0~5" id="W3y-Ux-ymV">
                                                                         <font key="font" metaFont="smallSystem"/>
                                                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -151,7 +151,7 @@
                                                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="qpe-7O-6pL">
                                                                     <rect key="frame" x="0.0" y="18" width="27" height="14"/>
                                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                                                    <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="6-9" id="q9l-VF-gYf">
+                                                                    <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="6~9" id="q9l-VF-gYf">
                                                                         <font key="font" metaFont="smallSystem"/>
                                                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -207,7 +207,11 @@
                                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                                     </textFieldCell>
                                                                     <connections>
-                                                                        <binding destination="gd9-yz-R2c" name="value" keyPath="needsScrewString01" id="U9K-BJ-kvr"/>
+                                                                        <binding destination="gd9-yz-R2c" name="value" keyPath="needsScrewString01" id="VZx-o1-e6f">
+                                                                            <dictionary key="options">
+                                                                                <string key="NSNullPlaceholder">-</string>
+                                                                            </dictionary>
+                                                                        </binding>
                                                                     </connections>
                                                                 </textField>
                                                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="cfa-SL-7c8">
@@ -251,7 +255,11 @@
                                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                                     </textFieldCell>
                                                                     <connections>
-                                                                        <binding destination="gd9-yz-R2c" name="value" keyPath="needsScrewString02" id="kuq-qB-bOA"/>
+                                                                        <binding destination="gd9-yz-R2c" name="value" keyPath="needsScrewString02" id="IU4-Uw-ag6">
+                                                                            <dictionary key="options">
+                                                                                <string key="NSNullPlaceholder">-</string>
+                                                                            </dictionary>
+                                                                        </binding>
                                                                     </connections>
                                                                 </textField>
                                                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="9hA-09-RKh">
@@ -295,7 +303,11 @@
                                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                                     </textFieldCell>
                                                                     <connections>
-                                                                        <binding destination="gd9-yz-R2c" name="value" keyPath="needsScrewString03" id="QMH-gt-Pf2"/>
+                                                                        <binding destination="gd9-yz-R2c" name="value" keyPath="needsScrewString03" id="y79-pS-DWD">
+                                                                            <dictionary key="options">
+                                                                                <string key="NSNullPlaceholder">-</string>
+                                                                            </dictionary>
+                                                                        </binding>
                                                                     </connections>
                                                                 </textField>
                                                             </subviews>