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
@@ -2457,23 +2457,13 @@ void  CalendarView::beamDone( Ir *ir )
     topLevelWidget()->raise();
 }
 
 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;
     mMoveIncidence = inc ;
     QDate da;
     if ( mMoveIncidence->type() == "Todo" ) {
         Todo * to = (Todo *) mMoveIncidence;
             if ( to->hasDueDate() ) 
@@ -2484,25 +2474,38 @@ void CalendarView::moveIncidence(Incidence * inc )
         da = mMoveIncidence->dtStart().date();
     }
     //PENDING set date for recurring incidence to date of recurrence
     //mMoveIncidenceOldDate;
     mDatePicker->setDate( da );
 }
-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() ;
         int h = mDatePicker->sizeHint().height() ;
         int dw = QApplication::desktop()->width();
         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;
     mDatePicker->setDate( mNavigator->selectedDates().first() );
 }
 
 void CalendarView::showEventEditor()
 {
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 731298d..e626ea3 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -438,13 +438,14 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     bool addAnniversary( QDate data, QString name, KCal::Attendee* a , bool birthday  );
     bool importQtopia( const QString &categoriesFile,
                        const QString &datebookFile,
                        const QString &tasklistFile );
     void syncExternal( int mode );
     void slotSelectPickerDate( QDate ) ;
-    void showDatePicker( ) ;
+    void showDatePicker() ;
+    void showDatePickerPopup() ;
     void moveIncidence(Incidence *) ;
     void beamIncidence(Incidence *) ;
     void beamCalendar() ;
     void beamFilteredCalendar() ;
     void beamIncidenceList(QPtrList<Incidence>) ;
     void manageCategories();
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 6ae4c6f..02d2585 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -922,14 +922,17 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
     else
         mWidStack->raiseWidget( mMonthView );
 
     emit incidenceSelected( 0 );
 #ifndef DESKTOP_VERSION
     resize( QApplication::desktop()->size() );
-    computeLayout();
+#else
+    resize(640, 480 );
 #endif
+    computeLayout();
+
 }
 
 KOMonthView::~KOMonthView()
 {
     delete mContextMenu;
 }
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 576c265..5bfe2a1 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -33,12 +33,13 @@
 #include <qfont.h>
 #include <qcolor.h>
 #include <qstringlist.h>
 #include <stdlib.h>
 
 #include <kglobal.h>
+#include <kglobalsettings.h>
 #include <kconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kemailsettings.h>
 #include <kstaticdeleter.h>
 #include <libkdepim/kpimglobalprefs.h>
@@ -59,19 +60,22 @@ KOPrefs::KOPrefs() :
   QColor defaultHighlightColor    = QColor(129,112,255);//64,64,255);
   QColor defaultAgendaBgColor     = QColor(239,241,169);//128,128,128);
   QColor defaultWorkingHoursColor = QColor(170,223,150);//160,160,160);
   QColor defaultTodoDueTodayColor = QColor(255,220,100);
   QColor defaultTodoOverdueColor  = QColor(255,153,125);
 
+  /*
   mTimeBarFont = QFont("helvetica",10);//,QFont::Bold);
   mDefaultViewFont = QFont("helvetica",10);
   mDefaultMonthViewFont = QFont("helvetica",8);
   mMarcusBainsFont= QFont("helvetica",10);
   mDateNavigatorFont= QFont("helvetica",10, QFont::Bold);
   mEditBoxFont = QFont("helvetica",12);
   mJornalViewFont = QFont("helvetica",12);
+  */
+
 
   KPrefs::setCurrentGroup("General");
 
 
   addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
 
@@ -153,24 +157,24 @@ KOPrefs::KOPrefs() :
   KPrefs::setCurrentGroup("Calendar");
 
   addItemInt("Default Calendar Format",&mDefaultFormat,FormatICalendar);
 
   KPrefs::setCurrentGroup("Fonts");
   // 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());
 
   KPrefs::setCurrentGroup("RemoteSyncing");
   addItemString("ActiveSyncPort",&mActiveSyncPort,"9197" );  
   addItemString("ActiveSyncIP",&mActiveSyncIP,"192.168.0.40" ); 
   addItemBool("ShowSyncEvents",&mShowSyncEvents,false); 
   addItemInt("LastSyncTime",&mLastSyncTime,0); 
