summaryrefslogtreecommitdiff
authorconber <conber>2002-06-15 16:05:38 (UTC)
committer conber <conber>2002-06-15 16:05:38 (UTC)
commitf2f238ad06ce87e644bf56d0c6950a2aeae35ed4 (patch) (unidiff)
tree82a465db09f4fa05a7af710492fe6c953f4a8e0f
parent3e9adfcfcc674ad9b329fcb17880ea24789dbcde (diff)
downloadopie-f2f238ad06ce87e644bf56d0c6950a2aeae35ed4.zip
opie-f2f238ad06ce87e644bf56d0c6950a2aeae35ed4.tar.gz
opie-f2f238ad06ce87e644bf56d0c6950a2aeae35ed4.tar.bz2
changed QToolBar to QPEToolBar
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/mail2/composerbase.cpp6
-rw-r--r--noncore/unsupported/mail2/composerbase.h4
-rw-r--r--noncore/unsupported/mail2/mainwindowbase.cpp4
-rw-r--r--noncore/unsupported/mail2/mainwindowbase.h4
-rw-r--r--noncore/unsupported/mail2/viewmailbase.cpp4
-rw-r--r--noncore/unsupported/mail2/viewmailbase.h4
6 files changed, 13 insertions, 13 deletions
diff --git a/noncore/unsupported/mail2/composerbase.cpp b/noncore/unsupported/mail2/composerbase.cpp
index 7754863..10d567d 100644
--- a/noncore/unsupported/mail2/composerbase.cpp
+++ b/noncore/unsupported/mail2/composerbase.cpp
@@ -1,28 +1,28 @@
1#include <qmultilineedit.h> 1#include <qmultilineedit.h>
2#include <qpopupmenu.h> 2#include <qpopupmenu.h>
3#include <qcombobox.h> 3#include <qcombobox.h>
4#include <qlineedit.h> 4#include <qlineedit.h>
5#include <qtoolbar.h>
6#include <qlayout.h> 5#include <qlayout.h>
7#include <qaction.h> 6#include <qaction.h>
8#include <qlabel.h> 7#include <qlabel.h>
9#include <qvbox.h> 8#include <qvbox.h>
10 9
10#include <qpe/qpetoolbar.h>
11#include <qpe/resource.h> 11#include <qpe/resource.h>
12 12
13#include "listviewplus.h" 13#include "listviewplus.h"
14#include "composerbase.h" 14#include "composerbase.h"
15 15
16ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl) 16ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
17 : QMainWindow(parent, name, fl) 17 : QMainWindow(parent, name, fl)
18{ 18{
19 setCaption(tr("Compose Message")); 19 setCaption(tr("Compose Message"));
20 setToolBarsMovable(false); 20 setToolBarsMovable(false);
21 21
22 toolbar = new QToolBar(this); 22 toolbar = new QPEToolBar(this);
23 addToolBar(toolbar); 23 addToolBar(toolbar);
24 toolbar->setHorizontalStretchable(true); 24 toolbar->setHorizontalStretchable(true);
25 25
26 sendmail = new QAction(tr("Send the mail"), QIconSet(Resource::loadPixmap("mail/sendmail")), 0, 0, this); 26 sendmail = new QAction(tr("Send the mail"), QIconSet(Resource::loadPixmap("mail/sendmail")), 0, 0, this);
27 sendmail->addTo(toolbar); 27 sendmail->addTo(toolbar);
28 28
@@ -113,13 +113,13 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
113 attachWindow = new QMainWindow(view, 0, 0); 113 attachWindow = new QMainWindow(view, 0, 0);
114 attachWindow->setMinimumHeight(100); 114 attachWindow->setMinimumHeight(100);
115 attachWindow->setMaximumHeight(100); 115 attachWindow->setMaximumHeight(100);
116 attachWindow->setToolBarsMovable(false); 116 attachWindow->setToolBarsMovable(false);
117 attachWindow->hide(); 117 attachWindow->hide();
118 118
119 attachToolbar = new QToolBar(attachWindow); 119 attachToolbar = new QPEToolBar(attachWindow);
120 attachToolbar->setVerticalStretchable(true); 120 attachToolbar->setVerticalStretchable(true);
121 121
122 addattach = new QAction(tr("Add an Attachement"), QIconSet(Resource::loadPixmap("mail/newmail")), 0, 0, this); 122 addattach = new QAction(tr("Add an Attachement"), QIconSet(Resource::loadPixmap("mail/newmail")), 0, 0, this);
123 addattach->addTo(attachToolbar); 123 addattach->addTo(attachToolbar);
124 124
125 delattach = new QAction(tr("Remove Attachement"), QIconSet(Resource::loadPixmap("mail/delete")), 0, 0, this); 125 delattach = new QAction(tr("Remove Attachement"), QIconSet(Resource::loadPixmap("mail/delete")), 0, 0, this);
diff --git a/noncore/unsupported/mail2/composerbase.h b/noncore/unsupported/mail2/composerbase.h
index e5fab67..75b77f4 100644
--- a/noncore/unsupported/mail2/composerbase.h
+++ b/noncore/unsupported/mail2/composerbase.h
@@ -3,15 +3,15 @@
3 3
4#include <qmainwindow.h> 4#include <qmainwindow.h>
5 5
6class QMultiLineEdit; 6class QMultiLineEdit;
7class ListViewPlus; 7class ListViewPlus;
8class QPopupMenu; 8class QPopupMenu;
9class QPEToolBar;
9class QComboBox; 10class QComboBox;
10class QLineEdit; 11class QLineEdit;
11class QToolBar;
12class QAction; 12class QAction;
13class QLabel; 13class QLabel;
14 14
15class ComposerBase : public QMainWindow 15class ComposerBase : public QMainWindow
16{ 16{
17 Q_OBJECT 17 Q_OBJECT
@@ -35,15 +35,15 @@ protected:
35 static const int POPUP_ATTACH_REMOVE = 2; 35 static const int POPUP_ATTACH_REMOVE = 2;
36 36
37 QMultiLineEdit *message; 37 QMultiLineEdit *message;
38 ListViewPlus *attachView; 38 ListViewPlus *attachView;
39 QMainWindow *attachWindow; 39 QMainWindow *attachWindow;
40 QPopupMenu *attachPopup; 40 QPopupMenu *attachPopup;
41 QPEToolBar *toolbar, *attachToolbar;
41 QComboBox *fromBox, *from, *receiversBox, *subjectBox, *priority; 42 QComboBox *fromBox, *from, *receiversBox, *subjectBox, *priority;
42 QLineEdit *replyto, *to, *cc, *bcc, *subject; 43 QLineEdit *replyto, *to, *cc, *bcc, *subject;
43 QToolBar *toolbar, *attachToolbar;
44 QAction *sendmail, *attachfile, *addressbook, *abort, *addattach, *delattach; 44 QAction *sendmail, *attachfile, *addressbook, *abort, *addattach, *delattach;
45 QLabel *fromLabel, *status; 45 QLabel *fromLabel, *status;
46 46
47protected slots: 47protected slots:
48 void slotAttachfileChanged(bool toggled); 48 void slotAttachfileChanged(bool toggled);
49 void slotFromMenuChanged(int id); 49 void slotFromMenuChanged(int id);
diff --git a/noncore/unsupported/mail2/mainwindowbase.cpp b/noncore/unsupported/mail2/mainwindowbase.cpp
index 4054af6..c55bd90 100644
--- a/noncore/unsupported/mail2/mainwindowbase.cpp
+++ b/noncore/unsupported/mail2/mainwindowbase.cpp
@@ -1,28 +1,28 @@
1#include <qprogressbar.h> 1#include <qprogressbar.h>
2#include <qtoolbutton.h> 2#include <qtoolbutton.h>
3#include <qpopupmenu.h> 3#include <qpopupmenu.h>
4#include <qtoolbar.h>
5#include <qaction.h> 4#include <qaction.h>
6#include <qheader.h> 5#include <qheader.h>
7#include <qlabel.h> 6#include <qlabel.h>
8#include <qvbox.h> 7#include <qvbox.h>
9 8
9#include <qpe/qpetoolbar.h>
10#include <qpe/resource.h> 10#include <qpe/resource.h>
11 11
12#include "mainwindowbase.h" 12#include "mainwindowbase.h"
13#include "folderwidget.h" 13#include "folderwidget.h"
14#include "mailtable.h" 14#include "mailtable.h"
15 15
16MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl) 16MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
17 : QMainWindow(parent, name, fl) 17 : QMainWindow(parent, name, fl)
18{ 18{
19 setCaption(tr("E-Mail")); 19 setCaption(tr("E-Mail"));
20 setToolBarsMovable(false); 20 setToolBarsMovable(false);
21 21
22 toolbar = new QToolBar(this); 22 toolbar = new QPEToolBar(this);
23 addToolBar(toolbar); 23 addToolBar(toolbar);
24 toolbar->setHorizontalStretchable(true); 24 toolbar->setHorizontalStretchable(true);
25 25
26 compose = new QAction(tr("Compose new mail"), QIconSet(Resource::loadPixmap("mail/newmail")), 0, 0, this); 26 compose = new QAction(tr("Compose new mail"), QIconSet(Resource::loadPixmap("mail/newmail")), 0, 0, this);
27 compose->addTo(toolbar); 27 compose->addTo(toolbar);
28 28
diff --git a/noncore/unsupported/mail2/mainwindowbase.h b/noncore/unsupported/mail2/mainwindowbase.h
index cf23f4f..0776f02 100644
--- a/noncore/unsupported/mail2/mainwindowbase.h
+++ b/noncore/unsupported/mail2/mainwindowbase.h
@@ -3,14 +3,14 @@
3 3
4#include <qmainwindow.h> 4#include <qmainwindow.h>
5 5
6class ServerConnection; 6class ServerConnection;
7class QProgressBar; 7class QProgressBar;
8class FolderWidget; 8class FolderWidget;
9class QPEToolBar;
9class MailTable; 10class MailTable;
10class QToolBar;
11class QAction; 11class QAction;
12class QLabel; 12class QLabel;
13 13
14class MainWindowBase : public QMainWindow 14class MainWindowBase : public QMainWindow
15{ 15{
16 Q_OBJECT 16 Q_OBJECT
@@ -22,14 +22,14 @@ protected slots:
22 void slotFoldersToggled(bool toggled); 22 void slotFoldersToggled(bool toggled);
23 23
24protected: 24protected:
25 ServerConnection *serverConnection; 25 ServerConnection *serverConnection;
26 QProgressBar *statusProgress; 26 QProgressBar *statusProgress;
27 FolderWidget *folderView; 27 FolderWidget *folderView;
28 QPEToolBar *toolbar;
28 MailTable *mailView; 29 MailTable *mailView;
29 QToolBar *toolbar;
30 QAction *compose, *folders, *findmails, *configure, *stop; 30 QAction *compose, *folders, *findmails, *configure, *stop;
31 QLabel *statusLabel; 31 QLabel *statusLabel;
32 32
33}; 33};
34 34
35#endif 35#endif
diff --git a/noncore/unsupported/mail2/viewmailbase.cpp b/noncore/unsupported/mail2/viewmailbase.cpp
index 134e5cb..b650c88 100644
--- a/noncore/unsupported/mail2/viewmailbase.cpp
+++ b/noncore/unsupported/mail2/viewmailbase.cpp
@@ -1,25 +1,25 @@
1#include <qtextbrowser.h> 1#include <qtextbrowser.h>
2#include <qlistview.h> 2#include <qlistview.h>
3#include <qtoolbar.h>
4#include <qaction.h> 3#include <qaction.h>
5#include <qlabel.h> 4#include <qlabel.h>
6#include <qvbox.h> 5#include <qvbox.h>
7 6
7#include <qpe/qpetoolbar.h>
8#include <qpe/resource.h> 8#include <qpe/resource.h>
9 9
10#include "viewmailbase.h" 10#include "viewmailbase.h"
11#include "opendiag.h" 11#include "opendiag.h"
12 12
13ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) 13ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
14 : QMainWindow(parent, name, fl) 14 : QMainWindow(parent, name, fl)
15{ 15{
16 setCaption(tr("E-Mail by %1")); 16 setCaption(tr("E-Mail by %1"));
17 setToolBarsMovable(false); 17 setToolBarsMovable(false);
18 18
19 toolbar = new QToolBar(this); 19 toolbar = new QPEToolBar(this);
20 toolbar->setHorizontalStretchable(true); 20 toolbar->setHorizontalStretchable(true);
21 addToolBar(toolbar); 21 addToolBar(toolbar);
22 22
23 reply = new QAction(tr("Reply"), QIconSet(Resource::loadPixmap("mail/reply")), 0, 0, this); 23 reply = new QAction(tr("Reply"), QIconSet(Resource::loadPixmap("mail/reply")), 0, 0, this);
24 reply->addTo(toolbar); 24 reply->addTo(toolbar);
25 25
diff --git a/noncore/unsupported/mail2/viewmailbase.h b/noncore/unsupported/mail2/viewmailbase.h
index 183bb04..9ddf2aa 100644
--- a/noncore/unsupported/mail2/viewmailbase.h
+++ b/noncore/unsupported/mail2/viewmailbase.h
@@ -2,27 +2,27 @@
2#define VIEWMAILBASE_H 2#define VIEWMAILBASE_H
3 3
4#include <qmainwindow.h> 4#include <qmainwindow.h>
5 5
6class QAction; 6class QAction;
7class OpenDiag; 7class OpenDiag;
8class QToolBar;
9class QListView; 8class QListView;
9class QPEToolBar;
10class QTextBrowser; 10class QTextBrowser;
11 11
12class ViewMailBase : public QMainWindow 12class ViewMailBase : public QMainWindow
13{ 13{
14 Q_OBJECT 14 Q_OBJECT
15 15
16public: 16public:
17 ViewMailBase(QWidget *parent = 0, const char *name = 0, WFlags fl = 0); 17 ViewMailBase(QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
18 18
19protected: 19protected:
20 QAction *reply, *forward, *attachbutton, *deleteMail; 20 QAction *reply, *forward, *attachbutton, *deleteMail;
21 QListView *attachments; 21 QListView *attachments;
22 QToolBar *toolbar; 22 QPEToolBar *toolbar;
23 QTextBrowser *browser; 23 QTextBrowser *browser;
24 OpenDiag *openDiag; 24 OpenDiag *openDiag;
25 25
26protected slots: 26protected slots:
27 void slotChangeAttachview(bool state); 27 void slotChangeAttachview(bool state);
28 28