gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 19:10:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updates for filesystem change.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@16566 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fedor 2003-04-28 02:33:10 +00:00
parent 05a7f146d9
commit ac8269a377
29 changed files with 128 additions and 1076 deletions
Download patch file Download diff file Expand all files Collapse all files

29
ChangeLog
View file

@ -1,3 +1,32 @@
2003-04-27 Adam Fedor <fedor@gnu.org>
* Updates for filesystem change.
* GNUmakefile (GNUSTEP_MAKEFILES): Remove
* ColorPickers/GNUmakefile, Documentation/GNUmakefile,
Images/GNUmakefile, KeyBindings/GNUmakefile, Model/GNUmakefile,
Panels/GNUmakefile, Panels/GNUmakefile.postamble,
PrinterTypes/GNUmakefile, PrinterTypes/GNUmakefile.postamble,
Source/GNUmakefile, TextConverters/GNUmakefile, Tools/GNUmakefile:
Idem and update install locations.
* Resources/GNUmakefile: Update for change in resource-set.make
* configure.ac: Replace $GNUSTEP_SYSTEM_ROOT/Makefiles with
$GNUSTEP_MAKEFILES. Replace Libraries with Library/Libraries.
Replace Headers with Library/Headers.
* Source/NSImage.m (+initialize, +imageNamed:): Use
+pathForLibraryResource:ofType:inDirectory.
* Source/NSPrintInfo (+initPrintInfoDefaults): Idem.
* Source/NSPrinter.m (getFile): Idem.
* Source/NSSound.m (+initialize, +soundNamed:): Idem.
* Source/NSView.m (-_loadPrinterProlog): Idem.
* Source/NSPageLayout.m
(-initWithContentRect:styleMask:backing:defer:screen:): Use
GSGuiBundle to get resources.
* Source/NSPrintPanel.m
( -initWithContentRect:styleMask:backing:defer:screen:): Idem.
* Source/NSSpellChecker.m ([NSSpellChecker -init]): Idem.
2003-03-27 Michael Hanni <michael@deviant-behavior.com> 2003-03-27 Michael Hanni <michael@deviant-behavior.com>
* Source/NSPopUpButtonCell.m (drawWithFrame:inView:): added a call * Source/NSPopUpButtonCell.m (drawWithFrame:inView:): added a call

4
ColorPickers/GNUmakefile
View file

@ -29,8 +29,6 @@
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES = ../gui.make GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES = ../gui.make
include $(GNUSTEP_MAKEFILES)/common.make include $(GNUSTEP_MAKEFILES)/common.make
@ -38,7 +36,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
#BUNDLE_NAME = StandardPicker NamedPicker WheelPicker #BUNDLE_NAME = StandardPicker NamedPicker WheelPicker
BUNDLE_NAME = StandardPicker WheelPicker BUNDLE_NAME = StandardPicker WheelPicker
BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ColorPickers BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ColorPickers
ADDITIONAL_INCLUDE_DIRS += -I../Headers -I../Headers/gnustep ADDITIONAL_INCLUDE_DIRS += -I../Headers -I../Headers/gnustep

4
Documentation/GNUmakefile
View file

@ -23,8 +23,6 @@
# Install into the system root by default # Install into the system root by default
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make
include $(GNUSTEP_MAKEFILES)/common.make include $(GNUSTEP_MAKEFILES)/common.make
@ -69,7 +67,7 @@ BUGS_DOC_INSTALL_DIR = Developer/Gui/ReleaseNotes/$(VERSION)
# file using the make file ../Source/DocMakefile. If headers are added to the # file using the make file ../Source/DocMakefile. If headers are added to the
# library, you need to modify that file to get the autogsdoc tool to use them. # library, you need to modify that file to get the autogsdoc tool to use them.
# #
REF_DOC_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Documentation/Developer/Gui/Reference REF_DOC_INSTALL_DIR = $(GNUSTEP_DOCUMENTATION)/Developer/Gui/Reference
-include GNUmakefile.preamble -include GNUmakefile.preamble

2
GNUmakefile
View file

@ -33,8 +33,6 @@ PACKAGE_NEEDS_CONFIGURE = YES
CVS_MODULE_NAME = gui CVS_MODULE_NAME = gui
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=gui.make GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=gui.make
include $(GNUSTEP_MAKEFILES)/common.make include $(GNUSTEP_MAKEFILES)/common.make

4
Images/GNUmakefile
View file

@ -23,14 +23,12 @@
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make
include $(GNUSTEP_MAKEFILES)/common.make include $(GNUSTEP_MAKEFILES)/common.make
include ../Version include ../Version
imagedir = $(GNUSTEP_RESOURCES)/Images imagedir = $(GNUSTEP_LIBRARY)/Images
IMAGE_FILES = \ IMAGE_FILES = \
GNUstep_Images_Copyright \ GNUstep_Images_Copyright \

8
KeyBindings/GNUmakefile
View file

@ -24,12 +24,12 @@ include $(GNUSTEP_MAKEFILES)/common.make
include $(GNUSTEP_MAKEFILES)/rules.make include $(GNUSTEP_MAKEFILES)/rules.make
$(GNUSTEP_RESOURCES)/KeyBindings: $(GNUSTEP_LIBRARY)/KeyBindings:
$(MKINSTALLDIRS) $@ $(MKINSTALLDIRS) $@
after-install:: $(GNUSTEP_RESOURCES)/KeyBindings after-install:: $(GNUSTEP_LIBRARY)/KeyBindings
$(INSTALL_DATA) DefaultKeyBindings.dict \ $(INSTALL_DATA) DefaultKeyBindings.dict \
$(GNUSTEP_RESOURCES)/KeyBindings/ $(GNUSTEP_LIBRARY)/KeyBindings/
after-uninstall:: after-uninstall::
rm -f $(GNUSTEP_RESOURCES)/KeyBindings/DefaultKeyBindings.dict rm -f $(GNUSTEP_LIBRARY)/KeyBindings/DefaultKeyBindings.dict

2
Model/GNUmakefile
View file

@ -24,8 +24,6 @@
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make
include $(GNUSTEP_MAKEFILES)/common.make include $(GNUSTEP_MAKEFILES)/common.make

7
Panels/GNUmakefile
View file

@ -28,8 +28,6 @@
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make
include $(GNUSTEP_MAKEFILES)/common.make include $(GNUSTEP_MAKEFILES)/common.make
@ -37,9 +35,8 @@ include ../Version
LANGUAGES = English LANGUAGES = English
LOCALIZED_RESOURCE_FILES = GSPrintPanel.gorm GSPageLayout.gorm LOCALIZED_RESOURCE_FILES = GSPrintPanel.gorm GSPageLayout.gorm \
SpellPanel.gmodel
PANELS = ColorPanel.gmodel SavePanel.gmodel SpellPanel.gmodel
-include GNUmakefile.preamble -include GNUmakefile.preamble
-include GNUmakefile.local -include GNUmakefile.local

19
Panels/GNUmakefile.postamble
View file

