mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-28 02:30:05 +00:00
Code Activity

Projucer: add free-to-use license for the live-build engine

Browse source
This commit is contained in:
stefan.graenitz 2016-10-11 15:35:44 +02:00 • committed by stefan
parent 4aa0f311e0
commit 8d02f61622
4 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
extras/Projucer/Source/Application/jucer_LoginForm.h
View file

@ -286,6 +286,13 @@ private:
{
parentDialog->exitModalState (0);
ProjucerApplication::getApp().updateAllBuildTabs();
if (ProjucerLicenses::getInstance()->hasFreeToUseLicense())
{
AlertWindow::showMessageBoxAsync (AlertWindow::InfoIcon,
"Free to use license info",
"The free-to-use license expires on 31st January 2017 Midnight GMT");
}
}
}

5
extras/Projucer/Source/Application/jucer_ProjucerLicenses.h
View file

@ -101,6 +101,11 @@ struct ProjucerLicenses : private DeletedAtShutdown
return isDLLPresent() && dll.projucer_hasLiveCodingLicence();
}
bool hasFreeToUseLicense() const
{
return isDLLPresent() && dll.projucer_hasLicense ("ProjucerFreeToUse");
}
bool retryLoadDll()
{
dll.tryLoadDll();

15
extras/Projucer/Source/Project/jucer_ProjectContentComponent.cpp
View file

@ -550,16 +550,21 @@ Component* ProjectContentComponent::createBuildTab (CompileEngineChildProcess* c
const auto& unlockStatus = *ProjucerLicenses::getInstance();
if (! unlockStatus.isLoggedIn())
return createDisabledBuildTabSubscribe ("Sign in with your ROLI account",
false, unlockStatus.isDLLPresent());
if (! unlockStatus.hasLiveCodingLicence())
return createDisabledBuildTabSubscribe(unlockStatus.isLoggedIn(),
unlockStatus.isDLLPresent());
return createDisabledBuildTabSubscribe ("Subscribe to JUCE Pro or Indie",
true, unlockStatus.isDLLPresent());
jassert (unlockStatus.isLoggedIn());
jassert (unlockStatus.isDLLPresent());
return new EnableBuildComp();
};
}
Component* ProjectContentComponent::createDisabledBuildTabSubscribe(bool loggedIn, bool dllPresent)
Component* ProjectContentComponent::createDisabledBuildTabSubscribe(String textPrefix,
bool loggedIn, bool dllPresent)
{
bool showSubscribeButton = true;
bool showSignInButton = dllPresent && ! loggedIn;
@ -567,7 +572,7 @@ Component* ProjectContentComponent::createDisabledBuildTabSubscribe(bool loggedI
bool showDownloadButton = ! dllPresent;
return new ProjucerDisabledComp (
"Subscribe to JUCE Pro or Indie to use the Projucer's live-build features:",
textPrefix + " to use the Projucer's live-build features:",
loggedIn, showSubscribeButton, showSignInButton, showSwitchAccountButton, showDownloadButton);
}

2
extras/Projucer/Source/Project/jucer_ProjectContentComponent.h
View file

@ -154,7 +154,7 @@ private:
void timerCallback() override;
Component* createBuildTab (CompileEngineChildProcess*);
Component* createDisabledBuildTabSubscribe (bool loggedIn, bool dllPresent);
Component* createDisabledBuildTabSubscribe (String textPrefix, bool loggedIn, bool dllPresent);
Component* createDisabledBuildTabInfoOnly (const char* messsage);
bool isContinuousRebuildEnabled() { return getAppSettings().getGlobalProperties().getBoolValue ("continuousRebuild", true); }