-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 @@ | |||
5 | Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org> | 5 | Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org> |
6 | Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org> | 6 | Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org> |
7 | Copyright (c) 2004 Ulf Schenk | ||
7 | 8 | ||
8 | This library is free software; you can redistribute it and/or | 9 | This library is free software; you can redistribute it and/or |
@@ -22,4 +23,11 @@ | |||
22 | */ | 23 | */ |
23 | 24 | ||
25 | /* | ||
26 | Enhanced Version of the file for platform independent KDE tools. | ||
27 | Copyright (c) 2004 Ulf Schenk | ||
28 | |||
29 | $Id$ | ||
30 | */ | ||
31 | |||
24 | #ifndef KRESOURCES_MANAGER_H | 32 | #ifndef KRESOURCES_MANAGER_H |
25 | #define KRESOURCES_MANAGER_H | 33 | #define KRESOURCES_MANAGER_H |
@@ -49,5 +57,5 @@ class ManagerListener | |||
49 | // removed or modified. | 57 | // removed or modified. |
50 | // | 58 | // |
51 | // The manager should also keep track of which (or at least | 59 | // The manager should also keep track of which (or at least |
52 | // how many) applications hve opened a resource, so that it | 60 | // how many) applications hve opened a resource, so that it |
53 | // is only closed if none of them is using it any more | 61 | // is only closed if none of them is using it any more |
@@ -72,5 +80,5 @@ class Manager : private ManagerImplListener | |||
72 | bool operator!=( const Iterator &it ) { return mIt != it.mIt; } | 80 | bool operator!=( const Iterator &it ) { return mIt != it.mIt; } |
73 | 81 | ||
74 | private: | 82 | private: |
75 | Resource::List::Iterator mIt; | 83 | Resource::List::Iterator mIt; |
76 | }; | 84 | }; |
@@ -82,5 +90,5 @@ class Manager : private ManagerImplListener | |||
82 | return it; | 90 | return it; |
83 | } | 91 | } |
84 | 92 | ||
85 | Iterator end() | 93 | Iterator end() |
86 | { | 94 | { |
@@ -160,17 +168,22 @@ class Manager : private ManagerImplListener | |||
160 | bool isEmpty() const { return mImpl->resourceList()->isEmpty(); } | 168 | bool isEmpty() const { return mImpl->resourceList()->isEmpty(); } |
161 | 169 | ||
162 | Manager( const QString &family ) | 170 | /** |
171 | Return true, if the manager manages syncable resources. | ||
172 | */ | ||
173 | bool manageSyncable() { return mImpl->manageSyncable(); } | ||
174 | |||
175 | Manager( const QString &family, bool syncable ) | ||
163 | { | 176 | { |
164 | mFactory = Factory::self( family ); | 177 | mFactory = Factory::self( family ); |
165 | // The managerimpl will use the same Factory object as the manager | 178 | // The managerimpl will use the same Factory object as the manager |
166 | // because of the Factory::self() pattern | 179 | // because of the Factory::self() pattern |
167 | mImpl = new ManagerImpl( family ); | 180 | mImpl = new ManagerImpl( family, syncable ); |
168 | mImpl->setListener( this ); | 181 | mImpl->setListener( this ); |
169 | 182 | ||
170 | mListeners = new QPtrList<ManagerListener<T> >; | 183 | mListeners = new QPtrList<ManagerListener<T> >; |
171 | } | 184 | } |
172 | 185 | ||
173 | virtual ~Manager() | 186 | virtual ~Manager() |
174 | { | 187 | { |
175 | mImpl->setListener( 0 ); | 188 | mImpl->setListener( 0 ); |
176 | delete mListeners; | 189 | delete mListeners; |
@@ -240,16 +253,17 @@ class Manager : private ManagerImplListener | |||
240 | 253 | ||
241 | /** | 254 | /** |
242 | Creates a new resource of type @param type, with default | 255 | Creates a new resource of type @param type, with default |
243 | settings. The resource is | 256 | settings. The resource is |
244 | not added to the manager, the application has to do that. | 257 | not added to the manager, the application has to do that. |
245 | Returns a pointer to a resource object or a null pointer | 258 | Returns a pointer to a resource object or a null pointer |
246 | if resource type doesn't exist. | 259 | if resource type doesn't exist. |
247 | 260 | ||
248 | @param type The type of the resource, one of those returned | 261 | @param type The type of the resource, one of those returned |
249 | by @ref resourceTypeNames() | 262 | by @ref resourceTypeNames() |
263 | * @param syncable If the resource should support syncing capabilities. | ||
250 | */ | 264 | */ |
251 | T *createResource( const QString& type ) | 265 | T *createResource( const QString& type ) |
252 | { | 266 | { |
253 | return (T *)( mFactory->resource( type, 0 ) ); | 267 | return (T *)( mFactory->resource( type, 0, mImpl->manageSyncable() ) ); |
254 | } | 268 | } |
255 | 269 | ||
@@ -279,6 +293,6 @@ class Manager : private ManagerImplListener | |||
279 | 293 | ||
280 | void resourceChanged( T *resource ) | 294 | void resourceChanged( T *resource ) |
281 | { | 295 | { |
282 | mImpl->resourceChanged( resource ); | 296 | mImpl->resourceChanged( resource ); |
283 | } | 297 | } |
284 | 298 | ||
@@ -310,5 +324,5 @@ class Manager : private ManagerImplListener | |||
310 | listener->resourceModified( resource ); | 324 | listener->resourceModified( resource ); |
311 | } | 325 | } |
312 | 326 | ||
313 | virtual void resourceDeleted( Resource *res ) | 327 | virtual void resourceDeleted( Resource *res ) |
314 | { | 328 | { |
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 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libkresources. | 2 | This file is part of libkresources. |
3 | 3 | ||
4 | Copyright (c) 2002 Tobias Koenig <tokoe@kde.org> | 4 | Copyright (c) 2002 Tobias Koenig <tokoe@kde.org> |
5 | Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org> | 5 | Copyright (c) 2002 Jan-Pascal van Best <janpascal@vanbest.org> |
@@ -22,4 +22,11 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | /* | ||
25 | Enhanced Version of the file for platform independent KDE tools. | ||
26 | Copyright (c) 2004 Ulf Schenk | ||
27 | |||
28 | $Id$ | ||
29 | */ | ||
30 | |||
24 | #include <kglobal.h> | 31 | #include <kglobal.h> |
25 | 32 | ||
@@ -35,12 +42,12 @@ | |||
35 | using namespace KRES; | 42 | using namespace KRES; |
36 | 43 | ||
37 | ManagerImpl::ManagerImpl( const QString &family ) | 44 | ManagerImpl::ManagerImpl( const QString &family, bool syncable ) |
38 | : mFamily( family ), mConfig( 0 ), mStdConfig( 0 ), mStandard( 0 ), | 45 | : mFamily( family ), mSyncable(syncable), mConfig( 0 ), mStdConfig( 0 ), mStandard( 0 ), |
39 | mFactory( 0 ) | 46 | mFactory( 0 ) |
40 | 47 | ||
41 | { | 48 | { |
42 | kdDebug(5650) << "ManagerImpl::ManagerImpl()" << endl; | 49 | kdDebug(5650) << "ManagerImpl::ManagerImpl()" << endl; |
43 | 50 | ||
44 | 51 | ||
45 | } | 52 | } |
46 | 53 | ||
@@ -53,5 +60,5 @@ ManagerImpl::~ManagerImpl() | |||
53 | delete *it; | 60 | delete *it; |
54 | } | 61 | } |
55 | 62 | ||
56 | delete mStdConfig; | 63 | delete mStdConfig; |
57 | } | 64 | } |
@@ -60,9 +67,9 @@ void ManagerImpl::createStandardConfig() | |||
60 | { | 67 | { |
61 | if ( !mStdConfig ) { | 68 | if ( !mStdConfig ) { |
62 | QString file = locateLocal( "data", KGlobal::getAppName() | 69 | QString file = locateLocal( "data", KGlobal::getAppName() |
63 | + "/kresources/" + mFamily + "rc" ); | 70 | + "/kresources/" + mFamily + "rc" ); |
64 | mStdConfig = new KConfig( file ); | 71 | mStdConfig = new KConfig( file ); |
65 | } | 72 | } |
66 | 73 | ||
67 | mConfig = mStdConfig; | 74 | mConfig = mStdConfig; |
68 | } | 75 | } |
@@ -80,5 +87,5 @@ void ManagerImpl::readConfig( KConfig *cfg ) | |||
80 | mConfig = cfg; | 87 | mConfig = cfg; |
81 | } | 88 | } |
82 | 89 | ||
83 | mStandard = 0; | 90 | mStandard = 0; |
84 | 91 | ||
@@ -93,12 +100,12 @@ void ManagerImpl::readConfig( KConfig *cfg ) | |||
93 | readResourceConfig( *it, false ); | 100 | readResourceConfig( *it, false ); |
94 | } | 101 | } |
95 | 102 | ||
96 | } | 103 | } |
97 | 104 | ||
98 | void ManagerImpl::writeConfig( KConfig *cfg ) | 105 | void ManagerImpl::writeConfig( KConfig *cfg ) |
99 | { | 106 | { |
100 | //USqDebug("ManagerImpl::writeConfig begin this= %ul cfg=%ul", this, cfg); | 107 | //USqDebug("ManagerImpl::writeConfig begin this= %ul cfg=%ul", this, cfg); |
101 | 108 | ||
102 | 109 | ||
103 | kdDebug(5650) << "ManagerImpl::writeConfig()" << endl; | 110 | kdDebug(5650) << "ManagerImpl::writeConfig()" << endl; |
104 | 111 | ||
@@ -108,5 +115,5 @@ void ManagerImpl::writeConfig( KConfig *cfg ) | |||
108 | mConfig = cfg; | 115 | mConfig = cfg; |
109 | } | 116 | } |
110 | 117 | ||
111 | QStringList activeKeys; | 118 | QStringList activeKeys; |
112 | QStringList passiveKeys; | 119 | QStringList passiveKeys; |
@@ -130,5 +137,5 @@ void ManagerImpl::writeConfig( KConfig *cfg ) | |||
130 | mConfig->writeEntry( "ResourceKeys", activeKeys ); | 137 | mConfig->writeEntry( "ResourceKeys", activeKeys ); |
131 | mConfig->writeEntry( "PassiveResourceKeys", passiveKeys ); | 138 | mConfig->writeEntry( "PassiveResourceKeys", passiveKeys ); |
132 | if ( mStandard ) | 139 | if ( mStandard ) |
133 | mConfig->writeEntry( "Standard", mStandard->identifier() ); | 140 | mConfig->writeEntry( "Standard", mStandard->identifier() ); |
134 | else | 141 | else |
@@ -137,13 +144,13 @@ void ManagerImpl::writeConfig( KConfig *cfg ) | |||
137 | mConfig->sync(); | 144 | mConfig->sync(); |
138 | kdDebug(5650) << "ManagerImpl::save() finished" << endl; | 145 | kdDebug(5650) << "ManagerImpl::save() finished" << endl; |
139 | 146 | ||
140 | //US qDebug("ManagerImpl::writeConfig end this= %ul cfg=%ul", this, cfg); | 147 | //US qDebug("ManagerImpl::writeConfig end this= %ul cfg=%ul", this, cfg); |
141 | 148 | ||
142 | } | 149 | } |
143 | 150 | ||
144 | void ManagerImpl::add( Resource *resource, bool useDCOP ) | 151 | void ManagerImpl::add( Resource *resource, bool useDCOP ) |
145 | { | 152 | { |
146 | qDebug("ManagerImpl::add begin this= %ul resource=%ul", this, resource); | 153 | qDebug("ManagerImpl::add begin this= %ul resource=%ul", this, resource); |
147 | 154 | ||
148 | resource->setActive( true ); | 155 | resource->setActive( true ); |
149 | 156 | ||
@@ -156,5 +163,5 @@ qDebug("ManagerImpl::add begin this= %ul resource=%ul", this, resource); | |||
156 | writeResourceConfig( resource, true ); | 163 | writeResourceConfig( resource, true ); |
157 | 164 | ||
158 | qDebug("ManagerImpl::add end this= %ul resource=%ul", this, resource); | 165 | qDebug("ManagerImpl::add end this= %ul resource=%ul", this, resource); |
159 | 166 | ||
160 | } | 167 | } |
@@ -179,10 +186,10 @@ void ManagerImpl::setActive( Resource *resource, bool active ) | |||
179 | } | 186 | } |
180 | 187 | ||
181 | Resource *ManagerImpl::standardResource() | 188 | Resource *ManagerImpl::standardResource() |
182 | { | 189 | { |
183 | return mStandard; | 190 | return mStandard; |
184 | } | 191 | } |
185 | 192 | ||
186 | void ManagerImpl::setStandardResource( Resource *resource ) | 193 | void ManagerImpl::setStandardResource( Resource *resource ) |
187 | { | 194 | { |
188 | mStandard = resource; | 195 | mStandard = resource; |
@@ -250,5 +257,5 @@ Resource* ManagerImpl::readResourceConfig( const QString& identifier, | |||
250 | { | 257 | { |
251 | kdDebug() << "ManagerImpl::readResourceConfig() " << identifier << endl; | 258 | kdDebug() << "ManagerImpl::readResourceConfig() " << identifier << endl; |
252 | 259 | ||
253 | // qDebug("ManagerImpl::readResourceConfig() %s", identifier.latin1()); | 260 | // qDebug("ManagerImpl::readResourceConfig() %s", identifier.latin1()); |
254 | 261 | ||
@@ -262,5 +269,5 @@ Resource* ManagerImpl::readResourceConfig( const QString& identifier, | |||
262 | QString type = mConfig->readEntry( "ResourceType" ); | 269 | QString type = mConfig->readEntry( "ResourceType" ); |
263 | QString name = mConfig->readEntry( "ResourceName" ); | 270 | QString name = mConfig->readEntry( "ResourceName" ); |
264 | Resource *resource = mFactory->resource( type, mConfig ); | 271 | Resource *resource = mFactory->resource( type, mConfig, mSyncable ); |
265 | if ( !resource ) { | 272 | if ( !resource ) { |
266 | qDebug("Failed to create resource with id %s ",identifier.latin1() ); | 273 | qDebug("Failed to create resource with id %s ",identifier.latin1() ); |
@@ -306,5 +313,5 @@ void ManagerImpl::writeResourceConfig( Resource *resource, | |||
306 | else if ( resource != mStandard && standardKey == key ) | 313 | else if ( resource != mStandard && standardKey == key ) |
307 | mConfig->writeEntry( "Standard", "" ); | 314 | mConfig->writeEntry( "Standard", "" ); |
308 | 315 | ||
309 | if ( checkActive ) { | 316 | if ( checkActive ) { |
310 | QStringList activeKeys = mConfig->readListEntry( "ResourceKeys" ); | 317 | QStringList activeKeys = mConfig->readListEntry( "ResourceKeys" ); |
@@ -326,5 +333,5 @@ void ManagerImpl::removeResource( Resource *resource ) | |||
326 | 333 | ||
327 | if ( !mConfig ) createStandardConfig(); | 334 | if ( !mConfig ) createStandardConfig(); |
328 | 335 | ||
329 | mConfig->setGroup( "General" ); | 336 | mConfig->setGroup( "General" ); |
330 | QStringList activeKeys = mConfig->readListEntry( "ResourceKeys" ); | 337 | QStringList activeKeys = mConfig->readListEntry( "ResourceKeys" ); |
@@ -357,2 +364,11 @@ Resource* ManagerImpl::getResource( const QString& identifier ) | |||
357 | return 0; | 364 | return 0; |
358 | } | 365 | } |
366 | |||
367 | /** | ||
368 | Return true, if the manager manages syncable resources. | ||
369 | */ | ||
370 | bool ManagerImpl::manageSyncable() const | ||
371 | { | ||
372 | return mSyncable; | ||
373 | } | ||
374 | |||
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 @@ | |||
1 | /* | ||
2 | This file is part of libkresources. | ||
3 | |||
4 | Copyright (c) 2004 Ulf Schenk | ||
5 | |||
6 | This library is free software; you can redistribute it and/or | ||
7 | modify it under the terms of the GNU Library General Public | ||
8 | License as published by the Free Software Foundation; either | ||
9 | version 2 of the License, or (at your option) any later version. | ||
10 | |||
11 | This library is distributed in the hope that it will be useful, | ||
12 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
14 | Library General Public License for more details. | ||
15 | |||
16 | You should have received a copy of the GNU Library General Public License | ||
17 | along with this library; see the file COPYING.LIB. If not, write to | ||
18 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
19 | Boston, MA 02111-1307, USA. | ||
20 | */ | ||
21 | |||
22 | // $Id$ | ||
23 | |||
24 | #include "syncwidget.h" | ||
25 | |||
26 | using namespace KRES; | ||
27 | |||
28 | |||
29 | SyncWidget::SyncWidget( QWidget *parent, const char *name ) | ||
30 | : QWidget( parent, name ) | ||
31 | { | ||
32 | } | ||
33 | |||
34 | void SyncWidget::setInEditMode( bool ) | ||
35 | { | ||
36 | } | ||
37 | |||
38 | void SyncWidget::loadSettings( Resource * ) | ||
39 | { | ||
40 | } | ||
41 | |||
42 | void SyncWidget::saveSettings( Resource * ) | ||
43 | { | ||
44 | } | ||
45 | |||
46 | |||
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 @@ | |||
1 | /* | ||
2 | This file is part of libkresources. | ||
3 | Copyright (c) 2004 Ulf Schenk | ||
4 | |||
5 | This library is free software; you can redistribute it and/or | ||
6 | modify it under the terms of the GNU Library General Public | ||
7 | License as published by the Free Software Foundation; either | ||
8 | version 2 of the License, or (at your option) any later version. | ||
9 | |||
10 | This library is distributed in the hope that it will be useful, | ||
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
13 | Library General Public License for more details. | ||
14 | |||
15 | You should have received a copy of the GNU Library General Public License | ||
16 | along with this library; see the file COPYING.LIB. If not, write to | ||
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
18 | Boston, MA 02111-1307, USA. | ||
19 | */ | ||
20 | |||
21 | // $Id$ | ||
22 | |||
23 | #ifndef KRESOURCES_SYNCWIDGET_H | ||
24 | #define KRESOURCES_SYNCWIDGET_H | ||
25 | |||
26 | #include <qwidget.h> | ||
27 | |||
28 | #include <kconfig.h> | ||
29 | |||
30 | #include "resource.h" | ||
31 | |||
32 | namespace KRES { | ||
33 | |||
34 | class SyncWidget : public QWidget | ||
35 | { | ||
36 | Q_OBJECT | ||
37 | |||
38 | public: | ||
39 | SyncWidget( QWidget *parent = 0, const char *name = 0 ); | ||
40 | |||
41 | /** | ||
42 | Sets the widget to 'edit' mode. Reimplement this method if you are | ||
43 | interested in the mode change (to disable some GUI element for | ||
44 | example). By default the widget is in 'create new' mode. | ||
45 | */ | ||
46 | virtual void setInEditMode( bool value ); | ||
47 | |||
48 | public slots: | ||
49 | virtual void loadSettings( Resource *resource ); | ||
50 | virtual void saveSettings( Resource *resource ); | ||
51 | |||
52 | signals: | ||
53 | //US void setReadOnly( bool value ); | ||
54 | //US void setPersistentReadOnly( bool value ); | ||
55 | |||
56 | |||
57 | protected: | ||
58 | //US Resource* mResource; | ||
59 | }; | ||
60 | |||
61 | } | ||
62 | #endif | ||