Author: ericwa
Date: Sat Mar 15 00:34:01 2014
New Revision: 10571
URL: http://svn.gna.org/viewcvs/etoile?rev=10571&view=rev
Log:
Typewriter: clean out some unused stuff
Modified:
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTagListDataSource.m
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTextView.m
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTypewriterWindowController.m
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/en.lproj/Commits/org.etoile.Typewriter.json
Modified:
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTagListDataSource.m
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTagListDataSource.m?rev=10571&r1=10570&r2=10571&view=diff
==============================================================================
--- trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTagListDataSource.m
(original)
+++ trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTagListDataSource.m
Sat Mar 15 00:34:01 2014
@@ -134,10 +134,6 @@
}
}
NSLog(@"Caching selected tags as %@", oldSelection);
- if ([oldSelection isEmpty])
- {
- NSLog(@"hih");
- }
}
else
{
Modified: trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTextView.m
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTextView.m?rev=10571&r1=10570&r2=10571&view=diff
==============================================================================
--- trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTextView.m
(original)
+++ trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTextView.m Sat Mar
15 00:34:01 2014
@@ -14,36 +14,12 @@
- (id)initWithFrame:(NSRect)frame
{
self = [super initWithFrame:frame];
- if (self) {
- // Initialization code here.
- }
-
+ if (self)
+ {
+ }
return self;
}
-- (BOOL)readSelectionFromPasteboard:(NSPasteboard *)pboard type:(NSString
*)type
-{
- if ([type isEqual: NSFilenamesPboardType])
- {
- NSString *urlString = [[[pboard pasteboardItems] objectAtIndex: 0]
stringForType: @"public.file-url"];
- NSURL *url = [NSURL URLWithString: urlString];
-
- EWDocument *doc = [[[self window] windowController] document];
- COAttachmentID *attachmentKey = [doc.editingContext.store
importAttachmentFromURL: url];
- assert(attachmentKey != nil);
-
- NSLog(@"------- attaching URL: %@ >>>>> attachment hash: %@",
urlString, attachmentKey);
-
- NSFileWrapper *wrapper = [[NSFileWrapper alloc] initWithPath: [url
path]];
- NSTextAttachment *attachment = [[NSTextAttachment alloc]
initWithFileWrapper: wrapper];
- NSAttributedString *attributedString = [NSAttributedString
attributedStringWithAttachment: attachment];
-
- [[self textStorage] replaceCharactersInRange: [self selectedRange]
- withAttributedString: attributedString];
-
- return YES;
- }
- return [super readSelectionFromPasteboard: pboard type: type];
-}
+// TODO: copy -readSelectionFromPasteboard: from ProjectDemo if we want to
support attachment import via drag & drop
@end
Modified:
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTypewriterWindowController.m
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTypewriterWindowController.m?rev=10571&r1=10570&r2=10571&view=diff
==============================================================================
---
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTypewriterWindowController.m
(original)
+++
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTypewriterWindowController.m
Sat Mar 15 00:34:01 2014
@@ -777,15 +777,6 @@
metadata[@"minorEdit"] = @(isMinor);
-// if (requestCoalescing && ![[self undoTrack] isCoalescing])
-// {
-// [[self undoTrack] beginCoalescing];
-// }
-// else if (!requestCoalescing && [[self undoTrack] isCoalescing])
-// {
-// [[self undoTrack] endCoalescing];
-// }
-
[self.editingContext commitWithIdentifier: identifier
metadata: metadata
undoTrack: undoTrack
Modified:
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/en.lproj/Commits/org.etoile.Typewriter.json
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/en.lproj/Commits/org.etoile.Typewriter.json?rev=10571&r1=10570&r2=10571&view=diff
==============================================================================
---
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/en.lproj/Commits/org.etoile.Typewriter.json
(original)
+++
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/en.lproj/Commits/org.etoile.Typewriter.json
Sat Mar 15 00:34:01 2014
@@ -93,127 +93,6 @@
-
- "rename-document":
- {
- "type": "renaming",
- "shortDescription": "Rename document from '%@' to '%@'"
- },
-
- "set-branch":
- {
- "type": "branch",
- "shortDescription": "Set branch"
- },
-
- "set-branch-label":
- {
- "type": "branch",
- "shortDescription": "Set branch label"
- },
-
- "set-branch-importance":
- {
- "type": "branch",
- "shortDescription": "Set branch importance"
- },
-
- "add-item":
- {
- "type": "creation",
- "shortDescription": "Add item"
- },
-
- "add-child-item":
- {
- "type": "creation",
- "shortDescription": "Add child item"
- },
-
- "shift-left":
- {
- "type": "modification",
- "shortDescription": "Shift left"
- },
-
- "shift-right":
- {
- "type": "modification",
- "shortDescription": "Shift right"
- },
-
- "revert":
- {
- "type": "history",
- "shortDescription": "Revert to revision"
- },
-
- "step-backward":
- {
- "type": "history",
- "shortDescription": "Step Backward"
- },
-
- "step-forward":
- {
- "type": "history",
- "shortDescription": "Step Forward"
- },
-
- "delete":
- {
- "type": "deletion",
- "shortDescription": "Deleted one or several objects"
- },
-
- "rename":
- {
- "type": "renaming",
- "shortDescription": "Rename outline item"
- },
-
- "duplicate":
- {
- "type": "copy",
- "shortDescription": "Duplicate %@"
- },
-
- "drop":
- {
- "type": "copy",
- "shortDescription": "Drop items"
- },
-
- "draw-shape":
- {
- "type": "creation",
- "shortDescription": "Draw shape"
- },
-
- "resize-shape":
- {
- "type": "modification",
- "shortDescription": "Resize shape"
- },
-
- "move-shape":
- {
- "type": "modification",
- "shortDescription": "Move shape"
- },
-
- "change-shape-color":
- {
- "type": "modification",
- "shortDescription": "Change color of shape"
- },
-
- "delete-shape":
- {
- "type": "deletion",
- "shortDescription": "Delete shape"
- },
-
"insert-text":
{
"type": "modification",
_______________________________________________
Etoile-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/etoile-cvs
