Skip to content

Commit

Permalink
Maintenance: changed some branding to Solar2D (#196)
Browse files Browse the repository at this point in the history
  • Loading branch information
sekodev authored Nov 18, 2020
1 parent f1e6865 commit 742d5ee
Show file tree
Hide file tree
Showing 10 changed files with 36 additions and 36 deletions.
24 changes: 12 additions & 12 deletions platform/mac/AppDelegate.mm
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//////////////////////////////////////////////////////////////////////////////
//
// This file is part of the Corona game engine.
// This file is part of the Solar2D game engine.
// For overview and more information on licensing please refer to README.md
// Home page: https://github.com/coronalabs/corona
// Contact: support@coronalabs.com
// Contact: support@solar2d.com
//
//////////////////////////////////////////////////////////////////////////////

Expand Down Expand Up @@ -688,7 +688,7 @@ -(void)coronaInit:(NSNotification*)aNotification
{
[[NSUserDefaults standardUserDefaults] setBool:NO forKey:kUserPreferenceDoNotUseSkinnedWindows];

NSRunAlertPanel( @"Corona Simulator - Deprecated Preference", @"The \"Display device border\" preference is no longer used. Borderless devices can be chosen in the Window/View As menu instead.", nil, nil, nil );
NSRunAlertPanel( @"Solar2D Simulator - Deprecated Preference", @"The \"Display device border\" preference is no longer used. Borderless devices can be chosen in the Window/View As menu instead.", nil, nil, nil );
}

// Find the application support directory and the user's Skins directory within it
Expand Down Expand Up @@ -1107,7 +1107,7 @@ - (void) loadExtensionMenu
NSMenu *appMenu = [[NSApplication sharedApplication] mainMenu];
NSMenuItem *windowMenuItem = [appMenu itemWithTitle:kWindowMenuItemName];
NSMenu *windowMenu = [windowMenuItem submenu];
long welcomeItemIdx = [windowMenu indexOfItemWithTitle:@"Welcome to Corona"];
long welcomeItemIdx = [windowMenu indexOfItemWithTitle:@"Welcome to Solar2D"];

if (welcomeItemIdx == -1)
{
Expand Down Expand Up @@ -1320,7 +1320,7 @@ - (void) runExtension:(NSString *) extName
NSMenu *appMenu = [[NSApplication sharedApplication] mainMenu];
NSMenuItem *windowMenuItem = [appMenu itemWithTitle:kWindowMenuItemName];
NSMenu *windowMenu = [windowMenuItem submenu];
long welcomeItemIdx = [windowMenu indexOfItemWithTitle:@"Welcome to Corona"];
long welcomeItemIdx = [windowMenu indexOfItemWithTitle:@"Welcome to Solar2D"];

if (welcomeItemIdx == -1)
{
Expand Down Expand Up @@ -2128,7 +2128,7 @@ - (BOOL) application:(NSApplication*)theApplication openFile:(NSString*)filepath

if (YES == isDirectory)
{
// In theory, we should just pass to runApp, but passing an empty directory seems to lead to Corona quiting.
// In theory, we should just pass to runApp, but passing an empty directory seems to lead to Solar2D quiting.
NSString* mainScriptFile = [NSString stringWithExternalString:Rtt_LUA_SCRIPT_FILE( "main" )];
NSString* fullpath = [filepath stringByAppendingPathComponent:mainScriptFile];
if( ! [[NSFileManager defaultManager] fileExistsAtPath:fullpath] )
Expand Down Expand Up @@ -3369,7 +3369,7 @@ -(void)notifyRuntimeError:(NSString *)message
{
if ( !fBuildProblemNotified )
{
[self notifyWithTitle:@"Corona Simulator" description:message iconData:nil];
[self notifyWithTitle:@"Solar2D Simulator" description:message iconData:nil];
fBuildProblemNotified = true;
}
}
Expand Down Expand Up @@ -3471,7 +3471,7 @@ - (BOOL) promptAndRelaunchSimulatorIfUserApproves
FileWatch_StopMonitoringFolder(luaResourceFolderMonitor);

NSAlert* relaunchAlert = [[[NSAlert alloc] init] autorelease];
[relaunchAlert setMessageText:@"Corona project has been modified"];
[relaunchAlert setMessageText:@"Project has been modified"];
[relaunchAlert setInformativeText:@"Would you like to relaunch the Simulator?"];
[relaunchAlert addButtonWithTitle:@"Relaunch Simulator"];
[relaunchAlert addButtonWithTitle:@"Ignore"];
Expand Down Expand Up @@ -3706,14 +3706,14 @@ - (void) checkOSVersionAndWarn

if ([self compareOSVersion:currentOSVersion with:kosVersionMinimum] == NSOrderedAscending)
{
NSString *msg = [NSString stringWithFormat:@"This version of macOS (%@) is too old to run Corona.\n\nMinimum supported macOS version is %@", currentOSVersion, kosVersionPrevious];
NSString *msg = [NSString stringWithFormat:@"This version of macOS (%@) is too old to run Solar2D.\n\nMinimum supported macOS version is %@", currentOSVersion, kosVersionPrevious];

[alert setMessageText:@"macOS Version Error"];
[alert setInformativeText:msg];
[alert setAlertStyle:NSCriticalAlertStyle];
[alert addButtonWithTitle:@"Exit"];

NSLog( @"Corona Simulator: %@", msg );
NSLog( @"Solar2D Simulator: %@", msg );

[alert runModal]; // we exit when they hit the button so run modally here

Expand All @@ -3729,7 +3729,7 @@ - (void) checkOSVersionAndWarn
[alert addButtonWithTitle:@"Continue"];
[alert setShowsSuppressionButton:YES];

NSLog( @"Corona Simulator: %@", msg );
NSLog( @"Solar2D Simulator: %@", msg );
}
else if ([self compareOSVersion:currentOSVersion with:kosVersionPrevious] == NSOrderedAscending)
{
Expand All @@ -3741,7 +3741,7 @@ - (void) checkOSVersionAndWarn
[alert addButtonWithTitle:@"Continue"];
[alert setShowsSuppressionButton:YES];

NSLog( @"Corona Simulator: %@", msg );
NSLog( @"Solar2D Simulator: %@", msg );
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion platform/mac/CoronaWindowController.mm
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ - (void)didPrepare
[self setWindowFrameAutosaveName:@"CoronaWelcomeWindow"];

window_title = [NSString stringWithFormat:@"%@ (Build %@)",
NSLocalizedString(@"Welcome to Corona", @"Welcome Window Title Bar Text Base"),
NSLocalizedString(@"Welcome to Solar2D", @"Welcome Window Title Bar Text Base"),
[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"]
];
}
Expand Down
4 changes: 2 additions & 2 deletions platform/mac/Credits.rtfd/TXT.rtf
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
\margl1440\margr1440\vieww12600\viewh10200\viewkind0
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\qc\partightenfactor0

\f0\b\fs24 \cf0 Copyright \'a9 2009-2020 Corona Labs Inc.\
All rights reserved.}
\f0\b\fs24 \cf0 Copyright \'a9 2020 Solar2D.\
All rights reserved.}
6 changes: 3 additions & 3 deletions platform/mac/English.lproj/MainMenu.nib/designable.nib

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified platform/mac/English.lproj/MainMenu.nib/keyedobjects.nib
Binary file not shown.
2 changes: 1 addition & 1 deletion platform/mac/English.lproj/WelcomeToCorona.xib
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{360, 214}, {960, 600}}</string>
<int key="NSWTFlags">544736256</int>
<string key="NSWindowTitle">Welcome to Corona</string>
<string key="NSWindowTitle">Welcome to Solar2D</string>
<string key="NSWindowClass">WelcomeWindow</string>
<nil key="NSViewClass"/>
<object class="NSView" key="NSWindowView" id="1006">
Expand Down
2 changes: 1 addition & 1 deletion platform/mac/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<key>NSHighResolutionCapable</key>
<true/>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2009-2020 Corona Labs Inc. All rights reserved.</string>
<string>Copyright © 2020 Solar2D. All rights reserved.</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion platform/mac/WelcomeToCoronaController.mm
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ - (void) resurrectWindow

#pragma mark Main Window helper methods

// Helper method to help create an NSAttributedString with a drop shadow. Intended for the main "Welcome to Corona" text.
// Helper method to help create an NSAttributedString with a drop shadow. Intended for the main "Welcome to Solar2D" text.
- (NSAttributedString*) dropShadowAttributedStringFromAttributedString:(NSAttributedString*)source_string
{
if(nil == source_string)
Expand Down
28 changes: 14 additions & 14 deletions platform/windows/Corona.Simulator/Simulator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,15 @@ CSimulatorApp::CSimulatorApp()
BOOL CSimulatorApp::InitInstance()
{
// Load the simulator version of the Corona library, which is only used by plugins to link against by name.
// This is a thin proxy DLL which forwards Corona's public APIs to this EXE's statically linked Corona APIs.
// This is a thin proxy DLL which forwards Solar2D's public APIs to this EXE's statically linked Solar2D APIs.
// This ensures that plugins link with the simulator's library and not the non-simulator version of the library.
CString coronaLibraryPath = GetApplicationDir() + _T("\\Resources\\CoronaLabs.Corona.Native.dll");
if (!Rtt_VERIFY(::LoadLibrary(coronaLibraryPath)))
{
CString message =
_T("Failed to load the Corona Simulator's library.\r\n")
_T("This might mean that your Corona installation is corrupted.\r\n")
_T("You may be able to fix this by re-installing the Corona.");
_T("Failed to load the Solar2D Simulator's library.\r\n")
_T("This might mean that your Solar2D installation is corrupted.\r\n")
_T("You may be able to fix this by re-installing the Solar2D.");
AfxMessageBox(message, MB_OK | MB_ICONEXCLAMATION);
return FALSE;
}
Expand Down Expand Up @@ -139,7 +139,7 @@ BOOL CSimulatorApp::InitInstance()
}
}
// Initialize WinGlobalProperties object which mirrors theApp properties
// Make sure this is done before accessing any Corona functions
// Make sure this is done before accessing any Solar2D functions
WinString strRegistryKey, strRegistryProfile, strResourcesDir;
strRegistryKey.SetTCHAR(m_pszRegistryKey);
strRegistryProfile.SetTCHAR(m_pszProfileName);
Expand All @@ -155,16 +155,16 @@ BOOL CSimulatorApp::InitInstance()
if (!lastRunSucceeded)
{
CString message =
_T("Corona Simulator crashed last time it was run\n\n")
_T("Solar2D Simulator crashed last time it was run\n\n")
_T("This can happen because Windows or the video driver need to be updated. ")
_T("If it crashes again, make sure the software for your video card is up to date (you ")
_T("may need to visit the manufacturer's web site to check this) and ensure that all ")
_T("available Windows updates have been installed.\n\n")
_T("If the problem persists, contact support@coronalabs.com including as much detail as possible.");
_T("If the problem persists, contact support@solar2d.com including as much detail as possible.");

SHMessageBoxCheck(NULL,
message,
TEXT("Corona Simulator"),
TEXT("Solar2D Simulator"),
MB_OK | MB_ICONEXCLAMATION,
IDOK,
L"CoronaShowCrashWarning");
Expand Down Expand Up @@ -224,7 +224,7 @@ BOOL CSimulatorApp::InitInstance()
{
// *** The app is currently displaying a modal dialog. ***

// Stop the app's currently running Corona project. Avoids file locking issues, like with fonts.
// Stop the app's currently running Solar2D project. Avoids file locking issues, like with fonts.
::PostMessage(windowHandle, WM_COMMAND, ID_FILE_CLOSE, 0);

// Send a quit message to exit the app. (Not a clean way to exit an app.)
Expand Down Expand Up @@ -265,7 +265,7 @@ BOOL CSimulatorApp::InitInstance()
// Display a logging window, if enabled.
if (m_isConsoleEnabled)
{
// Use the following Corona application as our logging window.
// Use the following Solar2D application as our logging window.
WinString outputViewerFilePath(GetApplicationDir());
WinString outputViewerArgs;

Expand Down Expand Up @@ -333,8 +333,8 @@ BOOL CSimulatorApp::InitInstance()
m_pDocManager = new CSimDocManager();

// Register the simulator's document template.
// This is used to manage an open Corona project with an MFC SDI document/view interface.
// Note: This custom doc template allows the simulator to open Corona projects by directory or "main.lua".
// This is used to manage an open Solar2D project with an MFC SDI document/view interface.
// Note: This custom doc template allows the simulator to open Solar2D projects by directory or "main.lua".
auto pDocTemplate = new CSimulatorDocTemplate();
if (!pDocTemplate)
{
Expand All @@ -343,7 +343,7 @@ BOOL CSimulatorApp::InitInstance()
AddDocTemplate(pDocTemplate);

// Do this before any of the ways app can exit (including not authorized)
printf("\nCorona Simulator %d.%d (%s %s)\n\n", Rtt_BUILD_YEAR, Rtt_BUILD_REVISION, __DATE__, __TIME__);
printf("\nSolar2D Simulator %d.%d (%s %s)\n\n", Rtt_BUILD_YEAR, Rtt_BUILD_REVISION, __DATE__, __TIME__);

// Load user preferences from registry
// Initialize member variables used to write out preferences
Expand Down Expand Up @@ -376,7 +376,7 @@ BOOL CSimulatorApp::InitInstance()
}
}

// If a Corona project directory was provided at the command line, then append a "main.lua" file to the path.
// If a Solar2D project directory was provided at the command line, then append a "main.lua" file to the path.
if (!cmdInfo.m_strFileName.IsEmpty() && ::PathIsDirectory(cmdInfo.m_strFileName))
{
TCHAR mainLuaFilePath[2048];
Expand Down
2 changes: 1 addition & 1 deletion simulator-extensions/welcomescreen
Submodule welcomescreen updated 1 files
+1 −1 extension.lua

0 comments on commit 742d5ee

Please sign in to comment.