17 files changed, 13 insertions, 6 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index 6721d5f..30b4168 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt @@ -728,31 +728,31 @@ { "Remote from: ","Fern von: " },
{ "Local from: ","Lokal von: " },
{ "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" },
{ "Local calendar changed!\n","Lokaler Kalender geändert!\n" },
{ "Write back","Schreibe zurück" },
{ "Pi-Sync succesful!","Pi-Sync erfolgreich!" },
{ "Received sync request","Sync Anfrage erhalten" },
{ "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." },
{ "Saving Data to temp file ...","Speichere Daten in temp Datei..." },
{ "Data saved to temp file!","Daten in temp Datei gespeichert!" },
{ "Sending file...","Sende Datei..." },
{ "Waiting for synced file...","Warte auf gesyncte Daten..." },
{ "Receiving synced file...","Gesyncte Daten erhalten..." },
{ "Received %1 bytes","%1 Bytes erhalten" },
{ "Writing file to disk...","Speichere Datei..." },
{ "Pi-Sync successful!","Pi-Sync erfolgreich!" },
{ "Clock skew of\nsyncing devices\nis %1 seconds!","Uhrzeitunterschied der\nsyncenden Geräte\nist %1 Sekunden!" },
{ "Synchronize!","Synchronisiere!" },
{ "High clock skew!","Großer Uhrzeitunterschied!" },
{ "ADJUST\nYOUR\nCLOCKS!","JUSTIERE\nDIE\nUHREN!" },
{ "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!" },
{ "Change search field enable jump bar","Ändere Suchfeld um Jumpbar anzuzeigen" },
{ "Search with '*' prefix (wildcard)","Suche mit '*' Prefix (Wildcard)" },
{ "Shrink searchfield in portrait view","Verkleinere Suchfeld im Portraitmodus" },
-{ "","" },
-{ "","" },
+{ "Edit new contact","Bearbeite neuen Kontakt" },
+{ "Edit ","Bearbeite " },
{ "","" },
{ "","" },
{ "","" },
{ "","" },
{ "","" },
\ No newline at end of file diff --git a/bin/kdepim/kaddressbook/icons16/ic_family.png b/bin/kdepim/kaddressbook/icons16/ic_family.png Binary files differnew file mode 100644 index 0000000..6b0dec6 --- a/dev/null +++ b/bin/kdepim/kaddressbook/icons16/ic_family.png diff --git a/bin/kdepim/kaddressbook/icons16/ic_female.png b/bin/kdepim/kaddressbook/icons16/ic_female.png Binary files differnew file mode 100644 index 0000000..c427605 --- a/dev/null +++ b/bin/kdepim/kaddressbook/icons16/ic_female.png diff --git a/bin/kdepim/kaddressbook/icons16/ic_kids.png b/bin/kdepim/kaddressbook/icons16/ic_kids.png Binary files differnew file mode 100644 index 0000000..fdbdabc --- a/dev/null +++ b/bin/kdepim/kaddressbook/icons16/ic_kids.png diff --git a/bin/kdepim/kaddressbook/icons16/ic_male.png b/bin/kdepim/kaddressbook/icons16/ic_male.png Binary files differnew file mode 100644 index 0000000..f22eaab --- a/dev/null +++ b/bin/kdepim/kaddressbook/icons16/ic_male.png diff --git a/bin/kdepim/kaddressbook/icons16/ic_penguin.png b/bin/kdepim/kaddressbook/icons16/ic_penguin.png Binary files differnew file mode 100644 index 0000000..a78da37 --- a/dev/null +++ b/bin/kdepim/kaddressbook/icons16/ic_penguin.png diff --git a/bin/kdepim/kaddressbook/icons16/package_toys.png b/bin/kdepim/kaddressbook/icons16/package_toys.png Binary files differdeleted file mode 100644 index eea4fc7..0000000 --- a/bin/kdepim/kaddressbook/icons16/package_toys.png +++ b/dev/null diff --git a/bin/kdepim/kaddressbook/icons22/ic_family.png b/bin/kdepim/kaddressbook/icons22/ic_family.png Binary files differnew file mode 100644 index 0000000..6b0dec6 --- a/dev/null +++ b/bin/kdepim/kaddressbook/icons22/ic_family.png diff --git a/bin/kdepim/kaddressbook/icons22/ic_female.png b/bin/kdepim/kaddressbook/icons22/ic_female.png Binary files differnew file mode 100644 index 0000000..c427605 --- a/dev/null +++ b/bin/kdepim/kaddressbook/icons22/ic_female.png diff --git a/bin/kdepim/kaddressbook/icons22/ic_kids.png b/bin/kdepim/kaddressbook/icons22/ic_kids.png Binary files differnew file mode 100644 index 0000000..fdbdabc --- a/dev/null +++ b/bin/kdepim/kaddressbook/icons22/ic_kids.png diff --git a/bin/kdepim/kaddressbook/icons22/ic_male.png b/bin/kdepim/kaddressbook/icons22/ic_male.png Binary files differnew file mode 100644 index 0000000..f22eaab --- a/dev/null +++ b/bin/kdepim/kaddressbook/icons22/ic_male.png diff --git a/bin/kdepim/kaddressbook/icons22/ic_penguin.png b/bin/kdepim/kaddressbook/icons22/ic_penguin.png Binary files differnew file mode 100644 index 0000000..a78da37 --- a/dev/null +++ b/bin/kdepim/kaddressbook/icons22/ic_penguin.png diff --git a/bin/kdepim/kaddressbook/icons22/package_toys.png b/bin/kdepim/kaddressbook/icons22/package_toys.png Binary files differdeleted file mode 100644 index eea4fc7..0000000 --- a/bin/kdepim/kaddressbook/icons22/package_toys.png +++ b/dev/null diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp index e85991e..8f104e0 100644 --- a/kabc/addresseeview.cpp +++ b/kabc/addresseeview.cpp @@ -231,58 +231,64 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee ) } QString aRole = ""; QString aOrga = ""; if ( true /*!mAddressee.role().isEmpty()*/ ) { aRole = "<tr>" "<td align=\"left\">" + mAddressee.role() + "</td>" "</tr>"; } if ( true /*!mAddressee.organization().isEmpty()*/ ) { aOrga = "<tr>" "<td align=\"left\">" + mAddressee.organization() + "</td>" "</tr>"; } mText = ""; QString picString = ""; KABC::Picture picture = mAddressee.photo(); bool picAvailintern = false; bool picAvailUrl = false; if (! picture.undefined() ) { picAvailintern = (picture.isIntern() && !picture.data().isNull()); picAvailUrl = !picture.isIntern() && QFile::exists(picture.url() ); } if ( picAvailUrl || picAvailintern || QApplication::desktop()->width() > 320 ) { + picString = "<img src=\"myimage\" width=\"50\" height=\"70\">"; if ( picAvailintern ) { QMimeSourceFactory::defaultFactory()->setImage( "myimage", picture.data() ); } else { if ( picAvailUrl ) { QMimeSourceFactory::defaultFactory()->setPixmap( "myimage", QPixmap( picture.url() )); } else { - QMimeSourceFactory::defaultFactory()->setPixmap( "myimage", KGlobal::iconLoader()->loadIcon( "package_toys", KIcon::Desktop, 128 ) ); + static bool setDefaultImage = false; + if ( !setDefaultImage ) { + qDebug("Setting default pixmap "); + QMimeSourceFactory::defaultFactory()->setPixmap( "defaultPenguin", KGlobal::iconLoader()->loadIcon( "package_toys", KIcon::Desktop, 128 ) ); + setDefaultImage = true; + } + picString = "<img src=\"defaultPenguin\" width=\"64\" height=\"64\">"; } } - picString = "<img src=\"myimage\" width=\"50\" height=\"70\">"; mText = QString::fromLatin1( "<html>" "<body text=\"%1\" bgcolor=\"%2\">" // text and background color "<table>" "<tr>" "<td rowspan=\"3\" align=\"right\" valign=\"top\">" "%3" "</td>" "<td align=\"left\"><font size=\"+2\"><b>%4</b></font></td>" // name "</tr>" "%5" // role "%6" // organization "<td colspan=\"2\"> </td>" "%7" // dynamic part "%8" // notes "</table>" "</body>" "</html>") //US .arg( /*KGlobalSettings::textColor().name()*/ "black" ) //US .arg( /*KGlobalSettings::baseColor().name()*/ "white" ) .arg( picString ) .arg( name ) diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp index a84fc61..b5a60f2 100644 --- a/kaddressbook/addresseeeditordialog.cpp +++ b/kaddressbook/addresseeeditordialog.cpp @@ -46,49 +46,49 @@ AddresseeEditorDialog::AddresseeEditorDialog( KABCore *core, QWidget *parent, QVBoxLayout *layout = new QVBoxLayout( page ); mEditorWidget = new AddresseeEditorWidget( core, false, page ); connect( mEditorWidget, SIGNAL( modified( const KABC::Addressee::List& ) ), SLOT( widgetModified() ) ); layout->addWidget( mEditorWidget ); enableButton( KDialogBase::Apply, false ); if ( QApplication::desktop()->width() < 480 ) { hideButtons(); } } AddresseeEditorDialog::~AddresseeEditorDialog() { //emit editorDestroyed( mEditorWidget->addressee().uid() ); } void AddresseeEditorDialog::setAddressee( const KABC::Addressee &addr ) { enableButton( KDialogBase::Apply, false ); mEditorWidget->setAddressee( addr ); - this->setCaption("Edit " + addr.formattedName()); + this->setCaption(i18n ("Edit ") + addr.formattedName()); } KABC::Addressee AddresseeEditorDialog::addressee() { return mEditorWidget->addressee(); } bool AddresseeEditorDialog::dirty() { return mEditorWidget->dirty(); } void AddresseeEditorDialog::slotApply() { if ( mEditorWidget->dirty() ) { mEditorWidget->save(); emit contactModified( mEditorWidget->addressee() ); } enableButton( KDialogBase::Apply, false ); KDialogBase::slotApply(); } diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 3f9b546..e1a490d 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -1239,48 +1239,49 @@ void KABCore::newContact() { QPtrList<KABC::Resource> kabcResources = mAddressBook->resources(); QPtrList<KRES::Resource> kresResources; QPtrListIterator<KABC::Resource> it( kabcResources ); KABC::Resource *resource; while ( ( resource = it.current() ) != 0 ) { ++it; if ( !resource->readOnly() ) { KRES::Resource *res = static_cast<KRES::Resource*>( resource ); if ( res ) kresResources.append( res ); } } KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, this ); resource = static_cast<KABC::Resource*>( res ); if ( resource ) { KABC::Addressee addr; addr.setResource( resource ); mEditorDialog->setAddressee( addr ); + mEditorDialog->setCaption( i18n("Edit new contact")); KApplication::execDialog ( mEditorDialog ); } else return; // mEditorDict.insert( dialog->addressee().uid(), dialog ); } void KABCore::addEmail( QString aStr ) { #ifndef KAB_EMBEDDED QString fullName, email; KABC::Addressee::parseEmailAddress( aStr, fullName, email ); // Try to lookup the addressee matching the email address bool found = false; QStringList emailList; KABC::AddressBook::Iterator it; for ( it = mAddressBook->begin(); !found && (it != mAddressBook->end()); ++it ) { emailList = (*it).emails(); if ( emailList.contains( email ) > 0 ) { diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 8752636..53cd011 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -239,49 +239,49 @@ void KOViewManager::showNextView() if ( KOPrefs::instance()->mShowIconMonth ) { showMonthView();return ;} LIST: if ( KOPrefs::instance()->mShowIconList ) { showListView() ;return ;} TODO: if ( KOPrefs::instance()->mShowIconTodoview ) { showTodoView() ;return ;} if ( KOPrefs::instance()->mShowIconNext ) { showWhatsNextView();return ;} if ( KOPrefs::instance()->mShowIconNextDays ) { showNextXView() ;return ;} if ( KOPrefs::instance()->mShowIconJournal ) { showJournalView() ;return ;} if ( KOPrefs::instance()->mShowIconDay1 ) { showDayView() ;return ;} if ( KOPrefs::instance()->mShowIconDay5 ) { showWorkWeekView() ;return ;} if ( KOPrefs::instance()->mShowIconDay7 ) { showWeekView();return ;} if ( KOPrefs::instance()->mShowIconDay6 ) { showMonthViewWeek();return ;} if ( KOPrefs::instance()->mShowIconMonth ) { showMonthView();return ;} if ( KOPrefs::instance()->mShowIconList ) { showListView() ;return ;} - if ( KOPrefs::instance()->mShowIconTodoview ) { showTodoView() ;return ;} + //if ( KOPrefs::instance()->mShowIconTodoview ) { showTodoView() ;return ;} } void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen ) { //mFlagShowNextxDays = false; //if(view == mCurrentView) return; if ( view == 0 ) { view = mCurrentView; if ( view == 0 ) return; } bool callupdate = !(view == mCurrentView); bool full = fullScreen; if(view == mCurrentView && view != mWhatsNextView ) { if ( mCurrentAgendaView < 0 ) return; if ( view != mMonthView ) full = mMainView->leftFrame()->isVisible(); } else { if ( view == mMonthView && mMonthView) ;//mMonthView->skipResize = true ; |
