Fixes Table Header + Idioms and languages var names

cescofry · Jul 11, 2013 · ef2b047 · ef2b047
1 parent 8ed367e
commit ef2b047
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 71 deletions.
diff --git a/HiperStrings/Controllers/ZFFileDetailController.m b/HiperStrings/Controllers/ZFFileDetailController.m
@@ -25,7 +25,7 @@ @implementation ZFFileDetailController
 - (void)setLangFile:(ZFTranslationFile *)langFile {
     _langFile = langFile;
 
-    self.columns = [[NSArray arrayWithObject:KEY_KEY] arrayByAddingObjectsFromArray:[_langFile allLanguageIdentifiers]];
+    self.columns = [[NSArray arrayWithObject:KEY_KEY] arrayByAddingObjectsFromArray:[_langFile allIdioms]];
     self.keys = (self.columns.count > 1)? [self.langFile allKeys] : [NSArray array];
 
     NSMutableArray *addCol = [self.columns mutableCopy];
@@ -40,19 +40,25 @@ - (void)setLangFile:(ZFTranslationFile *)langFile {
     }];
     [addCol enumerateObjectsUsingBlock:^(NSString *obj, NSUInteger idx, BOOL *stop) {
         NSTableColumn *column = [[NSTableColumn alloc] initWithIdentifier:obj];
-        [column setHeaderCell:[[NSCell alloc] initTextCell:obj]];
+        [[column headerCell] setStringValue:obj];
+        [[column headerCell] setAlignment:NSLeftTextAlignment];
         [self.tableView addTableColumn:column];
     }];
 
-
     [self didSwithSegmentedControl:self.segmentedControl];
 
 }
 
 #pragma mark - Segmented Controller
 
+-(void)tableViewColumnDidResize:(NSNotification *)notification {
+
+//    NSTableColumn *column = [[notification userInfo] objectForKey:@"NSTableColumn"];
+
+}
+
 - (IBAction)didSwithSegmentedControl:(NSSegmentedControl *)sender {
-    self.rows = [self.langFile translationsByType:(self.segmentedControl.selectedSegment == 0)? ZFLangTypeIOS : ZFLangTypeAndorid andLanguageIdentifier:nil];
+    self.rows = [self.langFile translationsByType:(self.segmentedControl.selectedSegment == 0)? ZFLangTypeIOS : ZFLangTypeAndorid andLanguageIdentifier:nil];  
     [self.tableView reloadData];
 }
 
