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 /kaddressbook | |
parent | 10eb314475b75a162582e8138d465890dbd21806 (diff) | |
download | kdepimpi-14056eb4ec076bc243dcb9f600999eb437fb8afd.zip kdepimpi-14056eb4ec076bc243dcb9f600999eb437fb8afd.tar.gz kdepimpi-14056eb4ec076bc243dcb9f600999eb437fb8afd.tar.bz2 |
Fixed menubar problem
-rw-r--r-- | kaddressbook/kabcore.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 2a2f904..bbf8e1b 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -84,27 +84,29 @@ $Id$ | |||
84 | #include <qmessagebox.h> | 84 | #include <qmessagebox.h> |
85 | #include <kdebug.h> | 85 | #include <kdebug.h> |
86 | #include <kiconloader.h> // needed for SmallIcon | 86 | #include <kiconloader.h> // needed for SmallIcon |
87 | #include <kresources/kcmkresources.h> | 87 | #include <kresources/kcmkresources.h> |
88 | #include <ktoolbar.h> | 88 | #include <ktoolbar.h> |
89 | 89 | ||
90 | 90 | ||
91 | //#include <qlabel.h> | 91 | //#include <qlabel.h> |
92 | 92 | ||
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 |
102 | #include "kcmconfigs/kcmkabconfig.h" | 104 | #include "kcmconfigs/kcmkabconfig.h" |
103 | #include "kcmconfigs/kcmkdepimconfig.h" | 105 | #include "kcmconfigs/kcmkdepimconfig.h" |
104 | #include "kpimglobalprefs.h" | 106 | #include "kpimglobalprefs.h" |
105 | #include "externalapphandler.h" | 107 | #include "externalapphandler.h" |
106 | 108 | ||
107 | 109 | ||
108 | #include <kresources/selectdialog.h> | 110 | #include <kresources/selectdialog.h> |
109 | #include <kmessagebox.h> | 111 | #include <kmessagebox.h> |
110 | 112 | ||
@@ -1750,25 +1752,25 @@ void KABCore::addActionsManually() | |||
1750 | //Disable the following block if you do not want to have a menubar. | 1752 | //Disable the following block if you do not want to have a menubar. |
1751 | mb->insertItem( "&File", fileMenu ); | 1753 | mb->insertItem( "&File", fileMenu ); |
1752 | mb->insertItem( "&Edit", editMenu ); | 1754 | mb->insertItem( "&Edit", editMenu ); |
1753 | mb->insertItem( "&View", viewMenu ); | 1755 | mb->insertItem( "&View", viewMenu ); |
1754 | mb->insertItem( "&Settings", settingsMenu ); | 1756 | mb->insertItem( "&Settings", settingsMenu ); |
1755 | mb->insertItem( "&Change selected", changeMenu ); | 1757 | mb->insertItem( "&Change selected", changeMenu ); |
1756 | mb->insertItem( "&Help", helpMenu ); | 1758 | mb->insertItem( "&Help", helpMenu ); |
1757 | mIncSearchWidget = new IncSearchWidget( tb ); | 1759 | mIncSearchWidget = new IncSearchWidget( tb ); |
1758 | // tb->insertWidget(-1, 0, mIncSearchWidget); | 1760 | // tb->insertWidget(-1, 0, mIncSearchWidget); |
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); |
1766 | mIncSearchWidget = new IncSearchWidget( tb ); | 1768 | mIncSearchWidget = new IncSearchWidget( tb ); |
1767 | 1769 | ||
1768 | tb->enableMoving(false); | 1770 | tb->enableMoving(false); |
1769 | popupBarTB->insertItem( "&File", fileMenu ); | 1771 | popupBarTB->insertItem( "&File", fileMenu ); |
1770 | popupBarTB->insertItem( "&Edit", editMenu ); | 1772 | popupBarTB->insertItem( "&Edit", editMenu ); |
1771 | popupBarTB->insertItem( "&View", viewMenu ); | 1773 | popupBarTB->insertItem( "&View", viewMenu ); |
1772 | popupBarTB->insertItem( "&Settings", settingsMenu ); | 1774 | popupBarTB->insertItem( "&Settings", settingsMenu ); |
1773 | mViewManager->getFilterAction()->plug ( popupBarTB); | 1775 | mViewManager->getFilterAction()->plug ( popupBarTB); |
1774 | popupBarTB->insertItem( "&Change selected", changeMenu ); | 1776 | popupBarTB->insertItem( "&Change selected", changeMenu ); |