Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaned up legacy icon mappings and add some missing resource definitions to 

TrackerIcons.h. Also removed the setup for the folder icon mimetype in 
TrackerInitialState, as it was using a non-existent resource ID to do so with.



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35118 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rene Gollent 2010-01-17 16:35:40 +00:00
parent 9760dcae20
commit aa61ee48ef
10 changed files with 51 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/kits/tracker/Bitmaps.h
View File

@ -47,58 +47,6 @@ class BBitmap;
namespace BPrivate {
// This maps the old tracker resource ID definitions to the new ones
// generated by QuickRes. Somebody want to go through the code and
// get rid of all these?
enum {
kResAppIcon = R_AppIcon,
kResFileIcon = R_FileIcon,
kResFolderIcon = 1,
kResTrashIcon = R_TrashIcon,
kResTrashFullIcon = R_TrashFullIcon,
kResQueryIcon = 2,
kResQueryTemplateIcon = 4,
kResPrinterIcon = R_PrinterIcon,
kResBarberPoleBitmap = R_BarberPoleBitmap,
kResFloppyIcon = R_FloppyIcon,
kResHardDiskIcon = 3,
kResCDIcon = R_CDIcon,
kResRootIcon = R_RootIcon,
kResBookmarkIcon = R_BookmarkIcon,
kResPersonIcon = R_PersonIcon,
kResBrokenLinkIcon = R_BrokenLinkIcon,
kResDeskIcon = R_DeskIcon,
kResHomeDirIcon = R_HomeDirIcon,
kResBeosFolderIcon = R_BeosFolderIcon,
kResBootVolumeIcon = R_BootVolumeIcon,
kResFontDirIcon = R_FontDirIcon,
kResAppsDirIcon = R_AppsDirIcon,
kResPrefsDirIcon = R_PrefsDirIcon,
kResMailDirIcon = R_MailDirIcon,
kResQueryDirIcon = R_QueryDirIcon,
kResSpoolFileIcon = R_SpoolFileIcon,
kResGenericPrinterIcon = R_GenericPrinterIcon,
kResDevelopDirIcon = R_DevelopDirIcon,
kResDownloadDirIcon = R_DownloadDirIcon,
kResPersonDirIcon = R_PersonDirIcon,
kResUtilDirIcon = R_UtilDirIcon,
kResConfigDirIcon = R_ConfigDirIcon,
kResMoveStatusBitmap = R_MoveStatusBitmap,
kResCopyStatusBitmap = R_CopyStatusBitmap,
kResTrashStatusBitmap = R_TrashStatusBitmap,
kResBackNavActive = R_ResBackNavActive,
kResBackNavInactive = R_ResBackNavInactive,
kResForwNavActive = R_ResForwNavActive,
kResForwNavInactive = R_ResForwNavInactive,
kResUpNavActive = R_ResUpNavActive,
kResUpNavInactive = R_ResUpNavInactive,
kResBackNavActiveSel = R_ResBackNavActiveSel,
kResForwNavActiveSel = R_ResForwNavActiveSel,
kResUpNavActiveSel = R_ResUpNavActiveSel,
kResShareIcon = R_ShareIcon
};
class BImageResources
{
// convenience class for accessing

2
src/kits/tracker/CountView.cpp
View File

@ -62,7 +62,7 @@ BCountView::BCountView(BRect bounds, BPoseView* view)
fTypeAheadString("")
{
GetTrackerResources()->GetBitmapResource(B_MESSAGE_TYPE,
kResBarberPoleBitmap, &fBarberPoleMap);
R_BarberPoleBitmap, &fBarberPoleMap);
}

12
src/kits/tracker/FSUtils.cpp
View File

@ -2389,18 +2389,18 @@ FSGetDeskDir(BDirectory *deskDir)
size_t size;
const void* data = GetTrackerResources()->
LoadResource('ICON', kResDeskIcon, &size);
LoadResource('ICON', R_DeskIcon, &size);
if (data != NULL)
deskDir->WriteAttr(kAttrLargeIcon, 'ICON', 0, data, size);
data = GetTrackerResources()->
LoadResource('MICN', kResDeskIcon, &size);
LoadResource('MICN', R_DeskIcon, &size);
if (data != NULL)
deskDir->WriteAttr(kAttrMiniIcon, 'MICN', 0, data, size);
#ifdef __HAIKU__
data = GetTrackerResources()->
LoadResource(B_VECTOR_ICON_TYPE, kResDeskIcon, &size);
LoadResource(B_VECTOR_ICON_TYPE, R_DeskIcon, &size);
if (data != NULL)
deskDir->WriteAttr(kAttrIcon, B_VECTOR_ICON_TYPE, 0, data, size);
#endif
@ -2855,20 +2855,20 @@ FSCreateTrashDirs()
size_t size;
const void* data = GetTrackerResources()->
LoadResource('ICON', kResTrashIcon, &size);
LoadResource('ICON', R_TrashIcon, &size);
if (data != NULL) {
trashDir.WriteAttr(kAttrLargeIcon, 'ICON', 0,
data, size);
}
data = GetTrackerResources()->
LoadResource('MICN', kResTrashIcon, &size);
LoadResource('MICN', R_TrashIcon, &size);
if (data != NULL) {
trashDir.WriteAttr(kAttrMiniIcon, 'MICN', 0,
data, size);
}
#ifdef __HAIKU
data = GetTrackerResources()->
LoadResource(B_VECTOR_ICON_TYPE, kResTrashIcon, &size);
LoadResource(B_VECTOR_ICON_TYPE, R_TrashIcon, &size);
if (data != NULL) {
trashDir.WriteAttr(kAttrIcon, B_VECTOR_ICON_TYPE, 0,
data, size);

28
src/kits/tracker/IconCache.cpp
View File

@ -561,7 +561,7 @@ IconCache::GetVolumeIcon(AutoLock<SimpleIconCache> *nodeCacheLocker,
if (volume.IsShared()) {
// Check if it's a network share and give it a special icon
BBitmap *bitmap = lazyBitmap->Get();
GetTrackerResources()->GetIconResource(kResShareIcon, size, bitmap);
GetTrackerResources()->GetIconResource(R_ShareIcon, size, bitmap);
if (!entry) {
PRINT_ADD_ITEM(("File %s; Line %d # adding entry for model %s\n",
__FILE__, __LINE__, model->Name()));
@ -649,58 +649,58 @@ IconCache::GetWellKnownIcon(AutoLock<SimpleIconCache> *,
int32 resid = -1;
switch (wellKnownEntry->which) {
case B_BOOT_DISK:
resid = kResBootVolumeIcon;
resid = R_BootVolumeIcon;
break;
case B_BEOS_DIRECTORY:
resid = kResBeosFolderIcon;
resid = R_BeosFolderIcon;
break;
case B_USER_DIRECTORY:
resid = kResHomeDirIcon;
resid = R_HomeDirIcon;
break;
case B_BEOS_FONTS_DIRECTORY:
case B_COMMON_FONTS_DIRECTORY:
case B_USER_FONTS_DIRECTORY:
resid = kResFontDirIcon;
resid = R_FontDirIcon;
break;
case B_BEOS_APPS_DIRECTORY:
case B_APPS_DIRECTORY:
case B_USER_DESKBAR_APPS_DIRECTORY:
resid = kResAppsDirIcon;
resid = R_AppsDirIcon;
break;
case B_BEOS_PREFERENCES_DIRECTORY:
case B_PREFERENCES_DIRECTORY:
case B_USER_DESKBAR_PREFERENCES_DIRECTORY:
resid = kResPrefsDirIcon;
resid = R_PrefsDirIcon;
break;
case B_USER_MAIL_DIRECTORY:
resid = kResMailDirIcon;
resid = R_MailDirIcon;
break;
case B_USER_QUERIES_DIRECTORY:
resid = kResQueryDirIcon;
resid = R_QueryDirIcon;
break;
case B_COMMON_DEVELOP_DIRECTORY:
case B_USER_DESKBAR_DEVELOP_DIRECTORY:
resid = kResDevelopDirIcon;
resid = R_DevelopDirIcon;
break;
case B_USER_CONFIG_DIRECTORY:
resid = kResConfigDirIcon;
resid = R_ConfigDirIcon;
break;
case B_USER_PEOPLE_DIRECTORY:
resid = kResPersonDirIcon;
resid = R_PersonDirIcon;
break;
case B_USER_DOWNLOADS_DIRECTORY:
resid = kResDownloadDirIcon;
resid = R_DownloadDirIcon;
break;
default:
@ -834,7 +834,7 @@ IconCache::GetFallbackIcon(AutoLock<SimpleIconCache> *sharedCacheLocker,
model->PreferredAppSignature());
BBitmap *bitmap = lazyBitmap->Get();
GetTrackerResources()->GetIconResource(kResFileIcon, size, bitmap);
GetTrackerResources()->GetIconResource(R_FileIcon, size, bitmap);
entry->SetIcon(lazyBitmap->Adopt(), kNormalIcon, size);
if (mode != kNormalIcon) {

2
src/kits/tracker/MountMenu.cpp
View File

@ -198,7 +198,7 @@ MountMenu::AddDynamicItem(add_state)
}
// Use the shared icon instead of the device icon
if (get_device_icon(info.device_name, icon->Bits(), B_MINI_ICON) != B_OK)
GetTrackerResources()->GetIconResource(kResShareIcon, B_MINI_ICON, icon);
GetTrackerResources()->GetIconResource(R_ShareIcon, B_MINI_ICON, icon);
BMessage *message = new BMessage(kUnmountVolume);
message->AddInt32("device_id", volume.Device());

12
src/kits/tracker/Navigator.cpp
View File

@ -136,20 +136,20 @@ BNavigator::BNavigator(const Model *model, BRect rect, uint32 resizeMask)
// Set up widgets
fBack = new BNavigatorButton(BRect(3, top, 21, top + 17), "Back",
new BMessage(kNavigatorCommandBackward), kResBackNavActiveSel,
kResBackNavActive, kResBackNavInactive);
new BMessage(kNavigatorCommandBackward), R_ResBackNavActiveSel,
R_ResBackNavActive, R_ResBackNavInactive);
fBack->SetEnabled(false);
AddChild(fBack);
fForw = new BNavigatorButton(BRect(35, top, 53, top + 17), "Forw",
new BMessage(kNavigatorCommandForward), kResForwNavActiveSel,
kResForwNavActive, kResForwNavInactive);
new BMessage(kNavigatorCommandForward), R_ResForwNavActiveSel,
R_ResForwNavActive, R_ResForwNavInactive);
fForw->SetEnabled(false);
AddChild(fForw);
fUp = new BNavigatorButton(BRect(67, top, 84, top + 17), "Up",
new BMessage(kNavigatorCommandUp), kResUpNavActiveSel,
kResUpNavActive, kResUpNavInactive);
new BMessage(kNavigatorCommandUp), R_ResUpNavActiveSel,
R_ResUpNavActive, R_ResUpNavInactive);
fUp->SetEnabled(false);
AddChild(fUp);

10
src/kits/tracker/StatusWindow.cpp
View File

@ -410,22 +410,22 @@ BStatusView::BStatusView(BRect bounds, thread_id thread,
switch (type) {
case kCopyState:
caption = "Preparing to copy items" B_UTF8_ELLIPSIS;
id = kResCopyStatusBitmap;
id = R_CopyStatusBitmap;
break;
case kMoveState:
caption = "Preparing to move items" B_UTF8_ELLIPSIS;
id = kResMoveStatusBitmap;
id = R_MoveStatusBitmap;
break;
case kCreateLinkState:
caption = "Preparing to create links" B_UTF8_ELLIPSIS;
id = kResMoveStatusBitmap;
id = R_MoveStatusBitmap;
break;
case kTrashState:
caption = "Preparing to empty Trash" B_UTF8_ELLIPSIS;
id = kResTrashStatusBitmap;
id = R_TrashStatusBitmap;
break;
case kVolumeState:
@ -434,7 +434,7 @@ BStatusView::BStatusView(BRect bounds, thread_id thread,
case kDeleteState:
caption = "Preparing to delete items" B_UTF8_ELLIPSIS;
id = kResTrashStatusBitmap;
id = R_TrashStatusBitmap;
break;
case kRestoreFromTrashState:

4
src/kits/tracker/TrackerIcons.h
View File

@ -33,6 +33,10 @@ All rights reserved.
*/
enum {
R_QueryIcon = 2,
R_HardDiskIcon = 3,
R_QueryTemplateIcon = 4,
R_SymlinkIcon = 6,
R_AppIcon = 1000,
R_FileIcon = 1001,
R_TrashIcon = 1003,

25
src/kits/tracker/TrackerInitialState.cpp
View File

@ -400,31 +400,28 @@ TTracker::InstallMimeIfNeeded(const char *type, int32 bitsID,
void
TTracker::InitMimeTypes()
{
InstallMimeIfNeeded(B_DIR_MIMETYPE, kResFolderIcon, "Folder",
"Folder container for file system items.", kTrackerSignature);
InstallMimeIfNeeded(B_APP_MIME_TYPE, kResAppIcon, "Be Application",
InstallMimeIfNeeded(B_APP_MIME_TYPE, R_AppIcon, "Be Application",
"Generic Be application executable.", kTrackerSignature);
InstallMimeIfNeeded(B_FILE_MIMETYPE, kResFileIcon,
InstallMimeIfNeeded(B_FILE_MIMETYPE, R_FileIcon,
"Generic file", "Generic document file.", kTrackerSignature);
InstallMimeIfNeeded(B_VOLUME_MIMETYPE, kResHardDiskIcon,
InstallMimeIfNeeded(B_VOLUME_MIMETYPE, R_HardDiskIcon,
"Be Volume", "Disk volume.", kTrackerSignature);
InstallMimeIfNeeded(B_QUERY_MIMETYPE, kResQueryIcon,
InstallMimeIfNeeded(B_QUERY_MIMETYPE, R_QueryDirIcon,
"Be Query", "Query to locate items on disks.", kTrackerSignature);
InstallMimeIfNeeded(B_QUERY_TEMPLATE_MIMETYPE, kResQueryTemplateIcon,
InstallMimeIfNeeded(B_QUERY_TEMPLATE_MIMETYPE, R_QueryTemplateIcon,
"Be Query template", "", kTrackerSignature);
InstallMimeIfNeeded(B_LINK_MIMETYPE, kResBrokenLinkIcon, "Symbolic link",
InstallMimeIfNeeded(B_LINK_MIMETYPE, R_BrokenLinkIcon, "Symbolic link",
"Link to another item in the file system.", kTrackerSignature);
InstallMimeIfNeeded(B_ROOT_MIMETYPE, kResRootIcon,
InstallMimeIfNeeded(B_ROOT_MIMETYPE, R_RootIcon,
"Be Root", "File system root.", kTrackerSignature);
InstallMimeIfNeeded(B_BOOKMARK_MIMETYPE, kResBookmarkIcon,
InstallMimeIfNeeded(B_BOOKMARK_MIMETYPE, R_BookmarkIcon,
"Bookmark", "Bookmark for a web page.", kNetPositiveSignature);
{
@ -439,7 +436,7 @@ TTracker::InitMimeTypes()
130, B_ALIGN_LEFT, false);
}
InstallMimeIfNeeded(B_PERSON_MIMETYPE, kResPersonIcon,
InstallMimeIfNeeded(B_PERSON_MIMETYPE, R_PersonIcon,
"Person", "Contact information for a person.", kPeopleSignature);
{
@ -474,7 +471,7 @@ TTracker::InitMimeTypes()
120, B_ALIGN_LEFT, false);
}
InstallMimeIfNeeded(B_PRINTER_SPOOL_MIMETYPE, kResSpoolFileIcon,
InstallMimeIfNeeded(B_PRINTER_SPOOL_MIMETYPE, R_SpoolFileIcon,
"Printer spool", "Printer spool file.", "application/x-vnd.Be-PRNT");
{
@ -503,7 +500,7 @@ TTracker::InitMimeTypes()
#endif
}
InstallMimeIfNeeded(B_PRINTER_MIMETYPE, kResGenericPrinterIcon,
InstallMimeIfNeeded(B_PRINTER_MIMETYPE, R_GenericPrinterIcon,
"Printer", "Printer queue.", kTrackerSignature /*application/x-vnd.Be-PRNT*/);
// for now set tracker as a default handler for the printer because we
// just want to open it as a folder

6
src/kits/tracker/TrashWatcher.cpp
View File

@ -164,15 +164,15 @@ BTrashWatcher::UpdateTrashIcons()
size_t largeSize = 0;
size_t smallSize = 0;
const void *largeData = GetTrackerResources()->LoadResource('ICON',
fTrashFull ? kResTrashFullIcon : kResTrashIcon, &largeSize);
fTrashFull ? R_TrashFullIcon : R_TrashIcon, &largeSize);
const void *smallData = GetTrackerResources()->LoadResource('MICN',
fTrashFull ? kResTrashFullIcon : kResTrashIcon, &smallSize);
fTrashFull ? R_TrashFullIcon : R_TrashIcon, &smallSize);
#ifdef HAIKU_TARGET_PLATFORM_HAIKU
size_t vectorSize = 0;
const void *vectorData = GetTrackerResources()->LoadResource(
B_VECTOR_ICON_TYPE, fTrashFull ? kResTrashFullIcon : kResTrashIcon,
B_VECTOR_ICON_TYPE, fTrashFull ? R_TrashFullIcon : R_TrashIcon,
&vectorSize);
if (vectorData)