author | zautrix <zautrix> | 2004-09-10 09:53:08 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-10 09:53:08 (UTC) |
commit | 14056eb4ec076bc243dcb9f600999eb437fb8afd (patch) (unidiff) | |
tree | e2040c584f7763826a5e6c474de7162514348bc3 /kmicromail | |
parent | 10eb314475b75a162582e8138d465890dbd21806 (diff) | |
download | kdepimpi-14056eb4ec076bc243dcb9f600999eb437fb8afd.zip kdepimpi-14056eb4ec076bc243dcb9f600999eb437fb8afd.tar.gz kdepimpi-14056eb4ec076bc243dcb9f600999eb437fb8afd.tar.bz2 |
Fixed menubar problem
-rw-r--r-- | kmicromail/mainwindow.cpp | 2 | ||||
-rw-r--r-- | kmicromail/mainwindow.h | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp index 6df95c6..5793a58 100644 --- a/kmicromail/mainwindow.cpp +++ b/kmicromail/mainwindow.cpp | |||
@@ -23,13 +23,13 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
23 | : QMainWindow( parent, name ) //, flags ) | 23 | : QMainWindow( parent, name ) //, flags ) |
24 | { | 24 | { |
25 | setCaption( tr( "KOpieMail/Pi" ) ); | 25 | setCaption( tr( "KOpieMail/Pi" ) ); |
26 | setToolBarsMovable( false ); | 26 | setToolBarsMovable( false ); |
27 | //KABC::StdAddressBook::self(); | 27 | //KABC::StdAddressBook::self(); |
28 | toolBar = new QToolBar( this ); | 28 | toolBar = new QToolBar( this ); |
29 | menuBar = new QMenuBar( toolBar ); | 29 | menuBar = new QPEMenuBar( toolBar ); |
30 | mailMenu = new QPopupMenu( menuBar ); | 30 | mailMenu = new QPopupMenu( menuBar ); |
31 | menuBar->insertItem( tr( "Mail" ), mailMenu ); | 31 | menuBar->insertItem( tr( "Mail" ), mailMenu ); |
32 | settingsMenu = new QPopupMenu( menuBar ); | 32 | settingsMenu = new QPopupMenu( menuBar ); |
33 | menuBar->insertItem( tr( "Settings" ), settingsMenu ); | 33 | menuBar->insertItem( tr( "Settings" ), settingsMenu ); |
34 | 34 | ||
35 | addToolBar( toolBar ); | 35 | addToolBar( toolBar ); |
diff --git a/kmicromail/mainwindow.h b/kmicromail/mainwindow.h index f5b81aa..680f0a9 100644 --- a/kmicromail/mainwindow.h +++ b/kmicromail/mainwindow.h | |||
@@ -5,13 +5,17 @@ | |||
5 | 5 | ||
6 | #include <qmainwindow.h> | 6 | #include <qmainwindow.h> |
7 | #include <qlistview.h> | 7 | #include <qlistview.h> |
8 | #include <qaction.h> | 8 | #include <qaction.h> |
9 | 9 | ||
10 | #include <qtoolbar.h> | 10 | #include <qtoolbar.h> |
11 | #ifdef DESKTOP_VERSION | ||
11 | #include <qmenubar.h> | 12 | #include <qmenubar.h> |
13 | #else | ||
14 | #include <qpe/qpemenubar.h> | ||
15 | #endif | ||
12 | 16 | ||
13 | #include "accountview.h" | 17 | #include "accountview.h" |
14 | #include "statuswidget.h" | 18 | #include "statuswidget.h" |
15 | 19 | ||
16 | #include <libmailwrapper/mailtypes.h> | 20 | #include <libmailwrapper/mailtypes.h> |
17 | #include <opie2/osmartpointer.h> | 21 | #include <opie2/osmartpointer.h> |
@@ -46,13 +50,13 @@ protected slots: | |||
46 | void showAbout(); | 50 | void showAbout(); |
47 | void showEtpanLicence(); | 51 | void showEtpanLicence(); |
48 | 52 | ||
49 | protected: | 53 | protected: |
50 | QToolBar *toolBar; | 54 | QToolBar *toolBar; |
51 | StatusWidget *statusWidget; | 55 | StatusWidget *statusWidget; |
52 | QMenuBar *menuBar; | 56 | QPEMenuBar *menuBar; |
53 | QPopupMenu *mailMenu, *settingsMenu; | 57 | QPopupMenu *mailMenu, *settingsMenu; |
54 | QAction *composeMail, *sendQueued, *showFolders, *searchMails, *deleteMails, | 58 | QAction *composeMail, *sendQueued, *showFolders, *searchMails, *deleteMails, |
55 | *editSettings, *editAccounts, *syncFolders; | 59 | *editSettings, *editAccounts, *syncFolders; |
56 | AccountView *folderView; | 60 | AccountView *folderView; |
57 | QListView *mailView; | 61 | QListView *mailView; |
58 | //QBoxLayout *layout; | 62 | //QBoxLayout *layout; |