ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logic: Added Non-Commercial Use option and removed trial mode

Browse Source 
* Added non-commercial use option to enter license window
* Show enter license window on first start and force license selection
* Added ApplicationSettings migration that removed private/academic license and switches user to non-commercial mode
* Added commandline option to choose non-commercial use and provide better hints to license selection
* Removed trial mode

fortune cookie message = A secret admirer will soon send you a sign of affection.
This commit is contained in:
Eberhard Graether
2017-10-19 16:58:47 +02:00
parent c3a5405cc4
commit 8e908c2a78
30 changed files with 602 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/main.cpp
+11 -7
View File
@@ -23,7 +23,6 @@
#include "utility/logging/LoggerUtility.h"
#include "utility/logging/logging.h"
#include "utility/logging/LogManager.h"
#include "utility/messaging/type/MessageEnteredLicense.h"
#include "utility/messaging/type/MessageInterruptTasks.h"
#include "utility/messaging/type/MessageLoadProject.h"
#include "utility/messaging/type/MessageStatus.h"
@@ -247,16 +246,21 @@ int main(int argc, char *argv[])
return 0;
}
if (!checker->isCurrentLicenseValid()) // this works because the user cannot enter a license string while running the app in headless more.
if (!checker->isCurrentLicenseValid() && !ApplicationSettings::getInstance()->getNonCommercialUse())
{
std::cout << "No or invalide License" << std::endl;
std::string appName = argc > 0 && std::string(argv[0]).size() ? argv[0] : "sourcetrail";
std::cout << "\nERROR: No valid license option selected.\n\n";
std::cout << "For commercial use please run:\n\n";
std::cout << "\t" << appName << " config --license-string <Commercial License or Test License string>\n";
std::cout << "or\n";
std::cout << "\t" << appName << " config --license-file <path/to/Commercial License or Test License file>\n\n\n";
std::cout << "For non-commercial use please run:\n\n";
std::cout << "\t" << appName << " config --non-commercial-use true\n" << std::endl;
LOG_WARNING("Your current Sourcetrail license seems to be invalid. Please update your license info.");
return 0;
}
else
{
MessageEnteredLicense(checker->getCurrentLicenseType()).dispatch();
}
if (commandLineParser.hasError() )
{