[haiku-commits] haiku: hrev48794 - data/artwork/icons src/kits/shared src/apps/showimage src/kits/tracker headers/private/shared
- From: waddlesplash@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 12 Feb 2015 05:16:06 +0100 (CET)
hrev48794 adds 6 changesets to branch 'master'
old head: 32fab80eea823a46c9ce733f2ebfed2bca82d850
new head: 4230183ded46826770f5c9ed1cc926350433eff3
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=4230183ded46+%5E32fab80eea82
----------------------------------------------------------------------------
90c3b9bf9fe6: tracker_new_templates: Bump copyright year.
d7cde0634bba: OptionalPackages: remove cmake from the default packages.
* It no longer has consistent naming across architectures, as it's
now GCC4-only.
* It hasn't been in the default images for that reason since that change
was made a few months ago, and nobody has missed it.
* Only a few pieces of software use it at this point, so those who need
it can simply run "pkgman install cmd:cmake".
94a4c1c45619: BToolbar: rename to BToolBar.
"BToolBar" matches the current convention ("BStatusBar", "BMenuBar", etc.)
I've no idea what I was thinking when I renamed this before...
Also adjust all users of BToolBar (Tracker and ShowImage).
7d226266e6fa: BToolBar: misc. fixes.
* Move common init. code to an _Init() function.
* Create a layout constructor.
* Make _AddView public and rename it to AddView.
3385848679b5: Tracker: take advantage of BToolBar changes from the previous
commit.
4230183ded46: Tracker/StatusWindow: use vector icons.
Fixes #11711.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
14 files changed, 147 insertions(+), 91 deletions(-)
build/jam/OptionalPackages | 2 +-
data/artwork/icons/Tracker_move | Bin 0 -> 15842 bytes
headers/private/shared/{Toolbar.h => ToolBar.h} | 18 +++--
src/apps/showimage/ShowImageWindow.cpp | 79 +++++++++----------
src/apps/showimage/ShowImageWindow.h | 4 +-
.../settings/tracker_new_templates/C++ header | 2 +-
.../settings/tracker_new_templates/C++ source | 2 +-
src/kits/shared/Jamfile | 2 +-
src/kits/shared/{Toolbar.cpp => ToolBar.cpp} | 69 ++++++++++------
src/kits/tracker/Navigator.cpp | 4 +-
src/kits/tracker/Navigator.h | 4 +-
src/kits/tracker/StatusWindow.cpp | 17 ++--
src/kits/tracker/TrackerIcons.h | 2 +
src/kits/tracker/TrackerIcons.rdef | 33 ++++++++
############################################################################
Commit: 90c3b9bf9fe633e4c6a59d42c11c3f523183c553
URL: http://cgit.haiku-os.org/haiku/commit/?id=90c3b9bf9fe6
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Thu Feb 12 03:34:06 2015 UTC
tracker_new_templates: Bump copyright year.
----------------------------------------------------------------------------
diff --git a/src/data/settings/tracker_new_templates/C++ header
b/src/data/settings/tracker_new_templates/C++ header
index b8937f4..4f20843 100644
--- a/src/data/settings/tracker_new_templates/C++ header
+++ b/src/data/settings/tracker_new_templates/C++ header
@@ -1,5 +1,5 @@
/*
- * Copyright 2014 Your Name <your@email.address>
+ * Copyright 2015 Your Name <your@email.address>
* All rights reserved. Distributed under the terms of the MIT license.
*/
#ifndef _H
diff --git a/src/data/settings/tracker_new_templates/C++ source
b/src/data/settings/tracker_new_templates/C++ source
index 32fd726..8be6747 100644
--- a/src/data/settings/tracker_new_templates/C++ source
+++ b/src/data/settings/tracker_new_templates/C++ source
@@ -1,5 +1,5 @@
/*
- * Copyright 2014 Your Name <your@email.address>
+ * Copyright 2015 Your Name <your@email.address>
* All rights reserved. Distributed under the terms of the MIT license.
*/
#include ".h"
############################################################################
Commit: d7cde0634bba03556c143ed201471b221ec30d8c
URL: http://cgit.haiku-os.org/haiku/commit/?id=d7cde0634bba
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Thu Feb 12 03:39:57 2015 UTC
OptionalPackages: remove cmake from the default packages.
* It no longer has consistent naming across architectures, as it's
now GCC4-only.
* It hasn't been in the default images for that reason since that change
was made a few months ago, and nobody has missed it.
* Only a few pieces of software use it at this point, so those who need
it can simply run "pkgman install cmd:cmake".
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 47cea27..ac8feea 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -94,7 +94,7 @@ if [ IsOptionalHaikuImagePackageAdded Development ] {
AddHaikuImagePackages autoconf automake libtool perl texinfo ;
# some other build tools
- AddHaikuImagePackages cmake pkgconfig scons ;
+ AddHaikuImagePackages pkgconfig scons ;
# devel packages for mandatory packages
local architectureObject ;
############################################################################
Commit: 94a4c1c4561945d4b8d682cf1fc6d8b6abe3a86e
URL: http://cgit.haiku-os.org/haiku/commit/?id=94a4c1c45619
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Thu Feb 12 03:54:48 2015 UTC
BToolbar: rename to BToolBar.
"BToolBar" matches the current convention ("BStatusBar", "BMenuBar", etc.)
I've no idea what I was thinking when I renamed this before...
Also adjust all users of BToolBar (Tracker and ShowImage).
----------------------------------------------------------------------------
diff --git a/headers/private/shared/Toolbar.h b/headers/private/shared/ToolBar.h
similarity index 82%
rename from headers/private/shared/Toolbar.h
rename to headers/private/shared/ToolBar.h
index 130a6bf..c7122ac 100644
--- a/headers/private/shared/Toolbar.h
+++ b/headers/private/shared/ToolBar.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2011-2014, Haiku, Inc. All rights reserved.
+ * Copyright 2011-2015, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _TOOLBAR_H
@@ -12,11 +12,11 @@ class BButton;
namespace BPrivate {
-class BToolbar : public BGroupView {
+class BToolBar : public BGroupView {
public:
- BToolbar(BRect
frame,
-
orientation ont = B_HORIZONTAL);
- virtual ~BToolbar();
+ BToolBar(BRect
frame,
+
orientation ont = B_HORIZONTAL);
+ virtual ~BToolBar();
virtual void Hide();
@@ -42,12 +42,12 @@ private:
void _AddView(BView* view);
BButton* _FindButton(uint32
command) const;
void _HideToolTips() const;
-
+
orientation fOrientation;
};
} // namespace BPrivate
-using BPrivate::BToolbar;
+using BPrivate::BToolBar;
#endif // _TOOLBAR_H
diff --git a/src/apps/showimage/ShowImageWindow.cpp
b/src/apps/showimage/ShowImageWindow.cpp
index 4b1fe46..0015b5f 100644
--- a/src/apps/showimage/ShowImageWindow.cpp
+++ b/src/apps/showimage/ShowImageWindow.cpp
@@ -45,7 +45,6 @@
#include <ScrollView.h>
#include <String.h>
#include <SupportDefs.h>
-#include <Toolbar.h>
#include <TranslationDefs.h>
#include <TranslationUtils.h>
#include <TranslatorRoster.h>
@@ -138,7 +137,7 @@ ShowImageWindow::ShowImageWindow(BRect frame, const
entry_ref& ref,
fBrowseMenu(NULL),
fGoToPageMenu(NULL),
fSlideShowDelayMenu(NULL),
- fToolbar(NULL),
+ fToolBar(NULL),
fImageView(NULL),
fStatusView(NULL),
fProgressWindow(new ProgressWindow()),
@@ -171,48 +170,48 @@ ShowImageWindow::ShowImageWindow(BRect frame, const
entry_ref& ref,
// Create the tool bar
BRect viewFrame = contentView->Bounds();
viewFrame.right -= B_V_SCROLL_BAR_WIDTH;
- fToolbar = new BToolbar(viewFrame);
+ fToolBar = new BToolBar(viewFrame);
// Add the tool icons.
-// fToolbar->AddAction(MSG_FILE_OPEN, be_app,
+// fToolBar->AddAction(MSG_FILE_OPEN, be_app,
// tool_bar_icon(kIconDocumentOpen), B_TRANSLATE("Open"
B_UTF8_ELLIPSIS));
- fToolbar->AddAction(MSG_FILE_PREV, this,
+ fToolBar->AddAction(MSG_FILE_PREV, this,
tool_bar_icon(kIconGoPrevious), B_TRANSLATE("Previous file"),
false);
- fToolbar->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);
- fToolbar->AddAction(fullScreenSlideShow, this,
+ fToolBar->AddAction(fullScreenSlideShow, this,
tool_bar_icon(kIconMediaMovieLibrary), B_TRANSLATE("Slide
show"),
false);
- fToolbar->AddSeparator();
- fToolbar->AddAction(MSG_SELECTION_MODE, this,
+ fToolBar->AddSeparator();
+ fToolBar->AddAction(MSG_SELECTION_MODE, this,
tool_bar_icon(kIconDrawRectangularSelection),
B_TRANSLATE("Selection mode"), false);
- fToolbar->AddSeparator();
- fToolbar->AddAction(kMsgOriginalSize, this,
+ fToolBar->AddSeparator();
+ fToolBar->AddAction(kMsgOriginalSize, this,
tool_bar_icon(kIconZoomOriginal), B_TRANSLATE("Original size"),
true);
- fToolbar->AddAction(kMsgFitToWindow, this,
+ fToolBar->AddAction(kMsgFitToWindow, this,
tool_bar_icon(kIconZoomFitBest), B_TRANSLATE("Fit to window"),
false);
- fToolbar->AddAction(MSG_ZOOM_IN, this, tool_bar_icon(kIconZoomIn),
+ fToolBar->AddAction(MSG_ZOOM_IN, this, tool_bar_icon(kIconZoomIn),
B_TRANSLATE("Zoom in"), false);
- fToolbar->AddAction(MSG_ZOOM_OUT, this, tool_bar_icon(kIconZoomOut),
+ fToolBar->AddAction(MSG_ZOOM_OUT, this, tool_bar_icon(kIconZoomOut),
B_TRANSLATE("Zoom out"), false);
- fToolbar->AddGlue();
- fToolbar->AddAction(MSG_FULL_SCREEN, this,
+ fToolBar->AddGlue();
+ fToolBar->AddAction(MSG_FULL_SCREEN, this,
tool_bar_icon(kIconViewWindowed), B_TRANSLATE("Leave full
screen"),
false);
- fToolbar->SetActionVisible(MSG_FULL_SCREEN, false);
+ fToolBar->SetActionVisible(MSG_FULL_SCREEN, false);
- fToolbar->ResizeTo(viewFrame.Width(), fToolbar->MinSize().height);
+ fToolBar->ResizeTo(viewFrame.Width(), fToolBar->MinSize().height);
- contentView->AddChild(fToolbar);
+ contentView->AddChild(fToolBar);
if (fShowToolBar)
- viewFrame.top = fToolbar->Frame().bottom + 1;
+ viewFrame.top = fToolBar->Frame().bottom + 1;
else
- fToolbar->Hide();
+ fToolBar->Hide();
fToolBarVisible = fShowToolBar;
@@ -256,7 +255,7 @@ ShowImageWindow::ShowImageWindow(BRect frame, const
entry_ref& ref,
contentView->AddChild(fVerticalScrollBar);
// Update minimum window size
- float toolBarMinWidth = fToolbar->MinSize().width;
+ float toolBarMinWidth = fToolBar->MinSize().width;
SetSizeLimits(std::max(menuBarMinWidth, toolBarMinWidth), 100000, 100,
100000);
@@ -362,7 +361,7 @@ ShowImageWindow::_BuildViewMenu(BMenu* menu, bool popupMenu)
_AddItemMenu(menu, B_TRANSLATE("Show tool bar"),
kMsgToggleToolBar,
'B', 0, this);
_MarkMenuItem(menu, kMsgToggleToolBar,
- !fToolbar->IsHidden(fToolbar));
+ !fToolBar->IsHidden(fToolBar));
}
if (popupMenu) {
@@ -553,7 +552,7 @@ ShowImageWindow::_ToggleMenuItem(uint32 what)
marked = !item->IsMarked();
item->SetMarked(marked);
}
- fToolbar->SetActionPressed(what, marked);
+ fToolBar->SetActionPressed(what, marked);
return marked;
}
@@ -564,7 +563,7 @@ ShowImageWindow::_EnableMenuItem(BMenu* menu, uint32 what,
bool enable)
BMenuItem* item = menu->FindItem(what);
if (item && item->IsEnabled() != enable)
item->SetEnabled(enable);
- fToolbar->SetActionEnabled(what, enable);
+ fToolBar->SetActionEnabled(what, enable);
}
@@ -574,7 +573,7 @@ ShowImageWindow::_MarkMenuItem(BMenu* menu, uint32 what,
bool marked)
BMenuItem* item = menu->FindItem(what);
if (item && item->IsMarked() != marked)
item->SetMarked(marked);
- fToolbar->SetActionPressed(what, marked);
+ fToolBar->SetActionPressed(what, marked);
}
@@ -893,13 +892,13 @@ ShowImageWindow::MessageReceived(BMessage* message)
if (item->IsMarked()) {
item->SetMarked(false);
_StopSlideShow();
- fToolbar->SetActionPressed(MSG_SLIDE_SHOW,
false);
+ fToolBar->SetActionPressed(MSG_SLIDE_SHOW,
false);
} else if (_ClosePrompt()) {
item->SetMarked(true);
if (!fFullScreen && fullScreen)
_ToggleFullScreen();
_StartSlideShow();
- fToolbar->SetActionPressed(MSG_SLIDE_SHOW,
true);
+ fToolBar->SetActionPressed(MSG_SLIDE_SHOW,
true);
}
break;
}
@@ -911,7 +910,7 @@ ShowImageWindow::MessageReceived(BMessage* message)
item->SetMarked(false);
_StopSlideShow();
- fToolbar->SetActionPressed(MSG_SLIDE_SHOW, false);
+ fToolBar->SetActionPressed(MSG_SLIDE_SHOW, false);
break;
}
@@ -1032,7 +1031,7 @@ ShowImageWindow::MessageReceived(BMessage* message)
{
float offset;
if (message->FindFloat("offset", &offset) == B_OK) {
- fToolbar->MoveBy(0, offset);
+ fToolBar->MoveBy(0, offset);
fScrollView->ResizeBy(0, -offset);
fScrollView->MoveBy(0, offset);
fVerticalScrollBar->ResizeBy(0, -offset);
@@ -1049,11 +1048,11 @@ ShowImageWindow::MessageReceived(BMessage* message)
if (message->FindFloat("offset", &offset) == B_OK
&& message->FindBool("show", &show) == B_OK) {
// Compensate rounding errors with the final
placement
- fToolbar->MoveTo(fToolbar->Frame().left,
offset);
+ fToolBar->MoveTo(fToolBar->Frame().left,
offset);
if (!show)
- fToolbar->Hide();
- BRect frame = fToolbar->Parent()->Bounds();
- frame.top = fToolbar->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);
@@ -1213,7 +1212,7 @@ ShowImageWindow::_ClosePrompt()
BAlert* alert = new BAlert(B_TRANSLATE("Close document"),
prompt.String(),
B_TRANSLATE("Cancel"), B_TRANSLATE("Close"));
alert->SetShortcut(0, B_ESCAPE);
-
+
if (alert->Go() == 0) {
// Cancel
return false;
@@ -1286,7 +1285,7 @@ ShowImageWindow::_ToggleFullScreen()
SetFlags(Flags() & ~(B_NOT_RESIZABLE | B_NOT_MOVABLE));
}
- fToolbar->SetActionVisible(MSG_FULL_SCREEN, fFullScreen);
+ fToolBar->SetActionVisible(MSG_FULL_SCREEN, fFullScreen);
_SetToolBarVisible(!fFullScreen && fShowToolBar);
MoveTo(frame.left, frame.top);
@@ -1518,11 +1517,11 @@ ShowImageWindow::_SetToolBarVisible(bool visible, bool
animate)
return;
fToolBarVisible = visible;
- float diff = fToolbar->Bounds().Height() + 2;
+ float diff = fToolBar->Bounds().Height() + 2;
if (!visible)
diff = -diff;
else
- fToolbar->Show();
+ fToolBar->Show();
if (animate) {
// Slide the controls into view. We do this with messages in
order
@@ -1543,9 +1542,9 @@ ShowImageWindow::_SetToolBarVisible(bool visible, bool
animate)
fScrollView->MoveBy(0, diff);
fVerticalScrollBar->ResizeBy(0, -diff);
fVerticalScrollBar->MoveBy(0, diff);
- fToolbar->MoveBy(0, diff);
+ fToolBar->MoveBy(0, diff);
if (!visible)
- fToolbar->Hide();
+ fToolBar->Hide();
}
}
diff --git a/src/apps/showimage/ShowImageWindow.h
b/src/apps/showimage/ShowImageWindow.h
index 496462e..ea593a3 100644
--- a/src/apps/showimage/ShowImageWindow.h
+++ b/src/apps/showimage/ShowImageWindow.h
@@ -11,7 +11,7 @@
#define SHOW_IMAGE_WINDOW_H
-#include <Toolbar.h>
+#include <ToolBar.h>
#include <Window.h>
#include "ImageFileNavigator.h"
@@ -114,7 +114,7 @@ private:
BMenu* fGoToPageMenu;
BMenu* fSlideShowDelayMenu;
BMenu* fRatingMenu;
- BToolbar* fToolbar;
+ BToolBar* fToolBar;
bool fToolBarVisible;
BScrollView* fScrollView;
BScrollBar* fVerticalScrollBar;
diff --git a/src/kits/shared/Jamfile b/src/kits/shared/Jamfile
index 039aeda..69eb901 100644
--- a/src/kits/shared/Jamfile
+++ b/src/kits/shared/Jamfile
@@ -53,7 +53,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
StringForSize.cpp
TextTable.cpp
Thread.cpp
- Toolbar.cpp
+ ToolBar.cpp
Variant.cpp
;
diff --git a/src/kits/shared/Toolbar.cpp b/src/kits/shared/ToolBar.cpp
similarity index 84%
rename from src/kits/shared/Toolbar.cpp
rename to src/kits/shared/ToolBar.cpp
index 0d6b791..130e40e 100644
--- a/src/kits/shared/Toolbar.cpp
+++ b/src/kits/shared/ToolBar.cpp
@@ -2,7 +2,7 @@
* Copyright 2011 Stephan Aßmus <superstippi@xxxxxx>
* All rights reserved. Distributed under the terms of the MIT license.
*/
-#include "Toolbar.h"
+#include "ToolBar.h"
#include <Button.h>
#include <ControlLook.h>
@@ -44,7 +44,7 @@ LockableButton::MouseDown(BPoint point)
}
-BToolbar::BToolbar(BRect frame, orientation ont)
+BToolBar::BToolBar(BRect frame, orientation ont)
:
BGroupView(ont),
fOrientation(ont)
@@ -61,23 +61,23 @@ BToolbar::BToolbar(BRect frame, orientation ont)
}
-BToolbar::~BToolbar()
+BToolBar::~BToolBar()
{
}
void
-BToolbar::Hide()
+BToolBar::Hide()
{
BView::Hide();
- // TODO: This could be fixed in BView instead. Looking from the
+ // 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,
+BToolBar::AddAction(uint32 command, BHandler* target, const BBitmap* icon,
const char* toolTipText, bool lockable)
{
AddAction(new BMessage(command), target, icon, toolTipText, lockable);
@@ -85,7 +85,7 @@ BToolbar::AddAction(uint32 command, BHandler* target, const
BBitmap* icon,
void
-BToolbar::AddAction(BMessage* message, BHandler* target,
+BToolBar::AddAction(BMessage* message, BHandler* target,
const BBitmap* icon, const char* toolTipText, bool lockable)
{
@@ -104,7 +104,7 @@ BToolbar::AddAction(BMessage* message, BHandler* target,
void
-BToolbar::AddSeparator()
+BToolBar::AddSeparator()
{
orientation ont = (fOrientation == B_HORIZONTAL) ?
B_VERTICAL : B_HORIZONTAL;
@@ -113,14 +113,14 @@ BToolbar::AddSeparator()
void
-BToolbar::AddGlue()
+BToolBar::AddGlue()
{
GroupLayout()->AddItem(BSpaceLayoutItem::CreateGlue());
}
void
-BToolbar::SetActionEnabled(uint32 command, bool enabled)
+BToolBar::SetActionEnabled(uint32 command, bool enabled)
{
if (BButton* button = _FindButton(command))
button->SetEnabled(enabled);
@@ -128,7 +128,7 @@ BToolbar::SetActionEnabled(uint32 command, bool enabled)
void
-BToolbar::SetActionPressed(uint32 command, bool pressed)
+BToolBar::SetActionPressed(uint32 command, bool pressed)
{
if (BButton* button = _FindButton(command))
button->SetValue(pressed);
@@ -136,7 +136,7 @@ BToolbar::SetActionPressed(uint32 command, bool pressed)
void
-BToolbar::SetActionVisible(uint32 command, bool visible)
+BToolBar::SetActionVisible(uint32 command, bool visible)
{
BButton* button = _FindButton(command);
if (button == NULL)
@@ -151,7 +151,7 @@ BToolbar::SetActionVisible(uint32 command, bool visible)
void
-BToolbar::Pulse()
+BToolBar::Pulse()
{
// TODO: Perhaps this could/should be addressed in BView instead.
if (IsHidden())
@@ -160,7 +160,7 @@ BToolbar::Pulse()
void
-BToolbar::FrameResized(float width, float height)
+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
@@ -170,14 +170,14 @@ BToolbar::FrameResized(float width, float height)
void
-BToolbar::_AddView(BView* view)
+BToolBar::_AddView(BView* view)
{
GroupLayout()->AddView(view);
}
BButton*
-BToolbar::_FindButton(uint32 command) const
+BToolBar::_FindButton(uint32 command) const
{
for (int32 i = 0; BView* view = ChildAt(i); i++) {
BButton* button = dynamic_cast<BButton*>(view);
@@ -197,7 +197,7 @@ BToolbar::_FindButton(uint32 command) const
void
-BToolbar::_HideToolTips() const
+BToolBar::_HideToolTips() const
{
for (int32 i = 0; BView* view = ChildAt(i); i++)
view->HideToolTip();
diff --git a/src/kits/tracker/Navigator.cpp b/src/kits/tracker/Navigator.cpp
index 59628f9..fe26828 100644
--- a/src/kits/tracker/Navigator.cpp
+++ b/src/kits/tracker/Navigator.cpp
@@ -57,7 +57,7 @@ static const int32 kMaxHistory = 32;
BNavigator::BNavigator(const Model* model)
:
- BToolbar(BRect()), // FIXME in BToolbar: pointless BRect()
+ BToolBar(BRect()), // FIXME in BToolbar: pointless BRect()
fBackHistory(8, true),
fForwHistory(8, true)
{
diff --git a/src/kits/tracker/Navigator.h b/src/kits/tracker/Navigator.h
index c7c8b9d..82e879c 100644
--- a/src/kits/tracker/Navigator.h
+++ b/src/kits/tracker/Navigator.h
@@ -35,7 +35,7 @@ All rights reserved.
#define _NAVIGATOR_H
-#include <Toolbar.h>
+#include <ToolBar.h>
#include "ContainerWindow.h"
#include "Model.h"
@@ -63,7 +63,7 @@ enum NavigationAction
};
-class BNavigator : public BToolbar {
+class BNavigator : public BToolBar {
public:
BNavigator(const Model* model);
~BNavigator();
############################################################################
Commit: 7d226266e6fa85b1c7a91ffff9c595d1e8c8397e
URL: http://cgit.haiku-os.org/haiku/commit/?id=7d226266e6fa
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Thu Feb 12 04:06:21 2015 UTC
BToolBar: misc. fixes.
* Move common init. code to an _Init() function.
* Create a layout constructor.
* Make _AddView public and rename it to AddView.
----------------------------------------------------------------------------
diff --git a/headers/private/shared/ToolBar.h b/headers/private/shared/ToolBar.h
index c7122ac..7186429 100644
--- a/headers/private/shared/ToolBar.h
+++ b/headers/private/shared/ToolBar.h
@@ -16,6 +16,7 @@ class BToolBar : public BGroupView {
public:
BToolBar(BRect
frame,
orientation ont = B_HORIZONTAL);
+
BToolBar(orientation ont = B_HORIZONTAL);
virtual ~BToolBar();
virtual void Hide();
@@ -30,6 +31,7 @@ public:
bool
lockable = false);
void AddSeparator();
void AddGlue();
+ void AddView(BView* view);
void SetActionEnabled(uint32
command, bool enabled);
void SetActionPressed(uint32
command, bool pressed);
@@ -39,7 +41,7 @@ private:
virtual void Pulse();
virtual void FrameResized(float width, float
height);
- void _AddView(BView* view);
+ void _Init();
BButton* _FindButton(uint32
command) const;
void _HideToolTips() const;
diff --git a/src/kits/shared/ToolBar.cpp b/src/kits/shared/ToolBar.cpp
index 130e40e..6ae093c 100644
--- a/src/kits/shared/ToolBar.cpp
+++ b/src/kits/shared/ToolBar.cpp
@@ -49,11 +49,7 @@ BToolBar::BToolBar(BRect frame, orientation ont)
BGroupView(ont),
fOrientation(ont)
{
- 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);
+ _Init();
MoveTo(frame.LeftTop());
ResizeTo(frame.Width(), frame.Height());
@@ -61,6 +57,15 @@ BToolBar::BToolBar(BRect frame, orientation ont)
}
+BToolBar::BToolBar(orientation ont)
+ :
+ BGroupView(ont),
+ fOrientation(ont)
+{
+ _Init();
+}
+
+
BToolBar::~BToolBar()
{
}
@@ -98,7 +103,7 @@ BToolBar::AddAction(BMessage* message, BHandler* target,
button->SetFlat(true);
if (toolTipText != NULL)
button->SetToolTip(toolTipText);
- _AddView(button);
+ AddView(button);
button->SetTarget(target);
}
@@ -108,7 +113,7 @@ BToolBar::AddSeparator()
{
orientation ont = (fOrientation == B_HORIZONTAL) ?
B_VERTICAL : B_HORIZONTAL;
- _AddView(new BSeparatorView(ont, B_PLAIN_BORDER));
+ AddView(new BSeparatorView(ont, B_PLAIN_BORDER));
}
@@ -120,6 +125,13 @@ BToolBar::AddGlue()
void
+BToolBar::AddView(BView* view)
+{
+ GroupLayout()->AddView(view);
+}
+
+
+void
BToolBar::SetActionEnabled(uint32 command, bool enabled)
{
if (BButton* button = _FindButton(command))
@@ -150,6 +162,9 @@ BToolBar::SetActionVisible(uint32 command, bool visible)
}
+// #pragma mark - Private methods
+
+
void
BToolBar::Pulse()
{
@@ -170,9 +185,13 @@ BToolBar::FrameResized(float width, float height)
void
-BToolBar::_AddView(BView* view)
+BToolBar::_Init()
{
- GroupLayout()->AddView(view);
+ 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);
}
############################################################################
Commit: 3385848679b50ba198341c7ba156b618590be9f6
URL: http://cgit.haiku-os.org/haiku/commit/?id=3385848679b5
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Thu Feb 12 04:06:36 2015 UTC
Tracker: take advantage of BToolBar changes from the previous commit.
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/Navigator.cpp b/src/kits/tracker/Navigator.cpp
index fe26828..c4ed58a 100644
--- a/src/kits/tracker/Navigator.cpp
+++ b/src/kits/tracker/Navigator.cpp
@@ -57,7 +57,7 @@ static const int32 kMaxHistory = 32;
BNavigator::BNavigator(const Model* model)
:
- BToolBar(BRect()), // FIXME in BToolbar: pointless BRect()
+ BToolBar(),
fBackHistory(8, true),
fForwHistory(8, true)
{
@@ -102,7 +102,7 @@ BNavigator::AttachedToWindow()
SetActionEnabled(kNavigatorCommandUp, false);
delete bmpUp;
- GroupLayout()->AddView(fLocation);
+ AddView(fLocation);
fLocation->SetTarget(this);
}
############################################################################
Revision: hrev48794
Commit: 4230183ded46826770f5c9ed1cc926350433eff3
URL: http://cgit.haiku-os.org/haiku/commit/?id=4230183ded46
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Wed Feb 4 18:21:43 2015 UTC
Ticket: https://dev.haiku-os.org/ticket/11711
Tracker/StatusWindow: use vector icons.
Fixes #11711.
----------------------------------------------------------------------------
diff --git a/data/artwork/icons/Tracker_move b/data/artwork/icons/Tracker_move
new file mode 100644
index 0000000..e0dfc1b
Binary files /dev/null and b/data/artwork/icons/Tracker_move differ
diff --git a/src/kits/tracker/StatusWindow.cpp
b/src/kits/tracker/StatusWindow.cpp
index 3913758..6388b7c 100644
--- a/src/kits/tracker/StatusWindow.cpp
+++ b/src/kits/tracker/StatusWindow.cpp
@@ -447,7 +447,7 @@ BStatusView::BStatusView(BRect bounds, thread_id thread,
StatusWindowState type)
SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
SetLowColor(ViewColor());
SetHighColor(20, 20, 20);
- SetDrawingMode(B_OP_OVER);
+ SetDrawingMode(B_OP_ALPHA);
const float buttonWidth = 22;
const float buttonHeight = 20;
@@ -465,23 +465,23 @@ BStatusView::BStatusView(BRect bounds, thread_id thread,
StatusWindowState type)
switch (type) {
case kCopyState:
caption = B_TRANSLATE("Preparing to copy items"
B_UTF8_ELLIPSIS);
- id = R_CopyStatusBitmap;
+ id = R_CopyStatusIcon;
break;
case kMoveState:
caption = B_TRANSLATE("Preparing to move items"
B_UTF8_ELLIPSIS);
- id = R_MoveStatusBitmap;
+ id = R_MoveStatusIcon;
break;
case kCreateLinkState:
caption = B_TRANSLATE("Preparing to create links"
B_UTF8_ELLIPSIS);
- id = R_MoveStatusBitmap;
+ id = R_MoveStatusIcon;
break;
case kTrashState:
caption = B_TRANSLATE("Preparing to empty Trash"
B_UTF8_ELLIPSIS);
- id = R_TrashStatusBitmap;
+ id = R_TrashIcon;
break;
case kVolumeState:
@@ -492,7 +492,7 @@ BStatusView::BStatusView(BRect bounds, thread_id thread,
StatusWindowState type)
case kDeleteState:
caption = B_TRANSLATE("Preparing to delete items"
B_UTF8_ELLIPSIS);
- id = R_TrashStatusBitmap;
+ id = R_TrashIcon;
break;
case kRestoreFromTrashState:
@@ -525,8 +525,9 @@ BStatusView::BStatusView(BRect bounds, thread_id thread,
StatusWindowState type)
}
if (id != 0) {
- GetTrackerResources()->GetBitmapResource(B_MESSAGE_TYPE, id,
- &fBitmap);
+ fBitmap = new BBitmap(BRect(0, 0, 16, 16), B_RGBA32);
+ GetTrackerResources()->GetIconResource(id, B_MINI_ICON,
+ fBitmap);
}
rect = Bounds();
diff --git a/src/kits/tracker/TrackerIcons.h b/src/kits/tracker/TrackerIcons.h
index d7f4b79..07b7e4c 100644
--- a/src/kits/tracker/TrackerIcons.h
+++ b/src/kits/tracker/TrackerIcons.h
@@ -64,6 +64,8 @@ enum {
R_PersonDirIcon = 1031,
R_UtilDirIcon = 1032,
R_ConfigDirIcon = 1033,
+ R_MoveStatusIcon = 1039,
+ R_CopyStatusIcon = 1040,
R_MICN_AppIcon = 1000,
R_MICN_FileIcon = 1001,
R_MICN_TrashIcon = 1003,
diff --git a/src/kits/tracker/TrackerIcons.rdef
b/src/kits/tracker/TrackerIcons.rdef
index 092c9cc..e84cf99 100644
--- a/src/kits/tracker/TrackerIcons.rdef
+++ b/src/kits/tracker/TrackerIcons.rdef
@@ -180,6 +180,39 @@ resource(R_ConfigDirIcon) #'VICN' array {
$"000207081815FF01178400040A0002070818001501178600040A0702070800"
};
+resource(R_MoveStatusIcon) #'VICN' array {
+ $"6E6369660B0500020006023841813C9B3BBEAB393A4F584B254D4A7AEB00FFE2"
+ $"ACFFF49806020016022C60673CAAABBEBB082E6EFB4BBA064A22B000FFFF8E02"
+ $"0006022C25F43C6917BEBB082E6EFB4BAFBF497E0B00FACE79FFBC410503A03D"
+ $"03020016023AE3B43C79DCBE5BC53CC0974B42AC47CA41009AFF500401650500"
+ $"020106023E387C38E5D3B893663DF2A44467C04989F300FBF5AAFFFFC0000200"
+ $"1202BCA6D53C2975BC8711BD19A64B51764AA2D23501FFFF012F04018C0A0A06"
+ $"4A5D505D545958595E53504F0A04232F2D494A5B463E0A04232F463E4A5BC323"
+ $"3C0A063A282E494A5A5C2C502A4C2C0A04302B30494A5951360A04302B51364A"
+ $"5954BB1E0A0A232F2D494A5B5C2C502A4C2C3A28382D302BB957BAA70A042135"
+ $"214F3D5D3D430A043F415231533340430604BE3E5E475A465B48594757485846"
+ $"563E540E0A060100023F086B0000000000003F086BBDFCD847D6070A0001061A"
+ $"3F086B0000000000003F086BBDFCD847D60715FF01178400040A0001061A3F08"
+ $"6B0000000000003F086BBDFCD847D607001501178600040A030103023F086B00"
+ $"00000000003F086BBDFCD847D6070A020104023F086B0000000000003F086BBD"
+ $"FCD847D6070A050105023F086B0000000000003F086BBDFCD847D6070A010101"
+ $"023F086B0000000000003F086BBDFCD847D6070A040102023F086B0000000000"
+ $"003F086BBDFCD847D6070A0A0109023FAE91BA5BB83A5BB83FAE91464616C79D"
+ $"770A080107023FAE91BA5BB83A5BB83FAE914680FFC7A6E60A070107123FAE91"
+ $"BA5BB83A5BB83FAE914680FFC7A6E601178222040A0901080240335FBBAD8D3C"
+ $"01213F989A430BA94726C00A090108024010F2BAA5963AA5964010F2C8DF97C9"
+ $"10E30A090108024010F2BA9A893AA59640085243EDDAC7DE06"
+};
+
+resource(R_CopyStatusIcon) #'VICN' array {
+ $"6E636966040500020106023E387C38E5D3B893663DF2A44467C04989F300FBF5"
+ $"AAFFFFC00002001202BCA6D53C2975BC8711BD19A64B51764AA2D20001FFFF01"
+ $"2F04018C030A042135214F3D5D3D430A043F415231533340430604BE3E5E475A"
+ $"465B48594757485846563E54090A030102201F200A03010220370C0A01010020"
+ $"380D0A00010030380D01178222040A010100000A0001001001178222040A0201"
+ $"01000A020101023EC1AB0000000000003E99EF481CBB49E7A20A020101200512"
+};
+
resource(R_DownloadDirIcon) #'VICN' array {
$"6E6369660B0500020006023841813C9B3BBEAB393A4F584B254D4A7AEB00FFE2"
$"ACFFF49806020016022C60673CAAABBEBB082E6EFB4BBA064A22B000FFFF8E02"
Other related posts:
- » [haiku-commits] haiku: hrev48794 - data/artwork/icons src/kits/shared src/apps/showimage src/kits/tracker headers/private/shared - waddlesplash