-rw-r--r-- | korganizer/koviewmanager.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 4057ae0..07c4295 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -2,49 +2,51 @@ | |||
2 | This file is part of KOrganizer. | 2 | This file is part of KOrganizer. |
3 | 3 | ||
4 | Copyright (c) 2001 | 4 | Copyright (c) 2001 |
5 | Cornelius Schumacher <schumacher@kde.org> | 5 | Cornelius Schumacher <schumacher@kde.org> |
6 | 6 | ||
7 | This program is free software; you can redistribute it and/or modify | 7 | This program is free software; you can redistribute it and/or modify |
8 | it under the terms of the GNU General Public License as published by | 8 | it under the terms of the GNU General Public License as published by |
9 | the Free Software Foundation; either version 2 of the License, or | 9 | the Free Software Foundation; either version 2 of the License, or |
10 | (at your option) any later version. | 10 | (at your option) any later version. |
11 | 11 | ||
12 | This program is distributed in the hope that it will be useful, | 12 | This program is distributed in the hope that it will be useful, |
13 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 13 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the | 14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the |
15 | GNU General Public License for more details. | 15 | GNU General Public License for more details. |
16 | 16 | ||
17 | You should have received a copy of the GNU General Public License | 17 | You should have received a copy of the GNU General Public License |
18 | along with this program; if not, write to the Free Software | 18 | along with this program; if not, write to the Free Software |
19 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 19 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
20 | 20 | ||
21 | As a special exception, permission is given to link this program | 21 | As a special exception, permission is given to link this program |
22 | with any edition of Qt, and distribute the resulting executable, | 22 | with any edition of Qt, and distribute the resulting executable, |
23 | without including the source code for Qt in the source distribution. | 23 | without including the source code for Qt in the source distribution. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <qwidgetstack.h> | 26 | #include <q3widgetstack.h> |
27 | //Added by qt3to4: | ||
28 | #include <Q3PtrList> | ||
27 | 29 | ||
28 | #include <kconfig.h> | 30 | #include <kconfig.h> |
29 | #include <kglobal.h> | 31 | #include <kglobal.h> |
30 | #ifndef DESKTOP_VERSION | 32 | #ifndef DESKTOP_VERSION |
31 | #include <qpe/qpeapplication.h> | 33 | #include <qpe/qpeapplication.h> |
32 | #else | 34 | #else |
33 | #include <qapplication.h> | 35 | #include <qapplication.h> |
34 | #endif | 36 | #endif |
35 | #include <qdatetime.h> | 37 | #include <qdatetime.h> |
36 | #include "calendarview.h" | 38 | #include "calendarview.h" |
37 | #include "datenavigator.h" | 39 | #include "datenavigator.h" |
38 | #include "kotodoview.h" | 40 | #include "kotodoview.h" |
39 | #include "koagendaview.h" | 41 | #include "koagendaview.h" |
40 | #include "kodialogmanager.h" | 42 | #include "kodialogmanager.h" |
41 | #include "komonthview.h" | 43 | #include "komonthview.h" |
42 | #include "kolistview.h" | 44 | #include "kolistview.h" |
43 | #include "kowhatsnextview.h" | 45 | #include "kowhatsnextview.h" |
44 | #include "kojournalview.h" | 46 | #include "kojournalview.h" |
45 | #include "kotimespanview.h" | 47 | #include "kotimespanview.h" |
46 | #include "koprefs.h" | 48 | #include "koprefs.h" |
47 | #include "navigatorbar.h" | 49 | #include "navigatorbar.h" |
48 | #include "kdatenavigator.h" | 50 | #include "kdatenavigator.h" |
49 | 51 | ||
50 | #include "koviewmanager.h" | 52 | #include "koviewmanager.h" |
@@ -436,50 +438,50 @@ void KOViewManager::showListView() | |||
436 | { | 438 | { |
437 | if (!mListView) { | 439 | if (!mListView) { |
438 | mListView = new KOListView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::ListView"); | 440 | mListView = new KOListView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::ListView"); |
439 | addView(mListView); | 441 | addView(mListView); |
440 | 442 | ||
441 | connect(mListView, SIGNAL(showIncidenceSignal(Incidence *)), | 443 | connect(mListView, SIGNAL(showIncidenceSignal(Incidence *)), |
442 | mMainView, SLOT(showIncidence(Incidence *))); | 444 | mMainView, SLOT(showIncidence(Incidence *))); |
443 | connect(mListView, SIGNAL(editIncidenceSignal(Incidence *)), | 445 | connect(mListView, SIGNAL(editIncidenceSignal(Incidence *)), |
444 | mMainView, SLOT(editIncidence(Incidence *))); | 446 | mMainView, SLOT(editIncidence(Incidence *))); |
445 | connect(mListView, SIGNAL(deleteIncidenceSignal(Incidence *)), | 447 | connect(mListView, SIGNAL(deleteIncidenceSignal(Incidence *)), |
446 | mMainView, SLOT(deleteIncidence(Incidence *))); | 448 | mMainView, SLOT(deleteIncidence(Incidence *))); |
447 | connect( mListView, SIGNAL( incidenceSelected( Incidence * ) ), | 449 | connect( mListView, SIGNAL( incidenceSelected( Incidence * ) ), |
448 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); | 450 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); |
449 | connect( mListView, SIGNAL( signalNewEvent() ), | 451 | connect( mListView, SIGNAL( signalNewEvent() ), |
450 | mMainView, SLOT( newEvent() ) ); | 452 | mMainView, SLOT( newEvent() ) ); |
451 | connect(mMainView, SIGNAL(configChanged()), mListView, SLOT(updateConfig())); | 453 | connect(mMainView, SIGNAL(configChanged()), mListView, SLOT(updateConfig())); |
452 | connect( mListView, SIGNAL( cloneIncidenceSignal( Incidence * ) ), | 454 | connect( mListView, SIGNAL( cloneIncidenceSignal( Incidence * ) ), |
453 | mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); | 455 | mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); |
454 | connect( mListView, SIGNAL( cancelIncidenceSignal( Incidence * ) ), | 456 | connect( mListView, SIGNAL( cancelIncidenceSignal( Incidence * ) ), |
455 | mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); | 457 | mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); |
456 | connect( mListView, SIGNAL( moveIncidenceSignal( Incidence * ) ), | 458 | connect( mListView, SIGNAL( moveIncidenceSignal( Incidence * ) ), |
457 | mMainView, SLOT ( moveIncidence( Incidence * ) ) ); | 459 | mMainView, SLOT ( moveIncidence( Incidence * ) ) ); |
458 | connect( mListView, SIGNAL( beamIncidenceSignal( Incidence * ) ), | 460 | connect( mListView, SIGNAL( beamIncidenceSignal( Incidence * ) ), |
459 | mMainView, SLOT ( beamIncidence( Incidence * ) ) ); | 461 | mMainView, SLOT ( beamIncidence( Incidence * ) ) ); |
460 | connect( mListView, SIGNAL( beamIncidenceList( QPtrList<Incidence> ) ), | 462 | connect( mListView, SIGNAL( beamIncidenceList( Q3PtrList<Incidence> ) ), |
461 | mMainView, SLOT ( beamIncidenceList( QPtrList<Incidence> ) ) ); | 463 | mMainView, SLOT ( beamIncidenceList( Q3PtrList<Incidence> ) ) ); |
462 | } | 464 | } |
463 | // bool temp = mFlagShowNextxDays; | 465 | // bool temp = mFlagShowNextxDays; |
464 | //globalFlagBlockPainting = true; | 466 | //globalFlagBlockPainting = true; |
465 | globalFlagBlockAgenda = 1; | 467 | globalFlagBlockAgenda = 1; |
466 | if ( KOPrefs::instance()->mListViewMonthTimespan ) { | 468 | if ( KOPrefs::instance()->mListViewMonthTimespan ) { |
467 | mMainView->setBlockShowDates( true ); | 469 | mMainView->setBlockShowDates( true ); |
468 | mMainView->dateNavigator()->selectMonth(); | 470 | mMainView->dateNavigator()->selectMonth(); |
469 | mMainView->setBlockShowDates( false ); | 471 | mMainView->setBlockShowDates( false ); |
470 | } | 472 | } |
471 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_L_VIEW; | 473 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_L_VIEW; |
472 | showView(mListView, KOPrefs::instance()->mFullViewTodo); | 474 | showView(mListView, KOPrefs::instance()->mFullViewTodo); |
473 | //mFlagShowNextxDays = temp; | 475 | //mFlagShowNextxDays = temp; |
474 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_L_VIEW; | 476 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_L_VIEW; |
475 | mMainView->setScrollBarStep( 7 ); | 477 | mMainView->setScrollBarStep( 7 ); |
476 | } | 478 | } |
477 | 479 | ||
478 | void KOViewManager::showAgendaView( bool fullScreen ) | 480 | void KOViewManager::showAgendaView( bool fullScreen ) |
479 | { | 481 | { |
480 | 482 | ||
481 | mMainView->dialogManager()->hideSearchDialog(); | 483 | mMainView->dialogManager()->hideSearchDialog(); |
482 | // qDebug("KOViewManager::showAgendaView "); | 484 | // qDebug("KOViewManager::showAgendaView "); |
483 | bool full; | 485 | bool full; |
484 | full = fullScreen; | 486 | full = fullScreen; |
485 | if (!mAgendaView) { | 487 | if (!mAgendaView) { |