|
|
|
|
@ -1971,7 +1971,7 @@ KMFolder* KMailICalIfaceImpl::initFolder( KMail::FolderContentsType contentsType |
|
|
|
|
i18n("There are multiple %1 default folders, please choose one:", |
|
|
|
|
localizedDefaultFolderName( contentsType ) ), labels ); |
|
|
|
|
if ( !selected.isEmpty() ) |
|
|
|
|
result.folder = result.folders[ labels.findIndex( selected ) ]; |
|
|
|
|
result.folder = result.folders[ labels.indexOf( selected ) ]; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
KMFolder* folder = result.folder; |
|
|
|
|
@ -2121,15 +2121,15 @@ QString KMailICalIfaceImpl::folderPixmap( KFolderTreeItem::Type type ) const |
|
|
|
|
return QString(); |
|
|
|
|
|
|
|
|
|
if( type == KFolderTreeItem::Contacts ) |
|
|
|
|
return QString::fromLatin1( "kmgroupware_folder_contacts" ); |
|
|
|
|
return QString::fromLatin1( "text-directory" ); |
|
|
|
|
else if( type == KFolderTreeItem::Calendar ) |
|
|
|
|
return QString::fromLatin1( "kmgroupware_folder_calendar" ); |
|
|
|
|
return QString::fromLatin1( "text-calendar" ); |
|
|
|
|
else if( type == KFolderTreeItem::Notes ) |
|
|
|
|
return QString::fromLatin1( "kmgroupware_folder_notes" ); |
|
|
|
|
return QString::fromLatin1( "view-pim-notes" ); |
|
|
|
|
else if( type == KFolderTreeItem::Tasks ) |
|
|
|
|
return QString::fromLatin1( "kmgroupware_folder_tasks" ); |
|
|
|
|
return QString::fromLatin1( "view-pim-tasks" ); |
|
|
|
|
else if( type == KFolderTreeItem::Journals ) |
|
|
|
|
return QString::fromLatin1( "kmgroupware_folder_journals" ); |
|
|
|
|
return QString::fromLatin1( "view-pim-journal" ); |
|
|
|
|
|
|
|
|
|
return QString(); |
|
|
|
|
} |
|
|
|
|
|