-rw-r--r-- | kaddressbook/kabcore.cpp | 11 | ||||
-rw-r--r-- | kaddressbook/kaddressbook.pro | 31 | ||||
-rw-r--r-- | kaddressbook/mainembedded.cpp | 30 | ||||
-rw-r--r-- | kdepim-desktop.pro | 2 | ||||
-rw-r--r-- | korganizer/koprefsdialog.cpp | 2 | ||||
-rw-r--r-- | korganizer/korganizer.pro | 32 | ||||
-rw-r--r-- | korganizer/main.cpp | 29 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 8 |
8 files changed, 72 insertions, 73 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 505cbf4..590cc82 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -155,8 +155,9 @@ $Id$ #include <kcmultidialog.h> #ifdef _WIN32_ - +#ifdef _OL_IMPORT_ #include "kaimportoldialog.h" +#endif #else #include <unistd.h> #endif @@ -1291,7 +1292,7 @@ void KABCore::importVCard( const KURL &url, bool showPreview ) } void KABCore::importFromOL() { -#ifdef _WIN32_ +#ifdef _OL_IMPORT_ KAImportOLdialog* idgl = new KAImportOLdialog( i18n("Import Contacts from OL"), mAddressBook, this ); idgl->exec(); KABC::Addressee::List list = idgl->getAddressList(); @@ -2166,7 +2167,7 @@ void KABCore::addActionsManually() #ifndef DESKTOP_VERSION if ( Ir::supported() ) fileMenu->insertItem( i18n("&Beam"), beamMenu ); #endif -#if 0 +#if 0 // PENDING fix MailVCard fileMenu->insertSeparator(); mActionMailVCard->plug( fileMenu ); @@ -2178,7 +2179,7 @@ void KABCore::addActionsManually() #endif fileMenu->insertSeparator(); mActionQuit->plug( fileMenu ); -#ifdef _WIN32_ +#ifdef _OL_IMPORT_ mActionImportOL->plug( ImportMenu ); #endif // edit menu @@ -2221,8 +2222,8 @@ void KABCore::addActionsManually() settingsMenu->insertSeparator(); #ifndef DESKTOP_VERSION if ( Ir::supported() ) mActionBR->plug(settingsMenu ); -#endif settingsMenu->insertSeparator(); +#endif mActionWhoAmI->plug( settingsMenu ); mActionEditCategories->plug( settingsMenu ); diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro index fbbc026..e73de06 100644 --- a/kaddressbook/kaddressbook.pro +++ b/kaddressbook/kaddressbook.pro @@ -28,21 +28,24 @@ LIBS += ../bin/microkabc.lib QMAKE_LINK += /NODEFAULTLIB:LIBC OBJECTS_DIR = obj/win MOC_DIR = moc/win +#olimport section +#blabla: { + LIBS += mfc71u.lib +DEFINES += _OL_IMPORT_ +HEADERS = ../outport/msoutl9.h \ + kaimportoldialog.h +SOURCES = ../outport/msoutl9.cpp \ + kaimportoldialog.cpp +#} +#olimport section end } - - - - - - - INTERFACES = \ # filteredit_base.ui \ # kofilterview_base.ui \ -HEADERS = \ +HEADERS += \ features/mergewidget.h \ features/distributionlistwidget.h \ kcmconfigs/addresseewidget.h \ @@ -108,7 +111,7 @@ xxport/sharpdtm_xxport.h \ # customlistviewitem.h \ # datenavigator.h -SOURCES = \ +SOURCES += \ addresseeeditordialog.cpp \ addresseeeditorwidget.cpp \ addresseditwidget.cpp \ @@ -172,13 +175,3 @@ xxport/sharpdtm_xxport.cpp \ # calendarview.cpp \ # timespanview.cpp - - -win32: { -HEADERS += ../outport/msoutl9.h \ - kaimportoldialog.h - -SOURCES += ../outport/msoutl9.cpp \ - kaimportoldialog.cpp -} - diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp index 1e03dba..d9968f3 100644 --- a/kaddressbook/mainembedded.cpp +++ b/kaddressbook/mainembedded.cpp @@ -7,6 +7,8 @@ #include <qwindowsstyle.h> #include <qplatinumstyle.h> #include <qmainwindow.h> +#include <qmessagebox.h> +#include <stdlib.h> #endif #include <qtextcodec.h> @@ -28,22 +30,22 @@ int main( int argc, char **argv ) #else QApplication a( argc, argv ); QApplication::setStyle( new QPlatinumStyle ()); - QString hdir = QDir::homeDirPath(); - // there is a bug when creating dirs for WIN 98 - // it is difficult to fix, because we have no WIN 98 runnung - // such that we try it to create the dirs at startup here - if ( hdir == "C:\\" ) { // win 98 or ME - QDir app_dir; - if ( !app_dir.exists("C:\\kdepim") ) - app_dir.mkdir ("C:\\kdepim"); - if ( !app_dir.exists("C:\\kdepim\\apps") ) - app_dir.mkdir ("C:\\kdepim\\apps"); - if ( !app_dir.exists("C:\\kdepim\\config") ) - app_dir.mkdir ("C:\\kdepim\\config"); - if ( !app_dir.exists("C:\\kdepim\\apps\\kaddressbook") ) - app_dir.mkdir ("C:\\kdepim\\apps\\kaddressbook"); +#ifdef _WIN32_ + QString hdir ( getenv( "HOME") ); + if ( hdir.isEmpty() ) { + QString hd ("C:/" ); + //QMessageBox::information(0,"hh",QDir::homeDirPath()+" xx" +hd ); + if ( QDir::homeDirPath().lower() == hd.lower() ) { + _putenv( "HOME=C:"); + //QMessageBox::information(0,"hh",QString ( getenv( "HOME") ) ); + } + } else { + QDir app_dir; + if ( !app_dir.exists(hdir) ) + app_dir.mkdir (hdir); } #endif +#endif bool exitHelp = false; if ( argc > 1 ) { diff --git a/kdepim-desktop.pro b/kdepim-desktop.pro index b0d60b7..da3a966 100644 --- a/kdepim-desktop.pro +++ b/kdepim-desktop.pro @@ -1,7 +1,7 @@ TEMPLATE = subdirs -SUBDIRS = libical libkcal kabc libkdepim microkde korganizer kaddressbook kabc/plugins/file kabc/plugins/dir kabc/plugins/file kabc/plugins/qtopia gammu/emb/common gammu/emb/gammu +SUBDIRS = libical libkcal kabc libkdepim microkde korganizer kaddressbook kabc/plugins/file kabc/plugins/dir kabc/plugins/qtopia gammu/emb/common gammu/emb/gammu unix:{ SUBDIRS += kmicromail/libetpan kmicromail/libmailwrapper kmicromail pwmanager/libcrypt/cipher pwmanager/libcrypt/error pwmanager/libcrypt/mpi pwmanager/libcrypt/zlib pwmanager/pwmanager } diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 8aa24ee..ea73fd0 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -94,8 +94,10 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : //setupGroupSchedulingTab(); //setupGroupAutomationTab(); +#ifndef DESKTOP_VERSION if ( QApplication::desktop()->height() == 480 ) hideButtons(); +#endif } diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro index c2602b2..4d67dca 100644 --- a/korganizer/korganizer.pro +++ b/korganizer/korganizer.pro @@ -1,5 +1,5 @@ TEMPLATE = app -CONFIG = qt warn_on +CONFIG += qt warn_off TARGET = kopi OBJECTS_DIR = _obj/ MOC_DIR = _moc @@ -36,12 +36,23 @@ LIBS += ../bin/microkabc.lib LIBS += ../libical/lib/ical.lib LIBS += ../libical/lib/icalss.lib #LIBS += atls.lib -LIBS += mfc71u.lib QMAKE_LINK += /NODEFAULTLIB:LIBC #QMAKE_LINK += /NODEFAULTLIB:MSVCRT #QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib OBJECTS_DIR = obj/win MOC_DIR = moc/win +#olimport section +#blabla: { +LIBS += mfc71u.lib +DEFINES += _OL_IMPORT_ + +HEADERS += ../outport/msoutl9.h \ + koimportoldialog.h +SOURCES += ../outport/msoutl9.cpp \ + koimportoldialog.cpp +#} +#olimport section end + } @@ -50,7 +61,7 @@ INTERFACES = kofilterview_base.ui # kdateedit.h \ -HEADERS = \ +HEADERS += \ filteredit_base.h \ alarmclient.h \ calendarview.h \ @@ -113,7 +124,7 @@ HEADERS = \ ../kalarmd/alarmdialog.h \ -SOURCES = \ +SOURCES += \ filteredit_base.cpp \ calendarview.cpp \ datenavigator.cpp \ @@ -178,16 +189,3 @@ INTERFACES += calprintdayconfig_base.ui \ calprintweekconfig_base.ui SOURCES += calprintbase.cpp calprinter.cpp calprintplugins.cpp cellitem.cpp - - -win32: { -HEADERS += ../outport/msoutl9.h \ - koimportoldialog.h - - -SOURCES += ../outport/msoutl9.cpp \ - koimportoldialog.cpp - - -} - diff --git a/korganizer/main.cpp b/korganizer/main.cpp index 2481ca4..4b207d9 100644 --- a/korganizer/main.cpp +++ b/korganizer/main.cpp @@ -11,6 +11,7 @@ #include <qwindowsstyle.h> #include <qplatinumstyle.h> #include <qsgistyle.h> +#include <stdlib.h> #endif #include <qtextcodec.h> @@ -29,22 +30,22 @@ int main( int argc, char **argv ) #else QApplication a( argc, argv ); QApplication::setStyle( new QPlatinumStyle ()); - QString hdir = QDir::homeDirPath(); - // there is a bug when creating dirs for WIN 98 - // it is difficult to fix, because we have no WIN 98 runnung - // such that we try it to create the dirs at startup here - if ( hdir == "C:\\" ) { // win 98 or ME - QDir app_dir; - if ( !app_dir.exists("C:\\kdepim") ) - app_dir.mkdir ("C:\\kdepim"); - if ( !app_dir.exists("C:\\kdepim\\apps") ) - app_dir.mkdir ("C:\\kdepim\\apps"); - if ( !app_dir.exists("C:\\kdepim\\config") ) - app_dir.mkdir ("C:\\kdepim\\config"); - if ( !app_dir.exists("C:\\kdepim\\apps\\korganizer") ) - app_dir.mkdir ("C:\\kdepim\\apps\\korganizer"); +#ifdef _WIN32_ + QString hdir ( getenv( "HOME") ); + if ( hdir.isEmpty() ) { + QString hd ("C:/" ); + //QMessageBox::information(0,"hh",QDir::homeDirPath()+" xx" +hd ); + if ( QDir::homeDirPath().lower() == hd.lower() ) { + _putenv( "HOME=C:"); + //QMessageBox::information(0,"hh",QString ( getenv( "HOME") ) ); + } + } else { + QDir app_dir; + if ( !app_dir.exists(hdir) ) + app_dir.mkdir (hdir); } #endif +#endif bool exitHelp = false; if ( argc > 1 ) { QString command = argv[1]; diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 7b07a2e..26ea1e2 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -66,8 +66,10 @@ using namespace KCal; #ifndef _WIN32_ #include <unistd.h> #else +#ifdef _OL_IMPORT_ #include "koimportoldialog.h" #endif +#endif #include "mainwindow.h" class KOex2phonePrefs : public QDialog @@ -778,7 +780,7 @@ void MainWindow::initActions() action->addTo( importMenu ); connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) ); #else -#ifdef _WIN32_ +#ifdef _OL_IMPORT_ importMenu->insertSeparator(); action = new QAction( "import_ol", i18n("Import from OL"), 0, this ); @@ -1367,8 +1369,8 @@ void MainWindow::enableIncidenceActions( bool enabled ) } void MainWindow::importOL() -{ -#ifdef _WIN32_ +{ +#ifdef _OL_IMPORT_ KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this ); id->exec(); delete id; |