author | zautrix <zautrix> | 2005-07-10 10:17:55 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-10 10:17:55 (UTC) |
commit | 58b7818a74809dc9280a3249eeb7e0195a66f93d (patch) (side-by-side diff) | |
tree | 04b04b867647a8c48d59e7a0fa89df6430039599 /korganizer/mainwindow.cpp | |
parent | e8b6635ef7c98996f0415e6a77394569493ab151 (diff) | |
download | kdepimpi-58b7818a74809dc9280a3249eeb7e0195a66f93d.zip kdepimpi-58b7818a74809dc9280a3249eeb7e0195a66f93d.tar.gz kdepimpi-58b7818a74809dc9280a3249eeb7e0195a66f93d.tar.bz2 |
fixx
-rw-r--r-- | korganizer/mainwindow.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 4bedb61..21d5a35 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -21,7 +21,6 @@ #include <qtextstream.h> #ifndef DESKTOP_VERSION #include <qpe/global.h> -#include <qpe/qpemenubar.h> #include <qpe/qpetoolbar.h> #include <qpe/resource.h> #include <qpe/qpeapplication.h> @@ -29,7 +28,6 @@ #include <qtopia/qcopenvelope_qws.h> #include <unistd.h> // for sleep #else -#include <qmenubar.h> #include <qtoolbar.h> #include <qapplication.h> //#include <resource.h> @@ -225,7 +223,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) : tbd = Left; } filterToolBar = new QPEToolBar ( this ); - filterMenubar = new QMenuBar( 0 ); + filterMenubar = new KMenuBar( 0 ); QFontMetrics fm ( filterMenubar->font() ); filterPopupMenu = new QPopupMenu( this ); @@ -682,9 +680,9 @@ void MainWindow::initActions() pathString += "iconsmini/"; pixWid = 18; pixHei = 16; } + KMenuBar *menuBar1; if ( KOPrefs::instance()->mShowFullMenu ) { - QMenuBar *menuBar1; - menuBar1 = menuBar(); + menuBar1 = new KMenuBar( this );//menuBar(); menuBar1->insertItem( i18n("File"), importMenu ); menuBar1->insertItem( i18n("View"), viewMenu ); menuBar1->insertItem( i18n("Edit"), mCurrentItemMenu ); @@ -700,8 +698,7 @@ void MainWindow::initActions() menuBar1->insertItem( i18n("Filter"),selectFilterMenu ); menuBar1->insertItem( i18n("Help"), helpMenu ); } else { - QPEMenuBar *menuBar1; - menuBar1 = new QPEMenuBar( iconToolBar ); + menuBar1 = new KMenuBar( iconToolBar ); QPopupMenu *menuBar = new QPopupMenu( this ); icon = loadPixmap( pathString + "z_menu" ); menuBar1->insertItem( icon.pixmap(), menuBar); @@ -718,6 +715,7 @@ void MainWindow::initActions() //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() ); menuBar1->setMaximumSize( menuBar1->sizeHint( )); } + connect ( menuBar1, SIGNAL( lostFocus () ), mView, SLOT ( slotResetFocus() ) ); connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) ); |