summaryrefslogtreecommitdiff
path: root/main.cpp
diff options
context:
space:
mode:
authorThomas Preud'homme <robotux@celest.fr>2019-02-03 00:10:52 +0000
committerThomas Preud'homme <robotux@celest.fr>2019-02-03 00:10:52 +0000
commit9b10c21f5cad0e2ec27d23c59e65af7141a226f3 (patch)
treebf81d75a9ed990bb76488c502767600fcf7550b7 /main.cpp
parent594fcba67600704bee9115c86e18927b2237b304 (diff)
New upstream version 1.6.1.3
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/main.cpp b/main.cpp
index 540fec6..1abaa28 100644
--- a/main.cpp
+++ b/main.cpp
@@ -14,6 +14,7 @@
#include "ResourcesManager.h"
#include "OptionEngine.h"
#include "PluginsManager.h"
+#include "ProductKey.h"
#ifndef ULTRACOPIER_PLUGIN_ALL_IN_ONE_DIRECT
#ifdef ULTRACOPIER_PLUGIN_ALL_IN_ONE
@@ -38,6 +39,7 @@ OptionEngine *OptionEngine::optionEngine=NULL;
PluginsManager *PluginsManager::pluginsManager=NULL;
LanguagesManager *LanguagesManager::languagesManager=NULL;
ThemesManager *ThemesManager::themesManager=NULL;
+ProductKey *ProductKey::productKey=NULL;
void registerTheOptions()
{
@@ -49,14 +51,13 @@ void registerTheOptions()
//add the options hidden, will not show in options pannel
KeysList.clear();
KeysList.push_back(std::pair<std::string, std::string>("Last_version_used","na"));
- #ifdef ULTRACOPIER_VERSION_ULTIMATE
KeysList.push_back(std::pair<std::string, std::string>("key",""));
- #endif
KeysList.push_back(std::pair<std::string, std::string>("ActionOnManualOpen","1"));
KeysList.push_back(std::pair<std::string, std::string>("GroupWindowWhen","0"));
KeysList.push_back(std::pair<std::string, std::string>("displayOSSpecific","true"));
KeysList.push_back(std::pair<std::string, std::string>("confirmToGroupWindows","true"));
KeysList.push_back(std::pair<std::string, std::string>("remainingTimeAlgorithm","1"));
+ KeysList.push_back(std::pair<std::string, std::string>("portable","false"));
#ifdef ULTRACOPIER_INTERNET_SUPPORT
#if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
KeysList.push_back(std::pair<std::string, std::string>("checkTheUpdate","true"));
@@ -117,6 +118,7 @@ int main(int argc, char *argv[])
PluginsManager::pluginsManager=new PluginsManager();
LanguagesManager::languagesManager=new LanguagesManager();
ThemesManager::themesManager=new ThemesManager();
+ ProductKey::productKey=new ProductKey();
//the main code, event loop of Qt and event dispatcher of ultracopier
{
@@ -127,6 +129,8 @@ int main(int argc, char *argv[])
returnCode=ultracopierApplication.exec();
}
+ delete ProductKey::productKey;
+ ProductKey::productKey=NULL;
delete ThemesManager::themesManager;
ThemesManager::themesManager=NULL;
delete LanguagesManager::languagesManager;