From d49d4d6e5f1407289e69ff9ad2141f92152fa4d6 Mon Sep 17 00:00:00 2001 From: Riccardo Mottola Date: Wed, 18 Aug 2021 23:11:45 +0200 Subject: [PATCH] cleanup inforpanel init and proper centering --- ChangeLog | 5 +++++ PCInfoController.m | 29 +++++++---------------------- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 08746cb..4677521 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2021-08-18 Riccardo Mottola + + * PCInfoContronoller.m + Center info panel correctly the first time on load. + 2021-08-10 Gregory John Casamento * Framework/PCEditorManager.m: Add method -gotoFile:atLine: diff --git a/PCInfoController.m b/PCInfoController.m index fee1c2f..15c15e3 100644 --- a/PCInfoController.m +++ b/PCInfoController.m @@ -37,6 +37,13 @@ infoDict = [NSDictionary dictionaryWithContentsOfFile:file]; RETAIN(infoDict); + + if ([NSBundle loadNibNamed:@"Info" owner:self] == NO) + { + return nil; + } + [versionField setStringValue:[NSString stringWithFormat:@"Version %@", [infoDict objectForKey:@"ApplicationRelease"]]]; + [infoWindow center]; } return self; @@ -56,29 +63,7 @@ - (void)showInfoWindow:(id)sender { - if ([NSBundle loadNibNamed:@"Info" owner:self] == NO) - { -// PCLogError(self, @"error loading Menu NIB file!"); - return; - } - [infoWindow makeKeyAndOrderFront:self]; - [versionField setStringValue:[NSString stringWithFormat:@"Version %@", [infoDict objectForKey:@"ApplicationRelease"]]]; - -/*#if defined(GNUSTEP) - if (!infoWindow) - { - infoWindow = [[GSInfoPanel alloc] initWithDictionary:infoDict]; - } - - [infoWindow setTitle:@"Info"]; - [infoWindow center]; - [infoWindow makeKeyAndOrderFront:self]; -#else - NSRunAlertPanel(@"Info", - @"OPENSTEP has no support for GSInfoPanel", - @"OK",nil,nil,nil); -#endif*/ } @end