nf

2 files changed, 18 insertions, 4 deletions

diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 1627dba..2b05d37 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -134,4 +134,8 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
    
-        if (!KGlobal::locale()->use12Clock())
+        if (!KGlobal::locale()->use12Clock()) {
+            if ( QApplication::desktop()->width() <= 320 )
+                suffix = "";
+            else
             suffix = "00";
+        }
        
@@ -161,3 +165,2 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
             hour.setNum(cell);
-
             // handle 24h and am/pm time formats
@@ -215,4 +218,8 @@ void TimeLabels::updateConfig()
         test = "pm";
+    else {
+        if ( QApplication::desktop()->width() <= 320 )
+            test = "";
     else
         test = "00";
+    }
     QFont sFont = font();
@@ -727,2 +734,5 @@ void KOAgendaView::createDayLabels()
     //dayLabel->setAlignment(QLabel::AlignHCenter);
+    if ( QApplication::desktop()->width() <= 320 )
+        dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ).left(2) );
+    else
     dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) );
@@ -834,3 +844,2 @@ void KOAgendaView::createDayLabels()
     //dayLabel->hide();//test only
-    qDebug("fremwidd %d ", mAgenda->frameWidth());
     int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()- (mAgenda->frameWidth()*2) ) % mSelectedDates.count() ;
@@ -844,2 +853,3 @@ void KOAgendaView::createDayLabels()
     dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ offset );
+
     //qDebug("setToFixed %d ", mAgenda->verticalScrollBar()->width()+ offset+2);
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 5b5703f..b8a0f09 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -795,4 +795,8 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
                     }  
+                    //qDebug("%d %d %d ",selh, row, addRow );
+                    int addrow2 = addRow-selh+1;
+                    if ( addrow2 < 0 )
+                         addrow2 = 0;
                     if (selh > 1) {
-                        p.fillRect(1, (row+1)*dheight, 7*dwidth+colModulo, (selh-1)*dheight+addRow,selcol);
+                        p.fillRect(1, (row+1)*dheight+addrow2, 7*dwidth+colModulo, (selh-1)*dheight+addRow,selcol);
                     }