Lil fixes

Mostly little fixes. A lot of weird stuff in the project folder.
/build/...  and localization weirdnesses.

but also some bug fixes with Find... and the Scrollviews

Author: elasticthreads

AppController.h

@@ -36,6 +36,7 @@
 //@class AugmentedScrollView;
 @class ETContentView;
 @class ETScrollView;
+@class ETNoteScrollView;
 
 #ifndef MarkdownPreview
 #define MarkdownPreview 13371
@@ -79,7 +80,7 @@
 	RBSplitSubview *notesSubview;
 	RBSplitView *splitView;
     IBOutlet ETScrollView *notesScrollView;
-    IBOutlet ETScrollView *textScrollView;
+    IBOutlet ETNoteScrollView *textScrollView;
     IBOutlet NotesTableView *notesTableView;
     IBOutlet LinkingEditor *textView;
 	IBOutlet EmptyView *editorStatusView;

AppController.m

@@ -10,7 +10,7 @@
  or promote products derived from this software without specific prior written permission. */
 //ET NV4
 
-#import "NSTextFinder.h"
+//#import "NSTextFinder.h"
 #import "AppController.h"
 #import "NoteObject.h"
 #import "GlobalPrefs.h"
@@ -34,7 +34,6 @@
 #import "DualField.h"
 #import "TitlebarButton.h"
 #import "RBSplitView/RBSplitView.h"
-//#import "AugmentedScrollView.h"
 #import "BookmarksController.h"
 #import "SyncSessionController.h"
 #import "MultiplePageView.h"
@@ -48,7 +47,7 @@
 #import "ETContentView.h"
 #import "PreviewController.h"
 #import "ETClipView.h"
-#import "ETScrollView.h"
+//#import "ETScrollView.h"
 #import "NSFileManager+DirectoryLocations.h"
 #import "nvaDevConfig.h"
 #import <Sparkle/SUUpdater.h>

AugmentedScrollView.h

@@ -0,0 +1,15 @@
+//
+//  ETNoteScrollView.h
+//  Notation
+//
+//  Created by David Halter on 10/3/16.
+//  Copyright © 2016 David Halter. All rights reserved.
+//
+
+#import "ETScrollView.h"
+
+@interface ETNoteScrollView : ETScrollView
+
+
+
+@end

AugmentedScrollView.m

@@ -0,0 +1,39 @@
+//
+//  ETNoteScrollView.m
+//  Notation
+//
+//  Created by David Halter on 10/3/16.
+//  Copyright © 2016 David Halter. All rights reserved.
+//
+
+#import "ETNoteScrollView.h"
+#import "LinkingEditor.h"
+
+@implementation ETNoteScrollView
+
+//- (void)awakeFromNib{
+//}
+
+
+- (NSView *)hitTest:(NSPoint)aPoint{
+    NSRect vsRect=[[self verticalScroller] frame];
+    vsRect.origin.x-=4.0;
+    vsRect.size.width+=4.0;
+
+    if (NSPointInRect (aPoint,vsRect)) {
+        return [self verticalScroller];
+    }else if (IsLionOrLater){
+        NSView *tView=[super hitTest:aPoint];
+        BOOL tViewIsDoc=(tView==self.documentView);
+        if (tViewIsDoc||[tView isKindOfClass:self.class]||[tView isKindOfClass:NSClassFromString(@"ETClipView")]){
+            [self.documentView setMouseInside:YES];
+            return self.documentView;
+        }
+        return tView;
+    }
+
+    return [super hitTest:aPoint];
+}
+
+
+@end

ETNoteScrollView.h

@@ -8,7 +8,6 @@
 #import "ETScrollView.h"
 #import "ETOverlayScroller.h"
 #import "GlobalPrefs.h"
-#import "LinkingEditor.h"
 
 @implementation ETScrollView
 
@@ -17,39 +16,13 @@ + (BOOL)isCompatibleWithResponsiveScrolling{
     return NO;
 }
 
