[haiku-commits] r33790 - in haiku/trunk: data/catalogs/preferences data/catalogs/preferences/keymap src/kits/locale src/preferences/keymap
- From: pulkomandy@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 27 Oct 2009 16:48:01 +0100 (CET)
Author: pulkomandy
Date: 2009-10-27 16:48:01 +0100 (Tue, 27 Oct 2009)
New Revision: 33790
Changeset: http://dev.haiku-os.org/changeset/33790/haiku
Added:
haiku/trunk/data/catalogs/preferences/keymap/
haiku/trunk/data/catalogs/preferences/keymap/fr.catkeys
Modified:
haiku/trunk/src/kits/locale/HashMapCatalog.cpp
haiku/trunk/src/preferences/keymap/Jamfile
haiku/trunk/src/preferences/keymap/KeymapApplication.cpp
haiku/trunk/src/preferences/keymap/KeymapApplication.h
haiku/trunk/src/preferences/keymap/KeymapWindow.cpp
Log:
-Removed unseless reference to adler32 in hashmapcatalog
-Localized Keymap preflet and translated it to french
Added: haiku/trunk/data/catalogs/preferences/keymap/fr.catkeys
===================================================================
--- haiku/trunk/data/catalogs/preferences/keymap/fr.catkeys
(rev 0)
+++ haiku/trunk/data/catalogs/preferences/keymap/fr.catkeys 2009-10-27
15:48:01 UTC (rev 33790)
@@ -0,0 +1,22 @@
+1 english x-vnd-Haiku-Keymap 3527348353
+Select Dead Keys Keymap window Touches mortes
+Tilde Trigger Keymap window Tilde
+Grave Trigger Keymap window Accent grave
+Quit Keymap window Quitter
+Circumflex Trigger Keymap window Accent circonflexe
+Open… Keymap window Ouvrir…
+System: Keymap window Système:
+Diaeresis Trigger Keymap window Trema
+User: Keymap window Utilisateur:
+Sample and Clipboard: Keymap window Exemple et presse-papier:
+Keymap Keymap window Keymap
+Switch Shortcut Keys Keymap window Touches raccourci
+Switch Shortcut Keys To Windows/Linux Mode Keymap window Touches
raccourci en mode Linux/Windows
+Layout Keymap window Disposition
+Revert Keymap window Défaire
+Save As… Keymap window Enregistrer sous…
+Switch Shortcut Keys To Haiku Mode Keymap window Touches
raccourci en mode Haiku
+File Keymap window Fichier
+(Current) Keymap window (Actif)
+Font Keymap window Police
+Acute Trigger Keymap window Accent aigu
Modified: haiku/trunk/src/kits/locale/HashMapCatalog.cpp
===================================================================
--- haiku/trunk/src/kits/locale/HashMapCatalog.cpp 2009-10-27 14:46:53 UTC
(rev 33789)
+++ haiku/trunk/src/kits/locale/HashMapCatalog.cpp 2009-10-27 15:48:01 UTC
(rev 33790)
@@ -22,10 +22,6 @@
*/
-extern "C" uint32 adler32(uint32 adler, const uint8 *buf, uint32 len);
- // definition lives in adler32.c
-
-
CatKey::CatKey(const char *str, const char *ctx, const char *cmt)
:
fString(str),
Modified: haiku/trunk/src/preferences/keymap/Jamfile
===================================================================
--- haiku/trunk/src/preferences/keymap/Jamfile 2009-10-27 14:46:53 UTC (rev
33789)
+++ haiku/trunk/src/preferences/keymap/Jamfile 2009-10-27 15:48:01 UTC (rev
33790)
@@ -12,6 +12,13 @@
KeymapListItem.cpp
KeymapWindow.cpp
- : be tracker $(TARGET_LIBSTDC++)
+ : be tracker liblocale.so $(TARGET_LIBSTDC++)
: Keymap.rdef
;
+
+DoCatalogs Keymap :
+ x-vnd.Haiku-Keymap
+ : KeymapWindow.cpp
+ : en.catalog
+ : fr.catkeys
+ ;
Modified: haiku/trunk/src/preferences/keymap/KeymapApplication.cpp
===================================================================
--- haiku/trunk/src/preferences/keymap/KeymapApplication.cpp 2009-10-27
14:46:53 UTC (rev 33789)
+++ haiku/trunk/src/preferences/keymap/KeymapApplication.cpp 2009-10-27
15:48:01 UTC (rev 33790)
@@ -13,6 +13,7 @@
KeymapApplication::KeymapApplication()
: BApplication("application/x-vnd.Haiku-Keymap")
{
+ be_locale->GetAppCatalog(&fCatalog);
// create the window
fWindow = new KeymapWindow();
fWindow->Show();
Modified: haiku/trunk/src/preferences/keymap/KeymapApplication.h
===================================================================
--- haiku/trunk/src/preferences/keymap/KeymapApplication.h 2009-10-27
14:46:53 UTC (rev 33789)
+++ haiku/trunk/src/preferences/keymap/KeymapApplication.h 2009-10-27
15:48:01 UTC (rev 33790)
@@ -14,7 +14,9 @@
#include "KeymapWindow.h"
#include <Application.h>
+#include <Catalog.h>
#include <Entry.h>
+#include <Locale.h>
class KeymapApplication : public BApplication {
@@ -26,6 +28,7 @@
private:
KeymapWindow* fWindow;
+ BCatalog fCatalog;
};
#endif // KEYMAP_APPLICATION_H
Modified: haiku/trunk/src/preferences/keymap/KeymapWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/keymap/KeymapWindow.cpp 2009-10-27 14:46:53 UTC
(rev 33789)
+++ haiku/trunk/src/preferences/keymap/KeymapWindow.cpp 2009-10-27 15:48:01 UTC
(rev 33790)
@@ -17,11 +17,13 @@
#include <Alert.h>
#include <Button.h>
+#include <Catalog.h>
#include <Directory.h>
#include <File.h>
#include <FindDirectory.h>
#include <GroupLayoutBuilder.h>
#include <ListView.h>
+#include <Locale.h>
#include <MenuBar.h>
#include <MenuField.h>
#include <MenuItem.h>
@@ -37,6 +39,9 @@
#include "KeymapListItem.h"
+#define TR_CONTEXT "Keymap window"
+
+
static const uint32 kMsgMenuFileOpen = 'mMFO';
static const uint32 kMsgMenuFileSaveAs = 'mMFA';
@@ -65,7 +70,7 @@
KeymapWindow::KeymapWindow()
:
- BWindow(BRect(80, 50, 880, 380), "Keymap", B_TITLED_WINDOW,
+ BWindow(BRect(80, 50, 880, 380), TR("Keymap"), B_TITLED_WINDOW,
B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS)
{
SetLayout(new BGroupLayout(B_VERTICAL));
@@ -73,12 +78,12 @@
fKeyboardLayoutView = new KeyboardLayoutView("layout");
fKeyboardLayoutView->SetKeymap(&fCurrentMap);
- fTextControl = new BTextControl("Sample and Clipboard:", "", NULL);
+ fTextControl = new BTextControl(TR("Sample and Clipboard:"), "", NULL);
fSwitchShortcutsButton = new BButton("switch", "",
new BMessage(kMsgSwitchShortcuts));
- fRevertButton = new BButton("revertButton", "Revert",
+ fRevertButton = new BButton("revertButton", TR("Revert"),
new BMessage(kMsgRevertKeymap));
// controls pane
@@ -373,19 +378,19 @@
BMenuItem* item;
// Create the File menu
- BMenu* menu = new BMenu("File");
- menu->AddItem(new BMenuItem("Open" B_UTF8_ELLIPSIS,
+ BMenu* menu = new BMenu(TR("File"));
+ menu->AddItem(new BMenuItem(TR("Open" B_UTF8_ELLIPSIS),
new BMessage(kMsgMenuFileOpen), 'O'));
menu->AddSeparatorItem();
- menu->AddItem(new BMenuItem("Save As" B_UTF8_ELLIPSIS,
+ menu->AddItem(new BMenuItem(TR("Save As" B_UTF8_ELLIPSIS),
new BMessage(kMsgMenuFileSaveAs)));
menu->AddSeparatorItem();
- menu->AddItem(new BMenuItem("Quit",
+ menu->AddItem(new BMenuItem(TR("Quit"),
new BMessage(B_QUIT_REQUESTED), 'Q'));
menuBar->AddItem(menu);
// Create keyboard layout menu
- fLayoutMenu = new BMenu("Layout");
+ fLayoutMenu = new BMenu(TR("Layout"));
fLayoutMenu->SetRadioMode(true);
fLayoutMenu->AddItem(item = new BMenuItem(
fKeyboardLayoutView->GetKeyboardLayout()->Name(),
@@ -396,7 +401,7 @@
menuBar->AddItem(fLayoutMenu);
// Create the Font menu
- fFontMenu = new BMenu("Font");
+ fFontMenu = new BMenu(TR("Font"));
fFontMenu->SetRadioMode(true);
int32 numFamilies = count_font_families();
font_family family, currentFamily;
@@ -424,9 +429,9 @@
BMenuField*
KeymapWindow::_CreateDeadKeyMenuField()
{
- BPopUpMenu* deadKeyMenu = new BPopUpMenu("Select Dead Keys", false,
false);
+ BPopUpMenu* deadKeyMenu = new BPopUpMenu(TR("Select Dead Keys"), false,
false);
- fAcuteMenu = new BMenu("Acute Trigger");
+ fAcuteMenu = new BMenu(TR("Acute Trigger"));
fAcuteMenu->SetRadioMode(true);
fAcuteMenu->AddItem(new BMenuItem("\xC2\xB4",
new BMessage(kMsgDeadKeyAcuteChanged)));
@@ -436,7 +441,7 @@
new BMessage(kMsgDeadKeyAcuteChanged)));
deadKeyMenu->AddItem(fAcuteMenu);
- fCircumflexMenu = new BMenu("Circumflex Trigger");
+ fCircumflexMenu = new BMenu(TR("Circumflex Trigger"));
fCircumflexMenu->SetRadioMode(true);
fCircumflexMenu->AddItem(new BMenuItem("^",
new BMessage(kMsgDeadKeyCircumflexChanged)));
@@ -444,7 +449,7 @@
new BMessage(kMsgDeadKeyCircumflexChanged)));
deadKeyMenu->AddItem(fCircumflexMenu);
- fDiaeresisMenu = new BMenu("Diaeresis Trigger");
+ fDiaeresisMenu = new BMenu(TR("Diaeresis Trigger"));
fDiaeresisMenu->SetRadioMode(true);
fDiaeresisMenu->AddItem(new BMenuItem("\xC2\xA8",
new BMessage(kMsgDeadKeyDiaeresisChanged)));
@@ -454,7 +459,7 @@
new BMessage(kMsgDeadKeyDiaeresisChanged)));
deadKeyMenu->AddItem(fDiaeresisMenu);
- fGraveMenu = new BMenu("Grave Trigger");
+ fGraveMenu = new BMenu(TR("Grave Trigger"));
fGraveMenu->SetRadioMode(true);
fGraveMenu->AddItem(new BMenuItem("`",
new BMessage(kMsgDeadKeyGraveChanged)));
@@ -462,7 +467,7 @@
new BMessage(kMsgDeadKeyGraveChanged)));
deadKeyMenu->AddItem(fGraveMenu);
- fTildeMenu = new BMenu("Tilde Trigger");
+ fTildeMenu = new BMenu(TR("Tilde Trigger"));
fTildeMenu->SetRadioMode(true);
fTildeMenu->AddItem(new BMenuItem("~",
new BMessage(kMsgDeadKeyTildeChanged)));
@@ -499,9 +504,9 @@
_SetListViewSize(fUserListView);
return BGroupLayoutBuilder(B_VERTICAL)
- .Add(new BStringView("system", "System:"))
+ .Add(new BStringView("system", TR("System:")))
.Add(systemScroller, 3)
- .Add(new BStringView("user", "User:"))
+ .Add(new BStringView("user", TR("User:")))
.Add(userScroller);
}
@@ -583,13 +588,13 @@
void
KeymapWindow::_UpdateSwitchShortcutButton()
{
- const char* label = "Switch Shortcut Keys";
+ const char* label = TR("Switch Shortcut Keys");
if (fCurrentMap.KeyForModifier(B_LEFT_COMMAND_KEY) == 0x5d
&& fCurrentMap.KeyForModifier(B_LEFT_CONTROL_KEY) == 0x5c) {
- label = "Switch Shortcut Keys To Windows/Linux Mode";
+ label = TR("Switch Shortcut Keys To Windows/Linux Mode");
} else if (fCurrentMap.KeyForModifier(B_LEFT_COMMAND_KEY) == 0x5c
&& fCurrentMap.KeyForModifier(B_LEFT_CONTROL_KEY) == 0x5d) {
- label = "Switch Shortcut Keys To Haiku Mode";
+ label = TR("Switch Shortcut Keys To Haiku Mode");
}
fSwitchShortcutsButton->SetLabel(label);
@@ -756,7 +761,7 @@
entry_ref ref;
_GetCurrentKeymap(ref);
- fUserListView->AddItem(new KeymapListItem(ref, "(Current)"));
+ fUserListView->AddItem(new KeymapListItem(ref, TR("(Current)")));
fCurrentMapName = _GetActiveKeymapName();
Other related posts:
- » [haiku-commits] r33790 - in haiku/trunk: data/catalogs/preferences data/catalogs/preferences/keymap src/kits/locale src/preferences/keymap - pulkomandy
