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

Rewrote BNodeInfo::GetTrackerIcon().

Browse Source 
* Exit the function early in case of error, instead of maintaining the error
  until the end.
* Separate more clearly the condition that a file type is available at all
  versus not. This removes a redundancy when falling back to the generic
  file icon.
* Add retrieving the icon from the super type. Even check if there is a
  preferred app for the super type that supplies an icon before using the
  icon of the super type itself.

Hopefully I didn't introduce new errors, but that the super type icon was not
used was the main problem I tried to fix.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27990 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2008-10-12 11:12:14 +00:00
parent 868b22c5f8
commit 260da902db
1 changed files with 75 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/storage/NodeInfo.cpp
+75 -66
View File
@@ -728,7 +728,6 @@ BNodeInfo::GetTrackerIcon(BBitmap *icon, icon_size iconSize) const
return B_BAD_VALUE; return B_BAD_VALUE;
// set some icon size related variables // set some icon size related variables
status_t error = B_OK;
BRect bounds; BRect bounds;
switch (iconSize) { switch (iconSize) {
case B_MINI_ICON: case B_MINI_ICON:
@@ -745,87 +744,97 @@ BNodeInfo::GetTrackerIcon(BBitmap *icon, icon_size iconSize) const
} }
// check parameters and initialization // check parameters and initialization
if (error == B_OK if (icon->InitCheck() != B_OK || icon->Bounds() != bounds)
&& (icon->InitCheck() != B_OK || icon->Bounds() != bounds)) { return B_BAD_VALUE;
error = B_BAD_VALUE;
}
if (error == B_OK && InitCheck() != B_OK)
error = B_NO_INIT;
bool success = false; if (InitCheck() != B_OK)
return B_NO_INIT;
// get node MIME type, and, if that fails, the generic icon // Ask GetIcon() first.
if (GetIcon(icon, iconSize) == B_OK)
return B_OK;
// If not successful, see if the node has a type available at all. If no type
// is available, use one of the standard types depending on
status_t error = B_OK;
char mimeString[B_MIME_TYPE_LENGTH]; char mimeString[B_MIME_TYPE_LENGTH];
if (error == B_OK) { if (GetType(mimeString) != B_OK) {
if (GetType(mimeString) != B_OK) { // Get the icon from a mime type...
struct stat stat; BMimeType type;
error = fNode->GetStat(&stat);
if (error == B_OK) { struct stat stat;
// no type available -- get the icon for the appropriate type (file/dir/etc.) error = fNode->GetStat(&stat);
BMimeType type; if (error == B_OK) {
if (S_ISREG(stat.st_mode)) { // no type available -- get the icon for the appropriate type (file/dir/etc.)
// is it an application (executable) or just a regular file? if (S_ISREG(stat.st_mode)) {
if ((stat.st_mode & S_IXUSR) != 0) // is it an application (executable) or just a regular file?
type.SetTo(B_APP_MIME_TYPE); if ((stat.st_mode & S_IXUSR) != 0)
else type.SetTo(B_APP_MIME_TYPE);
type.SetTo(B_FILE_MIME_TYPE); else
} else if (S_ISDIR(stat.st_mode)) { type.SetTo(B_FILE_MIME_TYPE);
// it's either a volume or just a standard directory } else if (S_ISDIR(stat.st_mode)) {
fs_info info; // it's either a volume or just a standard directory
if (fs_stat_dev(stat.st_dev, &info) == 0 && stat.st_ino == info.root) fs_info info;
type.SetTo(B_VOLUME_MIME_TYPE); if (fs_stat_dev(stat.st_dev, &info) == 0 && stat.st_ino == info.root)
else type.SetTo(B_VOLUME_MIME_TYPE);
type.SetTo(B_DIRECTORY_MIME_TYPE); else
} else if (S_ISLNK(stat.st_mode)) type.SetTo(B_DIRECTORY_MIME_TYPE);
type.SetTo(B_SYMLINK_MIME_TYPE); } else if (S_ISLNK(stat.st_mode))
type.SetTo(B_SYMLINK_MIME_TYPE);
success = (type.GetIcon(icon, iconSize) == B_OK); } else {
// NOTE: if there is an icon but getting it failes for some reason, // GetStat() failed.
// the error is not reported, and the fall back retrieval methods // Return the icon for "application/octet-stream" from the MIME database.
// are still tried. (IAW, we can't differentiate the reason for error.) type.SetTo(B_FILE_MIME_TYPE);
}
} }
}
// Ask GetIcon(). return type.GetIcon(icon, iconSize);
if (error == B_OK && !success)
success = (GetIcon(icon, iconSize) == B_OK);
// Get the preferred application and ask the MIME database, if that } else {
// application has a special icon for the node's file type. // We know the mimetype of the node.
if (error == B_OK && !success) { bool success = false;
// Get the preferred application and ask the MIME database, if that
// application has a special icon for the node's file type.
char signature[B_MIME_TYPE_LENGTH]; char signature[B_MIME_TYPE_LENGTH];
if (GetPreferredApp(signature) == B_OK) { if (GetPreferredApp(signature) == B_OK) {
BMimeType type(signature); BMimeType type(signature);
success = (type.GetIconForType(mimeString, icon, iconSize) == B_OK); success = type.GetIconForType(mimeString, icon, iconSize) == B_OK;
} }
}
// Ask the MIME database whether there is an icon for the node's file type. // TODO: Confirm Tracker asks preferred app icons before asking mime icons.
BMimeType nodeType;
if (error == B_OK && !success) {
nodeType.SetTo(mimeString);
success = (nodeType.GetIcon(icon, iconSize) == B_OK);
}
// Ask the MIME database for the preferred application for the node's BMimeType nodeType(mimeString);
// file type and whether this application has a special icon for the type.
if (error == B_OK && !success) { // Ask the MIME database for the preferred application for the node's
char signature[B_MIME_TYPE_LENGTH]; // file type and whether this application has a special icon for the type.
if (nodeType.GetPreferredApp(signature) == B_OK) { if (!success && nodeType.GetPreferredApp(signature) == B_OK) {
BMimeType type(signature); BMimeType type(signature);
success = (type.GetIconForType(mimeString, icon, iconSize) == B_OK); success = type.GetIconForType(mimeString, icon, iconSize) == B_OK;
} }
// Ask the MIME database whether there is an icon for the node's file type.
if (!success)
success = nodeType.GetIcon(icon, iconSize) == B_OK;
// Get the super type if still no success.
BMimeType superType;
if (!success && nodeType.GetSupertype(&superType) == B_OK) {
// Ask the MIME database for the preferred application for the node's
// super type and whether this application has a special icon for the type.
if (superType.GetPreferredApp(signature) == B_OK) {
BMimeType type(signature);
success = type.GetIconForType(superType.Type(), icon, iconSize) == B_OK;
}
// Get the icon of the super type itself.
if (!success)
success = superType.GetIcon(icon, iconSize) == B_OK;
}
if (success)
return B_OK;
} }
// Return the icon for "application/octet-stream" from the MIME database. return B_ERROR;
if (error == B_OK && !success) {
// get the "application/octet-stream" icon
BMimeType type(B_FILE_MIME_TYPE);
error = type.GetIcon(icon, iconSize);
success = (error == B_OK);
}
return error;
} }
// GetTrackerIcon // GetTrackerIcon