Permalink
Browse files

Merge branch 'master' of github.com:ttscoff/nv

# By elasticthreads
# Via elasticthreads
* 'master' of github.com:ttscoff/nv:
  added numbered list completion
  few more fixes for multi tagging
  improvements to the multiple note tagging
  more on moving cache folder to ~/Library/Caches
  always with the double commit for one fix. more scroller fixes.
  one more fix for the nvalt/10.6 scrollers
  scroller setting in the xib
  little bit more
  truncation
  improved tableview drawing
  fix to a colorscheme bug
  some fixes to how UnifiedCell draws.
  improved grid line drawing in notestableview as well as selection highlighting
  one more slight improvement to the statusview code
  added icon to project file screweup
  deleted old old menu icon. moved the new one
  Improvements to the menubar icon
  Quite a few little fixes
  Improvements to customs scrollers.
  prefs window>> Fonts & Colors >> do a better job of displaying the custom font

Conflicts:
	Notation.xcodeproj/project.pbxproj
  • Loading branch information...
2 parents afcac81 + 544895d commit 2e4ef7e48f339bba7d260639dd160815e2f181c1 @ttscoff committed May 20, 2013
Showing with 4,305 additions and 1,567 deletions.
  1. +2 −0 .gitignore
  2. +11 −10 AppController.h
  3. +388 −478 AppController.m
  4. +1 −1 AttributedPlainText.m
  5. +3 −2 BTTransparentScroller.m
  6. +1 −1 BookmarksController.m
  7. +0 −2 ETClipView.m
  8. +1 −1 ETContentView.m
  9. +24 −4 ETOverlayScroller.m
  10. +16 −28 ETScrollView.m
  11. +47 −55 ETTransparentScroller.m
  12. +20 −37 English.lproj/MainMenu.xib
  13. +36 −52 English.lproj/Preferences.xib
  14. +128 −42 English.lproj/TagEditingManager.xib
  15. +1 −1 HeaderViewWIthMenu.m
  16. BIN Images/nvMenu.png
  17. BIN Images/nvMenuW.png
  18. +78 −50 LinkingEditor.m
  19. +9 −1 NSString_CustomTruncation.m
  20. +15 −10 NSString_NV.m
  21. +34 −34 Notation.xcodeproj/project.pbxproj
  22. +10 −8 NoteObject.h
  23. +1 −1 NoteObject.m
  24. +5 −5 NotesTableHeaderCell.m
  25. +2 −0 NotesTableView.h
  26. +90 −78 NotesTableView.m
  27. +6 −1 PrefsWindowController.m
  28. +2 −0 PreviewController.m
  29. +6 −8 StatusItemView.h
  30. +35 −58 StatusItemView.m
  31. +8 −6 TagEditingManager.h
  32. +61 −36 TagEditingManager.m
  33. +5 −1 UnifiedCell.m
  34. +477 −6 de.lproj/MainMenu.xib
  35. +65 −63 de.lproj/Preferences.xib
  36. +1 −1 de.lproj/ServicesMenu.strings
  37. +146 −40 de.lproj/TagEditingManager.xib
  38. +458 −6 fr.lproj/MainMenu.xib
  39. +56 −74 fr.lproj/Preferences.xib
  40. +1 −1 fr.lproj/ServicesMenu.strings
  41. +146 −41 fr.lproj/TagEditingManager.xib
  42. +451 −5 it.lproj/MainMenu.xib
  43. +70 −88 it.lproj/Preferences.xib
  44. +128 −42 it.lproj/TagEditingManager.xib
  45. +459 −7 pt.lproj/MainMenu.xib
  46. +29 −47 pt.lproj/Preferences.xib
  47. +151 −41 pt.lproj/TagEditingManager.xib
  48. +451 −5 zh.lproj/MainMenu.xib
  49. +47 −47 zh.lproj/Preferences.xib
  50. +123 −42 zh.lproj/TagEditingManager.xib
