Permalink
Browse files

Way to much for a single Commit. So suit me.

Lost of Lion fixes, including the Find… fix
Fixing some NIBs
Some markdown autocomplete
and more
worst commit yet?
  • Loading branch information...
1 parent 4182d2d commit b89886fd12e73ade016c3a2dfcbd23ed9e9f873e @elasticthreads elasticthreads committed Sep 16, 2011
Showing with 9,077 additions and 11,045 deletions.
  1. +1 −1 AlienNoteImporter.m
  2. +17 −12 AppController.h
  3. +126 −65 AppController.m
  4. +15 −33 AugmentedScrollView.h
  5. +18 −130 AugmentedScrollView.m
  6. +2 −3 BTTransparentScroller.h
  7. +27 −238 BTTransparentScroller.m
  8. +1 −1 DualField.m
  9. +16 −0 ETClipView.m
  10. +14 −13 ETContentView.m
  11. +13 −0 ETOverlayScroller.h
  12. +30 −0 ETOverlayScroller.m
  13. +10 −1 ETScrollView.h
  14. +99 −65 ETScrollView.m
  15. +12 −22 ETTransparentScroller.h
  16. +120 −131 ETTransparentScroller.m
  17. +2 −2 EmptyView.h
  18. +1 −1 EmptyView.m
  19. +339 −682 English.lproj/MainMenu.xib
  20. +231 −37 English.lproj/MarkupPreview.xib
  21. BIN English.lproj/PTKeyComboPanel.nib/keyedobjects.nib
  22. +18 −18 English.lproj/{PTKeyComboPanel.nib/designable.nib → PTKeyComboPanel.xib}
  23. +70 −10 English.lproj/PassphrasePicker.nib/designable.nib
  24. BIN English.lproj/PassphrasePicker.nib/keyedobjects.nib
  25. BIN English.lproj/PassphraseRetriever.nib/keyedobjects.nib
  26. +9 −20 English.lproj/{PassphraseRetriever.nib/designable.nib → PassphraseRetriever.xib}
  27. +119 −264 English.lproj/Preferences.xib
  28. +1 −1 FastListDataSource.m
  29. +6 −3 GlobalPrefs.h
  30. +26 −5 GlobalPrefs.m
  31. +4 −5 Info.plist
  32. +2 −2 LabelObject.h
  33. +1 −1 LabelObject.m
  34. +1 −1 LabelsListController.m
  35. +1 −0 LinearDividerShader.m
  36. +22 −7 LinkingEditor.h
  37. +393 −140 LinkingEditor.m
  38. +3 −0 MultiTextFinder.h
  39. +2 −0 MultiTextFinder.m
  40. +170 −169 NSTextFinder.h
  41. +2 −1 NSTextFinder_LastFind.m
  42. +126 −96 Notation.xcodeproj/project.pbxproj
  43. +2 −2 NotationController.h
  44. +5 −5 NotationController.m
  45. +9 −9 NotationPrefs.h
  46. +9 −9 NotationPrefs.m
  47. +2 −2 NotationPrefsViewController.h
  48. +14 −13 NotationPrefsViewController.m
  49. +2 −1 NotesTableView.h
  50. +17 −16 NotesTableView.m
  51. +2 −2 PrefsWindowController.h
  52. +28 −46 PrefsWindowController.m
  53. +13 −5 PreviewController.m
  54. +6 −10 StatusItemView.m
  55. +1 −1 TagEditingManager.m
  56. +1 −1 UnifiedCell.m
  57. +200 −40 de.lproj/MainMenu.xib
  58. +218 −29 de.lproj/MarkupPreview.xib
  59. BIN de.lproj/PTKeyComboPanel.nib/keyedobjects.nib
  60. +37 −162 de.lproj/{PTKeyComboPanel.nib/designable.nib → PTKeyComboPanel.xib}
  61. +0 −950 de.lproj/PassphraseRetriever.nib/designable.nib
  62. BIN de.lproj/PassphraseRetriever.nib/keyedobjects.nib
  63. +575 −0 de.lproj/PassphraseRetriever.xib
  64. +156 −320 de.lproj/Preferences.xib
  65. +740 −24 fr.lproj/MainMenu.xib
  66. +218 −29 fr.lproj/MarkupPreview.xib
  67. BIN fr.lproj/PTKeyComboPanel.nib/keyedobjects.nib
  68. +108 −60 fr.lproj/{PTKeyComboPanel.nib/designable.nib → PTKeyComboPanel.xib}
  69. BIN fr.lproj/PassphraseRetriever.nib/keyedobjects.nib
  70. +118 −350 fr.lproj/{PassphraseRetriever.nib/designable.nib → PassphraseRetriever.xib}
  71. +160 −320 fr.lproj/Preferences.xib
  72. +169 −538 it.lproj/MainMenu.xib
  73. +218 −29 it.lproj/MarkupPreview.xib
  74. +0 −1,371 it.lproj/PTKeyComboPanel.nib/designable.nib
  75. BIN it.lproj/PTKeyComboPanel.nib/keyedobjects.nib
  76. +805 −0 it.lproj/PTKeyComboPanel.xib
  77. BIN it.lproj/PassphraseRetriever.nib/keyedobjects.nib
  78. +578 −0 it.lproj/PassphraseRetriever.xib
  79. +146 −294 it.lproj/Preferences.xib
  80. +270 −238 pt.lproj/MainMenu.xib
  81. +57 −28 pt.lproj/MarkupPreview.xib
  82. BIN pt.lproj/PTKeyComboPanel.nib/keyedobjects.nib
  83. +92 −67 pt.lproj/{PTKeyComboPanel.nib/designable.nib → PTKeyComboPanel.xib}
  84. +0 −1,423 pt.lproj/PassphraseRetriever.nib/designable.nib
  85. BIN pt.lproj/PassphraseRetriever.nib/keyedobjects.nib
  86. +584 −0 pt.lproj/PassphraseRetriever.xib
  87. +140 −311 pt.lproj/Preferences.xib
  88. +734 −69 zh.lproj/MainMenu.xib
  89. +218 −29 zh.lproj/MarkupPreview.xib
  90. BIN zh.lproj/PTKeyComboPanel.nib/keyedobjects.nib
  91. +53 −61 zh.lproj/{PTKeyComboPanel.nib/designable.nib → PTKeyComboPanel.xib}
  92. +0 −1,427 zh.lproj/PassphraseRetriever.nib/designable.nib
  93. BIN zh.lproj/PassphraseRetriever.nib/keyedobjects.nib
  94. +189 −281 it.lproj/PassphraseRetriever.nib/designable.nib → zh.lproj/PassphraseRetriever.xib
  95. +113 −293 zh.lproj/Preferences.xib
