Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

More li'l bug fixes in preparation for 2.2 release

- Fixed "Use Selection for Find"
- Adjusted the NoteTable Overlay scroller position to not overlap the
date when using horizontal layout
- cmd-shift-return now inserts a new line before the current paragraph
when editing a note
  • Loading branch information...
commit 78a325b570d9dd7c5a71e993faf08d6e45e7fa00 1 parent eae5135
@elasticthreads elasticthreads authored
View
3  AppController_Importing.m
@@ -151,6 +151,9 @@ - (BOOL)addNotesFromPasteboard:(NSPasteboard*)pasteboard {
}
- (BOOL)interpretNVURL:(NSURL*)aURL {
+
+// NSLog(@"interpret URL:|||%@|||",[aURL absoluteString]);
+
// currently supported:
// hostname -> command
// first level -> search term / title
View
4 ETOverlayScroller.m
@@ -18,8 +18,8 @@ + (BOOL)isCompatibleWithOverlayScrollers {
- (id)initWithFrame:(NSRect)frameRect{
if ((self=[super initWithFrame:frameRect])) {
-// verticalPaddingLeft = 4.0f;
-// verticalPaddingRight = 2.75f;
+ verticalPaddingLeft = 5.25f;
+ verticalPaddingRight = 1.5f;
knobAlpha=0.7f;
slotAlpha=0.55f;
}
View
481 English.lproj/MainMenu.xib
@@ -65,7 +65,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{397, 464}</string>
<reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
@@ -1154,6 +1153,17 @@
<reference key="NSMixedImage" ref="795901623"/>
<int key="NSTag">102</int>
</object>
+ <object class="NSMenuItem" id="842414548">
+ <reference key="NSMenu" ref="606466726"/>
+ <bool key="NSIsDisabled">YES</bool>
+ <bool key="NSIsHidden">YES</bool>
+ <string key="NSTitle">Make Vertical Layout</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="838981797"/>
+ <reference key="NSMixedImage" ref="795901623"/>
+ <int key="NSTag">1</int>
+ </object>
</array>
</object>
</object>
@@ -1480,7 +1490,6 @@
</set>
<string key="NSFrame">{{206, 6}, {145, 14}}</string>
<reference key="NSSuperview" ref="638000589"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTokenFieldCell" key="NSCell" id="283957023">
@@ -1521,7 +1530,6 @@
<int key="NSvFlags">266</int>
<string key="NSFrame">{{0, 1}, {381, 23}}</string>
<reference key="NSSuperview" ref="638000589"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="512979971"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="896422238">
@@ -1547,7 +1555,6 @@
</array>
<string key="NSFrameSize">{381, 24}</string>
<reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="704744704"/>
<string key="NSClassName">DFView</string>
<string key="NSExtension">NSResponder</string>
@@ -1565,7 +1572,7 @@
<nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMinSize">{213, 107}</string>
<object class="NSView" key="NSWindowView" id="514982605">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSButton" id="750243775">
@@ -1618,7 +1625,6 @@
</object>
</array>
<string key="NSFrameSize">{353, 106}</string>
- <reference key="NSSuperview"/>
<reference key="NSNextKeyView" ref="801718804"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
@@ -3313,6 +3319,14 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<int key="connectionID">1414</int>
</object>
<object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">toggleLayoutOrientation:</string>
+ <reference key="source" ref="633888970"/>
+ <reference key="destination" ref="842414548"/>
+ </object>
+ <int key="connectionID">1518</int>
+ </object>
+ <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
<reference key="source" ref="638000589"/>
@@ -3979,6 +3993,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<reference ref="542571896"/>
<reference ref="777249999"/>
<reference ref="648478030"/>
+ <reference ref="842414548"/>
</array>
<reference key="parent" ref="561665048"/>
</object>
@@ -4764,6 +4779,11 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<reference key="object" ref="85880920"/>
<reference key="parent" ref="731693694"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">1517</int>
+ <reference key="object" ref="842414548"/>
+ <reference key="parent" ref="606466726"/>
+ </object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -4913,6 +4933,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<string key="145.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="149.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="150.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="1517.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="156.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="157.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="158.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4997,349 +5018,11 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">1414</int>
+ <int key="maxID">1518</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
- <string key="className">AppController</string>
- <string key="superclassName">NSObject</string>
- <dictionary class="NSMutableDictionary" key="actions">
- <string key="bringFocusToControlField:">id</string>
- <string key="copyNoteLink:">id</string>
- <string key="deleteNote:">id</string>
- <string key="editNoteExternally:">id</string>
- <string key="exportNote:">id</string>
- <string key="fieldAction:">id</string>
- <string key="importNotes:">id</string>
- <string key="lockPreview:">id</string>
- <string key="multiTag:">id</string>
- <string key="openFileInEditor:">id</string>
- <string key="printNote:">id</string>
- <string key="printPreview:">id</string>
- <string key="renameNote:">id</string>
- <string key="revealNote:">id</string>
- <string key="savePreview:">id</string>
- <string key="selectPreviewMode:">id</string>
- <string key="setBWColorScheme:">id</string>
- <string key="setLCColorScheme:">id</string>
- <string key="setUserColorScheme:">id</string>
- <string key="sharePreview:">id</string>
- <string key="showHelpDocument:">id</string>
- <string key="showPreferencesWindow:">id</string>
- <string key="switchFullScreen:">id</string>
- <string key="switchViewLayout:">id</string>
- <string key="syncWaitQuit:">id</string>
- <string key="tagNote:">id</string>
- <string key="testThing:">id</string>
- <string key="toggleCollapse:">id</string>
- <string key="toggleNVActivation:">id</string>
- <string key="togglePreview:">id</string>
- <string key="toggleSourceView:">id</string>
- <string key="toggleWordCount:">id</string>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="actionInfosByName">
- <object class="IBActionInfo" key="bringFocusToControlField:">
- <string key="name">bringFocusToControlField:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="copyNoteLink:">
- <string key="name">copyNoteLink:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="deleteNote:">
- <string key="name">deleteNote:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="editNoteExternally:">
- <string key="name">editNoteExternally:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="exportNote:">
- <string key="name">exportNote:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="fieldAction:">
- <string key="name">fieldAction:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="importNotes:">
- <string key="name">importNotes:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="lockPreview:">
- <string key="name">lockPreview:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="multiTag:">
- <string key="name">multiTag:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="openFileInEditor:">
- <string key="name">openFileInEditor:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="printNote:">
- <string key="name">printNote:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="printPreview:">
- <string key="name">printPreview:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="renameNote:">
- <string key="name">renameNote:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="revealNote:">
- <string key="name">revealNote:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="savePreview:">
- <string key="name">savePreview:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="selectPreviewMode:">
- <string key="name">selectPreviewMode:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="setBWColorScheme:">
- <string key="name">setBWColorScheme:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="setLCColorScheme:">
- <string key="name">setLCColorScheme:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="setUserColorScheme:">
- <string key="name">setUserColorScheme:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="sharePreview:">
- <string key="name">sharePreview:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="showHelpDocument:">
- <string key="name">showHelpDocument:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="showPreferencesWindow:">
- <string key="name">showPreferencesWindow:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="switchFullScreen:">
- <string key="name">switchFullScreen:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="switchViewLayout:">
- <string key="name">switchViewLayout:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="syncWaitQuit:">
- <string key="name">syncWaitQuit:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="tagNote:">
- <string key="name">tagNote:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="testThing:">
- <string key="name">testThing:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="toggleCollapse:">
- <string key="name">toggleCollapse:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="toggleNVActivation:">
- <string key="name">toggleNVActivation:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="togglePreview:">
- <string key="name">togglePreview:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="toggleSourceView:">
- <string key="name">toggleSourceView:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="toggleWordCount:">
- <string key="name">toggleWordCount:</string>
- <string key="candidateClassName">id</string>
- </object>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="outlets">
- <string key="editorStatusView">EmptyView</string>
- <string key="field">DualField</string>
- <string key="fsMenuItem">NSMenuItem</string>
- <string key="lockNoteItem">NSMenuItem</string>
- <string key="mainView">ETContentView</string>
- <string key="multiMarkdownPreview">NSMenuItem</string>
- <string key="notesScrollView">ETScrollView</string>
- <string key="notesTableView">NotesTableView</string>
- <string key="previewToggler">NSMenuItem</string>
- <string key="printPreviewItem">NSMenuItem</string>
- <string key="savePreviewItem">NSMenuItem</string>
- <string key="sparkleUpdateItem">NSMenuItem</string>
- <string key="statBarMenu">NSMenu</string>
- <string key="syncWaitPanel">NSPanel</string>
- <string key="syncWaitSpinner">NSProgressIndicator</string>
- <string key="textScrollView">ETScrollView</string>
- <string key="textView">LinkingEditor</string>
- <string key="textilePreview">NSMenuItem</string>
- <string key="window">NSWindow</string>
- <string key="wordCounter">WordCountToken</string>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
- <object class="IBToOneOutletInfo" key="editorStatusView">
- <string key="name">editorStatusView</string>
- <string key="candidateClassName">EmptyView</string>
- </object>
- <object class="IBToOneOutletInfo" key="field">
- <string key="name">field</string>
- <string key="candidateClassName">DualField</string>
- </object>
- <object class="IBToOneOutletInfo" key="fsMenuItem">
- <string key="name">fsMenuItem</string>
- <string key="candidateClassName">NSMenuItem</string>
- </object>
- <object class="IBToOneOutletInfo" key="lockNoteItem">
- <string key="name">lockNoteItem</string>
- <string key="candidateClassName">NSMenuItem</string>
- </object>
- <object class="IBToOneOutletInfo" key="mainView">
- <string key="name">mainView</string>
- <string key="candidateClassName">ETContentView</string>
- </object>
- <object class="IBToOneOutletInfo" key="multiMarkdownPreview">
- <string key="name">multiMarkdownPreview</string>
- <string key="candidateClassName">NSMenuItem</string>
- </object>
- <object class="IBToOneOutletInfo" key="notesScrollView">
- <string key="name">notesScrollView</string>
- <string key="candidateClassName">ETScrollView</string>
- </object>
- <object class="IBToOneOutletInfo" key="notesTableView">
- <string key="name">notesTableView</string>
- <string key="candidateClassName">NotesTableView</string>
- </object>
- <object class="IBToOneOutletInfo" key="previewToggler">
- <string key="name">previewToggler</string>
- <string key="candidateClassName">NSMenuItem</string>
- </object>
- <object class="IBToOneOutletInfo" key="printPreviewItem">
- <string key="name">printPreviewItem</string>
- <string key="candidateClassName">NSMenuItem</string>
- </object>
- <object class="IBToOneOutletInfo" key="savePreviewItem">
- <string key="name">savePreviewItem</string>
- <string key="candidateClassName">NSMenuItem</string>
- </object>
- <object class="IBToOneOutletInfo" key="sparkleUpdateItem">
- <string key="name">sparkleUpdateItem</string>
- <string key="candidateClassName">NSMenuItem</string>
- </object>
- <object class="IBToOneOutletInfo" key="statBarMenu">
- <string key="name">statBarMenu</string>
- <string key="candidateClassName">NSMenu</string>
- </object>
- <object class="IBToOneOutletInfo" key="syncWaitPanel">
- <string key="name">syncWaitPanel</string>
- <string key="candidateClassName">NSPanel</string>
- </object>
- <object class="IBToOneOutletInfo" key="syncWaitSpinner">
- <string key="name">syncWaitSpinner</string>
- <string key="candidateClassName">NSProgressIndicator</string>
- </object>
- <object class="IBToOneOutletInfo" key="textScrollView">
- <string key="name">textScrollView</string>
- <string key="candidateClassName">ETScrollView</string>
- </object>
- <object class="IBToOneOutletInfo" key="textView">
- <string key="name">textView</string>
- <string key="candidateClassName">LinkingEditor</string>
- </object>
- <object class="IBToOneOutletInfo" key="textilePreview">
- <string key="name">textilePreview</string>
- <string key="candidateClassName">NSMenuItem</string>
- </object>
- <object class="IBToOneOutletInfo" key="window">
- <string key="name">window</string>
- <string key="candidateClassName">NSWindow</string>
- </object>
- <object class="IBToOneOutletInfo" key="wordCounter">
- <string key="name">wordCounter</string>
- <string key="candidateClassName">WordCountToken</string>
- </object>
- </dictionary>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/AppController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">DFView</string>
- <string key="superclassName">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/DFView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">DualField</string>
- <string key="superclassName">NSTextField</string>
- <object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">notesTable</string>
- <string key="NS.object.0">NSTableView</string>
- </object>
- <object class="NSMutableDictionary" key="toOneOutletInfosByName">
- <string key="NS.key.0">notesTable</string>
- <object class="IBToOneOutletInfo" key="NS.object.0">
- <string key="name">notesTable</string>
- <string key="candidateClassName">NSTableView</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/DualField.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">ETContentView</string>
- <string key="superclassName">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/ETContentView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">ETScrollView</string>
- <string key="superclassName">NSScrollView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/ETScrollView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">EmptyView</string>
- <string key="superclassName">NSView</string>
- <object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">labelText</string>
- <string key="NS.object.0">NSTextField</string>
- </object>
- <object class="NSMutableDictionary" key="toOneOutletInfosByName">
- <string key="NS.key.0">labelText</string>
- <object class="IBToOneOutletInfo" key="NS.object.0">
- <string key="name">labelText</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/EmptyView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">FirstResponder</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="bold:">id</string>
@@ -5390,114 +5073,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<string key="minorKey"/>
</object>
</object>
- <object class="IBPartialClassDescription">
- <string key="className">HeaderViewWithMenu</string>
- <string key="superclassName">NSTableHeaderView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/HeaderViewWithMenu.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">LinkingEditor</string>
- <string key="superclassName">NSTextView</string>
- <dictionary class="NSMutableDictionary" key="actions">
- <string key="insertLink:">id</string>
- <string key="pasteMarkdownLink:">id</string>
- <string key="performFindPanelAction:">id</string>
- <string key="shiftLeftAction:">id</string>
- <string key="shiftRightAction:">id</string>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="actionInfosByName">
- <object class="IBActionInfo" key="insertLink:">
- <string key="name">insertLink:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="pasteMarkdownLink:">
- <string key="name">pasteMarkdownLink:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="performFindPanelAction:">
- <string key="name">performFindPanelAction:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="shiftLeftAction:">
- <string key="name">shiftLeftAction:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="shiftRightAction:">
- <string key="name">shiftRightAction:</string>
- <string key="candidateClassName">id</string>
- </object>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="outlets">
- <string key="controlField">NSTextField</string>
- <string key="notesTableView">NotesTableView</string>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
- <object class="IBToOneOutletInfo" key="controlField">
- <string key="name">controlField</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo" key="notesTableView">
- <string key="name">notesTableView</string>
- <string key="candidateClassName">NotesTableView</string>
- </object>
- </dictionary>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/LinkingEditor.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NotesTableView</string>
- <string key="superclassName">NSTableView</string>
- <dictionary class="NSMutableDictionary" key="actions">
- <string key="actionHideShowColumn:">id</string>
- <string key="toggleNoteBodyPreviews:">id</string>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="actionInfosByName">
- <object class="IBActionInfo" key="actionHideShowColumn:">
- <string key="name">actionHideShowColumn:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="toggleNoteBodyPreviews:">
- <string key="name">toggleNoteBodyPreviews:</string>
- <string key="candidateClassName">id</string>
- </object>
- </dictionary>
- <object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">controlField</string>
- <string key="NS.object.0">NSTextField</string>
- </object>
- <object class="NSMutableDictionary" key="toOneOutletInfosByName">
- <string key="NS.key.0">controlField</string>
- <object class="IBToOneOutletInfo" key="NS.object.0">
- <string key="name">controlField</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/NotesTableView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">StatusItemView</string>
- <string key="superclassName">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/StatusItemView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">WordCountToken</string>
- <string key="superclassName">NSTokenField</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/WordCountToken.h</string>
- </object>
- </object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
View
2  Info.plist
@@ -159,7 +159,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>91</string>
+ <string>92</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.productivity</string>
<key>LSArchitecturePriority</key>
View
1  LinkingEditor.h
@@ -113,6 +113,7 @@
- (void)hideTextFinderIfNecessary:(NSNotification *)aNotification;
- (IBAction)pasteMarkdownLink:(id)sender;
- (BOOL)clipboardHasLink;
+- (IBAction)toggleLayoutOrientation:(id)sender;
#endif
//
@end
View
66 LinkingEditor.m
@@ -947,9 +947,14 @@ - (void)keyDown:(NSEvent*)anEvent {
//maybe it works on someone else's 10.3 Mac
[self doCommandBySelector:@selector(insertBacktab:)];
return;
- }else if (([anEvent keyCode]==36)&&([anEvent modifierFlags]&NSCommandKeyMask)&&(!(([anEvent modifierFlags]&NSControlKeyMask)||([anEvent modifierFlags]&NSAlternateKeyMask)||([anEvent modifierFlags]&NSShiftKeyMask)))) {
- [self moveToEndOfParagraph:self];
- [self insertNewlineIgnoringFieldEditor:self];
+ }else if (([anEvent keyCode]==36)&&([anEvent modifierFlags]&NSCommandKeyMask)&&(!(([anEvent modifierFlags]&NSControlKeyMask)||([anEvent modifierFlags]&NSAlternateKeyMask)))) {
+ if ([anEvent modifierFlags]&NSShiftKeyMask) {
+ [self moveToBeginningOfParagraph:self];
+ [self moveBackward:self];
+ }else{
+ [self moveToEndOfParagraph:self];
+ }
+ [self insertNewlineIgnoringFieldEditor:self];
return;
}
//[super interpretKeyEvents:[NSArray arrayWithObject:anEvent]];
@@ -1356,17 +1361,24 @@ - (BOOL)validateMenuItem:(NSMenuItem*)menuItem {
//for ElasticThreads Find... fix. Also make sure all Find menuItems point their targets to LinkingEditor instead of firstResponder
//hide Find and Replace... on Pre-Lion machines
- if (!IsLionOrLater&&([menuItem tag]==12)) {
+ if (!IsLionOrLater){
+ if([menuItem tag]==12) {
[menuItem setHidden:YES];
return NO;
+ }
+ }else{
+ if ([menuItem tag]==7) {
+ if (![textFinder validateAction:[menuItem tag]]) {
+ return NO;
+ }
+ }
}
return YES;
}else if (action==@selector(pasteMarkdownLink:)) {
// if ([[NSUserDefaults standardUserDefaults]boolForKey:@"UsesMarkdownCompletions"]) {
// [menuItem setHidden:NO];
- if ([self clipboardHasLink]) {
-
+ if ([self clipboardHasLink]) {
return YES;
}
@@ -1423,6 +1435,7 @@ - (id)highlightLinkAtIndex:(unsigned)givenIndex {
- (void)clickedOnLink:(id)aLink atIndex:(NSUInteger)charIndex {
NSEvent *currentEvent = [[self window] currentEvent];
+// NSLog(@"clicked:%@",[currentEvent description]);
if (![prefsController URLsAreClickable] && [currentEvent modifierFlags] & NSCommandKeyMask) {
@@ -1435,6 +1448,15 @@ - (void)clickedOnLink:(id)aLink atIndex:(NSUInteger)charIndex {
}
if ([aLink isKindOfClass:[NSURL class]] && [[aLink scheme] isEqualToString:@"nv"]) {
+ if (([currentEvent type]==10)&&((([currentEvent modifierFlags] & NSAlternateKeyMask)&&([currentEvent modifierFlags] & NSCommandKeyMask))&&!(([currentEvent modifierFlags] & NSControlKeyMask)))) {
+ NSString *newURLString=[[aLink lastPathComponent]stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+ NSString *txtString=[[NSString stringWithFormat:@"[[%@]]",[aLink lastPathComponent]] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+ newURLString=[NSString stringWithFormat:@"nv://make/?title=%@&txt=%@",newURLString,txtString];
+// NSLog(@"newurlstring:%@",newURLString);
+ NSURL *newURL=[NSURL URLWithString:newURLString];
+// NSLog(@"interpret from cmd-keydown OLD URL:||%@|| AND NEW URL:|%@|",[aLink absoluteString],[newURL absoluteString]);
+ aLink=newURL;
+ }
[[NSApp delegate] interpretNVURL:aLink];
} else {
[super clickedOnLink:aLink atIndex:charIndex];
@@ -1875,7 +1897,7 @@ - (IBAction)insertLink:(id)sender{
NSRange selRange = [self selectedRange];
if (selRange.length>0) {
NSString *selString = [[self string] substringWithRange:selRange];
- selString = [NSString stringWithFormat:@"%@%@%@",@"[[",selString,@"]]"];
+ selString = [NSString stringWithFormat:@"[[%@]]",selString];
[super insertText:selString];
}else{
@@ -2057,7 +2079,6 @@ - (BOOL)clipboardHasLink{
}
}
}
-
return NO;
}
@@ -2258,9 +2279,9 @@ - (IBAction)performFindPanelAction:(id)sender {
return;
NSInteger findTag=[sender tag];
+
[sender setTarget:self];
if(!IsLionOrLater||([sender tag]!=7)){
-
NSString *pbType;
if (IsSnowLeopardOrLater) {
pbType=NSPasteboardTypeString;
@@ -2282,15 +2303,19 @@ - (IBAction)performFindPanelAction:(id)sender {
[lastImportedFindString release];
lastImportedFindString = [typedString retain];
}
+
+// NSLog(@"aqui typedSTring:|%@|",typedString);
}
if ([[self window] firstResponder]!=self) {
[[self window]makeFirstResponder:self];
}
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
if (IsLionOrLater) {
+
+ id newSender=[sender copy];
if((findTag!=1)&&(findTag!=12)&&(findTag!=7)&&(![self textFinderIsVisible])){
- [sender setTag:NSTextFinderActionShowFindInterface];
- [super performTextFinderAction:sender];
+ [newSender setTag:NSTextFinderActionShowFindInterface];
+ [super performTextFinderAction:newSender];
}
if (findTag==1) {
findTag=NSTextFinderActionShowFindInterface;
@@ -2305,25 +2330,27 @@ - (IBAction)performFindPanelAction:(id)sender {
}else if (findTag==6) {
findTag=NSTextFinderActionReplaceAndFind;
}else if (findTag==7) {
+// NSLog(@"aqui2");
findTag=(NSTextFinderActionSetSearchString);
}else if (findTag==9) {
findTag=NSTextFinderActionSelectAll;
}else if (findTag==12) {
findTag=NSTextFinderActionShowReplaceInterface;
}//NSTextFinderActionSelectAll = 9,
- [sender setTag:findTag];
+ [newSender setTag:findTag];
if ([textFinder validateAction:findTag]) {
- [super performTextFinderAction:sender];
+ [super performTextFinderAction:newSender];
if ((findTag==NSTextFinderActionSetSearchString)&&(![self textFinderIsVisible])) {
- [sender setTag:NSTextFinderActionShowFindInterface];
- [super performTextFinderAction:sender];
+ [newSender setTag:NSTextFinderActionShowFindInterface];
+ [super performTextFinderAction:newSender];
}
- [textFinder setFindIndicatorNeedsUpdate:YES];
+// [textFinder setFindIndicatorNeedsUpdate:YES];
}else{
NSLog(@"find action was invalid");
}
+ [newSender release];
return;
}
#endif
@@ -2340,4 +2367,11 @@ - (IBAction)performFindPanelAction:(id)sender {
[super performFindPanelAction:sender];
}
+- (IBAction)toggleLayoutOrientation:(id)sender {
+ /*not ready yet. lots of display bugs. no horizontal scrollers... need to make SELF horizontally scrollable and switch to default scrollers or add ETTRANSPARENTHORIZONTAL BOYS. ALSO preference, binding, tag switching, etc.*/
+
+// [super changeLayoutOrientation:sender];
+
+}
+
@end
View
4 UnifiedCell.m
@@ -82,7 +82,7 @@ - (float)tableFontFrameHeight {
- (NSRect)nv_titleRectForFrame:(NSRect)aFrame {
//fixed based on width of the cell
- //height could justifiably vary based on wrapped height of title string
+ //height could justifiably vary based on wrapped height of title string-9.0
return NSMakeRect(aFrame.origin.x, aFrame.origin.y, aFrame.size.width, [self tableFontFrameHeight]);
}
@@ -203,7 +203,7 @@ - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView {
}
NSString *dateStr = (showDateCreated ? dateCreatedStringOfNote : dateModifiedStringOfNote)(tv, noteObject, NSNotFound);
- [dateStr drawInRect:NSMakeRect(NSMaxX(cellFrame) - 67.0, NSMinY(cellFrame), 70.0, fontHeight) withAttributes:baseAttrs];
+ [dateStr drawInRect:NSMakeRect(NSMaxX(cellFrame) - 76.0, NSMinY(cellFrame), 70.0, fontHeight) withAttributes:baseAttrs];
}
if (ColumnIsSet(NoteLabelsColumn, columnsBitmap) && [labelsOfNote(noteObject) length]) {
View
32 zh.lproj/MainMenu.xib
@@ -66,6 +66,7 @@
<string key="NSFrameSize">{397, 464}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMinSize">{213, 129}</string>
@@ -1462,6 +1463,7 @@
<string key="NSFrame">{{206, 6}, {145, 14}}</string>
<reference key="NSSuperview" ref="638000589"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTokenFieldCell" key="NSCell" id="283957023">
<int key="NSCellFlags">67239424</int>
@@ -1946,7 +1948,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">
@@ -1977,7 +1979,8 @@
</set>
<string key="NSFrameSize">{399, 14}</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">
@@ -2035,6 +2038,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">
@@ -2071,6 +2075,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"/>
<int key="NSArrowsLoc">2</int>
<reference key="NSTarget" ref="26511639"/>
<string key="NSAction">_doScroller:</string>
@@ -2081,6 +2087,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"/>
<int key="NSsFlags">1</int>
<int key="NSArrowsLoc">2</int>
@@ -2091,14 +2098,16 @@ 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"/>
<reference key="NSContentView" ref="572834572"/>
</object>
<object class="NSScrollView" id="1012988132">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSClipView" id="313519754">
@@ -2110,13 +2119,15 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<int key="NSvFlags">4352</int>
<string key="NSFrameSize">{399, 136}</string>
<reference key="NSSuperview" ref="313519754"/>
- <reference key="NSNextKeyView" ref="902416422"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="64005823"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTableHeaderView" key="NSHeaderView" id="379318512">
<reference key="NSNextResponder" ref="643799251"/>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{399, 17}</string>
<reference key="NSSuperview" ref="643799251"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="313519754"/>
<reference key="NSTableView" ref="1037522481"/>
</object>
@@ -2153,6 +2164,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</array>
<string key="NSFrame">{{0, 17}, {399, 136}}</string>
<reference key="NSSuperview" ref="1012988132"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1037522481"/>
<reference key="NSDocView" ref="1037522481"/>
<object class="NSColor" key="NSBGColor" id="770513632">
@@ -2167,6 +2179,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{384, 17}, {15, 136}}</string>
<reference key="NSSuperview" ref="1012988132"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
<int key="NSArrowsLoc">2</int>
<reference key="NSTarget" ref="1012988132"/>
<string key="NSAction">_doScroller:</string>
@@ -2177,6 +2191,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {382, 15}}</string>
<reference key="NSSuperview" ref="1012988132"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="643799251"/>
<int key="NSsFlags">1</int>
<int key="NSArrowsLoc">2</int>
@@ -2192,6 +2207,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</array>
<string key="NSFrameSize">{399, 17}</string>
<reference key="NSSuperview" ref="1012988132"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="379318512"/>
<reference key="NSDocView" ref="379318512"/>
<reference key="NSBGColor" ref="770513632"/>
@@ -2199,7 +2215,9 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</object>
</array>
<string key="NSFrameSize">{399, 153}</string>
- <reference key="NSNextKeyView" ref="313519754"/>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="902416422"/>
<int key="NSsFlags">133648</int>
<reference key="NSVScroller" ref="64005823"/>
<reference key="NSHScroller" ref="902416422"/>
@@ -4936,7 +4954,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">1331</int>
+ <int key="maxID">1422</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
Please sign in to comment.
Something went wrong with that request. Please try again.