author | zautrix <zautrix> | 2004-10-28 11:03:42 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-28 11:03:42 (UTC) |
commit | 01cd4ef94b8604532181c390e9abd560aebaf372 (patch) (side-by-side diff) | |
tree | 96ca1a524512ae2e2868f0bd3df03e4da5c445f9 /korganizer | |
parent | 61d9eb436349a841410559f51e2601a34ceb5794 (diff) | |
download | kdepimpi-01cd4ef94b8604532181c390e9abd560aebaf372.zip kdepimpi-01cd4ef94b8604532181c390e9abd560aebaf372.tar.gz kdepimpi-01cd4ef94b8604532181c390e9abd560aebaf372.tar.bz2 |
added howto to menus
-rw-r--r-- | korganizer/calendarview.cpp | 12 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 48 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 2 |
3 files changed, 42 insertions, 20 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 6e61351..4667918 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -1193,13 +1193,17 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int if ( delFut ) { delmess.sprintf( i18n("%d items skipped on remote,\nbecause they are in the past or\nmore than %d weeks in the future.\nAfter skipping, remote has\n%d calendar/todo items."), delFut,mSyncManager->mWriteBackInFuture, remRem-delFut); mes += delmess; } + mCalendar->checkAlarmForIncidence( 0, true ); + qDebug( mes ); if ( mSyncManager->mShowSyncSummary ) { - KMessageBox::information(this, mes, i18n("KO/Pi Synchronization") ); + if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes, + i18n("KO/Pi Synchronization"),i18n("Write back"))) { + qDebug("cancelled "); + return false; + } } - qDebug( mes ); - mCalendar->checkAlarmForIncidence( 0, true ); return syncOK; } void CalendarView::setSyncDevice( QString s ) @@ -1311,8 +1315,10 @@ void CalendarView::syncExternal( int mode ) lse->setDescription( "" ); lse->setReadOnly( true ); } } + } else { + topLevelWidget()->setCaption( i18n("Sync cancelled or failed.") ); } setModified( true ); } else { QString question = i18n("Sorry, the database access\ncommand failed!\n\nNothing synced!\n") ; diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index fc2d59b..65566b5 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -848,16 +848,33 @@ void MainWindow::initActions() //menuBar->insertItem( "Configure",configureMenu ); //configureMenu->insertItem( "Toolbar",configureToolBarMenu ); icon = loadPixmap( "korganizer/korganizer" ); - action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); + + action = new QAction( "Whats New", i18n("What's new?"), 0,this ); action->addTo( helpMenu ); connect( action, SIGNAL( activated() ), - SLOT( keyBindings() ) ); + SLOT( whatsNew() ) ); action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this ); action->addTo( helpMenu ); connect( action, SIGNAL( activated() ), SLOT( features() ) ); + action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); + action->addTo( helpMenu ); + connect( action, SIGNAL( activated() ), + SLOT( keyBindings() ) ); + action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this ); + action->addTo( helpMenu ); + connect( action, SIGNAL( activated() ), + SLOT( synchowto() ) ); + action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this ); + action->addTo( helpMenu ); + connect( action, SIGNAL( activated() ), + SLOT( kdesynchowto() ) ); + action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this ); + action->addTo( helpMenu ); + connect( action, SIGNAL( activated() ), + SLOT( multisynchowto() ) ); action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this ); action->addTo( helpMenu ); connect( action, SIGNAL( activated() ), SLOT( aboutAutoSaving() ) ); @@ -868,30 +885,20 @@ void MainWindow::initActions() action = new QAction( "Translate Howto", i18n("User translation..."), 0,this ); action->addTo( helpMenu ); connect( action, SIGNAL( activated() ), SLOT( usertrans() ) ); - action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this ); - action->addTo( helpMenu ); - connect( action, SIGNAL( activated() ), - SLOT( synchowto() ) ); - action = new QAction( "Whats New", i18n("What's new?"), 0,this ); - action->addTo( helpMenu ); - connect( action, SIGNAL( activated() ), - SLOT( whatsNew() ) ); action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this ); action->addTo( helpMenu ); connect( action, SIGNAL( activated() ), SLOT( faq() ) ); - - - action = new QAction( "about", i18n("About..."), 0, this ); - action->addTo( helpMenu ); - connect( action, SIGNAL( activated() ), - SLOT( about() ) ); action = new QAction( "licence", i18n("Licence..."), 0, this ); action->addTo( helpMenu ); connect( action, SIGNAL( activated() ), SLOT( licence() ) ); + action = new QAction( "about", i18n("About..."), 0, this ); + action->addTo( helpMenu ); + connect( action, SIGNAL( activated() ), + SLOT( about() ) ); //menuBar->insertSeparator(); // ****************************************************** // menubar icons @@ -1146,11 +1153,18 @@ void MainWindow::usertrans() displayFile( "usertranslationHOWTO.txt",i18n("KO/Pi User translation HowTo") ); } +void MainWindow::kdesynchowto() +{ + KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/Zaurus-KDE_syncHowTo.txt" ); +} +void MainWindow::multisynchowto() +{ + KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/MultiSyncHowTo.txt" ); +} void MainWindow::synchowto() { - KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" ); } void MainWindow::faq() { diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 0926313..ed65d36 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h @@ -52,8 +52,10 @@ class MainWindow : public QMainWindow void faq(); void usertrans(); void features(); void synchowto(); + void kdesynchowto(); + void multisynchowto(); void whatsNew(); void keyBindings(); void aboutAutoSaving();; void aboutKnownBugs(); |