-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 2 | ||||
-rw-r--r-- | bin/kdepim/korganizer/today_small.png | bin | 797 -> 827 bytes | |||
-rw-r--r-- | korganizer/kotodoview.cpp | 12 |
3 files changed, 9 insertions, 5 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index cb92677..bcc23dc 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -81,25 +81,24 @@ | |||
81 | { " - both are modified after last sync"," - beide wurden nach der letzten Syncronisation verändert" }, | 81 | { " - both are modified after last sync"," - beide wurden nach der letzten Syncronisation verändert" }, |
82 | { "Busy","Belegt" }, | 82 | { "Busy","Belegt" }, |
83 | { "&Cancel","Abbre&chen" }, | 83 | { "&Cancel","Abbre&chen" }, |
84 | { "Cancel","Abbrechen" }, | 84 | { "Cancel","Abbrechen" }, |
85 | { "Cannot delete To-Do\nwhich has children.","Kann Todo nicht löschen,\n da noch Einträge vorhanden sind" }, | 85 | { "Cannot delete To-Do\nwhich has children.","Kann Todo nicht löschen,\n da noch Einträge vorhanden sind" }, |
86 | { "Can't generate mail:\nNo event selected.","Kann e-Mail nicht erstellen:\nKein Termin ausgewählt." }, | 86 | { "Can't generate mail:\nNo event selected.","Kann e-Mail nicht erstellen:\nKein Termin ausgewählt." }, |
87 | { "Categories...","Kategorien..." }, | 87 | { "Categories...","Kategorien..." }, |
88 | { "Categories","Kategorien" }, | 88 | { "Categories","Kategorien" }, |
89 | { "Category","Kategorie" }, | 89 | { "Category","Kategorie" }, |
90 | { "Center View","Zentriere Ansicht" }, | 90 | { "Center View","Zentriere Ansicht" }, |
91 | { "Change","Ändere" }, | 91 | { "Change","Ändere" }, |
92 | { "Cinema","Kino" }, | 92 | { "Cinema","Kino" }, |
93 | { "Click to add a new Todo","Hier klicken, um ein neues Todo anzulegen" }, | ||
94 | { "Clone Item","Klone Eintrag" }, | 93 | { "Clone Item","Klone Eintrag" }, |
95 | { "&Close","S&chließen" }, | 94 | { "&Close","S&chließen" }, |
96 | { "Close","Schließen" }, | 95 | { "Close","Schließen" }, |
97 | { "Close this dialog to abort deletion!","Zum Abbrechen des Löschvorganges Dialog schließen!" }, | 96 | { "Close this dialog to abort deletion!","Zum Abbrechen des Löschvorganges Dialog schließen!" }, |
98 | { "Colors","Farben" }, | 97 | { "Colors","Farben" }, |
99 | { "completed","erledigt" }, | 98 | { "completed","erledigt" }, |
100 | { "completed on %1","erledigt am %1" }, | 99 | { "completed on %1","erledigt am %1" }, |
101 | { "Complete","Erledigt" }, | 100 | { "Complete","Erledigt" }, |
102 | { "Confidential","Vertraulich" }, | 101 | { "Confidential","Vertraulich" }, |
103 | { "Configure...","Einstellungen..." }, | 102 | { "Configure...","Einstellungen..." }, |
104 | { "Confirm &deletes","Löschvogang bestätigen" }, | 103 | { "Confirm &deletes","Löschvogang bestätigen" }, |
105 | { "Couldn't load calendar\n '%1'.","Kann Kalender\n '%1' nicht laden." }, | 104 | { "Couldn't load calendar\n '%1'.","Kann Kalender\n '%1' nicht laden." }, |
@@ -1485,22 +1484,23 @@ | |||
1485 | { "Do you want to <b>add</b> categories to the selected items or <b>reset</b> the list (i.e. remove current categories)?","Möchten Sie Kategorien zu den ausgewählten Einträgen <b>hinzufügen</b> oder die Liste <b>neu setzen</b> (d.h. vorhandene Kategorien löschen)?" }, | 1484 | { "Do you want to <b>add</b> categories to the selected items or <b>reset</b> the list (i.e. remove current categories)?","Möchten Sie Kategorien zu den ausgewählten Einträgen <b>hinzufügen</b> oder die Liste <b>neu setzen</b> (d.h. vorhandene Kategorien löschen)?" }, |
1486 | { "The file\n%1\ndoes not exist!\nShall I create it for you?","Die Datei\n%1\nexistiert nicht!\nSoll sie neu angelegt werden?" }, | 1485 | { "The file\n%1\ndoes not exist!\nShall I create it for you?","Die Datei\n%1\nexistiert nicht!\nSoll sie neu angelegt werden?" }, |
1487 | { "Sorry, cannot create the file\n%1!\nNo calendar added!","Kann leider die Datei\n%1\nnicht anlegen!\nKein Kalender hinzugefügt!" }, | 1486 | { "Sorry, cannot create the file\n%1!\nNo calendar added!","Kann leider die Datei\n%1\nnicht anlegen!\nKein Kalender hinzugefügt!" }, |
1488 | { "\nNO\n WRITEABLE\n CALENDAR\n FOUND!\n\nPlease fix your calendar settings!\n","\nKEIN\n SCHREIBBARER\n KALENDER\n GEFUNDEN!\n\nBitte korrigieren Sie\nihre Kalendereinstellungen!\n" }, | 1487 | { "\nNO\n WRITEABLE\n CALENDAR\n FOUND!\n\nPlease fix your calendar settings!\n","\nKEIN\n SCHREIBBARER\n KALENDER\n GEFUNDEN!\n\nBitte korrigieren Sie\nihre Kalendereinstellungen!\n" }, |
1489 | { "\nThe file\n%1\non disk has changed!\nFile size: %2 bytes.\nLast modified: %3\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n","\nDie Datei\n%1\nwurde verändert!\nDatei Grösse: %2 Bytes.\nZuletzt geändert: %3\nMöchten Sie:\n\n - Speichern und die Datei überschreiben?\n - Mit Datei Synchronisieren, dann speichern?\n - Abbrechen ohne zu speichern? \n" }, | 1488 | { "\nThe file\n%1\non disk has changed!\nFile size: %2 bytes.\nLast modified: %3\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n","\nDie Datei\n%1\nwurde verändert!\nDatei Grösse: %2 Bytes.\nZuletzt geändert: %3\nMöchten Sie:\n\n - Speichern und die Datei überschreiben?\n - Mit Datei Synchronisieren, dann speichern?\n - Abbrechen ohne zu speichern? \n" }, |
1490 | { "Edit","Edit" }, | 1489 | { "Edit","Edit" }, |
1491 | { "Last Modified","Zuletzt geändert" }, | 1490 | { "Last Modified","Zuletzt geändert" }, |
1492 | { "Journal viewer","Journal Anzeige" }, | 1491 | { "Journal viewer","Journal Anzeige" }, |
1493 | { "Configure Calendar Files...","Konfiguriere Kalenderdateien..." }, | 1492 | { "Configure Calendar Files...","Konfiguriere Kalenderdateien..." }, |
1494 | { "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>.","Sie können <b>mehr als eine</b> Kalenderdatei in KO/Pi darstellen und benutzen. Eine Kalenderdatei wird <b>Resource</b> genannt. Um einen Kalender hinzuzufügen oder die Kalendereinstellungen zu ändern benutzen Sie bitte das Menu: <b>Ansicht -> Resourcenansicht umschalten</b>." }, | 1493 | { "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>.","Sie können <b>mehr als eine</b> Kalenderdatei in KO/Pi darstellen und benutzen. Eine Kalenderdatei wird <b>Resource</b> genannt. Um einen Kalender hinzuzufügen oder die Kalendereinstellungen zu ändern benutzen Sie bitte das Menu: <b>Ansicht -> Resourcenansicht umschalten</b>." }, |
1495 | { "Hide Completed","Verstecke erledigte Todos" }, | 1494 | { "Hide Completed","Verstecke erledigte Todos" }, |
1496 | { "Show not Running","Zeige nicht Laufende" }, | 1495 | { "Show not Running","Zeige nicht Laufende" }, |
1496 | { "Click to add new Todo","Klick für neues Todo!" }, | ||
1497 | { "","" }, | 1497 | { "","" }, |
1498 | { "","" }, | 1498 | { "","" }, |
1499 | { "","" }, | 1499 | { "","" }, |
1500 | { "","" }, | 1500 | { "","" }, |
1501 | { "","" }, | 1501 | { "","" }, |
1502 | { "","" }, | 1502 | { "","" }, |
1503 | { "","" }, | 1503 | { "","" }, |
1504 | 1504 | ||
1505 | 1505 | ||
1506 | 1506 | ||
diff --git a/bin/kdepim/korganizer/today_small.png b/bin/kdepim/korganizer/today_small.png index fcc4ac2..3d2979f 100644 --- a/bin/kdepim/korganizer/today_small.png +++ b/bin/kdepim/korganizer/today_small.png | |||
Binary files differ | |||
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index 06d40b1..2c017e1 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp | |||
@@ -467,37 +467,37 @@ void KOTodoListView::contentsMouseDoubleClickEvent(QMouseEvent *e) | |||
467 | 467 | ||
468 | emit double_Clicked(item); | 468 | emit double_Clicked(item); |
469 | if (!item) return; | 469 | if (!item) return; |
470 | 470 | ||
471 | emit doubleClicked(item,vp,0); | 471 | emit doubleClicked(item,vp,0); |
472 | } | 472 | } |
473 | 473 | ||
474 | ///////////////////////////////////////////////////////////////////////////// | 474 | ///////////////////////////////////////////////////////////////////////////// |
475 | 475 | ||
476 | KOQuickTodo::KOQuickTodo(QWidget *parent) : | 476 | KOQuickTodo::KOQuickTodo(QWidget *parent) : |
477 | QLineEdit(parent) | 477 | QLineEdit(parent) |
478 | { | 478 | { |
479 | setText(i18n("Click to add a new Todo")); | 479 | setText(i18n("Click to add new Todo")); |
480 | } | 480 | } |
481 | 481 | ||
482 | void KOQuickTodo::focusInEvent(QFocusEvent *ev) | 482 | void KOQuickTodo::focusInEvent(QFocusEvent *ev) |
483 | { | 483 | { |
484 | if ( text()==i18n("Click to add a new Todo") ) | 484 | if ( text()==i18n("Click to add new Todo") ) |
485 | setText(""); | 485 | setText(""); |
486 | QLineEdit::focusInEvent(ev); | 486 | QLineEdit::focusInEvent(ev); |
487 | } | 487 | } |
488 | 488 | ||
489 | void KOQuickTodo::focusOutEvent(QFocusEvent *ev) | 489 | void KOQuickTodo::focusOutEvent(QFocusEvent *ev) |
490 | { | 490 | { |
491 | setText(i18n("Click to add a new Todo")); | 491 | setText(i18n("Click to add new Todo")); |
492 | QLineEdit::focusOutEvent(ev); | 492 | QLineEdit::focusOutEvent(ev); |
493 | } | 493 | } |
494 | 494 | ||
495 | ///////////////////////////////////////////////////////////////////////////// | 495 | ///////////////////////////////////////////////////////////////////////////// |
496 | 496 | ||
497 | KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : | 497 | KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : |
498 | KOrg::BaseView(calendar,parent,name) | 498 | KOrg::BaseView(calendar,parent,name) |
499 | { | 499 | { |
500 | mCategoryPopupMenu = 0; | 500 | mCategoryPopupMenu = 0; |
501 | mPendingUpdateBeforeRepaint = false; | 501 | mPendingUpdateBeforeRepaint = false; |
502 | isFlatDisplay = false; | 502 | isFlatDisplay = false; |
503 | mNavigator = 0; | 503 | mNavigator = 0; |
@@ -514,28 +514,32 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : | |||
514 | int fixwid = flat->sizeHint().height(); | 514 | int fixwid = flat->sizeHint().height(); |
515 | if ( QApplication::desktop()->width() > 320 ) | 515 | if ( QApplication::desktop()->width() > 320 ) |
516 | fixwid *= 2; | 516 | fixwid *= 2; |
517 | flat->setFixedWidth( fixwid ); | 517 | flat->setFixedWidth( fixwid ); |
518 | connect ( flat, SIGNAL ( clicked()), SLOT ( setAllFlat())); | 518 | connect ( flat, SIGNAL ( clicked()), SLOT ( setAllFlat())); |
519 | QPushButton * allopen = new QPushButton( "O",mQuickBar ); | 519 | QPushButton * allopen = new QPushButton( "O",mQuickBar ); |
520 | allopen->setFixedWidth( fixwid ); | 520 | allopen->setFixedWidth( fixwid ); |
521 | connect ( allopen, SIGNAL ( clicked()), SLOT ( setAllOpen())); | 521 | connect ( allopen, SIGNAL ( clicked()), SLOT ( setAllOpen())); |
522 | QPushButton * allclose = new QPushButton( "C",mQuickBar ); | 522 | QPushButton * allclose = new QPushButton( "C",mQuickBar ); |
523 | allclose->setFixedWidth( fixwid ); | 523 | allclose->setFixedWidth( fixwid ); |
524 | connect ( allclose, SIGNAL ( clicked()), SLOT ( setAllClose())); | 524 | connect ( allclose, SIGNAL ( clicked()), SLOT ( setAllClose())); |
525 | QPushButton * s_done = new QPushButton( "D",mQuickBar ); | 525 | QPushButton * s_done = new QPushButton( "D",mQuickBar ); |
526 | s_done->setPixmap( SmallIcon("greenhook16")); | ||
526 | s_done->setFixedWidth( fixwid ); | 527 | s_done->setFixedWidth( fixwid ); |
528 | s_done->setFixedHeight( flat->sizeHint().height() ); | ||
527 | connect ( s_done, SIGNAL ( clicked()), SLOT ( toggleCompleted())); | 529 | connect ( s_done, SIGNAL ( clicked()), SLOT ( toggleCompleted())); |
528 | QPushButton * s_run = new QPushButton( "R",mQuickBar ); | 530 | QPushButton * s_run = new QPushButton( "R",mQuickBar ); |
531 | s_run->setPixmap( SmallIcon("ko16old")); | ||
529 | s_run->setFixedWidth( fixwid ); | 532 | s_run->setFixedWidth( fixwid ); |
533 | s_run->setFixedHeight( flat->sizeHint().height() ); | ||
530 | connect ( s_run, SIGNAL ( clicked()), SLOT ( toggleRunning())); | 534 | connect ( s_run, SIGNAL ( clicked()), SLOT ( toggleRunning())); |
531 | 535 | ||
532 | mNewSubBut = new QPushButton( "sub",mQuickBar ); | 536 | mNewSubBut = new QPushButton( "sub",mQuickBar ); |
533 | mNewSubBut->setFixedWidth( fixwid*3/2 ); | 537 | mNewSubBut->setFixedWidth( fixwid*3/2 ); |
534 | connect ( mNewSubBut, SIGNAL ( clicked()), SLOT ( newSubTodo())); | 538 | connect ( mNewSubBut, SIGNAL ( clicked()), SLOT ( newSubTodo())); |
535 | mNewSubBut->setEnabled( false ); | 539 | mNewSubBut->setEnabled( false ); |
536 | quickLayout->addWidget( mNewSubBut ); | 540 | quickLayout->addWidget( mNewSubBut ); |
537 | quickLayout->addWidget( s_done ); | 541 | quickLayout->addWidget( s_done ); |
538 | quickLayout->addWidget( s_run ); | 542 | quickLayout->addWidget( s_run ); |
539 | 543 | ||
540 | quickLayout->addWidget( allopen ); | 544 | quickLayout->addWidget( allopen ); |
541 | quickLayout->addWidget( allclose ); | 545 | quickLayout->addWidget( allclose ); |
@@ -1109,25 +1113,25 @@ void KOTodoView::popupMenu(QListViewItem *item,const QPoint &p,int column) | |||
1109 | } | 1113 | } |
1110 | } else mPopupMenu->popup(QCursor::pos()); | 1114 | } else mPopupMenu->popup(QCursor::pos()); |
1111 | } | 1115 | } |
1112 | void KOTodoView::newTodo() | 1116 | void KOTodoView::newTodo() |
1113 | { | 1117 | { |
1114 | emit newTodoSignal(); | 1118 | emit newTodoSignal(); |
1115 | } | 1119 | } |
1116 | 1120 | ||
1117 | void KOTodoView::newSubTodo() | 1121 | void KOTodoView::newSubTodo() |
1118 | { | 1122 | { |
1119 | mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem(); | 1123 | mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem(); |
1120 | if (mActiveItem) { | 1124 | if (mActiveItem) { |
1121 | if ( mQuickAdd->isVisible() && !mQuickAdd->text().isEmpty() && mQuickAdd->text() != i18n("Click to add a new Todo") ) { | 1125 | if ( mQuickAdd->isVisible() && !mQuickAdd->text().isEmpty() && mQuickAdd->text() != i18n("Click to add new Todo") ) { |
1122 | addQuickTodoPar( mActiveItem->todo()); | 1126 | addQuickTodoPar( mActiveItem->todo()); |
1123 | } else | 1127 | } else |
1124 | emit newSubTodoSignal(mActiveItem->todo()); | 1128 | emit newSubTodoSignal(mActiveItem->todo()); |
1125 | } | 1129 | } |
1126 | } | 1130 | } |
1127 | void KOTodoView::unparentTodo() | 1131 | void KOTodoView::unparentTodo() |
1128 | { | 1132 | { |
1129 | if (mActiveItem) { | 1133 | if (mActiveItem) { |
1130 | emit unparentTodoSignal(mActiveItem->todo()); | 1134 | emit unparentTodoSignal(mActiveItem->todo()); |
1131 | } | 1135 | } |
1132 | } | 1136 | } |
1133 | 1137 | ||