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

* The IconView is now keyboard navigable, and can be invoked (via the enter key),

Browse Source 
or the current icon be deleted (using the delete key).
* Drag&drop between IconViews should now also work as expected for all icon
  types (only the large icon was taken into consideration before).
* Improved error handling in the Icon::CopyTo() methods


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19293 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-11-15 15:23:24 +00:00
parent f483286d59
commit 745e7694e5
2 changed files with 102 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/filetypes/IconView.cpp
+93 -18
View File
@@ -151,28 +151,63 @@ Icon::SetTo(entry_ref& ref, const char* type)
}
void
status_t
Icon::CopyTo(BAppFileInfo& info, const char* type, bool force)
{
status_t status = B_OK;
if (fLarge != NULL || force)
info.SetIconForType(type, fLarge, B_LARGE_ICON);
status = info.SetIconForType(type, fLarge, B_LARGE_ICON);
if (fMini != NULL || force)
info.SetIconForType(type, fMini, B_MINI_ICON);
status = info.SetIconForType(type, fMini, B_MINI_ICON);
#ifdef HAIKU_TARGET_PLATFORM_HAIKU
if (fData != NULL || force)
info.SetIconForType(type, fData, fSize);
status = info.SetIconForType(type, fData, fSize);
#endif
return status;
}
void
status_t
Icon::CopyTo(entry_ref& ref, const char* type, bool force)
{
BFile file(&ref, B_READ_ONLY);
BFile file;
status_t status = file.SetTo(&ref, B_READ_ONLY);
if (status < B_OK)
return status;
BAppFileInfo info(&file);
if (file.InitCheck() == B_OK
&& info.InitCheck() == B_OK)
CopyTo(info, type, force);
status = info.InitCheck();
if (status < B_OK)
return status;
return CopyTo(info, type, force);
}
status_t
Icon::CopyTo(BMessage& message)
{
status_t status = B_OK;
if (status == B_OK && fLarge != NULL) {
BMessage archive;
status = fLarge->Archive(&archive);
if (status == B_OK)
status = message.AddMessage("icon/large", &archive);
}
if (status == B_OK && fMini != NULL) {
BMessage archive;
status = fMini->Archive(&archive);
if (status == B_OK)
status = message.AddMessage("icon/mini", &archive);
}
#ifdef HAIKU_TARGET_PLATFORM_HAIKU
if (status == B_OK && fData != NULL)
status = message.AddData("icon", B_VECTOR_ICON_TYPE, fData, fSize);
#endif
return B_OK;
}
@@ -380,8 +415,8 @@ Icon::AllocateBitmap(int32 size, int32 space)
// #pragma mark -
IconView::IconView(BRect rect, const char* name, uint32 resizeMode)
: BView(rect, name, resizeMode, B_WILL_DRAW),
IconView::IconView(BRect rect, const char* name, uint32 resizeMode, uint32 flags)
: BView(rect, name, resizeMode, B_WILL_DRAW | flags),
fIconSize(B_LARGE_ICON),
fIcon(NULL),
fHeapIcon(NULL),
@@ -529,10 +564,10 @@ IconView::Draw(BRect updateRect)
StrokeRect(Bounds());
}
if (fDropTarget) {
if (IsFocus() || fDropTarget) {
// mark this view as a drop target
SetHighColor(ui_color(B_KEYBOARD_NAVIGATION_COLOR));
StrokeRect(Bounds());
StrokeRect(_BitmapRect());
}
}
@@ -566,7 +601,7 @@ IconView::MouseDown(BPoint where)
if ((buttons & B_PRIMARY_MOUSE_BUTTON) != 0 && _BitmapRect().Contains(where)) {
if (clicks == 2) {
// double click - open Icon-O-Matic
fTarget.SendMessage(kMsgIconInvoked);
Invoke();
} else if (fIcon != NULL) {
// start tracking - this icon might be dragged around
fDragPoint = where;
@@ -617,10 +652,13 @@ IconView::MouseMoved(BPoint where, uint32 transit, const BMessage* dragMessage)
// Start drag
BMessage message(B_SIMPLE_DATA);
// TODO: for now...
BMessage archive;
fIcon->Archive(&archive);
message.AddMessage("icon/large", &archive);
::Icon* icon = fIconData;
if (fHasRef) {
icon = new ::Icon;
icon->SetTo(fRef, fFileType.Length() > 0 ? fFileType.String() : NULL);
}
icon->CopyTo(message);
BBitmap *dragBitmap = new BBitmap(fIcon);
DragMessage(&message, dragBitmap, B_OP_ALPHA, fDragPoint, this);
@@ -641,6 +679,36 @@ IconView::MouseMoved(BPoint where, uint32 transit, const BMessage* dragMessage)
}
void
IconView::KeyDown(const char* bytes, int32 numBytes)
{
if (numBytes == 1) {
switch (bytes[0]) {
case B_DELETE:
case B_BACKSPACE:
_RemoveIcon();
return;
case B_ENTER:
case B_SPACE:
Invoke();
return;
}
}
BView::KeyDown(bytes, numBytes);
}
void
IconView::MakeFocus(bool focus)
{
if (focus != IsFocus())
Invalidate();
BView::MakeFocus(focus);
}
void
IconView::SetTo(entry_ref& ref, const char* fileType)
{
@@ -774,6 +842,13 @@ IconView::Update()
}
void
IconView::Invoke()
{
fTarget.SendMessage(kMsgIconInvoked);
}
Icon*
IconView::Icon()
{
src/preferences/filetypes/IconView.h
+9 -3
View File
@@ -21,8 +21,9 @@ class Icon {
void SetTo(BAppFileInfo& info, const char* type = NULL);
void SetTo(entry_ref& ref, const char* type = NULL);
void CopyTo(BAppFileInfo& info, const char* type = NULL, bool force = false);
void CopyTo(entry_ref& ref, const char* type = NULL, bool force = false);
status_t CopyTo(BAppFileInfo& info, const char* type = NULL, bool force = false);
status_t CopyTo(entry_ref& ref, const char* type = NULL, bool force = false);
status_t CopyTo(BMessage& message);
void SetData(const uint8* data, size_t size);
void SetLarge(const BBitmap* large);
@@ -53,7 +54,8 @@ class Icon {
class IconView : public BView {
public:
IconView(BRect rect, const char* name,
uint32 resizeMode = B_FOLLOW_LEFT | B_FOLLOW_TOP);
uint32 resizeMode = B_FOLLOW_LEFT | B_FOLLOW_TOP,
uint32 flags = B_NAVIGABLE);
virtual ~IconView();
virtual void AttachedToWindow();
@@ -65,6 +67,9 @@ class IconView : public BView {
virtual void MouseDown(BPoint where);
virtual void MouseUp(BPoint where);
virtual void MouseMoved(BPoint where, uint32 transit, const BMessage* dragMessage);
virtual void KeyDown(const char* bytes, int32 numBytes);
virtual void MakeFocus(bool focus = true);
void SetTo(entry_ref& file, const char* fileType = NULL);
void SetTo(::Icon* icon);
@@ -73,6 +78,7 @@ class IconView : public BView {
void SetEnabled(bool enabled);
void SetTarget(const BMessenger& target);
void Update();
void Invoke();
::Icon* Icon();