From e23b0decade05a098964fd90b3c1aa472ca3efd9 Mon Sep 17 00:00:00 2001 From: DarkWyrm Date: Thu, 21 Dec 2006 16:23:19 +0000 Subject: [PATCH] Some label tweaks and grammar fixes More Alt+W modal window shortcuts Made a couple of OK buttons the default button Added a few ellipses to some buttons which open windows git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19596 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/print/drivers/canon_lips/lips3/Lips3Cap.cpp | 2 +- src/add-ons/print/drivers/canon_lips/lips4/Lips4Cap.cpp | 2 +- src/add-ons/print/drivers/pcl5/PCL5Cap.cpp | 2 +- src/add-ons/print/drivers/pcl6/PCL6Cap.cpp | 8 ++++---- .../print/drivers/pdf/source/AdvancedSettingsWindow.cpp | 5 ++++- src/add-ons/print/drivers/pdf/source/FontsWindow.cpp | 2 ++ src/add-ons/print/drivers/pdf/source/PageSetupWindow.cpp | 4 ++-- .../print/drivers/shared/libprint/PageSetupDlg.cpp | 1 + 8 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/add-ons/print/drivers/canon_lips/lips3/Lips3Cap.cpp b/src/add-ons/print/drivers/canon_lips/lips3/Lips3Cap.cpp index 72737498eb..ef51dc1b9a 100644 --- a/src/add-ons/print/drivers/canon_lips/lips3/Lips3Cap.cpp +++ b/src/add-ons/print/drivers/canon_lips/lips3/Lips3Cap.cpp @@ -93,7 +93,7 @@ const ResolutionCap *resolutions[] = { }; const ColorCap color("Color", false, JobData::kColor); -const ColorCap monochrome("Monochrome", true, JobData::kMonochrome); +const ColorCap monochrome("Shades of Gray", true, JobData::kMonochrome); const ColorCap *colors[] = { &color, diff --git a/src/add-ons/print/drivers/canon_lips/lips4/Lips4Cap.cpp b/src/add-ons/print/drivers/canon_lips/lips4/Lips4Cap.cpp index da164b447c..3f0977fd9e 100644 --- a/src/add-ons/print/drivers/canon_lips/lips4/Lips4Cap.cpp +++ b/src/add-ons/print/drivers/canon_lips/lips4/Lips4Cap.cpp @@ -152,7 +152,7 @@ const BindingLocationCap *bindinglocations[] = { }; const ColorCap color("Color", false, JobData::kColor); -const ColorCap monochrome("Monochrome", true, JobData::kMonochrome); +const ColorCap monochrome("Shades of Gray", true, JobData::kMonochrome); const ColorCap *colors[] = { &color, diff --git a/src/add-ons/print/drivers/pcl5/PCL5Cap.cpp b/src/add-ons/print/drivers/pcl5/PCL5Cap.cpp index ce847e8a98..3835891d1c 100644 --- a/src/add-ons/print/drivers/pcl5/PCL5Cap.cpp +++ b/src/add-ons/print/drivers/pcl5/PCL5Cap.cpp @@ -91,7 +91,7 @@ const ResolutionCap *resolutions[] = { }; const ColorCap color("Color", false, JobData::kColor); -const ColorCap monochrome("Monochrome", true, JobData::kMonochrome); +const ColorCap monochrome("Shades of Gray", true, JobData::kMonochrome); const ColorCap *colors[] = { &color, diff --git a/src/add-ons/print/drivers/pcl6/PCL6Cap.cpp b/src/add-ons/print/drivers/pcl6/PCL6Cap.cpp index 32fe196bff..d5b1909922 100644 --- a/src/add-ons/print/drivers/pcl6/PCL6Cap.cpp +++ b/src/add-ons/print/drivers/pcl6/PCL6Cap.cpp @@ -155,7 +155,7 @@ const ProtocolClassCap pc1_1("PCL 6 Protocol Class 1.1", true, PCL6Writer::kProt "The printer driver supports the following features of protocol class 1.1:\n" "* Monochrome and Color Printing.\n" "* Paper Formats: Letter, Legal, A4, A3, A5 and Japanese Postcard.\n" -"* Paper Sources: Auto, Default, Manual Feed, Multi Purpose Tray, Upper and Lower Cassette and Envelope Tray.\n" +"* Paper Sources: Auto, Default, Manual Feed, Multi-Purpose Tray, Upper and Lower Cassette and Envelope Tray.\n" "* Resolutions: 150, 300, 600 and 1200 DPI." #if ENABLE_RLE_COMPRESSION "\n* Compression Method: RLE." @@ -165,14 +165,14 @@ const ProtocolClassCap pc1_1("PCL 6 Protocol Class 1.1", true, PCL6Writer::kProt ); const ProtocolClassCap pc2_0("PCL 6 Protocol Class 2.0", false, PCL6Writer::kProtocolClass2_0, -"Additionally to features of protocol class 1.1, the printer driver supports the " +"In addition to features of protocol class 1.1, the printer driver supports the " "following features of protocol class 2.0:\n" "* Additonal Paper Source: Third Cassette." // "\n* JPEG compression (not implemented yet)" ); const ProtocolClassCap pc2_1("PCL 6 Protocol Class 2.1", false, PCL6Writer::kProtocolClass2_1, -"Additionally to features of previous protocol classes, the printer driver supports the " +"In addition to features of previous protocol classes, the printer driver supports the " "following features of protocol class 2.1:\n" "* Additional Paper Format: B5." #if ENABLE_DELTA_ROW_COMPRESSION @@ -247,7 +247,7 @@ const ProtocolClassCap *protocolClasses[] = { }; const ColorCap color("Color", false, JobData::kColor); -const ColorCap monochrome("Monochrome", true, JobData::kMonochrome); +const ColorCap monochrome("Shades of Gray", true, JobData::kMonochrome); const ColorCap *colors[] = { &color, diff --git a/src/add-ons/print/drivers/pdf/source/AdvancedSettingsWindow.cpp b/src/add-ons/print/drivers/pdf/source/AdvancedSettingsWindow.cpp index c7994d15cc..074f34ca57 100644 --- a/src/add-ons/print/drivers/pdf/source/AdvancedSettingsWindow.cpp +++ b/src/add-ons/print/drivers/pdf/source/AdvancedSettingsWindow.cpp @@ -59,6 +59,8 @@ AdvancedSettingsWindow::AdvancedSettingsWindow(BMessage *settings) float x, y, w, h; fSettings = settings; + AddShortcut('W',B_COMMAND_KEY,new BMessage(B_QUIT_REQUESTED)); + // add a *dialog* background r = Bounds(); panel = new BBox(r, "top_panel", B_FOLLOW_ALL, @@ -182,6 +184,7 @@ AdvancedSettingsWindow::AdvancedSettingsWindow(BMessage *settings) B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM); button->ResizeToPreferred(); button->GetPreferredSize(&w, &h); + button->MakeDefault(true); x = r.right - w - 8; y = r.bottom - h - 8; button->MoveTo(x, y); @@ -197,7 +200,7 @@ AdvancedSettingsWindow::AdvancedSettingsWindow(BMessage *settings) panel->AddChild(button); // add a "Open Settings Folder" button - button = new BButton(r, NULL, "Open Settings Folder", new BMessage(OPEN_SETTINGS_FOLDER_MSG), + button = new BButton(r, NULL, "Open Settings Folder…", new BMessage(OPEN_SETTINGS_FOLDER_MSG), B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM); button->GetPreferredSize(&w, &h); button->ResizeToPreferred(); diff --git a/src/add-ons/print/drivers/pdf/source/FontsWindow.cpp b/src/add-ons/print/drivers/pdf/source/FontsWindow.cpp index 8859933915..1f8ffb8ee2 100644 --- a/src/add-ons/print/drivers/pdf/source/FontsWindow.cpp +++ b/src/add-ons/print/drivers/pdf/source/FontsWindow.cpp @@ -98,6 +98,8 @@ FontsWindow::FontsWindow(Fonts *fonts) BTabView *tabView; BTab *tab; + AddShortcut('W',B_COMMAND_KEY,new BMessage(B_QUIT_REQUESTED)); + fFonts = fonts; r = Bounds(); diff --git a/src/add-ons/print/drivers/pdf/source/PageSetupWindow.cpp b/src/add-ons/print/drivers/pdf/source/PageSetupWindow.cpp index 0a46342dff..b71f38d077 100644 --- a/src/add-ons/print/drivers/pdf/source/PageSetupWindow.cpp +++ b/src/add-ons/print/drivers/pdf/source/PageSetupWindow.cpp @@ -318,7 +318,7 @@ PageSetupWindow::PageSetupWindow(BMessage *msg, const char *printerName) panel->AddChild(button); // add a "Fonts" button - button = new BButton(r, NULL, "Fonts", new BMessage(FONTS_MSG), + button = new BButton(r, NULL, "Fonts…", new BMessage(FONTS_MSG), B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM); button->GetPreferredSize(&w, &h); button->ResizeToPreferred(); @@ -327,7 +327,7 @@ PageSetupWindow::PageSetupWindow(BMessage *msg, const char *printerName) // add a "Fonts" button BButton* font = button; - button = new BButton(r, NULL, "Advanced", new BMessage(ADVANCED_MSG), + button = new BButton(r, NULL, "Advanced…", new BMessage(ADVANCED_MSG), B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM); button->GetPreferredSize(&w, &h); button->ResizeToPreferred(); diff --git a/src/add-ons/print/drivers/shared/libprint/PageSetupDlg.cpp b/src/add-ons/print/drivers/shared/libprint/PageSetupDlg.cpp index 91bb32f34a..5055f35d7d 100644 --- a/src/add-ons/print/drivers/shared/libprint/PageSetupDlg.cpp +++ b/src/add-ons/print/drivers/shared/libprint/PageSetupDlg.cpp @@ -432,6 +432,7 @@ PageSetupDlg::PageSetupDlg(JobData *job_data, PrinterData *printer_data, const P oss << printer_data->get_printer_name() << " Setup"; SetTitle(title.str().c_str()); */ + AddShortcut('W',B_COMMAND_KEY,new BMessage(B_QUIT_REQUESTED)); PageSetupView *view = new PageSetupView(Bounds(), job_data, printer_data, printer_cap); AddChild(view);