-rw-r--r-- | korganizer/mainwindow.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index cbf6096..e960424 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1010,25 +1010,28 @@ void MainWindow::initActions() | |||
1010 | action = new QAction( "manage cat", i18n("Manage new categories..."), 0, | 1010 | action = new QAction( "manage cat", i18n("Manage new categories..."), 0, |
1011 | this ); | 1011 | this ); |
1012 | action->addTo( actionMenu ); | 1012 | action->addTo( actionMenu ); |
1013 | connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); | 1013 | connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); |
1014 | 1014 | ||
1015 | 1015 | ||
1016 | actionMenu->insertSeparator(); | 1016 | actionMenu->insertSeparator(); |
1017 | icon = loadPixmap( pathString + "configure" ); | 1017 | icon = loadPixmap( pathString + "configure" ); |
1018 | action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this ); | 1018 | action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this ); |
1019 | action->addTo( actionMenu ); | 1019 | action->addTo( actionMenu ); |
1020 | connect( action, SIGNAL( activated() ), | 1020 | connect( action, SIGNAL( activated() ), |
1021 | mView, SLOT( edit_options() ) ); | 1021 | mView, SLOT( edit_options() ) ); |
1022 | icon = loadPixmap( pathString + "configure" ); | 1022 | action = new QAction( i18n("Configure"),icon, i18n("Configure Calendar Files..."), 0, this ); |
1023 | action->addTo( actionMenu ); | ||
1024 | connect( action, SIGNAL( activated() ), | ||
1025 | this, SLOT( calHint() ) ); | ||
1023 | action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this ); | 1026 | action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this ); |
1024 | action->addTo( actionMenu ); | 1027 | action->addTo( actionMenu ); |
1025 | connect( action, SIGNAL( activated() ), | 1028 | connect( action, SIGNAL( activated() ), |
1026 | mView, SLOT( edit_global_options() ) ); | 1029 | mView, SLOT( edit_global_options() ) ); |
1027 | if ( KOPrefs::instance()->mShowFullMenu ) { | 1030 | if ( KOPrefs::instance()->mShowFullMenu ) { |
1028 | actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu ); | 1031 | actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu ); |
1029 | 1032 | ||
1030 | } | 1033 | } |
1031 | // actionMenu->insertSeparator(); | 1034 | // actionMenu->insertSeparator(); |
1032 | action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, | 1035 | action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, |
1033 | this ); | 1036 | this ); |
1034 | action->addTo( importMenu_X ); | 1037 | action->addTo( importMenu_X ); |
@@ -1351,25 +1354,30 @@ void MainWindow::initActions() | |||
1351 | if (p-> mShowIconOnetoolbar) | 1354 | if (p-> mShowIconOnetoolbar) |
1352 | configureToolBarMenu->setItemChecked( 6, true ); | 1355 | configureToolBarMenu->setItemChecked( 6, true ); |
1353 | 1356 | ||
1354 | 1357 | ||
1355 | if ( filterMenubar ) { | 1358 | if ( filterMenubar ) { |
1356 | filterMenubar->reparent(filterToolBar,0,QPoint(0,0) ); | 1359 | filterMenubar->reparent(filterToolBar,0,QPoint(0,0) ); |
1357 | connect( mView, SIGNAL( filtersUpdated() ), SLOT( updateFilterToolbar() ) ); | 1360 | connect( mView, SIGNAL( filtersUpdated() ), SLOT( updateFilterToolbar() ) ); |
1358 | } | 1361 | } |
1359 | connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) ); | 1362 | connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) ); |
1360 | configureAgenda( p->mHourSize ); | 1363 | configureAgenda( p->mHourSize ); |
1361 | connect( configureAgendaMenu, SIGNAL( activated( int ) ),this, SLOT(configureAgenda( int ) ) ); | 1364 | connect( configureAgendaMenu, SIGNAL( activated( int ) ),this, SLOT(configureAgenda( int ) ) ); |
1362 | } | 1365 | } |
1363 | 1366 | void MainWindow::calHint() | |
1367 | { | ||
1368 | QString message = i18n("You can use and display <b>more than one</b> calendar file in KO/Pi. A calendar file is called a <b>resource</b>. To add a calendar or change calendar settings please use menu: <b>View -> Toggle Resource View</b>."); | ||
1369 | |||
1370 | KMessageBox::information( this, message); | ||
1371 | } | ||
1364 | void MainWindow::exportToPhone( int mode ) | 1372 | void MainWindow::exportToPhone( int mode ) |
1365 | { | 1373 | { |
1366 | 1374 | ||
1367 | //ex2phone->insertItem(i18n("Complete calendar..."), 1 ); | 1375 | //ex2phone->insertItem(i18n("Complete calendar..."), 1 ); |
1368 | //ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); | 1376 | //ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); |
1369 | KOex2phonePrefs ex2phone; | 1377 | KOex2phonePrefs ex2phone; |
1370 | 1378 | ||
1371 | ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection ); | 1379 | ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection ); |
1372 | ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice ); | 1380 | ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice ); |
1373 | ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel ); | 1381 | ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel ); |
1374 | if ( mode == 1 ) | 1382 | if ( mode == 1 ) |
1375 | ex2phone.setCaption(i18n("Export complete calendar")); | 1383 | ex2phone.setCaption(i18n("Export complete calendar")); |