summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-04-02 08:36:37 (UTC)
committer zautrix <zautrix>2005-04-02 08:36:37 (UTC)
commite7cb4c20af8b07bf923c864026481ce316c40e1d (patch) (unidiff)
treec88b2d0c01ce683e73ea9f4657f4d5c6fbe6f922
parent7aefe488d1fe0c34cf29460f48a9a97d632f615e (diff)
downloadkdepimpi-e7cb4c20af8b07bf923c864026481ce316c40e1d.zip
kdepimpi-e7cb4c20af8b07bf923c864026481ce316c40e1d.tar.gz
kdepimpi-e7cb4c20af8b07bf923c864026481ce316c40e1d.tar.bz2
more fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagendaview.cpp86
-rw-r--r--korganizer/kodaymatrix.cpp8
-rw-r--r--microkde/KDGanttMinimizeSplitter.cpp10
-rw-r--r--microkde/kdialogbase.cpp8
4 files changed, 88 insertions, 24 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 2b05d37..8d32152 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -1,413 +1,477 @@
1/* 1/*
2 This file is part of KOrganizer. 2 This file is part of KOrganizer.
3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> 3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
9 9
10 This program is distributed in the hope that it will be useful, 10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 13 GNU General Public License for more details.
14 14
15 You should have received a copy of the GNU General Public License 15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18 18
19 As a special exception, permission is given to link this program 19 As a special exception, permission is given to link this program
20 with any edition of Qt, and distribute the resulting executable, 20 with any edition of Qt, and distribute the resulting executable,
21 without including the source code for Qt in the source distribution. 21 without including the source code for Qt in the source distribution.
22*/ 22*/
23 23
24#include <qhbox.h> 24#include <qhbox.h>
25#include <qvbox.h> 25#include <qvbox.h>
26#include <qlabel.h> 26#include <qlabel.h>
27#include <qframe.h> 27#include <qframe.h>
28#include <qlayout.h> 28#include <qlayout.h>
29#ifndef KORG_NOSPLITTER 29#ifndef KORG_NOSPLITTER
30#include <qsplitter.h> 30#include <qsplitter.h>
31#endif 31#endif
32#include <qfont.h> 32#include <qfont.h>
33#include <qfontmetrics.h> 33#include <qfontmetrics.h>
34#include <qpopupmenu.h> 34#include <qpopupmenu.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 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;
72extern int globalFlagBlockAgenda; 72extern int globalFlagBlockAgenda;
73extern int globalFlagBlockStartup; 73extern int globalFlagBlockStartup;
74extern int globalFlagBlockAgendaItemPaint; 74extern int globalFlagBlockAgendaItemPaint;
75extern int globalFlagBlockAgendaItemUpdate; 75extern int globalFlagBlockAgendaItemUpdate;
76extern int globalFlagBlockLabel; 76extern int globalFlagBlockLabel;
77using namespace KOrg; 77using namespace KOrg;
78 78
79 79
80 80
81TimeLabels::TimeLabels(int rows,QWidget *parent,const char *name,WFlags f) : 81TimeLabels::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 myPix.resize( 1, 1 );
85 mRows = rows; 85 mRows = rows;
86 86
87 mRedrawNeeded = true; 87 mRedrawNeeded = true;
88 setMinimumHeight( 20 ); 88 setMinimumHeight( 20 );
89 mCellHeight = KOPrefs::instance()->mHourSize*4; 89 mCellHeight = KOPrefs::instance()->mHourSize*4;
90 90
91 enableClipper(true); 91 enableClipper(true);
92 92
93 setHScrollBarMode(AlwaysOff); 93 setHScrollBarMode(AlwaysOff);
94 setVScrollBarMode(AlwaysOff); 94 setVScrollBarMode(AlwaysOff);
95 95
96 resizeContents(50,mRows * mCellHeight); 96 resizeContents(50,mRows * mCellHeight);
97 97
98 viewport()->setBackgroundMode( PaletteBackground ); 98 viewport()->setBackgroundMode( PaletteBackground );
99} 99}
100 100
101void TimeLabels::setCellHeight(int height) 101void TimeLabels::setCellHeight(int height)
102{ 102{
103 mCellHeight = height; 103 mCellHeight = height;
104} 104}
105 105
106/* 106/*
107 Optimization so that only the "dirty" portion of the scroll view 107 Optimization so that only the "dirty" portion of the scroll view
108 is redrawn. Unfortunately, this is not called by default paintEvent() method. 108 is redrawn. Unfortunately, this is not called by default paintEvent() method.
109*/ 109*/
110void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch) 110void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
111{ 111{
112 112
113 // if ( globalFlagBlockAgenda ) 113 cx = contentsX() + frameWidth()*2;
114 // return; 114 cw = contentsWidth() ;
115 // bug: the parameters cx, cy, cw, ch are the areas that need to be 115 // end of workaround
116 // redrawn, not the area of the widget. unfortunately, this 116
117 // code assumes the latter... 117 int cell = ((int)(cy/mCellHeight));
118 118 int y = cell * mCellHeight;
119 // now, for a workaround... 119 QFontMetrics fm = fontMetrics();
120 // these two assignments fix the weird redraw bug 120 QString hour;
121 QString suffix = "am";
122 int timeHeight = fm.ascent();
123 QFont nFont = p->font();
124
125 if (!KGlobal::locale()->use12Clock()) {
126 if ( QApplication::desktop()->width() <= 320 )
127 suffix = "00";
128 else
129 suffix = "00";
130 }
131
132 if ( timeHeight > mCellHeight ) {
133 timeHeight = mCellHeight-1;
134 int pointS = nFont.pointSize();
135 while ( pointS > 4 ) {
136 nFont.setPointSize( pointS );
137 fm = QFontMetrics( nFont );
138 if ( fm.ascent() < mCellHeight )
139 break;
140 -- pointS;
141 }
142 fm = QFontMetrics( nFont );
143 timeHeight = fm.ascent();
144 }
145 //timeHeight -= (timeHeight/4-2);
146 QFont sFont = nFont;
147 sFont.setPointSize( sFont.pointSize()/2 );
148 QFontMetrics fmS( sFont );
149 int sHei = fmS.ascent() ;
150 //sHei -= (sHei/4-2);
151 int startW = this->width() - frameWidth()-2;
152 int tw2 = fmS.width(suffix);
153 timeHeight = (timeHeight-1) /2 -1;
154 while (y < cy + ch+mCellHeight) {
155 p->drawLine(startW-tw2+1 ,y,cw,y);
156 hour.setNum(cell);
157 // handle 24h and am/pm time formats
158 if (KGlobal::locale()->use12Clock()) {
159 if (cell > 11) suffix = "pm";
160 else
161 suffix = "am";
162 if (cell == 0) hour.setNum(12);
163 if (cell > 12) hour.setNum(cell - 12);
164 }
165
166 // center and draw the time label
167 int timeWidth = fm.width(hour);
168 int offset = startW - timeWidth - tw2 ;
169 p->setFont( nFont );
170 p->drawText( offset, y+ timeHeight, hour);
171 p->setFont( sFont );
172 offset = startW - tw2+1;
173 p->drawText( offset, y -1, suffix);
174
175 // increment indices
176 y += mCellHeight;
177 cell++;
178 }
179
180
181
182
183#if 0
121 mRedrawNeeded = true; 184 mRedrawNeeded = true;
122 if ( mRedrawNeeded ) { 185 if ( mRedrawNeeded ) {
123 cx = contentsX() + frameWidth()*2; 186 cx = contentsX() + frameWidth()*2;
124 cw = contentsWidth() ; 187 cw = contentsWidth() ;
125 // end of workaround 188 // end of workaround
126 189
127 int cell = ((int)(cy/mCellHeight)); 190 int cell = ((int)(cy/mCellHeight));
128 int y = cell * mCellHeight; 191 int y = cell * mCellHeight;
129 QFontMetrics fm = fontMetrics(); 192 QFontMetrics fm = fontMetrics();
130 QString hour; 193 QString hour;
131 QString suffix; 194 QString suffix;
132 int timeHeight = fm.ascent(); 195 int timeHeight = fm.ascent();
133 QFont nFont = p->font(); 196 QFont nFont = p->font();
134 197
135 if (!KGlobal::locale()->use12Clock()) { 198 if (!KGlobal::locale()->use12Clock()) {
136 if ( QApplication::desktop()->width() <= 320 ) 199 if ( QApplication::desktop()->width() <= 320 )
137 suffix = ""; 200 suffix = "";
138 else 201 else
139 suffix = "00"; 202 suffix = "00";
140 } 203 }
141 204
142 if ( timeHeight > mCellHeight ) { 205 if ( timeHeight > mCellHeight ) {
143 timeHeight = mCellHeight-1; 206 timeHeight = mCellHeight-1;
144 int pointS = nFont.pointSize(); 207 int pointS = nFont.pointSize();
145 while ( pointS > 4 ) { 208 while ( pointS > 4 ) {
146 nFont.setPointSize( pointS ); 209 nFont.setPointSize( pointS );
147 fm = QFontMetrics( nFont ); 210 fm = QFontMetrics( nFont );
148 if ( fm.ascent() < mCellHeight ) 211 if ( fm.ascent() < mCellHeight )
149 break; 212 break;
150 -- pointS; 213 -- pointS;
151 } 214 }
152 fm = QFontMetrics( nFont ); 215 fm = QFontMetrics( nFont );
153 timeHeight = fm.ascent(); 216 timeHeight = fm.ascent();
154 } 217 }
155 //timeHeight -= (timeHeight/4-2); 218 //timeHeight -= (timeHeight/4-2);
156 QFont sFont = nFont; 219 QFont sFont = nFont;
157 sFont.setPointSize( sFont.pointSize()/2 ); 220 sFont.setPointSize( sFont.pointSize()/2 );
158 QFontMetrics fmS( sFont ); 221 QFontMetrics fmS( sFont );
159 int sHei = fmS.ascent() ; 222 int sHei = fmS.ascent() ;
160 //sHei -= (sHei/4-2); 223 //sHei -= (sHei/4-2);
161 int startW = this->width() - frameWidth()-2; 224 int startW = this->width() - frameWidth()-2;
162 int tw2 = fmS.width(suffix); 225 int tw2 = fmS.width(suffix);
163 while (y < cy + ch) { 226 while (y < cy + ch) {
164 p->drawLine(cx,y,cw,y); 227 p->drawLine(cx,y,cw,y);
165 hour.setNum(cell); 228 hour.setNum(cell);
166 // handle 24h and am/pm time formats 229 // handle 24h and am/pm time formats
167 if (KGlobal::locale()->use12Clock()) { 230 if (KGlobal::locale()->use12Clock()) {
168 if (cell > 11) suffix = "pm"; 231 if (cell > 11) suffix = "pm";
169 else 232 else
170 suffix = "am"; 233 suffix = "am";
171 if (cell == 0) hour.setNum(12); 234 if (cell == 0) hour.setNum(12);
172 if (cell > 12) hour.setNum(cell - 12); 235 if (cell > 12) hour.setNum(cell - 12);
173 tw2 = fmS.width(suffix); 236 tw2 = fmS.width(suffix);
174 } 237 }
175 238
176 // center and draw the time label 239 // center and draw the time label
177 int timeWidth = fm.width(hour); 240 int timeWidth = fm.width(hour);
178 int offset = startW - timeWidth - tw2 ; 241 int offset = startW - timeWidth - tw2 ;
179 p->setFont( nFont ); 242 p->setFont( nFont );
180 p->drawText( offset, y+ timeHeight, hour); 243 p->drawText( offset, y+ timeHeight, hour);
181 p->setFont( sFont ); 244 p->setFont( sFont );
182 offset = startW - tw2+1; 245 offset = startW - tw2+1;
183 p->drawText( offset, y+ sHei, suffix); 246 p->drawText( offset, y+ sHei, suffix);
184 247
185 // increment indices 248 // increment indices
186 y += mCellHeight; 249 y += mCellHeight;
187 cell++; 250 cell++;
188 } 251 }
189 } else { 252 } else {
190 //qDebug("NO redraw "); 253 //qDebug("NO redraw ");
191 } 254 }
192 // double buffer not yet implemented 255 // double buffer not yet implemented
193 //bitBlt (this, 0, 0, &myPix, 0 ,0,width(), height() ,CopyROP); 256 //bitBlt (this, 0, 0, &myPix, 0 ,0,width(), height() ,CopyROP);
194 //mRedrawNeeded = false; 257 //mRedrawNeeded = false;
258#endif
195} 259}
196 260
197/** 261/**
198 Calculates the minimum width. 262 Calculates the minimum width.
199*/ 263*/
200int TimeLabels::minimumWidth() const 264int TimeLabels::minimumWidth() const
201{ 265{
202 return mMiniWidth; 266 return mMiniWidth;
203} 267}
204 268
205/** updates widget's internal state */ 269/** updates widget's internal state */
206void TimeLabels::updateConfig() 270void TimeLabels::updateConfig()
207{ 271{
208 mRedrawNeeded = true; 272 mRedrawNeeded = true;
209 // set the font 273 // set the font
210 // config->setGroup("Fonts"); 274 // config->setGroup("Fonts");
211 // QFont font = config->readFontEntry("TimeBar Font"); 275 // QFont font = config->readFontEntry("TimeBar Font");
212 setFont(KOPrefs::instance()->mTimeBarFont); 276 setFont(KOPrefs::instance()->mTimeBarFont);
213 QString test = "20"; 277 QString test = "20";
214 if (KGlobal::locale()->use12Clock()) 278 if (KGlobal::locale()->use12Clock())
215 test = "12"; 279 test = "12";
216 mMiniWidth = fontMetrics().width(test); 280 mMiniWidth = fontMetrics().width(test);
217 if (KGlobal::locale()->use12Clock()) 281 if (KGlobal::locale()->use12Clock())
218 test = "pm"; 282 test = "pm";
219 else { 283 else {
220 if ( QApplication::desktop()->width() <= 320 ) 284 if ( QApplication::desktop()->width() <= 320 )
221 test = ""; 285 test = "00";
222 else 286 else
223 test = "00"; 287 test = "00";
224 } 288 }
225 QFont sFont = font(); 289 QFont sFont = font();
226 sFont.setPointSize( sFont.pointSize()/2 ); 290 sFont.setPointSize( sFont.pointSize()/2 );
227 QFontMetrics fmS( sFont ); 291 QFontMetrics fmS( sFont );
228 mMiniWidth += fmS.width( test ) + frameWidth()*2 +4 ; 292 mMiniWidth += fmS.width( test ) + frameWidth()*2 +4 ;
229 // update geometry restrictions based on new settings 293 // update geometry restrictions based on new settings
230 setFixedWidth( mMiniWidth ); 294 setFixedWidth( mMiniWidth );
231 295
232 // update HourSize 296 // update HourSize
233 mCellHeight = KOPrefs::instance()->mHourSize*4; 297 mCellHeight = KOPrefs::instance()->mHourSize*4;
234 resizeContents(50,mRows * mCellHeight); 298 resizeContents(50,mRows * mCellHeight);
235} 299}
236 300
237/** update time label positions */ 301/** update time label positions */
238void TimeLabels::positionChanged() 302void TimeLabels::positionChanged()
239{ 303{
240 int adjustment = mAgenda->contentsY(); 304 int adjustment = mAgenda->contentsY();
241 setContentsPos(0, adjustment); 305 setContentsPos(0, adjustment);
242} 306}
243 307
244/** */ 308/** */
245void TimeLabels::setAgenda(KOAgenda* agenda) 309void TimeLabels::setAgenda(KOAgenda* agenda)
246{ 310{
247 mAgenda = agenda; 311 mAgenda = agenda;
248} 312}
249 313
250void TimeLabels::contentsMousePressEvent ( QMouseEvent * e) 314void TimeLabels::contentsMousePressEvent ( QMouseEvent * e)
251{ 315{
252 mMouseDownY = e->pos().y(); 316 mMouseDownY = e->pos().y();
253 mOrgCap = topLevelWidget()->caption(); 317 mOrgCap = topLevelWidget()->caption();
254} 318}
255 319
256void TimeLabels::contentsMouseMoveEvent ( QMouseEvent * e ) 320void TimeLabels::contentsMouseMoveEvent ( QMouseEvent * e )
257{ 321{
258 int diff = mMouseDownY - e->pos().y(); 322 int diff = mMouseDownY - e->pos().y();
259 if ( diff < 10 && diff > -10 ) 323 if ( diff < 10 && diff > -10 )
260 return; 324 return;
261 int tSize = KOPrefs::instance()->mHourSize + (diff/10) ; 325 int tSize = KOPrefs::instance()->mHourSize + (diff/10) ;
262 if ( tSize < 4 ) 326 if ( tSize < 4 )
263 tSize = 4; 327 tSize = 4;
264 if ( tSize > 22 ) 328 if ( tSize > 22 )
265 tSize = 22; 329 tSize = 22;
266 tSize = (tSize-2)/2; 330 tSize = (tSize-2)/2;
267 topLevelWidget()->setCaption(i18n("New Agendasize: %1").arg(tSize)); 331 topLevelWidget()->setCaption(i18n("New Agendasize: %1").arg(tSize));
268 332
269} 333}
270void TimeLabels::contentsMouseReleaseEvent ( QMouseEvent * e ) 334void TimeLabels::contentsMouseReleaseEvent ( QMouseEvent * e )
271{ 335{
272 topLevelWidget()->setCaption( mOrgCap ); 336 topLevelWidget()->setCaption( mOrgCap );
273 int diff = mMouseDownY - e->pos().y(); 337 int diff = mMouseDownY - e->pos().y();
274 if ( diff < 10 && diff > -10 ) 338 if ( diff < 10 && diff > -10 )
275 return; 339 return;
276 int tSize = KOPrefs::instance()->mHourSize + (diff/10); 340 int tSize = KOPrefs::instance()->mHourSize + (diff/10);
277 if ( tSize < 4 ) 341 if ( tSize < 4 )
278 tSize = 4; 342 tSize = 4;
279 if ( tSize > 22 ) 343 if ( tSize > 22 )
280 tSize = 22; 344 tSize = 22;
281 tSize = (tSize/2)*2; 345 tSize = (tSize/2)*2;
282 if ( tSize == KOPrefs::instance()->mHourSize ) 346 if ( tSize == KOPrefs::instance()->mHourSize )
283 return; 347 return;
284 KOPrefs::instance()->mHourSize = tSize; 348 KOPrefs::instance()->mHourSize = tSize;
285 emit scaleChanged(); 349 emit scaleChanged();
286} 350}
287 351
288/** This is called in response to repaint() */ 352/** This is called in response to repaint() */
289void TimeLabels::paintEvent(QPaintEvent*) 353void TimeLabels::paintEvent(QPaintEvent*)
290{ 354{
291 355
292 // kdDebug() << "paintevent..." << endl; 356 // kdDebug() << "paintevent..." << endl;
293 // this is another hack! 357 // this is another hack!
294 // QPainter painter(this); 358 // QPainter painter(this);
295 //QString c 359 //QString c
296 repaintContents(contentsX(), contentsY(), visibleWidth(), visibleHeight()); 360 repaintContents(contentsX(), contentsY(), visibleWidth(), visibleHeight());
297} 361}
298 362
299//////////////////////////////////////////////////////////////////////////// 363////////////////////////////////////////////////////////////////////////////
300 364
301EventIndicator::EventIndicator(Location loc,QWidget *parent,const char *name) 365EventIndicator::EventIndicator(Location loc,QWidget *parent,const char *name)
302 : QFrame(parent,name) 366 : QFrame(parent,name)
303{ 367{
304 mColumns = 1; 368 mColumns = 1;
305 mTopBox = 0; 369 mTopBox = 0;
306 mLocation = loc; 370 mLocation = loc;
307 mTopLayout = 0; 371 mTopLayout = 0;
308 mPaintWidget = 0; 372 mPaintWidget = 0;
309 mXOffset = 0; 373 mXOffset = 0;
310 if (mLocation == Top) mPixmap = SmallIcon("1uparrow"); 374 if (mLocation == Top) mPixmap = SmallIcon("1uparrow");
311 else mPixmap = SmallIcon("1downarrow"); 375 else mPixmap = SmallIcon("1downarrow");
312 mEnabled.resize(mColumns); 376 mEnabled.resize(mColumns);
313 mEnabled.fill( false ); 377 mEnabled.fill( false );
314 setMinimumHeight(mPixmap.height()); 378 setMinimumHeight(mPixmap.height());
315} 379}
316 380
317EventIndicator::~EventIndicator() 381EventIndicator::~EventIndicator()
318{ 382{
319} 383}
320 384
321void EventIndicator::drawContents(QPainter *p) 385void EventIndicator::drawContents(QPainter *p)
322{ 386{
323 387
324 // kdDebug() << "======== top: " << contentsRect().top() << " bottom " << // contentsRect().bottom() << " left " << contentsRect().left() << " right " << contentsRect().right() << endl; 388 // kdDebug() << "======== top: " << contentsRect().top() << " bottom " << // contentsRect().bottom() << " left " << contentsRect().left() << " right " << contentsRect().right() << endl;
325 KDGanttSplitterHandle* han = 0; 389 KDGanttSplitterHandle* han = 0;
326 if ( mPaintWidget ) 390 if ( mPaintWidget )
327 han = mPaintWidget->firstHandle(); 391 han = mPaintWidget->firstHandle();
328 if ( ! han ) { 392 if ( ! han ) {
329 int i; 393 int i;
330 for(i=0;i<mColumns;++i) { 394 for(i=0;i<mColumns;++i) {
331 if (mEnabled[i]) { 395 if (mEnabled[i]) {
332 int cellWidth = contentsRect().right()/mColumns; 396 int cellWidth = contentsRect().right()/mColumns;
333 int xOffset = KOGlobals::self()->reverseLayout() ? 397 int xOffset = KOGlobals::self()->reverseLayout() ?
334 (mColumns - 1 - i)*cellWidth + (cellWidth -mPixmap.width())/2 : 398 (mColumns - 1 - i)*cellWidth + (cellWidth -mPixmap.width())/2 :
335 i*cellWidth + (cellWidth -mPixmap.width()) /2; 399 i*cellWidth + (cellWidth -mPixmap.width()) /2;
336 p->drawPixmap(QPoint(1+xOffset,0),mPixmap); 400 p->drawPixmap(QPoint(1+xOffset,0),mPixmap);
337 } 401 }
338 } 402 }
339 } else { 403 } else {
340 han->repaint(); 404 han->repaint();
341 //mPaintWidget->setBackgroundColor( red ); 405 //mPaintWidget->setBackgroundColor( red );
342 406
343 QPainter pa( han ); 407 QPainter pa( han );
344 int i; 408 int i;
345 bool setColor = false; 409 bool setColor = false;
346 for(i=0;i<mColumns;++i) { 410 for(i=0;i<mColumns;++i) {
347 if (mEnabled[i]) { 411 if (mEnabled[i]) {
348 setColor = true; 412 setColor = true;
349 413
350 int cellWidth = contentsRect().right()/mColumns; 414 int cellWidth = contentsRect().right()/mColumns;
351 int xOffset = KOGlobals::self()->reverseLayout() ? 415 int xOffset = KOGlobals::self()->reverseLayout() ?
352 (mColumns - 1 - i)*cellWidth + cellWidth/2 -mPixmap.width()/2 : 416 (mColumns - 1 - i)*cellWidth + cellWidth/2 -mPixmap.width()/2 :
353 i*cellWidth + cellWidth/2 -mPixmap.width()/2; 417 i*cellWidth + cellWidth/2 -mPixmap.width()/2;
354 pa.drawPixmap(QPoint(mXOffset + xOffset,0),mPixmap); 418 pa.drawPixmap(QPoint(mXOffset + xOffset,0),mPixmap);
355 //qDebug("222draw pix %d ",xOffset ); 419 //qDebug("222draw pix %d ",xOffset );
356 420
357 } 421 }
358 422
359 } 423 }
360 pa.end(); 424 pa.end();
361 425
362 } 426 }
363} 427}
364 428
365void EventIndicator::setXOffset( int x ) 429void EventIndicator::setXOffset( int x )
366{ 430{
367 mXOffset = x; 431 mXOffset = x;
368} 432}
369void EventIndicator::setPaintWidget( KDGanttMinimizeSplitter * w ) 433void EventIndicator::setPaintWidget( KDGanttMinimizeSplitter * w )
370{ 434{
371 mPaintWidget = w; 435 mPaintWidget = w;
372 setMaximumHeight(0); 436 setMaximumHeight(0);
373 setMinimumHeight(0); 437 setMinimumHeight(0);
374} 438}
375void EventIndicator::changeColumns(int columns) 439void EventIndicator::changeColumns(int columns)
376{ 440{
377 mColumns = columns; 441 mColumns = columns;
378 mEnabled.resize(mColumns); 442 mEnabled.resize(mColumns);
379 443
380 update(); 444 update();
381} 445}
382 446
383void EventIndicator::enableColumn(int column, bool enable) 447void EventIndicator::enableColumn(int column, bool enable)
384{ 448{
385 mEnabled[column] = enable; 449 mEnabled[column] = enable;
386} 450}
387 451
388 452
389//////////////////////////////////////////////////////////////////////////// 453////////////////////////////////////////////////////////////////////////////
390//////////////////////////////////////////////////////////////////////////// 454////////////////////////////////////////////////////////////////////////////
391//////////////////////////////////////////////////////////////////////////// 455////////////////////////////////////////////////////////////////////////////
392 456
393KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) : 457KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
394 KOEventView (cal,parent,name) 458 KOEventView (cal,parent,name)
395{ 459{
396 mBlockUpdating = true; 460 mBlockUpdating = true;
397 mStartHour = 8; 461 mStartHour = 8;
398 mSelectedDates.append(QDate::currentDate()); 462 mSelectedDates.append(QDate::currentDate());
399 463
400 mLayoutDayLabels = 0; 464 mLayoutDayLabels = 0;
401 mDayLabelsFrame = 0; 465 mDayLabelsFrame = 0;
402 mDayLabels = 0; 466 mDayLabels = 0;
403 bool isRTL = KOGlobals::self()->reverseLayout(); 467 bool isRTL = KOGlobals::self()->reverseLayout();
404 QPixmap expandPix; 468 QPixmap expandPix;
405 if ( KOPrefs::instance()->mVerticalScreen ) { 469 if ( KOPrefs::instance()->mVerticalScreen ) {
406 expandPix = SmallIcon( "1updownarrow" ); 470 expandPix = SmallIcon( "1updownarrow" );
407 } else { 471 } else {
408 expandPix = SmallIcon("1leftrightarrow" ); 472 expandPix = SmallIcon("1leftrightarrow" );
409 } 473 }
410 474
411 QBoxLayout *topLayout = new QVBoxLayout(this); 475 QBoxLayout *topLayout = new QVBoxLayout(this);
412 476
413 // Create day name labels for agenda columns 477 // Create day name labels for agenda columns
@@ -485,445 +549,449 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
485 mAgendaPopup->addAdditionalItem(QIconSet(SmallIcon("bell")), 549 mAgendaPopup->addAdditionalItem(QIconSet(SmallIcon("bell")),
486 i18n("Toggle Alarm"),mAgenda, 550 i18n("Toggle Alarm"),mAgenda,
487 SLOT(popupAlarm()),true); 551 SLOT(popupAlarm()),true);
488 552
489 553
490 connect(mAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)), 554 connect(mAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)),
491 mAgendaPopup,SLOT(showIncidencePopup(Incidence *))); 555 mAgendaPopup,SLOT(showIncidencePopup(Incidence *)));
492 556
493 // make connections between dependent widgets 557 // make connections between dependent widgets
494 mTimeLabels->setAgenda(mAgenda); 558 mTimeLabels->setAgenda(mAgenda);
495 559
496 // Update widgets to reflect user preferences 560 // Update widgets to reflect user preferences
497 // updateConfig(); 561 // updateConfig();
498 562
499 // createDayLabels(); 563 // createDayLabels();
500 564
501 // these blank widgets make the All Day Event box line up with the agenda 565 // these blank widgets make the All Day Event box line up with the agenda
502 dummyAllDayRight->setFixedWidth(mAgenda->verticalScrollBar()->width()); 566 dummyAllDayRight->setFixedWidth(mAgenda->verticalScrollBar()->width());
503 dummyAgendaRight->setFixedWidth(mAgenda->verticalScrollBar()->width()); 567 dummyAgendaRight->setFixedWidth(mAgenda->verticalScrollBar()->width());
504 mDummyAllDayLeft->setFixedWidth(mTimeLabels->width()); 568 mDummyAllDayLeft->setFixedWidth(mTimeLabels->width());
505 569
506 // Scrolling 570 // Scrolling
507 connect(mAgenda->verticalScrollBar(),SIGNAL(valueChanged(int)), 571 connect(mAgenda->verticalScrollBar(),SIGNAL(valueChanged(int)),
508 mTimeLabels, SLOT(positionChanged())); 572 mTimeLabels, SLOT(positionChanged()));
509 connect(mTimeLabels->verticalScrollBar(),SIGNAL(valueChanged(int)), 573 connect(mTimeLabels->verticalScrollBar(),SIGNAL(valueChanged(int)),
510 SLOT(setContentsPos(int))); 574 SLOT(setContentsPos(int)));
511 575
512 connect(mAgenda,SIGNAL(showDateView( int, int)),SLOT(slotShowDateView( int, int ))); 576 connect(mAgenda,SIGNAL(showDateView( int, int)),SLOT(slotShowDateView( int, int )));
513 connect(mAllDayAgenda,SIGNAL(showDateView( int, int )), SLOT(slotShowDateView( int, int ) )); 577 connect(mAllDayAgenda,SIGNAL(showDateView( int, int )), SLOT(slotShowDateView( int, int ) ));
514 578
515 // Create/Show/Edit/Delete Event 579 // Create/Show/Edit/Delete Event
516 connect(mAgenda,SIGNAL(newEventSignal(int,int)), 580 connect(mAgenda,SIGNAL(newEventSignal(int,int)),
517 SLOT(newEvent(int,int))); 581 SLOT(newEvent(int,int)));
518 connect(mAgenda,SIGNAL(newTodoSignal(int,int)), 582 connect(mAgenda,SIGNAL(newTodoSignal(int,int)),
519 SLOT(newTodo(int,int))); 583 SLOT(newTodo(int,int)));
520 connect(mAgenda,SIGNAL(newEventSignal(int,int,int,int)), 584 connect(mAgenda,SIGNAL(newEventSignal(int,int,int,int)),
521 SLOT(newEvent(int,int,int,int))); 585 SLOT(newEvent(int,int,int,int)));
522 connect(mAllDayAgenda,SIGNAL(newEventSignal(int,int)), 586 connect(mAllDayAgenda,SIGNAL(newEventSignal(int,int)),
523 SLOT(newEventAllDay(int,int))); 587 SLOT(newEventAllDay(int,int)));
524 connect(mAllDayAgenda,SIGNAL(newTodoSignal(int,int)), 588 connect(mAllDayAgenda,SIGNAL(newTodoSignal(int,int)),
525 SLOT(newTodoAllDay(int,int))); 589 SLOT(newTodoAllDay(int,int)));
526 connect(mAllDayAgenda,SIGNAL(newEventSignal(int,int,int,int)), 590 connect(mAllDayAgenda,SIGNAL(newEventSignal(int,int,int,int)),
527 SLOT(newEventAllDay(int,int))); 591 SLOT(newEventAllDay(int,int)));
528 connect(mAgenda,SIGNAL(newTimeSpanSignal(int,int,int,int)), 592 connect(mAgenda,SIGNAL(newTimeSpanSignal(int,int,int,int)),
529 SLOT(newTimeSpanSelected(int,int,int,int))); 593 SLOT(newTimeSpanSelected(int,int,int,int)));
530 connect(mAllDayAgenda,SIGNAL(newTimeSpanSignal(int,int,int,int)), 594 connect(mAllDayAgenda,SIGNAL(newTimeSpanSignal(int,int,int,int)),
531 SLOT(newTimeSpanSelectedAllDay(int,int,int,int))); 595 SLOT(newTimeSpanSelectedAllDay(int,int,int,int)));
532 connect(mAgenda,SIGNAL(newStartSelectSignal()),SLOT(updateView())); 596 connect(mAgenda,SIGNAL(newStartSelectSignal()),SLOT(updateView()));
533 connect(mAllDayAgenda,SIGNAL(newStartSelectSignal()),SLOT(updateView())); 597 connect(mAllDayAgenda,SIGNAL(newStartSelectSignal()),SLOT(updateView()));
534 598
535 connect(mAgenda,SIGNAL(editIncidenceSignal(Incidence *)), 599 connect(mAgenda,SIGNAL(editIncidenceSignal(Incidence *)),
536 SIGNAL(editIncidenceSignal(Incidence *))); 600 SIGNAL(editIncidenceSignal(Incidence *)));
537 connect(mAllDayAgenda,SIGNAL(editIncidenceSignal(Incidence *)), 601 connect(mAllDayAgenda,SIGNAL(editIncidenceSignal(Incidence *)),
538 SIGNAL(editIncidenceSignal(Incidence *))); 602 SIGNAL(editIncidenceSignal(Incidence *)));
539 connect(mAgenda,SIGNAL(showIncidenceSignal(Incidence *)), 603 connect(mAgenda,SIGNAL(showIncidenceSignal(Incidence *)),
540 SIGNAL(showIncidenceSignal(Incidence *))); 604 SIGNAL(showIncidenceSignal(Incidence *)));
541 connect(mAllDayAgenda,SIGNAL(showIncidenceSignal(Incidence *)), 605 connect(mAllDayAgenda,SIGNAL(showIncidenceSignal(Incidence *)),
542 SIGNAL(showIncidenceSignal(Incidence *))); 606 SIGNAL(showIncidenceSignal(Incidence *)));
543 connect(mAgenda,SIGNAL(deleteIncidenceSignal(Incidence *)), 607 connect(mAgenda,SIGNAL(deleteIncidenceSignal(Incidence *)),
544 SIGNAL(deleteIncidenceSignal(Incidence *))); 608 SIGNAL(deleteIncidenceSignal(Incidence *)));
545 connect(mAllDayAgenda,SIGNAL(deleteIncidenceSignal(Incidence *)), 609 connect(mAllDayAgenda,SIGNAL(deleteIncidenceSignal(Incidence *)),
546 SIGNAL(deleteIncidenceSignal(Incidence *))); 610 SIGNAL(deleteIncidenceSignal(Incidence *)));
547 611
548 connect(mAgenda,SIGNAL(itemModified(KOAgendaItem *, int )), 612 connect(mAgenda,SIGNAL(itemModified(KOAgendaItem *, int )),
549 SLOT(updateEventDates(KOAgendaItem *, int ))); 613 SLOT(updateEventDates(KOAgendaItem *, int )));
550 connect(mAllDayAgenda,SIGNAL(itemModified(KOAgendaItem *, int )), 614 connect(mAllDayAgenda,SIGNAL(itemModified(KOAgendaItem *, int )),
551 SLOT(updateEventDates(KOAgendaItem *, int))); 615 SLOT(updateEventDates(KOAgendaItem *, int)));
552 616
553 // event indicator update 617 // event indicator update
554 connect(mAgenda,SIGNAL(lowerYChanged(int)), 618 connect(mAgenda,SIGNAL(lowerYChanged(int)),
555 SLOT(updateEventIndicatorTop(int))); 619 SLOT(updateEventIndicatorTop(int)));
556 connect(mAgenda,SIGNAL(upperYChanged(int)), 620 connect(mAgenda,SIGNAL(upperYChanged(int)),
557 SLOT(updateEventIndicatorBottom(int))); 621 SLOT(updateEventIndicatorBottom(int)));
558 // drag signals 622 // drag signals
559 /* 623 /*
560 connect(mAgenda,SIGNAL(startDragSignal(Event *)), 624 connect(mAgenda,SIGNAL(startDragSignal(Event *)),
561 SLOT(startDrag(Event *))); 625 SLOT(startDrag(Event *)));
562 connect(mAllDayAgenda,SIGNAL(startDragSignal(Event *)), 626 connect(mAllDayAgenda,SIGNAL(startDragSignal(Event *)),
563 SLOT(startDrag(Event *))); 627 SLOT(startDrag(Event *)));
564 */ 628 */
565 // synchronize selections 629 // synchronize selections
566 connect( mAgenda, SIGNAL( incidenceSelected( Incidence * ) ), 630 connect( mAgenda, SIGNAL( incidenceSelected( Incidence * ) ),
567 mAllDayAgenda, SLOT( deselectItem() ) ); 631 mAllDayAgenda, SLOT( deselectItem() ) );
568 connect( mAllDayAgenda, SIGNAL( incidenceSelected( Incidence * ) ), 632 connect( mAllDayAgenda, SIGNAL( incidenceSelected( Incidence * ) ),
569 mAgenda, SLOT( deselectItem() ) ); 633 mAgenda, SLOT( deselectItem() ) );
570 connect( mAgenda, SIGNAL( incidenceSelected( Incidence * ) ), 634 connect( mAgenda, SIGNAL( incidenceSelected( Incidence * ) ),
571 SIGNAL( incidenceSelected( Incidence * ) ) ); 635 SIGNAL( incidenceSelected( Incidence * ) ) );
572 connect( mAllDayAgenda, SIGNAL( incidenceSelected( Incidence * ) ), 636 connect( mAllDayAgenda, SIGNAL( incidenceSelected( Incidence * ) ),
573 SIGNAL( incidenceSelected( Incidence * ) ) ); 637 SIGNAL( incidenceSelected( Incidence * ) ) );
574 connect( mAgenda, SIGNAL( resizedSignal() ), 638 connect( mAgenda, SIGNAL( resizedSignal() ),
575 SLOT( updateConfig( ) ) ); 639 SLOT( updateConfig( ) ) );
576 connect( mAgenda, SIGNAL( addToCalSignal(Incidence *, Incidence *) ), 640 connect( mAgenda, SIGNAL( addToCalSignal(Incidence *, Incidence *) ),
577 SLOT( addToCalSlot(Incidence *, Incidence * ) ) ); 641 SLOT( addToCalSlot(Incidence *, Incidence * ) ) );
578 connect( mAllDayAgenda, SIGNAL( addToCalSignal(Incidence * ,Incidence *) ), 642 connect( mAllDayAgenda, SIGNAL( addToCalSignal(Incidence * ,Incidence *) ),
579 SLOT( addToCalSlot(Incidence * , Incidence *) ) ); 643 SLOT( addToCalSlot(Incidence * , Incidence *) ) );
580 // connect( mAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) ); 644 // connect( mAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) );
581 //connect( mAllDayAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) ); 645 //connect( mAllDayAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) );
582 646
583 647
584} 648}
585 649
586void KOAgendaView::toggleAllDay() 650void KOAgendaView::toggleAllDay()
587{ 651{
588 if ( mSplitterAgenda->firstHandle() ) 652 if ( mSplitterAgenda->firstHandle() )
589 mSplitterAgenda->firstHandle()->toggle(); 653 mSplitterAgenda->firstHandle()->toggle();
590} 654}
591void KOAgendaView::addToCalSlot(Incidence * inc, Incidence * incOld ) 655void KOAgendaView::addToCalSlot(Incidence * inc, Incidence * incOld )
592{ 656{
593 calendar()->addIncidence( inc ); 657 calendar()->addIncidence( inc );
594 658
595 if ( incOld ) { 659 if ( incOld ) {
596 if ( incOld->type() == "Todo" ) 660 if ( incOld->type() == "Todo" )
597 emit todoMoved((Todo*)incOld, KOGlobals::EVENTEDITED ); 661 emit todoMoved((Todo*)incOld, KOGlobals::EVENTEDITED );
598 else 662 else
599 emit incidenceChanged(incOld, KOGlobals::EVENTEDITED); 663 emit incidenceChanged(incOld, KOGlobals::EVENTEDITED);
600 } 664 }
601 665
602} 666}
603 667
604KOAgendaView::~KOAgendaView() 668KOAgendaView::~KOAgendaView()
605{ 669{
606 delete mAgendaPopup; 670 delete mAgendaPopup;
607 delete mAllDayAgendaPopup; 671 delete mAllDayAgendaPopup;
608 delete KOAgendaItem::paintPix(); 672 delete KOAgendaItem::paintPix();
609 delete KOAgendaItem::paintPixSel(); 673 delete KOAgendaItem::paintPixSel();
610} 674}
611void KOAgendaView::resizeEvent( QResizeEvent* e ) 675void KOAgendaView::resizeEvent( QResizeEvent* e )
612{ 676{
613 //qDebug("KOAgendaView::resizeEvent( QResizeEvent* e ) %d ", e->size().width()); 677 //qDebug("KOAgendaView::resizeEvent( QResizeEvent* e ) %d ", e->size().width());
614 bool uc = false; 678 bool uc = false;
615 int ow = e->oldSize().width(); 679 int ow = e->oldSize().width();
616 int oh = e->oldSize().height(); 680 int oh = e->oldSize().height();
617 int w = e->size().width(); 681 int w = e->size().width();
618 int h = e->size().height(); 682 int h = e->size().height();
619 if ( (ow > oh && w< h ) || (ow < oh && w > h ) ) { 683 if ( (ow > oh && w< h ) || (ow < oh && w > h ) ) {
620 if ( ! mBlockUpdating && !globalFlagBlockStartup && !globalFlagBlockAgenda ) 684 if ( ! mBlockUpdating && !globalFlagBlockStartup && !globalFlagBlockAgenda )
621 uc = true; 685 uc = true;
622 //qDebug("view changed %d %d %d %d ", ow, oh , w , h); 686 //qDebug("view changed %d %d %d %d ", ow, oh , w , h);
623 } 687 }
624 mUpcomingWidth = e->size().width() ; 688 mUpcomingWidth = e->size().width() ;
625 if ( mBlockUpdating || uc ) { 689 if ( mBlockUpdating || uc ) {
626 mBlockUpdating = false; 690 mBlockUpdating = false;
627 //mAgenda->setMinimumSize(800 , 600 ); 691 //mAgenda->setMinimumSize(800 , 600 );
628 //qDebug("mAgenda->resize+++++++++++++++ "); 692 //qDebug("mAgenda->resize+++++++++++++++ ");
629 updateConfig(); 693 updateConfig();
630 //qDebug("KOAgendaView::Updating now possible "); 694 //qDebug("KOAgendaView::Updating now possible ");
631 } else 695 } else
632 createDayLabels(); 696 createDayLabels();
633 //qDebug("resizeEvent end "); 697 //qDebug("resizeEvent end ");
634 698
635} 699}
636void KOAgendaView::slotDaylabelClicked( int num ) 700void KOAgendaView::slotDaylabelClicked( int num )
637{ 701{
638 702
639 QDate firstDate = mSelectedDates.first(); 703 QDate firstDate = mSelectedDates.first();
640 if ( num == -1 ) 704 if ( num == -1 )
641 emit showDateView( 6, firstDate ); 705 emit showDateView( 6, firstDate );
642 else if (num >= 0 ) { 706 else if (num >= 0 ) {
643 if ( mSelectedDates.count() == 1) 707 if ( mSelectedDates.count() == 1)
644 emit showDateView( 9, firstDate.addDays( num ) ); 708 emit showDateView( 9, firstDate.addDays( num ) );
645 else 709 else
646 emit showDateView( 3, firstDate.addDays( num ) ); 710 emit showDateView( 3, firstDate.addDays( num ) );
647 } 711 }
648 else 712 else
649 showDateView( 10, firstDate.addDays(1) ); 713 showDateView( 10, firstDate.addDays(1) );
650} 714}
651 715
652KOAgendaButton* KOAgendaView::getNewDaylabel() 716KOAgendaButton* KOAgendaView::getNewDaylabel()
653{ 717{
654 718
655 KOAgendaButton * dayLabel = new KOAgendaButton(mDayLabels); 719 KOAgendaButton * dayLabel = new KOAgendaButton(mDayLabels);
656 connect( dayLabel, SIGNAL( numClicked(int) ), this, SLOT ( slotDaylabelClicked(int) ) ); 720 connect( dayLabel, SIGNAL( numClicked(int) ), this, SLOT ( slotDaylabelClicked(int) ) );
657 mDayLabelsList.append( dayLabel ); 721 mDayLabelsList.append( dayLabel );
658 mLayoutDayLabels->addWidget(dayLabel); 722 mLayoutDayLabels->addWidget(dayLabel);
659 return dayLabel ; 723 return dayLabel ;
660} 724}
661 725
662void KOAgendaView::createDayLabels() 726void KOAgendaView::createDayLabels()
663{ 727{
664 728
665 if ( mBlockUpdating || globalFlagBlockLabel == 1) { 729 if ( mBlockUpdating || globalFlagBlockLabel == 1) {
666 // qDebug(" KOAgendaView::createDayLabels() blocked "); 730 // qDebug(" KOAgendaView::createDayLabels() blocked ");
667 return; 731 return;
668 732
669 } 733 }
670 int newHight; 734 int newHight;
671 735
672 // ### Before deleting and recreating we could check if mSelectedDates changed... 736 // ### Before deleting and recreating we could check if mSelectedDates changed...
673 // It would remove some flickering and gain speed (since this is called by 737 // It would remove some flickering and gain speed (since this is called by
674 // each updateView() call) 738 // each updateView() call)
675 739
676 int maxWid = mUpcomingWidth - mTimeLabels->width()- mAgenda->verticalScrollBar()->width() - mAgenda->frameWidth()*2; 740 int maxWid = mUpcomingWidth - mTimeLabels->width()- mAgenda->verticalScrollBar()->width() - mAgenda->frameWidth()*2;
741 if ( QApplication::desktop()->width() <= 320 )
742 maxWid -= 10;
677 mDayLabelsFrame->setMaximumWidth( mUpcomingWidth ); 743 mDayLabelsFrame->setMaximumWidth( mUpcomingWidth );
678 if ( maxWid < 0 ) 744 if ( maxWid < 0 )
679 maxWid = 20; 745 maxWid = 20;
680 746
681 QFont dlf = KOPrefs::instance()->mTimeLabelsFont; 747 QFont dlf = KOPrefs::instance()->mTimeLabelsFont;
682 QFontMetrics fm ( dlf ); 748 QFontMetrics fm ( dlf );
683 int selCount = mSelectedDates.count(); 749 int selCount = mSelectedDates.count();
684 QString dayTest = "Mon 20"; 750 QString dayTest = "Mon 20";
685 //QString dayTest = "Mon 20"; 751 //QString dayTest = "Mon 20";
686 int wid = fm.width( dayTest ); 752 int wid = fm.width( dayTest );
687 //maxWid -= ( selCount * 3 ); //working for QLabels 753 //maxWid -= ( selCount * 3 ); //working for QLabels
688 maxWid -= ( selCount * 3 ); //working for QPushButton 754 maxWid -= ( selCount * 3 ); //working for QPushButton
689 if ( maxWid < 0 ) 755 if ( maxWid < 0 )
690 maxWid = 20; 756 maxWid = 20;
691 int needWid = wid * selCount; 757 int needWid = wid * selCount;
692 //qDebug("++++++++Needed : %d MaxWidth: %d", needWid, maxWid ); 758 //qDebug("++++++++Needed : %d MaxWidth: %d", needWid, maxWid );
693 //if ( needWid > maxWid ) 759 //if ( needWid > maxWid )
694 // qDebug("DAYLABELS TOOOOOOO BIG "); 760 // qDebug("DAYLABELS TOOOOOOO BIG ");
695 while ( needWid > maxWid ) { 761 while ( needWid > maxWid ) {
696 dayTest = dayTest.left( dayTest.length() - 1 ); 762 dayTest = dayTest.left( dayTest.length() - 1 );
697 wid = fm.width( dayTest ); 763 wid = fm.width( dayTest );
698 needWid = wid * selCount; 764 needWid = wid * selCount;
699 } 765 }
700 int maxLen = dayTest.length(); 766 int maxLen = dayTest.length();
701 int fontPoint = dlf.pointSize(); 767 int fontPoint = dlf.pointSize();
702 if ( maxLen < 2 ) { 768 if ( maxLen < 2 ) {
703 int fontPoint = dlf.pointSize(); 769 int fontPoint = dlf.pointSize();
704 while ( fontPoint > 4 ) { 770 while ( fontPoint > 4 ) {
705 --fontPoint; 771 --fontPoint;
706 dlf.setPointSize( fontPoint ); 772 dlf.setPointSize( fontPoint );
707 QFontMetrics f( dlf ); 773 QFontMetrics f( dlf );
708 wid = f.width( "30" ); 774 wid = f.width( "30" );
709 needWid = wid * selCount; 775 needWid = wid * selCount;
710 if ( needWid < maxWid ) 776 if ( needWid < maxWid )
711 break; 777 break;
712 } 778 }
713 maxLen = 2; 779 maxLen = 2;
714 } 780 }
715 //qDebug("Max len %d ", dayTest.length() ); 781 //qDebug("Max len %d ", dayTest.length() );
716 782
717 QFontMetrics tempF( dlf ); 783 QFontMetrics tempF( dlf );
718 newHight = tempF.height(); 784 newHight = tempF.height();
719 mDayLabels->setFont( dlf ); 785 mDayLabels->setFont( dlf );
720 // mLayoutDayLabels = new QHBoxLayout(mDayLabels);; 786 // mLayoutDayLabels = new QHBoxLayout(mDayLabels);;
721 // mLayoutDayLabels->addSpacing(mTimeLabels->width()); 787 // mLayoutDayLabels->addSpacing(mTimeLabels->width());
722 //mLayoutDayLabels->addSpacing( 2 ); 788 //mLayoutDayLabels->addSpacing( 2 );
723 // QFont lFont = dlf; 789 // QFont lFont = dlf;
724 bool appendLabels = false; 790 bool appendLabels = false;
725 KOAgendaButton *dayLabel; 791 KOAgendaButton *dayLabel;
726 dayLabel = mDayLabelsList.first(); 792 dayLabel = mDayLabelsList.first();
727 if ( !dayLabel ) { 793 if ( !dayLabel ) {
728 appendLabels = true; 794 appendLabels = true;
729 dayLabel = getNewDaylabel(); 795 dayLabel = getNewDaylabel();
730 } 796 }
731 dayLabel->setFixedWidth( mTimeLabels->width()+mAgenda->frameWidth() ); 797 dayLabel->setFixedWidth( mTimeLabels->width()+mAgenda->frameWidth() );
732 dayLabel->setFont( dlf ); 798 dayLabel->setFont( dlf );
733 dayLabel->setNum( -1 ); 799 dayLabel->setNum( -1 );
734 //dayLabel->setAlignment(QLabel::AlignHCenter); 800 //dayLabel->setAlignment(QLabel::AlignHCenter);
801#if 0
735 if ( QApplication::desktop()->width() <= 320 ) 802 if ( QApplication::desktop()->width() <= 320 )
736 dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ).left(2) ); 803 dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ).left(2) );
737 else 804 else
805#endif
738 dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) ); 806 dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) );
739 dayLabel->show(); 807 dayLabel->show();
740 DateList::ConstIterator dit; 808 DateList::ConstIterator dit;
741 bool oneday = (mSelectedDates.first() == mSelectedDates.last() ); 809 bool oneday = (mSelectedDates.first() == mSelectedDates.last() );
742 int counter = -1; 810 int counter = -1;
743 for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) { 811 for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) {
744 ++counter; 812 ++counter;
745 QDate date = *dit; 813 QDate date = *dit;
746 // QBoxLayout *dayLayout = new QVBoxLayout(mLayoutDayLabels); 814 // QBoxLayout *dayLayout = new QVBoxLayout(mLayoutDayLabels);
747 if ( ! appendLabels ) { 815 if ( ! appendLabels ) {
748 dayLabel = mDayLabelsList.next(); 816 dayLabel = mDayLabelsList.next();
749 if ( !dayLabel ) 817 if ( !dayLabel )
750 appendLabels = true; 818 appendLabels = true;
751 } 819 }
752 if ( appendLabels ) { 820 if ( appendLabels ) {
753 dayLabel = getNewDaylabel(); 821 dayLabel = getNewDaylabel();
754 } 822 }
755 dayLabel->setMinimumWidth( 1 ); 823 dayLabel->setMinimumWidth( 1 );
756 dayLabel->setMaximumWidth( 10240 ); 824 dayLabel->setMaximumWidth( 10240 );
757 dayLabel->setFont( dlf ); 825 dayLabel->setFont( dlf );
758 dayLabel->show(); 826 dayLabel->show();
759 dayLabel->setAutoRepeat( false ); 827 dayLabel->setAutoRepeat( false );
760 dayLabel->setNum( counter ); 828 dayLabel->setNum( counter );
761 QString str; 829 QString str;
762 int dW = KOGlobals::self()->calendarSystem()->dayOfWeek(date); 830 int dW = KOGlobals::self()->calendarSystem()->dayOfWeek(date);
763 QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( dW, true ); 831 QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( dW, true );
764 switch ( maxLen ) { 832 switch ( maxLen ) {
765 case 2: 833 case 2:
766 str = QString::number( date.day() ); 834 str = QString::number( date.day() );
767 break; 835 break;
768 836
769 case 3: 837 case 3:
770 str = dayName.left( 1 ) +QString::number( date.day()); 838 str = dayName.left( 1 ) +QString::number( date.day());
771 839
772 break; 840 break;
773 case 4: 841 case 4:
774 str = dayName.left( 1 ) + " " +QString::number( date.day()); 842 str = dayName.left( 1 ) + " " +QString::number( date.day());
775 843
776 break; 844 break;
777 case 5: 845 case 5:
778 str = dayName.left( 2 ) + " " +QString::number( date.day()); 846 str = dayName.left( 2 ) + " " +QString::number( date.day());
779 847
780 break; 848 break;
781 case 6: 849 case 6:
782 str = dayName.left( 3 ) + " " +QString::number( date.day()); 850 str = dayName.left( 3 ) + " " +QString::number( date.day());
783 break; 851 break;
784 852
785 default: 853 default:
786 break; 854 break;
787 } 855 }
788 if ( oneday ) { 856 if ( oneday ) {
789 QString addString; 857 QString addString;
790 if ( mSelectedDates.first() == QDateTime::currentDateTime().date() ) 858 if ( mSelectedDates.first() == QDateTime::currentDateTime().date() )
791 addString = i18n("Today"); 859 addString = i18n("Today");
792 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(1) ) 860 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(1) )
793 addString = i18n("Tomorrow"); 861 addString = i18n("Tomorrow");
794 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-1) ) 862 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-1) )
795 addString = i18n("Yesterday"); 863 addString = i18n("Yesterday");
796 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-2) ) 864 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-2) )
797 addString = i18n("Day before yesterday"); 865 addString = i18n("Day before yesterday");
798 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(2) ) 866 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(2) )
799 addString = i18n("Day after tomorrow"); 867 addString = i18n("Day after tomorrow");
800 if ( !addString.isEmpty() ) { 868 if ( !addString.isEmpty() ) {
801 str = addString+", " + str; 869 str = addString+", " + str;
802 } else { 870 } else {
803 str = KGlobal::locale()->formatDate( date, KOPrefs::instance()->mShortDateInViewer); 871 str = KGlobal::locale()->formatDate( date, KOPrefs::instance()->mShortDateInViewer);
804 } 872 }
805 } 873 }
806 dayLabel->setText(str); 874 dayLabel->setText(str);
807 //dayLabel->setAlignment(QLabel::AlignHCenter); 875 //dayLabel->setAlignment(QLabel::AlignHCenter);
808 if (date == QDate::currentDate()) { 876 if (date == QDate::currentDate()) {
809 QFont bFont = dlf; 877 QFont bFont = dlf;
810 bFont.setBold( true ); 878 bFont.setBold( true );
811 dayLabel->setFont(bFont); 879 dayLabel->setFont(bFont);
812 } 880 }
813 //dayLayout->addWidget(dayLabel); 881 //dayLayout->addWidget(dayLabel);
814 882
815#ifndef KORG_NOPLUGINS 883#ifndef KORG_NOPLUGINS
816 CalendarDecoration::List cds = KOCore::self()->calendarDecorations(); 884 CalendarDecoration::List cds = KOCore::self()->calendarDecorations();
817 CalendarDecoration *it; 885 CalendarDecoration *it;
818 for(it = cds.first(); it; it = cds.next()) { 886 for(it = cds.first(); it; it = cds.next()) {
819 QString text = it->shortText( date ); 887 QString text = it->shortText( date );
820 if ( !text.isEmpty() ) { 888 if ( !text.isEmpty() ) {
821 QLabel *label = new QLabel(text,mDayLabels); 889 QLabel *label = new QLabel(text,mDayLabels);
822 label->setAlignment(AlignCenter); 890 label->setAlignment(AlignCenter);
823 dayLayout->addWidget(label); 891 dayLayout->addWidget(label);
824 } 892 }
825 } 893 }
826 894
827 for(it = cds.first(); it; it = cds.next()) { 895 for(it = cds.first(); it; it = cds.next()) {
828 QWidget *wid = it->smallWidget(mDayLabels,date); 896 QWidget *wid = it->smallWidget(mDayLabels,date);
829 if ( wid ) { 897 if ( wid ) {
830 // wid->setHeight(20); 898 // wid->setHeight(20);
831 dayLayout->addWidget(wid); 899 dayLayout->addWidget(wid);
832 } 900 }
833 } 901 }
834#endif 902#endif
835 } 903 }
836 if ( ! appendLabels ) { 904 if ( ! appendLabels ) {
837 dayLabel = mDayLabelsList.next(); 905 dayLabel = mDayLabelsList.next();
838 if ( !dayLabel ) 906 if ( !dayLabel )
839 appendLabels = true; 907 appendLabels = true;
840 } 908 }
841 if ( appendLabels ) { 909 if ( appendLabels ) {
842 dayLabel = getNewDaylabel(); 910 dayLabel = getNewDaylabel();
843 } 911 }
844 //dayLabel->hide();//test only 912 //dayLabel->hide();//test only
845 int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()- (mAgenda->frameWidth()*2) ) % mSelectedDates.count() ; 913 int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()- (mAgenda->frameWidth()*2) ) % mSelectedDates.count() ;
846 if ( offset < 0 ) offset = 0; 914 if ( offset < 0 ) offset = 0;
847 //qDebug("mLayoutDayLabels->addSpacing %d ", mAgenda->verticalScrollBar()->width()+offset+2 ); 915 //qDebug("mLayoutDayLabels->addSpacing %d ", mAgenda->verticalScrollBar()->width()+offset+2 );
848 dayLabel->setText(">");//QString::number ( mSelectedDates.first().month() ) ); 916 dayLabel->setText(">");//QString::number ( mSelectedDates.first().month() ) );
849 dayLabel->setFont( dlf ); 917 dayLabel->setFont( dlf );
850 dayLabel->setAutoRepeat( true ); 918 dayLabel->setAutoRepeat( true );
851 dayLabel->show(); 919 dayLabel->show();
852 dayLabel->setNum( -2 ); 920 dayLabel->setNum( -2 );
853 dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ offset ); 921 dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ offset );
854 922
855 //qDebug("setToFixed %d ", mAgenda->verticalScrollBar()->width()+ offset+2); 923 //qDebug("setToFixed %d ", mAgenda->verticalScrollBar()->width()+ offset+2);
856 //mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()+ offset+2); 924 //mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()+ offset+2);
857 if ( !appendLabels ) { 925 if ( !appendLabels ) {
858 dayLabel = mDayLabelsList.next(); 926 dayLabel = mDayLabelsList.next();
859 while ( dayLabel ) { 927 while ( dayLabel ) {
860 //qDebug("!dayLabel %d",dayLabel ); 928 //qDebug("!dayLabel %d",dayLabel );
861 dayLabel->hide(); 929 dayLabel->hide();
862 dayLabel = mDayLabelsList.next(); 930 dayLabel = mDayLabelsList.next();
863 } 931 }
864 } 932 }
865 933
866 mDayLabelsFrame->setFixedHeight( newHight + 4 ); 934 mDayLabelsFrame->setFixedHeight( newHight + 4 );
867} 935}
868 936
869int KOAgendaView::maxDatesHint() 937int KOAgendaView::maxDatesHint()
870{ 938{
871 // Not sure about the max number of events, so return 0 for now. 939 // Not sure about the max number of events, so return 0 for now.
872 return 0; 940 return 0;
873} 941}
874 942
875int KOAgendaView::currentDateCount() 943int KOAgendaView::currentDateCount()
876{ 944{
877 return mSelectedDates.count(); 945 return mSelectedDates.count();
878} 946}
879 947
880QPtrList<Incidence> KOAgendaView::selectedIncidences() 948QPtrList<Incidence> KOAgendaView::selectedIncidences()
881{ 949{
882 QPtrList<Incidence> selected; 950 QPtrList<Incidence> selected;
883 Incidence *incidence; 951 Incidence *incidence;
884 952
885 incidence = mAgenda->selectedIncidence(); 953 incidence = mAgenda->selectedIncidence();
886 if (incidence) selected.append(incidence); 954 if (incidence) selected.append(incidence);
887 955
888 incidence = mAllDayAgenda->selectedIncidence(); 956 incidence = mAllDayAgenda->selectedIncidence();
889 if (incidence) selected.append(incidence); 957 if (incidence) selected.append(incidence);
890 958
891 return selected; 959 return selected;
892} 960}
893 961
894DateList KOAgendaView::selectedDates() 962DateList KOAgendaView::selectedDates()
895{ 963{
896 DateList selected; 964 DateList selected;
897 QDate qd; 965 QDate qd;
898 966
899 qd = mAgenda->selectedIncidenceDate(); 967 qd = mAgenda->selectedIncidenceDate();
900 if (qd.isValid()) selected.append(qd); 968 if (qd.isValid()) selected.append(qd);
901 969
902 qd = mAllDayAgenda->selectedIncidenceDate(); 970 qd = mAllDayAgenda->selectedIncidenceDate();
903 if (qd.isValid()) selected.append(qd); 971 if (qd.isValid()) selected.append(qd);
904 972
905 return selected; 973 return selected;
906} 974}
907 975
908 976
909void KOAgendaView::updateView() 977void KOAgendaView::updateView()
910{ 978{
911 if ( mBlockUpdating ) 979 if ( mBlockUpdating )
912 return; 980 return;
913 // kdDebug() << "KOAgendaView::updateView()" << endl; 981 // kdDebug() << "KOAgendaView::updateView()" << endl;
914 fillAgenda(); 982 fillAgenda();
915 983
916} 984}
917 985
918 986
919/* 987/*
920 Update configuration settings for the agenda view. This method is not 988 Update configuration settings for the agenda view. This method is not
921 complete. 989 complete.
922*/ 990*/
923void KOAgendaView::updateConfig() 991void KOAgendaView::updateConfig()
924{ 992{
925 if ( mBlockUpdating ) 993 if ( mBlockUpdating )
926 return; 994 return;
927 if ( mAgenda->height() > 96 * KOPrefs::instance()->mHourSize ) { 995 if ( mAgenda->height() > 96 * KOPrefs::instance()->mHourSize ) {
928 int old = KOPrefs::instance()->mHourSize; 996 int old = KOPrefs::instance()->mHourSize;
929 KOPrefs::instance()->mHourSize = mAgenda->height()/96 +1; 997 KOPrefs::instance()->mHourSize = mAgenda->height()/96 +1;
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index b8a0f09..8affe50 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -578,397 +578,397 @@ void KODayMatrix::mouseMoveEvent (QMouseEvent* e)
578 repaint(false); 578 repaint(false);
579 } 579 }
580 } 580 }
581} 581}
582 582
583// ---------------------------------------------------------------------------- 583// ----------------------------------------------------------------------------
584// D R A G ' N D R O P H A N D L I N G 584// D R A G ' N D R O P H A N D L I N G
585// ---------------------------------------------------------------------------- 585// ----------------------------------------------------------------------------
586 586
587void KODayMatrix::dragEnterEvent(QDragEnterEvent *e) 587void KODayMatrix::dragEnterEvent(QDragEnterEvent *e)
588{ 588{
589#ifndef KORG_NODND 589#ifndef KORG_NODND
590 if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) ) { 590 if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) ) {
591 e->ignore(); 591 e->ignore();
592 return; 592 return;
593 } 593 }
594 594
595 // some visual feedback 595 // some visual feedback
596// oldPalette = palette(); 596// oldPalette = palette();
597// setPalette(my_HilitePalette); 597// setPalette(my_HilitePalette);
598// update(); 598// update();
599#endif 599#endif
600} 600}
601 601
602void KODayMatrix::dragMoveEvent(QDragMoveEvent *e) 602void KODayMatrix::dragMoveEvent(QDragMoveEvent *e)
603{ 603{
604#ifndef KORG_NODND 604#ifndef KORG_NODND
605 if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) ) { 605 if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) ) {
606 e->ignore(); 606 e->ignore();
607 return; 607 return;
608 } 608 }
609 609
610 e->accept(); 610 e->accept();
611#endif 611#endif
612} 612}
613 613
614void KODayMatrix::dragLeaveEvent(QDragLeaveEvent */*dl*/) 614void KODayMatrix::dragLeaveEvent(QDragLeaveEvent */*dl*/)
615{ 615{
616#ifndef KORG_NODND 616#ifndef KORG_NODND
617// setPalette(oldPalette); 617// setPalette(oldPalette);
618// update(); 618// update();
619#endif 619#endif
620} 620}
621 621
622void KODayMatrix::dropEvent(QDropEvent *e) 622void KODayMatrix::dropEvent(QDropEvent *e)
623{ 623{
624#ifndef KORG_NODND 624#ifndef KORG_NODND
625// kdDebug() << "KODayMatrix::dropEvent(e) begin" << endl; 625// kdDebug() << "KODayMatrix::dropEvent(e) begin" << endl;
626 626
627 if (!mCalendar || !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) ) { 627 if (!mCalendar || !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) ) {
628 e->ignore(); 628 e->ignore();
629 return; 629 return;
630 } 630 }
631 631
632 DndFactory factory( mCalendar ); 632 DndFactory factory( mCalendar );
633 Event *event = factory.createDrop(e); 633 Event *event = factory.createDrop(e);
634 634
635 if (event) { 635 if (event) {
636 e->acceptAction(); 636 e->acceptAction();
637 637
638 Event *existingEvent = mCalendar->event(event->uid()); 638 Event *existingEvent = mCalendar->event(event->uid());
639 639
640 if(existingEvent) { 640 if(existingEvent) {
641 // uniquify event 641 // uniquify event
642 event->recreate(); 642 event->recreate();
643/* 643/*
644 KMessageBox::sorry(this, 644 KMessageBox::sorry(this,
645 i18n("Event already exists in this calendar."), 645 i18n("Event already exists in this calendar."),
646 i18n("Drop Event")); 646 i18n("Drop Event"));
647 delete event; 647 delete event;
648 return; 648 return;
649*/ 649*/
650 } 650 }
651// kdDebug() << "Drop new Event" << endl; 651// kdDebug() << "Drop new Event" << endl;
652 // Adjust date 652 // Adjust date
653 QDateTime start = event->dtStart(); 653 QDateTime start = event->dtStart();
654 QDateTime end = event->dtEnd(); 654 QDateTime end = event->dtEnd();
655 int duration = start.daysTo(end); 655 int duration = start.daysTo(end);
656 int idx = getDayIndexFrom(e->pos().x(), e->pos().y()); 656 int idx = getDayIndexFrom(e->pos().x(), e->pos().y());
657 657
658 start.setDate(days[idx]); 658 start.setDate(days[idx]);
659 end.setDate(days[idx].addDays(duration)); 659 end.setDate(days[idx].addDays(duration));
660 660
661 event->setDtStart(start); 661 event->setDtStart(start);
662 event->setDtEnd(end); 662 event->setDtEnd(end);
663 mCalendar->addEvent(event); 663 mCalendar->addEvent(event);
664 664
665 emit eventDropped(event); 665 emit eventDropped(event);
666 } else { 666 } else {
667// kdDebug() << "KODayMatrix::dropEvent(): Event from drop not decodable" << endl; 667// kdDebug() << "KODayMatrix::dropEvent(): Event from drop not decodable" << endl;
668 e->ignore(); 668 e->ignore();
669 } 669 }
670#endif 670#endif
671} 671}
672 672
673// ---------------------------------------------------------------------------- 673// ----------------------------------------------------------------------------
674// P A I N T E V E N T H A N D L I N G 674// P A I N T E V E N T H A N D L I N G
675// ---------------------------------------------------------------------------- 675// ----------------------------------------------------------------------------
676 676
677void KODayMatrix::paintEvent(QPaintEvent * pevent) 677void KODayMatrix::paintEvent(QPaintEvent * pevent)
678{ 678{
679 679
680 if ( width() <= 0 || height() <= 0 ) 680 if ( width() <= 0 || height() <= 0 )
681 return; 681 return;
682 if ( mPendingUpdateBeforeRepaint ) { 682 if ( mPendingUpdateBeforeRepaint ) {
683 updateViewTimed(); 683 updateViewTimed();
684 mPendingUpdateBeforeRepaint = false; 684 mPendingUpdateBeforeRepaint = false;
685 } 685 }
686 if ( myPix.width() != width() || myPix.height()!=height() ) { 686 if ( myPix.width() != width() || myPix.height()!=height() ) {
687 myPix.resize(size() ); 687 myPix.resize(size() );
688 mRedrawNeeded = true; 688 mRedrawNeeded = true;
689 } 689 }
690 690
691 if ( mRedrawNeeded ) { 691 if ( mRedrawNeeded ) {
692 //qDebug("REDRAW "); 692 //qDebug("REDRAW ");
693 QPainter p(&myPix); 693 QPainter p(&myPix);
694 p.setFont(font()); 694 p.setFont(font());
695 695
696 696
697 int dheight = daysize.height(); 697 int dheight = daysize.height();
698 int dwidth = daysize.width(); 698 int dwidth = daysize.width();
699 int row,col; 699 int row,col;
700 int selw, selh; 700 int selw, selh;
701 int xyOff = frameWidth(); 701 int xyOff = frameWidth();
702 int colModulo = (width()-2) % 7; 702 int colModulo = (width()-2) % 7;
703 int rowModulo = (height()-2) % 6; 703 int rowModulo = (height()-2) % 6;
704 //qDebug("col %d row %d ",colModulo,rowModulo ); 704 //qDebug("col %d row %d ",colModulo,rowModulo );
705 705
706 bool isRTL = KOGlobals::self()->reverseLayout(); 706 bool isRTL = KOGlobals::self()->reverseLayout();
707 707
708 // draw background and topleft frame 708 // draw background and topleft frame
709 p.fillRect(0,0,width(),height(), mDefaultBackColor); 709 p.fillRect(0,0,width(),height(), mDefaultBackColor);
710 p.setPen(mDefaultTextColor); 710 p.setPen(mDefaultTextColor);
711 p.drawRect(0, 0, width(), height()); 711 p.drawRect(0, 0, width(), height());
712 int mSelStartT = mSelStart; 712 int mSelStartT = mSelStart;
713 int mSelEndT = mSelEnd; 713 int mSelEndT = mSelEnd;
714 if ( mSelEndT >= NUMDAYS ) 714 if ( mSelEndT >= NUMDAYS )
715 mSelEndT = NUMDAYS-1; 715 mSelEndT = NUMDAYS-1;
716 // draw selected days with highlighted background color 716 // draw selected days with highlighted background color
717 if (mSelStart != NOSELECTION) { 717 if (mSelStart != NOSELECTION) {
718 bool skip = false; 718 bool skip = false;
719 if ( ! mouseDown ) { 719 if ( ! mouseDown ) {
720 int mo = days[20].month(); 720 int mo = days[20].month();
721 //qDebug("-- %d %d ", mSelStartT, mSelEndT); 721 //qDebug("-- %d %d ", mSelStartT, mSelEndT);
722 //qDebug("%d %d %d - d %d", mo, days[mSelStartT].month() , days[mSelEndT].month(), days[mSelEndT].day() ); 722 //qDebug("%d %d %d - d %d", mo, days[mSelStartT].month() , days[mSelEndT].month(), days[mSelEndT].day() );
723 int startMo = days[mSelStartT].month(); 723 int startMo = days[mSelStartT].month();
724 int endMo = days[mSelEndT].month(); 724 int endMo = days[mSelEndT].month();
725 if ( startMo == 12 && mo == 1 && endMo <= 2 ) 725 if ( startMo == 12 && mo == 1 && endMo <= 2 )
726 startMo = 1; 726 startMo = 1;
727 if ( endMo == 1 && mo == 12 ) 727 if ( endMo == 1 && mo == 12 )
728 endMo = 12; 728 endMo = 12;
729 if ( mo == 12 && startMo == 1 ) 729 if ( mo == 12 && startMo == 1 )
730 startMo = 13; 730 startMo = 13;
731 if ( (startMo > mo || endMo < mo) ) { 731 if ( (startMo > mo || endMo < mo) ) {
732 skip = true; 732 skip = true;
733 } else { 733 } else {
734 if ( days[mSelStartT].month() != mo ) { 734 if ( days[mSelStartT].month() != mo ) {
735 int add = days[mSelStartT].daysInMonth ()-days[mSelStartT].day(); 735 int add = days[mSelStartT].daysInMonth ()-days[mSelStartT].day();
736 mSelStartT += add +1; 736 mSelStartT += add +1;
737 } 737 }
738 if ( days[mSelEndT].month() != mo ) { 738 if ( days[mSelEndT].month() != mo ) {
739 int sub = days[mSelEndT].day(); 739 int sub = days[mSelEndT].day();
740 mSelEndT -= sub ; 740 mSelEndT -= sub ;
741 } 741 }
742 } 742 }
743 } 743 }
744 //qDebug("SKIP %d ", skip); 744 //qDebug("SKIP %d ", skip);
745 if ( ! skip ) { 745 if ( ! skip ) {
746 row = mSelStartT/7; 746 row = mSelStartT/7;
747 col = mSelStartT -row*7; 747 col = mSelStartT -row*7;
748 QColor selcol = KOPrefs::instance()->mHighlightColor; 748 QColor selcol = KOPrefs::instance()->mHighlightColor;
749 int addCol = 0; 749 int addCol = 0;
750 int addRow = 0; 750 int addRow = 0;
751 int addRow2 = 0; 751 int addRow2 = 0;
752 int addCol2 = 0; 752 int addCol2 = 0;
753 if (row == mSelEndT/7) { 753 if (row == mSelEndT/7) {
754 if ( rowModulo ) { 754 if ( rowModulo ) {
755 if ( row >= 6 - rowModulo ) 755 if ( row >= 6 - rowModulo )
756 addRow = row - 5 + rowModulo; 756 addRow = row - 5 + rowModulo;
757 } 757 }
758 if ( colModulo ) { 758 if ( colModulo ) {
759 int colt1 = mSelEndT%7; 759 int colt1 = mSelEndT%7;
760 //qDebug("colt1 %d ", colt1 ); 760 //qDebug("colt1 %d ", colt1 );
761 if ( colt1 >= 7 - colModulo ) 761 if ( colt1 >= 7 - colModulo )
762 addCol = colt1 - 7 + colModulo+1; 762 addCol = colt1 - 7 + colModulo+1;
763 int colt = mSelStartT%7; 763 int colt = mSelStartT%7;
764 if ( colt >= 7 - colModulo ) 764 if ( colt >= 7 - colModulo )
765 addCol2 = colt - 7 + colModulo; 765 addCol2 = colt - 7 + colModulo;
766 addCol -= addCol2; 766 addCol -= addCol2;
767 //qDebug("COL %d %d %d %d ",col , colt1 ,addCol ,addCol2 ); 767 //qDebug("COL %d %d %d %d ",col , colt1 ,addCol ,addCol2 );
768 } 768 }
769 // Single row selection 769 // Single row selection
770 if ( row == 0) 770 //if ( row == 0)
771 addRow = 1; 771 // addRow = 1;
772 p.fillRect(isRTL ? (7 - (mSelEndT-mSelStartT+1) - col)*dwidth : col*dwidth+1+addCol2, 772 p.fillRect(isRTL ? (7 - (mSelEndT-mSelStartT+1) - col)*dwidth : col*dwidth+1+addCol2,
773 row*dheight+addRow, (mSelEndT-mSelStartT+1)*dwidth+addCol, dheight+1, selcol); 773 row*dheight+addRow, (mSelEndT-mSelStartT+1)*dwidth+addCol, dheight+1, selcol);
774 } else { 774 } else {
775 // draw first row to the right 775 // draw first row to the right
776 if ( colModulo ) { 776 if ( colModulo ) {
777 if ( col >= 7 - colModulo ) 777 if ( col >= 7 - colModulo )
778 addCol2 = col - 7 + colModulo; 778 addCol2 = col - 7 + colModulo;
779 } 779 }
780 if ( rowModulo ) { 780 if ( rowModulo ) {
781 if ( row >= 6 - rowModulo ) 781 if ( row >= 6 - rowModulo )
782 addRow = row - 5 + rowModulo; 782 addRow = row - 5 + rowModulo;
783 } 783 }
784 if ( row == 0) 784 //if ( row == 0)
785 addRow = 1; 785 // addRow = 1;
786 int drawWid = width()-(col*dwidth+1+addCol2)-1; 786 int drawWid = width()-(col*dwidth+1+addCol2)-1;
787 p.fillRect(isRTL ? 0 : col*dwidth+1+addCol2, row*dheight+addRow, drawWid, 787 p.fillRect(isRTL ? 0 : col*dwidth+1+addCol2, row*dheight+addRow, drawWid,
788 dheight+1, selcol); 788 dheight+1, selcol);
789 // draw full block till last line 789 // draw full block till last line
790 selh = mSelEndT/7-row; 790 selh = mSelEndT/7-row;
791 addRow = 0; 791 addRow = 0;
792 if ( rowModulo ) { 792 if ( rowModulo ) {
793 if ( mSelEndT/7 >= 6 - rowModulo ) 793 if ( mSelEndT/7 >= 6 - rowModulo )
794 addRow = mSelEndT/7 - 5 + rowModulo; 794 addRow = mSelEndT/7 - 5 + rowModulo;
795 } 795 }
796 //qDebug("%d %d %d ",selh, row, addRow ); 796 //qDebug("%d %d %d ",selh, row, addRow );
797 int addrow2 = addRow-selh+1; 797 int addrow2 = addRow-selh+1;
798 if ( addrow2 < 0 ) 798 if ( addrow2 < 0 )
799 addrow2 = 0; 799 addrow2 = 0;
800 if (selh > 1) { 800 if (selh > 1) {
801 p.fillRect(1, (row+1)*dheight+addrow2, 7*dwidth+colModulo, (selh-1)*dheight+addRow,selcol); 801 p.fillRect(1, (row+1)*dheight+addrow2, 7*dwidth+colModulo, (selh-1)*dheight+addRow,selcol);
802 } 802 }
803 // draw last block from left to mSelEndT 803 // draw last block from left to mSelEndT
804 selw = mSelEndT-7*(mSelEndT/7)+1; 804 selw = mSelEndT-7*(mSelEndT/7)+1;
805 //qDebug("esl %d ",selw ); 805 //qDebug("esl %d ",selw );
806 int add = 0; 806 int add = 0;
807 if ( colModulo ) { 807 if ( colModulo ) {
808 add = 7 - colModulo; 808 add = 7 - colModulo;
809 if ( selw > add ) 809 if ( selw > add )
810 add = selw - add; 810 add = selw - add;
811 else 811 else
812 add = 0; 812 add = 0;
813 } 813 }
814 //qDebug("add %d ", add); 814 //qDebug("add %d ", add);
815 p.fillRect(isRTL ? (7-selw)*dwidth : 1, (row+selh)*dheight+addRow, 815 p.fillRect(isRTL ? (7-selw)*dwidth : 1, (row+selh)*dheight+addRow,
816 selw*dwidth+add, dheight+1, selcol); 816 selw*dwidth+add, dheight+1, selcol);
817 } 817 }
818 } 818 }
819 } 819 }
820 820
821 // iterate over all days in the matrix and draw the day label in appropriate colors 821 // iterate over all days in the matrix and draw the day label in appropriate colors
822 QColor actcol = mDefaultTextColorShaded; 822 QColor actcol = mDefaultTextColorShaded;
823 p.setPen(actcol); 823 p.setPen(actcol);
824 QPen tmppen; 824 QPen tmppen;
825 for(int i = 0; i < NUMDAYS; i++) { 825 for(int i = 0; i < NUMDAYS; i++) {
826 row = i/7; 826 row = i/7;
827 col = isRTL ? 6-(i-row*7) : i-row*7; 827 col = isRTL ? 6-(i-row*7) : i-row*7;
828 828
829 // if it is the first day of a month switch color from normal to shaded and vice versa 829 // if it is the first day of a month switch color from normal to shaded and vice versa
830 if ( KOGlobals::self()->calendarSystem()->day( days[i] ) == 1) { 830 if ( KOGlobals::self()->calendarSystem()->day( days[i] ) == 1) {
831 if (actcol == mDefaultTextColorShaded) { 831 if (actcol == mDefaultTextColorShaded) {
832 actcol = mDefaultTextColor; 832 actcol = mDefaultTextColor;
833 } else { 833 } else {
834 actcol = mDefaultTextColorShaded; 834 actcol = mDefaultTextColorShaded;
835 } 835 }
836 p.setPen(actcol); 836 p.setPen(actcol);
837 } 837 }
838 if (actcol == mDefaultTextColorShaded) { 838 if (actcol == mDefaultTextColorShaded) {
839 if ( ! mouseDown ) { 839 if ( ! mouseDown ) {
840 continue; 840 continue;
841 } 841 }
842 } 842 }
843 //Reset pen color after selected days block 843 //Reset pen color after selected days block
844 if (i == mSelEndT+1) { 844 if (i == mSelEndT+1) {
845 p.setPen(actcol); 845 p.setPen(actcol);
846 } 846 }
847 847
848 // if today then draw rectangle around day 848 // if today then draw rectangle around day
849 if (today == i) { 849 if (today == i) {
850 tmppen = p.pen(); 850 tmppen = p.pen();
851 QPen mTodayPen(p.pen()); 851 QPen mTodayPen(p.pen());
852 if ( daysize.width() < 20 ) 852 if ( daysize.width() < 20 )
853 mTodayPen.setWidth(1); 853 mTodayPen.setWidth(1);
854 else 854 else
855 mTodayPen.setWidth(mTodayMarginWidth); 855 mTodayPen.setWidth(mTodayMarginWidth);
856 //draw red rectangle for holidays 856 //draw red rectangle for holidays
857 if (!mHolidays[i].isNull()) { 857 if (!mHolidays[i].isNull()) {
858 if (actcol == mDefaultTextColor) { 858 if (actcol == mDefaultTextColor) {
859 mTodayPen.setColor(KOPrefs::instance()->mHolidayColor); 859 mTodayPen.setColor(KOPrefs::instance()->mHolidayColor);
860 } else { 860 } else {
861 mTodayPen.setColor(mHolidayColorShaded); 861 mTodayPen.setColor(mHolidayColorShaded);
862 } 862 }
863 } 863 }
864 //draw gray rectangle for today if in selection 864 //draw gray rectangle for today if in selection
865 if (i >= mSelStartT && i <= mSelEndT) { 865 if (i >= mSelStartT && i <= mSelEndT) {
866 QColor grey("grey"); 866 QColor grey("grey");
867 mTodayPen.setColor(grey); 867 mTodayPen.setColor(grey);
868 } 868 }
869 p.setPen(mTodayPen); 869 p.setPen(mTodayPen);
870 870
871 871
872 int addCol = 0; 872 int addCol = 0;
873 int addRow = 0; 873 int addRow = 0;
874 if (rowModulo) { 874 if (rowModulo) {
875 if ( row >= 6 - rowModulo ) 875 if ( row >= 6 - rowModulo )
876 addRow = row - 5 + rowModulo; 876 addRow = row - 5 + rowModulo;
877 } 877 }
878 if ( colModulo ) { 878 if ( colModulo ) {
879 if ( col >= 7 - colModulo ) 879 if ( col >= 7 - colModulo )
880 addCol = col - 6 + colModulo-1; 880 addCol = col - 6 + colModulo-1;
881 } 881 }
882 882
883 addCol += 1; 883 addCol += 1;
884 if ( row == 0 ) 884 if ( row == 0 )
885 addRow = 1; 885 addRow = 1;
886 p.drawRect(col*dwidth+addCol, row*dheight+addRow, dwidth+1, dheight+1); 886 p.drawRect(col*dwidth+addCol, row*dheight+addRow, dwidth+1, dheight+1);
887 p.setPen(tmppen); 887 p.setPen(tmppen);
888 } 888 }
889 889
890 // if any events are on that day then draw it using a bold font 890 // if any events are on that day then draw it using a bold font
891 if ( eDays.testBit(i) ) { 891 if ( eDays.testBit(i) ) {
892 QFont myFont = font(); 892 QFont myFont = font();
893 myFont.setBold(true); 893 myFont.setBold(true);
894 p.setFont(myFont); 894 p.setFont(myFont);
895 } 895 }
896 896
897 // if it is a holiday then use the default holiday color 897 // if it is a holiday then use the default holiday color
898 if ( !mHolidays[i].isNull()) { 898 if ( !mHolidays[i].isNull()) {
899 if ( bDays.testBit(i) ) { 899 if ( bDays.testBit(i) ) {
900 if ( hDays.testBit(i) ) 900 if ( hDays.testBit(i) )
901 p.setPen(QColor(Qt::green)); 901 p.setPen(QColor(Qt::green));
902 else 902 else
903 p.setPen(QColor(Qt::green).dark()); 903 p.setPen(QColor(Qt::green).dark());
904 } else { 904 } else {
905 if (actcol == mDefaultTextColor ) { 905 if (actcol == mDefaultTextColor ) {
906 p.setPen(KOPrefs::instance()->mHolidayColor); 906 p.setPen(KOPrefs::instance()->mHolidayColor);
907 } else { 907 } else {
908 p.setPen(mHolidayColorShaded); 908 p.setPen(mHolidayColorShaded);
909 } 909 }
910 } 910 }
911 } 911 }
912 912
913 // draw selected days with special color 913 // draw selected days with special color
914 // DO NOT specially highlight holidays in selection ! 914 // DO NOT specially highlight holidays in selection !
915 if (i >= mSelStartT && i <= mSelEndT) { 915 if (i >= mSelStartT && i <= mSelEndT) {
916 ;//p.setPen(mSelectedDaysColor); 916 ;//p.setPen(mSelectedDaysColor);
917 } 917 }
918 918
919 int addCol = 0; 919 int addCol = 0;
920 int addRow = 0; 920 int addRow = 0;
921 if ( colModulo ) { 921 if ( colModulo ) {
922 if ( col >= 7 - colModulo ) 922 if ( col >= 7 - colModulo )
923 addCol = col - 7 + colModulo; 923 addCol = col - 7 + colModulo;
924 } 924 }
925 if ( rowModulo ) { 925 if ( rowModulo ) {
926 if ( row >= 6 - rowModulo ) 926 if ( row >= 6 - rowModulo )
927 addRow = row - 5 + rowModulo; 927 addRow = row - 5 + rowModulo;
928 } 928 }
929 //qDebug("add %d %d -- %d %d ", col, addCol, row, addRow); 929 //qDebug("add %d %d -- %d %d ", col, addCol, row, addRow);
930 ++addCol;//++addCol; 930 ++addCol;//++addCol;
931 if ( row == 0) 931 if ( row == 0)
932 addRow = 1; 932 addRow = 1;
933 p.drawText(col*dwidth+addCol, row*dheight+addRow, dwidth, dheight, 933 p.drawText(col*dwidth+addCol, row*dheight+addRow, dwidth, dheight,
934 Qt::AlignHCenter | Qt::AlignVCenter, daylbls[i]); 934 Qt::AlignHCenter | Qt::AlignVCenter, daylbls[i]);
935 935
936 // reset color to actual color 936 // reset color to actual color
937 if (!mHolidays[i].isNull()) { 937 if (!mHolidays[i].isNull()) {
938 p.setPen(actcol); 938 p.setPen(actcol);
939 } 939 }
940 // reset bold font to plain font 940 // reset bold font to plain font
941 if ( eDays.testBit(i)) { 941 if ( eDays.testBit(i)) {
942 QFont myFont = font(); 942 QFont myFont = font();
943 myFont.setBold(false); 943 myFont.setBold(false);
944 p.setFont(myFont); 944 p.setFont(myFont);
945 } 945 }
946 } 946 }
947 } else { 947 } else {
948 //qDebug("NO redraw "); 948 //qDebug("NO redraw ");
949 } 949 }
950 bitBlt (this, 0, 0, &myPix, 0 ,0,width(), height() ,CopyROP); 950 bitBlt (this, 0, 0, &myPix, 0 ,0,width(), height() ,CopyROP);
951 mRedrawNeeded = false; 951 mRedrawNeeded = false;
952} 952}
953 953
954// ---------------------------------------------------------------------------- 954// ----------------------------------------------------------------------------
955// R E SI Z E E V E N T H A N D L I N G 955// R E SI Z E E V E N T H A N D L I N G
956// ---------------------------------------------------------------------------- 956// ----------------------------------------------------------------------------
957 957
958void KODayMatrix::resizeEvent(QResizeEvent *) 958void KODayMatrix::resizeEvent(QResizeEvent *)
959{ 959{
960 QRect sz = frameRect(); 960 QRect sz = frameRect();
961 daysize.setHeight(sz.height()*7 / NUMDAYS); 961 daysize.setHeight(sz.height()*7 / NUMDAYS);
962 daysize.setWidth(sz.width() / 7); 962 daysize.setWidth(sz.width() / 7);
963} 963}
964 964
965QSize KODayMatrix::sizeHint() const 965QSize KODayMatrix::sizeHint() const
966{ 966{
967 967
968 QFontMetrics fm ( font() ); 968 QFontMetrics fm ( font() );
969 int wid = fm.width( "30") *7+3; 969 int wid = fm.width( "30") *7+3;
970 int hei = fm.height() * 6+3; 970 int hei = fm.height() * 6+3;
971 //qDebug("KODayMatrix::sizeHint()********************* %d %d", wid , hei); 971 //qDebug("KODayMatrix::sizeHint()********************* %d %d", wid , hei);
972 return QSize ( wid, hei ); 972 return QSize ( wid, hei );
973 973
974} 974}
diff --git a/microkde/KDGanttMinimizeSplitter.cpp b/microkde/KDGanttMinimizeSplitter.cpp
index 253175e..2a30346 100644
--- a/microkde/KDGanttMinimizeSplitter.cpp
+++ b/microkde/KDGanttMinimizeSplitter.cpp
@@ -84,404 +84,400 @@ KDGanttSplitterHandle::KDGanttSplitterHandle( Qt::Orientation o,
84 //setMaximumHeight( 5 ); // test only 84 //setMaximumHeight( 5 ); // test only
85} 85}
86 86
87QSize KDGanttSplitterHandle::sizeHint() const 87QSize KDGanttSplitterHandle::sizeHint() const
88{ 88{
89 return mSizeHint; 89 return mSizeHint;
90} 90}
91 91
92void KDGanttSplitterHandle::setOrientation( Qt::Orientation o ) 92void KDGanttSplitterHandle::setOrientation( Qt::Orientation o )
93{ 93{
94 orient = o; 94 orient = o;
95#ifndef QT_NO_CURSOR 95#ifndef QT_NO_CURSOR
96 if ( o == KDGanttMinimizeSplitter::Horizontal ) 96 if ( o == KDGanttMinimizeSplitter::Horizontal )
97 setCursor( splitHCursor ); 97 setCursor( splitHCursor );
98 else 98 else
99 setCursor( splitVCursor ); 99 setCursor( splitVCursor );
100#endif 100#endif
101} 101}
102 102
103 103
104void KDGanttSplitterHandle::mouseMoveEvent( QMouseEvent *e ) 104void KDGanttSplitterHandle::mouseMoveEvent( QMouseEvent *e )
105{ 105{
106 updateCursor( e->pos() ); 106 updateCursor( e->pos() );
107 if ( !(e->state()&LeftButton) ) 107 if ( !(e->state()&LeftButton) )
108 return; 108 return;
109 109
110 if ( _activeButton != 0) 110 if ( _activeButton != 0)
111 return; 111 return;
112 112
113 QCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos())) 113 QCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos()))
114 - mouseOffset; 114 - mouseOffset;
115 if ( opaque() ) { 115 if ( opaque() ) {
116 s->moveSplitter( pos, id() ); 116 s->moveSplitter( pos, id() );
117 } else { 117 } else {
118 int min = pos; int max = pos; 118 int min = pos; int max = pos;
119 s->getRange( id(), &min, &max ); 119 s->getRange( id(), &min, &max );
120 s->setRubberband( QMAX( min, QMIN(max, pos ))); 120 s->setRubberband( QMAX( min, QMIN(max, pos )));
121 } 121 }
122 _collapsed = false; 122 _collapsed = false;
123} 123}
124 124
125void KDGanttSplitterHandle::mousePressEvent( QMouseEvent *e ) 125void KDGanttSplitterHandle::mousePressEvent( QMouseEvent *e )
126{ 126{
127 if ( e->button() == LeftButton ) { 127 if ( e->button() == LeftButton ) {
128 _activeButton = onButton( e->pos() ); 128 _activeButton = onButton( e->pos() );
129 mouseOffset = s->pick(e->pos()); 129 mouseOffset = s->pick(e->pos());
130 mMouseDown = true; 130 mMouseDown = true;
131 repaint(); 131 repaint();
132 updateCursor( e->pos() ); 132 updateCursor( e->pos() );
133 } 133 }
134} 134}
135 135
136void KDGanttSplitterHandle::updateCursor( const QPoint& p) 136void KDGanttSplitterHandle::updateCursor( const QPoint& p)
137{ 137{
138 if ( onButton( p ) != 0 ) { 138 if ( onButton( p ) != 0 ) {
139 setCursor( arrowCursor ); 139 setCursor( arrowCursor );
140 } 140 }
141 else { 141 else {
142 if ( orient == KDGanttMinimizeSplitter::Horizontal ) 142 if ( orient == KDGanttMinimizeSplitter::Horizontal )
143 setCursor( splitHCursor ); 143 setCursor( splitHCursor );
144 else 144 else
145 setCursor( splitVCursor ); 145 setCursor( splitVCursor );
146 } 146 }
147} 147}
148void KDGanttSplitterHandle::toggle() 148void KDGanttSplitterHandle::toggle()
149{ 149{
150 int pos; 150 int pos;
151 int min, max; 151 int min, max;
152 if ( !_collapsed ) { 152 if ( !_collapsed ) {
153 s->expandPos( id(), &min, &max ); 153 s->expandPos( id(), &min, &max );
154 if ( s->minimizeDirection() == KDGanttMinimizeSplitter::Left 154 if ( s->minimizeDirection() == KDGanttMinimizeSplitter::Left
155 || s->minimizeDirection() == KDGanttMinimizeSplitter::Up ) { 155 || s->minimizeDirection() == KDGanttMinimizeSplitter::Up ) {
156 pos = min; 156 pos = min;
157 } 157 }
158 else { 158 else {
159 pos = max; 159 pos = max;
160 } 160 }
161 161
162 _origPos = s->pick(mapToParent( QPoint( 0,0 ) )); 162 _origPos = s->pick(mapToParent( QPoint( 0,0 ) ));
163 s->moveSplitter( pos, id() ); 163 s->moveSplitter( pos, id() );
164 _collapsed = true; 164 _collapsed = true;
165 } 165 }
166 else { 166 else {
167 s->moveSplitter( _origPos, id() ); 167 s->moveSplitter( _origPos, id() );
168 _collapsed = false; 168 _collapsed = false;
169 } 169 }
170 repaint(); 170 repaint();
171} 171}
172 172
173void KDGanttSplitterHandle::mouseReleaseEvent( QMouseEvent *e ) 173void KDGanttSplitterHandle::mouseReleaseEvent( QMouseEvent *e )
174{ 174{
175 mMouseDown = false; 175 mMouseDown = false;
176 if ( _activeButton != 0 ) { 176 if ( _activeButton != 0 ) {
177 if ( onButton( e->pos() ) == _activeButton ) 177 if ( onButton( e->pos() ) == _activeButton )
178 { 178 {
179 toggle(); 179 toggle();
180 } 180 }
181 _activeButton = 0; 181 _activeButton = 0;
182 updateCursor( e->pos() ); 182 updateCursor( e->pos() );
183 } 183 }
184 else { 184 else {
185 if ( !opaque() && e->button() == LeftButton ) { 185 if ( !opaque() && e->button() == LeftButton ) {
186 QCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos())) 186 QCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos()))
187 - mouseOffset; 187 - mouseOffset;
188 s->setRubberband( -1 ); 188 s->setRubberband( -1 );
189 s->moveSplitter( pos, id() ); 189 s->moveSplitter( pos, id() );
190 } 190 }
191 } 191 }
192 if ( s->rubberBand() ) 192 if ( s->rubberBand() )
193 s->rubberBand()->hide(); 193 s->rubberBand()->hide();
194 repaint(); 194 repaint();
195} 195}
196 196
197int KDGanttSplitterHandle::onButton( const QPoint& p ) 197int KDGanttSplitterHandle::onButton( const QPoint& p )
198{ 198{
199 QValueList<QPointArray> list = buttonRegions(); 199 QValueList<QPointArray> list = buttonRegions();
200 int index = 1; 200 int index = 1;
201 int add = 12; 201 int add = 12;
202 for( QValueList<QPointArray>::Iterator it = list.begin(); it != list.end(); ++it ) { 202 for( QValueList<QPointArray>::Iterator it = list.begin(); it != list.end(); ++it ) {
203 QRect rect = (*it).boundingRect(); 203 QRect rect = (*it).boundingRect();
204 rect.setLeft( rect.left()- add ); 204 rect.setLeft( rect.left()- add );
205 rect.setRight( rect.right() + add); 205 rect.setRight( rect.right() + add);
206 rect.setTop( rect.top()- add ); 206 rect.setTop( rect.top()- add );
207 rect.setBottom( rect.bottom() + add); 207 rect.setBottom( rect.bottom() + add);
208 if ( rect.contains( p ) ) { 208 if ( rect.contains( p ) ) {
209 return index; 209 return index;
210 } 210 }
211 index++; 211 index++;
212 } 212 }
213 return 0; 213 return 0;
214} 214}
215 215
216 216
217QValueList<QPointArray> KDGanttSplitterHandle::buttonRegions() 217QValueList<QPointArray> KDGanttSplitterHandle::buttonRegions()
218{ 218{
219 QValueList<QPointArray> list; 219 QValueList<QPointArray> list;
220 220
221 int sw = 8; 221 int sw = 8;
222 int yyy = 1; 222 int yyy = 1;
223 int xxx = 1; 223 int xxx = 1;
224 int voffset[] = { (int) -sw*3, (int) sw*3 }; 224 int voffset[] = { (int) -sw*3, (int) sw*3 };
225 for ( int i = 0; i < 2; i++ ) { 225 for ( int i = 0; i < 2; i++ ) {
226 QPointArray arr; 226 QPointArray arr;
227 if ( !_collapsed && s->minimizeDirection() == KDGanttMinimizeSplitter::Right || 227 if ( !_collapsed && s->minimizeDirection() == KDGanttMinimizeSplitter::Right ||
228 _collapsed && s->minimizeDirection() == KDGanttMinimizeSplitter::Left) { 228 _collapsed && s->minimizeDirection() == KDGanttMinimizeSplitter::Left) {
229 int mid = height()/2 + voffset[i]; 229 int mid = height()/2 + voffset[i];
230 arr.setPoints( 3, 230 arr.setPoints( 3,
231 1-xxx, mid - sw + 4, 231 1-xxx, mid - sw + 4,
232 sw-3-xxx, mid, 232 sw-3-xxx, mid,
233 1-xxx, mid + sw -4); 233 1-xxx, mid + sw -4);
234 } 234 }
235 else if ( !_collapsed && s->minimizeDirection() == KDGanttMinimizeSplitter::Left || 235 else if ( !_collapsed && s->minimizeDirection() == KDGanttMinimizeSplitter::Left ||
236 _collapsed && s->minimizeDirection() == KDGanttMinimizeSplitter::Right ) { 236 _collapsed && s->minimizeDirection() == KDGanttMinimizeSplitter::Right ) {
237 int mid = height()/2 + voffset[i]; 237 int mid = height()/2 + voffset[i];
238 arr.setPoints( 3, 238 arr.setPoints( 3,
239 sw-4, mid - sw + 4, 239 sw-4, mid - sw + 4,
240 0, mid, 240 0, mid,
241 sw-4, mid + sw - 4); 241 sw-4, mid + sw - 4);
242 } 242 }
243 else if ( !_collapsed && s->minimizeDirection() == KDGanttMinimizeSplitter::Up || 243 else if ( !_collapsed && s->minimizeDirection() == KDGanttMinimizeSplitter::Up ||
244 _collapsed && s->minimizeDirection() == KDGanttMinimizeSplitter::Down) { 244 _collapsed && s->minimizeDirection() == KDGanttMinimizeSplitter::Down) {
245 int mid = width()/2 + voffset[i]; 245 int mid = width()/2 + voffset[i];
246 arr.setPoints( 3, 246 arr.setPoints( 3,
247 mid - sw + 4, sw-4, 247 mid - sw + 4, sw-4,
248 mid, 0, 248 mid, 0,
249 mid + sw - 4, sw-4 ); 249 mid + sw - 4, sw-4 );
250 } 250 }
251 else if ( !_collapsed && s->minimizeDirection() == KDGanttMinimizeSplitter::Down || 251 else if ( !_collapsed && s->minimizeDirection() == KDGanttMinimizeSplitter::Down ||
252 _collapsed && s->minimizeDirection() == KDGanttMinimizeSplitter::Up ) { 252 _collapsed && s->minimizeDirection() == KDGanttMinimizeSplitter::Up ) {
253 int mid = width()/2 + voffset[i]; 253 int mid = width()/2 + voffset[i];
254 arr.setPoints( 3, 254 arr.setPoints( 3,
255 mid - sw + 4, 1-yyy, 255 mid - sw + 4, 1-yyy,
256 mid, sw-3-yyy, 256 mid, sw-3-yyy,
257 mid + sw -4, 1-yyy); 257 mid + sw -4, 1-yyy);
258 } 258 }
259 list.append( arr ); 259 list.append( arr );
260 } 260 }
261 return list; 261 return list;
262} 262}
263 263
264void KDGanttSplitterHandle::paintEvent( QPaintEvent * ) 264void KDGanttSplitterHandle::paintEvent( QPaintEvent * )
265{ 265{
266 QPixmap buffer( size() ); 266 QPixmap buffer( size() );
267 QPainter p( &buffer ); 267 QPainter p( &buffer );
268 268
269 //LR 269 //LR
270 // Draw the splitter rectangle 270 // Draw the splitter rectangle
271 p.setBrush( colorGroup().background() ); 271 p.setBrush( colorGroup().background() );
272 p.setPen( colorGroup().foreground() ); 272 p.setPen( colorGroup().foreground() );
273 //p.drawRect( rect() ); 273 //p.drawRect( rect() );
274#ifndef DESKTOP_VERSION 274#ifndef DESKTOP_VERSION
275 if ( mMouseDown ) 275 if ( mMouseDown )
276 buffer.fill( QColor( 242,27,255 ) ); 276 buffer.fill( colorGroup().background().dark() );
277 else 277 else
278#endif 278#endif
279 buffer.fill( colorGroup().background() ); 279 buffer.fill( colorGroup().background() );
280 //buffer.fill( backgroundColor() ); 280 //buffer.fill( backgroundColor() );
281 // parentWidget()->style().drawPrimitive( QStyle::PE_Panel, &p, rect(), parentWidget()->colorGroup()); 281 // parentWidget()->style().drawPrimitive( QStyle::PE_Panel, &p, rect(), parentWidget()->colorGroup());
282 282
283 int sw = 8; // Hardcoded, given I didn't use styles anymore, I didn't like to use their size 283 int sw = 8; // Hardcoded, given I didn't use styles anymore, I didn't like to use their size
284 284
285 // arrow color 285 // arrow color
286 QColor col; 286 QColor col;
287 if ( _activeButton ) 287 if ( _activeButton )
288 col = colorGroup().background().dark( 250 ); 288 col = colorGroup().background().dark( 250 );
289 else { 289 else {
290 if ( mMouseDown ) 290 if ( mMouseDown )
291#ifndef DESKTOP_VERSION 291 col = Qt::white;
292 col = QColor( 178,18,188);//QColor( 242,27,255 );//Qt::white;
293#else
294 col = Qt::white;
295#endif
296 else 292 else
297 col = colorGroup().background().dark( 150 ); 293 col = colorGroup().background().dark( 150 );
298 } 294 }
299 //QColor col = backgroundColor().dark( 130 ); 295 //QColor col = backgroundColor().dark( 130 );
300 p.setBrush( col ); 296 p.setBrush( col );
301 p.setPen( col ); 297 p.setPen( col );
302 298
303 QValueList<QPointArray> list = buttonRegions(); 299 QValueList<QPointArray> list = buttonRegions();
304 int index = 1; 300 int index = 1;
305 if ( mUseOffset ) 301 if ( mUseOffset )
306 p.translate( 0, 1 ); 302 p.translate( 0, 1 );
307 for ( QValueList<QPointArray>::Iterator it = list.begin(); it != list.end(); ++it ) { 303 for ( QValueList<QPointArray>::Iterator it = list.begin(); it != list.end(); ++it ) {
308 if ( index == _activeButton ) { 304 if ( index == _activeButton ) {
309 305
310 /* 306 /*
311 if ( ! _collapsed ) { 307 if ( ! _collapsed ) {
312 p.save(); 308 p.save();
313 // p.translate( parentWidget()->style().pixelMetric( QStyle::PM_ButtonShiftHorizontal ), 309 // p.translate( parentWidget()->style().pixelMetric( QStyle::PM_ButtonShiftHorizontal ),
314 // parentWidget()->style().pixelMetric( QStyle::PM_ButtonShiftVertical ) ); 310 // parentWidget()->style().pixelMetric( QStyle::PM_ButtonShiftVertical ) );
315 p.translate( -1, 0 ); 311 p.translate( -1, 0 );
316 p.drawPolygon( *it, true ); 312 p.drawPolygon( *it, true );
317 p.restore(); } else 313 p.restore(); } else
318 */ 314 */
319 p.drawPolygon( *it, true ); 315 p.drawPolygon( *it, true );
320 316
321 } 317 }
322 else { 318 else {
323 /* 319 /*
324 if ( ! _collapsed ) { 320 if ( ! _collapsed ) {
325 p.save(); 321 p.save();
326 p.translate( -1, 0 ); 322 p.translate( -1, 0 );
327 p.drawPolygon( *it, true ); 323 p.drawPolygon( *it, true );
328 p.restore(); 324 p.restore();
329 } else 325 } else
330 */ 326 */
331 p.drawPolygon( *it, true ); 327 p.drawPolygon( *it, true );
332 328
333 } 329 }
334 index++; 330 index++;
335 } 331 }
336 332
337 // Draw the lines between the arrows 333 // Draw the lines between the arrows
338 if ( s->minimizeDirection() == KDGanttMinimizeSplitter::Left || 334 if ( s->minimizeDirection() == KDGanttMinimizeSplitter::Left ||
339 s->minimizeDirection() == KDGanttMinimizeSplitter::Right ) { 335 s->minimizeDirection() == KDGanttMinimizeSplitter::Right ) {
340 int mid = height()/2; 336 int mid = height()/2;
341 p.drawLine ( 1, mid - sw, 1, mid + sw ); 337 p.drawLine ( 1, mid - sw, 1, mid + sw );
342 p.drawLine ( 3, mid - sw, 3, mid + sw ); 338 p.drawLine ( 3, mid - sw, 3, mid + sw );
343 } 339 }
344 else if ( s->minimizeDirection() == KDGanttMinimizeSplitter::Up || 340 else if ( s->minimizeDirection() == KDGanttMinimizeSplitter::Up ||
345 s->minimizeDirection() == KDGanttMinimizeSplitter::Down ) { 341 s->minimizeDirection() == KDGanttMinimizeSplitter::Down ) {
346 int mid = width()/2; 342 int mid = width()/2;
347 p.drawLine( mid -sw, 1, mid +sw, 1 ); 343 p.drawLine( mid -sw, 1, mid +sw, 1 );
348 p.drawLine( mid -sw, 3, mid +sw, 3 ); 344 p.drawLine( mid -sw, 3, mid +sw, 3 );
349 } 345 }
350 bitBlt( this, 0, 0, &buffer ); 346 bitBlt( this, 0, 0, &buffer );
351 347
352} 348}
353#endif 349#endif
354 350
355class QSplitterLayoutStruct 351class QSplitterLayoutStruct
356{ 352{
357public: 353public:
358 KDGanttMinimizeSplitter::ResizeMode mode; 354 KDGanttMinimizeSplitter::ResizeMode mode;
359 QCOORD sizer; 355 QCOORD sizer;
360 bool isSplitter; 356 bool isSplitter;
361 QWidget *wid; 357 QWidget *wid;
362}; 358};
363 359
364class QSplitterData 360class QSplitterData
365{ 361{
366public: 362public:
367 QSplitterData() : opaque( FALSE ), firstShow( TRUE ) {} 363 QSplitterData() : opaque( FALSE ), firstShow( TRUE ) {}
368 364
369 QPtrList<QSplitterLayoutStruct> list; 365 QPtrList<QSplitterLayoutStruct> list;
370 bool opaque; 366 bool opaque;
371 bool firstShow; 367 bool firstShow;
372}; 368};
373 369
374void kdganttGeomCalc( QMemArray<QLayoutStruct> &chain, int start, int count, int pos, 370void kdganttGeomCalc( QMemArray<QLayoutStruct> &chain, int start, int count, int pos,
375 int space, int spacer ); 371 int space, int spacer );
376#endif // DOXYGEN_SKIP_INTERNAL 372#endif // DOXYGEN_SKIP_INTERNAL
377 373
378 374
379/*! 375/*!
380 \class KDGanttMinimizeSplitter KDGanttMinimizeSplitter.h 376 \class KDGanttMinimizeSplitter KDGanttMinimizeSplitter.h
381 \brief The KDGanttMinimizeSplitter class implements a splitter 377 \brief The KDGanttMinimizeSplitter class implements a splitter
382 widget with minimize buttons. 378 widget with minimize buttons.
383 379
384 This class (and its documentation) is largely a copy of Qt's 380 This class (and its documentation) is largely a copy of Qt's
385 QSplitter; the copying was necessary because QSplitter is not 381 QSplitter; the copying was necessary because QSplitter is not
386 extensible at all. QSplitter and its documentation are licensed 382 extensible at all. QSplitter and its documentation are licensed
387 according to the GPL and the Qt Professional License (if you hold 383 according to the GPL and the Qt Professional License (if you hold
388 such a license) and are (C) Trolltech AS. 384 such a license) and are (C) Trolltech AS.
389 385
390 A splitter lets the user control the size of child widgets by 386 A splitter lets the user control the size of child widgets by
391 dragging the boundary between the children. Any number of widgets 387 dragging the boundary between the children. Any number of widgets
392 may be controlled. 388 may be controlled.
393 389
394 To show a QListBox, a QListView and a QTextEdit side by side: 390 To show a QListBox, a QListView and a QTextEdit side by side:
395 391
396 \code 392 \code
397 KDGanttMinimizeSplitter *split = new KDGanttMinimizeSplitter( parent ); 393 KDGanttMinimizeSplitter *split = new KDGanttMinimizeSplitter( parent );
398 QListBox *lb = new QListBox( split ); 394 QListBox *lb = new QListBox( split );
399 QListView *lv = new QListView( split ); 395 QListView *lv = new QListView( split );
400 QTextEdit *ed = new QTextEdit( split ); 396 QTextEdit *ed = new QTextEdit( split );
401 \endcode 397 \endcode
402 398
403 In KDGanttMinimizeSplitter, the boundary can be either horizontal or 399 In KDGanttMinimizeSplitter, the boundary can be either horizontal or
404 vertical. The default is horizontal (the children are side by side) 400 vertical. The default is horizontal (the children are side by side)
405 but you can use setOrientation( QSplitter::Vertical ) to set it to 401 but you can use setOrientation( QSplitter::Vertical ) to set it to
406 vertical. 402 vertical.
407 403
408 Use setResizeMode() to specify 404 Use setResizeMode() to specify
409 that a widget should keep its size when the splitter is resized. 405 that a widget should keep its size when the splitter is resized.
410 406
411 Although KDGanttMinimizeSplitter normally resizes the children only 407 Although KDGanttMinimizeSplitter normally resizes the children only
412 at the end of a resize operation, if you call setOpaqueResize( TRUE 408 at the end of a resize operation, if you call setOpaqueResize( TRUE
413 ) the widgets are resized as often as possible. 409 ) the widgets are resized as often as possible.
414 410
415 The initial distribution of size between the widgets is determined 411 The initial distribution of size between the widgets is determined
416 by the initial size of each widget. You can also use setSizes() to 412 by the initial size of each widget. You can also use setSizes() to
417 set the sizes of all the widgets. The function sizes() returns the 413 set the sizes of all the widgets. The function sizes() returns the
418 sizes set by the user. 414 sizes set by the user.
419 415
420 If you hide() a child, its space will be distributed among the other 416 If you hide() a child, its space will be distributed among the other
421 children. It will be reinstated when you show() it again. It is also 417 children. It will be reinstated when you show() it again. It is also
422 possible to reorder the widgets within the splitter using 418 possible to reorder the widgets within the splitter using
423 moveToFirst() and moveToLast(). 419 moveToFirst() and moveToLast().
424*/ 420*/
425 421
426 422
427 423
428static QSize minSize( const QWidget* /*w*/ ) 424static QSize minSize( const QWidget* /*w*/ )
429{ 425{
430 return QSize(0,0); 426 return QSize(0,0);
431} 427}
432 428
433// This is the original version of minSize 429// This is the original version of minSize
434static QSize minSizeHint( const QWidget* w ) 430static QSize minSizeHint( const QWidget* w )
435{ 431{
436 QSize min = w->minimumSize(); 432 QSize min = w->minimumSize();
437 QSize s; 433 QSize s;
438 if ( min.height() <= 0 || min.width() <= 0 ) 434 if ( min.height() <= 0 || min.width() <= 0 )
439 s = w->minimumSizeHint(); 435 s = w->minimumSizeHint();
440 if ( min.height() > 0 ) 436 if ( min.height() > 0 )
441 s.setHeight( min.height() ); 437 s.setHeight( min.height() );
442 if ( min.width() > 0 ) 438 if ( min.width() > 0 )
443 s.setWidth( min.width() ); 439 s.setWidth( min.width() );
444 return s.expandedTo(QSize(0,0)); 440 return s.expandedTo(QSize(0,0));
445} 441}
446 442
447 443
448/*! 444/*!
449 Constructs a horizontal splitter with the \a parent and \a 445 Constructs a horizontal splitter with the \a parent and \a
450 name arguments being passed on to the QFrame constructor. 446 name arguments being passed on to the QFrame constructor.
451*/ 447*/
452KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( QWidget *parent, const char *name ) 448KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( QWidget *parent, const char *name )
453 :QFrame(parent,name,WPaintUnclipped) 449 :QFrame(parent,name,WPaintUnclipped)
454{ 450{
455 mRubberBand = 0; 451 mRubberBand = 0;
456 mFirstHandle = 0; 452 mFirstHandle = 0;
457#if QT_VERSION >= 232 453#if QT_VERSION >= 232
458 orient = Horizontal; 454 orient = Horizontal;
459 init(); 455 init();
460#endif 456#endif
461} 457}
462 458
463/*! 459/*!
464 Constructs a splitter with orientation \a o with the \a parent 460 Constructs a splitter with orientation \a o with the \a parent
465 and \a name arguments being passed on to the QFrame constructor. 461 and \a name arguments being passed on to the QFrame constructor.
466*/ 462*/
467KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Orientation o, QWidget *parent, const char *name ) 463KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Orientation o, QWidget *parent, const char *name )
468 :QFrame(parent,name,WPaintUnclipped) 464 :QFrame(parent,name,WPaintUnclipped)
469{ 465{
470 466
471 mRubberBand = 0; 467 mRubberBand = 0;
472 mFirstHandle = 0; 468 mFirstHandle = 0;
473#if QT_VERSION >= 232 469#if QT_VERSION >= 232
474 orient = o; 470 orient = o;
475 init(); 471 init();
476#endif 472#endif
477} 473}
478 474
479/*! 475/*!
480 Destroys the splitter and any children. 476 Destroys the splitter and any children.
481*/ 477*/
482KDGanttMinimizeSplitter::~KDGanttMinimizeSplitter() 478KDGanttMinimizeSplitter::~KDGanttMinimizeSplitter()
483{ 479{
484#if QT_VERSION >= 232 480#if QT_VERSION >= 232
485 data->list.setAutoDelete( TRUE ); 481 data->list.setAutoDelete( TRUE );
486 delete data; 482 delete data;
487#endif 483#endif
@@ -499,385 +495,385 @@ void KDGanttMinimizeSplitter::init()
499 else 495 else
500 setSizePolicy( QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Expanding) ); 496 setSizePolicy( QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Expanding) );
501#ifndef DESKTOP_VERSION 497#ifndef DESKTOP_VERSION
502 setOpaqueResize( false ); 498 setOpaqueResize( false );
503#else 499#else
504 setOpaqueResize( true ); 500 setOpaqueResize( true );
505#endif 501#endif
506} 502}
507#endif 503#endif
508 504
509 505
510void KDGanttMinimizeSplitter::toggle() 506void KDGanttMinimizeSplitter::toggle()
511{ 507{
512 if ( mFirstHandle ) 508 if ( mFirstHandle )
513 mFirstHandle->toggle(); 509 mFirstHandle->toggle();
514 else 510 else
515 qDebug("KDGanttMinimizeSplitter::toggle::sorry, handle not available "); 511 qDebug("KDGanttMinimizeSplitter::toggle::sorry, handle not available ");
516 512
517} 513}
518 514
519 515
520/*! 516/*!
521 \brief the orientation of the splitter 517 \brief the orientation of the splitter
522 518
523 By default the orientation is horizontal (the widgets are side by side). 519 By default the orientation is horizontal (the widgets are side by side).
524 The possible orientations are Qt:Vertical and Qt::Horizontal (the default). 520 The possible orientations are Qt:Vertical and Qt::Horizontal (the default).
525*/ 521*/
526void KDGanttMinimizeSplitter::setOrientation( Orientation o ) 522void KDGanttMinimizeSplitter::setOrientation( Orientation o )
527{ 523{
528#if QT_VERSION >= 232 524#if QT_VERSION >= 232
529 if ( orient == o ) 525 if ( orient == o )
530 return; 526 return;
531 orient = o; 527 orient = o;
532 528
533 if ( orient == Horizontal ) 529 if ( orient == Horizontal )
534 setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) ); 530 setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) );
535 else 531 else
536 setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Expanding ) ); 532 setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Expanding ) );
537 533
538 QSplitterLayoutStruct *s = data->list.first(); 534 QSplitterLayoutStruct *s = data->list.first();
539 while ( s ) { 535 while ( s ) {
540 if ( s->isSplitter ) 536 if ( s->isSplitter )
541 ((KDGanttSplitterHandle*)s->wid)->setOrientation( o ); 537 ((KDGanttSplitterHandle*)s->wid)->setOrientation( o );
542 s = data->list.next(); // ### next at end of loop, no iterator 538 s = data->list.next(); // ### next at end of loop, no iterator
543 } 539 }
544 recalc( isVisible() ); 540 recalc( isVisible() );
545#endif 541#endif
546} 542}
547 543
548 544
549#if QT_VERSION >= 232 545#if QT_VERSION >= 232
550/*! 546/*!
551 \reimp 547 \reimp
552*/ 548*/
553void KDGanttMinimizeSplitter::resizeEvent( QResizeEvent * ) 549void KDGanttMinimizeSplitter::resizeEvent( QResizeEvent * )
554{ 550{
555 doResize(); 551 doResize();
556} 552}
557 553
558 554
559/* 555/*
560 Inserts the widget \a w at the end (or at the beginning if \a first 556 Inserts the widget \a w at the end (or at the beginning if \a first
561 is TRUE) of the splitter's list of widgets. 557 is TRUE) of the splitter's list of widgets.
562 558
563 It is the responsibility of the caller of this function to make sure 559 It is the responsibility of the caller of this function to make sure
564 that \a w is not already in the splitter and to call recalcId if 560 that \a w is not already in the splitter and to call recalcId if
565 needed. (If \a first is TRUE, then recalcId is very probably 561 needed. (If \a first is TRUE, then recalcId is very probably
566 needed.) 562 needed.)
567*/ 563*/
568QSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( QWidget *w, bool first ) 564QSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( QWidget *w, bool first )
569{ 565{
570 QSplitterLayoutStruct *s; 566 QSplitterLayoutStruct *s;
571 KDGanttSplitterHandle *newHandle = 0; 567 KDGanttSplitterHandle *newHandle = 0;
572 if ( data->list.count() > 0 ) { 568 if ( data->list.count() > 0 ) {
573 s = new QSplitterLayoutStruct; 569 s = new QSplitterLayoutStruct;
574 s->mode = KeepSize; 570 s->mode = KeepSize;
575 QString tmp = "qt_splithandle_"; 571 QString tmp = "qt_splithandle_";
576 tmp += w->name(); 572 tmp += w->name();
577 newHandle = new KDGanttSplitterHandle( orientation(), this, tmp.latin1() ); 573 newHandle = new KDGanttSplitterHandle( orientation(), this, tmp.latin1() );
578 if ( ! mFirstHandle ) 574 if ( ! mFirstHandle )
579 mFirstHandle = newHandle; 575 mFirstHandle = newHandle;
580 s->wid = newHandle; 576 s->wid = newHandle;
581 newHandle->setId(data->list.count()); 577 newHandle->setId(data->list.count());
582 s->isSplitter = TRUE; 578 s->isSplitter = TRUE;
583 s->sizer = pick( newHandle->sizeHint() ); 579 s->sizer = pick( newHandle->sizeHint() );
584 if ( first ) 580 if ( first )
585 data->list.insert( 0, s ); 581 data->list.insert( 0, s );
586 else 582 else
587 data->list.append( s ); 583 data->list.append( s );
588 } 584 }
589 s = new QSplitterLayoutStruct; 585 s = new QSplitterLayoutStruct;
590 s->mode = Stretch; 586 s->mode = Stretch;
591 s->wid = w; 587 s->wid = w;
592 if ( !testWState( WState_Resized ) && w->sizeHint().isValid() ) 588 if ( !testWState( WState_Resized ) && w->sizeHint().isValid() )
593 s->sizer = pick( w->sizeHint() ); 589 s->sizer = pick( w->sizeHint() );
594 else 590 else
595 s->sizer = pick( w->size() ); 591 s->sizer = pick( w->size() );
596 s->isSplitter = FALSE; 592 s->isSplitter = FALSE;
597 if ( first ) 593 if ( first )
598 data->list.insert( 0, s ); 594 data->list.insert( 0, s );
599 else 595 else
600 data->list.append( s ); 596 data->list.append( s );
601 if ( newHandle && isVisible() ) 597 if ( newHandle && isVisible() )
602 newHandle->show(); //will trigger sending of post events 598 newHandle->show(); //will trigger sending of post events
603 return s; 599 return s;
604} 600}
605 601
606 602
607/*! 603/*!
608 Tells the splitter that a child widget has been inserted or removed. 604 Tells the splitter that a child widget has been inserted or removed.
609 The event is passed in \a c. 605 The event is passed in \a c.
610*/ 606*/
611void KDGanttMinimizeSplitter::childEvent( QChildEvent *c ) 607void KDGanttMinimizeSplitter::childEvent( QChildEvent *c )
612{ 608{
613 if ( c->type() == QEvent::ChildInserted ) { 609 if ( c->type() == QEvent::ChildInserted ) {
614 if ( !c->child()->isWidgetType() ) 610 if ( !c->child()->isWidgetType() )
615 return; 611 return;
616 612
617 if ( ((QWidget*)c->child())->testWFlags( WType_TopLevel ) ) 613 if ( ((QWidget*)c->child())->testWFlags( WType_TopLevel ) )
618 return; 614 return;
619 615
620 QSplitterLayoutStruct *s = data->list.first(); 616 QSplitterLayoutStruct *s = data->list.first();
621 while ( s ) { 617 while ( s ) {
622 if ( s->wid == c->child() ) 618 if ( s->wid == c->child() )
623 return; 619 return;
624 s = data->list.next(); 620 s = data->list.next();
625 } 621 }
626 addWidget( (QWidget*)c->child() ); 622 addWidget( (QWidget*)c->child() );
627 recalc( isVisible() ); 623 recalc( isVisible() );
628 624
629 } else if ( c->type() == QEvent::ChildRemoved ) { 625 } else if ( c->type() == QEvent::ChildRemoved ) {
630 QSplitterLayoutStruct *p = 0; 626 QSplitterLayoutStruct *p = 0;
631 if ( data->list.count() > 1 ) 627 if ( data->list.count() > 1 )
632 p = data->list.at(1); //remove handle _after_ first widget. 628 p = data->list.at(1); //remove handle _after_ first widget.
633 QSplitterLayoutStruct *s = data->list.first(); 629 QSplitterLayoutStruct *s = data->list.first();
634 while ( s ) { 630 while ( s ) {
635 if ( s->wid == c->child() ) { 631 if ( s->wid == c->child() ) {
636 data->list.removeRef( s ); 632 data->list.removeRef( s );
637 delete s; 633 delete s;
638 if ( p && p->isSplitter ) { 634 if ( p && p->isSplitter ) {
639 data->list.removeRef( p ); 635 data->list.removeRef( p );
640 delete p->wid; //will call childEvent 636 delete p->wid; //will call childEvent
641 delete p; 637 delete p;
642 } 638 }
643 recalcId(); 639 recalcId();
644 doResize(); 640 doResize();
645 return; 641 return;
646 } 642 }
647 p = s; 643 p = s;
648 s = data->list.next(); 644 s = data->list.next();
649 } 645 }
650 } 646 }
651} 647}
652 648
653 649
654/*! 650/*!
655 Shows a rubber band at position \a p. If \a p is negative, the 651 Shows a rubber band at position \a p. If \a p is negative, the
656 rubber band is removed. 652 rubber band is removed.
657*/ 653*/
658void KDGanttMinimizeSplitter::setRubberband( int p ) 654void KDGanttMinimizeSplitter::setRubberband( int p )
659{ 655{
660#ifdef DESKTOP_VERSION 656#ifdef DESKTOP_VERSION
661 QPainter paint( this ); 657 QPainter paint( this );
662 paint.setPen( gray ); 658 paint.setPen( gray );
663 paint.setBrush( gray ); 659 paint.setBrush( gray );
664 paint.setRasterOp( XorROP ); 660 paint.setRasterOp( XorROP );
665 QRect r = contentsRect(); 661 QRect r = contentsRect();
666 const int rBord = 3; //Themable???? 662 const int rBord = 3; //Themable????
667#if QT_VERSION >= 0x030000 663#if QT_VERSION >= 0x030000
668 int sw = style().pixelMetric(QStyle::PM_SplitterWidth, this); 664 int sw = style().pixelMetric(QStyle::PM_SplitterWidth, this);
669#else 665#else
670 int sw = style().splitterWidth(); 666 int sw = style().splitterWidth();
671#endif 667#endif
672 if ( orient == Horizontal ) { 668 if ( orient == Horizontal ) {
673 if ( opaqueOldPos >= 0 ) 669 if ( opaqueOldPos >= 0 )
674 paint.drawRect( opaqueOldPos + sw/2 - rBord , r.y(), 670 paint.drawRect( opaqueOldPos + sw/2 - rBord , r.y(),
675 2*rBord, r.height() ); 671 2*rBord, r.height() );
676 if ( p >= 0 ) 672 if ( p >= 0 )
677 paint.drawRect( p + sw/2 - rBord, r.y(), 2*rBord, r.height() ); 673 paint.drawRect( p + sw/2 - rBord, r.y(), 2*rBord, r.height() );
678 } else { 674 } else {
679 if ( opaqueOldPos >= 0 ) 675 if ( opaqueOldPos >= 0 )
680 paint.drawRect( r.x(), opaqueOldPos + sw/2 - rBord, 676 paint.drawRect( r.x(), opaqueOldPos + sw/2 - rBord,
681 r.width(), 2*rBord ); 677 r.width(), 2*rBord );
682 if ( p >= 0 ) 678 if ( p >= 0 )
683 paint.drawRect( r.x(), p + sw/2 - rBord, r.width(), 2*rBord ); 679 paint.drawRect( r.x(), p + sw/2 - rBord, r.width(), 2*rBord );
684 } 680 }
685 opaqueOldPos = p; 681 opaqueOldPos = p;
686#else 682#else
687 if ( !mRubberBand ) { 683 if ( !mRubberBand ) {
688 mRubberBand = new QFrame( 0, "rubber", WStyle_NoBorder | WStyle_Customize | WStyle_StaysOnTop); 684 mRubberBand = new QFrame( 0, "rubber", WStyle_NoBorder | WStyle_Customize | WStyle_StaysOnTop);
689 mRubberBand->setFrameStyle( Box | Raised ); 685 mRubberBand->setFrameStyle( Box | Raised );
690 //mRubberBand->setPalette( QPalette ( Qt::red.light(),Qt::red.dark() ) ); 686 //mRubberBand->setPalette( QPalette ( Qt::red.light(),Qt::red.dark() ) );
691 mRubberBand->setPalette( QPalette ( QColor( 178,18,188), QColor( 242,27,255 ) )); 687 mRubberBand->setPalette( QPalette ( colorGroup().background().light(), colorGroup().background().dark() ));
692 } 688 }
693 QRect r = contentsRect(); 689 QRect r = contentsRect();
694 static int rBord = 0; //Themable???? 690 static int rBord = 0; //Themable????
695 if ( !rBord ) { 691 if ( !rBord ) {
696 if (QApplication::desktop()->width() <= 320 ) 692 if (QApplication::desktop()->width() <= 320 )
697 rBord = 3; 693 rBord = 3;
698 else 694 else
699 rBord = 4; 695 rBord = 4;
700 } 696 }
701 int sw = style().splitterWidth(); 697 int sw = style().splitterWidth();
702 if ( orient == Horizontal ) { 698 if ( orient == Horizontal ) {
703 if ( p >= 0 ) { 699 if ( p >= 0 ) {
704 QPoint geo = mapToGlobal (QPoint ( p + sw/2 - rBord, r.y())); 700 QPoint geo = mapToGlobal (QPoint ( p + sw/2 - rBord, r.y()));
705 mRubberBand->setGeometry( geo.x(), geo.y(), 2*rBord, r.height() ); 701 mRubberBand->setGeometry( geo.x(), geo.y(), 2*rBord, r.height() );
706 } 702 }
707 } else { 703 } else {
708 if ( p >= 0 ) { 704 if ( p >= 0 ) {
709 QPoint geo = mapToGlobal (QPoint ( r.x(), p + sw/2 - rBord)); 705 QPoint geo = mapToGlobal (QPoint ( r.x(), p + sw/2 - rBord));
710 mRubberBand->setGeometry( geo.x(), geo.y(), r.width(), 2*rBord); 706 mRubberBand->setGeometry( geo.x(), geo.y(), r.width(), 2*rBord);
711 } 707 }
712 } 708 }
713 opaqueOldPos = p; 709 opaqueOldPos = p;
714 if ( ! mRubberBand->isVisible() ) { 710 if ( ! mRubberBand->isVisible() ) {
715 mRubberBand->show(); 711 mRubberBand->show();
716 } 712 }
717#endif 713#endif
718} 714}
719 715
720 716
721/*! \reimp */ 717/*! \reimp */
722bool KDGanttMinimizeSplitter::event( QEvent *e ) 718bool KDGanttMinimizeSplitter::event( QEvent *e )
723{ 719{
724 if ( e->type() == QEvent::LayoutHint || ( e->type() == QEvent::Show && data->firstShow ) ) { 720 if ( e->type() == QEvent::LayoutHint || ( e->type() == QEvent::Show && data->firstShow ) ) {
725 recalc( isVisible() ); 721 recalc( isVisible() );
726 if ( e->type() == QEvent::Show ) 722 if ( e->type() == QEvent::Show )
727 data->firstShow = FALSE; 723 data->firstShow = FALSE;
728 } 724 }
729 return QWidget::event( e ); 725 return QWidget::event( e );
730} 726}
731 727
732 728
733/*! 729/*!
734 \obsolete 730 \obsolete
735 731
736 Draws the splitter handle in the rectangle described by \a x, \a y, 732 Draws the splitter handle in the rectangle described by \a x, \a y,
737 \a w, \a h using painter \a p. 733 \a w, \a h using painter \a p.
738 \sa QStyle::drawPrimitive() 734 \sa QStyle::drawPrimitive()
739*/ 735*/
740void KDGanttMinimizeSplitter::drawSplitter( QPainter *p, 736void KDGanttMinimizeSplitter::drawSplitter( QPainter *p,
741 QCOORD x, QCOORD y, QCOORD w, QCOORD h ) 737 QCOORD x, QCOORD y, QCOORD w, QCOORD h )
742{ 738{
743#if 0 739#if 0
744 // LR 740 // LR
745 style().drawPrimitive(QStyle::PE_Splitter, p, QRect(x, y, w, h), colorGroup(), 741 style().drawPrimitive(QStyle::PE_Splitter, p, QRect(x, y, w, h), colorGroup(),
746 (orientation() == Qt::Horizontal ? 742 (orientation() == Qt::Horizontal ?
747 QStyle::Style_Horizontal : 0)); 743 QStyle::Style_Horizontal : 0));
748#endif 744#endif
749} 745}
750 746
751 747
752/*! 748/*!
753 Returns the id of the splitter to the right of or below the widget \a w, 749 Returns the id of the splitter to the right of or below the widget \a w,
754 or 0 if there is no such splitter 750 or 0 if there is no such splitter
755 (i.e. it is either not in this KDGanttMinimizeSplitter or it is at the end). 751 (i.e. it is either not in this KDGanttMinimizeSplitter or it is at the end).
756*/ 752*/
757int KDGanttMinimizeSplitter::idAfter( QWidget* w ) const 753int KDGanttMinimizeSplitter::idAfter( QWidget* w ) const
758{ 754{
759 QSplitterLayoutStruct *s = data->list.first(); 755 QSplitterLayoutStruct *s = data->list.first();
760 bool seen_w = FALSE; 756 bool seen_w = FALSE;
761 while ( s ) { 757 while ( s ) {
762 if ( s->isSplitter && seen_w ) 758 if ( s->isSplitter && seen_w )
763 return data->list.at(); 759 return data->list.at();
764 if ( !s->isSplitter && s->wid == w ) 760 if ( !s->isSplitter && s->wid == w )
765 seen_w = TRUE; 761 seen_w = TRUE;
766 s = data->list.next(); 762 s = data->list.next();
767 } 763 }
768 return 0; 764 return 0;
769} 765}
770 766
771 767
772/*! 768/*!
773 Moves the left/top edge of the splitter handle with id \a id as 769 Moves the left/top edge of the splitter handle with id \a id as
774 close as possible to position \a p, which is the distance from the 770 close as possible to position \a p, which is the distance from the
775 left (or top) edge of the widget. 771 left (or top) edge of the widget.
776 772
777 For Arabic and Hebrew the layout is reversed, and using this 773 For Arabic and Hebrew the layout is reversed, and using this
778 function to set the position of the splitter might lead to 774 function to set the position of the splitter might lead to
779 unexpected results, since in Arabic and Hebrew the position of 775 unexpected results, since in Arabic and Hebrew the position of
780 splitter one is to the left of the position of splitter zero. 776 splitter one is to the left of the position of splitter zero.
781 777
782 \sa idAfter() 778 \sa idAfter()
783*/ 779*/
784void KDGanttMinimizeSplitter::moveSplitter( QCOORD p, int id ) 780void KDGanttMinimizeSplitter::moveSplitter( QCOORD p, int id )
785{ 781{
786 p = adjustPos( p, id ); 782 p = adjustPos( p, id );
787 QSplitterLayoutStruct *s = data->list.at(id); 783 QSplitterLayoutStruct *s = data->list.at(id);
788 int oldP = orient == Horizontal ? s->wid->x() : s->wid->y(); 784 int oldP = orient == Horizontal ? s->wid->x() : s->wid->y();
789 bool upLeft; 785 bool upLeft;
790 if ( false && orient == Horizontal ) { 786 if ( false && orient == Horizontal ) {
791 p += s->wid->width(); 787 p += s->wid->width();
792 upLeft = p > oldP; 788 upLeft = p > oldP;
793 } else 789 } else
794 upLeft = p < oldP; 790 upLeft = p < oldP;
795 791
796 moveAfter( p, id, upLeft ); 792 moveAfter( p, id, upLeft );
797 moveBefore( p-1, id-1, upLeft ); 793 moveBefore( p-1, id-1, upLeft );
798 794
799 storeSizes(); 795 storeSizes();
800} 796}
801 797
802 798
803void KDGanttMinimizeSplitter::setG( QWidget *w, int p, int s, bool isSplitter ) 799void KDGanttMinimizeSplitter::setG( QWidget *w, int p, int s, bool isSplitter )
804{ 800{
805 if ( orient == Horizontal ) { 801 if ( orient == Horizontal ) {
806 if ( false && orient == Horizontal && !isSplitter ) 802 if ( false && orient == Horizontal && !isSplitter )
807 p = contentsRect().width() - p - s; 803 p = contentsRect().width() - p - s;
808 w->setGeometry( p, contentsRect().y(), s, contentsRect().height() ); 804 w->setGeometry( p, contentsRect().y(), s, contentsRect().height() );
809 } else 805 } else
810 w->setGeometry( contentsRect().x(), p, contentsRect().width(), s ); 806 w->setGeometry( contentsRect().x(), p, contentsRect().width(), s );
811} 807}
812 808
813 809
814/* 810/*
815 Places the right/bottom edge of the widget at \a id at position \a pos. 811 Places the right/bottom edge of the widget at \a id at position \a pos.
816 812
817 \sa idAfter() 813 \sa idAfter()
818*/ 814*/
819void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft ) 815void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft )
820{ 816{
821 if( id < 0 ) 817 if( id < 0 )
822 return; 818 return;
823 QSplitterLayoutStruct *s = data->list.at(id); 819 QSplitterLayoutStruct *s = data->list.at(id);
824 if ( !s ) 820 if ( !s )
825 return; 821 return;
826 QWidget *w = s->wid; 822 QWidget *w = s->wid;
827 if ( w->isHidden() ) { 823 if ( w->isHidden() ) {
828 moveBefore( pos, id-1, upLeft ); 824 moveBefore( pos, id-1, upLeft );
829 } else if ( s->isSplitter ) { 825 } else if ( s->isSplitter ) {
830 int pos1, pos2; 826 int pos1, pos2;
831 int dd = s->sizer; 827 int dd = s->sizer;
832 if( false && orient == Horizontal ) { 828 if( false && orient == Horizontal ) {
833 pos1 = pos; 829 pos1 = pos;
834 pos2 = pos + dd; 830 pos2 = pos + dd;
835 } else { 831 } else {
836 pos2 = pos - dd; 832 pos2 = pos - dd;
837 pos1 = pos2 + 1; 833 pos1 = pos2 + 1;
838 } 834 }
839 if ( upLeft ) { 835 if ( upLeft ) {
840 setG( w, pos1, dd, TRUE ); 836 setG( w, pos1, dd, TRUE );
841 moveBefore( pos2, id-1, upLeft ); 837 moveBefore( pos2, id-1, upLeft );
842 } else { 838 } else {
843 moveBefore( pos2, id-1, upLeft ); 839 moveBefore( pos2, id-1, upLeft );
844 setG( w, pos1, dd, TRUE ); 840 setG( w, pos1, dd, TRUE );
845 } 841 }
846 } else { 842 } else {
847 int dd, newLeft, nextPos; 843 int dd, newLeft, nextPos;
848 if( false && orient == Horizontal ) { 844 if( false && orient == Horizontal ) {
849 dd = w->geometry().right() - pos; 845 dd = w->geometry().right() - pos;
850 dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->maximumSize()))); 846 dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->maximumSize())));
851 newLeft = pos+1; 847 newLeft = pos+1;
852 nextPos = newLeft + dd; 848 nextPos = newLeft + dd;
853 } else { 849 } else {
854 dd = pos - pick( w->pos() ) + 1; 850 dd = pos - pick( w->pos() ) + 1;
855 dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->maximumSize()))); 851 dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->maximumSize())));
856 newLeft = pos-dd+1; 852 newLeft = pos-dd+1;
857 nextPos = newLeft - 1; 853 nextPos = newLeft - 1;
858 } 854 }
859 setG( w, newLeft, dd, TRUE ); 855 setG( w, newLeft, dd, TRUE );
860 moveBefore( nextPos, id-1, upLeft ); 856 moveBefore( nextPos, id-1, upLeft );
861 } 857 }
862} 858}
863 859
864 860
865/* 861/*
866 Places the left/top edge of the widget at \a id at position \a pos. 862 Places the left/top edge of the widget at \a id at position \a pos.
867 863
868 \sa idAfter() 864 \sa idAfter()
869*/ 865*/
870void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft ) 866void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft )
871{ 867{
872 QSplitterLayoutStruct *s = id < int(data->list.count()) ? 868 QSplitterLayoutStruct *s = id < int(data->list.count()) ?
873 data->list.at(id) : 0; 869 data->list.at(id) : 0;
874 if ( !s ) 870 if ( !s )
875 return; 871 return;
876 QWidget *w = s->wid; 872 QWidget *w = s->wid;
877 if ( w->isHidden() ) { 873 if ( w->isHidden() ) {
878 moveAfter( pos, id+1, upLeft ); 874 moveAfter( pos, id+1, upLeft );
879 } else if ( pick( w->pos() ) == pos ) { 875 } else if ( pick( w->pos() ) == pos ) {
880 //No need to do anything if it's already there. 876 //No need to do anything if it's already there.
881 return; 877 return;
882 } else if ( s->isSplitter ) { 878 } else if ( s->isSplitter ) {
883 int dd = s->sizer; 879 int dd = s->sizer;
diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp
index e6144de..11635e1 100644
--- a/microkde/kdialogbase.cpp
+++ b/microkde/kdialogbase.cpp
@@ -1,296 +1,296 @@
1#include <qtabwidget.h> 1#include <qtabwidget.h>
2#include <qpushbutton.h> 2#include <qpushbutton.h>
3#include <qlayout.h> 3#include <qlayout.h>
4#include <qframe.h> 4#include <qframe.h>
5 5
6 6
7#include "klocale.h" 7#include "klocale.h"
8#include "kdebug.h" 8#include "kdebug.h"
9 9
10#include "kdialogbase.h" 10#include "kdialogbase.h"
11 11
12KDialogBase::KDialogBase() 12KDialogBase::KDialogBase()
13{ 13{
14} 14}
15 15
16KDialogBase::KDialogBase( QWidget *parent, const char *name, bool modal, 16KDialogBase::KDialogBase( QWidget *parent, const char *name, bool modal,
17 const QString &caption, 17 const QString &caption,
18 int buttonMask, ButtonCode defaultButton, 18 int buttonMask, ButtonCode defaultButton,
19 bool separator, 19 bool separator,
20 const QString &user1, 20 const QString &user1,
21 const QString &user2, 21 const QString &user2,
22 const QString &user3) : 22 const QString &user3) :
23 KDialog( parent, name, modal ) 23 KDialog( parent, name, modal )
24{ 24{
25 init( caption, buttonMask, user1, user2 ); 25 init( caption, buttonMask, user1, user2 );
26 if (findButton( defaultButton ) ) { 26 if (findButton( defaultButton ) ) {
27 (findButton( defaultButton ) )->setFocus(); 27 (findButton( defaultButton ) )->setFocus();
28 (findButton( defaultButton ) )->setDefault( true ); 28 (findButton( defaultButton ) )->setDefault( true );
29 } 29 }
30 30
31} 31}
32 32
33KDialogBase::KDialogBase( int dialogFace, const QString &caption, 33KDialogBase::KDialogBase( int dialogFace, const QString &caption,
34 int buttonMask, ButtonCode defaultButton, 34 int buttonMask, ButtonCode defaultButton,
35 QWidget *parent, const char *name, bool modal, 35 QWidget *parent, const char *name, bool modal,
36 bool separator, 36 bool separator,
37 const QString &user1, 37 const QString &user1,
38 const QString &user2, 38 const QString &user2,
39 const QString &user3) : 39 const QString &user3) :
40 KDialog( parent, name, modal ) 40 KDialog( parent, name, modal )
41{ 41{
42 init( caption, buttonMask, user1, user2 ); 42 init( caption, buttonMask, user1, user2 );
43 if (findButton( defaultButton ) ) { 43 if (findButton( defaultButton ) ) {
44 (findButton( defaultButton ) )->setFocus(); 44 (findButton( defaultButton ) )->setFocus();
45 (findButton( defaultButton ) )->setDefault( true ); 45 (findButton( defaultButton ) )->setDefault( true );
46 } 46 }
47 47
48} 48}
49 49
50KDialogBase::~KDialogBase() 50KDialogBase::~KDialogBase()
51{ 51{
52} 52}
53 53
54void KDialogBase::init( const QString &caption, int buttonMask, 54void KDialogBase::init( const QString &caption, int buttonMask,
55 const QString &user1 ,const QString &user2 ) 55 const QString &user1 ,const QString &user2 )
56{ 56{
57 mMainWidget = 0; 57 mMainWidget = 0;
58 mTabWidget = 0; 58 mTabWidget = 0;
59 mPlainPage = 0; 59 mPlainPage = 0;
60 mTopLayout = 0; 60 mTopLayout = 0;
61 if ( !caption.isEmpty() ) { 61 if ( !caption.isEmpty() ) {
62 setCaption( caption ); 62 setCaption( caption );
63 } 63 }
64 64
65 if ( buttonMask & User1 ) { 65 if ( buttonMask & User1 ) {
66 mUser1Button = new QPushButton( user1, this ); 66 mUser1Button = new QPushButton( user1, this );
67 connect( mUser1Button, SIGNAL( clicked() ), SLOT( slotUser1() ) ); 67 connect( mUser1Button, SIGNAL( clicked() ), SLOT( slotUser1() ) );
68 } else { 68 } else {
69 mUser1Button = 0; 69 mUser1Button = 0;
70 } 70 }
71 if ( buttonMask & User2 ) { 71 if ( buttonMask & User2 ) {
72 mUser2Button = new QPushButton( user2, this ); 72 mUser2Button = new QPushButton( user2, this );
73 connect( mUser2Button, SIGNAL( clicked() ), SLOT( slotUser2() ) ); 73 connect( mUser2Button, SIGNAL( clicked() ), SLOT( slotUser2() ) );
74 } else { 74 } else {
75 mUser2Button = 0; 75 mUser2Button = 0;
76 } 76 }
77 77
78 if ( buttonMask & Ok ) { 78 if ( buttonMask & Ok ) {
79 mOkButton = new QPushButton( i18n("Ok"), this ); 79 mOkButton = new QPushButton( i18n("Ok"), this );
80 connect( mOkButton, SIGNAL( clicked() ), SLOT( slotOk() ) ); 80 connect( mOkButton, SIGNAL( clicked() ), SLOT( slotOk() ) );
81 //mOkButton->setDefault( true ); 81 //mOkButton->setDefault( true );
82 } else { 82 } else {
83 mOkButton = 0; 83 mOkButton = 0;
84 } 84 }
85 if ( buttonMask & Default ) { 85 if ( buttonMask & Default ) {
86 mDefaultButton = new QPushButton( i18n("Default"), this ); 86 mDefaultButton = new QPushButton( i18n("Default"), this );
87 connect( mDefaultButton, SIGNAL( clicked() ), SIGNAL( defaultClicked() ) ); 87 connect( mDefaultButton, SIGNAL( clicked() ), SIGNAL( defaultClicked() ) );
88 } else { 88 } else {
89 mDefaultButton = 0; 89 mDefaultButton = 0;
90 } 90 }
91 91
92 if ( buttonMask & Apply ) { 92 if ( buttonMask & Apply ) {
93 mApplyButton = new QPushButton( i18n("Apply"), this ); 93 mApplyButton = new QPushButton( i18n("Apply"), this );
94 connect( mApplyButton, SIGNAL( clicked() ), SLOT( slotApply() ) ); 94 connect( mApplyButton, SIGNAL( clicked() ), SLOT( slotApply() ) );
95 } else { 95 } else {
96 mApplyButton = 0; 96 mApplyButton = 0;
97 } 97 }
98 98
99 if ( buttonMask & Cancel ) { 99 if ( buttonMask & Cancel ) {
100 mCancelButton = new QPushButton( i18n("Cancel"), this ); 100 mCancelButton = new QPushButton( i18n("Cancel"), this );
101 connect( mCancelButton, SIGNAL( clicked() ), SLOT( slotCancel() ) ); 101 connect( mCancelButton, SIGNAL( clicked() ), SLOT( slotCancel() ) );
102 } else { 102 } else {
103 mCancelButton = 0; 103 mCancelButton = 0;
104 } 104 }
105 105
106 if ( buttonMask & Close ) { 106 if ( buttonMask & Close ) {
107 mCloseButton = new QPushButton( i18n("Close"), this ); 107 mCloseButton = new QPushButton( i18n("Close"), this );
108 connect( mCloseButton, SIGNAL( clicked() ), SLOT( slotClose() ) ); 108 connect( mCloseButton, SIGNAL( clicked() ), SLOT( slotClose() ) );
109 } else { 109 } else {
110 mCloseButton = 0; 110 mCloseButton = 0;
111 } 111 }
112} 112}
113 113
114QTabWidget *KDialogBase::tabWidget() 114QTabWidget *KDialogBase::tabWidget()
115{ 115{
116 if ( !mTabWidget ) { 116 if ( !mTabWidget ) {
117 mTabWidget = new QTabWidget( this ); 117 mTabWidget = new QTabWidget( this );
118 setMainWidget( mTabWidget ); 118 setMainWidget( mTabWidget );
119 } 119 }
120 return mTabWidget; 120 return mTabWidget;
121} 121}
122 122
123void KDialogBase::hideButtons() 123void KDialogBase::hideButtons()
124{ 124{
125 if ( mUser1Button ) mUser1Button->hide() ; 125 if ( mUser1Button ) mUser1Button->hide() ;
126 if ( mUser2Button ) mUser2Button->hide() ; 126 if ( mUser2Button ) mUser2Button->hide() ;
127 if ( mOkButton ) mOkButton->hide() ; 127 if ( mOkButton ) mOkButton->hide() ;
128 if ( mApplyButton ) mApplyButton->hide() ; 128 if ( mApplyButton ) mApplyButton->hide() ;
129 if ( mDefaultButton ) mDefaultButton->hide(); 129 if ( mDefaultButton ) mDefaultButton->hide();
130 if ( mCancelButton ) mCancelButton->hide() ; 130 if ( mCancelButton ) mCancelButton->hide() ;
131 if ( mCloseButton ) mCloseButton->hide() ; 131 if ( mCloseButton ) mCloseButton->hide() ;
132 132
133} 133}
134void KDialogBase::initLayout() 134void KDialogBase::initLayout()
135{ 135{
136 136
137 delete mTopLayout; 137 delete mTopLayout;
138 mTopLayout = new QVBoxLayout( this ); 138 mTopLayout = new QVBoxLayout( this );
139 mTopLayout->setMargin( marginHint() ); 139 mTopLayout->setMargin( marginHintSmall() );
140 mTopLayout->setSpacing( spacingHint() ); 140 mTopLayout->setSpacing( spacingHintSmall() );
141 141
142 mTopLayout->addWidget( mMainWidget ); 142 mTopLayout->addWidget( mMainWidget );
143 143
144 QBoxLayout *buttonLayout = new QHBoxLayout; 144 QBoxLayout *buttonLayout = new QHBoxLayout;
145 mTopLayout->addLayout( buttonLayout ); 145 mTopLayout->addLayout( buttonLayout );
146 146
147 if ( mUser1Button ) buttonLayout->addWidget( mUser1Button ); 147 if ( mUser1Button ) buttonLayout->addWidget( mUser1Button );
148 if ( mUser2Button ) buttonLayout->addWidget( mUser2Button ); 148 if ( mUser2Button ) buttonLayout->addWidget( mUser2Button );
149 if ( mOkButton ) buttonLayout->addWidget( mOkButton ); 149 if ( mOkButton ) buttonLayout->addWidget( mOkButton );
150 if ( mApplyButton ) buttonLayout->addWidget( mApplyButton ); 150 if ( mApplyButton ) buttonLayout->addWidget( mApplyButton );
151 if ( mDefaultButton ) buttonLayout->addWidget( mDefaultButton ); 151 if ( mDefaultButton ) buttonLayout->addWidget( mDefaultButton );
152 if ( mCancelButton ) buttonLayout->addWidget( mCancelButton ); 152 if ( mCancelButton ) buttonLayout->addWidget( mCancelButton );
153 if ( mCloseButton ) buttonLayout->addWidget( mCloseButton ); 153 if ( mCloseButton ) buttonLayout->addWidget( mCloseButton );
154 buttonLayout->setMargin( 0 ); 154 buttonLayout->setMargin( marginHintSmall() );
155 buttonLayout->setSpacing( spacingHint() ); 155 buttonLayout->setSpacing( spacingHintSmall() );
156} 156}
157 157
158QFrame *KDialogBase::addPage( const QString &name ) 158QFrame *KDialogBase::addPage( const QString &name )
159{ 159{
160// kdDebug() << "KDialogBase::addPage(): " << name << endl; 160// kdDebug() << "KDialogBase::addPage(): " << name << endl;
161 QFrame *frame = new QFrame( tabWidget() ); 161 QFrame *frame = new QFrame( tabWidget() );
162 tabWidget()->addTab( frame, name ); 162 tabWidget()->addTab( frame, name );
163 return frame; 163 return frame;
164} 164}
165 165
166QFrame *KDialogBase::addPage( const QString &name, int, const QPixmap & ) 166QFrame *KDialogBase::addPage( const QString &name, int, const QPixmap & )
167{ 167{
168 return addPage( name ); 168 return addPage( name );
169} 169}
170 170
171 171
172void KDialogBase::setMainWidget( QWidget *widget ) 172void KDialogBase::setMainWidget( QWidget *widget )
173{ 173{
174 kdDebug() << "KDialogBase::setMainWidget()" << endl; 174 kdDebug() << "KDialogBase::setMainWidget()" << endl;
175 175
176 mMainWidget = widget; 176 mMainWidget = widget;
177 initLayout(); 177 initLayout();
178} 178}
179 179
180void KDialogBase::setButtonText( ButtonCode id, const QString &text ) 180void KDialogBase::setButtonText( ButtonCode id, const QString &text )
181{ 181{
182 QPushButton *button = findButton( id ); 182 QPushButton *button = findButton( id );
183 if ( button ) { 183 if ( button ) {
184 button->setText( text ); 184 button->setText( text );
185 } 185 }
186} 186}
187 187
188void KDialogBase::enableButton( ButtonCode id, bool state ) 188void KDialogBase::enableButton( ButtonCode id, bool state )
189{ 189{
190 QPushButton *button = findButton( id ); 190 QPushButton *button = findButton( id );
191 if ( button ) { 191 if ( button ) {
192 button->setEnabled( state ); 192 button->setEnabled( state );
193 } 193 }
194} 194}
195 195
196QPushButton *KDialogBase::findButton( ButtonCode id ) 196QPushButton *KDialogBase::findButton( ButtonCode id )
197{ 197{
198 QPushButton *button = 0; 198 QPushButton *button = 0;
199 switch ( id ) { 199 switch ( id ) {
200 case Ok: 200 case Ok:
201 button = mOkButton; 201 button = mOkButton;
202 break; 202 break;
203 case Apply: 203 case Apply:
204 button = mApplyButton; 204 button = mApplyButton;
205 break; 205 break;
206 case User1: 206 case User1:
207 button = mUser1Button; 207 button = mUser1Button;
208 break; 208 break;
209 case User2: 209 case User2:
210 button = mUser2Button; 210 button = mUser2Button;
211 break; 211 break;
212 case Cancel: 212 case Cancel:
213 button = mCancelButton; 213 button = mCancelButton;
214 break; 214 break;
215 case Default: 215 case Default:
216 button = mDefaultButton; 216 button = mDefaultButton;
217 break; 217 break;
218 case Close: 218 case Close:
219 button = mCloseButton; 219 button = mCloseButton;
220 break; 220 break;
221 default: 221 default:
222 break; 222 break;
223 } 223 }
224 return button; 224 return button;
225} 225}
226 226
227void KDialogBase::enableButtonOK( bool state ) 227void KDialogBase::enableButtonOK( bool state )
228{ 228{
229 enableButton( Ok, state ); 229 enableButton( Ok, state );
230} 230}
231 231
232void KDialogBase::enableButtonApply( bool state ) 232void KDialogBase::enableButtonApply( bool state )
233{ 233{
234 enableButton( Apply, state ); 234 enableButton( Apply, state );
235} 235}
236 236
237void KDialogBase::showButton( ButtonCode id, bool show ) 237void KDialogBase::showButton( ButtonCode id, bool show )
238{ 238{
239 QPushButton *button = findButton( id ); 239 QPushButton *button = findButton( id );
240 if ( button ) { 240 if ( button ) {
241 if ( show ) button->show(); 241 if ( show ) button->show();
242 else button->hide(); 242 else button->hide();
243 } 243 }
244} 244}
245 245
246int KDialogBase::pageIndex( QWidget *widget ) const 246int KDialogBase::pageIndex( QWidget *widget ) const
247{ 247{
248 return 0; 248 return 0;
249} 249}
250 250
251 251
252bool KDialogBase::showPage( int index ) 252bool KDialogBase::showPage( int index )
253{ 253{
254 tabWidget()->setCurrentPage( index );return false; 254 tabWidget()->setCurrentPage( index );return false;
255} 255}
256 256
257QFrame *KDialogBase::plainPage() 257QFrame *KDialogBase::plainPage()
258{ 258{
259 if ( !mPlainPage ) { 259 if ( !mPlainPage ) {
260 mPlainPage = new QFrame( this ); 260 mPlainPage = new QFrame( this );
261 setMainWidget( mPlainPage ); 261 setMainWidget( mPlainPage );
262 } 262 }
263 return mPlainPage; 263 return mPlainPage;
264} 264}
265 265
266void KDialogBase::slotOk() 266void KDialogBase::slotOk()
267{ 267{
268 emit okClicked(); 268 emit okClicked();
269 accept(); 269 accept();
270} 270}
271 271
272void KDialogBase::slotApply() 272void KDialogBase::slotApply()
273{ 273{
274 emit applyClicked(); 274 emit applyClicked();
275} 275}
276 276
277void KDialogBase::slotCancel() 277void KDialogBase::slotCancel()
278{ 278{
279 emit cancelClicked(); 279 emit cancelClicked();
280 reject(); 280 reject();
281} 281}
282 282
283void KDialogBase::slotClose() 283void KDialogBase::slotClose()
284{ 284{
285 emit closeClicked(); 285 emit closeClicked();
286 reject(); 286 reject();
287} 287}
288 288
289void KDialogBase::slotUser1() 289void KDialogBase::slotUser1()
290{ 290{
291 emit user1Clicked(); 291 emit user1Clicked();
292} 292}
293void KDialogBase::slotUser2() 293void KDialogBase::slotUser2()
294{ 294{
295 emit user2Clicked(); 295 emit user2Clicked();
296} 296}