-rw-r--r-- | kaddressbook/kabcore.cpp | 6 | ||||
-rw-r--r-- | kaddressbook/mainembedded.cpp | 122 | ||||
-rw-r--r-- | kaddressbook/views/contactlistview.cpp | 2 |
3 files changed, 8 insertions, 122 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 1074a62..c4382d6 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -383,16 +383,18 @@ void KABCore::disableBR(bool b) | |||
383 | } | 383 | } |
384 | #endif | 384 | #endif |
385 | 385 | ||
386 | } | 386 | } |
387 | void KABCore::recieve( QString fn ) | 387 | void KABCore::recieve( QString fn ) |
388 | { | 388 | { |
389 | //qDebug("KABCore::recieve "); | 389 | //qDebug("KABCore::recieve "); |
390 | int count = mAddressBook->importFromFile( fn, true ); | 390 | int count = mAddressBook->importFromFile( fn, true ); |
391 | if ( count ) | ||
392 | setModified( true ); | ||
391 | mViewManager->refreshView(); | 393 | mViewManager->refreshView(); |
392 | message(i18n("%1 contact(s) received!").arg( count )); | 394 | message(i18n("%1 contact(s) received!").arg( count )); |
393 | topLevelWidget()->showMaximized(); | 395 | topLevelWidget()->showMaximized(); |
394 | topLevelWidget()->raise(); | 396 | topLevelWidget()->raise(); |
395 | } | 397 | } |
396 | void KABCore::restoreSettings() | 398 | void KABCore::restoreSettings() |
397 | { | 399 | { |
398 | mMultipleViewsAtOnce = KABPrefs::instance()->mMultipleViewsAtOnce; | 400 | mMultipleViewsAtOnce = KABPrefs::instance()->mMultipleViewsAtOnce; |
@@ -2874,17 +2876,19 @@ bool KABCore::syncPhone() | |||
2874 | return syncOK; | 2876 | return syncOK; |
2875 | } | 2877 | } |
2876 | void KABCore::getFile( bool success ) | 2878 | void KABCore::getFile( bool success ) |
2877 | { | 2879 | { |
2878 | if ( ! success ) { | 2880 | if ( ! success ) { |
2879 | message( i18n("Error receiving file. Nothing changed!") ); | 2881 | message( i18n("Error receiving file. Nothing changed!") ); |
2880 | return; | 2882 | return; |
2881 | } | 2883 | } |
2882 | mAddressBook->importFromFile( sentSyncFile() , false, true ); | 2884 | int count = mAddressBook->importFromFile( sentSyncFile() , false, true ); |
2885 | if ( count ) | ||
2886 | setModified( true ); | ||
2883 | message( i18n("Pi-Sync successful!") ); | 2887 | message( i18n("Pi-Sync successful!") ); |
2884 | mViewManager->refreshView(); | 2888 | mViewManager->refreshView(); |
2885 | } | 2889 | } |
2886 | void KABCore::syncFileRequest() | 2890 | void KABCore::syncFileRequest() |
2887 | { | 2891 | { |
2888 | mAddressBook->export2File( sentSyncFile() ); | 2892 | mAddressBook->export2File( sentSyncFile() ); |
2889 | } | 2893 | } |
2890 | QString KABCore::sentSyncFile() | 2894 | QString KABCore::sentSyncFile() |
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp index a2ff1e9..40089a1 100644 --- a/kaddressbook/mainembedded.cpp +++ b/kaddressbook/mainembedded.cpp | |||
@@ -4,16 +4,17 @@ | |||
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 <kstandarddirs.h> | 13 | #include <kstandarddirs.h> |
13 | #include <qregexp.h> | 14 | #include <qregexp.h> |
14 | #include <kglobal.h> | 15 | #include <kglobal.h> |
15 | #include <stdio.h> | 16 | #include <stdio.h> |
16 | #include <qdir.h> | 17 | #include <qdir.h> |
17 | #include "kaddressbookmain.h" | 18 | #include "kaddressbookmain.h" |
18 | #include "externalapphandler.h" | 19 | #include "externalapphandler.h" |
19 | #include <libkdepim/kpimglobalprefs.h> | 20 | #include <libkdepim/kpimglobalprefs.h> |
@@ -87,129 +88,8 @@ int main( int argc, char **argv ) | |||
87 | #endif | 88 | #endif |
88 | a.exec(); | 89 | a.exec(); |
89 | 90 | ||
90 | 91 | ||
91 | } | 92 | } |
92 | qDebug("KA: Bye! "); | 93 | qDebug("KA: Bye! "); |
93 | } | 94 | } |
94 | 95 | ||
95 | /* | ||
96 | #include <stdlib.h> | ||
97 | |||
98 | #include <qstring.h> | ||
99 | |||
100 | #include <kabc/stdaddressbook.h> | ||
101 | #include <kaboutdata.h> | ||
102 | #include <kcmdlineargs.h> | ||
103 | #include <kcrash.h> | ||
104 | #include <kdebug.h> | ||
105 | #include <klocale.h> | ||
106 | #include <kstartupinfo.h> | ||
107 | #include <kuniqueapplication.h> | ||
108 | #include <kwin.h> | ||
109 | |||
110 | #include "kaddressbookmain.h" | ||
111 | #include "kabcore.h" | ||
112 | |||
113 | extern "C" { | ||
114 | |||
115 | void crashHandler( int ) | ||
116 | { | ||
117 | KABC::StdAddressBook::handleCrash(); | ||
118 | ::exit( 0 ); | ||
119 | } | ||
120 | |||
121 | } | ||
122 | |||
123 | class KAddressBookApp : public KUniqueApplication { | ||
124 | public: | ||
125 | KAddressBookApp() : mMainWin( 0 ) {} | ||
126 | ~KAddressBookApp() {} | ||
127 | |||
128 | int newInstance(); | ||
129 | |||
130 | private: | ||
131 | KAddressBookMain *mMainWin; | ||
132 | }; | ||
133 | |||
134 | int KAddressBookApp::newInstance() | ||
135 | { | ||
136 | if ( isRestored() ) { | ||
137 | // There can only be one main window | ||
138 | if ( KMainWindow::canBeRestored( 1 ) ) { | ||
139 | mMainWin = new KAddressBookMain; | ||
140 | mMainWin->show(); | ||
141 | mMainWin->restore( 1 ); | ||
142 | } | ||
143 | } else { | ||
144 | KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); | ||
145 | |||
146 | QCString addrStr = args->getOption( "addr" ); | ||
147 | QCString uidStr = args->getOption( "uid" ); | ||
148 | QString addr; | ||
149 | QString uid; | ||
150 | if ( !addrStr.isEmpty() ) | ||
151 | addr = QString::fromLocal8Bit( addrStr ); | ||
152 | if ( !uidStr.isEmpty() ) | ||
153 | uid = QString::fromLocal8Bit( uidStr ); | ||
154 | |||
155 | |||
156 | if ( args->isSet( "editor-only" ) ) { | ||
157 | if ( !mMainWin ) | ||
158 | mMainWin = new KAddressBookMain; | ||
159 | KStartupInfo::appStarted(); | ||
160 | mMainWin->hide(); | ||
161 | } else { | ||
162 | if ( mMainWin ) { | ||
163 | mMainWin->show(); | ||
164 | KWin::setActiveWindow( mMainWin->winId() ); | ||
165 | } else { | ||
166 | mMainWin = new KAddressBookMain; | ||
167 | mMainWin->show(); | ||
168 | } | ||
169 | } | ||
170 | // Can not see why anyone would pass both a uid and an email address, so I'll leave it that two contact editors will show if they do | ||
171 | if ( !addr.isEmpty() ) | ||
172 | mMainWin->addEmail( addr ); | ||
173 | |||
174 | if ( !uid.isEmpty() ) | ||
175 | mMainWin->showContactEditor( uid ); | ||
176 | if ( args->isSet( "new-contact" ) ) { | ||
177 | mMainWin->newContact(); | ||
178 | } | ||
179 | } | ||
180 | |||
181 | KCrash::setEmergencySaveFunction( crashHandler ); | ||
182 | |||
183 | return 0; | ||
184 | } | ||
185 | |||
186 | // the dummy argument is required, because KMail apparently sends an empty | ||
187 | // argument. | ||
188 | static KCmdLineOptions kmoptions[] = | ||
189 | { | ||
190 | { "a", 0 , 0 }, | ||
191 | { "addr <email>", I18N_NOOP( "Shows contact editor with given email address" ), 0 }, | ||
192 | { "uid <uid>", I18N_NOOP( "Shows contact editor with given uid" ), 0 }, | ||
193 | { "editor-only", I18N_NOOP( "Launches in editor only mode" ), 0 }, | ||
194 | { "new-contact", I18N_NOOP( "Launches editor for the new contact" ), 0 }, | ||
195 | { "+[argument]", I18N_NOOP( "dummy argument" ), 0}, | ||
196 | { 0, 0, 0} | ||
197 | }; | ||
198 | |||
199 | int main( int argc, char *argv[] ) | ||
200 | { | ||
201 | KLocale::setMainCatalogue( "kaddressbook" ); | ||
202 | |||
203 | KCmdLineArgs::init( argc, argv, KABCore::createAboutData() ); | ||
204 | KCmdLineArgs::addCmdLineOptions( kmoptions ); | ||
205 | KUniqueApplication::addCmdLineOptions(); | ||
206 | |||
207 | if ( !KAddressBookApp::start() ) | ||
208 | exit( 0 ); | ||
209 | |||
210 | KAddressBookApp app; | ||
211 | KGlobal::locale()->insertCatalogue( "libkdepim" ); | ||
212 | |||
213 | return app.exec(); | ||
214 | } | ||
215 | */ | ||
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index c74f8cf..5fb4163 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp | |||
@@ -163,16 +163,17 @@ ContactListViewItem::ContactListViewItem(const KABC::Addressee &a, | |||
163 | : KListViewItem(parent), mAddressee(a), mFields( fields ), | 163 | : KListViewItem(parent), mAddressee(a), mFields( fields ), |
164 | parentListView( parent ), mDocument(doc) | 164 | parentListView( parent ), mDocument(doc) |
165 | { | 165 | { |
166 | refresh(); | 166 | refresh(); |
167 | } | 167 | } |
168 | 168 | ||
169 | QString ContactListViewItem::key(int column, bool ascending) const | 169 | QString ContactListViewItem::key(int column, bool ascending) const |
170 | { | 170 | { |
171 | #ifndef DESKTOP_VERSION | ||
171 | int lan = KGlobal::locale()->language(); | 172 | int lan = KGlobal::locale()->language(); |
172 | //qDebug("language %d ", lan); | 173 | //qDebug("language %d ", lan); |
173 | if ( lan == 1 ) { //GERMAN | 174 | if ( lan == 1 ) { //GERMAN |
174 | QString ret = QListViewItem::key(column, ascending).utf8(); | 175 | QString ret = QListViewItem::key(column, ascending).utf8(); |
175 | int start = -1; | 176 | int start = -1; |
176 | while ( (start = ret.find( 'ä', start+1)) > 0 ) { | 177 | while ( (start = ret.find( 'ä', start+1)) > 0 ) { |
177 | ret.at(start-1) = 'a'; | 178 | ret.at(start-1) = 'a'; |
178 | } | 179 | } |
@@ -189,16 +190,17 @@ QString ContactListViewItem::key(int column, bool ascending) const | |||
189 | ret.at(start-1) = 's'; | 190 | ret.at(start-1) = 's'; |
190 | } | 191 | } |
191 | //qDebug("conv string %s ", ret.latin1()); | 192 | //qDebug("conv string %s ", ret.latin1()); |
192 | 193 | ||
193 | return ret; | 194 | return ret; |
194 | 195 | ||
195 | } | 196 | } |
196 | else | 197 | else |
198 | #endif | ||
197 | return QListViewItem::key(column, ascending).lower(); | 199 | return QListViewItem::key(column, ascending).lower(); |
198 | } | 200 | } |
199 | 201 | ||
200 | void ContactListViewItem::paintCell(QPainter * p, | 202 | void ContactListViewItem::paintCell(QPainter * p, |
201 | const QColorGroup & cg, | 203 | const QColorGroup & cg, |
202 | int column, | 204 | int column, |
203 | int width, | 205 | int width, |
204 | int align) | 206 | int align) |