-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 4 | ||||
-rw-r--r-- | kalarmd/alarmdialog.cpp | 5 | ||||
-rw-r--r-- | korganizer/calendarview.cpp | 45 | ||||
-rw-r--r-- | korganizer/calendarview.h | 2 | ||||
-rw-r--r-- | korganizer/kodialogmanager.cpp | 4 | ||||
-rw-r--r-- | korganizer/kolistview.cpp | 3 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 17 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 2 |
8 files changed, 42 insertions, 40 deletions
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 | |||
@@ -1473,9 +1473,9 @@ | |||
1473 | { "Toolbar changes needs a restart!","Neustart benötigt für Toolbaränderungen!" }, | 1473 | { "Toolbar changes needs a restart!","Neustart benötigt für Toolbaränderungen!" }, |
1474 | { "Filepath: ","Dateipfad: " }, | 1474 | { "Filepath: ","Dateipfad: " }, |
1475 | { "The loading of one or more calendar failed:","Das Laden eines oder mehrerer Kalender schlug fehl:" }, | 1475 | { "The loading of one or more calendar failed:","Das Laden eines oder mehrerer Kalender schlug fehl:" }, |
1476 | { "You can try to reload the calendar in the Resource View!","In der Resourcenansicht können Sie erneut versuchen den Kalender zu laden!" }, | 1476 | { "You can try to reload the calendar in the Resource View!","In der Resourcenansicht können Sie erneut versuchen den Kalender zu laden!" }, |
1477 | { "","" }, | 1477 | { "<b>WARNING:</b> There is a pending suspended alarm!","<b>WARNUNG:</b> Es gibt einen laufenden Suspendalarm!" }, |
1478 | { "","" }, | 1478 | { "Pending Suspend Alarm","Laufender Suspend Alarm" }, |
1479 | { "","" }, | 1479 | { "","" }, |
1480 | { "","" }, | 1480 | { "","" }, |
1481 | { "","" }, \ No newline at end of file | 1481 | { "","" }, \ 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 | |||
@@ -97,8 +97,13 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name) | |||
97 | mMissedAlarmsCombo = new QComboBox ( this ); | 97 | mMissedAlarmsCombo = new QComboBox ( this ); |
98 | layout->addWidget ( mMissedAlarmsCombo ); | 98 | layout->addWidget ( mMissedAlarmsCombo ); |
99 | 99 | ||
100 | QLabel* labb = new QLabel("Suspend\nduration\n(minutes):",this); | 100 | QLabel* labb = new QLabel("Suspend\nduration\n(minutes):",this); |
101 | #ifdef DESKTOP_VERSION | ||
102 | fo = font(); | ||
103 | fo.setPointSize( 12 ); | ||
104 | labb->setFont ( fo ); | ||
105 | #endif | ||
101 | labb->setAlignment(AlignCenter); | 106 | labb->setAlignment(AlignCenter); |
102 | //layout->addWidget ( labb ); | 107 | //layout->addWidget ( labb ); |
103 | fo = font(); | 108 | fo = font(); |
104 | int pointSize = 36; | 109 | int pointSize = 36; |
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index fd026fa..70a1d2d 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -782,9 +782,9 @@ void CalendarView::startAlarm( QString mess , QString filename) | |||
782 | topLevelWidget()->setActiveWindow(); | 782 | topLevelWidget()->setActiveWindow(); |
783 | topLevelWidget()->raise(); | 783 | topLevelWidget()->raise(); |
784 | 784 | ||
785 | mAlarmDialog->eventNotification( mess, KOPrefs::instance()->mAlarmPlayBeeps, filename, true,KOPrefs::instance()->mAlarmBeepInterval ,KOPrefs::instance()->mAlarmSuspendCount ); | 785 | mAlarmDialog->eventNotification( mess, KOPrefs::instance()->mAlarmPlayBeeps, filename, true,KOPrefs::instance()->mAlarmBeepInterval ,KOPrefs::instance()->mAlarmSuspendCount ); |
786 | QTimer::singleShot( 3000, this, SLOT( checkNextTimerAlarm() ) ); | 786 | QTimer::singleShot( 2000, this, SLOT( checkNextTimerAlarm() ) ); |
787 | 787 | ||
788 | } | 788 | } |
789 | 789 | ||
790 | void CalendarView::checkNextTimerAlarm() | 790 | void CalendarView::checkNextTimerAlarm() |
@@ -925,14 +925,18 @@ void CalendarView::recheckTimerAlarm() | |||
925 | mAlarmTimer->stop(); | 925 | mAlarmTimer->stop(); |
926 | mRecheckAlarmTimer->stop(); | 926 | mRecheckAlarmTimer->stop(); |
927 | mCalendar->checkAlarmForIncidence( 0, true ); | 927 | mCalendar->checkAlarmForIncidence( 0, true ); |
928 | } | 928 | } |
929 | #ifndef DESKTOP_VERSION | ||
929 | void CalendarView::removeAlarm(const QDateTime &qdt, const QString ¬i ) | 930 | void CalendarView::removeAlarm(const QDateTime &qdt, const QString ¬i ) |
931 | #else | ||
932 | void CalendarView::removeAlarm(const QDateTime &, const QString & ) | ||
933 | #endif | ||
930 | { | 934 | { |
931 | //qDebug("-----removeAlarm %s %s ", qdt.toString().latin1() , noti.latin1() ); | 935 | //qDebug("-----removeAlarm %s %s ", qdt.toString().latin1() , noti.latin1() ); |
932 | if ( ! KOPrefs::instance()->mUseInternalAlarmNotification ) { | 936 | if ( ! KOPrefs::instance()->mUseInternalAlarmNotification ) { |
933 | #ifndef DESKTOP_VERSION | 937 | #ifndef DESKTOP_VERSION |
934 | AlarmServer::deleteAlarm (qdt ,"koalarm" ,noti.latin1() ); | 938 | AlarmServer::deleteAlarm (qdt ,"koalarm" ,noti.utf8() ); |
935 | #endif | 939 | #endif |
936 | return; | 940 | return; |
937 | } | 941 | } |
938 | mAlarmTimer->stop(); | 942 | mAlarmTimer->stop(); |
@@ -1209,9 +1213,8 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1209 | //QPtrList<Event> el = local->rawEvents(); | 1213 | //QPtrList<Event> el = local->rawEvents(); |
1210 | Event* eventR; | 1214 | Event* eventR; |
1211 | QString uid; | 1215 | QString uid; |
1212 | int take; | 1216 | int take; |
1213 | Event* eventL; | ||
1214 | Event* eventRSync; | 1217 | Event* eventRSync; |
1215 | Event* eventLSync; | 1218 | Event* eventLSync; |
1216 | clearAllViews(); | 1219 | clearAllViews(); |
1217 | QPtrList<Event> eventRSyncSharp = remote->getExternLastSyncEvents(); | 1220 | QPtrList<Event> eventRSyncSharp = remote->getExternLastSyncEvents(); |
@@ -2309,9 +2312,14 @@ void CalendarView::readSettings() | |||
2309 | mViewManager->readSettings( config ); | 2312 | mViewManager->readSettings( config ); |
2310 | QTimer::singleShot( 1, mDateNavigator, SLOT ( setResizeEnabled() ) ); | 2313 | QTimer::singleShot( 1, mDateNavigator, SLOT ( setResizeEnabled() ) ); |
2311 | } | 2314 | } |
2312 | 2315 | ||
2313 | 2316 | void CalendarView::checkSuspendAlarm() | |
2317 | { | ||
2318 | if ( mSuspendTimer->isActive() ) { | ||
2319 | KMessageBox::information( this, i18n("<b>WARNING:</b> There is a pending suspended alarm!"), i18n("Pending Suspend Alarm")); | ||
2320 | } | ||
2321 | } | ||
2314 | void CalendarView::writeSettings() | 2322 | void CalendarView::writeSettings() |
2315 | { | 2323 | { |
2316 | // kdDebug() << "CalendarView::writeSettings" << endl; | 2324 | // kdDebug() << "CalendarView::writeSettings" << endl; |
2317 | 2325 | ||
@@ -2793,10 +2801,9 @@ void CalendarView::removeCategories() | |||
2793 | QStringList catList = KOPrefs::instance()->mCustomCategories; | 2801 | QStringList catList = KOPrefs::instance()->mCustomCategories; |
2794 | QStringList catIncList; | 2802 | QStringList catIncList; |
2795 | QStringList newCatList; | 2803 | QStringList newCatList; |
2796 | Incidence* inc = incList.first(); | 2804 | Incidence* inc = incList.first(); |
2797 | int i; | 2805 | uint i; |
2798 | int count = 0; | ||
2799 | while ( inc ) { | 2806 | while ( inc ) { |
2800 | newCatList.clear(); | 2807 | newCatList.clear(); |
2801 | catIncList = inc->categories() ; | 2808 | catIncList = inc->categories() ; |
2802 | for( i = 0; i< catIncList.count(); ++i ) { | 2809 | for( i = 0; i< catIncList.count(); ++i ) { |
@@ -2814,9 +2821,9 @@ int CalendarView::addCategories() | |||
2814 | QPtrList<Incidence> incList = mCalendar->rawIncidences(); | 2821 | QPtrList<Incidence> incList = mCalendar->rawIncidences(); |
2815 | QStringList catList = KOPrefs::instance()->mCustomCategories; | 2822 | QStringList catList = KOPrefs::instance()->mCustomCategories; |
2816 | QStringList catIncList; | 2823 | QStringList catIncList; |
2817 | Incidence* inc = incList.first(); | 2824 | Incidence* inc = incList.first(); |
2818 | int i; | 2825 | uint i; |
2819 | int count = 0; | 2826 | int count = 0; |
2820 | while ( inc ) { | 2827 | while ( inc ) { |
2821 | catIncList = inc->categories() ; | 2828 | catIncList = inc->categories() ; |
2822 | for( i = 0; i< catIncList.count(); ++i ) { | 2829 | for( i = 0; i< catIncList.count(); ++i ) { |
@@ -2944,17 +2951,19 @@ void CalendarView::beamIncidenceList(QPtrList<Incidence> delSel ) | |||
2944 | ir->send( fn, description, "text/x-vCalendar" ); | 2951 | ir->send( fn, description, "text/x-vCalendar" ); |
2945 | #endif | 2952 | #endif |
2946 | } | 2953 | } |
2947 | } | 2954 | } |
2955 | |||
2956 | #ifndef DESKTOP_VERSION | ||
2948 | void CalendarView::beamDone( Ir *ir ) | 2957 | void CalendarView::beamDone( Ir *ir ) |
2949 | { | 2958 | { |
2950 | #ifndef DESKTOP_VERSION | ||
2951 | delete ir; | 2959 | delete ir; |
2952 | #endif | ||
2953 | topLevelWidget()->setCaption( i18n("KO/Pi: Beaming done.") ); | 2960 | topLevelWidget()->setCaption( i18n("KO/Pi: Beaming done.") ); |
2954 | topLevelWidget()->raise(); | 2961 | topLevelWidget()->raise(); |
2955 | } | 2962 | } |
2956 | 2963 | #else | |
2964 | void CalendarView::beamDone( Ir *){;} | ||
2965 | #endif | ||
2957 | void CalendarView::moveIncidence(Incidence * inc ) | 2966 | void CalendarView::moveIncidence(Incidence * inc ) |
2958 | { | 2967 | { |
2959 | if ( !inc ) return; | 2968 | if ( !inc ) return; |
2960 | showDatePickerPopup(); | 2969 | showDatePickerPopup(); |
@@ -4306,13 +4315,8 @@ Todo *CalendarView::selectedTodo() | |||
4306 | 4315 | ||
4307 | return 0; | 4316 | return 0; |
4308 | } | 4317 | } |
4309 | 4318 | ||
4310 | void CalendarView::dialogClosing(Incidence *in) | ||
4311 | { | ||
4312 | // mDialogList.remove(in); | ||
4313 | } | ||
4314 | |||
4315 | void CalendarView::showIncidence() | 4319 | void CalendarView::showIncidence() |
4316 | { | 4320 | { |
4317 | mViewerCallerIsSearchDialog = false; | 4321 | mViewerCallerIsSearchDialog = false; |
4318 | Incidence *incidence = currentSelection(); | 4322 | Incidence *incidence = currentSelection(); |
@@ -4431,12 +4435,9 @@ void CalendarView::purgeCompleted() | |||
4431 | 4435 | ||
4432 | QPtrList<Todo> todoCal; | 4436 | QPtrList<Todo> todoCal; |
4433 | QPtrList<Todo> rootTodos; | 4437 | QPtrList<Todo> rootTodos; |
4434 | //QPtrList<Incidence> rel; | 4438 | //QPtrList<Incidence> rel; |
4435 | Todo *aTodo;//, *rTodo; | 4439 | Todo *aTodo; |
4436 | Incidence *rIncidence; | ||
4437 | bool childDelete = false; | ||
4438 | bool deletedOne = true; | ||
4439 | todoCal = calendar()->todos(); | 4440 | todoCal = calendar()->todos(); |
4440 | for (aTodo = todoCal.first(); aTodo; aTodo = todoCal.next()) { | 4441 | for (aTodo = todoCal.first(); aTodo; aTodo = todoCal.next()) { |
4441 | if ( !aTodo->relatedTo() ) | 4442 | if ( !aTodo->relatedTo() ) |
4442 | rootTodos.append( aTodo ); | 4443 | rootTodos.append( aTodo ); |
@@ -4462,9 +4463,11 @@ void CalendarView::keyPressEvent ( QKeyEvent *e) | |||
4462 | 4463 | ||
4463 | 4464 | ||
4464 | bool CalendarView::sync(KSyncManager* manager, QString filename, int mode) | 4465 | bool CalendarView::sync(KSyncManager* manager, QString filename, int mode) |
4465 | { | 4466 | { |
4466 | // mSyncManager = manager; | 4467 | |
4468 | if ( manager != mSyncManager) | ||
4469 | qDebug("KO: Internal error-1. SyncManager mismatch "); | ||
4467 | if ( filename == QDir::homeDirPath ()+"/.kdecalendardump.ics" ) { | 4470 | if ( filename == QDir::homeDirPath ()+"/.kdecalendardump.ics" ) { |
4468 | qDebug("KO: SyncKDE request detected!"); | 4471 | qDebug("KO: SyncKDE request detected!"); |
4469 | } | 4472 | } |
4470 | mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice(); | 4473 | mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice(); |
@@ -4473,8 +4476,10 @@ bool CalendarView::sync(KSyncManager* manager, QString filename, int mode) | |||
4473 | } | 4476 | } |
4474 | bool CalendarView::syncExternal(KSyncManager* manager, QString resource) | 4477 | bool CalendarView::syncExternal(KSyncManager* manager, QString resource) |
4475 | { | 4478 | { |
4476 | //mSyncManager = manager; | 4479 | //mSyncManager = manager; |
4480 | if ( manager != mSyncManager) | ||
4481 | qDebug("KO: Internal error-2. SyncManager mismatch "); | ||
4477 | mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice(); | 4482 | mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice(); |
4478 | mCurrentSyncName = mSyncManager->getCurrentSyncName(); | 4483 | mCurrentSyncName = mSyncManager->getCurrentSyncName(); |
4479 | if ( resource == "sharp" ) | 4484 | if ( resource == "sharp" ) |
4480 | syncExternal( 0 ); | 4485 | syncExternal( 0 ); |
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 3323a98..c9e9870 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h | |||
@@ -136,8 +136,9 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
136 | void addView(KOrg::BaseView *); | 136 | void addView(KOrg::BaseView *); |
137 | void showView(KOrg::BaseView *); | 137 | void showView(KOrg::BaseView *); |
138 | KOEventViewerDialog* getEventViewerDialog(); | 138 | KOEventViewerDialog* getEventViewerDialog(); |
139 | Incidence *currentSelection(); | 139 | Incidence *currentSelection(); |
140 | void checkSuspendAlarm(); | ||
140 | 141 | ||
141 | signals: | 142 | signals: |
142 | void save (); | 143 | void save (); |
143 | void saveStopTimer (); | 144 | void saveStopTimer (); |
@@ -454,9 +455,8 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser | |||
454 | 455 | ||
455 | void toggleExpand(); | 456 | void toggleExpand(); |
456 | void toggleDateNavigatorWidget(); | 457 | void toggleDateNavigatorWidget(); |
457 | void toggleAllDaySize(); | 458 | void toggleAllDaySize(); |
458 | void dialogClosing(Incidence *); | ||
459 | 459 | ||
460 | /** Look for new messages in the inbox */ | 460 | /** Look for new messages in the inbox */ |
461 | void lookForIncomingMessages(); | 461 | void lookForIncomingMessages(); |
462 | /** Look for new messages in the outbox */ | 462 | /** Look for new messages in the outbox */ |
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp index 5455098..ea30fac 100644 --- a/korganizer/kodialogmanager.cpp +++ b/korganizer/kodialogmanager.cpp | |||
@@ -297,10 +297,8 @@ KOEventEditor *KODialogManager::getEventEditor() | |||
297 | // connect(mCategoryEditDialog,SIGNAL(categoryConfigChanged()), | 297 | // connect(mCategoryEditDialog,SIGNAL(categoryConfigChanged()), |
298 | // eventEditor,SLOT(updateCategoryConfig())); | 298 | // eventEditor,SLOT(updateCategoryConfig())); |
299 | // connect(eventEditor,SIGNAL(editCategories()), | 299 | // connect(eventEditor,SIGNAL(editCategories()), |
300 | // mCategoryEditDialog,SLOT(show())); | 300 | // mCategoryEditDialog,SLOT(show())); |
301 | connect(eventEditor,SIGNAL(dialogClose(Incidence*)), | ||
302 | mMainView,SLOT(dialogClosing(Incidence*))); | ||
303 | 301 | ||
304 | //connect(mMainView,SIGNAL(closingDown()),eventEditor,SLOT(reject())); | 302 | //connect(mMainView,SIGNAL(closingDown()),eventEditor,SLOT(reject())); |
305 | 303 | ||
306 | #ifndef DESKTOP_VERSION | 304 | #ifndef DESKTOP_VERSION |
@@ -323,10 +321,8 @@ KOTodoEditor *KODialogManager::getTodoEditor() | |||
323 | connect(todoEditor,SIGNAL(todoChanged(Todo *)), | 321 | connect(todoEditor,SIGNAL(todoChanged(Todo *)), |
324 | mMainView,SLOT(todoChanged(Todo *))); | 322 | mMainView,SLOT(todoChanged(Todo *))); |
325 | connect(todoEditor,SIGNAL(todoDeleted()), | 323 | connect(todoEditor,SIGNAL(todoDeleted()), |
326 | mMainView,SLOT(todoDeleted())); | 324 | mMainView,SLOT(todoDeleted())); |
327 | connect(todoEditor,SIGNAL(dialogClose(Incidence*)), | ||
328 | mMainView,SLOT(dialogClosing(Incidence*))); | ||
329 | connect( todoEditor, SIGNAL(jumpToTime( const QDate &)), | 325 | connect( todoEditor, SIGNAL(jumpToTime( const QDate &)), |
330 | mMainView->dateNavigator(), SLOT( selectWeek( const QDate & ) ) ); | 326 | mMainView->dateNavigator(), SLOT( selectWeek( const QDate & ) ) ); |
331 | connect( todoEditor, SIGNAL( showAgendaView( bool)), | 327 | connect( todoEditor, SIGNAL( showAgendaView( bool)), |
332 | mMainView->viewManager(), SLOT( showAgendaView( bool) ) ); | 328 | mMainView->viewManager(), SLOT( showAgendaView( bool) ) ); |
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index 517677c..e5e3704 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp | |||
@@ -438,9 +438,10 @@ void KOListView::populateCalPopup() | |||
438 | mCalPopup->clear(); | 438 | mCalPopup->clear(); |
439 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); | 439 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); |
440 | while ( kkf ) { | 440 | while ( kkf ) { |
441 | int index = mCalPopup->insertItem( kkf->mName, kkf->mCalNumber); | 441 | int index = mCalPopup->insertItem( kkf->mName, kkf->mCalNumber); |
442 | mCalPopup->setItemEnabled( index, !kkf->isReadOnly ); | 442 | if ( kkf->mErrorOnLoad || kkf->isReadOnly ) |
443 | mCalPopup->setItemEnabled( index, false ); | ||
443 | kkf = KOPrefs::instance()->mCalendars.next(); | 444 | kkf = KOPrefs::instance()->mCalendars.next(); |
444 | } | 445 | } |
445 | } | 446 | } |
446 | void KOListView::updateList() | 447 | void KOListView::updateList() |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index b6ce7d5..b797d8c 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -133,9 +133,9 @@ public: | |||
133 | QPixmap* sgListViewCompletedPix[6]; | 133 | QPixmap* sgListViewCompletedPix[6]; |
134 | 134 | ||
135 | 135 | ||
136 | int globalFlagBlockStartup; | 136 | int globalFlagBlockStartup; |
137 | MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | 137 | MainWindow::MainWindow( QWidget *parent, const char *name ) : |
138 | QMainWindow( parent, name ) | 138 | QMainWindow( parent, name ) |
139 | { | 139 | { |
140 | sgListViewCompletedPix[5] = &listviewPix; | 140 | sgListViewCompletedPix[5] = &listviewPix; |
141 | sgListViewCompletedPix[0] = &listviewPix0; | 141 | sgListViewCompletedPix[0] = &listviewPix0; |
@@ -143,16 +143,13 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
143 | sgListViewCompletedPix[2] = &listviewPix40; | 143 | sgListViewCompletedPix[2] = &listviewPix40; |
144 | sgListViewCompletedPix[3] = &listviewPix60; | 144 | sgListViewCompletedPix[3] = &listviewPix60; |
145 | sgListViewCompletedPix[4] = &listviewPix80; | 145 | sgListViewCompletedPix[4] = &listviewPix80; |
146 | if ( sgListViewCompletedPix[5]->height() < 5 ) { | 146 | if ( sgListViewCompletedPix[5]->height() < 5 ) { |
147 | int size = 12; | 147 | //int size = 12; |
148 | sgListViewCompletedPix[5]->resize( 11, 11 ); | 148 | sgListViewCompletedPix[5]->resize( 11, 11 ); |
149 | sgListViewCompletedPix[5]->fill( Qt::white ); | 149 | sgListViewCompletedPix[5]->fill( Qt::white ); |
150 | QPainter p ( sgListViewCompletedPix[5] ); | 150 | QPainter p ( sgListViewCompletedPix[5] ); |
151 | p.drawRect( 0,0,11,11); | 151 | p.drawRect( 0,0,11,11); |
152 | int half = size/2; | ||
153 | int heihei = size/2; | ||
154 | int x = 1; | ||
155 | p.drawLine ( 2, 5, 4 , 7 ) ; | 152 | p.drawLine ( 2, 5, 4 , 7 ) ; |
156 | p.drawLine ( 4 , 7 , 8, 3) ; | 153 | p.drawLine ( 4 , 7 , 8, 3) ; |
157 | int iii = 0; | 154 | int iii = 0; |
158 | for ( iii = 0; iii < 5; ++iii ) { | 155 | for ( iii = 0; iii < 5; ++iii ) { |
@@ -343,9 +340,8 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
343 | qDebug("KO: Calendar loading time: %d ms",msNeeded ); | 340 | qDebug("KO: Calendar loading time: %d ms",msNeeded ); |
344 | 341 | ||
345 | if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) { | 342 | if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) { |
346 | KOPrefs::instance()->setAllDefaults(); | 343 | KOPrefs::instance()->setAllDefaults(); |
347 | int count = mView->addCategories(); | ||
348 | } | 344 | } |
349 | processIncidenceSelection( 0 ); | 345 | processIncidenceSelection( 0 ); |
350 | connect( mView, SIGNAL( incidenceSelected( Incidence * ) ), | 346 | connect( mView, SIGNAL( incidenceSelected( Incidence * ) ), |
351 | SLOT( processIncidenceSelection( Incidence * ) ) ); | 347 | SLOT( processIncidenceSelection( Incidence * ) ) ); |
@@ -1854,13 +1850,13 @@ void MainWindow::saveOnClose() | |||
1854 | else | 1850 | else |
1855 | p->mToolBarUpF = filterToolBar->x() > width()/2 ; | 1851 | p->mToolBarUpF = filterToolBar->x() > width()/2 ; |
1856 | } | 1852 | } |
1857 | #endif | 1853 | #endif |
1858 | |||
1859 | save(); | 1854 | save(); |
1860 | mView->writeSettings(); | 1855 | mView->writeSettings(); |
1856 | mView->checkSuspendAlarm(); | ||
1861 | } | 1857 | } |
1862 | void MainWindow::slotModifiedChanged( bool changed ) | 1858 | void MainWindow::slotModifiedChanged( bool ) |
1863 | { | 1859 | { |
1864 | if ( mBlockAtStartup ) | 1860 | if ( mBlockAtStartup ) |
1865 | return; | 1861 | return; |
1866 | 1862 | ||
@@ -1902,9 +1898,9 @@ void MainWindow::backupAllFiles() | |||
1902 | KopiCalendarFile * cal = calendars.first(); | 1898 | KopiCalendarFile * cal = calendars.first(); |
1903 | cal = calendars.next(); | 1899 | cal = calendars.next(); |
1904 | while ( cal ) { | 1900 | while ( cal ) { |
1905 | if ( !cal->mErrorOnLoad ) { | 1901 | if ( !cal->mErrorOnLoad ) { |
1906 | int retval = KApplication::createBackup( cal->mFileName, bupDir, KPimGlobalPrefs::instance()->mBackupNumbers ); | 1902 | KApplication::createBackup( cal->mFileName, bupDir, KPimGlobalPrefs::instance()->mBackupNumbers ); |
1907 | } | 1903 | } |
1908 | cal = calendars.next(); | 1904 | cal = calendars.next(); |
1909 | } | 1905 | } |
1910 | KOPrefs::instance()->mLastBackupDate = daysTo; | 1906 | KOPrefs::instance()->mLastBackupDate = daysTo; |
@@ -2407,12 +2403,11 @@ void MainWindow::importFile( QString fn, bool quick ) | |||
2407 | { | 2403 | { |
2408 | QFileInfo info; | 2404 | QFileInfo info; |
2409 | info.setFile( fn ); | 2405 | info.setFile( fn ); |
2410 | QString mess; | 2406 | QString mess; |
2411 | bool loadbup = true; | ||
2412 | if ( !info. exists() ) { | 2407 | if ( !info. exists() ) { |
2413 | mess = i18n("Import file \n...%1\ndoes not exist!\nNothing imported!\n").arg(fn.right( 30)); | 2408 | mess = i18n("Import file \n...%1\ndoes not exist!\nNothing imported!\n").arg(fn.right( 30)); |
2414 | int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"), | 2409 | QMessageBox::warning( this, i18n("KO/Pi: Warning!"), |
2415 | mess ); | 2410 | mess ); |
2416 | return; | 2411 | return; |
2417 | } | 2412 | } |
2418 | int result = 0; | 2413 | int result = 0; |
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 953774f..a948a52 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h | |||
@@ -35,9 +35,9 @@ using namespace KCal; | |||
35 | class MainWindow : public QMainWindow | 35 | class MainWindow : public QMainWindow |
36 | { | 36 | { |
37 | Q_OBJECT | 37 | Q_OBJECT |
38 | public: | 38 | public: |
39 | MainWindow( QWidget *parent = 0, const char *name = 0, QString command = ""); | 39 | MainWindow( QWidget *parent = 0, const char *name = 0 ); |
40 | ~MainWindow(); | 40 | ~MainWindow(); |
41 | bool beamReceiveEnabled(); | 41 | bool beamReceiveEnabled(); |
42 | static QString defaultFileName(); | 42 | static QString defaultFileName(); |
43 | static QString syncFileName(); | 43 | static QString syncFileName(); |