Diffstat (limited to 'korganizer/kodialogmanager.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | korganizer/kodialogmanager.cpp | 87 |
1 files changed, 45 insertions, 42 deletions
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp index 41a4dc1..1af9dad 100644 --- a/korganizer/kodialogmanager.cpp +++ b/korganizer/kodialogmanager.cpp | |||
@@ -167,53 +167,56 @@ void KODialogManager::hideSearchDialog() | |||
167 | 167 | ||
168 | void KODialogManager::showSearchDialog() | 168 | void KODialogManager::showSearchDialog() |
169 | { | 169 | { |
170 | if (!mSearchDialog) { | 170 | if (!mSearchDialog) { |
171 | mSearchDialog = new SearchDialog(mMainView->calendar(),mMainView); | 171 | mSearchDialog = new SearchDialog(mMainView->calendar(),mMainView); |
172 | KOListView * lview = mSearchDialog->listview(); | 172 | KOListView * lview = mSearchDialog->listview(); |
173 | 173 | ||
174 | connect(lview, SIGNAL(showIncidenceSignal(Incidence *)), | 174 | connect(lview, SIGNAL(showIncidenceSignal(Incidence *)), |
175 | mMainView, SLOT(showIncidence(Incidence *))); | 175 | mMainView, SLOT(showIncidence(Incidence *))); |
176 | connect(lview, SIGNAL(editIncidenceSignal(Incidence *)), | 176 | connect(lview, SIGNAL(editIncidenceSignal(Incidence *)), |
177 | mMainView, SLOT(editIncidence(Incidence *))); | 177 | mMainView, SLOT(editIncidence(Incidence *))); |
178 | connect(lview, SIGNAL(deleteIncidenceSignal(Incidence *)), | 178 | connect(lview, SIGNAL(deleteIncidenceSignal(Incidence *)), |
179 | mMainView, SLOT(deleteIncidence(Incidence *))); | 179 | mMainView, SLOT(deleteIncidence(Incidence *))); |
180 | connect(lview, SIGNAL(cloneIncidenceSignal(Incidence *)), | 180 | connect(lview, SIGNAL(cloneIncidenceSignal(Incidence *)), |
181 | mMainView, SLOT(cloneIncidence(Incidence *))); | 181 | mMainView, SLOT(cloneIncidence(Incidence *))); |
182 | connect(lview, SIGNAL(beamIncidenceSignal(Incidence *)), | 182 | connect(lview, SIGNAL(beamIncidenceSignal(Incidence *)), |
183 | mMainView, SLOT(beamIncidence(Incidence *))); | 183 | mMainView, SLOT(beamIncidence(Incidence *))); |
184 | connect(lview, SIGNAL(moveIncidenceSignal(Incidence *)), | 184 | connect(lview, SIGNAL(moveIncidenceSignal(Incidence *)), |
185 | mMainView, SLOT(moveIncidence(Incidence *))); | 185 | mMainView, SLOT(moveIncidence(Incidence *))); |
186 | connect(lview, SIGNAL(beamIncidenceList(QPtrList<Incidence> )), | 186 | connect(lview, SIGNAL(beamIncidenceList(QPtrList<Incidence> )), |
187 | mMainView, SLOT(beamIncidenceList(QPtrList<Incidence> ))); | 187 | mMainView, SLOT(beamIncidenceList(QPtrList<Incidence> ))); |
188 | 188 | ||
189 | connect(mMainView, SIGNAL(configChanged()), mSearchDialog, SLOT(updateConfig())); | 189 | connect(mMainView, SIGNAL(configChanged()), mSearchDialog, SLOT(updateConfig())); |
190 | connect(mMainView, SIGNAL(updateSearchDialog()), mSearchDialog, SLOT(updateList())); | 190 | connect(mMainView, SIGNAL(updateSearchDialog()), mSearchDialog, SLOT(updateList())); |
191 | // connect( lview, SIGNAL( incidenceSelected( Incidence * ) ), | 191 | // connect( lview, SIGNAL( incidenceSelected( Incidence * ) ), |
192 | // mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); | 192 | // mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); |
193 | #ifndef DESKTOP_VERSION | 193 | #ifndef DESKTOP_VERSION |
194 | mSearchDialog->setMaximumSize( QApplication::desktop()->size()); | 194 | mSearchDialog->setMaximumSize( QApplication::desktop()->size()); |
195 | //mSearchDialog->setGeometry( 40,40, 400, 300); | 195 | mSearchDialog->showMaximized(); |
196 | mSearchDialog->showMaximized(); | ||
197 | #else | 196 | #else |
198 | KConfig *config = KOGlobals::config(); | 197 | KConfig *config = KOGlobals::config(); |
199 | config->setGroup("WidgetLayout"); | 198 | config->setGroup("WidgetLayout"); |
200 | QStringList list; | 199 | QStringList list; |
201 | list = config->readListEntry("SearchLayout"); | 200 | list = config->readListEntry("SearchLayout"); |
202 | int x,y,w,h; | 201 | int x,y,w,h; |
203 | if ( ! list.isEmpty() ) { | 202 | if ( ! list.isEmpty() ) { |
204 | x = list[0].toInt(); | 203 | x = list[0].toInt(); |
205 | y = list[1].toInt(); | 204 | y = list[1].toInt(); |
206 | w = list[2].toInt(); | 205 | w = list[2].toInt(); |
207 | h = list[3].toInt(); | 206 | h = list[3].toInt(); |
208 | mSearchDialog->setGeometry(x,y,w,h); | 207 | mSearchDialog->setGeometry(x,y,w,h); |
209 | 208 | ||
210 | } | 209 | } |
211 | 210 | ||
212 | #endif | 211 | #endif |
213 | } | 212 | } |
214 | // make sure the widget is on top again | 213 | // make sure the widget is on top again |
215 | mSearchDialog->show(); | 214 | #ifdef DESKTOP_VERSION |
216 | mSearchDialog->raise(); | 215 | mSearchDialog->show(); |
216 | #else | ||
217 | mSearchDialog->showMaximized(); | ||
218 | #endif | ||
219 | mSearchDialog->raise(); | ||
217 | } | 220 | } |
218 | 221 | ||
219 | SearchDialog * KODialogManager::getSearchDialog() | 222 | SearchDialog * KODialogManager::getSearchDialog() |