gnustep/apps-gorm
0
0
Fork 0
mirror of https://github.com/gnustep/apps-gorm.git synced 2025-02-23 19:51:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Palettes/0Menus/GormMenuEditor.m (-mouseDown:): Call

Browse source 
startConnecting.
        * GormCore/GormViewEditor.m (-startConnectingObject:withEvent:): Ditto.
        * GormCore/GormObjectEditor.m (-mouseDown:): Ditto.
        * GormCore/GormDocument.m (changeToViewWithTag:): Don't change the
        selection if connecting.
        * GormCore/GormResourceManager.m: Revert previous commit.
        * Gorm.m (-startConnecting:): Remove checks for a nil
        connectDestination.



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@24178 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Matt Rice 2006-12-03 01:11:26 +00:00
parent 6826102d00
commit 4a03adccea
7 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2006-12-02 Matt Rice <ratmice@gmail.com>
* Palettes/0Menus/GormMenuEditor.m (-mouseDown:): Call
startConnecting.
* GormCore/GormViewEditor.m (-startConnectingObject:withEvent:): Ditto.
* GormCore/GormObjectEditor.m (-mouseDown:): Ditto.
* GormCore/GormDocument.m (changeToViewWithTag:): Don't change the
selection if connecting.
* GormCore/GormResourceManager.m: Revert previous commit.
* Gorm.m (-startConnecting:): Remove checks for a nil
connectDestination.
2006-11-27 Matt Rice <ratmice@gmail.com> 2006-11-27 Matt Rice <ratmice@gmail.com>
* GormCore/GormResourceManager.m: Temporarily comment out some code. * GormCore/GormResourceManager.m: Temporarily comment out some code.

5
Gorm.m
View file

@ -993,11 +993,12 @@
{ {
return; return;
} }
if (connectDestination == nil || connectSource == nil) if (connectSource == nil)
{ {
return; return;
} }
if ([[self activeDocument] containsObject: connectDestination] == NO) if (connectDestination
&& [[self activeDocument] containsObject: connectDestination] == NO)
{ {
NSLog(@"Oops - connectDestination not in active document"); NSLog(@"Oops - connectDestination not in active document");
return; return;

3
GormCore/GormDocument.m
View file

@ -885,7 +885,8 @@ static NSImage *fileImage = nil;
{ {
[selectionBox setContentView: scrollView]; [selectionBox setContentView: scrollView];
[toolbar setSelectedItemIdentifier: @"ObjectsItem"]; [toolbar setSelectedItemIdentifier: @"ObjectsItem"];
[self setSelectionFromEditor: objectsView]; if (![NSApp isConnecting])
[self setSelectionFromEditor: objectsView];
} }
break; break;
case 1: // images case 1: // images

1
GormCore/GormObjectEditor.m
View file

@ -418,6 +418,7 @@ static NSMapTable *docMap = 0;
owner: self]; owner: self];
[pb setString: name forType: GormLinkPboardType]; [pb setString: name forType: GormLinkPboardType];
[NSApp displayConnectionBetween: obj and: nil]; [NSApp displayConnectionBetween: obj and: nil];
[NSApp startConnecting];
[self dragImage: [NSApp linkImage] [self dragImage: [NSApp linkImage]
at: loc at: loc

8
GormCore/GormResourceManager.m
View file

@ -81,13 +81,7 @@
} }
else if ([type isEqual:GormLinkPboardType]) else if ([type isEqual:GormLinkPboardType])
{ {
/* FIXME [(GormDocument *)document changeToViewWithTag:0];
* temporarily comment this out
* changeToViewWithTag: calls
* setSelectionFromEditor: calls
* -stopConnecting which gets rid of the connect source
*/
//[(GormDocument *)document changeToViewWithTag:0];
return NO; return NO;
} }
} }

1
GormCore/GormViewEditor.m
View file

@ -1185,6 +1185,7 @@ static BOOL currently_displaying = NO;
owner: self]; owner: self];
[pb setString: name forType: GormLinkPboardType]; [pb setString: name forType: GormLinkPboardType];
[NSApp displayConnectionBetween: anObject and: nil]; [NSApp displayConnectionBetween: anObject and: nil];
[NSApp startConnecting];
[self dragImage: [NSApp linkImage] [self dragImage: [NSApp linkImage]
at: dragPoint at: dragPoint

1
Palettes/0Menus/GormMenuEditor.m
View file

@ -200,6 +200,7 @@
owner: self]; owner: self];
[pb setString: name forType: GormLinkPboardType]; [pb setString: name forType: GormLinkPboardType];
[NSApp displayConnectionBetween: item and: nil]; [NSApp displayConnectionBetween: item and: nil];
[NSApp startConnecting];
isLinkSource = YES; isLinkSource = YES;
[self dragImage: [NSApp linkImage] [self dragImage: [NSApp linkImage]