fixes

10 files changed, 98 insertions, 55 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 0fbaa9a..a9de65a 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2462,13 +2462,3 @@ void CalendarView::moveIncidence(Incidence * inc )
     if ( !inc ) return;
-    // qDebug("showDatePickerForIncidence( ) ");
-    if ( mDateFrame->isVisible() )
-        mDateFrame->hide();
-    else {
-        int w =mDatePicker->sizeHint().width()+2*mDateFrame->lineWidth() ;
-        int h = mDatePicker->sizeHint().height()+2*mDateFrame->lineWidth() ;
-        int dw = QApplication::desktop()->width();
-        int dh = QApplication::desktop()->height();
-        mDateFrame->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
-        mDateFrame->show();
-    }
+    showDatePickerPopup(); 
     mDatePickerMode = 2;
@@ -2489,8 +2479,16 @@ void CalendarView::moveIncidence(Incidence * inc )
 }
-void CalendarView::showDatePicker( ) 
+void CalendarView::showDatePickerPopup() 
 {
-    //qDebug("CalendarView::showDatePicker( )  ");
-    if ( mDateFrame->isVisible() )
+ if ( mDateFrame->isVisible() )
         mDateFrame->hide();
     else {
+        int offX = 0, offY = 0;
+#ifdef DESKTOP_VERSION
+        int w =mDatePicker->sizeHint().width() ;
+        int h = mDatePicker->sizeHint().height() ;
+        int dw = topLevelWidget()->width();
+        int dh = topLevelWidget()->height();
+        offX = topLevelWidget()->x();
+        offY = topLevelWidget()->y();
+#else
         int w =mDatePicker->sizeHint().width() ;
@@ -2499,5 +2497,10 @@ void CalendarView::showDatePicker( )
         int dh = QApplication::desktop()->height();
-        mDateFrame->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
+#endif
+        mDateFrame->setGeometry( (dw-w)/2+offX, (dh - h )/2+offY ,w,h );
         mDateFrame->show();
     }
+}
+void CalendarView::showDatePicker( ) 
+{
+    showDatePickerPopup(); 
     mDatePickerMode = 1;
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 731298d..e626ea3 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -443,3 +443,4 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     void slotSelectPickerDate( QDate ) ;
-    void showDatePicker( ) ;
+    void showDatePicker() ;
+    void showDatePickerPopup() ;
     void moveIncidence(Incidence *) ;
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 6ae4c6f..02d2585 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -927,4 +927,7 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
     resize( QApplication::desktop()->size() );
-    computeLayout();
+#else
+    resize(640, 480 );
 #endif
+    computeLayout();
+
 }
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 576c265..5bfe2a1 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -38,2 +38,3 @@
 #include <kglobal.h>
+#include <kglobalsettings.h>
 #include <kconfig.h>
@@ -64,2 +65,3 @@ KOPrefs::KOPrefs() :
 
+  /*
   mTimeBarFont = QFont("helvetica",10);//,QFont::Bold);
@@ -71,2 +73,4 @@ KOPrefs::KOPrefs() :
   mJornalViewFont = QFont("helvetica",12);
+  */
+
 
@@ -158,14 +162,14 @@ KOPrefs::KOPrefs() :
   // qDebug(" KPrefs::setCurrentGroup(Fonts); ");
