Changeset 16909

Timestamp:

03/28/06 06:32:21 (3 years ago)

Author:

axeld

Message:

* Tracker wrote icons with the wrong type at several places.
* Also replaced all B_COLOR_8_BIT with the B_CMAP8 constant.

Location:

haiku/trunk/src/kits/tracker

Files:

• FSUtils.cpp (modified) (6 diffs)
• FavoritesConfig.cpp (modified) (2 diffs)
• IconMenuItem.cpp (modified) (9 diffs)
• Model.cpp (modified) (1 diff)
• MountMenu.cpp (modified) (2 diffs)
• TrackerInitialState.cpp (modified) (1 diff)
• Utilities.cpp (modified) (91 diffs)
• Utilities.h (modified) (1 diff)

haiku/trunk/src/kits/tracker/FSUtils.cpp

@@ -2127 +2127 @@
         if (result != B_OK)
                 return result;
-                
+
         BPath path;
         result = find_directory(B_DESKTOP_DIRECTORY, &path, true, &volume);
@@ -2148 +2148 @@
 
         if (data)
-                deskDir->WriteAttr(kAttrLargeIcon, B_COLOR_8_BIT_TYPE, 0, data, size);
+                deskDir->WriteAttr(kAttrLargeIcon, 'ICON', 0, data, size);
 
         data = GetTrackerResources()->
@@ -2154 +2154 @@
 
         if (data)
-                deskDir->WriteAttr(kAttrMiniIcon, B_COLOR_8_BIT_TYPE, 0, data, size);
-        
+                deskDir->WriteAttr(kAttrMiniIcon, 'MICN', 0, data, size);
+
         return B_OK;
 }
