gnustep/apps-projectcenter
0
0
Fork 0
mirror of https://github.com/gnustep/apps-projectcenter.git synced 2025-03-13 14:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Extracting UI creation into category and minor bug fixes

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/branches/RELEASE_0_3_5@17140 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Philippe C.D. Robert 2003-07-05 16:43:46 +00:00
parent e507242ccc
commit c7c4216793
7 changed files with 203 additions and 125 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -9,7 +9,9 @@
PCFindController.m, PCMenuController.h, PCMenuController.m,
PCPrefController.m, PCPrefController.h
* Extracting UI creation into category: PCPrefController+UInterface.h,
PCPrefController+UInterface.m, PCPrefController.m, PCPrefController.h
PCPrefController+UInterface.m, PCPrefController.m, PCPrefController.h,
PCLib/PCProjectDebugger+UInterface.h, PCLib/PCProjectDebugger.h,
PCLib/PCProjectDebugger+UInterface.m, PCLib/PCProjectDebugger.m
* Disabling unused menu entries using defines: ProjectCenter_main.m
2003-07-04 Philippe C.D. Robert <probert@siggraph.org>

9
PCLib/GNUmakefile
View file

@ -10,7 +10,6 @@
include $(GNUSTEP_MAKEFILES)/common.make
include Version
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
#
@ -45,7 +44,6 @@ libProjectCenter_LIBRARIES_DEPEND_UPON += -lgnustep-gui
#
libProjectCenter_HEADER_FILES= \
PCButton.h \
PCBrowserController.h \
PCBundleLoader.h \
PCDataSource.h \
@ -79,14 +77,14 @@ PCEditor+UInterface.h \
PCFileManager+UInterface.h \
PCProjectManager+UInterface.h \
PCProject+UInterface.h \
PCTextFinder+UInterface.h
PCTextFinder+UInterface.h \
PCProjectDebugger+UInterface.h
#
# Class files
#
libProjectCenter_OBJC_FILES= \
PCButton.m \
PCBrowserController.m \
PCBundleLoader.m \
PCDataSource.m \
@ -110,7 +108,8 @@ PCEditor+UInterface.m \
PCFileManager+UInterface.m \
PCProjectManager+UInterface.m \
PCProject+UInterface.m \
PCTextFinder+UInterface.m
PCTextFinder+UInterface.m \
PCProjectDebugger+UInterface.m
#
# C files

40
PCLib/PCProjectDebugger+UInterface.h Normal file
View file

@ -0,0 +1,40 @@
/*
GNUstep ProjectCenter - http://www.gnustep.org
Copyright (C) 2000-2002 Free Software Foundation
Author: Philippe C.D. Robert <probert@siggraph.org>
This file is part of GNUstep.
This application is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This application 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
Library General Public License for more details.
You should have received a copy of the GNU General Public
License along with this library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
$Id$
*/
#ifndef __PCPROJECTDEBUGGER_UINTERFACE_H
#define __PCPROJECTDEBUGGER_UINTERFACE_H
#include "PCProjectDebugger.h"
@interface PCProjectDebugger (UInterface)
- (void)_createLaunchPanel;
- (void)_createComponentView;
@end
#endif

140
PCLib/PCProjectDebugger+UInterface.m Normal file
View file

