diff --git a/data/artwork/icons/Tracker_move b/data/artwork/icons/Tracker_move new file mode 100644 index 0000000000..e0dfc1b11a Binary files /dev/null and b/data/artwork/icons/Tracker_move differ diff --git a/src/kits/tracker/StatusWindow.cpp b/src/kits/tracker/StatusWindow.cpp index 3913758f18..6388b7cf2a 100644 --- a/src/kits/tracker/StatusWindow.cpp +++ b/src/kits/tracker/StatusWindow.cpp @@ -447,7 +447,7 @@ BStatusView::BStatusView(BRect bounds, thread_id thread, StatusWindowState type) SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); SetLowColor(ViewColor()); SetHighColor(20, 20, 20); - SetDrawingMode(B_OP_OVER); + SetDrawingMode(B_OP_ALPHA); const float buttonWidth = 22; const float buttonHeight = 20; @@ -465,23 +465,23 @@ BStatusView::BStatusView(BRect bounds, thread_id thread, StatusWindowState type) switch (type) { case kCopyState: caption = B_TRANSLATE("Preparing to copy items" B_UTF8_ELLIPSIS); - id = R_CopyStatusBitmap; + id = R_CopyStatusIcon; break; case kMoveState: caption = B_TRANSLATE("Preparing to move items" B_UTF8_ELLIPSIS); - id = R_MoveStatusBitmap; + id = R_MoveStatusIcon; break; case kCreateLinkState: caption = B_TRANSLATE("Preparing to create links" B_UTF8_ELLIPSIS); - id = R_MoveStatusBitmap; + id = R_MoveStatusIcon; break; case kTrashState: caption = B_TRANSLATE("Preparing to empty Trash" B_UTF8_ELLIPSIS); - id = R_TrashStatusBitmap; + id = R_TrashIcon; break; case kVolumeState: @@ -492,7 +492,7 @@ BStatusView::BStatusView(BRect bounds, thread_id thread, StatusWindowState type) case kDeleteState: caption = B_TRANSLATE("Preparing to delete items" B_UTF8_ELLIPSIS); - id = R_TrashStatusBitmap; + id = R_TrashIcon; break; case kRestoreFromTrashState: @@ -525,8 +525,9 @@ BStatusView::BStatusView(BRect bounds, thread_id thread, StatusWindowState type) } if (id != 0) { - GetTrackerResources()->GetBitmapResource(B_MESSAGE_TYPE, id, - &fBitmap); + fBitmap = new BBitmap(BRect(0, 0, 16, 16), B_RGBA32); + GetTrackerResources()->GetIconResource(id, B_MINI_ICON, + fBitmap); } rect = Bounds(); diff --git a/src/kits/tracker/TrackerIcons.h b/src/kits/tracker/TrackerIcons.h index d7f4b79f56..07b7e4c76f 100644 --- a/src/kits/tracker/TrackerIcons.h +++ b/src/kits/tracker/TrackerIcons.h @@ -64,6 +64,8 @@ enum { R_PersonDirIcon = 1031, R_UtilDirIcon = 1032, R_ConfigDirIcon = 1033, + R_MoveStatusIcon = 1039, + R_CopyStatusIcon = 1040, R_MICN_AppIcon = 1000, R_MICN_FileIcon = 1001, R_MICN_TrashIcon = 1003, diff --git a/src/kits/tracker/TrackerIcons.rdef b/src/kits/tracker/TrackerIcons.rdef index 092c9cc2f6..e84cf99fb7 100644 --- a/src/kits/tracker/TrackerIcons.rdef +++ b/src/kits/tracker/TrackerIcons.rdef @@ -180,6 +180,39 @@ resource(R_ConfigDirIcon) #'VICN' array { $"000207081815FF01178400040A0002070818001501178600040A0702070800" }; +resource(R_MoveStatusIcon) #'VICN' array { + $"6E6369660B0500020006023841813C9B3BBEAB393A4F584B254D4A7AEB00FFE2" + $"ACFFF49806020016022C60673CAAABBEBB082E6EFB4BBA064A22B000FFFF8E02" + $"0006022C25F43C6917BEBB082E6EFB4BAFBF497E0B00FACE79FFBC410503A03D" + $"03020016023AE3B43C79DCBE5BC53CC0974B42AC47CA41009AFF500401650500" + $"020106023E387C38E5D3B893663DF2A44467C04989F300FBF5AAFFFFC0000200" + $"1202BCA6D53C2975BC8711BD19A64B51764AA2D23501FFFF012F04018C0A0A06" + $"4A5D505D545958595E53504F0A04232F2D494A5B463E0A04232F463E4A5BC323" + $"3C0A063A282E494A5A5C2C502A4C2C0A04302B30494A5951360A04302B51364A" + $"5954BB1E0A0A232F2D494A5B5C2C502A4C2C3A28382D302BB957BAA70A042135" + $"214F3D5D3D430A043F415231533340430604BE3E5E475A465B48594757485846" + $"563E540E0A060100023F086B0000000000003F086BBDFCD847D6070A0001061A" + $"3F086B0000000000003F086BBDFCD847D60715FF01178400040A0001061A3F08" + $"6B0000000000003F086BBDFCD847D607001501178600040A030103023F086B00" + $"00000000003F086BBDFCD847D6070A020104023F086B0000000000003F086BBD" + $"FCD847D6070A050105023F086B0000000000003F086BBDFCD847D6070A010101" + $"023F086B0000000000003F086BBDFCD847D6070A040102023F086B0000000000" + $"003F086BBDFCD847D6070A0A0109023FAE91BA5BB83A5BB83FAE91464616C79D" + $"770A080107023FAE91BA5BB83A5BB83FAE914680FFC7A6E60A070107123FAE91" + $"BA5BB83A5BB83FAE914680FFC7A6E601178222040A0901080240335FBBAD8D3C" + $"01213F989A430BA94726C00A090108024010F2BAA5963AA5964010F2C8DF97C9" + $"10E30A090108024010F2BA9A893AA59640085243EDDAC7DE06" +}; + +resource(R_CopyStatusIcon) #'VICN' array { + $"6E636966040500020106023E387C38E5D3B893663DF2A44467C04989F300FBF5" + $"AAFFFFC00002001202BCA6D53C2975BC8711BD19A64B51764AA2D20001FFFF01" + $"2F04018C030A042135214F3D5D3D430A043F415231533340430604BE3E5E475A" + $"465B48594757485846563E54090A030102201F200A03010220370C0A01010020" + $"380D0A00010030380D01178222040A010100000A0001001001178222040A0201" + $"01000A020101023EC1AB0000000000003E99EF481CBB49E7A20A020101200512" +}; + resource(R_DownloadDirIcon) #'VICN' array { $"6E6369660B0500020006023841813C9B3BBEAB393A4F584B254D4A7AEB00FFE2" $"ACFFF49806020016022C60673CAAABBEBB082E6EFB4BBA064A22B000FFFF8E02"