Ticket #11394: 0001-ToolBarView-rename-to-BToolbar-and-move-to-libshared.patch

new file headers/private/shared/Toolbar.h

@@ +1 @@
+/*
+ * Copyright 2011 Stephan Aßmus <superstippi@gmx.de>
+ * All rights reserved. Distributed under the terms of the MIT license.
+ */
+#ifndef _TOOLBAR_H
+#define _TOOLBAR_H
+
+#include <GroupView.h>
+
+
+class BButton;
+
+
+class BToolbar : public BGroupView {
+public:
+                                BToolbar(BRect frame);
+    virtual                     ~BToolbar();
+
+    virtual void                Hide();
+
+            void                AddAction(uint32 command, BHandler* target,
+                                    const BBitmap* icon,
+                                    const char* toolTipText = NULL,
+                                    bool lockable = false);
+            void                AddAction(BMessage* message, BHandler* target,
+                                    const BBitmap* icon,
+                                    const char* toolTipText = NULL,
+                                    bool lockable = false);
+            void                AddSeparator();
+            void                AddGlue();
+
+            void                SetActionEnabled(uint32 command, bool enabled);
+            void                SetActionPressed(uint32 command, bool pressed);
+            void                SetActionVisible(uint32 command, bool visible);
+
+private:
+    virtual void                Pulse();
+    virtual void                FrameResized(float width, float height);
+
+            void                _AddView(BView* view);
+            BButton*            _FindButton(uint32 command) const;
+            void                _HideToolTips() const;
+};
+
+#endif // _TOOLBAR_H

src/apps/showimage/Jamfile

@@ -20 +20 @@
     ShowImageView.cpp
     ShowImageWindow.cpp
     ToolBarIcons.cpp
-    ToolBarView.cpp
     : libshared.a be tracker translation localestub
         [ TargetLibstdc++ ] [ TargetLibsupc++ ]
     : ShowImage.rdef

src/apps/showimage/ShowImageWindow.cpp

@@ -44 +44 @@
 #include <ScrollView.h>
 #include <String.h>
 #include <SupportDefs.h>
+#include <Toolbar.h>
 #include <TranslationDefs.h>
 #include <TranslationUtils.h>
 #include <TranslatorRoster.h>
@@ -55 +56 @@
 #include "ShowImageStatusView.h"
 #include "ShowImageView.h"
 #include "ToolBarIcons.h"
-#include "ToolBarView.h"
 
 
 // BMessage field names used in Save messages
@@ -137 +137 @@
     fBrowseMenu(NULL),
     fGoToPageMenu(NULL),
     fSlideShowDelayMenu(NULL),
-    fToolBarView(NULL),
+    fToolbar(NULL),
     fImageView(NULL),
     fStatusView(NULL),
     fProgressWindow(new ProgressWindow()),
@@ -170 +170 @@
     // Create the tool bar
     BRect viewFrame = contentView->Bounds();
     viewFrame.right -= B_V_SCROLL_BAR_WIDTH;
-    fToolBarView = new ToolBarView(viewFrame);
+    fToolbar = new BToolbar(viewFrame);
 
     // Add the tool icons.
 
-//  fToolBarView->AddAction(MSG_FILE_OPEN, be_app,
+//  fToolbar->AddAction(MSG_FILE_OPEN, be_app,
 //      tool_bar_icon(kIconDocumentOpen), B_TRANSLATE("Open" B_UTF8_ELLIPSIS));
