-rw-r--r-- | kaddressbook/kabcore.cpp | 11 | ||||
-rw-r--r-- | kaddressbook/kaddressbook.pro | 31 | ||||
-rw-r--r-- | kaddressbook/mainembedded.cpp | 30 |
3 files changed, 34 insertions, 38 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 505cbf4..590cc82 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -152,14 +152,15 @@ $Id$ | |||
152 | #include "extensionmanager.h" | 152 | #include "extensionmanager.h" |
153 | #include "addresseeconfig.h" | 153 | #include "addresseeconfig.h" |
154 | #include "nameeditdialog.h" | 154 | #include "nameeditdialog.h" |
155 | #include <kcmultidialog.h> | 155 | #include <kcmultidialog.h> |
156 | 156 | ||
157 | #ifdef _WIN32_ | 157 | #ifdef _WIN32_ |
158 | 158 | #ifdef _OL_IMPORT_ | |
159 | #include "kaimportoldialog.h" | 159 | #include "kaimportoldialog.h" |
160 | #endif | ||
160 | #else | 161 | #else |
161 | #include <unistd.h> | 162 | #include <unistd.h> |
162 | #endif | 163 | #endif |
163 | // sync includes | 164 | // sync includes |
164 | #include <libkdepim/ksyncprofile.h> | 165 | #include <libkdepim/ksyncprofile.h> |
165 | #include <libkdepim/ksyncprefsdialog.h> | 166 | #include <libkdepim/ksyncprefsdialog.h> |
@@ -1288,13 +1289,13 @@ void KABCore::addEmail( QString aStr ) | |||
1288 | void KABCore::importVCard( const KURL &url, bool showPreview ) | 1289 | void KABCore::importVCard( const KURL &url, bool showPreview ) |
1289 | { | 1290 | { |
1290 | mXXPortManager->importVCard( url, showPreview ); | 1291 | mXXPortManager->importVCard( url, showPreview ); |
1291 | } | 1292 | } |
1292 | void KABCore::importFromOL() | 1293 | void KABCore::importFromOL() |
1293 | { | 1294 | { |
1294 | #ifdef _WIN32_ | 1295 | #ifdef _OL_IMPORT_ |
1295 | KAImportOLdialog* idgl = new KAImportOLdialog( i18n("Import Contacts from OL"), mAddressBook, this ); | 1296 | KAImportOLdialog* idgl = new KAImportOLdialog( i18n("Import Contacts from OL"), mAddressBook, this ); |
1296 | idgl->exec(); | 1297 | idgl->exec(); |
1297 | KABC::Addressee::List list = idgl->getAddressList(); | 1298 | KABC::Addressee::List list = idgl->getAddressList(); |
1298 | if ( list.count() > 0 ) { | 1299 | if ( list.count() > 0 ) { |
1299 | KABC::Addressee::List listNew; | 1300 | KABC::Addressee::List listNew; |
1300 | KABC::Addressee::List listExisting; | 1301 | KABC::Addressee::List listExisting; |
@@ -2163,25 +2164,25 @@ void KABCore::addActionsManually() | |||
2163 | fileMenu->insertItem( "&Import", ImportMenu ); | 2164 | fileMenu->insertItem( "&Import", ImportMenu ); |
2164 | fileMenu->insertItem( "&Export", ExportMenu ); | 2165 | fileMenu->insertItem( "&Export", ExportMenu ); |
2165 | fileMenu->insertItem( i18n("&Change"), changeMenu ); | 2166 | fileMenu->insertItem( i18n("&Change"), changeMenu ); |
2166 | #ifndef DESKTOP_VERSION | 2167 | #ifndef DESKTOP_VERSION |
2167 | if ( Ir::supported() ) fileMenu->insertItem( i18n("&Beam"), beamMenu ); | 2168 | if ( Ir::supported() ) fileMenu->insertItem( i18n("&Beam"), beamMenu ); |
2168 | #endif | 2169 | #endif |
2169 | #if 0 | 2170 | #if 0 |
2170 | // PENDING fix MailVCard | 2171 | // PENDING fix MailVCard |
2171 | fileMenu->insertSeparator(); | 2172 | fileMenu->insertSeparator(); |
2172 | mActionMailVCard->plug( fileMenu ); | 2173 | mActionMailVCard->plug( fileMenu ); |
2173 | #endif | 2174 | #endif |
2174 | #ifndef DESKTOP_VERSION | 2175 | #ifndef DESKTOP_VERSION |
2175 | if ( Ir::supported() ) mActionBR->plug( beamMenu ); | 2176 | if ( Ir::supported() ) mActionBR->plug( beamMenu ); |
2176 | if ( Ir::supported() ) mActionBeamVCard->plug( beamMenu ); | 2177 | if ( Ir::supported() ) mActionBeamVCard->plug( beamMenu ); |
2177 | if ( Ir::supported() ) mActionBeam->plug( beamMenu ); | 2178 | if ( Ir::supported() ) mActionBeam->plug( beamMenu ); |
2178 | #endif | 2179 | #endif |
2179 | fileMenu->insertSeparator(); | 2180 | fileMenu->insertSeparator(); |
2180 | mActionQuit->plug( fileMenu ); | 2181 | mActionQuit->plug( fileMenu ); |
2181 | #ifdef _WIN32_ | 2182 | #ifdef _OL_IMPORT_ |
2182 | mActionImportOL->plug( ImportMenu ); | 2183 | mActionImportOL->plug( ImportMenu ); |
2183 | #endif | 2184 | #endif |
2184 | // edit menu | 2185 | // edit menu |
2185 | mActionUndo->plug( editMenu ); | 2186 | mActionUndo->plug( editMenu ); |
2186 | mActionRedo->plug( editMenu ); | 2187 | mActionRedo->plug( editMenu ); |
2187 | editMenu->insertSeparator(); | 2188 | editMenu->insertSeparator(); |
@@ -2218,14 +2219,14 @@ void KABCore::addActionsManually() | |||
2218 | mActionDetails->plug( settingsMenu ); | 2219 | mActionDetails->plug( settingsMenu ); |
2219 | //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) | 2220 | //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) |
2220 | mActionDetails->plug( tb ); | 2221 | mActionDetails->plug( tb ); |
2221 | settingsMenu->insertSeparator(); | 2222 | settingsMenu->insertSeparator(); |
2222 | #ifndef DESKTOP_VERSION | 2223 | #ifndef DESKTOP_VERSION |
2223 | if ( Ir::supported() ) mActionBR->plug(settingsMenu ); | 2224 | if ( Ir::supported() ) mActionBR->plug(settingsMenu ); |
2224 | #endif | ||
2225 | settingsMenu->insertSeparator(); | 2225 | settingsMenu->insertSeparator(); |
2226 | #endif | ||
2226 | 2227 | ||
2227 | mActionWhoAmI->plug( settingsMenu ); | 2228 | mActionWhoAmI->plug( settingsMenu ); |
2228 | mActionEditCategories->plug( settingsMenu ); | 2229 | mActionEditCategories->plug( settingsMenu ); |
2229 | mActionEditCategories->plug( changeMenu ); | 2230 | mActionEditCategories->plug( changeMenu ); |
2230 | mActionCategories->plug( changeMenu ); | 2231 | mActionCategories->plug( changeMenu ); |
2231 | mActionManageCategories->plug( changeMenu ); | 2232 | mActionManageCategories->plug( changeMenu ); |
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro index fbbc026..e73de06 100644 --- a/kaddressbook/kaddressbook.pro +++ b/kaddressbook/kaddressbook.pro | |||
@@ -25,27 +25,30 @@ LIBS += ../bin/microkdepim.lib | |||
25 | LIBS += ../bin/microkcal.lib | 25 | LIBS += ../bin/microkcal.lib |
26 | LIBS += ../bin/microkde.lib | 26 | LIBS += ../bin/microkde.lib |
27 | LIBS += ../bin/microkabc.lib | 27 | LIBS += ../bin/microkabc.lib |
28 | QMAKE_LINK += /NODEFAULTLIB:LIBC | 28 | QMAKE_LINK += /NODEFAULTLIB:LIBC |
29 | OBJECTS_DIR = obj/win | 29 | OBJECTS_DIR = obj/win |
30 | MOC_DIR = moc/win | 30 | MOC_DIR = moc/win |
31 | #olimport section | ||
32 | #blabla: { | ||
33 | |||
31 | LIBS += mfc71u.lib | 34 | LIBS += mfc71u.lib |
35 | DEFINES += _OL_IMPORT_ | ||
36 | HEADERS = ../outport/msoutl9.h \ | ||
37 | kaimportoldialog.h | ||
38 | SOURCES = ../outport/msoutl9.cpp \ | ||
39 | kaimportoldialog.cpp | ||
40 | #} | ||
41 | #olimport section end | ||
32 | } | 42 | } |
33 | 43 | ||
34 | |||
35 | |||
36 | |||
37 | |||
38 | |||
39 | |||
40 | |||
41 | INTERFACES = \ | 44 | INTERFACES = \ |
42 | # filteredit_base.ui \ | 45 | # filteredit_base.ui \ |
43 | # kofilterview_base.ui \ | 46 | # kofilterview_base.ui \ |
44 | 47 | ||
45 | HEADERS = \ | 48 | HEADERS += \ |
46 | features/mergewidget.h \ | 49 | features/mergewidget.h \ |
47 | features/distributionlistwidget.h \ | 50 | features/distributionlistwidget.h \ |
48 | kcmconfigs/addresseewidget.h \ | 51 | kcmconfigs/addresseewidget.h \ |
49 | kcmconfigs/extensionconfigdialog.h \ | 52 | kcmconfigs/extensionconfigdialog.h \ |
50 | kcmconfigs/kcmkabconfig.h \ | 53 | kcmconfigs/kcmkabconfig.h \ |
51 | kcmconfigs/kabconfigwidget.h \ | 54 | kcmconfigs/kabconfigwidget.h \ |
@@ -105,13 +108,13 @@ xxport/sharpdtm_xxport.h \ | |||
105 | #mainwindoiw.h \ | 108 | #mainwindoiw.h \ |
106 | # alarmclient.h \ | 109 | # alarmclient.h \ |
107 | # calendarview.h \ | 110 | # calendarview.h \ |
108 | # customlistviewitem.h \ | 111 | # customlistviewitem.h \ |
109 | # datenavigator.h | 112 | # datenavigator.h |
110 | 113 | ||
111 | SOURCES = \ | 114 | SOURCES += \ |
112 | addresseeeditordialog.cpp \ | 115 | addresseeeditordialog.cpp \ |
113 | addresseeeditorwidget.cpp \ | 116 | addresseeeditorwidget.cpp \ |
114 | addresseditwidget.cpp \ | 117 | addresseditwidget.cpp \ |
115 | addresseeconfig.cpp \ | 118 | addresseeconfig.cpp \ |
116 | addresseeutil.cpp \ | 119 | addresseeutil.cpp \ |
117 | extensionmanager.cpp \ | 120 | extensionmanager.cpp \ |
@@ -169,16 +172,6 @@ xxport/qtopia_xxport.cpp \ | |||
169 | xxport/sharpdtm_xxport.cpp \ | 172 | xxport/sharpdtm_xxport.cpp \ |
170 | #details/look_details.cpp \ | 173 | #details/look_details.cpp \ |
171 | #mainwindow.cpp \ | 174 | #mainwindow.cpp \ |
172 | # calendarview.cpp \ | 175 | # calendarview.cpp \ |
173 | # timespanview.cpp | 176 | # timespanview.cpp |
174 | 177 | ||
175 | |||
176 | |||
177 | win32: { | ||
178 | HEADERS += ../outport/msoutl9.h \ | ||
179 | kaimportoldialog.h | ||
180 | |||
181 | SOURCES += ../outport/msoutl9.cpp \ | ||
182 | kaimportoldialog.cpp | ||
183 | } | ||
184 | |||
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp index 1e03dba..d9968f3 100644 --- a/kaddressbook/mainembedded.cpp +++ b/kaddressbook/mainembedded.cpp | |||
@@ -4,12 +4,14 @@ | |||
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 | #include <qmessagebox.h> | ||
11 | #include <stdlib.h> | ||
10 | #endif | 12 | #endif |
11 | 13 | ||
12 | #include <qtextcodec.h> | 14 | #include <qtextcodec.h> |
13 | #include <kstandarddirs.h> | 15 | #include <kstandarddirs.h> |
14 | #include <qregexp.h> | 16 | #include <qregexp.h> |
15 | #include <kglobal.h> | 17 | #include <kglobal.h> |
@@ -25,28 +27,28 @@ int main( int argc, char **argv ) | |||
25 | #ifndef DESKTOP_VERSION | 27 | #ifndef DESKTOP_VERSION |
26 | QPEApplication a( argc, argv ); | 28 | QPEApplication a( argc, argv ); |
27 | a.setKeepRunning (); | 29 | a.setKeepRunning (); |
28 | #else | 30 | #else |
29 | QApplication a( argc, argv ); | 31 | QApplication a( argc, argv ); |
30 | QApplication::setStyle( new QPlatinumStyle ()); | 32 | QApplication::setStyle( new QPlatinumStyle ()); |
31 | QString hdir = QDir::homeDirPath(); | 33 | #ifdef _WIN32_ |
32 | // there is a bug when creating dirs for WIN 98 | 34 | QString hdir ( getenv( "HOME") ); |
33 | // it is difficult to fix, because we have no WIN 98 runnung | 35 | if ( hdir.isEmpty() ) { |
34 | // such that we try it to create the dirs at startup here | 36 | QString hd ("C:/" ); |
35 | if ( hdir == "C:\\" ) { // win 98 or ME | 37 | //QMessageBox::information(0,"hh",QDir::homeDirPath()+" xx" +hd ); |
36 | QDir app_dir; | 38 | if ( QDir::homeDirPath().lower() == hd.lower() ) { |
37 | if ( !app_dir.exists("C:\\kdepim") ) | 39 | _putenv( "HOME=C:"); |
38 | app_dir.mkdir ("C:\\kdepim"); | 40 | //QMessageBox::information(0,"hh",QString ( getenv( "HOME") ) ); |
39 | if ( !app_dir.exists("C:\\kdepim\\apps") ) | 41 | } |
40 | app_dir.mkdir ("C:\\kdepim\\apps"); | 42 | } else { |
41 | if ( !app_dir.exists("C:\\kdepim\\config") ) | 43 | QDir app_dir; |
42 | app_dir.mkdir ("C:\\kdepim\\config"); | 44 | if ( !app_dir.exists(hdir) ) |
43 | if ( !app_dir.exists("C:\\kdepim\\apps\\kaddressbook") ) | 45 | app_dir.mkdir (hdir); |
44 | app_dir.mkdir ("C:\\kdepim\\apps\\kaddressbook"); | ||
45 | } | 46 | } |
46 | #endif | 47 | #endif |
48 | #endif | ||
47 | 49 | ||
48 | bool exitHelp = false; | 50 | bool exitHelp = false; |
49 | if ( argc > 1 ) { | 51 | if ( argc > 1 ) { |
50 | QString command = argv[1]; | 52 | QString command = argv[1]; |
51 | if ( command == "-help" ){ | 53 | if ( command == "-help" ){ |
52 | printf("KA/E command line commands:\n"); | 54 | printf("KA/E command line commands:\n"); |