summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp9
-rw-r--r--kaddressbook/kaddressbook.pro31
-rw-r--r--kaddressbook/mainembedded.cpp28
-rw-r--r--kdepim-desktop.pro2
-rw-r--r--korganizer/koprefsdialog.cpp2
-rw-r--r--korganizer/korganizer.pro32
-rw-r--r--korganizer/main.cpp27
-rw-r--r--korganizer/mainwindow.cpp6
8 files changed, 68 insertions, 69 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$
#include "extensionmanager.h"
#include "addresseeconfig.h"
#include "nameeditdialog.h"
#include <kcmultidialog.h>
#ifdef _WIN32_
-
+#ifdef _OL_IMPORT_
#include "kaimportoldialog.h"
+#endif
#else
#include <unistd.h>
#endif
// sync includes
#include <libkdepim/ksyncprofile.h>
#include <libkdepim/ksyncprefsdialog.h>
@@ -1288,13 +1289,13 @@ void KABCore::addEmail( QString aStr )
void KABCore::importVCard( const KURL &url, bool showPreview )
{
mXXPortManager->importVCard( url, 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();
if ( list.count() > 0 ) {
KABC::Addressee::List listNew;
KABC::Addressee::List listExisting;
@@ -2175,13 +2176,13 @@ void KABCore::addActionsManually()
if ( Ir::supported() ) mActionBR->plug( beamMenu );
if ( Ir::supported() ) mActionBeamVCard->plug( beamMenu );
if ( Ir::supported() ) mActionBeam->plug( beamMenu );
#endif
fileMenu->insertSeparator();
mActionQuit->plug( fileMenu );
-#ifdef _WIN32_
+#ifdef _OL_IMPORT_
mActionImportOL->plug( ImportMenu );
#endif
// edit menu
mActionUndo->plug( editMenu );
mActionRedo->plug( editMenu );
editMenu->insertSeparator();
@@ -2218,14 +2219,14 @@ void KABCore::addActionsManually()
mActionDetails->plug( settingsMenu );
//if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop )
mActionDetails->plug( tb );
settingsMenu->insertSeparator();
#ifndef DESKTOP_VERSION
if ( Ir::supported() ) mActionBR->plug(settingsMenu );
-#endif
settingsMenu->insertSeparator();
+#endif
mActionWhoAmI->plug( settingsMenu );
mActionEditCategories->plug( settingsMenu );
mActionEditCategories->plug( changeMenu );
mActionCategories->plug( changeMenu );
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
LIBS += ../bin/microkcal.lib
LIBS += ../bin/microkde.lib
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 \
kcmconfigs/extensionconfigdialog.h \
kcmconfigs/kcmkabconfig.h \
kcmconfigs/kabconfigwidget.h \
@@ -105,13 +108,13 @@ xxport/sharpdtm_xxport.h \
#mainwindoiw.h \
# alarmclient.h \
# calendarview.h \
# customlistviewitem.h \
# datenavigator.h
-SOURCES = \
+SOURCES += \
addresseeeditordialog.cpp \
addresseeeditorwidget.cpp \
addresseditwidget.cpp \
addresseeconfig.cpp \
addresseeutil.cpp \
extensionmanager.cpp \
@@ -169,16 +172,6 @@ xxport/qtopia_xxport.cpp \
xxport/sharpdtm_xxport.cpp \
#details/look_details.cpp \
#mainwindow.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
@@ -4,12 +4,14 @@
#include <stdlib.h>
#else
#include <qapplication.h>
#include <qwindowsstyle.h>
#include <qplatinumstyle.h>
#include <qmainwindow.h>
+#include <qmessagebox.h>
+#include <stdlib.h>
#endif
#include <qtextcodec.h>
#include <kstandarddirs.h>
#include <qregexp.h>
#include <kglobal.h>
@@ -25,28 +27,28 @@ int main( int argc, char **argv )
#ifndef DESKTOP_VERSION
QPEApplication a( argc, argv );
a.setKeepRunning ();
#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
+#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("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");
+ if ( !app_dir.exists(hdir) )
+ app_dir.mkdir (hdir);
}
#endif
+#endif
bool exitHelp = false;
if ( argc > 1 ) {
QString command = argv[1];
if ( command == "-help" ){
printf("KA/E command line commands:\n");
diff --git a/kdepim-desktop.pro b/kdepim-desktop.pro
index b0d60b7..da3a966 100644
--- a/kdepim-desktop.pro
+++ b/kdepim-desktop.pro
@@ -1,8 +1,8 @@
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
@@ -91,14 +91,16 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
//setupSyncTab();
//setupSyncAlgTab();
//setupPrinterTab();
//setupGroupSchedulingTab();
//setupGroupAutomationTab();
+#ifndef DESKTOP_VERSION
if ( QApplication::desktop()->height() == 480 )
hideButtons();
+#endif
}
KOPrefsDialog::~KOPrefsDialog()
{
}
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index c2602b2..4d67dca 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -1,8 +1,8 @@
TEMPLATE = app
-CONFIG = qt warn_on
+CONFIG += qt warn_off
TARGET = kopi
OBJECTS_DIR = _obj/
MOC_DIR = _moc
DESTDIR= ../bin
include( ../variables.pri )
@@ -33,27 +33,38 @@ LIBS += ../bin/microkdepim.lib
LIBS += ../bin/microkcal.lib
LIBS += ../bin/microkde.lib
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
+
}
INTERFACES = kofilterview_base.ui
#filteredit_base.ui
# kdateedit.h \
-HEADERS = \
+HEADERS += \
filteredit_base.h \
alarmclient.h \
calendarview.h \
customlistviewitem.h \
datenavigator.h \
docprefs.h \
@@ -110,13 +121,13 @@ HEADERS = \
timeline.h \
timespanview.h \
version.h \
../kalarmd/alarmdialog.h \
-SOURCES = \
+SOURCES += \
filteredit_base.cpp \
calendarview.cpp \
datenavigator.cpp \
docprefs.cpp \
filtereditdialog.cpp \
incomingdialog.cpp \
@@ -175,19 +186,6 @@ HEADERS += calprintbase.h calprinter.h calprintplugins.h cellitem.h
INTERFACES += calprintdayconfig_base.ui \
calprintmonthconfig_base.ui \
calprinttodoconfig_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
@@ -8,12 +8,13 @@
#else
#include <qapplication.h>
#include <qstring.h>
#include <qwindowsstyle.h>
#include <qplatinumstyle.h>
#include <qsgistyle.h>
+#include <stdlib.h>
#endif
#include <qtextcodec.h>
#include <qdir.h>
#include <kstandarddirs.h>
#include <kglobal.h>
@@ -26,28 +27,28 @@ int main( int argc, char **argv )
#ifndef DESKTOP_VERSION
QPEApplication a( argc, argv );
a.setKeepRunning ();
#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
+#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("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");
+ if ( !app_dir.exists(hdir) )
+ app_dir.mkdir (hdir);
}
#endif
+#endif
bool exitHelp = false;
if ( argc > 1 ) {
QString command = argv[1];
if ( command == "-help" ){
printf("KO/Pi command line commands:\n");
printf(" no command: Start KO/Pi in usual way\n");
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 7b07a2e..26ea1e2 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -63,14 +63,16 @@
#include "externalapphandler.h"
using namespace KCal;
#ifndef _WIN32_
#include <unistd.h>
#else
+#ifdef _OL_IMPORT_
#include "koimportoldialog.h"
#endif
+#endif
#include "mainwindow.h"
class KOex2phonePrefs : public QDialog
{
public:
KOex2phonePrefs( QWidget *parent=0, const char *name=0 ) :
@@ -775,13 +777,13 @@ void MainWindow::initActions()
importMenu->insertSeparator();
action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0,
this );
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 );
action->addTo( importMenu );
connect( action, SIGNAL( activated() ), SLOT( importOL() ) );
#endif
@@ -1365,13 +1367,13 @@ void MainWindow::enableIncidenceActions( bool enabled )
mBeamAction->setEnabled( enabled );
mCancelAction->setEnabled( 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;
mView->updateView();
#endif
}