-rw-r--r-- | noncore/securityplugins/notice/noticeplugin.cpp | 3 | ||||
-rw-r--r-- | noncore/securityplugins/notice/noticeplugin.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/noncore/securityplugins/notice/noticeplugin.cpp b/noncore/securityplugins/notice/noticeplugin.cpp index f7d41ab..bacc439 100644 --- a/noncore/securityplugins/notice/noticeplugin.cpp +++ b/noncore/securityplugins/notice/noticeplugin.cpp | |||
@@ -1,83 +1,84 @@ | |||
1 | #include "noticeplugin.h" | 1 | #include "noticeplugin.h" |
2 | 2 | ||
3 | #include <opie2/oapplication.h> | 3 | #include <opie2/oapplication.h> |
4 | 4 | ||
5 | #include <qmessagebox.h> | 5 | #include <qmessagebox.h> |
6 | #include <qregexp.h> | 6 | #include <qregexp.h> |
7 | 7 | ||
8 | |||
8 | /// creates and initializes the m_config Config object | 9 | /// creates and initializes the m_config Config object |
9 | NoticePlugin::NoticePlugin() : MultiauthPluginObject(), noticeW(0) { | 10 | NoticePlugin::NoticePlugin() : MultiauthPluginObject(), noticeW(0) { |
10 | m_config = new Config("Security"); | 11 | m_config = new Config("Security"); |
11 | m_config->setGroup("NoticePlugin"); | 12 | m_config->setGroup("NoticePlugin"); |
12 | } | 13 | } |
13 | 14 | ||
14 | /// deletes the m_config Config object and noticeW if necessary | 15 | /// deletes the m_config Config object and noticeW if necessary |
15 | NoticePlugin::~NoticePlugin() { | 16 | NoticePlugin::~NoticePlugin() { |
16 | delete m_config; | 17 | delete m_config; |
17 | if (noticeW != 0) | 18 | if (noticeW != 0) |
18 | delete noticeW; | 19 | delete noticeW; |
19 | } | 20 | } |
20 | 21 | ||
21 | /// Simply return its name (Notice plugin) | 22 | /// Simply return its name (Notice plugin) |
22 | QString NoticePlugin::pluginName() const { | 23 | QString NoticePlugin::pluginName() const { |
23 | return "Notice plugin"; | 24 | return "Notice plugin"; |
24 | } | 25 | } |
25 | 26 | ||
26 | /// return the Notice widget configuration widget | 27 | /// return the Notice widget configuration widget |
27 | /** | 28 | /** |
28 | * \return noticeW, the NoticeConfigWidget | 29 | * \return noticeW, the NoticeConfigWidget |
29 | */ | 30 | */ |
30 | MultiauthConfigWidget * NoticePlugin::configWidget(QWidget * parent) { | 31 | MultiauthConfigWidget * NoticePlugin::configWidget(QWidget * parent) { |
31 | if (noticeW == 0) | 32 | if (noticeW == 0) |
32 | noticeW = new NoticeConfigWidget(parent, "Notice configuration widget"); | 33 | noticeW = new NoticeConfigWidget(parent, "Notice configuration widget"); |
33 | return noticeW; | 34 | return noticeW; |
34 | } | 35 | } |
35 | 36 | ||
36 | /// return the path of the small tab icon | 37 | /// return the path of the small tab icon |
37 | QString NoticePlugin::pixmapNameConfig() const { | 38 | QString NoticePlugin::pixmapNameConfig() const { |
38 | return "security/noticeplugin_small"; | 39 | return "security/noticeplugin_small"; |
39 | } | 40 | } |
40 | 41 | ||
41 | /// return the path of the big icon for the active/order checklist | 42 | /// return the path of the big icon for the active/order checklist |
42 | QString NoticePlugin::pixmapNameWidget() const { | 43 | QString NoticePlugin::pixmapNameWidget() const { |
43 | return "security/noticeplugin"; | 44 | return "security/noticeplugin"; |
44 | } | 45 | } |
45 | 46 | ||
46 | /// Displays the configured message and an 'Accept' button | 47 | /// Displays the configured message and an 'Accept' button |
47 | /** | 48 | /** |
48 | * \return the outcome code of this authentication (can be only success) | 49 | * \return the outcome code of this authentication (can be only success) |
49 | */ | 50 | */ |
50 | int NoticePlugin::authenticate() { | 51 | int NoticePlugin::authenticate() { |
51 | QMessageBox noticeDialog("Notice plugin", | 52 | QMessageBox noticeDialog("Notice plugin", |
52 | getNoticeText(), | 53 | getNoticeText(), |
53 | QMessageBox::Warning, | 54 | QMessageBox::Warning, |
54 | QMessageBox::Yes, | 55 | QMessageBox::Yes, |
55 | 0, | 56 | 0, |
56 | 0, | 57 | 0, |
57 | 0, | 58 | 0, |
58 | "notice plugin dialog", | 59 | "notice plugin dialog", |
59 | true, | 60 | true, |
60 | Qt::WStyle_NoBorder | Qt::WStyle_Customize | Qt::WStyle_StaysOnTop); | 61 | Qt::WStyle_NoBorder | Qt::WStyle_Customize | Qt::WStyle_StaysOnTop); |
61 | 62 | ||
62 | noticeDialog.setButtonText(QMessageBox::Yes, "I accept"); | 63 | noticeDialog.setButtonText(QMessageBox::Yes, tr("I accept")); |
63 | 64 | ||
64 | QRect desk = oApp->desktop()->geometry(); | 65 | QRect desk = oApp->desktop()->geometry(); |
65 | noticeDialog.setGeometry( 0, 0, desk.width(), desk.height() ); | 66 | noticeDialog.setGeometry( 0, 0, desk.width(), desk.height() ); |
66 | 67 | ||
67 | switch (noticeDialog.exec()) | 68 | switch (noticeDialog.exec()) |
68 | { | 69 | { |
69 | case QMessageBox::Yes: | 70 | case QMessageBox::Yes: |
70 | return MultiauthPluginObject::Success; | 71 | return MultiauthPluginObject::Success; |
71 | } | 72 | } |
72 | return 255; //should not be returned anyway | 73 | return 255; //should not be returned anyway |
73 | } | 74 | } |
74 | 75 | ||
75 | /// get the notice text from our m_config config file (with true new lines) | 76 | /// get the notice text from our m_config config file (with true new lines) |
76 | /** | 77 | /** |
77 | * if no text has been defined yet returns defaultNoticeText | 78 | * if no text has been defined yet returns defaultNoticeText |
78 | */ | 79 | */ |
79 | QString NoticePlugin::getNoticeText() { | 80 | QString NoticePlugin::getNoticeText() { |
80 | // Note: C++ processes '\' character, so we have to type \\\\ to mean \\ to QRegExp | 81 | // Note: C++ processes '\' character, so we have to type \\\\ to mean \\ to QRegExp |
81 | return m_config->readEntry("noticeText", defaultNoticeText).replace( QRegExp("\\\\n"), "\n" ); | 82 | return m_config->readEntry("noticeText", defaultNoticeText).replace( QRegExp("\\\\n"), "\n" ); |
82 | } | 83 | } |
83 | 84 | ||
diff --git a/noncore/securityplugins/notice/noticeplugin.h b/noncore/securityplugins/notice/noticeplugin.h index e01cb93..842d47b 100644 --- a/noncore/securityplugins/notice/noticeplugin.h +++ b/noncore/securityplugins/notice/noticeplugin.h | |||
@@ -1,62 +1,64 @@ | |||
1 | /** | 1 | /** |
2 | * \file noticeplugin.h | 2 | * \file noticeplugin.h |
3 | * \brief Standard Opie multiauth plugin definition | 3 | * \brief Standard Opie multiauth plugin definition |
4 | * \author Clément Séveillac (clement . seveillac (at) via . ecp . fr) | 4 | * \author Clément Séveillac (clement . seveillac (at) via . ecp . fr) |
5 | */ | 5 | */ |
6 | /* | 6 | /* |
7 | =. This file is part of the Opie Project | 7 | =. This file is part of the Opie Project |
8 | .=l. Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org> | 8 | .=l. Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org> |
9 | .>+-= | 9 | .>+-= |
10 | _;:, .> :=|. This library is free software; you can | 10 | _;:, .> :=|. This library is free software; you can |
11 | .> <`_, > . <= redistribute it and/or modify it under | 11 | .> <`_, > . <= redistribute it and/or modify it under |
12 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 12 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
13 | .="- .-=="i, .._ License as published by the Free Software | 13 | .="- .-=="i, .._ License as published by the Free Software |
14 | - . .-<_> .<> Foundation; either version 2 of the License, | 14 | - . .-<_> .<> Foundation; either version 2 of the License, |
15 | ._= =} : or (at your option) any later version. | 15 | ._= =} : or (at your option) any later version. |
16 | .%`+i> _;_. | 16 | .%`+i> _;_. |
17 | .i_,=:_. -<s. This library is distributed in the hope that | 17 | .i_,=:_. -<s. This library is distributed in the hope that |
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
19 | : .. .:, . . . without even the implied warranty of | 19 | : .. .:, . . . without even the implied warranty of |
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; Library General Public License for more | 22 | ..}^=.= = ; Library General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 26 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #ifndef NOTICE_PLUGIN_H | 34 | #ifndef NOTICE_PLUGIN_H |
35 | #define NOTICE_PLUGIN_H | 35 | #define NOTICE_PLUGIN_H |
36 | 36 | ||
37 | #include <qstring.h> | 37 | #include <qstring.h> |
38 | #include <qpe/config.h> | 38 | #include <qpe/config.h> |
39 | #include <opie2/multiauthplugininterface.h> | 39 | #include <opie2/multiauthplugininterface.h> |
40 | #include "noticeConfigWidget.h" | 40 | #include "noticeConfigWidget.h" |
41 | 41 | ||
42 | /// Multi-authentication plugin, having the user accept a (legal, etc.) notice text. | 42 | /// Multi-authentication plugin, having the user accept a (legal, etc.) notice text. |
43 | /** | 43 | /** |
44 | * The plugin itself, implementing the main authenticate() function. | 44 | * The plugin itself, implementing the main authenticate() function. |
45 | */ | 45 | */ |
46 | class NoticePlugin : public MultiauthPluginObject { | 46 | class NoticePlugin : public QObject, public MultiauthPluginObject { |
47 | |||
48 | Q_OBJECT; | ||
47 | 49 | ||
48 | public: | 50 | public: |
49 | NoticePlugin(); | 51 | NoticePlugin(); |
50 | virtual ~NoticePlugin(); | 52 | virtual ~NoticePlugin(); |
51 | int authenticate(); | 53 | int authenticate(); |
52 | MultiauthConfigWidget * configWidget(QWidget * parent); | 54 | MultiauthConfigWidget * configWidget(QWidget * parent); |
53 | QString pixmapNameConfig() const; | 55 | QString pixmapNameConfig() const; |
54 | QString pixmapNameWidget() const; | 56 | QString pixmapNameWidget() const; |
55 | QString pluginName() const; | 57 | QString pluginName() const; |
56 | private: | 58 | private: |
57 | NoticeConfigWidget * noticeW; | 59 | NoticeConfigWidget * noticeW; |
58 | Config * m_config; | 60 | Config * m_config; |
59 | QString getNoticeText(); | 61 | QString getNoticeText(); |
60 | }; | 62 | }; |
61 | 63 | ||
62 | #endif | 64 | #endif |