-    fToolBarView->AddAction(MSG_FILE_PREV, this,
+    fToolbar->AddAction(MSG_FILE_PREV, this,
         tool_bar_icon(kIconGoPrevious), B_TRANSLATE("Previous file"), false);
-    fToolBarView->AddAction(MSG_FILE_NEXT, this, tool_bar_icon(kIconGoNext),
+    fToolbar->AddAction(MSG_FILE_NEXT, this, tool_bar_icon(kIconGoNext),
         B_TRANSLATE("Next file"), false);
     BMessage* fullScreenSlideShow = new BMessage(MSG_SLIDE_SHOW);
     fullScreenSlideShow->AddBool("full screen", true);
-    fToolBarView->AddAction(fullScreenSlideShow, this,
+    fToolbar->AddAction(fullScreenSlideShow, this,
         tool_bar_icon(kIconMediaMovieLibrary), B_TRANSLATE("Slide show"),
         false);
-    fToolBarView->AddSeparator();
-    fToolBarView->AddAction(MSG_SELECTION_MODE, this,
+    fToolbar->AddSeparator();
+    fToolbar->AddAction(MSG_SELECTION_MODE, this,
         tool_bar_icon(kIconDrawRectangularSelection),
         B_TRANSLATE("Selection mode"), false);
-    fToolBarView->AddSeparator();
-    fToolBarView->AddAction(kMsgOriginalSize, this,
+    fToolbar->AddSeparator();
+    fToolbar->AddAction(kMsgOriginalSize, this,
         tool_bar_icon(kIconZoomOriginal), B_TRANSLATE("Original size"), true);
-    fToolBarView->AddAction(kMsgFitToWindow, this,
+    fToolbar->AddAction(kMsgFitToWindow, this,
         tool_bar_icon(kIconZoomFitBest), B_TRANSLATE("Fit to window"), false);
-    fToolBarView->AddAction(MSG_ZOOM_IN, this, tool_bar_icon(kIconZoomIn),
+    fToolbar->AddAction(MSG_ZOOM_IN, this, tool_bar_icon(kIconZoomIn),
         B_TRANSLATE("Zoom in"), false);
-    fToolBarView->AddAction(MSG_ZOOM_OUT, this, tool_bar_icon(kIconZoomOut),
+    fToolbar->AddAction(MSG_ZOOM_OUT, this, tool_bar_icon(kIconZoomOut),
         B_TRANSLATE("Zoom out"), false);
-    fToolBarView->AddGlue();
-    fToolBarView->AddAction(MSG_FULL_SCREEN, this,
+    fToolbar->AddGlue();
+    fToolbar->AddAction(MSG_FULL_SCREEN, this,
         tool_bar_icon(kIconViewWindowed), B_TRANSLATE("Leave full screen"),
         false);
-    fToolBarView->SetActionVisible(MSG_FULL_SCREEN, false);
+    fToolbar->SetActionVisible(MSG_FULL_SCREEN, false);
 
-    fToolBarView->ResizeTo(viewFrame.Width(), fToolBarView->MinSize().height);
+    fToolbar->ResizeTo(viewFrame.Width(), fToolbar->MinSize().height);
 
-    contentView->AddChild(fToolBarView);
+    contentView->AddChild(fToolbar);
 
     if (fShowToolBar)
-        viewFrame.top = fToolBarView->Frame().bottom + 1;
+        viewFrame.top = fToolbar->Frame().bottom + 1;
     else
-        fToolBarView->Hide();
+        fToolbar->Hide();
 
     fToolBarVisible = fShowToolBar;
 
@@ -255 +255 @@
     contentView->AddChild(fVerticalScrollBar);
 
     // Update minimum window size
-    float toolBarMinWidth = fToolBarView->MinSize().width;
+    float toolBarMinWidth = fToolbar->MinSize().width;
     SetSizeLimits(std::max(menuBarMinWidth, toolBarMinWidth), 100000, 100,
         100000);
 
@@ -362 +362 @@
         _AddItemMenu(menu, B_TRANSLATE("Show tool bar"), kMsgToggleToolBar,
             'B', 0, this);
         _MarkMenuItem(menu, kMsgToggleToolBar,
-            !fToolBarView->IsHidden(fToolBarView));
+            !fToolbar->IsHidden(fToolbar));
     }
 
     if (popupMenu) {
@@ -553 +553 @@
         marked = !item->IsMarked();
         item->SetMarked(marked);
     }
-    fToolBarView->SetActionPressed(what, marked);
+    fToolbar->SetActionPressed(what, marked);
     return marked;
 }
 
@@ -564 +564 @@
     BMenuItem* item = menu->FindItem(what);
     if (item && item->IsEnabled() != enable)
         item->SetEnabled(enable);
-    fToolBarView->SetActionEnabled(what, enable);
+    fToolbar->SetActionEnabled(what, enable);
 }
 
 
@@ -574 +574 @@
     BMenuItem* item = menu->FindItem(what);
     if (item && item->IsMarked() != marked)
         item->SetMarked(marked);
-    fToolBarView->SetActionPressed(what, marked);
+    fToolbar->SetActionPressed(what, marked);
 }
 
 
@@ -893 +893 @@
             if (item->IsMarked()) {
                 item->SetMarked(false);
                 _StopSlideShow();
-                fToolBarView->SetActionPressed(MSG_SLIDE_SHOW, false);
+                fToolbar->SetActionPressed(MSG_SLIDE_SHOW, false);
             } else if (_ClosePrompt()) {
                 item->SetMarked(true);
                 if (!fFullScreen && fullScreen)
                     _ToggleFullScreen();
                 _StartSlideShow();
-                fToolBarView->SetActionPressed(MSG_SLIDE_SHOW, true);
+                fToolbar->SetActionPressed(MSG_SLIDE_SHOW, true);
             }
             break;
         }
@@ -911 +911 @@
                 item->SetMarked(false);
 
             _StopSlideShow();
-            fToolBarView->SetActionPressed(MSG_SLIDE_SHOW, false);
+            fToolbar->SetActionPressed(MSG_SLIDE_SHOW, false);
             break;
         }
 
@@ -1032 +1032 @@
         {
             float offset;
             if (message->FindFloat("offset", &offset) == B_OK) {
-                fToolBarView->MoveBy(0, offset);
+                fToolbar->MoveBy(0, offset);
                 fScrollView->ResizeBy(0, -offset);
                 fScrollView->MoveBy(0, offset);
                 fVerticalScrollBar->ResizeBy(0, -offset);
@@ -1049 +1049 @@
             if (message->FindFloat("offset", &offset) == B_OK
                 && message->FindBool("show", &show) == B_OK) {
                 // Compensate rounding errors with the final placement
-                fToolBarView->MoveTo(fToolBarView->Frame().left, offset);
+                fToolbar->MoveTo(fToolbar->Frame().left, offset);
                 if (!show)
-                    fToolBarView->Hide();
-                BRect frame = fToolBarView->Parent()->Bounds();
-                frame.top = fToolBarView->Frame().bottom + 1;
+                    fToolbar->Hide();
+                BRect frame = fToolbar->Parent()->Bounds();
+                frame.top = fToolbar->Frame().bottom + 1;
                 fScrollView->MoveTo(fScrollView->Frame().left, frame.top);
                 fScrollView->ResizeTo(fScrollView->Bounds().Width(),
                     frame.Height() - B_H_SCROLL_BAR_HEIGHT + 1);
@@ -1286 +1286 @@
         SetFlags(Flags() & ~(B_NOT_RESIZABLE | B_NOT_MOVABLE));
     }
 
-    fToolBarView->SetActionVisible(MSG_FULL_SCREEN, fFullScreen);
+    fToolbar->SetActionVisible(MSG_FULL_SCREEN, fFullScreen);
     _SetToolBarVisible(!fFullScreen && fShowToolBar);
 
     MoveTo(frame.left, frame.top);
@@ -1518 +1518 @@
         return;
 
     fToolBarVisible = visible;
-    float diff = fToolBarView->Bounds().Height() + 2;
+    float diff = fToolbar->Bounds().Height() + 2;
     if (!visible)
         diff = -diff;
     else
-        fToolBarView->Show();
+        fToolbar->Show();
 
     if (animate) {
         // Slide the controls into view. We do this with messages in order
@@ -1543 +1543 @@
         fScrollView->MoveBy(0, diff);
         fVerticalScrollBar->ResizeBy(0, -diff);
         fVerticalScrollBar->MoveBy(0, diff);
-        fToolBarView->MoveBy(0, diff);
+        fToolbar->MoveBy(0, diff);
         if (!visible)
-            fToolBarView->Hide();
+            fToolbar->Hide();
     }
 }
 

src/apps/showimage/ShowImageWindow.h

@@ -27 +27 @@
 class ProgressWindow;
 class ShowImageView;
 class ShowImageStatusView;
-class ToolBarView;
+class BToolbar;
 
 
 // public message constants
@@ -114 +114 @@
             BMenu*              fGoToPageMenu;
             BMenu*              fSlideShowDelayMenu;
             BMenu*              fRatingMenu;
-            ToolBarView*        fToolBarView;
+            BToolbar*           fToolbar;
             bool                fToolBarVisible;
             BScrollView*        fScrollView;
             BScrollBar*         fVerticalScrollBar;

deleted file src/apps/showimage/ToolBarView.cpp

@@ -1 @@
-/*
- * Copyright 2011 Stephan Aßmus <superstippi@gmx.de>
- * All rights reserved. Distributed under the terms of the MIT license.
- */
-#include "ToolBarView.h"
-
-#include <Button.h>
-#include <ControlLook.h>
-#include <Message.h>
-#include <SeparatorView.h>
-#include <SpaceLayoutItem.h>
-
-class LockableButton: public BButton {
-public:
-            LockableButton(const char* name, const char* label,
-                BMessage* message);
-
-    void    MouseDown(BPoint point);
-};
-
-
-LockableButton::LockableButton(const char* name, const char* label,
-    BMessage* message)
-    :
-    BButton(name, label, message)
-{
-}
-
-
-void
-LockableButton::MouseDown(BPoint point)
-{
-    if ((modifiers() & B_SHIFT_KEY) != 0 || Value() == B_CONTROL_ON)
-        SetBehavior(B_TOGGLE_BEHAVIOR);
-    else
-        SetBehavior(B_BUTTON_BEHAVIOR);
-
-    Message()->SetInt32("behavior", Behavior());
-    BButton::MouseDown(point);
-}
-
-
-ToolBarView::ToolBarView(BRect frame)
-    :
-    BGroupView(B_HORIZONTAL)
-{
-    float inset = ceilf(be_control_look->DefaultItemSpacing() / 2);
-    GroupLayout()->SetInsets(inset, 0, inset, 0);
-    GroupLayout()->SetSpacing(1);
-
-    SetFlags(Flags() | B_FRAME_EVENTS | B_PULSE_NEEDED);
-
-    MoveTo(frame.LeftTop());
-    ResizeTo(frame.Width(), frame.Height());
-    SetResizingMode(B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP);
-}
-
-
-ToolBarView::~ToolBarView()
-{
-}
-
-
-void
-ToolBarView::Hide()
-{
-    BView::Hide();
-    // TODO: This could be fixed in BView instead. Looking from the 
-    // BButtons, they are not hidden though, only their parent is...
-    _HideToolTips();
-}
-
-
-void
-ToolBarView::AddAction(uint32 command, BHandler* target, const BBitmap* icon,
-    const char* toolTipText, bool lockable)
-{
-    AddAction(new BMessage(command), target, icon, toolTipText, lockable);
-}
-
-
-void
-ToolBarView::AddAction(BMessage* message, BHandler* target,
-    const BBitmap* icon, const char* toolTipText, bool lockable)
-{
-
-    BButton* button;
-    if (lockable)
-        button = new LockableButton(NULL, NULL, message);
-    else
-        button = new BButton(NULL, NULL, message);
-    button->SetIcon(icon);
-    button->SetFlat(true);
-    if (toolTipText != NULL)
-        button->SetToolTip(toolTipText);
-    _AddView(button);
-    button->SetTarget(target);
-}
-
-
-void
-ToolBarView::AddSeparator()
-{
-    _AddView(new BSeparatorView(B_VERTICAL, B_PLAIN_BORDER));
-}
-
-
-void
-ToolBarView::AddGlue()
-{
-    GroupLayout()->AddItem(BSpaceLayoutItem::CreateGlue());
-}
-
-
-void
-ToolBarView::SetActionEnabled(uint32 command, bool enabled)
-{
-    if (BButton* button = _FindButton(command))
-        button->SetEnabled(enabled);
-}
-
-
-void
-ToolBarView::SetActionPressed(uint32 command, bool pressed)
-{
-    if (BButton* button = _FindButton(command))
-        button->SetValue(pressed);
-}
-
-
-void
-ToolBarView::SetActionVisible(uint32 command, bool visible)
-{
-    BButton* button = _FindButton(command);
-    if (button == NULL)
-        return;
-    for (int32 i = 0; BLayoutItem* item = GroupLayout()->ItemAt(i); i++) {
-        if (item->View() != button)
-            continue;
-        item->SetVisible(visible);
-        break;
-    }
-}
-
-
-void
-ToolBarView::Pulse()
-{
-    // TODO: Perhaps this could/should be addressed in BView instead.
-    if (IsHidden())
-        _HideToolTips();
-}
-
-
-void
-ToolBarView::FrameResized(float width, float height)
-{
-    // TODO: There seems to be a bug in app_server which does not
-    // correctly trigger invalidation of views which are shown, when
-    // the resulting dirty area is somehow already part of an update region.
-    Invalidate();
-}
-
-
-void
-ToolBarView::_AddView(BView* view)
-{
-    GroupLayout()->AddView(view);
-}
-
-
-BButton*
-ToolBarView::_FindButton(uint32 command) const
-{
-    for (int32 i = 0; BView* view = ChildAt(i); i++) {
-        BButton* button = dynamic_cast<BButton*>(view);
-        if (button == NULL)
-            continue;
-        BMessage* message = button->Message();
-        if (message == NULL)
-            continue;
-        if (message->what == command) {
-            return button;
-            // Assumes there is only one button with this message...
-            break;
-        }
-    }
-    return NULL;
-}
-
-
-void
-ToolBarView::_HideToolTips() const
-{
-    for (int32 i = 0; BView* view = ChildAt(i); i++)
-        view->HideToolTip();
-}
-

deleted file src/apps/showimage/ToolBarView.h

@@ -1 @@
-/*
- * Copyright 2011 Stephan Aßmus <superstippi@gmx.de>
- * All rights reserved. Distributed under the terms of the MIT license.
- */
-#ifndef TOOL_BAR_VIEW_H
-#define TOOL_BAR_VIEW_H
-
-#include <GroupView.h>
-
-
-class BButton;
-
-
-class ToolBarView : public BGroupView {
-public:
-                                ToolBarView(BRect frame);
-    virtual                     ~ToolBarView();
-
-    virtual void                Hide();
-
-            void                AddAction(uint32 command, BHandler* target,
-                                    const BBitmap* icon,
-                                    const char* toolTipText = NULL,
-                                    bool lockable = false);
-            void                AddAction(BMessage* message, BHandler* target,
-                                    const BBitmap* icon,
-                                    const char* toolTipText = NULL,
-                                    bool lockable = false);
-            void                AddSeparator();
-            void                AddGlue();
-
-            void                SetActionEnabled(uint32 command, bool enabled);
-            void                SetActionPressed(uint32 command, bool pressed);
-            void                SetActionVisible(uint32 command, bool visible);
-
-private:
-    virtual void                Pulse();
-    virtual void                FrameResized(float width, float height);
-
-            void                _AddView(BView* view);
-            BButton*            _FindButton(uint32 command) const;
-            void                _HideToolTips() const;
-};
-
-#endif // TOOL_BAR_VIEW_H

src/kits/shared/Jamfile

@@ -53 +53 @@
             StringForSize.cpp
             TextTable.cpp
             Thread.cpp
+            Toolbar.cpp
             Variant.cpp
             ;
 

new file src/kits/shared/Toolbar.cpp

@@ +1 @@
+/*
+ * Copyright 2011 Stephan Aßmus <superstippi@gmx.de>
+ * All rights reserved. Distributed under the terms of the MIT license.
+ */
+#include "Toolbar.h"
+
+#include <Button.h>
+#include <ControlLook.h>
+#include <Message.h>
+#include <SeparatorView.h>
+#include <SpaceLayoutItem.h>
+
+class LockableButton: public BButton {
+public:
+            LockableButton(const char* name, const char* label,
+                BMessage* message);
+
+    void    MouseDown(BPoint point);
+};
+
+
+LockableButton::LockableButton(const char* name, const char* label,
+    BMessage* message)
+    :
+    BButton(name, label, message)
+{
+}
+
+
+void
+LockableButton::MouseDown(BPoint point)
+{
+    if ((modifiers() & B_SHIFT_KEY) != 0 || Value() == B_CONTROL_ON)
+        SetBehavior(B_TOGGLE_BEHAVIOR);
+    else
+        SetBehavior(B_BUTTON_BEHAVIOR);
+
+    Message()->SetInt32("behavior", Behavior());
+    BButton::MouseDown(point);
+}
+
+
+BToolbar::BToolbar(BRect frame)
+    :
+    BGroupView(B_HORIZONTAL)
+{
+    float inset = ceilf(be_control_look->DefaultItemSpacing() / 2);
+    GroupLayout()->SetInsets(inset, 0, inset, 0);
+    GroupLayout()->SetSpacing(1);
+
+    SetFlags(Flags() | B_FRAME_EVENTS | B_PULSE_NEEDED);
+
+    MoveTo(frame.LeftTop());
+    ResizeTo(frame.Width(), frame.Height());
+    SetResizingMode(B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP);
+}
+
+
+BToolbar::~BToolbar()
+{
+}
+
+
+void
+BToolbar::Hide()
+{
+    BView::Hide();
+    // TODO: This could be fixed in BView instead. Looking from the 
+    // BButtons, they are not hidden though, only their parent is...
+    _HideToolTips();
+}
+
+
+void
+BToolbar::AddAction(uint32 command, BHandler* target, const BBitmap* icon,
+    const char* toolTipText, bool lockable)
+{
+    AddAction(new BMessage(command), target, icon, toolTipText, lockable);
+}
+
+
+void
+BToolbar::AddAction(BMessage* message, BHandler* target,
+    const BBitmap* icon, const char* toolTipText, bool lockable)
+{
+
+    BButton* button;
+    if (lockable)
+        button = new LockableButton(NULL, NULL, message);
+    else
+        button = new BButton(NULL, NULL, message);
+    button->SetIcon(icon);
+    button->SetFlat(true);
+    if (toolTipText != NULL)
+        button->SetToolTip(toolTipText);
+    _AddView(button);
+    button->SetTarget(target);
+}
+
+
+void
+BToolbar::AddSeparator()
+{
+    _AddView(new BSeparatorView(B_VERTICAL, B_PLAIN_BORDER));
+}
+
+
+void
+BToolbar::AddGlue()
+{
+    GroupLayout()->AddItem(BSpaceLayoutItem::CreateGlue());
+}
+
+
+void
+BToolbar::SetActionEnabled(uint32 command, bool enabled)
+{
+    if (BButton* button = _FindButton(command))
+        button->SetEnabled(enabled);
+}
+
+
+void
+BToolbar::SetActionPressed(uint32 command, bool pressed)
+{
+    if (BButton* button = _FindButton(command))
+        button->SetValue(pressed);
+}
+
+
+void
+BToolbar::SetActionVisible(uint32 command, bool visible)
+{
+    BButton* button = _FindButton(command);
+    if (button == NULL)
+        return;
+    for (int32 i = 0; BLayoutItem* item = GroupLayout()->ItemAt(i); i++) {
+        if (item->View() != button)
+            continue;
+        item->SetVisible(visible);
+        break;
+    }
+}
+
+
+void
+BToolbar::Pulse()
+{
+    // TODO: Perhaps this could/should be addressed in BView instead.
+    if (IsHidden())
+        _HideToolTips();
+}
+
+
+void
+BToolbar::FrameResized(float width, float height)
+{
+    // TODO: There seems to be a bug in app_server which does not
+    // correctly trigger invalidation of views which are shown, when
+    // the resulting dirty area is somehow already part of an update region.
+    Invalidate();
+}
+
+
+void
+BToolbar::_AddView(BView* view)
+{
+    GroupLayout()->AddView(view);
+}
+
+
+BButton*
+BToolbar::_FindButton(uint32 command) const
+{
+    for (int32 i = 0; BView* view = ChildAt(i); i++) {
+        BButton* button = dynamic_cast<BButton*>(view);
+        if (button == NULL)
+            continue;
+        BMessage* message = button->Message();
+        if (message == NULL)
+            continue;
+        if (message->what == command) {
+            return button;
+            // Assumes there is only one button with this message...
+            break;
+        }
+    }
+    return NULL;
+}
+
+
+void
+BToolbar::_HideToolTips() const
+{
+    for (int32 i = 0; BView* view = ChildAt(i); i++)
+        view->HideToolTip();
+}
+