Changeset 19870

Timestamp:

01/19/07 18:01:42 (22 months ago)

Author:

axeld

Message:

* To get away with that empty mount menu, it now at least shows all mounted and

mountable volumes - there are no icons yet, and it will also not work at all,
that is, you cannot mount/unmount any volumes yet.

* Got rid of _INCLUDES_CLASS_DEVICE_MAP in MountMenu.cpp.

Location:

haiku/trunk/src/kits/tracker

Files:

• Jamfile (modified) (1 diff)
• MountMenu.cpp (modified) (9 diffs)

haiku/trunk/src/kits/tracker/Jamfile

@@ -4 +4 @@
 AddSubDirSupportedPlatforms libbe_test ;
 
-UsePrivateHeaders shared ;
-UsePrivateHeaders tracker ;
+UsePrivateHeaders shared storage tracker ;
 
 UseLibraryHeaders icon ;

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

@@ -49 +49 @@
 #include "Bitmaps.h"
 
-#if OPEN_TRACKER
+#ifdef __HAIKU__
+#       include <DiskDevice.h>
+#       include <DiskDeviceList.h>
+#else
 #       include "DeviceMap.h"
-#else
-#       include <private/storage/DeviceMap.h>
 #endif
 
@@ -58 +59 @@
 
 
-MountMenu::MountMenu(const char *name)
-        : BMenu(name)
-{
-        SetFont(be_plain_font);
-}
-
-
-#if _INCLUDES_CLASS_DEVICE_MAP
+#ifdef __HAIKU__
+//      #pragma mark - Haiku Disk Device API
+
+
+class AddMenuItemVisitor : public BDiskDeviceVisitor {
+        public:
+                AddMenuItemVisitor(BMenu* menu);
+                virtual ~AddMenuItemVisitor();
+
+                virtual bool Visit(BDiskDevice *device);
+                virtual bool Visit(BPartition *partition, int32 level);
+
+        private:
+                BMenu* fMenu;
+};
+
+
+AddMenuItemVisitor::AddMenuItemVisitor(BMenu* menu)
+        :
+        fMenu(menu)
+{
+}
+
+
+AddMenuItemVisitor::~AddMenuItemVisitor()
+{
+}
+
+
+bool
+AddMenuItemVisitor::Visit(BDiskDevice *device)
+{
+        return Visit(device, 0);
+}
+
+
+bool
+AddMenuItemVisitor::Visit(BPartition *partition, int32 level)
+{
+        if (!partition->ContainsFileSystem())
+                return NULL;
+
+        // get name (and eventually the type)
+        BString name = partition->ContentName();
+        if (name.Length() == 0) {
+                name = partition->Name();
+                if (name.Length() == 0) {
+                        const char *type = partition->ContentType();
+                        if (type == NULL)
+                                return NULL;
+
+                        name = "(unnamed ";
+                        name << type;
+                        name << ")";
+                }
+        }
+
+        // get icon
+        BBitmap *icon = new BBitmap(BRect(0, 0, B_MINI_ICON - 1, B_MINI_ICON - 1),
+                B_CMAP8);
+        if (partition->GetIcon(icon, B_MINI_ICON) != B_OK) {
+                delete icon;
+                icon = NULL;
+        }
+
+        BMessage *message = new BMessage(partition->IsMounted() ?
+                kUnmountVolume : kMountVolume);
+        message->AddInt32("id", partition->ID());
+
+        // TODO: for now, until we actually have disk device icons
+        BMenuItem *item;
+        if (icon != NULL)
+                item = new IconMenuItem(name.String(), message, icon);
+        else
+                item = new BMenuItem(name.String(), message);
+        if (partition->IsMounted()) {
+                item->SetMarked(true);
+
+                BVolume volume;
+                if (partition->GetVolume(&volume) == B_OK) {
+                        BVolume bootVolume;
+                        BVolumeRoster().GetBootVolume(&bootVolume);
+                        if (volume == bootVolume)
+                                item->SetEnabled(false);
+                }
+        }
+
+        fMenu->AddItem(item);
+        return false;
+}
+
+#else   // !__HAIKU__
+//      #pragma mark - R5 DeviceMap API
+
+
 struct AddOneAsMenuItemParams {
         BMenu *mountMenu;
@@ -128 +216 @@
         return NULL;
 }
-#endif  // _INCLUDES_CLASS_DEVICE_MAP
+#endif  // !__HAIKU__
+
+
+//      #pragma mark -
+
+
+MountMenu::MountMenu(const char *name)
+        : BMenu(name)
+{
+        SetFont(be_plain_font);
+}
 
 
@@ -134 +232 @@
 MountMenu::AddDynamicItem(add_state)
 {
-#if _INCLUDES_CLASS_DEVICE_MAP
+        // remove old items
         for (;;) {
                 BMenuItem *item = RemoveItem(0L);
@@ -142 +240 @@
         }
 
+#ifdef __HAIKU__
+        BDiskDeviceList devices;
+        status_t status = devices.Fetch();
+        if (status == B_OK) {
+                AddMenuItemVisitor visitor(this);
+                devices.VisitEachPartition(&visitor);
+        }
+#else
         AddOneAsMenuItemParams params;
         params.mountMenu = this;
@@ -150 +256 @@
         autoMounter->CheckVolumesNow();
         autoMounter->EachPartition(&AddOnePartitionAsMenuItem, &params);
+#endif
 
 #ifdef SHOW_NETWORK_VOLUMES
@@ -186 +293 @@
         AddSeparatorItem();
 
+#ifndef __HAIKU__
         // add an option to rescan the scsii bus, etc.
         BMenuItem *rescanItem = NULL;
@@ -192 +300 @@
                 AddItem(rescanItem);
         }
+#endif
 
         BMenuItem *mountAll = new BMenuItem("Mount All", new BMessage(kMountAllNow));
@@ -201 +310 @@
         SetTargetForItems(be_app);
         
+#ifndef __HAIKU__
         if (rescanItem)
                 rescanItem->SetTarget(autoMounter);
-#endif  // _INCLUDES_CLASS_DEVICE_MAP
+#endif
 
         return false;