Patch by Humdiner:

Changed strings in add-ons to sentence case. This is case-add-ons.diff
from #5169.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35046 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2010-01-13 11:48:15 +00:00
parent ab496a4be8
commit fcc3e627e1
54 changed files with 452 additions and 451 deletions
File diff suppressed because it is too large Load Diff
@@ -51,7 +51,7 @@ PenInputServerMethod::PenInputServerMethod()
PRINT(("%s\n", __FUNCTION__));
#if DEBUG
//fDebugFile.SetTo("/tmp/PenInputMethodMessages.txt", B_READ_WRITE|B_CREATE_FILE);
fDebugAlert = new BAlert("PenInput Debug", "Plip \n\n\n\n\n\n\n\n\n\n\n\n\n", "Ok");
fDebugAlert = new BAlert("PenInput Debug", "Plip \n\n\n\n\n\n\n\n\n\n\n\n\n", "OK");
fDebugAlert->SetLook(B_TITLED_WINDOW_LOOK);
fDebugAlert->TextView()->MakeSelectable();
fDebugAlert->TextView()->SelectAll();
@@ -6,7 +6,7 @@ tagfile=/tmp/dokillinputserver
tmout=$((30))
touch $tagfile
(alert "All is fine" "Ok"; rm $tagfile) &
(alert "All is fine." "OK"; rm $tagfile) &
sleep $tmout
@@ -94,16 +94,16 @@ T9InputServerMethod::T9InputServerMethod()
BMessage *msg = new BMessage('SetM');
msg->AddInt32("t9mode", WordMode);
BMenuItem *item;
item = new BMenuItem(_T("Word Mode"), msg);
item = new BMenuItem(_T("Word mode"), msg);
item->SetMarked(true);
fDeskbarMenu->AddItem(item);
msg = new BMessage('SetM');
msg->AddInt32("t9mode", CharMode);
item = new BMenuItem(_T("Character Mode"), msg);
item = new BMenuItem(_T("Character mode"), msg);
fDeskbarMenu->AddItem(item);
msg = new BMessage('SetM');
msg->AddInt32("t9mode", NumMode);
item = new BMenuItem(_T("Numeric Mode"), msg);
item = new BMenuItem(_T("Numeric mode"), msg);
fDeskbarMenu->AddItem(item);
fDeskbarMenu->SetFont(be_plain_font);
// doesn't seem to work here
@@ -177,7 +177,7 @@ void T9InputServerMethod::MessageReceived(BMessage *message)
s << (long) fDeskbarMenu->FindMarked();
s << " - ";
s << (long) fDeskbarMenu->ItemAt(v);
BAlert *a = new BAlert("Plop", s.String(), "Ok");
BAlert *a = new BAlert("Plop", s.String(), "OK");
a->Go(NULL);
}*/
break;
@@ -94,16 +94,16 @@ T9InputServerMethod::T9InputServerMethod()
BMessage *msg = new BMessage('SetM');
msg->AddInt32("t9mode", WordMode);
BMenuItem *item;
item = new BMenuItem(_T("Word Mode"), msg);
item = new BMenuItem(_T("Word mode"), msg);
item->SetMarked(true);
fDeskbarMenu->AddItem(item);
msg = new BMessage('SetM');
msg->AddInt32("t9mode", CharMode);
item = new BMenuItem(_T("Character Mode"), msg);
item = new BMenuItem(_T("Character mode"), msg);
fDeskbarMenu->AddItem(item);
msg = new BMessage('SetM');
msg->AddInt32("t9mode", NumMode);
item = new BMenuItem(_T("Numeric Mode"), msg);
item = new BMenuItem(_T("Numeric mode"), msg);
fDeskbarMenu->AddItem(item);
fDeskbarMenu->SetFont(be_plain_font);
// doesn't seem to work here
@@ -177,7 +177,7 @@ void T9InputServerMethod::MessageReceived(BMessage *message)
s << (long) fDeskbarMenu->FindMarked();
s << " - ";
s << (long) fDeskbarMenu->ItemAt(v);
BAlert *a = new BAlert("Plop", s.String(), "Ok");
BAlert *a = new BAlert("Plop", s.String(), "OK");
a->Go(NULL);
}*/
break;
@@ -49,20 +49,20 @@ RuleFilterConfig::RuleFilterConfig(BMessage *settings) : BView(BRect(0,0,260,85)
if (settings->HasString("attribute"))
attr->SetText(settings->FindString("attribute"));
AddChild(attr);
regex = new BTextControl(BRect(104,5,255,20),"attr",MDR_DIALECT_CHOICE (" has ",""),MDR_DIALECT_CHOICE ("value (use REGEX: in from of regular expressions like *spam*)","値(正規表現対応)"),NULL);
regex->SetDivider(be_plain_font->StringWidth(MDR_DIALECT_CHOICE (" has ","")) + 4);
if (settings->HasString("regex"))
regex->SetText(settings->FindString("regex"));
AddChild(regex);
arg = new BFileControl(BRect(5,55,255,80),"arg",NULL,MDR_DIALECT_CHOICE ("this field is based on the Action","ここは動作によって意味が変わります"));
arg = new BFileControl(BRect(5,55,255,80),"arg",NULL,MDR_DIALECT_CHOICE ("this field is based on the action","ここは動作によって意味が変わります"));
if (BControl *control = (BControl *)arg->FindView("select_file"))
control->SetEnabled(false);
if (settings->HasString("argument"))
arg->SetText(settings->FindString("argument"));
outbound = new BPopUpMenu(MDR_DIALECT_CHOICE ("<Choose Account>","<アカウントを選択>"));
outbound = new BPopUpMenu(MDR_DIALECT_CHOICE ("<Choose account>","<アカウントを選択>"));
BList list;
GetOutboundMailChains(&list);
if (settings->HasInt32("do_what"))
@@ -81,27 +81,27 @@ RuleFilterConfig::RuleFilterConfig(BMessage *settings) : BView(BRect(0,0,260,85)
item->SetMarked(true);
delete (BMailChain *)(list.ItemAt(i));
}
}
void RuleFilterConfig::AttachedToWindow() {
if (menu != NULL)
return; // We switched back from another tab
menu = new BPopUpMenu(MDR_DIALECT_CHOICE ("<Choose Action>","<動作を選択>"));
menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Move To","移動する"), new BMessage(kMsgActionMoveTo)));
menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Set Flags To","フラグを指定する"), new BMessage(kMsgActionSetTo)));
menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Delete Message","削除する"), new BMessage(kMsgActionDelete)));
menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Reply With","返事を書く"), new BMessage(kMsgActionReplyWith)));
menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Set As Read","既読にする"), new BMessage(kMsgActionSetRead)));
menu = new BPopUpMenu(MDR_DIALECT_CHOICE ("<Choose action>","<動作を選択>"));
menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Move to","移動する"), new BMessage(kMsgActionMoveTo)));
menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Set flags to","フラグを指定する"), new BMessage(kMsgActionSetTo)));
menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Delete message","削除する"), new BMessage(kMsgActionDelete)));
menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Reply with","返事を書く"), new BMessage(kMsgActionReplyWith)));
menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Set as read","既読にする"), new BMessage(kMsgActionSetRead)));
menu->SetTargetForItems(this);
BMenuField *field = new BMenuField(BRect(5,30,210,50),"do_what",MDR_DIALECT_CHOICE ("Then","ならば"),menu);
field->ResizeToPreferred();
field->SetDivider(be_plain_font->StringWidth(MDR_DIALECT_CHOICE ("Then","ならば")) + 8);
AddChild(field);
outbound_field = new BMenuField(BRect(5,55,255,80),"reply","Foo",outbound);
outbound_field->ResizeToPreferred();
outbound_field->SetDivider(0);
@@ -123,7 +123,7 @@ status_t RuleFilterConfig::Archive(BMessage *into, bool deep) const {
into->AddInt32("argument",outbound->FindMarked()->Message()->what);
} else
into->AddString("argument",arg->Text());
return B_OK;
}
@@ -132,7 +132,7 @@ void RuleFilterConfig::MessageReceived(BMessage *msg) {
{
case kMsgActionMoveTo:
case kMsgActionSetTo:
if (BControl *control = (BControl *)arg->FindView("file_path"))
if (BControl *control = (BControl *)arg->FindView("file_path"))
arg->SetEnabled(true);
if (BControl *control = (BControl *)arg->FindView("select_file"))
control->SetEnabled(msg->what == kMsgActionMoveTo);
@@ -486,7 +486,7 @@ descriptive_name (
sprintf (buffer, "Spam >= %05.3f", (double) cutoffRatio);
if (addMarker)
strcat (buffer, ", Mark Subject");
strcat (buffer, ", Mark subject");
if (autoTraining)
strcat (buffer, ", Self-training");
strcat (buffer, ".");
@@ -178,7 +178,7 @@ void AGMSBayesianSpamFilterConfig::AttachedToWindow ()
fAddSpamToSubjectCheckBoxPntr = new BCheckBox (
tempRect,
"AddToSubject",
"Add spam rating to start of Subject",
"Add spam rating to start of subject",
new BMessage (kAddSpamToSubjectPressed));
AddChild (fAddSpamToSubjectCheckBoxPntr);
fAddSpamToSubjectCheckBoxPntr->ResizeToPreferred ();
@@ -194,7 +194,7 @@ void AGMSBayesianSpamFilterConfig::AttachedToWindow ()
fNoWordsMeansSpamCheckBoxPntr = new BCheckBox (
tempRect,
"NoWordsMeansSpam",
"or empty E-mail",
"or empty e-mail",
new BMessage (kNoWordsMeansSpam));
AddChild (fNoWordsMeansSpamCheckBoxPntr);
fNoWordsMeansSpamCheckBoxPntr->ResizeToPreferred ();
@@ -250,7 +250,7 @@ void AGMSBayesianSpamFilterConfig::AttachedToWindow ()
fAutoTrainingCheckBoxPntr = new BCheckBox (
tempRect,
"autoTraining",
"Learn from all incoming E-mail",
"Learn from all incoming e-mail",
new BMessage (kAutoTrainingPressed));
AddChild (fAutoTrainingCheckBoxPntr);
fAutoTrainingCheckBoxPntr->ResizeToPreferred ();
@@ -1,5 +1,5 @@
/*
* Copyright 2007-2008, Haiku Inc. All Rights Reserved.
* Copyright 2007-2009, Haiku, Inc. All rights reserved.
* Copyright 2001-2002 Dr. Zoidberg Enterprises. All rights reserved.
*
* Distributed under the terms of the MIT License.
@@ -34,7 +34,7 @@ IMAPConfig::IMAPConfig(BMessage *archive)
)
{
#ifdef USE_SSL
AddFlavor("No Encryption");
AddFlavor("No encryption");
AddFlavor("SSL");
#endif
@@ -53,8 +53,8 @@ IMAPConfig::IMAPConfig(BMessage *archive)
/*frame.top += 10;
frame.bottom += 10;*/
BTextControl *folder = new BTextControl(frame,"root","Top Mailbox Folder: ","",NULL);
folder->SetDivider(be_plain_font->StringWidth("Top Mailbox Folder: "));
BTextControl *folder = new BTextControl(frame,"root","Top mailbox folder: ","",NULL);
folder->SetDivider(be_plain_font->StringWidth("Top mailbox folder: "));
if (archive->HasString("root"))
folder->SetText(archive->FindString("root"));
@@ -1,5 +1,5 @@
/*
* Copyright 2007-2008, Haiku Inc. All Rights Reserved.
* Copyright 2007-2009, Haiku, Inc. All rights reserved.
* Copyright 2001-2002 Dr. Zoidberg Enterprises. All rights reserved.
*
* Distributed under the terms of the MIT License.
@@ -85,7 +85,7 @@ POP3Protocol::~POP3Protocol()
status_t
POP3Protocol::Open(const char *server, int port, int)
{
runner->ReportProgress(0, 0, MDR_DIALECT_CHOICE("Connecting to POP3 Server...",
runner->ReportProgress(0, 0, MDR_DIALECT_CHOICE("Connecting to POP3 server...",
"POP3サーバに接続しています..."));
if (port <= 0) {
@@ -169,7 +169,7 @@ POP3Protocol::Open(const char *server, int port, int)
<< settings->FindString("server");
if (port != 995)
error << ":" << port;
error << ". (SSL Connection Error)";
error << ". (SSL connection error)";
runner->ShowError(error.String());
SSL_CTX_free(fSSLContext);
#ifndef HAIKU_TARGET_PLATFORM_BEOS
@@ -765,11 +765,11 @@ instantiate_config_panel(BMessage *settings, BMessage *)
| B_MAIL_PROTOCOL_HAS_FLAVORS
#endif
);
view->AddAuthMethod("Plain Text");
view->AddAuthMethod("Plain text");
view->AddAuthMethod("APOP");
#if USE_SSL
view->AddFlavor("No Encryption");
view->AddFlavor("No encryption");
view->AddFlavor("SSL");
#endif
@@ -27,28 +27,28 @@ ConfigView::ConfigView()
BRect rect(5,4,250,25);
rect.bottom = rect.top - 2 + itemHeight;
BMailFileConfigView *fview = new BMailFileConfigView(MDR_DIALECT_CHOICE ("Fortune File:","予言ファイル:"),"fortune_file",false,"",B_FILE_NODE);
BMailFileConfigView *fview = new BMailFileConfigView(MDR_DIALECT_CHOICE ("Fortune file:","予言ファイル:"),"fortune_file",false,"",B_FILE_NODE);
AddChild(fview);
rect.top = rect.bottom + 8;
rect.bottom = rect.top - 2 + itemHeight;
BTextControl * control = new BTextControl(rect,"tag_line",MDR_DIALECT_CHOICE ("Tag Line:","見出し:"),NULL,NULL);
BTextControl * control = new BTextControl(rect,"tag_line",MDR_DIALECT_CHOICE ("Tag line:","見出し:"),NULL,NULL);
control->SetDivider(control->StringWidth(control->Label()) + 6);
AddChild(control);
ResizeToPreferred();
}
}
void ConfigView::SetTo(BMessage *archive)
{
if (BMailFileConfigView *control = (BMailFileConfigView *)FindView("fortune_file"))
control->SetTo(archive,NULL);
BString path = archive->FindString("tag_line");
if (!archive->HasString("tag_line"))
path = "Fortune Cookie Says:\n\n";
path = "Fortune cookie says:\n\n";
path.Truncate(path.Length() - 2);
if (BTextControl *control = (BTextControl *)FindView("tag_line"))
control->SetText(path.String());
@@ -61,7 +61,7 @@ status_t ConfigView::Archive(BMessage *into,bool) const
{
control->Archive(into);
}
if (BTextControl *control = (BTextControl *)FindView("tag_line"))
{
BString line = control->Text();
@@ -73,7 +73,7 @@ status_t ConfigView::Archive(BMessage *into,bool) const
return B_OK;
}
void ConfigView::GetPreferredSize(float *width, float *height)
{
*width = 258;
@@ -1,5 +1,5 @@
/*
* Copyright 2007-2008, Haiku Inc. All Rights Reserved.
* Copyright 2007-2009, Haiku, Inc. All rights reserved.
* Copyright 2001-2002 Dr. Zoidberg Enterprises. All rights reserved.
*
* Distributed under the terms of the MIT License.
@@ -257,7 +257,7 @@ SMTPProtocol::SMTPProtocol(BMessage *message, BMailChainRunner *run)
// to the SMTP server first...
fStatus = POP3Authentification();
if (fStatus < B_OK) {
error_msg << MDR_DIALECT_CHOICE ("POP3 authentification failed. The server said:\n","POP3認証に失敗しました\n") << fLog;
error_msg << MDR_DIALECT_CHOICE ("POP3 authentication failed. The server said:\n","POP3認証に失敗しました\n") << fLog;
runner->ShowError(error_msg.String());
runner->Stop(true);
return;
@@ -423,7 +423,7 @@ SMTPProtocol::Open(const char *address, int port, bool esmtp)
error << "Could not connect to SMTP server " << fSettings->FindString("server");
if (port != 465)
error << ":" << port;
error << ". (SSL Connection Error)";
error << ". (SSL connection error)";
runner->ShowError(error.String());
SSL_CTX_free(ctx);
#ifndef HAIKU_TARGET_PLATFORM_BEOS
@@ -1118,7 +1118,7 @@ instantiate_config_panel(BMessage *settings, BMessage *)
view->AddAuthMethod(MDR_DIALECT_CHOICE ("POP3 before SMTP","送信前に受信する"), false);
BTextControl *control = (BTextControl *)(view->FindView("host"));
control->SetLabel(MDR_DIALECT_CHOICE ("SMTP Server: ","SMTPサーバ: "));
control->SetLabel(MDR_DIALECT_CHOICE ("SMTP server: ","SMTPサーバ: "));
// Reset the dividers after changing one
float widestLabel=0;
@@ -37,8 +37,8 @@ ConfigView::ConfigView()
MDR_DIALECT_CHOICE ("Beep",""),
MDR_DIALECT_CHOICE ("Alert","窓(メール毎)"),
MDR_DIALECT_CHOICE ("Keyboard LEDs","キーボードLED"),
MDR_DIALECT_CHOICE ("Central Alert","窓(一括)"),
"Central Beep","Log Window"};
MDR_DIALECT_CHOICE ("Central alert","窓(一括)"),
"Central beep","Log window"};
for (int32 i = 0,j = 1;i < 6;i++,j *= 2)
menu->AddItem(new BMenuItem(notifyMethods[i],new BMessage(kMsgNotifyMethod)));
@@ -25,7 +25,7 @@ class NotifyCallback : public BMailChainCallback {
public:
NotifyCallback (int32 notification_method, BMailChainRunner *us,NotifyFilter *ref2);
virtual void Callback(status_t result);
uint32 num_messages;
private:
BMailChainRunner *chainrunner;
@@ -43,10 +43,10 @@ class NotifyFilter : public BMailFilter
BPositionIO** io_message, BEntry* io_entry,
BMessage* io_headers, BPath* io_folder, const char* io_uid
);
private:
friend class NotifyCallback;
NotifyCallback *callback;
BMailChainRunner *_runner;
int32 strategy;
@@ -70,19 +70,19 @@ status_t NotifyFilter::ProcessMailMessage(BPositionIO**, BEntry*, BMessage*heade
callback = new NotifyCallback(strategy,_runner,this);
_runner->RegisterProcessCallback(callback);
}
if (!headers->FindBool("ENTIRE_MESSAGE")) {
if (!headers->FindBool("ENTIRE_MESSAGE")) {
BString status;
headers->FindString("STATUS", &status);
// do not notify about auto-read messages
if (status.Compare("Read") != 0)
callback->num_messages ++;
}
return B_OK;
}
NotifyCallback::NotifyCallback (int32 notification_method, BMailChainRunner *us,NotifyFilter *ref2) :
NotifyCallback::NotifyCallback (int32 notification_method, BMailChainRunner *us,NotifyFilter *ref2) :
num_messages(0),
chainrunner(us),
strategy(notification_method),
@@ -92,13 +92,13 @@ NotifyCallback::NotifyCallback (int32 notification_method, BMailChainRunner *us,
void NotifyCallback::Callback(status_t result) {
parent->callback = NULL;
if (num_messages == 0)
return;
if (strategy & do_beep)
system_beep("New E-mail");
if (strategy & alert) {
BString text;
MDR_DIALECT_CHOICE (
@@ -106,27 +106,27 @@ void NotifyCallback::Callback(status_t result) {
<< " for " << chainrunner->Chain()->Name() << ".",
text << chainrunner->Chain()->Name() << "より\n" << num_messages << " 通のメッセージが届きました");
BAlert *alert = new BAlert(MDR_DIALECT_CHOICE ("New Messages","新着メッセージ"), text.String(), "OK", NULL, NULL, B_WIDTH_AS_USUAL);
BAlert *alert = new BAlert(MDR_DIALECT_CHOICE ("New messages","新着メッセージ"), text.String(), "OK", NULL, NULL, B_WIDTH_AS_USUAL);
alert->SetFeel(B_NORMAL_WINDOW_FEEL);
alert->Go(NULL);
}
if (strategy & blink_leds)
be_app->PostMessage('mblk');
if (strategy & one_central_beep)
be_app->PostMessage('mcbp');
if (strategy & big_doozy_alert) {
BMessage msg('numg');
msg.AddInt32("num_messages",num_messages);
msg.AddString("chain_name",chainrunner->Chain()->Name());
msg.AddInt32("chain_id",chainrunner->Chain()->ID());
be_app->PostMessage(&msg);
}
if (strategy & log_window) {
BString message;
message << num_messages << " new message" << ((num_messages != 1) ? "s" : "");
+1 -1
View File
@@ -76,7 +76,7 @@ IFSSaver::StartConfig(BView *view)
// the additive check box
fSpeedS = new BSlider(frame, "speed setting",
"Morphing Speed:",
"Morphing speed:",
new BMessage(MSG_SET_SPEED),
1, 12, B_BLOCK_THUMB,
B_FOLLOW_LEFT_RIGHT | B_FOLLOW_BOTTOM);
@@ -68,7 +68,7 @@ SlideShowConfigView::SlideShowConfigView(const BRect &frame, const char *name,
// Show Caption checkbox
pMsg = new BMessage(CHANGE_CAPTION);
fShowCaption = new BCheckBox(BRect(10, 45, 180, 62),
"Show Caption", "Show Caption", pMsg);
"Show caption", "Show caption", pMsg);
val = (fSettings->SetGetBool(SAVER_SETTING_CAPTION)) ? 1 : 0;
fShowCaption->SetValue(val);
fShowCaption->SetViewColor(ViewColor());
@@ -77,7 +77,7 @@ SlideShowConfigView::SlideShowConfigView(const BRect &frame, const char *name,
// Change Border checkbox
pMsg = new BMessage(CHANGE_BORDER);
fShowBorder = new BCheckBox(BRect(10, 70, 180, 87),
"Show Border", "Show Border", pMsg);
"Show border", "Show border", pMsg);
val = (fSettings->SetGetBool(SAVER_SETTING_BORDER)) ? 1 : 0;
fShowBorder->SetValue(val);
fShowBorder->SetViewColor(ViewColor());
@@ -86,13 +86,13 @@ SlideShowConfigView::SlideShowConfigView(const BRect &frame, const char *name,
// Delay Menu
// setup PNG interlace options menu
int32 currentDelay = fSettings->SetGetInt32(SAVER_SETTING_DELAY) / 1000;
fDelayMenu = new BPopUpMenu("Delay Menu");
fDelayMenu = new BPopUpMenu("Delay menu");
struct DelayItem {
const char *name;
int32 delay;
};
DelayItem items[] = {
{"No Delay", 0},
{"No delay", 0},
{"1 second", 1},
{"2 seconds", 2},
{"3 seconds", 3},
@@ -128,7 +128,7 @@ SlideShowConfigView::SlideShowConfigView(const BRect &frame, const char *name,
// Choose Image Folder button
pMsg = new BMessage(CHOOSE_DIRECTORY);
fChooseFolder = new BButton(BRect(50, 160, 180, 180),
"Choose Folder", "Choose Image Folder" B_UTF8_ELLIPSIS, pMsg);
"Choose Folder", "Choose image folder" B_UTF8_ELLIPSIS, pMsg);
AddChild(fChooseFolder);
// Setup choose folder file panel
@@ -317,6 +317,6 @@ SlideShowConfigView::Draw(BRect area)
// Draw current folder
BString strFolder;
fSettings->GetString(SAVER_SETTING_DIRECTORY, strFolder);
strFolder.Prepend("Image Folder: ");
strFolder.Prepend("Image folder: ");
DrawString(strFolder.String(), BPoint(10, yplain * 9 + ybold));
}
@@ -1,5 +1,5 @@
/*
* Copyright 2007, Haiku Inc. All rights reserved.
* Copyright 2007-2009, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
@@ -353,7 +353,7 @@ SpiderView::SpiderView(BRect frame, SpiderSaver* saver,
frame.top = 10.0;
frame.bottom = frame.top + viewHeight;
frame.OffsetBy(0.0, viewHeight);
fQueueNumberS = new BSlider(frame, "queue number", "Max Polygon Count",
fQueueNumberS = new BSlider(frame, "queue number", "Max. polygon count",
new BMessage(MSG_QUEUE_NUMBER),
1, MAX_QUEUE_NUMBER);
fQueueNumberS->SetHashMarks(B_HASH_MARKS_BOTTOM);
@@ -361,7 +361,7 @@ SpiderView::SpiderView(BRect frame, SpiderSaver* saver,
fQueueNumberS->SetValue(queueNumber);
AddChild(fQueueNumberS);
frame.OffsetBy(0.0, viewHeight);
fPolyNumberS = new BSlider(frame, "poly points", "Max Points per Polygon",
fPolyNumberS = new BSlider(frame, "poly points", "Max. points per polygon",
new BMessage(MSG_POLY_NUMBER),
MIN_POLY_POINTS, MAX_POLY_POINTS);
fPolyNumberS->SetHashMarks(B_HASH_MARKS_BOTTOM);
@@ -369,7 +369,7 @@ SpiderView::SpiderView(BRect frame, SpiderSaver* saver,
fPolyNumberS->SetValue(maxPolyPoints);
AddChild(fPolyNumberS);
frame.OffsetBy(0.0, viewHeight);
fQueueDepthS = new BSlider(frame, "queue depth", "Trail Depth",
fQueueDepthS = new BSlider(frame, "queue depth", "Trail depth",
new BMessage(MSG_QUEUE_DEPTH),
MIN_QUEUE_DEPTH, MAX_QUEUE_DEPTH);
fQueueDepthS->SetHashMarks(B_HASH_MARKS_BOTTOM);
+2 -2
View File
@@ -17,7 +17,7 @@ static void Error(BView *view, status_t status, bool unlock=false)
if (view && unlock)
view->UnlockLooper();
BString s(strerror(status));
alert = new BAlert("Error", s.String(), "Ok");
alert = new BAlert("Error", s.String(), "OK");
alert->Go();
}
@@ -80,7 +80,7 @@ process_refs(entry_ref dir, BMessage* refs, void* /*reserved*/)
alert = new BAlert("Error", "IconVader:\nClick on the icons to get points.\nAvoid symlinks!", "Ok");
alert = new BAlert("Error", "IconVader:\nClick on the icons to get points.\nAvoid symlinks!", "OK");
alert->Go();
@@ -40,7 +40,7 @@ process_refs(entry_ref directoryRef, BMessage *msg, void *)
|| targetEntry.GetParent(&targetEntry) != B_OK) {
(new BAlert("Open Target Folder",
"Cannot open target folder. Maybe this link is broken?",
"Ok", NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go(NULL);
"OK", NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go(NULL);
continue;
}
@@ -62,7 +62,7 @@ process_refs(entry_ref directoryRef, BMessage *msg, void *)
(new BAlert("Open Target Folder",
"This add-on can only be used on symbolic links.\n"
"It opens the folder of the link target in Tracker.",
"Ok"))->Go(NULL);
"OK"))->Go(NULL);
}
}
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2006, Haiku.
* Copyright 2002-2009, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
@@ -116,7 +116,7 @@ make_nth_translator(int32 n, image_id you, uint32 flags, ...)
// Returns:
// ---------------------------------------------------------------
BMPTranslator::BMPTranslator()
: BaseTranslator("BMP Images", "BMP image translator",
: BaseTranslator("BMP images", "BMP image translator",
BMP_TRANSLATOR_VERSION,
gInputFormats, sizeof(gInputFormats) / sizeof(translation_format),
gOutputFormats, sizeof(gOutputFormats) / sizeof(translation_format),
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2006, Haiku, Inc.
* Copyright 2002-2009, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT license.
*
* Authors:
@@ -30,7 +30,7 @@ BMPView::BMPView(const BRect &frame, const char *name, uint32 resizeMode,
float height = fontHeight.descent + fontHeight.ascent + fontHeight.leading;
BRect rect(10, 10, 200, 10 + height);
BStringView *stringView = new BStringView(rect, "title", "BMP Image Translator");
BStringView *stringView = new BStringView(rect, "title", "BMP image translator");
stringView->SetFont(be_bold_font);
stringView->ResizeToPreferred();
AddChild(stringView);
+1 -1
View File
@@ -25,7 +25,7 @@ ConfigView::ConfigView(const BRect &frame, uint32 resize, uint32 flags)
float height = fontHeight.descent + fontHeight.ascent + fontHeight.leading;
BRect rect(10, 10, 200, 10 + height);
BStringView *stringView = new BStringView(rect, "title", "EXR Images");
BStringView *stringView = new BStringView(rect, "title", "EXR images");
stringView->SetFont(be_bold_font);
stringView->ResizeToPreferred();
AddChild(stringView);
@@ -56,7 +56,7 @@ const uint32 kNumDefaultSettings = sizeof(sDefaultSettings) / sizeof(TranSetting
EXRTranslator::EXRTranslator()
: BaseTranslator("EXR Images", "EXR Image Translator",
: BaseTranslator("EXR Images", "EXR image translator",
EXR_TRANSLATOR_VERSION,
sInputFormats, kNumInputFormats,
sOutputFormats, kNumOutputFormats,
+21 -21
View File
@@ -40,19 +40,19 @@ bool DetermineType(BPositionIO *source, bool *is_gif);
status_t GetBitmap(BPositionIO *in, BBitmap **out);
/* Required data */
char translatorName[] = "GIF Images";
char translatorInfo[] = "GIF image translator v1.4";
char translatorName[] = "GIF images";
char translatorInfo[] = "GIF image translator v1.4";
int32 translatorVersion = 0x140;
translation_format inputFormats[] = {
{ GIF_TYPE, B_TRANSLATOR_BITMAP, 0.8, 0.8, "image/gif", "GIF image" },
{ B_TRANSLATOR_BITMAP, B_TRANSLATOR_BITMAP, 0.3, 0.3, "image/x-be-bitmap", "Be Bitmap Format (GIFTranslator)" },
translation_format inputFormats[] = {
{ GIF_TYPE, B_TRANSLATOR_BITMAP, 0.8, 0.8, "image/gif", "GIF image" },
{ B_TRANSLATOR_BITMAP, B_TRANSLATOR_BITMAP, 0.3, 0.3, "image/x-be-bitmap", "Be Bitmap Format (GIFTranslator)" },
{ 0 }
};
translation_format outputFormats[] = {
{ GIF_TYPE, B_TRANSLATOR_BITMAP, 0.8, 0.8, "image/gif", "GIF image" },
{ B_TRANSLATOR_BITMAP, B_TRANSLATOR_BITMAP, 0.3, 0.3, "image/x-be-bitmap", "Be Bitmap Format (GIFTranslator)" },
translation_format outputFormats[] = {
{ GIF_TYPE, B_TRANSLATOR_BITMAP, 0.8, 0.8, "image/gif", "GIF image" },
{ B_TRANSLATOR_BITMAP, B_TRANSLATOR_BITMAP, 0.3, 0.3, "image/x-be-bitmap", "Be Bitmap Format (GIFTranslator)" },
{ 0 }
};
@@ -77,7 +77,7 @@ DetermineType(BPositionIO *source, bool *is_gif)
*is_gif = true;
if (source->Read(header, 6) != 6) return false;
header[6] = 0x00;
if (strcmp((char *)header, "GIF87a") != 0 && strcmp((char *)header, "GIF89a") != 0) {
*is_gif = false;
int32 magic = (header[0] << 24) + (header[1] << 16) + (header[2] << 8) + header[3];
@@ -88,7 +88,7 @@ DetermineType(BPositionIO *source, bool *is_gif)
cs = (color_space)B_BENDIAN_TO_HOST_INT32(cs);
if (cs != B_RGB32 && cs != B_RGBA32 && cs != B_RGB32_BIG && cs != B_RGBA32_BIG) return false;
}
source->Seek(0, SEEK_SET);
return true;
}
@@ -99,7 +99,7 @@ status_t
GetBitmap(BPositionIO *in, BBitmap **out)
{
TranslatorBitmap header;
status_t err = in->Read(&header, sizeof(header));
if (err != sizeof(header))
return B_IO_ERROR;
@@ -112,7 +112,7 @@ GetBitmap(BPositionIO *in, BBitmap **out)
header.rowBytes = B_BENDIAN_TO_HOST_INT32(header.rowBytes);
header.colors = (color_space)B_BENDIAN_TO_HOST_INT32(header.colors);
header.dataSize = B_BENDIAN_TO_HOST_INT32(header.dataSize);
BBitmap *bitmap = new BBitmap(header.bounds, header.colors);
*out = bitmap;
if (bitmap == NULL) return B_NO_MEMORY;
@@ -124,26 +124,26 @@ GetBitmap(BPositionIO *in, BBitmap **out)
err = in->Read(bits, header.dataSize);
if (err == (status_t)header.dataSize) return B_OK;
else return B_IO_ERROR;
}
}
/* Required Identify function - may need to read entire header, not sure */
status_t
Identify(BPositionIO *inSource, const translation_format *inFormat,
Identify(BPositionIO *inSource, const translation_format *inFormat,
BMessage *ioExtension, translator_info *outInfo, uint32 outType)
{
const char *debug_text = getenv("GIF_TRANSLATOR_DEBUG");
if ((debug_text != NULL) && (atoi(debug_text) != 0)) debug = true;
if (outType == 0) outType = B_TRANSLATOR_BITMAP;
if (outType != GIF_TYPE && outType != B_TRANSLATOR_BITMAP) return B_NO_TRANSLATOR;
bool is_gif;
if (!DetermineType(inSource, &is_gif)) return B_NO_TRANSLATOR;
if (!is_gif && inFormat != NULL && inFormat->type != B_TRANSLATOR_BITMAP)
return B_NO_TRANSLATOR;
outInfo->group = B_TRANSLATOR_BITMAP;
if (is_gif) {
outInfo->type = GIF_TYPE;
@@ -166,7 +166,7 @@ Identify(BPositionIO *inSource, const translation_format *inFormat,
/* Main required function - assumes that an incoming GIF must be translated
to a BBitmap, and vice versa - this could be improved */
status_t
Translate(BPositionIO *inSource, const translator_info *inInfo,
Translate(BPositionIO *inSource, const translator_info *inInfo,
BMessage *ioExtension, uint32 outType, BPositionIO *outDestination)
{
@@ -177,11 +177,11 @@ Translate(BPositionIO *inSource, const translator_info *inInfo,
if (outType != GIF_TYPE && outType != B_TRANSLATOR_BITMAP) {
return B_NO_TRANSLATOR;
}
bool is_gif;
if (!DetermineType(inSource, &is_gif)) return B_NO_TRANSLATOR;
if (!is_gif && inInfo->type != B_TRANSLATOR_BITMAP) return B_NO_TRANSLATOR;
status_t err = B_OK;
bigtime_t now = system_time();
// Going from BBitmap to GIF
@@ -206,7 +206,7 @@ Translate(BPositionIO *inSource, const translator_info *inInfo,
}
delete gl;
}
if (debug) {
now = system_time() - now;
printf("Translate() - Translation took %Ld microseconds\n", now);
+5 -5
View File
@@ -68,7 +68,7 @@ GIFView::GIFView(BRect rect, const char *name)
// menu fields (Palette & Colors)
fWebSafeMI = new BMenuItem("Websafe", new BMessage(GV_WEB_SAFE), 0, 0);
fBeOSSystemMI = new BMenuItem("BeOS System", new BMessage(GV_BEOS_SYSTEM), 0, 0);
fBeOSSystemMI = new BMenuItem("BeOS system", new BMessage(GV_BEOS_SYSTEM), 0, 0);
fGreyScaleMI = new BMenuItem("Greyscale", new BMessage(GV_GREYSCALE), 0, 0);
fOptimalMI = new BMenuItem("Optimal", new BMessage(GV_OPTIMAL), 0, 0);
fPaletteM = new BPopUpMenu("PalettePopUpMenu", true, true, B_ITEMS_IN_COLUMN);
@@ -92,19 +92,19 @@ GIFView::GIFView(BRect rect, const char *name)
r.top = r.bottom + 14;
r.bottom = r.top + 24;
fPaletteMF = new BMenuField(r, "PaletteMenuField", "Palette",
fPaletteMF = new BMenuField(r, "PaletteMenuField", "Palette: ",
fPaletteM, B_FOLLOW_LEFT | B_FOLLOW_TOP, B_WILL_DRAW | B_NAVIGABLE);
AddChild(fPaletteMF);
r.top = r.bottom + 5;
r.bottom = r.top + 24;
fColorCountMF = new BMenuField(r, "ColorCountMenuField", "Colors",
fColorCountMF = new BMenuField(r, "ColorCountMenuField", "Colors: ",
fColorCountM, B_FOLLOW_LEFT | B_FOLLOW_TOP, B_WILL_DRAW | B_NAVIGABLE);
AddChild(fColorCountMF);
// align menu fields
float maxLabelWidth = ceilf(max_c(be_plain_font->StringWidth("Colors"),
be_plain_font->StringWidth("Palette")));
float maxLabelWidth = ceilf(max_c(be_plain_font->StringWidth("Colors: "),
be_plain_font->StringWidth("Palette: ")));
fPaletteMF->SetDivider(maxLabelWidth + 7);
fColorCountMF->SetDivider(maxLabelWidth + 7);
+1 -1
View File
@@ -25,7 +25,7 @@ ConfigView::ConfigView(const BRect &frame, uint32 resize, uint32 flags)
float height = fontHeight.descent + fontHeight.ascent + fontHeight.leading;
BRect rect(10, 10, 200, 10 + height);
BStringView *stringView = new BStringView(rect, "title", "HPGS Images");
BStringView *stringView = new BStringView(rect, "title", "HPGS images");
stringView->SetFont(be_bold_font);
stringView->ResizeToPreferred();
AddChild(stringView);
@@ -80,7 +80,7 @@ const uint32 kNumDefaultSettings = sizeof(sDefaultSettings) / sizeof(TranSetting
HPGSTranslator::HPGSTranslator()
: BaseTranslator("HPGS Images", "HPGS Image Translator",
: BaseTranslator("HPGS images", "HPGS image translator",
HPGS_TRANSLATOR_VERSION,
sInputFormats, kNumInputFormats,
sOutputFormats, kNumOutputFormats,
@@ -60,7 +60,7 @@ make_nth_translator(int32 n, image_id image, uint32 flags, ...)
HVIFTranslator::HVIFTranslator()
: BaseTranslator("HVIF Icons", "Native Haiku vector icon translator",
: BaseTranslator("HVIF icons", "Native Haiku vector icon translator",
HVIF_TRANSLATOR_VERSION, sInputFormats,
sizeof(sInputFormats) / sizeof(sInputFormats[0]), sOutputFormats,
sizeof(sOutputFormats) / sizeof(sOutputFormats[0]),
+3 -3
View File
@@ -30,7 +30,7 @@ HVIFView::HVIFView(const BRect &frame, const char *name, uint32 resizeMode,
BRect rect(10, 10, 200, 10 + height);
BStringView *stringView = new BStringView(rect, "title",
"Native Haiku Icon Format Translator");
"Native Haiku icon format translator");
stringView->SetFont(be_bold_font);
stringView->ResizeToPreferred();
AddChild(stringView);
@@ -57,7 +57,7 @@ HVIFView::HVIFView(const BRect &frame, const char *name, uint32 resizeMode,
rect.OffsetBy(0, height + 5);
int32 renderSize = fSettings->SetGetInt32(HVIF_SETTING_RENDER_SIZE);
BString label = "Render Size: ";
BString label = "Render size: ";
label << renderSize;
fRenderSize = new BSlider(rect, "renderSize", label.String(), NULL, 1, 32);
@@ -92,7 +92,7 @@ HVIFView::MessageReceived(BMessage *message)
fSettings->SetGetInt32(HVIF_SETTING_RENDER_SIZE, &value);
fSettings->SaveSettings();
BString newLabel = "Render Size: ";
BString newLabel = "Render size: ";
newLabel << value;
fRenderSize->SetLabel(newLabel.String());
return;
+1 -1
View File
@@ -24,7 +24,7 @@ ConfigView::ConfigView(const BRect &frame, uint32 resize, uint32 flags)
float height = fontHeight.descent + fontHeight.ascent + fontHeight.leading;
BRect rect(10, 10, 200, 10 + height);
BStringView *stringView = new BStringView(rect, "title", "Windows Icon Images");
BStringView *stringView = new BStringView(rect, "title", "Windows icon images");
stringView->SetFont(be_bold_font);
stringView->ResizeToPreferred();
AddChild(stringView);
@@ -72,7 +72,7 @@ const uint32 kNumDefaultSettings = sizeof(sDefaultSettings) / sizeof(TranSetting
ICOTranslator::ICOTranslator()
: BaseTranslator("Windows Icon Images", "Windows Icon Translator",
: BaseTranslator("Windows icon images", "Windows icon translator",
ICO_TRANSLATOR_VERSION,
sInputFormats, kNumInputFormats,
sOutputFormats, kNumOutputFormats,
@@ -50,14 +50,14 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define B_TRANSLATOR_BITMAP_DESCRIPTION "Be Bitmap Format (JPEGTranslator)"
// Translation Kit required globals
char translatorName[] = "JPEG Images";
char translatorName[] = "JPEG images";
char translatorInfo[] =
"©2002-2003, Marcin Konicki\n"
"©2005-2007, Haiku\n"
"\n"
"Based on IJG library © 1991-1998, Thomas G. Lane\n"
" http://www.ijg.org/files/\n"
"with \"Lossless\" encoding support patch by Ken Murchison\n"
"with \"lossless\" encoding support patch by Ken Murchison\n"
" http://www.oceana.com/ftp/ljpeg/\n"
"\n"
"With some colorspace conversion routines by Magnus Hellman\n"
@@ -71,8 +71,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define VIEW_LABEL_PROGRESSIVE "Use progressive compression"
#define VIEW_LABEL_OPTIMIZECOLORS "Prevent colors 'washing out'"
#define VIEW_LABEL_SMALLERFILE "Make file smaller (sligthtly worse quality)"
#define VIEW_LABEL_GRAY1ASRGB24 "Write Black&White images as RGB24"
#define VIEW_LABEL_ALWAYSRGB32 "Read Greyscale images as RGB32"
#define VIEW_LABEL_GRAY1ASRGB24 "Write black-and-white images as RGB24"
#define VIEW_LABEL_ALWAYSRGB32 "Read greyscale images as RGB32"
#define VIEW_LABEL_PHOTOSHOPCMYK "Use CMYK code with 0 for 100% ink coverage"
#define VIEW_LABEL_SHOWREADERRORBOX "Show warning messages"
@@ -48,7 +48,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define B_TRANSLATOR_BITMAP_DESCRIPTION "Be Bitmap Format (JPEG2000Translator)"
// Translation Kit required globals
char translatorName[] = "JPEG2000 Images";
char translatorName[] = "JPEG2000 images";
char translatorInfo[] = "©2002-2003, Shard\n"
"©2005-2006, Haiku\n"
"\n"
@@ -62,9 +62,9 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// View labels
#define VIEW_LABEL_QUALITY "Output quality"
#define VIEW_LABEL_GRAY1ASRGB24 "Write Black&White images as RGB24"
#define VIEW_LABEL_GRAY1ASRGB24 "Write black-and-white images as RGB24"
#define VIEW_LABEL_JPC "Output only codestream (.jpc)"
#define VIEW_LABEL_GRAYASRGB32 "Read Greyscale images as RGB32"
#define VIEW_LABEL_GRAYASRGB32 "Read greyscale images as RGB32"
//! Settings storage structure
+1 -1
View File
@@ -25,7 +25,7 @@ ConfigView::ConfigView(const BRect &frame, uint32 resize, uint32 flags)
float height = fontHeight.descent + fontHeight.ascent + fontHeight.leading;
BRect rect(10, 10, 200, 10 + height);
BStringView *stringView = new BStringView(rect, "title", "PCX Images");
BStringView *stringView = new BStringView(rect, "title", "PCX images");
stringView->SetFont(be_bold_font);
stringView->ResizeToPreferred();
AddChild(stringView);
@@ -69,7 +69,7 @@ const uint32 kNumDefaultSettings = sizeof(sDefaultSettings) / sizeof(TranSetting
PCXTranslator::PCXTranslator()
: BaseTranslator("PCX Images", "PCX Translator",
: BaseTranslator("PCX images", "PCX translator",
PCX_TRANSLATOR_VERSION,
sInputFormats, kNumInputFormats,
sOutputFormats, kNumOutputFormats,
@@ -8,7 +8,8 @@
// PNG images.
//
//
// Copyright (c) 2003 OpenBeOS Project
// Copyright (c) 2003, OpenBeOS Project
// Copyright (c) 2009, Haiku, Inc. All rights reserved.
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
@@ -178,7 +179,7 @@ pngcb_flush_data(png_structp ppng)
// Returns:
// ---------------------------------------------------------------
PNGTranslator::PNGTranslator()
: BaseTranslator("PNG Images", "PNG image translator",
: BaseTranslator("PNG images", "PNG image translator",
PNG_TRANSLATOR_VERSION,
gInputFormats, sizeof(gInputFormats) / sizeof(translation_format),
gOutputFormats, sizeof(gOutputFormats) / sizeof(translation_format),
+3 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2003-2006, Haiku, Inc.
* Copyright 2003-2009, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT license.
*
* Authors:
@@ -34,7 +34,7 @@ PNGView::PNGView(const BRect &frame, const char *name, uint32 resizeMode,
float height = fontHeight.descent + fontHeight.ascent + fontHeight.leading;
BRect rect(10, 10, 200, 10 + height);
BStringView *stringView = new BStringView(rect, "title", "PNG Image Translator");
BStringView *stringView = new BStringView(rect, "title", "PNG image translator");
stringView->SetFont(be_bold_font);
stringView->ResizeToPreferred();
AddChild(stringView);
@@ -78,7 +78,7 @@ PNGView::PNGView(const BRect &frame, const char *name, uint32 resizeMode,
rect.OffsetBy(0, stringView->Frame().Height() + 20.0f);
BMenuField* menuField = new BMenuField(rect, "PNG Interlace Menu",
"Interlacing Type:", fInterlaceMenu);
"Interlacing type:", fInterlaceMenu);
menuField->SetDivider(menuField->StringWidth(menuField->Label()) + 7.0f);
menuField->ResizeToPreferred();
AddChild(menuField);
+22 -22
View File
@@ -47,7 +47,7 @@
#define PPM_TRANSLATOR_VERSION 0x100
/* These three data items are exported by every translator. */
char translatorName[] = "PPM Images";
char translatorName[] = "PPM images";
char translatorInfo[] = "PPM image translator v1.0.0, " __DATE__;
int32 translatorVersion = PPM_TRANSLATOR_VERSION;
// Revision: lowest 4 bits
@@ -214,13 +214,13 @@ public:
PrefsLoader g_prefs_loader("PPMTranslator_Settings");
/* Some prototypes for functions we use. */
status_t read_ppm_header(BDataIO * io, int * width, int * rowbytes, int * height,
status_t read_ppm_header(BDataIO * io, int * width, int * rowbytes, int * height,
int * max, bool * ascii, color_space * space, bool * is_ppm, char ** comment);
status_t read_bits_header(BDataIO * io, int skipped, int * width, int * rowbytes,
status_t read_bits_header(BDataIO * io, int skipped, int * width, int * rowbytes,
int * height, int * max, bool * ascii, color_space * space);
status_t write_comment(const char * str, BDataIO * io);
status_t copy_data(BDataIO * in, BDataIO * out, int rowbytes, int out_rowbytes,
int height, int max, bool in_ascii, bool out_ascii, color_space in_space,
status_t copy_data(BDataIO * in, BDataIO * out, int rowbytes, int out_rowbytes,
int height, int max, bool in_ascii, bool out_ascii, color_space in_space,
color_space out_space);
/* Return B_NO_TRANSLATOR if not handling this data. */
@@ -340,9 +340,9 @@ Translate( /* required */
}
else { /* When outputting to B_TRANSLATOR_BITMAP, follow user's wishes. */
#if defined(_PR3_COMPATIBLE_) /* R4 headers? */
if (!ioExtension || ioExtension->FindInt32(B_TRANSLATOR_EXT_BITMAP_COLOR_SPACE, (int32*)&out_space) ||
if (!ioExtension || ioExtension->FindInt32(B_TRANSLATOR_EXT_BITMAP_COLOR_SPACE, (int32*)&out_space) ||
#else
if (!ioExtension || ioExtension->FindInt32("bits/space", (int32*)&out_space) ||
if (!ioExtension || ioExtension->FindInt32("bits/space", (int32*)&out_space) ||
#endif
(out_space == B_NO_COLOR_SPACE)) {
if (g_settings.out_space == B_NO_COLOR_SPACE) {
@@ -445,7 +445,7 @@ public:
mMenu->AddItem(new BMenuItem("RGB 5:5:5 16 bits", CSMessage(B_RGB15)));
mMenu->AddItem(new BMenuItem("RGBA 5:5:5:1 16 bits", CSMessage(B_RGBA15)));
mMenu->AddItem(new BMenuItem("RGB 5:6:5 16 bits", CSMessage(B_RGB16)));
mMenu->AddItem(new BMenuItem("System Palette 8 bits", CSMessage(B_CMAP8)));
mMenu->AddItem(new BMenuItem("System palette 8 bits", CSMessage(B_CMAP8)));
mMenu->AddSeparatorItem();
mMenu->AddItem(new BMenuItem("Grayscale 8 bits", CSMessage(B_GRAY8)));
mMenu->AddItem(new BMenuItem("Bitmap 1 bit", CSMessage(B_GRAY1)));
@@ -458,7 +458,7 @@ public:
mMenu->AddItem(new BMenuItem("RGB 5:5:5 16 bits big-endian", CSMessage(B_RGB15_BIG)));
mMenu->AddItem(new BMenuItem("RGBA 5:5:5:1 16 bits big-endian", CSMessage(B_RGBA15_BIG)));
mMenu->AddItem(new BMenuItem("RGB 5:6:5 16 bits big-endian", CSMessage(B_RGB16)));
mField = new BMenuField(BRect(10,110,190,130), "Color Space Field", "Input Color Space", mMenu);
mField = new BMenuField(BRect(10,110,190,130), "Color Space Field", "Input color space", mMenu);
mField->SetDivider(mField->StringWidth(mField->Label()) + 7);
mField->SetViewColor(ViewColor());
AddChild(mField);
@@ -490,16 +490,16 @@ virtual void Draw(
float xbold, ybold;
xbold = fh.descent + 1;
ybold = fh.ascent + fh.descent * 2 + fh.leading;
char title[] = "PPM Image Translator";
char title[] = "PPM image translator";
DrawString(title, BPoint(xbold, ybold));
SetFont(be_plain_font);
font_height plainh;
GetFontHeight(&plainh);
float yplain;
yplain = plainh.ascent + plainh.descent * 2 + plainh.leading;
char detail[100];
int ver = static_cast<int>(translatorVersion);
sprintf(detail, "Version %d.%d.%d %s", ver >> 8, ((ver >> 4) & 0xf),
@@ -598,7 +598,7 @@ private:
/* as a local when translation starts. */
/* Store your settings wherever you feel like it. */
status_t
status_t
MakeConfig( /* optional */
BMessage * ioExtension, /* can be NULL */
BView * * outView,
@@ -644,7 +644,7 @@ read_ppm_header(
BDataIO * inSource,
int * width,
int * rowbytes,
int * height,
int * height,
int * max,
bool * ascii,
color_space * space,
@@ -760,7 +760,7 @@ read_bits_header(
int skipped,
int * width,
int * rowbytes,
int * height,
int * height,
int * max,
bool * ascii,
color_space * space)
@@ -928,7 +928,7 @@ write_ascii_line(
}
static unsigned char *
static unsigned char *
make_scale_data(
int max)
{
@@ -954,13 +954,13 @@ scale_data(
status_t
copy_data(
BDataIO * in,
BDataIO * out,
int rowbytes,
BDataIO * in,
BDataIO * out,
int rowbytes,
int out_rowbytes,
int height,
int height,
int max,
bool in_ascii,
bool in_ascii,
bool out_ascii,
color_space in_space,
color_space out_space)
+1 -1
View File
@@ -24,7 +24,7 @@ ConfigView::ConfigView(const BRect &frame, uint32 resize, uint32 flags)
float height = fontHeight.descent + fontHeight.ascent + fontHeight.leading;
BRect rect(10, 10, 200, 10 + height);
BStringView *stringView = new BStringView(rect, "title", "RAW Images");
BStringView *stringView = new BStringView(rect, "title", "RAW images");
stringView->SetFont(be_bold_font);
stringView->ResizeToPreferred();
AddChild(stringView);
@@ -92,7 +92,7 @@ const uint32 kNumDefaultSettings = sizeof(sDefaultSettings) / sizeof(TranSetting
RAWTranslator::RAWTranslator()
: BaseTranslator("RAW Images", "RAW Image Translator",
: BaseTranslator("RAW images", "RAW image translator",
RAW_TRANSLATOR_VERSION,
sInputFormats, kNumInputFormats,
sOutputFormats, kNumOutputFormats,
+1 -1
View File
@@ -22,7 +22,7 @@ ConfigView::ConfigView(const BRect &frame, uint32 resize, uint32 flags)
float height = fontHeight.descent + fontHeight.ascent + fontHeight.leading;
BRect rect(10, 10, 200, 10 + height);
BStringView *stringView = new BStringView(rect, "title", "Rich Text Format (RTF) Files");
BStringView *stringView = new BStringView(rect, "title", "Rich Text Format (RTF) files");
stringView->SetFont(be_bold_font);
stringView->ResizeToPreferred();
AddChild(stringView);
@@ -54,7 +54,7 @@ translation_format sOutputFormats[] = {
RTFTranslator::RTFTranslator()
{
char info[256];
sprintf(info, "Rich Text Format Translator v%d.%d.%d %s",
sprintf(info, "Rich Text Format translator v%d.%d.%d %s",
int(B_TRANSLATION_MAJOR_VERSION(RTF_TRANSLATOR_VERSION)),
int(B_TRANSLATION_MINOR_VERSION(RTF_TRANSLATOR_VERSION)),
int(B_TRANSLATION_REVISION_VERSION(RTF_TRANSLATOR_VERSION)),
@@ -73,7 +73,7 @@ RTFTranslator::~RTFTranslator()
const char *
RTFTranslator::TranslatorName() const
{
return "RTF Text Files";
return "RTF text files";
}
@@ -10,7 +10,7 @@
// SGI images.
//
//
// Copyright (c) 2003-2006 Haiku Project
// Copyright (c) 2003-2009 Haiku, Inc. All rights reserved.
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
@@ -146,7 +146,7 @@ make_nth_translator(int32 n, image_id you, uint32 flags, ...)
// Returns:
// ---------------------------------------------------------------
SGITranslator::SGITranslator()
: BaseTranslator("SGI Images", "SGI image translator",
: BaseTranslator("SGI images", "SGI image translator",
SGI_TRANSLATOR_VERSION,
gInputFormats, sizeof(gInputFormats) / sizeof(translation_format),
gOutputFormats, sizeof(gOutputFormats) / sizeof(translation_format),
+12 -12
View File
@@ -14,18 +14,18 @@
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
/*****************************************************************************/
@@ -99,7 +99,7 @@ SGIView::SGIView(const BRect &frame, const char *name,
BRect menuFrame = Bounds();
menuFrame.bottom = menuFrame.top + menu->Bounds().Height();
fCompressionMF = new BMenuField(menuFrame, "compression",
"Use Compression:", menu, true/*,
"Use compression:", menu, true/*,
B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP*/);
if (fCompressionMF->MenuBar())
fCompressionMF->MenuBar()->ResizeToPreferred();
@@ -111,12 +111,12 @@ SGIView::SGIView(const BRect &frame, const char *name,
float xbold, ybold;
xbold = fh.descent + 1;
ybold = fh.ascent + fh.descent * 2 + fh.leading;
font_height plainh;
be_plain_font->GetHeight(&plainh);
float yplain;
yplain = plainh.ascent + plainh.descent * 2 + plainh.leading;
// position the menu field below all the text we draw in Draw()
BPoint textOffset(0.0, yplain * 2 + ybold);
fCompressionMF->MoveTo(textOffset);
@@ -270,8 +270,8 @@ SGIView::Draw(BRect area)
float xbold, ybold;
xbold = fh.descent + 1;
ybold = fh.ascent + fh.descent * 2 + fh.leading;
const char* text = "SGI Image Translator";
const char* text = "SGI image translator";
DrawString(text, BPoint(xbold, ybold));
SetFont(be_plain_font);
@@ -279,7 +279,7 @@ SGIView::Draw(BRect area)
GetFontHeight(&plainh);
float yplain;
yplain = plainh.ascent + plainh.descent * 2 + plainh.leading;
char detail[100];
sprintf(detail, "Version %d.%d.%d %s",
static_cast<int>(B_TRANSLATION_MAJOR_VERSION(SGI_TRANSLATOR_VERSION)),
@@ -302,7 +302,7 @@ SGIView::Draw(BRect area)
text = "based on GIMP SGI plugin v1.5:";
DrawString(text, offset);
offset.y += ybold;
DrawString(kSGICopyright, offset);
}
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2008, Haiku, Inc. All Rights Reserved.
* Copyright 2002-2009, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
@@ -1329,7 +1329,7 @@ translate_from_text(BPositionIO* source, const char* encoding, bool forceEncodin
STXTTranslator::STXTTranslator()
: BaseTranslator("StyledEdit Files", "StyledEdit files translator",
: BaseTranslator("StyledEdit files", "StyledEdit files translator",
STXT_TRANSLATOR_VERSION,
gInputFormats, sizeof(gInputFormats) / sizeof(translation_format),
gOutputFormats, sizeof(gOutputFormats) / sizeof(translation_format),
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2006, Haiku, Inc.
* Copyright 2002-2009, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT license.
*
* Authors:
@@ -30,7 +30,7 @@ STXTView::STXTView(const BRect &frame, const char *name, uint32 resizeMode,
float height = fontHeight.descent + fontHeight.ascent + fontHeight.leading;
BRect rect(10, 10, 200, 10 + height);
BStringView *stringView = new BStringView(rect, "title", "StyledEdit Files Translator");
BStringView *stringView = new BStringView(rect, "title", "StyledEdit files translator");
stringView->SetFont(be_bold_font);
stringView->ResizeToPreferred();
AddChild(stringView);
@@ -7,7 +7,7 @@
// This BTranslator based object is for opening and writing TGA files.
//
//
// Copyright (c) 2002 Haiku, Inc.
// Copyright (c) 2002-2009, Haiku, Inc. All rights reserved.
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
@@ -131,7 +131,7 @@ make_nth_translator(int32 n, image_id you, uint32 flags, ...)
// Returns:
// ---------------------------------------------------------------
TGATranslator::TGATranslator()
: BaseTranslator("TGA Images", "TGA image translator",
: BaseTranslator("TGA images", "TGA image translator",
TGA_TRANSLATOR_VERSION,
gInputFormats, sizeof(gInputFormats) / sizeof(translation_format),
gOutputFormats, sizeof(gOutputFormats) / sizeof(translation_format),
+3 -3
View File
@@ -55,7 +55,7 @@ TGAView::TGAView(const BRect& frame, const char* name, uint32 resize,
fpchkIgnoreAlpha->ResizeToPreferred();
fpchkRLE = new BCheckBox(BRect(10, 67, 180, 84),
"Save with RLE Compression", "Save with RLE Compression",
"Save with RLE compression", "Save with RLE compression",
new BMessage(CHANGE_RLE));
val = (fSettings->SetGetBool(TGA_SETTING_RLE)) ? 1 : 0;
fpchkRLE->SetValue(val);
@@ -114,7 +114,7 @@ TGAView::Draw(BRect area)
xbold = fh.descent + 1;
ybold = fh.ascent + fh.descent * 2 + fh.leading;
DrawString("TGA Image Translator", BPoint(xbold, ybold));
DrawString("TGA image translator", BPoint(xbold, ybold));
SetFont(be_plain_font);
font_height plainh;
@@ -130,6 +130,6 @@ TGAView::Draw(BRect area)
__DATE__);
DrawString(detail, BPoint(xbold, yplain + ybold));
DrawString("Written by the Haiku Translation Kit Team",
DrawString("Written by the Haiku Translation Kit team",
BPoint(xbold, yplain * 7 + ybold));
}
@@ -1,5 +1,5 @@
/*
* Copyright 2003-2007, Haiku, Inc. All Rights Reserved.
* Copyright 2003-2009, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
@@ -591,7 +591,7 @@ write_tif_stream(TIFF* tif, BPositionIO* inSource, color_space format,
TIFFTranslator::TIFFTranslator()
: BaseTranslator("TIFF Images", "TIFF image translator",
: BaseTranslator("TIFF images", "TIFF image translator",
TIFF_TRANSLATOR_VERSION,
gInputFormats, sizeof(gInputFormats) / sizeof(translation_format),
gOutputFormats, sizeof(gOutputFormats) / sizeof(translation_format),
+13 -13
View File
@@ -13,18 +13,18 @@
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
/*****************************************************************************/
@@ -99,7 +99,7 @@ TIFFView::TIFFView(const BRect &frame, const char *name,
// add_menu_item(menu, COMPRESSION_JP2000, "JPEG2000", currentCompression);
fCompressionMF = new BMenuField(BRect(20, 50, 215, 70), "compression",
"Use Compression:", menu, true);
"Use compression:", menu, true);
fCompressionMF->ResizeToPreferred();
fCompressionMF->SetDivider(
fCompressionMF->StringWidth(fCompressionMF->Label()) + 7);
@@ -200,16 +200,16 @@ TIFFView::Draw(BRect area)
float xbold, ybold;
xbold = fh.descent + 1;
ybold = fh.ascent + fh.descent * 2 + fh.leading;
char title[] = "TIFF Image Translator";
char title[] = "TIFF image translator";
DrawString(title, BPoint(xbold, ybold));
SetFont(be_plain_font);
font_height plainh;
GetFontHeight(&plainh);
float yplain;
yplain = plainh.ascent + plainh.descent * 2 + plainh.leading;
char detail[100];
sprintf(detail, "Version %d.%d.%d %s",
static_cast<int>(B_TRANSLATION_MAJOR_VERSION(TIFF_TRANSLATOR_VERSION)),
@@ -217,11 +217,11 @@ TIFFView::Draw(BRect area)
static_cast<int>(B_TRANSLATION_REVISION_VERSION(TIFF_TRANSLATOR_VERSION)),
__DATE__);
DrawString(detail, BPoint(xbold, yplain + ybold));
int32 lineno = 6;
DrawString("TIFF Library:", BPoint(xbold, yplain * lineno + ybold));
DrawString("TIFF library:", BPoint(xbold, yplain * lineno + ybold));
lineno += 2;
char libtiff[] = TIFFLIB_VERSION_STR;
char *tok = strtok(libtiff, "\n");
while (tok) {
@@ -1,5 +1,5 @@
/*
* Copyright 2006, Haiku. All rights reserved.
* Copyright 2006-2009, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
@@ -81,7 +81,7 @@ make_nth_translator(int32 n, image_id you, uint32 flags, ...)
WonderBrushTranslator::WonderBrushTranslator()
: BaseTranslator("WonderBrush Images", "WonderBrush image translator",
: BaseTranslator("WonderBrush images", "WonderBrush image translator",
WBI_TRANSLATOR_VERSION,
gInputFormats, sizeof(gInputFormats) / sizeof(translation_format),
gOutputFormats, sizeof(gOutputFormats) / sizeof(translation_format),
@@ -1,5 +1,5 @@
/*
* Copyright 2006, Haiku. All rights reserved.
* Copyright 2006-2009, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
@@ -52,12 +52,12 @@ WonderBrushView::WonderBrushView(const BRect &frame, const char *name,
float xbold, ybold;
xbold = fh.descent + 1;
ybold = fh.ascent + fh.descent * 2 + fh.leading;
font_height plainh;
be_plain_font->GetHeight(&plainh);
float yplain;
yplain = plainh.ascent + plainh.descent * 2 + plainh.leading;
ResizeToPreferred();
}
@@ -128,8 +128,8 @@ WonderBrushView::Draw(BRect area)
float ybold = fh.ascent + fh.descent * 2 + fh.leading;
BPoint offset(xbold, ybold);
const char* text = "WonderBrush Image Translator";
const char* text = "WonderBrush image translator";
DrawString(text, offset);
SetFont(be_plain_font);
@@ -138,7 +138,7 @@ WonderBrushView::Draw(BRect area)
float yplain = plainh.ascent + plainh.descent * 2 + plainh.leading;
offset.y += yplain;
char detail[100];
sprintf(detail, "Version %d.%d.%d %s",
static_cast<int>(B_TRANSLATION_MAJOR_VERSION(WBI_TRANSLATOR_VERSION)),