From 6458195cc07458e5f8b7359856962020e4f248a7 Mon Sep 17 00:00:00 2001 From: adison Date: Thu, 11 Sep 2014 19:18:05 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=8A=A0=E5=85=A5=20author=20=E6=A0=8F?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Commenter/VVBaseCommenter.m | 44 ++++++- .../Setting/VVDSettingPanelWindowController.m | 11 +- .../VVDSettingPanelWindowController.xib | 113 ++++++++++++++---- .../Setting/VVDocumenterSetting.h | 1 + .../Setting/VVDocumenterSetting.m | 11 ++ 5 files changed, 153 insertions(+), 27 deletions(-) diff --git a/VVDocumenter-Xcode/Commenter/VVBaseCommenter.m b/VVDocumenter-Xcode/Commenter/VVBaseCommenter.m index c688669..7659120 100755 --- a/VVDocumenter-Xcode/Commenter/VVBaseCommenter.m +++ b/VVDocumenter-Xcode/Commenter/VVBaseCommenter.m @@ -31,7 +31,12 @@ -(instancetype) initWithIndentString:(NSString *)indent codeString:(NSString *)c } return self; } - +/** + * Adison 14-09-10 14:09:18 + + * + * @return <#return value description#> + */ -(NSString *) paramSymbol { return self.forSwift ? @":param:" : @"@param"; } @@ -40,20 +45,47 @@ -(NSString *) returnSymbol { return self.forSwift ? @":returns:" : @"@return"; } +/** + * @Author: Adison, 14-09-11 15:09:09 + * <#Description#> + * + * @return <#return value description#> + */ -(NSString *) startComment { NSString *descriptionTag = [[VVDocumenterSetting defaultSetting] briefDescription] && !self.forSwift ? @"@brief " : @""; + NSString *authorInfo = @""; + if ([[VVDocumenterSetting defaultSetting] defaultUserInformation] && !self.forSwift) { + NSDateFormatter *formatter = [[NSDateFormatter alloc] init]; + [formatter setDateFormat:@"MM-dd-YYYY HH:MM:ss"]; + + NSString *author = @"Adison"; + + NSLog(@"%@", author); + + authorInfo = [NSString stringWithFormat:@"%@@Author %@, %@\n", + self.prefixString, + author, + [formatter stringFromDate:[NSDate date]] + ]; + } + if ([[VVDocumenterSetting defaultSetting] useHeaderDoc]) { return [NSString stringWithFormat:@"%@/*!\n%@%@<#Description#>\n", self.indent, self.prefixString, descriptionTag]; } else if ([[VVDocumenterSetting defaultSetting] prefixWithSlashes]) { return [NSString stringWithFormat:@"%@%@<#Description#>\n", self.prefixString, descriptionTag]; } else { - return [NSString stringWithFormat:@"%@/**\n%@%@<#Description#>\n", self.indent, self.prefixString, descriptionTag]; + return [NSString stringWithFormat:@"%@/**\n%@%@%@<#Description#>\n", self.indent, authorInfo, self.prefixString, descriptionTag]; } } - +/** + * Adison 14-09-10 15:09:10 + + * + * @return <#return value description#> + */ -(NSString *) argumentsComment { if (self.arguments.count == 0) @@ -94,6 +126,12 @@ -(NSString *) returnComment } } +-(NSString *) defaultUserInformation +{ + + +} + -(NSString *) sinceComment { //It seems no since attribute for swift? Maybe I am wrong. diff --git a/VVDocumenter-Xcode/Setting/VVDSettingPanelWindowController.m b/VVDocumenter-Xcode/Setting/VVDSettingPanelWindowController.m index 1aed811..14239f6 100644 --- a/VVDocumenter-Xcode/Setting/VVDSettingPanelWindowController.m +++ b/VVDocumenter-Xcode/Setting/VVDSettingPanelWindowController.m @@ -26,6 +26,7 @@ @interface VVDSettingPanelWindowController () @property (weak) IBOutlet NSButton *btnUseHeaderDoc; @property (weak) IBOutlet NSButton *btnBlankLinesBetweenSections; @property (weak) IBOutlet NSButton *btnAlightArgumentComments; +@property (weak) IBOutlet NSButton *btnDefaultUserInformation; @end @implementation VVDSettingPanelWindowController @@ -53,7 +54,8 @@ - (void)windowDidLoad self.btnUseHeaderDoc.state = (NSCellStateValue)[[VVDocumenterSetting defaultSetting] useHeaderDoc]; self.btnBlankLinesBetweenSections.state = (NSCellStateValue)[[VVDocumenterSetting defaultSetting] blankLinesBetweenSections]; self.btnAlightArgumentComments.state = (NSCellStateValue)[[VVDocumenterSetting defaultSetting] alignArgumentComments]; - + self.btnDefaultUserInformation.state = (NSCellStateValue)[[VVDocumenterSetting defaultSetting] defaultUserInformation]; + if ([[VVDocumenterSetting defaultSetting] prefixWithStar]) { [self.mtxPrefixOptions selectCell:self.btnPrefixWithStar]; } else if ([[VVDocumenterSetting defaultSetting] prefixWithSlashes]) { @@ -89,7 +91,8 @@ - (IBAction)btnResetPressed:(id)sender { [[VVDocumenterSetting defaultSetting] setUseHeaderDoc:NO]; [[VVDocumenterSetting defaultSetting] setBlankLinesBetweenSections:YES]; [[VVDocumenterSetting defaultSetting] setAlignArgumentComments:YES]; - + [[VVDocumenterSetting defaultSetting] setDefaultUserInformation:YES]; + self.btnUseSpaces.state = NSOnState; [self updateUseSpace:self.btnUseSpaces.state]; self.btnPrefixWithWhitespace.state = NSOffState; @@ -128,6 +131,10 @@ - (IBAction)btnBriefDescriptionPressed:(id)sender { [[VVDocumenterSetting defaultSetting] setBriefDescription:self.btnBriefDescription.state]; } +- (IBAction)btnDefaultUserInformationPressed:(id)sender { + [[VVDocumenterSetting defaultSetting] setBriefDescription:self.btnDefaultUserInformation.state]; +} + -(void) syncSpaceCount { NSInteger spaceCount = [[VVDocumenterSetting defaultSetting] spaceCount]; diff --git a/VVDocumenter-Xcode/Setting/VVDSettingPanelWindowController.xib b/VVDocumenter-Xcode/Setting/VVDSettingPanelWindowController.xib index 29b1cef..908e0df 100644 --- a/VVDocumenter-Xcode/Setting/VVDSettingPanelWindowController.xib +++ b/VVDocumenter-Xcode/Setting/VVDSettingPanelWindowController.xib @@ -43,7 +43,7 @@ 3 2 - {{508, 391}, {460, 437}} + {{508, 391}, {460, 473}} 544735232 VVDocumenter Setting NSWindow @@ -56,7 +56,7 @@ 268 - {{67, 311}, {212, 35}} + {{67, 347}, {212, 35}} @@ -92,7 +92,7 @@ 268 - {{329, 320}, {60, 17}} + {{329, 356}, {60, 17}} @@ -130,7 +130,7 @@ 268 - {{279, 317}, {37, 22}} + {{279, 353}, {37, 22}} @@ -166,7 +166,7 @@ 268 - {{14, 13}, {113, 32}} + {{14, 19}, {113, 32}} @@ -191,7 +191,7 @@ 268 - {{66, 398}, {107, 17}} + {{66, 434}, {107, 17}} @@ -213,7 +213,7 @@ 268 - {{279, 395}, {96, 22}} + {{279, 431}, {96, 22}} @@ -236,7 +236,7 @@ 268 - {{78, 352}, {295, 38}} + {{78, 388}, {295, 38}} @@ -271,7 +271,7 @@ 268 - {{312, 314}, {19, 27}} + {{312, 350}, {19, 27}} @@ -291,7 +291,7 @@ 268 - {{67, 290}, {201, 18}} + {{67, 326}, {201, 18}} @@ -318,7 +318,7 @@ 268 - {{67, 260}, {187, 18}} + {{67, 296}, {187, 18}} @@ -345,7 +345,7 @@ 268 - {{67, 230}, {272, 18}} + {{67, 266}, {272, 18}} @@ -372,7 +372,7 @@ 268 - {{67, 202}, {272, 18}} + {{67, 238}, {272, 18}} @@ -399,7 +399,7 @@ 268 - {{68, 61}, {325, 85}} + {{68, 67}, {325, 85}} @@ -580,7 +580,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 12 - {{70, 152}, {323, 5}} + {{70, 158}, {323, 5}} @@ -605,10 +605,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{67, 170}, {272, 18}} + {{67, 206}, {272, 18}} - + _NS:9 YES @@ -629,13 +629,40 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO + + + 268 + {{66, 174}, {272, 18}} + + + + _NS:9 + YES + + -2080374784 + 268435456 + Add Default User Informaiton + + _NS:9 + + 1211912448 + 2 + + + + + 200 + 25 + + NO + - {460, 437} + {460, 473} - {{0, 0}, {1680, 1028}} + {{0, 0}, {1440, 878}} {10000000000000, 10000000000000} YES @@ -835,6 +862,22 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 oHc-uk-ERk + + + btnDefaultUserInformationPressed: + + + + 8q6-ME-BbL + + + + btnDefaultUserInformation + + + + FuE-aM-HNb + delegate @@ -882,9 +925,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 2 - - - @@ -897,6 +937,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 + + + + @@ -1106,6 +1150,19 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 + + yp5-mf-NgJ + + + + + + + + 7e3-kk-v20 + + + @@ -1135,6 +1192,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1150,6 +1208,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin @@ -1166,6 +1225,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 id id id + id id id id @@ -1189,6 +1249,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 btnBriefDescriptionPressed: id + + btnDefaultUserInformationPressed: + id + btnResetPressed: id @@ -1215,6 +1279,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NSButton NSButton NSButton + NSButton NSButtonCell NSButtonCell NSButtonCell @@ -1243,6 +1308,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 btnBriefDescription NSButton + + btnDefaultUserInformation + NSButton + btnPrefixWithSlashes NSButtonCell diff --git a/VVDocumenter-Xcode/Setting/VVDocumenterSetting.h b/VVDocumenter-Xcode/Setting/VVDocumenterSetting.h index 636388c..6d5db43 100644 --- a/VVDocumenter-Xcode/Setting/VVDocumenterSetting.h +++ b/VVDocumenter-Xcode/Setting/VVDocumenterSetting.h @@ -24,5 +24,6 @@ extern NSString *const VVDDefaultTriggerString; @property BOOL useHeaderDoc; @property BOOL blankLinesBetweenSections; @property BOOL alignArgumentComments; +@property BOOL defaultUserInformation; @property (readonly) NSString *spacesString; @end diff --git a/VVDocumenter-Xcode/Setting/VVDocumenterSetting.m b/VVDocumenter-Xcode/Setting/VVDocumenterSetting.m index 11b0bc1..2ef19b0 100644 --- a/VVDocumenter-Xcode/Setting/VVDocumenterSetting.m +++ b/VVDocumenter-Xcode/Setting/VVDocumenterSetting.m @@ -21,6 +21,7 @@ NSString *const kVVDUserHeaderDoc = @"com.onevcat.VVDocumenter.useHeaderDoc"; NSString *const kVVDNoBlankLinesBetweenFields = @"com.onevcat.VVDocumenter.noBlankLinesBetweenFields"; NSString *const kVVDNoArgumentPadding = @"com.onevcat.VVDocumenter.noArgumentPadding"; +NSString *const kVVDDefaultUserInformation = @"com.onevcat.VVDocumenter.defaultUserInformation"; @implementation VVDocumenterSetting + (VVDocumenterSetting *)defaultSetting @@ -173,6 +174,16 @@ -(void) setAlignArgumentComments:(BOOL)alignArgumentComments [[NSUserDefaults standardUserDefaults] synchronize]; } +-(BOOL)defaultUserInformation +{ + return ![[NSUserDefaults standardUserDefaults] boolForKey:kVVDDefaultUserInformation]; +} +-(void) setDefaultUserInformation:(BOOL)defaultUserInformation +{ + [[NSUserDefaults standardUserDefaults] setBool:!defaultUserInformation forKey:kVVDDefaultUserInformation]; + [[NSUserDefaults standardUserDefaults] synchronize]; +} + -(NSString *) spacesString { if ([self useSpaces]) { From d8e82049a128ef55c2b90be7c6b33916cf03d6ad Mon Sep 17 00:00:00 2001 From: adison Date: Fri, 12 Sep 2014 11:14:48 +0800 Subject: [PATCH 2/6] add Author Information field, Date Format String field and related methods (+1 squashed commit) Squashed commits: [fa916f4] fix typo --- .../Commenter/VVBaseCommenter.m | 54 ++- .../Setting/VVDSettingPanelWindowController.m | 38 ++- .../VVDSettingPanelWindowController.xib | 319 ++++++++++++++++-- .../Setting/VVDocumenterSetting.h | 7 +- .../Setting/VVDocumenterSetting.m | 49 ++- 5 files changed, 385 insertions(+), 82 deletions(-) diff --git a/VVDocumenter-Xcode/Commenter/VVBaseCommenter.m b/VVDocumenter-Xcode/Commenter/VVBaseCommenter.m index 7659120..4f045b7 100755 --- a/VVDocumenter-Xcode/Commenter/VVBaseCommenter.m +++ b/VVDocumenter-Xcode/Commenter/VVBaseCommenter.m @@ -31,12 +31,7 @@ -(instancetype) initWithIndentString:(NSString *)indent codeString:(NSString *)c } return self; } -/** - * Adison 14-09-10 14:09:18 - - * - * @return <#return value description#> - */ + -(NSString *) paramSymbol { return self.forSwift ? @":param:" : @"@param"; } @@ -45,31 +40,31 @@ -(NSString *) returnSymbol { return self.forSwift ? @":returns:" : @"@return"; } -/** - * @Author: Adison, 14-09-11 15:09:09 - * <#Description#> - * - * @return <#return value description#> - */ -(NSString *) startComment { NSString *descriptionTag = [[VVDocumenterSetting defaultSetting] briefDescription] && !self.forSwift ? @"@brief " : @""; NSString *authorInfo = @""; - if ([[VVDocumenterSetting defaultSetting] defaultUserInformation] && !self.forSwift) { - NSDateFormatter *formatter = [[NSDateFormatter alloc] init]; - [formatter setDateFormat:@"MM-dd-YYYY HH:MM:ss"]; - - NSString *author = @"Adison"; - - NSLog(@"%@", author); + if ([[VVDocumenterSetting defaultSetting] useAuthorInformation] && !self.forSwift) { - authorInfo = [NSString stringWithFormat:@"%@@Author %@, %@\n", + authorInfo = [NSString stringWithFormat:@"%@@Author %@", self.prefixString, - author, - [formatter stringFromDate:[NSDate date]] - ]; + [[VVDocumenterSetting defaultSetting] authorInformation]]; + + if ([[VVDocumenterSetting defaultSetting] useDateInformation]) { + NSString *formatString = [[VVDocumenterSetting defaultSetting] dateInformationFormat]; + if ([formatString length] <= 0) { + formatString = @"MM-dd-YYYY HH:MM:ss"; + } + NSDateFormatter *formatter = [[NSDateFormatter alloc] init]; + [formatter setDateFormat:formatString]; + + authorInfo = [NSString stringWithFormat:@"%@, %@", + authorInfo, + [formatter stringFromDate:[NSDate date]]]; + } + authorInfo = [NSString stringWithFormat:@"%@\n", authorInfo]; } if ([[VVDocumenterSetting defaultSetting] useHeaderDoc]) { @@ -80,12 +75,7 @@ -(NSString *) startComment return [NSString stringWithFormat:@"%@/**\n%@%@%@<#Description#>\n", self.indent, authorInfo, self.prefixString, descriptionTag]; } } -/** - * Adison 14-09-10 15:09:10 - - * - * @return <#return value description#> - */ + -(NSString *) argumentsComment { if (self.arguments.count == 0) @@ -126,12 +116,6 @@ -(NSString *) returnComment } } --(NSString *) defaultUserInformation -{ - - -} - -(NSString *) sinceComment { //It seems no since attribute for swift? Maybe I am wrong. diff --git a/VVDocumenter-Xcode/Setting/VVDSettingPanelWindowController.m b/VVDocumenter-Xcode/Setting/VVDSettingPanelWindowController.m index 14239f6..5421340 100644 --- a/VVDocumenter-Xcode/Setting/VVDSettingPanelWindowController.m +++ b/VVDocumenter-Xcode/Setting/VVDSettingPanelWindowController.m @@ -26,7 +26,11 @@ @interface VVDSettingPanelWindowController () @property (weak) IBOutlet NSButton *btnUseHeaderDoc; @property (weak) IBOutlet NSButton *btnBlankLinesBetweenSections; @property (weak) IBOutlet NSButton *btnAlightArgumentComments; -@property (weak) IBOutlet NSButton *btnDefaultUserInformation; +@property (weak) IBOutlet NSButton *btnUseAuthorInformation; +@property (weak) IBOutlet NSButton *btnUseDateInformation; +@property (weak) IBOutlet NSTextField *tfAuthoInformation; +@property (weak) IBOutlet NSTextField *tfDateInformaitonFormat; + @end @implementation VVDSettingPanelWindowController @@ -54,7 +58,10 @@ - (void)windowDidLoad self.btnUseHeaderDoc.state = (NSCellStateValue)[[VVDocumenterSetting defaultSetting] useHeaderDoc]; self.btnBlankLinesBetweenSections.state = (NSCellStateValue)[[VVDocumenterSetting defaultSetting] blankLinesBetweenSections]; self.btnAlightArgumentComments.state = (NSCellStateValue)[[VVDocumenterSetting defaultSetting] alignArgumentComments]; - self.btnDefaultUserInformation.state = (NSCellStateValue)[[VVDocumenterSetting defaultSetting] defaultUserInformation]; + self.btnUseAuthorInformation.state = (NSCellStateValue)[[VVDocumenterSetting defaultSetting] useAuthorInformation]; + self.tfAuthoInformation.stringValue = [[VVDocumenterSetting defaultSetting] authorInformation]; + self.btnUseDateInformation.state = (NSCellStateValue)[[VVDocumenterSetting defaultSetting] useDateInformation]; + self.tfDateInformaitonFormat.stringValue = [[VVDocumenterSetting defaultSetting] dateInformationFormat]; if ([[VVDocumenterSetting defaultSetting] prefixWithStar]) { [self.mtxPrefixOptions selectCell:self.btnPrefixWithStar]; @@ -73,6 +80,8 @@ - (void)windowDidLoad [self syncSpaceCount]; self.tfTrigger.delegate = self; + self.tfDateInformaitonFormat.delegate = self; + self.tfAuthoInformation.delegate = self; } - (IBAction)stepperPressed:(id)sender { @@ -91,7 +100,10 @@ - (IBAction)btnResetPressed:(id)sender { [[VVDocumenterSetting defaultSetting] setUseHeaderDoc:NO]; [[VVDocumenterSetting defaultSetting] setBlankLinesBetweenSections:YES]; [[VVDocumenterSetting defaultSetting] setAlignArgumentComments:YES]; - [[VVDocumenterSetting defaultSetting] setDefaultUserInformation:YES]; + [[VVDocumenterSetting defaultSetting] setUseAuthorInformation:NO]; + [[VVDocumenterSetting defaultSetting] setAuthorInformation:VVDDefaultAuthorString]; + [[VVDocumenterSetting defaultSetting] setUseDateInformation:NO]; + [[VVDocumenterSetting defaultSetting] setDateInformationFormat:VVDDefaultDateInfomationFormat]; self.btnUseSpaces.state = NSOnState; [self updateUseSpace:self.btnUseSpaces.state]; @@ -104,7 +116,11 @@ - (IBAction)btnResetPressed:(id)sender { self.btnUseHeaderDoc.state = NSOffState; self.btnBlankLinesBetweenSections.state = NSOnState; self.btnAlightArgumentComments.state = NSOnState; - + self.btnUseAuthorInformation.state = NSOffState; + self.tfAuthoInformation.stringValue = VVDDefaultAuthorString; + self.btnUseDateInformation.state = NSOffState; + self.tfDateInformaitonFormat.stringValue = VVDDefaultDateInfomationFormat; + self.btnPrefixWithSlashes.enabled = YES; [self syncSpaceCount]; @@ -131,8 +147,12 @@ - (IBAction)btnBriefDescriptionPressed:(id)sender { [[VVDocumenterSetting defaultSetting] setBriefDescription:self.btnBriefDescription.state]; } -- (IBAction)btnDefaultUserInformationPressed:(id)sender { - [[VVDocumenterSetting defaultSetting] setBriefDescription:self.btnDefaultUserInformation.state]; +- (IBAction)btnUseAuthorInformationPressed:(id)sender { + [[VVDocumenterSetting defaultSetting] setUseAuthorInformation:self.btnUseAuthorInformation.state]; +} + +- (IBAction)btnUseDateInformationPressed:(id)sender { + [[VVDocumenterSetting defaultSetting] setUseDateInformation:self.btnUseDateInformation.state]; } -(void) syncSpaceCount @@ -154,6 +174,12 @@ - (void)controlTextDidChange:(NSNotification *)notification if([notification object] == self.tfTrigger) { [[VVDocumenterSetting defaultSetting] setTriggerString:self.tfTrigger.stringValue]; } + if([notification object] == self.tfAuthoInformation) { + [[VVDocumenterSetting defaultSetting] setAuthorInformation:self.tfAuthoInformation.stringValue]; + } + if([notification object] == self.tfDateInformaitonFormat) { + [[VVDocumenterSetting defaultSetting] setDateInformationFormat:self.tfDateInformaitonFormat.stringValue]; + } } - (BOOL)control:(NSControl *)control textShouldEndEditing:(NSText *)fieldEditor diff --git a/VVDocumenter-Xcode/Setting/VVDSettingPanelWindowController.xib b/VVDocumenter-Xcode/Setting/VVDSettingPanelWindowController.xib index 908e0df..ae8f566 100644 --- a/VVDocumenter-Xcode/Setting/VVDSettingPanelWindowController.xib +++ b/VVDocumenter-Xcode/Setting/VVDSettingPanelWindowController.xib @@ -43,7 +43,7 @@ 3 2 - {{508, 391}, {460, 473}} + {{508, 391}, {463, 544}} 544735232 VVDocumenter Setting NSWindow @@ -56,7 +56,7 @@ 268 - {{67, 347}, {212, 35}} + {{67, 418}, {212, 35}} @@ -92,7 +92,7 @@ 268 - {{329, 356}, {60, 17}} + {{329, 427}, {60, 17}} @@ -130,7 +130,7 @@ 268 - {{279, 353}, {37, 22}} + {{279, 424}, {37, 22}} @@ -166,7 +166,7 @@ 268 - {{14, 19}, {113, 32}} + {{11, 38}, {113, 32}} @@ -191,7 +191,7 @@ 268 - {{66, 434}, {107, 17}} + {{66, 505}, {107, 17}} @@ -213,7 +213,7 @@ 268 - {{279, 431}, {96, 22}} + {{279, 502}, {96, 22}} @@ -233,10 +233,33 @@ NO 1 + + + 268 + {{149, 217}, {241, 22}} + + + + _NS:9 + YES + + -1804599231 + 71304192 + + + _NS:9 + + YES + + + + NO + 1 + 268 - {{78, 388}, {295, 38}} + {{78, 459}, {295, 38}} @@ -271,7 +294,7 @@ 268 - {{312, 350}, {19, 27}} + {{312, 421}, {19, 27}} @@ -291,7 +314,7 @@ 268 - {{67, 326}, {201, 18}} + {{67, 397}, {201, 18}} @@ -318,7 +341,7 @@ 268 - {{67, 296}, {187, 18}} + {{67, 367}, {187, 18}} @@ -345,7 +368,7 @@ 268 - {{67, 266}, {272, 18}} + {{67, 337}, {272, 18}} @@ -372,7 +395,7 @@ 268 - {{67, 238}, {272, 18}} + {{67, 309}, {272, 18}} @@ -399,7 +422,7 @@ 268 - {{68, 67}, {325, 85}} + {{65, 86}, {325, 85}} @@ -580,7 +603,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 12 - {{70, 158}, {323, 5}} + {{67, 177}, {323, 5}} @@ -605,7 +628,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{67, 206}, {272, 18}} + {{67, 277}, {272, 18}} @@ -632,10 +655,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{66, 174}, {272, 18}} + {{66, 245}, {213, 18}} - + _NS:9 YES @@ -656,8 +679,102 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO + + + 268 + {{83, 219}, {60, 17}} + + + + _NS:1535 + YES + + 68157504 + 272630784 + Author: + + _NS:1535 + + + + + NO + 1 + + + + 268 + {{225, 192}, {165, 22}} + + + + _NS:9 + YES + + -1804599231 + 4195328 + MM-dd-YYYY, HH:MM:ss + + _NS:9 + + YES + + + + NO + 1 + + + + 268 + {{83, 193}, {90, 18}} + + + + _NS:9 + YES + + -2080374784 + 268435456 + Add Date + + _NS:9 + + 1211912448 + 2 + + + + + 200 + 25 + + NO + + + + 268 + {{172, 194}, {59, 17}} + + + + _NS:1535 + YES + + 68157504 + 272630784 + Format: + + _NS:1535 + + + + + NO + 1 + - {460, 473} + {463, 544} @@ -863,20 +980,52 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 oHc-uk-ERk - - btnDefaultUserInformationPressed: + + btnUseAuthorInformation - 8q6-ME-BbL + Pqf-GX-Avo - btnDefaultUserInformation + btnUseDateInformation + + + + s02-Tx-jGJ + + + + tfAuthoInformation + + + + as9-qR-Eq1 + + + + btnUseAuthorInformationPressed: - FuE-aM-HNb + cAF-1d-3Wh + + + + btnUseDateInformationPressed: + + + + bKa-IH-b3m + + + + tfDateInformaitonFormat + + + + df2-hk-v5B @@ -937,10 +1086,15 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 + + + - + + + @@ -1163,6 +1317,71 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 + + zua-Qs-tG6 + + + + + + + + 3w5-ev-VuS + + + + + Haw-5R-IXR + + + + + + + + s2i-JB-wgP + + + + + b6P-6I-DiH + + + + + + + + y0w-1Y-908 + + + + + L0g-BX-Fh0 + + + + + + + + Krc-dg-Cog + + + + + whT-H5-Xdo + + + + + + + + To6-Zf-QbE + + + @@ -1188,6 +1407,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1197,18 +1417,27 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin @@ -1225,8 +1454,9 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 id id id - id id + id + id id id id @@ -1249,14 +1479,18 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 btnBriefDescriptionPressed: id - - btnDefaultUserInformationPressed: - id - btnResetPressed: id + + btnUseAuthorInformationPressed: + id + + + btnUseDateInformationPressed: + id + btnUseSpacesPressed: id @@ -1279,14 +1513,17 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NSButton NSButton NSButton - NSButton NSButtonCell NSButtonCell NSButtonCell + NSButton + NSButton NSButton NSButton NSMatrix NSStepper + NSTextField + NSTextField NSTextField NSTextField NSTextField @@ -1308,10 +1545,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 btnBriefDescription NSButton - - btnDefaultUserInformation - NSButton - btnPrefixWithSlashes NSButtonCell @@ -1324,6 +1557,14 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 btnPrefixWithWhitespace NSButtonCell + + btnUseAuthorInformation + NSButton + + + btnUseDateInformation + NSButton + btnUseHeaderDoc NSButton @@ -1340,6 +1581,14 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 stepperCount NSStepper + + tfAuthoInformation + NSTextField + + + tfDateInformaitonFormat + NSTextField + tfSpaceCount NSTextField diff --git a/VVDocumenter-Xcode/Setting/VVDocumenterSetting.h b/VVDocumenter-Xcode/Setting/VVDocumenterSetting.h index 6d5db43..a54731c 100644 --- a/VVDocumenter-Xcode/Setting/VVDocumenterSetting.h +++ b/VVDocumenter-Xcode/Setting/VVDocumenterSetting.h @@ -9,6 +9,8 @@ #import extern NSString *const VVDDefaultTriggerString; +extern NSString *const VVDDefaultAuthorString; +extern NSString *const VVDDefaultDateInfomationFormat; @interface VVDocumenterSetting : NSObject + (VVDocumenterSetting *)defaultSetting; @@ -24,6 +26,9 @@ extern NSString *const VVDDefaultTriggerString; @property BOOL useHeaderDoc; @property BOOL blankLinesBetweenSections; @property BOOL alignArgumentComments; -@property BOOL defaultUserInformation; +@property BOOL useAuthorInformation; +@property NSString *authorInformation; +@property BOOL useDateInformation; +@property NSString *dateInformationFormat; @property (readonly) NSString *spacesString; @end diff --git a/VVDocumenter-Xcode/Setting/VVDocumenterSetting.m b/VVDocumenter-Xcode/Setting/VVDocumenterSetting.m index 2ef19b0..8e634f9 100644 --- a/VVDocumenter-Xcode/Setting/VVDocumenterSetting.m +++ b/VVDocumenter-Xcode/Setting/VVDocumenterSetting.m @@ -10,6 +10,8 @@ #import NSString *const VVDDefaultTriggerString = @"///"; +NSString *const VVDDefaultAuthorString = @""; +NSString *const VVDDefaultDateInfomationFormat = @"YY-MM-dd HH:MM:ss"; NSString *const kVVDUseSpaces = @"com.onevcat.VVDocumenter.useSpaces"; NSString *const kVVDSpaceCount = @"com.onevcat.VVDocumenter.spaceCount"; @@ -21,7 +23,10 @@ NSString *const kVVDUserHeaderDoc = @"com.onevcat.VVDocumenter.useHeaderDoc"; NSString *const kVVDNoBlankLinesBetweenFields = @"com.onevcat.VVDocumenter.noBlankLinesBetweenFields"; NSString *const kVVDNoArgumentPadding = @"com.onevcat.VVDocumenter.noArgumentPadding"; -NSString *const kVVDDefaultUserInformation = @"com.onevcat.VVDocumenter.defaultUserInformation"; +NSString *const kVVDUseAuthorInformation = @"com.onevcat.VVDocumenter.useAuthorInformation"; +NSString *const kVVDAuthorInfomation = @"com.onevcat.VVDocumenter.authorInfomation"; +NSString *const kVVDUseDateInformation = @"com.onevcat.VVDocumenter.useDateInformation"; +NSString *const kVVDDateInformationFormat = @"com.onevcat.VVDocumenter.dateInformationFomat"; @implementation VVDocumenterSetting + (VVDocumenterSetting *)defaultSetting @@ -174,13 +179,47 @@ -(void) setAlignArgumentComments:(BOOL)alignArgumentComments [[NSUserDefaults standardUserDefaults] synchronize]; } --(BOOL)defaultUserInformation +-(BOOL)useAuthorInformation { - return ![[NSUserDefaults standardUserDefaults] boolForKey:kVVDDefaultUserInformation]; + return ![[NSUserDefaults standardUserDefaults] boolForKey:kVVDUseAuthorInformation]; } --(void) setDefaultUserInformation:(BOOL)defaultUserInformation +-(void) setUseAuthorInformation:(BOOL)useAuthorInformation { - [[NSUserDefaults standardUserDefaults] setBool:!defaultUserInformation forKey:kVVDDefaultUserInformation]; + [[NSUserDefaults standardUserDefaults] setBool:!useAuthorInformation forKey:kVVDUseAuthorInformation]; + [[NSUserDefaults standardUserDefaults] synchronize]; +} + +-(NSString *)authorInformation { + NSString *authorInformation = [[NSUserDefaults standardUserDefaults] objectForKey:kVVDAuthorInfomation]; + if (authorInformation == nil ) { + authorInformation = VVDDefaultAuthorString; + } + return authorInformation; +} +-(void)setAuthorInformation:(NSString *)authorInformation { + [[NSUserDefaults standardUserDefaults] setObject:authorInformation forKey:kVVDAuthorInfomation]; + [[NSUserDefaults standardUserDefaults] synchronize]; +} + +-(BOOL)useDateInformation +{ + return ![[NSUserDefaults standardUserDefaults] boolForKey:kVVDUseDateInformation]; +} +-(void) setUseDateInformation:(BOOL)useDateInformation +{ + [[NSUserDefaults standardUserDefaults] setBool:!useDateInformation forKey:kVVDUseDateInformation]; + [[NSUserDefaults standardUserDefaults] synchronize]; +} + +-(NSString *)dateInformationFormat { + NSString *formatString = [[NSUserDefaults standardUserDefaults] objectForKey:kVVDDateInformationFormat]; + if (formatString == nil || formatString.length <= 0) { + formatString = VVDDefaultDateInfomationFormat; + } + return formatString; +} +-(void)setDateInformationFormat:(NSString *)dateInformationFormat { + [[NSUserDefaults standardUserDefaults] setObject:dateInformationFormat forKey:kVVDDateInformationFormat]; [[NSUserDefaults standardUserDefaults] synchronize]; } From f28ec78e4e7b95ebc66ad46d5b37682b1cf9e71f Mon Sep 17 00:00:00 2001 From: adison Date: Fri, 12 Sep 2014 14:04:26 +0800 Subject: [PATCH 3/6] refine the author content: add comma only when author name exists --- VVDocumenter-Xcode/Commenter/VVBaseCommenter.m | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/VVDocumenter-Xcode/Commenter/VVBaseCommenter.m b/VVDocumenter-Xcode/Commenter/VVBaseCommenter.m index 4f045b7..b869656 100755 --- a/VVDocumenter-Xcode/Commenter/VVBaseCommenter.m +++ b/VVDocumenter-Xcode/Commenter/VVBaseCommenter.m @@ -48,9 +48,14 @@ -(NSString *) startComment NSString *authorInfo = @""; if ([[VVDocumenterSetting defaultSetting] useAuthorInformation] && !self.forSwift) { - authorInfo = [NSString stringWithFormat:@"%@@Author %@", - self.prefixString, - [[VVDocumenterSetting defaultSetting] authorInformation]]; + authorInfo = [NSString stringWithFormat:@"%@@Author", + self.prefixString]; + + if ([[VVDocumenterSetting defaultSetting] authorInformation].length > 0) { + authorInfo = [NSString stringWithFormat:@"%@ %@,", + self.prefixString, + [[VVDocumenterSetting defaultSetting] authorInformation]]; + } if ([[VVDocumenterSetting defaultSetting] useDateInformation]) { NSString *formatString = [[VVDocumenterSetting defaultSetting] dateInformationFormat]; @@ -60,7 +65,7 @@ -(NSString *) startComment NSDateFormatter *formatter = [[NSDateFormatter alloc] init]; [formatter setDateFormat:formatString]; - authorInfo = [NSString stringWithFormat:@"%@, %@", + authorInfo = [NSString stringWithFormat:@"%@ %@", authorInfo, [formatter stringFromDate:[NSDate date]]]; } From da469755cb9d3e12f99a2bc5e64c40c329c3ab81 Mon Sep 17 00:00:00 2001 From: adison Date: Fri, 12 Sep 2014 20:06:36 +0800 Subject: [PATCH 4/6] temp --- VVDocumenter-Xcode/Commenter/VVBaseCommenter.m | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/VVDocumenter-Xcode/Commenter/VVBaseCommenter.m b/VVDocumenter-Xcode/Commenter/VVBaseCommenter.m index b869656..e16dd00 100755 --- a/VVDocumenter-Xcode/Commenter/VVBaseCommenter.m +++ b/VVDocumenter-Xcode/Commenter/VVBaseCommenter.m @@ -46,17 +46,16 @@ -(NSString *) startComment [[VVDocumenterSetting defaultSetting] briefDescription] && !self.forSwift ? @"@brief " : @""; NSString *authorInfo = @""; + if ([[VVDocumenterSetting defaultSetting] useAuthorInformation] && !self.forSwift) { - authorInfo = [NSString stringWithFormat:@"%@@Author", self.prefixString]; + NSMutableString *authorCotent = @"".mutableCopy; if ([[VVDocumenterSetting defaultSetting] authorInformation].length > 0) { - authorInfo = [NSString stringWithFormat:@"%@ %@,", - self.prefixString, - [[VVDocumenterSetting defaultSetting] authorInformation]]; + [authorCotent appendString:[[VVDocumenterSetting defaultSetting] authorInformation]]; } - + if ([[VVDocumenterSetting defaultSetting] useDateInformation]) { NSString *formatString = [[VVDocumenterSetting defaultSetting] dateInformationFormat]; if ([formatString length] <= 0) { @@ -65,9 +64,10 @@ -(NSString *) startComment NSDateFormatter *formatter = [[NSDateFormatter alloc] init]; [formatter setDateFormat:formatString]; - authorInfo = [NSString stringWithFormat:@"%@ %@", - authorInfo, - [formatter stringFromDate:[NSDate date]]]; + if (authorCotent.length > 0) { + [authorCotent appendString:@", "]; + } + [authorCotent appendString:[formatter stringFromDate:[NSDate date]]]; } authorInfo = [NSString stringWithFormat:@"%@\n", authorInfo]; } From bf36eddd0a5c2cf845ae47b7b41f297b3ca3c251 Mon Sep 17 00:00:00 2001 From: adison Date: Fri, 12 Sep 2014 20:06:36 +0800 Subject: [PATCH 5/6] fix author information property method (+1 squashed commit) Squashed commits: [3470b91] refine the author information format (+1 squashed commit) Squashed commits: [da46975] temp --- VVDocumenter-Xcode/Commenter/VVBaseCommenter.m | 9 ++++----- VVDocumenter-Xcode/Setting/VVDocumenterSetting.m | 8 ++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/VVDocumenter-Xcode/Commenter/VVBaseCommenter.m b/VVDocumenter-Xcode/Commenter/VVBaseCommenter.m index e16dd00..3ab4cb0 100755 --- a/VVDocumenter-Xcode/Commenter/VVBaseCommenter.m +++ b/VVDocumenter-Xcode/Commenter/VVBaseCommenter.m @@ -48,8 +48,6 @@ -(NSString *) startComment NSString *authorInfo = @""; if ([[VVDocumenterSetting defaultSetting] useAuthorInformation] && !self.forSwift) { - authorInfo = [NSString stringWithFormat:@"%@@Author", - self.prefixString]; NSMutableString *authorCotent = @"".mutableCopy; if ([[VVDocumenterSetting defaultSetting] authorInformation].length > 0) { @@ -69,13 +67,14 @@ -(NSString *) startComment } [authorCotent appendString:[formatter stringFromDate:[NSDate date]]]; } - authorInfo = [NSString stringWithFormat:@"%@\n", authorInfo]; + + authorInfo = [NSString stringWithFormat:@"%@@Author %@\n%@\n", self.prefixString, authorCotent, self.prefixString]; } if ([[VVDocumenterSetting defaultSetting] useHeaderDoc]) { - return [NSString stringWithFormat:@"%@/*!\n%@%@<#Description#>\n", self.indent, self.prefixString, descriptionTag]; + return [NSString stringWithFormat:@"%@/*!\n%@%@%@<#Description#>\n", self.indent, authorInfo, self.prefixString, descriptionTag]; } else if ([[VVDocumenterSetting defaultSetting] prefixWithSlashes]) { - return [NSString stringWithFormat:@"%@%@<#Description#>\n", self.prefixString, descriptionTag]; + return [NSString stringWithFormat:@"%@%@%@<#Description#>\n", self.prefixString, authorInfo, descriptionTag]; } else { return [NSString stringWithFormat:@"%@/**\n%@%@%@<#Description#>\n", self.indent, authorInfo, self.prefixString, descriptionTag]; } diff --git a/VVDocumenter-Xcode/Setting/VVDocumenterSetting.m b/VVDocumenter-Xcode/Setting/VVDocumenterSetting.m index 8e634f9..b2508ae 100644 --- a/VVDocumenter-Xcode/Setting/VVDocumenterSetting.m +++ b/VVDocumenter-Xcode/Setting/VVDocumenterSetting.m @@ -181,11 +181,11 @@ -(void) setAlignArgumentComments:(BOOL)alignArgumentComments -(BOOL)useAuthorInformation { - return ![[NSUserDefaults standardUserDefaults] boolForKey:kVVDUseAuthorInformation]; + return [[NSUserDefaults standardUserDefaults] boolForKey:kVVDUseAuthorInformation]; } -(void) setUseAuthorInformation:(BOOL)useAuthorInformation { - [[NSUserDefaults standardUserDefaults] setBool:!useAuthorInformation forKey:kVVDUseAuthorInformation]; + [[NSUserDefaults standardUserDefaults] setBool:useAuthorInformation forKey:kVVDUseAuthorInformation]; [[NSUserDefaults standardUserDefaults] synchronize]; } @@ -203,11 +203,11 @@ -(void)setAuthorInformation:(NSString *)authorInformation { -(BOOL)useDateInformation { - return ![[NSUserDefaults standardUserDefaults] boolForKey:kVVDUseDateInformation]; + return [[NSUserDefaults standardUserDefaults] boolForKey:kVVDUseDateInformation]; } -(void) setUseDateInformation:(BOOL)useDateInformation { - [[NSUserDefaults standardUserDefaults] setBool:!useDateInformation forKey:kVVDUseDateInformation]; + [[NSUserDefaults standardUserDefaults] setBool:useDateInformation forKey:kVVDUseDateInformation]; [[NSUserDefaults standardUserDefaults] synchronize]; } From 4d3064d92bf67e174174fe5a98b1138c85494144 Mon Sep 17 00:00:00 2001 From: onevcat Date: Sat, 20 Sep 2014 00:49:48 +0900 Subject: [PATCH 6/6] Fix a warning in xib and add objc only --- .../VVDSettingPanelWindowController.xib | 243 +++++++++++++++--- 1 file changed, 205 insertions(+), 38 deletions(-) diff --git a/VVDocumenter-Xcode/Setting/VVDSettingPanelWindowController.xib b/VVDocumenter-Xcode/Setting/VVDSettingPanelWindowController.xib index ae8f566..af7354c 100644 --- a/VVDocumenter-Xcode/Setting/VVDSettingPanelWindowController.xib +++ b/VVDocumenter-Xcode/Setting/VVDSettingPanelWindowController.xib @@ -2,13 +2,13 @@ 1080 - 13E28 - 5056 - 1265.21 - 698.00 + 14A361c + 6245 + 1339 + 755.00 com.apple.InterfaceBuilder.CocoaPlugin - 5056 + 6245 NSBox @@ -43,7 +43,7 @@ 3 2 - {{508, 391}, {463, 544}} + {{508, 391}, {463, 519}} 544735232 VVDocumenter Setting NSWindow @@ -56,7 +56,7 @@ 268 - {{67, 418}, {212, 35}} + {{67, 393}, {212, 35}} @@ -67,7 +67,7 @@ 268435456 Use spaces instead of tabs - .LucidaGrandeUI + YES 13 1044 @@ -92,7 +92,7 @@ 268 - {{329, 427}, {60, 17}} + {{329, 402}, {60, 17}} @@ -130,7 +130,7 @@ 268 - {{279, 424}, {37, 22}} + {{279, 399}, {37, 22}} @@ -166,7 +166,7 @@ 268 - {{11, 38}, {113, 32}} + {{11, 13}, {113, 32}} @@ -191,7 +191,7 @@ 268 - {{66, 505}, {107, 17}} + {{66, 480}, {107, 17}} @@ -213,7 +213,7 @@ 268 - {{279, 502}, {96, 22}} + {{279, 477}, {96, 22}} @@ -236,7 +236,7 @@ 268 - {{149, 217}, {241, 22}} + {{149, 192}, {241, 22}} @@ -259,7 +259,7 @@ 268 - {{78, 459}, {295, 38}} + {{78, 434}, {295, 38}} @@ -270,9 +270,9 @@ 272629760 VVDocumenter will inspect the input and insert document comment when it matches this. - LucidaGrande + YES 12 - 16 + 4883 _NS:1535 @@ -294,7 +294,7 @@ 268 - {{312, 421}, {19, 27}} + {{312, 396}, {19, 27}} @@ -314,7 +314,7 @@ 268 - {{67, 397}, {201, 18}} + {{67, 372}, {201, 18}} @@ -341,7 +341,7 @@ 268 - {{67, 367}, {187, 18}} + {{67, 342}, {187, 18}} @@ -368,7 +368,7 @@ 268 - {{67, 337}, {272, 18}} + {{67, 312}, {272, 18}} @@ -395,7 +395,7 @@ 268 - {{67, 309}, {272, 18}} + {{67, 284}, {272, 18}} @@ -422,7 +422,7 @@ 268 - {{65, 86}, {325, 85}} + {{65, 61}, {325, 85}} @@ -452,7 +452,7 @@ -2080374784 0 - Prefix each comment line with a star + Prefix each comment line with a star (objc only) 2 @@ -603,7 +603,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 12 - {{67, 177}, {323, 5}} + {{67, 152}, {323, 5}} @@ -616,8 +616,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 - 3 - MCAwLjgwMDAwMDAxMTkAA + 6 + System + labelColor + 3 @@ -628,7 +630,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{67, 277}, {272, 18}} + {{67, 252}, {272, 18}} @@ -655,7 +657,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{66, 245}, {213, 18}} + {{66, 217}, {326, 24}} @@ -664,7 +666,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 -2080374784 268435456 - Add Default User Informaiton + Add Default User Informaiton (objc only) _NS:9 @@ -682,7 +684,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{83, 219}, {60, 17}} + {{83, 194}, {60, 17}} @@ -704,7 +706,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{225, 192}, {165, 22}} + {{225, 167}, {165, 22}} @@ -727,7 +729,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{83, 193}, {90, 18}} + {{83, 168}, {90, 18}} @@ -754,7 +756,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{172, 194}, {59, 17}} + {{172, 169}, {59, 17}} @@ -774,19 +776,19 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1 - {463, 544} + {463, 519} - {{0, 0}, {1440, 878}} + {{0, 0}, {1680, 1027}} {10000000000000, 10000000000000} YES NO - + window @@ -1390,6 +1392,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin + {424.5, 462.5} com.apple.InterfaceBuilder.CocoaPlugin {{357, 418}, {480, 270}} @@ -1449,6 +1452,13 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 VVDSettingPanelWindowController NSWindowController + + IBProjectSource + ../VVDocumenter-Xcode/Setting/VVDSettingPanelWindowController.h + + + + VVDSettingPanelWindowController id id @@ -1604,7 +1614,164 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 IBProjectSource - ./Classes/VVDSettingPanelWindowController.h + ../VVDocumenter-Xcode/Setting/VVDSettingPanelWindowController.m + + + + + + NSActionCell + NSCell + + IBFrameworkSource + AppKit.framework/Headers/NSActionCell.h + + + + NSApplication + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSApplication.h + + + + NSBox + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSBox.h + + + + NSButton + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSButton.h + + + + NSButtonCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSButtonCell.h + + + + NSCell + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSCell.h + + + + NSControl + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSControl.h + + + + NSFormatter + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFormatter.h + + + + NSMatrix + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSMatrix.h + + + + NSMenu + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSMenu.h + + + + NSResponder + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSResponder.h + + + + NSStepper + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSStepper.h + + + + NSStepperCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSStepperCell.h + + + + NSTextField + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSTextField.h + + + + NSTextFieldCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSTextFieldCell.h + + + + NSView + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSView.h + + + + NSWindow + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSWindow.h + + + + NSWindowController + NSResponder + + showWindow: + id + + + showWindow: + + showWindow: + id + + + + IBFrameworkSource + AppKit.framework/Headers/NSWindowController.h