diff options
Diffstat (limited to 'EventDispatcher.cpp')
-rw-r--r-- | EventDispatcher.cpp | 50 |
1 files changed, 27 insertions, 23 deletions
diff --git a/EventDispatcher.cpp b/EventDispatcher.cpp index ba8b45c..a19cfd4 100644 --- a/EventDispatcher.cpp +++ b/EventDispatcher.cpp @@ -20,21 +20,20 @@ #include <windows.h> #endif -/// \todo group the facility engine - /// \brief Initiate the ultracopier event dispatcher and check if no other session is running EventDispatcher::EventDispatcher() { - connect(&localListener,SIGNAL(cli(QStringList,bool)),&cliParser,SLOT(cli(QStringList,bool)),Qt::QueuedConnection); - connect(themes, SIGNAL(newThemeOptions(QWidget*,bool,bool)), &optionDialog, SLOT(newThemeOptions(QWidget*,bool,bool))); - connect(&cliParser, SIGNAL(newCopy(QStringList)), ©Server, SLOT(newCopy(QStringList))); - connect(&cliParser, SIGNAL(newCopy(QStringList,QString)), ©Server, SLOT(newCopy(QStringList,QString))); - connect(&cliParser, SIGNAL(newMove(QStringList)), ©Server, SLOT(newMove(QStringList))); - connect(&cliParser, SIGNAL(newMove(QStringList,QString)), ©Server, SLOT(newMove(QStringList,QString))); + copyServer=new CopyListener(&optionDialog); + connect(&localListener,SIGNAL(cli(QStringList,bool,bool)),&cliParser,SLOT(cli(QStringList,bool,bool)),Qt::QueuedConnection); + connect(themes, SIGNAL(newThemeOptions(QString,QWidget*,bool,bool)), &optionDialog, SLOT(newThemeOptions(QString,QWidget*,bool,bool))); + connect(&cliParser, SIGNAL(newCopy(QStringList)), copyServer, SLOT(newCopy(QStringList))); + connect(&cliParser, SIGNAL(newCopy(QStringList,QString)), copyServer, SLOT(newCopy(QStringList,QString))); + connect(&cliParser, SIGNAL(newMove(QStringList)), copyServer, SLOT(newMove(QStringList))); + connect(&cliParser, SIGNAL(newMove(QStringList,QString)), copyServer, SLOT(newMove(QStringList,QString))); copyMoveEventIdIndex=0; backgroundIcon=NULL; stopIt=false; - sessionloader=new SessionLoader(this); + sessionloader=new SessionLoader(&optionDialog); copyEngineList=new CopyEngineManager(&optionDialog); core=new Core(copyEngineList); qRegisterMetaType<CatchState>("CatchState"); @@ -61,7 +60,7 @@ EventDispatcher::EventDispatcher() KeysList.clear(); KeysList.append(qMakePair(QString("Last_version_used"),QVariant("na"))); KeysList.append(qMakePair(QString("ActionOnManualOpen"),QVariant(1))); - KeysList.append(qMakePair(QString("GroupWindowWhen"),QVariant(3))); + KeysList.append(qMakePair(QString("GroupWindowWhen"),QVariant(0))); options->addOptionGroup("Ultracopier",KeysList); if(options->getOptionValue("Ultracopier","Last_version_used")!=QVariant("na") && options->getOptionValue("Ultracopier","Last_version_used")!=QVariant(ULTRACOPIER_VERSION)) { @@ -78,6 +77,8 @@ EventDispatcher::EventDispatcher() KeysList.clear(); KeysList.append(qMakePair(QString("List"),QVariant(QStringList() << "Ultracopier-0.3"))); options->addOptionGroup("CopyEngine",KeysList); + + connect(&cliParser, SIGNAL(newTransferList(QString,QString,QString)),core, SLOT(newTransferList(QString,QString,QString))); } /// \brief Destroy the ultracopier event dispatcher @@ -92,6 +93,7 @@ EventDispatcher::~EventDispatcher() delete sessionloader; if(backgroundIcon!=NULL) delete backgroundIcon; + delete copyServer; } /// \brief return if need be close @@ -117,15 +119,17 @@ void EventDispatcher::initFunction() return; } ULTRACOPIER_DEBUGCONSOLE(DebugLevel_Notice,"Initialize the variable of event loop"); - connect(©Server, SIGNAL(newCopy(quint32,QStringList,QStringList)), core, SLOT(newCopy(quint32,QStringList,QStringList))); - connect(©Server, SIGNAL(newCopy(quint32,QStringList,QStringList,QString,QString)), core, SLOT(newCopy(quint32,QStringList,QStringList,QString,QString))); - connect(©Server, SIGNAL(newMove(quint32,QStringList,QStringList)), core, SLOT(newMove(quint32,QStringList,QStringList))); - connect(©Server, SIGNAL(newMove(quint32,QStringList,QStringList,QString,QString)), core, SLOT(newMove(quint32,QStringList,QStringList,QString,QString))); - connect(core, SIGNAL(copyFinished(quint32,bool)), ©Server, SLOT(copyFinished(quint32,bool))); - connect(core, SIGNAL(copyCanceled(quint32)), ©Server, SLOT(copyCanceled(quint32))); + connect(copyServer, SIGNAL(newCopy(quint32,QStringList,QStringList)), core, SLOT(newCopy(quint32,QStringList,QStringList))); + connect(copyServer, SIGNAL(newCopy(quint32,QStringList,QStringList,QString,QString)), core, SLOT(newCopy(quint32,QStringList,QStringList,QString,QString))); + connect(copyServer, SIGNAL(newMove(quint32,QStringList,QStringList)), core, SLOT(newMove(quint32,QStringList,QStringList))); + connect(copyServer, SIGNAL(newMove(quint32,QStringList,QStringList,QString,QString)), core, SLOT(newMove(quint32,QStringList,QStringList,QString,QString))); + connect(core, SIGNAL(copyFinished(quint32,bool)), copyServer, SLOT(copyFinished(quint32,bool))); + connect(core, SIGNAL(copyCanceled(quint32)), copyServer, SLOT(copyCanceled(quint32))); if(localListener.tryConnect()) { stopIt=true; + //why before removed??? + QCoreApplication::quit(); return; } localListener.listenServer(); @@ -139,13 +143,13 @@ void EventDispatcher::initFunction() connect(backgroundIcon, SIGNAL(quit()),this,SLOT(quit())); //show option is for OptionEngine object connect(backgroundIcon, SIGNAL(showOptions()), &optionDialog, SLOT(show())); - connect(©Server, SIGNAL(listenerReady(ListeningState,bool,bool)), backgroundIcon, SLOT(listenerReady(ListeningState,bool,bool))); - connect(©Server, SIGNAL(pluginLoaderReady(CatchState,bool,bool)), backgroundIcon, SLOT(pluginLoaderReady(CatchState,bool,bool))); - connect(backgroundIcon, SIGNAL(tryCatchCopy()), ©Server, SLOT(listen())); - connect(backgroundIcon, SIGNAL(tryUncatchCopy()), ©Server, SLOT(close())); + connect(copyServer, SIGNAL(listenerReady(ListeningState,bool,bool)), backgroundIcon, SLOT(listenerReady(ListeningState,bool,bool))); + connect(copyServer, SIGNAL(pluginLoaderReady(CatchState,bool,bool)), backgroundIcon, SLOT(pluginLoaderReady(CatchState,bool,bool))); + connect(backgroundIcon, SIGNAL(tryCatchCopy()), copyServer, SLOT(listen())); + connect(backgroundIcon, SIGNAL(tryUncatchCopy()), copyServer, SLOT(close())); if(options->getOptionValue("CopyListener","CatchCopyAsDefault").toBool()) - copyServer.listen(); - ULTRACOPIER_DEBUGCONSOLE(DebugLevel_Notice,"copyServer.oneListenerIsLoaded(): "+QString::number(copyServer.oneListenerIsLoaded())); + copyServer->listen(); + ULTRACOPIER_DEBUGCONSOLE(DebugLevel_Notice,"copyServer.oneListenerIsLoaded(): "+QString::number(copyServer->oneListenerIsLoaded())); //backgroundIcon->readyToListen(copyServer.oneListenerIsLoaded()); connect(backgroundIcon, SIGNAL(addWindowCopyMove(CopyMode,QString)), core, SLOT(addWindowCopyMove(CopyMode,QString))); @@ -153,7 +157,7 @@ void EventDispatcher::initFunction() connect(copyEngineList, SIGNAL(addCopyEngine(QString,bool)), backgroundIcon, SLOT(addCopyEngine(QString,bool))); connect(copyEngineList, SIGNAL(removeCopyEngine(QString)), backgroundIcon, SLOT(removeCopyEngine(QString))); copyEngineList->setIsConnected(); - copyServer.resendState(); + copyServer->resendState(); } //conntect the last chance signal before quit connect(QCoreApplication::instance(),SIGNAL(aboutToQuit()),this,SLOT(quit())); |