summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-09-10 09:53:08 (UTC)
committer zautrix <zautrix>2004-09-10 09:53:08 (UTC)
commit14056eb4ec076bc243dcb9f600999eb437fb8afd (patch) (unidiff)
treee2040c584f7763826a5e6c474de7162514348bc3
parent10eb314475b75a162582e8138d465890dbd21806 (diff)
downloadkdepimpi-14056eb4ec076bc243dcb9f600999eb437fb8afd.zip
kdepimpi-14056eb4ec076bc243dcb9f600999eb437fb8afd.tar.gz
kdepimpi-14056eb4ec076bc243dcb9f600999eb437fb8afd.tar.bz2
Fixed menubar problem
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp4
-rw-r--r--kmicromail/mainwindow.cpp2
-rw-r--r--kmicromail/mainwindow.h6
3 files changed, 9 insertions, 3 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 2a2f904..bbf8e1b 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -93,9 +93,11 @@ $Id$
93 93
94#ifndef DESKTOP_VERSION 94#ifndef DESKTOP_VERSION
95#include <qpe/ir.h> 95#include <qpe/ir.h>
96#include <qpe/qpemenubar.h>
96#include <qtopia/qcopenvelope_qws.h> 97#include <qtopia/qcopenvelope_qws.h>
97#else 98#else
98 99
100#include <qmenubar.h>
99#endif 101#endif
100 102
101#endif // KAB_EMBEDDED 103#endif // KAB_EMBEDDED
@@ -1759,7 +1761,7 @@ void KABCore::addActionsManually()
1759 1761
1760#else 1762#else
1761 //US setup toolbar 1763 //US setup toolbar
1762 QMenuBar *menuBarTB = new QMenuBar( tb ); 1764 QPEMenuBar *menuBarTB = new QPEMenuBar( tb );
1763 QPopupMenu *popupBarTB = new QPopupMenu( this ); 1765 QPopupMenu *popupBarTB = new QPopupMenu( this );
1764 menuBarTB->insertItem( "ME", popupBarTB); 1766 menuBarTB->insertItem( "ME", popupBarTB);
1765 tb->insertWidget(-1, 0, menuBarTB); 1767 tb->insertWidget(-1, 0, menuBarTB);
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 6df95c6..5793a58 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -26,7 +26,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
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 );
diff --git a/kmicromail/mainwindow.h b/kmicromail/mainwindow.h
index f5b81aa..680f0a9 100644
--- a/kmicromail/mainwindow.h
+++ b/kmicromail/mainwindow.h
@@ -8,7 +8,11 @@
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"
@@ -49,7 +53,7 @@ protected slots:
49protected: 53protected:
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;