diff --git a/korganizer/ktimeedit.cpp b/korganizer/ktimeedit.cpp
index 5222ac9..61a0931 100644
--- a/korganizer/ktimeedit.cpp
+++ b/korganizer/ktimeedit.cpp
@@ -46,16 +46,18 @@
 // But Qt-3.2 will offer QLineEdit::setMask, so a "99:99" mask would help.
 KOTimeEdit::KOTimeEdit(QWidget *parent, QTime qt, const char *name)
   : QComboBox(TRUE, parent, name)
 {
   setInsertionPolicy(NoInsertion);
     mFlagKeyPressed = false;
-
-    if ( QApplication::desktop()->width() < 650 )
+    if ( QApplication::desktop()->height() <= 480 ) {
         setSizeLimit ( 6 ); 
-  mTime = qt;
+    } else {
+        setSizeLimit ( 12 ); 
+    }
+    mTime = qt;
 
 //  mNoTimeString = i18n("No Time");
 //  insertItem( mNoTimeString );
 
   // Fill combo box with selection of times in localized format.
   QTime timeEntry(0,0,0);
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 7810bf9..61c39f5 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -2027,22 +2027,39 @@ void MainWindow::printCal()
 #include "libkdepim/kdatepicker.h"
 #include <kdatetbl.h>
 void MainWindow::weekAction()
 {
     int month;
     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);
     // -----
     picker->resize(picker->sizeHint());
     popup->setMainWidget(picker);
     picker->setFocus();
     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))))
         {
             month = picker->getResult();
             emit selectWeek ( month );
             //qDebug("weekSelected %d ", month);
         }
     delete popup;
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index f05e6f6..4a31c77 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -37,12 +37,13 @@
 #include <kiconloader.h>
 #include "libkdepim/kdatepicker.h"
 #include <knotifyclient.h>
 #include "kdatetbl.h"
 
 #include "koglobals.h"
+#include <kglobalsettings.h>
 #include "koprefs.h"
 #ifndef KORG_NOPLUGINS
 #include "kocore.h"
 #endif
 
 #include <kcalendarsystem.h>
@@ -58,13 +59,13 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam
   mCtrlFrame = new QFrame( this );
   mCtrlFrame->setFrameStyle(QFrame::Panel|QFrame::Raised);
   mCtrlFrame->setLineWidth(1);
 
   topLayout->addWidget( mCtrlFrame );
 
-  QFont tfont = font();
+  QFont tfont = KGlobalSettings::generalFont();//font();
   if ( QApplication::desktop()->width() >= 480 ) 
       tfont.setPointSize(tfont.pointSize()+2);
   tfont.setBold(true);
 
   bool isRTL = KOGlobals::self()->reverseLayout();
 #ifndef DESKTOP_VERSION
diff --git a/libkdepim/kdatepicker.cpp b/libkdepim/kdatepicker.cpp
index d8bc9f5..2be9c9e 100644
--- a/libkdepim/kdatepicker.cpp
+++ b/libkdepim/kdatepicker.cpp
@@ -30,12 +30,13 @@
 #include <qfont.h>
 #include <qapplication.h>
 #include <qlineedit.h>
 #include <qvalidator.h>
 #include <kdebug.h>
 #include <knotifyclient.h>
+#include <kglobalsettings.h>
 #include "kdatetbl.h"
 #include "kdateedit.h"
 //#include "kdatepicker.moc"
 
 
 KDatePicker::KDatePicker(QWidget *parent, QDate dt, const char *name)
@@ -48,20 +49,15 @@ KDatePicker::KDatePicker(QWidget *parent, QDate dt, const char *name)
     selectYear(new QToolButton(this)),
     //line(new QLineEdit(this)),
     val(new KDateValidator(this))
     //table(new KDateTable(this)),
     //fontsize(1)
 {
-  // -----
-    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);
   lineDate = new KDateEdit( this, "dateediipicker", true );
   yearForward->setPixmap(SmallIcon("2rightarrowB"));
   yearBackward->setPixmap(SmallIcon("2leftarrowB"));
   monthForward->setPixmap(SmallIcon("1rightarrowB"));
   monthBackward->setPixmap(SmallIcon("1leftarrowB"));
diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp
index fce0e5a..e827412 100644
--- a/microkde/kdatetbl.cpp
+++ b/microkde/kdatetbl.cpp
@@ -195,14 +195,18 @@ KDateTable::paintCell(QPainter *painter, int row, int col)
             }
         }
         painter->drawRect(0, 0, w, h);
         painter->setPen(pen);
         painter->drawText(0, 0, w, h, AlignCenter, text, -1, &rect);
     }
-    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());
+    }
+    */
 }
 
 void
 KDateTable::keyPressEvent( QKeyEvent *e )
 {
     /*
@@ -310,15 +314,21 @@ KDateTable::setFontSize(int size)
             maxCell.setWidth(QMAX(maxCell.width(), rect.width()));
             maxCell.setHeight(QMAX(maxCell.height(), rect.height()));
         }
     // ----- compare with a real wide number and add some space:
     rect=metrics.boundingRect(QString::fromLatin1("88"));
     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 ");
+    }
 }
 
 void
 KDateTable::contentsMousePressEvent(QMouseEvent *e)
 {
     if(e->type()!=QEvent::MouseButtonPress)
@@ -440,13 +450,13 @@ KDateInternalMonthPicker::KDateInternalMonthPicker
     QRect rect;
     QFont font;
     // -----
     activeCol = -1;
     activeRow = -1;
     font=KGlobalSettings::generalFont();
-    font.setPointSize(fontsize);
+    //font.setPointSize(fontsize);
     setFont(font);
     setHScrollBarMode(AlwaysOff);
     setVScrollBarMode(AlwaysOff);
     setFrameStyle(QFrame::NoFrame);
     setNumRows(4);
     setNumCols(3);
@@ -758,13 +768,13 @@ KDateInternalWeekPicker::KDateInternalWeekPicker
     QRect rect;
     QFont font;
     // -----
     activeCol = -1;
     activeRow = -1;
     font=KGlobalSettings::generalFont();
-    font.setPointSize(fontsize);
+    //font.setPointSize(fontsize);
     setFont(font);
     setHScrollBarMode(AlwaysOff);
     setVScrollBarMode(AlwaysOff);
     setFrameStyle(QFrame::NoFrame);
     setNumRows(13);
     setNumCols(4);
@@ -779,13 +789,17 @@ KDateInternalWeekPicker::KDateInternalWeekPicker
     for(int i=1; i <= 52; ++i)
         {
             rect=metrics.boundingRect(QString::number( i ));
             if(max.width()<rect.width()) max.setWidth(rect.width());
             if(max.height()<rect.height()) max.setHeight(rect.height());
         }
-
+    if ( QApplication::desktop()->width() > 640 ) {
+      
+        max.setWidth(max.width()+6);
+        max.setHeight(max.height()+8);
+    }
 }
 
 QSize
 KDateInternalWeekPicker::sizeHint() const
 {
     return QSize((max.width()+6)*numCols()+2*frameWidth(),
diff --git a/microkde/kglobalsettings.cpp b/microkde/kglobalsettings.cpp
index 2fff8fc..30e793f 100644
--- a/microkde/kglobalsettings.cpp
+++ b/microkde/kglobalsettings.cpp
@@ -7,22 +7,24 @@
 
 QFont KGlobalSettings::generalFont()
 {
    int size = 12;
     if (QApplication::desktop()->width() < 480 )
         size = 10;   
-    return QFont("helvetica",size);
+    QFont f = QApplication::font();
+    f.setPointSize( size );
+    return f;
 }
 QFont KGlobalSettings::toolBarFont()
 {
-  return QFont("helevetica",12);
+    return  QApplication::font();
 }
 
 QColor KGlobalSettings::toolBarHighlightColor()
 {
-  return QColor("black");
+    return QColor( "black" );
 }
 
 QRect KGlobalSettings::desktopGeometry( QWidget * )
 {
   return QApplication::desktop()->rect();
 }
@@ -31,11 +33,11 @@ QRect KGlobalSettings::desktopGeometry( QWidget * )
      * Returns whether KDE runs in single (default) or double click
      * mode.
      * see http://developer.kde.org/documentation/standards/kde/style/mouse/index.html
      * @return true if single click mode, or false if double click mode.
      **/
 bool KGlobalSettings::singleClick()
-{
+{   
     KConfig *c = KGlobal::config();
     KConfigGroupSaver cgs( c, "KDE" );
     return c->readBoolEntry("SingleClick", KDE_DEFAULT_SINGLECLICK);
 }