diff options
Diffstat (limited to 'src/modules/sharedfileswindow')
6 files changed, 15 insertions, 81 deletions
diff --git a/src/modules/sharedfileswindow/CMakeLists.txt b/src/modules/sharedfileswindow/CMakeLists.txt index 6f69065e7..fba19455e 100644 --- a/src/modules/sharedfileswindow/CMakeLists.txt +++ b/src/modules/sharedfileswindow/CMakeLists.txt @@ -1,7 +1,5 @@ # CMakeLists for src/modules/sharedfileswindow -SUBDIRS(caps) - SET(kvisharedfileswindow_MOC_HDRS SharedFilesWindow.h ) diff --git a/src/modules/sharedfileswindow/SharedFilesWindow.cpp b/src/modules/sharedfileswindow/SharedFilesWindow.cpp index 75f4c80ae..1becf1271 100644 --- a/src/modules/sharedfileswindow/SharedFilesWindow.cpp +++ b/src/modules/sharedfileswindow/SharedFilesWindow.cpp @@ -206,8 +206,8 @@ SharedFilesTreeWidgetItem::~SharedFilesTreeWidgetItem() } -SharedFilesWindow::SharedFilesWindow(KviModuleExtensionDescriptor * d) -: KviWindow(KviWindow::Tool,"shared files window",0), KviModuleExtension(d) +SharedFilesWindow::SharedFilesWindow() +: KviWindow(KviWindow::Tool,"shared files window",0) { g_pSharedFilesWindow = this; m_pSplitter = new KviTalSplitter(Qt::Horizontal,this); diff --git a/src/modules/sharedfileswindow/SharedFilesWindow.h b/src/modules/sharedfileswindow/SharedFilesWindow.h index 0faad1be8..fc38b1347 100644 --- a/src/modules/sharedfileswindow/SharedFilesWindow.h +++ b/src/modules/sharedfileswindow/SharedFilesWindow.h @@ -74,12 +74,12 @@ protected slots: }; -class SharedFilesWindow : public KviWindow, public KviModuleExtension +class SharedFilesWindow : public KviWindow { friend class KviSharedFilesItem; Q_OBJECT public: - SharedFilesWindow(KviModuleExtensionDescriptor * d); + SharedFilesWindow(); ~SharedFilesWindow(); protected: QSplitter * m_pVertSplitter; diff --git a/src/modules/sharedfileswindow/caps/CMakeLists.txt b/src/modules/sharedfileswindow/caps/CMakeLists.txt deleted file mode 100644 index 2837b3f4a..000000000 --- a/src/modules/sharedfileswindow/caps/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -# CMakeLists for ./caps - -SET(CAPSFILE sharedfileswindow) - -IF(UNIX) - IF(APPLE) - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/modules/caps/tool/) - ELSE() - # Assume linux - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/modules/caps/tool/) - ENDIF() -ELSEIF(WIN32) - INSTALL(FILES ${CAPSFILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/modules/caps/tool/) -ENDIF() diff --git a/src/modules/sharedfileswindow/caps/sharedfileswindow b/src/modules/sharedfileswindow/caps/sharedfileswindow deleted file mode 100644 index e69de29bb..000000000 --- a/src/modules/sharedfileswindow/caps/sharedfileswindow +++ /dev/null diff --git a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp index e9bb1e74b..1b12d39c4 100644 --- a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp +++ b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp @@ -36,50 +36,6 @@ SharedFilesWindow * g_pSharedFilesWindow = 0; -static KviModuleExtension * sharedfileswindow_extension_alloc(KviModuleExtensionAllocStruct * s) -{ - bool bCreateMinimized = false; - bool bNoRaise = false; - - if(!g_pSharedFilesWindow) - { - if(s->pParams) - { - if(QVariant * v = s->pParams->find("bCreateMinimized")) - { - if(v->isValid()) - { - if(v->type() == QVariant::Bool) - { - bCreateMinimized = v->toBool(); - } - } - } - } - - g_pSharedFilesWindow = new SharedFilesWindow(s->pDescriptor); - g_pMainWindow->addWindow(g_pSharedFilesWindow,!bCreateMinimized); - if(bCreateMinimized)g_pSharedFilesWindow->minimize(); - return g_pSharedFilesWindow; - } - - if(s->pParams) - { - if(QVariant * v = s->pParams->find("bNoRaise")) - { - if(v) - { - if(v->isValid() && v->type() == QVariant::Bool) - bNoRaise = v->toBool(); - } - } - } - - if(!bNoRaise)g_pSharedFilesWindow->delayedAutoRaise(); - return g_pSharedFilesWindow; -} - - /* @doc: sharedfileswindow.open @type: @@ -101,30 +57,24 @@ static KviModuleExtension * sharedfileswindow_extension_alloc(KviModuleExtension static bool sharedfileswindow_kvs_cmd_open(KviKvsModuleCommandCall * c) { - KviModuleExtensionDescriptor * d = c->module()->findExtensionDescriptor("tool",KVI_SHARED_FILES_WINDOW_EXTENSION_NAME); - if(d) - { - KviPointerHashTable<QString,QVariant> dict(17,true); - dict.setAutoDelete(true); - dict.replace("bCreateMinimized",new QVariant(c->hasSwitch('m',"minimized"))); - dict.replace("bNoRaise",new QVariant(c->hasSwitch('n',"noraise"))); + QString dummy; + bool bCreateMinimized = c->hasSwitch('m',"minimized"); + bool bNoRaise = c->hasSwitch('n',"noraise"); - d->allocate(c->window(),&dict,0); - } else { - c->warning("Ops.. internal error"); + if(!g_pSharedFilesWindow) + { + g_pSharedFilesWindow = new SharedFilesWindow(); + g_pMainWindow->addWindow(g_pSharedFilesWindow,!bCreateMinimized); + if(bCreateMinimized)g_pSharedFilesWindow->minimize(); + return true; } + + if(!bNoRaise)g_pSharedFilesWindow->delayedAutoRaise(); return true; } static bool sharedfileswindow_module_init(KviModule * m) { - KviModuleExtensionDescriptor * d = m->registerExtension("tool", - KVI_SHARED_FILES_WINDOW_EXTENSION_NAME, - __tr2qs_ctx("Manage S&hared Files","sharedfileswindow"), - sharedfileswindow_extension_alloc); - - if(d)d->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::SharedFiles))); - KVSM_REGISTER_SIMPLE_COMMAND(m,"open",sharedfileswindow_kvs_cmd_open); return true; } |