| 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 @@ -23,3 +23,2 @@ #include <qpe/global.h> -#include <qpe/qpemenubar.h> #include <qpe/qpetoolbar.h> @@ -31,3 +30,2 @@ #else -#include <qmenubar.h> #include <qtoolbar.h> @@ -227,3 +225,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) : filterToolBar = new QPEToolBar ( this ); - filterMenubar = new QMenuBar( 0 ); + filterMenubar = new KMenuBar( 0 ); QFontMetrics fm ( filterMenubar->font() ); @@ -684,5 +682,5 @@ void MainWindow::initActions() } + KMenuBar *menuBar1; if ( KOPrefs::instance()->mShowFullMenu ) { - QMenuBar *menuBar1; - menuBar1 = menuBar(); + menuBar1 = new KMenuBar( this );//menuBar(); menuBar1->insertItem( i18n("File"), importMenu ); @@ -702,4 +700,3 @@ void MainWindow::initActions() } else { - QPEMenuBar *menuBar1; - menuBar1 = new QPEMenuBar( iconToolBar ); + menuBar1 = new KMenuBar( iconToolBar ); QPopupMenu *menuBar = new QPopupMenu( this ); @@ -720,2 +717,3 @@ void MainWindow::initActions() } + connect ( menuBar1, SIGNAL( lostFocus () ), mView, SLOT ( slotResetFocus() ) ); connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); |