-- (NSView *)hitTest:(NSPoint)aPoint{
-    if([[[self documentView]className] isEqualToString:@"LinkingEditor"]){
-        NSRect vsRect=[[self verticalScroller] frame];
-        vsRect.origin.x-=4.0;
-        vsRect.size.width+=4.0;
-        
-        if (NSPointInRect (aPoint,vsRect)) {
-            return [self verticalScroller];
-        }else if (IsLionOrLater){
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
-            if([[self subviews]containsObject:[self findBarView]]) {
-                NSView *tView=[super hitTest:aPoint];
-                if ((tView==[self findBarView])||([tView superview]==[self findBarView])||([[tView className]isEqualToString:@"NSFindPatternFieldEditor"])) {
-                    [[self window]invalidateCursorRectsForView:tView];
-                    [[self documentView]setMouseInside:NO];
-                    return tView;
-                }
-            }
-#endif
-        }
-        [[self documentView]setMouseInside:YES];
-        return [self documentView];
-    }
-    return [super hitTest:aPoint];
-}
 
-
-- (void)awakeFromNib{ 
+- (void)awakeFromNib{
     needsOverlayTiling=NO;
-    if([[[self documentView]className] isEqualToString:@"NotesTableView"]){
+    if ([self.documentView isKindOfClass:[NSTableView class]]) {
         scrollerClass=NSClassFromString(@"ETOverlayScroller");
+        [self setAutohidesScrollers:YES];
         if (!IsLionOrLater) {
-            [self setAutohidesScrollers:YES];
             needsOverlayTiling=YES;
         }
     }else{
@@ -62,12 +35,12 @@ - (void)awakeFromNib{
         [self setVerticalScrollElasticity:NSScrollElasticityAllowed];
     }
 #endif
-        [self changeUseETScrollbarsOnLion];
+    [self changeUseETScrollbarsOnLion];
 }
 
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
-- (void)settingChangedForSelectorString:(NSString*)selectorString{  
+- (void)settingChangedForSelectorString:(NSString*)selectorString{
     if (IsLionOrLater&&([selectorString isEqualToString:SEL_STR(setUseETScrollbarsOnLion:sender:)])){
         [self changeUseETScrollbarsOnLion];
     }
@@ -76,8 +49,8 @@ - (void)settingChangedForSelectorString:(NSString*)selectorString{
 - (void)changeUseETScrollbarsOnLion{
     id theScroller;
     if (!IsLionOrLater||[[GlobalPrefs defaultPrefs]useETScrollbarsOnLion]) {
-        theScroller=[[scrollerClass alloc]init];        
-        [theScroller setFillBackground:!IsLionOrLater&&(scrollerClass==NSClassFromString(@"ETTransparentScroller"))];
+        theScroller=[[scrollerClass alloc]init];
+        [theScroller setFillBackground:!IsLionOrLater&&(scrollerClass==[ETTransparentScroller class])];
     }else{
         theScroller=[[NSScroller alloc]init];
     }
@@ -86,22 +59,22 @@ - (void)changeUseETScrollbarsOnLion{
         style=[[theScroller class] preferredScrollerStyle];
     }
     [self setVerticalScroller:theScroller];
-    [theScroller release];
-    
+
     if (IsLionOrLater) {
         [theScroller setScrollerStyle:style];
         [self setScrollerStyle:style];
     }
+    [theScroller release];
     [self tile];
     [self reflectScrolledClipView:[self contentView]];
-//    if (IsLionOrLater) {
-//        [self flashScrollers];
-//    }
+    //    if (IsLionOrLater) {
+    //        [self flashScrollers];
+    //    }
 }
 #endif
 
 - (void)tile {
-	[super tile];
+    [super tile];
     if (needsOverlayTiling) {
         if (![[self verticalScroller] isHidden]) {
             //            NSRect vsRect=[[self verticalScroller] frame];
@@ -111,7 +84,7 @@ - (void)tile {
             [[self contentView] setFrameSize:conRect.size];
             //            [wdContent setFrame:conRect];
             //            [wdContent release];
-            //            [[self verticalScroller] setFrame:vsRect];            
+            //            [[self verticalScroller] setFrame:vsRect];
         }
     }
 }