| -rw-r--r-- | kmicromail/opiemail.cpp | 1 | ||||
| -rw-r--r-- | kmicromail/viewmailbase.cpp | 9 | ||||
| -rw-r--r-- | kmicromail/viewmailbase.h | 5 | ||||
| -rw-r--r-- | korganizer/kodaymatrix.cpp | 34 | ||||
| -rw-r--r-- | korganizer/kodaymatrix.h | 4 |
5 files changed, 38 insertions, 15 deletions
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index b701446..4436ad6 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp @@ -55,2 +55,3 @@ OpieMail::OpieMail( QWidget *parent, const char *name ) this, SLOT(insertAttendees(const QString&, const QStringList&, const QStringList&, const QStringList&))); + folderView->setFocus(); } diff --git a/kmicromail/viewmailbase.cpp b/kmicromail/viewmailbase.cpp index 3a41ba0..3bb964e 100644 --- a/kmicromail/viewmailbase.cpp +++ b/kmicromail/viewmailbase.cpp @@ -6,2 +6,3 @@ #include <qvbox.h> +#include <qapplication.h> @@ -74,6 +75,8 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) attachments = new QListView(view); - attachments->setMinimumHeight(90); - attachments->setMaximumHeight(90); + int fixh = 100; + if ( QApplication::desktop()->width() > 320 ) + fixh = 200; + attachments->setFixedHeight(fixh); attachments->setAllColumnsShowFocus(true); - attachments->addColumn("Mime Type", 60); + attachments->addColumn("Mime Type", fixh-30); attachments->addColumn(i18n("Description"), 100); diff --git a/kmicromail/viewmailbase.h b/kmicromail/viewmailbase.h index 7ad1eec..7c075eb 100644 --- a/kmicromail/viewmailbase.h +++ b/kmicromail/viewmailbase.h @@ -6,2 +6,7 @@ +#ifndef DESKTOP_VERSION +#include <qpe/qpemenubar.h> +#define QMenuBar QPEMenuBar +#endif + class QAction; diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 59618bf..d543aaf 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -117,5 +117,7 @@ KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const bDays.resize ( NUMDAYS ); + hDays.resize ( NUMDAYS );; + eDays.resize ( NUMDAYS );; days = new QDate[NUMDAYS]; daylbls = new QString[NUMDAYS]; - events = new int[NUMDAYS]; + //events = new int[NUMDAYS]; mToolTip = new DynamicTip(this); @@ -242,3 +244,3 @@ KODayMatrix::~KODayMatrix() delete [] daylbls; - delete [] events; + //delete [] events; delete mToolTip; @@ -313,3 +315,3 @@ void KODayMatrix::recalculateToday() for (int i=0; i<NUMDAYS; i++) { - events[i] = 0; + //events[i] = 0; days[i] = startdate.addDays(i); @@ -351,2 +353,4 @@ void KODayMatrix::updateViewTimed() bDays.clearBit(i); + hDays.clearBit(i); + eDays.clearBit(i); for(event=eventlist.first();event != 0;event=eventlist.next()) { @@ -358,2 +362,3 @@ void KODayMatrix::updateViewTimed() if ( event->isHoliday()) { + hDays.setBit(i); if ( !holiStr.isEmpty() ) @@ -373,3 +378,4 @@ void KODayMatrix::updateViewTimed() } - events[i] = numEvents; + if ( numEvents ) + eDays.setBit(i); //if it is a holy day then draw it red. Sundays are consider holidays, too @@ -449,4 +455,7 @@ void KODayMatrix::updateEvents() } - } - events[ i ] = numEvents; + } + if ( numEvents ) + eDays.setBit(i); + else + eDays.clearBit(i); } @@ -864,3 +873,3 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) // if any events are on that day then draw it using a bold font - if (events[i] > 0) { + if ( eDays.testBit(i) ) { QFont myFont = font(); @@ -871,7 +880,10 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) // if it is a holiday then use the default holiday color - if (!mHolidays[i].isNull()) { + if ( !mHolidays[i].isNull()) { if ( bDays.testBit(i) ) { - p.setPen(Qt::green); + if ( hDays.testBit(i) ) + p.setPen(QColor(Qt::green)); + else + p.setPen(QColor(Qt::green).dark()); } else { - if (actcol == mDefaultTextColor) { + if (actcol == mDefaultTextColor ) { p.setPen(KOPrefs::instance()->mHolidayColor); @@ -911,3 +923,3 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) // reset bold font to plain font - if (events[i] > 0) { + if ( eDays.testBit(i)) { QFont myFont = font(); diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h index 2a1959c..38a7f92 100644 --- a/korganizer/kodaymatrix.h +++ b/korganizer/kodaymatrix.h @@ -232,2 +232,4 @@ private: QBitArray bDays; + QBitArray hDays; + QBitArray eDays; QPixmap myPix; @@ -272,3 +274,3 @@ private: */ - int *events; + //int *events; |