Add some support for help links and markers in RTF documents. These

end up as dedicated attachments in attributed strings.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@31828 72102866-910b-0410-8b05-ffd578937521

Source/GNUmakefile

@@ -239,7 +239,8 @@ GSGormLoader.m \
 GSGModelLoader.m \
 GSNibLoader.m \
 GSXibLoader.m \
-NSManagedObjectContext.m
+NSManagedObjectContext.m \
+GSHelpAttachment.m
 
 # Turn off NSMenuItem warning that NSMenuItem conforms to <NSObject>,
 # but does not implement <NSObject>'s methods itself (it inherits
@@ -447,7 +448,8 @@ GSInstantiator.h \
 GSSoundSink.h \
 GSSoundSource.h \
 GSWindowDecorationView.h \
-GSXibLoading.h
+GSXibLoading.h \
+GSHelpAttachment.h
 
 libgnustep-gui_HEADER_FILES = ${GUI_HEADERS}
 

Source/GSHelpAttachment.m

@@ -0,0 +1,108 @@
+/** <title>GSHelpAttachment</title>
+
+   Copyright (C) 2011 Free Software Foundation, Inc.
+
+   Author: Wolfgang Lux <wolfgang.lux@gmail.com>
+   Date:   Jan 2011
+   
+   This file is part of the GNUstep GUI Library.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; see the file COPYING.LIB.
+   If not, see <http://www.gnu.org/licenses/> or write to the 
+   Free Software Foundation, 51 Franklin Street, Fifth Floor, 
+   Boston, MA 02110-1301, USA.
+*/
+
+
+#import "AppKit/NSFileWrapper.h"
+#import "AppKit/NSImage.h"
+#import "GNUstepGUI/GSHelpAttachment.h"
+
+@implementation GSHelpLinkAttachment
+
+static NSImage *sharedHelpLinkIcon;
+
++ (void) initialize
+{
+  sharedHelpLinkIcon = [NSImage imageNamed: @"common_HelpLink"];
+}
+
+- (id) initWithFileName: (NSString *)aFileName
+	     markerName: (NSString *)aMarkerName
+{
+  NSFileWrapper *wrapper;
+
+  /* Create an empty wrapper so that we can supply an icon to the
+     attachment cell. */
+  wrapper = [[NSFileWrapper alloc] init];
+  [wrapper setIcon: sharedHelpLinkIcon];
+
+  if ((self = [super initWithFileWrapper: wrapper]) != nil)
+    {
+      ASSIGN(fileName, aFileName);
+      ASSIGN(markerName, aMarkerName);
+    }
+  RELEASE(wrapper);
+  return self;
+}
+
+- (void) dealloc
+{
+  RELEASE(fileName);
+  RELEASE(markerName);
+  [super dealloc];
+}
+
+- (NSString *) fileName
+{
+  return fileName;
+}
+
+- (NSString *) markerName
+{
+  return markerName;
+}
+
+@end
+
+@implementation GSHelpMarkerAttachment
+
+- (id) initWithMarkerName: (NSString *)aMarkerName
+{
+  NSFileWrapper *wrapper;
+
+  /* Create an empty wrapper so that we can supply an (nil) icon to
+     the attachment cell. */
+  wrapper = [[NSFileWrapper alloc] init];
+
+  if ((self = [super initWithFileWrapper: wrapper]) != nil)
+    {
+      ASSIGN(markerName, aMarkerName);
+    }
+  RELEASE(wrapper);
+  return self;
+}
+
+- (void) dealloc
+{
+  RELEASE(markerName);
+  [super dealloc];
+}
+
+- (NSString *) markerName
+{
+  return markerName;
+}
+
+@end

Source/NSFileWrapper.m

@@ -339,7 +339,7 @@
 
 - (NSImage*) icon
 {
-  if (_iconImage == nil)
+  if (_iconImage == nil && [self filename])
     {
       return [[NSWorkspace sharedWorkspace] iconForFile: [self filename]];
     }