Haiku/haiku
Haiku/haiku
1
0
Fork 0
mirror of https://review.haiku-os.org/haiku synced 2024-11-23 07:18:40 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tracker: Style changes related to Shortcuts update

Browse Source 
Change-Id: I30d10821a2767c77718f8545b585ef577b546405
Reviewed-on: https://review.haiku-os.org/c/haiku/+/8224
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
Haiku-Format: Haiku-format Bot <no-reply+haikuformatbot@haiku-os.org>
Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>
This commit is contained in:
John Scipione 2024-09-04 12:33:24 -04:00 committed by waddlesplash
parent 8fbb862695
commit 8f97570f6a
6 changed files with 41 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/kits/tracker/ContainerWindow.cpp
View File

@ -36,8 +36,8 @@ All rights reserved.
#include "ContainerWindow.h"
#include <Alert.h>
#include <Application.h>
#include <AppFileInfo.h>
#include <Application.h>
#include <Catalog.h>
#include <ControlLook.h>
#include <Debug.h>
@ -48,8 +48,8 @@ All rights reserved.
#include <GroupLayout.h>
#include <Keymap.h>
#include <Locale.h>
#include <MenuItem.h>
#include <MenuBar.h>
#include <MenuItem.h>
#include <NodeMonitor.h>
#include <Path.h>
#include <PopUpMenu.h>
@ -66,7 +66,6 @@ All rights reserved.
#include <stdlib.h>
#include "Attributes.h"
#include "AttributeStream.h"
#include "AutoDeleter.h"
#include "AutoLock.h"
#include "BackgroundImage.h"
@ -74,26 +73,26 @@ All rights reserved.
#include "CountView.h"
#include "DeskWindow.h"
#include "DraggableContainerIcon.h"
#include "FavoritesMenu.h"
#include "FindPanel.h"
#include "FSClipboard.h"
#include "FSUndoRedo.h"
#include "FSUtils.h"
#include "FavoritesMenu.h"
#include "FindPanel.h"
#include "IconMenuItem.h"
#include "OpenWithWindow.h"
#include "MimeTypes.h"
#include "Model.h"
#include "MountMenu.h"
#include "Navigator.h"
#include "NavMenu.h"
#include "Navigator.h"
#include "OpenWithWindow.h"
#include "PoseView.h"
#include "QueryContainerWindow.h"
#include "SelectionWindow.h"
#include "TemplatesMenu.h"
#include "Thread.h"
#include "TitleView.h"
#include "Tracker.h"
#include "TrackerSettings.h"
#include "Thread.h"
#include "TemplatesMenu.h"
#undef B_TRANSLATION_CONTEXT
@ -146,8 +145,7 @@ ActivateWindowFilter(BMessage*, BHandler** target, BMessageFilter*)
static int32
AddOnMenuGenerate(const entry_ref* addOnRef, BMenu* menu,
BContainerWindow* window)
AddOnMenuGenerate(const entry_ref* addOnRef, BMenu* menu, BContainerWindow* window)
{
BEntry entry(addOnRef);
BPath path;
@ -359,12 +357,10 @@ AddMimeTypeString(BStringList& list, Model* model)
// #pragma mark - BContainerWindow
BContainerWindow::BContainerWindow(LockingList<BWindow>* list,
uint32 openFlags, window_look look, window_feel feel, uint32 windowFlags,
uint32 workspace, bool useLayout, bool isDeskWindow)
BContainerWindow::BContainerWindow(LockingList<BWindow>* list, uint32 openFlags, window_look look,
window_feel feel, uint32 windowFlags, uint32 workspace, bool useLayout, bool isDeskWindow)
:
BWindow(InitialWindowRect(feel), "TrackerWindow", look, feel, windowFlags,
workspace),
BWindow(InitialWindowRect(feel), "TrackerWindow", look, feel, windowFlags, workspace),
fWindowList(list),
fOpenFlags(openFlags),
fUsesLayout(useLayout),
@ -781,15 +777,12 @@ BContainerWindow::Init(const BMessage* message)
}
AddContextMenus();
AddShortcut('T', B_COMMAND_KEY | B_SHIFT_KEY, new BMessage(kDelete),
PoseView());
AddShortcut('K', B_COMMAND_KEY | B_SHIFT_KEY, new BMessage(kCleanupAll),
PoseView());
AddShortcut('Q', B_COMMAND_KEY | B_OPTION_KEY | B_SHIFT_KEY
| B_CONTROL_KEY, new BMessage(kQuitTracker));
AddShortcut('T', B_COMMAND_KEY | B_SHIFT_KEY, new BMessage(kDelete), PoseView());
AddShortcut('K', B_COMMAND_KEY | B_SHIFT_KEY, new BMessage(kCleanupAll), PoseView());
AddShortcut('Q', B_COMMAND_KEY | B_OPTION_KEY | B_SHIFT_KEY | B_CONTROL_KEY,
new BMessage(kQuitTracker));
AddShortcut(B_DOWN_ARROW, B_COMMAND_KEY, new BMessage(kOpenSelection),
PoseView());
AddShortcut(B_DOWN_ARROW, B_COMMAND_KEY, new BMessage(kOpenSelection), PoseView());
SetSingleWindowBrowseShortcuts(settings.SingleWindowBrowse());
@ -838,10 +831,8 @@ BContainerWindow::Init(const BMessage* message)
MarkAttributesMenu(fAttrMenu);
CheckScreenIntersect();
if (fBackgroundImage != NULL && !fIsDesktop
&& PoseView()->ViewMode() != kListMode) {
if (fBackgroundImage != NULL && !fIsDesktop && PoseView()->ViewMode() != kListMode)
fBackgroundImage->Show(PoseView(), current_workspace());
}
Show();
@ -2153,10 +2144,10 @@ BContainerWindow::SetupNavigationMenu(const entry_ref* ref, BMenu* parent)
Model model(&entry);
entry_ref resolvedRef;
if (model.InitCheck() != B_OK
|| (!model.IsContainer() && !model.IsSymLink())) {
if (model.InitCheck() != B_OK)
return;
else if (!model.IsContainer() && !model.IsSymLink())
return;
}
if (model.IsSymLink()) {
if (entry.SetTo(model.EntryRef(), true) != B_OK)
@ -2715,10 +2706,8 @@ BContainerWindow::AddFileContextMenus(BMenu* menu)
menu->AddSeparatorItem();
}
} else {
menu->AddItem(new BMenuItem(B_TRANSLATE("Delete"),
new BMessage(kDelete), 0));
menu->AddItem(new BMenuItem(B_TRANSLATE("Restore"),
new BMessage(kRestoreFromTrash), 0));
menu->AddItem(new BMenuItem(B_TRANSLATE("Delete"), new BMessage(kDelete), 0));
menu->AddItem(new BMenuItem(B_TRANSLATE("Restore"), new BMessage(kRestoreFromTrash), 0));
}
#ifdef CUT_COPY_PASTE_IN_CONTEXT_MENU
@ -3633,10 +3622,10 @@ BContainerWindow::AddMimeTypesToMenu(BMenu* menu)
}
// remove separator if it's the only item in menu
BMenuItem* item = menu->ItemAt(menu->CountItems() - 1);
if (dynamic_cast<BSeparatorItem*>(item) != NULL) {
menu->RemoveItem(item);
delete item;
BMenuItem* separator = menu->ItemAt(menu->CountItems() - 1);
if (dynamic_cast<BSeparatorItem*>(separator) != NULL) {
menu->RemoveItem(separator);
delete separator;
}
MarkAttributesMenu(menu);
@ -4135,7 +4124,6 @@ BContainerWindow::SetSingleWindowBrowseShortcuts(bool enabled)
new BMessage(kOpenSelection), PoseView());
AddShortcut('L', B_COMMAND_KEY,
new BMessage(kNavigatorCommandSetFocus), Navigator());
} else {
RemoveShortcut(B_LEFT_ARROW, B_COMMAND_KEY);
RemoveShortcut(B_RIGHT_ARROW, B_COMMAND_KEY);

2
src/kits/tracker/ContainerWindow.h
View File

@ -329,9 +329,7 @@ private:
BMessage* fDragMessage;
BObjectList<BString>* fCachedTypesList;
bool fWaitingForRefs;
bool fSaveStateIsEnabled;
bool fIsWatchingPath;
typedef BWindow _inherited;

2
src/kits/tracker/DeskWindow.cpp
View File

@ -64,8 +64,8 @@ All rights reserved.
#include "KeyInfos.h"
#include "MountMenu.h"
#include "PoseView.h"
#include "Tracker.h"
#include "TemplatesMenu.h"
#include "Tracker.h"
const char* kShelfPath = "tracker_shelf";

14
src/kits/tracker/FilePanelPriv.cpp
View File

@ -64,16 +64,16 @@ All rights reserved.
#include <Volume.h>
#include <VolumeRoster.h>
#include "Attributes.h"
#include "AttributeStream.h"
#include "Attributes.h"
#include "AutoLock.h"
#include "Commands.h"
#include "CountView.h"
#include "DesktopPoseView.h"
#include "DirMenu.h"
#include "FavoritesMenu.h"
#include "FSUtils.h"
#include "FSClipboard.h"
#include "FSUtils.h"
#include "FavoritesMenu.h"
#include "IconMenuItem.h"
#include "MimeTypes.h"
#include "NavMenu.h"
@ -166,10 +166,10 @@ key_down_filter(BMessage* message, BHandler** handler, BMessageFilter* filter)
// #pragma mark - TFilePanel
TFilePanel::TFilePanel(file_panel_mode mode, BMessenger* target,
const BEntry* startDir, uint32 nodeFlavors, bool multipleSelection,
BMessage* message, BRefFilter* filter, uint32 openFlags, window_look look,
window_feel feel, uint32 windowFlags, uint32 workspace, bool hideWhenDone)
TFilePanel::TFilePanel(file_panel_mode mode, BMessenger* target, const BEntry* startDir,
uint32 nodeFlavors, bool multipleSelection, BMessage* message, BRefFilter* filter,
uint32 openFlags, window_look look, window_feel feel, uint32 windowFlags, uint32 workspace,
bool hideWhenDone)
:
BContainerWindow(0, openFlags, look, feel, windowFlags, workspace, false),
fDirMenu(NULL),

4
src/kits/tracker/PoseView.cpp
View File

@ -84,14 +84,14 @@ All rights reserved.
#include "CountView.h"
#include "DeskWindow.h"
#include "DesktopPoseView.h"
#include "FilePanelPriv.h"
#include "FSClipboard.h"
#include "FSUtils.h"
#include "FilePanelPriv.h"
#include "FunctionObject.h"
#include "InfoWindow.h"
#include "MimeTypes.h"
#include "Navigator.h"
#include "Pose.h"
#include "InfoWindow.h"
#include "Tests.h"
#include "Thread.h"
#include "Tracker.h"

9
src/kits/tracker/infowindow/HeaderView.cpp
View File

@ -333,9 +333,8 @@ HeaderView::MouseDown(BPoint where)
Window()->CurrentMessage()->FindInt32("buttons", (int32*)&buttons);
if (SecondaryMouseButtonDown(modifiers(), buttons)) {
// Show contextual menu
BPopUpMenu* contextMenu
= new BPopUpMenu("FileContext", false, false);
if (contextMenu) {
BPopUpMenu* contextMenu = new BPopUpMenu("FileContext", false, false);
if (contextMenu != NULL) {
BuildContextMenu(contextMenu);
contextMenu->SetAsyncAutoDestruct(true);
contextMenu->Go(ConvertToScreen(where), true, true,
@ -348,8 +347,8 @@ HeaderView::MouseDown(BPoint where)
BPoint offsetPoint;
offsetPoint.x = where.x - fIconRect.left;
offsetPoint.y = where.y - fIconRect.top;
if (IconCache::sIconCache->IconHitTest(offsetPoint, fIconModel,
kNormalIcon, fIconRect.Size())) {
if (IconCache::sIconCache->IconHitTest(offsetPoint, fIconModel, kNormalIcon,
fIconRect.Size())) {
// Can't drag the trash anywhere..
fTrackingState = fModel->IsTrash()
? open_only_track : icon_track;