summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/language/language.cpp17
1 files changed, 15 insertions, 2 deletions
diff --git a/noncore/settings/language/language.cpp b/noncore/settings/language/language.cpp
index d30a041..8dff063 100644
--- a/noncore/settings/language/language.cpp
+++ b/noncore/settings/language/language.cpp
@@ -32,121 +32,134 @@
32 32
33#include <qlabel.h> 33#include <qlabel.h>
34#include <qcheckbox.h> 34#include <qcheckbox.h>
35#include <qradiobutton.h> 35#include <qradiobutton.h>
36#include <qtabwidget.h> 36#include <qtabwidget.h>
37#include <qslider.h> 37#include <qslider.h>
38#include <qfile.h> 38#include <qfile.h>
39#include <qtextstream.h> 39#include <qtextstream.h>
40#include <qdatastream.h> 40#include <qdatastream.h>
41#include <qmessagebox.h> 41#include <qmessagebox.h>
42#include <qcombobox.h> 42#include <qcombobox.h>
43#include <qspinbox.h> 43#include <qspinbox.h>
44#include <qlistbox.h> 44#include <qlistbox.h>
45#include <qdir.h> 45#include <qdir.h>
46#if QT_VERSION >= 300 46#if QT_VERSION >= 300
47#include <qstylefactory.h> 47#include <qstylefactory.h>
48#endif 48#endif
49 49
50#include <stdlib.h> 50#include <stdlib.h>
51 51
52 52
53LanguageSettings::LanguageSettings( QWidget* parent, const char* name, WFlags fl ) 53LanguageSettings::LanguageSettings( QWidget* parent, const char* name, WFlags fl )
54 : LanguageSettingsBase( parent, name, TRUE, fl ) 54 : LanguageSettingsBase( parent, name, TRUE, fl )
55{ 55{
56 if ( FontManager::hasUnicodeFont() ) 56 if ( FontManager::hasUnicodeFont() )
57 languages->setFont(FontManager::unicodeFont(FontManager::Proportional)); 57 languages->setFont(FontManager::unicodeFont(FontManager::Proportional));
58 58
59 59
60 QString tfn = QPEApplication::qpeDir() + "/i18n/"; 60 QString tfn = QPEApplication::qpeDir() + "/i18n/";
61 QDir langDir = tfn; 61 QDir langDir = tfn;
62 QStringList list = langDir.entryList("*", QDir::Dirs ); 62 QStringList list = langDir.entryList("*", QDir::Dirs );
63 63
64 QStringList::Iterator it; 64 QStringList::Iterator it;
65 65
66 for ( it = list.begin(); it != list.end(); ++it ) { 66 for ( it = list.begin(); it != list.end(); ++it ) {
67 QString name = (*it); 67 QString name = (*it);
68 QFileInfo desktopFile( tfn + "/" + name + "/.directory" ); 68 QFileInfo desktopFile( tfn + "/" + name + "/.directory" );
69 if ( desktopFile.exists() ) { 69 if ( desktopFile.exists() ) {
70 langAvail.append(name); 70 langAvail.append(name);
71 Config conf( desktopFile.filePath(), Config::File ); 71 Config conf( desktopFile.filePath(), Config::File );
72 QString langName = conf.readEntry( "Name" ); 72 QString langName = conf.readEntry( "Name" );
73 QString ownName = conf.readEntryDirect( "Name[" + name + "]" ); 73 QString ownName = conf.readEntryDirect( "Name[" + name + "]" );
74 if ( ownName.isEmpty() ) 74 if ( ownName.isEmpty() )
75 ownName = conf.readEntryDirect( "Name" ); 75 ownName = conf.readEntryDirect( "Name" );
76 if ( !ownName.isEmpty() && ownName != langName ) 76 if ( !ownName.isEmpty() && ownName != langName )
77 langName = langName + " [" + ownName + "]"; 77 langName = langName + " [" + ownName + "]";
78 languages->insertItem( langName ); 78 languages->insertItem( langName );
79 79
80 } 80 }
81 } 81 }
82 if ( langAvail. find ( "en" ) == -1 ) { 82 if ( langAvail. find ( "en" ) == -1 ) {
83 langAvail. prepend ( "" ); // no tr 83 langAvail. prepend ( "" ); // no tr
84 languages-> insertItem ( QString ( "English [%1] (%2)" /* no tr (!) */ ). arg ( tr ( "English" )). arg ( tr( "default" )), 0 ); 84 languages-> insertItem ( QString ( "English [%1] (%2)" /* no tr (!) */ ). arg ( tr ( "English" )). arg ( tr( "default" )), 0 );
85 } 85 }
86 86
87 dl = new QPEDialogListener(this); 87 dl = new QPEDialogListener(this);
88 reset(); 88 reset();
89} 89}
90 90
91LanguageSettings::~LanguageSettings() 91LanguageSettings::~LanguageSettings()
92{} 92{}
93 93
94void LanguageSettings::accept() 94void LanguageSettings::accept()
95{ 95{
96 applyLanguage(); 96 switch( QMessageBox::warning( this, "Language",
97 QDialog::accept(); 97 "Attention, all windows will be closed\n"
98 "by changing the language\n"
99 "without saving the Data.\n\n"
100 "Go on?",
101 "Ok", "Cancel", 0,
102 0, 1 ))
103 {
104 case 0: // OK
105 applyLanguage();
106 QDialog::accept();
107 break;
108 case 1: // Abbruch
109 break;
110 }
98} 111}
99 112
100void LanguageSettings::applyLanguage() 113void LanguageSettings::applyLanguage()
101{ 114{
102 setLanguage ( langAvail. at ( languages-> currentItem ( ))); 115 setLanguage ( langAvail. at ( languages-> currentItem ( )));
103} 116}
104 117
105 118
106void LanguageSettings::reject() 119void LanguageSettings::reject()
107{ 120{
108 reset(); 121 reset();
109 QDialog::reject(); 122 QDialog::reject();
110} 123}
111 124
112void LanguageSettings::reset() 125void LanguageSettings::reset()
113{ 126{
114 QString l = getenv("LANG"); 127 QString l = getenv("LANG");
115 Config config("locale"); 128 Config config("locale");
116 config.setGroup("Language"); 129 config.setGroup("Language");
117 l = config.readEntry( "Language", l ); 130 l = config.readEntry( "Language", l );
118 actualLanguage = l; 131 actualLanguage = l;
119 if (l.isEmpty()) 132 if (l.isEmpty())
120 l = "en"; 133 l = "en";
121 134
122 int n = langAvail.find( l ); 135 int n = langAvail.find( l );
123 languages->setCurrentItem( n ); 136 languages->setCurrentItem( n );
124} 137}
125 138
126QString LanguageSettings::actualLanguage; 139QString LanguageSettings::actualLanguage;
127 140
128void LanguageSettings::setLanguage(const QString& lang) 141void LanguageSettings::setLanguage(const QString& lang)
129{ 142{
130 if ( lang != actualLanguage ) { 143 if ( lang != actualLanguage ) {
131 Config config("locale"); 144 Config config("locale");
132 config.setGroup( "Language" ); 145 config.setGroup( "Language" );
133 if ( lang. isEmpty ( )) 146 if ( lang. isEmpty ( ))
134 config. removeEntry ( "Language" ); 147 config. removeEntry ( "Language" );
135 else 148 else
136 config.writeEntry( "Language", lang ); 149 config.writeEntry( "Language", lang );
137 config.write(); 150 config.write();
138 151
139#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 152#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
140 153
141 QCopEnvelope e("QPE/System", "language(QString)"); 154 QCopEnvelope e("QPE/System", "language(QString)");
142 e << lang; 155 e << lang;
143#endif 156#endif
144 157
145 } 158 }
146} 159}
147 160
148void LanguageSettings::done(int r) 161void LanguageSettings::done(int r)
149{ 162{
150 QDialog::done(r); 163 QDialog::done(r);
151 close(); 164 close();
152} 165}