From 4230183ded46826770f5c9ed1cc926350433eff3 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Wed, 4 Feb 2015 13:21:43 -0500
Subject: [PATCH] Tracker/StatusWindow: use vector icons.

Fixes #11711.
---
 data/artwork/icons/Tracker_move    | Bin 0 -> 15842 bytes
 src/kits/tracker/StatusWindow.cpp  |  17 ++++++++-------
 src/kits/tracker/TrackerIcons.h    |   2 ++
 src/kits/tracker/TrackerIcons.rdef |  33 +++++++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 8 deletions(-)
 create mode 100644 data/artwork/icons/Tracker_move

diff --git a/data/artwork/icons/Tracker_move b/data/artwork/icons/Tracker_move
new file mode 100644
index 0000000000000000000000000000000000000000..e0dfc1b11a6949d102e93158eb121ed2d8e6ac7b
GIT binary patch
literal 15842
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
U&^w_X-iOxhI6bm%SaU%6KT-Qxy8r+H

literal 0
HcmV?d00001

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"