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

Style fixes and code simplifications

Browse Source
This commit is contained in:
John Scipione
2013-04-28 23:38:04 -04:00
parent 955d6389af
commit 32994cb474
1 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/tracker/FindPanel.cpp
+26 -16
View File
@@ -698,8 +698,7 @@ FindPanel::FindPanel(BFile* node, FindWindow* parent, bool fromTemplate,
fMimeTypeField = new BMenuField("MimeTypeMenu", "", fMimeTypeMenu); fMimeTypeField = new BMenuField("MimeTypeMenu", "", fMimeTypeMenu);
fMimeTypeField->SetDivider(0.0f); fMimeTypeField->SetDivider(0.0f);
fMimeTypeField->MenuItem()->SetLabel( fMimeTypeField->MenuItem()->SetLabel(B_TRANSLATE("All files and folders"));
B_TRANSLATE("All files and folders"));
// add popup for search criteria // add popup for search criteria
fSearchModeMenu = new BPopUpMenu("searchMode"); fSearchModeMenu = new BPopUpMenu("searchMode");
fSearchModeMenu->AddItem(new BMenuItem(B_TRANSLATE("by name"), fSearchModeMenu->AddItem(new BMenuItem(B_TRANSLATE("by name"),
@@ -1150,20 +1149,25 @@ FindPanel::MessageReceived(BMessage* message)
if (message->FindPointer("source", (void**)&item) != B_OK) if (message->FindPointer("source", (void**)&item) != B_OK)
return; return;
if (item->Submenu()->ItemAt(0)) if (item->Submenu()->ItemAt(0) != NULL)
item->Submenu()->ItemAt(0)->SetMarked(true); item->Submenu()->ItemAt(0)->SetMarked(true);
Invalidate(); Invalidate();
break; break;
case kLatchChanged: case kLatchChanged:
{
int32 value; int32 value;
if (message->FindInt32("be:value", &value) == B_OK) { if (message->FindInt32("be:value", &value) != B_OK)
break;
if (value == 0 && !fMoreOptions->IsHidden(this)) if (value == 0 && !fMoreOptions->IsHidden(this))
fMoreOptions->Hide(); fMoreOptions->Hide();
else if (value == 1 && fMoreOptions->IsHidden(this)) else if (value == 1 && fMoreOptions->IsHidden(this))
fMoreOptions->Show(); fMoreOptions->Show();
}
break; break;
}
case B_SAVE_REQUESTED: case B_SAVE_REQUESTED:
{ {
@@ -1635,15 +1639,19 @@ FindPanel::SetCurrentMimeType(BMenuItem* item)
BMenuItem* search; BMenuItem* search;
for (int32 i = 2; (search = MimeTypeMenu()->ItemAt(i)) != NULL; i++) { for (int32 i = 2; (search = MimeTypeMenu()->ItemAt(i)) != NULL; i++) {
if (item == search || !search->Label()) if (item == search || search->Label() == NULL)
continue; continue;
if (strcmp(item->Label(),search->Label()) == 0) {
if (strcmp(item->Label(), search->Label()) == 0) {
search->SetMarked(true); search->SetMarked(true);
break; break;
} }
BMenu* submenu = search->Submenu(); BMenu* submenu = search->Submenu();
if (submenu) { if (submenu == NULL)
for (int32 j = submenu->CountItems();j-- > 0;) { continue;
for (int32 j = submenu->CountItems(); j-- > 0;) {
BMenuItem* sub = submenu->ItemAt(j); BMenuItem* sub = submenu->ItemAt(j);
if (strcmp(item->Label(),sub->Label()) == 0) { if (strcmp(item->Label(),sub->Label()) == 0) {
sub->SetMarked(true); sub->SetMarked(true);
@@ -1652,7 +1660,7 @@ FindPanel::SetCurrentMimeType(BMenuItem* item)
} }
} }
} }
}
return B_OK; return B_OK;
} }
@@ -1781,23 +1789,25 @@ FindPanel::AddMimeTypesToMenu()
} }
} }
if (tracker) if (tracker != NULL) {
tracker->MimeTypes()->EachCommonType(&FindPanel::AddOneMimeTypeToMenu, tracker->MimeTypes()->EachCommonType(&FindPanel::AddOneMimeTypeToMenu,
MimeTypeMenu()); MimeTypeMenu());
}
// remove empty super type menus (and set target) // remove empty super type menus (and set target)
for (int32 index = MimeTypeMenu()->CountItems();index-- > 2;) { for (int32 index = MimeTypeMenu()->CountItems(); index-- > 2;) {
BMenuItem* item = MimeTypeMenu()->ItemAt(index); BMenuItem* item = MimeTypeMenu()->ItemAt(index);
BMenu* submenu = item->Submenu(); BMenu* submenu = item->Submenu();
if (submenu != NULL) { if (submenu == NULL)
continue;
if (submenu->CountItems() == 0) { if (submenu->CountItems() == 0) {
MimeTypeMenu()->RemoveItem(item); MimeTypeMenu()->RemoveItem(item);
delete item; delete item;
} else } else
submenu->SetTargetForItems(this); submenu->SetTargetForItems(this);
} }
}
MimeTypeMenu()->SetTargetForItems(this); MimeTypeMenu()->SetTargetForItems(this);
} }
@@ -2405,6 +2415,7 @@ FindPanel::RemoveAttrViewItems(bool removeGrid)
child->RemoveSelf(); child->RemoveSelf();
delete child; delete child;
} }
if (removeGrid) { if (removeGrid) {
view->RemoveSelf(); view->RemoveSelf();
delete view; delete view;
@@ -2549,7 +2560,6 @@ FindPanel::AddAttributeControls(int32 gridRow)
// target everything // target everything
menu->SetTargetForItems(this); menu->SetTargetForItems(this);
for (int32 index = menu->CountItems() - 1; index >= 0; index--) for (int32 index = menu->CountItems() - 1; index >= 0; index--)
menu->SubmenuAt(index)->SetTargetForItems(this); menu->SubmenuAt(index)->SetTargetForItems(this);
@@ -2631,7 +2641,7 @@ FindPanel::SaveAttrState(BMessage* message, int32 index)
message->AddString("attrViewText", textControl->TextView()->Text()); message->AddString("attrViewText", textControl->TextView()->Text());
BMenuField* field = dynamic_cast<BMenuField*>(FindAttrView("Logic", index)); BMenuField* field = dynamic_cast<BMenuField*>(FindAttrView("Logic", index));
if (field) { if (field != NULL) {
BMenuItem* item = field->Menu()->FindMarked(); BMenuItem* item = field->Menu()->FindMarked();
ASSERT(item); ASSERT(item);
message->AddInt32("logicalRelation", message->AddInt32("logicalRelation",