From: Miltiadis Vasilakis Date: Fri, 6 Apr 2012 15:31:52 +0000 (+0300) Subject: Change UI labels. X-Git-Tag: v0.9~3 X-Git-Url: https://code.grnet.gr/git/pithos-macos/commitdiff_plain/928b3094fc50d39ccbf9e019d5d2fb5c52c765ed Change UI labels. --- diff --git a/pithos-macos/PithosBrowserController.m b/pithos-macos/PithosBrowserController.m index d8ef69d..fac1f5d 100644 --- a/pithos-macos/PithosBrowserController.m +++ b/pithos-macos/PithosBrowserController.m @@ -2206,7 +2206,9 @@ forDraggedRowsWithIndexes:(NSIndexSet *)rowIndexes inColumn:(NSInteger)column { [menu addItem:menuItem]; [menu addItem:[NSMenuItem separatorItem]]; // Get Info - menuItem = [[[NSMenuItem alloc] initWithTitle:@"Get Info" action:@selector(menuGetInfo:) keyEquivalent:@""] autorelease]; + menuItem = [[[NSMenuItem alloc] initWithTitle:(([menuNode class] == [PithosContainerNode class]) ? @"Info" : @"Info and Sharing") + action:@selector(menuGetInfo:) + keyEquivalent:@""] autorelease]; [menuItem setRepresentedObject:[NSArray arrayWithObject:menuNode]]; [menu addItem:menuItem]; // Paste @@ -2254,7 +2256,9 @@ forDraggedRowsWithIndexes:(NSIndexSet *)rowIndexes inColumn:(NSInteger)column { // Get Info if (!sharingAccount || ([firstMenuNode class] != [PithosAccountNode class])) { [menu addItem:[NSMenuItem separatorItem]]; - menuItem = [[[NSMenuItem alloc] initWithTitle:@"Get Info" action:@selector(menuGetInfo:) keyEquivalent:@""] autorelease]; + menuItem = [[[NSMenuItem alloc] initWithTitle:(([firstMenuNode class] == [PithosContainerNode class]) ? @"Info" : @"Info and Sharing") + action:@selector(menuGetInfo:) + keyEquivalent:@""] autorelease]; [menuItem setRepresentedObject:menuNodes]; [menu addItem:menuItem]; diff --git a/pithos-macos/PithosBrowserPreviewController.xib b/pithos-macos/PithosBrowserPreviewController.xib index 99c6039..3e7ae5d 100644 --- a/pithos-macos/PithosBrowserPreviewController.xib +++ b/pithos-macos/PithosBrowserPreviewController.xib @@ -1,14 +1,14 @@ - 1060 - 10K549 - 1306 - 1038.36 - 461.00 + 1070 + 11D50b + 2182 + 1138.32 + 568.00 com.apple.InterfaceBuilder.CocoaPlugin - 1306 + 2182 YES @@ -27,11 +27,8 @@ com.apple.InterfaceBuilder.CocoaPlugin - YES - - YES - - + PluginDependencyRecalculationVersion + YES @@ -52,14 +49,15 @@ 269 - {{59, 18}, {82, 19}} + {{49, 18}, {102, 19}} + YES -2080244224 134217728 - More info... + Info and sharing LucidaGrande 11 @@ -79,6 +77,7 @@ 271 {{1, 45}, {98, 14}} + YES @@ -117,6 +116,7 @@ 271 {{1, 61}, {98, 14}} + YES @@ -135,6 +135,7 @@ 271 {{1, 77}, {98, 14}} + YES @@ -153,6 +154,7 @@ 271 {{1, 93}, {98, 14}} + YES @@ -171,6 +173,7 @@ 271 {{1, 109}, {98, 14}} + YES @@ -189,6 +192,7 @@ 271 {{1, 125}, {98, 14}} + YES @@ -207,6 +211,7 @@ 271 {{101, 45}, {98, 14}} + YES @@ -232,6 +237,7 @@ 271 {{101, 61}, {98, 14}} + YES @@ -249,6 +255,7 @@ 271 {{101, 77}, {98, 14}} + YES @@ -266,6 +273,7 @@ 271 {{101, 93}, {98, 14}} + YES @@ -283,6 +291,7 @@ 271 {{101, 109}, {98, 14}} + YES @@ -300,6 +309,7 @@ 271 {{101, 125}, {98, 14}} + YES @@ -329,6 +339,7 @@ {{36, 147}, {128, 128}} + YES @@ -344,6 +355,7 @@ {200, 295} + NSView @@ -396,6 +408,22 @@ + value: representedObject.pithosObject.contentType + + + + + + value: representedObject.pithosObject.contentType + value + representedObject.pithosObject.contentType + 2 + + + 89 + + + value: representedObject.pithosObject.bytes @@ -416,19 +444,23 @@ - value: representedObject.pithosObject.contentType - + value: representedObject.pithosObject.lastModified + - + - value: representedObject.pithosObject.contentType + value: representedObject.pithosObject.lastModified value - representedObject.pithosObject.contentType + representedObject.pithosObject.lastModified + + NSValueTransformerName + LastModifiedDateTransformer + 2 - 89 + 97 @@ -503,33 +535,15 @@ 95 - - - value: representedObject.pithosObject.lastModified - - - - - - value: representedObject.pithosObject.lastModified - value - representedObject.pithosObject.lastModified - - NSValueTransformerName - LastModifiedDateTransformer - - 2 - - - 97 - YES 0 - + + YES + @@ -797,8 +811,7 @@ -2.IBPluginDependency -3.IBPluginDependency 1.IBPluginDependency - 1.WindowOrigin - 1.editorWindowContentRectSynchronizationRect + 10.IBPluginDependency 20.IBPluginDependency 21.IBPluginDependency 27.IBPluginDependency @@ -828,14 +841,13 @@ 74.IBPluginDependency 75.IBPluginDependency - + YES com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {628, 654} - {{357, 416}, {480, 272}} + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin diff --git a/pithos-macos/PithosContainerNodeInfoController.h b/pithos-macos/PithosContainerNodeInfoController.h index 8ef971f..e84caed 100644 --- a/pithos-macos/PithosContainerNodeInfoController.h +++ b/pithos-macos/PithosContainerNodeInfoController.h @@ -37,11 +37,14 @@ #import #import "PithosNodeInfoController.h" +#import "InspectorPane.h" @interface PithosContainerNodeInfoController : PithosNodeInfoController { IBOutlet NSDictionaryController *metadataDictionaryController; NSArray *policyVersioningValuesArray; + + IBOutlet InspectorPane *metadataInspectorPane; } @property (nonatomic, retain) NSArray *policyVersioningValuesArray; diff --git a/pithos-macos/PithosContainerNodeInfoController.m b/pithos-macos/PithosContainerNodeInfoController.m index f2d2589..39b6e29 100644 --- a/pithos-macos/PithosContainerNodeInfoController.m +++ b/pithos-macos/PithosContainerNodeInfoController.m @@ -37,6 +37,10 @@ #import "PithosContainerNodeInfoController.h" +@interface InspectorPane (PrivateMadePublic) +- (void)toggleCollapsedWithAnimation:(BOOL)animates; +@end + @implementation PithosContainerNodeInfoController @synthesize policyVersioningValuesArray; @@ -63,6 +67,8 @@ [metadataDictionaryController setInitialValue:@"value"]; [[self window] setDelegate:self]; + + [metadataInspectorPane toggleCollapsedWithAnimation:NO]; } @end diff --git a/pithos-macos/PithosContainerNodeInfoController.xib b/pithos-macos/PithosContainerNodeInfoController.xib index 2404d94..c595201 100755 --- a/pithos-macos/PithosContainerNodeInfoController.xib +++ b/pithos-macos/PithosContainerNodeInfoController.xib @@ -786,8 +786,8 @@ YES - 67239488 - 4196352 + 70385217 + 4195328 Block hash @@ -823,8 +823,8 @@ YES - 67239488 - 4196352 + 70385217 + 4195328 Block size @@ -860,8 +860,8 @@ YES - 67239488 - 4196352 + 70385217 + 4195328 Modified @@ -897,8 +897,8 @@ YES - 67239488 - 4196352 + 70385217 + 4195328 Size @@ -934,8 +934,8 @@ YES - 67239488 - 4196352 + 70385217 + 4195328 Count @@ -1163,11 +1163,11 @@ - policyVersioningArrayController + metadataInspectorPane - + - 946 + 1213 @@ -2953,7 +2953,7 @@ - 1212 + 1213 @@ -3070,14 +3070,35 @@ PithosContainerNodeInfoController PithosNodeInfoController - metadataDictionaryController - NSDictionaryController + YES + + YES + metadataDictionaryController + metadataInspectorPane + + + YES + NSDictionaryController + InspectorPane + - metadataDictionaryController - - metadataDictionaryController - NSDictionaryController + YES + + YES + metadataDictionaryController + metadataInspectorPane + + + YES + + metadataDictionaryController + NSDictionaryController + + + metadataInspectorPane + InspectorPane + diff --git a/pithos-macos/PithosObjectNodeInfoController.h b/pithos-macos/PithosObjectNodeInfoController.h index 4a5109f..2979dd3 100644 --- a/pithos-macos/PithosObjectNodeInfoController.h +++ b/pithos-macos/PithosObjectNodeInfoController.h @@ -46,6 +46,7 @@ IBOutlet NSArrayController *versionsArrayController; IBOutlet InspectorPane *versionsInspectorPane; + IBOutlet InspectorPane *metadataInspectorPane; IBOutlet InspectorPane *otherMetadataInspectorPane; BOOL isObjectNode; diff --git a/pithos-macos/PithosObjectNodeInfoController.m b/pithos-macos/PithosObjectNodeInfoController.m index f207672..a6d30a3 100644 --- a/pithos-macos/PithosObjectNodeInfoController.m +++ b/pithos-macos/PithosObjectNodeInfoController.m @@ -64,12 +64,13 @@ [metadataDictionaryController setInitialKey:@"key"]; [metadataDictionaryController setInitialValue:@"value"]; - [sharingDictionaryController setInitialKey:@"user"]; + [sharingDictionaryController setInitialKey:@"user or user:group"]; [sharingDictionaryController setInitialValue:@"read only"]; [[self window] setDelegate:self]; [versionsInspectorPane toggleCollapsedWithAnimation:NO]; + [metadataInspectorPane toggleCollapsedWithAnimation:NO]; [otherMetadataInspectorPane toggleCollapsedWithAnimation:NO]; } diff --git a/pithos-macos/PithosObjectNodeInfoController.xib b/pithos-macos/PithosObjectNodeInfoController.xib index b02d828..5b6b491 100755 --- a/pithos-macos/PithosObjectNodeInfoController.xib +++ b/pithos-macos/PithosObjectNodeInfoController.xib @@ -193,7 +193,7 @@ YES - 68288064 + 70385217 4195328 pithos @@ -895,7 +895,7 @@ 67239488 272762880 - Public & Permissions: + Sharing: @@ -1509,8 +1509,8 @@ YES - 67239488 - 4196352 + 70385217 + 4195328 UUID @@ -1546,8 +1546,8 @@ YES - 67239488 - 4196352 + 70385217 + 4195328 Version @@ -1583,8 +1583,8 @@ YES - 67239488 - 4196352 + 70385217 + 4195328 Modified by @@ -1620,8 +1620,8 @@ YES - 67239488 - 4196352 + 70385217 + 4195328 Modified @@ -1657,8 +1657,8 @@ YES - 67239488 - 4196352 + 70385217 + 4195328 Where @@ -1694,8 +1694,8 @@ YES - 67239488 - 4196352 + 70385217 + 4195328 Size @@ -1731,8 +1731,8 @@ YES - 67239488 - 4196352 + 70385217 + 4195328 Kind @@ -1952,6 +1952,14 @@ 1491 + + metadataInspectorPane + + + + 1500 + + displayPatternTitle1: self.node.displayName @@ -4879,7 +4887,7 @@ - 1499 + 1500 @@ -5019,6 +5027,7 @@ YES metadataDictionaryController + metadataInspectorPane otherMetadataInspectorPane sharingDictionaryController versionsArrayController @@ -5028,6 +5037,7 @@ YES NSDictionaryController InspectorPane + InspectorPane NSDictionaryController NSArrayController InspectorPane @@ -5038,6 +5048,7 @@ YES metadataDictionaryController + metadataInspectorPane otherMetadataInspectorPane sharingDictionaryController versionsArrayController @@ -5050,6 +5061,10 @@ NSDictionaryController + metadataInspectorPane + InspectorPane + + otherMetadataInspectorPane InspectorPane