Commit d2b2ec5d authored by Eric Heintzmann's avatar Eric Heintzmann

Import Upstream version 0.6.1

parent 654db582
2012-06-12 Riccardo Mottola <rm@gnu.org>
* Framework/PCProjectWindow.m
Use centerScanRect to avoid strange problems with AA text in editor.
* Headers/PCAppController.h
* PCAppController.m
Update applicationShouldTerminate signature.
2012-04-20 Riccardo Mottola <rm@gnu.org>
* Modules/Debuggers/ProjectCenter/PTYView.m
NetBSD doesn't support streams either.
2012-04-17 Riccardo Mottola <rm@gnu.org>
* Modules/Debuggers/ProjectCenter/PTYView.m
Fix imports and includes for FreeBSD
2011-09-08 Riccardo Mottola <rm@gnu.org>
* Framework/PCAddFilesPanel.m [-setFileTypes]:
use setAllowedFileTypes method instead of private method which was removed
2011-04-28 Riccardo Mottola <rm@gnu.org>
* Framework/PCFileManager.m:
Correct cast according to ctypes caveats.
2011-04-07 Riccardo Mottola <rm@gnu.org>
* Headers/ProjectCenter/PCDefines.h
Change ifdef to detect non-gnustep.
* Framework/PCProjectInspector.m
Warning fix.
* Modules/Preferences/Misc/PCMiscPrefs.m
Remove extra parentheses which confuse = and == warning.
2011-04-06 Fred Kiefer <FredKiefer@gmx.de>
* Modules/Parsers/ProjectCenter/PCParser.m [-parse]: Move the
selector and IMP definitions inside the method. Global IMP caching
is always wrong! And this broke compilation with llvm.
2011-03-14 Nicola Pero <nicola.pero@meta-innovation.com>
* Modules/Projects/ResourceSet/PCResourceSetProject.m
([PCResourceSetProject -appendHead:]): Added FIXME.
2011-01-24 Wolfgang Lux <wolfgang.lux@gmail.com>
* Modules/Editors/ProjectCenter/PCEditor.m (-revertFileToSaved):
Ask for confirmation before reverting.
2011-01-24 Wolfgang Lux <wolfgang.lux@gmail.com>
* Modules/Editors/ProjectCenter/PCEditorView.m (-performIndentation):
Fix annoying bug where pressing the tab key would delete whole
empty lines. Also register insertions done by the tab key at the
undo manager.
2011-01-06 Wolfgang Lux <wolfgang.lux@gmail.com>
* Modules/Projects/Application/PCAppProject+Inspector.m
(-setDocBasedApp:):
Fix bug where the document based app flag was reset after opening
the project inspector for the first time.
2010-12-28 Wolfgang Lux <wolfgang.lux@gmail.com>
* Framework/PCProjectBuilder.m (-buildArguments): Add either
debug=yes or debug=no to the arguments since the debug variable no
longer has a clear default for quite some time.
2010-12-22 German Arias <german@xelalug.org>
* Headers/ProjectCenter/PCProject.h:
Added method -resourceDirForLanguage:. So we can call this
method to manage the languages.
* Headers/ProjectCenter/PCProjectInspector.h:
* Framework/PCProjectInspector.m:
* Framework/English.lproj/ProjectLanguages.gorm:
Added UI controls for languages at Inspector, and methods
-addLanguage: and -removeLanguage:.
2010-12-18 German Arias <german@xelalug.org>
* Headers/ProjectCenter/PCProjectInspector.h:
* Framework/PCProjectInspector.m:
* Framework/English.lproj/ProjectInspector.gorm:
Added "Project Languages" option on Inspector.
2010-12-04 Wolfgang Lux <wolfgang.lux@gmail.com>
* Framework/PCProjectBuilder.m (-build:, -logStdOut:, -logErrOut:):
......
{
"## Comment" = "Do NOT change this file, Gorm maintains it";
FirstResponder = {
Actions = (
"addLanguage:",
"removeLanguage:"
);
Super = NSObject;
};
PCProjectInspector = {
Actions = (
"addLanguage:",
"removeLanguage:"
);
Outlets = (
projectLanguagesView
projectLanguagesView,
languagesList,
newLanguage
);
Super = NSObject;
};
......
/*
GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html
Copyright (C) 2004 Free Software Foundation
Copyright (C) 2004-2011 Free Software Foundation
Authors: Serg Stoyan
Riccardo Mottola
This file is part of GNUstep.
......@@ -93,7 +94,7 @@ static PCAddFilesPanel *addFilesPanel = nil;
{
NSString *path = nil;
ASSIGN(_fileTypes, fileTypes);
[super setAllowedFileTypes: fileTypes];
path = [_browser path];
[self validateVisibleColumns];
......
/*
GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html
Copyright (C) 2000-2010 Free Software Foundation
Copyright (C) 2000-2011 Free Software Foundation
Authors: Philippe C.D. Robert
Serg Stoyan
......@@ -627,7 +627,7 @@ static PCFileManager *_mgr = nil;
buf = [data bytes];
for (i = printable = 0, n = [data length]; i < n; i++)
{
if (isprint(buf[i]) || isspace(buf[i]))
if (isprint((int)(unsigned char)buf[i]) || isspace((int)(unsigned char)buf[i]))
{
printable++;
}
......
......@@ -329,7 +329,14 @@
[args addObjectsFromArray:[projectDict objectForKey:PCBuilderArguments]];
// --- Get arguments from options
if ([[projectDict objectForKey:PCBuilderDebug] isEqualToString:@"NO"])
if ([[projectDict objectForKey:PCBuilderDebug] isEqualToString:@"YES"])
{ // there is no clear default; the default configuration of GNUstep-make
// uses debug=no (since release 2.2.1, it had debug=yes before), but
// that default can easily be changed at configuration time with the
// --enable-debug-by-default configure option.
[args addObject:@"debug=yes"];
}
else
{ // default is 'debug=yes'
[args addObject:@"debug=no"];
}
......
This diff is collapsed.
......@@ -103,7 +103,7 @@
[statusLine setStringValue:@""];
/*
* Hosrizontal split view
* Horizontal split view
*/
rect = [[projectWindow contentView] frame];
rect.size.height -= 62;
......@@ -434,6 +434,7 @@
// from/to superview
RETAIN(h_split);
[h_split removeFromSuperview];
rect = [cView centerScanRect: rect];
[h_split setFrame:rect];
[cView addSubview:h_split];
RELEASE(h_split);
......@@ -447,6 +448,7 @@
RETAIN(v_split);
[v_split removeFromSuperview];
[v_split setFrame:rect];
rect = [cView centerScanRect: rect];
[cView addSubview:v_split];
RELEASE(v_split);
}
......@@ -471,6 +473,7 @@
// Hack. See above
RETAIN(h_split);
[h_split removeFromSuperview];
rect = [cView centerScanRect: rect];
[h_split setFrame:rect];
[cView addSubview:h_split];
RELEASE(h_split);
......@@ -891,6 +894,7 @@
{*/
vSplitRect.size.width = hSplitSize.width;
/* }*/
vSplitRect = [browserView centerScanRect: vSplitRect];
[v_split setFrame:vSplitRect];
// Custom view (Editor|Builder|Launcher)
......@@ -900,6 +904,7 @@
boxRect.origin.y = vSplitRect.size.height + [h_split dividerThickness];
boxRect.size.width = hSplitSize.width;
boxRect.size.height = hSplitSize.height - boxRect.origin.y;
boxRect = [customView centerScanRect: boxRect];
[customView setFrame:boxRect];
// }
}
......
......@@ -16,7 +16,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
#
# Main application
#
VERSION = 0.6.0
VERSION = 0.6.1
APP_NAME = ProjectCenter
ProjectCenter_APPLICATION_ICON = Images/ProjectCenter.tiff
......
/*
GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html
Copyright (C) 2001 Free Software Foundation
Copyright (C) 2001-2012 Free Software Foundation
This file is part of GNUstep.
......@@ -72,7 +72,7 @@
- (void)applicationWillFinishLaunching:(NSNotification *)notification;
- (void)applicationDidFinishLaunching:(NSNotification *)notification;
- (BOOL)applicationShouldTerminate:(id)sender;
- (NSApplicationTerminateReply)applicationShouldTerminate:(id)sender;
- (void)applicationWillTerminate:(NSNotification *)notification;
@end
......
......@@ -46,7 +46,7 @@
//=============================================================================
// ==== MacOS X portability defines
//=============================================================================
#ifndef GNUSTEP_BASE_VERSION
#ifndef GNUSTEP
#define RETAIN(object) [object retain]
#define RELEASE(object) [object release]
......
......@@ -142,6 +142,7 @@ extern NSString *PCProjectBreakpointNotification;
- (NSArray *)publicHeaders;
- (void)setHeaderFile:(NSString *)file public:(BOOL)yn;
- (NSArray *)localizedResources;
- (NSString *)resourceDirForLanguage:(NSString *)language;
- (void)setResourceFile:(NSString *)file localizable:(BOOL)yn;
- (NSArray *)buildTargets;
......
......@@ -5,7 +5,8 @@
Authors: Philippe C.D. Robert
Serg Stoyan
Riccardo Mottola
Riccardo Mottola
German Arias
This file is part of GNUstep.
......@@ -90,7 +91,10 @@
IBOutlet NSButton *authorDown;
// Project Languages
//IBOutlet NSBox *projectLanguagesView;
IBOutlet NSBox *projectLanguagesView;
IBOutlet NSTableView *languagesList;
IBOutlet NSTextField *newLanguage;
NSMutableArray *languagesItems;
// File Attributes
IBOutlet NSBox *fileAttributesView;
......@@ -161,6 +165,8 @@
// ==== Project Languages
// ============================================================================
- (void)createProjectLanguages;
- (void)addLanguage:(id)sender;
- (void)removeLanguage:(id)sender;
// ============================================================================
// ==== File Attributes
......
/*
** PTYView
**
** Copyright (c) 2008
** Copyright (c) 2008-2012 Free Software Foundation
**
** Author: Gregory Casamento <greg_casamento@yahoo.com>
**
......@@ -20,22 +20,30 @@
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#import <PTYView.h>
#import <sys/stat.h>
#import <signal.h>
#import <stdio.h> /* for stderr and perror*/
#import <errno.h> /* for int errno */
#import <fcntl.h>
#import <sys/termios.h>
#import <sys/types.h>
#import <unistd.h>
#import <stdlib.h>
#import <string.h>
#include <sys/stat.h>
#include <signal.h>
#if !defined(__OpenBSD__)
#import <stropts.h>
#include <stdio.h> /* for stderr and perror*/
#include <errno.h> /* for int errno */
#include <fcntl.h>
#include <sys/types.h>
#if defined (__FreeBSD__)
#include <sys/ioctl.h>
#include <termios.h>
#include <libutil.h>
#else
#include <sys/termios.h>
#endif
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !(defined (__NetBSD__))
#include <stropts.h>
#endif
#ifndef NOTIFICATION_CENTER
......@@ -48,10 +56,12 @@
#define USE_FORKPTY_REPLACEMENT 1
#endif
#if !(defined (__NetBSD__)) && !(defined (__SOLARIS__)) && !(defined (__OpenBSD__))
#if !(defined (__NetBSD__)) && !(defined (__SOLARIS__)) && !(defined (__OpenBSD__)) && !(defined(__FreeBSD__))
# include <pty.h>
#endif
#import "PTYView.h"
#ifdef USE_FORKPTY_REPLACEMENT
int openpty(int *amaster, int *aslave, char *name, const struct termios *termp, const struct winsize *winp)
{
......
......@@ -666,6 +666,16 @@
return YES;
}
if (NSAlertDefaultReturn !=
NSRunAlertPanel(@"Revert",
@"%@ has been modified. "
@"Are you sure you want to undo changes?",
@"Revert", @"Cancel", nil,
[_path lastPathComponent]))
{
return NO;
}
[[NSNotificationCenter defaultCenter]
postNotificationName:PCEditorWillRevertNotification
object:self];
......
......@@ -291,6 +291,7 @@ static int ComputeIndentingOffset(NSString * string, unsigned int start)
unichar c, plfc, clfc;
NSRange wsRange;
NSMutableString *indentString;
NSCharacterSet *wsCharSet = [NSCharacterSet whitespaceCharacterSet];
int i;
// int point;
......@@ -307,7 +308,7 @@ static int ComputeIndentingOffset(NSString * string, unsigned int start)
for (offset = line_start; offset >= 0; offset++)
{
c = [string characterAtIndex:offset];
if (!isspace(c))
if (![wsCharSet characterIsMember:c])
{
wsRange = NSMakeRange(line_start, offset-line_start);
break;
......@@ -319,7 +320,7 @@ static int ComputeIndentingOffset(NSString * string, unsigned int start)
for (offset = line_start; offset >= 0; offset++)
{
c = [string characterAtIndex:offset];
if (!isspace(c))
if (![wsCharSet characterIsMember:c])
{
offset = offset - line_start;
NSLog(@"offset: %i", offset);
......@@ -337,7 +338,7 @@ static int ComputeIndentingOffset(NSString * string, unsigned int start)
offset -= 2;
}
// Get offset from BOL of pervious line
// Get offset from BOL of previous line
// offset = ComputeIndentingOffset([self string], line_start-1);
NSLog(@"Indent offset: %i", offset);
......@@ -348,8 +349,10 @@ static int ComputeIndentingOffset(NSString * string, unsigned int start)
[indentString appendString:@" "];
}
[[self textStorage] replaceCharactersInRange:wsRange
withString:indentString];
if ([self shouldChangeTextInRange:wsRange
replacementString:indentString])
[[self textStorage] replaceCharactersInRange:wsRange
withString:indentString];
/* if (location > line_start + offset)
{
......
......@@ -124,23 +124,21 @@ CodeType codeType(unichar *ch)
}
}
static SEL selString = @selector(string:);
static SEL selNumber = @selector(number:);
static SEL selSpaceAndNewLine = @selector(spaceAndNewLine:);
static SEL selInvisible = @selector(invisible:);
static SEL selSymbol = @selector(symbol:);
static void (*impString)(id, SEL, id);
static void (*impNumber)(id, SEL, id);
static void (*impSpaceAndNewLine)(id, SEL, unichar);
static void (*impInvisible)(id, SEL, unichar);
static void (*impSymbol)(id, SEL, unichar);
- (void)parse
{
unsigned int i, start, end;
CodeType startType, endType;
NSString *out;
SEL selString = @selector(string:);
SEL selNumber = @selector(number:);
SEL selSpaceAndNewLine = @selector(spaceAndNewLine:);
SEL selInvisible = @selector(invisible:);
SEL selSymbol = @selector(symbol:);
void (*impString)(id, SEL, id);
void (*impNumber)(id, SEL, id);
void (*impSpaceAndNewLine)(id, SEL, unichar);
void (*impInvisible)(id, SEL, unichar);
void (*impSymbol)(id, SEL, unichar);
NSLog(@"CodeParser begin...");
......
//
// GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html
//
// Copyright (C) 2001-2009 Free Software Foundation
// Copyright (C) 2001-2011 Free Software Foundation
//
// Authors: Sergii Stoian
//
......@@ -191,7 +191,7 @@
NSFileManager *fm = [NSFileManager defaultManager];
// Choose
if ((sender == debuggerField))
if (sender == debuggerField)
{
path = [debuggerField stringValue];
}
......@@ -249,7 +249,7 @@
NSWorkspace *ws = [NSWorkspace sharedWorkspace];
// Choose
if ((sender == debuggerField))
if (sender == debuggerField)
{
path = [debuggerField stringValue];
}
......
......@@ -101,12 +101,11 @@ cleanup(NSMutableDictionary *m, NSString *k)
[addDocTypeButton setRefusesFirstResponder:YES];
[removeDocTypeButton setRefusesFirstResponder:YES];
[docBasedAppButton setRefusesFirstResponder:YES];
[self setDocBasedApp:docBasedAppButton];
[docBasedAppButton setState:
([[projectDict objectForKey:PCDocumentBasedApp]
isEqualToString:@"YES"]) ? NSOnState : NSOffState];
[self setDocBasedApp:docBasedAppButton];
[self updateInspectorValues:nil];
}
......
......@@ -188,6 +188,9 @@
[mff appendString:@"\n#\n# Resource Set\n#\n"];
[mff appendString:[NSString stringWithFormat:@"RESOURCE_SET_NAME = %@\n",
projectName]];
/* FIXME: This was deprecated in 2007 and has even been removed from
the latest gnustep-make! The variable to use is
xxx_INSTALL_DIR. */
[mff appendString:
[NSString stringWithFormat:@"@%RESOURCE_FILES_INSTALL_DIR = %@\n",
[projectDict objectForKey:PCInstallDomain]]];
......
/*
GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html
Copyright (C) 2001 Free Software Foundation
Copyright (C) 2001-2012 Free Software Foundation
This file is part of GNUstep.
......@@ -145,9 +145,9 @@
object:nil];
}
- (BOOL)applicationShouldTerminate:(id)sender
- (NSApplicationTerminateReply)applicationShouldTerminate:(id)sender
{
BOOL quit = YES;
NSApplicationTerminateReply quit = NSTerminateNow;
if ([prefController boolForKey:PromptOnQuit])
{
......@@ -155,7 +155,7 @@
@"Do you really want to quit ProjectCenter?",
@"Cancel", @"Quit", nil))
{
return NO;
return NSTerminateLater;
}
}
......@@ -163,20 +163,21 @@
// Save projects unconditionally if preferences tells that
if ([prefController boolForKey:SaveOnQuit])
{
quit = [projectManager saveAllProjects];
if(![projectManager saveAllProjects])
quit = NSTerminateLater;
}
// Close ProjectManager (projects, editors, etc.)
if ((quit == NO) || ([projectManager close] == NO))
{
return NO;
return NSTerminateLater;
}
[[NSNotificationCenter defaultCenter]
postNotificationName:PCAppWillTerminateNotification
object:nil];
return YES;
return NSTerminateNow;
}
- (void)applicationWillTerminate:(NSNotification *)notification
......
......@@ -3,7 +3,7 @@
ApplicationName = "ProjectCenter";
ApplicationDescription = "GNUstep Integrated Development Environment";
ApplicationIcon = "ProjectCenter.tiff";
ApplicationRelease = "0.6.0";
ApplicationRelease = "0.6.1";
FullVersionID = "HEAD";
Authors = (
"Philippe C.D. Robert",
......@@ -63,6 +63,6 @@
}
);
URL = "See http://www.gnustep.org/";
Copyright = "Copyright (C) 1999 - 2008 Free Software Foundation";
Copyright = "Copyright (C) 1999 - 2012 Free Software Foundation";
CopyrightDescription = "Released under the GNU General Public License 3.0 or later";
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment