Diffstat (limited to 'noncore/securityplugins/notice') (more/less context) (ignore whitespace changes)
-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,19 +1,20 @@ | |||
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 | } |
@@ -50,25 +51,25 @@ QString NoticePlugin::pixmapNameWidget() const { | |||
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 | ||
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 | |||
@@ -34,25 +34,27 @@ | |||
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; |