fixx

10 files changed, 64 insertions, 15 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 5a2482e..17f1659 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -656,4 +656,11 @@ CalendarView::~CalendarView()
     //kdDebug() << "~CalendarView() done" << endl;
 }
+
+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
@@ -201,5 +201,6 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
 
 
-  public slots:
+  public slots: 
+    void slotResetFocus();
     void nextConflict( bool all, bool allday );
     void conflictAll();
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 779f12e..0dd5ef5 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -1636,5 +1636,8 @@ void KOAgenda::setStartHour(int startHour)
 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);
 }
 void KOAgenda::hideUnused()
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 4bedb61..21d5a35 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -22,5 +22,4 @@
 #ifndef DESKTOP_VERSION
 #include <qpe/global.h>
-#include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
@@ -30,5 +29,4 @@
 #include <unistd.h> // for sleep
 #else
-#include <qmenubar.h>
 #include <qtoolbar.h>
 #include <qapplication.h>
@@ -226,5 +224,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
         }
         filterToolBar = new QPEToolBar ( this );
-        filterMenubar = new QMenuBar( 0 );
+        filterMenubar = new KMenuBar( 0 );
         QFontMetrics fm ( filterMenubar->font() );
             
@@ -683,7 +681,7 @@ void MainWindow::initActions()
         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 );
@@ -701,6 +699,5 @@ void MainWindow::initActions()
         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" );
@@ -719,4 +716,5 @@ void MainWindow::initActions()
         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() ) );
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index d648f14..e2de3ba 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -12,4 +12,5 @@
 #include <libkcal/incidence.h>
 #include <ksyncmanager.h>
+#include <kpopupmenu.h>
 #ifndef DESKTOP_VERSION
 #include <qcopchannel_qws.h> 
@@ -21,8 +22,6 @@ class KSyncProfile;
 
 #define QPEToolBar QToolBar
-#define QPEMenuBar QMenuBar
 #endif
 class QPEToolBar;
-class QPEMenuBar;
 
 
@@ -129,5 +128,5 @@ class MainWindow : public QMainWindow
     QPEToolBar *navigatorToolBar;
     QPEToolBar *filterToolBar;
-    QMenuBar *filterMenubar;
+    KMenuBar *filterMenubar;
     QPopupMenu * filterPopupMenu;
     QPopupMenu * mCurrentItemMenu;
diff --git a/microkde/kdeui/kbuttonbox.cpp b/microkde/kdeui/kbuttonbox.cpp
index 16206e8..83d622a 100644
--- a/microkde/kdeui/kbuttonbox.cpp
+++ b/microkde/kdeui/kbuttonbox.cpp
@@ -47,5 +47,5 @@
 
 //US #include "kbuttonbox.moc"
-
+ 
 #include <kbuttonbox.h>
 #include <qpushbutton.h>
diff --git a/microkde/kdeui/kpopupmenu.cpp b/microkde/kdeui/kpopupmenu.cpp
new file mode 100644
index 0000000..96d2a87
--- a/dev/null
+++ b/microkde/kdeui/kpopupmenu.cpp
@@ -0,0 +1,19 @@
+
+#include <kpopupmenu.h>
+#include <qtimer.h>
+
+
+KPopupMenu::KPopupMenu ( QWidget * parent, const char * name )
+    : QPopupMenu ( parent, name ) {;}
+
+
+
+KMenuBar::KMenuBar ( QWidget * parent, const char * name )
+    : QPEMenuBar ( parent, name ) {}
+
+void KMenuBar::focusOutEvent ( QFocusEvent * e)
+{ 
+    QPEMenuBar::focusOutEvent( e );
+    QTimer::singleShot( 100, this, SIGNAL ( lostFocus() ) );
+    
+}
diff --git a/microkde/kdeui/kpopupmenu.h b/microkde/kdeui/kpopupmenu.h
index 1352429..f16ce77 100644
--- a/microkde/kdeui/kpopupmenu.h
+++ b/microkde/kdeui/kpopupmenu.h
@@ -3,11 +3,29 @@
 
 #include <qpopupmenu.h>
+#ifdef DESKTOP_VERSION
+#include <qmenubar.h>
+#define QPEMenuBar QMenubar
+#else
+#include <qpe/qpemenubar.h>
+#endif
 
 class KPopupMenu : public QPopupMenu
 {
+Q_OBJECT
     public:
-  KPopupMenu ( QWidget * parent=0, const char * name=0 )
-    : QPopupMenu ( parent, name ) {}
+    KPopupMenu ( QWidget * parent=0, const char * name=0 );
+
+};
 
+
+class KMenuBar : public QPEMenuBar
+{
+Q_OBJECT
+    public:
+    KMenuBar ( QWidget * parent=0, const char * name=0 );
+ signals:
+  void lostFocus();
+ protected:
+  void focusOutEvent ( QFocusEvent * e);
 };
 
diff --git a/microkde/microkde.pro b/microkde/microkde.pro
index 44e5f9d..7120bdd 100644
--- a/microkde/microkde.pro
+++ b/microkde/microkde.pro
@@ -104,4 +104,5 @@ KDGanttMinimizeSplitter.h \
  kdeui/ktoolbarhandler.h \
  kdeui/kaction.h \
+ kdeui/kpopupmenu.h \
  kdeui/kactionclasses.h \
  kdeui/kactioncollection.h \
@@ -166,4 +167,5 @@ KDGanttMinimizeSplitter.cpp \
  kutils/kcmultidialog.cpp \
  kdeui/kaction.cpp \
+ kdeui/kpopupmenu.cpp \
  kdeui/kactionclasses.cpp \
  kdeui/kactioncollection.cpp \
diff --git a/microkde/microkdeE.pro b/microkde/microkdeE.pro
index 335fcd0..8fe2bd5 100644
--- a/microkde/microkdeE.pro
+++ b/microkde/microkdeE.pro
@@ -57,4 +57,5 @@ KDGanttMinimizeSplitter.h \
  kdeui/kguiitem.h \
  kdeui/kaction.h \
+ kdeui/kpopupmenu.h \
  kdeui/kactionclasses.h \
  kdeui/kactioncollection.h \
@@ -140,4 +141,5 @@ KDGanttMinimizeSplitter.cpp fncolordialog.cpp \
  kdecore/kstringhandler.cpp \
  kdeui/kaction.cpp \
+ kdeui/kpopupmenu.cpp \
  kdeui/kactionclasses.cpp \
  kdeui/kactioncollection.cpp \