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 | |||
@@ -751,4 +751,4 @@ | |||
751 | { "Shrink searchfield in portrait view","Verkleinere Suchfeld im Portraitmodus" }, | 751 | { "Shrink searchfield in portrait view","Verkleinere Suchfeld im Portraitmodus" }, |
752 | { "","" }, | 752 | { "Edit new contact","Bearbeite neuen Kontakt" }, |
753 | { "","" }, | 753 | { "Edit ","Bearbeite " }, |
754 | { "","" }, | 754 | { "","" }, |
diff --git a/bin/kdepim/kaddressbook/icons16/ic_family.png b/bin/kdepim/kaddressbook/icons16/ic_family.png new file mode 100644 index 0000000..6b0dec6 --- a/dev/null +++ b/bin/kdepim/kaddressbook/icons16/ic_family.png | |||
Binary files differ | |||
diff --git a/bin/kdepim/kaddressbook/icons16/ic_female.png b/bin/kdepim/kaddressbook/icons16/ic_female.png new file mode 100644 index 0000000..c427605 --- a/dev/null +++ b/bin/kdepim/kaddressbook/icons16/ic_female.png | |||
Binary files differ | |||
diff --git a/bin/kdepim/kaddressbook/icons16/ic_kids.png b/bin/kdepim/kaddressbook/icons16/ic_kids.png new file mode 100644 index 0000000..fdbdabc --- a/dev/null +++ b/bin/kdepim/kaddressbook/icons16/ic_kids.png | |||
Binary files differ | |||
diff --git a/bin/kdepim/kaddressbook/icons16/ic_male.png b/bin/kdepim/kaddressbook/icons16/ic_male.png new file mode 100644 index 0000000..f22eaab --- a/dev/null +++ b/bin/kdepim/kaddressbook/icons16/ic_male.png | |||
Binary files differ | |||
diff --git a/bin/kdepim/kaddressbook/icons16/ic_penguin.png b/bin/kdepim/kaddressbook/icons16/ic_penguin.png new file mode 100644 index 0000000..a78da37 --- a/dev/null +++ b/bin/kdepim/kaddressbook/icons16/ic_penguin.png | |||
Binary files differ | |||
diff --git a/bin/kdepim/kaddressbook/icons16/package_toys.png b/bin/kdepim/kaddressbook/icons16/package_toys.png deleted file mode 100644 index eea4fc7..0000000 --- a/bin/kdepim/kaddressbook/icons16/package_toys.png +++ b/dev/null | |||
Binary files differ | |||
diff --git a/bin/kdepim/kaddressbook/icons22/ic_family.png b/bin/kdepim/kaddressbook/icons22/ic_family.png new file mode 100644 index 0000000..6b0dec6 --- a/dev/null +++ b/bin/kdepim/kaddressbook/icons22/ic_family.png | |||
Binary files differ | |||
diff --git a/bin/kdepim/kaddressbook/icons22/ic_female.png b/bin/kdepim/kaddressbook/icons22/ic_female.png new file mode 100644 index 0000000..c427605 --- a/dev/null +++ b/bin/kdepim/kaddressbook/icons22/ic_female.png | |||
Binary files differ | |||
diff --git a/bin/kdepim/kaddressbook/icons22/ic_kids.png b/bin/kdepim/kaddressbook/icons22/ic_kids.png new file mode 100644 index 0000000..fdbdabc --- a/dev/null +++ b/bin/kdepim/kaddressbook/icons22/ic_kids.png | |||
Binary files differ | |||
diff --git a/bin/kdepim/kaddressbook/icons22/ic_male.png b/bin/kdepim/kaddressbook/icons22/ic_male.png new file mode 100644 index 0000000..f22eaab --- a/dev/null +++ b/bin/kdepim/kaddressbook/icons22/ic_male.png | |||
Binary files differ | |||
diff --git a/bin/kdepim/kaddressbook/icons22/ic_penguin.png b/bin/kdepim/kaddressbook/icons22/ic_penguin.png new file mode 100644 index 0000000..a78da37 --- a/dev/null +++ b/bin/kdepim/kaddressbook/icons22/ic_penguin.png | |||
Binary files differ | |||
diff --git a/bin/kdepim/kaddressbook/icons22/package_toys.png b/bin/kdepim/kaddressbook/icons22/package_toys.png deleted file mode 100644 index eea4fc7..0000000 --- a/bin/kdepim/kaddressbook/icons22/package_toys.png +++ b/dev/null | |||
Binary files differ | |||
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp index e85991e..8f104e0 100644 --- a/kabc/addresseeview.cpp +++ b/kabc/addresseeview.cpp | |||
@@ -254,2 +254,3 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee ) | |||
254 | if ( picAvailUrl || picAvailintern || QApplication::desktop()->width() > 320 ) { | 254 | if ( picAvailUrl || picAvailintern || QApplication::desktop()->width() > 320 ) { |
255 | picString = "<img src=\"myimage\" width=\"50\" height=\"70\">"; | ||
255 | if ( picAvailintern ) { | 256 | if ( picAvailintern ) { |
@@ -260,6 +261,11 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee ) | |||
260 | } else { | 261 | } else { |
261 | QMimeSourceFactory::defaultFactory()->setPixmap( "myimage", KGlobal::iconLoader()->loadIcon( "package_toys", KIcon::Desktop, 128 ) ); | 262 | static bool setDefaultImage = false; |
263 | if ( !setDefaultImage ) { | ||
264 | qDebug("Setting default pixmap "); | ||
265 | QMimeSourceFactory::defaultFactory()->setPixmap( "defaultPenguin", KGlobal::iconLoader()->loadIcon( "package_toys", KIcon::Desktop, 128 ) ); | ||
266 | setDefaultImage = true; | ||
267 | } | ||
268 | picString = "<img src=\"defaultPenguin\" width=\"64\" height=\"64\">"; | ||
262 | } | 269 | } |
263 | } | 270 | } |
264 | picString = "<img src=\"myimage\" width=\"50\" height=\"70\">"; | ||
265 | mText = QString::fromLatin1( | 271 | mText = QString::fromLatin1( |
diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp index a84fc61..b5a60f2 100644 --- a/kaddressbook/addresseeeditordialog.cpp +++ b/kaddressbook/addresseeeditordialog.cpp | |||
@@ -69,3 +69,3 @@ void AddresseeEditorDialog::setAddressee( const KABC::Addressee &addr ) | |||
69 | 69 | ||
70 | this->setCaption("Edit " + addr.formattedName()); | 70 | this->setCaption(i18n ("Edit ") + addr.formattedName()); |
71 | } | 71 | } |
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 3f9b546..e1a490d 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -1262,2 +1262,3 @@ void KABCore::newContact() | |||
1262 | mEditorDialog->setAddressee( addr ); | 1262 | mEditorDialog->setAddressee( addr ); |
1263 | mEditorDialog->setCaption( i18n("Edit new contact")); | ||
1263 | KApplication::execDialog ( mEditorDialog ); | 1264 | KApplication::execDialog ( mEditorDialog ); |
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 8752636..53cd011 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -262,3 +262,3 @@ void KOViewManager::showNextView() | |||
262 | 262 | ||
263 | if ( KOPrefs::instance()->mShowIconTodoview ) { showTodoView() ;return ;} | 263 | //if ( KOPrefs::instance()->mShowIconTodoview ) { showTodoView() ;return ;} |
264 | 264 | ||