author | conber <conber> | 2002-06-19 13:58:18 (UTC) |
---|---|---|
committer | conber <conber> | 2002-06-19 13:58:18 (UTC) |
commit | dee5f6c5a3bd982913d0b234fb9392ce68d5df63 (patch) (unidiff) | |
tree | 8a3c2d374d622234b7cf67648c8c4e31a2b530b6 /noncore/unsupported | |
parent | 230cdc6fd89f9e52859633816f554512cd2121e0 (diff) | |
download | opie-dee5f6c5a3bd982913d0b234fb9392ce68d5df63.zip opie-dee5f6c5a3bd982913d0b234fb9392ce68d5df63.tar.gz opie-dee5f6c5a3bd982913d0b234fb9392ce68d5df63.tar.bz2 |
some small fixes
-rw-r--r-- | noncore/unsupported/mail2/composerbase.cpp | 8 | ||||
-rw-r--r-- | noncore/unsupported/mail2/configdiag.cpp | 20 | ||||
-rw-r--r-- | noncore/unsupported/mail2/configdiag.h | 2 | ||||
-rw-r--r-- | noncore/unsupported/mail2/configdiagbase.ui | 11 | ||||
-rw-r--r-- | noncore/unsupported/mail2/mainwindowbase.cpp | 8 |
5 files changed, 8 insertions, 41 deletions
diff --git a/noncore/unsupported/mail2/composerbase.cpp b/noncore/unsupported/mail2/composerbase.cpp index ff00a73..c456ae5 100644 --- a/noncore/unsupported/mail2/composerbase.cpp +++ b/noncore/unsupported/mail2/composerbase.cpp | |||
@@ -27,6 +27,10 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl) | |||
27 | addToolBar(toolbar); | 27 | addToolBar(toolbar); |
28 | toolbar->setHorizontalStretchable(true); | 28 | toolbar->setHorizontalStretchable(true); |
29 | 29 | ||
30 | QLabel *spacer = new QLabel(toolbar); | ||
31 | spacer->setBackgroundMode(QWidget::PaletteButton); | ||
32 | toolbar->setStretchableWidget(spacer); | ||
33 | |||
30 | sendmail = new QAction(tr("Send the mail"), QIconSet(Resource::loadPixmap("mail/sendmail")), 0, 0, this); | 34 | sendmail = new QAction(tr("Send the mail"), QIconSet(Resource::loadPixmap("mail/sendmail")), 0, 0, this); |
31 | sendmail->addTo(toolbar); | 35 | sendmail->addTo(toolbar); |
32 | sendmail->addTo(mailmenu); | 36 | sendmail->addTo(mailmenu); |
@@ -44,10 +48,6 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl) | |||
44 | addressbook->addTo(toolbar); | 48 | addressbook->addTo(toolbar); |
45 | addressbook->addTo(mailmenu); | 49 | addressbook->addTo(mailmenu); |
46 | 50 | ||
47 | QLabel *spacer = new QLabel(toolbar); | ||
48 | spacer->setBackgroundMode(QWidget::PaletteButton); | ||
49 | toolbar->setStretchableWidget(spacer); | ||
50 | |||
51 | abort = new QAction(tr("Abort sending"), QIconSet(Resource::loadPixmap("mail/abort")), 0, 0, this); | 51 | abort = new QAction(tr("Abort sending"), QIconSet(Resource::loadPixmap("mail/abort")), 0, 0, this); |
52 | abort->addTo(toolbar); | 52 | abort->addTo(toolbar); |
53 | abort->addTo(mailmenu); | 53 | abort->addTo(mailmenu); |
diff --git a/noncore/unsupported/mail2/configdiag.cpp b/noncore/unsupported/mail2/configdiag.cpp index b89b937..e2b2f13 100644 --- a/noncore/unsupported/mail2/configdiag.cpp +++ b/noncore/unsupported/mail2/configdiag.cpp | |||
@@ -12,7 +12,6 @@ | |||
12 | #include <qpe/config.h> | 12 | #include <qpe/config.h> |
13 | 13 | ||
14 | #include "accounteditor.h" | 14 | #include "accounteditor.h" |
15 | #include "zaurusstuff.h" | ||
16 | #include "configdiag.h" | 15 | #include "configdiag.h" |
17 | #include "defines.h" | 16 | #include "defines.h" |
18 | 17 | ||
@@ -49,8 +48,6 @@ ConfigDiag::ConfigDiag(QWidget *parent, const char *name, bool modal, WFlags fl) | |||
49 | connect(accountEdit, SIGNAL(clicked()), SLOT(slotEditAccount())); | 48 | connect(accountEdit, SIGNAL(clicked()), SLOT(slotEditAccount())); |
50 | connect(accountDelete, SIGNAL(clicked()), SLOT(slotDelAccount())); | 49 | connect(accountDelete, SIGNAL(clicked()), SLOT(slotDelAccount())); |
51 | 50 | ||
52 | connect(testbutton, SIGNAL(clicked()), SLOT(slotTestSettings())); | ||
53 | |||
54 | slotFillLists(); | 51 | slotFillLists(); |
55 | } | 52 | } |
56 | 53 | ||
@@ -126,20 +123,3 @@ void ConfigDiag::slotDelAccount() | |||
126 | emit changed(); | 123 | emit changed(); |
127 | } | 124 | } |
128 | 125 | ||
129 | void ConfigDiag::slotTestSettings() | ||
130 | { | ||
131 | testbutton->setEnabled(false); | ||
132 | |||
133 | if (blinkLed->isChecked()) ZaurusStuff::blinkLedOn(); | ||
134 | if (playSound->isChecked()) ZaurusStuff::buzzerOn(); | ||
135 | QTimer::singleShot(3000, this, SLOT(slotEndTest())); | ||
136 | } | ||
137 | |||
138 | void ConfigDiag::slotEndTest() | ||
139 | { | ||
140 | if (playSound->isChecked()) ZaurusStuff::buzzerOff(); | ||
141 | if (blinkLed->isChecked()) ZaurusStuff::blinkLedOff(); | ||
142 | |||
143 | testbutton->setEnabled(true); | ||
144 | } | ||
145 | |||
diff --git a/noncore/unsupported/mail2/configdiag.h b/noncore/unsupported/mail2/configdiag.h index f70ba7f..cbc9b22 100644 --- a/noncore/unsupported/mail2/configdiag.h +++ b/noncore/unsupported/mail2/configdiag.h | |||
@@ -37,8 +37,6 @@ protected slots: | |||
37 | void slotNewAccount(); | 37 | void slotNewAccount(); |
38 | void slotEditAccount(); | 38 | void slotEditAccount(); |
39 | void slotDelAccount(); | 39 | void slotDelAccount(); |
40 | void slotTestSettings(); | ||
41 | void slotEndTest(); | ||
42 | 40 | ||
43 | private: | 41 | private: |
44 | Config *_configBenD; | 42 | Config *_configBenD; |
diff --git a/noncore/unsupported/mail2/configdiagbase.ui b/noncore/unsupported/mail2/configdiagbase.ui index 182fedc..8b225fe 100644 --- a/noncore/unsupported/mail2/configdiagbase.ui +++ b/noncore/unsupported/mail2/configdiagbase.ui | |||
@@ -233,17 +233,6 @@ | |||
233 | <string>Blink LED</string> | 233 | <string>Blink LED</string> |
234 | </property> | 234 | </property> |
235 | </widget> | 235 | </widget> |
236 | <widget row="2" column="2" > | ||
237 | <class>QToolButton</class> | ||
238 | <property stdset="1"> | ||
239 | <name>name</name> | ||
240 | <cstring>testbutton</cstring> | ||
241 | </property> | ||
242 | <property stdset="1"> | ||
243 | <name>text</name> | ||
244 | <string> Test </string> | ||
245 | </property> | ||
246 | </widget> | ||
247 | <widget row="0" column="0" rowspan="1" colspan="3" > | 236 | <widget row="0" column="0" rowspan="1" colspan="3" > |
248 | <class>QCheckBox</class> | 237 | <class>QCheckBox</class> |
249 | <property stdset="1"> | 238 | <property stdset="1"> |
diff --git a/noncore/unsupported/mail2/mainwindowbase.cpp b/noncore/unsupported/mail2/mainwindowbase.cpp index 9ffe6f0..d61899b 100644 --- a/noncore/unsupported/mail2/mainwindowbase.cpp +++ b/noncore/unsupported/mail2/mainwindowbase.cpp | |||
@@ -30,6 +30,10 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl) | |||
30 | addToolBar(toolbar); | 30 | addToolBar(toolbar); |
31 | toolbar->setHorizontalStretchable(true); | 31 | toolbar->setHorizontalStretchable(true); |
32 | 32 | ||
33 | QLabel *spacer = new QLabel(toolbar); | ||
34 | spacer->setBackgroundMode(QWidget::PaletteButton); | ||
35 | toolbar->setStretchableWidget(spacer); | ||
36 | |||
33 | compose = new QAction(tr("Compose new mail"), QIconSet(Resource::loadPixmap("mail/newmail")), 0, 0, this); | 37 | compose = new QAction(tr("Compose new mail"), QIconSet(Resource::loadPixmap("mail/newmail")), 0, 0, this); |
34 | compose->addTo(toolbar); | 38 | compose->addTo(toolbar); |
35 | compose->addTo(mailmenu); | 39 | compose->addTo(mailmenu); |
@@ -51,10 +55,6 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl) | |||
51 | configure->addTo(toolbar); | 55 | configure->addTo(toolbar); |
52 | configure->addTo(servermenu); | 56 | configure->addTo(servermenu); |
53 | 57 | ||
54 | QLabel *spacer = new QLabel(toolbar); | ||
55 | spacer->setBackgroundMode(QWidget::PaletteButton); | ||
56 | toolbar->setStretchableWidget(spacer); | ||
57 | |||
58 | stop = new QAction(tr("Abort"), QIconSet(Resource::loadPixmap("mail/abort")), 0, 0, this); | 58 | stop = new QAction(tr("Abort"), QIconSet(Resource::loadPixmap("mail/abort")), 0, 0, this); |
59 | stop->addTo(toolbar); | 59 | stop->addTo(toolbar); |
60 | 60 | ||