Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
DarkWyrm 2006-12-21 16:23:19 +00:00
parent 5cb03f9fb9
commit e23b0decad
8 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/add-ons/print/drivers/canon_lips/lips3/Lips3Cap.cpp
View File

@ -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,

2
src/add-ons/print/drivers/canon_lips/lips4/Lips4Cap.cpp
View File

@ -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,

2
src/add-ons/print/drivers/pcl5/PCL5Cap.cpp
View File

@ -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,

8
src/add-ons/print/drivers/pcl6/PCL6Cap.cpp
View File

@ -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,

5
src/add-ons/print/drivers/pdf/source/AdvancedSettingsWindow.cpp
View File

@ -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();

2
src/add-ons/print/drivers/pdf/source/FontsWindow.cpp
View File

@ -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();

4
src/add-ons/print/drivers/pdf/source/PageSetupWindow.cpp
View File

@ -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();

1
src/add-ons/print/drivers/shared/libprint/PageSetupDlg.cpp
View File

@ -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);