liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automatic language detection (Win Vista/7)

Browse Source 
see issue 847
This commit is contained in:
Oliver Duis 2011-07-16 13:39:28 +02:00
parent cee8bd83e1
commit c4e54b004b
8 changed files with 111 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtdata/languages/Deutsch
View File

@ -15,6 +15,7 @@
#13 Erweiterung (oduis)
#14 05.12.2010, 3.0 alpha: Erweiterung und Korrekturen (Metex)
#15 Jan-Jun 2011: Erweiterungen und Korrekturen (MaWe). Letzter Stand: 30.06.2011
#16 Erweiterung (oduis)
ABOUT_TAB_BUILD;Version
ABOUT_TAB_CREDITS;Danksagungen
ABOUT_TAB_LICENSE;Lizenz
@ -611,6 +612,7 @@ PREFERENCES_INTENT_RELATIVE;Relativ farbmetrisch
PREFERENCES_INTENT_SATURATION;Sättigung
PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Voransicht aus RAW, wenn noch nicht editiert
PREFERENCES_LIVETHUMBNAILS;Live Voransichten (langsamer)
PREFERENCES_LANGAUTODETECT;Betriebssystem-Einstellung verwenden
PREFERENCES_MENUOPTIONS;Menüoptionen
PREFERENCES_MENUGROUPRANK;Untermenü Bewertung
PREFERENCES_MENUGROUPLABEL;Untermenü Farbmarkierung

1
rtdata/languages/default
View File

@ -610,6 +610,7 @@ PREFERENCES_INTENT_PERCEPTUAL;Perceptual
PREFERENCES_INTENT_RELATIVE;Relative Colorimetric
PREFERENCES_INTENT_SATURATION;Saturation
PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show RAW internal thumbnail if unedited
PREFERENCES_LANGAUTODETECT;Use OS language setting
PREFERENCES_LIVETHUMBNAILS;Live Thumbnails (slower)
PREFERENCES_MENUOPTIONS;Menu Options
PREFERENCES_MENUGROUPRANK;Group Ranking

81
rtgui/multilangmgr.cc
View File

