author | zautrix <zautrix> | 2005-03-17 10:00:03 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-17 10:00:03 (UTC) |
commit | a1ae8a0c130aef01923b9a00c95919e0a9fea9d7 (patch) (unidiff) | |
tree | 09988c640bb71db2677dff6155cae0a6f027d194 | |
parent | e0a510893ffcddb8d58f785832622d030900b2f9 (diff) | |
download | kdepimpi-a1ae8a0c130aef01923b9a00c95919e0a9fea9d7.zip kdepimpi-a1ae8a0c130aef01923b9a00c95919e0a9fea9d7.tar.gz kdepimpi-a1ae8a0c130aef01923b9a00c95919e0a9fea9d7.tar.bz2 |
small kapi fixes
-rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 2 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index 5335f47..a3d465f 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt | |||
@@ -701,57 +701,57 @@ | |||
701 | { "Profile kind specific settings","Profil Art abhängige Einstellungen" }, | 701 | { "Profile kind specific settings","Profil Art abhängige Einstellungen" }, |
702 | { "Local temp file:","Lokale temp Datei:" }, | 702 | { "Local temp file:","Lokale temp Datei:" }, |
703 | { "Multiple profiles with same name!\nPlease use unique profile names!","Mehrere Profile mit demselben Namen!\nBitte verschiedene Namen benutzen!" }, | 703 | { "Multiple profiles with same name!\nPlease use unique profile names!","Mehrere Profile mit demselben Namen!\nBitte verschiedene Namen benutzen!" }, |
704 | { "Aborted! Nothing synced!","Abgebrochen! Nichts wurde gesynct!" }, | 704 | { "Aborted! Nothing synced!","Abgebrochen! Nichts wurde gesynct!" }, |
705 | { "You cannot remove your standard resource!\n Please select a new standard resource first.","Standard Resource kann\nnicht entfernt werden!\nBitte eine andere Resource\nals Standard setzen." }, | 705 | { "You cannot remove your standard resource!\n Please select a new standard resource first.","Standard Resource kann\nnicht entfernt werden!\nBitte eine andere Resource\nals Standard setzen." }, |
706 | { "Sorry","Tut mir leid" }, | 706 | { "Sorry","Tut mir leid" }, |
707 | { "You cannot use a read-only<br> resource as standard!","Man kann nicht eine read-only<br> Resource als Standard setzen!" }, | 707 | { "You cannot use a read-only<br> resource as standard!","Man kann nicht eine read-only<br> Resource als Standard setzen!" }, |
708 | { "Please restart to get the \nchanged resources (re)loaded!\n","Bitte starten Sie jetzt\ndas Programm neu, um die geänderten\nResourcen neu zu laden!\n" }, | 708 | { "Please restart to get the \nchanged resources (re)loaded!\n","Bitte starten Sie jetzt\ndas Programm neu, um die geänderten\nResourcen neu zu laden!\n" }, |
709 | { "The selected file does not\ninclude a valid vCard.\nPlease check the file and try again.\n","Die gewählte Datei enthält\nkeine gültige vCard.\nBitte prüfen Sie die Datei\nund versuchen es erneut.\n" }, | 709 | { "The selected file does not\ninclude a valid vCard.\nPlease check the file and try again.\n","Die gewählte Datei enthält\nkeine gültige vCard.\nBitte prüfen Sie die Datei\nund versuchen es erneut.\n" }, |
710 | { "Unable to load resource '%1'","Resource kann nicht geladen werden: '%1'" }, | 710 | { "Unable to load resource '%1'","Resource kann nicht geladen werden: '%1'" }, |
711 | { "Some changes are only\neffective after a restart!\n","Einige Änderungen werden erst\nnach einem Neustart übernommen!\n" }, | 711 | { "Some changes are only\neffective after a restart!\n","Einige Änderungen werden erst\nnach einem Neustart übernommen!\n" }, |
712 | { "Syncing aborted. Nothing synced.","Syncing abgebrochen.Nichts wurde gesynct." }, | 712 | { "Syncing aborted. Nothing synced.","Syncing abgebrochen.Nichts wurde gesynct." }, |
713 | { "Connected! Sending request for remote file ...","Verbunden! Sende Daten Anfrage..." }, | 713 | { "Connected! Sending request for remote file ...","Verbunden! Sende Daten Anfrage..." }, |
714 | { "Trying to connect to remote...","Versuche mit Gegenstelle zu verbinden..." }, | 714 | { "Trying to connect to remote...","Versuche mit Gegenstelle zu verbinden..." }, |
715 | { "Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host?","Verbindungsversuch wegen\nZeitüberschreitung gescheitert!\nWurde vergessen Pi-Sync auf\nder Gegenstelle anzuschalten?" }, | 715 | { "Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host?","Verbindungsversuch wegen\nZeitüberschreitung gescheitert!\nWurde vergessen Pi-Sync auf\nder Gegenstelle anzuschalten?" }, |
716 | { "ERROR: Receiving remote file failed.","FEHLER: Empfang der entfernten Daten fehlgeschlagen." }, | 716 | { "ERROR: Receiving remote file failed.","FEHLER: Empfang der entfernten Daten fehlgeschlagen." }, |
717 | { "Error","Fehler" }, | 717 | { "Error","Fehler" }, |
718 | { ""You entered an invalid date!\n Date changed to current date.","Ungültiges Datum eingegeben.\nSetze heutiges Datum." }, | 718 | { ""You entered an invalid date!\n Date changed to current date.","Ungültiges Datum eingegeben.\nSetze heutiges Datum." }, |
719 | { "You entered an invalid date!\n Will use current date instead.","Ungültiges Datum eingegeben.\nSetze stattdessen heutiges Datum." }, | 719 | { "You entered an invalid date!\n Will use current date instead.","Ungültiges Datum eingegeben.\nSetze stattdessen heutiges Datum." }, |
720 | { "Warning","Warnung" }, | 720 | { "Warning","Warnung" }, |
721 | { "Select week number","Wähle Wochen Nummer" }, | 721 | { "Select week number","Wähle Wochen Nummer" }, |
722 | { "Februar","Februar" }, | 722 | { "Februar","Februar" }, |
723 | { "Pi-Sync options for device: ","Pi-Sync Einstellungen für Gerät: " }, | 723 | { "Pi-Sync options for device: ","Pi-Sync Einstellungen für Gerät: " }, |
724 | { "Password for remote access:","Passwort für fernen Zugriff:" }, | 724 | { "Password for remote access:","Passwort für fernen Zugriff:" }, |
725 | { "Remote IP address:","Ferne IP Adresse:" }, | 725 | { "Remote IP address:","Ferne IP Adresse:" }, |
726 | { "Remote port number:","Ferne Port Nummer:" }, | 726 | { "Remote port number:","Ferne Port Nummer:" }, |
727 | { "Remote file saved to temp file.","Ferne Daten in temp Datei gespeichert." }, | 727 | { "Remote file saved to temp file.","Ferne Daten in temp Datei gespeichert." }, |
728 | { "Remote from: ","Fern von: " }, | 728 | { "Remote from: ","Fern von: " }, |
729 | { "Local from: ","Lokal von: " }, | 729 | { "Local from: ","Lokal von: " }, |
730 | { "Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n %d incoming filtered out\n %d outgoing filtered out\n","Synchronisationsübersicht:\n\n %d lokal hinzugefügt\n %d fern hinzugefügt\n %d lokal geändert\n %d fern geändert\n %d lokal gelöscht\n %d fern gelöscht\n %d eingehende ausgefiltert\n %d ausgehende ausgefiltert\n" }, | 730 | { "Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n %d incoming filtered out\n %d outgoing filtered out\n","Synchronisationsübersicht:\n\n %d lokal hinzugefügt\n %d fern hinzugefügt\n %d lokal geändert\n %d fern geändert\n %d lokal gelöscht\n %d fern gelöscht\n %d eingehende ausgefiltert\n %d ausgehende ausgefiltert\n" }, |
731 | { "Local calendar changed!\n","Lokaler Kalender geändert!\n" }, | 731 | { "Local calendar changed!\n","Lokaler Kalender geändert!\n" }, |
732 | { "Write back","Schreibe zurück" }, | 732 | { "Write back","Schreibe zurück" }, |
733 | { "Pi-Sync succesful!","Pi-Sync erfolgreich!" }, | 733 | { "Pi-Sync succesful!","Pi-Sync erfolgreich!" }, |
734 | { "Received sync request","Sync Anfrage erhalten" }, | 734 | { "Received sync request","Sync Anfrage erhalten" }, |
735 | { "Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog.","Ferne Synchronisation ...\n\nBenutze diese Anwendung nicht!\n\nWenn das Syncen fehlschlägt kann\ndieser Dialog geschlossen werden." }, | 735 | { "Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog.","Ferne Synchronisation ...\n\nBenutze diese Anwendung nicht!\n\nWenn das Syncen fehlschlägt kann\ndieser Dialog geschlossen werden." }, |
736 | { "Saving Data to temp file ...","Speichere Daten in temp Datei..." }, | 736 | { "Saving Data to temp file ...","Speichere Daten in temp Datei..." }, |
737 | { "Data saved to temp file!","Daten in temp Datei gespeichert!" }, | 737 | { "Data saved to temp file!","Daten in temp Datei gespeichert!" }, |
738 | { "Sending file...","Sende Datei..." }, | 738 | { "Sending file...","Sende Datei..." }, |
739 | { "Waiting for synced file...","Warte auf gesyncte Daten..." }, | 739 | { "Waiting for synced file...","Warte auf gesyncte Daten..." }, |
740 | { "Receiving synced file...","Gesyncte Daten erhalten..." }, | 740 | { "Receiving synced file...","Gesyncte Daten erhalten..." }, |
741 | { "Received %1 bytes","%1 Bytes erhalten" }, | 741 | { "Received %1 bytes","%1 Bytes erhalten" }, |
742 | { "Writing file to disk...","Speichere Datei..." }, | 742 | { "Writing file to disk...","Speichere Datei..." }, |
743 | { "Pi-Sync successful!","Pi-Sync erfolgreich!" }, | 743 | { "Pi-Sync successful!","Pi-Sync erfolgreich!" }, |
744 | { "Clock skew of\nsyncing devices\nis %1 seconds!","Uhrzeitunterschied der\nsyncenden Geräte\nist %1 Sekunden!" }, | 744 | { "Clock skew of\nsyncing devices\nis %1 seconds!","Uhrzeitunterschied der\nsyncenden Geräte\nist %1 Sekunden!" }, |
745 | { "Synchronize!","Synchronisiere!" }, | 745 | { "Synchronize!","Synchronisiere!" }, |
746 | { "High clock skew!","Großer Uhrzeitunterschied!" }, | 746 | { "High clock skew!","Großer Uhrzeitunterschied!" }, |
747 | { "ADJUST\nYOUR\nCLOCKS!","JUSTIERE\nDIE\nUHREN!" }, | 747 | { "ADJUST\nYOUR\nCLOCKS!","JUSTIERE\nDIE\nUHREN!" }, |
748 | { "The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!","Die Uhren der syncenden Geräte\nhaben einen Unterschied von\nmehr als 5 Minuten. Bitte die\nUhrzeiten anpassen. Sie können\nfalsche Sync-Resultate erhalten!\nBitte das Syncen bestätigen!" }, | 748 | { "The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!","Die Uhren der syncenden Geräte\nhaben einen Unterschied von\nmehr als 5 Minuten. Bitte die\nUhrzeiten anpassen. Sie können\nfalsche Sync-Resultate erhalten!\nBitte das Syncen bestätigen!" }, |
749 | { "","" }, | 749 | { "Change search field enable jump bar","Ändere Suchfeld um Jumpbar anzuzeigen" }, |
750 | { "","" }, | 750 | { "","" }, |
751 | { "","" }, | 751 | { "","" }, |
752 | { "","" }, | 752 | { "","" }, |
753 | { "","" }, | 753 | { "","" }, |
754 | { "","" }, | 754 | { "","" }, |
755 | { "","" }, | 755 | { "","" }, |
756 | { "","" }, | 756 | { "","" }, |
757 | { "","" }, \ No newline at end of file | 757 | { "","" }, \ No newline at end of file |
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 3f7a7da..e8f6132 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -1398,96 +1398,101 @@ void KABCore::save() | |||
1398 | syncManager->setBlockSave(false); | 1398 | syncManager->setBlockSave(false); |
1399 | } | 1399 | } |
1400 | 1400 | ||
1401 | 1401 | ||
1402 | void KABCore::undo() | 1402 | void KABCore::undo() |
1403 | { | 1403 | { |
1404 | UndoStack::instance()->undo(); | 1404 | UndoStack::instance()->undo(); |
1405 | 1405 | ||
1406 | // Refresh the view | 1406 | // Refresh the view |
1407 | mViewManager->refreshView(); | 1407 | mViewManager->refreshView(); |
1408 | } | 1408 | } |
1409 | 1409 | ||
1410 | void KABCore::redo() | 1410 | void KABCore::redo() |
1411 | { | 1411 | { |
1412 | RedoStack::instance()->redo(); | 1412 | RedoStack::instance()->redo(); |
1413 | 1413 | ||
1414 | // Refresh the view | 1414 | // Refresh the view |
1415 | mViewManager->refreshView(); | 1415 | mViewManager->refreshView(); |
1416 | } | 1416 | } |
1417 | void KABCore::setJumpButtonBar( bool visible ) | 1417 | void KABCore::setJumpButtonBar( bool visible ) |
1418 | { | 1418 | { |
1419 | setJumpButtonBarVisible(visible ); | 1419 | setJumpButtonBarVisible(visible ); |
1420 | saveSettings(); | 1420 | saveSettings(); |
1421 | } | 1421 | } |
1422 | void KABCore::setJumpButtonBarVisible( bool visible ) | 1422 | void KABCore::setJumpButtonBarVisible( bool visible ) |
1423 | { | 1423 | { |
1424 | if (mMultipleViewsAtOnce) | 1424 | if (mMultipleViewsAtOnce) |
1425 | { | 1425 | { |
1426 | if ( visible ) | 1426 | if ( visible ) |
1427 | mJumpButtonBar->show(); | 1427 | mJumpButtonBar->show(); |
1428 | else | 1428 | else |
1429 | mJumpButtonBar->hide(); | 1429 | mJumpButtonBar->hide(); |
1430 | } | 1430 | } |
1431 | else | 1431 | else |
1432 | { | 1432 | { |
1433 | // show the jumpbar only if "the details are hidden" == "viewmanager are shown" | 1433 | // show the jumpbar only if "the details are hidden" == "viewmanager are shown" |
1434 | if (mViewManager->isVisible()) | 1434 | if (mViewManager->isVisible()) |
1435 | { | 1435 | { |
1436 | if ( visible ) | 1436 | if ( visible ) |
1437 | mJumpButtonBar->show(); | 1437 | mJumpButtonBar->show(); |
1438 | else | 1438 | else |
1439 | mJumpButtonBar->hide(); | 1439 | mJumpButtonBar->hide(); |
1440 | } | 1440 | } |
1441 | else | 1441 | else |
1442 | { | 1442 | { |
1443 | mJumpButtonBar->hide(); | 1443 | mJumpButtonBar->hide(); |
1444 | } | 1444 | } |
1445 | } | 1445 | } |
1446 | if ( visible ) { | ||
1447 | if ( mIncSearchWidget->currentItem() == 0 ) { | ||
1448 | message( i18n("Change search field enable jump bar") ); | ||
1449 | } | ||
1450 | } | ||
1446 | } | 1451 | } |
1447 | 1452 | ||
1448 | 1453 | ||
1449 | void KABCore::setDetailsToState() | 1454 | void KABCore::setDetailsToState() |
1450 | { | 1455 | { |
1451 | setDetailsVisible( mActionDetails->isChecked() ); | 1456 | setDetailsVisible( mActionDetails->isChecked() ); |
1452 | } | 1457 | } |
1453 | void KABCore::setDetailsToggle() | 1458 | void KABCore::setDetailsToggle() |
1454 | { | 1459 | { |
1455 | mActionDetails->setChecked( !mActionDetails->isChecked() ); | 1460 | mActionDetails->setChecked( !mActionDetails->isChecked() ); |
1456 | setDetailsToState(); | 1461 | setDetailsToState(); |
1457 | } | 1462 | } |
1458 | 1463 | ||
1459 | 1464 | ||
1460 | 1465 | ||
1461 | void KABCore::setDetailsVisible( bool visible ) | 1466 | void KABCore::setDetailsVisible( bool visible ) |
1462 | { | 1467 | { |
1463 | if (visible && mDetails->isHidden()) | 1468 | if (visible && mDetails->isHidden()) |
1464 | { | 1469 | { |
1465 | KABC::Addressee::List addrList = mViewManager->selectedAddressees(); | 1470 | KABC::Addressee::List addrList = mViewManager->selectedAddressees(); |
1466 | if ( addrList.count() > 0 ) | 1471 | if ( addrList.count() > 0 ) |
1467 | mDetails->setAddressee( addrList[ 0 ] ); | 1472 | mDetails->setAddressee( addrList[ 0 ] ); |
1468 | } | 1473 | } |
1469 | 1474 | ||
1470 | // mMultipleViewsAtOnce=false: mDetails is always visible. But we switch between | 1475 | // mMultipleViewsAtOnce=false: mDetails is always visible. But we switch between |
1471 | // the listview and the detailview. We do that by changing the splitbar size. | 1476 | // the listview and the detailview. We do that by changing the splitbar size. |
1472 | if (mMultipleViewsAtOnce) | 1477 | if (mMultipleViewsAtOnce) |
1473 | { | 1478 | { |
1474 | if ( visible ) | 1479 | if ( visible ) |
1475 | mDetails->show(); | 1480 | mDetails->show(); |
1476 | else | 1481 | else |
1477 | mDetails->hide(); | 1482 | mDetails->hide(); |
1478 | } | 1483 | } |
1479 | else | 1484 | else |
1480 | { | 1485 | { |
1481 | if ( visible ) { | 1486 | if ( visible ) { |
1482 | mViewManager->hide(); | 1487 | mViewManager->hide(); |
1483 | mDetails->show(); | 1488 | mDetails->show(); |
1484 | mIncSearchWidget->setFocus(); | 1489 | mIncSearchWidget->setFocus(); |
1485 | } | 1490 | } |
1486 | else { | 1491 | else { |
1487 | mViewManager->show(); | 1492 | mViewManager->show(); |
1488 | mDetails->hide(); | 1493 | mDetails->hide(); |
1489 | mViewManager->setFocusAV(); | 1494 | mViewManager->setFocusAV(); |
1490 | } | 1495 | } |
1491 | setJumpButtonBarVisible( !visible ); | 1496 | setJumpButtonBarVisible( !visible ); |
1492 | } | 1497 | } |
1493 | 1498 | ||