Diffstat (limited to 'core/pim/datebook2/mainwindow.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/pim/datebook2/mainwindow.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/core/pim/datebook2/mainwindow.cpp b/core/pim/datebook2/mainwindow.cpp index be30415..7ff2204 100644 --- a/core/pim/datebook2/mainwindow.cpp +++ b/core/pim/datebook2/mainwindow.cpp | |||
@@ -208,66 +208,63 @@ BookManager* MainWindow::manager() { | |||
208 | TemplateManager MainWindow::templateManager() { | 208 | TemplateManager MainWindow::templateManager() { |
209 | return m_tempMan; | 209 | return m_tempMan; |
210 | } | 210 | } |
211 | LocationManager MainWindow::locationManager() { | 211 | LocationManager MainWindow::locationManager() { |
212 | return m_locMan; | 212 | return m_locMan; |
213 | } | 213 | } |
214 | DescriptionManager MainWindow::descriptionManager() { | 214 | DescriptionManager MainWindow::descriptionManager() { |
215 | return m_descMan; | 215 | return m_descMan; |
216 | } | 216 | } |
217 | void MainWindow::setLocationManager( const LocationManager& loc) { | 217 | void MainWindow::setLocationManager( const LocationManager& loc) { |
218 | m_locMan = loc; | 218 | m_locMan = loc; |
219 | } | 219 | } |
220 | void MainWindow::setDescriptionManager( const DescriptionManager& dsc ) { | 220 | void MainWindow::setDescriptionManager( const DescriptionManager& dsc ) { |
221 | m_descMan = dsc; | 221 | m_descMan = dsc; |
222 | } | 222 | } |
223 | Show* MainWindow::eventShow() { | 223 | Show* MainWindow::eventShow() { |
224 | return m_show; | 224 | return m_show; |
225 | } | 225 | } |
226 | void MainWindow::slotAction( QAction* act ) { | 226 | void MainWindow::slotAction( QAction* act ) { |
227 | 227 | ||
228 | } | 228 | } |
229 | void MainWindow::slotConfigureLocs() { | 229 | void MainWindow::slotConfigureLocs() { |
230 | LocationManagerDialog dlg( locationManager() ); | 230 | LocationManagerDialog dlg( locationManager() ); |
231 | dlg.setCaption( tr("Configure Locations") ); | 231 | dlg.setCaption( tr("Configure Locations") ); |
232 | dlg.showMaximized(); | 232 | if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) { |
233 | if (dlg.exec() == QDialog::Accepted ) { | ||
234 | setLocationManager( dlg.manager() ); | 233 | setLocationManager( dlg.manager() ); |
235 | } | 234 | } |
236 | } | 235 | } |
237 | void MainWindow::slotConfigureDesc() { | 236 | void MainWindow::slotConfigureDesc() { |
238 | DescriptionManagerDialog dlg( descriptionManager() ); | 237 | DescriptionManagerDialog dlg( descriptionManager() ); |
239 | dlg.setCaption( tr("Configure Descriptions") ); | 238 | dlg.setCaption( tr("Configure Descriptions") ); |
240 | dlg.showMaximized(); | 239 | if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) { |
241 | if (dlg.exec() == QDialog::Accepted ) { | ||
242 | setDescriptionManager( dlg.manager() ); | 240 | setDescriptionManager( dlg.manager() ); |
243 | } | 241 | } |
244 | } | 242 | } |
245 | void MainWindow::slotConfigureTemp() { | 243 | void MainWindow::slotConfigureTemp() { |
246 | TemplateDialog dlg( templateManager(), editor() ); | 244 | TemplateDialog dlg( templateManager(), editor() ); |
247 | dlg.setCaption( tr("Configure Templates") ); | 245 | dlg.setCaption( tr("Configure Templates") ); |
248 | dlg.showMaximized(); | 246 | if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) { |
249 | if ( dlg.exec() == QDialog::Accepted ) { | ||
250 | m_tempMan = dlg.manager(); | 247 | m_tempMan = dlg.manager(); |
251 | setTemplateMenu(); | 248 | setTemplateMenu(); |
252 | } | 249 | } |
253 | } | 250 | } |
254 | void MainWindow::hideShow() { | 251 | void MainWindow::hideShow() { |
255 | 252 | ||
256 | } | 253 | } |
257 | void MainWindow::viewPopup(int ) { | 254 | void MainWindow::viewPopup(int ) { |
258 | 255 | ||
259 | } | 256 | } |
260 | void MainWindow::viewAdd(const QDate& ) { | 257 | void MainWindow::viewAdd(const QDate& ) { |
261 | 258 | ||
262 | } | 259 | } |
263 | void MainWindow::viewAdd( const QDateTime&, const QDateTime& ) { | 260 | void MainWindow::viewAdd( const QDateTime&, const QDateTime& ) { |
264 | 261 | ||
265 | } | 262 | } |
266 | bool MainWindow::viewAP()const{ | 263 | bool MainWindow::viewAP()const{ |
267 | } | 264 | } |
268 | bool MainWindow::viewStartMonday()const { | 265 | bool MainWindow::viewStartMonday()const { |
269 | 266 | ||
270 | } | 267 | } |
271 | void MainWindow::setTemplateMenu() { | 268 | void MainWindow::setTemplateMenu() { |
272 | m_popTemplate->clear(); | 269 | m_popTemplate->clear(); |
273 | 270 | ||