author | zautrix <zautrix> | 2005-04-01 14:41:00 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-01 14:41:00 (UTC) |
commit | e5ec0ef6a256b96a758815ef861526f53d1ad7a5 (patch) (unidiff) | |
tree | 3fa188da9108c867c1437157731c7b7a3d4e641d /korganizer | |
parent | 93003b1f8348f112648d3cc20acb21b062220e21 (diff) | |
download | kdepimpi-e5ec0ef6a256b96a758815ef861526f53d1ad7a5.zip kdepimpi-e5ec0ef6a256b96a758815ef861526f53d1ad7a5.tar.gz kdepimpi-e5ec0ef6a256b96a758815ef861526f53d1ad7a5.tar.bz2 |
fix
-rw-r--r-- | korganizer/koagendaview.cpp | 10 | ||||
-rw-r--r-- | korganizer/koagendaview.h | 2 | ||||
-rw-r--r-- | korganizer/kodaymatrix.cpp | 17 | ||||
-rw-r--r-- | korganizer/kodaymatrix.h | 1 |
4 files changed, 26 insertions, 4 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 2996acb..218396d 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -36,211 +36,221 @@ | |||
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 | 39 | ||
40 | #include <kapplication.h> | 40 | #include <kapplication.h> |
41 | #include <KDGanttMinimizeSplitter.h> | 41 | #include <KDGanttMinimizeSplitter.h> |
42 | #include <kdebug.h> | 42 | #include <kdebug.h> |
43 | #include <kstandarddirs.h> | 43 | #include <kstandarddirs.h> |
44 | #include <kiconloader.h> | 44 | #include <kiconloader.h> |
45 | #include <klocale.h> | 45 | #include <klocale.h> |
46 | #include <kconfig.h> | 46 | #include <kconfig.h> |
47 | #include <kglobal.h> | 47 | #include <kglobal.h> |
48 | #include "calendarview.h" | 48 | #include "calendarview.h" |
49 | #include "koviewmanager.h" | 49 | #include "koviewmanager.h" |
50 | 50 | ||
51 | #include <libkcal/calendar.h> | 51 | #include <libkcal/calendar.h> |
52 | #include <libkcal/icaldrag.h> | 52 | #include <libkcal/icaldrag.h> |
53 | #include <libkcal/dndfactory.h> | 53 | #include <libkcal/dndfactory.h> |
54 | 54 | ||
55 | #include <kcalendarsystem.h> | 55 | #include <kcalendarsystem.h> |
56 | 56 | ||
57 | #include "koglobals.h" | 57 | #include "koglobals.h" |
58 | #ifndef KORG_NOPLUGINS | 58 | #ifndef KORG_NOPLUGINS |
59 | #include "kocore.h" | 59 | #include "kocore.h" |
60 | #endif | 60 | #endif |
61 | #include "koprefs.h" | 61 | #include "koprefs.h" |
62 | #include "koagenda.h" | 62 | #include "koagenda.h" |
63 | #include "koagendaitem.h" | 63 | #include "koagendaitem.h" |
64 | #ifndef KORG_NOPRINTER | 64 | #ifndef KORG_NOPRINTER |
65 | #include "calprinter.h" | 65 | #include "calprinter.h" |
66 | #endif | 66 | #endif |
67 | 67 | ||
68 | #include "koagendaview.h" | 68 | #include "koagendaview.h" |
69 | //#include "koagendaview.moc" | 69 | //#include "koagendaview.moc" |
70 | 70 | ||
71 | //extern bool globalFlagBlockPainting; | 71 | //extern bool globalFlagBlockPainting; |
72 | extern int globalFlagBlockAgenda; | 72 | extern int globalFlagBlockAgenda; |
73 | extern int globalFlagBlockStartup; | 73 | extern int globalFlagBlockStartup; |
74 | extern int globalFlagBlockAgendaItemPaint; | 74 | extern int globalFlagBlockAgendaItemPaint; |
75 | extern int globalFlagBlockAgendaItemUpdate; | 75 | extern int globalFlagBlockAgendaItemUpdate; |
76 | extern int globalFlagBlockLabel; | 76 | extern int globalFlagBlockLabel; |
77 | using namespace KOrg; | 77 | using namespace KOrg; |
78 | 78 | ||
79 | 79 | ||
80 | 80 | ||
81 | TimeLabels::TimeLabels(int rows,QWidget *parent,const char *name,WFlags f) : | 81 | TimeLabels::TimeLabels(int rows,QWidget *parent,const char *name,WFlags f) : |
82 | QScrollView(parent,name,f) | 82 | QScrollView(parent,name,f) |
83 | { | 83 | { |
84 | myPix.resize( 1, 1 ); | ||
84 | mRows = rows; | 85 | mRows = rows; |
85 | 86 | ||
87 | mRedrawNeeded = true; | ||
86 | setMinimumHeight( 20 ); | 88 | setMinimumHeight( 20 ); |
87 | mCellHeight = KOPrefs::instance()->mHourSize*4; | 89 | mCellHeight = KOPrefs::instance()->mHourSize*4; |
88 | 90 | ||
89 | enableClipper(true); | 91 | enableClipper(true); |
90 | 92 | ||
91 | setHScrollBarMode(AlwaysOff); | 93 | setHScrollBarMode(AlwaysOff); |
92 | setVScrollBarMode(AlwaysOff); | 94 | setVScrollBarMode(AlwaysOff); |
93 | 95 | ||
94 | resizeContents(50,mRows * mCellHeight); | 96 | resizeContents(50,mRows * mCellHeight); |
95 | 97 | ||
96 | viewport()->setBackgroundMode( PaletteBackground ); | 98 | viewport()->setBackgroundMode( PaletteBackground ); |
97 | } | 99 | } |
98 | 100 | ||
99 | void TimeLabels::setCellHeight(int height) | 101 | void TimeLabels::setCellHeight(int height) |
100 | { | 102 | { |
101 | mCellHeight = height; | 103 | mCellHeight = height; |
102 | } | 104 | } |
103 | 105 | ||
104 | /* | 106 | /* |
105 | Optimization so that only the "dirty" portion of the scroll view | 107 | Optimization so that only the "dirty" portion of the scroll view |
106 | is redrawn. Unfortunately, this is not called by default paintEvent() method. | 108 | is redrawn. Unfortunately, this is not called by default paintEvent() method. |
107 | */ | 109 | */ |
108 | void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch) | 110 | void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch) |
109 | { | 111 | { |
110 | 112 | ||
111 | // if ( globalFlagBlockAgenda ) | 113 | // if ( globalFlagBlockAgenda ) |
112 | // return; | 114 | // return; |
113 | // bug: the parameters cx, cy, cw, ch are the areas that need to be | 115 | // bug: the parameters cx, cy, cw, ch are the areas that need to be |
114 | // redrawn, not the area of the widget. unfortunately, this | 116 | // redrawn, not the area of the widget. unfortunately, this |
115 | // code assumes the latter... | 117 | // code assumes the latter... |
116 | 118 | ||
117 | // now, for a workaround... | 119 | // now, for a workaround... |
118 | // these two assignments fix the weird redraw bug | 120 | // these two assignments fix the weird redraw bug |
121 | if ( mRedrawNeeded ) { | ||
119 | cx = contentsX() + 2; | 122 | cx = contentsX() + 2; |
120 | cw = contentsWidth() - 2; | 123 | cw = contentsWidth() - 2; |
121 | // end of workaround | 124 | // end of workaround |
122 | 125 | ||
123 | int cell = ((int)(cy/mCellHeight)); | 126 | int cell = ((int)(cy/mCellHeight)); |
124 | int y = cell * mCellHeight; | 127 | int y = cell * mCellHeight; |
125 | QFontMetrics fm = fontMetrics(); | 128 | QFontMetrics fm = fontMetrics(); |
126 | QString hour; | 129 | QString hour; |
127 | QString suffix; | 130 | QString suffix; |
128 | int tW = fm.width("24:00i"); | 131 | int tW = fm.width("24:00i"); |
129 | int timeHeight = fm.height(); | 132 | int timeHeight = fm.height(); |
130 | //timeHeight -= (timeHeight/4-2); | 133 | //timeHeight -= (timeHeight/4-2); |
131 | int borderWidth = 0; | 134 | int borderWidth = 0; |
132 | QFont nFont = p->font(); | 135 | QFont nFont = p->font(); |
133 | 136 | ||
134 | if (!KGlobal::locale()->use12Clock()) | 137 | if (!KGlobal::locale()->use12Clock()) |
135 | suffix = "00"; | 138 | suffix = "00"; |
136 | else | 139 | else |
137 | borderWidth = 0; | 140 | borderWidth = 0; |
138 | if ( timeHeight > mCellHeight ) { | 141 | if ( timeHeight > mCellHeight ) { |
139 | timeHeight = mCellHeight-1; | 142 | timeHeight = mCellHeight-1; |
140 | int pointS = nFont.pointSize(); | 143 | int pointS = nFont.pointSize(); |
141 | while ( pointS > 4 ) { | 144 | while ( pointS > 4 ) { |
142 | nFont.setPointSize( pointS ); | 145 | nFont.setPointSize( pointS ); |
143 | fm = QFontMetrics( nFont ); | 146 | fm = QFontMetrics( nFont ); |
144 | if ( fm.height() < mCellHeight ) | 147 | if ( fm.height() < mCellHeight ) |
145 | break; | 148 | break; |
146 | -- pointS; | 149 | -- pointS; |
147 | } | 150 | } |
148 | fm = QFontMetrics( nFont ); | 151 | fm = QFontMetrics( nFont ); |
149 | borderWidth = 4; | 152 | borderWidth = 4; |
150 | timeHeight = fm.height(); | 153 | timeHeight = fm.height(); |
151 | } | 154 | } |
152 | timeHeight -= (timeHeight/4-2); | 155 | timeHeight -= (timeHeight/4-2); |
153 | QFont sFont = nFont; | 156 | QFont sFont = nFont; |
154 | sFont.setPointSize( sFont.pointSize()/2+2 ); | 157 | sFont.setPointSize( sFont.pointSize()/2+2 ); |
155 | QFontMetrics fmS( sFont ); | 158 | QFontMetrics fmS( sFont ); |
156 | int sHei = fmS.height(); | 159 | int sHei = fmS.height(); |
157 | sHei -= (sHei/4-2); | 160 | sHei -= (sHei/4-2); |
158 | int startW = this->width() - frameWidth(); | 161 | int startW = this->width() - frameWidth(); |
159 | while (y < cy + ch) { | 162 | while (y < cy + ch) { |
160 | p->drawLine(cx,y,cx+tW,y); | 163 | p->drawLine(cx,y,cx+tW,y); |
161 | hour.setNum(cell); | 164 | hour.setNum(cell); |
162 | 165 | ||
163 | // handle 24h and am/pm time formats | 166 | // handle 24h and am/pm time formats |
164 | if (KGlobal::locale()->use12Clock()) { | 167 | if (KGlobal::locale()->use12Clock()) { |
165 | if (cell > 11) suffix = "pm"; | 168 | if (cell > 11) suffix = "pm"; |
166 | else | 169 | else |
167 | suffix = "am"; | 170 | suffix = "am"; |
168 | if (cell == 0) hour.setNum(12); | 171 | if (cell == 0) hour.setNum(12); |
169 | if (cell > 12) hour.setNum(cell - 12); | 172 | if (cell > 12) hour.setNum(cell - 12); |
170 | } | 173 | } |
171 | 174 | ||
172 | // center and draw the time label | 175 | // center and draw the time label |
173 | int timeWidth = fm.width(hour+"i"); | 176 | int timeWidth = fm.width(hour+"i"); |
174 | int tw2 = fm.width(suffix); | 177 | int tw2 = fm.width(suffix); |
175 | int offset = startW - timeWidth - tw2 ; | 178 | int offset = startW - timeWidth - tw2 ; |
176 | p->setFont( nFont ); | 179 | p->setFont( nFont ); |
177 | p->drawText(cx - borderWidth + offset, y+ timeHeight, hour); | 180 | p->drawText(cx - borderWidth + offset, y+ timeHeight, hour); |
178 | p->setFont( sFont ); | 181 | p->setFont( sFont ); |
179 | offset = startW - tw2-1; | 182 | offset = startW - tw2-1; |
180 | p->drawText(cx - borderWidth + offset, y+ sHei, suffix); | 183 | p->drawText(cx - borderWidth + offset, y+ sHei, suffix); |
181 | 184 | ||
182 | // increment indices | 185 | // increment indices |
183 | y += mCellHeight; | 186 | y += mCellHeight; |
184 | cell++; | 187 | cell++; |
185 | } | 188 | } |
189 | } else { | ||
190 | //qDebug("NO redraw "); | ||
191 | } | ||
192 | // double buffer not yet implemented | ||
193 | //bitBlt (this, 0, 0, &myPix, 0 ,0,width(), height() ,CopyROP); | ||
194 | //mRedrawNeeded = false; | ||
186 | } | 195 | } |
187 | 196 | ||
188 | /** | 197 | /** |
189 | Calculates the minimum width. | 198 | Calculates the minimum width. |
190 | */ | 199 | */ |
191 | int TimeLabels::minimumWidth() const | 200 | int TimeLabels::minimumWidth() const |
192 | { | 201 | { |
193 | return mMiniWidth; | 202 | return mMiniWidth; |
194 | } | 203 | } |
195 | 204 | ||
196 | /** updates widget's internal state */ | 205 | /** updates widget's internal state */ |
197 | void TimeLabels::updateConfig() | 206 | void TimeLabels::updateConfig() |
198 | { | 207 | { |
208 | mRedrawNeeded = true; | ||
199 | // set the font | 209 | // set the font |
200 | // config->setGroup("Fonts"); | 210 | // config->setGroup("Fonts"); |
201 | // QFont font = config->readFontEntry("TimeBar Font"); | 211 | // QFont font = config->readFontEntry("TimeBar Font"); |
202 | setFont(KOPrefs::instance()->mTimeBarFont); | 212 | setFont(KOPrefs::instance()->mTimeBarFont); |
203 | QString test = "88:88"; | 213 | QString test = "88:88"; |
204 | if (KGlobal::locale()->use12Clock()) | 214 | if (KGlobal::locale()->use12Clock()) |
205 | test += "i"; | 215 | test += "i"; |
206 | mMiniWidth = fontMetrics().width(test) + frameWidth()*2 +1 ; | 216 | mMiniWidth = fontMetrics().width(test) + frameWidth()*2 +1 ; |
207 | // update geometry restrictions based on new settings | 217 | // update geometry restrictions based on new settings |
208 | setFixedWidth(minimumWidth()); | 218 | setFixedWidth(minimumWidth()); |
209 | 219 | ||
210 | // update HourSize | 220 | // update HourSize |
211 | mCellHeight = KOPrefs::instance()->mHourSize*4; | 221 | mCellHeight = KOPrefs::instance()->mHourSize*4; |
212 | resizeContents(50,mRows * mCellHeight); | 222 | resizeContents(50,mRows * mCellHeight); |
213 | } | 223 | } |
214 | 224 | ||
215 | /** update time label positions */ | 225 | /** update time label positions */ |
216 | void TimeLabels::positionChanged() | 226 | void TimeLabels::positionChanged() |
217 | { | 227 | { |
218 | int adjustment = mAgenda->contentsY(); | 228 | int adjustment = mAgenda->contentsY(); |
219 | setContentsPos(0, adjustment); | 229 | setContentsPos(0, adjustment); |
220 | } | 230 | } |
221 | 231 | ||
222 | /** */ | 232 | /** */ |
223 | void TimeLabels::setAgenda(KOAgenda* agenda) | 233 | void TimeLabels::setAgenda(KOAgenda* agenda) |
224 | { | 234 | { |
225 | mAgenda = agenda; | 235 | mAgenda = agenda; |
226 | } | 236 | } |
227 | 237 | ||
228 | void TimeLabels::contentsMousePressEvent ( QMouseEvent * e) | 238 | void TimeLabels::contentsMousePressEvent ( QMouseEvent * e) |
229 | { | 239 | { |
230 | mMouseDownY = e->pos().y(); | 240 | mMouseDownY = e->pos().y(); |
231 | mOrgCap = topLevelWidget()->caption(); | 241 | mOrgCap = topLevelWidget()->caption(); |
232 | } | 242 | } |
233 | 243 | ||
234 | void TimeLabels::contentsMouseMoveEvent ( QMouseEvent * e ) | 244 | void TimeLabels::contentsMouseMoveEvent ( QMouseEvent * e ) |
235 | { | 245 | { |
236 | int diff = mMouseDownY - e->pos().y(); | 246 | int diff = mMouseDownY - e->pos().y(); |
237 | if ( diff < 10 && diff > -10 ) | 247 | if ( diff < 10 && diff > -10 ) |
238 | return; | 248 | return; |
239 | int tSize = KOPrefs::instance()->mHourSize + (diff/10) ; | 249 | int tSize = KOPrefs::instance()->mHourSize + (diff/10) ; |
240 | if ( tSize < 4 ) | 250 | if ( tSize < 4 ) |
241 | tSize = 4; | 251 | tSize = 4; |
242 | if ( tSize > 22 ) | 252 | if ( tSize > 22 ) |
243 | tSize = 22; | 253 | tSize = 22; |
244 | tSize = (tSize-2)/2; | 254 | tSize = (tSize-2)/2; |
245 | topLevelWidget()->setCaption(i18n("New Agendasize: %1").arg(tSize)); | 255 | topLevelWidget()->setCaption(i18n("New Agendasize: %1").arg(tSize)); |
246 | 256 | ||
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h index 6dc81c6..30c9b05 100644 --- a/korganizer/koagendaview.h +++ b/korganizer/koagendaview.h | |||
@@ -56,96 +56,98 @@ class KOAgendaButton : public QPushButton | |||
56 | mNum = -3; | 56 | mNum = -3; |
57 | setFlat( true ); | 57 | setFlat( true ); |
58 | setFocusPolicy(NoFocus); | 58 | setFocusPolicy(NoFocus); |
59 | setSizePolicy(QSizePolicy( QSizePolicy::Expanding ,QSizePolicy::Expanding )); | 59 | setSizePolicy(QSizePolicy( QSizePolicy::Expanding ,QSizePolicy::Expanding )); |
60 | connect( this, SIGNAL( clicked() ), this, SLOT ( bClicked() ) ); | 60 | connect( this, SIGNAL( clicked() ), this, SLOT ( bClicked() ) ); |
61 | }; | 61 | }; |
62 | 62 | ||
63 | QSize sizeHint () const { return QSize( 5,5) ;} | 63 | QSize sizeHint () const { return QSize( 5,5) ;} |
64 | void setNum( int n) { mNum = n; } | 64 | void setNum( int n) { mNum = n; } |
65 | private slots: | 65 | private slots: |
66 | void bClicked() {emit numClicked( mNum);} | 66 | void bClicked() {emit numClicked( mNum);} |
67 | signals: | 67 | signals: |
68 | void numClicked( int ); | 68 | void numClicked( int ); |
69 | private: | 69 | private: |
70 | int mNum; | 70 | int mNum; |
71 | }; | 71 | }; |
72 | 72 | ||
73 | class TimeLabels : public QScrollView { | 73 | class TimeLabels : public QScrollView { |
74 | Q_OBJECT | 74 | Q_OBJECT |
75 | public: | 75 | public: |
76 | TimeLabels(int rows,QWidget *parent=0,const char *name=0,WFlags f=0); | 76 | TimeLabels(int rows,QWidget *parent=0,const char *name=0,WFlags f=0); |
77 | 77 | ||
78 | void setCellHeight(int height); | 78 | void setCellHeight(int height); |
79 | 79 | ||
80 | /** Calculates the minimum width */ | 80 | /** Calculates the minimum width */ |
81 | virtual int minimumWidth() const; | 81 | virtual int minimumWidth() const; |
82 | 82 | ||
83 | /** updates widget's internal state */ | 83 | /** updates widget's internal state */ |
84 | void updateConfig(); | 84 | void updateConfig(); |
85 | 85 | ||
86 | /** */ | 86 | /** */ |
87 | void setAgenda(KOAgenda* agenda); | 87 | void setAgenda(KOAgenda* agenda); |
88 | 88 | ||
89 | /** */ | 89 | /** */ |
90 | virtual void paintEvent(QPaintEvent* e); | 90 | virtual void paintEvent(QPaintEvent* e); |
91 | void contentsMousePressEvent ( QMouseEvent * ) ; | 91 | void contentsMousePressEvent ( QMouseEvent * ) ; |
92 | void contentsMouseReleaseEvent ( QMouseEvent * ); | 92 | void contentsMouseReleaseEvent ( QMouseEvent * ); |
93 | void contentsMouseMoveEvent ( QMouseEvent * ); | 93 | void contentsMouseMoveEvent ( QMouseEvent * ); |
94 | 94 | ||
95 | public slots: | 95 | public slots: |
96 | /** update time label positions */ | 96 | /** update time label positions */ |
97 | void positionChanged(); | 97 | void positionChanged(); |
98 | signals: | 98 | signals: |
99 | void scaleChanged(); | 99 | void scaleChanged(); |
100 | protected: | 100 | protected: |
101 | void drawContents(QPainter *p,int cx, int cy, int cw, int ch); | 101 | void drawContents(QPainter *p,int cx, int cy, int cw, int ch); |
102 | 102 | ||
103 | private: | 103 | private: |
104 | QPixmap myPix; | ||
105 | bool mRedrawNeeded; | ||
104 | int mMiniWidth; | 106 | int mMiniWidth; |
105 | int mMouseDownY; | 107 | int mMouseDownY; |
106 | QString mOrgCap; | 108 | QString mOrgCap; |
107 | int mRows; | 109 | int mRows; |
108 | int mCellHeight; | 110 | int mCellHeight; |
109 | 111 | ||
110 | /** */ | 112 | /** */ |
111 | KOAgenda* mAgenda; | 113 | KOAgenda* mAgenda; |
112 | }; | 114 | }; |
113 | 115 | ||
114 | class EventIndicator : public QFrame { | 116 | class EventIndicator : public QFrame { |
115 | Q_OBJECT | 117 | Q_OBJECT |
116 | public: | 118 | public: |
117 | enum Location { Top, Bottom }; | 119 | enum Location { Top, Bottom }; |
118 | EventIndicator(Location loc=Top,QWidget *parent=0,const char *name=0); | 120 | EventIndicator(Location loc=Top,QWidget *parent=0,const char *name=0); |
119 | virtual ~EventIndicator(); | 121 | virtual ~EventIndicator(); |
120 | 122 | ||
121 | void changeColumns(int columns); | 123 | void changeColumns(int columns); |
122 | void setPaintWidget( KDGanttMinimizeSplitter* ); | 124 | void setPaintWidget( KDGanttMinimizeSplitter* ); |
123 | void setXOffset( int ); | 125 | void setXOffset( int ); |
124 | void enableColumn(int column, bool enable); | 126 | void enableColumn(int column, bool enable); |
125 | 127 | ||
126 | protected: | 128 | protected: |
127 | void drawContents(QPainter *); | 129 | void drawContents(QPainter *); |
128 | 130 | ||
129 | private: | 131 | private: |
130 | int mXOffset; | 132 | int mXOffset; |
131 | KDGanttMinimizeSplitter* mPaintWidget; | 133 | KDGanttMinimizeSplitter* mPaintWidget; |
132 | int mColumns; | 134 | int mColumns; |
133 | QHBox *mTopBox; | 135 | QHBox *mTopBox; |
134 | QBoxLayout *mTopLayout; | 136 | QBoxLayout *mTopLayout; |
135 | Location mLocation; | 137 | Location mLocation; |
136 | QPixmap mPixmap; | 138 | QPixmap mPixmap; |
137 | QMemArray<bool> mEnabled; | 139 | QMemArray<bool> mEnabled; |
138 | }; | 140 | }; |
139 | 141 | ||
140 | /** | 142 | /** |
141 | KOAgendaView is the agenda-like view used to display events in an one or | 143 | KOAgendaView is the agenda-like view used to display events in an one or |
142 | multi-day view. | 144 | multi-day view. |
143 | */ | 145 | */ |
144 | class KOAgendaView : public KOEventView { | 146 | class KOAgendaView : public KOEventView { |
145 | Q_OBJECT | 147 | Q_OBJECT |
146 | public: | 148 | public: |
147 | KOAgendaView(Calendar *cal,QWidget *parent = 0,const char *name = 0 ); | 149 | KOAgendaView(Calendar *cal,QWidget *parent = 0,const char *name = 0 ); |
148 | virtual ~KOAgendaView(); | 150 | virtual ~KOAgendaView(); |
149 | void setStartHour( int ); | 151 | void setStartHour( int ); |
150 | void toggleAllDay(); | 152 | void toggleAllDay(); |
151 | 153 | ||
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index d543aaf..dfc6af7 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -65,96 +65,97 @@ public: | |||
65 | KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { ;}; | 65 | KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { ;}; |
66 | ~KODaymatrixWhatsThis() { ; }; | 66 | ~KODaymatrixWhatsThis() { ; }; |
67 | 67 | ||
68 | protected: | 68 | protected: |
69 | virtual QString text( const QPoint& p ) | 69 | virtual QString text( const QPoint& p ) |
70 | { | 70 | { |
71 | return _view->getWhatsThisText( p ) ; | 71 | return _view->getWhatsThisText( p ) ; |
72 | } | 72 | } |
73 | private: | 73 | private: |
74 | KODayMatrix * _view; | 74 | KODayMatrix * _view; |
75 | }; | 75 | }; |
76 | 76 | ||
77 | void DynamicTip::maybeTip( const QPoint &pos ) | 77 | void DynamicTip::maybeTip( const QPoint &pos ) |
78 | { | 78 | { |
79 | //calculate which cell of the matrix the mouse is in | 79 | //calculate which cell of the matrix the mouse is in |
80 | QRect sz = matrix->frameRect(); | 80 | QRect sz = matrix->frameRect(); |
81 | int dheight = sz.height()*7 / 42; | 81 | int dheight = sz.height()*7 / 42; |
82 | int dwidth = sz.width() / 7; | 82 | int dwidth = sz.width() / 7; |
83 | int row = pos.y()/dheight; | 83 | int row = pos.y()/dheight; |
84 | int col = pos.x()/dwidth; | 84 | int col = pos.x()/dwidth; |
85 | 85 | ||
86 | QRect rct(col*dwidth, row*dheight, dwidth, dheight); | 86 | QRect rct(col*dwidth, row*dheight, dwidth, dheight); |
87 | 87 | ||
88 | // kdDebug() << "DynamicTip::maybeTip matrix cell index [" << | 88 | // kdDebug() << "DynamicTip::maybeTip matrix cell index [" << |
89 | // col << "][" << row << "] => " <<(col+row*7) << endl; | 89 | // col << "][" << row << "] => " <<(col+row*7) << endl; |
90 | 90 | ||
91 | //show holiday names only | 91 | //show holiday names only |
92 | QString str = matrix->getHolidayLabel(col+row*7); | 92 | QString str = matrix->getHolidayLabel(col+row*7); |
93 | if (str.isEmpty()) return; | 93 | if (str.isEmpty()) return; |
94 | tip(rct, str); | 94 | tip(rct, str); |
95 | } | 95 | } |
96 | 96 | ||
97 | 97 | ||
98 | // ============================================================================ | 98 | // ============================================================================ |
99 | // K O D A Y M A T R I X | 99 | // K O D A Y M A T R I X |
100 | // ============================================================================ | 100 | // ============================================================================ |
101 | 101 | ||
102 | const int KODayMatrix::NOSELECTION = -1000; | 102 | const int KODayMatrix::NOSELECTION = -1000; |
103 | const int KODayMatrix::NUMDAYS = 42; | 103 | const int KODayMatrix::NUMDAYS = 42; |
104 | 104 | ||
105 | KODayMatrix::KODayMatrix( QWidget *parent, const char *name ) | 105 | KODayMatrix::KODayMatrix( QWidget *parent, const char *name ) |
106 | : QFrame( parent, name , Qt::WRepaintNoErase ), mCalendar( 0 ) | 106 | : QFrame( parent, name , Qt::WRepaintNoErase ), mCalendar( 0 ) |
107 | 107 | ||
108 | #if 0 | 108 | #if 0 |
109 | KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const char *name) : | 109 | KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const char *name) : |
110 | QFrame(parent, name) | 110 | QFrame(parent, name) |
111 | #endif | 111 | #endif |
112 | { | 112 | { |
113 | mRedrawNeeded = true; | ||
113 | mKODaymatrixWhatsThis = new KODaymatrixWhatsThis(this); | 114 | mKODaymatrixWhatsThis = new KODaymatrixWhatsThis(this); |
114 | mPendingUpdateBeforeRepaint = false; | 115 | mPendingUpdateBeforeRepaint = false; |
115 | mouseDown = false; | 116 | mouseDown = false; |
116 | // initialize dynamic arrays | 117 | // initialize dynamic arrays |
117 | bDays.resize ( NUMDAYS ); | 118 | bDays.resize ( NUMDAYS ); |
118 | hDays.resize ( NUMDAYS );; | 119 | hDays.resize ( NUMDAYS );; |
119 | eDays.resize ( NUMDAYS );; | 120 | eDays.resize ( NUMDAYS );; |
120 | days = new QDate[NUMDAYS]; | 121 | days = new QDate[NUMDAYS]; |
121 | daylbls = new QString[NUMDAYS]; | 122 | daylbls = new QString[NUMDAYS]; |
122 | //events = new int[NUMDAYS]; | 123 | //events = new int[NUMDAYS]; |
123 | mToolTip = new DynamicTip(this); | 124 | mToolTip = new DynamicTip(this); |
124 | 125 | ||
125 | // set default values used for drawing the matrix | 126 | // set default values used for drawing the matrix |
126 | mDefaultBackColor = palette().active().base(); | 127 | mDefaultBackColor = palette().active().base(); |
127 | mDefaultTextColor = palette().active().foreground(); | 128 | mDefaultTextColor = palette().active().foreground(); |
128 | mDefaultTextColorShaded = getShadedColor(mDefaultTextColor); | 129 | mDefaultTextColorShaded = getShadedColor(mDefaultTextColor); |
129 | mHolidayColorShaded = getShadedColor(KOPrefs::instance()->mHolidayColor); | 130 | mHolidayColorShaded = getShadedColor(KOPrefs::instance()->mHolidayColor); |
130 | mSelectedDaysColor = QColor("white"); | 131 | mSelectedDaysColor = QColor("white"); |
131 | mTodayMarginWidth = 2; | 132 | mTodayMarginWidth = 2; |
132 | mSelEnd = mSelStart = NOSELECTION; | 133 | mSelEnd = mSelStart = NOSELECTION; |
133 | 134 | ||
134 | setAcceptDrops(true); | 135 | setAcceptDrops(true); |
135 | //setFont( QFont("Arial", 10) ); | 136 | //setFont( QFont("Arial", 10) ); |
136 | 137 | ||
137 | mUpdateTimer = new QTimer( this ); | 138 | mUpdateTimer = new QTimer( this ); |
138 | connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( updateViewTimed() )); | 139 | connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( updateViewTimed() )); |
139 | mRepaintTimer = new QTimer( this ); | 140 | mRepaintTimer = new QTimer( this ); |
140 | connect (mRepaintTimer ,SIGNAL(timeout()), this, SLOT ( repaintViewTimed() )); | 141 | connect (mRepaintTimer ,SIGNAL(timeout()), this, SLOT ( repaintViewTimed() )); |
141 | mDayChanged = false; | 142 | mDayChanged = false; |
142 | updateView(); | 143 | updateView(); |
143 | } | 144 | } |
144 | QString KODayMatrix::getWhatsThisText( QPoint p ) | 145 | QString KODayMatrix::getWhatsThisText( QPoint p ) |
145 | { | 146 | { |
146 | 147 | ||
147 | int tmp = getDayIndexFrom(p.x(), p.y()); | 148 | int tmp = getDayIndexFrom(p.x(), p.y()); |
148 | if ( tmp < 0 || tmp > NUMDAYS-1 || !mCalendar ) | 149 | if ( tmp < 0 || tmp > NUMDAYS-1 || !mCalendar ) |
149 | return QString(); | 150 | return QString(); |
150 | QDate mDate = days[tmp]; | 151 | QDate mDate = days[tmp]; |
151 | QPtrList<Event> eventlist = mCalendar->events(mDate); | 152 | QPtrList<Event> eventlist = mCalendar->events(mDate); |
152 | Event *event; | 153 | Event *event; |
153 | QStringList mToolTip; | 154 | QStringList mToolTip; |
154 | for(event=eventlist.first();event != 0;event=eventlist.next()) { | 155 | for(event=eventlist.first();event != 0;event=eventlist.next()) { |
155 | QString mToolTipText; | 156 | QString mToolTipText; |
156 | QString text; | 157 | QString text; |
157 | int multiday = 0;// 1 = start, 2 = midddle, 3 = end day | 158 | int multiday = 0;// 1 = start, 2 = midddle, 3 = end day |
158 | if (event->isMultiDay()) { | 159 | if (event->isMultiDay()) { |
159 | QString prefix = "<->";multiday = 2; | 160 | QString prefix = "<->";multiday = 2; |
160 | QString time; | 161 | QString time; |
@@ -341,139 +342,141 @@ void KODayMatrix::updateViewTimed() | |||
341 | mUpdateTimer->stop(); | 342 | mUpdateTimer->stop(); |
342 | if ( !mCalendar ) { | 343 | if ( !mCalendar ) { |
343 | qDebug("NOT CAL "); | 344 | qDebug("NOT CAL "); |
344 | return; | 345 | return; |
345 | } | 346 | } |
346 | //qDebug("KODayMatrix::updateViewTimed "); | 347 | //qDebug("KODayMatrix::updateViewTimed "); |
347 | for(int i = 0; i < NUMDAYS; i++) { | 348 | for(int i = 0; i < NUMDAYS; i++) { |
348 | // if events are set for the day then remember to draw it bold | 349 | // if events are set for the day then remember to draw it bold |
349 | QPtrList<Event> eventlist = mCalendar->events(days[i]); | 350 | QPtrList<Event> eventlist = mCalendar->events(days[i]); |
350 | Event *event; | 351 | Event *event; |
351 | int numEvents = eventlist.count(); | 352 | int numEvents = eventlist.count(); |
352 | QString holiStr = ""; | 353 | QString holiStr = ""; |
353 | bDays.clearBit(i); | 354 | bDays.clearBit(i); |
354 | hDays.clearBit(i); | 355 | hDays.clearBit(i); |
355 | eDays.clearBit(i); | 356 | eDays.clearBit(i); |
356 | for(event=eventlist.first();event != 0;event=eventlist.next()) { | 357 | for(event=eventlist.first();event != 0;event=eventlist.next()) { |
357 | ushort recurType = event->recurrence()->doesRecur(); | 358 | ushort recurType = event->recurrence()->doesRecur(); |
358 | if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) || | 359 | if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) || |
359 | (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) { | 360 | (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) { |
360 | numEvents--; | 361 | numEvents--; |
361 | } | 362 | } |
362 | if ( event->isHoliday()) { | 363 | if ( event->isHoliday()) { |
363 | hDays.setBit(i); | 364 | hDays.setBit(i); |
364 | if ( !holiStr.isEmpty() ) | 365 | if ( !holiStr.isEmpty() ) |
365 | holiStr += "\n"; | 366 | holiStr += "\n"; |
366 | holiStr += event->summary(); | 367 | holiStr += event->summary(); |
367 | if ( !event->location().isEmpty() ) | 368 | if ( !event->location().isEmpty() ) |
368 | holiStr += " (" + event->location() + ")"; | 369 | holiStr += " (" + event->location() + ")"; |
369 | } | 370 | } |
370 | if ( event->isBirthday()) { | 371 | if ( event->isBirthday()) { |
371 | if ( !holiStr.isEmpty() ) | 372 | if ( !holiStr.isEmpty() ) |
372 | holiStr += "\n"; | 373 | holiStr += "\n"; |
373 | holiStr += i18n("Birthday") + ": "+event->summary(); | 374 | holiStr += i18n("Birthday") + ": "+event->summary(); |
374 | if ( !event->location().isEmpty() ) | 375 | if ( !event->location().isEmpty() ) |
375 | holiStr += " (" + event->location() + ")"; | 376 | holiStr += " (" + event->location() + ")"; |
376 | bDays.setBit(i); | 377 | bDays.setBit(i); |
377 | } | 378 | } |
378 | } | 379 | } |
379 | if ( numEvents ) | 380 | if ( numEvents ) |
380 | eDays.setBit(i); | 381 | eDays.setBit(i); |
381 | //if it is a holy day then draw it red. Sundays are consider holidays, too | 382 | //if it is a holy day then draw it red. Sundays are consider holidays, too |
382 | if ( (KOGlobals::self()->calendarSystem()->dayOfWeek(days[i]) == KOGlobals::self()->calendarSystem()->weekDayOfPray()) || | 383 | if ( (KOGlobals::self()->calendarSystem()->dayOfWeek(days[i]) == KOGlobals::self()->calendarSystem()->weekDayOfPray()) || |
383 | !holiStr.isEmpty()) { | 384 | !holiStr.isEmpty()) { |
384 | mHolidays[i] = holiStr; | 385 | mHolidays[i] = holiStr; |
385 | } else { | 386 | } else { |
386 | mHolidays[i] = QString::null; | 387 | mHolidays[i] = QString::null; |
387 | } | 388 | } |
388 | } | 389 | } |
390 | mRedrawNeeded = true; | ||
389 | if ( ! mPendingUpdateBeforeRepaint ) | 391 | if ( ! mPendingUpdateBeforeRepaint ) |
390 | repaint(false); | 392 | repaint(false); |
391 | } | 393 | } |
392 | void KODayMatrix::updateView(QDate actdate) | 394 | void KODayMatrix::updateView(QDate actdate) |
393 | { | 395 | { |
394 | 396 | ||
395 | if ( ! actdate.isValid() ) { | 397 | if ( ! actdate.isValid() ) { |
396 | //qDebug("date not valid "); | 398 | //qDebug("date not valid "); |
397 | return; | 399 | return; |
398 | } | 400 | } |
399 | mDayChanged = false; | 401 | mDayChanged = false; |
400 | //flag to indicate if the starting day of the matrix has changed by this call | 402 | //flag to indicate if the starting day of the matrix has changed by this call |
401 | //mDayChanged = false; | 403 | //mDayChanged = false; |
402 | // if a new startdate is to be set then apply Cornelius's calculation | 404 | // if a new startdate is to be set then apply Cornelius's calculation |
403 | // of the first day to be shown | 405 | // of the first day to be shown |
404 | if (actdate != startdate) { | 406 | if (actdate != startdate) { |
405 | // reset index of selection according to shift of starting date from startdate to actdate | 407 | // reset index of selection according to shift of starting date from startdate to actdate |
406 | if (mSelStart != NOSELECTION) { | 408 | if (mSelStart != NOSELECTION) { |
407 | int tmp = actdate.daysTo(startdate); | 409 | int tmp = actdate.daysTo(startdate); |
408 | //kdDebug() << "Shift of Selection1: " << mSelStart << " - " << mSelEnd << " -> " << tmp << "(" << offset << ")" << endl; | 410 | //kdDebug() << "Shift of Selection1: " << mSelStart << " - " << mSelEnd << " -> " << tmp << "(" << offset << ")" << endl; |
409 | // shift selection if new one would be visible at least partly ! | 411 | // shift selection if new one would be visible at least partly ! |
410 | 412 | ||
411 | if (mSelStart+tmp < NUMDAYS && mSelEnd+tmp >= 0) { | 413 | if (mSelStart+tmp < NUMDAYS && mSelEnd+tmp >= 0) { |
412 | // nested if is required for next X display pushed from a different month - correction required | 414 | // nested if is required for next X display pushed from a different month - correction required |
413 | // otherwise, for month forward and backward, it must be avoided | 415 | // otherwise, for month forward and backward, it must be avoided |
414 | if( mSelStart > NUMDAYS || mSelStart < 0 ) | 416 | if( mSelStart > NUMDAYS || mSelStart < 0 ) |
415 | mSelStart = mSelStart + tmp; | 417 | mSelStart = mSelStart + tmp; |
416 | if( mSelEnd > NUMDAYS || mSelEnd < 0 ) | 418 | if( mSelEnd > NUMDAYS || mSelEnd < 0 ) |
417 | mSelEnd = mSelEnd + tmp; | 419 | mSelEnd = mSelEnd + tmp; |
418 | } | 420 | } |
419 | } | 421 | } |
420 | startdate = actdate; | 422 | startdate = actdate; |
421 | mDayChanged = true; | 423 | mDayChanged = true; |
422 | recalculateToday(); | 424 | recalculateToday(); |
425 | mRedrawNeeded = true; | ||
423 | } | 426 | } |
424 | //qDebug("restart Timer %d vis: %d", mDayChanged, isVisible() ); | 427 | //qDebug("restart Timer %d vis: %d", mDayChanged, isVisible() ); |
425 | if ( !isVisible() ) { | 428 | if ( !isVisible() ) { |
426 | mPendingUpdateBeforeRepaint = true; | 429 | mPendingUpdateBeforeRepaint = true; |
427 | } else { | 430 | } else { |
428 | #ifdef DESKTOP_VERSION | 431 | #ifdef DESKTOP_VERSION |
429 | //mRepaintTimer->start( 100 ); | 432 | //mRepaintTimer->start( 100 ); |
430 | //updateViewTimed(); | 433 | //updateViewTimed(); |
431 | mUpdateTimer->start( 20 ); | 434 | mUpdateTimer->start( 50 ); |
432 | #else | 435 | #else |
433 | mRepaintTimer->start( 350 ); | 436 | mRepaintTimer->start( 350 ); |
434 | mUpdateTimer->start( 1200 ); | 437 | mUpdateTimer->start( 1200 ); |
435 | #endif | 438 | #endif |
436 | } | 439 | } |
437 | } | 440 | } |
438 | void KODayMatrix::updateEvents() | 441 | void KODayMatrix::updateEvents() |
439 | { | 442 | { |
440 | if ( !mCalendar ) return; | 443 | if ( !mCalendar ) return; |
441 | 444 | ||
442 | for( int i = 0; i < NUMDAYS; i++ ) { | 445 | for( int i = 0; i < NUMDAYS; i++ ) { |
443 | // if events are set for the day then remember to draw it bold | 446 | // if events are set for the day then remember to draw it bold |
444 | QPtrList<Event> eventlist = mCalendar->events( days[ i ] ); | 447 | QPtrList<Event> eventlist = mCalendar->events( days[ i ] ); |
445 | int numEvents = eventlist.count(); | 448 | int numEvents = eventlist.count(); |
446 | Event *event; | 449 | Event *event; |
447 | for( event = eventlist.first(); event != 0;event=eventlist.next()) { | 450 | for( event = eventlist.first(); event != 0;event=eventlist.next()) { |
448 | ushort recurType = event->doesRecur(); | 451 | ushort recurType = event->doesRecur(); |
449 | 452 | ||
450 | if ( ( recurType == Recurrence::rDaily && | 453 | if ( ( recurType == Recurrence::rDaily && |
451 | !KOPrefs::instance()->mDailyRecur ) || | 454 | !KOPrefs::instance()->mDailyRecur ) || |
452 | ( recurType == Recurrence::rWeekly && | 455 | ( recurType == Recurrence::rWeekly && |
453 | !KOPrefs::instance()->mWeeklyRecur ) ) { | 456 | !KOPrefs::instance()->mWeeklyRecur ) ) { |
454 | numEvents--; | 457 | numEvents--; |
455 | } | 458 | } |
456 | } | 459 | } |
457 | if ( numEvents ) | 460 | if ( numEvents ) |
458 | eDays.setBit(i); | 461 | eDays.setBit(i); |
459 | else | 462 | else |
460 | eDays.clearBit(i); | 463 | eDays.clearBit(i); |
461 | } | 464 | } |
462 | } | 465 | } |
463 | 466 | ||
464 | const QDate& KODayMatrix::getDate(int offset) | 467 | const QDate& KODayMatrix::getDate(int offset) |
465 | { | 468 | { |
466 | if (offset < 0 || offset > NUMDAYS-1) { | 469 | if (offset < 0 || offset > NUMDAYS-1) { |
467 | qDebug("Wrong offset2 %d", offset); | 470 | qDebug("Wrong offset2 %d", offset); |
468 | return days[0]; | 471 | return days[0]; |
469 | } | 472 | } |
470 | return days[offset]; | 473 | return days[offset]; |
471 | } | 474 | } |
472 | 475 | ||
473 | QString KODayMatrix::getHolidayLabel(int offset) | 476 | QString KODayMatrix::getHolidayLabel(int offset) |
474 | { | 477 | { |
475 | if (offset < 0 || offset > NUMDAYS-1) { | 478 | if (offset < 0 || offset > NUMDAYS-1) { |
476 | qDebug("Wrong offset1 %d", offset); | 479 | qDebug("Wrong offset1 %d", offset); |
477 | return QString(); | 480 | return QString(); |
478 | } | 481 | } |
479 | return mHolidays[offset]; | 482 | return mHolidays[offset]; |
@@ -633,97 +636,101 @@ void KODayMatrix::dropEvent(QDropEvent *e) | |||
633 | if(existingEvent) { | 636 | if(existingEvent) { |
634 | // uniquify event | 637 | // uniquify event |
635 | event->recreate(); | 638 | event->recreate(); |
636 | /* | 639 | /* |
637 | KMessageBox::sorry(this, | 640 | KMessageBox::sorry(this, |
638 | i18n("Event already exists in this calendar."), | 641 | i18n("Event already exists in this calendar."), |
639 | i18n("Drop Event")); | 642 | i18n("Drop Event")); |
640 | delete event; | 643 | delete event; |
641 | return; | 644 | return; |
642 | */ | 645 | */ |
643 | } | 646 | } |
644 | // kdDebug() << "Drop new Event" << endl; | 647 | // kdDebug() << "Drop new Event" << endl; |
645 | // Adjust date | 648 | // Adjust date |
646 | QDateTime start = event->dtStart(); | 649 | QDateTime start = event->dtStart(); |
647 | QDateTime end = event->dtEnd(); | 650 | QDateTime end = event->dtEnd(); |
648 | int duration = start.daysTo(end); | 651 | int duration = start.daysTo(end); |
649 | int idx = getDayIndexFrom(e->pos().x(), e->pos().y()); | 652 | int idx = getDayIndexFrom(e->pos().x(), e->pos().y()); |
650 | 653 | ||
651 | start.setDate(days[idx]); | 654 | start.setDate(days[idx]); |
652 | end.setDate(days[idx].addDays(duration)); | 655 | end.setDate(days[idx].addDays(duration)); |
653 | 656 | ||
654 | event->setDtStart(start); | 657 | event->setDtStart(start); |
655 | event->setDtEnd(end); | 658 | event->setDtEnd(end); |
656 | mCalendar->addEvent(event); | 659 | mCalendar->addEvent(event); |
657 | 660 | ||
658 | emit eventDropped(event); | 661 | emit eventDropped(event); |
659 | } else { | 662 | } else { |
660 | // kdDebug() << "KODayMatrix::dropEvent(): Event from drop not decodable" << endl; | 663 | // kdDebug() << "KODayMatrix::dropEvent(): Event from drop not decodable" << endl; |
661 | e->ignore(); | 664 | e->ignore(); |
662 | } | 665 | } |
663 | #endif | 666 | #endif |
664 | } | 667 | } |
665 | 668 | ||
666 | // ---------------------------------------------------------------------------- | 669 | // ---------------------------------------------------------------------------- |
667 | // P A I N T E V E N T H A N D L I N G | 670 | // P A I N T E V E N T H A N D L I N G |
668 | // ---------------------------------------------------------------------------- | 671 | // ---------------------------------------------------------------------------- |
669 | 672 | ||
670 | void KODayMatrix::paintEvent(QPaintEvent * pevent) | 673 | void KODayMatrix::paintEvent(QPaintEvent * pevent) |
671 | { | 674 | { |
672 | 675 | ||
673 | if ( width() <= 0 || height() <= 0 ) | 676 | if ( width() <= 0 || height() <= 0 ) |
674 | return; | 677 | return; |
675 | if ( mPendingUpdateBeforeRepaint ) { | 678 | if ( mPendingUpdateBeforeRepaint ) { |
676 | updateViewTimed(); | 679 | updateViewTimed(); |
677 | mPendingUpdateBeforeRepaint = false; | 680 | mPendingUpdateBeforeRepaint = false; |
678 | } | 681 | } |
679 | if ( myPix.width() != width() || myPix.height()!=height() ) { | 682 | if ( myPix.width() != width() || myPix.height()!=height() ) { |
680 | myPix.resize(size() ); | 683 | myPix.resize(size() ); |
684 | mRedrawNeeded = true; | ||
681 | } | 685 | } |
686 | |||
687 | if ( mRedrawNeeded ) { | ||
688 | //qDebug("REDRAW "); | ||
682 | QPainter p(&myPix); | 689 | QPainter p(&myPix); |
683 | p.setFont(font()); | 690 | p.setFont(font()); |
684 | 691 | ||
685 | 692 | ||
686 | int dheight = daysize.height(); | 693 | int dheight = daysize.height(); |
687 | int dwidth = daysize.width(); | 694 | int dwidth = daysize.width(); |
688 | int row,col; | 695 | int row,col; |
689 | int selw, selh; | 696 | int selw, selh; |
690 | int xyOff = frameWidth(); | 697 | int xyOff = frameWidth(); |
691 | int colModulo = (width()-2) % 7; | 698 | int colModulo = (width()-2) % 7; |
692 | int rowModulo = (height()-2) % 6; | 699 | int rowModulo = (height()-2) % 6; |
693 | //qDebug("col %d row %d ",colModulo,rowModulo ); | 700 | //qDebug("col %d row %d ",colModulo,rowModulo ); |
694 | 701 | ||
695 | bool isRTL = KOGlobals::self()->reverseLayout(); | 702 | bool isRTL = KOGlobals::self()->reverseLayout(); |
696 | 703 | ||
697 | // draw background and topleft frame | 704 | // draw background and topleft frame |
698 | p.fillRect(0,0,width(),height(), mDefaultBackColor); | 705 | p.fillRect(0,0,width(),height(), mDefaultBackColor); |
699 | p.setPen(mDefaultTextColor); | 706 | p.setPen(mDefaultTextColor); |
700 | p.drawRect(0, 0, width(), height()); | 707 | p.drawRect(0, 0, width(), height()); |
701 | int mSelStartT = mSelStart; | 708 | int mSelStartT = mSelStart; |
702 | int mSelEndT = mSelEnd; | 709 | int mSelEndT = mSelEnd; |
703 | if ( mSelEndT >= NUMDAYS ) | 710 | if ( mSelEndT >= NUMDAYS ) |
704 | mSelEndT = NUMDAYS-1; | 711 | mSelEndT = NUMDAYS-1; |
705 | // draw selected days with highlighted background color | 712 | // draw selected days with highlighted background color |
706 | if (mSelStart != NOSELECTION) { | 713 | if (mSelStart != NOSELECTION) { |
707 | bool skip = false; | 714 | bool skip = false; |
708 | if ( ! mouseDown ) { | 715 | if ( ! mouseDown ) { |
709 | int mo = days[20].month(); | 716 | int mo = days[20].month(); |
710 | //qDebug("-- %d %d ", mSelStartT, mSelEndT); | 717 | //qDebug("-- %d %d ", mSelStartT, mSelEndT); |
711 | //qDebug("%d %d %d - d %d", mo, days[mSelStartT].month() , days[mSelEndT].month(), days[mSelEndT].day() ); | 718 | //qDebug("%d %d %d - d %d", mo, days[mSelStartT].month() , days[mSelEndT].month(), days[mSelEndT].day() ); |
712 | int startMo = days[mSelStartT].month(); | 719 | int startMo = days[mSelStartT].month(); |
713 | int endMo = days[mSelEndT].month(); | 720 | int endMo = days[mSelEndT].month(); |
714 | if ( startMo == 12 && mo == 1 && endMo <= 2 ) | 721 | if ( startMo == 12 && mo == 1 && endMo <= 2 ) |
715 | startMo = 1; | 722 | startMo = 1; |
716 | if ( endMo == 1 && mo == 12 ) | 723 | if ( endMo == 1 && mo == 12 ) |
717 | endMo = 12; | 724 | endMo = 12; |
718 | if ( mo == 12 && startMo == 1 ) | 725 | if ( mo == 12 && startMo == 1 ) |
719 | startMo = 13; | 726 | startMo = 13; |
720 | if ( (startMo > mo || endMo < mo) ) { | 727 | if ( (startMo > mo || endMo < mo) ) { |
721 | skip = true; | 728 | skip = true; |
722 | } else { | 729 | } else { |
723 | if ( days[mSelStartT].month() != mo ) { | 730 | if ( days[mSelStartT].month() != mo ) { |
724 | int add = days[mSelStartT].daysInMonth ()-days[mSelStartT].day(); | 731 | int add = days[mSelStartT].daysInMonth ()-days[mSelStartT].day(); |
725 | mSelStartT += add +1; | 732 | mSelStartT += add +1; |
726 | } | 733 | } |
727 | if ( days[mSelEndT].month() != mo ) { | 734 | if ( days[mSelEndT].month() != mo ) { |
728 | int sub = days[mSelEndT].day(); | 735 | int sub = days[mSelEndT].day(); |
729 | mSelEndT -= sub ; | 736 | mSelEndT -= sub ; |
@@ -882,74 +889,76 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) | |||
882 | if ( bDays.testBit(i) ) { | 889 | if ( bDays.testBit(i) ) { |
883 | if ( hDays.testBit(i) ) | 890 | if ( hDays.testBit(i) ) |
884 | p.setPen(QColor(Qt::green)); | 891 | p.setPen(QColor(Qt::green)); |
885 | else | 892 | else |
886 | p.setPen(QColor(Qt::green).dark()); | 893 | p.setPen(QColor(Qt::green).dark()); |
887 | } else { | 894 | } else { |
888 | if (actcol == mDefaultTextColor ) { | 895 | if (actcol == mDefaultTextColor ) { |
889 | p.setPen(KOPrefs::instance()->mHolidayColor); | 896 | p.setPen(KOPrefs::instance()->mHolidayColor); |
890 | } else { | 897 | } else { |
891 | p.setPen(mHolidayColorShaded); | 898 | p.setPen(mHolidayColorShaded); |
892 | } | 899 | } |
893 | } | 900 | } |
894 | } | 901 | } |
895 | 902 | ||
896 | // draw selected days with special color | 903 | // draw selected days with special color |
897 | // DO NOT specially highlight holidays in selection ! | 904 | // DO NOT specially highlight holidays in selection ! |
898 | if (i >= mSelStartT && i <= mSelEndT) { | 905 | if (i >= mSelStartT && i <= mSelEndT) { |
899 | ;//p.setPen(mSelectedDaysColor); | 906 | ;//p.setPen(mSelectedDaysColor); |
900 | } | 907 | } |
901 | 908 | ||
902 | int addCol = 0; | 909 | int addCol = 0; |
903 | int addRow = 0; | 910 | int addRow = 0; |
904 | if ( colModulo ) { | 911 | if ( colModulo ) { |
905 | if ( col >= 7 - colModulo ) | 912 | if ( col >= 7 - colModulo ) |
906 | addCol = col - 7 + colModulo; | 913 | addCol = col - 7 + colModulo; |
907 | } | 914 | } |
908 | if ( rowModulo ) { | 915 | if ( rowModulo ) { |
909 | if ( row >= 6 - rowModulo ) | 916 | if ( row >= 6 - rowModulo ) |
910 | addRow = row - 5 + rowModulo; | 917 | addRow = row - 5 + rowModulo; |
911 | } | 918 | } |
912 | //qDebug("add %d %d -- %d %d ", col, addCol, row, addRow); | 919 | //qDebug("add %d %d -- %d %d ", col, addCol, row, addRow); |
913 | ++addCol;//++addCol; | 920 | ++addCol;//++addCol; |
914 | if ( row == 0) | 921 | if ( row == 0) |
915 | addRow = 1; | 922 | addRow = 1; |
916 | p.drawText(col*dwidth+addCol, row*dheight+addRow, dwidth, dheight, | 923 | p.drawText(col*dwidth+addCol, row*dheight+addRow, dwidth, dheight, |
917 | Qt::AlignHCenter | Qt::AlignVCenter, daylbls[i]); | 924 | Qt::AlignHCenter | Qt::AlignVCenter, daylbls[i]); |
918 | 925 | ||
919 | // reset color to actual color | 926 | // reset color to actual color |
920 | if (!mHolidays[i].isNull()) { | 927 | if (!mHolidays[i].isNull()) { |
921 | p.setPen(actcol); | 928 | p.setPen(actcol); |
922 | } | 929 | } |
923 | // reset bold font to plain font | 930 | // reset bold font to plain font |
924 | if ( eDays.testBit(i)) { | 931 | if ( eDays.testBit(i)) { |
925 | QFont myFont = font(); | 932 | QFont myFont = font(); |
926 | myFont.setBold(false); | 933 | myFont.setBold(false); |
927 | p.setFont(myFont); | 934 | p.setFont(myFont); |
928 | } | 935 | } |
929 | } | 936 | } |
930 | int off = 0;//xyOff; | 937 | } else { |
931 | bitBlt (this, off, off, &myPix, 0 ,0,width(), height() ,CopyROP); | 938 | //qDebug("NO redraw "); |
932 | //qDebug("ffffffffff %d ", off); | 939 | } |
940 | bitBlt (this, 0, 0, &myPix, 0 ,0,width(), height() ,CopyROP); | ||
941 | mRedrawNeeded = false; | ||
933 | } | 942 | } |
934 | 943 | ||
935 | // ---------------------------------------------------------------------------- | 944 | // ---------------------------------------------------------------------------- |
936 | // R E SI Z E E V E N T H A N D L I N G | 945 | // R E SI Z E E V E N T H A N D L I N G |
937 | // ---------------------------------------------------------------------------- | 946 | // ---------------------------------------------------------------------------- |
938 | 947 | ||
939 | void KODayMatrix::resizeEvent(QResizeEvent *) | 948 | void KODayMatrix::resizeEvent(QResizeEvent *) |
940 | { | 949 | { |
941 | QRect sz = frameRect(); | 950 | QRect sz = frameRect(); |
942 | daysize.setHeight(sz.height()*7 / NUMDAYS); | 951 | daysize.setHeight(sz.height()*7 / NUMDAYS); |
943 | daysize.setWidth(sz.width() / 7); | 952 | daysize.setWidth(sz.width() / 7); |
944 | } | 953 | } |
945 | 954 | ||
946 | QSize KODayMatrix::sizeHint() const | 955 | QSize KODayMatrix::sizeHint() const |
947 | { | 956 | { |
948 | 957 | ||
949 | QFontMetrics fm ( font() ); | 958 | QFontMetrics fm ( font() ); |
950 | int wid = fm.width( "30") *7+3; | 959 | int wid = fm.width( "30") *7+3; |
951 | int hei = fm.height() * 6+3; | 960 | int hei = fm.height() * 6+3; |
952 | //qDebug("KODayMatrix::sizeHint()********************* %d %d", wid , hei); | 961 | //qDebug("KODayMatrix::sizeHint()********************* %d %d", wid , hei); |
953 | return QSize ( wid, hei ); | 962 | return QSize ( wid, hei ); |
954 | 963 | ||
955 | } | 964 | } |
diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h index 38a7f92..731117c 100644 --- a/korganizer/kodaymatrix.h +++ b/korganizer/kodaymatrix.h | |||
@@ -182,96 +182,97 @@ public slots: | |||
182 | void repaintViewTimed(); | 182 | void repaintViewTimed(); |
183 | 183 | ||
184 | /** | 184 | /** |
185 | * Calculate which square in the matrix should be | 185 | * Calculate which square in the matrix should be |
186 | * hilighted to indicate it's today. | 186 | * hilighted to indicate it's today. |
187 | */ | 187 | */ |
188 | void recalculateToday(); | 188 | void recalculateToday(); |
189 | 189 | ||
190 | /* | 190 | /* |
191 | void setStartDate(QDate); | 191 | void setStartDate(QDate); |
192 | */ | 192 | */ |
193 | 193 | ||
194 | signals: | 194 | signals: |
195 | 195 | ||
196 | /** emitted if the user selects a block of days with the mouse by dragging a rectangle | 196 | /** emitted if the user selects a block of days with the mouse by dragging a rectangle |
197 | * inside the matrix | 197 | * inside the matrix |
198 | * | 198 | * |
199 | * @param daylist list of days that have been selected by the user | 199 | * @param daylist list of days that have been selected by the user |
200 | */ | 200 | */ |
201 | void selected( const KCal::DateList &daylist ); | 201 | void selected( const KCal::DateList &daylist ); |
202 | 202 | ||
203 | /** emitted if the user has dropped an event inside the matrix | 203 | /** emitted if the user has dropped an event inside the matrix |
204 | * | 204 | * |
205 | * @param event the dropped calendar event | 205 | * @param event the dropped calendar event |
206 | */ | 206 | */ |
207 | void eventDropped(Event *event); | 207 | void eventDropped(Event *event); |
208 | 208 | ||
209 | protected: | 209 | protected: |
210 | 210 | ||
211 | void paintEvent(QPaintEvent *ev); | 211 | void paintEvent(QPaintEvent *ev); |
212 | 212 | ||
213 | void mousePressEvent (QMouseEvent* e); | 213 | void mousePressEvent (QMouseEvent* e); |
214 | 214 | ||
215 | void mouseReleaseEvent (QMouseEvent* e); | 215 | void mouseReleaseEvent (QMouseEvent* e); |
216 | 216 | ||
217 | void mouseMoveEvent (QMouseEvent* e); | 217 | void mouseMoveEvent (QMouseEvent* e); |
218 | 218 | ||
219 | void dragEnterEvent(QDragEnterEvent *); | 219 | void dragEnterEvent(QDragEnterEvent *); |
220 | 220 | ||
221 | void dragMoveEvent(QDragMoveEvent *); | 221 | void dragMoveEvent(QDragMoveEvent *); |
222 | 222 | ||
223 | void dragLeaveEvent(QDragLeaveEvent *); | 223 | void dragLeaveEvent(QDragLeaveEvent *); |
224 | 224 | ||
225 | void dropEvent(QDropEvent *); | 225 | void dropEvent(QDropEvent *); |
226 | 226 | ||
227 | void resizeEvent(QResizeEvent *); | 227 | void resizeEvent(QResizeEvent *); |
228 | 228 | ||
229 | private: | 229 | private: |
230 | bool mRedrawNeeded; | ||
230 | KODaymatrixWhatsThis* mKODaymatrixWhatsThis; | 231 | KODaymatrixWhatsThis* mKODaymatrixWhatsThis; |
231 | bool mouseDown; | 232 | bool mouseDown; |
232 | QBitArray bDays; | 233 | QBitArray bDays; |
233 | QBitArray hDays; | 234 | QBitArray hDays; |
234 | QBitArray eDays; | 235 | QBitArray eDays; |
235 | QPixmap myPix; | 236 | QPixmap myPix; |
236 | QTimer* mUpdateTimer; | 237 | QTimer* mUpdateTimer; |
237 | QTimer* mRepaintTimer; | 238 | QTimer* mRepaintTimer; |
238 | bool mDayChanged; | 239 | bool mDayChanged; |
239 | bool mPendingUpdateBeforeRepaint; | 240 | bool mPendingUpdateBeforeRepaint; |
240 | 241 | ||
241 | /** returns the index of the day located at the matrix's widget (x,y) position. | 242 | /** returns the index of the day located at the matrix's widget (x,y) position. |
242 | * | 243 | * |
243 | * @param x horizontal coordinate | 244 | * @param x horizontal coordinate |
244 | * @param y vertical coordinate | 245 | * @param y vertical coordinate |
245 | */ | 246 | */ |
246 | int getDayIndexFrom(int x, int y); | 247 | int getDayIndexFrom(int x, int y); |
247 | 248 | ||
248 | /** calculates a "shaded" color from the supplied color object. | 249 | /** calculates a "shaded" color from the supplied color object. |
249 | * (Copied from Cornelius's kdpdatebutton.cpp) | 250 | * (Copied from Cornelius's kdpdatebutton.cpp) |
250 | * | 251 | * |
251 | * @param color source based on which a shaded color should be calculated. | 252 | * @param color source based on which a shaded color should be calculated. |
252 | */ | 253 | */ |
253 | QColor getShadedColor(QColor color); | 254 | QColor getShadedColor(QColor color); |
254 | 255 | ||
255 | /** number of days to be displayed. For now there is no support for any other number then 42. | 256 | /** number of days to be displayed. For now there is no support for any other number then 42. |
256 | so change it at your own risk :o) */ | 257 | so change it at your own risk :o) */ |
257 | static const int NUMDAYS; | 258 | static const int NUMDAYS; |
258 | 259 | ||
259 | /** calendar instance to be queried for holidays, events, ... */ | 260 | /** calendar instance to be queried for holidays, events, ... */ |
260 | Calendar *mCalendar; | 261 | Calendar *mCalendar; |
261 | 262 | ||
262 | /** starting date of the matrix */ | 263 | /** starting date of the matrix */ |
263 | QDate startdate; | 264 | QDate startdate; |
264 | 265 | ||
265 | /** array of day labels to optimeize drawing performance. */ | 266 | /** array of day labels to optimeize drawing performance. */ |
266 | QString *daylbls; | 267 | QString *daylbls; |
267 | 268 | ||
268 | /** array of days displayed to reduce memory consumption by | 269 | /** array of days displayed to reduce memory consumption by |
269 | subsequently calling QDate::addDays(). */ | 270 | subsequently calling QDate::addDays(). */ |
270 | QDate *days; | 271 | QDate *days; |
271 | 272 | ||
272 | /** array of storing the number of events on a given day. | 273 | /** array of storing the number of events on a given day. |
273 | * used for drawing a bold font if there is at least one event on that day. | 274 | * used for drawing a bold font if there is at least one event on that day. |
274 | */ | 275 | */ |
275 | //int *events; | 276 | //int *events; |
276 | 277 | ||
277 | /** stores holiday names of the days shown in the matrix. */ | 278 | /** stores holiday names of the days shown in the matrix. */ |