@ -23,30 +23,17 @@
# If not, write to the Free Software Foundation, # If not, write to the Free Software Foundation,
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
$(GNUSTEP_INSTALLATION_DIR)/Library/Model:
$(MKDIRS) $(GNUSTEP_INSTALLATION_DIR)/Library/Model
before-install:: $(GNUSTEP_INSTALLATION_DIR)/Library/Model
for f in $(PANELS); do \
$(INSTALL_DATA) $$f $(GNUSTEP_INSTALLATION_DIR)/Library/Model/; \
done
before-uninstall::
for f in $(PANELS); do \
rm -f $(GNUSTEP_INSTALLATION_DIR)/Library/Model/$$f; \
done
# Things to do after installing # Things to do after installing
after-install:: after-install::
ifneq ($(strip $(LOCALIZED_RESOURCE_FILES)),) ifneq ($(strip $(LOCALIZED_RESOURCE_FILES)),)
@(echo "Copying localized resources into system..."; \ @(echo "Copying localized resources into system..."; \
for l in $(LANGUAGES); do \ for l in $(LANGUAGES); do \
if [ ! -f $$l.lproj ]; then \ if [ ! -f $$l.lproj ]; then \
$(MKDIRS) $(GNUSTEP_RESOURCES)/$$l.lproj; \ $(MKDIRS) $(GNUSTEP_RESOURCES)/gnustep-gui/$$l.lproj; \
fi; \ fi; \
for f in $(LOCALIZED_RESOURCE_FILES); do \ for f in $(LOCALIZED_RESOURCE_FILES); do \
if [ -f $$l.lproj/$$f ]; then \ if [ -f $$l.lproj/$$f ]; then \
cp -r $$l.lproj/$$f $(GNUSTEP_RESOURCES)/$$l.lproj; \ cp -r $$l.lproj/$$f $(GNUSTEP_RESOURCES)/gnustep-gui/$$l.lproj; \
fi; \ fi; \
done; \ done; \
done;) done;)
@ -57,7 +44,7 @@ after-uninstall::
ifneq ($(strip $(LOCALIZED_RESOURCE_FILES)),) ifneq ($(strip $(LOCALIZED_RESOURCE_FILES)),)
@(for l in $(LANGUAGES); do \ @(for l in $(LANGUAGES); do \
if [ ! -f $$l.lproj ]; then \ if [ ! -f $$l.lproj ]; then \
rm -rf $(GNUSTEP_RESOURCES)/$$l.lproj; \ rm -rf $(GNUSTEP_RESOURCES)/gnustep-gui/$$l.lproj; \
fi; \ fi; \
done;) done;)
endif endif

874
Panels/SpellPanel.gmodel
View file

