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

Code cleanup (ellipsis) no functional changes

Browse Source 
* Replace instances of hardcoded "..." with B_UTF8_ELLIPSIS

 * Removal of trailing whitespaces

Change-Id: I82d26fb3e599daa2931c69c3bda3b9a5ab719d00
Reviewed-on: https://review.haiku-os.org/c/1012
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
Rob Gill
2019-02-06 16:37:51 +00:00
committed by Jérôme Duval
parent 1d0064be8b
commit e4803b2c61
7 changed files with 91 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/mail_daemon/inbound_filters/match_header/ConfigView.cpp
+1 -1
View File
@@ -72,7 +72,7 @@ RuleFilterConfig::RuleFilterConfig(const BMailAddOnSettings& addOnSettings)
fAttributeControl = new BTextControl("attr", B_TRANSLATE("If"), NULL, NULL);
fAttributeControl->SetToolTip(
B_TRANSLATE("Header field (e.g. Subject, From, ...)"));
B_TRANSLATE("Header field (e.g. Subject, From, " B_UTF8_ELLIPSIS ")"));
fAttributeControl->SetText(settings.Attribute());
fRegexControl = new BTextControl("regex", B_TRANSLATE("has"), NULL, NULL);
src/add-ons/mail_daemon/inbound_protocols/imap/FolderConfigWindow.cpp
+3 -2
View File
@@ -310,7 +310,7 @@ void
FolderConfigWindow::_LoadFolders()
{
StatusWindow* statusWindow = new StatusWindow(this,
B_TRANSLATE("Fetching IMAP folders, have patience..."));
B_TRANSLATE("Fetching IMAP folders, have patience" B_UTF8_ELLIPSIS));
statusWindow->Show();
status_t status = fProtocol.Connect(fSettings.ServerAddress(),
@@ -374,7 +374,8 @@ FolderConfigWindow::_ApplyChanges()
return;
StatusWindow* status = new StatusWindow(this,
B_TRANSLATE("Update subcription of IMAP folders, have patience..."));
B_TRANSLATE("Update subcription of IMAP folders, have patience"
B_UTF8_ELLIPSIS));
status->Show();
for (size_t i = 0; i < fFolderList.size(); i++) {
src/apps/processcontroller/ProcessController.cpp
+2 -1
View File
@@ -456,7 +456,8 @@ ProcessController::MessageReceived(BMessage *message)
}
if (last) {
alert = new BAlert(B_TRANSLATE("Info"),
B_TRANSLATE("This is the last active processor...\n"
B_TRANSLATE("This is the last active processor"
B_UTF8_ELLIPSIS "\n"
"You can't turn it off!"),
B_TRANSLATE("That's no Fun!"), NULL, NULL,
B_WIDTH_AS_USUAL, B_WARNING_ALERT);
src/apps/softwareupdater/SoftwareUpdaterWindow.cpp
+76 -74
View File
@@ -71,7 +71,7 @@ SoftwareUpdaterWindow::SoftwareUpdaterWindow()
fDetailView->SetExplicitAlignment(BAlignment(B_ALIGN_LEFT, B_ALIGN_TOP));
fStatusBar = new BStatusBar("progress");
fStatusBar->SetMaxValue(100);
fListView = new PackageListView();
fScrollView = new BScrollView("scrollview", fListView, B_WILL_DRAW,
false, true);
@@ -86,7 +86,7 @@ SoftwareUpdaterWindow::SoftwareUpdaterWindow()
font.SetSize(font.Size() * 1.5);
fHeaderView->SetFont(&font,
B_FONT_FAMILY_AND_STYLE | B_FONT_SIZE | B_FONT_FLAGS);
BLayoutBuilder::Group<>(this, B_HORIZONTAL, B_USE_ITEM_SPACING)
.Add(fStripeView)
.AddGroup(B_VERTICAL, 0)
@@ -107,23 +107,23 @@ SoftwareUpdaterWindow::SoftwareUpdaterWindow()
.End()
.End()
.End();
fDetailsLayoutItem = layout_item_for(fDetailView);
fProgressLayoutItem = layout_item_for(fStatusBar);
fPackagesLayoutItem = layout_item_for(fScrollView);
fCancelButtonLayoutItem = layout_item_for(fCancelButton);
fUpdateButtonLayoutItem = layout_item_for(fUpdateButton);
fDetailsCheckboxLayoutItem = layout_item_for(fDetailsCheckbox);
_SetState(STATE_DISPLAY_STATUS);
CenterOnScreen();
SetFlags(Flags() ^ B_AUTO_UPDATE_SIZE_LIMITS);
// Prevent resizing for now
fDefaultRect = Bounds();
SetSizeLimits(fDefaultRect.Width(), fDefaultRect.Width(),
fDefaultRect.Height(), fDefaultRect.Height());
// Read settings file
status_t status = find_directory(B_USER_SETTINGS_DIRECTORY, &fSettingsPath);
if (status == B_OK) {
@@ -141,16 +141,16 @@ SoftwareUpdaterWindow::SoftwareUpdaterWindow()
}
}
Show();
BMessage registerMessage(kMsgRegister);
registerMessage.AddMessenger(kKeyMessenger, BMessenger(this));
be_app->PostMessage(&registerMessage);
fCancelAlertResponse.SetMessage(new BMessage(kMsgCancelResponse));
fCancelAlertResponse.SetTarget(this);
fWarningAlertDismissed.SetMessage(new BMessage(kMsgWarningDismissed));
fWarningAlertDismissed.SetTarget(this);
// Common elements used for the zoom height and width calculations
fZoomHeightBaseline = 6
+ be_control_look->ComposeSpacing(B_USE_SMALL_SPACING)
@@ -217,14 +217,14 @@ void
SoftwareUpdaterWindow::MessageReceived(BMessage* message)
{
switch (message->what) {
case kMsgTextUpdate:
{
if (fCurrentState == STATE_DISPLAY_PROGRESS)
_SetState(STATE_DISPLAY_STATUS);
else if (fCurrentState != STATE_DISPLAY_STATUS)
break;
BString header;
BString detail;
Lock();
@@ -237,14 +237,14 @@ SoftwareUpdaterWindow::MessageReceived(BMessage* message)
Unlock();
break;
}
case kMsgProgressUpdate:
{
if (fCurrentState == STATE_DISPLAY_STATUS)
_SetState(STATE_DISPLAY_PROGRESS);
else if (fCurrentState != STATE_DISPLAY_PROGRESS)
break;
BString packageName;
status_t result = message->FindString(kKeyPackageName,
&packageName);
@@ -258,7 +258,7 @@ SoftwareUpdaterWindow::MessageReceived(BMessage* message)
result = message->FindFloat(kKeyPercentage, &percent);
if (result != B_OK)
break;
BString header;
Lock();
result = message->FindString(kKeyHeader, &header);
@@ -267,11 +267,11 @@ SoftwareUpdaterWindow::MessageReceived(BMessage* message)
fStatusBar->SetTo(percent, packageName.String(),
packageCount.String());
Unlock();
fListView->UpdatePackageProgress(packageName.String(), percent);
break;
}
case kMsgCancel:
{
if (_GetState() == STATE_FINAL_MESSAGE) {
@@ -284,10 +284,11 @@ SoftwareUpdaterWindow::MessageReceived(BMessage* message)
Lock();
fHeaderView->SetText(B_TRANSLATE("Cancelling updates"));
fDetailView->SetText(
B_TRANSLATE("Attempting to cancel the updates..."));
B_TRANSLATE("Attempting to cancel the updates"
B_UTF8_ELLIPSIS));
Unlock();
fUserCancelRequested = true;
if (fWaitingForButton) {
fButtonResult = message->what;
delete_sem(fWaitingSem);
@@ -295,7 +296,7 @@ SoftwareUpdaterWindow::MessageReceived(BMessage* message)
}
break;
}
// Confirm with the user to cancel
BAlert* alert = new BAlert("cancel request", B_TRANSLATE("Updates"
" have not been completed, are you sure you want to quit?"),
@@ -305,7 +306,7 @@ SoftwareUpdaterWindow::MessageReceived(BMessage* message)
alert->Go(&fCancelAlertResponse);
break;
}
case kMsgCancelResponse:
{
// Verify whether the cancel alert was confirmed
@@ -313,14 +314,15 @@ SoftwareUpdaterWindow::MessageReceived(BMessage* message)
message->FindInt32("which", &selection);
if (selection != 0)
break;
Lock();
fHeaderView->SetText(B_TRANSLATE("Cancelling updates"));
fDetailView->SetText(
B_TRANSLATE("Attempting to cancel the updates..."));
B_TRANSLATE("Attempting to cancel the updates"
B_UTF8_ELLIPSIS));
Unlock();
fUserCancelRequested = true;
if (fWaitingForButton) {
fButtonResult = message->what;
delete_sem(fWaitingSem);
@@ -328,7 +330,7 @@ SoftwareUpdaterWindow::MessageReceived(BMessage* message)
}
break;
}
case kMsgUpdateConfirmed:
{
if (fWaitingForButton) {
@@ -339,7 +341,7 @@ SoftwareUpdaterWindow::MessageReceived(BMessage* message)
}
break;
}
case kMsgMoreDetailsToggle:
fListView->SetMoreDetails(fDetailsCheckbox->Value() != 0);
PostMessage(kMsgSetZoomLimits);
@@ -367,17 +369,17 @@ SoftwareUpdaterWindow::MessageReceived(BMessage* message)
SetZoomLimits(zoomWidth, zoomHeight);
break;
}
case kMsgWarningDismissed:
fWarningAlertCount--;
break;
case kMsgWindowFrameChanged:
delete fMessageRunner;
fMessageRunner = NULL;
_WriteSettings();
break;
case kMsgGetUpdateType:
{
BString text(
@@ -399,11 +401,11 @@ SoftwareUpdaterWindow::MessageReceived(BMessage* message)
case 0:
action = CANCEL_UPDATE;
break;
case 1:
action = FULLSYNC;
break;
case 2:
action = UPDATE;
break;
@@ -413,7 +415,7 @@ SoftwareUpdaterWindow::MessageReceived(BMessage* message)
message->SendReply(&reply);
break;
}
case kMsgNoRepositories:
{
BString text(
@@ -431,7 +433,7 @@ SoftwareUpdaterWindow::MessageReceived(BMessage* message)
message->SendReply(&reply);
break;
}
default:
BWindow::MessageReceived(message);
}
@@ -446,10 +448,10 @@ SoftwareUpdaterWindow::ConfirmUpdates()
fDetailView->SetText(B_TRANSLATE("The following changes will be made:"));
fListView->SortItems();
Unlock();
uint32 priorState = _GetState();
_SetState(STATE_GET_CONFIRMATION);
_WaitForButtonClick();
_SetState(priorState);
return fButtonResult == kMsgUpdateConfirmed;
@@ -472,7 +474,7 @@ SoftwareUpdaterWindow::UserCancelRequested()
{
if (_GetState() > STATE_GET_CONFIRMATION)
return false;
return fUserCancelRequested;
}
@@ -520,7 +522,7 @@ SoftwareUpdaterWindow::FinalUpdate(const char* header, const char* detail)
{
if (_GetState() == STATE_FINAL_MESSAGE)
return;
_SetState(STATE_FINAL_MESSAGE);
Lock();
fHeaderView->SetText(header);
@@ -556,9 +558,9 @@ SoftwareUpdaterWindow::_SetState(uint32 state)
{
if (state <= STATE_HEAD || state >= STATE_MAX)
return;
Lock();
// Initial settings
if (fCurrentState == STATE_HEAD) {
fProgressLayoutItem->SetVisible(false);
@@ -567,14 +569,14 @@ SoftwareUpdaterWindow::_SetState(uint32 state)
fCancelButtonLayoutItem->SetVisible(false);
}
fCurrentState = state;
// Update confirmation button
// Show only when asking for confirmation to update
if (fCurrentState == STATE_GET_CONFIRMATION)
if (fCurrentState == STATE_GET_CONFIRMATION)
fUpdateButtonLayoutItem->SetVisible(true);
else
fUpdateButtonLayoutItem->SetVisible(false);
// View package info view and checkbox
// Show at confirmation prompt, hide at final update
if (fCurrentState == STATE_GET_CONFIRMATION) {
@@ -593,7 +595,7 @@ SoftwareUpdaterWindow::_SetState(uint32 state)
fPackagesLayoutItem->SetVisible(false);
fDetailsCheckboxLayoutItem->SetVisible(false);
}
// Progress bar and string view
// Hide detail text while showing status bar
if (fCurrentState == STATE_DISPLAY_PROGRESS) {
@@ -603,7 +605,7 @@ SoftwareUpdaterWindow::_SetState(uint32 state)
fProgressLayoutItem->SetVisible(false);
fDetailsLayoutItem->SetVisible(true);
}
// Resizing and zooming
if (fCurrentState == STATE_GET_CONFIRMATION) {
// Enable resizing and zooming
@@ -648,14 +650,14 @@ SoftwareUpdaterWindow::_SetState(uint32 state)
SetFlags(Flags() | B_AUTO_UPDATE_SIZE_LIMITS | B_NOT_RESIZABLE
| B_NOT_ZOOMABLE);
}
// Quit button
if (fCurrentState == STATE_FINAL_MESSAGE) {
fCancelButtonLayoutItem->SetVisible(true);
fCancelButton->SetLabel(B_TRANSLATE_COMMENT("Quit", "Button label"));
fCancelButton->MakeDefault(true);
}
Unlock();
}
@@ -729,7 +731,7 @@ void
SuperItem::DrawItem(BView* owner, BRect item_rect, bool complete)
{
owner->PushState();
float width;
owner->GetPreferredSize(&width, NULL);
BString text(fItemText);
@@ -738,7 +740,7 @@ SuperItem::DrawItem(BView* owner, BRect item_rect, bool complete)
owner->TruncateString(&text, B_TRUNCATE_END, width);
owner->DrawString(text.String(), BPoint(item_rect.left,
item_rect.bottom - fBoldFontHeight.descent));
owner->PopState();
}
@@ -861,12 +863,12 @@ void
PackageItem::DrawItem(BView* owner, BRect item_rect, bool complete)
{
owner->PushState();
float width = owner->Frame().Width();
float nameWidth = width / 2.0;
float offsetWidth = 0;
bool showMoreDetails = fSuperItem->GetDetailLevel();
BBitmap* icon = fSuperItem->GetIcon(showMoreDetails);
if (icon != NULL && icon->IsValid()) {
float iconSize = icon->Bounds().Height();
@@ -877,14 +879,14 @@ PackageItem::DrawItem(BView* owner, BRect item_rect, bool complete)
owner->DrawBitmap(icon, location);
owner->SetDrawingMode(B_OP_COPY);
offsetWidth = iconSize + fLabelOffset;
if (fDrawBarFlag)
_DrawBar(location, owner, icon_size(iconSize));
}
owner->SetFont(be_plain_font);
owner->SetHighColor(ui_color(B_LIST_ITEM_TEXT_COLOR));
// Package name
BString name(fName);
owner->TruncateString(&name, B_TRUNCATE_END, nameWidth);
@@ -894,11 +896,11 @@ PackageItem::DrawItem(BView* owner, BRect item_rect, bool complete)
cursor.y -= fSmallTotalHeight + 1;
owner->DrawString(name.String(), cursor);
cursor.x += owner->StringWidth(name.String()) + fLabelOffset;
// Change font and color
owner->SetFont(&fSmallFont);
owner->SetHighColor(tint_color(ui_color(B_LIST_ITEM_TEXT_COLOR), 0.7));
// Simple version or repository
BString versionOrRepo;
if (showMoreDetails)
@@ -907,14 +909,14 @@ PackageItem::DrawItem(BView* owner, BRect item_rect, bool complete)
versionOrRepo.SetTo(fSimpleVersion);
owner->TruncateString(&versionOrRepo, B_TRUNCATE_END, width - cursor.x);
owner->DrawString(versionOrRepo.String(), cursor);
// Summary
BString summary(fSummary);
cursor.x = item_rect.left + offsetWidth;
cursor.y += fSmallTotalHeight;
owner->TruncateString(&summary, B_TRUNCATE_END, width - cursor.x);
owner->DrawString(summary.String(), cursor);
// Detailed version
if (showMoreDetails) {
BString version(fDetailedVersion);
@@ -922,7 +924,7 @@ PackageItem::DrawItem(BView* owner, BRect item_rect, bool complete)
owner->TruncateString(&version, B_TRUNCATE_END, width - cursor.x);
owner->DrawString(version.String(), cursor);
}
owner->PopState();
}
@@ -940,7 +942,7 @@ PackageItem::_DrawBar(BPoint where, BView* view, icon_size which)
} else
yOffset = 2;
int32 barHeight = size - 3 - 2 * yOffset;
// the black shadowed line
view->SetHighColor(32, 32, 32, 92);
@@ -993,7 +995,7 @@ void
PackageItem::CalculateZoomWidths(BView *owner)
{
owner->PushState();
// More details
float offsetWidth = 2 * be_control_look->DefaultItemSpacing()
+ be_plain_font->Size()
@@ -1012,7 +1014,7 @@ PackageItem::CalculateZoomWidths(BView *owner)
if (versionWidth > stringWidth)
stringWidth = versionWidth;
fMoreDetailsWidth = offsetWidth + stringWidth;
// Less details
offsetWidth = 2 * be_control_look->DefaultItemSpacing()
+ be_plain_font->Size()
@@ -1026,7 +1028,7 @@ PackageItem::CalculateZoomWidths(BView *owner)
if (summaryWidth > stringWidth)
stringWidth = summaryWidth;
fLessDetailsWidth = offsetWidth + stringWidth;
owner->PopState();
}
@@ -1097,7 +1099,7 @@ PackageListView::AddPackage(uint32 install_type, const char* name,
BString repositoryText(B_TRANSLATE_COMMENT("from repository",
"List item text"));
repositoryText.Append(" ").Append(repository);
switch (install_type) {
case PACKAGE_UPDATE:
{
@@ -1107,7 +1109,7 @@ PackageListView::AddPackage(uint32 install_type, const char* name,
AddItem(fSuperUpdateItem);
}
super = fSuperUpdateItem;
simpleVersion.SetTo(new_ver);
detailedVersion.Append(B_TRANSLATE_COMMENT("Updating version",
"List item text"))
@@ -1117,7 +1119,7 @@ PackageListView::AddPackage(uint32 install_type, const char* name,
.Append(" ").Append(new_ver);
break;
}
case PACKAGE_INSTALL:
{
if (fSuperInstallItem == NULL) {
@@ -1126,14 +1128,14 @@ PackageListView::AddPackage(uint32 install_type, const char* name,
AddItem(fSuperInstallItem);
}
super = fSuperInstallItem;
simpleVersion.SetTo(new_ver);
detailedVersion.Append(B_TRANSLATE_COMMENT("Installing version",
"List item text"))
.Append(" ").Append(new_ver);
break;
}
case PACKAGE_UNINSTALL:
{
if (fSuperUninstallItem == NULL) {
@@ -1142,17 +1144,17 @@ PackageListView::AddPackage(uint32 install_type, const char* name,
AddItem(fSuperUninstallItem);
}
super = fSuperUninstallItem;
simpleVersion.SetTo("");
detailedVersion.Append(B_TRANSLATE_COMMENT("Uninstalling version",
"List item text"))
.Append(" ").Append(cur_ver);
break;
}
default:
return;
}
PackageItem* item = new PackageItem(name, simpleVersion.String(),
detailedVersion.String(), repositoryText.String(), summary, file_name,
@@ -1171,7 +1173,7 @@ PackageListView::UpdatePackageProgress(const char* packageName, float percent)
if (wholePercent == fLastProgressValue)
return;
fLastProgressValue = wholePercent;
// A new package started downloading, find the PackageItem by name
if (percent == 0) {
fLastProgressItem = NULL;
@@ -1185,14 +1187,14 @@ PackageListView::UpdatePackageProgress(const char* packageName, float percent)
}
}
}
if (fLastProgressItem != NULL) {
fLastProgressItem->SetDownloadProgress(percent);
Invalidate();
}
}
void
PackageListView::SortItems()
{
@@ -1280,7 +1282,7 @@ PackageListView::_SetItemHeights()
item = ItemUnderAt(fSuperInstallItem, true, i);
item->SetHeight(itemHeight);
}
}
if (fSuperUninstallItem != NULL) {
fSuperUninstallItem->SetDetailLevel(fShowMoreDetails);
@@ -1290,6 +1292,6 @@ PackageListView::_SetItemHeights()
item = ItemUnderAt(fSuperUninstallItem, true, i);
item->SetHeight(itemHeight);
}
}
}
src/preferences/bluetooth/BluetoothMain.cpp
+1 -1
View File
@@ -100,7 +100,7 @@ BluetoothApplication::AboutRequested()
" - Mika Lindqvist\n"
" - Adrien Destugues\n"
" - Maksym Yevmenkin\n\n"
"Thanks to the individuals who helped...\n\n"
"Thanks to the individuals who helped" B_UTF8_ELLIPSIS "\n\n"
"Shipping/donating hardware:\n"
" - Henry Jair Abril Florez (el Colombian)\n"
" & Stefanie Bartolich\n"
src/preferences/bluetooth/BluetoothSettingsView.cpp
+4 -3
View File
@@ -213,7 +213,7 @@ BluetoothSettingsView::_BuildConnectionPolicy()
BMessage* message = NULL;
BMenuItem* item = NULL;
fPolicyMenu = new BPopUpMenu(B_TRANSLATE("Policy..."));
fPolicyMenu = new BPopUpMenu(B_TRANSLATE("Policy" B_UTF8_ELLIPSIS));
message = new BMessage(kMsgSetConnectionPolicy);
message->AddInt8("Policy", 1);
@@ -237,7 +237,7 @@ BluetoothSettingsView::_BuildClassMenu()
BMessage* message = NULL;
BMenuItem* item = NULL;
fClassMenu = new BPopUpMenu(B_TRANSLATE("Identify us as..."));
fClassMenu = new BPopUpMenu(B_TRANSLATE("Identify us as" B_UTF8_ELLIPSIS));
message = new BMessage(kMsgSetDeviceClass);
message->AddInt8("DeviceClass", 1);
@@ -292,7 +292,8 @@ BluetoothSettingsView::_BuildLocalDevicesMenu()
LocalDevice* lDevice;
if (!fLocalDevicesMenu)
fLocalDevicesMenu = new BPopUpMenu(B_TRANSLATE("Pick device..."));
fLocalDevicesMenu = new BPopUpMenu(B_TRANSLATE("Pick device"
B_UTF8_ELLIPSIS));
while (fLocalDevicesMenu->CountItems() > 0) {
BMenuItem* item = fLocalDevicesMenu->RemoveItem((int32)0);
src/preferences/bluetooth/InquiryPanel.cpp
+4 -2
View File
@@ -214,7 +214,8 @@ InquiryPanel::MessageReceived(BMessage* message)
fRemoteList->MakeEmpty();
fScanProgress->Reset();
fScanProgress->SetTo(1);
fScanProgress->SetTrailingText(B_TRANSLATE("Starting scan..."));
fScanProgress->SetTrailingText(B_TRANSLATE("Starting scan"
B_UTF8_ELLIPSIS));
fScanProgress->SetBarColor(activeColor);
fAddButton->SetEnabled(false);
@@ -234,7 +235,8 @@ InquiryPanel::MessageReceived(BMessage* message)
fRetrieving = true;
labelPlaced = false;
fScanProgress->SetTo(100);
fScanProgress->SetTrailingText(B_TRANSLATE("Retrieving names..."));
fScanProgress->SetTrailingText(B_TRANSLATE("Retrieving names"
B_UTF8_ELLIPSIS));
BMessageRunner::StartSending(fMessenger, fRetrieveMessage, 1000000, 1);
break;