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

Tracker: more style fixes to ContainerWindow.cpp

Browse Source 
* Rename templateMenu to templatesMenu.
* 80 char limit fixes
* whitespace fixes
* Declare 1 item per line.
* Don't set variables inline, set, then use.
* Explicit NULL comparisons
* {}'s around if statment with multi-line appearance
This commit is contained in:
John Scipione
2014-07-18 09:04:19 -04:00
parent bc1739a5c5
commit 5ddedec51a
1 changed files with 42 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/tracker/ContainerWindow.cpp
+42 -37
View File
@@ -1920,10 +1920,10 @@ BContainerWindow::AddFileMenu(BMenu* menu)
if (!TargetModel()->IsQuery() && !TargetModel()->IsVirtualDirectory() if (!TargetModel()->IsQuery() && !TargetModel()->IsVirtualDirectory()
&& !IsTrash() && !IsPrintersDir() && !TargetModel()->IsRoot()) { && !IsTrash() && !IsPrintersDir() && !TargetModel()->IsRoot()) {
if (!PoseView()->IsFilePanel()) { if (!PoseView()->IsFilePanel()) {
TemplatesMenu* templateMenu = new TemplatesMenu(PoseView(), TemplatesMenu* templatesMenu = new TemplatesMenu(PoseView(),
B_TRANSLATE("New")); B_TRANSLATE("New"));
menu->AddItem(templateMenu); menu->AddItem(templatesMenu);
templateMenu->SetTargetForItems(PoseView()); templatesMenu->SetTargetForItems(PoseView());
} else { } else {
menu->AddItem(new BMenuItem(B_TRANSLATE("New folder"), menu->AddItem(new BMenuItem(B_TRANSLATE("New folder"),
new BMessage(kNewFolder), 'N')); new BMessage(kNewFolder), 'N'));
@@ -1958,16 +1958,15 @@ BContainerWindow::AddFileMenu(BMenu* menu)
new BMessage(kUnmountVolume), 'U'); new BMessage(kUnmountVolume), 'U');
item->SetEnabled(false); item->SetEnabled(false);
menu->AddItem(item); menu->AddItem(item);
menu->AddItem(new BMenuItem(B_TRANSLATE("Mount settings" B_UTF8_ELLIPSIS), menu->AddItem(new BMenuItem(
B_TRANSLATE("Mount settings" B_UTF8_ELLIPSIS),
new BMessage(kRunAutomounterSettings))); new BMessage(kRunAutomounterSettings)));
} else { } else {
menu->AddItem(new BMenuItem(B_TRANSLATE("Duplicate"), menu->AddItem(new BMenuItem(B_TRANSLATE("Duplicate"),
new BMessage(kDuplicateSelection), 'D')); new BMessage(kDuplicateSelection), 'D'));
menu->AddItem(new BMenuItem(TrackerSettings().DontMoveFilesToTrash() menu->AddItem(new BMenuItem(TrackerSettings().DontMoveFilesToTrash()
? B_TRANSLATE("Delete") : B_TRANSLATE("Move to Trash"), ? B_TRANSLATE("Delete") : B_TRANSLATE("Move to Trash"),
new BMessage(kMoveToTrash), 'T')); new BMessage(kMoveToTrash), 'T'));
menu->AddSeparatorItem(); menu->AddSeparatorItem();
// The "Move To", "Copy To", "Create Link" menus are inserted // The "Move To", "Copy To", "Create Link" menus are inserted
@@ -1975,20 +1974,23 @@ BContainerWindow::AddFileMenu(BMenu* menu)
// BContainerWindow::SetupMoveCopyMenus() // BContainerWindow::SetupMoveCopyMenus()
} }
BMenuItem* cutItem = NULL,* copyItem = NULL,* pasteItem = NULL; BMenuItem* cutItem = NULL;
BMenuItem* copyItem = NULL;
BMenuItem* pasteItem = NULL;
if (!IsPrintersDir()) { if (!IsPrintersDir()) {
menu->AddSeparatorItem(); menu->AddSeparatorItem();
if (!TargetModel()->IsRoot()) { if (!TargetModel()->IsRoot()) {
menu->AddItem(cutItem = new(std::nothrow) BMenuItem( cutItem = new(std::nothrow) BMenuItem(B_TRANSLATE("Cut"),
B_TRANSLATE("Cut"), new BMessage(B_CUT), 'X')); new BMessage(B_CUT), 'X');
menu->AddItem(copyItem = new(std::nothrow) BMenuItem( menu->AddItem(cutItem);
B_TRANSLATE("Copy"), new BMessage(B_COPY), 'C')); copyItem = new(std::nothrow) BMenuItem(B_TRANSLATE("Copy"),
menu->AddItem(pasteItem = new(std::nothrow) BMenuItem( new BMessage(B_COPY), 'C');
B_TRANSLATE("Paste"), new BMessage(B_PASTE), 'V')); menu->AddItem(copyItem);
pasteItem = new(std::nothrow) BMenuItem(B_TRANSLATE("Paste"),
new BMessage(B_PASTE), 'V');
menu->AddItem(pasteItem);
menu->AddSeparatorItem(); menu->AddSeparatorItem();
menu->AddItem(new BMenuItem(B_TRANSLATE("Identify"), menu->AddItem(new BMenuItem(B_TRANSLATE("Identify"),
new BMessage(kIdentifyEntry))); new BMessage(kIdentifyEntry)));
} }
@@ -1998,13 +2000,13 @@ BContainerWindow::AddFileMenu(BMenu* menu)
} }
menu->SetTargetForItems(PoseView()); menu->SetTargetForItems(PoseView());
if (cutItem) if (cutItem != NULL)
cutItem->SetTarget(this); cutItem->SetTarget(this);
if (copyItem) if (copyItem != NULL)
copyItem->SetTarget(this); copyItem->SetTarget(this);
if (pasteItem) if (pasteItem != NULL)
pasteItem->SetTarget(this); pasteItem->SetTarget(this);
} }
@@ -2849,11 +2851,12 @@ BContainerWindow::AddFileContextMenus(BMenu* menu)
#ifdef CUT_COPY_PASTE_IN_CONTEXT_MENU #ifdef CUT_COPY_PASTE_IN_CONTEXT_MENU
menu->AddSeparatorItem(); menu->AddSeparatorItem();
BMenuItem* cutItem,* copyItem; BMenuItem* cutItem = new BMenuItem(B_TRANSLATE("Cut"),
menu->AddItem(cutItem = new BMenuItem(B_TRANSLATE("Cut"), new BMessage(B_CUT), 'X');
new BMessage(B_CUT), 'X')); menu->AddItem(cutItem);
menu->AddItem(copyItem = new BMenuItem(B_TRANSLATE("Copy"), BMenuItem* copyItem = new BMenuItem(B_TRANSLATE("Copy"),
new BMessage(B_COPY), 'C')); new BMessage(B_COPY), 'C');
menu->AddItem(copyItem);
#endif #endif
menu->AddSeparatorItem(); menu->AddSeparatorItem();
@@ -2912,14 +2915,14 @@ BContainerWindow::AddWindowContextMenus(BMenu* menu)
} else if (IsPrintersDir()) { } else if (IsPrintersDir()) {
menu->AddItem(new BMenuItem(B_TRANSLATE("Add printer" B_UTF8_ELLIPSIS), menu->AddItem(new BMenuItem(B_TRANSLATE("Add printer" B_UTF8_ELLIPSIS),
new BMessage(kAddPrinter), 'N')); new BMessage(kAddPrinter), 'N'));
} else if (InTrash() || TargetModel()->IsRoot()) } else if (InTrash() || TargetModel()->IsRoot()) {
needSeparator = false; needSeparator = false;
else { } else {
TemplatesMenu* templateMenu = new TemplatesMenu(PoseView(), TemplatesMenu* templatesMenu = new TemplatesMenu(PoseView(),
B_TRANSLATE("New")); B_TRANSLATE("New"));
menu->AddItem(templateMenu); menu->AddItem(templatesMenu);
templateMenu->SetTargetForItems(PoseView()); templatesMenu->SetTargetForItems(PoseView());
templateMenu->SetFont(be_plain_font); templatesMenu->SetFont(be_plain_font);
} }
if (needSeparator) if (needSeparator)
@@ -2930,9 +2933,9 @@ BContainerWindow::AddWindowContextMenus(BMenu* menu)
menu->AddItem(pasteItem); menu->AddItem(pasteItem);
menu->AddSeparatorItem(); menu->AddSeparatorItem();
#endif #endif
BMenu* arrangeBy = new BMenu(B_TRANSLATE("Arrange by")); BMenu* arrangeBy = new BMenu(B_TRANSLATE("Arrange by"));
PopulateArrangeByMenu(arrangeBy); PopulateArrangeByMenu(arrangeBy);
menu->AddItem(arrangeBy); menu->AddItem(arrangeBy);
menu->AddItem(new BMenuItem(B_TRANSLATE("Select" B_UTF8_ELLIPSIS), menu->AddItem(new BMenuItem(B_TRANSLATE("Select" B_UTF8_ELLIPSIS),
@@ -2956,7 +2959,8 @@ BContainerWindow::AddWindowContextMenus(BMenu* menu)
#if DEBUG #if DEBUG
menu->AddSeparatorItem(); menu->AddSeparatorItem();
BMenuItem* testing = new BMenuItem("Test icon cache", new BMessage(kTestIconCache)); BMenuItem* testing = new BMenuItem("Test icon cache",
new BMessage(kTestIconCache));
menu->AddItem(testing); menu->AddItem(testing);
#endif #endif
@@ -3153,9 +3157,10 @@ BContainerWindow::UpdateMenu(BMenu* menu, UpdateMenuContext context)
} }
Model* selectedModel = NULL; Model* selectedModel = NULL;
if (selectCount == 1) if (selectCount == 1) {
selectedModel = PoseView()->SelectionList()->FirstItem()-> selectedModel = PoseView()->SelectionList()->FirstItem()->
TargetModel(); TargetModel();
}
if (context == kMenuBarContext || context == kPosePopUpContext) { if (context == kMenuBarContext || context == kPosePopUpContext) {
SetUpEditQueryItem(menu); SetUpEditQueryItem(menu);
@@ -3227,10 +3232,10 @@ BContainerWindow::UpdateMenu(BMenu* menu, UpdateMenuContext context)
BMenuItem* item = menu->FindItem(B_TRANSLATE("New")); BMenuItem* item = menu->FindItem(B_TRANSLATE("New"));
if (item != NULL) { if (item != NULL) {
TemplatesMenu* templateMenu = dynamic_cast<TemplatesMenu*> TemplatesMenu* templatesMenu = dynamic_cast<TemplatesMenu*>(
(item->Submenu()); item->Submenu());
if (templateMenu != NULL) if (templatesMenu != NULL)
templateMenu->UpdateMenuState(); templatesMenu->UpdateMenuState();
} }
} }