@@ -2632 +2632 @@
         roster.Rewind();
         while (roster.GetNextVolume(&volume) == B_OK) {
-                
                 if (volume.IsReadOnly() || !volume.IsPersistent())
                         continue;
-                
+
                 BPath path;
                 find_directory(B_DESKTOP_DIRECTORY, &path, true, &volume);
@@ -2646 +2645 @@
                                 LoadResource('ICON', kResTrashIcon, &size);
                         if (data) {
-                                trashDir.WriteAttr(kAttrLargeIcon, B_COLOR_8_BIT_TYPE, 0,
+                                trashDir.WriteAttr(kAttrLargeIcon, 'ICON', 0,
                                         data, size);
                         }
@@ -2652 +2651 @@
                                 LoadResource('MICN', kResTrashIcon, &size);
                         if (data) {
-                                trashDir.WriteAttr(kAttrMiniIcon, B_COLOR_8_BIT_TYPE, 0,
+                                trashDir.WriteAttr(kAttrMiniIcon, 'MICN', 0,
                                         data, size);
                         }

haiku/trunk/src/kits/tracker/FavoritesConfig.cpp

@@ -1050 +1050 @@
                 SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 
-        fIcon = new BBitmap(BRect(0, 0, 31, 31), B_COLOR_8_BIT);
-        fIcon->SetBits(kLargeNewGroupIcon, fIcon->BitsLength(), 0, B_COLOR_8_BIT);
+        fIcon = new BBitmap(BRect(0, 0, 31, 31), B_CMAP8);
+        fIcon->SetBits(kLargeNewGroupIcon, fIcon->BitsLength(), 0, B_CMAP8);
         //      calculate correct frame for icon and label
         //      sets icon rect and label rect for drawing
@@ -1251 +1251 @@
 
         //      cache the new group icon
-        fSmallGroupIcon = new BBitmap(BRect(0, 0, 15, 15), B_COLOR_8_BIT);
+        fSmallGroupIcon = new BBitmap(BRect(0, 0, 15, 15), B_CMAP8);
         fSmallGroupIcon->SetBits(kSmallNewGroupIcon, fSmallGroupIcon->BitsLength(),
-                0, B_COLOR_8_BIT);
+                0, B_CMAP8);
 
         //      cache the symlink icon
         BMimeType symlink("application/x-vnd.Be-symlink");
         if (symlink.InitCheck() == B_OK) {
-                fSymlinkIcon = new BBitmap(BRect(0, 0, 15, 15), B_COLOR_8_BIT);
+                fSymlinkIcon = new BBitmap(BRect(0, 0, 15, 15), B_CMAP8);
                 if (symlink.GetIcon(fSymlinkIcon, B_MINI_ICON) != B_OK)
                         fSymlinkIcon = NULL;            

haiku/trunk/src/kits/tracker/IconMenuItem.cpp

@@ -35 +35 @@
 // menu items with small icons.
 
+#include "IconCache.h"
+#include "IconMenuItem.h"
+
 #include <Debug.h>
 #include <Menu.h>
 #include <NodeInfo.h>
 
-#include "IconCache.h"
-#include "IconMenuItem.h"
-
 
 ModelMenuItem::ModelMenuItem(const Model *model, const char *title,
-        BMessage *message, char shortcut, uint32 modifiers,
-        bool drawText, bool extraPad)
-        :       BMenuItem(title, message, shortcut, modifiers),
-                fModel(*model),
-                fHeightDelta(0),
-                fDrawText(drawText),
-                fExtraPad(extraPad)
+                BMessage *message, char shortcut, uint32 modifiers,
+                bool drawText, bool extraPad)
+        : BMenuItem(title, message, shortcut, modifiers),
+        fModel(*model),
+        fHeightDelta(0),
+        fDrawText(drawText),
+        fExtraPad(extraPad)
 {
         ThrowOnInitCheckError(&fModel);
-        //      The 'fExtraPad' field is used to when this menu item is added to
-        //      a menubar instead of a menu. Menus and MenuBars space out items
-        //      differently (more space around items in a menu). This class wants
-        //      to be able to space item the same, no matter where they are. The
-        //      fExtraPad field allows for that.
+        // The 'fExtraPad' field is used to when this menu item is added to
+        // a menubar instead of a menu. Menus and MenuBars space out items
+        // differently (more space around items in a menu). This class wants
+        // to be able to space item the same, no matter where they are. The
+        // fExtraPad field allows for that.
 
         if (model->IsRoot())
@@ -190 +190 @@
         clone.AddPointer("source", this);
 
-        if ((modifiers() & B_OPTION_KEY) == 0)
+        if ((modifiers() & B_OPTION_KEY) == 0) {
                 // if option not held, remove refs to close to prevent closing
                 // parent window
                 clone.RemoveData("nodeRefsToClose");
+        }
 
         return BInvoker::Invoke(&clone);
@@ -227 +228 @@
 
 IconMenuItem::IconMenuItem(const char *label, BMessage *message, BBitmap *icon)
-        :       PositionPassingMenuItem(label, message),
-                fDeviceIcon(icon)
+        : PositionPassingMenuItem(label, message),
+        fDeviceIcon(icon)
 {
         // IconMenuItem is used in synchronously invoked menus, make sure
@@ -237 +238 @@
 
 IconMenuItem::IconMenuItem(const char *label, BMessage *message,
-        const BNodeInfo *nodeInfo, icon_size which)
-        :       PositionPassingMenuItem(label, message),
-                fDeviceIcon(NULL)
+                const BNodeInfo *nodeInfo, icon_size which)
+        : PositionPassingMenuItem(label, message),
+        fDeviceIcon(NULL)
 {
         if (nodeInfo) {
-                fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_COLOR_8_BIT);
+                fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_CMAP8);
                 if (nodeInfo->GetTrackerIcon(fDeviceIcon, B_MINI_ICON)) {
                         delete fDeviceIcon;
@@ -248 +249 @@
                 }
         }
-        
+
         // IconMenuItem is used in synchronously invoked menus, make sure
         // we invoke with a timeout
@@ -256 +257 @@
 
 IconMenuItem::IconMenuItem(const char *label, BMessage *message,
-        const char *iconType, icon_size which)
-        :       PositionPassingMenuItem(label, message),
-                fDeviceIcon(NULL)
+                const char *iconType, icon_size which)
+        : PositionPassingMenuItem(label, message),
+        fDeviceIcon(NULL)
 {
         BMimeType mime(iconType);
-        fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_COLOR_8_BIT);
+        fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_CMAP8);
 
         if (mime.GetIcon(fDeviceIcon, which) != B_OK) {
@@ -267 +268 @@
                 fDeviceIcon = NULL;
         }
-        
+
         // IconMenuItem is used in synchronously invoked menus, make sure
         // we invoke with a timeout
@@ -275 +276 @@
 
 IconMenuItem::IconMenuItem(BMenu *submenu, BMessage *message,
-        const char *iconType, icon_size which)
-        :       PositionPassingMenuItem(submenu, message),
-                fDeviceIcon(NULL)
+                const char *iconType, icon_size which)
+        : PositionPassingMenuItem(submenu, message),
+        fDeviceIcon(NULL)
 {
         BMimeType mime(iconType);
-        fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_COLOR_8_BIT);
+        fDeviceIcon = new BBitmap(BRect(0, 0, which - 1, which - 1), B_CMAP8);
 
         if (mime.GetIcon(fDeviceIcon, which) != B_OK) {
@@ -286 +287 @@
                 fDeviceIcon = NULL;
         }
-        
+
         // IconMenuItem is used in synchronously invoked menus, make sure
         // we invoke with a timeout

haiku/trunk/src/kits/tracker/Model.cpp

@@ -1328 +1328 @@
                 rect.Set(0, 0, B_LARGE_ICON - 1, B_LARGE_ICON - 1);
 