@ -1,874 +0,0 @@
{
"Object 1" = {elements = ("Object 2"); isa = NSMutableArray; };
"Object 2" = {
className = NSSpellChecker;
isa = IMCustomObject;
realObject = "Object 3";
};
"Object 3" = {
delegate = nil;
isa = NSApplication;
keyWindow = nil;
mainMenu = nil;
mainWindow = nil;
windows = "Object 4";
};
"Object 4" = {
elements = ("Object 5", "Object 9", "Object 11");
isa = NSMutableArray;
};
"Object 5" = {
backgroundColor = "Object 8";
backingType = 0;
contentFrame = "{x=0.000000; y=0.000000; width=256.000000; height=128.000000}";
contentView = "Object 6";
frameAutosaveName = nil;
hidesOnDeactivate = NO;
initialFirstResponder = nil;
isAutodisplay = NO;
isReleasedWhenClosed = NO;
isVisible = NO;
isa = NSWindow;
level = 0;
maxSize = "{width=340282346638528860000000000000000000000.000000; height=340282346638528860000000000000000000000.000000}";
minSize = "{width=0.000000; height=0.000000}";
representedFilename = "";
styleMask = 0;
title = "";
};
"Object 6" = {
autoresizesSubviews = YES;
autoresizingMask = 0;
bounds = "{x=0.000000; y=0.000000; width=256.000000; height=128.000000}";
frame = "{x=0.000000; y=0.000000; width=256.000000; height=128.000000}";
interfaceStyle = 0;
isa = NSView;
nextKeyView = nil;
nextResponder = "Object 5";
postsBoundsChangedNotifications = YES;
postsFrameChangedNotifications = YES;
previousKeyView = nil;
subviews = "Object 7";
superview = nil;
};
"Object 7" = {elements = (); isa = NSMutableArray; };
"Object 8" = {
alpha = 1.000000;
blue = 0.666667;
brightness = 0.666667;
colorSpaceName = NSCalibratedRGBColorSpace;
green = 0.666667;
hue = 0.000000;
isa = NSColor;
red = 0.666667;
saturation = 0.000000;
};
"Object 9" = {
backgroundColor = "Object 8";
backingType = 0;
contentFrame = "{x=0.000000; y=0.000000; width=193.000000; height=208.000000}";
contentView = "Object 10";
frameAutosaveName = nil;
hidesOnDeactivate = NO;
initialFirstResponder = nil;
isAutodisplay = NO;
isReleasedWhenClosed = NO;
isVisible = NO;
isa = NSWindow;
level = 0;
maxSize = "{width=340282346638528860000000000000000000000.000000; height=340282346638528860000000000000000000000.000000}";
minSize = "{width=0.000000; height=0.000000}";
representedFilename = "";
styleMask = 0;
title = "";
};
"Object 10" = {
autoresizesSubviews = YES;
autoresizingMask = 0;
bounds = "{x=0.000000; y=0.000000; width=193.000000; height=208.000000}";
frame = "{x=0.000000; y=0.000000; width=193.000000; height=208.000000}";
interfaceStyle = 0;
isa = NSView;
nextKeyView = nil;
nextResponder = "Object 9";
postsBoundsChangedNotifications = YES;
postsFrameChangedNotifications = YES;
previousKeyView = nil;
subviews = "Object 7";
superview = nil;
};
"Object 11" = {
backgroundColor = "Object 8";
backingType = 2;
becomesKeyOnlyIfNeeded = NO;
contentFrame = "{x=311.000000; y=220.000000; width=186.000000; height=304.000000}";
contentView = "Object 12";
frameAutosaveName = nil;
hidesOnDeactivate = YES;
initialFirstResponder = nil;
isAutodisplay = YES;
isFloatingPanel = NO;
isReleasedWhenClosed = NO;
isVisible = NO;
isa = NSPanel;
level = 0;
maxSize = "{width=340282346638528860000000000000000000000.000000; height=340282346638528860000000000000000000000.000000}";
minSize = "{width=0.000000; height=0.000000}";
representedFilename = "";
styleMask = 10;
title = Spelling;
worksWhenModal = NO;
};
"Object 12" = {
autoresizesSubviews = YES;
autoresizingMask = 0;
bounds = "{x=0.000000; y=0.000000; width=186.000000; height=304.000000}";
frame = "{x=1.000000; y=9.000000; width=186.000000; height=304.000000}";
interfaceStyle = 0;
isa = NSView;
nextKeyView = nil;
nextResponder = "Object 11";
postsBoundsChangedNotifications = YES;
postsFrameChangedNotifications = YES;
previousKeyView = nil;
subviews = "Object 13";
superview = nil;
};
"Object 13" = {
elements = (
"Object 14",
"Object 17",
"Object 19",
"Object 21",
"Object 22",
"Object 24",
"Object 34"
);
isa = NSMutableArray;
};
"Object 14" = {
autoresizesSubviews = NO;
autoresizingMask = 38;
bounds = "{x=0.000000; y=0.000000; width=72.000000; height=24.000000}";
cell = "Object 15";
frame = "{x=16.000000; y=40.000000; width=72.000000; height=24.000000}";
ignoresMultiClick = NO;
interfaceStyle = 0;
isEnabled = YES;
isa = NSButton;
nextKeyView = nil;
nextResponder = "Object 12";
postsBoundsChangedNotifications = YES;
postsFrameChangedNotifications = YES;
previousKeyView = nil;
subviews = "Object 7";
superview = "Object 12";
tag = 0;
};
"Object 15" = {
action = nil;
alignment = 2;
alternateImage = nil;
alternateTitle = "";
delay = 0.200000;
entryType = 0;
font = "Object 16";
highlightsBy = 14;
image = nil;
imagePosition = 0;
interval = 0.025000;
isBezeled = NO;
isBordered = YES;
isContinuous = NO;
isEditable = NO;
isEnabled = YES;
isScrollable = NO;
isSelectable = NO;
isTransparent = NO;
isa = NSButtonCell;
keyEquivalent = "";
keyEquivalentFont = "Object 16";
keyEquivalentModifierMask = 0;
sendActionMask = 0;
showsStateBy = 0;
state = 0;
stringValue = 0;
tag = 0;
target = nil;
title = Ignore;
type = 1;
wraps = YES;
};
"Object 16" = {isa = NSFont; name = Helvetica; size = 12.000000; };
"Object 17" = {
autoresizesSubviews = NO;
autoresizingMask = 35;
bounds = "{x=0.000000; y=0.000000; width=72.000000; height=24.000000}";
cell = "Object 18";
frame = "{x=96.000000; y=40.000000; width=72.000000; height=24.000000}";
ignoresMultiClick = NO;
interfaceStyle = 0;
isEnabled = YES;
isa = NSButton;
nextKeyView = nil;
nextResponder = "Object 12";
postsBoundsChangedNotifications = YES;
postsFrameChangedNotifications = YES;
previousKeyView = nil;
subviews = "Object 7";
superview = "Object 12";
tag = 0;
};
"Object 18" = {
action = nil;
alignment = 2;
alternateImage = nil;
alternateTitle = "";
delay = 0.200000;
entryType = 0;
font = "Object 16";
highlightsBy = 14;
image = nil;
imagePosition = 0;
interval = 0.025000;
isBezeled = NO;
isBordered = YES;
isContinuous = NO;
isEditable = NO;
isEnabled = YES;
isScrollable = NO;
isSelectable = NO;
isTransparent = NO;
isa = NSButtonCell;
keyEquivalent = "";
keyEquivalentFont = "Object 16";
keyEquivalentModifierMask = 0;
sendActionMask = 0;
showsStateBy = 0;
state = 0;
stringValue = 0;
tag = 0;
target = nil;
title = Guess;
type = 1;
wraps = YES;
};
"Object 19" = {
autoresizesSubviews = NO;
autoresizingMask = 35;
bounds = "{x=0.000000; y=0.000000; width=72.000000; height=24.000000}";
cell = "Object 20";
frame = "{x=96.000000; y=8.000000; width=72.000000; height=24.000000}";
ignoresMultiClick = NO;
interfaceStyle = 0;
isEnabled = YES;
isa = NSButton;
nextKeyView = nil;
nextResponder = "Object 12";
postsBoundsChangedNotifications = YES;
postsFrameChangedNotifications = YES;
previousKeyView = nil;
subviews = "Object 7";
superview = "Object 12";
tag = 0;
};
"Object 20" = {
action = nil;
alignment = 2;
alternateImage = nil;
alternateTitle = "";
delay = 0.200000;
entryType = 0;
font = "Object 16";
highlightsBy = 14;
image = nil;
imagePosition = 0;
interval = 0.025000;
isBezeled = NO;
isBordered = YES;
isContinuous = NO;
isEditable = NO;
isEnabled = YES;
isScrollable = NO;
isSelectable = NO;
isTransparent = NO;
isa = NSButtonCell;
keyEquivalent = "";
keyEquivalentFont = "Object 16";
keyEquivalentModifierMask = 0;
sendActionMask = 0;
showsStateBy = 0;
state = 0;
stringValue = 0;
tag = 0;
target = nil;
title = Correct;
type = 1;
wraps = YES;
};
"Object 21" = {
acceptsArrowKeys = NO;
allowsBranchSelection = NO;
allowsEmptySelection = YES;
allowsMultipleSelection = NO;
autoresizesSubviews = NO;
autoresizingMask = 18;
bounds = "{x=0.000000; y=0.000000; width=152.000000; height=113.000000}";
cell = nil;
delegate = nil;
doubleAction = nil;
frame = "{x=16.000000; y=96.000000; width=152.000000; height=113.000000}";
hasHorizontalScroller = NO;
ignoresMultiClick = NO;
interfaceStyle = 0;
isEnabled = YES;
isTitled = YES;
isa = NSBrowser;
maxVisibleColumns = 1;
minColumnWidth = 1;
nextKeyView = nil;
nextResponder = "Object 12";
path = "";
pathSeparator = /;
postsBoundsChangedNotifications = YES;
postsFrameChangedNotifications = YES;
previousKeyView = nil;
reusesColumns = NO;
sendsActionOnArrowKeys = NO;
separatesColumns = YES;
subviews = "Object 7";
superview = "Object 12";
tag = 0;
takesTitleFromPreviousColumn = YES;
};
"Object 22" = {
autoresizesSubviews = NO;
autoresizingMask = 38;
bounds = "{x=0.000000; y=0.000000; width=72.000000; height=24.000000}";
cell = "Object 23";
frame = "{x=16.000000; y=8.000000; width=72.000000; height=24.000000}";
ignoresMultiClick = NO;
interfaceStyle = 0;
isEnabled = YES;
isa = NSButton;
nextKeyView = nil;
nextResponder = "Object 12";
postsBoundsChangedNotifications = YES;
postsFrameChangedNotifications = YES;
previousKeyView = nil;
subviews = "Object 7";
superview = "Object 12";
tag = 0;
};
"Object 23" = {
action = nil;
alignment = 2;
alternateImage = nil;
alternateTitle = "";
delay = 0.200000;
entryType = 0;
font = "Object 16";
highlightsBy = 14;
image = nil;
imagePosition = 0;
interval = 0.025000;
isBezeled = NO;
isBordered = YES;
isContinuous = NO;
isEditable = NO;
isEnabled = YES;
isScrollable = NO;
isSelectable = NO;
isTransparent = NO;
isa = NSButtonCell;
keyEquivalent = "";
keyEquivalentFont = "Object 16";
keyEquivalentModifierMask = 0;
sendActionMask = 0;
showsStateBy = 0;
state = 0;
stringValue = 0;
tag = 0;
target = nil;
title = "Find Next";
type = 1;
wraps = YES;
};
"Object 24" = {
autoresizesSubviews = NO;
autoresizingMask = 10;
borderType = 3;
bounds = "{x=0.000000; y=0.000000; width=152.000000; height=89.000000}";
contentView = "Object 26";
contentViewMargins = "{width=5.000000; height=5.000000}";
frame = "{x=16.000000; y=216.000000; width=152.000000; height=89.000000}";
interfaceStyle = 0;
isa = NSBox;
nextKeyView = nil;
nextResponder = "Object 12";
postsBoundsChangedNotifications = YES;
postsFrameChangedNotifications = YES;
previousKeyView = nil;
subviews = "Object 25";
superview = "Object 12";
title = Dictionary;
titleFont = "Object 16";
titlePosition = 2;
};
"Object 25" = {elements = ("Object 26"); isa = NSMutableArray; };
"Object 26" = {
autoresizesSubviews = YES;
autoresizingMask = 0;
bounds = "{x=0.000000; y=0.000000; width=138.000000; height=66.000000}";
frame = "{x=7.000000; y=7.000000; width=138.000000; height=66.000000}";
interfaceStyle = 0;
isa = NSView;
nextKeyView = nil;
nextResponder = "Object 24";
postsBoundsChangedNotifications = YES;
postsFrameChangedNotifications = YES;
previousKeyView = nil;
subviews = "Object 27";
superview = "Object 24";
};
"Object 27" = {
elements = ("Object 28", "Object 30", "Object 32");
isa = NSMutableArray;
};
"Object 28" = {
autoresizesSubviews = NO;
autoresizingMask = 35;
bounds = "{x=0.000000; y=0.000000; width=64.000000; height=24.000000}";
cell = "Object 29";
frame = "{x=72.000000; y=0.000000; width=64.000000; height=24.000000}";
ignoresMultiClick = NO;
interfaceStyle = 0;
isEnabled = YES;
isa = NSButton;
nextKeyView = nil;
nextResponder = "Object 26";
postsBoundsChangedNotifications = YES;
postsFrameChangedNotifications = YES;
previousKeyView = nil;
subviews = "Object 7";
superview = "Object 26";
tag = 0;
};
"Object 29" = {
action = nil;
alignment = 2;
alternateImage = nil;
alternateTitle = "";
delay = 0.200000;
entryType = 0;
font = "Object 16";
highlightsBy = 14;
image = nil;
imagePosition = 0;
interval = 0.025000;
isBezeled = NO;
isBordered = YES;
isContinuous = NO;
isEditable = NO;
isEnabled = YES;
isScrollable = NO;
isSelectable = NO;
isTransparent = NO;
isa = NSButtonCell;
keyEquivalent = "";
keyEquivalentFont = "Object 16";
keyEquivalentModifierMask = 0;
sendActionMask = 0;
showsStateBy = 0;
state = 0;
stringValue = 0;
tag = 0;
target = nil;
title = Forget;
type = 1;
wraps = YES;
};
"Object 30" = {
autoresizesSubviews = NO;
autoresizingMask = 38;
bounds = "{x=0.000000; y=0.000000; width=64.000000; height=24.000000}";
cell = "Object 31";
frame = "{x=0.000000; y=0.000000; width=64.000000; height=24.000000}";
ignoresMultiClick = NO;
interfaceStyle = 0;
isEnabled = YES;
isa = NSButton;
nextKeyView = nil;
nextResponder = "Object 26";
postsBoundsChangedNotifications = YES;
postsFrameChangedNotifications = YES;
previousKeyView = nil;
subviews = "Object 7";
superview = "Object 26";
tag = 0;
};
"Object 31" = {
action = nil;
alignment = 2;
alternateImage = nil;
alternateTitle = "";
delay = 0.200000;
entryType = 0;
font = "Object 16";
highlightsBy = 14;
image = nil;
imagePosition = 0;
interval = 0.025000;
isBezeled = NO;
isBordered = YES;
isContinuous = NO;
isEditable = NO;
isEnabled = YES;
isScrollable = NO;
isSelectable = NO;
isTransparent = NO;
isa = NSButtonCell;
keyEquivalent = "";
keyEquivalentFont = "Object 16";
keyEquivalentModifierMask = 0;
sendActionMask = 0;
showsStateBy = 0;
state = 0;
stringValue = 0;
tag = 0;
target = nil;
title = Learn;
type = 1;
wraps = YES;
};
"Object 32" = {
action = nil;
autoresizingMask = 2;
frame = "{x=0.000000; y=32.000000; width=136.000000; height=22.000000}";
isEnabled = YES;
isa = NSPopUpButton;
itemArray = ("Object 33");
pullsDown = NO;
tag = 0;
target = nil;
};
"Object 33" = {
action = nil;
image = nil;
isEnabled = YES;
isa = NSMenuItem;
keyEquivalent = "";
representedObject = nil;
state = 1;
tag = 0;
target = nil;
title = English;
};
"Object 34" = {
autoresizesSubviews = NO;
autoresizingMask = 34;
bounds = "{x=0.000000; y=0.000000; width=152.000000; height=21.000000}";
cell = "Object 35";
delegate = nil;
errorAction = nil;
frame = "{x=16.000000; y=72.000000; width=152.000000; height=21.000000}";
ignoresMultiClick = NO;
interfaceStyle = 0;
isEnabled = YES;
isa = NSTextField;
nextKeyView = nil;
nextResponder = "Object 12";
postsBoundsChangedNotifications = YES;
postsFrameChangedNotifications = YES;
previousKeyView = nil;
subviews = "Object 7";
superview = "Object 12";
tag = 0;
};
"Object 35" = {
action = nil;
alignment = 0;
backgroundColor = "Object 36";
drawsBackground = YES;
entryType = 0;
font = "Object 16";
image = nil;
isBezeled = YES;
isBordered = NO;
isContinuous = NO;
isEditable = YES;
isEnabled = YES;
isScrollable = YES;
isSelectable = YES;
isa = NSTextFieldCell;
sendActionMask = 0;
state = 1;
stringValue = "";
tag = 0;
target = nil;
textColor = "Object 37";
type = 1;
wraps = NO;
};
"Object 36" = {
alpha = 1.000000;
blue = 1.000000;
brightness = 1.000000;
colorSpaceName = NSCalibratedRGBColorSpace;
green = 1.000000;
hue = 0.000000;
isa = NSColor;
red = 1.000000;
saturation = 0.000000;
};
"Object 37" = {
alpha = 1.000000;
blue = 0.000000;
brightness = 0.000000;
colorSpaceName = NSCalibratedRGBColorSpace;
green = 0.000000;
hue = 0.000000;
isa = NSColor;
red = 0.000000;
saturation = 0.000000;
};
"Object 38" = {
elements = (
"Object 39",
"Object 41",
"Object 43",
"Object 45",
"Object 47",
"Object 49",
"Object 51",
"Object 53",
"Object 55",
"Object 57",
"Object 59",
"Object 61",
"Object 63",
"Object 65",
"Object 67",
"Object 69",
"Object 71",
"Object 73",
"Object 75",
"Object 77",
"Object 78",
"Object 80",
"Object 82",
"Object 83",
"Object 84",
"Object 85",
"Object 86",
"Object 87",
"Object 88",
"Object 89"
);
isa = NSMutableArray;
};
"Object 39" = {
destination = "Object 2";
isa = IMControlConnector;
label = "Object 40";
source = "Object 28";
};
"Object 40" = {isa = NSString; string = "_forget:"; };
"Object 41" = {
destination = "Object 2";
isa = IMControlConnector;
label = "Object 42";
source = "Object 30";
};
"Object 42" = {isa = NSString; string = "_learn:"; };
"Object 43" = {
destination = "Object 2";
isa = IMControlConnector;
label = "Object 44";
source = "Object 17";
};
"Object 44" = {isa = NSString; string = "_guess:"; };
"Object 45" = {
destination = "Object 2";
isa = IMControlConnector;
label = "Object 46";
source = "Object 22";
};
"Object 46" = {isa = NSString; string = "_findNext:"; };
"Object 47" = {
destination = "Object 2";
isa = IMControlConnector;
label = "Object 48";
source = "Object 19";
};
"Object 48" = {isa = NSString; string = "_correct:"; };
"Object 49" = {
destination = "Object 2";
isa = IMControlConnector;
label = "Object 50";
source = "Object 14";
};
"Object 50" = {isa = NSString; string = "_ignore:"; };
"Object 51" = {
destination = "Object 21";
isa = IMOutletConnector;
label = "Object 52";
source = "Object 2";
};
"Object 52" = {isa = NSString; string = _accessoryView; };
"Object 53" = {
destination = "Object 34";
isa = IMOutletConnector;
label = "Object 54";
source = "Object 2";
};
"Object 54" = {isa = NSString; string = _wordField; };
"Object 55" = {
destination = "Object 11";
isa = IMOutletConnector;
label = "Object 56";
source = "Object 2";
};
"Object 56" = {isa = NSString; string = _spellPanel; };
"Object 57" = {
destination = "Object 32";
isa = IMOutletConnector;
label = "Object 58";
source = "Object 2";
};
"Object 58" = {isa = NSString; string = _dictionaryPulldown; };
"Object 59" = {
destination = "Object 2";
isa = IMControlConnector;
label = "Object 60";
source = "Object 32";
};
"Object 60" = {isa = NSString; string = "_switchDictionary:"; };
"Object 61" = {
destination = "Object 2";
isa = IMControlConnector;
label = "Object 62";
source = "Object 21";
};
"Object 62" = {isa = NSString; string = "_highlightGuess:"; };
"Object 63" = {
destination = "Object 2";
isa = IMOutletConnector;
label = "Object 64";
source = "Object 11";
};
"Object 64" = {isa = NSString; string = delegate; };
"Object 65" = {
destination = "Object 30";
isa = IMOutletConnector;
label = "Object 66";
source = "Object 2";
};
"Object 66" = {isa = NSString; string = _learnButton; };
"Object 67" = {
destination = "Object 28";
isa = IMOutletConnector;
label = "Object 68";
source = "Object 2";
};
"Object 68" = {isa = NSString; string = _forgetButton; };
"Object 69" = {
destination = "Object 14";
isa = IMOutletConnector;
label = "Object 70";
source = "Object 2";
};
"Object 70" = {isa = NSString; string = _ignoreButton; };
"Object 71" = {
destination = "Object 17";
isa = IMOutletConnector;
label = "Object 72";
source = "Object 2";
};
"Object 72" = {isa = NSString; string = _guessButton; };
"Object 73" = {
destination = "Object 22";
isa = IMOutletConnector;
label = "Object 74";
source = "Object 2";
};
"Object 74" = {isa = NSString; string = _findNextButton; };
"Object 75" = {
destination = "Object 19";
isa = IMOutletConnector;
label = "Object 76";
source = "Object 2";
};
"Object 76" = {isa = NSString; string = _correctButton; };
"Object 77" = {
destination = "Object 2";
isa = IMOutletConnector;
label = "Object 64";
source = "Object 21";
};
"Object 78" = {
destination = "Object 19";
isa = IMOutletConnector;
label = "Object 79";
source = "Object 11";
};
"Object 79" = {isa = NSString; string = initialFirstResponder; };
"Object 80" = {
destination = "Object 17";
isa = IMOutletConnector;
label = "Object 81";
source = "Object 14";
};
"Object 81" = {isa = NSString; string = nextKeyView; };
"Object 82" = {
destination = "Object 22";
isa = IMOutletConnector;
label = "Object 81";
source = "Object 17";
};
"Object 83" = {
destination = "Object 19";
isa = IMOutletConnector;
label = "Object 81";
source = "Object 22";
};
"Object 84" = {
destination = "Object 28";
isa = IMOutletConnector;
label = "Object 81";
source = "Object 30";
};
"Object 85" = {
destination = "Object 21";
isa = IMOutletConnector;
label = "Object 81";
source = "Object 28";
};
"Object 86" = {
destination = "Object 34";
isa = IMOutletConnector;
label = "Object 81";
source = "Object 21";
};
"Object 87" = {
destination = "Object 14";
isa = IMOutletConnector;
label = "Object 81";
source = "Object 34";
};
"Object 88" = {
destination = "Object 30";
isa = IMOutletConnector;
label = "Object 81";
source = "Object 32";
};
"Object 89" = {
destination = "Object 32";
isa = IMOutletConnector;
label = "Object 81";
source = "Object 24";
};
RootObject = {Connections = "Object 38"; Objects = "Object 1"; isa = GMModel; };
TopLevelObjects = (RootObject);
Version = 1;
}

