-rw-r--r-- | microkde/kutils/kcmultidialog.cpp | 13 | ||||
-rw-r--r-- | microkde/kutils/kcmultidialog.h | 5 |
2 files changed, 7 insertions, 11 deletions
diff --git a/microkde/kutils/kcmultidialog.cpp b/microkde/kutils/kcmultidialog.cpp index c2378fb..6c82e4f 100644 --- a/microkde/kutils/kcmultidialog.cpp +++ b/microkde/kutils/kcmultidialog.cpp | |||
@@ -13,118 +13,117 @@ | |||
13 | Library General Public License for more details. | 13 | Library General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 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 | 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, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | 19 | ||
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <qhbox.h> | 22 | #include <qhbox.h> |
23 | #include <qvbox.h> | 23 | #include <qvbox.h> |
24 | #include <qcursor.h> | 24 | #include <qcursor.h> |
25 | #include <qlayout.h> | 25 | #include <qlayout.h> |
26 | 26 | ||
27 | #include <klocale.h> | 27 | #include <klocale.h> |
28 | #include <kglobal.h> | 28 | #include <kglobal.h> |
29 | #include <kdebug.h> | 29 | #include <kdebug.h> |
30 | #include <kiconloader.h> | 30 | #include <kiconloader.h> |
31 | #include <kmessagebox.h> | 31 | #include <kmessagebox.h> |
32 | //US #include <klibloader.h> | 32 | //US #include <klibloader.h> |
33 | #include <krun.h> | 33 | #include <krun.h> |
34 | #include <kprocess.h> | 34 | #include <kprocess.h> |
35 | 35 | ||
36 | #include "kcmultidialog.h" | 36 | #include "kcmultidialog.h" |
37 | #include "kprefs.h" | ||
38 | //US #include "kcmultidialog.moc" | 37 | //US #include "kcmultidialog.moc" |
39 | //US #include "kcmoduleloader.h" | 38 | //US #include "kcmoduleloader.h" |
40 | 39 | ||
41 | KCMultiDialog::KCMultiDialog(KPrefs* prefs, const QString& baseGroup, QWidget *parent, const char *name, bool modal) | 40 | KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const char *name, bool modal) |
42 | : KDialogBase(IconList, i18n("Configure"), Default |Cancel | Apply | Ok, Ok, | 41 | : KDialogBase(IconList, i18n("Configure"), Default |Cancel | Apply | Ok, Ok, |
43 | parent, name, modal, true), mPrefs(prefs), d(0L) | 42 | parent, name, modal, true), d(0L) |
44 | { | 43 | { |
45 | enableButton(Apply, false); | 44 | enableButton(Apply, false); |
46 | //connect(this, SIGNAL(aboutToShowPage(QWidget *)), this, SLOT(slotAboutToShow(QWidget *))); | 45 | //connect(this, SIGNAL(aboutToShowPage(QWidget *)), this, SLOT(slotAboutToShow(QWidget *))); |
47 | 46 | ||
48 | connect( this, SIGNAL( defaultClicked() ), SLOT( slotDefault() ) ); | 47 | connect( this, SIGNAL( defaultClicked() ), SLOT( slotDefault() ) ); |
49 | 48 | ||
50 | _baseGroup = baseGroup; | 49 | _baseGroup = baseGroup; |
51 | mMainWidget = new KJanusWidget( this, "JanusWidget", KJanusWidget::Tabbed ); | 50 | mMainWidget = new KJanusWidget( this, "JanusWidget", KJanusWidget::Tabbed ); |
52 | setMainWidget(mMainWidget ); | 51 | setMainWidget(mMainWidget ); |
53 | #ifdef DESKTOP_VERSION | 52 | #ifdef DESKTOP_VERSION |
54 | resize(640,480); | 53 | resize(640,480); |
55 | #else | 54 | #else |
56 | resize(640,480); | 55 | resize(640,480); |
57 | setMaximumSize( KMIN(KGlobal::getDesktopWidth()-5, 640), KMIN(KGlobal::getDesktopHeight()-20, 480)); | 56 | setMaximumSize( KMIN(KGlobal::getDesktopWidth()-5, 640), KMIN(KGlobal::getDesktopHeight()-20, 480)); |
58 | //showMaximized(); | 57 | //showMaximized(); |
59 | #endif | 58 | #endif |
60 | 59 | ||
61 | } | 60 | } |
62 | 61 | ||
63 | KCMultiDialog::~KCMultiDialog() | 62 | KCMultiDialog::~KCMultiDialog() |
64 | { | 63 | { |
65 | //US moduleDict.setAutoDelete(true); | 64 | //US moduleDict.setAutoDelete(true); |
66 | } | 65 | } |
67 | 66 | ||
68 | void KCMultiDialog::slotDefault() | 67 | void KCMultiDialog::slotDefault() |
69 | { | 68 | { |
70 | 69 | ||
71 | int curPageIndex = mMainWidget->activePageIndex(); | 70 | int curPageIndex = mMainWidget->activePageIndex(); |
72 | 71 | ||
73 | QPtrListIterator<KCModule> it(modules); | 72 | QPtrListIterator<KCModule> it(modules); |
74 | for (; it.current(); ++it) | 73 | for (; it.current(); ++it) |
75 | { | 74 | { |
76 | if (pageIndex((QWidget *)(*it)->parent()) == curPageIndex) | 75 | if (pageIndex((QWidget *)(*it)->parent()) == curPageIndex) |
77 | { | 76 | { |
78 | (*it)->defaults(mPrefs); | 77 | (*it)->defaults(); |
79 | clientChanged(true); | 78 | clientChanged(true); |
80 | return; | 79 | return; |
81 | } | 80 | } |
82 | } | 81 | } |
83 | 82 | ||
84 | } | 83 | } |
85 | 84 | ||
86 | void KCMultiDialog::slotApply() | 85 | void KCMultiDialog::slotApply() |
87 | { | 86 | { |
88 | qDebug("KCMultiDialog::slotApply clicked"); | 87 | qDebug("KCMultiDialog::slotApply clicked"); |
89 | 88 | ||
90 | QPtrListIterator<KCModule> it(modules); | 89 | QPtrListIterator<KCModule> it(modules); |
91 | for (; it.current(); ++it) | 90 | for (; it.current(); ++it) |
92 | (*it)->save(mPrefs); | 91 | (*it)->save(); |
93 | clientChanged(false); | 92 | clientChanged(false); |
94 | 93 | ||
95 | emit applyClicked(); | 94 | emit applyClicked(); |
96 | 95 | ||
97 | } | 96 | } |
98 | 97 | ||
99 | 98 | ||
100 | void KCMultiDialog::slotOk() | 99 | void KCMultiDialog::slotOk() |
101 | { | 100 | { |
102 | qDebug("KCMultiDialog::slotOk clicked"); | 101 | qDebug("KCMultiDialog::slotOk clicked"); |
103 | 102 | ||
104 | QPtrListIterator<KCModule> it(modules); | 103 | QPtrListIterator<KCModule> it(modules); |
105 | for (; it.current(); ++it) | 104 | for (; it.current(); ++it) |
106 | (*it)->save(mPrefs); | 105 | (*it)->save(); |
107 | accept(); | 106 | accept(); |
108 | 107 | ||
109 | emit okClicked(); | 108 | emit okClicked(); |
110 | } | 109 | } |
111 | 110 | ||
112 | void KCMultiDialog::slotHelp() | 111 | void KCMultiDialog::slotHelp() |
113 | { | 112 | { |
114 | /*US | 113 | /*US |
115 | KURL url( KURL("help:/"), _docPath ); | 114 | KURL url( KURL("help:/"), _docPath ); |
116 | 115 | ||
117 | if (url.protocol() == "help" || url.protocol() == "man" || url.protocol() == "info") { | 116 | if (url.protocol() == "help" || url.protocol() == "man" || url.protocol() == "info") { |
118 | KProcess process; | 117 | KProcess process; |
119 | process << "khelpcenter" | 118 | process << "khelpcenter" |
120 | << url.url(); | 119 | << url.url(); |
121 | process.start(KProcess::DontCare); | 120 | process.start(KProcess::DontCare); |
122 | process.detach(); | 121 | process.detach(); |
123 | } else { | 122 | } else { |
124 | new KRun(url); | 123 | new KRun(url); |
125 | } | 124 | } |
126 | */ | 125 | */ |
127 | } | 126 | } |
128 | 127 | ||
129 | void KCMultiDialog::clientChanged(bool state) | 128 | void KCMultiDialog::clientChanged(bool state) |
130 | { | 129 | { |
@@ -141,49 +140,49 @@ void KCMultiDialog::addModule(const QString& path, bool withfallback) | |||
141 | QHBox* page = addHBoxPage(info.moduleName(), info.comment(), | 140 | QHBox* page = addHBoxPage(info.moduleName(), info.comment(), |
142 | KGlobal::iconLoader()->loadIcon(info.icon(), KIcon::Desktop, KIcon::SizeMedium)); | 141 | KGlobal::iconLoader()->loadIcon(info.icon(), KIcon::Desktop, KIcon::SizeMedium)); |
143 | if(!page) { | 142 | if(!page) { |
144 | KCModuleLoader::unloadModule(info); | 143 | KCModuleLoader::unloadModule(info); |
145 | return; | 144 | return; |
146 | } | 145 | } |
147 | moduleDict.insert(page, new LoadInfo(path, withfallback)); | 146 | moduleDict.insert(page, new LoadInfo(path, withfallback)); |
148 | if (modules.isEmpty()) | 147 | if (modules.isEmpty()) |
149 | slotAboutToShow(page); | 148 | slotAboutToShow(page); |
150 | } | 149 | } |
151 | */ | 150 | */ |
152 | QVBox * KCMultiDialog::getNewVBoxPage( const QString & modulename ) | 151 | QVBox * KCMultiDialog::getNewVBoxPage( const QString & modulename ) |
153 | { | 152 | { |
154 | QVBox *page = mMainWidget->addVBoxPage(modulename , QString::null,QPixmap() ); | 153 | QVBox *page = mMainWidget->addVBoxPage(modulename , QString::null,QPixmap() ); |
155 | return page; | 154 | return page; |
156 | 155 | ||
157 | } | 156 | } |
158 | //US special method for microkde. We dop noty want to load everything dynamically. | 157 | //US special method for microkde. We dop noty want to load everything dynamically. |
159 | void KCMultiDialog::addModule(KCModule* module ) //, const QString& modulename, const QString& iconname) | 158 | void KCMultiDialog::addModule(KCModule* module ) //, const QString& modulename, const QString& iconname) |
160 | { | 159 | { |
161 | 160 | ||
162 | modules.append(module); | 161 | modules.append(module); |
163 | connect(module, SIGNAL(changed(bool)), this, SLOT(clientChanged(bool))); | 162 | connect(module, SIGNAL(changed(bool)), this, SLOT(clientChanged(bool))); |
164 | //US | 163 | //US |
165 | module->load(mPrefs); | 164 | module->load(); |
166 | 165 | ||
167 | 166 | ||
168 | } | 167 | } |
169 | 168 | ||
170 | void KCMultiDialog::slotAboutToShow(QWidget *page) | 169 | void KCMultiDialog::slotAboutToShow(QWidget *page) |
171 | { | 170 | { |
172 | /*US | 171 | /*US |
173 | LoadInfo *loadInfo = moduleDict[page]; | 172 | LoadInfo *loadInfo = moduleDict[page]; |
174 | if (!loadInfo) | 173 | if (!loadInfo) |
175 | return; | 174 | return; |
176 | 175 | ||
177 | QApplication::setOverrideCursor(Qt::WaitCursor); | 176 | QApplication::setOverrideCursor(Qt::WaitCursor); |
178 | 177 | ||
179 | moduleDict.remove(page); | 178 | moduleDict.remove(page); |
180 | 179 | ||
181 | KCModuleInfo info(loadInfo->path, _baseGroup); | 180 | KCModuleInfo info(loadInfo->path, _baseGroup); |
182 | 181 | ||
183 | KCModule *module = KCModuleLoader::loadModule(info, loadInfo->withfallback); | 182 | KCModule *module = KCModuleLoader::loadModule(info, loadInfo->withfallback); |
184 | 183 | ||
185 | if (!module) | 184 | if (!module) |
186 | { | 185 | { |
187 | QApplication::restoreOverrideCursor(); | 186 | QApplication::restoreOverrideCursor(); |
188 | KCModuleLoader::showLastLoaderError(this); | 187 | KCModuleLoader::showLastLoaderError(this); |
189 | delete loadInfo; | 188 | delete loadInfo; |
diff --git a/microkde/kutils/kcmultidialog.h b/microkde/kutils/kcmultidialog.h index a42555f..1aa66b2 100644 --- a/microkde/kutils/kcmultidialog.h +++ b/microkde/kutils/kcmultidialog.h | |||
@@ -8,74 +8,72 @@ | |||
8 | version 2 of the License, or (at your option) any later version. | 8 | version 2 of the License, or (at your option) any later version. |
9 | 9 | ||
10 | This library is distributed in the hope that it will be useful, | 10 | This library is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Library General Public License for more details. | 13 | Library General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 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 | 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, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | 19 | ||
20 | */ | 20 | */ |
21 | 21 | ||
22 | #ifndef KCMULTIDIALOG_H | 22 | #ifndef KCMULTIDIALOG_H |
23 | #define KCMULTIDIALOG_H | 23 | #define KCMULTIDIALOG_H |
24 | 24 | ||
25 | #include <qptrlist.h> | 25 | #include <qptrlist.h> |
26 | #include <qptrdict.h> | 26 | #include <qptrdict.h> |
27 | 27 | ||
28 | #include <kdialogbase.h> | 28 | #include <kdialogbase.h> |
29 | #include <kjanuswidget.h> | 29 | #include <kjanuswidget.h> |
30 | #include <kcmodule.h> | 30 | #include <kcmodule.h> |
31 | 31 | ||
32 | class KPrefs; | ||
33 | |||
34 | /** | 32 | /** |
35 | * A class that offers a @ref KDialogBase containing arbitrary KControl Modules | 33 | * A class that offers a @ref KDialogBase containing arbitrary KControl Modules |
36 | * | 34 | * |
37 | * @short A method that offers a @ref KDialogBase containing arbitrary | 35 | * @short A method that offers a @ref KDialogBase containing arbitrary |
38 | * KControl Modules. | 36 | * KControl Modules. |
39 | * | 37 | * |
40 | * @author Matthias Elter <elter@kde.org>, Daniel Molkentin <molkentin@kde.org> | 38 | * @author Matthias Elter <elter@kde.org>, Daniel Molkentin <molkentin@kde.org> |
41 | * @since 3.2 | 39 | * @since 3.2 |
42 | */ | 40 | */ |
43 | class KCMultiDialog : public KDialogBase | 41 | class KCMultiDialog : public KDialogBase |
44 | { | 42 | { |
45 | Q_OBJECT | 43 | Q_OBJECT |
46 | 44 | ||
47 | public: | 45 | public: |
48 | /** | 46 | /** |
49 | * Constructs a new KCMultiDialog | 47 | * Constructs a new KCMultiDialog |
50 | * | 48 | * |
51 | * @param parent The parent Widget | 49 | * @param parent The parent Widget |
52 | * @param name The widget name | 50 | * @param name The widget name |
53 | * @param baseGroup The baseGroup, if you want to call a module out of | 51 | * @param baseGroup The baseGroup, if you want to call a module out of |
54 | * kcontrol, just keep "settings" | 52 | * kcontrol, just keep "settings" |
55 | * @param modal If you pass true here, the dialog will be modal | 53 | * @param modal If you pass true here, the dialog will be modal |
56 | **/ | 54 | **/ |
57 | KCMultiDialog(KPrefs* prefs, const QString& baseGroup = QString::fromLatin1("settings"), | 55 | KCMultiDialog(const QString& baseGroup = QString::fromLatin1("settings"), |
58 | QWidget *parent=0, const char *name=0, | 56 | QWidget *parent=0, const char *name=0, |
59 | bool modal=false); | 57 | bool modal=false); |
60 | 58 | ||
61 | /** | 59 | /** |
62 | * Destructor | 60 | * Destructor |
63 | **/ | 61 | **/ |
64 | virtual ~KCMultiDialog(); | 62 | virtual ~KCMultiDialog(); |
65 | 63 | ||
66 | /** | 64 | /** |
67 | * Add a module. | 65 | * Add a module. |
68 | * | 66 | * |
69 | * @param module Specify the name of the module that is to be added | 67 | * @param module Specify the name of the module that is to be added |
70 | * to the list of modules the dialog will show. | 68 | * to the list of modules the dialog will show. |
71 | * | 69 | * |
72 | * @param withfallback Try harder to load the module. Might result | 70 | * @param withfallback Try harder to load the module. Might result |
73 | * in the module appearing outside the dialog. | 71 | * in the module appearing outside the dialog. |
74 | **/ | 72 | **/ |
75 | //US void addModule(const QString& module, bool withfallback=true); | 73 | //US void addModule(const QString& module, bool withfallback=true); |
76 | 74 | ||
77 | 75 | ||
78 | //US special method for microkde. We dop noty want to load everything dynamically. | 76 | //US special method for microkde. We dop noty want to load everything dynamically. |
79 | void addModule(KCModule* module );//, const QString& modulename, const QString& iconname); | 77 | void addModule(KCModule* module );//, const QString& modulename, const QString& iconname); |
80 | QVBox* getNewVBoxPage(const QString & modulename) ; | 78 | QVBox* getNewVBoxPage(const QString & modulename) ; |
81 | 79 | ||
@@ -118,32 +116,31 @@ private slots: | |||
118 | 116 | ||
119 | void slotAboutToShow(QWidget *); | 117 | void slotAboutToShow(QWidget *); |
120 | 118 | ||
121 | void clientChanged(bool state); | 119 | void clientChanged(bool state); |
122 | 120 | ||
123 | private: | 121 | private: |
124 | /*US | 122 | /*US |
125 | struct LoadInfo { | 123 | struct LoadInfo { |
126 | LoadInfo(const QString &_path, bool _withfallback) | 124 | LoadInfo(const QString &_path, bool _withfallback) |
127 | : path(_path), withfallback(_withfallback) | 125 | : path(_path), withfallback(_withfallback) |
128 | { } | 126 | { } |
129 | QString path; | 127 | QString path; |
130 | bool withfallback; | 128 | bool withfallback; |
131 | }; | 129 | }; |
132 | */ | 130 | */ |
133 | QPtrList<KCModule> modules; | 131 | QPtrList<KCModule> modules; |
134 | /* | 132 | /* |
135 | QPtrDict<LoadInfo> moduleDict; | 133 | QPtrDict<LoadInfo> moduleDict; |
136 | QString _docPath; | 134 | QString _docPath; |
137 | */ | 135 | */ |
138 | QString _baseGroup; | 136 | QString _baseGroup; |
139 | 137 | ||
140 | //US | 138 | //US |
141 | KJanusWidget* mMainWidget; | 139 | KJanusWidget* mMainWidget; |
142 | KPrefs* mPrefs; | ||
143 | 140 | ||
144 | // For future use | 141 | // For future use |
145 | class KCMultiDialogPrivate; | 142 | class KCMultiDialogPrivate; |
146 | KCMultiDialogPrivate *d; | 143 | KCMultiDialogPrivate *d; |
147 | }; | 144 | }; |
148 | 145 | ||
149 | #endif //KCMULTIDIALOG_H | 146 | #endif //KCMULTIDIALOG_H |