Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* $(HAIKU_LOCALE_LIBS) must be linked before "tracker", or else the wrong CatalogStub is used by the deskbar. 

* Also fix some style problems and fix the build with APM-aware deskbar (was missing a B_TRANSLATE but did feature the closing parenthesis for it).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37596 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Adrien Destugues 2010-07-19 14:07:10 +00:00
parent 4b53c2ba4f
commit 9253acf88d
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/apps/deskbar/BeMenu.cpp
View File

@ -67,7 +67,7 @@ class DeskbarMountMenu : public BPrivate::MountMenu {
#endif #endif
//#define SHOW_RECENT_FIND_ITEMS // #define SHOW_RECENT_FIND_ITEMS
namespace BPrivate { namespace BPrivate {
BMenu* TrackerBuildRecentFindItemsMenu(const char*); BMenu* TrackerBuildRecentFindItemsMenu(const char*);
@ -257,16 +257,16 @@ TBeMenu::AddStandardBeMenuItems()
item->SetEnabled(!dragging); item->SetEnabled(!dragging);
AddItem(item); AddItem(item);
static const char* kFindMenuItemStr = static const char* kFindMenuItemStr
B_TRANSLATE_MARK("Find" B_UTF8_ELLIPSIS); = B_TRANSLATE_MARK("Find" B_UTF8_ELLIPSIS);
#ifdef SHOW_RECENT_FIND_ITEMS #ifdef SHOW_RECENT_FIND_ITEMS
item = new BMenuItem( item = new BMenuItem(
TrackerBuildRecentFindItemsMenu(kFindMenuItemStr), TrackerBuildRecentFindItemsMenu(kFindMenuItemStr),
new BMessage(kFindButton)); new BMessage(kFindButton));
#else #else
item = new BMenuItem(B_TRANSLATE(kFindMenuItemStr), item = new BMenuItem(B_TRANSLATE(kFindMenuItemStr),
new BMessage(kFindButton)); new BMessage(kFindButton));
#endif #endif
item->SetEnabled(!dragging); item->SetEnabled(!dragging);
AddItem(item); AddItem(item);
@ -288,7 +288,7 @@ TBeMenu::AddStandardBeMenuItems()
item = new BMenuItem(B_TRANSLATE("Deskbar preferences" B_UTF8_ELLIPSIS), item = new BMenuItem(B_TRANSLATE("Deskbar preferences" B_UTF8_ELLIPSIS),
new BMessage(kConfigShow)); new BMessage(kConfigShow));
item->SetTarget(be_app); item->SetTarget(be_app);
AddItem(item); AddItem(item);
AddSeparatorItem(); AddSeparatorItem();
@ -304,7 +304,8 @@ TBeMenu::AddStandardBeMenuItems()
#ifdef APM_SUPPORT #ifdef APM_SUPPORT
if (_kapm_control_(APM_CHECK_ENABLED) == B_OK) { if (_kapm_control_(APM_CHECK_ENABLED) == B_OK) {
item = new BMenuItem(kSuspendMenuItemStr), new BMessage(kSuspendSystem)); item = new BMenuItem(B_TRANSLATE(kSuspendMenuItemStr),
new BMessage(kSuspendSystem));
item->SetEnabled(!dragging); item->SetEnabled(!dragging);
shutdownMenu->AddItem(item); shutdownMenu->AddItem(item);
} }
@ -341,7 +342,7 @@ void
TBeMenu::ResetTargets() TBeMenu::ResetTargets()
{ {
// This method does not recurse into submenus // This method does not recurse into submenus
// and does not affect menu items in submenus. // and does not affect menu items in submenus.
// (e.g. "Restart System" and "Power Off") // (e.g. "Restart System" and "Power Off")
BNavMenu::ResetTargets(); BNavMenu::ResetTargets();

2
src/apps/deskbar/Jamfile
View File

@ -39,7 +39,7 @@ Application Deskbar :
ResourceSet.cpp ResourceSet.cpp
Switcher.cpp Switcher.cpp
$(targetSource) $(targetSource)
: be tracker $(HAIKU_LOCALE_LIBS) $(targetLib) $(TARGET_LIBSUPC++) : be $(HAIKU_LOCALE_LIBS) tracker $(targetLib) $(TARGET_LIBSUPC++)
; ;
DoCatalogs Deskbar : DoCatalogs Deskbar :