[haiku-commits] haiku: hrev47515 - src/kits/tracker
- From: jscipione@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 18 Jul 2014 15:16:10 +0200 (CEST)
hrev47515 adds 2 changesets to branch 'master'
old head: bc1739a5c56a2e8ab105ef2998cc4768a198a07f
new head: 61dec7d2ec230a5ec8351fa171e3b0af5ccab36e
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=61dec7d+%5Ebc1739a
----------------------------------------------------------------------------
5ddedec: Tracker: more style fixes to ContainerWindow.cpp
* 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
61dec7d: Tracker: fix bug introduced in hrev17795
Ticket #298 for context.
In BContainerWindow::AddWindowContextMenus() pasteItem is used but
not declared if CUT_COPY_PASTE_IN_CONTEXT_MENU is defined.
[ John Scipione <jscipione@xxxxxxxxx> ]
----------------------------------------------------------------------------
1 file changed, 43 insertions(+), 38 deletions(-)
src/kits/tracker/ContainerWindow.cpp | 81 +++++++++++++++++---------------
############################################################################
Commit: 5ddedec51aa353ddca27c237861a02be2fe27a6a
URL: http://cgit.haiku-os.org/haiku/commit/?id=5ddedec
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Fri Jul 18 13:04:19 2014 UTC
Tracker: more style fixes to ContainerWindow.cpp
* 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
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/ContainerWindow.cpp
b/src/kits/tracker/ContainerWindow.cpp
index e0e566a..0e31c83 100644
--- a/src/kits/tracker/ContainerWindow.cpp
+++ b/src/kits/tracker/ContainerWindow.cpp
@@ -1920,10 +1920,10 @@ BContainerWindow::AddFileMenu(BMenu* menu)
if (!TargetModel()->IsQuery() && !TargetModel()->IsVirtualDirectory()
&& !IsTrash() && !IsPrintersDir() && !TargetModel()->IsRoot()) {
if (!PoseView()->IsFilePanel()) {
- TemplatesMenu* templateMenu = new
TemplatesMenu(PoseView(),
+ TemplatesMenu* templatesMenu = new
TemplatesMenu(PoseView(),
B_TRANSLATE("New"));
- menu->AddItem(templateMenu);
- templateMenu->SetTargetForItems(PoseView());
+ menu->AddItem(templatesMenu);
+ templatesMenu->SetTargetForItems(PoseView());
} else {
menu->AddItem(new BMenuItem(B_TRANSLATE("New folder"),
new BMessage(kNewFolder), 'N'));
@@ -1958,16 +1958,15 @@ BContainerWindow::AddFileMenu(BMenu* menu)
new BMessage(kUnmountVolume), 'U');
item->SetEnabled(false);
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)));
} else {
menu->AddItem(new BMenuItem(B_TRANSLATE("Duplicate"),
new BMessage(kDuplicateSelection), 'D'));
-
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'));
-
menu->AddSeparatorItem();
// The "Move To", "Copy To", "Create Link" menus are inserted
@@ -1975,20 +1974,23 @@ BContainerWindow::AddFileMenu(BMenu* menu)
// BContainerWindow::SetupMoveCopyMenus()
}
- BMenuItem* cutItem = NULL,* copyItem = NULL,* pasteItem = NULL;
+ BMenuItem* cutItem = NULL;
+ BMenuItem* copyItem = NULL;
+ BMenuItem* pasteItem = NULL;
if (!IsPrintersDir()) {
menu->AddSeparatorItem();
if (!TargetModel()->IsRoot()) {
- menu->AddItem(cutItem = new(std::nothrow) BMenuItem(
- B_TRANSLATE("Cut"), new BMessage(B_CUT), 'X'));
- menu->AddItem(copyItem = new(std::nothrow) BMenuItem(
- B_TRANSLATE("Copy"), new BMessage(B_COPY),
'C'));
- menu->AddItem(pasteItem = new(std::nothrow) BMenuItem(
- B_TRANSLATE("Paste"), new BMessage(B_PASTE),
'V'));
-
+ cutItem = new(std::nothrow)
BMenuItem(B_TRANSLATE("Cut"),
+ new BMessage(B_CUT), 'X');
+ menu->AddItem(cutItem);
+ copyItem = new(std::nothrow)
BMenuItem(B_TRANSLATE("Copy"),
+ new BMessage(B_COPY), 'C');
+ menu->AddItem(copyItem);
+ pasteItem = new(std::nothrow)
BMenuItem(B_TRANSLATE("Paste"),
+ new BMessage(B_PASTE), 'V');
+ menu->AddItem(pasteItem);
menu->AddSeparatorItem();
-
menu->AddItem(new BMenuItem(B_TRANSLATE("Identify"),
new BMessage(kIdentifyEntry)));
}
@@ -1998,13 +2000,13 @@ BContainerWindow::AddFileMenu(BMenu* menu)
}
menu->SetTargetForItems(PoseView());
- if (cutItem)
+ if (cutItem != NULL)
cutItem->SetTarget(this);
- if (copyItem)
+ if (copyItem != NULL)
copyItem->SetTarget(this);
- if (pasteItem)
+ if (pasteItem != NULL)
pasteItem->SetTarget(this);
}
@@ -2849,11 +2851,12 @@ BContainerWindow::AddFileContextMenus(BMenu* menu)
#ifdef CUT_COPY_PASTE_IN_CONTEXT_MENU
menu->AddSeparatorItem();
- BMenuItem* cutItem,* copyItem;
- menu->AddItem(cutItem = new BMenuItem(B_TRANSLATE("Cut"),
- new BMessage(B_CUT), 'X'));
- menu->AddItem(copyItem = new BMenuItem(B_TRANSLATE("Copy"),
- new BMessage(B_COPY), 'C'));
+ BMenuItem* cutItem = new BMenuItem(B_TRANSLATE("Cut"),
+ new BMessage(B_CUT), 'X');
+ menu->AddItem(cutItem);
+ BMenuItem* copyItem = new BMenuItem(B_TRANSLATE("Copy"),
+ new BMessage(B_COPY), 'C');
+ menu->AddItem(copyItem);
#endif
menu->AddSeparatorItem();
@@ -2912,14 +2915,14 @@ BContainerWindow::AddWindowContextMenus(BMenu* menu)
} else if (IsPrintersDir()) {
menu->AddItem(new BMenuItem(B_TRANSLATE("Add printer"
B_UTF8_ELLIPSIS),
new BMessage(kAddPrinter), 'N'));
- } else if (InTrash() || TargetModel()->IsRoot())
+ } else if (InTrash() || TargetModel()->IsRoot()) {
needSeparator = false;
- else {
- TemplatesMenu* templateMenu = new TemplatesMenu(PoseView(),
+ } else {
+ TemplatesMenu* templatesMenu = new TemplatesMenu(PoseView(),
B_TRANSLATE("New"));
- menu->AddItem(templateMenu);
- templateMenu->SetTargetForItems(PoseView());
- templateMenu->SetFont(be_plain_font);
+ menu->AddItem(templatesMenu);
+ templatesMenu->SetTargetForItems(PoseView());
+ templatesMenu->SetFont(be_plain_font);
}
if (needSeparator)
@@ -2930,9 +2933,9 @@ BContainerWindow::AddWindowContextMenus(BMenu* menu)
menu->AddItem(pasteItem);
menu->AddSeparatorItem();
#endif
+
BMenu* arrangeBy = new BMenu(B_TRANSLATE("Arrange by"));
PopulateArrangeByMenu(arrangeBy);
-
menu->AddItem(arrangeBy);
menu->AddItem(new BMenuItem(B_TRANSLATE("Select" B_UTF8_ELLIPSIS),
@@ -2956,7 +2959,8 @@ BContainerWindow::AddWindowContextMenus(BMenu* menu)
#if DEBUG
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);
#endif
@@ -3153,9 +3157,10 @@ BContainerWindow::UpdateMenu(BMenu* menu,
UpdateMenuContext context)
}
Model* selectedModel = NULL;
- if (selectCount == 1)
+ if (selectCount == 1) {
selectedModel = PoseView()->SelectionList()->FirstItem()->
TargetModel();
+ }
if (context == kMenuBarContext || context == kPosePopUpContext) {
SetUpEditQueryItem(menu);
@@ -3227,10 +3232,10 @@ BContainerWindow::UpdateMenu(BMenu* menu,
UpdateMenuContext context)
BMenuItem* item = menu->FindItem(B_TRANSLATE("New"));
if (item != NULL) {
- TemplatesMenu* templateMenu =
dynamic_cast<TemplatesMenu*>
- (item->Submenu());
- if (templateMenu != NULL)
- templateMenu->UpdateMenuState();
+ TemplatesMenu* templatesMenu =
dynamic_cast<TemplatesMenu*>(
+ item->Submenu());
+ if (templatesMenu != NULL)
+ templatesMenu->UpdateMenuState();
}
}
############################################################################
Revision: hrev47515
Commit: 61dec7d2ec230a5ec8351fa171e3b0af5ccab36e
URL: http://cgit.haiku-os.org/haiku/commit/?id=61dec7d
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Fri Jul 18 13:15:23 2014 UTC
Ticket: https://dev.haiku-os.org/ticket/298
Tracker: fix bug introduced in hrev17795
Ticket #298 for context.
In BContainerWindow::AddWindowContextMenus() pasteItem is used but
not declared if CUT_COPY_PASTE_IN_CONTEXT_MENU is defined.
----------------------------------------------------------------------------
diff --git a/src/kits/tracker/ContainerWindow.cpp
b/src/kits/tracker/ContainerWindow.cpp
index 0e31c83..639853b 100644
--- a/src/kits/tracker/ContainerWindow.cpp
+++ b/src/kits/tracker/ContainerWindow.cpp
@@ -2928,7 +2928,7 @@ BContainerWindow::AddWindowContextMenus(BMenu* menu)
if (needSeparator)
menu->AddSeparatorItem();
-#if 0
+#ifdef CUT_COPY_PASTE_IN_CONTEXT_MENU
BMenuItem* pasteItem = new BMenuItem("Paste", new BMessage(B_PASTE),
'V');
menu->AddItem(pasteItem);
menu->AddSeparatorItem();
Other related posts:
- » [haiku-commits] haiku: hrev47515 - src/kits/tracker - jscipione