View
@@ -56,3 +56,5 @@ French.lproj/*.nvhelp
>>>>>>> another gitignore
SimperiumConfig.h
+
+*.pbxproj
View
@@ -57,14 +57,15 @@
IBOutlet NSMenuItem *fsMenuItem;
BOOL wasVert;
BOOL wasDFVisible;
+ BOOL fieldWasFirstResponder;
BOOL isAutocompleting;
BOOL wasDeleting;
IBOutlet ETContentView *mainView;
DFView *dualFieldView;
StatusItemView *cView;
NSStatusItem *statusItem;
IBOutlet NSMenu *statBarMenu;
- TagEditingManager *TagEditer;
+ TagEditingManager *tagEditor;
NSColor *backgrndColor;
NSColor *foregrndColor;
NSInteger userScheme;
@@ -108,7 +109,6 @@
BOOL isFilteringFromTyping, typedStringIsCached;
BOOL isCreatingANote;
NSString *typedString;
- NSArray *cTags;
BOOL isEditing;
NoteObject *currentNote;
@@ -182,12 +182,12 @@ void outletObjectAwoke(id sender);
//elasticwork
//- (void)setIsEditing:(BOOL)inBool inCell:(NSCell *)theCell;
//- (void)focusOnCtrlFld:(id)sender;
-- (void)tableView:(NSTableView *)aTableView willDisplayCell:(id)aCell forTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex;
- (NSMenu *)statBarMenu;
-- (BOOL)toggleAttachedWindow:(NSNotification *)aNotification;
-- (BOOL)toggleAttachedMenu:(NSNotification *)aNotification;
-- (NSArray *)commonLabels;
+- (void)toggleAttachedWindow:(NSNotification *)aNotification;
+- (void)toggleAttachedMenu:(NSNotification *)aNotification;
+- (NSArray *)commonLabelsForNotesAtIndexes:(NSIndexSet *)selDexes;
- (IBAction)multiTag:(id)sender;
+- (void)releaseTagEditor:(NSNotification *)note;
- (void)setDualFieldInToolbar;
- (void)setDualFieldInView;
- (void)setDualFieldIsVisible:(BOOL)isVis;
@@ -197,8 +197,8 @@ void outletObjectAwoke(id sender);
- (IBAction)toggleCollapse:(id)sender;
- (IBAction)switchFullScreen:(id)sender;
- (BOOL)isInFullScreen;
-- (IBAction)openFileInEditor:(id)sender;
-- (NSArray *)getTxtAppList;
+//- (IBAction)openFileInEditor:(id)sender;
+//- (NSArray *)getTxtAppList;
//- (void)updateTextApp:(id)sender;
- (IBAction)setBWColorScheme:(id)sender;
- (IBAction)setLCColorScheme:(id)sender;
@@ -215,6 +215,7 @@ void outletObjectAwoke(id sender);
- (IBAction)toggleWordCount:(id)sender;
- (void)popWordCount:(BOOL)showIt;
- (void)popPreview:(BOOL)showIt;
+- (IBAction)previewNoteWithMarked:(id)sender;
- (IBAction)togglePreview:(id)sender;
- (IBAction)toggleSourceView:(id)sender;
- (IBAction)savePreview:(id)sender;
@@ -227,17 +228,17 @@ void outletObjectAwoke(id sender);
- (void)updateRTL;
- (void)refreshNotesList;
- (void)focusControlField:(id)sender activate:(BOOL)shouldActivate;
+- (void)updateModifier:(NSTimer*)theTimer;
#pragma mark toggling dock icon
- (void)togDockIcon:(NSNotification *)notification;
- (void)hideDockIconAfterDelay;
- (void)hideDockIcon;
- (void)showDockIcon;
- (void)reActivate:(id)sender;
- (void)toggleStatusItem:(NSNotification *)notification;
-//- (IBAction)testThing:(id)sender;
- (void)setUpStatusBarItem;
- (NSArray *)referenceLinksInString:(NSString *)contentString;
-- (IBAction)testThing:(id)sender;
+//- (IBAction)testThing:(id)sender;
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
- (void)postToggleToolbar:(NSNumber *)boolNum;
#endif
Oops, something went wrong.

0 comments on commit 2e4ef7e

Please sign in to comment.