@ -20,11 +20,19 @@
#include <multilangmgr.h>
#include <string.h>
#include <safegtk.h>
#ifdef WIN32
// Desired auto detect function is Vista+
#define _WIN32_WINNT 0x0600
#include <windows.h>
#include <winnls.h>
#undef _WIN32_WINNT
#endif
MultiLangMgr langMgr;
Glib::ustring M (std::string key) { return langMgr.getStr (key); }
// fb is fallback manager if the first could not be loaded
bool MultiLangMgr::load (Glib::ustring fname, MultiLangMgr* fb) {
FILE *f = safe_g_fopen (fname, "rt");
@ -85,6 +93,79 @@ bool MultiLangMgr::save (Glib::ustring fname) {
return true;
}
bool MultiLangMgr::isOSLanguageDetectSupported() {
#ifdef WIN32
// Only on Vista or above
return LOBYTE(LOWORD(GetVersion()))>=6;
#else
return false;
#endif
}
// returns Language name mapped from the currently selected OS language
Glib::ustring MultiLangMgr::getOSUserLanguage() {
Glib::ustring langName = Glib::ustring("default");
if (isOSLanguageDetectSupported()) {
// TODO: Add support for other OS here
#ifdef WIN32
WCHAR langRFCU[64] = {0};
if (GetUserDefaultLocaleName(langRFCU,64)!=0 && lstrlenW(langRFCU)>=2) {
// convert UNICODE16 to GTK
char langRFC[64];
WideCharToMultiByte(CP_UTF8,0,langRFCU,-1,langRFC,64,0,0);
Glib::ustring localRFC=Glib::ustring(langRFC);
langName=TranslateRFC2Language(localRFC);
}
#endif
} else printf("Automatic language detection not supported on your OS\n");
return langName;
}
// Translates RFC standard language code to file name, e.g. "de-DE" to "Deutsch"
Glib::ustring MultiLangMgr::TranslateRFC2Language(Glib::ustring rfcName) {
if (rfcName.length()<2) return Glib::ustring("default");
Glib::ustring major=rfcName.substr(0,2).lowercase();
Glib::ustring minor;
if (rfcName.length()>=5) {
minor=rfcName.substr(3,2).uppercase();
}
//printf("Lang: %s - %s\n",major.c_str(),minor.c_str());
if (major=="cs") return "Czech";
if (major=="ca") return "Catala";
if (major=="fr") return "Francais";
if (major=="de") return "Deutsch";
if (major=="sr") return "Serbian (Cyrilic Characters)";
if (major=="zh")
return (minor=="CN" || minor=="SG") ? "Chinese (Simplified)" : "Chinese (Traditional)";
if (major=="da") return "Dansk";
if (major=="es") return "Espanol";
if (major=="el") return "Greek";
if (major=="he") return "Hebrew";
if (major=="it") return "Italian";
if (major=="ja") return "Japanese";
if (major=="nl") return "Nederlands";
if (major=="nn" || major=="nb") return "Norsk BM";
if (major=="pl") return "Polish";
if (major=="pt") return "Portugues (Brasil)";
if (major=="ru") return "Russian";
if (major=="sk") return "Slovak";
if (major=="fi") return "Suomi";
if (major=="se") return "Swedish";
if (major=="tr") return "Turkish";
// Don't split en-US, en-GB, etc. since only default english is constantly updated
return "default";
}
Glib::ustring MultiLangMgr::getStr (std::string key) {
std::map<std::string, Glib::ustring>::iterator r = transTable.find (key);

5
rtgui/multilangmgr.h
View File

@ -28,6 +28,8 @@ class MultiLangMgr {
std::map<std::string, Glib::ustring> transTable;
MultiLangMgr* fallBack;
Glib::ustring TranslateRFC2Language(Glib::ustring rfcName);
public:
MultiLangMgr () : fallBack (NULL) {}
MultiLangMgr (Glib::ustring fname) : fallBack (NULL) { load (fname); }
@ -36,6 +38,9 @@ class MultiLangMgr {
bool load (Glib::ustring fname, MultiLangMgr* fb = NULL);
bool save (Glib::ustring fname);
bool isOSLanguageDetectSupported();
Glib::ustring getOSUserLanguage();
Glib::ustring getStr (std::string key);
};

5
rtgui/options.cc
View File

@ -98,6 +98,7 @@ void Options::setDefaults () {
bgcolor = 0;
blinkClipped = false; // was true
language = DefaultLanguage;
languageAutoDetect= langMgr.isOSLanguageDetectSupported();
lastSaveAsPath = "";
overwriteOutputFile = false; // if TRUE, existing output JPGs/PNGs are overwritten, instead of adding ..-1.jpg, -2.jpg etc.
theme = "17-Gray-Red";
@ -268,6 +269,7 @@ if (keyFile.has_group ("General")) {
if (keyFile.has_key ("General", "MultiUser")) multiUser = keyFile.get_boolean ("General", "MultiUser");
if (keyFile.has_key ("General", "Version")) version = keyFile.get_string ("General", "Version");
if (keyFile.has_key ("General", "Language")) language = keyFile.get_string ("General", "Language");
if (keyFile.has_key ("General", "LanguageAutoDetect")) languageAutoDetect = keyFile.get_boolean ("General", "LanguageAutoDetect");
if (keyFile.has_key ("General", "Theme")) theme = keyFile.get_string ("General", "Theme");
if (keyFile.has_key ("General", "SlimUI")) slimUI = keyFile.get_boolean ("General", "SlimUI");
if (keyFile.has_key ("General", "UseSystemTheme")) useSystemTheme = keyFile.get_boolean ("General", "UseSystemTheme");
@ -433,6 +435,7 @@ int Options::saveToFile (Glib::ustring fname) {
keyFile.set_boolean ("General", "DualProcSupport", rtSettings.dualThreadEnabled);
keyFile.set_boolean ("General", "MultiUser", multiUser);
keyFile.set_string ("General", "Language", language);
keyFile.set_boolean ("General", "LanguageAutoDetect", languageAutoDetect);
keyFile.set_string ("General", "Theme", theme);
keyFile.set_boolean ("General", "SlimUI", slimUI);
keyFile.set_boolean ("General", "UseSystemTheme", useSystemTheme);
@ -661,6 +664,8 @@ void Options::load () {
Glib::ustring languageTranslation = "";
Glib::ustring localeTranslation = "";
if (options.languageAutoDetect) options.language=langMgr.getOSUserLanguage();
if (!options.language.empty()){
std::vector<Glib::ustring> langPortions = Glib::Regex::split_simple(" ", options.language);
if (langPortions.size() >= 1){

1
rtgui/options.h
View File

@ -100,6 +100,7 @@ class Options {
bool blinkClipped;
int bgcolor;
Glib::ustring language;
bool languageAutoDetect;
Glib::ustring theme;
bool slimUI;
bool useSystemTheme;

13
rtgui/preferences.cc
View File

@ -454,6 +454,9 @@ Gtk::Widget* Preferences::getGeneralPanel () {
Gtk::Frame* flang = Gtk::manage( new Gtk::Frame (M("PREFERENCES_DEFAULTLANG")) );
Gtk::HBox* hblang = Gtk::manage( new Gtk::HBox () );
hblang->set_border_width (4);
ckbLangAutoDetect = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_LANGAUTODETECT")) );
Gtk::Label* langlab = Gtk::manage( new Gtk::Label (M("PREFERENCES_SELECTLANG")+":") );
languages = Gtk::manage( new Gtk::ComboBoxText () );
@ -466,12 +469,15 @@ Gtk::Widget* Preferences::getGeneralPanel () {
}
Gtk::Label* langw = Gtk::manage( new Gtk::Label (Glib::ustring(" (") + M("PREFERENCES_APPLNEXTSTARTUP") + ")") );
hblang->pack_start (*langlab, Gtk::PACK_SHRINK, 4);
hblang->pack_start (*ckbLangAutoDetect, Gtk::PACK_SHRINK, 4);
hblang->pack_start (*langlab, Gtk::PACK_SHRINK, 8);
hblang->pack_start (*languages);
hblang->pack_end (*langw, Gtk::PACK_SHRINK, 4);
flang->add (*hblang);
mvbsd->pack_start (*flang, Gtk::PACK_SHRINK, 4);
langAutoDetectConn = ckbLangAutoDetect->signal_toggled().connect (sigc::mem_fun(*this, &Preferences::langAutoDetectToggled));
Gtk::Frame* ftheme = Gtk::manage( new Gtk::Frame (M("PREFERENCES_DEFAULTTHEME")) );
Gtk::VBox* vbftheme = Gtk::manage( new Gtk::VBox () );
vbftheme->set_border_width(4);
@ -927,6 +933,7 @@ void Preferences::storePreferences () {
moptions.highlightThreshold = (int)hlThresh->get_value ();
moptions.shadowThreshold = (int)shThresh->get_value ();
moptions.language = languages->get_active_text ();
moptions.languageAutoDetect = ckbLangAutoDetect->get_active ();
moptions.theme = theme->get_active_text ();
moptions.slimUI = slimUI->get_active ();
moptions.useSystemTheme = chUseSystemTheme->get_active ();
@ -1046,6 +1053,7 @@ void Preferences::fillPreferences () {
iccDir->set_current_folder (moptions.rtSettings.iccDirectory);
intent->set_active (moptions.rtSettings.colorimetricIntent);
languages->set_active_text (moptions.language);
ckbLangAutoDetect->set_active (moptions.languageAutoDetect);
theme->set_active_text (moptions.theme);
slimUI->set_active(moptions.slimUI);
chUseSystemTheme->set_active(moptions.useSystemTheme);
@ -1191,6 +1199,9 @@ void Preferences::sndEnableToggled () {
spbSndLngEditProcDoneSecs->set_sensitive(ckbSndEnable->get_active());
}
void Preferences::langAutoDetectToggled () {
languages->set_sensitive(!ckbLangAutoDetect->get_active());
}
void Preferences::okPressed () {

5
rtgui/preferences.h
View File

@ -54,6 +54,7 @@ class Preferences : public Gtk::Dialog {
Gtk::ComboBoxText* rprofiles;
Gtk::ComboBoxText* iprofiles;
Gtk::ComboBoxText* languages;
Gtk::CheckButton* ckbLangAutoDetect;
Gtk::Entry* dateformat;
Gtk::Entry* startupdir;
Gtk::RadioButton* sdcurrent;
@ -132,7 +133,8 @@ class Preferences : public Gtk::Dialog {
Options moptions;
sigc::connection tconn, sconn, fconn, usethcon, addc, setc, dfconn, ffconn, autoMonProfileConn, sndEnableConn;
sigc::connection tconn, sconn, fconn, usethcon, addc, setc, dfconn, ffconn;
sigc::connection autoMonProfileConn, sndEnableConn, langAutoDetectConn;
Glib::ustring initialTheme;
Glib::ustring initialFont;
@ -172,6 +174,7 @@ class Preferences : public Gtk::Dialog {
void aboutPressed ();
void autoMonProfileToggled ();
void sndEnableToggled ();
void langAutoDetectToggled ();
void selectStartupDir ();
void addExtPressed ();