i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fixed a bug in BRecentItemsList::GetNextMenuItem() that would prevent it from

Browse Source 
correctly adding navigable folders (it did just hide (and leak) any folders
  before).
* Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38896 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-10-08 13:13:31 +00:00
parent c5e2c3ec4d
commit 3f7a0ba1b0
1 changed files with 164 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/tracker/RecentItems.cpp
+164 -118
View File
@@ -32,6 +32,9 @@ names are registered trademarks or trademarks of their respective holders.
All rights reserved. All rights reserved.
*/ */
#include "RecentItems.h"
#include <Roster.h> #include <Roster.h>
#include "Attributes.h" #include "Attributes.h"
@@ -39,11 +42,11 @@ All rights reserved.
#include "Model.h" #include "Model.h"
#include "NavMenu.h" #include "NavMenu.h"
#include "PoseView.h" #include "PoseView.h"
#include "RecentItems.h"
#include "SlowMenu.h" #include "SlowMenu.h"
#include "Tracker.h" #include "Tracker.h"
#include "Utilities.h" #include "Utilities.h"
class RecentItemsMenu : public BSlowMenu { class RecentItemsMenu : public BSlowMenu {
public: public:
RecentItemsMenu(const char *title, BMessage *openMessage, RecentItemsMenu(const char *title, BMessage *openMessage,
@@ -65,7 +68,7 @@ protected:
{ return fTargetMesage; } { return fTargetMesage; }
virtual const BMessage *ContainerMessage() virtual const BMessage *ContainerMessage()
{ return fTargetMesage; } { return fTargetMesage; }
BRecentItemsList *fTterator; BRecentItemsList *fTterator;
BMessage *fTargetMesage; BMessage *fTargetMesage;
BHandler *fItemTarget; BHandler *fItemTarget;
@@ -75,13 +78,55 @@ protected:
}; };
class RecentFilesMenu : public RecentItemsMenu {
public:
RecentFilesMenu(const char *title, BMessage *openFileMessage,
BMessage *openFolderMessage, BHandler *target,
int32 maxItems, bool navMenuFolders, const char *ofType,
const char *openedByAppSig);
RecentFilesMenu(const char *title, BMessage *openFileMessage,
BMessage *openFolderMessage, BHandler *target,
int32 maxItems, bool navMenuFolders, const char *ofTypeList[],
int32 ofTypeListCount, const char *openedByAppSig);
virtual ~RecentFilesMenu();
protected:
virtual const BMessage *ContainerMessage()
{ return openFolderMessage; }
private:
BMessage *openFolderMessage;
};
class RecentFoldersMenu : public RecentItemsMenu {
public:
RecentFoldersMenu(const char *title, BMessage *openMessage,
BHandler *target, int32 maxItems, bool navMenuFolders,
const char *openedByAppSig);
};
class RecentAppsMenu : public RecentItemsMenu {
public:
RecentAppsMenu(const char *title, BMessage *openMessage,
BHandler *target, int32 maxItems);
};
// #pragma mark -
RecentItemsMenu::~RecentItemsMenu() RecentItemsMenu::~RecentItemsMenu()
{ {
delete fTterator; delete fTterator;
delete fTargetMesage; delete fTargetMesage;
} }
bool
bool
RecentItemsMenu::AddNextItem() RecentItemsMenu::AddNextItem()
{ {
BMenuItem *item = fTterator->GetNextMenuItem(FileMessage(), BMenuItem *item = fTterator->GetNextMenuItem(FileMessage(),
@@ -92,17 +137,19 @@ RecentItemsMenu::AddNextItem()
fCount++; fCount++;
} }
fSanityCount++; fSanityCount++;
return fCount < fMaxCount - 1 && (fSanityCount < fMaxCount + 20); return fCount < fMaxCount - 1 && (fSanityCount < fMaxCount + 20);
// fSanityCount is a hacky way of dealing with a lot of stale // fSanityCount is a hacky way of dealing with a lot of stale
// recent apps // recent apps
} }
bool
bool
RecentItemsMenu::StartBuildingItemList() RecentItemsMenu::StartBuildingItemList()
{ {
// remove any preexisting items // remove any preexisting items
int32 itemCount = CountItems(); int32 itemCount = CountItems();
while (itemCount--) while (itemCount--)
delete RemoveItem((int32)0); delete RemoveItem((int32)0);
fCount = 0; fCount = 0;
@@ -112,7 +159,7 @@ RecentItemsMenu::StartBuildingItemList()
} }
void void
RecentItemsMenu::ClearMenuBuildingState() RecentItemsMenu::ClearMenuBuildingState()
{ {
fMenuBuilt = false; fMenuBuilt = false;
@@ -121,9 +168,72 @@ RecentItemsMenu::ClearMenuBuildingState()
} }
// #pragma mark -
RecentFilesMenu::RecentFilesMenu(const char *title, BMessage *openFileMessage,
BMessage *openFolderMessage, BHandler *target, int32 maxItems,
bool navMenuFolders, const char *ofType, const char *openedByAppSig)
:
RecentItemsMenu(title, openFileMessage, target, maxItems),
openFolderMessage(openFolderMessage)
{
fTterator = new BRecentFilesList(maxItems + 10, navMenuFolders,
ofType, openedByAppSig);
}
RecentFilesMenu::RecentFilesMenu(const char *title, BMessage *openFileMessage,
BMessage *openFolderMessage, BHandler *target, int32 maxItems,
bool navMenuFolders, const char *ofTypeList[], int32 ofTypeListCount,
const char *openedByAppSig)
:
RecentItemsMenu(title, openFileMessage, target, maxItems),
openFolderMessage(openFolderMessage)
{
fTterator = new BRecentFilesList(maxItems + 10, navMenuFolders,
ofTypeList, ofTypeListCount, openedByAppSig);
}
RecentFilesMenu::~RecentFilesMenu()
{
delete openFolderMessage;
}
// #pragma mark -
RecentFoldersMenu::RecentFoldersMenu(const char *title, BMessage *openMessage,
BHandler *target, int32 maxItems, bool navMenuFolders,
const char *openedByAppSig)
:
RecentItemsMenu(title, openMessage, target, maxItems)
{
fTterator = new BRecentFoldersList(maxItems + 10, navMenuFolders,
openedByAppSig);
}
// #pragma mark -
RecentAppsMenu::RecentAppsMenu(const char *title, BMessage *openMessage,
BHandler *target, int32 maxItems)
: RecentItemsMenu(title, openMessage, target, maxItems)
{
fTterator = new BRecentAppsList(maxItems);
}
// #pragma mark -
BRecentItemsList::BRecentItemsList(int32 maxItems, bool navMenuFolders) BRecentItemsList::BRecentItemsList(int32 maxItems, bool navMenuFolders)
: fMaxItems(maxItems), :
fNavMenuFolders(navMenuFolders) fMaxItems(maxItems),
fNavMenuFolders(navMenuFolders)
{ {
InitIconPreloader(); InitIconPreloader();
// need the icon cache // need the icon cache
@@ -141,8 +251,8 @@ BRecentItemsList::Rewind()
BMenuItem * BMenuItem *
BRecentItemsList::GetNextMenuItem(const BMessage *fileOpenInvokeMessage, BRecentItemsList::GetNextMenuItem(const BMessage *fileOpenInvokeMessage,
const BMessage *containerOpenInvokeMessage, const BMessage *containerOpenInvokeMessage, BHandler *target,
BHandler *target, entry_ref *currentItemRef) entry_ref *currentItemRef)
{ {
entry_ref ref; entry_ref ref;
if (GetNextRef(&ref) != B_OK) if (GetNextRef(&ref) != B_OK)
@@ -154,7 +264,7 @@ BRecentItemsList::GetNextMenuItem(const BMessage *fileOpenInvokeMessage,
bool container = false; bool container = false;
if (model.IsSymLink()) { if (model.IsSymLink()) {
Model *newResolvedModel = NULL; Model *newResolvedModel = NULL;
Model *result = model.LinkTo(); Model *result = model.LinkTo();
@@ -172,14 +282,14 @@ BRecentItemsList::GetNextMenuItem(const BMessage *fileOpenInvokeMessage,
if (result) { if (result) {
BModelOpener opener(result); BModelOpener opener(result);
// open the model, if it ain't open already // open the model, if it ain't open already
PoseInfo poseInfo; PoseInfo poseInfo;
ssize_t size = -1; ssize_t size = -1;
if (result->Node()) if (result->Node())
size = result->Node()->ReadAttr(kAttrPoseInfo, B_RAW_TYPE, 0, size = result->Node()->ReadAttr(kAttrPoseInfo, B_RAW_TYPE, 0,
&poseInfo, sizeof(poseInfo)); &poseInfo, sizeof(poseInfo));
result->CloseNode(); result->CloseNode();
ref = *result->EntryRef(); ref = *result->EntryRef();
@@ -202,7 +312,7 @@ BRecentItemsList::GetNextMenuItem(const BMessage *fileOpenInvokeMessage,
message = new BMessage(*fileOpenInvokeMessage); message = new BMessage(*fileOpenInvokeMessage);
else else
message = new BMessage(B_REFS_RECEIVED); message = new BMessage(B_REFS_RECEIVED);
message->AddRef("refs", model.EntryRef()); message->AddRef("refs", model.EntryRef());
// Truncate the name if necessary // Truncate the name if necessary
@@ -211,50 +321,55 @@ BRecentItemsList::GetNextMenuItem(const BMessage *fileOpenInvokeMessage,
BNavMenu::GetMaxMenuWidth()); BNavMenu::GetMaxMenuWidth());
ModelMenuItem *item = NULL; ModelMenuItem *item = NULL;
if (!container || !fNavMenuFolders) if (!container || !fNavMenuFolders)
item = new ModelMenuItem(&model, truncatedString.String(), message); item = new ModelMenuItem(&model, truncatedString.String(), message);
else { else {
// add another nav menu item if it's a directory // add another nav menu item if it's a directory
BNavMenu *menu = new BNavMenu(truncatedString.String(), message->what, BNavMenu *menu = new BNavMenu(truncatedString.String(), message->what,
target, 0); target, 0);
menu->SetNavDir(&ref); menu->SetNavDir(&ref);
ModelMenuItem *item = new ModelMenuItem(&model, menu); item = new ModelMenuItem(&model, menu);
item->SetMessage(message); item->SetMessage(message);
} }
if (item && target) if (item && target)
item->SetTarget(target); item->SetTarget(target);
return item; return item;
} }
status_t
status_t
BRecentItemsList::GetNextRef(entry_ref *result) BRecentItemsList::GetNextRef(entry_ref *result)
{ {
return fItems.FindRef("refs", fIndex++, result); return fItems.FindRef("refs", fIndex++, result);
} }
// #pragma mark - // #pragma mark -
BRecentFilesList::BRecentFilesList(int32 maxItems, bool navMenuFolders, BRecentFilesList::BRecentFilesList(int32 maxItems, bool navMenuFolders,
const char *ofType, const char *openedByAppSig) const char *ofType, const char *openedByAppSig)
: BRecentItemsList(maxItems, navMenuFolders), :
fType(ofType), BRecentItemsList(maxItems, navMenuFolders),
fTypes(NULL), fType(ofType),
fTypeCount(0), fTypes(NULL),
fAppSig(openedByAppSig) fTypeCount(0),
fAppSig(openedByAppSig)
{ {
} }
BRecentFilesList::BRecentFilesList(int32 maxItems, bool navMenuFolders, BRecentFilesList::BRecentFilesList(int32 maxItems, bool navMenuFolders,
const char *ofTypeList[], int32 ofTypeListCount, const char *openedByAppSig) const char *ofTypeList[], int32 ofTypeListCount, const char *openedByAppSig)
: BRecentItemsList(maxItems, navMenuFolders), :
fType(NULL), BRecentItemsList(maxItems, navMenuFolders),
fTypes(NULL), fType(NULL),
fTypeCount(ofTypeListCount), fTypes(NULL),
fAppSig(openedByAppSig) fTypeCount(ofTypeListCount),
fAppSig(openedByAppSig)
{ {
if (fTypeCount) { if (fTypeCount) {
fTypes = new char *[ofTypeListCount]; fTypes = new char *[ofTypeListCount];
@@ -273,7 +388,8 @@ BRecentFilesList::~BRecentFilesList()
} }
} }
status_t
status_t
BRecentFilesList::GetNextRef(entry_ref *ref) BRecentFilesList::GetNextRef(entry_ref *ref)
{ {
if (fIndex == 0) { if (fIndex == 0) {
@@ -286,62 +402,12 @@ BRecentFilesList::GetNextRef(entry_ref *ref)
BRoster().GetRecentDocuments(&fItems, fMaxItems, BRoster().GetRecentDocuments(&fItems, fMaxItems,
fType.Length() ? fType.String() : NULL, fType.Length() ? fType.String() : NULL,
fAppSig.Length() ? fAppSig.String() : NULL); fAppSig.Length() ? fAppSig.String() : NULL);
} }
return BRecentItemsList::GetNextRef(ref); return BRecentItemsList::GetNextRef(ref);
} }
class RecentFilesMenu : public RecentItemsMenu {
public:
RecentFilesMenu(const char *title, BMessage *openFileMessage,
BMessage *openFolderMessage, BHandler *target,
int32 maxItems, bool navMenuFolders, const char *ofType,
const char *openedByAppSig);
RecentFilesMenu(const char *title, BMessage *openFileMessage,
BMessage *openFolderMessage, BHandler *target,
int32 maxItems, bool navMenuFolders, const char *ofTypeList[],
int32 ofTypeListCount, const char *openedByAppSig);
virtual ~RecentFilesMenu();
protected:
virtual const BMessage *ContainerMessage()
{ return openFolderMessage; }
private:
BMessage *openFolderMessage;
};
RecentFilesMenu::RecentFilesMenu(const char *title, BMessage *openFileMessage,
BMessage *openFolderMessage, BHandler *target, int32 maxItems,
bool navMenuFolders, const char *ofType, const char *openedByAppSig)
: RecentItemsMenu(title, openFileMessage, target, maxItems),
openFolderMessage(openFolderMessage)
{
fTterator = new BRecentFilesList(maxItems + 10, navMenuFolders,
ofType, openedByAppSig);
}
RecentFilesMenu::RecentFilesMenu(const char *title, BMessage *openFileMessage,
BMessage *openFolderMessage, BHandler *target, int32 maxItems,
bool navMenuFolders, const char *ofTypeList[], int32 ofTypeListCount,
const char *openedByAppSig)
: RecentItemsMenu(title, openFileMessage, target, maxItems),
openFolderMessage(openFolderMessage)
{
fTterator = new BRecentFilesList(maxItems + 10, navMenuFolders,
ofTypeList, ofTypeListCount, openedByAppSig);
}
RecentFilesMenu::~RecentFilesMenu()
{
delete openFolderMessage;
}
BMenu * BMenu *
BRecentFilesList::NewFileListMenu(const char *title, BRecentFilesList::NewFileListMenu(const char *title,
BMessage *openFileMessage, BMessage *openFolderMessage, BMessage *openFileMessage, BMessage *openFolderMessage,
@@ -352,6 +418,7 @@ BRecentFilesList::NewFileListMenu(const char *title,
openFolderMessage, target, maxItems, navMenuFolders, ofType, openedByAppSig); openFolderMessage, target, maxItems, navMenuFolders, ofType, openedByAppSig);
} }
BMenu * BMenu *
BRecentFilesList::NewFileListMenu(const char *title, BRecentFilesList::NewFileListMenu(const char *title,
BMessage *openFileMessage, BMessage *openFolderMessage, BMessage *openFileMessage, BMessage *openFolderMessage,
@@ -363,22 +430,9 @@ BRecentFilesList::NewFileListMenu(const char *title,
ofTypeListCount, openedByAppSig); ofTypeListCount, openedByAppSig);
} }
// #pragma mark - // #pragma mark -
class RecentFoldersMenu : public RecentItemsMenu {
public:
RecentFoldersMenu(const char *title, BMessage *openMessage,
BHandler *target, int32 maxItems, bool navMenuFolders,
const char *openedByAppSig);
};
RecentFoldersMenu::RecentFoldersMenu(const char *title, BMessage *openMessage,
BHandler *target, int32 maxItems, bool navMenuFolders, const char *openedByAppSig)
: RecentItemsMenu(title, openMessage, target, maxItems)
{
fTterator = new BRecentFoldersList(maxItems + 10, navMenuFolders,
openedByAppSig);
}
BMenu * BMenu *
BRecentFoldersList::NewFolderListMenu(const char *title, BRecentFoldersList::NewFolderListMenu(const char *title,
@@ -389,14 +443,17 @@ BRecentFoldersList::NewFolderListMenu(const char *title,
navMenuFolders, openedByAppSig); navMenuFolders, openedByAppSig);
} }
BRecentFoldersList::BRecentFoldersList(int32 maxItems, bool navMenuFolders, BRecentFoldersList::BRecentFoldersList(int32 maxItems, bool navMenuFolders,
const char *openedByAppSig) const char *openedByAppSig)
: BRecentItemsList(maxItems, navMenuFolders), :
fAppSig(openedByAppSig) BRecentItemsList(maxItems, navMenuFolders),
fAppSig(openedByAppSig)
{ {
} }
status_t
status_t
BRecentFoldersList::GetNextRef(entry_ref *ref) BRecentFoldersList::GetNextRef(entry_ref *ref)
{ {
if (fIndex == 0) { if (fIndex == 0) {
@@ -408,14 +465,18 @@ BRecentFoldersList::GetNextRef(entry_ref *ref)
return BRecentItemsList::GetNextRef(ref); return BRecentItemsList::GetNextRef(ref);
} }
// #pragma mark - // #pragma mark -
BRecentAppsList::BRecentAppsList(int32 maxItems) BRecentAppsList::BRecentAppsList(int32 maxItems)
: BRecentItemsList(maxItems, false) :
BRecentItemsList(maxItems, false)
{ {
} }
status_t
status_t
BRecentAppsList::GetNextRef(entry_ref *ref) BRecentAppsList::GetNextRef(entry_ref *ref)
{ {
if (fIndex == 0) { if (fIndex == 0) {
@@ -425,20 +486,6 @@ BRecentAppsList::GetNextRef(entry_ref *ref)
return BRecentItemsList::GetNextRef(ref); return BRecentItemsList::GetNextRef(ref);
} }
class RecentAppsMenu : public RecentItemsMenu {
public:
RecentAppsMenu(const char *title, BMessage *openMessage,
BHandler *target, int32 maxItems);
};
RecentAppsMenu::RecentAppsMenu(const char *title, BMessage *openMessage,
BHandler *target, int32 maxItems)
: RecentItemsMenu(title, openMessage, target, maxItems)
{
fTterator = new BRecentAppsList(maxItems);
}
BMenu * BMenu *
BRecentAppsList::NewAppListMenu(const char *title, BMessage *openMessage, BRecentAppsList::NewAppListMenu(const char *title, BMessage *openMessage,
@@ -446,4 +493,3 @@ BRecentAppsList::NewAppListMenu(const char *title, BMessage *openMessage,
{ {
return new RecentAppsMenu(title, openMessage, target, maxItems); return new RecentAppsMenu(title, openMessage, target, maxItems);
} }