@@ -62,13 +68,14 @@ - (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView {
     return [self.keys count];
 }
 
-- (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
+- (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {    
     NSString *key = [self.keys objectAtIndex:row];
     if ([tableColumn.identifier isEqualToString:KEY_KEY]) return key;
     else {
         NSArray *translation = [self.langFile translationsByType:(self.segmentedControl.selectedSegment == 0)? ZFLangTypeIOS : ZFLangTypeAndorid andLanguageIdentifier:tableColumn.identifier];
         ZFLangFile *lang = [translation lastObject];
-        return [[lang lineForKey:key] value];
+        ZFTranslationLine *line = [lang lineForKey:key];
+        return (line.type != ZFTranslationLineTypeUntranslated)? line.value : @"--";
     }
 
     //return [[self.rows objectForKey:tableColumn.identifier] objectForKey:[self.keys objectAtIndex:row]];

diff --git a/HiperStrings/en.lproj/MainMenu.xib b/HiperStrings/en.lproj/MainMenu.xib
@@ -1407,9 +1407,10 @@
 												</object>
 											</object>
 											<double key="NSRowHeight">60</double>
-											<int key="NSTvFlags">-700448768</int>
+											<int key="NSTvFlags">-163577856</int>
 											<reference key="NSDelegate"/>
 											<reference key="NSDataSource"/>
+											<int key="NSGridStyleMask">2</int>
 											<int key="NSColumnAutoresizingStyle">4</int>
 											<int key="NSDraggingSourceMaskForLocal">15</int>
 											<int key="NSDraggingSourceMaskForNonLocal">0</int>
@@ -1513,14 +1514,13 @@
 											<bool key="NSEnabled">YES</bool>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 											<bool key="NSControlAllowsExpansionToolTips">YES</bool>
-											<object class="NSTableHeaderView" key="NSHeaderView" id="590224447">
-												<reference key="NSNextResponder" ref="575000840"/>
+											<object class="NSTableHeaderView" key="NSHeaderView" id="135437731">
+												<reference key="NSNextResponder" ref="222291212"/>
 												<int key="NSvFlags">256</int>
 												<string key="NSFrameSize">{721, 17}</string>
-												<reference key="NSSuperview" ref="575000840"/>
+												<reference key="NSSuperview" ref="222291212"/>
 												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="700309970"/>
-												<string key="NSReuseIdentifierKey">_NS:16</string>
 												<reference key="NSTableView" ref="126529486"/>
 											</object>
 											<object class="_NSCornerView" key="NSCornerView">
@@ -1601,10 +1601,11 @@
 											<reference key="NSBackgroundColor" ref="34161968"/>
 											<reference key="NSGridColor" ref="229574475"/>
 											<double key="NSRowHeight">17</double>
-											<int key="NSTvFlags">-700448768</int>
+											<int key="NSTvFlags">1992327168</int>
 											<reference key="NSDelegate"/>
 											<reference key="NSDataSource"/>
-											<int key="NSColumnAutoresizingStyle">4</int>
+											<int key="NSGridStyleMask">3</int>
+											<int key="NSColumnAutoresizingStyle">1</int>
 											<int key="NSDraggingSourceMaskForLocal">15</int>
 											<int key="NSDraggingSourceMaskForNonLocal">0</int>
 											<bool key="NSAllowsTypeSelect">YES</bool>
@@ -1632,8 +1633,7 @@
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 									<reference key="NSTarget" ref="405919396"/>
 									<string key="NSAction">_doScroller:</string>
-									<double key="NSCurValue">37</double>
-									<double key="NSPercent">0.1947367936372757</double>
+									<double key="NSPercent">0.99842271293375395</double>
 								</object>
 								<object class="NSScroller" id="1005844031">
 									<reference key="NSNextResponder" ref="405919396"/>
@@ -1647,34 +1647,33 @@
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="405919396"/>
 									<string key="NSAction">_doScroller:</string>
-									<double key="NSPercent">0.57142859697341919</double>
+									<double key="NSPercent">0.99861495844875348</double>
 								</object>
-								<object class="NSClipView" id="575000840">
+								<object class="NSClipView" id="222291212">
 									<reference key="NSNextResponder" ref="405919396"/>
 									<int key="NSvFlags">2304</int>
 									<array class="NSMutableArray" key="NSSubviews">
-										<reference ref="590224447"/>
+										<reference ref="135437731"/>
 									</array>
 									<string key="NSFrame">{{1, 0}, {721, 17}}</string>
 									<reference key="NSSuperview" ref="405919396"/>
 									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="590224447"/>
-									<string key="NSReuseIdentifierKey">_NS:15</string>
-									<reference key="NSDocView" ref="590224447"/>
+									<reference key="NSNextKeyView" ref="135437731"/>
+									<reference key="NSDocView" ref="135437731"/>
 									<reference key="NSBGColor" ref="215509219"/>
 									<int key="NScvFlags">4</int>
 								</object>
 							</array>
 							<string key="NSFrame">{{278, -1}, {723, 651}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="575000840"/>
+							<reference key="NSNextKeyView" ref="222291212"/>
 							<string key="NSReuseIdentifierKey">_NS:9</string>
 							<int key="NSsFlags">133682</int>
 							<reference key="NSVScroller" ref="539140495"/>
 							<reference key="NSHScroller" ref="1005844031"/>
 							<reference key="NSContentView" ref="700309970"/>
-							<reference key="NSHeaderClipView" ref="575000840"/>
+							<reference key="NSHeaderClipView" ref="222291212"/>
 							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
 							<double key="NSMinMagnification">0.25</double>
 							<double key="NSMaxMagnification">4</double>
@@ -3552,8 +3551,8 @@
 							</object>
 							<reference ref="32193900"/>
 							<reference ref="812725058"/>
-							<reference ref="405919396"/>
 							<reference ref="696093428"/>
+							<reference ref="405919396"/>
 						</array>
 						<reference key="parent" ref="972006081"/>
 					</object>
@@ -4116,8 +4115,8 @@
 						<array class="NSMutableArray" key="children">
 							<reference ref="126529486"/>
 							<reference ref="1005844031"/>
-							<reference ref="590224447"/>
 							<reference ref="539140495"/>
+							<reference ref="135437731"/>
 						</array>
 						<reference key="parent" ref="439893737"/>
 					</object>
@@ -4135,11 +4134,6 @@
 						<reference key="object" ref="1005844031"/>
 						<reference key="parent" ref="405919396"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">636</int>
-						<reference key="object" ref="590224447"/>
-						<reference key="parent" ref="405919396"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">637</int>
 						<reference key="object" ref="539140495"/>
@@ -4414,7 +4408,7 @@
 								<int key="NSvFlags">274</int>
 								<array class="NSMutableArray" key="NSSubviews"/>
 								<string key="NSFrame">{{1, 1}, {447, 50}}</string>
-								<reference key="NSNextKeyView"/>
+								<reference key="NSNextKeyView" ref="749135618"/>
 							</object>
 						</array>
 						<reference key="parent" ref="794620896"/>
@@ -4424,11 +4418,6 @@
 						<reference key="object" ref="537766335"/>
 						<reference key="parent" ref="152586093"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">678</int>
-						<reference key="object" ref="387297059"/>
-						<reference key="parent" ref="234702603"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">681</int>
 						<reference key="object" ref="792017930"/>
@@ -4473,11 +4462,6 @@
 						<reference key="object" ref="1011537513"/>
 						<reference key="parent" ref="0"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">701</int>
-						<reference key="object" ref="138064046"/>
-						<reference key="parent" ref="234702603"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">702</int>
 						<reference key="object" ref="236283428"/>
@@ -4541,21 +4525,11 @@
 						<reference key="object" ref="372765649"/>
 						<reference key="parent" ref="342014958"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">708</int>
-						<reference key="object" ref="763778639"/>
-						<reference key="parent" ref="234702603"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">709</int>
 						<reference key="object" ref="81610123"/>
 						<reference key="parent" ref="234702603"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">713</int>
-						<reference key="object" ref="91039756"/>
-						<reference key="parent" ref="234702603"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">715</int>
 						<reference key="object" ref="962887723"/>
@@ -4566,6 +4540,31 @@
 						<reference key="object" ref="876230019"/>
 						<reference key="parent" ref="236283428"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">678</int>
+						<reference key="object" ref="387297059"/>
+						<reference key="parent" ref="234702603"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">713</int>
+						<reference key="object" ref="91039756"/>
+						<reference key="parent" ref="234702603"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">708</int>
+						<reference key="object" ref="763778639"/>
+						<reference key="parent" ref="234702603"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">701</int>
+						<reference key="object" ref="138064046"/>
+						<reference key="parent" ref="234702603"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">752</int>
+						<reference key="object" ref="135437731"/>
+						<reference key="parent" ref="405919396"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -4750,8 +4749,6 @@
 				<string key="633.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="634.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="635.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<dictionary class="NSMutableDictionary" key="636.IBAttributePlaceholdersKey"/>
-				<string key="636.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="637.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<dictionary class="NSMutableDictionary" key="638.IBAttributePlaceholdersKey"/>
 				<string key="638.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4831,6 +4828,7 @@
 				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="74.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="75.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="752.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="77.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="78.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="79.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4843,7 +4841,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">721</int>
+			<int key="maxID">752</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">

diff --git a/Strings/ZFLangFile.h b/Strings/ZFLangFile.h
@@ -19,7 +19,7 @@ typedef enum {
 @property (nonatomic, strong) NSURL *url;
 @property (nonatomic, strong, readonly) NSString *fileName;
 @property (nonatomic, assign, readonly) ZFLangType type;
-@property (nonatomic, strong, readonly) NSString *language;
+@property (nonatomic, strong, readonly) NSString *idiom;
 @property (nonatomic, strong, readonly) NSArray *allKeys;
 @property (nonatomic, strong, readonly) NSMutableArray *translations;
 @property (nonatomic, assign, readonly) BOOL isDirty;

diff --git a/Strings/ZFLangFile.m b/Strings/ZFLangFile.m
@@ -36,7 +36,7 @@ - (id)initWithURL:(NSURL *)url {
         self.url = url;
         _fileName = [url lastPathComponent];
         _type = (isIOS)? ZFLangTypeIOS : ZFLangTypeAndorid;
-        _language = lang;
+        _idiom = lang;
         _isDirty = NO;
 
         ZFStringsConverter *converter = [[ZFStringsConverter alloc] init];
@@ -65,7 +65,7 @@ - (id)initWithCouplingLanguage:(ZFLangFile *)langfile {
     self = [self init];
     if (self) {
         _type = (langfile.type == ZFLangTypeIOS)? ZFLangTypeAndorid : ZFLangTypeIOS;
-        _language = langfile.language;
+        _idiom = langfile.idiom;
         _translations = [langfile.translations mutableCopy];
         _isDirty = YES;
     }
@@ -118,7 +118,7 @@ - (void)sortTranslations {
 }
 
 - (NSString *)description {
-    return [[super description] stringByAppendingFormat:@" %@ %d %@ %ld keys", self.fileName, self.type, self.language, (unsigned long)[self.allKeys count]];
+    return [[super description] stringByAppendingFormat:@" %@ %d %@ %ld keys", self.fileName, self.type, self.idiom, (unsigned long)[self.allKeys count]];
 }
 
 

diff --git a/Strings/ZFTranslationFile.h b/Strings/ZFTranslationFile.h
@@ -27,7 +27,7 @@ typedef enum {
 @property (nonatomic, strong) NSMutableArray *languages;
 
 @property (nonatomic, strong) NSArray *allKeys;
-@property (nonatomic, strong) NSArray *allLanguageIdentifiers;
+@property (nonatomic, strong) NSArray *allIdioms;
 
 @property (nonatomic, strong, readonly) NSURL *rootIOSURL;
 @property (nonatomic, strong, readonly) NSURL *rootAndroidURL;