@ -0,0 +1,140 @@
/*
GNUstep ProjectCenter - http://www.gnustep.org
Copyright (C) 2003 Free Software Foundation
Author: Philippe C.D. Robert <probert@siggraph.org>
This file is part of GNUstep.
This application is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This application 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
Library General Public License for more details.
You should have received a copy of the GNU General Public
License along with this library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
$Id$
*/
#include "PCProjectDebugger.h"
#include "PCProjectDebugger+UInterface.h"
#include "PCProject.h"
#include "PCButton.h"
#include <AppKit/AppKit.h>
#ifndef IMAGE
#define IMAGE(X) [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForImageResource:(X)]] autorelease]
#endif
@implementation PCProjectDebugger (UInterface)
- (void) _createLaunchPanel
{
launchPanel = [[NSPanel alloc]
initWithContentRect: NSMakeRect (0, 300, 480, 322)
styleMask: (NSTitledWindowMask
| NSClosableWindowMask
| NSResizableWindowMask)
backing: NSBackingStoreRetained
defer: YES];
[launchPanel setMinSize: NSMakeSize(400, 160)];
[launchPanel setFrameAutosaveName: @"ProjectLauncher"];
[launchPanel setReleasedWhenClosed: NO];
[launchPanel setHidesOnDeactivate: NO];
[launchPanel setTitle: [NSString
stringWithFormat: @"%@ - Launch", [currentProject projectName]]];
if (![launchPanel setFrameUsingName: @"ProjectLauncher"])
{
[launchPanel center];
}
}
- (void)_createComponentView
{
NSScrollView *scrollView;
NSString *string;
NSAttributedString *attributedString;
componentView = [[NSBox alloc] initWithFrame:NSMakeRect(8,-1,464,322)];
[componentView setTitlePosition:NSNoTitle];
[componentView setBorderType:NSNoBorder];
[componentView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
[componentView setContentViewMargins: NSMakeSize(0.0,0.0)];
/*
* Top buttons
*/
// _w_frame = NSMakeRect(0, 270, 88, 44);
runButton = [[PCButton alloc] initWithFrame: NSMakeRect(0,264,50,50)];
[runButton setTitle: @"Run"];
[runButton setImage: IMAGE(@"ProjectCenter_run")];
[runButton setAlternateImage: IMAGE(@"Stop")];
[runButton setTarget: self];
[runButton setAction: @selector(run:)];
[runButton setAutoresizingMask: (NSViewMaxXMargin | NSViewMinYMargin)];
[runButton setButtonType: NSToggleButton];
[componentView addSubview: runButton];
RELEASE (runButton);
debugButton = [[PCButton alloc] initWithFrame: NSMakeRect(50,264,50,50)];
[debugButton setTitle: @"Debug"];
[debugButton setImage: IMAGE(@"ProjectCenter_debug")];
[debugButton setAlternateImage: IMAGE(@"Stop")];
[debugButton setTarget: self];
[debugButton setAction: @selector(debug:)];
[debugButton setAutoresizingMask: (NSViewMaxXMargin | NSViewMinYMargin)];
[debugButton setButtonType: NSToggleButton];
[componentView addSubview: debugButton];
RELEASE (debugButton);
/*
*
*/
scrollView = [[NSScrollView alloc] initWithFrame:NSMakeRect (0,-1,464,253)];
[scrollView setHasHorizontalScroller:NO];
[scrollView setHasVerticalScroller:YES];
[scrollView setBorderType: NSBezelBorder];
[scrollView setAutoresizingMask:(NSViewWidthSizable | NSViewHeightSizable)];
stdOut=[[NSTextView alloc] initWithFrame:[[scrollView contentView] frame]];
[stdOut setMinSize: NSMakeSize(0, 0)];
[stdOut setMaxSize: NSMakeSize(1e7, 1e7)];
[stdOut setRichText:YES];
[stdOut setEditable:NO];
[stdOut setSelectable:YES];
[stdOut setVerticallyResizable: YES];
[stdOut setHorizontallyResizable: NO];
[stdOut setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
[[stdOut textContainer] setWidthTracksTextView:YES];
[[stdOut textContainer] setContainerSize:
NSMakeSize([stdOut frame].size.width, 1e7)];
// Font
string = [NSString stringWithString:@"=== Launcher ready ==="];
attributedString =
[[NSAttributedString alloc] initWithString:string
attributes:textAttributes];
[[stdOut textStorage] setAttributedString:attributedString];
[scrollView setDocumentView:stdOut];
RELEASE (stdOut);
[componentView addSubview: scrollView];
RELEASE(scrollView);
}
@end

6
PCLib/PCProjectDebugger.h
View file

@ -24,6 +24,9 @@
$Id$
*/
#ifndef __PCPROJECTDEBUGGER_H
#define __PCPROJECTDEBUGGER_H
#include <AppKit/AppKit.h>
#ifndef GNUSTEP_BASE_VERSION
@ -83,3 +86,6 @@
- (void)logData:(NSData *)data error:(BOOL)yn;
@end
#endif

121
PCLib/PCProjectDebugger.m
View file

@ -25,6 +25,7 @@
*/
#include "PCProjectDebugger.h"
#include "PCProjectDebugger+UInterface.h"
#include "PCDefines.h"
#include "PCProject.h"
#include "PCProjectManager.h"
@ -32,10 +33,6 @@
#include <AppKit/AppKit.h>
#ifndef IMAGE
#define IMAGE(X) [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForImageResource:(X)]] autorelease]
#endif
#ifndef NOTIFICATION_CENTER
#define NOTIFICATION_CENTER [NSNotificationCenter defaultCenter]
#endif
@ -45,116 +42,6 @@ enum {
DEBUG_DEBUG_TARGET = 2
};
@interface PCProjectDebugger (CreateUI)
- (void)_createLaunchPanel;
- (void)_createComponentView;
@end
@implementation PCProjectDebugger (CreateUI)
- (void) _createLaunchPanel
{
launchPanel = [[NSPanel alloc]
initWithContentRect: NSMakeRect (0, 300, 480, 322)
styleMask: (NSTitledWindowMask
| NSClosableWindowMask
| NSResizableWindowMask)
backing: NSBackingStoreRetained
defer: YES];
[launchPanel setMinSize: NSMakeSize(400, 160)];
[launchPanel setFrameAutosaveName: @"ProjectLauncher"];
[launchPanel setReleasedWhenClosed: NO];
[launchPanel setHidesOnDeactivate: NO];
[launchPanel setTitle: [NSString
stringWithFormat: @"%@ - Launch", [currentProject projectName]]];
if (![launchPanel setFrameUsingName: @"ProjectLauncher"])
{
[launchPanel center];
}
}
- (void)_createComponentView
{
NSScrollView *scrollView;
NSString *string;
NSAttributedString *attributedString;
componentView = [[NSBox alloc] initWithFrame:NSMakeRect(8,-1,464,322)];
[componentView setTitlePosition:NSNoTitle];
[componentView setBorderType:NSNoBorder];
[componentView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
[componentView setContentViewMargins: NSMakeSize(0.0,0.0)];
/*
* Top buttons
*/
// _w_frame = NSMakeRect(0, 270, 88, 44);
runButton = [[PCButton alloc] initWithFrame: NSMakeRect(0,264,50,50)];
[runButton setTitle: @"Run"];
[runButton setImage: IMAGE(@"ProjectCenter_run")];
[runButton setAlternateImage: IMAGE(@"Stop")];
[runButton setTarget: self];
[runButton setAction: @selector(run:)];
[runButton setAutoresizingMask: (NSViewMaxXMargin | NSViewMinYMargin)];
[runButton setButtonType: NSToggleButton];
[componentView addSubview: runButton];
RELEASE (runButton);
debugButton = [[PCButton alloc] initWithFrame: NSMakeRect(50,264,50,50)];
[debugButton setTitle: @"Debug"];
[debugButton setImage: IMAGE(@"ProjectCenter_debug")];
[debugButton setAlternateImage: IMAGE(@"Stop")];
[debugButton setTarget: self];
[debugButton setAction: @selector(debug:)];
[debugButton setAutoresizingMask: (NSViewMaxXMargin | NSViewMinYMargin)];
[debugButton setButtonType: NSToggleButton];
[componentView addSubview: debugButton];
RELEASE (debugButton);
/*
*
*/
scrollView = [[NSScrollView alloc] initWithFrame:NSMakeRect (0,-1,464,253)];
[scrollView setHasHorizontalScroller:NO];
[scrollView setHasVerticalScroller:YES];
[scrollView setBorderType: NSBezelBorder];
[scrollView setAutoresizingMask:(NSViewWidthSizable | NSViewHeightSizable)];
stdOut=[[NSTextView alloc] initWithFrame:[[scrollView contentView] frame]];
[stdOut setMinSize: NSMakeSize(0, 0)];
[stdOut setMaxSize: NSMakeSize(1e7, 1e7)];
[stdOut setRichText:YES];
[stdOut setEditable:NO];
[stdOut setSelectable:YES];
[stdOut setVerticallyResizable: YES];
[stdOut setHorizontallyResizable: NO];
[stdOut setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
[[stdOut textContainer] setWidthTracksTextView:YES];
[[stdOut textContainer] setContainerSize:
NSMakeSize([stdOut frame].size.width, 1e7)];
// Font
string = [NSString stringWithString:@"=== Launcher ready ==="];
attributedString =
[[NSAttributedString alloc] initWithString:string
attributes:textAttributes];
[[stdOut textStorage] setAttributedString:attributedString];
[scrollView setDocumentView:stdOut];
RELEASE (stdOut);
[componentView addSubview: scrollView];
RELEASE(scrollView);
}
@end
@implementation PCProjectDebugger
- (id)initWithProject:(PCProject *)aProject
@ -242,7 +129,9 @@ enum {
- (void)debug:(id)sender
{
NSRunAlertPanel(@"Attention!",@"Integrated debugging is not yet available...",@"OK",nil,nil);
NSRunAlertPanel(@"Attention!",
@"Integrated debugging is not yet available...",
@"OK",nil,nil);
}
- (void)run:(id)sender
@ -372,7 +261,7 @@ enum {
RELEASE(launchTask);
launchTask = nil;
[runButton setNextState];
[runButton setState:NSOffState];
[componentView display];
}
}

8
PCLib/ProjectCenter.pcproj
View file

@ -25,7 +25,8 @@
"PCFileManager+UInterface.m",
"PCProjectManager+UInterface.m",
"PCProject+UInterface.m",
"PCTextFinder+UInterface.m"
"PCTextFinder+UInterface.m",
"PCProjectDebugger+UInterface.m"
);
COMPILEROPTIONS = "";
CREATION_DATE = "";
@ -68,7 +69,8 @@
"PCFileManager+UInterface.h",
"PCProjectManager+UInterface.h",
"PCProject+UInterface.h",
"PCTextFinder+UInterface.h"
"PCTextFinder+UInterface.h",
"PCProjectDebugger+UInterface.h"
);
INSTALLDIR = "$(GNUSTEP_INSTALLATION_DIR)";
LANGUAGE = English;
@ -105,4 +107,4 @@
GNUmakefile,
GNUmakefile.postamble
);
}
}