author | zautrix <zautrix> | 2004-10-22 08:27:03 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-22 08:27:03 (UTC) |
commit | e61ce30fc3f2376d8e9caff421495496344a8359 (patch) (unidiff) | |
tree | e82f8e5a0ecf3f21d246b0f441502cb8ee0e11a7 /kaddressbook | |
parent | a0cd6749d41390ea832e2acd814fe117bdd39c37 (diff) | |
download | kdepimpi-e61ce30fc3f2376d8e9caff421495496344a8359.zip kdepimpi-e61ce30fc3f2376d8e9caff421495496344a8359.tar.gz kdepimpi-e61ce30fc3f2376d8e9caff421495496344a8359.tar.bz2 |
added translations
-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 | |||
@@ -12,46 +12,52 @@ | |||
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
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 | ||
34 | #include "kabprefs.h" | 38 | #include "kabprefs.h" |
35 | 39 | ||
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 ); |
48 | addItemInt( "CurrentIncSearchField", &mCurrentIncSearchField, 0 ); | 54 | addItemInt( "CurrentIncSearchField", &mCurrentIncSearchField, 0 ); |
49 | 55 | ||
50 | #ifdef KAB_EMBEDDED | 56 | #ifdef KAB_EMBEDDED |
51 | addItemBool("AskForQuit",&mAskForQuit,true); | 57 | addItemBool("AskForQuit",&mAskForQuit,true); |
52 | addItemBool("ToolBarHor",&mToolBarHor, true ); | 58 | addItemBool("ToolBarHor",&mToolBarHor, true ); |
53 | addItemBool("ToolBarUp",&mToolBarUp, false ); | 59 | addItemBool("ToolBarUp",&mToolBarUp, false ); |
54 | addItemBool("SearchWithReturn",&mSearchWithReturn, true ); | 60 | addItemBool("SearchWithReturn",&mSearchWithReturn, true ); |
55 | addItemFont("DetailsFont",&mDetailsFont); | 61 | addItemFont("DetailsFont",&mDetailsFont); |
56 | 62 | ||
57 | 63 | ||
@@ -72,62 +78,130 @@ KABPrefs::KABPrefs() | |||
72 | addItemInt( "CurrentExtension", &mCurrentExtension, 0 ); | 78 | addItemInt( "CurrentExtension", &mCurrentExtension, 0 ); |
73 | addItemStringList( "ActiveExtensions", &mActiveExtensions, defaultExtensions ); | 79 | addItemStringList( "ActiveExtensions", &mActiveExtensions, defaultExtensions ); |
74 | 80 | ||
75 | KPrefs::setCurrentGroup( "Views" ); | 81 | KPrefs::setCurrentGroup( "Views" ); |
76 | QString defaultView = i18n( "Default Table View" ); | 82 | QString defaultView = i18n( "Default Table View" ); |
77 | addItemString( "CurrentView", &mCurrentView, defaultView ); | 83 | addItemString( "CurrentView", &mCurrentView, defaultView ); |
78 | addItemStringList( "ViewNames", &mViewNames, defaultView ); | 84 | addItemStringList( "ViewNames", &mViewNames, defaultView ); |
79 | 85 | ||
80 | KPrefs::setCurrentGroup( "Filters" ); | 86 | KPrefs::setCurrentGroup( "Filters" ); |
81 | addItemInt( "CurrentFilter", &mCurrentFilter, 0 ); | 87 | addItemInt( "CurrentFilter", &mCurrentFilter, 0 ); |
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 |
94 | sInstance = staticDeleter.setObject( new KABPrefs() ); | 103 | sInstance = staticDeleter.setObject( new KABPrefs() ); |
95 | #else //KAB_EMBEDDED | 104 | #else //KAB_EMBEDDED |
96 | //US the following line has changed ???. Why | 105 | //US the following line has changed ???. Why |
97 | staticDeleter.setObject( sInstance, new KABPrefs() ); | 106 | staticDeleter.setObject( sInstance, new KABPrefs() ); |
98 | #endif //KAB_EMBEDDED | 107 | #endif //KAB_EMBEDDED |
99 | sInstance->readConfig(); | 108 | sInstance->readConfig(); |
100 | } | 109 | } |
101 | 110 | ||
102 | return sInstance; | 111 | return sInstance; |
103 | } | 112 | } |
104 | 113 | ||
105 | void KABPrefs::setCategoryDefaults() | 114 | void KABPrefs::setCategoryDefaults() |
106 | { | 115 | { |
107 | mCustomCategories.clear(); | 116 | mCustomCategories.clear(); |
108 | 117 | ||
109 | mCustomCategories << i18n( "Business" ) << i18n( "Family" ) << i18n( "School" ) | 118 | mCustomCategories << i18n( "Business" ) << i18n( "Family" ) << i18n( "School" ) |
110 | << i18n( "Customer" ) << i18n( "Friend" ); | 119 | << i18n( "Customer" ) << i18n( "Friend" ); |
111 | } | 120 | } |
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(); |
124 | } | 198 | } |
125 | 199 | ||
126 | void KABPrefs::usrReadConfig() | 200 | void KABPrefs::usrReadConfig() |
127 | { | 201 | { |
128 | KPimPrefs::usrReadConfig(); | 202 | KPimPrefs::usrReadConfig(); |
129 | } | 203 | } |
130 | 204 | ||
131 | void KABPrefs::usrWriteConfig() | 205 | void KABPrefs::usrWriteConfig() |
132 | { | 206 | { |
133 | KPimPrefs::usrWriteConfig(); | 207 | KPimPrefs::usrWriteConfig(); |
diff --git a/kaddressbook/kabprefs.h b/kaddressbook/kabprefs.h index 4a3b6e2..1098f4c 100644 --- a/kaddressbook/kabprefs.h +++ b/kaddressbook/kabprefs.h | |||
@@ -12,32 +12,33 @@ | |||
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
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 |
34 | { | 35 | { |
35 | public: | 36 | public: |
36 | virtual ~KABPrefs(); | 37 | virtual ~KABPrefs(); |
37 | 38 | ||
38 | static KABPrefs *instance(); | 39 | static KABPrefs *instance(); |
39 | 40 | ||
40 | // General | 41 | // General |
41 | bool mHonorSingleClick; | 42 | bool mHonorSingleClick; |
42 | bool mAutomaticNameParsing; | 43 | bool mAutomaticNameParsing; |
43 | int mCurrentIncSearchField; | 44 | int mCurrentIncSearchField; |
@@ -47,47 +48,49 @@ class KABPrefs : public KPimPrefs | |||
47 | KConfig* getConfig(); | 48 | KConfig* getConfig(); |
48 | 49 | ||
49 | bool mToolBarHor; | 50 | bool mToolBarHor; |
50 | bool mToolBarUp; | 51 | bool mToolBarUp; |
51 | bool mAskForQuit; | 52 | bool mAskForQuit; |
52 | 53 | ||
53 | 54 | ||
54 | /** Set preferences to default values */ | 55 | /** Set preferences to default values */ |
55 | // void usrSetDefaults(); | 56 | // void usrSetDefaults(); |
56 | 57 | ||
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; |
69 | bool mSearchWithReturn; | 71 | bool mSearchWithReturn; |
70 | QValueList<int> mExtensionsSplitter; | 72 | QValueList<int> mExtensionsSplitter; |
71 | QValueList<int> mDetailsSplitter; | 73 | QValueList<int> mDetailsSplitter; |
72 | 74 | ||
73 | // Extensions stuff | 75 | // Extensions stuff |
74 | int mCurrentExtension; | 76 | int mCurrentExtension; |
75 | QStringList mActiveExtensions; | 77 | QStringList mActiveExtensions; |
76 | 78 | ||
77 | // Views stuff | 79 | // Views stuff |
78 | QString mCurrentView; | 80 | QString mCurrentView; |
79 | QStringList mViewNames; | 81 | QStringList mViewNames; |
80 | 82 | ||
81 | // Filter | 83 | // Filter |
82 | int mCurrentFilter; | 84 | int mCurrentFilter; |
83 | 85 | ||
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 | |||
@@ -33,34 +33,33 @@ | |||
33 | #include <kmessagebox.h> | 33 | #include <kmessagebox.h> |
34 | #include <kstatusbar.h> | 34 | #include <kstatusbar.h> |
35 | #endif //KAB_EMBEDDED | 35 | #endif //KAB_EMBEDDED |
36 | #include <klocale.h> | 36 | #include <klocale.h> |
37 | 37 | ||
38 | #include "kabcore.h" | 38 | #include "kabcore.h" |
39 | #include "kaddressbookmain.h" | 39 | #include "kaddressbookmain.h" |
40 | #include "kactioncollection.h" | 40 | #include "kactioncollection.h" |
41 | 41 | ||
42 | #ifdef KAB_EMBEDDED | 42 | #ifdef KAB_EMBEDDED |
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; |
57 | iconToolBar = new QToolBar( this ); | 56 | iconToolBar = new QToolBar( this ); |
58 | addToolBar (iconToolBar , tbd ); | 57 | addToolBar (iconToolBar , tbd ); |
59 | iconToolBar->setHorizontalStretchable(true); | 58 | iconToolBar->setHorizontalStretchable(true); |
60 | //US iconToolBar->setWidth(300); | 59 | //US iconToolBar->setWidth(300); |
61 | #endif // 0 | 60 | #endif // 0 |
62 | 61 | ||
63 | mCore = new KABCore( this, true, this ); | 62 | mCore = new KABCore( this, true, this ); |
64 | 63 | ||
65 | #ifdef KAB_EMBEDDED | 64 | #ifdef KAB_EMBEDDED |
66 | setCaption( i18n( "KAddressbook/Pi" ) ); | 65 | setCaption( i18n( "KAddressbook/Pi" ) ); |
diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp index da28870..8062354 100644 --- a/kaddressbook/kaddressbookview.cpp +++ b/kaddressbook/kaddressbookview.cpp | |||
@@ -30,32 +30,33 @@ | |||
30 | 30 | ||
31 | #include "viewmanager.h" | 31 | #include "viewmanager.h" |
32 | 32 | ||
33 | #endif //KAB_EMBEDDED | 33 | #endif //KAB_EMBEDDED |
34 | #include <qlayout.h> | 34 | #include <qlayout.h> |
35 | 35 | ||
36 | #include <kabc/distributionlistdialog.h> | 36 | #include <kabc/distributionlistdialog.h> |
37 | #include <kabc/addressbook.h> | 37 | #include <kabc/addressbook.h> |
38 | #include <kdebug.h> | 38 | #include <kdebug.h> |
39 | 39 | ||
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 - " |
52 | << name() << endl; | 53 | << name() << endl; |
53 | } | 54 | } |
54 | 55 | ||
55 | void KAddressBookView::readConfig( KConfig *config ) | 56 | void KAddressBookView::readConfig( KConfig *config ) |
56 | { | 57 | { |
57 | mFieldList = KABC::Field::restoreFields( config, "KABCFields" ); | 58 | mFieldList = KABC::Field::restoreFields( config, "KABCFields" ); |
58 | 59 | ||
59 | if ( mFieldList.isEmpty() ) | 60 | if ( mFieldList.isEmpty() ) |
60 | mFieldList = KABC::Field::defaultFields(); | 61 | mFieldList = KABC::Field::defaultFields(); |
61 | 62 | ||
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp index 40089a1..a8816f9 100644 --- a/kaddressbook/mainembedded.cpp +++ b/kaddressbook/mainembedded.cpp | |||
@@ -2,36 +2,37 @@ | |||
2 | #include <qpe/qpeapplication.h> | 2 | #include <qpe/qpeapplication.h> |
3 | #include <qcopchannel_qws.h> | 3 | #include <qcopchannel_qws.h> |
4 | #include <stdlib.h> | 4 | #include <stdlib.h> |
5 | #else | 5 | #else |
6 | #include <qapplication.h> | 6 | #include <qapplication.h> |
7 | #include <qwindowsstyle.h> | 7 | #include <qwindowsstyle.h> |
8 | #include <qplatinumstyle.h> | 8 | #include <qplatinumstyle.h> |
9 | #include <qmainwindow.h> | 9 | #include <qmainwindow.h> |
10 | #endif | 10 | #endif |
11 | 11 | ||
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 |
28 | QApplication a( argc, argv ); | 29 | QApplication a( argc, argv ); |
29 | QApplication::setStyle( new QPlatinumStyle ()); | 30 | QApplication::setStyle( new QPlatinumStyle ()); |
30 | QString hdir = QDir::homeDirPath(); | 31 | QString hdir = QDir::homeDirPath(); |
31 | // there is a bug when creating dirs for WIN 98 | 32 | // there is a bug when creating dirs for WIN 98 |
32 | // it is difficult to fix, because we have no WIN 98 runnung | 33 | // it is difficult to fix, because we have no WIN 98 runnung |
33 | // such that we try it to create the dirs at startup here | 34 | // such that we try it to create the dirs at startup here |
34 | if ( hdir == "C:\\" ) { // win 98 or ME | 35 | if ( hdir == "C:\\" ) { // win 98 or ME |
35 | QDir app_dir; | 36 | QDir app_dir; |
36 | if ( !app_dir.exists("C:\\kdepim") ) | 37 | if ( !app_dir.exists("C:\\kdepim") ) |
37 | app_dir.mkdir ("C:\\kdepim"); | 38 | app_dir.mkdir ("C:\\kdepim"); |
@@ -58,38 +59,41 @@ int main( int argc, char **argv ) | |||
58 | if ( ! exitHelp ) { | 59 | if ( ! exitHelp ) { |
59 | 60 | ||
60 | KGlobal::setAppName( "kaddressbook" ); | 61 | KGlobal::setAppName( "kaddressbook" ); |
61 | #ifndef DESKTOP_VERSION | 62 | #ifndef DESKTOP_VERSION |
62 | if ( QApplication::desktop()->width() > 320 ) | 63 | if ( QApplication::desktop()->width() > 320 ) |
63 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons22/"); | 64 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons22/"); |
64 | else | 65 | else |
65 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/"); | 66 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/"); |
66 | #else | 67 | #else |
67 | QString fileName ; | 68 | QString fileName ; |
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(); |
80 | } | 83 | } |
81 | #ifndef DESKTOP_VERSION | 84 | #ifndef DESKTOP_VERSION |
82 | a.showMainWidget( &m ); | 85 | a.showMainWidget( &m ); |
83 | 86 | ||
84 | #else | 87 | #else |
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 | ||