nf

3 files changed, 27 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
@@ -133,6 +133,10 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
         QFont nFont = p->font();
    
-        if (!KGlobal::locale()->use12Clock())
+        if (!KGlobal::locale()->use12Clock()) {
+            if ( QApplication::desktop()->width() <= 320 )
+                suffix = "";
+            else
             suffix = "00";
+        }
        
         if ( timeHeight >  mCellHeight ) {
@@ -160,5 +164,4 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
             p->drawLine(cx,y,cw,y);
             hour.setNum(cell);
-
             // handle 24h and am/pm time formats
             if (KGlobal::locale()->use12Clock()) {
@@ -214,6 +217,10 @@ void TimeLabels::updateConfig()
     if (KGlobal::locale()->use12Clock())
         test = "pm";
+    else {
+        if ( QApplication::desktop()->width() <= 320 )
+            test = "";
     else
         test = "00";
+    }
     QFont sFont = font();
     sFont.setPointSize( sFont.pointSize()/2 );
@@ -726,4 +733,7 @@ void KOAgendaView::createDayLabels()
     dayLabel->setNum( -1 );
     //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 ) );
     dayLabel->show();
@@ -833,5 +843,4 @@ void KOAgendaView::createDayLabels()
     }
     //dayLabel->hide();//test only
-    qDebug("fremwidd %d ", mAgenda->frameWidth());
     int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()- (mAgenda->frameWidth()*2) ) % mSelectedDates.count() ;
     if ( offset < 0 ) offset = 0;
@@ -843,4 +852,5 @@ void KOAgendaView::createDayLabels()
     dayLabel->setNum( -2 );
     dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ offset );
+
     //qDebug("setToFixed %d ", mAgenda->verticalScrollBar()->width()+ offset+2);
     //mLayoutDayLabels->addSpacing(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
@@ -794,6 +794,10 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
                             addRow = mSelEndT/7 - 5 + rowModulo;
                     }  
+                    //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);
                     }
                     // draw last block from left to mSelEndT
diff --git a/microkde/KDGanttMinimizeSplitter.cpp b/microkde/KDGanttMinimizeSplitter.cpp
index 6cb1f31..253175e 100644
--- a/microkde/KDGanttMinimizeSplitter.cpp
+++ b/microkde/KDGanttMinimizeSplitter.cpp
@@ -272,4 +272,9 @@ void KDGanttSplitterHandle::paintEvent( QPaintEvent * )
     p.setPen( colorGroup().foreground() );
     //p.drawRect( rect() );
+#ifndef DESKTOP_VERSION
+    if (  mMouseDown )
+        buffer.fill( QColor( 242,27,255  ) );
+    else    
+#endif
     buffer.fill( colorGroup().background() );
     //buffer.fill( backgroundColor() );
@@ -284,5 +289,9 @@ void KDGanttSplitterHandle::paintEvent( QPaintEvent * )
     else {
         if ( mMouseDown )
+#ifndef DESKTOP_VERSION
+            col =  QColor( 178,18,188);//QColor( 242,27,255  );//Qt::white; 
+#else
             col = Qt::white;
+#endif
         else
             col = colorGroup().background().dark( 150 );