| -rw-r--r-- | microkde/kresources/manager.h | 44 | ||||
| -rw-r--r-- | microkde/kresources/managerimpl.cpp | 70 | ||||
| -rw-r--r-- | microkde/kresources/syncwidget.cpp | 46 | ||||
| -rw-r--r-- | microkde/kresources/syncwidget.h | 62 |
4 files changed, 180 insertions, 42 deletions
diff --git a/microkde/kresources/manager.h b/microkde/kresources/manager.h index b5e97fc..7e9e19a 100644 --- a/microkde/kresources/manager.h +++ b/microkde/kresources/manager.h @@ -5,4 +5,5 @@ Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org> Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org> + Copyright (c) 2004 Ulf Schenk This library is free software; you can redistribute it and/or @@ -22,4 +23,11 @@ */ +/* +Enhanced Version of the file for platform independent KDE tools. +Copyright (c) 2004 Ulf Schenk + +$Id$ +*/ + #ifndef KRESOURCES_MANAGER_H #define KRESOURCES_MANAGER_H @@ -49,5 +57,5 @@ class ManagerListener // removed or modified. // -// The manager should also keep track of which (or at least +// The manager should also keep track of which (or at least // how many) applications hve opened a resource, so that it // is only closed if none of them is using it any more @@ -72,5 +80,5 @@ class Manager : private ManagerImplListener bool operator!=( const Iterator &it ) { return mIt != it.mIt; } - private: + private: Resource::List::Iterator mIt; }; @@ -82,5 +90,5 @@ class Manager : private ManagerImplListener return it; } - + Iterator end() { @@ -160,17 +168,22 @@ class Manager : private ManagerImplListener bool isEmpty() const { return mImpl->resourceList()->isEmpty(); } - Manager( const QString &family ) + /** + Return true, if the manager manages syncable resources. + */ + bool manageSyncable() { return mImpl->manageSyncable(); } + + Manager( const QString &family, bool syncable ) { mFactory = Factory::self( family ); // The managerimpl will use the same Factory object as the manager // because of the Factory::self() pattern - mImpl = new ManagerImpl( family ); + mImpl = new ManagerImpl( family, syncable ); mImpl->setListener( this ); - + mListeners = new QPtrList<ManagerListener<T> >; } virtual ~Manager() - { + { mImpl->setListener( 0 ); delete mListeners; @@ -240,16 +253,17 @@ class Manager : private ManagerImplListener /** - Creates a new resource of type @param type, with default - settings. The resource is + Creates a new resource of type @param type, with default + settings. The resource is not added to the manager, the application has to do that. Returns a pointer to a resource object or a null pointer if resource type doesn't exist. - - @param type The type of the resource, one of those returned + + @param type The type of the resource, one of those returned by @ref resourceTypeNames() + * @param syncable If the resource should support syncing capabilities. */ T *createResource( const QString& type ) { - return (T *)( mFactory->resource( type, 0 ) ); + return (T *)( mFactory->resource( type, 0, mImpl->manageSyncable() ) ); } @@ -279,6 +293,6 @@ class Manager : private ManagerImplListener void resourceChanged( T *resource ) - { - mImpl->resourceChanged( resource ); + { + mImpl->resourceChanged( resource ); } @@ -310,5 +324,5 @@ class Manager : private ManagerImplListener listener->resourceModified( resource ); } - + virtual void resourceDeleted( Resource *res ) { diff --git a/microkde/kresources/managerimpl.cpp b/microkde/kresources/managerimpl.cpp index 785b6b4..3655f50 100644 --- a/microkde/kresources/managerimpl.cpp +++ b/microkde/kresources/managerimpl.cpp @@ -1,5 +1,5 @@ /* This file is part of libkresources. - + Copyright (c) 2002 Tobias Koenig <tokoe@kde.org> Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org> @@ -22,4 +22,11 @@ */ +/* +Enhanced Version of the file for platform independent KDE tools. +Copyright (c) 2004 Ulf Schenk + +$Id$ +*/ + #include <kglobal.h> @@ -35,12 +42,12 @@ using namespace KRES; -ManagerImpl::ManagerImpl( const QString &family ) - : mFamily( family ), mConfig( 0 ), mStdConfig( 0 ), mStandard( 0 ), +ManagerImpl::ManagerImpl( const QString &family, bool syncable ) + : mFamily( family ), mSyncable(syncable), mConfig( 0 ), mStdConfig( 0 ), mStandard( 0 ), mFactory( 0 ) { kdDebug(5650) << "ManagerImpl::ManagerImpl()" << endl; - - + + } @@ -53,5 +60,5 @@ ManagerImpl::~ManagerImpl() delete *it; } - + delete mStdConfig; } @@ -60,9 +67,9 @@ void ManagerImpl::createStandardConfig() { if ( !mStdConfig ) { - QString file = locateLocal( "data", KGlobal::getAppName() + QString file = locateLocal( "data", KGlobal::getAppName() + "/kresources/" + mFamily + "rc" ); mStdConfig = new KConfig( file ); } - + mConfig = mStdConfig; } @@ -80,5 +87,5 @@ void ManagerImpl::readConfig( KConfig *cfg ) mConfig = cfg; } - + mStandard = 0; @@ -93,12 +100,12 @@ void ManagerImpl::readConfig( KConfig *cfg ) readResourceConfig( *it, false ); } - + } void ManagerImpl::writeConfig( KConfig *cfg ) { -//USqDebug("ManagerImpl::writeConfig begin this= %ul cfg=%ul", this, cfg); - - +//USqDebug("ManagerImpl::writeConfig begin this= %ul cfg=%ul", this, cfg); + + kdDebug(5650) << "ManagerImpl::writeConfig()" << endl; @@ -108,5 +115,5 @@ void ManagerImpl::writeConfig( KConfig *cfg ) mConfig = cfg; } - + QStringList activeKeys; QStringList passiveKeys; @@ -130,5 +137,5 @@ void ManagerImpl::writeConfig( KConfig *cfg ) mConfig->writeEntry( "ResourceKeys", activeKeys ); mConfig->writeEntry( "PassiveResourceKeys", passiveKeys ); - if ( mStandard ) + if ( mStandard ) mConfig->writeEntry( "Standard", mStandard->identifier() ); else @@ -137,13 +144,13 @@ void ManagerImpl::writeConfig( KConfig *cfg ) mConfig->sync(); kdDebug(5650) << "ManagerImpl::save() finished" << endl; - -//US qDebug("ManagerImpl::writeConfig end this= %ul cfg=%ul", this, cfg); - + +//US qDebug("ManagerImpl::writeConfig end this= %ul cfg=%ul", this, cfg); + } void ManagerImpl::add( Resource *resource, bool useDCOP ) { -qDebug("ManagerImpl::add begin this= %ul resource=%ul", this, resource); - +qDebug("ManagerImpl::add begin this= %ul resource=%ul", this, resource); + resource->setActive( true ); @@ -156,5 +163,5 @@ qDebug("ManagerImpl::add begin this= %ul resource=%ul", this, resource); writeResourceConfig( resource, true ); - qDebug("ManagerImpl::add end this= %ul resource=%ul", this, resource); + qDebug("ManagerImpl::add end this= %ul resource=%ul", this, resource); } @@ -179,10 +186,10 @@ void ManagerImpl::setActive( Resource *resource, bool active ) } -Resource *ManagerImpl::standardResource() +Resource *ManagerImpl::standardResource() { return mStandard; } -void ManagerImpl::setStandardResource( Resource *resource ) +void ManagerImpl::setStandardResource( Resource *resource ) { mStandard = resource; @@ -250,5 +257,5 @@ Resource* ManagerImpl::readResourceConfig( const QString& identifier, { kdDebug() << "ManagerImpl::readResourceConfig() " << identifier << endl; - + // qDebug("ManagerImpl::readResourceConfig() %s", identifier.latin1()); @@ -262,5 +269,5 @@ Resource* ManagerImpl::readResourceConfig( const QString& identifier, QString type = mConfig->readEntry( "ResourceType" ); QString name = mConfig->readEntry( "ResourceName" ); - Resource *resource = mFactory->resource( type, mConfig ); + Resource *resource = mFactory->resource( type, mConfig, mSyncable ); if ( !resource ) { qDebug("Failed to create resource with id %s ",identifier.latin1() ); @@ -306,5 +313,5 @@ void ManagerImpl::writeResourceConfig( Resource *resource, else if ( resource != mStandard && standardKey == key ) mConfig->writeEntry( "Standard", "" ); - + if ( checkActive ) { QStringList activeKeys = mConfig->readListEntry( "ResourceKeys" ); @@ -326,5 +333,5 @@ void ManagerImpl::removeResource( Resource *resource ) if ( !mConfig ) createStandardConfig(); - + mConfig->setGroup( "General" ); QStringList activeKeys = mConfig->readListEntry( "ResourceKeys" ); @@ -357,2 +364,11 @@ Resource* ManagerImpl::getResource( const QString& identifier ) return 0; } + +/** + Return true, if the manager manages syncable resources. +*/ +bool ManagerImpl::manageSyncable() const +{ + return mSyncable; +} + diff --git a/microkde/kresources/syncwidget.cpp b/microkde/kresources/syncwidget.cpp new file mode 100644 index 0000000..9bb0df6 --- a/dev/null +++ b/microkde/kresources/syncwidget.cpp @@ -0,0 +1,46 @@ +/* + This file is part of libkresources. + + Copyright (c) 2004 Ulf Schenk + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. +*/ + +// $Id$ + +#include "syncwidget.h" + +using namespace KRES; + + +SyncWidget::SyncWidget( QWidget *parent, const char *name ) + : QWidget( parent, name ) +{ +} + +void SyncWidget::setInEditMode( bool ) +{ +} + +void SyncWidget::loadSettings( Resource * ) +{ +} + +void SyncWidget::saveSettings( Resource * ) +{ +} + + diff --git a/microkde/kresources/syncwidget.h b/microkde/kresources/syncwidget.h new file mode 100644 index 0000000..e94252c --- a/dev/null +++ b/microkde/kresources/syncwidget.h @@ -0,0 +1,62 @@ +/* + This file is part of libkresources. + Copyright (c) 2004 Ulf Schenk + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. +*/ + +// $Id$ + +#ifndef KRESOURCES_SYNCWIDGET_H +#define KRESOURCES_SYNCWIDGET_H + +#include <qwidget.h> + +#include <kconfig.h> + +#include "resource.h" + +namespace KRES { + +class SyncWidget : public QWidget +{ + Q_OBJECT + +public: + SyncWidget( QWidget *parent = 0, const char *name = 0 ); + + /** + Sets the widget to 'edit' mode. Reimplement this method if you are + interested in the mode change (to disable some GUI element for + example). By default the widget is in 'create new' mode. + */ + virtual void setInEditMode( bool value ); + +public slots: + virtual void loadSettings( Resource *resource ); + virtual void saveSettings( Resource *resource ); + +signals: +//US void setReadOnly( bool value ); +//US void setPersistentReadOnly( bool value ); + + +protected: +//US Resource* mResource; +}; + +} +#endif |