Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Same as in Master, not as serious as it looks

fixes Find… highlighting, improves the "manage text width" bit, and
gets rid of a lot of crusty comments and nslogs
  • Loading branch information...
commit 92ebdde6c63258608f51069a7da270136b599c15 1 parent ee36618
@elasticthreads elasticthreads authored
View
5 AppController.h
@@ -109,6 +109,7 @@
BOOL isCreatingANote;
NSString *typedString;
NSArray *cTags;
+ BOOL isEditing;
NoteObject *currentNote;
NSArray *savedSelectedNotes;
@@ -124,6 +125,8 @@
NSInteger currentPreviewMode;
}
+@property(readwrite)BOOL isEditing;
+
void outletObjectAwoke(id sender);
- (void)setNotationController:(NotationController*)newNotation;
@@ -178,7 +181,6 @@ void outletObjectAwoke(id sender);
//elasticwork
//- (void)setIsEditing:(BOOL)inBool inCell:(NSCell *)theCell;
-- (void)setIsEditing:(BOOL)inBool;
//- (void)focusOnCtrlFld:(id)sender;
- (void)tableView:(NSTableView *)aTableView willDisplayCell:(id)aCell forTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex;
- (NSMenu *)statBarMenu;
@@ -232,6 +234,7 @@ void outletObjectAwoke(id sender);
- (void)showDockIcon;
- (void)reActivate:(id)sender;
- (void)toggleStatusItem:(NSNotification *)notification;
+//- (IBAction)testThing:(id)sender;
- (void)setUpStatusBarItem;
- (NSArray *)referenceLinksInString:(NSString *)contentString;
- (IBAction)testThing:(id)sender;
View
145 AppController.m
@@ -65,10 +65,12 @@
int ModFlagger;
int popped;
BOOL splitViewAwoke;
-BOOL isEd;
+
@implementation AppController
+@synthesize isEditing;
+
//an instance of this class is designated in the nib as the delegate of the window, nstextfield and two nstextviews
/*
+ (void)initialize
@@ -137,12 +139,12 @@ - (id)init {
dividerShader = [[[LinearDividerShader alloc] initWithBaseColors:self] retain];
isCreatingANote = isFilteringFromTyping = typedStringIsCached = NO;
typedString = @"";
+ self.isEditing=NO;
}
return self;
}
- (void)awakeFromNib {
- // NSLog(@"awake");
theFieldEditor = [[[NSTextView alloc]initWithFrame:[window frame]] retain];
[theFieldEditor setFieldEditor:YES];
// [theFieldEditor setDelegate:self];
@@ -241,7 +243,6 @@ - (void)awakeFromNib {
//really need make AppController a subclass of NSWindowController and stick this junk in windowDidLoad
- (void)setupViewsAfterAppAwakened {
static BOOL awakenedViews = NO;
- isEd = NO;
if (!awakenedViews) {
//NSLog(@"all (hopefully relevant) views awakend!");
[self _configureDividerForCurrentLayout];
@@ -398,21 +399,17 @@ - (void)runDelayedUIActionsAfterLaunch {
}
+// self.isEditing=NO;
- // NSLog(@"hia");
// [NSApp activateIgnoringOtherApps:NO];
// [window makeKeyAndOrderFront:self];
}
-
-- (void)applicationWillFinishLaunching:(NSNotification *)aNotification{
-
-
- // NSLog(@"will finish");
-
- // NSLog(@"will finish :>%@< withObjecT",[[aNotification object] description]);
-}
+//
+//- (void)applicationWillFinishLaunching:(NSNotification *)aNotification{
+//
+//}
- (void)applicationDidFinishLaunching:(NSNotification*)aNote {
@@ -748,7 +745,7 @@ - (void)_forceRegeneratePreviewsForTitleColumn {
- (void)_configureDividerForCurrentLayout {
- isEd = NO;
+ self.isEditing = NO;
BOOL horiz = [prefsController horizontalLayout];
if ([notesSubview isCollapsed]) {
[notesSubview expand];
@@ -817,7 +814,7 @@ - (IBAction)renameNote:(id)sender {
[self toggleCollapse:sender];
}
//edit the first selected note
- isEd = YES;
+ self.isEditing = YES;
[notesTableView editRowAtColumnWithIdentifier:NoteTitleColumnString];
}
@@ -964,7 +961,7 @@ - (IBAction)tagNote:(id)sender {
NSLog(@"multitag excep this: %@",[e name]);
}
} else if ([indexes count] == 1) {
- isEd = YES;
+ self.isEditing = YES;
[notesTableView editRowAtColumnWithIdentifier:NoteLabelsColumnString];
}
}
@@ -1069,7 +1066,6 @@ - (void)settingChangedForSelectorString:(NSString*)selectorString {
}
- (void)tableView:(NSTableView *)tableView didClickTableColumn:(NSTableColumn *)tableColumn {
- // NSLog(@"dickclicktablecol");
if (tableView == notesTableView) {
//this sets global prefs options, which ultimately calls back to us
[notesTableView setStatusForSortedColumn:tableColumn];
@@ -1197,16 +1193,12 @@ - (void)cancelOperation:(id)sender {
}
}
-//- (BOOL)textView:(NSTextView *)aTextView doCommandBySelector:(SEL)aSelector{
-// NSLog(@"AtextView:%@ doCommand:%@",[aTextView description],NSStringFromSelector(aSelector));
-// return NO;
-//}
+
- (BOOL)control:(NSControl *)control textView:(NSTextView *)aTextView doCommandBySelector:(SEL)command {
- // NSLog(@"BtextView:%@ doCommand:%@",[aTextView description],NSStringFromSelector(command));
if (control == (NSControl*)field) {
- isEd=NO;
+ self.isEditing=NO;
//backwards-searching is slow enough as it is, so why not just check this first?
if (command == @selector(deleteBackward:))
return NO;
@@ -1300,8 +1292,7 @@ - (BOOL)control:(NSControl *)control textView:(NSTextView *)aTextView doCommandB
if (command == @selector(insertNewline:)) {
//hit return in cell
- //NSLog(@"herehere");
- isEd=NO;
+ self.isEditing=NO;
[window makeFirstResponder:textView];
return YES;
}
@@ -1336,7 +1327,7 @@ - (BOOL)control:(NSControl *)control textView:(NSTextView *)aTextView doCommandB
} else{
NSLog(@"%@/%@ got %@", [control description], [aTextView description], NSStringFromSelector(command));
- isEd=NO;
+ self.isEditing=NO;
}
return NO;
@@ -1489,7 +1480,9 @@ - (void)controlTextDidChange:(NSNotification *)aNotification {
- (void)tableViewSelectionIsChanging:(NSNotification *)aNotification {
-
+ if (IsLionOrLater) {
+ [[NSNotificationCenter defaultCenter] postNotificationName:@"TextFindContextShouldReset" object:self];
+ }
BOOL allowMultipleSelection = NO;
NSEvent *event = [window currentEvent];
@@ -1530,9 +1523,9 @@ - (void)setTableAllowsMultipleSelection {
- (void)tableViewSelectionDidChange:(NSNotification *)aNotification {
if (IsLionOrLater) {
- [[NSNotificationCenter defaultCenter] postNotificationName:@"TextFindContextDidChange" object:self];
+ [[NSNotificationCenter defaultCenter] postNotificationName:@"TextFindContextShouldUpdate" object:self];
}
- isEd = NO;
+ self.isEditing = NO;
NSEventType type = [[window currentEvent] type];
if (type != NSKeyDown && type != NSKeyUp) {
[self performSelector:@selector(setTableAllowsMultipleSelection) withObject:nil afterDelay:0];
@@ -1731,10 +1724,12 @@ - (void)textDidChange:(NSNotification *)aNotification {
[currentNote setContentString:[textView textStorage]];
[self postTextUpdate];
[self updateWordCount:(![prefsController showWordCount])];
+ if (IsLionOrLater) {
+ [[NSNotificationCenter defaultCenter] postNotificationName:@"TextFindContextShouldUpdate" object:self];
+ }
}
- if (IsLionOrLater) {
- [[NSNotificationCenter defaultCenter] postNotificationName:@"TextFindContextDidChange" object:self];
- }
+
+
}
- (void)textDidBeginEditing:(NSNotification *)aNotification {
@@ -1746,17 +1741,25 @@ - (void)textDidBeginEditing:(NSNotification *)aNotification {
}*/
}
+- (BOOL)textShouldBeginEditing:(NSText *)aTextObject {
+ if (IsLionOrLater) {
+ if (aTextObject==textView) {
+ [[NSNotificationCenter defaultCenter]postNotificationName:@"TextFindContextShouldNoteChanges" object:nil];
+
+ }else{
+
+ NSLog(@"not textview should begin with to:%@",[aTextObject description]);
+ }
+ }
+ return YES;
+
+}
+
/*
- (void)controlTextDidBeginEditing:(NSNotification *)aNotification{
NSLog(@"controltextdidbegin");
}
-
- - (void)textShouldBeginEditing:(NSNotification *)aNotification {
-
- NSLog(@"ntv textshould2");
-
- } */
-
+*/
- (void)textDidEndEditing:(NSNotification *)aNotification {
if ([aNotification object] == textView) {
//save last selection range for currentNote?
@@ -2331,7 +2334,7 @@ - (void)focusControlField:(id)sender activate:(BOOL)shouldActivate{
}
}
[self setEmptyViewState:currentNote == nil];
- isEd = NO;
+ self.isEditing = NO;
}
@@ -2351,15 +2354,12 @@ - (NSWindow*)window {
-- (void)setIsEditing:(BOOL)inBool{
- isEd = inBool;
-}
- (void)tableView:(NSTableView *)aTableView willDisplayCell:(id)aCell forTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex {
//NSUInteger rowInt = rowIndex;
if ([[notesTableView selectedRowIndexes] containsIndex:rowIndex]) {
- if (isEd) {
+ if (self.isEditing) {
[aCell setTextColor:foregrndColor];
}else{
[aCell setTextColor:[NSColor whiteColor]];
@@ -2545,7 +2545,6 @@ - (void)setDualFieldInView {
}
- (void)setDualFieldIsVisible:(BOOL)isVis{
- // NSLog(@"settin' df vis:%d",isVis);
if (isVis) {
[window setTitle:@"nvALT"];
if (currentNote)
@@ -2710,7 +2709,7 @@ - (IBAction)switchFullScreen:(id)sender
#endif
//@try {
- isEd = NO;
+ self.isEditing = NO;
NSResponder *currentResponder = [window firstResponder];
NSDictionary* options;
if (([[NSUserDefaults standardUserDefaults] boolForKey:@"ShowDockIcon"])&&(IsSnowLeopardOrLater)) {
@@ -2983,7 +2982,7 @@ - (void)updateFieldAttributes{
}
fieldAttributes = [[NSDictionary dictionaryWithObject:[textView _selectionColorForForegroundColor:foregrndColor backgroundColor:backgrndColor] forKey:NSBackgroundColorAttributeName] retain];
- if (isEd) {
+ if (self.isEditing) {
[theFieldEditor setDrawsBackground:NO];
// [theFieldEditor setBackgroundColor:backgrndColor];
[theFieldEditor setSelectedTextAttributes:fieldAttributes];
@@ -3069,32 +3068,10 @@ - (NSColor *)foregrndColor{
}
- (void)updateWordCount:(BOOL)doIt{
- //NSLog(@"updating wordcount");
- if (doIt) {
- /* NSArray *selRange = [textView selectedRanges];
- // NSLog(@"selRange is :%@",[selRange description]);
- int theCount = 0;
- if (([selRange count]>1)||([[selRange objectAtIndex:0] rangeValue].length>0)) {
- for (id aRange in selRange) {
- NSRange bRange = [aRange rangeValue];
- NSString *aStr = [[textView string] substringWithRange: bRange];
- if ([aStr length]>0) {
- aStr = [aStr stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
- if ([aStr length]>0) {
- for (id bStr in [aStr componentsSeparatedByCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]) {
- if ([bStr length]>0) {
- theCount += 1;
- }
- }
- }
- }
- }
- }else{*/
-
+ if (doIt) {
NSTextStorage *noteStorage = [textView textStorage];
- int theCount = [[noteStorage words] count];
-
- // }
+ NSUInteger theCount = [[noteStorage words] count];
+
if (theCount > 0) {
[wordCounter setStringValue:[[NSString stringWithFormat:@"%d", theCount] stringByAppendingString:@" words"]];
}else {
@@ -3104,7 +3081,6 @@ - (void)updateWordCount:(BOOL)doIt{
}
- (void)popWordCount:(BOOL)showIt{
- // NSUInteger testInt=NSFlagsChanged|NSMouseMoved|NSMouseEntered|NSMouseExited|NSScrollWheel;
NSUInteger curEv=[[NSApp currentEvent] type];
if ((curEv==NSFlagsChanged)||(curEv==NSMouseMoved)||(curEv==NSMouseEntered)||(curEv==NSMouseExited)||(curEv==NSScrollWheel)){
if (showIt) {
@@ -3121,9 +3097,6 @@ - (void)popWordCount:(BOOL)showIt{
}
}
}
- // else{
- // NSLog(@"not flagschanged on popWord:%lu",[[NSApp currentEvent] type]);
- // }
}
- (IBAction)toggleWordCount:(id)sender{
@@ -3149,8 +3122,6 @@ - (IBAction)toggleWordCount:(id)sender{
- (void)flagsChanged:(NSEvent *)theEvent{
- // if (ModFlagger>=0) {
- // NSLog(@"flagschanged :>%@<",theEvent);
if ((ModFlagger==0)&&(popped==0)&&([theEvent modifierFlags]&NSAlternateKeyMask)&&(([theEvent keyCode]==58)||([theEvent keyCode]==61))) { //option down&NSKeyDownMask
ModFlagger = 1;
modifierTimer = [[NSTimer scheduledTimerWithTimeInterval:1.2
@@ -3174,7 +3145,6 @@ - (void)flagsChanged:(NSEvent *)theEvent{
- (void)updateModifier:(NSTimer*)theTimer{
if ([theTimer isValid]) {
- // NSLog(@"updatemod modflag :>%d< popped:%d",ModFlagger,popped);
if((ModFlagger>0)&&(popped==0)){
if ([[theTimer userInfo] isEqualToString:@"option"]) {
[self popWordCount:YES];
@@ -3212,7 +3182,6 @@ - (void)resetModTimers:(NSNotification *)notification{
#pragma mark Preview-related and to be extracted into separate files
- (void)popPreview:(BOOL)showIt{
- // NSLog(@"current event is :%@",[[NSApp currentEvent] description]);
NSUInteger curEv=[[NSApp currentEvent] type];
if((curEv==NSFlagsChanged)||(curEv==NSMouseMoved)||(curEv==NSMouseEntered)||(curEv==NSMouseExited)||(curEv==NSScrollWheel)){
if ([previewToggler state]==0) {
@@ -3229,10 +3198,6 @@ - (void)popPreview:(BOOL)showIt{
}
}
}
- // else{
- //
- // NSLog(@"not flagschanged on popPre:%lu",[[NSApp currentEvent] type]);
- // }
}
@@ -3312,8 +3277,7 @@ - (IBAction)selectPreviewMode:(id)sender
- (id)windowWillReturnFieldEditor:(NSWindow *)sender toObject:(id)client{
- if (isEd) {
- // NSLog(@"window will return client is :%@",client);
+ if (self.isEditing) {
if (!fieldAttributes) {
[self updateFieldAttributes];
@@ -3359,12 +3323,7 @@ - (void)refreshNotesList
[notesTableView setNeedsDisplay:YES];
}
- - (BOOL)performKeyEquivalent:(NSEvent *)theEvent {
- NSLog(@"perform key AC");
- // [self resetModTimers];
- [[NSNotificationCenter defaultCenter] postNotificationName:@"ModTimersShouldReset" object:nil];
- return [super performKeyEquivalent:theEvent];
- }
+
#pragma mark toggleDock
- (void)togDockIcon:(NSNotification *)notification{
@@ -3454,7 +3413,7 @@ - (void)toggleStatusItem:(NSNotification *)notification{
#pragma mark NSPREDICATE TO FIND MARKDOWN REFERENCE LINKS
- - (IBAction)testThing:(id)sender{
+// - (IBAction)testThing:(id)sender{
// NSString *testString=@"not []http://sdfas as\n\not [][]\n not [](http://)\n a [a ref]: http://nytimes.com \n squirels [another ref]: http://google.com \n http://squarshit \n how's tthat http his lorem ipsum";
//
// NSArray *foundLinks=[self referenceLinksInString:testString];
@@ -3463,7 +3422,7 @@ - (IBAction)testThing:(id)sender{
// }else{
// NSLog(@"didn't find shit");
// }
- }
+// }
- (NSArray *)referenceLinksInString:(NSString *)contentString{
NSString *wildString = @"*[*]:*http*"; //This is where you define your match string.
View
30 DFView.m
@@ -62,35 +62,7 @@ - (void)setBackgroundColor:(NSColor *)inColor{
vColor = [NSColor colorWithCalibratedWhite:fWhite alpha:1.0f];
[vColor retain];
}
-//
-//- (void)mouseDown:(NSEvent*)anEvent {
-//
-// NSLog(@"dfview mouse down");
-// [[NSNotificationCenter defaultCenter] postNotificationName:@"ModTimersShouldReset" object:nil];
-//
-//
-// [super mouseDown:anEvent];
-//
-//}
-//
-//- (void)mouseUp:(NSEvent*)anEvent {
-//
-// NSLog(@"dfview mouseUp");
-// [[NSNotificationCenter defaultCenter] postNotificationName:@"ModTimersShouldReset" object:nil];
-//
-//
-// [super mouseUp:anEvent];
-//
-//}
-//
-//- (NSMenu *)menuForEvent:(NSEvent *)theEvent{
-// NSLog(@"dfview menuForEvent");
-// [[NSNotificationCenter defaultCenter] postNotificationName:@"ModTimersShouldReset" object:nil];
-//
-//
-// return [super menuForEvent:theEvent];
-//
-//}
+
@end
View
59 DualField.m
@@ -121,41 +121,6 @@ - (void)setShowsSnapbackButton:(BOOL)shouldShow {
}
}
-//- (void)mouseDown:(NSEvent*)anEvent {
-//
-// NSLog(@"dfc mouse down");
-// [[NSNotificationCenter defaultCenter] postNotificationName:@"ModTimersShouldReset" object:nil];
-//
-//
-// [super mouseDown:anEvent];
-//
-//}
-//
-//- (NSMenu *)menuForEvent:(NSEvent *)theEvent{
-// NSLog(@"dfc menuForEvent");
-// [[NSNotificationCenter defaultCenter] postNotificationName:@"ModTimersShouldReset" object:nil];
-//
-//
-// return [super menuForEvent:theEvent];
-//
-//}
-//
-//- (void)mouseUp:(NSEvent*)anEvent {
-//
-// NSLog(@"dfc mouse up");
-// [[NSNotificationCenter defaultCenter] postNotificationName:@"ModTimersShouldReset" object:nil];
-//
-//
-// [super mouseUp:anEvent];
-//
-//}
-
-//- (NSMenu *)menu{
-// NSLog(@"dfc menu");
-// [[NSNotificationCenter defaultCenter] postNotificationName:@"ModTimersShouldReset" object:nil];
-// return [super menu];
-//}
-
- (BOOL)handleMouseDown:(NSEvent *)theEvent {
DualField *controlView = (DualField *)[self controlView];
@@ -525,29 +490,7 @@ - (void)drawRect:(NSRect)rect {
//elasticwork
-//- (NSMenu *)menuForEvent:(NSEvent *)theEvent{
-// NSLog(@"df menuForEvent");
-// [[NSNotificationCenter defaultCenter] postNotificationName:@"ModTimersShouldReset" object:nil];
-//
-//
-// return [super menuForEvent:theEvent];
-//
-//}
-//
-//- (void)mouseUp:(NSEvent*)anEvent {
-//
-// NSLog(@"df mouse up");
-// [[NSNotificationCenter defaultCenter] postNotificationName:@"ModTimersShouldReset" object:nil];
-//
-// [super mouseUp:anEvent];
-//
-//}
-//
-//- (NSMenu *)menu{
-// NSLog(@"df menu");
-// [[NSNotificationCenter defaultCenter] postNotificationName:@"ModTimersShouldReset" object:nil];
-// return [super menu];
-//}
+
- (void)mouseDown:(NSEvent*)anEvent {
View
4 ETClipView.h
@@ -10,8 +10,10 @@
#define kTextMargins 50.0
@interface ETClipView : NSClipView{
+ BOOL managesTextWidth;
}
-- (void)clipWidthSettingChanged:(NSRect)frameRect;
+- (BOOL)clipWidthSettingChanged:(NSRect)frameRect;
+- (BOOL)clipRect:(NSRect *)clipRect forFrameRect:(NSRect)frameRect;
@end
View
87 ETClipView.m
@@ -8,6 +8,7 @@
#import "ETClipView.h"
#import "GlobalPrefs.h"
#import "AppController.h"
+#import "LinkingEditor.h"
@implementation ETClipView
@@ -15,6 +16,7 @@ @implementation ETClipView
- (id)initWithFrame:(NSRect)frameRect{
self = [super initWithFrame:frameRect];
if (self) {
+ managesTextWidth=[[GlobalPrefs defaultPrefs] managesTextWidthInWindow];
[[GlobalPrefs defaultPrefs] registerForSettingChange:@selector(setMaxNoteBodyWidth:sender:) withTarget:self];
[[GlobalPrefs defaultPrefs] registerForSettingChange:@selector(setManagesTextWidthInWindow:sender:) withTarget:self];
}
@@ -22,62 +24,65 @@ - (id)initWithFrame:(NSRect)frameRect{
}
//
--(void)setFrame:(NSRect)frameRect
-{
- if (([[NSApp delegate]isInFullScreen])||([[GlobalPrefs defaultPrefs] managesTextWidthInWindow])) {
- NSRect docRect = [[self documentView] frame];
- docRect.origin.x=0.0;
+-(void)setFrame:(NSRect)frameRect{
+ if (managesTextWidth||([[NSApp delegate]isInFullScreen])) {
if (frameRect.size.width!=[self frame].size.width) {
-
- // }
- // if (!NSEqualRects(frameRect, [self frame])) {
- // NSLog(@"not equal");
- CGFloat theMax=[[GlobalPrefs defaultPrefs] maxNoteBodyWidth]+(kTextMargins*2);
- if (frameRect.size.width>=(theMax+(kTextMargins/5))){
- CGFloat diff = fabs(frameRect.size.width-theMax);
- diff=round(diff/2);
- frameRect.origin.x=diff;
- frameRect.size.width=theMax;
+ NSRect clipRect;
+ NSRect docRect = [[self documentView] frame];
+ if ([self clipRect:&clipRect forFrameRect:frameRect]) {
+ frameRect=clipRect;
+ // docRect.origin.x=0.0;
docRect.size.width=frameRect.size.width;
- [[self documentView] setFrame:docRect];
+ // [[self documentView] setFrame:docRect];
+ [[self documentView] setConstrainedFrameSize:docRect.size];
+ }else if (docRect.size.width>[self frame].size.width){
+ // NSLog(@"problem");
+ docRect.size.width=[self frame].size.width;
+ [[self documentView] setConstrainedFrameSize:docRect.size];
}
}
}
[super setFrame:frameRect];
}
-
-- (void)settingChangedForSelectorString:(NSString*)selectorString{
- if (([selectorString isEqualToString:SEL_STR(setMaxNoteBodyWidth:sender:)])||([selectorString isEqualToString:SEL_STR(setManagesTextWidthInWindow:sender:)])){
- NSRect aRect=[[[self documentView]enclosingScrollView] frame];
- [self clipWidthSettingChanged:aRect];
+- (BOOL)clipRect:(NSRect *)clipRect forFrameRect:(NSRect)frameRect{
+ CGFloat theMax=[[GlobalPrefs defaultPrefs] maxNoteBodyWidth]+(kTextMargins*2);
+ if (frameRect.size.width>=(theMax+(kTextMargins/5))){
+ CGFloat diff = fabs(frameRect.size.width-theMax);
+ diff=round(diff/2);
+ frameRect.origin.x=diff;
+ frameRect.size.width=theMax;
+ *clipRect=frameRect;
+ return YES;
}
+ return NO;
}
-- (void)clipWidthSettingChanged:(NSRect)frameRect{
- if (([[NSApp delegate]isInFullScreen])||([[GlobalPrefs defaultPrefs] managesTextWidthInWindow])) {
+- (BOOL)clipWidthSettingChanged:(NSRect)frameRect{
+ NSRect clipRect;
+ if ([self clipRect:&clipRect forFrameRect:frameRect]) {
+ frameRect=clipRect;
NSRect docRect = [[self documentView] frame];
- docRect.origin.x=0.0;
- BOOL superIt=(frameRect.size.width!=[self frame].size.width);
-
- // }
- // if (!NSEqualRects(frameRect, [self frame])) {
- // NSLog(@"not equal");
- CGFloat theMax=[[GlobalPrefs defaultPrefs] maxNoteBodyWidth]+(kTextMargins*2);
- if (frameRect.size.width>=(theMax+(kTextMargins/5))){
- CGFloat diff = fabs(frameRect.size.width-theMax);
- diff=round(diff/2);
- frameRect.origin.x=diff;
- frameRect.size.width=theMax;
- docRect.size.width=frameRect.size.width;
- [[self documentView] setFrame:docRect];
- superIt=YES;
+ // docRect.origin.x=0.0;
+ docRect.size.width=frameRect.size.width;
+ [[self documentView] setConstrainedFrameSize:docRect.size];
+ // [[self documentView] setFrame:docRect];
+ [super setFrame:frameRect];
+ return YES;
+ }
+ return NO;
+}
+
+- (void)settingChangedForSelectorString:(NSString*)selectorString{
+ if (([selectorString isEqualToString:SEL_STR(setMaxNoteBodyWidth:sender:)])||([selectorString isEqualToString:SEL_STR(setManagesTextWidthInWindow:sender:)])){
+ if ([selectorString isEqualToString:SEL_STR(setManagesTextWidthInWindow:sender:)]) {
+ managesTextWidth=[[GlobalPrefs defaultPrefs] managesTextWidthInWindow];
+ [[self documentView] setManagesTextWidth:managesTextWidth];
}
- if(superIt){
- [super setFrame:frameRect];
+ if (!managesTextWidth||![self clipWidthSettingChanged:[self frame]]) {
+ [[self documentView]updateInset];
}
}
-
}
@end
View
30 ETContentView.m
@@ -20,32 +20,12 @@ @implementation ETContentView
// return self;
//}
//
-//- (void)dealloc
-//{
-// [super dealloc];
-//}
-
-//- (void)mouseUp:(NSEvent *)theEvent{
-// // [[NSApp delegate] resetModTimers];
-// NSLog(@"etcontent mouseup");
-// [[NSNotificationCenter defaultCenter] postNotificationName:@"ModTimersShouldReset" object:nil];
-// [super mouseUp:theEvent];
-//}
-//
-//- (void)mouseDown:(NSEvent *)theEvent{
-// // [[NSApp delegate] resetModTimers];
-// NSLog(@"etcontent mousedown");
-// [[NSNotificationCenter defaultCenter] postNotificationName:@"ModTimersShouldReset" object:nil];
-// [super mouseDown:theEvent];
-//}
+- (void)dealloc
+{
+ [backColor release];
+ [super dealloc];
+}
-//- (void)keyDown:(NSEvent *)theEvent{
-// // NSLog(@"keydownCV");
-//// [[NSApp delegate] resetModTimers];
-// [[NSNotificationCenter defaultCenter] postNotificationName:@"ModTimersShouldReset" object:nil];
-// [super keyDown:theEvent];
-// // [super interpretKeyEvents:[NSArray arrayWithObject:theEvent]];
-//}
- (void)drawRect:(NSRect)dirtyRect
{
View
19 ETScrollView.m
@@ -12,10 +12,6 @@
@implementation ETScrollView
-//+ (void)initialize{
-//
-//// NSLog(@"etscroll initialize");
-//}
- (NSView *)hitTest:(NSPoint)aPoint{
if([[[self documentView]className] isEqualToString:@"LinkingEditor"]){
@@ -39,20 +35,7 @@ - (NSView *)hitTest:(NSPoint)aPoint{
}
return [super hitTest:aPoint];
}
-//
-//- (void)mouseDown:(NSEvent *)theEvent{
-// // [[NSApp delegate] resetModTimers];
-// NSLog(@"etscroll mousedown");
-// [[NSNotificationCenter defaultCenter] postNotificationName:@"ModTimersShouldReset" object:nil];
-// [super mouseDown:theEvent];
-//}
-//
-//- (void)mouseUp:(NSEvent *)theEvent{
-// // [[NSApp delegate] resetModTimers];
-// NSLog(@"etscroll mouseup");
-// [[NSNotificationCenter defaultCenter] postNotificationName:@"ModTimersShouldReset" object:nil];
-// [super mouseUp:theEvent];
-//}
+
//- (void)setScrollerClassWithString:(NSString *)scrollerClassName{
// scrollerClass=NSClassFromString(scrollerClassName);
View
20 ETTransparentScroller.m
@@ -140,29 +140,11 @@ - (void)drawKnob;
// return [self rectForPart:aPart];
//}
-//- (NSScrollerPart)testPart:(NSPoint)aPoint{
-// NSScrollerPart aPart=[super testPart:aPoint];
-// if (aPart==NSScrollerKnobSlot) {
-// NSLog(@"super found knobslot");
-// }else if (aPart==NSScrollerKnob) {
-// NSLog(@"super found knob");
-// }else{
-// NSLog(@"suer found else:%lu",aPart);
-// }
-// if (NSPointInRect(aPoint, [self rectForPart:NSScrollerKnob])) {
-// NSLog(@"knob");
-// }else if (NSPointInRect(aPoint, [self rectForPart:NSScrollerKnobSlot])) {
-// NSLog(@"knobsliot");
-// return NSScrollerKnobSlot;
-// }
-// NSLog(@"aqui");
-// return NSScrollerNoPart;
-//}
+
//- (void)trackKnob:(NSEvent *)theEvent{
// NSPoint aPoint=[theEvent locationInWindow];
// NSScrollerPart aPart=[super testPart:aPoint];
-// NSLog(@"trackThis :>%lu<",aPart);
// [super trackKnob:theEvent];
//}
View
39 English.lproj/MainMenu.xib
@@ -2024,7 +2024,7 @@
<bool key="NSSharedInstance">YES</bool>
</object>
<object class="NSScrollView" id="26511639">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSClipView" id="572834572">
@@ -2055,7 +2055,8 @@
</set>
<string key="NSFrameSize">{399, 304}</string>
<reference key="NSSuperview" ref="572834572"/>
- <reference key="NSNextKeyView" ref="965568530"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="540470833"/>
<object class="NSTextContainer" key="NSTextContainer" id="721568932">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
@@ -2112,6 +2113,7 @@
</array>
<string key="NSFrameSize">{399, 304}</string>
<reference key="NSSuperview" ref="26511639"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="633888970"/>
<reference key="NSDocView" ref="633888970"/>
<object class="NSColor" key="NSBGColor">
@@ -2148,6 +2150,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<int key="NSvFlags">-2147479296</int>
<string key="NSFrame">{{384, 0}, {15, 304}}</string>
<reference key="NSSuperview" ref="26511639"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSArrowsLoc">2</int>
<reference key="NSTarget" ref="26511639"/>
@@ -2159,6 +2163,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<int key="NSvFlags">-2147479296</int>
<string key="NSFrame">{{-100, -100}, {384, 15}}</string>
<reference key="NSSuperview" ref="26511639"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="572834572"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int>
@@ -2170,7 +2175,9 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</object>
</array>
<string key="NSFrameSize">{399, 304}</string>
- <reference key="NSNextKeyView" ref="572834572"/>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="965568530"/>
<int key="NSsFlags">133648</int>
<reference key="NSVScroller" ref="540470833"/>
<reference key="NSHScroller" ref="965568530"/>
@@ -3180,14 +3187,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
- <string key="label">testThing:</string>
- <reference key="source" ref="464328210"/>
- <reference key="destination" ref="742683714"/>
- </object>
- <int key="connectionID">1384</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
<string key="label">togglePreview:</string>
<reference key="source" ref="464328210"/>
<reference key="destination" ref="516880425"/>
@@ -5651,6 +5650,24 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">WebView</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">reloadFromOrigin:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">reloadFromOrigin:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">reloadFromOrigin:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/WebView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">WordCountToken</string>
<string key="superclassName">NSTokenField</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
View
2  GlobalPrefs.m
@@ -647,7 +647,6 @@ - (NSDictionary*)noteBodyAttributes {
NSColor *fgColor = [[NSApp delegate] foregrndColor];
if (!ColorsEqualWith8BitChannels([NSColor blackColor], fgColor)) {
- // NSLog(@"golly1");
[attrs setObject:fgColor forKey:NSForegroundColorAttributeName];
}
// background text color is handled directly by the NSTextView subclass and so does not need to be stored here
@@ -667,7 +666,6 @@ - (NSDictionary*)noteBodyAttributes {
NSColor *fgColor = [[NSApp delegate] foregrndColor];
// if (!ColorsEqualWith8BitChannels([NSColor blackColor], fgColor)) {
- //NSLog(@"golly122");
[attrs setObject:fgColor forKey:NSForegroundColorAttributeName];
noteBodyAttributes = attrs;
// }
View
7 LinkingEditor.h
@@ -46,7 +46,7 @@
IMP defaultIBeamCursorIMP, whiteIBeamCursorIMP;
-
+ BOOL managesTextWidth;
NSString *beforeString;
NSString *afterString;
NSString *activeParagraph;
@@ -60,6 +60,7 @@
@property (readonly) NSString *beforeString;
@property (readonly) NSString *afterString;
@property (readonly) NSString *activeParagraph;
+@property (readwrite) BOOL managesTextWidth;
//@property (readonly) BOOL clipboardHasLink;
- (NSColor*)_insertionPointColorForForegroundColor:(NSColor*)fgColor backgroundColor:(NSColor*)bgColor;
@@ -94,6 +95,7 @@
#pragma mark ElasticThreads additions
- (BOOL)changeMarkdownAttribute:(NSString *)syntaxBit;
- (BOOL)isAlreadyNearMarkdownLink;
+- (void)updateInset;
- (BOOL)setInsetForFrame:(NSRect)frameRect;
- (BOOL)deleteEmptyPairsInRange:(NSRange)charRange;
- (void)selectRangeAndRegisterUndo:(NSRange)selRange;
@@ -115,6 +117,9 @@
- (void)removeStringAtStartOfSelectedParagraphs:(NSString *)removeString;
- (BOOL)clipboardHasLink;
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
+- (void)textFinderShouldResetContext:(NSNotification *)aNotification;
+- (void)textFinderShouldUpdateContext:(NSNotification *)aNotification;
+- (void)textFinderShouldNoteChanges:(NSNotification *)aNotification;
- (void)hideTextFinderIfNecessary:(NSNotification *)aNotification;
- (IBAction)toggleLayoutOrientation:(id)sender;
#endif
View
96 LinkingEditor.m
@@ -63,6 +63,7 @@ @implementation LinkingEditor
@synthesize activeParagraph;
@synthesize activeParagraphBeforeCursor;
@synthesize activeParagraphPastCursor;
+@synthesize managesTextWidth;
CGFloat _perceptualDarkness(NSColor*a);
@@ -112,7 +113,8 @@ - (void)awakeFromNib {
[center addObserver:self selector:@selector(windowBecameOrResignedMain:) name:NSWindowDidResignMainNotification object:[self window]];
//[center addObserver:self selector:@selector(updateTextColors) name:NSSystemColorsDidChangeNotification object:nil]; // recreate gradient if needed
-// NoMods = YES;
+ // NoMods = YES;
+ self.managesTextWidth=[prefsController managesTextWidthInWindow];
[self setInsetForFrame:[self frame]];
outletObjectAwoke(self);
}
@@ -135,12 +137,7 @@ - (void)settingChangedForSelectorString:(NSString*)selectorString {
} else if ([selectorString isEqualToString:SEL_STR(setMakeURLsClickable:sender:)]) {
[self setLinkTextAttributes:[self preferredLinkAttributes]];
- } else if (([selectorString isEqualToString:SEL_STR(setManagesTextWidthInWindow:sender:)])||([selectorString isEqualToString:SEL_STR(setMaxNoteBodyWidth:sender:)])) {
- [self setInsetForFrame:[self frame]];
-// [self setLinkTextAttributes:[self preferredLinkAttributes]];
-
-// @selector(setMaxNoteBodyWidth:sender:),
-// @selector(setManagesTextWidthInWindow:sender:), nil];
+
//} else if ([selectorString isEqualToString:SEL_STR(setBackgroundTextColor:sender:)]) {
//link-color is derived both from foreground and background colors
@@ -164,25 +161,29 @@ - (void)settingChangedForSelectorString:(NSString*)selectorString {
}
}
+- (void)updateInset{
+ [self setInsetForFrame:[self frame]];
+}
+
- (BOOL)setInsetForFrame:(NSRect)frameRect{
CGFloat insX=kDefaultTextInsetWidth;
CGFloat insY=kDefaultTextInsetHeight;
- if (([[NSApp delegate]isInFullScreen])||([prefsController managesTextWidthInWindow])) {
+ if (managesTextWidth||([[NSApp delegate]isInFullScreen])) {
if (frameRect.size.width>[prefsController maxNoteBodyWidth]) {
insX=kTextMargins;
- insY=40.0;
+ insY=16.0;
CGFloat theMin=[prefsController maxNoteBodyWidth]+(insX*1.9);
if (frameRect.size.width<theMin) {
CGFloat diff=theMin-frameRect.size.width;
diff=round(diff/2);
insX=insX-diff;
- if (insX<3.0) {
- insX=3.0;
+ if (insX<kDefaultTextInsetWidth) {
+ insX=kDefaultTextInsetWidth;
}
insY=(insX/kTextMargins)*insY;
- if (insY<8.0) {
- insY=8.0;
+ if (insY<kDefaultTextInsetHeight) {
+ insY=kDefaultTextInsetHeight;
}
}
}
@@ -192,7 +193,7 @@ - (BOOL)setInsetForFrame:(NSRect)frameRect{
[self setTextContainerInset:NSMakeSize(insX, insY)];
return YES;
}
-
+
return NO;
}
@@ -1706,7 +1707,6 @@ - (BOOL)_rangeIsAutoIdentedBullet:(NSRange)aRange {
}
- (void)insertNewline:(id)sender {
-// NSLog(@"insertion2");
//reset custom styles after each line
[self setTypingAttributes:[prefsController noteBodyAttributes]];
@@ -1943,26 +1943,6 @@ - (IBAction)insertLink:(id)sender{
}
-//- (void)mouseUp:(NSEvent *)theEvent{
-//// [[NSApp delegate] resetModTimers];
-// NSLog(@"linking ed mouseup");
-// [[NSNotificationCenter defaultCenter] postNotificationName:@"ModTimersShouldReset" object:nil];
-// [super mouseUp:theEvent];
-//}
-//
-//- (void)mouseDown:(NSEvent *)theEvent{
-// // [[NSApp delegate] resetModTimers];
-// NSLog(@"linking ed mousedown");
-// [[NSNotificationCenter defaultCenter] postNotificationName:@"ModTimersShouldReset" object:nil];
-// [[NSApp delegate] setIsEditing:NO];
-//
-// [super mouseDown:theEvent];
-//}
-//
-//- (NSMenu *)menu{
-// [[NSNotificationCenter defaultCenter] postNotificationName:@"ModTimersShouldReset" object:nil];
-// return [super menu];
-//}
#pragma mark Pairing
@@ -2006,21 +1986,6 @@ - (BOOL)cursorIsImmediatelyPastPair:(NSString *)closingCharacter{
}
-//- (BOOL)isAlreadyNearMarkdownLink{
-// NSString *aftaString=[self.activeParagraphPastCursor stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@" ]"]];
-// NSString *bifoString=[self.activeParagraphBeforeCursor stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@" ["]];
-// NSPredicate *bifoRefPred=[NSPredicate predicateWithFormat:@"SELF LIKE[cd] %@ OR SELF LIKE[cd] %@",@"*[*",@"*[*]"];
-// NSPredicate *aftaRefPred=[NSPredicate predicateWithFormat:@"SELF BEGINSWITH[cd] %@ OR SELF LIKE[cd] %@ OR SELF LIKE[cd] %@",@":",@"[*]*",@"(*)*"];
-//// BOOL bifoBool=[bifoRefPred evaluateWithObject:bifoString];
-//// BOOL aftaBool=[aftaRefPred evaluateWithObject:aftaString];
-//// NSLog(@"bifoBool:%d forString :>%@<\naftaBool:%d forString:>%@<",bifoBool,bifoString,aftaBool,aftaString);
-// if(([bifoRefPred evaluateWithObject:bifoString])||([aftaRefPred evaluateWithObject:aftaString]))
-// return YES;
-//
-//
-// return NO;
-//}
-
- (NSUInteger)cursorIsInsidePair:(NSString *)closingCharacter{
if (![closingCharacter isEqualToString:@"]"])
return NSNotFound;
@@ -2165,7 +2130,6 @@ - (NSString *)afterString{
}
afterString=[[self string] substringFromIndex:[self selectedRange].location];
if (!afterString) {
-// NSLog(@"afterstring is null");
afterString=@"";
}
return afterString;
@@ -2180,7 +2144,6 @@ - (NSString *)beforeString{
}
beforeString=[[self string] substringToIndex:selRange.location];
if (!beforeString) {
-// NSLog(@"beforeString is null");
return @"";
}
return beforeString;
@@ -2200,8 +2163,11 @@ - (void)prepareTextFinder{
[textFinder setIncrementalSearchingEnabled:YES];
// [textFinder setIncrementalSearchingShouldDimContentView:NO];
- [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(textFinderShouldUpdateContext:) name:@"TextFindContextDidChange" object:nil];
- [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(hideTextFinderIfNecessary:) name:@"TextFinderShouldHide" object:nil];
+ NSNotificationCenter *dc=[NSNotificationCenter defaultCenter];
+ [dc addObserver:self selector:@selector(textFinderShouldUpdateContext:) name:@"TextFindContextShouldUpdate" object:nil];
+ [dc addObserver:self selector:@selector(textFinderShouldNoteChanges:) name:@"TextFindContextShouldNoteChanges" object:nil];
+ [dc addObserver:self selector:@selector(textFinderShouldResetContext:) name:@"TextFindContextShouldReset" object:nil];
+ [dc addObserver:self selector:@selector(hideTextFinderIfNecessary:) name:@"TextFinderShouldHide" object:nil];
return;
}
#endif
@@ -2227,9 +2193,23 @@ - (void)prepareTextFinderPreLion{
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
+- (void)textFinderShouldResetContext:(NSNotification *)aNotification{
+
+ if (IsLionOrLater){
+ [textFinder cancelFindIndicator];
+ [textFinder noteClientStringWillChange];
+ }
+}
+
+- (void)textFinderShouldNoteChanges:(NSNotification *)aNotification{
+ if (IsLionOrLater){
+ [textFinder noteClientStringWillChange];
+ }
+}
+
- (void)textFinderShouldUpdateContext:(NSNotification *)aNotification{
- if (IsLionOrLater){
+ if (IsLionOrLater){
[textFinder setFindIndicatorNeedsUpdate:YES];
}
}
@@ -2240,7 +2220,6 @@ - (void)hideTextFinderIfNecessary:(NSNotification *)aNotification{
[textFinder setFindIndicatorNeedsUpdate:YES];
[textFinder cancelFindIndicator];
[textFinder performAction:NSTextFinderActionHideFindInterface];
- // [[NSNotificationCenter defaultCenter] removeObserver:self name:@"TextFindContextDidChange" object:nil];
}
}
}
@@ -2287,8 +2266,7 @@ - (IBAction)performFindPanelAction:(id)sender {
lastImportedFindString = [typedString retain];
}
}
-
-// NSLog(@"aqui typedSTring:|%@|",typedString);
+
}
if ([[self window] firstResponder]!=self) {
[[self window]makeFirstResponder:self];
@@ -2314,7 +2292,6 @@ - (IBAction)performFindPanelAction:(id)sender {
}else if (findTag==6) {
findTag=NSTextFinderActionReplaceAndFind;
}else if (findTag==7) {
-// NSLog(@"aqui2");
findTag=(NSTextFinderActionSetSearchString);
}else if (findTag==9) {
findTag=NSTextFinderActionSelectAll;
@@ -2416,7 +2393,6 @@ - (IBAction)pasteMarkdownLink:(id)sender{
}
}
}
- // NSLog(@"pasting non link");
[super paste:sender];
}
View
1  NotationController.m
@@ -388,7 +388,6 @@ - (BOOL)initializeJournaling {
goto bail;
}
-// NSLog(@"convertPath4:>%s<",convertedPath);
if (!(walWriter = [[WALStorageController alloc] initWithParentFSRep:(char*)convertedPath encryptionKey:walSessionKey])) {
//couldn't create a journal after recovering the old one
//if databaseCouldNotBeFlushed is true here, then we've potentially lost notes; perhaps exchangeobjects would be better here?
View
2  NotesTableView.m
@@ -1195,7 +1195,6 @@ - (void)textDidChange:(NSNotification *)aNotification {
NSTextView *editor = [aNotification object];
- //NSLog(@"isAutocompleting: %d, wasDeleting: %d", isAutocompleting, wasDeleting);
if (!isAutocompleting && !wasDeleting) {
isAutocompleting = YES;
[editor complete:self];
@@ -1230,7 +1229,6 @@ - (NSArray *)labelCompletionsForString:(NSString *)fieldString index:(NSInteger)
tags = [labelsListSource labelTitlesPrefixedByString:[fieldString substringWithRange:charRange]
indexOfSelectedItem:&index minusWordSet:existingWordSet];
- //NSLog(@"tags is :%@",[tags description]);
}
}
}
View
1  PrefsWindowController.m
@@ -40,7 +40,6 @@ - (id)init {
}
- (void)showWindow:(id)sender {
- //NSLog(@"showwin");
if (!window) {
if (![NSBundle loadNibNamed:@"Preferences" owner:self]) {
NSLog(@"Failed to load Preferences.nib");
View
6 RBSplitView/RBSplitView.m
@@ -1094,8 +1094,6 @@ - (void)RB___tryToExpandLeading:(RBSplitSubview*)leading divider:(NSUInteger)ind
ishor = [self isHorizontal];
document = [[self enclosingScrollView] documentView];
if (document) {
-
- //NSLog(@"uhoh2");
frame = [document frame];
} else {
window = [self window];
@@ -1166,8 +1164,6 @@ - (void)RB___tryToShortenLeading:(RBSplitSubview*)leading divider:(NSUInteger)in
ishor = [self isHorizontal];
document = [[self enclosingScrollView] documentView];
if (document) {
-
- // NSLog(@"uhoh3");
frame = [document frame];
} else {
window = [self window];
@@ -1230,8 +1226,6 @@ - (void)RB___tryToShortenTrailing:(RBSplitSubview*)trailing divider:(NSUInteger)
ishor = [self isHorizontal];
document = [[self enclosingScrollView] documentView];
if (document) {
-
- /// NSLog(@"uhoh4");
frame = [document frame];
} else {
window = [self window];
View
6 StatusItemView.m
@@ -56,22 +56,16 @@ - (void)drawRect:(NSRect)rect {
- (void)mouseDown:(NSEvent *)event
{
-// [controller resetModTimers];
-// [[NSNotificationCenter defaultCenter] postNotificationName:@"ModTimersShouldReset" object:nil];
clicked = YES;
[self setNeedsDisplay:YES];
NSUInteger modFlags=[event modifierFlags];
if ((modFlags&NSControlKeyMask)&&!((modFlags&NSCommandKeyMask)||(modFlags&NSAlternateKeyMask)||(modFlags&NSShiftKeyMask))) {
-// NSLog(@"ctrl click");
[[NSNotificationCenter defaultCenter]postNotificationName:@"StatusItemMenuShouldDrop" object:nil];
- // [controller toggleAttachedMenu:self];
clicked = NO;
[self setNeedsDisplay:YES];
}else{
-// NSLog(@"not ctrl click");
[[NSNotificationCenter defaultCenter]postNotificationName:@"NVShouldActivate" object:self];
}
-// [controller toggleAttachedWindow:self];
}
- (void)mouseUp:(NSEvent *)event {
View
1  TagEditingManager.m
@@ -35,7 +35,6 @@ - (void)awakeFromNib {
- (BOOL)control:(NSControl *)control textView:(NSTextView *)textView doCommandBySelector:(SEL)command{
if (command == @selector(cancelOperation:)) {
[tagPanel orderOut:self];
- NSLog(@"tagman cancaelr");
//[self closeTP:self];
}
return NO;
View
119 de.lproj/DeletionManager.nib/designable.nib
@@ -1,41 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
- <int key="IBDocument.SystemTarget">1030</int>
- <string key="IBDocument.SystemVersion">11B26</string>
- <string key="IBDocument.InterfaceBuilderVersion">1617</string>
- <string key="IBDocument.AppKitVersion">1138</string>
- <string key="IBDocument.HIToolboxVersion">566.00</string>
+ <int key="IBDocument.SystemTarget">1050</int>
+ <string key="IBDocument.SystemVersion">12D78</string>
+ <string key="IBDocument.InterfaceBuilderVersion">3084</string>
+ <string key="IBDocument.AppKitVersion">1187.37</string>
+ <string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">1617</string>
+ <string key="NS.object.0">3084</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>NSScroller</string>
<string>NSButton</string>
- <string>NSScrollView</string>
- <string>NSTextFieldCell</string>
<string>NSButtonCell</string>
- <string>NSImageView</string>
+ <string>NSCustomObject</string>
<string>NSImageCell</string>
+ <string>NSImageView</string>
+ <string>NSScrollView</string>
+ <string>NSScroller</string>
+ <string>NSTableColumn</string>
<string>NSTableView</string>
- <string>NSCustomObject</string>
+ <string>NSTextField</string>
+ <string>NSTextFieldCell</string>
<string>NSView</string>
<string>NSWindowTemplate</string>
- <string>NSTextField</string>
- <string>NSTableColumn</string>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <reference key="dict.values" ref="0"/>
+ <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+ <integer value="1" key="NS.object.0"/>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1058938187">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -75,7 +72,7 @@
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="705922310">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">272629760</int>
<string key="NSContents">Die folgenden Dateien existieren nicht mehr im Notizenverzeichnis - sollen sie wiederhergestellt oder gelöscht werden?</string>
<object class="NSFont" key="NSSupport" id="932550149">
@@ -103,6 +100,7 @@
</object>
</object>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSImageView" id="7033653">
<reference key="NSNextResponder" ref="431170363"/>
@@ -124,7 +122,7 @@
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="436408607">
- <int key="NSCellFlags">130560</int>
+ <int key="NSCellFlags">134217728</int>
<int key="NSCellFlags2">33554432</int>
<object class="NSCustomResource" key="NSContents">
<string key="NSClassName">NSImage</string>
@@ -135,6 +133,7 @@
<int key="NSStyle">0</int>
<bool key="NSAnimates">NO</bool>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSEditable">YES</bool>
</object>
<object class="NSScrollView" id="622225289">
@@ -154,6 +153,8 @@
<reference key="NSSuperview" ref="826875363"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <bool key="NSControlAllowsExpansionToolTips">YES</bool>
<object class="_NSCornerView" key="NSCornerView">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
@@ -166,7 +167,7 @@
<double key="NSMinWidth">40</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
- <int key="NSCellFlags">75628096</int>
+ <int key="NSCellFlags">75497536</int>
<int key="NSCellFlags2">2048</int>
<string key="NSContents"/>
<object class="NSFont" key="NSSupport">
@@ -186,7 +187,7 @@
</object>
</object>
<object class="NSTextFieldCell" key="NSDataCell" id="114982436">
- <int key="NSCellFlags">337772096</int>
+ <int key="NSCellFlags">337641536</int>
<int key="NSCellFlags2">2048</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="932550149"/>
@@ -243,9 +244,10 @@
<object class="NSScroller" id="847712607">
<reference key="NSNextResponder" ref="622225289"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{315, 1}, {15, 129}}</string>
+ <string key="NSFrame">{{314, 1}, {16, 129}}</string>
<reference key="NSSuperview" ref="622225289"/>
<reference key="NSWindow"/>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<reference key="NSTarget" ref="622225289"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">0.67894739999999998</double>
@@ -256,6 +258,7 @@
<string key="NSFrame">{{-100, -100}, {128, 15}}</string>
<reference key="NSSuperview" ref="622225289"/>
<reference key="NSWindow"/>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="622225289"/>
<string key="NSAction">_doScroller:</string>
@@ -271,6 +274,9 @@
<reference key="NSHScroller" ref="292526104"/>
<reference key="NSContentView" ref="826875363"/>
<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+ <double key="NSMinMagnification">0.25</double>
+ <double key="NSMaxMagnification">4</double>
+ <double key="NSMagnification">1</double>
</object>
<object class="NSButton" id="606208022">
<reference key="NSNextResponder" ref="431170363"/>
@@ -280,12 +286,12 @@
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="654119746">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Löschen</string>
<reference key="NSSupport" ref="932550149"/>
<reference key="NSControlView" ref="606208022"/>
- <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags">-2038284288</int>
<int key="NSButtonFlags2">1</int>
<reference key="NSAlternateImage" ref="932550149"/>
<string key="NSAlternateContents"/>
@@ -293,6 +299,7 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="132743118">
<reference key="NSNextResponder" ref="431170363"/>
@@ -302,12 +309,12 @@
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="436632161">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Wiederherstellen</string>
<reference key="NSSupport" ref="932550149"/>
<reference key="NSControlView" ref="132743118"/>
- <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags">-2038284288</int>
<int key="NSButtonFlags2">1</int>
<reference key="NSAlternateImage" ref="932550149"/>
<string key="NSAlternateContents"/>
@@ -315,6 +322,7 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="1018072835">
<reference key="NSNextResponder" ref="431170363"/>
@@ -324,12 +332,12 @@
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="225622405">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Diese Meldung nicht mehr anzeigen</string>
<reference key="NSSupport" ref="932550149"/>
<reference key="NSControlView" ref="1018072835"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<object class="NSButtonImageSource" key="NSAlternateImage">
<string key="NSImageName">NSSwitch</string>
@@ -339,6 +347,7 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</object>
<string key="NSFrameSize">{371, 313}</string>
@@ -388,22 +397,6 @@
<int key="connectionID">339</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">dataSource</string>
- <reference key="source" ref="503619527"/>
- <reference key="destination" ref="81991024"/>
- </object>
- <int key="connectionID">340</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="503619527"/>
- <reference key="destination" ref="81991024"/>
- </object>
- <int key="connectionID">341</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">changeConfirmDeletion:</string>
<reference key="source" ref="81991024"/>
@@ -419,13 +412,31 @@
</object>
<int key="connectionID">354</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">dataSource</string>
+ <reference key="source" ref="503619527"/>
+ <reference key="destination" ref="81991024"/>
+ </object>
+ <int key="connectionID">340</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="503619527"/>
+ <reference key="destination" ref="81991024"/>
+ </object>
+ <int key="connectionID">341</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBObjectRecord">
<int key="objectID">0</int>
- <reference key="object" ref="0"/>
+ <object class="NSArray" key="object" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
<reference key="children" ref="1058938187"/>
<nil key="parent"/>
</object>
@@ -617,7 +628,7 @@
<string>351.IBPluginDependency</string>
<string>352.IBPluginDependency</string>
</object>
- <object class="NSMutableArray" key="dict.values">
+ <object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -674,7 +685,7 @@
<string>deleteAction:</string>
<string>restoreAction:</string>
</object>
- <object class="NSMutableArray" key="dict.values">
+ <object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
@@ -689,7 +700,7 @@
<string>deleteAction:</string>
<string>restoreAction:</string>
</object>
- <object class="NSMutableArray" key="dict.values">
+ <object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">changeConfirmDeletion:</string>
@@ -713,7 +724,7 @@
<string>tableView</string>
<string>window</string>
</object>
- <object class="NSMutableArray" key="dict.values">
+ <object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSButton</string>
<string>NSTableView</string>
@@ -728,7 +739,7 @@
<string>tableView</string>
<string>window</string>
</object>
- <object class="NSMutableArray" key="dict.values">
+ <object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">confirmDeletionButton</string>
@@ -773,7 +784,11 @@
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
- <integer value="1030" key="NS.object.0"/>
+ <real value="1050" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+ <real value="1070" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
View
BIN  de.lproj/DeletionManager.nib/keyedobjects.nib
Binary file not shown
View
111 fr.lproj/DeletionManager.nib/designable.nib
@@ -1,41 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
- <int key="IBDocument.SystemTarget">1030</int>
- <string key="IBDocument.SystemVersion">11B26</string>
- <string key="IBDocument.InterfaceBuilderVersion">1617</string>
- <string key="IBDocument.AppKitVersion">1138</string>
- <string key="IBDocument.HIToolboxVersion">566.00</string>
+ <int key="IBDocument.SystemTarget">1050</int>
+ <string key="IBDocument.SystemVersion">12D78</string>
+ <string key="IBDocument.InterfaceBuilderVersion">3084</string>
+ <string key="IBDocument.AppKitVersion">1187.37</string>
+ <string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">1617</string>
+ <string key="NS.object.0">3084</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>NSScroller</string>
<string>NSButton</string>
- <string>NSScrollView</string>
- <string>NSTextFieldCell</string>
<string>NSButtonCell</string>
- <string>NSImageView</string>
+ <string>NSCustomObject</string>
<string>NSImageCell</string>
+ <string>NSImageView</string>
+ <string>NSScrollView</string>
+ <string>NSScroller</string>
+ <string>NSTableColumn</string>
<string>NSTableView</string>
- <string>NSCustomObject</string>
+ <string>NSTextField</string>
+ <string>NSTextFieldCell</string>
<string>NSView</string>
<string>NSWindowTemplate</string>
- <string>NSTextField</string>
- <string>NSTableColumn</string>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <reference key="dict.values" ref="0"/>
+ <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+ <integer value="1" key="NS.object.0"/>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1058938187">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -74,7 +71,7 @@
<reference key="NSSuperview" ref="431170363"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="705922310">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">272629760</int>
<string key="NSContents">Les fichiers suivants n'existent plus dans le dossier contenant vos notes. Voulez-vous les restaurer dans le dossier, ou faut-il également effacer leur copie dans Notational Velocity ?</string>
<object class="NSFont" key="NSSupport" id="932550149">
@@ -102,6 +99,7 @@
</object>
</object>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSScrollView" id="622225289">
<reference key="NSNextResponder" ref="431170363"/>
@@ -119,6 +117,8 @@
<string key="NSFrameSize">{375, 129}</string>
<reference key="NSSuperview" ref="826875363"/>
<bool key="NSEnabled">YES</bool>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <bool key="NSControlAllowsExpansionToolTips">YES</bool>
<object class="_NSCornerView" key="NSCornerView">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
@@ -131,7 +131,7 @@
<double key="NSMinWidth">40</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
- <int key="NSCellFlags">75628096</int>
+ <int key="NSCellFlags">75497536</int>
<int key="NSCellFlags2">2048</int>
<string key="NSContents"/>
<object class="NSFont" key="NSSupport">
@@ -151,7 +151,7 @@
</object>
</object>
<object class="NSTextFieldCell" key="NSDataCell" id="114982436">
- <int key="NSCellFlags">337772096</int>
+ <int key="NSCellFlags">337641536</int>
<int key="NSCellFlags2">2048</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="932550149"/>
@@ -207,8 +207,9 @@
<object class="NSScroller" id="847712607">
<reference key="NSNextResponder" ref="622225289"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{361, 1}, {15, 129}}</string>
+ <string key="NSFrame">{{360, 1}, {16, 129}}</string>
<reference key="NSSuperview" ref="622225289"/>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<reference key="NSTarget" ref="622225289"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">0.67894739999999998</double>
@@ -218,6 +219,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {128, 15}}</string>
<reference key="NSSuperview" ref="622225289"/>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="622225289"/>
<string key="NSAction">_doScroller:</string>
@@ -232,6 +234,9 @@
<reference key="NSHScroller" ref="292526104"/>
<reference key="NSContentView" ref="826875363"/>
<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+ <double key="NSMinMagnification">0.25</double>
+ <double key="NSMaxMagnification">4</double>
+ <double key="NSMagnification">1</double>
</object>
<object class="NSButton" id="606208022">
<reference key="NSNextResponder" ref="431170363"/>
@@ -240,12 +245,12 @@
<reference key="NSSuperview" ref="431170363"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="654119746">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Les supprimer</string>
<reference key="NSSupport" ref="932550149"/>
<reference key="NSControlView" ref="606208022"/>
- <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags">-2038284288</int>
<int key="NSButtonFlags2">1</int>
<reference key="NSAlternateImage" ref="932550149"/>
<string key="NSAlternateContents"/>
@@ -253,6 +258,7 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="132743118">
<reference key="NSNextResponder" ref="431170363"/>
@@ -261,12 +267,12 @@
<reference key="NSSuperview" ref="431170363"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="436632161">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Restaurer dans le dossier</string>
<reference key="NSSupport" ref="932550149"/>
<reference key="NSControlView" ref="132743118"/>
- <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags">-2038284288</int>
<int key="NSButtonFlags2">1</int>
<reference key="NSAlternateImage" ref="932550149"/>
<string key="NSAlternateContents"/>
@@ -274,6 +280,7 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="595023510">
<reference key="NSNextResponder" ref="431170363"/>
@@ -282,12 +289,12 @@
<reference key="NSSuperview" ref="431170363"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="185021299">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Ne plus afficher ce message</string>
<reference key="NSSupport" ref="932550149"/>
<reference key="NSControlView" ref="595023510"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<object class="NSButtonImageSource" key="NSAlternateImage">
<string key="NSImageName">NSSwitch</string>
@@ -297,6 +304,7 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSImageView" id="765986563">
<reference key="NSNextResponder" ref="431170363"/>
@@ -317,7 +325,7 @@
<reference key="NSSuperview" ref="431170363"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="42971123">
- <int key="NSCellFlags">130560</int>
+ <int key="NSCellFlags">134217728</int>
<int key="NSCellFlags2">33554432</int>
<object class="NSCustomResource" key="NSContents">
<string key="NSClassName">NSImage</string>
@@ -328,6 +336,7 @@
<int key="NSStyle">0</int>
<bool key="NSAnimates">NO</bool>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSEditable">YES</bool>
</object>
</object>
@@ -377,22 +386,6 @@
<int key="connectionID">339</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">dataSource</string>
- <reference key="source" ref="503619527"/>
- <reference key="destination" ref="81991024"/>
- </object>
- <int key="connectionID">340</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="503619527"/>
- <reference key="destination" ref="81991024"/>
- </object>
- <int key="connectionID">341</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">changeConfirmDeletion:</string>
<reference key="source" ref="81991024"/>
@@ -408,13 +401,31 @@
</object>
<int key="connectionID">354</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">dataSource</string>
+ <reference key="source" ref="503619527"/>
+ <reference key="destination" ref="81991024"/>
+ </object>
+ <int key="connectionID">340</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="503619527"/>
+ <reference key="destination" ref="81991024"/>
+ </object>
+ <int key="connectionID">341</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBObjectRecord">
<int key="objectID">0</int>
- <reference key="object" ref="0"/>
+ <object class="NSArray" key="object" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
<reference key="children" ref="1058938187"/>
<nil key="parent"/>
</object>
@@ -606,7 +617,7 @@
<string>351.IBPluginDependency</string>
<string>352.IBPluginDependency</string>
</object>
- <object class="NSMutableArray" key="dict.values">
+ <object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -676,7 +687,11 @@
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
- <integer value="1030" key="NS.object.0"/>
+ <real value="1050" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+ <real value="1070" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
View
BIN  fr.lproj/DeletionManager.nib/keyedobjects.nib
Binary file not shown
View
219 pt.lproj/DeletionManager.nib/designable.nib
@@ -1,41 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
- <int key="IBDocument.SystemTarget">1030</int>
- <string key="IBDocument.SystemVersion">11B26</string>
- <string key="IBDocument.InterfaceBuilderVersion">1617</string>
- <string key="IBDocument.AppKitVersion">1138</string>
- <string key="IBDocument.HIToolboxVersion">566.00</string>
+ <int key="IBDocument.SystemTarget">1050</int>
+ <string key="IBDocument.SystemVersion">12D78</string>
+ <string key="IBDocument.InterfaceBuilderVersion">3084</string>
+ <string key="IBDocument.AppKitVersion">1187.37</string>
+ <string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">1617</string>
+ <string key="NS.object.0">3084</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>NSScroller</string>
<string>NSButton</string>
- <string>NSScrollView</string>
- <string>NSTextFieldCell</string>
<string>NSButtonCell</string>
- <string>NSImageView</string>
+ <string>NSCustomObject</string>
<string>NSImageCell</string>
+ <string>NSImageView</string>
+ <string>NSScrollView</string>
+ <string>NSScroller</string>
+ <string>NSTableColumn</string>
<string>NSTableView</string>
- <string>NSCustomObject</string>
+ <string>NSTextField</string>
+ <string>NSTextFieldCell</string>
<string>NSView</string>
<string>NSWindowTemplate</string>
- <string>NSTextField</string>
- <string>NSTableColumn</string>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <reference key="dict.values" ref="0"/>
+ <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+ <integer value="1" key="NS.object.0"/>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="331430730">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -72,10 +69,10 @@
<int key="NSvFlags">266</int>
<string key="NSFrame">{{102, 221}, {252, 72}}</string>
<reference key="NSSuperview" ref="243353062"/>
- <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="657454669"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="896040101">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">272629760</int>
<string key="NSContents">Os arquivos a seguir não existem mais na pasta de notas — deseja restaurar para o disco ou remover também do Notational Velocity?</string>
<object class="NSFont" key="NSSupport" id="974988827">
@@ -103,6 +100,7 @@
</object>
</object>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSScrollView" id="657454669">
<reference key="NSNextResponder" ref="243353062"/>
@@ -119,8 +117,10 @@
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{329, 129}</string>
<reference key="NSSuperview" ref="492330708"/>
- <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="315922626"/>
<bool key="NSEnabled">YES</bool>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <bool key="NSControlAllowsExpansionToolTips">YES</bool>
<object class="_NSCornerView" key="NSCornerView">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
@@ -133,7 +133,7 @@
<double key="NSMinWidth">40</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
- <int key="NSCellFlags">75628096</int>
+ <int key="NSCellFlags">75497536</int>
<int key="NSCellFlags2">2048</int>
<string key="NSContents"/>
<object class="NSFont" key="NSSupport">
@@ -153,7 +153,7 @@
</object>
</object>
<object class="NSTextFieldCell" key="NSDataCell" id="452901429">
- <int key="NSCellFlags">337772096</int>
+ <int key="NSCellFlags">337641536</int>
<int key="NSCellFlags2">2048</int>
<reference key="NSSupport" ref="974988827"/>
<reference key="NSControlView" ref="1042743364"/>
@@ -200,7 +200,6 @@
</object>
<string key="NSFrame">{{1, 1}, {329, 129}}</string>
<reference key="NSSuperview" ref="657454669"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1042743364"/>
<reference key="NSDocView" ref="1042743364"/>
<reference key="NSBGColor" ref="967196692"/>
@@ -209,9 +208,10 @@
<object class="NSScroller" id="315922626">
<reference key="NSNextResponder" ref="657454669"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{315, 1}, {15, 129}}</string>