View
@@ -279,7 +279,7 @@ - (void)importURLInBackground:(NSURL*)aURL linkTitle:(NSString*)linkTitle recept
[self retain];
- (void)[[URLGetter alloc] initWithURL:aURL delegate:self userData:linkTitle];
+ (void)[[[URLGetter alloc] initWithURL:aURL delegate:self userData:linkTitle] autorelease];
}
- (NSArray*)importedNotes {
View
@@ -33,7 +33,7 @@
@class DFView;
@class PreviewController;
@class WordCountToken;
-@class AugmentedScrollView;
+//@class AugmentedScrollView;
@class ETContentView;
@class ETScrollView;
@@ -54,7 +54,6 @@
<NSToolbarDelegate, NSTableViewDelegate, NSWindowDelegate, NSTextFieldDelegate, NSTextViewDelegate>
#endif
{
-
IBOutlet NSMenuItem *fsMenuItem;
BOOL wasVert;
BOOL isAutocompleting;
@@ -67,7 +66,7 @@
TagEditingManager *TagEditer;
NSColor *backgrndColor;
NSColor *foregrndColor;
- int userScheme;
+ NSInteger userScheme;
NSString *noteFormat;
NSTextView *theFieldEditor;
NSDictionary *fieldAttributes;
@@ -77,7 +76,7 @@
RBSplitSubview *splitSubview;
RBSplitSubview *notesSubview;
RBSplitView *splitView;
- IBOutlet AugmentedScrollView *notesScrollView;
+ IBOutlet ETScrollView *notesScrollView;
IBOutlet ETScrollView *textScrollView;
IBOutlet NotesTableView *notesTableView;
IBOutlet LinkingEditor *textView;
@@ -177,14 +176,13 @@ void outletObjectAwoke(id sender);
- (NSWindow*)window;
//elasticwork
-- (void)setIsEditing:(BOOL)inBool inCell:(NSCell *)theCell;
+//- (void)setIsEditing:(BOOL)inBool inCell:(NSCell *)theCell;
- (void)setIsEditing:(BOOL)inBool;
//- (void)focusOnCtrlFld:(id)sender;
-- (void)drawNotesTable;
- (void)tableView:(NSTableView *)aTableView willDisplayCell:(id)aCell forTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex;
- (NSMenu *)statBarMenu;
-- (BOOL)toggleAttachedWindow:(id)sender;
-- (BOOL)toggleAttachedMenu:(id)sender;
+- (BOOL)toggleAttachedWindow:(NSNotification *)aNotification;
+- (BOOL)toggleAttachedMenu:(NSNotification *)aNotification;
- (NSArray *)commonLabels;
- (IBAction)multiTag:(id)sender;
- (void)setDualFieldInToolbar;
@@ -194,18 +192,16 @@ void outletObjectAwoke(id sender);
//- (void)showDualFieldView;
- (BOOL)dualFieldIsVisible;
- (IBAction)toggleCollapse:(id)sender;
-- (void)setMaxNoteBodyWidth;
- (IBAction)switchFullScreen:(id)sender;
- (BOOL)isInFullScreen;
- (IBAction)openFileInEditor:(id)sender;
- (NSArray *)getTxtAppList;
-- (void)updateTextApp:(id)sender;
+//- (void)updateTextApp:(id)sender;
- (IBAction)setBWColorScheme:(id)sender;
- (IBAction)setLCColorScheme:(id)sender;
- (IBAction)setUserColorScheme:(id)sender;
- (void)updateFieldAttributes;
- (void)updateColorScheme;
-- (NSColor*)_selectionColor;
- (void)setBackgrndColor:(NSColor *)inColor;
- (void)setForegrndColor:(NSColor *)inColor;
- (NSColor *)backgrndColor;
@@ -214,6 +210,8 @@ void outletObjectAwoke(id sender);
- (void)ensurePreviewIsVisible;
- (void)resetModTimers;
- (IBAction)toggleWordCount:(id)sender;
+- (void)popWordCount:(BOOL)showIt;
+- (void)popPreview:(BOOL)showIt;
- (IBAction)togglePreview:(id)sender;
- (IBAction)toggleSourceView:(id)sender;
- (IBAction)savePreview:(id)sender;
@@ -222,7 +220,14 @@ void outletObjectAwoke(id sender);
- (IBAction)printPreview:(id)sender;
- (void)postTextUpdate;
- (IBAction)selectPreviewMode:(id)sender;
-
+- (BOOL)setNoteIfNecessary;
- (void)updateRTL;
- (void)refreshNotesList;
+#pragma mark toggling dock icon
+- (void)togDockIcon:(NSNotification *)notification;
+- (void)relaunchAfterDelay;
+- (void)relaunchNV:(id)sender;
+- (void)reactivateAfterDelay;
+- (void)reActivate:(id)sender;
+
@end
Oops, something went wrong.

0 comments on commit b89886f

Please sign in to comment.