-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 8 | ||||
-rw-r--r-- | korganizer/koeditorgeneralevent.cpp | 27 | ||||
-rw-r--r-- | korganizer/koeditorrecurrence.cpp | 6 | ||||
-rw-r--r-- | korganizer/kotodoeditor.cpp | 1 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 3 |
5 files changed, 27 insertions, 18 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 7e7f8b7..b4e26c2 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -150,25 +150,25 @@ | |||
150 | { "Edit...","Bearbeite..." }, | 150 | { "Edit...","Bearbeite..." }, |
151 | { "Edit","Bearbeite" }, | 151 | { "Edit","Bearbeite" }, |
152 | { "Edit Event...","Bearbeite Termin..." }, | 152 | { "Edit Event...","Bearbeite Termin..." }, |
153 | { "Edit Event","Bearbeite Termin" }, | 153 | { "Edit Event","Bearbeite Termin" }, |
154 | { "Edit exceptions","Bearbeite Ausnahmen" }, | 154 | { "Edit exceptions","Bearbeite Ausnahmen" }, |
155 | { "EditorBox:","Editor Fenster:" }, | 155 | { "EditorBox:","Editor Fenster:" }, |
156 | { "Edit Recurrence Range","Bearbeite Wiederholung" }, | 156 | { "Edit Recurrence Range","Bearbeite Wiederholung" }, |
157 | { "Edit Todo...","Berabeite Todo..." }, | 157 | { "Edit Todo...","Berabeite Todo..." }, |
158 | { "Edit To-Do","Todo bearbeiten" }, | 158 | { "Edit To-Do","Todo bearbeiten" }, |
159 | { "E&mail address:","E&mail Adresse:" }, | 159 | { "E&mail address:","E&mail Adresse:" }, |
160 | { "(EmptyEmail)","(KeineEmail)" }, | 160 | { "(EmptyEmail)","(KeineEmail)" }, |
161 | { "(EmptyName)","(KeinName)" }, | 161 | { "(EmptyName)","(KeinName)" }, |
162 | { "Enable Recurrence","Wiederholender Termin" }, | 162 | { "Enable Recurrence","Wiederholung anschalten" }, |
163 | { "End after","Endet nach"}, | 163 | { "End after","Endet nach"}, |
164 | { "End by:","Endet am"}, | 164 | { "End by:","Endet am"}, |
165 | { "End Date","End Datum" }, | 165 | { "End Date","End Datum" }, |
166 | { "End:","Ende:" }, | 166 | { "End:","Ende:" }, |
167 | { "End Time","End Zeit" }, | 167 | { "End Time","End Zeit" }, |
168 | { "English","Englisch" }, | 168 | { "English","Englisch" }, |
169 | { "Event","Termin" }, | 169 | { "Event","Termin" }, |
170 | { "Event list","Termin Liste" }, | 170 | { "Event list","Termin Liste" }, |
171 | { "Events","Termine" }, | 171 | { "Events","Termine" }, |
172 | { "Event Viewer:","Termin Übersicht:" }, | 172 | { "Event Viewer:","Termin Übersicht:" }, |
173 | { "every","jede" }, | 173 | { "every","jede" }, |
174 | { "Exceptions...","Ausnahmen..." }, | 174 | { "Exceptions...","Ausnahmen..." }, |
@@ -1323,18 +1323,18 @@ | |||
1323 | { "<p><b>A+(shift or ctrl)</b>: Show occurence of next alarm</p>\n","<p><b>A+(shift oder ctrl)</b>: Zeige Zeit bis zum nächsten Alarm</p>\n" }, | 1323 | { "<p><b>A+(shift or ctrl)</b>: Show occurence of next alarm</p>\n","<p><b>A+(shift oder ctrl)</b>: Zeige Zeit bis zum nächsten Alarm</p>\n" }, |
1324 | { "<p><b>N</b>: Switch to next view which has a toolbar icon</p>\n","<p><b>N</b>: Wechsle zur nächsten Ansicht, die ein Icon in der Toolbar hat</p>\n" }, | 1324 | { "<p><b>N</b>: Switch to next view which has a toolbar icon</p>\n","<p><b>N</b>: Wechsle zur nächsten Ansicht, die ein Icon in der Toolbar hat</p>\n" }, |
1325 | { "%1d","%1t" }, | 1325 | { "%1d","%1t" }, |
1326 | { "%1h","%1std" }, | 1326 | { "%1h","%1std" }, |
1327 | { "%1min","%1min" }, | 1327 | { "%1min","%1min" }, |
1328 | { "( %1 before )","( %1 vorher )" }, | 1328 | { "( %1 before )","( %1 vorher )" }, |
1329 | { "The next alarm is in\nless than one minute!","Der nächste Alarm kommt in\nweniger als einer Minute!" }, | 1329 | { "The next alarm is in\nless than one minute!","Der nächste Alarm kommt in\nweniger als einer Minute!" }, |
1330 | { "\nThe internal alarm notification is disabled!\n","\nDie interne Alarmbenachrichtigung ist ausgeschaltet!\n" }, | 1330 | { "\nThe internal alarm notification is disabled!\n","\nDie interne Alarmbenachrichtigung ist ausgeschaltet!\n" }, |
1331 | { "Enable it in the settings menu, TAB alarm.","Schalten Sie sie an im Menu Einstellungen, TAB Alarm." }, | 1331 | { "Enable it in the settings menu, TAB alarm.","Schalten Sie sie an im Menu Einstellungen, TAB Alarm." }, |
1332 | { "Show Sync Events in WN+Agenda","Zeige Sync-Ereignisse in WN+Agenda" }, | 1332 | { "Show Sync Events in WN+Agenda","Zeige Sync-Ereignisse in WN+Agenda" }, |
1333 | { "Use short date in WN+Event view","Zeige Kurzdatum in WN+Terminanzeige" }, | 1333 | { "Use short date in WN+Event view","Zeige Kurzdatum in WN+Terminanzeige" }, |
1334 | { "Number of max.displayed todo prios:","Anzahl max.angezeigter Todo-Prios:" }, | 1334 | { "Number of max.displayed todo prios:","Anzahl max.angezeigter Todo-Prios:" }, |
1335 | { "","" }, | 1335 | { " on "," am " }, |
1336 | { "","" }, | 1336 | { "On: ","Am: " }, |
1337 | { "","" }, | 1337 | { "<i>The recurrence is computed from the start datetime!</i>","<i>Die Wiederholung wird vom Startwert aus berechnet!</i>" }, |
1338 | { "","" }, | 1338 | { "","" }, |
1339 | { "","" }, | 1339 | { "","" }, |
1340 | { "","" }, | 1340 | { "","" }, |
diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp index 2a49528..d4aa78c 100644 --- a/korganizer/koeditorgeneralevent.cpp +++ b/korganizer/koeditorgeneralevent.cpp | |||
@@ -367,38 +367,45 @@ void KOEditorGeneralEvent::setDuration() | |||
367 | catStr = i18n("1 min","%n min",minutediff); | 367 | catStr = i18n("1 min","%n min",minutediff); |
368 | tmpStr += catStr; | 368 | tmpStr += catStr; |
369 | } | 369 | } |
370 | } else tmpStr = ""; | 370 | } else tmpStr = ""; |
371 | } | 371 | } |
372 | } | 372 | } |
373 | mDurationLabel->setText(tmpStr); | 373 | mDurationLabel->setText(tmpStr); |
374 | } | 374 | } |
375 | 375 | ||
376 | void KOEditorGeneralEvent::emitDateTimeStr() | 376 | void KOEditorGeneralEvent::emitDateTimeStr() |
377 | { | 377 | { |
378 | KLocale *l = KGlobal::locale(); | 378 | KLocale *l = KGlobal::locale(); |
379 | QString startString = ""; | ||
380 | if ( mCurrStartDateTime.date() < mCurrEndDateTime.date() ) { | ||
381 | if ( mNoTimeButton->isChecked() ) { | ||
382 | startString = i18n("From: ") + l->formatDate(mCurrStartDateTime.date() ); | ||
383 | startString += "\n"+i18n("To: ")+ l->formatDate(mCurrEndDateTime.date()); | ||
379 | 384 | ||
380 | QString from,to; | 385 | } else { |
386 | startString = i18n("From: ") +l->formatDateTime(mCurrStartDateTime, false); | ||
387 | startString += "\n"+i18n("To: ")+l->formatDateTime(mCurrEndDateTime, false); | ||
388 | } | ||
389 | } else { | ||
381 | if (mNoTimeButton->isChecked()) { | 390 | if (mNoTimeButton->isChecked()) { |
382 | from = l->formatDate(mCurrStartDateTime.date()); | 391 | startString = i18n("On: ") + l->formatDate(mCurrStartDateTime.date() ); |
383 | to = l->formatDate(mCurrEndDateTime.date()); | ||
384 | } else { | 392 | } else { |
385 | from = l->formatDateTime(mCurrStartDateTime); | 393 | startString = i18n("From: ") + KGlobal::locale()->formatTime(mCurrStartDateTime.time())+ |
386 | to = l->formatDateTime(mCurrEndDateTime); | 394 | "-"+KGlobal::locale()->formatTime(mCurrEndDateTime.time()); |
395 | startString += i18n(" on ")+KGlobal::locale()->formatDate( mCurrStartDateTime.date(), true); | ||
387 | } | 396 | } |
388 | 397 | } | |
389 | QString str = i18n("From: %1 To: %2 %3").arg(from).arg(to) | 398 | startString +="\n"+mDurationLabel->text(); |
390 | .arg(mDurationLabel->text()); | 399 | emit dateTimeStrChanged(startString); |
391 | |||
392 | emit dateTimeStrChanged(str); | ||
393 | } | 400 | } |
394 | 401 | ||
395 | bool KOEditorGeneralEvent::validateInput() | 402 | bool KOEditorGeneralEvent::validateInput() |
396 | { | 403 | { |
397 | 404 | ||
398 | if (!mStartDateEdit->inputIsValid()) { | 405 | if (!mStartDateEdit->inputIsValid()) { |
399 | KMessageBox::sorry( 0, | 406 | KMessageBox::sorry( 0, |
400 | i18n("Please specify a valid start date,\nfor example '%1'.") | 407 | i18n("Please specify a valid start date,\nfor example '%1'.") |
401 | .arg( KGlobal::locale()->formatDate( QDate::currentDate(), true ) ) ); | 408 | .arg( KGlobal::locale()->formatDate( QDate::currentDate(), true ) ) ); |
402 | return false; | 409 | return false; |
403 | } | 410 | } |
404 | 411 | ||
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index bf81b01..01c5773 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp | |||
@@ -720,41 +720,41 @@ KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) : | |||
720 | QWidget( parent, name ) | 720 | QWidget( parent, name ) |
721 | { | 721 | { |
722 | QGridLayout *topLayout = new QGridLayout( this, 2,2 ); | 722 | QGridLayout *topLayout = new QGridLayout( this, 2,2 ); |
723 | topLayout->setSpacing( KDialog::spacingHint() ); | 723 | topLayout->setSpacing( KDialog::spacingHint() ); |
724 | topLayout->setMargin( KDialog::marginHintSmall() ); | 724 | topLayout->setMargin( KDialog::marginHintSmall() ); |
725 | 725 | ||
726 | mEnabledCheck = new QCheckBox( i18n("Enable Recurrence"), this ); | 726 | mEnabledCheck = new QCheckBox( i18n("Enable Recurrence"), this ); |
727 | connect( mEnabledCheck, SIGNAL( toggled( bool ) ), | 727 | connect( mEnabledCheck, SIGNAL( toggled( bool ) ), |
728 | SLOT( setEnabled( bool ) ) ); | 728 | SLOT( setEnabled( bool ) ) ); |
729 | topLayout->addMultiCellWidget( mEnabledCheck, 0, 0, 0, 1 ); | 729 | topLayout->addMultiCellWidget( mEnabledCheck, 0, 0, 0, 1 ); |
730 | 730 | ||
731 | 731 | ||
732 | mTimeGroupBox = new QGroupBox( 1, Horizontal, i18n("Appointment Time "), | 732 | mTimeGroupBox = new QGroupBox( 1, Horizontal, i18n("Time"), |
733 | this ); | 733 | this ); |
734 | topLayout->addMultiCellWidget( mTimeGroupBox, 1, 1 , 0 , 1 ); | 734 | topLayout->addMultiCellWidget( mTimeGroupBox, 1, 1 , 0 , 1 ); |
735 | 735 | ||
736 | if ( QApplication::desktop()->width() <= 320) { | 736 | if ( QApplication::desktop()->width() <= 320) { |
737 | mTimeGroupBox->hide(); | 737 | mTimeGroupBox->hide(); |
738 | } | 738 | } |
739 | 739 | ||
740 | // QFrame *timeFrame = new QFrame( mTimeGroupBox ); | 740 | // QFrame *timeFrame = new QFrame( mTimeGroupBox ); |
741 | // QBoxLayout *layoutTimeFrame = new QHBoxLayout( timeFrame ); | 741 | // QBoxLayout *layoutTimeFrame = new QHBoxLayout( timeFrame ); |
742 | // layoutTimeFrame->setSpacing( KDialog::spacingHint() ); | 742 | // layoutTimeFrame->setSpacing( KDialog::spacingHint() ); |
743 | 743 | ||
744 | mDateTimeLabel = new QLabel( mTimeGroupBox ); | 744 | mDateTimeLabel = new QLabel( mTimeGroupBox ); |
745 | // mDateTimeLabel = new QLabel( timeFrame ); | 745 | // mDateTimeLabel = new QLabel( timeFrame ); |
746 | // layoutTimeFrame->addWidget( mDateTimeLabel ); | 746 | // layoutTimeFrame->addWidget( mDateTimeLabel ); |
747 | 747 | //mTimeGroupBox->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum ) ); | |
748 | 748 | //mDateTimeLabel->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum) ); | |
749 | mRuleBox = new QGroupBox( 1, Horizontal, i18n("Recurrence Rule"), this ); | 749 | mRuleBox = new QGroupBox( 1, Horizontal, i18n("Recurrence Rule"), this ); |
750 | topLayout->addMultiCellWidget( mRuleBox, 2, 2, 0, 1 ); | 750 | topLayout->addMultiCellWidget( mRuleBox, 2, 2, 0, 1 ); |
751 | mRecurrenceChooser = new RecurrenceChooser( mRuleBox ); | 751 | mRecurrenceChooser = new RecurrenceChooser( mRuleBox ); |
752 | connect( mRecurrenceChooser, SIGNAL( chosen( int ) ), | 752 | connect( mRecurrenceChooser, SIGNAL( chosen( int ) ), |
753 | SLOT( showCurrentRule( int ) ) ); | 753 | SLOT( showCurrentRule( int ) ) ); |
754 | 754 | ||
755 | 755 | ||
756 | mRuleStack = new QWidgetStack( mRuleBox ); | 756 | mRuleStack = new QWidgetStack( mRuleBox ); |
757 | 757 | ||
758 | mDaily = new RecurDaily( mRuleStack ); | 758 | mDaily = new RecurDaily( mRuleStack ); |
759 | mRuleStack->addWidget( mDaily, 0 ); | 759 | mRuleStack->addWidget( mDaily, 0 ); |
760 | 760 | ||
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp index 51e2524..6a05cc8 100644 --- a/korganizer/kotodoeditor.cpp +++ b/korganizer/kotodoeditor.cpp | |||
@@ -63,24 +63,25 @@ KOTodoEditor::KOTodoEditor( Calendar *calendar, QWidget *parent ) : | |||
63 | 63 | ||
64 | KOTodoEditor::~KOTodoEditor() | 64 | KOTodoEditor::~KOTodoEditor() |
65 | { | 65 | { |
66 | emit dialogClose( mTodo ); | 66 | emit dialogClose( mTodo ); |
67 | } | 67 | } |
68 | 68 | ||
69 | void KOTodoEditor::init() | 69 | void KOTodoEditor::init() |
70 | { | 70 | { |
71 | setupGeneral(); | 71 | setupGeneral(); |
72 | setupAttendeesTab(); | 72 | setupAttendeesTab(); |
73 | setupRecurrence(); | 73 | setupRecurrence(); |
74 | connect(mGeneral,SIGNAL(datesChecked()),this ,SLOT(checkRecurrence())); | 74 | connect(mGeneral,SIGNAL(datesChecked()),this ,SLOT(checkRecurrence())); |
75 | mRecurrence->setDateTimeStr( i18n("<i>The recurrence is computed from the start datetime!</i>") ); | ||
75 | } | 76 | } |
76 | void KOTodoEditor::setupRecurrence() | 77 | void KOTodoEditor::setupRecurrence() |
77 | { | 78 | { |
78 | QFrame *topFrame = addPage( i18n("Recurrence") ); | 79 | QFrame *topFrame = addPage( i18n("Recurrence") ); |
79 | QBoxLayout *topLayout = new QVBoxLayout( topFrame ); | 80 | QBoxLayout *topLayout = new QVBoxLayout( topFrame ); |
80 | 81 | ||
81 | mRecurrence = new KOEditorRecurrence( topFrame ); | 82 | mRecurrence = new KOEditorRecurrence( topFrame ); |
82 | topLayout->addWidget( mRecurrence ); | 83 | topLayout->addWidget( mRecurrence ); |
83 | } | 84 | } |
84 | 85 | ||
85 | void KOTodoEditor::setCategories( QString s ) | 86 | void KOTodoEditor::setCategories( QString s ) |
86 | { | 87 | { |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 94f4677..ffc4d9a 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1578,25 +1578,26 @@ void MainWindow::processIncidenceSelection( Incidence *incidence ) | |||
1578 | startString += " --- "+((Event*)incidence)->dtEndDateStr( true ); | 1578 | startString += " --- "+((Event*)incidence)->dtEndDateStr( true ); |
1579 | 1579 | ||
1580 | } else { | 1580 | } else { |
1581 | startString = ": "+incidence->dtStartStr(true); | 1581 | startString = ": "+incidence->dtStartStr(true); |
1582 | startString += " --- "+((Event*)incidence)->dtEndStr(true); | 1582 | startString += " --- "+((Event*)incidence)->dtEndStr(true); |
1583 | 1583 | ||
1584 | } | 1584 | } |
1585 | 1585 | ||
1586 | } else { | 1586 | } else { |
1587 | if ( incidence->dtStart().time() != incidence->dtEnd().time() ) | 1587 | if ( incidence->dtStart().time() != incidence->dtEnd().time() ) |
1588 | startString = ": "+KGlobal::locale()->formatTime(incidence->dtStart().time())+ | 1588 | startString = ": "+KGlobal::locale()->formatTime(incidence->dtStart().time())+ |
1589 | "-"+KGlobal::locale()->formatTime(incidence->dtEnd().time()); | 1589 | "-"+KGlobal::locale()->formatTime(incidence->dtEnd().time()); |
1590 | if ( incidence->categories().contains( i18n("Birthday") ) || incidence->categories().contains( i18n("Anniversary") ) ) { | 1590 | |
1591 | if ( incidence->isBirthday() || incidence->isAnniversary() ) { | ||
1591 | bool ok; | 1592 | bool ok; |
1592 | QDateTime noc = incidence->getNextOccurence( mView->startDate().addDays(-1), &ok ); | 1593 | QDateTime noc = incidence->getNextOccurence( mView->startDate().addDays(-1), &ok ); |
1593 | if ( ok ) { | 1594 | if ( ok ) { |
1594 | int years = noc.date().year() - incidence->dtStart().date().year(); | 1595 | int years = noc.date().year() - incidence->dtStart().date().year(); |
1595 | startString += i18n(" (%1 y.)"). arg( years ); | 1596 | startString += i18n(" (%1 y.)"). arg( years ); |
1596 | } | 1597 | } |
1597 | } | 1598 | } |
1598 | else | 1599 | else |
1599 | startString +=" "+KGlobal::locale()->formatDate( incidence->dtStart().date(), true); | 1600 | startString +=" "+KGlobal::locale()->formatDate( incidence->dtStart().date(), true); |
1600 | } | 1601 | } |
1601 | 1602 | ||
1602 | } | 1603 | } |