[haiku-commits] r42706 - haiku/trunk/src/apps/processcontroller

From: philippe.houdoin@xxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Fri, 2 Sep 2011 08:02:37 +0200 (CEST)
Author: phoudoin
Date: 2011-09-02 08:02:36 +0200 (Fri, 02 Sep 2011)
New Revision: 42706
Changeset: https://dev.haiku-os.org/changeset/42706
Ticket: https://dev.haiku-os.org/ticket/7219

Modified:
   haiku/trunk/src/apps/processcontroller/AutoIcon.cpp
   haiku/trunk/src/apps/processcontroller/PCWorld.h
   haiku/trunk/src/apps/processcontroller/Utilities.h
   haiku/trunk/src/apps/processcontroller/icons.h
Log:
Remove last usage of hardcoded k_app_mini old BeOS generic app icon.
That should gracefully close #7219.


Modified: haiku/trunk/src/apps/processcontroller/AutoIcon.cpp
===================================================================
--- haiku/trunk/src/apps/processcontroller/AutoIcon.cpp 2011-09-01 15:27:57 UTC 
(rev 42705)
+++ haiku/trunk/src/apps/processcontroller/AutoIcon.cpp 2011-09-02 06:02:36 UTC 
(rev 42706)
@@ -23,6 +23,7 @@
 
 #include <Bitmap.h>
 #include <Entry.h>
+#include <MimeType.h>
 #include <NodeInfo.h>
 #include <Roster.h>
 
@@ -45,8 +46,10 @@
                if (fSignature) {
                        entry_ref ref;
                        be_roster->FindApp (fSignature, &ref);
-                       if (BNodeInfo::GetTrackerIcon(&ref, fBitmap, 
B_MINI_ICON) != B_OK)
-                               fBitmap->SetBits(k_app_mini, 256, 0, B_CMAP8);
+                       if (BNodeInfo::GetTrackerIcon(&ref, fBitmap, 
B_MINI_ICON) != B_OK) {
+                               BMimeType genericAppType(B_APP_MIME_TYPE);
+                               genericAppType.GetIcon(fBitmap, B_MINI_ICON);
+                       }
                }
 
                if (fbits)

Modified: haiku/trunk/src/apps/processcontroller/PCWorld.h
===================================================================
--- haiku/trunk/src/apps/processcontroller/PCWorld.h    2011-09-01 15:27:57 UTC 
(rev 42705)
+++ haiku/trunk/src/apps/processcontroller/PCWorld.h    2011-09-02 06:02:36 UTC 
(rev 42706)
@@ -35,7 +35,6 @@
 extern const int kCurrentVersion;
 
 
-extern const uchar k_app_mini[];
 extern const char* kProgramName;
 extern const char* kPCSemaphoreName;
 

Modified: haiku/trunk/src/apps/processcontroller/Utilities.h
===================================================================
--- haiku/trunk/src/apps/processcontroller/Utilities.h  2011-09-01 15:27:57 UTC 
(rev 42705)
+++ haiku/trunk/src/apps/processcontroller/Utilities.h  2011-09-02 06:02:36 UTC 
(rev 42706)
@@ -44,6 +44,5 @@
 void make_window_visible(BWindow* window, bool mayResize = false);
 
 extern const uchar k_cpu_mini[];
-extern const uchar k_app_mini[];
 
 #endif // UTILITIES_H

Modified: haiku/trunk/src/apps/processcontroller/icons.h
===================================================================
--- haiku/trunk/src/apps/processcontroller/icons.h      2011-09-01 15:27:57 UTC 
(rev 42705)
+++ haiku/trunk/src/apps/processcontroller/icons.h      2011-09-02 06:02:36 UTC 
(rev 42706)
@@ -17,17 +17,6 @@
        Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA       
 */
 
-const uchar k_app_mini[] = 
{0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0,0x0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-0x0,0xfa,0xfa,0x0,0x0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0,0xfa,0xfa,0xfa,0xfa,0xfa,0x0,0x0,0xff,0xff,0xff,0xff,0xff,
-0xff,0xff,0x0,0x1f,0xfa,0xfa,0xfa,0xfa,0x1f,0x5d,0x0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0,0xf9,0x1f,0x1f,0xfa,0x1f,0x5d,0x5d,0x0,0xff,
-0xff,0xff,0xff,0xff,0xff,0x0,0x0,0xf9,0xf9,0xf9,0x1f,0x5d,0x5d,0x5d,0x0,0xff,0xff,0xff,0xff,0xff,0x0,0x60,0x1,0xf9,0xf9,0xf9,0xf9,0x5d,
-0x5d,0x5d,0x0,0x0,0xff,0xff,0xff,0x0,0x60,0x60,0x1,0xf9,0xf9,0xf9,0xf9,0x5d,0x5d,0x5d,0x0,0xa3,0x0,0x0,0x0,0x1f,0x60,0x60,0x60,0x1,0xf9,
-0xf9,0xf9,0x5d,0x5d,0x0,0xa3,0x1f,0x2d,0x0,0x0,0x86,0x1f,0x1f,0x60,0x1f,0x0,0x0,0xf9,0x5d,0x0,0xa3,0x1f,0x2d,0x2d,0x0,0x0,0x86,0x86,
-0x86,0x1f,0xd5,0x27,0x0,0x0,0x0,0xa3,0x1f,0x2d,0x2d,0x2e,0x0,0x0,0x86,0x86,0x86,0x86,0xd5,0x28,0x1,0xca,0xca,0xa3,0xa3,0x2d,0x2d,0x2e,
-0x0,0x0,0x86,0x86,0x86,0x86,0xd5,0xd5,0x0,0xca,0xa3,0xa3,0xa3,0x2d,0x2d,0x2d,0x0,0x0,0x86,0x86,0x86,0x86,0xd5,0xd5,0x0,0xa3,0xa3,0xa3,
-0xa3,0x2d,0x2d,0x2e,0x1,0xff,0x0,0x0,0x86,0x86,0xd5,0xd5,0x1,0x0,0x0,0xa3,0xa3,0x2d,0x2e,0x0,0x11,0xff,0xff,0xff,0x0,0x0,0x0,0x0,0x11,
-0x11,0xff,0x0,0x0,0x0,0x0,0x11,0x11};
-
 const uchar k_cpu_mini[] = {
        0xFF, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 
0x00, 0xFF, 0xFF, 0xFF,
        0xFF, 0x0B, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 
0x09, 0x09, 0xFF, 0xFF,
[haiku-commits] r42706 - haiku/trunk/src/apps/processcontroller

Other related posts:
