| -rw-r--r-- | noncore/settings/language/language.cpp | 124 |
1 files changed, 67 insertions, 57 deletions
diff --git a/noncore/settings/language/language.cpp b/noncore/settings/language/language.cpp index 397d372..5c4284b 100644 --- a/noncore/settings/language/language.cpp +++ b/noncore/settings/language/language.cpp @@ -60,33 +60,38 @@ -LanguageSettings::LanguageSettings( QWidget* parent, const char* name, WFlags fl ) - : LanguageSettingsBase( parent, name, TRUE, fl ) +LanguageSettings::LanguageSettings( QWidget* parent, const char* name, WFlags fl ) + : LanguageSettingsBase( parent, name, TRUE, fl ) { - if ( FontManager::hasUnicodeFont() ) - languages->setFont(FontManager::unicodeFont(FontManager::Proportional)); - - QString tfn = QPEApplication::qpeDir()+"/i18n/"; - QDir langDir = tfn; - QStringList list = langDir.entryList("*", QDir::Dirs ); - - QStringList::Iterator it; - - for( it = list.begin(); it != list.end(); ++it ) { - QString name = (*it); - QFileInfo desktopFile( tfn + "/" + name + "/.directory" ); - if( desktopFile.exists() ) { - langAvail.append(name); - Config conf( desktopFile.filePath(), Config::File ); - QString langName = conf.readEntry( "Name" ); - QString ownName = conf.readEntryDirect( "Name["+name+"]" ); - if ( ownName.isEmpty() ) - ownName = conf.readEntryDirect( "Name" ); - if ( !ownName.isEmpty() && ownName != langName ) - langName = langName + " [" + ownName + "]"; - languages->insertItem( langName ); - + if ( FontManager::hasUnicodeFont() ) + languages->setFont(FontManager::unicodeFont(FontManager::Proportional)); + + + QString tfn = QPEApplication::qpeDir() + "/i18n/"; + QDir langDir = tfn; + QStringList list = langDir.entryList("*", QDir::Dirs ); + + QStringList::Iterator it; + + for ( it = list.begin(); it != list.end(); ++it ) { + QString name = (*it); + QFileInfo desktopFile( tfn + "/" + name + "/.directory" ); + if ( desktopFile.exists() ) { + langAvail.append(name); + Config conf( desktopFile.filePath(), Config::File ); + QString langName = conf.readEntry( "Name" ); + QString ownName = conf.readEntryDirect( "Name[" + name + "]" ); + if ( ownName.isEmpty() ) + ownName = conf.readEntryDirect( "Name" ); + if ( !ownName.isEmpty() && ownName != langName ) + langName = langName + " [" + ownName + "]"; + languages->insertItem( langName ); + + } } - } - - dl = new QPEDialogListener(this); - reset(); + if ( langAvail. find ( "en" ) == -1 ) { + langAvail. prepend ( "" ); // no tr + languages-> insertItem ( QString ( "English [%1] (%2)" /* no tr (!) */ ). arg ( tr ( "English" )). arg ( tr( "default" )), 0 ); + } + + dl = new QPEDialogListener(this); + reset(); } @@ -94,4 +99,3 @@ LanguageSettings::LanguageSettings( QWidget* parent, const char* name, WFlags f LanguageSettings::~LanguageSettings() -{ -} +{} @@ -99,4 +103,4 @@ void LanguageSettings::accept() { - applyLanguage(); - QDialog::accept(); + applyLanguage(); + QDialog::accept(); } @@ -105,4 +109,3 @@ void LanguageSettings::applyLanguage() { - QString lang = langAvail.at( languages->currentItem() ); - setLanguage( lang ); + setLanguage ( langAvail. at ( languages-> currentItem ( ))); } @@ -112,4 +115,4 @@ void LanguageSettings::reject() { - reset(); - QDialog::reject(); + reset(); + QDialog::reject(); } @@ -118,10 +121,12 @@ void LanguageSettings::reset() { - QString l = getenv("LANG"); - Config config("language"); - l = config.readEntry( "Language", l ); - if(l.isEmpty()) l = "en"; - actualLanguage = l; - - int n = langAvail.find( l ); - languages->setCurrentItem( n ); + QString l = getenv("LANG"); + Config config("locale"); + config.setGroup("Language"); + l = config.readEntry( "Language", l ); + if (l.isEmpty()) + l = "en"; + actualLanguage = l; + + int n = langAvail.find( l ); + languages->setCurrentItem( n ); } @@ -132,19 +137,24 @@ void LanguageSettings::setLanguage(const QString& lang) { - if( lang != actualLanguage ) { - Config config("locale"); - config.setGroup( "Language" ); - config.writeEntry( "Language", lang ); - config.write(); - + if ( lang != actualLanguage ) { + Config config("locale"); + config.setGroup( "Language" ); + if ( lang. isEmpty ( )) + config. removeEntry ( "Language" ); + else + config.writeEntry( "Language", lang ); + config.write(); + #if defined(Q_WS_QWS) && !defined(QT_NO_COP) - QCopEnvelope e("QPE/System","language(QString)"); - e << lang; + + QCopEnvelope e("QPE/System", "language(QString)"); + e << lang; #endif - } + + } } -void LanguageSettings::done(int r) +void LanguageSettings::done(int r) { - QDialog::done(r); - close(); + QDialog::done(r); + close(); } |