-        BBitmap bitmap(rect, B_COLOR_8_BIT);
+        BBitmap bitmap(rect, B_CMAP8);
 
         BModelOpener opener(this);

haiku/trunk/src/kits/tracker/MountMenu.cpp

@@ -79 +79 @@
         AddOneAsMenuItemParams *params = (AddOneAsMenuItemParams *)castToParams;
         BBitmap *icon = new BBitmap(BRect(0, 0, B_MINI_ICON - 1, B_MINI_ICON - 1),
-                B_COLOR_8_BIT);
+                B_CMAP8);
         get_device_icon(partition->GetDevice()->Name(), icon->Bits(), B_MINI_ICON);     
 
@@ -161 +161 @@
                 if (volume.IsShared()) {
                         needSeparator = true;
-                        BBitmap *icon = new BBitmap(BRect(0, 0, 15, 15), B_COLOR_8_BIT);
+                        BBitmap *icon = new BBitmap(BRect(0, 0, 15, 15), B_CMAP8);
                         fs_info info;
                         if (fs_stat_dev(volume.Device(), &info) != B_OK) {

haiku/trunk/src/kits/tracker/TrackerInitialState.cpp

@@ -159 +159 @@
         // be passed for attributes that don't matter; returns true if anything
         // had to be changed
-        BBitmap largeIcon(BRect(0, 0, 31, 31), B_COLOR_8_BIT);
-        BBitmap miniIcon(BRect(0, 0, 15, 15), B_COLOR_8_BIT);
+        BBitmap largeIcon(BRect(0, 0, 31, 31), B_CMAP8);
+        BBitmap miniIcon(BRect(0, 0, 15, 15), B_CMAP8);
         char tmp[B_MIME_TYPE_LENGTH];
 

haiku/trunk/src/kits/tracker/Utilities.cpp

@@ -75 +75 @@
 FILE *logFile = NULL;
 
+static const float kMinSeparatorStubX = 10;
+static const float kStubToStringSlotX = 5;
+
+
 namespace BPrivate {
 
 const rgb_color kBlack = {0, 0, 0, 255};
 const rgb_color kWhite = {255, 255, 255, 255};
+
 
 uint32
@@ -95 +100 @@
 }
 
+
 uint32
 AttrHashString(const char *string, uint32 type)
@@ -114 +120 @@
 }
 
+
 bool
 ValidateStream(BMallocIO *stream, uint32 key, int32 version)
@@ -127 +134 @@
 }
 
+
 void
 DisallowFilenameKeys(BTextView *textView)
@@ -133 +141 @@
         textView->DisallowChar('/');
 }
+
 
 void
@@ -150 +159 @@
 }       // namespace BPrivate
 
-void 
+
+void
 PoseInfo::EndianSwap(void *castToThis)
 {
@@ -160 +170 @@
         self->fInitedDirectory = SwapInt64(self->fInitedDirectory);
         swap_data(B_POINT_TYPE, &self->fLocation, sizeof(BPoint), B_SWAP_ALWAYS);
-        
+
         // do a sanity check on the icon position
         if (self->fLocation.x < -20000 || self->fLocation.x > 20000
@@ -171 +181 @@
 }
 
-void 
+
+void
 PoseInfo::PrintToStream()
 {
@@ -178 +189 @@
 }
 
+
 // #pragma mark -
 
-size_t 
+
+size_t
 ExtendedPoseInfo::Size() const
 {
@@ -186 +199 @@
 }
 
-size_t 
+
+size_t
 ExtendedPoseInfo::Size(int32 count)
 {
@@ -192 +206 @@
 }
 
-size_t 
+
+size_t
 ExtendedPoseInfo::SizeWithHeadroom() const
 {
@@ -198 +213 @@
 }
 
-size_t 
+
+size_t
 ExtendedPoseInfo::SizeWithHeadroom(size_t oldSize)
 {
@@ -206 +222 @@
         else
                 count = 0;
-                
+
         return Size(count + 1);
 }
@@ -214 +230 @@
 ExtendedPoseInfo::HasLocationForFrame(BRect frame) const
 {
-        for (int32 index = 0; index < fNumFrames; index++)
+        for (int32 index = 0; index < fNumFrames; index++) {
                 if (fLocations[index].fFrame == frame)
                         return true;
+        }
 
         return false;
 }
 
-BPoint 
+
+BPoint
 ExtendedPoseInfo::LocationForFrame(BRect frame) const
 {
-        for (int32 index = 0; index < fNumFrames; index++)
+        for (int32 index = 0; index < fNumFrames; index++) {
                 if (fLocations[index].fFrame == frame)
                         return fLocations[index].fLocation;
+        }
 
         TRESPASS();
@@ -232 +251 @@
 }
 
-bool 
+
+bool
 ExtendedPoseInfo::SetLocationForFrame(BPoint newLocation, BRect frame)
 {
-        for (int32 index = 0; index < fNumFrames; index++)
+        for (int32 index = 0; index < fNumFrames; index++) {
                 if (fLocations[index].fFrame == frame) {
                         if (fLocations[index].fLocation == newLocation)
                                 return false;
+
                         fLocations[index].fLocation = newLocation;
                         return true;
                 }
+        }
+
         fLocations[fNumFrames].fFrame = frame;
         fLocations[fNumFrames].fLocation = newLocation;
@@ -249 +272 @@
 }
 
-void 
+
+void
 ExtendedPoseInfo::EndianSwap(void *castToThis)
 {
@@ -258 +282 @@
         self->fWorkspaces = SwapUInt32(self->fWorkspaces);
         self->fNumFrames = SwapInt32(self->fNumFrames);
-        
+
         for (int32 index = 0; index < self->fNumFrames; index++) {
                 swap_data(B_POINT_TYPE, &self->fLocations[index].fLocation,
@@ -276 +300 @@
 }
 
-void 
+
+void
 ExtendedPoseInfo::PrintToStream()
 {
 }
 
+
 // #pragma mark -
 
+
 OffscreenBitmap::OffscreenBitmap(BRect frame)
-        :       fBitmap(NULL)
+        :
+        fBitmap(NULL)
 {
         NewBitmap(frame);
 }
 
+
 OffscreenBitmap::OffscreenBitmap()
-        :       fBitmap(NULL)
-{
-}
+        :
+        fBitmap(NULL)
+{
+}
+
 
 OffscreenBitmap::~OffscreenBitmap()
@@ -298 +329 @@
         delete fBitmap;
 }
+
 
 void
@@ -320 +352 @@
 }
 
+
 BView *
 OffscreenBitmap::BeginUsing(BRect frame)
@@ -325 +358 @@
         if (!fBitmap || fBitmap->Bounds() != frame)
                 NewBitmap(frame);
+
         fBitmap->Lock();
         return View();
 }
 