-  addItemFont("TimeBar Font",&mTimeBarFont);
-  addItemFont("MonthView Font",&mMonthViewFont);
-  addItemFont("AgendaView Font",&mAgendaViewFont);
-  addItemFont("MarcusBains Font",&mMarcusBainsFont);
-  addItemFont("TimeLabels Font",&mTimeLabelsFont);
-  addItemFont("TodoView Font",&mTodoViewFont);
-  addItemFont("ListView Font",&mListViewFont);
-  addItemFont("DateNavigator Font",&mDateNavigatorFont);
-  addItemFont("EditBox Font",&mEditBoxFont);
-  addItemFont("JournalView Font",&mJornalViewFont);
-  addItemFont("WhatsNextView Font",&mWhatsNextFont);
-  addItemFont("EventView Font",&mEventViewFont);
+  addItemFont("TimeBar Font",&mTimeBarFont,KGlobalSettings::generalFont() );
+  addItemFont("MonthView Font",&mMonthViewFont,KGlobalSettings::generalFont());
+  addItemFont("AgendaView Font",&mAgendaViewFont,KGlobalSettings::generalFont());
+  addItemFont("MarcusBains Font",&mMarcusBainsFont,KGlobalSettings::generalFont());
+  addItemFont("TimeLabels Font",&mTimeLabelsFont,KGlobalSettings::generalFont());
+  addItemFont("TodoView Font",&mTodoViewFont,KGlobalSettings::generalFont());
+  addItemFont("ListView Font",&mListViewFont,KGlobalSettings::generalFont());
+  addItemFont("DateNavigator Font",&mDateNavigatorFont,KGlobalSettings::generalFont());
+  addItemFont("EditBox Font",&mEditBoxFont,KGlobalSettings::generalFont());
+  addItemFont("JournalView Font",&mJornalViewFont,KGlobalSettings::generalFont());
+  addItemFont("WhatsNextView Font",&mWhatsNextFont,KGlobalSettings::generalFont());
+  addItemFont("EventView Font",&mEventViewFont,KGlobalSettings::generalFont());
 
diff --git a/korganizer/ktimeedit.cpp b/korganizer/ktimeedit.cpp
index 5222ac9..61a0931 100644
--- a/korganizer/ktimeedit.cpp
+++ b/korganizer/ktimeedit.cpp
@@ -51,6 +51,8 @@ KOTimeEdit::KOTimeEdit(QWidget *parent, QTime qt, const char *name)
     mFlagKeyPressed = false;
-
-    if ( QApplication::desktop()->width() < 650 )
+    if ( QApplication::desktop()->height() <= 480 ) {
         setSizeLimit ( 6 ); 
-  mTime = qt;
+    } else {
+        setSizeLimit ( 12 ); 
+    }
+    mTime = qt;
 
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 7810bf9..61c39f5 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -2032,6 +2032,3 @@ void MainWindow::weekAction()
     KPopupFrame* popup = new KPopupFrame(this);
-    int size = 12;
-    if ( QApplication::desktop()->width() >= 480 ) 
-        size = 18;
-    KDateInternalWeekPicker* picker = new KDateInternalWeekPicker(size, popup);
+    KDateInternalWeekPicker* picker = new KDateInternalWeekPicker(10, popup);
     // -----
@@ -2041,3 +2038,23 @@ void MainWindow::weekAction()
     connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int)));
-    if(popup->exec(iconToolBar->mapToGlobal(QPoint(0, iconToolBar->height()))))
+    int x = 0;
+    int y = iconToolBar->height();
+    int dX = 0;
+    int dY = 0;
+    if ( iconToolBar->orientation () == Qt:: Horizontal ) {
+        if ( iconToolBar->y() > height()/2 ) {
+            dY = iconToolBar->height()+picker->sizeHint().height();
+            y = 0;
+        }
+    } else {
+        if ( iconToolBar->x() > width()/2 ) { // right side
+            x=0;
+            dX= iconToolBar->width()+picker->sizeHint().width();
+            y = 0;
+        } else {
+            x= iconToolBar->width();
+            y = 0;
+        }
+    }
+    qDebug("dax %d  dy %d         %d %d ", dX, dY, iconToolBar->x(), iconToolBar->y() );
+    if(popup->exec(iconToolBar->mapToGlobal(QPoint(x,y)-QPoint( dX,dY))))
         {
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index f05e6f6..4a31c77 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -42,2 +42,3 @@
 #include "koglobals.h"
+#include <kglobalsettings.h>
 #include "koprefs.h"
@@ -63,3 +64,3 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam
 
-  QFont tfont = font();
+  QFont tfont = KGlobalSettings::generalFont();//font();
   if ( QApplication::desktop()->width() >= 480 ) 
diff --git a/libkdepim/kdatepicker.cpp b/libkdepim/kdatepicker.cpp
index d8bc9f5..2be9c9e 100644
--- a/libkdepim/kdatepicker.cpp
+++ b/libkdepim/kdatepicker.cpp
@@ -35,2 +35,3 @@
 #include <knotifyclient.h>
+#include <kglobalsettings.h>
 #include "kdatetbl.h"
@@ -53,10 +54,5 @@ KDatePicker::KDatePicker(QWidget *parent, QDate dt, const char *name)
 {
-  // -----
-    int size = 12;
-  if (  QApplication::desktop()->width() >= 480 )
-      size = 18;
-  fontsize = size;
-  setFont ( QFont("helvetica",size) );
+  setFont ( KGlobalSettings::generalFont() );
   table = new KDateTable(this);
-  setFontSize(size);
+  setFontSize(font().pointSize()+2);
   //line->setValidator(val);
diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp
index fce0e5a..e827412 100644
--- a/microkde/kdatetbl.cpp
+++ b/microkde/kdatetbl.cpp
@@ -200,4 +200,8 @@ KDateTable::paintCell(QPainter *painter, int row, int col)
     }
-    if(rect.width()>maxCell.width()) maxCell.setWidth(rect.width());
-    if(rect.height()>maxCell.height()) maxCell.setHeight(rect.height());
+    /*
+    if(rect.width()>maxCell.width()) maxCell.setWidth(rect.width()); 
+    if(rect.height()>maxCell.height()) {
+        maxCell.setHeight(rect.height());
+    }
+    */
 }
@@ -315,5 +319,11 @@ KDateTable::setFontSize(int size)
     maxCell.setWidth(QMAX(maxCell.width()+2, rect.width()));
+#ifdef DESKTOP_VERSION
+    maxCell.setHeight(QMAX(maxCell.height()+8, rect.height()));
+#else
     maxCell.setHeight(QMAX(maxCell.height()+4, rect.height()));
-    if ( maxCell.width() * 1000 / maxCell.height()  > 1900 )
+#endif
+    if ( maxCell.width() * 1000 / maxCell.height()  > 1900 ) {
         maxCell.setHeight(maxCell.width() * 1000 / 1900 );
+        qDebug("setmax ");
+    }
 }
@@ -445,3 +455,3 @@ KDateInternalMonthPicker::KDateInternalMonthPicker
     font=KGlobalSettings::generalFont();
-    font.setPointSize(fontsize);
+    //font.setPointSize(fontsize);
     setFont(font);
@@ -763,3 +773,3 @@ KDateInternalWeekPicker::KDateInternalWeekPicker
     font=KGlobalSettings::generalFont();
-    font.setPointSize(fontsize);
+    //font.setPointSize(fontsize);
     setFont(font);
@@ -784,3 +794,7 @@ KDateInternalWeekPicker::KDateInternalWeekPicker
         }
-
+    if ( QApplication::desktop()->width() > 640 ) {
+      
+        max.setWidth(max.width()+6);
+        max.setHeight(max.height()+8);
+    }
 }
diff --git a/microkde/kglobalsettings.cpp b/microkde/kglobalsettings.cpp
index 2fff8fc..30e793f 100644
--- a/microkde/kglobalsettings.cpp
+++ b/microkde/kglobalsettings.cpp
@@ -12,3 +12,5 @@ QFont KGlobalSettings::generalFont()
         size = 10;   
-    return QFont("helvetica",size);
+    QFont f = QApplication::font();
+    f.setPointSize( size );
+    return f;
 }
@@ -16,3 +18,3 @@ QFont KGlobalSettings::toolBarFont()
 {
-  return QFont("helevetica",12);
+    return  QApplication::font();
 }
@@ -21,3 +23,3 @@ QColor KGlobalSettings::toolBarHighlightColor()
 {
-  return QColor("black");
+    return QColor( "black" );
 }
@@ -36,3 +38,3 @@ QRect KGlobalSettings::desktopGeometry( QWidget * )
 bool KGlobalSettings::singleClick()
-{
+{   
     KConfig *c = KGlobal::config();