From 98d29d15275c4b8e9a3348742925f6e6d03f7a07 Mon Sep 17 00:00:00 2001 From: zautrix Date: Fri, 01 Jul 2005 17:57:30 +0000 Subject: fixx --- diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 44e6bdf..593806b 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt @@ -1474,8 +1474,8 @@ { "Filepath: ","Dateipfad: " }, { "The loading of one or more calendar failed:","Das Laden eines oder mehrerer Kalender schlug fehl:" }, { "You can try to reload the calendar in the Resource View!","In der Resourcenansicht können Sie erneut versuchen den Kalender zu laden!" }, -{ "","" }, -{ "","" }, +{ "WARNING: There is a pending suspended alarm!","WARNUNG: Es gibt einen laufenden Suspendalarm!" }, +{ "Pending Suspend Alarm","Laufender Suspend Alarm" }, { "","" }, { "","" }, { "","" }, \ No newline at end of file diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp index 17d4afa..ddb125a 100644 --- a/kalarmd/alarmdialog.cpp +++ b/kalarmd/alarmdialog.cpp @@ -98,6 +98,11 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name) layout->addWidget ( mMissedAlarmsCombo ); QLabel* labb = new QLabel("Suspend\nduration\n(minutes):",this); +#ifdef DESKTOP_VERSION + fo = font(); + fo.setPointSize( 12 ); + labb->setFont ( fo ); +#endif labb->setAlignment(AlignCenter); //layout->addWidget ( labb ); fo = font(); diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index fd026fa..70a1d2d 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -783,7 +783,7 @@ void CalendarView::startAlarm( QString mess , QString filename) topLevelWidget()->raise(); mAlarmDialog->eventNotification( mess, KOPrefs::instance()->mAlarmPlayBeeps, filename, true,KOPrefs::instance()->mAlarmBeepInterval ,KOPrefs::instance()->mAlarmSuspendCount ); - QTimer::singleShot( 3000, this, SLOT( checkNextTimerAlarm() ) ); + QTimer::singleShot( 2000, this, SLOT( checkNextTimerAlarm() ) ); } @@ -926,12 +926,16 @@ void CalendarView::recheckTimerAlarm() mRecheckAlarmTimer->stop(); mCalendar->checkAlarmForIncidence( 0, true ); } +#ifndef DESKTOP_VERSION void CalendarView::removeAlarm(const QDateTime &qdt, const QString ¬i ) +#else +void CalendarView::removeAlarm(const QDateTime &, const QString & ) +#endif { //qDebug("-----removeAlarm %s %s ", qdt.toString().latin1() , noti.latin1() ); if ( ! KOPrefs::instance()->mUseInternalAlarmNotification ) { #ifndef DESKTOP_VERSION - AlarmServer::deleteAlarm (qdt ,"koalarm" ,noti.latin1() ); + AlarmServer::deleteAlarm (qdt ,"koalarm" ,noti.utf8() ); #endif return; } @@ -1210,7 +1214,6 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int Event* eventR; QString uid; int take; - Event* eventL; Event* eventRSync; Event* eventLSync; clearAllViews(); @@ -2310,11 +2313,16 @@ void CalendarView::readSettings() QTimer::singleShot( 1, mDateNavigator, SLOT ( setResizeEnabled() ) ); } - +void CalendarView::checkSuspendAlarm() +{ + if ( mSuspendTimer->isActive() ) { + KMessageBox::information( this, i18n("WARNING: There is a pending suspended alarm!"), i18n("Pending Suspend Alarm")); + } +} void CalendarView::writeSettings() { // kdDebug() << "CalendarView::writeSettings" << endl; - + KConfig *config = KOGlobals::config(); mViewManager->writeSettings( config ); @@ -2794,8 +2802,7 @@ void CalendarView::removeCategories() QStringList catIncList; QStringList newCatList; Incidence* inc = incList.first(); - int i; - int count = 0; + uint i; while ( inc ) { newCatList.clear(); catIncList = inc->categories() ; @@ -2815,7 +2822,7 @@ int CalendarView::addCategories() QStringList catList = KOPrefs::instance()->mCustomCategories; QStringList catIncList; Incidence* inc = incList.first(); - int i; + uint i; int count = 0; while ( inc ) { catIncList = inc->categories() ; @@ -2945,15 +2952,17 @@ void CalendarView::beamIncidenceList(QPtrList delSel ) #endif } } + +#ifndef DESKTOP_VERSION void CalendarView::beamDone( Ir *ir ) { -#ifndef DESKTOP_VERSION delete ir; -#endif topLevelWidget()->setCaption( i18n("KO/Pi: Beaming done.") ); topLevelWidget()->raise(); } - +#else +void CalendarView::beamDone( Ir *){;} +#endif void CalendarView::moveIncidence(Incidence * inc ) { if ( !inc ) return; @@ -4307,11 +4316,6 @@ Todo *CalendarView::selectedTodo() return 0; } -void CalendarView::dialogClosing(Incidence *in) -{ - // mDialogList.remove(in); -} - void CalendarView::showIncidence() { mViewerCallerIsSearchDialog = false; @@ -4432,10 +4436,7 @@ void CalendarView::purgeCompleted() QPtrList todoCal; QPtrList rootTodos; //QPtrList rel; - Todo *aTodo;//, *rTodo; - Incidence *rIncidence; - bool childDelete = false; - bool deletedOne = true; + Todo *aTodo; todoCal = calendar()->todos(); for (aTodo = todoCal.first(); aTodo; aTodo = todoCal.next()) { if ( !aTodo->relatedTo() ) @@ -4463,7 +4464,9 @@ void CalendarView::keyPressEvent ( QKeyEvent *e) bool CalendarView::sync(KSyncManager* manager, QString filename, int mode) { - // mSyncManager = manager; + + if ( manager != mSyncManager) + qDebug("KO: Internal error-1. SyncManager mismatch "); if ( filename == QDir::homeDirPath ()+"/.kdecalendardump.ics" ) { qDebug("KO: SyncKDE request detected!"); } @@ -4474,6 +4477,8 @@ bool CalendarView::sync(KSyncManager* manager, QString filename, int mode) bool CalendarView::syncExternal(KSyncManager* manager, QString resource) { //mSyncManager = manager; + if ( manager != mSyncManager) + qDebug("KO: Internal error-2. SyncManager mismatch "); mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice(); mCurrentSyncName = mSyncManager->getCurrentSyncName(); if ( resource == "sharp" ) diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 3323a98..c9e9870 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h @@ -137,6 +137,7 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser void showView(KOrg::BaseView *); KOEventViewerDialog* getEventViewerDialog(); Incidence *currentSelection(); + void checkSuspendAlarm(); signals: void save (); @@ -455,7 +456,6 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser void toggleExpand(); void toggleDateNavigatorWidget(); void toggleAllDaySize(); - void dialogClosing(Incidence *); /** Look for new messages in the inbox */ void lookForIncomingMessages(); diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp index 5455098..ea30fac 100644 --- a/korganizer/kodialogmanager.cpp +++ b/korganizer/kodialogmanager.cpp @@ -298,8 +298,6 @@ KOEventEditor *KODialogManager::getEventEditor() // eventEditor,SLOT(updateCategoryConfig())); // connect(eventEditor,SIGNAL(editCategories()), // mCategoryEditDialog,SLOT(show())); - connect(eventEditor,SIGNAL(dialogClose(Incidence*)), - mMainView,SLOT(dialogClosing(Incidence*))); //connect(mMainView,SIGNAL(closingDown()),eventEditor,SLOT(reject())); @@ -324,8 +322,6 @@ KOTodoEditor *KODialogManager::getTodoEditor() mMainView,SLOT(todoChanged(Todo *))); connect(todoEditor,SIGNAL(todoDeleted()), mMainView,SLOT(todoDeleted())); - connect(todoEditor,SIGNAL(dialogClose(Incidence*)), - mMainView,SLOT(dialogClosing(Incidence*))); connect( todoEditor, SIGNAL(jumpToTime( const QDate &)), mMainView->dateNavigator(), SLOT( selectWeek( const QDate & ) ) ); connect( todoEditor, SIGNAL( showAgendaView( bool)), diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index 517677c..e5e3704 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -439,7 +439,8 @@ void KOListView::populateCalPopup() KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); while ( kkf ) { int index = mCalPopup->insertItem( kkf->mName, kkf->mCalNumber); - mCalPopup->setItemEnabled( index, !kkf->isReadOnly ); + if ( kkf->mErrorOnLoad || kkf->isReadOnly ) + mCalPopup->setItemEnabled( index, false ); kkf = KOPrefs::instance()->mCalendars.next(); } } diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index b6ce7d5..b797d8c 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -134,7 +134,7 @@ QPixmap* sgListViewCompletedPix[6]; int globalFlagBlockStartup; -MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : +MainWindow::MainWindow( QWidget *parent, const char *name ) : QMainWindow( parent, name ) { sgListViewCompletedPix[5] = &listviewPix; @@ -144,14 +144,11 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : sgListViewCompletedPix[3] = &listviewPix60; sgListViewCompletedPix[4] = &listviewPix80; if ( sgListViewCompletedPix[5]->height() < 5 ) { - int size = 12; + //int size = 12; sgListViewCompletedPix[5]->resize( 11, 11 ); sgListViewCompletedPix[5]->fill( Qt::white ); QPainter p ( sgListViewCompletedPix[5] ); p.drawRect( 0,0,11,11); - int half = size/2; - int heihei = size/2; - int x = 1; p.drawLine ( 2, 5, 4 , 7 ) ; p.drawLine ( 4 , 7 , 8, 3) ; int iii = 0; @@ -344,7 +341,6 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) { KOPrefs::instance()->setAllDefaults(); - int count = mView->addCategories(); } processIncidenceSelection( 0 ); connect( mView, SIGNAL( incidenceSelected( Incidence * ) ), @@ -1855,11 +1851,11 @@ void MainWindow::saveOnClose() p->mToolBarUpF = filterToolBar->x() > width()/2 ; } #endif - save(); mView->writeSettings(); + mView->checkSuspendAlarm(); } -void MainWindow::slotModifiedChanged( bool changed ) +void MainWindow::slotModifiedChanged( bool ) { if ( mBlockAtStartup ) return; @@ -1903,7 +1899,7 @@ void MainWindow::backupAllFiles() cal = calendars.next(); while ( cal ) { if ( !cal->mErrorOnLoad ) { - int retval = KApplication::createBackup( cal->mFileName, bupDir, KPimGlobalPrefs::instance()->mBackupNumbers ); + KApplication::createBackup( cal->mFileName, bupDir, KPimGlobalPrefs::instance()->mBackupNumbers ); } cal = calendars.next(); } @@ -2408,10 +2404,9 @@ void MainWindow::importFile( QString fn, bool quick ) QFileInfo info; info.setFile( fn ); QString mess; - bool loadbup = true; if ( !info. exists() ) { mess = i18n("Import file \n...%1\ndoes not exist!\nNothing imported!\n").arg(fn.right( 30)); - int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"), + QMessageBox::warning( this, i18n("KO/Pi: Warning!"), mess ); return; } diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 953774f..a948a52 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h @@ -36,7 +36,7 @@ class MainWindow : public QMainWindow { Q_OBJECT public: - MainWindow( QWidget *parent = 0, const char *name = 0, QString command = ""); + MainWindow( QWidget *parent = 0, const char *name = 0 ); ~MainWindow(); bool beamReceiveEnabled(); static QString defaultFileName(); -- cgit v0.9.0.2