Diffstat (limited to 'korganizer/kodialogmanager.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | korganizer/kodialogmanager.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp index ea30fac..deb1e46 100644 --- a/korganizer/kodialogmanager.cpp +++ b/korganizer/kodialogmanager.cpp | |||
@@ -32,24 +32,26 @@ | |||
32 | #include "searchdialog.h" | 32 | #include "searchdialog.h" |
33 | #include "filtereditdialog.h" | 33 | #include "filtereditdialog.h" |
34 | #ifndef KORG_NOPLUGINS | 34 | #ifndef KORG_NOPLUGINS |
35 | #include "plugindialog.h" | 35 | #include "plugindialog.h" |
36 | #endif | 36 | #endif |
37 | #ifndef KORG_NOARCHIVE | 37 | #ifndef KORG_NOARCHIVE |
38 | #include "archivedialog.h" | 38 | #include "archivedialog.h" |
39 | #endif | 39 | #endif |
40 | 40 | ||
41 | #include "kconfig.h" | 41 | #include "kconfig.h" |
42 | #include "kodialogmanager.h" | 42 | #include "kodialogmanager.h" |
43 | #include <kapplication.h> | 43 | #include <kapplication.h> |
44 | //Added by qt3to4: | ||
45 | #include <Q3PtrList> | ||
44 | 46 | ||
45 | KODialogManager::KODialogManager( CalendarView *mainView ) : | 47 | KODialogManager::KODialogManager( CalendarView *mainView ) : |
46 | QObject(), mMainView( mainView ) | 48 | QObject(), mMainView( mainView ) |
47 | { | 49 | { |
48 | mOutgoingDialog = 0; | 50 | mOutgoingDialog = 0; |
49 | mIncomingDialog = 0; | 51 | mIncomingDialog = 0; |
50 | mOptionsDialog = 0; | 52 | mOptionsDialog = 0; |
51 | mSearchDialog = 0; | 53 | mSearchDialog = 0; |
52 | mArchiveDialog = 0; | 54 | mArchiveDialog = 0; |
53 | mFilterEditDialog = 0; | 55 | mFilterEditDialog = 0; |
54 | mPluginDialog = 0; | 56 | mPluginDialog = 0; |
55 | 57 | ||
@@ -179,26 +181,26 @@ void KODialogManager::showSearchDialog() | |||
179 | connect(lview, SIGNAL(showIncidenceSignal(Incidence *)), | 181 | connect(lview, SIGNAL(showIncidenceSignal(Incidence *)), |
180 | mMainView, SLOT(showIncidence(Incidence *))); | 182 | mMainView, SLOT(showIncidence(Incidence *))); |
181 | connect(lview, SIGNAL(editIncidenceSignal(Incidence *)), | 183 | connect(lview, SIGNAL(editIncidenceSignal(Incidence *)), |
182 | mMainView, SLOT(editIncidence(Incidence *))); | 184 | mMainView, SLOT(editIncidence(Incidence *))); |
183 | connect(lview, SIGNAL(deleteIncidenceSignal(Incidence *)), | 185 | connect(lview, SIGNAL(deleteIncidenceSignal(Incidence *)), |
184 | mMainView, SLOT(deleteIncidence(Incidence *))); | 186 | mMainView, SLOT(deleteIncidence(Incidence *))); |
185 | connect(lview, SIGNAL(cloneIncidenceSignal(Incidence *)), | 187 | connect(lview, SIGNAL(cloneIncidenceSignal(Incidence *)), |
186 | mMainView, SLOT(cloneIncidence(Incidence *))); | 188 | mMainView, SLOT(cloneIncidence(Incidence *))); |
187 | connect(lview, SIGNAL(beamIncidenceSignal(Incidence *)), | 189 | connect(lview, SIGNAL(beamIncidenceSignal(Incidence *)), |
188 | mMainView, SLOT(beamIncidence(Incidence *))); | 190 | mMainView, SLOT(beamIncidence(Incidence *))); |
189 | connect(lview, SIGNAL(moveIncidenceSignal(Incidence *)), | 191 | connect(lview, SIGNAL(moveIncidenceSignal(Incidence *)), |
190 | mMainView, SLOT(moveIncidence(Incidence *))); | 192 | mMainView, SLOT(moveIncidence(Incidence *))); |
191 | connect(lview, SIGNAL(beamIncidenceList(QPtrList<Incidence> )), | 193 | connect(lview, SIGNAL(beamIncidenceList(Q3PtrList<Incidence> )), |
192 | mMainView, SLOT(beamIncidenceList(QPtrList<Incidence> ))); | 194 | mMainView, SLOT(beamIncidenceList(Q3PtrList<Incidence> ))); |
193 | 195 | ||
194 | connect(mMainView, SIGNAL(configChanged()), mSearchDialog, SLOT(updateConfig())); | 196 | connect(mMainView, SIGNAL(configChanged()), mSearchDialog, SLOT(updateConfig())); |
195 | connect(mMainView, SIGNAL(updateSearchDialog()), mSearchDialog, SLOT(updateList())); | 197 | connect(mMainView, SIGNAL(updateSearchDialog()), mSearchDialog, SLOT(updateList())); |
196 | // connect( lview, SIGNAL( incidenceSelected( Incidence * ) ), | 198 | // connect( lview, SIGNAL( incidenceSelected( Incidence * ) ), |
197 | // mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); | 199 | // mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); |
198 | #ifndef DESKTOP_VERSION | 200 | #ifndef DESKTOP_VERSION |
199 | mSearchDialog->setMaximumSize( QApplication::desktop()->size()); | 201 | mSearchDialog->setMaximumSize( QApplication::desktop()->size()); |
200 | mSearchDialog->showMaximized(); | 202 | mSearchDialog->showMaximized(); |
201 | #else | 203 | #else |
202 | KConfig *config = KOGlobals::config(); | 204 | KConfig *config = KOGlobals::config(); |
203 | config->setGroup("WidgetLayout"); | 205 | config->setGroup("WidgetLayout"); |
204 | QStringList list; | 206 | QStringList list; |
@@ -237,25 +239,25 @@ void KODialogManager::showArchiveDialog() | |||
237 | mArchiveDialog = new ArchiveDialog(mMainView->calendar(),mMainView); | 239 | mArchiveDialog = new ArchiveDialog(mMainView->calendar(),mMainView); |
238 | connect(mArchiveDialog,SIGNAL(eventsDeleted()), | 240 | connect(mArchiveDialog,SIGNAL(eventsDeleted()), |
239 | mMainView,SLOT(updateView())); | 241 | mMainView,SLOT(updateView())); |
240 | } | 242 | } |
241 | mArchiveDialog->show(); | 243 | mArchiveDialog->show(); |
242 | mArchiveDialog->raise(); | 244 | mArchiveDialog->raise(); |
243 | 245 | ||
244 | // Workaround. | 246 | // Workaround. |
245 | QApplication::restoreOverrideCursor(); | 247 | QApplication::restoreOverrideCursor(); |
246 | #endif | 248 | #endif |
247 | } | 249 | } |
248 | 250 | ||
249 | void KODialogManager::showFilterEditDialog(QPtrList<CalFilter> *filters) | 251 | void KODialogManager::showFilterEditDialog(Q3PtrList<CalFilter> *filters) |
250 | { | 252 | { |
251 | if (!mFilterEditDialog) { | 253 | if (!mFilterEditDialog) { |
252 | mFilterEditDialog = new FilterEditDialog(filters,mMainView); | 254 | mFilterEditDialog = new FilterEditDialog(filters,mMainView); |
253 | connect(mFilterEditDialog,SIGNAL(filterChanged()), | 255 | connect(mFilterEditDialog,SIGNAL(filterChanged()), |
254 | mMainView,SLOT(filterEdited())); | 256 | mMainView,SLOT(filterEdited())); |
255 | 257 | ||
256 | } | 258 | } |
257 | 259 | ||
258 | #ifndef DESKTOP_VERSION | 260 | #ifndef DESKTOP_VERSION |
259 | mFilterEditDialog->showMaximized(); | 261 | mFilterEditDialog->showMaximized(); |
260 | #else | 262 | #else |
261 | mFilterEditDialog->show(); | 263 | mFilterEditDialog->show(); |