From 6817d12843b027b91afaede83b606451c6804d29 Mon Sep 17 00:00:00 2001 From: Sergii Stoian Date: Sat, 14 Feb 2009 15:45:52 +0000 Subject: [PATCH] * PCMenuController.m: (showInfoPanel:): Use appController intead of [NSApp delegate]. * GNUmakefile: Change version to 0.5.1. * Resources/Info-gnustep.plist: ditto. * Framework/PCProjectManager.m: (open): Move ordering front project window for here... (openProjectAt:): to here. * Framework/PCProjectBrowser.m: (nameOfSelectedCategory): Edit comment text. * Framework/PCLogController.m: (showPanel): Call makeKeyAndOrderFront instead of orderFront. * Headers/PCInfoController.[hm]: (showInfoWindow:): Get version info from Info-gnustep.plist. * PCPrefController.m: (showPanel:): Call makeKeyAndOrderFront instead of orderFront. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@27861 72102866-910b-0410-8b05-ffd578937521 --- English.lproj/Info.gorm/data.classes | 9 +++++++++ English.lproj/Info.gorm/objects.gorm | Bin 93287 -> 93392 bytes Framework/PCLogController.m | 2 +- Framework/PCProjectBrowser.m | 4 ++-- Framework/PCProjectManager.m | 11 ++++------- GNUmakefile | 2 +- Headers/PCInfoController.h | 5 +++-- PCInfoController.m | 3 +++ PCMenuController.m | 2 +- PCPrefController.m | 2 +- Resources/Info-gnustep.plist | 2 +- 11 files changed, 26 insertions(+), 16 deletions(-) diff --git a/English.lproj/Info.gorm/data.classes b/English.lproj/Info.gorm/data.classes index 168dd6b..45c1120 100644 --- a/English.lproj/Info.gorm/data.classes +++ b/English.lproj/Info.gorm/data.classes @@ -1,3 +1,12 @@ { "## Comment" = "Do NOT change this file, Gorm maintains it"; + PCInfoController = { + Actions = ( + ); + Outlets = ( + infoWindow, + versionField + ); + Super = NSObject; + }; } \ No newline at end of file diff --git a/English.lproj/Info.gorm/objects.gorm b/English.lproj/Info.gorm/objects.gorm index 8014d1c5a9904e9b464e541cf1d17caff83d4cb0..260ea041450478d4e6b2e4f98832d0837c26b02d 100644 GIT binary patch delta 285 zcmaEUgZ08q)(P@lMpgzOU}#{zQB#AF?Op=|w~JkKIOFzkM#k%I%GnGI+|Dfw3}W0) zr+`ey1|U<6n*j*G1W0&#pa zz*u6a#314q?3bD3Us{rrS_0IPmzrFXUj$Ubz_8)*hPwfbOdC1WfE*sU`8-TzsYS(^ v`FU=csW~YDjLaLAfGSS}FtR{Ya=}${F=YbX5uTZsl3yOc$huJ;WDo-Y5L8G! delta 171 zcmca`llA!x)(P@lhE@h3U}#{xQB#AF?EwP=w~I}4IOFzkM#k%I%6&k-a|;857`Iac zkm(2{#KgE6fB;N@gr^63FfN;ZAeqr%`oC~Sx$Ul=jL}St7TXtkGg?V=Fp2`zGHzhr zekYA_CbJ~3Dv-+x660m^3wA6h$jMAjEXmBzn?5m%v6W2@BqO(7CY#ZLk$t1Q8j!~T E0PhkfZ2$lO diff --git a/Framework/PCLogController.m b/Framework/PCLogController.m index 0017082..46732c6 100644 --- a/Framework/PCLogController.m +++ b/Framework/PCLogController.m @@ -134,7 +134,7 @@ static PCLogController *_logCtrllr = nil; - (void)showPanel { - [panel orderFront:self]; + [panel makeKeyAndOrderFront:self]; } - (void)logMessage:(NSString *)text withTag:(int)tag sender:(id)sender; diff --git a/Framework/PCProjectBrowser.m b/Framework/PCProjectBrowser.m index aa9f7ca..3714c7a 100644 --- a/Framework/PCProjectBrowser.m +++ b/Framework/PCProjectBrowser.m @@ -150,8 +150,8 @@ NSString *PCBrowserDidSetPathNotification = @"PCBrowserDidSetPathNotification"; NSString *name = nil; int i; - // Name of subproject selected: change path to be ended with 'Subprojects' - // category of superproject. + // Name of subproject selected: Change active project to superproject + // to check category against superproject's catgory list. // But: path '/Subproject/Foo' and '/Subprojects/Foo/Subprojects' will // return the same category 'Subprojects' and active project will be 'Foo' // in both cases diff --git a/Framework/PCProjectManager.m b/Framework/PCProjectManager.m index d3493f2..a243ee6 100644 --- a/Framework/PCProjectManager.m +++ b/Framework/PCProjectManager.m @@ -641,6 +641,9 @@ NSString *PCActiveProjectDidChangeNotification = @"PCActiveProjectDidChange"; { [[project projectWindow] showProjectLoadedFiles:self]; } + + [[project projectWindow] makeKeyAndOrderFront:self]; + return YES; } @@ -662,13 +665,7 @@ NSString *PCActiveProjectDidChangeNotification = @"PCActiveProjectDidChange"; if (filePath != nil) { - if (![self openProjectAt:filePath]) - { - // No need to open alert panel. - // Panel was opened in openProjectAt:->loadProjectAt: method. - return; - } - [[activeProject projectWindow] makeKeyAndOrderFront:self]; + [self openProjectAt:filePath]; } } diff --git a/GNUmakefile b/GNUmakefile index 6092544..a34a2f0 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -16,7 +16,7 @@ include $(GNUSTEP_MAKEFILES)/common.make # # Main application # -VERSION = 0.5.0 +VERSION = 0.5.1 APP_NAME = ProjectCenter ProjectCenter_APPLICATION_ICON = Images/ProjectCenter.tiff diff --git a/Headers/PCInfoController.h b/Headers/PCInfoController.h index 27dc8f0..65f6c0a 100644 --- a/Headers/PCInfoController.h +++ b/Headers/PCInfoController.h @@ -27,8 +27,9 @@ @interface PCInfoController : NSObject { - id infoWindow; - NSDictionary *infoDict; + id infoWindow; + id versionField; + NSDictionary *infoDict; } - (id)init; diff --git a/PCInfoController.m b/PCInfoController.m index db6af4f..fee1c2f 100644 --- a/PCInfoController.m +++ b/PCInfoController.m @@ -61,6 +61,9 @@ // PCLogError(self, @"error loading Menu NIB file!"); return; } + + [infoWindow makeKeyAndOrderFront:self]; + [versionField setStringValue:[NSString stringWithFormat:@"Version %@", [infoDict objectForKey:@"ApplicationRelease"]]]; /*#if defined(GNUSTEP) if (!infoWindow) diff --git a/PCMenuController.m b/PCMenuController.m index 1834742..4309b76 100644 --- a/PCMenuController.m +++ b/PCMenuController.m @@ -87,7 +87,7 @@ - (void)showInfoPanel:(id)sender { - [[[NSApp delegate] infoController] showInfoWindow:sender]; + [[appController infoController] showInfoWindow:sender]; } - (void)showEditorPanel:(id)sender diff --git a/PCPrefController.m b/PCPrefController.m index ff9d1df..04b1849 100644 --- a/PCPrefController.m +++ b/PCPrefController.m @@ -348,7 +348,7 @@ static PCPrefController *_prefCtrllr = nil; // Load saved prefs [self loadPreferences]; - [panel orderFront:self]; + [panel makeKeyAndOrderFront:self]; } // diff --git a/Resources/Info-gnustep.plist b/Resources/Info-gnustep.plist index 705791c..0bdae63 100644 --- a/Resources/Info-gnustep.plist +++ b/Resources/Info-gnustep.plist @@ -3,7 +3,7 @@ ApplicationName = "ProjectCenter"; ApplicationDescription = "GNUstep Integrated Development Environment"; ApplicationIcon = "ProjectCenter.tiff"; - ApplicationRelease = "0.5.0"; + ApplicationRelease = "0.5.1"; FullVersionID = "HEAD"; Authors = ( "Philippe C.D. Robert",