author | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
commit | a08aff328d4393031d5ba7d622c2b05705a89d73 (patch) (unidiff) | |
tree | 8ee90d686081c52e7c69b5ce946e9b1a7d690001 /korganizer/koagendaview.cpp | |
parent | 11edc920afe4f274c0964436633aa632c8288a40 (diff) | |
download | kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.zip kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.gz kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.bz2 |
initial public commit of qt4 portp1
-rw-r--r-- | korganizer/koagendaview.cpp | 78 |
1 files changed, 45 insertions, 33 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 6e65a03..87993ae 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -22,8 +22,8 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <qhbox.h> | 24 | #include <q3hbox.h> |
25 | #include <qvbox.h> | 25 | #include <q3vbox.h> |
26 | #include <qlabel.h> | 26 | #include <qlabel.h> |
27 | #include <qframe.h> | 27 | #include <q3frame.h> |
28 | #include <qlayout.h> | 28 | #include <qlayout.h> |
29 | #ifndef KORG_NOSPLITTER | 29 | #ifndef KORG_NOSPLITTER |
@@ -32,9 +32,21 @@ | |||
32 | #include <qfont.h> | 32 | #include <qfont.h> |
33 | #include <qfontmetrics.h> | 33 | #include <qfontmetrics.h> |
34 | #include <qpopupmenu.h> | 34 | #include <q3popupmenu.h> |
35 | #include <qtooltip.h> | 35 | #include <qtooltip.h> |
36 | #include <qpainter.h> | 36 | #include <qpainter.h> |
37 | #include <qpushbutton.h> | 37 | #include <qpushbutton.h> |
38 | #include <qapplication.h> | 38 | #include <qapplication.h> |
39 | #include <QDesktopWidget> | ||
40 | //Added by qt3to4: | ||
41 | #include <QResizeEvent> | ||
42 | #include <QPixmap> | ||
43 | #include <QMouseEvent> | ||
44 | #include <Q3GridLayout> | ||
45 | #include <Q3ValueList> | ||
46 | #include <QKeyEvent> | ||
47 | #include <Q3HBoxLayout> | ||
48 | #include <Q3VBoxLayout> | ||
49 | #include <QPaintEvent> | ||
50 | #include <Q3PtrList> | ||
39 | 51 | ||
40 | #include <kapplication.h> | 52 | #include <kapplication.h> |
@@ -79,6 +91,6 @@ using namespace KOrg; | |||
79 | #define IDLETIMEOUT 45 | 91 | #define IDLETIMEOUT 45 |
80 | 92 | ||
81 | TimeLabels::TimeLabels(int rows,QWidget *parent,const char *name,WFlags f) : | 93 | TimeLabels::TimeLabels(int rows,QWidget *parent,const char *name,Qt::WFlags f) : |
82 | QScrollView(parent,name,f) | 94 | Q3ScrollView(parent,name,f) |
83 | { | 95 | { |
84 | myPix.resize( 1, 1 ); | 96 | myPix.resize( 1, 1 ); |
@@ -96,5 +108,5 @@ TimeLabels::TimeLabels(int rows,QWidget *parent,const char *name,WFlags f) : | |||
96 | resizeContents(50,mRows * mCellHeight); | 108 | resizeContents(50,mRows * mCellHeight); |
97 | 109 | ||
98 | viewport()->setBackgroundMode( PaletteBackground ); | 110 | viewport()->setBackgroundMode( Qt::PaletteBackground ); |
99 | } | 111 | } |
100 | 112 | ||
@@ -284,5 +296,5 @@ void TimeLabels::paintEvent(QPaintEvent*) | |||
284 | 296 | ||
285 | EventIndicator::EventIndicator(Location loc,QWidget *parent,const char *name) | 297 | EventIndicator::EventIndicator(Location loc,QWidget *parent,const char *name) |
286 | : QFrame(parent,name) | 298 | : Q3Frame(parent,name) |
287 | { | 299 | { |
288 | mColumns = 1; | 300 | mColumns = 1; |
@@ -394,5 +406,5 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) : | |||
394 | } | 406 | } |
395 | 407 | ||
396 | QBoxLayout *topLayout = new QVBoxLayout(this); | 408 | Q3BoxLayout *topLayout = new Q3VBoxLayout(this); |
397 | 409 | ||
398 | // Create day name labels for agenda columns | 410 | // Create day name labels for agenda columns |
@@ -402,11 +414,11 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) : | |||
402 | mSplitterAgenda->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); | 414 | mSplitterAgenda->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); |
403 | topLayout->addWidget( mSplitterAgenda ); | 415 | topLayout->addWidget( mSplitterAgenda ); |
404 | mAllDayFrame = new QHBox(mSplitterAgenda); | 416 | mAllDayFrame = new Q3HBox(mSplitterAgenda); |
405 | mAllDayFrame->setFocusPolicy(NoFocus); | 417 | mAllDayFrame->setFocusPolicy(Qt::NoFocus); |
406 | QWidget *agendaFrame = new QWidget(mSplitterAgenda); | 418 | QWidget *agendaFrame = new QWidget(mSplitterAgenda); |
407 | agendaFrame->setFocusPolicy(NoFocus); | 419 | agendaFrame->setFocusPolicy(Qt::NoFocus); |
408 | 420 | ||
409 | // Create all-day agenda widget | 421 | // Create all-day agenda widget |
410 | mDummyAllDayLeft = new QVBox( mAllDayFrame ); | 422 | mDummyAllDayLeft = new Q3VBox( mAllDayFrame ); |
411 | 423 | ||
412 | mExpandButton = new QPushButton(mDummyAllDayLeft); | 424 | mExpandButton = new QPushButton(mDummyAllDayLeft); |
@@ -421,7 +433,7 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) : | |||
421 | mExpandButton->setFixedSize( widebut, widebut); | 433 | mExpandButton->setFixedSize( widebut, widebut); |
422 | connect( mExpandButton, SIGNAL( clicked() ), SIGNAL( toggleExpand() ) ); | 434 | connect( mExpandButton, SIGNAL( clicked() ), SIGNAL( toggleExpand() ) ); |
423 | mExpandButton->setFocusPolicy(NoFocus); | 435 | mExpandButton->setFocusPolicy(Qt::NoFocus); |
424 | mAllDayAgenda = new KOAgenda(1,mAllDayFrame); | 436 | mAllDayAgenda = new KOAgenda(1,mAllDayFrame); |
425 | mAllDayAgenda->setFocusPolicy(NoFocus); | 437 | mAllDayAgenda->setFocusPolicy(Qt::NoFocus); |
426 | QLabel *dummyAllDayRight = new QLabel (mAllDayFrame); | 438 | QLabel *dummyAllDayRight = new QLabel (mAllDayFrame); |
427 | 439 | ||
@@ -430,5 +442,5 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) : | |||
430 | 442 | ||
431 | // Create agenda frame | 443 | // Create agenda frame |
432 | QGridLayout *agendaLayout = new QGridLayout(agendaFrame,4,3); | 444 | Q3GridLayout *agendaLayout = new Q3GridLayout(agendaFrame,4,3); |
433 | // QHBox *agendaFrame = new QHBox(splitterAgenda); | 445 | // QHBox *agendaFrame = new QHBox(splitterAgenda); |
434 | 446 | ||
@@ -438,8 +450,8 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) : | |||
438 | mEventIndicatorTop->setPaintWidget( mSplitterAgenda ); | 450 | mEventIndicatorTop->setPaintWidget( mSplitterAgenda ); |
439 | #endif | 451 | #endif |
440 | mDayLabelsFrame = new QHBox(agendaFrame); | 452 | mDayLabelsFrame = new Q3HBox(agendaFrame); |
441 | //topLayout->addWidget(mDayLabelsFrame); | 453 | //topLayout->addWidget(mDayLabelsFrame); |
442 | mDayLabels = new QFrame (mDayLabelsFrame); | 454 | mDayLabels = new Q3Frame (mDayLabelsFrame); |
443 | mLayoutDayLabels = new QHBoxLayout(mDayLabels); | 455 | mLayoutDayLabels = new Q3HBoxLayout(mDayLabels); |
444 | agendaLayout->addMultiCellWidget(mDayLabelsFrame ,0,0,0,2); | 456 | agendaLayout->addMultiCellWidget(mDayLabelsFrame ,0,0,0,2); |
445 | agendaLayout->addWidget(mEventIndicatorTop,1,1); | 457 | agendaLayout->addWidget(mEventIndicatorTop,1,1); |
@@ -461,10 +473,10 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) : | |||
461 | agendaLayout->addMultiCellWidget(mAgenda,2,2,1,2); | 473 | agendaLayout->addMultiCellWidget(mAgenda,2,2,1,2); |
462 | agendaLayout->setColStretch(1,1); | 474 | agendaLayout->setColStretch(1,1); |
463 | mAgenda->setFocusPolicy(NoFocus); | 475 | mAgenda->setFocusPolicy(Qt::NoFocus); |
464 | // Create event context menu for agenda | 476 | // Create event context menu for agenda |
465 | mAllAgendaPopup = eventPopup(); | 477 | mAllAgendaPopup = eventPopup(); |
466 | 478 | ||
467 | #if 0 | 479 | #if 0 |
468 | mAllAgendaPopup->addAdditionalItem(QIconSet(SmallIcon("bell")), | 480 | mAllAgendaPopup->addAdditionalItem(QIcon(SmallIcon("bell")), |
469 | i18n("Toggle Alarm"),mAgenda, | 481 | i18n("Toggle Alarm"),mAgenda, |
470 | SLOT(popupAlarm()),true); | 482 | SLOT(popupAlarm()),true); |
@@ -919,7 +931,7 @@ int KOAgendaView::currentDateCount() | |||
919 | } | 931 | } |
920 | 932 | ||
921 | QPtrList<Incidence> KOAgendaView::selectedIncidences() | 933 | Q3PtrList<Incidence> KOAgendaView::selectedIncidences() |
922 | { | 934 | { |
923 | QPtrList<Incidence> selected; | 935 | Q3PtrList<Incidence> selected; |
924 | Incidence *incidence; | 936 | Incidence *incidence; |
925 | 937 | ||
@@ -988,6 +1000,6 @@ void KOAgendaView::updateConfig() | |||
988 | 1000 | ||
989 | // ToolTips displaying summary of events | 1001 | // ToolTips displaying summary of events |
990 | KOAgendaItem::toolTipGroup()->setEnabled(KOPrefs::instance() | 1002 | /* TODO:hacker: KOAgendaItem::toolTipGroup()->setEnabled(KOPrefs::instance() |
991 | ->mEnableToolTips); | 1003 | ->mEnableToolTips); */ |
992 | 1004 | ||
993 | //setHolidayMasks(); | 1005 | //setHolidayMasks(); |
@@ -1118,5 +1130,5 @@ void KOAgendaView::showDates( const QDate &start, const QDate &end ) | |||
1118 | 1130 | ||
1119 | 1131 | ||
1120 | void KOAgendaView::showEvents(QPtrList<Event>) | 1132 | void KOAgendaView::showEvents(Q3PtrList<Event>) |
1121 | { | 1133 | { |
1122 | kdDebug() << "KOAgendaView::showEvents() is not yet implemented" << endl; | 1134 | kdDebug() << "KOAgendaView::showEvents() is not yet implemented" << endl; |
@@ -1166,9 +1178,9 @@ void KOAgendaView::fillAgenda() | |||
1166 | mMaxY.resize(mSelectedDates.count()); | 1178 | mMaxY.resize(mSelectedDates.count()); |
1167 | 1179 | ||
1168 | QPtrList<Event> dayEvents; | 1180 | Q3PtrList<Event> dayEvents; |
1169 | 1181 | ||
1170 | // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue. | 1182 | // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue. |
1171 | // Therefore, gtodoset all of them. | 1183 | // Therefore, gtodoset all of them. |
1172 | QPtrList<Todo> todos = calendar()->todos(); | 1184 | Q3PtrList<Todo> todos = calendar()->todos(); |
1173 | 1185 | ||
1174 | mAgenda->setDateList(mSelectedDates); | 1186 | mAgenda->setDateList(mSelectedDates); |
@@ -1301,5 +1313,5 @@ void KOAgendaView::fillAgenda() | |||
1301 | // Already completed items can be displayed on their original due date | 1313 | // Already completed items can be displayed on their original due date |
1302 | //if not KOPrefs::instance()->mShowTodoInAgenda, show overdue in agenda | 1314 | //if not KOPrefs::instance()->mShowTodoInAgenda, show overdue in agenda |
1303 | bool overdue = (!todo->isCompleted()) && (todo->dtDue() < today) && KOPrefs::instance()->mShowTodoInAgenda; | 1315 | bool overdue = (!todo->isCompleted()) && (todo->dtDue() < (QDateTime)today) && KOPrefs::instance()->mShowTodoInAgenda; |
1304 | bool fillIn = false; | 1316 | bool fillIn = false; |
1305 | if ( todo->hasCompletedDate() && todo->completed().date() == currentDate ) | 1317 | if ( todo->hasCompletedDate() && todo->completed().date() == currentDate ) |
@@ -1504,5 +1516,5 @@ void KOAgendaView::readSettings(KConfig *config) | |||
1504 | 1516 | ||
1505 | //#ifndef KORG_NOSPLITTER | 1517 | //#ifndef KORG_NOSPLITTER |
1506 | QValueList<int> sizes = config->readIntListEntry("Separator AgendaView"); | 1518 | Q3ValueList<int> sizes = config->readIntListEntry("Separator AgendaView"); |
1507 | if (sizes.count() == 2) { | 1519 | if (sizes.count() == 2) { |
1508 | if ( sizes[0] < 20 ) { | 1520 | if ( sizes[0] < 20 ) { |
@@ -1525,5 +1537,5 @@ void KOAgendaView::writeSettings(KConfig *config) | |||
1525 | 1537 | ||
1526 | //#ifndef KORG_NOSPLITTER | 1538 | //#ifndef KORG_NOSPLITTER |
1527 | QValueList<int> list = mSplitterAgenda->sizes(); | 1539 | Q3ValueList<int> list = mSplitterAgenda->sizes(); |
1528 | config->writeEntry("Separator AgendaView",list); | 1540 | config->writeEntry("Separator AgendaView",list); |
1529 | //qDebug("write %d %d ", list[0],list[1] ); | 1541 | //qDebug("write %d %d ", list[0],list[1] ); |
@@ -1542,5 +1554,5 @@ void KOAgendaView::setHolidayMasks() | |||
1542 | bool showHoliday = false; | 1554 | bool showHoliday = false; |
1543 | if ( KOPrefs::instance()->mExcludeHolidays ) { | 1555 | if ( KOPrefs::instance()->mExcludeHolidays ) { |
1544 | QPtrList<Event> events = calendar()->events( date, true ); | 1556 | Q3PtrList<Event> events = calendar()->events( date, true ); |
1545 | Event *event; | 1557 | Event *event; |
1546 | for( event = events.first(); event; event = events.next() ) { | 1558 | for( event = events.first(); event; event = events.next() ) { |
@@ -1664,5 +1676,5 @@ void KOAgendaView::updateTodo( Todo * t, int ) | |||
1664 | } | 1676 | } |
1665 | else { | 1677 | else { |
1666 | bool overdue = (!t->isCompleted()) && (t->dtDue() < QDate::currentDate()) && KOPrefs::instance()->mShowTodoInAgenda ; | 1678 | bool overdue = (!t->isCompleted()) && (t->dtDue() < (QDateTime)QDate::currentDate()) && KOPrefs::instance()->mShowTodoInAgenda ; |
1667 | if ( overdue && | 1679 | if ( overdue && |
1668 | QDate::currentDate() >= mSelectedDates.first() && | 1680 | QDate::currentDate() >= mSelectedDates.first() && |