-rw-r--r-- | kaddressbook/kabprefs.cpp | 74 | ||||
-rw-r--r-- | kaddressbook/kabprefs.h | 3 | ||||
-rw-r--r-- | kaddressbook/kaddressbookmain.cpp | 3 | ||||
-rw-r--r-- | kaddressbook/kaddressbookview.cpp | 1 | ||||
-rw-r--r-- | kaddressbook/mainembedded.cpp | 6 |
5 files changed, 84 insertions, 3 deletions
diff --git a/kaddressbook/kabprefs.cpp b/kaddressbook/kabprefs.cpp index 9270a7d..4b3ee47 100644 --- a/kaddressbook/kabprefs.cpp +++ b/kaddressbook/kabprefs.cpp | |||
@@ -22,12 +22,16 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | //US#ifdef KAB_EMBEDDED | 24 | //US#ifdef KAB_EMBEDDED |
25 | //#include <qstring.h> | 25 | //#include <qstring.h> |
26 | //#endif //KAB_EMBEDDED | 26 | //#endif //KAB_EMBEDDED |
27 | 27 | ||
28 | #include <qtextstream.h> | ||
29 | #include <qfile.h> | ||
30 | #include <stdlib.h> | ||
31 | #include <libkdepim/kpimglobalprefs.h> | ||
28 | 32 | ||
29 | #include <kconfig.h> | 33 | #include <kconfig.h> |
30 | #include <klocale.h> | 34 | #include <klocale.h> |
31 | #include <kstaticdeleter.h> | 35 | #include <kstaticdeleter.h> |
32 | //US#include <kdebug.h> // defines kdDebug() | 36 | //US#include <kdebug.h> // defines kdDebug() |
33 | 37 | ||
@@ -36,12 +40,14 @@ | |||
36 | KABPrefs *KABPrefs::sInstance = 0; | 40 | KABPrefs *KABPrefs::sInstance = 0; |
37 | static KStaticDeleter<KABPrefs> staticDeleter; | 41 | static KStaticDeleter<KABPrefs> staticDeleter; |
38 | 42 | ||
39 | KABPrefs::KABPrefs() | 43 | KABPrefs::KABPrefs() |
40 | : KPimPrefs("kaddressbookrc") | 44 | : KPimPrefs("kaddressbookrc") |
41 | { | 45 | { |
46 | |||
47 | mLocaleDict = 0; | ||
42 | mDetailsFont = QFont("helvetica",12); | 48 | mDetailsFont = QFont("helvetica",12); |
43 | KPrefs::setCurrentGroup( "Views" ); | 49 | KPrefs::setCurrentGroup( "Views" ); |
44 | addItemBool( "HonorSingleClick", &mHonorSingleClick, false ); | 50 | addItemBool( "HonorSingleClick", &mHonorSingleClick, false ); |
45 | 51 | ||
46 | KPrefs::setCurrentGroup( "General" ); | 52 | KPrefs::setCurrentGroup( "General" ); |
47 | addItemBool( "AutomaticNameParsing", &mAutomaticNameParsing, true ); | 53 | addItemBool( "AutomaticNameParsing", &mAutomaticNameParsing, true ); |
@@ -82,12 +88,15 @@ KABPrefs::KABPrefs() | |||
82 | 88 | ||
83 | } | 89 | } |
84 | 90 | ||
85 | KABPrefs::~KABPrefs() | 91 | KABPrefs::~KABPrefs() |
86 | { | 92 | { |
87 | //qDebug("KABPrefs::~KABPrefs() "); | 93 | //qDebug("KABPrefs::~KABPrefs() "); |
94 | setLocaleDict( 0 ); | ||
95 | if ( mLocaleDict ) | ||
96 | delete mLocaleDict; | ||
88 | } | 97 | } |
89 | 98 | ||
90 | KABPrefs *KABPrefs::instance() | 99 | KABPrefs *KABPrefs::instance() |
91 | { | 100 | { |
92 | if ( !sInstance ) { | 101 | if ( !sInstance ) { |
93 | #ifdef KAB_EMBEDDED | 102 | #ifdef KAB_EMBEDDED |
@@ -112,12 +121,77 @@ void KABPrefs::setCategoryDefaults() | |||
112 | 121 | ||
113 | // US introduce a nonconst way to return the config object. | 122 | // US introduce a nonconst way to return the config object. |
114 | KConfig* KABPrefs::getConfig() | 123 | KConfig* KABPrefs::getConfig() |
115 | { | 124 | { |
116 | return config(); | 125 | return config(); |
117 | } | 126 | } |
127 | void KABPrefs::usrReadConfig() | ||
128 | { | ||
129 | QString fileName ; | ||
130 | #ifndef DESKTOP_VERSION | ||
131 | fileName= QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/"; | ||
132 | #else | ||
133 | fileName = qApp->applicationDirPath () + "/kdepim/kaddressbook/"; | ||
134 | #endif | ||
135 | int mPreferredLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage; | ||
136 | mLocaleDict = 0; | ||
137 | if ( mPreferredLanguage > 0 && mPreferredLanguage < 5 ) { | ||
138 | |||
139 | if ( mPreferredLanguage == 1 ) | ||
140 | fileName = fileName+"germantranslation.txt"; | ||
141 | else if ( mPreferredLanguage == 4 ) | ||
142 | fileName = fileName+"usertranslation.txt"; | ||
143 | else if ( mPreferredLanguage == 2 ) | ||
144 | fileName = fileName+"frenchtranslation.txt"; | ||
145 | else if ( mPreferredLanguage == 3 ) | ||
146 | fileName = fileName+"italiantranslation.txt"; | ||
147 | QFile file( fileName ); | ||
148 | if (file.open( IO_ReadOnly ) ) { | ||
149 | QTextStream ts( &file ); | ||
150 | ts.setEncoding( QTextStream::Latin1 ); | ||
151 | //ts.setCodec( QTextCodec::latin1 ); | ||
152 | QString text = ts.read(); | ||
153 | file.close(); | ||
154 | text.replace( QRegExp("\\\\n"), "\n" ); | ||
155 | QString line; | ||
156 | QString we; | ||
157 | QString wt; | ||
158 | int br = 0; | ||
159 | int nbr; | ||
160 | nbr = text.find ( "},", br ); | ||
161 | line = text.mid( br, nbr - br ); | ||
162 | br = nbr+1; | ||
163 | int se, ee, st, et; | ||
164 | mLocaleDict = new QDict<QString>; | ||
165 | QString end = "{ \"\",\"\" }"; | ||
166 | while ( (line != end) && (br > 1) ) { | ||
167 | //qDebug("%d *%s* ", br, line.latin1()); | ||
168 | se = line.find("\"")+1; | ||
169 | et = line.findRev("\"",-1); | ||
170 | ee = line.find("\",\""); | ||
171 | st = ee+3; | ||
172 | we = line.mid( se, ee-se ); | ||
173 | wt = line.mid( st, et-st ); | ||
174 | //qDebug("*%s* *%s* ", we.latin1(), wt.latin1()); | ||
175 | mLocaleDict->insert( we, new QString (wt) ); | ||
176 | nbr = text.find ( "}", br ); | ||
177 | line = text.mid( br, nbr - br ); | ||
178 | br = nbr+1; | ||
179 | } | ||
180 | //qDebug("end *%s* ", end.latin1()); | ||
181 | |||
182 | setLocaleDict( mLocaleDict ); | ||
183 | } else { | ||
184 | qDebug("KO: Cannot find translation file %s",fileName.latin1() ); | ||
185 | } | ||
186 | |||
187 | |||
188 | } | ||
189 | qDebug("KABPrefs::usrReadConfig********************** "); | ||
190 | KPimPrefs::usrReadConfig(); | ||
191 | } | ||
118 | 192 | ||
119 | 193 | ||
120 | /*US | 194 | /*US |
121 | void KABPrefs::usrSetDefaults() | 195 | void KABPrefs::usrSetDefaults() |
122 | { | 196 | { |
123 | KPimPrefs::usrSetDefaults(); | 197 | KPimPrefs::usrSetDefaults(); |
diff --git a/kaddressbook/kabprefs.h b/kaddressbook/kabprefs.h index 4a3b6e2..1098f4c 100644 --- a/kaddressbook/kabprefs.h +++ b/kaddressbook/kabprefs.h | |||
@@ -22,12 +22,13 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | #ifndef KABPREFS_H | 24 | #ifndef KABPREFS_H |
25 | #define KABPREFS_H | 25 | #define KABPREFS_H |
26 | 26 | ||
27 | #include <qstringlist.h> | 27 | #include <qstringlist.h> |
28 | #include <qdict.h> | ||
28 | 29 | ||
29 | #include <libkdepim/kpimprefs.h> | 30 | #include <libkdepim/kpimprefs.h> |
30 | 31 | ||
31 | class KConfig; | 32 | class KConfig; |
32 | 33 | ||
33 | class KABPrefs : public KPimPrefs | 34 | class KABPrefs : public KPimPrefs |
@@ -57,12 +58,13 @@ class KABPrefs : public KPimPrefs | |||
57 | /** Read preferences from config file */ | 58 | /** Read preferences from config file */ |
58 | // void usrReadConfig(); | 59 | // void usrReadConfig(); |
59 | 60 | ||
60 | /** Write preferences to config file */ | 61 | /** Write preferences to config file */ |
61 | // void usrWriteConfig(); | 62 | // void usrWriteConfig(); |
62 | #endif //KAB_EMBEDDED | 63 | #endif //KAB_EMBEDDED |
64 | void usrReadConfig(); | ||
63 | 65 | ||
64 | 66 | ||
65 | // GUI | 67 | // GUI |
66 | bool mJumpButtonBarVisible; | 68 | bool mJumpButtonBarVisible; |
67 | bool mDetailsPageVisible; | 69 | bool mDetailsPageVisible; |
68 | bool mMultipleViewsAtOnce; | 70 | bool mMultipleViewsAtOnce; |
@@ -84,10 +86,11 @@ class KABPrefs : public KPimPrefs | |||
84 | void setCategoryDefaults(); | 86 | void setCategoryDefaults(); |
85 | QFont mDetailsFont; | 87 | QFont mDetailsFont; |
86 | 88 | ||
87 | private: | 89 | private: |
88 | KABPrefs(); | 90 | KABPrefs(); |
89 | 91 | ||
92 | QDict<QString> *mLocaleDict; | ||
90 | static KABPrefs *sInstance; | 93 | static KABPrefs *sInstance; |
91 | }; | 94 | }; |
92 | 95 | ||
93 | #endif | 96 | #endif |
diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp index f48f214..2832257 100644 --- a/kaddressbook/kaddressbookmain.cpp +++ b/kaddressbook/kaddressbookmain.cpp | |||
@@ -43,14 +43,13 @@ | |||
43 | KAddressBookMain::KAddressBookMain() : KMainWindow( 0, "adrressbook" ) | 43 | KAddressBookMain::KAddressBookMain() : KMainWindow( 0, "adrressbook" ) |
44 | #else //KAB_EMBEDDED | 44 | #else //KAB_EMBEDDED |
45 | //MOC_SKIP_BEGIN | 45 | //MOC_SKIP_BEGIN |
46 | KAddressBookMain::KAddressBookMain() : DCOPObject( "KAddressBookIface" ), KMainWindow( 0 ) | 46 | KAddressBookMain::KAddressBookMain() : DCOPObject( "KAddressBookIface" ), KMainWindow( 0 ) |
47 | //MOC_SKIP_END | 47 | //MOC_SKIP_END |
48 | #endif //KAB_EMBEDDED | 48 | #endif //KAB_EMBEDDED |
49 | { | 49 | { |
50 | |||
51 | setIcon(SmallIcon( "ka24" ) ); | 50 | setIcon(SmallIcon( "ka24" ) ); |
52 | #if 0 | 51 | #if 0 |
53 | //US for embedded systems, create the toolbar before we initiate KABCore. | 52 | //US for embedded systems, create the toolbar before we initiate KABCore. |
54 | // KABCore will fill the toolbar with menues and icons | 53 | // KABCore will fill the toolbar with menues and icons |
55 | QMainWindow::ToolBarDock tbd; | 54 | QMainWindow::ToolBarDock tbd; |
56 | tbd = Top; | 55 | tbd = Top; |
diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp index da28870..8062354 100644 --- a/kaddressbook/kaddressbookview.cpp +++ b/kaddressbook/kaddressbookview.cpp | |||
@@ -40,12 +40,13 @@ | |||
40 | #include "kaddressbookview.h" | 40 | #include "kaddressbookview.h" |
41 | 41 | ||
42 | KAddressBookView::KAddressBookView( KABC::AddressBook *ab, QWidget *parent, | 42 | KAddressBookView::KAddressBookView( KABC::AddressBook *ab, QWidget *parent, |
43 | const char *name ) | 43 | const char *name ) |
44 | : QWidget( parent, name ), mAddressBook( ab ), mFieldList() | 44 | : QWidget( parent, name ), mAddressBook( ab ), mFieldList() |
45 | { | 45 | { |
46 | |||
46 | initGUI(); | 47 | initGUI(); |
47 | } | 48 | } |
48 | 49 | ||
49 | KAddressBookView::~KAddressBookView() | 50 | KAddressBookView::~KAddressBookView() |
50 | { | 51 | { |
51 | kdDebug(5720) << "KAddressBookView::~KAddressBookView: destroying - " | 52 | kdDebug(5720) << "KAddressBookView::~KAddressBookView: destroying - " |
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp index 40089a1..a8816f9 100644 --- a/kaddressbook/mainembedded.cpp +++ b/kaddressbook/mainembedded.cpp | |||
@@ -12,16 +12,17 @@ | |||
12 | #include <qtextcodec.h> | 12 | #include <qtextcodec.h> |
13 | #include <kstandarddirs.h> | 13 | #include <kstandarddirs.h> |
14 | #include <qregexp.h> | 14 | #include <qregexp.h> |
15 | #include <kglobal.h> | 15 | #include <kglobal.h> |
16 | #include <stdio.h> | 16 | #include <stdio.h> |
17 | #include <qdir.h> | 17 | #include <qdir.h> |
18 | #include "kabprefs.h" | ||
18 | #include "kaddressbookmain.h" | 19 | #include "kaddressbookmain.h" |
19 | #include "externalapphandler.h" | 20 | #include "externalapphandler.h" |
20 | #include <libkdepim/kpimglobalprefs.h> | 21 | #include <libkdepim/kpimglobalprefs.h> |
21 | 22 | void dumpMissing(); | |
22 | int main( int argc, char **argv ) | 23 | int main( int argc, char **argv ) |
23 | { | 24 | { |
24 | #ifndef DESKTOP_VERSION | 25 | #ifndef DESKTOP_VERSION |
25 | QPEApplication a( argc, argv ); | 26 | QPEApplication a( argc, argv ); |
26 | a.setKeepRunning (); | 27 | a.setKeepRunning (); |
27 | #else | 28 | #else |
@@ -68,12 +69,14 @@ int main( int argc, char **argv ) | |||
68 | fileName = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons22/"; | 69 | fileName = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons22/"; |
69 | KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); | 70 | KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); |
70 | QApplication::addLibraryPath ( qApp->applicationDirPath () ); | 71 | QApplication::addLibraryPath ( qApp->applicationDirPath () ); |
71 | 72 | ||
72 | #endif | 73 | #endif |
73 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook"))); | 74 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook"))); |
75 | // init language | ||
76 | KABPrefs::instance(); | ||
74 | KAddressBookMain m ; | 77 | KAddressBookMain m ; |
75 | //US MainWindow m; | 78 | //US MainWindow m; |
76 | QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); | 79 | QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); |
77 | 80 | ||
78 | { | 81 | { |
79 | KPimGlobalPrefs::instance()->setGlobalConfig(); | 82 | KPimGlobalPrefs::instance()->setGlobalConfig(); |
@@ -85,11 +88,12 @@ int main( int argc, char **argv ) | |||
85 | a.setMainWidget( &m ); | 88 | a.setMainWidget( &m ); |
86 | m.resize (640, 480 ); | 89 | m.resize (640, 480 ); |
87 | m.show(); | 90 | m.show(); |
88 | #endif | 91 | #endif |
89 | a.exec(); | 92 | a.exec(); |
90 | 93 | ||
94 | dumpMissing(); | ||
91 | 95 | ||
92 | } | 96 | } |
93 | qDebug("KA: Bye! "); | 97 | qDebug("KA: Bye! "); |
94 | } | 98 | } |
95 | 99 | ||