+
 void
 OffscreenBitmap::DoneUsing()
@@ -334 +369 @@
         fBitmap->Unlock();
 }
+
 
 BBitmap *
@@ -342 +378 @@
         return fBitmap;
 }
+
 
 BView *
@@ -433 +470 @@
 
 DraggableIcon::DraggableIcon(BRect rect, const char *name, const char *mimeType,
-        icon_size size, const BMessage *message, BMessenger target, uint32 resizeMask,
-        uint32 flags)
-        :       BView(rect, name, resizeMask, flags),
-                fMessage(*message),
-                fTarget(target)
+                icon_size size, const BMessage *message, BMessenger target,
+                uint32 resizeMask, uint32 flags)
+        : BView(rect, name, resizeMask, flags),
+        fMessage(*message),
+        fTarget(target)
 {
         fBitmap = new BBitmap(Bounds(), kDefaultIconDepth);
@@ -452 +489 @@
 
 
-void 
+DraggableIcon::~DraggableIcon()
+{
+        delete fBitmap;
+}
+
+
+void
 DraggableIcon::SetTarget(BMessenger target)
 {
@@ -458 +501 @@
 }
 
-DraggableIcon::~DraggableIcon()
-{
-        delete fBitmap;
-}
-
-BRect 
+
+BRect
 DraggableIcon::PreferredRect(BPoint offset, icon_size size)
 {
@@ -471 +510 @@
 }
 
-void 
+
+void
 DraggableIcon::AttachedToWindow()
 {
@@ -481 +521 @@
 }
 
-void 
+
+void
 DraggableIcon::MouseDown(BPoint point)
 {
@@ -502 +543 @@
         view->FillRect(view->Bounds());
         view->SetDrawingMode(B_OP_ALPHA);
-        view->SetHighColor(0, 0, 0, 128);       // set the level of transparency by
-                                                                                // value
+        view->SetHighColor(0, 0, 0, 128);
+                // set the level of transparency by value
         view->SetBlendingMode(B_CONSTANT_ALPHA, B_ALPHA_COMPOSITE);
         view->DrawBitmap(fBitmap);
@@ -511 +552 @@
 }
 
-bool 
+
+bool
 DraggableIcon::DragStarted(BMessage *)
 {
         return true;
 }
+
 
 void
@@ -524 +567 @@
 }
 
+
 // #pragma mark -
 
+
 FlickerFreeStringView::FlickerFreeStringView(BRect bounds, const char *name,
-        const char *text, uint32 resizeFlags, uint32 flags)
-        :       BStringView(bounds, name, text, resizeFlags, flags),
-                fBitmap(NULL),
-                fOrigBitmap(NULL)
-{
-}
+                const char *text, uint32 resizeFlags, uint32 flags)
+        : BStringView(bounds, name, text, resizeFlags, flags),
+        fBitmap(NULL),
+        fOrigBitmap(NULL)