-rw-r--r-- | korganizer/koagenda.cpp | 10 | ||||
-rw-r--r-- | korganizer/koagendaitem.cpp | 6 | ||||
-rw-r--r-- | korganizer/koagendaitem.h | 1 |
3 files changed, 8 insertions, 9 deletions
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 9b817bc..01cef35 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp | |||
@@ -1884,70 +1884,74 @@ void KOAgenda::computeSizes() | |||
1884 | item->resize(mGridSpacingX * item->cellWidth(),subCellWidth); | 1884 | item->resize(mGridSpacingX * item->cellWidth(),subCellWidth); |
1885 | moveChild(item,KOGlobals::self()->reverseLayout() ? | 1885 | moveChild(item,KOGlobals::self()->reverseLayout() ? |
1886 | (mColumns - 1 - item->cellX()) * mGridSpacingX : | 1886 | (mColumns - 1 - item->cellX()) * mGridSpacingX : |
1887 | item->cellX() * mGridSpacingX, | 1887 | item->cellX() * mGridSpacingX, |
1888 | item->subCell() * subCellWidth); | 1888 | item->subCell() * subCellWidth); |
1889 | } | 1889 | } |
1890 | KOPrefs::instance()->mAllDaySize = mGridSpacingY; | 1890 | KOPrefs::instance()->mAllDaySize = mGridSpacingY; |
1891 | } else { | 1891 | } else { |
1892 | mGridSpacingX = (width() - verticalScrollBar()->width()-frameOffset)/mColumns; | 1892 | mGridSpacingX = (width() - verticalScrollBar()->width()-frameOffset)/mColumns; |
1893 | if (height() > mGridSpacingY * mRows + 1 ) { | 1893 | if (height() > mGridSpacingY * mRows + 1 ) { |
1894 | KOPrefs::instance()->mHourSize = ((height())/mRows)+1; | 1894 | KOPrefs::instance()->mHourSize = ((height())/mRows)+1; |
1895 | mGridSpacingY = KOPrefs::instance()->mHourSize ; | 1895 | mGridSpacingY = KOPrefs::instance()->mHourSize ; |
1896 | resizeContents( mGridSpacingX * mColumns + 1 , mGridSpacingY * mRows + 1 ); | 1896 | resizeContents( mGridSpacingX * mColumns + 1 , mGridSpacingY * mRows + 1 ); |
1897 | emit resizedSignal(); | 1897 | emit resizedSignal(); |
1898 | } else | 1898 | } else |
1899 | resizeContents( mGridSpacingX * mColumns + 1 , mGridSpacingY * mRows + 1 ); | 1899 | resizeContents( mGridSpacingX * mColumns + 1 , mGridSpacingY * mRows + 1 ); |
1900 | KOAgendaItem *item; | 1900 | KOAgendaItem *item; |
1901 | int subCellWidth; | 1901 | int subCellWidth; |
1902 | 1902 | ||
1903 | for ( item=mItems.first(); item != 0; item=mItems.next() ) { | 1903 | for ( item=mItems.first(); item != 0; item=mItems.next() ) { |
1904 | subCellWidth = mGridSpacingX / item->subCells(); | 1904 | subCellWidth = mGridSpacingX / item->subCells(); |
1905 | item->resize(subCellWidth,item->height()); | 1905 | item->resize(subCellWidth,item->height()); |
1906 | moveChild(item,(KOGlobals::self()->reverseLayout() ? | 1906 | moveChild(item,(KOGlobals::self()->reverseLayout() ? |
1907 | (mColumns - 1 - item->cellX()) * mGridSpacingX : | 1907 | (mColumns - 1 - item->cellX()) * mGridSpacingX : |
1908 | item->cellX() * mGridSpacingX) + | 1908 | item->cellX() * mGridSpacingX) + |
1909 | item->subCell() * subCellWidth,childY(item)); | 1909 | item->subCell() * subCellWidth,childY(item)); |
1910 | } | 1910 | } |
1911 | } | 1911 | } |
1912 | int cw = contentsWidth(); | 1912 | int cw = contentsWidth(); |
1913 | int ch = contentsHeight(); | 1913 | int ch = contentsHeight(); |
1914 | if ( mAllDayMode ) { | 1914 | if ( mAllDayMode ) { |
1915 | QPixmap* paintPixAll = KOAgendaItem::paintPixAllday(); | 1915 | QPixmap* paintPixAll = KOAgendaItem::paintPixAllday(); |
1916 | if ( (paintPixAll->width() < cw || paintPixAll->height() < ch) && cw > 0 && ch > 0 ) | 1916 | if ( (paintPixAll->width() < cw || paintPixAll->height() < ch) && cw > 0 && ch > 0 ) { |
1917 | //qDebug("paintPixAll->resize "); | ||
1917 | paintPixAll->resize( cw, ch ); | 1918 | paintPixAll->resize( cw, ch ); |
1919 | } | ||
1918 | } else { | 1920 | } else { |
1919 | QPixmap* paintPix = KOAgendaItem::paintPix(); | 1921 | QPixmap* paintPix = KOAgendaItem::paintPix(); |
1920 | if ( paintPix->width() < cw || paintPix->height() < ch ) | 1922 | if ( paintPix->width() < cw || paintPix->height() < ch ) { |
1921 | KOAgendaItem::resizePixmap( cw , ch ); | 1923 | //qDebug("paintPix->resize "); |
1924 | paintPix->resize( cw , ch ); | ||
1925 | } | ||
1922 | } | 1926 | } |
1923 | 1927 | ||
1924 | checkScrollBoundaries(); | 1928 | checkScrollBoundaries(); |
1925 | marcus_bains(); | 1929 | marcus_bains(); |
1926 | drawContentsToPainter(); | 1930 | drawContentsToPainter(); |
1927 | viewport()->repaint(false); | 1931 | viewport()->repaint(false); |
1928 | } | 1932 | } |
1929 | 1933 | ||
1930 | void KOAgenda::scrollUp() | 1934 | void KOAgenda::scrollUp() |
1931 | { | 1935 | { |
1932 | scrollBy(0,-mScrollOffset); | 1936 | scrollBy(0,-mScrollOffset); |
1933 | } | 1937 | } |
1934 | 1938 | ||
1935 | 1939 | ||
1936 | void KOAgenda::scrollDown() | 1940 | void KOAgenda::scrollDown() |
1937 | { | 1941 | { |
1938 | scrollBy(0,mScrollOffset); | 1942 | scrollBy(0,mScrollOffset); |
1939 | } | 1943 | } |
1940 | 1944 | ||
1941 | void KOAgenda::popupAlarm() | 1945 | void KOAgenda::popupAlarm() |
1942 | { | 1946 | { |
1943 | if (!mClickedItem) { | 1947 | if (!mClickedItem) { |
1944 | qDebug("KOAgenda::popupAlarm() called without having a clicked item "); | 1948 | qDebug("KOAgenda::popupAlarm() called without having a clicked item "); |
1945 | return; | 1949 | return; |
1946 | } | 1950 | } |
1947 | // TODO: deal correctly with multiple alarms | 1951 | // TODO: deal correctly with multiple alarms |
1948 | Alarm* alarm; | 1952 | Alarm* alarm; |
1949 | QPtrList<Alarm> list(mClickedItem->incidence()->alarms()); | 1953 | QPtrList<Alarm> list(mClickedItem->incidence()->alarms()); |
1950 | for(alarm=list.first();alarm;alarm=list.next()) { | 1954 | for(alarm=list.first();alarm;alarm=list.next()) { |
1951 | alarm->toggleAlarm(); | 1955 | alarm->toggleAlarm(); |
1952 | } | 1956 | } |
1953 | emit itemModified( mClickedItem , KOGlobals::EVENTEDITED ); | 1957 | emit itemModified( mClickedItem , KOGlobals::EVENTEDITED ); |
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index abb29f7..f855b03 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp | |||
@@ -441,85 +441,81 @@ void KOAgendaItem::paintMe( bool selected, QPainter* paint ) | |||
441 | x = 3; | 441 | x = 3; |
442 | if ( !horLayout && addIcon ) | 442 | if ( !horLayout && addIcon ) |
443 | x += AGENDA_ICON_SIZE+3; | 443 | x += AGENDA_ICON_SIZE+3; |
444 | if ( w > parentWidget()->width() ){ | 444 | if ( w > parentWidget()->width() ){ |
445 | w = parentWidget()->width() - 6; | 445 | w = parentWidget()->width() - 6; |
446 | #ifndef DESKTOP_VERSION | 446 | #ifndef DESKTOP_VERSION |
447 | align = ( AlignHCenter|WordBreak|AlignTop); | 447 | align = ( AlignHCenter|WordBreak|AlignTop); |
448 | #else | 448 | #else |
449 | align = ( AlignHCenter|BreakAnywhere|WordBreak|AlignTop); | 449 | align = ( AlignHCenter|BreakAnywhere|WordBreak|AlignTop); |
450 | #endif | 450 | #endif |
451 | 451 | ||
452 | } | 452 | } |
453 | } | 453 | } |
454 | QRect dr; | 454 | QRect dr; |
455 | if ( w + x > parentWidget()->width() ) | 455 | if ( w + x > parentWidget()->width() ) |
456 | w = parentWidget()->width()-x; | 456 | w = parentWidget()->width()-x; |
457 | paint->drawText ( x, yy, w, h, align, mDisplayedText, -1, &dr ); | 457 | paint->drawText ( x, yy, w, h, align, mDisplayedText, -1, &dr ); |
458 | //qDebug("%d %d %d %d ", x, yy, w, h ); | 458 | //qDebug("%d %d %d %d ", x, yy, w, h ); |
459 | if ( mIncidence->cancelled() ){ | 459 | if ( mIncidence->cancelled() ){ |
460 | 460 | ||
461 | 461 | ||
462 | small = ( height() < 20 ); | 462 | small = ( height() < 20 ); |
463 | 463 | ||
464 | if ( ! small ) { | 464 | if ( ! small ) { |
465 | QFontMetrics fm ( paint->font() ); | 465 | QFontMetrics fm ( paint->font() ); |
466 | paint->drawLine(dr.left(), yy+fm.height()/2, dr.right()-2, yy+fm.height()/2); | 466 | paint->drawLine(dr.left(), yy+fm.height()/2, dr.right()-2, yy+fm.height()/2); |
467 | } | 467 | } |
468 | 468 | ||
469 | } | 469 | } |
470 | pa.end(); | 470 | pa.end(); |
471 | 471 | ||
472 | } | 472 | } |
473 | void KOAgendaItem::resizePixmap( int w , int h ) | ||
474 | { | ||
475 | paintPix()->resize( w, h ); | ||
476 | 473 | ||
477 | } | ||
478 | QPixmap * KOAgendaItem::paintPix() | 474 | QPixmap * KOAgendaItem::paintPix() |
479 | { | 475 | { |
480 | static QPixmap* mPaintPix = 0; | 476 | static QPixmap* mPaintPix = 0; |
481 | if ( ! mPaintPix ) { | 477 | if ( ! mPaintPix ) { |
482 | int w = QApplication::desktop()->width(); | 478 | int w = QApplication::desktop()->width(); |
483 | int h = QApplication::desktop()->height(); | 479 | int h = QApplication::desktop()->height(); |
484 | mPaintPix = new QPixmap(w,h); | 480 | mPaintPix = new QPixmap(w,h); |
485 | } | 481 | } |
486 | return mPaintPix ; | 482 | return mPaintPix ; |
487 | } | 483 | } |
488 | QPixmap * KOAgendaItem::paintPixAllday() | 484 | QPixmap * KOAgendaItem::paintPixAllday() |
489 | { | 485 | { |
490 | static QPixmap* mPaintPixA = 0; | 486 | static QPixmap* mPaintPixA = 0; |
491 | if ( ! mPaintPixA ) { | 487 | if ( ! mPaintPixA ) { |
492 | int w = QApplication::desktop()->width(); | 488 | int w = QApplication::desktop()->width(); |
493 | int h = QApplication::desktop()->height()/3; | 489 | int h = QApplication::desktop()->height()/5; |
494 | mPaintPixA = new QPixmap(w,h); | 490 | mPaintPixA = new QPixmap(w,h); |
495 | } | 491 | } |
496 | return mPaintPixA ; | 492 | return mPaintPixA ; |
497 | } | 493 | } |
498 | 494 | ||
499 | void KOAgendaItem::paintEvent ( QPaintEvent *e ) | 495 | void KOAgendaItem::paintEvent ( QPaintEvent *e ) |
500 | { | 496 | { |
501 | 497 | ||
502 | if ( globalFlagBlockAgendaItemPaint ) | 498 | if ( globalFlagBlockAgendaItemPaint ) |
503 | return; | 499 | return; |
504 | if ( globalFlagBlockAgenda > 0 && globalFlagBlockAgenda < 5 ) | 500 | if ( globalFlagBlockAgenda > 0 && globalFlagBlockAgenda < 5 ) |
505 | return; | 501 | return; |
506 | int yy; | 502 | int yy; |
507 | if ( mAllDay ) | 503 | if ( mAllDay ) |
508 | yy = y(); | 504 | yy = y(); |
509 | else | 505 | else |
510 | yy = mCellYTop * ( height() / cellHeight() ); | 506 | yy = mCellYTop * ( height() / cellHeight() ); |
511 | int xx = x(); | 507 | int xx = x(); |
512 | 508 | ||
513 | if ( xPaintCoord != xx || yPaintCoord != yy || | 509 | if ( xPaintCoord != xx || yPaintCoord != yy || |
514 | wPaintCoord != width() || hPaintCoord != height()) { | 510 | wPaintCoord != width() || hPaintCoord != height()) { |
515 | xPaintCoord= xx; | 511 | xPaintCoord= xx; |
516 | yPaintCoord = yy; | 512 | yPaintCoord = yy; |
517 | wPaintCoord = width(); | 513 | wPaintCoord = width(); |
518 | hPaintCoord = height(); | 514 | hPaintCoord = height(); |
519 | globalFlagBlockAgendaItemUpdate = 0; | 515 | globalFlagBlockAgendaItemUpdate = 0; |
520 | paintMe( mSelected ); | 516 | paintMe( mSelected ); |
521 | //qDebug("calling paintMe "); | 517 | //qDebug("calling paintMe "); |
522 | globalFlagBlockAgendaItemUpdate = 1; | 518 | globalFlagBlockAgendaItemUpdate = 1; |
523 | if ( mSelected ) | 519 | if ( mSelected ) |
524 | return; | 520 | return; |
525 | } | 521 | } |
diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h index 7103abe..3ed68b0 100644 --- a/korganizer/koagendaitem.h +++ b/korganizer/koagendaitem.h | |||
@@ -72,65 +72,64 @@ class KOAgendaItem : public QWidget | |||
72 | 72 | ||
73 | void moveRelative(int dx,int dy); | 73 | void moveRelative(int dx,int dy); |
74 | void expandTop(int dy); | 74 | void expandTop(int dy); |
75 | void expandBottom(int dy); | 75 | void expandBottom(int dy); |
76 | void expandLeft(int dx); | 76 | void expandLeft(int dx); |
77 | void expandRight(int dx); | 77 | void expandRight(int dx); |
78 | int mLastMoveXPos; | 78 | int mLastMoveXPos; |
79 | 79 | ||
80 | void setMultiItem(KOAgendaItem *first,KOAgendaItem *next, | 80 | void setMultiItem(KOAgendaItem *first,KOAgendaItem *next, |
81 | KOAgendaItem *last); | 81 | KOAgendaItem *last); |
82 | KOAgendaItem *firstMultiItem() { return mFirstMultiItem; } | 82 | KOAgendaItem *firstMultiItem() { return mFirstMultiItem; } |
83 | KOAgendaItem *nextMultiItem() { return mNextMultiItem; } | 83 | KOAgendaItem *nextMultiItem() { return mNextMultiItem; } |
84 | KOAgendaItem *lastMultiItem() { return mLastMultiItem; } | 84 | KOAgendaItem *lastMultiItem() { return mLastMultiItem; } |
85 | 85 | ||
86 | Incidence *incidence() const { return mIncidence; } | 86 | Incidence *incidence() const { return mIncidence; } |
87 | QDate itemDate() { return mDate; } | 87 | QDate itemDate() { return mDate; } |
88 | 88 | ||
89 | /** Update the date of this item's occurence (not in the event) */ | 89 | /** Update the date of this item's occurence (not in the event) */ |
90 | void setItemDate(QDate qd); | 90 | void setItemDate(QDate qd); |
91 | 91 | ||
92 | void setText ( const QString & text ) { mDisplayedText = text; } | 92 | void setText ( const QString & text ) { mDisplayedText = text; } |
93 | QString text () { return mDisplayedText; } | 93 | QString text () { return mDisplayedText; } |
94 | 94 | ||
95 | virtual bool eventFilter ( QObject *, QEvent * ); | 95 | virtual bool eventFilter ( QObject *, QEvent * ); |
96 | 96 | ||
97 | static QToolTipGroup *toolTipGroup(); | 97 | static QToolTipGroup *toolTipGroup(); |
98 | 98 | ||
99 | QPtrList<KOAgendaItem> conflictItems(); | 99 | QPtrList<KOAgendaItem> conflictItems(); |
100 | void setConflictItems(QPtrList<KOAgendaItem>); | 100 | void setConflictItems(QPtrList<KOAgendaItem>); |
101 | void addConflictItem(KOAgendaItem *ci); | 101 | void addConflictItem(KOAgendaItem *ci); |
102 | void paintMe( bool, QPainter* painter = 0 ); | 102 | void paintMe( bool, QPainter* painter = 0 ); |
103 | void repaintMe(); | 103 | void repaintMe(); |
104 | static void resizePixmap( int, int ); | ||
105 | static QPixmap * paintPix(); | 104 | static QPixmap * paintPix(); |
106 | static QPixmap * paintPixAllday(); | 105 | static QPixmap * paintPixAllday(); |
107 | void updateItem(); | 106 | void updateItem(); |
108 | void computeText(); | 107 | void computeText(); |
109 | void recreateIncidence(); | 108 | void recreateIncidence(); |
110 | bool checkLayout(); | 109 | bool checkLayout(); |
111 | void initColor (); | 110 | void initColor (); |
112 | public slots: | 111 | public slots: |
113 | bool updateIcons( QPainter *, bool ); | 112 | bool updateIcons( QPainter *, bool ); |
114 | void select(bool=true); | 113 | void select(bool=true); |
115 | 114 | ||
116 | protected: | 115 | protected: |
117 | void dragEnterEvent(QDragEnterEvent *e); | 116 | void dragEnterEvent(QDragEnterEvent *e); |
118 | void dropEvent(QDropEvent *e); | 117 | void dropEvent(QDropEvent *e); |
119 | void paintEvent ( QPaintEvent * ); | 118 | void paintEvent ( QPaintEvent * ); |
120 | void resizeEvent ( QResizeEvent *ev ); | 119 | void resizeEvent ( QResizeEvent *ev ); |
121 | 120 | ||
122 | private: | 121 | private: |
123 | KOAgendaItemWhatsThis* mKOAgendaItemWhatsThis; | 122 | KOAgendaItemWhatsThis* mKOAgendaItemWhatsThis; |
124 | bool mAllDay; | 123 | bool mAllDay; |
125 | bool mWhiteText; | 124 | bool mWhiteText; |
126 | int mCellX; | 125 | int mCellX; |
127 | int mCellXWidth; | 126 | int mCellXWidth; |
128 | int mCellYTop,mCellYBottom; | 127 | int mCellYTop,mCellYBottom; |
129 | int mSubCell; // subcell number of this item | 128 | int mSubCell; // subcell number of this item |
130 | int mSubCells; // Total number of subcells in cell of this item | 129 | int mSubCells; // Total number of subcells in cell of this item |
131 | int xPaintCoord; | 130 | int xPaintCoord; |
132 | int yPaintCoord; | 131 | int yPaintCoord; |
133 | int wPaintCoord; | 132 | int wPaintCoord; |
134 | int hPaintCoord; | 133 | int hPaintCoord; |
135 | // Variables to remember start position | 134 | // Variables to remember start position |
136 | int mStartCellX; | 135 | int mStartCellX; |