hrev50825 adds 1 changeset to branch 'master'
old head: bdf0ed4231618548c9c9fd66f2da4631e5406753
new head: 5f050a9e7a76e187d085f9f2fc256227be5e25a9
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=5f050a9e7a76+%5Ebdf0ed423161
----------------------------------------------------------------------------
5f050a9e7a76: Change strings in Printer prefs
Per tests by Vidrep, makes the GUI slightly more consistent.
Plus additional sentence casing.
[ Humdinger <humdingerb@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev50825
Commit: 5f050a9e7a76e187d085f9f2fc256227be5e25a9
URL: http://cgit.haiku-os.org/haiku/commit/?id=5f050a9e7a76
Author: Humdinger <humdingerb@xxxxxxxxx>
Date: Thu Jan 5 16:58:51 2017 UTC
----------------------------------------------------------------------------
13 files changed, 116 insertions(+), 116 deletions(-)
.../pdf/source/AdvancedSettingsWindow.cpp | 28 ++++-----
.../print/drivers/pdf/source/DocInfoWindow.cpp | 26 ++++----
.../print/drivers/pdf/source/JobSetupWindow.cpp | 20 +++---
src/libs/print/libprint/AddPrinterDlg.cpp | 28 ++++-----
src/libs/print/libprint/JobSetupDlg.cpp | 22 +++----
src/libs/print/libprint/MarginView.cpp | 2 +-
src/libs/print/libprint/PageSetupDlg.cpp | 4 +-
src/libs/print/libprint/Preview.cpp | 14 ++---
src/libs/print/libprint/StatusWindow.cpp | 66 ++++++++++----------
src/preferences/printers/PrinterListView.cpp | 6 +-
src/preferences/printers/PrintersWindow.cpp | 4 +-
src/preferences/printers/TestPageView.cpp | 2 +-
src/servers/print/ConfigWindow.cpp | 10 +--
----------------------------------------------------------------------------
diff --git a/src/add-ons/print/drivers/pdf/source/AdvancedSettingsWindow.cpp
b/src/add-ons/print/drivers/pdf/source/AdvancedSettingsWindow.cpp
index 2bb6033..5e96563 100644
--- a/src/add-ons/print/drivers/pdf/source/AdvancedSettingsWindow.cpp
+++ b/src/add-ons/print/drivers/pdf/source/AdvancedSettingsWindow.cpp
@@ -54,7 +54,7 @@ static BMessage* BorderWidthMessage(uint32 what, float width)
AdvancedSettingsWindow::AdvancedSettingsWindow(BMessage *settings)
- : HWindow(BRect(0, 0, 450, 180), "Advanced Settings",
B_TITLED_WINDOW_LOOK,
+ : HWindow(BRect(0, 0, 450, 180), "Advanced settings",
B_TITLED_WINDOW_LOOK,
B_MODAL_APP_WINDOW_FEEL, B_NOT_RESIZABLE | B_NOT_MINIMIZABLE |
B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS | B_CLOSE_ON_ESCAPE),
fSettings(settings)
@@ -87,7 +87,7 @@ AdvancedSettingsWindow::AdvancedSettingsWindow(BMessage
*settings)
fCloseOption = kNever;
fLicenseKey = new BTextControl("pdflib_license_key",
- "PDFlib License Key: ", "", NULL);
+ "PDFlib license key: ", "", NULL);
fLicenseKey->SetEnabled(false);
fLicenseKey->TextView()->HideTyping(true);
fLicenseKey->TextView()->SetText(licenseKey.String());
@@ -102,7 +102,7 @@ AdvancedSettingsWindow::AdvancedSettingsWindow(BMessage
*settings)
menuLinkBorder->SetRadioMode(true);
BMenuField* menuFieldLinkBorder = new
BMenuField("link_border_width_menu",
- "Link Border: ", menuLinkBorder);
+ "Link border:", menuLinkBorder);
menuFieldLinkBorder->Menu()->SetLabelFromMarked(true);
BMenuItem* item;
@@ -112,19 +112,19 @@ AdvancedSettingsWindow::AdvancedSettingsWindow(BMessage
*settings)
item->SetMarked(!fCreateLinks);
menuLinkBorder->AddSeparatorItem();
- menuLinkBorder->AddItem(item = new BMenuItem("No Border",
+ menuLinkBorder->AddItem(item = new BMenuItem("No border",
BorderWidthMessage(LINK_BORDER_MSG, 0.0)));
if (fCreateLinks && fLinkBorderWidth == 0)
item->SetMarked(true);
- menuLinkBorder->AddItem(item = new BMenuItem("Normal Border",
+ menuLinkBorder->AddItem(item = new BMenuItem("Normal border",
BorderWidthMessage(LINK_BORDER_MSG, 1.0)));
if (fCreateLinks && fLinkBorderWidth == 1)
item->SetMarked(true);
- menuLinkBorder->AddItem(item = new BMenuItem("Bold Border",
+ menuLinkBorder->AddItem(item = new BMenuItem("Bold border",
BorderWidthMessage(LINK_BORDER_MSG, 2.0)));
if (fCreateLinks && fLinkBorderWidth == 2)
@@ -137,7 +137,7 @@ AdvancedSettingsWindow::AdvancedSettingsWindow(BMessage
*settings)
menuBookmark->SetRadioMode(true);
BMenuField* menuFieldBookmark = new BMenuField("definition_menu",
- "Bookmark Definition File: ", menuBookmark);
+ "Bookmark definition file:", menuBookmark);
menuFieldBookmark->Menu()->SetLabelFromMarked(true);
menuBookmark->AddItem(item = new BMenuItem("None",
@@ -164,7 +164,7 @@ AdvancedSettingsWindow::AdvancedSettingsWindow(BMessage
*settings)
menuCrossReferences->SetRadioMode(true);
BMenuField* menuFieldCrossReferences = new BMenuField("xrefs_menu",
- "Cross References File: ", menuCrossReferences);
+ "Cross references file:", menuCrossReferences);
menuFieldCrossReferences->Menu()->SetLabelFromMarked(true);
menuCrossReferences->AddItem(item = new BMenuItem("None",
@@ -191,25 +191,25 @@ AdvancedSettingsWindow::AdvancedSettingsWindow(BMessage
*settings)
menuStatusWindow->SetRadioMode(true);
BMenuField* menuFieldStatusWindow = new BMenuField("close_option_menu",
- "Close status window when done: ", menuStatusWindow);
+ "Close status window when done:", menuStatusWindow);
menuFieldStatusWindow->Menu()->SetLabelFromMarked(true);
_AddMenuItem(menuStatusWindow, "Never", kNever);
- _AddMenuItem(menuStatusWindow, "No Errors", kNoErrors);
- _AddMenuItem(menuStatusWindow, "No Errors or Warnings",
+ _AddMenuItem(menuStatusWindow, "No errors", kNoErrors);
+ _AddMenuItem(menuStatusWindow, "No errors or warnings",
kNoErrorsOrWarnings);
- _AddMenuItem(menuStatusWindow, "No Errors, Warnings or Info",
+ _AddMenuItem(menuStatusWindow, "No errors, warnings or info",
kNoErrorsWarningsOrInfo);
_AddMenuItem(menuStatusWindow, "Always", kAlways);
BButton *cancelButton = new BButton("cancel", "Cancel",
new BMessage(CANCEL_MSG));
- BButton *okButton = new BButton("ok", "Ok", new BMessage(OK_MSG));
+ BButton *okButton = new BButton("ok", "OK", new BMessage(OK_MSG));
okButton->MakeDefault(true);
BButton *openButton = new BButton("openSettingsFolder",
- "Open Settings Folder" B_UTF8_ELLIPSIS,
+ "Open settings folder" B_UTF8_ELLIPSIS,
new BMessage(OPEN_SETTINGS_FOLDER_MSG));
BLayoutBuilder::Group<>(this, B_VERTICAL)
diff --git a/src/add-ons/print/drivers/pdf/source/DocInfoWindow.cpp
b/src/add-ons/print/drivers/pdf/source/DocInfoWindow.cpp
index 5f9c0e7..9108261 100644
--- a/src/add-ons/print/drivers/pdf/source/DocInfoWindow.cpp
+++ b/src/add-ons/print/drivers/pdf/source/DocInfoWindow.cpp
@@ -2,9 +2,9 @@
DocInfoWindow.cpp
-Copyright (c) 2002 OpenBeOS.
+Copyright (c) 2002 OpenBeOS.
-Author:
+Author:
Michael Pfeiffer
Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -50,7 +50,7 @@ THE SOFTWARE.
DocInfoWindow::DocInfoWindow(BMessage *docInfo)
- : HWindow(BRect(0, 0, 400, 250), "Document Information",
B_TITLED_WINDOW_LOOK,
+ : HWindow(BRect(0, 0, 400, 250), "Document information",
B_TITLED_WINDOW_LOOK,
B_MODAL_APP_WINDOW_FEEL, B_NOT_MINIMIZABLE | B_CLOSE_ON_ESCAPE),
fDocInfo(docInfo)
{
@@ -189,7 +189,7 @@ DocInfoWindow::_SetupDocInfoView(BBox* panel)
#endif
// add list of keys
- fKeyList = new BMenu("Delete Key");
+ fKeyList = new BMenu("Delete key");
BMenuField *menu = new BMenuField(bounds, "delete", "", fKeyList,
B_FOLLOW_BOTTOM);
panel->AddChild(menu);
@@ -199,13 +199,13 @@ DocInfoWindow::_SetupDocInfoView(BBox* panel)
menu->ResizeToPreferred();
menu->MoveTo(bounds.left, bounds.bottom - menu->Bounds().Height());
#else
- menu->ResizeTo(menu->StringWidth("Delete Key") + 15.0, 25.0);
+ menu->ResizeTo(menu->StringWidth("Delete key") + 15.0, 25.0);
menu->MoveTo(bounds.left, bounds.bottom - 25.0);
#endif
const char* title[6] = { "Title", "Author", "Subject", "Keywords",
"Creator",
NULL }; // PDFlib sets these: "Producer", "CreationDate", not
"ModDate"
- BMenu* defaultKeys = new BMenu("Default Keys");
+ BMenu* defaultKeys = new BMenu("Default keys");
for (int32 i = 0; title[i] != NULL; ++i)
defaultKeys->AddItem(new BMenuItem(title[i], new
BMessage(DEFAULT_KEY_MSG)));
@@ -218,21 +218,21 @@ DocInfoWindow::_SetupDocInfoView(BBox* panel)
menu->ResizeToPreferred();
menu->MoveBy(frame.Width() + 10.0, 0.0);
#else
- menu->ResizeTo(menu->StringWidth("Default Keys") + 15.0, 25.0);
+ menu->ResizeTo(menu->StringWidth("Default keys") + 15.0, 25.0);
menu->MoveBy(menu->Bounds().Width() + 10.0, 0.0);
#endif
frame = menu->Frame();
frame.left = frame.right + 10.0;
frame.right = bounds.right;
- BTextControl *add = new BTextControl(frame, "add", "Add Key:", "",
+ BTextControl *add = new BTextControl(frame, "add", "Add key:", "",
new BMessage(ADD_KEY_MSG), B_FOLLOW_LEFT_RIGHT |
B_FOLLOW_BOTTOM);
panel->AddChild(add);
float width, height;
add->GetPreferredSize(&width, &height);
add->ResizeTo(bounds.right - frame.left, height);
- add->SetDivider(be_plain_font->StringWidth("Add Key: "));
+ add->SetDivider(be_plain_font->StringWidth("Add key: "));
bounds.bottom = frame.top - 10.0;
bounds.right -= B_V_SCROLL_BAR_WIDTH;
@@ -437,13 +437,13 @@ DocInfoWindow::_SetupPasswordView(BBox* panel)
BRect bounds(panel->Bounds().InsetByCopy(10.0, 10.0));
fMasterPassword = _AddPasswordControl(bounds, panel, "master_password",
- "Master Password:");
+ "Master password:");
bounds.OffsetBy(0, fMasterPassword->Bounds().Height());
fUserPassword = _AddPasswordControl(bounds, panel, "user_password",
- "User Password:");
+ "User password:");
- float divider = max_c(panel->StringWidth("Master Password:"),
- panel->StringWidth("User Password:"));
+ float divider = max_c(panel->StringWidth("Master password:"),
+ panel->StringWidth("User password:"));
fMasterPassword->SetDivider(divider);
fUserPassword->SetDivider(divider);
}
diff --git a/src/add-ons/print/drivers/pdf/source/JobSetupWindow.cpp
b/src/add-ons/print/drivers/pdf/source/JobSetupWindow.cpp
index 2354921..af2176c 100644
--- a/src/add-ons/print/drivers/pdf/source/JobSetupWindow.cpp
+++ b/src/add-ons/print/drivers/pdf/source/JobSetupWindow.cpp
@@ -44,16 +44,16 @@ THE SOFTWARE.
#include "DocInfoWindow.h"
static const char* includeKeys[] = {
- "doc_info",
+ "doc_info",
#if HAVE_FULLVERSION_PDF_LIB
- "master_password", "user_password", "permissions",
+ "master_password", "user_password", "permissions",
#endif
NULL
};
// --------------------------------------------------
JobSetupWindow::JobSetupWindow(BMessage *msg, const char * printerName)
- : HWindow(BRect(0, 0, 100, 100), "Job Setup",
+ : HWindow(BRect(0, 0, 100, 100), "Job setup",
B_TITLED_WINDOW_LOOK,
B_MODAL_APP_WINDOW_FEEL,
B_NOT_RESIZABLE | B_NOT_MINIMIZABLE | B_NOT_ZOOMABLE
@@ -62,14 +62,14 @@ JobSetupWindow::JobSetupWindow(BMessage *msg, const char *
printerName)
fSetupMsg = msg;
fExitSem = create_sem(0, "JobSetup");
fResult = B_ERROR;
-
+
if (printerName) {
BString title;
- title << printerName << " Job Setup";
+ title << printerName << " job setup";
SetTitle(title.String());
fPrinterName = printerName;
}
-
+
// PrinterDriver ensures that property exists
int32 firstPage;
fSetupMsg->FindInt32("first_page", &firstPage);
@@ -85,7 +85,7 @@ JobSetupWindow::JobSetupWindow(BMessage *msg, const char *
printerName)
fSetupMsg->AddMessage("doc_info", &doc_info);
}
AddFields(&fDocInfo, fSetupMsg, NULL, includeKeys);
-
+
bool allPages = firstPage == 1 && lastPage == MAX_INT32;
fAll = new BRadioButton("allPages", "Print all pages",
@@ -155,7 +155,7 @@ JobSetupWindow::JobSetupWindow(BMessage *msg, const char *
printerName)
// --------------------------------------------------
void
-JobSetupWindow::UpdateJobMessage()
+JobSetupWindow::UpdateJobMessage()
{
int32 copies = 1;
@@ -203,7 +203,7 @@ JobSetupWindow::MessageReceived(BMessage *msg)
fResult = B_OK;
release_sem(fExitSem);
break;
-
+
case CANCEL_MSG:
release_sem(fExitSem);
break;
@@ -227,7 +227,7 @@ JobSetupWindow::MessageReceived(BMessage *msg)
break;
}
}
-
+
// --------------------------------------------------
status_t
diff --git a/src/libs/print/libprint/AddPrinterDlg.cpp
b/src/libs/print/libprint/AddPrinterDlg.cpp
index 719b35e..bffab74 100644
--- a/src/libs/print/libprint/AddPrinterDlg.cpp
+++ b/src/libs/print/libprint/AddPrinterDlg.cpp
@@ -20,7 +20,7 @@ ProtocolClassItem::ProtocolClassItem(const ProtocolClassCap*
cap)
}
-int
+int
ProtocolClassItem::GetProtocolClass() const
{
return fProtocolClassCap->fProtocolClass;
@@ -53,22 +53,22 @@ AddPrinterView::AttachedToWindow()
{
// protocol class box
BBox* protocolClassBox = new BBox("protocolClass");
- protocolClassBox->SetLabel("Protocol Classes:");
-
+ protocolClassBox->SetLabel("Protocol classes:");
+
// protocol class
fProtocolClassList = new BListView("protocolClassList");
fProtocolClassList->SetExplicitMinSize(BSize(500, 200));
BScrollView* protocolClassScroller = new BScrollView(
- "protocolClassListScroller",
- fProtocolClassList,
- 0,
- false,
+ "protocolClassListScroller",
+ fProtocolClassList,
+ 0,
+ false,
true,
B_NO_BORDER);
fProtocolClassList->SetSelectionMessage(
new BMessage(kMsgProtocolClassChanged));
fProtocolClassList->SetTarget(this);
-
+
protocolClassBox->AddChild(protocolClassScroller);
int count = fPrinterCap->CountCap(PrinterCap::kProtocolClass);
@@ -76,7 +76,7 @@ AddPrinterView::AttachedToWindow()
(ProtocolClassCap
**)fPrinterCap->GetCaps(PrinterCap::kProtocolClass);
while (count--) {
const ProtocolClassCap *protocolClass = *protocolClasses;
-
+
BStringItem* item = new ProtocolClassItem(protocolClass);
fProtocolClassList->AddItem(item);
if (protocolClass->fIsDefault) {
@@ -85,7 +85,7 @@ AddPrinterView::AttachedToWindow()
}
protocolClasses ++;
}
-
+
// description of protocol class box
BBox* descriptionBox = new BBox("descriptionBox");
descriptionBox->SetLabel("Description:");
@@ -128,7 +128,7 @@ AddPrinterView::AttachedToWindow()
.SetInsets(0, 0, 0, 0)
);
-
+
// update description
BMessage updateDescription(kMsgProtocolClassChanged);
MessageReceived(&updateDescription);
@@ -153,7 +153,7 @@ AddPrinterView::MessageReceived(BMessage* msg)
ProtocolClassItem *item = CurrentSelection();
if (item != NULL) {
fDescription->SetText(item->GetDescription());
- }
+ }
} else {
BView::MessageReceived(msg);
}
@@ -175,7 +175,7 @@ AddPrinterDlg::AddPrinterDlg(PrinterData* printerData,
const PrinterCap *printerCap)
:
DialogWindow(BRect(100, 100, 120, 120),
- "Add Printer", B_TITLED_WINDOW_LOOK, B_MODAL_APP_WINDOW_FEEL,
+ "Add printer", B_TITLED_WINDOW_LOOK, B_MODAL_APP_WINDOW_FEEL,
B_NOT_MINIMIZABLE | B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS
| B_AUTO_UPDATE_SIZE_LIMITS)
{
@@ -190,7 +190,7 @@ AddPrinterDlg::AddPrinterDlg(PrinterData* printerData,
}
-void
+void
AddPrinterDlg::MessageReceived(BMessage* msg)
{
switch (msg->what) {
diff --git a/src/libs/print/libprint/JobSetupDlg.cpp
b/src/libs/print/libprint/JobSetupDlg.cpp
index 9aa4a34..ecc95f0 100644
--- a/src/libs/print/libprint/JobSetupDlg.cpp
+++ b/src/libs/print/libprint/JobSetupDlg.cpp
@@ -211,7 +211,7 @@ JobSetupView::AttachedToWindow()
// page range
BBox* pageRangeBox = new BBox("pageRange");
- pageRangeBox->SetLabel("Page Range");
+ pageRangeBox->SetLabel("Page range");
fAll = new BRadioButton("all", "Print all Pages", new
BMessage(kMsgRangeAll));
@@ -256,7 +256,7 @@ JobSetupView::AttachedToWindow()
FillCapabilityMenu(fPaperFeed, kMsgNone, PrinterCap::kPaperSource,
fJobData->GetPaperSource());
BMenuField* paperSourceMenufield = new BMenuField("paperSource",
- "Paper Source:", fPaperFeed);
+ "Paper source:", fPaperFeed);
// Pages per sheet
fNup = new BPopUpMenu("");
@@ -264,7 +264,7 @@ JobSetupView::AttachedToWindow()
FillCapabilityMenu(fNup, kMsgNone, gNups,
sizeof(gNups) / sizeof(gNups[0]), (int)fJobData->GetNup());
BMenuField* pagesPerSheet = new BMenuField("pagesPerSheet",
- "Pages Per Sheet:", fNup);
+ "Pages per sheet:", fNup);
// duplex
if (fPrinterCap->Supports(PrinterCap::kPrintStyle)) {
@@ -279,7 +279,7 @@ JobSetupView::AttachedToWindow()
}
// copies
- fCopies = new BTextControl("copies", "Number of Copies:", "", NULL);
+ fCopies = new BTextControl("copies", "Number of copies:", "", NULL);
AllowOnlyDigits(fCopies->TextView(), 3);
BString copies;
@@ -295,7 +295,7 @@ JobSetupView::AttachedToWindow()
fCollate->SetTarget(this);
// reverse
- fReverse = new BCheckBox("reverse", "Reverse Order",
+ fReverse = new BCheckBox("reverse", "Reverse order",
new BMessage(kMsgReverseChanged));
if (fJobData->GetReverse()) {
fReverse->SetValue(B_CONTROL_ON);
@@ -313,14 +313,14 @@ JobSetupView::AttachedToWindow()
// page selection
BBox* pageSelectionBox = new BBox("pageSelection");
- pageSelectionBox->SetLabel("Page Selection");
+ pageSelectionBox->SetLabel("Page selection");
- fAllPages = CreatePageSelectionItem("allPages", "All Pages",
+ fAllPages = CreatePageSelectionItem("allPages", "All pages",
JobData::kAllPages);
fOddNumberedPages = CreatePageSelectionItem("oddPages",
- "Odd-Numbered Pages", JobData::kOddNumberedPages);
+ "Odd-numbered pages", JobData::kOddNumberedPages);
fEvenNumberedPages = CreatePageSelectionItem("evenPages",
- "Even-Numbered Pages", JobData::kEvenNumberedPages);
+ "Even-numbered pages", JobData::kEvenNumberedPages);
fPreview = new BCheckBox("preview", "Show preview before printing",
NULL);
if (fJobData->GetShowPreview())
@@ -493,7 +493,7 @@ JobSetupView::CreateHalftoneConfigurationUI()
fGamma->SetTarget(this);
// ink density
- fInkDensity = new JSDSlider("inkDensity", "Ink Usage",
+ fInkDensity = new JSDSlider("inkDensity", "Ink usage",
new BMessage(kMsgQuality), 0, 127);
fInkDensity->SetLimitLabels("Min", "Max");
@@ -1013,7 +1013,7 @@ JobSetupView::UpdateJobData()
JobSetupDlg::JobSetupDlg(JobData* jobData, PrinterData* printerData,
const PrinterCap* printerCap)
:
- DialogWindow(BRect(100, 100, 200, 200), "PrintJob Setup",
+ DialogWindow(BRect(100, 100, 200, 200), "Print job setup",
B_TITLED_WINDOW_LOOK, B_MODAL_APP_WINDOW_FEEL,
B_NOT_RESIZABLE | B_NOT_MINIMIZABLE | B_NOT_ZOOMABLE
| B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS
diff --git a/src/libs/print/libprint/MarginView.cpp
b/src/libs/print/libprint/MarginView.cpp
index 3da3b42..becc93b 100644
--- a/src/libs/print/libprint/MarginView.cpp
+++ b/src/libs/print/libprint/MarginView.cpp
@@ -65,7 +65,7 @@ const static float kMinFieldWidth = 100; // pixels
const static float kMinUnitHeight = 30; // pixels
const static float kUnitFormat[] = { kInchUnits, kCMUnits, kPointUnits };
-const static char *kUnitNames[] = { "Inch", "cm", "Points", NULL };
+const static char *kUnitNames[] = { "inch", "cm", "points", NULL };
const static MarginUnit kUnitMsg[] = { kUnitInch, kUnitCM, kUnitPoint };
const pattern kDots = {{ 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55 }};
diff --git a/src/libs/print/libprint/PageSetupDlg.cpp
b/src/libs/print/libprint/PageSetupDlg.cpp
index b3fb08a..8e902cf 100644
--- a/src/libs/print/libprint/PageSetupDlg.cpp
+++ b/src/libs/print/libprint/PageSetupDlg.cpp
@@ -127,7 +127,7 @@ PageSetupView::AttachedToWindow()
}
if (!marked)
item->SetMarked(true);
- BMenuField* paperSize = new BMenuField("paperSize", "Paper Size:",
fPaper);
+ BMenuField* paperSize = new BMenuField("paperSize", "Paper size:",
fPaper);
// orientation
fOrientation = new BPopUpMenu("orientation");
@@ -348,7 +348,7 @@ PageSetupView::MessageReceived(BMessage *msg)
// TODO center window on screen
PageSetupDlg::PageSetupDlg(JobData *job_data, PrinterData *printer_data, const
PrinterCap *printer_cap)
: DialogWindow(BRect(100, 100, 160, 160),
- "Page Setup", B_TITLED_WINDOW_LOOK, B_MODAL_APP_WINDOW_FEEL,
+ "Page setup", B_TITLED_WINDOW_LOOK, B_MODAL_APP_WINDOW_FEEL,
B_NOT_RESIZABLE | B_NOT_MINIMIZABLE | B_NOT_ZOOMABLE
| B_AUTO_UPDATE_SIZE_LIMITS | B_CLOSE_ON_ESCAPE)
{
diff --git a/src/libs/print/libprint/Preview.cpp
b/src/libs/print/libprint/Preview.cpp
index 5c7bcad..d2e3c40 100644
--- a/src/libs/print/libprint/Preview.cpp
+++ b/src/libs/print/libprint/Preview.cpp
@@ -792,22 +792,22 @@ PreviewWindow::PreviewWindow(BFile* jobFile, bool
showOkAndCancelButtons)
bounds.OffsetBy(10.0, 10.0);
- fFirst = new BButton(bounds, "first", "First Page", new
BMessage(MSG_FIRST_PAGE));
+ fFirst = new BButton(bounds, "first", "First page", new
BMessage(MSG_FIRST_PAGE));
panel->AddChild(fFirst);
fFirst->ResizeToPreferred();
bounds.OffsetBy(fFirst->Bounds().Width() + 10.0, 0.0);
- fPrev = new BButton(bounds, "previous", "Previous Page", new
BMessage(MSG_PREV_PAGE));
+ fPrev = new BButton(bounds, "previous", "Previous page", new
BMessage(MSG_PREV_PAGE));
panel->AddChild(fPrev);
fPrev->ResizeToPreferred();
bounds.OffsetBy(fPrev->Bounds().Width() + 10.0, 0.0);
- fNext = new BButton(bounds, "next", "Next Page", new
BMessage(MSG_NEXT_PAGE));
+ fNext = new BButton(bounds, "next", "Next page", new
BMessage(MSG_NEXT_PAGE));
panel->AddChild(fNext);
fNext->ResizeToPreferred();
bounds.OffsetBy(fNext->Bounds().Width() + 10.0, 0.0);
- fLast = new BButton(bounds, "last", "Last Page", new
BMessage(MSG_LAST_PAGE));
+ fLast = new BButton(bounds, "last", "Last page", new
BMessage(MSG_LAST_PAGE));
panel->AddChild(fLast);
fLast->ResizeToPreferred();
@@ -832,16 +832,16 @@ PreviewWindow::PreviewWindow(BFile* jobFile, bool
showOkAndCancelButtons)
bounds.OffsetBy(fPageNumber->Bounds().Width() + 5.0, 0.0);
fPageText = new BStringView(bounds, "pageText", "");
panel->AddChild(fPageText);
- fPageText->ResizeTo(fPageText->StringWidth("of 99999 Pages"),
+ fPageText->ResizeTo(fPageText->StringWidth("of 99999 pages"),
fFirst->Bounds().Height());
bounds.OffsetBy(fPageText->Bounds().Width() + 10.0, 0.0);
- fZoomIn = new BButton(bounds, "zoomIn", "Zoom In", new
BMessage(MSG_ZOOM_IN));
+ fZoomIn = new BButton(bounds, "zoomIn", "Zoom in", new
BMessage(MSG_ZOOM_IN));
panel->AddChild(fZoomIn);
fZoomIn->ResizeToPreferred();
bounds.OffsetBy(fZoomIn->Bounds().Width() + 10.0, 0.0);
- fZoomOut = new BButton(bounds, "ZoomOut", "Zoom Out", new
BMessage(MSG_ZOOM_OUT));
+ fZoomOut = new BButton(bounds, "ZoomOut", "Zoom out", new
BMessage(MSG_ZOOM_OUT));
panel->AddChild(fZoomOut);
fZoomOut->ResizeToPreferred();
diff --git a/src/libs/print/libprint/StatusWindow.cpp
b/src/libs/print/libprint/StatusWindow.cpp
index 450c32e..4350a07 100644
--- a/src/libs/print/libprint/StatusWindow.cpp
+++ b/src/libs/print/libprint/StatusWindow.cpp
@@ -26,7 +26,7 @@ StatusWindow::StatusWindow(bool oddPages, bool evenPages,
uint32 firstPage,
uint32 numPages, uint32 numCopies, uint32 nup)
:
BWindow(BRect(200, 200, 250, 250),
- "Print Status",
+ "Print status",
B_TITLED_WINDOW,
B_NOT_RESIZABLE | B_NOT_CLOSABLE | B_NOT_ZOOMABLE
| B_AUTO_UPDATE_SIZE_LIMITS)
@@ -37,17 +37,17 @@ StatusWindow::StatusWindow(bool oddPages, bool evenPages,
uint32 firstPage,
// numPages - total number of pages (must be recalculate if
odd/even is
// used)
// numCopies - total number of document copies
-
+
// the status bar
fStatusBar = new BStatusBar("statusBar", "Page: ");
-
+
// the cancel button
- fHideButton = new BButton("hideButton", "Hide Status",
+ fHideButton = new BButton("hideButton", "Hide status",
new BMessage(HIDE_MSG));
fCancelButton = new BButton("cancelButton", "Cancel",
new BMessage(CANCEL_MSG));
-
+
SetLayout(new BGroupLayout(B_VERTICAL));
AddChild(BGroupLayoutBuilder(B_HORIZONTAL, 10)
.Add(fStatusBar)
@@ -58,16 +58,16 @@ StatusWindow::StatusWindow(bool oddPages, bool evenPages,
uint32 firstPage,
fCancelled = false;
-
+
// calculate the real number of pages
fNops = numPages;
-
+
bool evenFirstPage = (firstPage % 2) == 0;
bool evenNumPages = (numPages % 2) == 0;
-
- // recalculate page numbers if even or odd is used
- if (oddPages || evenPages) {
- if (evenNumPages) {
+
+ // recalculate page numbers if even or odd is used
+ if (oddPages || evenPages) {
+ if (evenNumPages) {
fNops = numPages / 2;
} else if (evenFirstPage) {
if (oddPages)
@@ -75,28 +75,28 @@ StatusWindow::StatusWindow(bool oddPages, bool evenPages,
uint32 firstPage,
if (evenPages)
fNops = (numPages + 1) / 2;
} else {
- if (oddPages)
+ if (oddPages)
fNops = (numPages + 1) / 2;
if (evenPages)
fNops = (numPages - 1) / 2;
}
- }
-
+ }
+
uint32 addPage = 0;
- if (fNops % nup > 0)
+ if (fNops % nup > 0)
addPage = 1;
fNops = (uint32)(fNops / (float)nup) + addPage;
// recalculate page numbers nup-pages-up
-
+
fStatusBar->SetMaxValue((float)fNops);
// max value of status bar = real number of pages
fDelta = 1.0/numCopies;
// reduce step width of status bar
fStatusDelta = fDelta;
fDocCopies = numCopies;
-
- fDocumentCopy = fDocCopies > 1;
-
+
+ fDocumentCopy = fDocCopies > 1;
+
fDocCopies++;
ResetStatusBar();
@@ -109,7 +109,7 @@ StatusWindow::~StatusWindow(void)
}
-void
+void
StatusWindow::ResetStatusBar(void)
{
Lock();
@@ -119,35 +119,35 @@ StatusWindow::ResetStatusBar(void)
}
-bool
+bool
StatusWindow::UpdateStatusBar(uint32 page, uint32 copy)
{
Lock();
- Activate(true);
+ Activate(true);
// Frontmost Window
char buffer[20];
-
+
sprintf(buffer,"%d", (int)(page + 1));
BString string1(buffer);
-
- sprintf(buffer,"%d",(int)fNops );
+
+ sprintf(buffer,"%d",(int)fNops );
BString string2(buffer);
string1.Append(BString(" / "));
string1.Append(string2);
-
- BString string3 = BString("Remaining Document Copies: ");
+
+ BString string3 = BString("Remaining document copies: ");
if (fDocumentCopy == true) {
sprintf(buffer, "%d", (int)(fDocCopies));
BString string4(buffer);
string3.Append(string4);
} else {
- string3 = BString("Remaining Page Copies: ");
+ string3 = BString("Remaining page copies: ");
char buffer[20];
- sprintf(buffer,"%d",(int)(fCopies - copy) );
+ sprintf(buffer,"%d",(int)(fCopies - copy) );
BString string4(buffer);
- string3.Append(string4);
+ string3.Append(string4);
}
-
+
fStatusBar->Update(fStatusDelta * 100.0 / fNops,
string1.String(), string3.String());
if (fStatusBar->MaxValue() == fStatusBar->CurrentValue())
@@ -159,7 +159,7 @@ StatusWindow::UpdateStatusBar(uint32 page, uint32 copy)
}
-void
+void
StatusWindow::SetPageCopies(uint32 copies)
{
fCopies = copies;
@@ -169,7 +169,7 @@ StatusWindow::SetPageCopies(uint32 copies)
// Handling of user interface and other events
-void
+void
StatusWindow::MessageReceived(BMessage *message)
{
diff --git a/src/preferences/printers/PrinterListView.cpp
b/src/preferences/printers/PrinterListView.cpp
index d353287..acf373f 100644
--- a/src/preferences/printers/PrinterListView.cpp
+++ b/src/preferences/printers/PrinterListView.cpp
@@ -512,15 +512,15 @@ PrinterItem::UpdatePendingJobs()
if (fFolder) {
uint32 pendingJobs = fFolder->CountJobs();
if (pendingJobs == 1) {
- fPendingJobs = B_TRANSLATE("1 pending job.");
+ fPendingJobs = B_TRANSLATE("1 pending job");
return;
} else if (pendingJobs > 1) {
fPendingJobs = "";
- fPendingJobs << pendingJobs << B_TRANSLATE(" pending
jobs.");
+ fPendingJobs << pendingJobs << B_TRANSLATE(" pending
jobs");
return;
}
}
- fPendingJobs = B_TRANSLATE("No pending jobs.");
+ fPendingJobs = B_TRANSLATE("No pending jobs");
}
diff --git a/src/preferences/printers/PrintersWindow.cpp
b/src/preferences/printers/PrintersWindow.cpp
index cc5f25c..8f5c26b 100644
--- a/src/preferences/printers/PrintersWindow.cpp
+++ b/src/preferences/printers/PrintersWindow.cpp
@@ -52,7 +52,7 @@ private:
TestPageWindow::TestPageWindow(BPrintJob* job, PrinterItem* printer)
- : BWindow(job->PaperRect().OffsetByCopy(-20000, -20000),
B_TRANSLATE("Test Page"),
+ : BWindow(job->PaperRect().OffsetByCopy(-20000, -20000),
B_TRANSLATE("Test page"),
B_TITLED_WINDOW, 0), fJob(job)
{
fTestPage = new TestPageView(job->PrintableRect(), printer);
@@ -223,7 +223,7 @@ PrintersWindow::MessageReceived(BMessage* msg)
void
PrintersWindow::PrintTestPage(PrinterItem* printer)
{
- BPrintJob* job = new BPrintJob(B_TRANSLATE("Test Page"));
+ BPrintJob* job = new BPrintJob(B_TRANSLATE("Test page"));
job->ConfigPage();
// job->ConfigJob();
diff --git a/src/preferences/printers/TestPageView.cpp
b/src/preferences/printers/TestPageView.cpp
index 1708d31..8375640 100644
--- a/src/preferences/printers/TestPageView.cpp
+++ b/src/preferences/printers/TestPageView.cpp
@@ -253,7 +253,7 @@ TestPageView::AttachedToWindow()
statusView->MakeEditable(false);
statusView->MakeSelectable(false);
- const char* title = B_TRANSLATE("Test Page");
+ const char* title = B_TRANSLATE("Test page");
BString text;
text << title << "\n\n";
text << B_TRANSLATE(
diff --git a/src/servers/print/ConfigWindow.cpp
b/src/servers/print/ConfigWindow.cpp
index 608948d..3d8eb75 100644
--- a/src/servers/print/ConfigWindow.cpp
+++ b/src/servers/print/ConfigWindow.cpp
@@ -160,23 +160,23 @@ ConfigWindow::ConfigWindow(config_setup_kind kind,
Printer* defaultPrinter,
fPrinters = new BMenuField(B_TRANSLATE("Printer:"), menu);
// page format button
- fPageSetup = AddPictureButton(panel, "Paper setup",
+ fPageSetup = AddPictureButton(panel, "Page setup",
"PAGE_SETUP", MSG_PAGE_SETUP);
// add description to button
BStringView *pageFormatTitle = new BStringView("paperSetupTitle",
- B_TRANSLATE("Paper setup:"));
- fPageFormatText = new BStringView("paperSetupText", "");
+ B_TRANSLATE("Page setup:"));
+ fPageFormatText = new BStringView("pageSetupText", "");
// page selection button
fJobSetup = NULL;
BStringView* jobSetupTitle = NULL;
if (kind == kJobSetup) {
- fJobSetup = AddPictureButton(panel, "Page setup",
+ fJobSetup = AddPictureButton(panel, "Job setup",
"JOB_SETUP", MSG_JOB_SETUP);
// add description to button
jobSetupTitle = new BStringView("jobSetupTitle",
- B_TRANSLATE("Page setup:"));
+ B_TRANSLATE("Print job setup:"));
fJobSetupText = new BStringView("jobSetupText", "");
}