5
PrinterTypes/GNUmakefile
View file

@ -23,14 +23,13 @@
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make
include $(GNUSTEP_MAKEFILES)/common.make include $(GNUSTEP_MAKEFILES)/common.make
include ../Version include ../Version
INSTALL_DIR = $(GNUSTEP_RESOURCES)/PrinterTypes RES_INSTALL_DIR = $(GNUSTEP_LIBRARY)/PostScript
PPD_INSTALL_DIR = $(GNUSTEP_LIBRARY)/PostScript/PPD
RESOURCE_DIRS = \ RESOURCE_DIRS = \
English.lproj \ English.lproj \

20
PrinterTypes/GNUmakefile.postamble
View file

@ -41,22 +41,22 @@
# Things to do after compiling # Things to do after compiling
# after-all:: # after-all::
$(INSTALL_DIR): $(PPD_INSTALL_DIR):
$(MKDIRS) $(INSTALL_DIR) $(MKDIRS) $(PPD_INSTALL_DIR)
# Things to do before installing # Things to do before installing
before-install:: $(INSTALL_DIR) before-install:: $(PPD_INSTALL_DIR)
# Things to do after installing # Things to do after installing
after-install:: after-install::
for dirs in $(RESOURCE_DIRS); do \ for dirs in $(RESOURCE_DIRS); do \
if [ ! -d $(INSTALL_DIR)/$$dirs ]; then \ if [ ! -d $(PPD_INSTALL_DIR)/$$dirs ]; then \
$(MKDIRS) $(INSTALL_DIR)/$$dirs ; \ $(MKDIRS) $(PPD_INSTALL_DIR)/$$dirs ; \
fi; \ fi; \
$(INSTALL_DATA) $$dirs/*ppd $(INSTALL_DIR)/$$dirs/ ; \ $(INSTALL_DATA) $$dirs/*ppd $(PPD_INSTALL_DIR)/$$dirs/ ; \
done; \ done; \
for file in $(RESOURCE_FILES); do \ for file in $(RESOURCE_FILES); do \
$(INSTALL_DATA) $$file $(INSTALL_DIR) ; \ $(INSTALL_DATA) $$file $(RES_INSTALL_DIR) ; \
done done
# Things to do before uninstalling # Things to do before uninstalling
@ -65,9 +65,11 @@ after-install::
# Things to do after uninstalling # Things to do after uninstalling
after-uninstall:: after-uninstall::
for file in $(RESOURCE_DIRS); do \ for file in $(RESOURCE_DIRS); do \
rm -rf $(INSTALL_DIR)/$$file ; \ rm -rf $(PPD_INSTALL_DIR)/$$file ; \
done
for file in $(RESOURCE_FILES); do \
rm $(RES_INSTALL_DIR)/$$file ; \
done done
rm -rf $(INSTALL_DIR)
# Things to do before cleaning # Things to do before cleaning
# before-clean:: # before-clean::

3
Resources/GNUmakefile
View file

@ -27,8 +27,7 @@ GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make
include $(GNUSTEP_MAKEFILES)/common.make include $(GNUSTEP_MAKEFILES)/common.make
RESOURCE_SET_NAME = gui-resources RESOURCE_SET_NAME = gui-resources
gui-resources_RESOURCE_FILES_INSTALL_DIR = \ gui-resources_RESOURCE_FILES_INSTALL_DIR = gnustep-gui
Libraries/Resources/gnustep-gui/Resources
gui-resources_LANGUAGES = English Italian gui-resources_LANGUAGES = English Italian
gui-resources_LOCALIZED_RESOURCE_FILES = Localizable.strings gui-resources_LOCALIZED_RESOURCE_FILES = Localizable.strings

2
Source/GNUmakefile
View file

@ -26,8 +26,6 @@
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make
include $(GNUSTEP_MAKEFILES)/common.make include $(GNUSTEP_MAKEFILES)/common.make

4
Source/GNUmakefile.preamble
View file

@ -43,9 +43,7 @@
GNUSTEP_INSTALL_PREFIX=$(GNUSTEP_SYSTEM_ROOT) GNUSTEP_INSTALL_PREFIX=$(GNUSTEP_SYSTEM_ROOT)
# Additional flags to pass to the preprocessor # Additional flags to pass to the preprocessor
GNUSTEP_INSTALL_LIBDIR=$(GNUSTEP_LIBRARIES_ROOT) ADDITIONAL_CPPFLAGS = \
ADDITIONAL_CPPFLAGS = -DGNUSTEP_INSTALL_LIBDIR=\"$(GNUSTEP_INSTALL_LIBDIR)\" \
${DPS_DEFINE} \
-DGNUSTEP_INSTALL_PREFIX=$(GNUSTEP_INSTALL_PREFIX) \ -DGNUSTEP_INSTALL_PREFIX=$(GNUSTEP_INSTALL_PREFIX) \
-DGNUSTEP_TARGET_DIR=\"$(GNUSTEP_TARGET_DIR)\" \ -DGNUSTEP_TARGET_DIR=\"$(GNUSTEP_TARGET_DIR)\" \
-DGNUSTEP_TARGET_CPU=\"$(GNUSTEP_TARGET_CPU)\" \ -DGNUSTEP_TARGET_CPU=\"$(GNUSTEP_TARGET_CPU)\" \

48
Source/NSImage.m
View file

@ -152,16 +152,9 @@ repd_for_rep(NSArray *_reps, NSImageRep *rep)
{ {
if (self == [NSImage class]) if (self == [NSImage class])
{ {
#ifdef GNUSTEP_BASE_LIBRARY NSString *path = [NSBundle pathForLibraryResource: @"nsmapping"
NSString *path = [NSBundle pathForGNUstepResource: @"nsmapping" ofType: @"strings"
ofType: @"strings" inDirectory: @"Images"];
inDirectory: @"Images"];
#else
NSBundle *system = [NSBundle bundleWithPath: @GNUSTEP_INSTALL_LIBDIR];
NSString *path = [system pathForResource: @"nsmapping"
ofType: @"strings"
inDirectory: @"Images"];
#endif
// Initial version // Initial version
[self setVersion: 1]; [self setVersion: 1];
@ -243,46 +236,23 @@ repd_for_rep(NSArray *_reps, NSImageRep *rep)
{ {
if (ext) if (ext)
{ {
#ifdef GNUSTEP_BASE_LIBRARY path = [NSBundle pathForLibraryResource: the_name
path = [NSBundle pathForGNUstepResource: the_name ofType: ext
ofType: ext inDirectory: @"Images"];
inDirectory: @"Images"];
#else
NSBundle *system = [NSBundle bundleWithPath: @GNUSTEP_INSTALL_LIBDIR];
path = [system pathForResource: the_name
ofType: ext
inDirectory: @"Images"];
#endif
} }
else else
{ {
#ifdef GNUSTEP_BASE_LIBRARY
id o, e; id o, e;
e = [array objectEnumerator]; e = [array objectEnumerator];
while ((o = [e nextObject])) while ((o = [e nextObject]))
{ {
path = [NSBundle pathForGNUstepResource: the_name path = [NSBundle pathForLibraryResource: the_name
ofType: o ofType: o
inDirectory: @"Images"]; inDirectory: @"Images"];
if (path != nil && [path length] != 0) if (path != nil && [path length] != 0)
break; break;
} }
#else
NSBundle *system = [NSBundle bundleWithPath: @GNUSTEP_INSTALL_LIBDIR];
id o, e;
e = [array objectEnumerator];
while ((o = [e nextObject]))
{
path = [system pathForResource: the_name
ofType: o
inDirectory: @"Images"];
if (path != nil && [path length] != 0)
break;
}
#endif
} }
} }

5
Source/NSPageLayout.m
View file

@ -42,6 +42,7 @@
#include <AppKit/NSPrintInfo.h> #include <AppKit/NSPrintInfo.h>
#include <AppKit/NSPageLayout.h> #include <AppKit/NSPageLayout.h>
#include <AppKit/NSPrinter.h> #include <AppKit/NSPrinter.h>
#include <AppKit/GSGuiPrivate.h>
static NSPageLayout *shared_instance; static NSPageLayout *shared_instance;
@ -131,8 +132,8 @@ static NSPageLayout *shared_instance;
if (self == nil) if (self == nil)
return nil; return nil;
panel = [NSBundle pathForGNUstepResource: GSPANELNAME ofType: @"gorm" panel = [GSGuiBundle() pathForResource: GSPANELNAME ofType: @"gorm"
inDirectory: nil]; inDirectory: nil];
if (panel == nil) if (panel == nil)
{ {
NSRunAlertPanel(@"Error", @"Could not find page layout resource", NSRunAlertPanel(@"Error", @"Could not find page layout resource",

35
Source/NSPrintInfo.m
View file

@ -32,6 +32,7 @@
#include <Foundation/NSDictionary.h> #include <Foundation/NSDictionary.h>
#include <Foundation/NSException.h> #include <Foundation/NSException.h>
#include <Foundation/NSEnumerator.h> #include <Foundation/NSEnumerator.h>
#include <Foundation/NSUserDefaults.h>
#include <Foundation/NSValue.h> #include <Foundation/NSValue.h>
#include <AppKit/NSPrinter.h> #include <AppKit/NSPrinter.h>
@ -373,33 +374,19 @@ NSDictionary *paperSizes = nil;
// //
+ initPrintInfoDefaults + initPrintInfoDefaults
{ {
NSUserDefaults *def;
NSString *defPrinter, *str; NSString *defPrinter, *str;
NSString *path;
NSPrinter *printer; NSPrinter *printer;
#ifdef GNUSTEP_BASE_LIBRARY def = [NSUserDefaults standardUserDefaults];
path = [NSBundle pathForGNUstepResource: @"PrintDefaults" printInfoDefaults = [def objectForKey: @"DefaultPrinter"];
ofType: nil if (printInfoDefaults)
inDirectory: @"PrinterAdmin"]; printInfoDefaults = [printInfoDefaults mutableCopy];
#else defPrinter = [printInfoDefaults objectForKey:NSPrintPrinter];
NSBundle *adminBundle; if (defPrinter)
printer = [NSPrinter printerWithName: defPrinter];
adminBundle = [NSBundle bundleWithPath: @GNUSTEP_INSTALL_LIBDIR]; if (printer == nil)
path = [adminBundle pathForResource: @"PrintDefaults" defPrinter = nil;
ofType: nil
inDirectory: @"PrinterAdmin"];
#endif
defPrinter = nil;
if (path != nil && [path length] != 0)
{
printInfoDefaults = [NSMutableDictionary dictionaryWithContentsOfFile:path];
RETAIN(printInfoDefaults);
defPrinter = [printInfoDefaults objectForKey:NSPrintPrinter];
printer = [NSPrinter printerWithName: defPrinter];
if (printer == nil)
defPrinter = nil;
}
if (printInfoDefaults == nil) if (printInfoDefaults == nil)
{ {
NSDebugLog(@"NSPrinter", @"Could not find printing defaults table"); NSDebugLog(@"NSPrinter", @"Could not find printing defaults table");

4
Source/NSPrintPanel.m
View file

@ -115,8 +115,8 @@ static NSPrintPanel *shared_instance;
if (self == nil) if (self == nil)
return nil; return nil;
panel = [NSBundle pathForGNUstepResource: GSPANELNAME ofType: @"gorm" panel = [GSGuiBundle() pathForResource: GSPANELNAME ofType: @"gorm"
inDirectory: nil]; inDirectory: nil];
if (panel == nil) if (panel == nil)
{ {
NSRunAlertPanel(@"Error", @"Could not find print panel resource", NSRunAlertPanel(@"Error", @"Could not find print panel resource",

27
Source/NSPrinter.m
View file

@ -56,7 +56,6 @@
#include <AppKit/NSPrinter.h> #include <AppKit/NSPrinter.h>
// Define size used for the name and type maps - just use a small table // Define size used for the name and type maps - just use a small table
#define NAMEMAPSIZE 0 #define NAMEMAPSIZE 0
#define TYPEMAPSIZE 0 #define TYPEMAPSIZE 0
@ -69,7 +68,7 @@
[NSCharacterSet whitespaceAndNewlineCharacterSet]\ [NSCharacterSet whitespaceAndNewlineCharacterSet]\
intoString:NULL] intoString:NULL]
static NSString *NSPrinter_PATH = @"PrinterTypes"; static NSString *NSPrinter_PATH = @"PostScript/PPD";
static NSString *NSPrinter_INDEXFILE = @"Printers"; static NSString *NSPrinter_INDEXFILE = @"Printers";
// //
@ -212,9 +211,9 @@ static NSString *interpretQuotedValue(NSString *qString)
static NSString *getFile(NSString *name, NSString *type) static NSString *getFile(NSString *name, NSString *type)
{ {
return [NSBundle pathForGNUstepResource: name return [NSBundle pathForLibraryResource: name
ofType: type ofType: type
inDirectory: NSPrinter_PATH]; inDirectory: NSPrinter_PATH];
} }
@ -882,17 +881,21 @@ andOptionTranslation:(NSString *)optionTranslation
NAMEMAPSIZE); NAMEMAPSIZE);
// Load the index file // Load the index file
path = getFile(NSPrinter_INDEXFILE, nil); path = [NSBundle pathForLibraryResource: NSPrinter_INDEXFILE
ofType: nil
inDirectory: @"PostScript"];
// If not found // If not found
if (path == nil || [path length] == 0) if (path == nil || [path length] == 0)
{ {
[NSException raise:NSGenericException NSLog(@"Could not find index of printers, file %@", NSPrinter_INDEXFILE);
format:@"Could not find index of printers, file %@", nameDict = [NSDictionary dictionaryWithObject:
NSPrinter_INDEXFILE]; [NSArray arrayWithObjects: @"Apple_LaserWriter_II_NTX",
// NOT REACHED @"localhost", @"A Note", nil]
forKey: @"Unknown"];
} }
// And create the name dictionary, loading it else
nameDict = RETAIN([NSDictionary dictionaryWithContentsOfFile:path]); nameDict = [NSDictionary dictionaryWithContentsOfFile:path];
RETAIN(nameDict);
return self; return self;
} }

51
Source/NSSound.m
View file

@ -351,17 +351,9 @@ return NO; \
{ {
if (self == [NSSound class]) if (self == [NSSound class])
{ {
#ifdef GNUSTEP_BASE_LIBRARY NSString *path = [NSBundle pathForLibraryResource: @"nsmapping"
NSString *path = [NSBundle pathForGNUstepResource: @"nsmapping" ofType: @"strings"
ofType: @"strings" inDirectory: @"Sounds"];
inDirectory: @"Sounds"];
#else
NSBundle *system = [NSBundle bundleWithPath: @GNUSTEP_INSTALL_LIBDIR];
NSString *path = [system pathForResource: @"nsmapping"
ofType: @"strings"
inDirectory: @"Sounds"];
#endif
[self setVersion: 1]; [self setVersion: 1];
nameDict = [[NSMutableDictionary alloc] initWithCapacity: 10]; nameDict = [[NSMutableDictionary alloc] initWithCapacity: 10];
@ -591,49 +583,24 @@ return NO; \
{ {
if (extension) if (extension)
{ {
#ifdef GNUSTEP_BASE_LIBRARY path = [NSBundle pathForLibraryResource: the_name
path = [NSBundle pathForGNUstepResource: the_name ofType: extension
ofType: extension inDirectory: @"Sounds"];
inDirectory: @"Sounds"];
#else
NSBundle *system = [NSBundle bundleWithPath: @GNUSTEP_INSTALL_LIBDIR];
path = [system pathForResource: the_name
ofType: extension
inDirectory: @"Sounds"];
#endif
} }
else else
{ {
#ifdef GNUSTEP_BASE_LIBRARY
id o, e; id o, e;
e = [array objectEnumerator]; e = [array objectEnumerator];
while ((o = [e nextObject])) { while ((o = [e nextObject])) {
path = [NSBundle pathForGNUstepResource: the_name path = [NSBundle pathForLibraryResource: the_name
ofType: o ofType: o
inDirectory: @"Sounds"]; inDirectory: @"Sounds"];
if (path != nil && [path length] != 0) if (path != nil && [path length] != 0)
{ {
break; break;
} }
} }
#else
NSBundle *system = [NSBundle bundleWithPath: @GNUSTEP_INSTALL_LIBDIR];
id o, e;
e = [array objectEnumerator];
while ((o = [e nextObject]))
{
path = [system pathForResource: the_name
ofType: o
inDirectory: @"Sounds"];
if (path != nil && [path length] != 0)
{
break;
}
}
#endif
} }
} }

3
Source/NSSpellChecker.m
View file

@ -51,6 +51,7 @@
#include <AppKit/NSGraphics.h> #include <AppKit/NSGraphics.h>
#include <AppKit/NSWindow.h> #include <AppKit/NSWindow.h>
#include <AppKit/NSPanel.h> #include <AppKit/NSPanel.h>
#include <AppKit/GSGuiPrivate.h>
// prototype for function to create name for server // prototype for function to create name for server
NSString *GSSpellServerName(NSString *checkerDictionary, NSString *language); NSString *GSSpellServerName(NSString *checkerDictionary, NSString *language);
@ -267,7 +268,7 @@ static int __documentTag = 0;
_ignoredWords = [NSMutableDictionary new]; _ignoredWords = [NSMutableDictionary new];
// Load the gmodel file // Load the gmodel file
if(![NSBundle loadNibFile: @"SpellPanel.gmodel" if(![GSGuiBundle() loadNibFile: @"SpellPanel.gmodel"
externalNameTable: [NSDictionary dictionaryWithObject: self forKey: @"NSOwner"] externalNameTable: [NSDictionary dictionaryWithObject: self forKey: @"NSOwner"]
withZone: [self zone]]) withZone: [self zone]])
{ {

4
Source/NSTextView.m
View file

@ -3360,6 +3360,10 @@ shouldRemoveMarker: (NSRulerMarker *)marker
NSRange errorRange; NSRange errorRange;
int count = 0; int count = 0;
if (sp == nil)
{
return;
}
errorRange = [sp checkSpellingOfString: [self string] errorRange = [sp checkSpellingOfString: [self string]
startingAt: NSMaxRange (_layoutManager->_selected_range) startingAt: NSMaxRange (_layoutManager->_selected_range)
language: [sp language] language: [sp language]

6
Source/NSView.m
View file

@ -3396,9 +3396,9 @@ static NSView* findByTag(NSView *view, int aTag, unsigned *level)
- (void) _loadPrinterProlog: (NSGraphicsContext *)ctxt - (void) _loadPrinterProlog: (NSGraphicsContext *)ctxt
{ {
NSString *prolog; NSString *prolog;
prolog = [NSBundle pathForGNUstepResource: @"GSProlog" prolog = [NSBundle pathForLibraryResource: @"GSProlog"
ofType: @"ps" ofType: @"ps"
inDirectory: @"PrinterTypes"]; inDirectory: @"PostScript"];
if (prolog == nil) if (prolog == nil)
{ {
NSLog(@"Cannot find printer prolog file"); NSLog(@"Cannot find printer prolog file");

2
TextConverters/GNUmakefile
View file

@ -25,8 +25,6 @@
# If not, write to the Free Software Foundation, # If not, write to the Free Software Foundation,
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
include $(GNUSTEP_MAKEFILES)/common.make include $(GNUSTEP_MAKEFILES)/common.make
# #
# The list of subproject directories # The list of subproject directories

2
Tools/GNUmakefile
View file

@ -22,8 +22,6 @@
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make
include $(GNUSTEP_MAKEFILES)/common.make include $(GNUSTEP_MAKEFILES)/common.make
include ../config.make include ../config.make

2
Tools/gsnd/GNUmakefile
View file

@ -22,8 +22,6 @@
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
include $(GNUSTEP_MAKEFILES)/common.make include $(GNUSTEP_MAKEFILES)/common.make
# The applications to be compiled # The applications to be compiled

16
configure vendored
View file

@ -1206,7 +1206,7 @@ fi
# Use config.guess, config.sub and install-sh provided by gnustep-make # Use config.guess, config.sub and install-sh provided by gnustep-make
#-------------------------------------------------------------------- #--------------------------------------------------------------------
ac_aux_dir= ac_aux_dir=
for ac_dir in $GNUSTEP_SYSTEM_ROOT/Makefiles $srcdir/$GNUSTEP_SYSTEM_ROOT/Makefiles; do for ac_dir in $GNUSTEP_MAKEFILES $srcdir/$GNUSTEP_MAKEFILES; do
if test -f $ac_dir/install-sh; then if test -f $ac_dir/install-sh; then
ac_aux_dir=$ac_dir ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install-sh -c" ac_install_sh="$ac_aux_dir/install-sh -c"
@ -1222,8 +1222,8 @@ for ac_dir in $GNUSTEP_SYSTEM_ROOT/Makefiles $srcdir/$GNUSTEP_SYSTEM_ROOT/Makefi
fi fi
done done
if test -z "$ac_aux_dir"; then if test -z "$ac_aux_dir"; then
{ { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $GNUSTEP_SYSTEM_ROOT/Makefiles $srcdir/$GNUSTEP_SYSTEM_ROOT/Makefiles" >&5 { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $GNUSTEP_MAKEFILES $srcdir/$GNUSTEP_MAKEFILES" >&5
echo "$as_me: error: cannot find install-sh or install.sh in $GNUSTEP_SYSTEM_ROOT/Makefiles $srcdir/$GNUSTEP_SYSTEM_ROOT/Makefiles" >&2;} echo "$as_me: error: cannot find install-sh or install.sh in $GNUSTEP_MAKEFILES $srcdir/$GNUSTEP_MAKEFILES" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
ac_config_guess="$SHELL $ac_aux_dir/config.guess" ac_config_guess="$SHELL $ac_aux_dir/config.guess"
@ -1325,14 +1325,14 @@ test -n "$target_alias" &&
# in the GNUstep root are used before the standard ones # in the GNUstep root are used before the standard ones
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# Set location of GNUstep dirs for later use # Set location of GNUstep dirs for later use
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Headers GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Library/Headers
if test "$GNUSTEP_FLATTENED" = yes; then if test "$GNUSTEP_FLATTENED" = yes; then
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Library/Libraries
else else
clean_target_os=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_os.sh $target_os` clean_target_os=`$GNUSTEP_MAKEFILES/clean_os.sh $target_os`
clean_target_cpu=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_cpu.sh $target_cpu` clean_target_cpu=`$GNUSTEP_MAKEFILES/clean_cpu.sh $target_cpu`
obj_dir=$clean_target_cpu/$clean_target_os obj_dir=$clean_target_cpu/$clean_target_os
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries/$obj_dir GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Library/Libraries/$obj_dir
fi fi
CPPFLAGS="$CPPFLAGS -I$GNUSTEP_HDIR" CPPFLAGS="$CPPFLAGS -I$GNUSTEP_HDIR"
LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR" LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR"

12
configure.ac
View file

@ -32,7 +32,7 @@ fi
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# Use config.guess, config.sub and install-sh provided by gnustep-make # Use config.guess, config.sub and install-sh provided by gnustep-make
#-------------------------------------------------------------------- #--------------------------------------------------------------------
AC_CONFIG_AUX_DIR($GNUSTEP_SYSTEM_ROOT/Makefiles) AC_CONFIG_AUX_DIR($GNUSTEP_MAKEFILES)
AC_CONFIG_HEADER(Headers/gnustep/gui/config.h) AC_CONFIG_HEADER(Headers/gnustep/gui/config.h)
@ -46,14 +46,14 @@ AC_CANONICAL_TARGET([])
# in the GNUstep root are used before the standard ones # in the GNUstep root are used before the standard ones
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# Set location of GNUstep dirs for later use # Set location of GNUstep dirs for later use
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Headers GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Library/Headers
if test "$GNUSTEP_FLATTENED" = yes; then if test "$GNUSTEP_FLATTENED" = yes; then
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Library/Libraries
else else
clean_target_os=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_os.sh $target_os` clean_target_os=`$GNUSTEP_MAKEFILES/clean_os.sh $target_os`
clean_target_cpu=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_cpu.sh $target_cpu` clean_target_cpu=`$GNUSTEP_MAKEFILES/clean_cpu.sh $target_cpu`
obj_dir=$clean_target_cpu/$clean_target_os obj_dir=$clean_target_cpu/$clean_target_os
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries/$obj_dir GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Library/Libraries/$obj_dir
fi fi
CPPFLAGS="$CPPFLAGS -I$GNUSTEP_HDIR" CPPFLAGS="$CPPFLAGS -I$GNUSTEP_HDIR"
LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR" LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR"