fixx

5 files changed, 20 insertions, 12 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 5a2482e..17f1659 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -657,2 +657,9 @@ CalendarView::~CalendarView()
 }
+
+void CalendarView::slotResetFocus()
+{
+    qDebug(" CalendarView::slotResetFocus() %x", qApp->focusWidget());
+
+}
+
 void CalendarView::nextConflict( bool all, bool allday )
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 799c297..456c2d7 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -202,3 +202,4 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
 
-  public slots:
+  public slots: 
+    void slotResetFocus();
     void nextConflict( bool all, bool allday );
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 779f12e..0dd5ef5 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -1637,3 +1637,6 @@ QTime KOAgenda::getEndTime()
 {
-    return QTime ( (contentsY ()+viewport()->height())*24/contentsHeight ()+1,0,0);
+    int tim = (contentsY ()+viewport()->height())*24/contentsHeight ();
+    if ( tim > 23 )
+        return QTime ( 23,59,59);
+    return QTime ( tim,0,0);
 }
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 ) ) );
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index d648f14..e2de3ba 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -13,2 +13,3 @@
 #include <ksyncmanager.h>
+#include <kpopupmenu.h>
 #ifndef DESKTOP_VERSION
@@ -22,6 +23,4 @@ class KSyncProfile;
 #define QPEToolBar QToolBar
-#define QPEMenuBar QMenuBar
 #endif
 class QPEToolBar;
-class QPEMenuBar;
 
@@ -130,3 +129,3 @@ class MainWindow : public QMainWindow
     QPEToolBar *filterToolBar;
-    QMenuBar *filterMenubar;
+    KMenuBar *filterMenubar;
     QPopupMenu * filterPopupMenu;