author | zautrix <zautrix> | 2005-01-26 23:05:26 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-26 23:05:26 (UTC) |
commit | 15351333eff09beadb6e691e9f0aab2aaf0a95a0 (patch) (unidiff) | |
tree | 443fba1e36ef3a2549b531fe600567d9e1232d7c | |
parent | 96fc3903cf690957d0242d7aa2894bd64800edcc (diff) | |
download | kdepimpi-15351333eff09beadb6e691e9f0aab2aaf0a95a0.zip kdepimpi-15351333eff09beadb6e691e9f0aab2aaf0a95a0.tar.gz kdepimpi-15351333eff09beadb6e691e9f0aab2aaf0a95a0.tar.bz2 |
fixes
-rw-r--r-- | korganizer/calendarview.cpp | 4 | ||||
-rw-r--r-- | korganizer/koagendaview.cpp | 37 | ||||
-rw-r--r-- | korganizer/koagendaview.h | 7 | ||||
-rw-r--r-- | korganizer/kodialogmanager.cpp | 7 |
4 files changed, 51 insertions, 4 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 06454c2..1d5a57e 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -2492,66 +2492,66 @@ void CalendarView::showDatePicker( ) | |||
2492 | if ( mDateFrame->isVisible() ) | 2492 | if ( mDateFrame->isVisible() ) |
2493 | mDateFrame->hide(); | 2493 | mDateFrame->hide(); |
2494 | else { | 2494 | else { |
2495 | int w =mDatePicker->sizeHint().width() ; | 2495 | int w =mDatePicker->sizeHint().width() ; |
2496 | int h = mDatePicker->sizeHint().height() ; | 2496 | int h = mDatePicker->sizeHint().height() ; |
2497 | int dw = QApplication::desktop()->width(); | 2497 | int dw = QApplication::desktop()->width(); |
2498 | int dh = QApplication::desktop()->height(); | 2498 | int dh = QApplication::desktop()->height(); |
2499 | mDateFrame->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 2499 | mDateFrame->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
2500 | mDateFrame->show(); | 2500 | mDateFrame->show(); |
2501 | } | 2501 | } |
2502 | mDatePickerMode = 1; | 2502 | mDatePickerMode = 1; |
2503 | mDatePicker->setDate( mNavigator->selectedDates().first() ); | 2503 | mDatePicker->setDate( mNavigator->selectedDates().first() ); |
2504 | } | 2504 | } |
2505 | 2505 | ||
2506 | void CalendarView::showEventEditor() | 2506 | void CalendarView::showEventEditor() |
2507 | { | 2507 | { |
2508 | #ifdef DESKTOP_VERSION | 2508 | #ifdef DESKTOP_VERSION |
2509 | mEventEditor->show(); | 2509 | mEventEditor->show(); |
2510 | #else | 2510 | #else |
2511 | if ( mEventEditor->width() < QApplication::desktop()->width() -60 || mEventEditor->width() > QApplication::desktop()->width() ) { | 2511 | if ( mEventEditor->width() < QApplication::desktop()->width() -60 || mEventEditor->width() > QApplication::desktop()->width() ) { |
2512 | topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") ); | 2512 | topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") ); |
2513 | qDebug("KO: CalendarView: recreate mEventEditor %d %d", mEventEditor->width(), QApplication::desktop()->width() ); | 2513 | qDebug("KO: CalendarView: recreate mEventEditor %d %d", mEventEditor->width(), QApplication::desktop()->width() ); |
2514 | delete mEventEditor; | 2514 | delete mEventEditor; |
2515 | mEventEditor = mDialogManager->getEventEditor(); | 2515 | mEventEditor = mDialogManager->getEventEditor(); |
2516 | topLevelWidget()->setCaption( i18n("") ); | ||
2516 | } | 2517 | } |
2517 | mEventEditor->showMaximized(); | 2518 | mEventEditor->showMaximized(); |
2518 | topLevelWidget()->setCaption( i18n("") ); | ||
2519 | #endif | 2519 | #endif |
2520 | } | 2520 | } |
2521 | void CalendarView::showTodoEditor() | 2521 | void CalendarView::showTodoEditor() |
2522 | { | 2522 | { |
2523 | #ifdef DESKTOP_VERSION | 2523 | #ifdef DESKTOP_VERSION |
2524 | mTodoEditor->show(); | 2524 | mTodoEditor->show(); |
2525 | #else | 2525 | #else |
2526 | if ( mTodoEditor->width() < QApplication::desktop()->width() -60|| mTodoEditor->width() > QApplication::desktop()->width() ) { | 2526 | if ( mTodoEditor->width() < QApplication::desktop()->width() -60|| mTodoEditor->width() > QApplication::desktop()->width() ) { |
2527 | topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") ); | 2527 | topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") ); |
2528 | qDebug("KO: CalendarView: recreate mTodoEditor %d %d ", mTodoEditor->width() ,QApplication::desktop()->width() ); | 2528 | qDebug("KO: CalendarView: recreate mTodoEditor %d %d ", mTodoEditor->width() ,QApplication::desktop()->width() ); |
2529 | delete mTodoEditor; | 2529 | delete mTodoEditor; |
2530 | mTodoEditor = mDialogManager->getTodoEditor(); | 2530 | mTodoEditor = mDialogManager->getTodoEditor(); |
2531 | topLevelWidget()->setCaption( i18n("") ); | ||
2531 | } | 2532 | } |
2532 | mTodoEditor->showMaximized(); | 2533 | mTodoEditor->showMaximized(); |
2533 | topLevelWidget()->setCaption( i18n("") ); | ||
2534 | #endif | 2534 | #endif |
2535 | } | 2535 | } |
2536 | 2536 | ||
2537 | void CalendarView::cloneIncidence() | 2537 | void CalendarView::cloneIncidence() |
2538 | { | 2538 | { |
2539 | Incidence *incidence = currentSelection(); | 2539 | Incidence *incidence = currentSelection(); |
2540 | if ( !incidence ) incidence = mTodoList->selectedIncidences().first(); | 2540 | if ( !incidence ) incidence = mTodoList->selectedIncidences().first(); |
2541 | if ( incidence ) { | 2541 | if ( incidence ) { |
2542 | cloneIncidence(incidence); | 2542 | cloneIncidence(incidence); |
2543 | } | 2543 | } |
2544 | } | 2544 | } |
2545 | void CalendarView::moveIncidence() | 2545 | void CalendarView::moveIncidence() |
2546 | { | 2546 | { |
2547 | Incidence *incidence = currentSelection(); | 2547 | Incidence *incidence = currentSelection(); |
2548 | if ( !incidence ) incidence = mTodoList->selectedIncidences().first(); | 2548 | if ( !incidence ) incidence = mTodoList->selectedIncidences().first(); |
2549 | if ( incidence ) { | 2549 | if ( incidence ) { |
2550 | moveIncidence(incidence); | 2550 | moveIncidence(incidence); |
2551 | } | 2551 | } |
2552 | } | 2552 | } |
2553 | void CalendarView::beamIncidence() | 2553 | void CalendarView::beamIncidence() |
2554 | { | 2554 | { |
2555 | Incidence *incidence = currentSelection(); | 2555 | Incidence *incidence = currentSelection(); |
2556 | if ( !incidence ) incidence = mTodoList->selectedIncidences().first(); | 2556 | if ( !incidence ) incidence = mTodoList->selectedIncidences().first(); |
2557 | if ( incidence ) { | 2557 | if ( incidence ) { |
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 6428757..b5596d9 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -180,49 +180,84 @@ void TimeLabels::updateConfig() | |||
180 | // config->setGroup("Fonts"); | 180 | // config->setGroup("Fonts"); |
181 | // QFont font = config->readFontEntry("TimeBar Font"); | 181 | // QFont font = config->readFontEntry("TimeBar Font"); |
182 | setFont(KOPrefs::instance()->mTimeBarFont); | 182 | setFont(KOPrefs::instance()->mTimeBarFont); |
183 | 183 | ||
184 | // update geometry restrictions based on new settings | 184 | // update geometry restrictions based on new settings |
185 | setFixedWidth(minimumWidth()); | 185 | setFixedWidth(minimumWidth()); |
186 | 186 | ||
187 | // update HourSize | 187 | // update HourSize |
188 | mCellHeight = KOPrefs::instance()->mHourSize*4; | 188 | mCellHeight = KOPrefs::instance()->mHourSize*4; |
189 | resizeContents(50,mRows * mCellHeight); | 189 | resizeContents(50,mRows * mCellHeight); |
190 | } | 190 | } |
191 | 191 | ||
192 | /** update time label positions */ | 192 | /** update time label positions */ |
193 | void TimeLabels::positionChanged() | 193 | void TimeLabels::positionChanged() |
194 | { | 194 | { |
195 | int adjustment = mAgenda->contentsY(); | 195 | int adjustment = mAgenda->contentsY(); |
196 | setContentsPos(0, adjustment); | 196 | setContentsPos(0, adjustment); |
197 | } | 197 | } |
198 | 198 | ||
199 | /** */ | 199 | /** */ |
200 | void TimeLabels::setAgenda(KOAgenda* agenda) | 200 | void TimeLabels::setAgenda(KOAgenda* agenda) |
201 | { | 201 | { |
202 | mAgenda = agenda; | 202 | mAgenda = agenda; |
203 | } | 203 | } |
204 | |||
205 | void TimeLabels::contentsMousePressEvent ( QMouseEvent * e) | ||
206 | { | ||
207 | mMouseDownY = e->pos().y(); | ||
208 | } | ||
209 | |||
210 | void TimeLabels::contentsMouseMoveEvent ( QMouseEvent * e ) | ||
211 | { | ||
212 | int diff = mMouseDownY - e->pos().y(); | ||
213 | if ( diff < 10 && diff > -10 ) | ||
214 | return; | ||
215 | int tSize = KOPrefs::instance()->mHourSize + (diff/10) ; | ||
216 | if ( tSize < 4 ) | ||
217 | tSize = 4; | ||
218 | if ( tSize > 18 ) | ||
219 | tSize = 18; | ||
220 | tSize = (tSize-2)/2; | ||
221 | topLevelWidget()->setCaption(i18n("New Agendasize: %1").arg(tSize)); | ||
204 | 222 | ||
223 | } | ||
224 | void TimeLabels::contentsMouseReleaseEvent ( QMouseEvent * e ) | ||
225 | { | ||
226 | int diff = mMouseDownY - e->pos().y(); | ||
227 | if ( diff < 10 && diff > -10 ) | ||
228 | return; | ||
229 | int tSize = KOPrefs::instance()->mHourSize + (diff/10); | ||
230 | if ( tSize < 4 ) | ||
231 | tSize = 4; | ||
232 | if ( tSize > 18 ) | ||
233 | tSize = 18; | ||
234 | tSize = (tSize/2)*2; | ||
235 | if ( tSize == KOPrefs::instance()->mHourSize ) | ||
236 | return; | ||
237 | KOPrefs::instance()->mHourSize = tSize; | ||
238 | emit scaleChanged(); | ||
239 | } | ||
205 | 240 | ||
206 | /** This is called in response to repaint() */ | 241 | /** This is called in response to repaint() */ |
207 | void TimeLabels::paintEvent(QPaintEvent*) | 242 | void TimeLabels::paintEvent(QPaintEvent*) |
208 | { | 243 | { |
209 | 244 | ||
210 | // kdDebug() << "paintevent..." << endl; | 245 | // kdDebug() << "paintevent..." << endl; |
211 | // this is another hack! | 246 | // this is another hack! |
212 | // QPainter painter(this); | 247 | // QPainter painter(this); |
213 | //QString c | 248 | //QString c |
214 | repaintContents(contentsX(), contentsY(), visibleWidth(), visibleHeight()); | 249 | repaintContents(contentsX(), contentsY(), visibleWidth(), visibleHeight()); |
215 | } | 250 | } |
216 | 251 | ||
217 | //////////////////////////////////////////////////////////////////////////// | 252 | //////////////////////////////////////////////////////////////////////////// |
218 | 253 | ||
219 | EventIndicator::EventIndicator(Location loc,QWidget *parent,const char *name) | 254 | EventIndicator::EventIndicator(Location loc,QWidget *parent,const char *name) |
220 | : QFrame(parent,name) | 255 | : QFrame(parent,name) |
221 | { | 256 | { |
222 | mColumns = 1; | 257 | mColumns = 1; |
223 | mTopBox = 0; | 258 | mTopBox = 0; |
224 | mLocation = loc; | 259 | mLocation = loc; |
225 | mTopLayout = 0; | 260 | mTopLayout = 0; |
226 | mPaintWidget = 0; | 261 | mPaintWidget = 0; |
227 | mXOffset = 0; | 262 | mXOffset = 0; |
228 | if (mLocation == Top) mPixmap = SmallIcon("1uparrow"); | 263 | if (mLocation == Top) mPixmap = SmallIcon("1uparrow"); |
@@ -389,48 +424,50 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) : | |||
389 | QWidget *dummyAllDayRight = new QWidget(mAllDayFrame); | 424 | QWidget *dummyAllDayRight = new QWidget(mAllDayFrame); |
390 | 425 | ||
391 | // Create event context menu for all day agenda | 426 | // Create event context menu for all day agenda |
392 | mAllDayAgendaPopup = eventPopup(); | 427 | mAllDayAgendaPopup = eventPopup(); |
393 | connect(mAllDayAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)), | 428 | connect(mAllDayAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)), |
394 | mAllDayAgendaPopup,SLOT(showIncidencePopup(Incidence *))); | 429 | mAllDayAgendaPopup,SLOT(showIncidencePopup(Incidence *))); |
395 | 430 | ||
396 | // Create agenda frame | 431 | // Create agenda frame |
397 | QGridLayout *agendaLayout = new QGridLayout(agendaFrame,3,3); | 432 | QGridLayout *agendaLayout = new QGridLayout(agendaFrame,3,3); |
398 | // QHBox *agendaFrame = new QHBox(splitterAgenda); | 433 | // QHBox *agendaFrame = new QHBox(splitterAgenda); |
399 | 434 | ||
400 | // create event indicator bars | 435 | // create event indicator bars |
401 | mEventIndicatorTop = new EventIndicator(EventIndicator::Top,agendaFrame); | 436 | mEventIndicatorTop = new EventIndicator(EventIndicator::Top,agendaFrame); |
402 | agendaLayout->addWidget(mEventIndicatorTop,0,1); | 437 | agendaLayout->addWidget(mEventIndicatorTop,0,1); |
403 | mEventIndicatorTop->setPaintWidget( mSplitterAgenda ); | 438 | mEventIndicatorTop->setPaintWidget( mSplitterAgenda ); |
404 | mEventIndicatorBottom = new EventIndicator(EventIndicator::Bottom, | 439 | mEventIndicatorBottom = new EventIndicator(EventIndicator::Bottom, |
405 | agendaFrame); | 440 | agendaFrame); |
406 | agendaLayout->addWidget(mEventIndicatorBottom,2,1); | 441 | agendaLayout->addWidget(mEventIndicatorBottom,2,1); |
407 | QWidget *dummyAgendaRight = new QWidget(agendaFrame); | 442 | QWidget *dummyAgendaRight = new QWidget(agendaFrame); |
408 | agendaLayout->addWidget(dummyAgendaRight,0,2); | 443 | agendaLayout->addWidget(dummyAgendaRight,0,2); |
409 | 444 | ||
410 | // Create time labels | 445 | // Create time labels |
411 | mTimeLabels = new TimeLabels(24,agendaFrame); | 446 | mTimeLabels = new TimeLabels(24,agendaFrame); |
412 | agendaLayout->addWidget(mTimeLabels,1,0); | 447 | agendaLayout->addWidget(mTimeLabels,1,0); |
448 | connect(mTimeLabels,SIGNAL( scaleChanged()), | ||
449 | this,SLOT(updateConfig())); | ||
413 | 450 | ||
414 | // Create agenda | 451 | // Create agenda |
415 | mAgenda = new KOAgenda(1,96,KOPrefs::instance()->mHourSize,agendaFrame); | 452 | mAgenda = new KOAgenda(1,96,KOPrefs::instance()->mHourSize,agendaFrame); |
416 | agendaLayout->addMultiCellWidget(mAgenda,1,1,1,2); | 453 | agendaLayout->addMultiCellWidget(mAgenda,1,1,1,2); |
417 | agendaLayout->setColStretch(1,1); | 454 | agendaLayout->setColStretch(1,1); |
418 | mAgenda->setFocusPolicy(NoFocus); | 455 | mAgenda->setFocusPolicy(NoFocus); |
419 | // Create event context menu for agenda | 456 | // Create event context menu for agenda |
420 | mAgendaPopup = eventPopup(); | 457 | mAgendaPopup = eventPopup(); |
421 | 458 | ||
422 | mAgendaPopup->addAdditionalItem(QIconSet(SmallIcon("bell")), | 459 | mAgendaPopup->addAdditionalItem(QIconSet(SmallIcon("bell")), |
423 | i18n("Toggle Alarm"),mAgenda, | 460 | i18n("Toggle Alarm"),mAgenda, |
424 | SLOT(popupAlarm()),true); | 461 | SLOT(popupAlarm()),true); |
425 | 462 | ||
426 | 463 | ||
427 | connect(mAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)), | 464 | connect(mAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)), |
428 | mAgendaPopup,SLOT(showIncidencePopup(Incidence *))); | 465 | mAgendaPopup,SLOT(showIncidencePopup(Incidence *))); |
429 | 466 | ||
430 | // make connections between dependent widgets | 467 | // make connections between dependent widgets |
431 | mTimeLabels->setAgenda(mAgenda); | 468 | mTimeLabels->setAgenda(mAgenda); |
432 | 469 | ||
433 | // Update widgets to reflect user preferences | 470 | // Update widgets to reflect user preferences |
434 | // updateConfig(); | 471 | // updateConfig(); |
435 | 472 | ||
436 | // createDayLabels(); | 473 | // createDayLabels(); |
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h index 0079253..221b0ea 100644 --- a/korganizer/koagendaview.h +++ b/korganizer/koagendaview.h | |||
@@ -42,57 +42,62 @@ class QLabel; | |||
42 | class QPushButton; | 42 | class QPushButton; |
43 | class CalendarView; | 43 | class CalendarView; |
44 | class KOAgenda; | 44 | class KOAgenda; |
45 | class KOAgendaItem; | 45 | class KOAgendaItem; |
46 | class KConfig; | 46 | class KConfig; |
47 | class KDGanttMinimizeSplitter; | 47 | class KDGanttMinimizeSplitter; |
48 | class TimeLabels : public QScrollView { | 48 | class TimeLabels : public QScrollView { |
49 | Q_OBJECT | 49 | Q_OBJECT |
50 | public: | 50 | public: |
51 | TimeLabels(int rows,QWidget *parent=0,const char *name=0,WFlags f=0); | 51 | TimeLabels(int rows,QWidget *parent=0,const char *name=0,WFlags f=0); |
52 | 52 | ||
53 | void setCellHeight(int height); | 53 | void setCellHeight(int height); |
54 | 54 | ||
55 | /** Calculates the minimum width */ | 55 | /** Calculates the minimum width */ |
56 | virtual int minimumWidth() const; | 56 | virtual int minimumWidth() const; |
57 | 57 | ||
58 | /** updates widget's internal state */ | 58 | /** updates widget's internal state */ |
59 | void updateConfig(); | 59 | void updateConfig(); |
60 | 60 | ||
61 | /** */ | 61 | /** */ |
62 | void setAgenda(KOAgenda* agenda); | 62 | void setAgenda(KOAgenda* agenda); |
63 | 63 | ||
64 | /** */ | 64 | /** */ |
65 | virtual void paintEvent(QPaintEvent* e); | 65 | virtual void paintEvent(QPaintEvent* e); |
66 | void contentsMousePressEvent ( QMouseEvent * ) ; | ||
67 | void contentsMouseReleaseEvent ( QMouseEvent * ); | ||
68 | void contentsMouseMoveEvent ( QMouseEvent * ); | ||
66 | 69 | ||
67 | public slots: | 70 | public slots: |
68 | /** update time label positions */ | 71 | /** update time label positions */ |
69 | void positionChanged(); | 72 | void positionChanged(); |
70 | 73 | signals: | |
74 | void scaleChanged(); | ||
71 | protected: | 75 | protected: |
72 | void drawContents(QPainter *p,int cx, int cy, int cw, int ch); | 76 | void drawContents(QPainter *p,int cx, int cy, int cw, int ch); |
73 | 77 | ||
74 | private: | 78 | private: |
79 | int mMouseDownY; | ||
75 | int mRows; | 80 | int mRows; |
76 | int mCellHeight; | 81 | int mCellHeight; |
77 | 82 | ||
78 | /** */ | 83 | /** */ |
79 | KOAgenda* mAgenda; | 84 | KOAgenda* mAgenda; |
80 | }; | 85 | }; |
81 | 86 | ||
82 | class EventIndicator : public QFrame { | 87 | class EventIndicator : public QFrame { |
83 | Q_OBJECT | 88 | Q_OBJECT |
84 | public: | 89 | public: |
85 | enum Location { Top, Bottom }; | 90 | enum Location { Top, Bottom }; |
86 | EventIndicator(Location loc=Top,QWidget *parent=0,const char *name=0); | 91 | EventIndicator(Location loc=Top,QWidget *parent=0,const char *name=0); |
87 | virtual ~EventIndicator(); | 92 | virtual ~EventIndicator(); |
88 | 93 | ||
89 | void changeColumns(int columns); | 94 | void changeColumns(int columns); |
90 | void setPaintWidget( KDGanttMinimizeSplitter* ); | 95 | void setPaintWidget( KDGanttMinimizeSplitter* ); |
91 | void setXOffset( int ); | 96 | void setXOffset( int ); |
92 | void enableColumn(int column, bool enable); | 97 | void enableColumn(int column, bool enable); |
93 | 98 | ||
94 | protected: | 99 | protected: |
95 | void drawContents(QPainter *); | 100 | void drawContents(QPainter *); |
96 | 101 | ||
97 | private: | 102 | private: |
98 | int mXOffset; | 103 | int mXOffset; |
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp index c99c0cb..41a4dc1 100644 --- a/korganizer/kodialogmanager.cpp +++ b/korganizer/kodialogmanager.cpp | |||
@@ -272,70 +272,75 @@ KOEventEditor *KODialogManager::getEventEditor() | |||
272 | mMainView ); | 272 | mMainView ); |
273 | 273 | ||
274 | connect(eventEditor,SIGNAL(eventAdded(Event *)), | 274 | connect(eventEditor,SIGNAL(eventAdded(Event *)), |
275 | mMainView,SLOT(eventAdded(Event *))); | 275 | mMainView,SLOT(eventAdded(Event *))); |
276 | connect(eventEditor,SIGNAL(eventChanged(Event *)), | 276 | connect(eventEditor,SIGNAL(eventChanged(Event *)), |
277 | mMainView,SLOT(eventChanged(Event *))); | 277 | mMainView,SLOT(eventChanged(Event *))); |
278 | connect(eventEditor,SIGNAL(eventDeleted()), | 278 | connect(eventEditor,SIGNAL(eventDeleted()), |
279 | mMainView,SLOT(eventDeleted())); | 279 | mMainView,SLOT(eventDeleted())); |
280 | connect(eventEditor,SIGNAL(deleteAttendee(Incidence *)), | 280 | connect(eventEditor,SIGNAL(deleteAttendee(Incidence *)), |
281 | mMainView,SLOT(schedule_cancel(Incidence *))); | 281 | mMainView,SLOT(schedule_cancel(Incidence *))); |
282 | connect( eventEditor, SIGNAL(jumpToTime( const QDate &)), | 282 | connect( eventEditor, SIGNAL(jumpToTime( const QDate &)), |
283 | mMainView->dateNavigator(), SLOT( selectWeek( const QDate & ) ) ); | 283 | mMainView->dateNavigator(), SLOT( selectWeek( const QDate & ) ) ); |
284 | connect( eventEditor, SIGNAL( showAgendaView( bool)), | 284 | connect( eventEditor, SIGNAL( showAgendaView( bool)), |
285 | mMainView->viewManager(), SLOT( showAgendaView( bool) ) ); | 285 | mMainView->viewManager(), SLOT( showAgendaView( bool) ) ); |
286 | 286 | ||
287 | // connect(mCategoryEditDialog,SIGNAL(categoryConfigChanged()), | 287 | // connect(mCategoryEditDialog,SIGNAL(categoryConfigChanged()), |
288 | // eventEditor,SLOT(updateCategoryConfig())); | 288 | // eventEditor,SLOT(updateCategoryConfig())); |
289 | // connect(eventEditor,SIGNAL(editCategories()), | 289 | // connect(eventEditor,SIGNAL(editCategories()), |
290 | // mCategoryEditDialog,SLOT(show())); | 290 | // mCategoryEditDialog,SLOT(show())); |
291 | connect(eventEditor,SIGNAL(dialogClose(Incidence*)), | 291 | connect(eventEditor,SIGNAL(dialogClose(Incidence*)), |
292 | mMainView,SLOT(dialogClosing(Incidence*))); | 292 | mMainView,SLOT(dialogClosing(Incidence*))); |
293 | 293 | ||
294 | //connect(mMainView,SIGNAL(closingDown()),eventEditor,SLOT(reject())); | 294 | //connect(mMainView,SIGNAL(closingDown()),eventEditor,SLOT(reject())); |
295 | 295 | ||
296 | #ifndef DESKTOP_VERSION | ||
297 | eventEditor->resize( QApplication::desktop()->width() -20, 100 ); | ||
298 | #endif | ||
296 | return eventEditor; | 299 | return eventEditor; |
297 | } | 300 | } |
298 | 301 | ||
299 | KOTodoEditor *KODialogManager::getTodoEditor() | 302 | KOTodoEditor *KODialogManager::getTodoEditor() |
300 | { | 303 | { |
301 | KOTodoEditor *todoEditor = new KOTodoEditor( mMainView->calendar(), | 304 | KOTodoEditor *todoEditor = new KOTodoEditor( mMainView->calendar(), |
302 | mMainView ); | 305 | mMainView ); |
303 | 306 | ||
304 | // connect(mCategoryEditDialog,SIGNAL(categoryConfigChanged()), | 307 | // connect(mCategoryEditDialog,SIGNAL(categoryConfigChanged()), |
305 | // todoEditor,SLOT(updateCategoryConfig())); | 308 | // todoEditor,SLOT(updateCategoryConfig())); |
306 | // connect(todoEditor,SIGNAL(editCategories()),mCategoryEditDialog,SLOT(show())); | 309 | // connect(todoEditor,SIGNAL(editCategories()),mCategoryEditDialog,SLOT(show())); |
307 | 310 | ||
308 | connect(todoEditor,SIGNAL(todoAdded(Todo *)), | 311 | connect(todoEditor,SIGNAL(todoAdded(Todo *)), |
309 | mMainView,SLOT(todoAdded(Todo *))); | 312 | mMainView,SLOT(todoAdded(Todo *))); |
310 | connect(todoEditor,SIGNAL(todoChanged(Todo *)), | 313 | connect(todoEditor,SIGNAL(todoChanged(Todo *)), |
311 | mMainView,SLOT(todoChanged(Todo *))); | 314 | mMainView,SLOT(todoChanged(Todo *))); |
312 | connect(todoEditor,SIGNAL(todoDeleted()), | 315 | connect(todoEditor,SIGNAL(todoDeleted()), |
313 | mMainView,SLOT(todoDeleted())); | 316 | mMainView,SLOT(todoDeleted())); |
314 | connect(todoEditor,SIGNAL(dialogClose(Incidence*)), | 317 | connect(todoEditor,SIGNAL(dialogClose(Incidence*)), |
315 | mMainView,SLOT(dialogClosing(Incidence*))); | 318 | mMainView,SLOT(dialogClosing(Incidence*))); |
316 | connect( todoEditor, SIGNAL(jumpToTime( const QDate &)), | 319 | connect( todoEditor, SIGNAL(jumpToTime( const QDate &)), |
317 | mMainView->dateNavigator(), SLOT( selectWeek( const QDate & ) ) ); | 320 | mMainView->dateNavigator(), SLOT( selectWeek( const QDate & ) ) ); |
318 | connect( todoEditor, SIGNAL( showAgendaView( bool)), | 321 | connect( todoEditor, SIGNAL( showAgendaView( bool)), |
319 | mMainView->viewManager(), SLOT( showAgendaView( bool) ) ); | 322 | mMainView->viewManager(), SLOT( showAgendaView( bool) ) ); |
320 | // connect(todoEditor,SIGNAL(deleteAttendee(Incidence *)), | 323 | // connect(todoEditor,SIGNAL(deleteAttendee(Incidence *)), |
321 | // mMainView,SLOT(schedule_cancel(Incidence *))); | 324 | // mMainView,SLOT(schedule_cancel(Incidence *))); |
322 | //connect(mMainView,SIGNAL(closingDown()),todoEditor,SLOT(reject())); | 325 | //connect(mMainView,SIGNAL(closingDown()),todoEditor,SLOT(reject())); |
323 | 326 | #ifndef DESKTOP_VERSION | |
327 | todoEditor->resize( QApplication::desktop()->width() -20, 100 ); | ||
328 | #endif | ||
324 | return todoEditor; | 329 | return todoEditor; |
325 | } | 330 | } |
326 | 331 | ||
327 | void KODialogManager::updateSearchDialog() | 332 | void KODialogManager::updateSearchDialog() |
328 | { | 333 | { |
329 | if (mSearchDialog) mSearchDialog->updateView(); | 334 | if (mSearchDialog) mSearchDialog->updateView(); |
330 | } | 335 | } |
331 | 336 | ||
332 | void KODialogManager::setDocumentId( const QString &id ) | 337 | void KODialogManager::setDocumentId( const QString &id ) |
333 | { | 338 | { |
334 | if (mOutgoingDialog) mOutgoingDialog->setDocumentId( id ); | 339 | if (mOutgoingDialog) mOutgoingDialog->setDocumentId( id ); |
335 | } | 340 | } |
336 | 341 | ||
337 | void KODialogManager::writeSettings( KConfig *config ) | 342 | void KODialogManager::writeSettings( KConfig *config ) |
338 | { | 343 | { |
339 | if (mSearchDialog) | 344 | if (mSearchDialog) |
340 | mSearchDialog->listview()->writeSettings(config,"SearchListView Layout"); | 345 | mSearchDialog->listview()->writeSettings(config,"SearchListView Layout"); |
341 | } | 346 | } |