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

Upated to use new B_TRANSLATE macros. Rene also send me a patch for this

Browse Source 
(thanks!), but I've redone it to keep the 80 char/line limit.

git-svn-id: http://svn.haiku-os.org/webpositive/webkit/trunk@493 94f232f2-1747-11df-bad5-a5bfde151594
This commit is contained in:
stippi 2010-05-11 12:15:22 +00:00 committed by Alexandre Deckner
parent 17813bda8c
commit 59b99c1229
2 changed files with 65 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
src/apps/webpositive/SettingsWindow.cpp
View File

@ -55,8 +55,8 @@
#include "WebSettings.h" #include "WebSettings.h"
#undef TR_CONTEXT #undef B_TRANSLATE_CONTEXT
#define TR_CONTEXT "Settings Window" #define B_TRANSLATE_CONTEXT "Settings Window"
enum { enum {
MSG_APPLY = 'aply', MSG_APPLY = 'aply',
@ -90,15 +90,18 @@ static const int32 kDefaultFontSize = 14;
SettingsWindow::SettingsWindow(BRect frame, SettingsMessage* settings) SettingsWindow::SettingsWindow(BRect frame, SettingsMessage* settings)
: :
BWindow(frame, TR("Settings"), B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL, BWindow(frame, B_TRANSLATE("Settings"), B_TITLED_WINDOW_LOOK,
B_AUTO_UPDATE_SIZE_LIMITS | B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE), B_NORMAL_WINDOW_FEEL, B_AUTO_UPDATE_SIZE_LIMITS
| B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE),
fSettings(settings) fSettings(settings)
{ {
SetLayout(new BGroupLayout(B_VERTICAL)); SetLayout(new BGroupLayout(B_VERTICAL));
fApplyButton = new BButton(TR("Apply"), new BMessage(MSG_APPLY)); fApplyButton = new BButton(B_TRANSLATE("Apply"), new BMessage(MSG_APPLY));
fCancelButton = new BButton(TR("Cancel"), new BMessage(MSG_CANCEL)); fCancelButton = new BButton(B_TRANSLATE("Cancel"),
fRevertButton = new BButton(TR("Revert"), new BMessage(MSG_REVERT)); new BMessage(MSG_CANCEL));
fRevertButton = new BButton(B_TRANSLATE("Revert"),
new BMessage(MSG_REVERT));
float spacing = be_control_look->DefaultItemSpacing(); float spacing = be_control_look->DefaultItemSpacing();
@ -241,40 +244,49 @@ BView*
SettingsWindow::_CreateGeneralPage(float spacing) SettingsWindow::_CreateGeneralPage(float spacing)
{ {
fStartPageControl = new BTextControl("start page", fStartPageControl = new BTextControl("start page",
TR("Start page:"), "", new BMessage(MSG_START_PAGE_CHANGED)); B_TRANSLATE("Start page:"), "", new BMessage(MSG_START_PAGE_CHANGED));
fStartPageControl->SetModificationMessage( fStartPageControl->SetModificationMessage(
new BMessage(MSG_START_PAGE_CHANGED)); new BMessage(MSG_START_PAGE_CHANGED));
fStartPageControl->SetText( fStartPageControl->SetText(
fSettings->GetValue(kSettingsKeyStartPageURL, kDefaultStartPageURL)); fSettings->GetValue(kSettingsKeyStartPageURL, kDefaultStartPageURL));
fSearchPageControl = new BTextControl("search page", fSearchPageControl = new BTextControl("search page",
TR("Search page:"), "", new BMessage(MSG_SEARCH_PAGE_CHANGED)); B_TRANSLATE("Search page:"), "",
new BMessage(MSG_SEARCH_PAGE_CHANGED));
fSearchPageControl->SetModificationMessage( fSearchPageControl->SetModificationMessage(
new BMessage(MSG_SEARCH_PAGE_CHANGED)); new BMessage(MSG_SEARCH_PAGE_CHANGED));
fSearchPageControl->SetText( fSearchPageControl->SetText(
fSettings->GetValue(kSettingsKeySearchPageURL, kDefaultSearchPageURL)); fSettings->GetValue(kSettingsKeySearchPageURL, kDefaultSearchPageURL));
fDownloadFolderControl = new BTextControl("download folder", fDownloadFolderControl = new BTextControl("download folder",
TR("Download folder:"), "", new BMessage(MSG_DOWNLOAD_FOLDER_CHANGED)); B_TRANSLATE("Download folder:"), "",
new BMessage(MSG_DOWNLOAD_FOLDER_CHANGED));
fDownloadFolderControl->SetModificationMessage( fDownloadFolderControl->SetModificationMessage(
new BMessage(MSG_DOWNLOAD_FOLDER_CHANGED)); new BMessage(MSG_DOWNLOAD_FOLDER_CHANGED));
fDownloadFolderControl->SetText( fDownloadFolderControl->SetText(
fSettings->GetValue(kSettingsKeyDownloadPath, kDefaultDownloadPath)); fSettings->GetValue(kSettingsKeyDownloadPath, kDefaultDownloadPath));
fNewWindowBehaviorOpenHomeItem = new BMenuItem(TR("Open start page"), fNewWindowBehaviorOpenHomeItem = new BMenuItem(
B_TRANSLATE("Open start page"),
new BMessage(MSG_NEW_WINDOWS_BEHAVIOR_CHANGED)); new BMessage(MSG_NEW_WINDOWS_BEHAVIOR_CHANGED));
fNewWindowBehaviorOpenSearchItem = new BMenuItem(TR("Open search page"), fNewWindowBehaviorOpenSearchItem = new BMenuItem(
B_TRANSLATE("Open search page"),
new BMessage(MSG_NEW_WINDOWS_BEHAVIOR_CHANGED)); new BMessage(MSG_NEW_WINDOWS_BEHAVIOR_CHANGED));
fNewWindowBehaviorOpenBlankItem = new BMenuItem(TR("Open blank page"), fNewWindowBehaviorOpenBlankItem = new BMenuItem(
B_TRANSLATE("Open blank page"),
new BMessage(MSG_NEW_WINDOWS_BEHAVIOR_CHANGED)); new BMessage(MSG_NEW_WINDOWS_BEHAVIOR_CHANGED));
fNewTabBehaviorCloneCurrentItem = new BMenuItem(TR("Clone current page"), fNewTabBehaviorCloneCurrentItem = new BMenuItem(
B_TRANSLATE("Clone current page"),
new BMessage(MSG_NEW_TABS_BEHAVIOR_CHANGED)); new BMessage(MSG_NEW_TABS_BEHAVIOR_CHANGED));
fNewTabBehaviorOpenHomeItem = new BMenuItem(TR("Open start page"), fNewTabBehaviorOpenHomeItem = new BMenuItem(
B_TRANSLATE("Open start page"),
new BMessage(MSG_NEW_TABS_BEHAVIOR_CHANGED)); new BMessage(MSG_NEW_TABS_BEHAVIOR_CHANGED));
fNewTabBehaviorOpenSearchItem = new BMenuItem(TR("Open search page"), fNewTabBehaviorOpenSearchItem = new BMenuItem(
B_TRANSLATE("Open search page"),
new BMessage(MSG_NEW_TABS_BEHAVIOR_CHANGED)); new BMessage(MSG_NEW_TABS_BEHAVIOR_CHANGED));
fNewTabBehaviorOpenBlankItem = new BMenuItem(TR("Open blank page"), fNewTabBehaviorOpenBlankItem = new BMenuItem(
B_TRANSLATE("Open blank page"),
new BMessage(MSG_NEW_TABS_BEHAVIOR_CHANGED)); new BMessage(MSG_NEW_TABS_BEHAVIOR_CHANGED));
fNewWindowBehaviorOpenHomeItem->SetMarked(true); fNewWindowBehaviorOpenHomeItem->SetMarked(true);
@ -285,7 +297,7 @@ SettingsWindow::_CreateGeneralPage(float spacing)
newWindowBehaviorMenu->AddItem(fNewWindowBehaviorOpenSearchItem); newWindowBehaviorMenu->AddItem(fNewWindowBehaviorOpenSearchItem);
newWindowBehaviorMenu->AddItem(fNewWindowBehaviorOpenBlankItem); newWindowBehaviorMenu->AddItem(fNewWindowBehaviorOpenBlankItem);
fNewWindowBehaviorMenu = new BMenuField("new window behavior", fNewWindowBehaviorMenu = new BMenuField("new window behavior",
TR("New windows:"), newWindowBehaviorMenu); B_TRANSLATE("New windows:"), newWindowBehaviorMenu);
BPopUpMenu* newTabBehaviorMenu = new BPopUpMenu("New tabs"); BPopUpMenu* newTabBehaviorMenu = new BPopUpMenu("New tabs");
newTabBehaviorMenu->AddItem(fNewTabBehaviorOpenBlankItem); newTabBehaviorMenu->AddItem(fNewTabBehaviorOpenBlankItem);
@ -293,10 +305,10 @@ SettingsWindow::_CreateGeneralPage(float spacing)
newTabBehaviorMenu->AddItem(fNewTabBehaviorOpenSearchItem); newTabBehaviorMenu->AddItem(fNewTabBehaviorOpenSearchItem);
newTabBehaviorMenu->AddItem(fNewTabBehaviorCloneCurrentItem); newTabBehaviorMenu->AddItem(fNewTabBehaviorCloneCurrentItem);
fNewTabBehaviorMenu = new BMenuField("new tab behavior", fNewTabBehaviorMenu = new BMenuField("new tab behavior",
TR("New tabs:"), newTabBehaviorMenu); B_TRANSLATE("New tabs:"), newTabBehaviorMenu);
fDaysInHistoryMenuControl = new BTextControl("days in history", fDaysInHistoryMenuControl = new BTextControl("days in history",
TR("Number of days to keep links in History menu:"), "", B_TRANSLATE("Number of days to keep links in History menu:"), "",
new BMessage(MSG_HISTORY_MENU_DAYS_CHANGED)); new BMessage(MSG_HISTORY_MENU_DAYS_CHANGED));
fDaysInHistoryMenuControl->SetModificationMessage( fDaysInHistoryMenuControl->SetModificationMessage(
new BMessage(MSG_HISTORY_MENU_DAYS_CHANGED)); new BMessage(MSG_HISTORY_MENU_DAYS_CHANGED));
@ -309,12 +321,12 @@ SettingsWindow::_CreateGeneralPage(float spacing)
fDaysInHistoryMenuControl->TextView()->DisallowChar(i); fDaysInHistoryMenuControl->TextView()->DisallowChar(i);
fShowTabsIfOnlyOnePage = new BCheckBox("show tabs if only one page", fShowTabsIfOnlyOnePage = new BCheckBox("show tabs if only one page",
TR("Show tabs if only one page is open."), B_TRANSLATE("Show tabs if only one page is open."),
new BMessage(MSG_TAB_DISPLAY_BEHAVIOR_CHANGED)); new BMessage(MSG_TAB_DISPLAY_BEHAVIOR_CHANGED));
fShowTabsIfOnlyOnePage->SetValue(B_CONTROL_ON); fShowTabsIfOnlyOnePage->SetValue(B_CONTROL_ON);
fAutoHideInterfaceInFullscreenMode = new BCheckBox("auto-hide interface", fAutoHideInterfaceInFullscreenMode = new BCheckBox("auto-hide interface",
TR("Auto-hide interface in fullscreen mode."), B_TRANSLATE("Auto-hide interface in fullscreen mode."),
new BMessage(MSG_AUTO_HIDE_BEHAVIOR_CHANGED)); new BMessage(MSG_AUTO_HIDE_BEHAVIOR_CHANGED));
fAutoHideInterfaceInFullscreenMode->SetValue(B_CONTROL_OFF); fAutoHideInterfaceInFullscreenMode->SetValue(B_CONTROL_OFF);
@ -345,7 +357,7 @@ SettingsWindow::_CreateGeneralPage(float spacing)
.SetInsets(spacing, spacing, spacing, spacing) .SetInsets(spacing, spacing, spacing, spacing)
; ;
view->SetName(TR("General")); view->SetName(B_TRANSLATE("General"));
return view; return view;
} }
@ -353,22 +365,25 @@ SettingsWindow::_CreateGeneralPage(float spacing)
BView* BView*
SettingsWindow::_CreateFontsPage(float spacing) SettingsWindow::_CreateFontsPage(float spacing)
{ {
fStandardFontView = new FontSelectionView("standard", TR("Standard font:"), fStandardFontView = new FontSelectionView("standard",
true, be_plain_font); B_TRANSLATE("Standard font:"), true, be_plain_font);
BFont defaultSerifFont = _FindDefaultSerifFont(); BFont defaultSerifFont = _FindDefaultSerifFont();
fSerifFontView = new FontSelectionView("serif", TR("Serif font:"), true, fSerifFontView = new FontSelectionView("serif",
&defaultSerifFont); B_TRANSLATE("Serif font:"), true, &defaultSerifFont);
fSansSerifFontView = new FontSelectionView("sans serif", fSansSerifFontView = new FontSelectionView("sans serif",
TR("Sans serif font:"), true, be_plain_font); B_TRANSLATE("Sans serif font:"), true, be_plain_font);
fFixedFontView = new FontSelectionView("fixed", TR("Fixed font:"), true, fFixedFontView = new FontSelectionView("fixed",
be_fixed_font); B_TRANSLATE("Fixed font:"), true, be_fixed_font);
fStandardSizesMenu = new BMenuField("standard font size", fStandardSizesMenu = new BMenuField("standard font size",
TR("Default standard font size:"), new BPopUpMenu("sizes"), NULL); B_TRANSLATE("Default standard font size:"), new BPopUpMenu("sizes"),
_BuildSizesMenu(fStandardSizesMenu->Menu(), MSG_STANDARD_FONT_SIZE_SELECTED); NULL);
_BuildSizesMenu(fStandardSizesMenu->Menu(),
MSG_STANDARD_FONT_SIZE_SELECTED);
fFixedSizesMenu = new BMenuField("fixed font size", fFixedSizesMenu = new BMenuField("fixed font size",
TR("Default fixed font size:"), new BPopUpMenu("sizes"), NULL); B_TRANSLATE("Default fixed font size:"), new BPopUpMenu("sizes"),
NULL);
_BuildSizesMenu(fFixedSizesMenu->Menu(), MSG_FIXED_FONT_SIZE_SELECTED); _BuildSizesMenu(fFixedSizesMenu->Menu(), MSG_FIXED_FONT_SIZE_SELECTED);
BView* view = BGridLayoutBuilder(spacing / 2, spacing / 2) BView* view = BGridLayoutBuilder(spacing / 2, spacing / 2)
@ -399,7 +414,7 @@ SettingsWindow::_CreateFontsPage(float spacing)
.SetInsets(spacing, spacing, spacing, spacing) .SetInsets(spacing, spacing, spacing, spacing)
; ;
view->SetName(TR("Fonts")); view->SetName(B_TRANSLATE("Fonts"));
return view; return view;
} }
@ -408,12 +423,12 @@ BView*
SettingsWindow::_CreateProxyPage(float spacing) SettingsWindow::_CreateProxyPage(float spacing)
{ {
fUseProxyCheckBox = new BCheckBox("use proxy", fUseProxyCheckBox = new BCheckBox("use proxy",
TR("Use proxy server to connect to the internet."), B_TRANSLATE("Use proxy server to connect to the internet."),
new BMessage(MSG_USE_PROXY_CHANGED)); new BMessage(MSG_USE_PROXY_CHANGED));
fUseProxyCheckBox->SetValue(B_CONTROL_ON); fUseProxyCheckBox->SetValue(B_CONTROL_ON);
fProxyAddressControl = new BTextControl("proxy address", fProxyAddressControl = new BTextControl("proxy address",
TR("Proxy server address:"), "", B_TRANSLATE("Proxy server address:"), "",
new BMessage(MSG_PROXY_ADDRESS_CHANGED)); new BMessage(MSG_PROXY_ADDRESS_CHANGED));
fProxyAddressControl->SetModificationMessage( fProxyAddressControl->SetModificationMessage(
new BMessage(MSG_PROXY_ADDRESS_CHANGED)); new BMessage(MSG_PROXY_ADDRESS_CHANGED));
@ -421,7 +436,8 @@ SettingsWindow::_CreateProxyPage(float spacing)
fSettings->GetValue(kSettingsKeyProxyAddress, "")); fSettings->GetValue(kSettingsKeyProxyAddress, ""));
fProxyPortControl = new BTextControl("proxy port", fProxyPortControl = new BTextControl("proxy port",
TR("Proxy server port:"), "", new BMessage(MSG_PROXY_PORT_CHANGED)); B_TRANSLATE("Proxy server port:"), "",
new BMessage(MSG_PROXY_PORT_CHANGED));
fProxyPortControl->SetModificationMessage( fProxyPortControl->SetModificationMessage(
new BMessage(MSG_PROXY_PORT_CHANGED)); new BMessage(MSG_PROXY_PORT_CHANGED));
fProxyPortControl->SetText( fProxyPortControl->SetText(
@ -440,7 +456,7 @@ SettingsWindow::_CreateProxyPage(float spacing)
.SetInsets(spacing, spacing, spacing, spacing) .SetInsets(spacing, spacing, spacing, spacing)
; ;
view->SetName(TR("Proxy server")); view->SetName(B_TRANSLATE("Proxy server"));
return view; return view;
} }

18
src/apps/webpositive/support/FontSelectionView.cpp
View File

@ -26,8 +26,8 @@
#include <stdio.h> #include <stdio.h>
#undef TR_CONTEXT #undef B_TRANSLATE_CONTEXT
#define TR_CONTEXT "Font Selection view" #define B_TRANSLATE_CONTEXT "Font Selection view"
static const float kMinSize = 8.0; static const float kMinSize = 8.0;
@ -65,22 +65,26 @@ FontSelectionView::FontSelectionView(const char* name, const char* label,
// styles menu, if desired // styles menu, if desired
if (separateStyles) { if (separateStyles) {
fStylesMenu = new BPopUpMenu("styles menu"); fStylesMenu = new BPopUpMenu("styles menu");
fStylesMenuField = new BMenuField("styles", TR("Style:"), fStylesMenu, fStylesMenuField = new BMenuField("styles", B_TRANSLATE("Style:"),
NULL); fStylesMenu, NULL);
} else { } else {
fStylesMenu = NULL; fStylesMenu = NULL;
fStylesMenuField = NULL; fStylesMenuField = NULL;
} }
// size menu // size menu
fSizesMenuField = new BMenuField("size", TR("Size:"), fSizesMenu, NULL); fSizesMenuField = new BMenuField("size", B_TRANSLATE("Size:"), fSizesMenu,
NULL);
fSizesMenuField->SetAlignment(B_ALIGN_RIGHT); fSizesMenuField->SetAlignment(B_ALIGN_RIGHT);
// preview // preview
fPreviewText = new BStringView("preview text", fPreviewText = new BStringView("preview text",
TR_CMT("The quick brown fox jumps over the lazy dog.","Don't translate this literally ! Use a phrase showing all chars from A to Z.")); B_TRANSLATE_COMMENT("The quick brown fox jumps over the lazy dog.",
"Don't translate this literally ! Use a phrase showing all "
"chars from A to Z."));
fPreviewText->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNLIMITED)); fPreviewText->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED,
B_SIZE_UNLIMITED));
fPreviewText->SetHighColor(tint_color(ui_color(B_PANEL_BACKGROUND_COLOR), fPreviewText->SetHighColor(tint_color(ui_color(B_PANEL_BACKGROUND_COLOR),
1.65)); 1.65));
fPreviewText->SetAlignment(B_ALIGN_RIGHT); fPreviewText->SetAlignment(B_ALIGN_RIGHT);