i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* The new icon retrieval code didn't always work that well...

Browse Source 
* For applications without an icon, the default application icon is now shown.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16419 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-02-16 13:20:38 +00:00
parent 84506c140e
commit e47433bccb
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/filetypes/MimeTypeListView.cpp
+20 -6
View File
@@ -18,16 +18,14 @@ icon_for_type(BMimeType& type, BBitmap& bitmap, icon_size size,
{ {
icon_source source = kNoIcon; icon_source source = kNoIcon;
if (type.GetIcon(&bitmap, size) == B_OK) { if (type.GetIcon(&bitmap, size) == B_OK)
source = kOwnIcon; source = kOwnIcon;
return B_OK;
}
if (source == kNoIcon) { if (source == kNoIcon) {
// check for icon from preferred app // check for icon from preferred app
char preferred[B_MIME_TYPE_LENGTH]; char preferred[B_MIME_TYPE_LENGTH];
if (type.GetPreferredApp(preferred) != B_OK) { if (type.GetPreferredApp(preferred) == B_OK) {
BMimeType preferredApp(preferred); BMimeType preferredApp(preferred);
if (preferredApp.GetIconForType(type.Type(), &bitmap, size) == B_OK) if (preferredApp.GetIconForType(type.Type(), &bitmap, size) == B_OK)
@@ -137,7 +135,14 @@ MimeTypeItem::DrawItem(BView* owner, BRect frame, bool complete)
BBitmap bitmap(BRect(0, 0, B_MINI_ICON - 1, B_MINI_ICON - 1), B_CMAP8); BBitmap bitmap(BRect(0, 0, B_MINI_ICON - 1, B_MINI_ICON - 1), B_CMAP8);
BMimeType mimeType(fType.String()); BMimeType mimeType(fType.String());
if (icon_for_type(mimeType, bitmap, B_MINI_ICON) == B_OK) { status_t status = icon_for_type(mimeType, bitmap, B_MINI_ICON);
if (status < B_OK && fApplicationMode) {
// get default application icon
BMimeType appType(B_ELF_APP_MIME_TYPE);
status = icon_for_type(appType, bitmap, B_MINI_ICON);
}
if (status == B_OK) {
BPoint point(rect.left + 2.0f, BPoint point(rect.left + 2.0f,
rect.top + (rect.Height() - B_MINI_ICON) / 2.0f); rect.top + (rect.Height() - B_MINI_ICON) / 2.0f);
@@ -242,6 +247,13 @@ MimeTypeItem::ShowIcon(bool showIcon)
} }
void
MimeTypeItem::SetApplicationMode(bool applicationMode)
{
fApplicationMode = applicationMode;
}
/*static*/ /*static*/
int int
MimeTypeItem::Compare(const BListItem* a, const BListItem* b) MimeTypeItem::Compare(const BListItem* a, const BListItem* b)
@@ -323,8 +335,10 @@ MimeTypeListView::_CollectSubtypes(const char* supertype, MimeTypeItem* supertyp
if (fApplicationMode ^ isApp) if (fApplicationMode ^ isApp)
continue; continue;
BStringItem* typeItem = new MimeTypeItem(mimeType, fShowIcons, MimeTypeItem* typeItem = new MimeTypeItem(mimeType, fShowIcons,
supertypeItem == NULL); supertypeItem == NULL);
typeItem->SetApplicationMode(isApp);
if (supertypeItem != NULL) if (supertypeItem != NULL)
AddUnder(typeItem, supertypeItem); AddUnder(typeItem, supertypeItem);
else else
src/preferences/filetypes/MimeTypeListView.h
+3
View File
@@ -29,7 +29,9 @@ class MimeTypeItem : public BStringItem {
void UpdateText(); void UpdateText();
void AddSubtype(); void AddSubtype();
void ShowIcon(bool showIcon); void ShowIcon(bool showIcon);
void SetApplicationMode(bool applicationMode);
static int Compare(const BListItem* a, const BListItem* b); static int Compare(const BListItem* a, const BListItem* b);
static int CompareLabels(const BListItem* a, const BListItem* b); static int CompareLabels(const BListItem* a, const BListItem* b);
@@ -45,6 +47,7 @@ class MimeTypeItem : public BStringItem {
bool fIsSupertype; bool fIsSupertype;
bool fFlat; bool fFlat;
bool fShowIcon; bool fShowIcon;
bool fApplicationMode;
}; };
class MimeTypeListView : public BOutlineListView { class MimeTypeListView : public BOutlineListView {