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

* 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
+2 -5
View File
@@ -8,6 +8,7 @@
#include <QMainWindow>
#include "data/search/SearchMatch.h"
#include "LicenseChecker.h"
#include "qt/window/QtWindowStack.h"
class Bookmark;
@@ -71,7 +72,7 @@ public:
void loadDockWidgetLayout();
void loadWindow(bool showStartWindow);
void forceEnterLicense(bool expired);
void forceEnterLicense(LicenseChecker::LicenseState state);
void updateHistoryMenu(const std::vector<SearchMatch>& history);
void updateBookmarksMenu(const std::vector<std::shared_ptr<Bookmark>>& bookmarks);
@@ -160,8 +161,6 @@ private:
void setupBookmarksMenu();
void setupHelpMenu();
void setTrialActionsEnabled(bool enabled);
DockWidget* getDockWidgetForView(View* view);
void setShowDockWidgetTitleBars(bool showTitleBars);
@@ -187,8 +186,6 @@ private:
bool m_showDockWidgetTitleBars;
std::vector<QAction*> m_trialDisabledActions;
QtWindowStack m_windowStack;
};