summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp11
-rw-r--r--kaddressbook/kaddressbook.pro31
-rw-r--r--kaddressbook/mainembedded.cpp30
-rw-r--r--kdepim-desktop.pro2
-rw-r--r--korganizer/koprefsdialog.cpp2
-rw-r--r--korganizer/korganizer.pro32
-rw-r--r--korganizer/main.cpp29
-rw-r--r--korganizer/mainwindow.cpp8
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
@@ -157,4 +157,5 @@ $Id$
#ifdef _WIN32_
-
+#ifdef _OL_IMPORT_
#include "kaimportoldialog.h"
+#endif
#else
@@ -1293,3 +1294,3 @@ void KABCore::importFromOL()
{
-#ifdef _WIN32_
+#ifdef _OL_IMPORT_
KAImportOLdialog* idgl = new KAImportOLdialog( i18n("Import Contacts from OL"), mAddressBook, this );
@@ -2168,3 +2169,3 @@ void KABCore::addActionsManually()
#endif
-#if 0
+#if 0
// PENDING fix MailVCard
@@ -2180,3 +2181,3 @@ void KABCore::addActionsManually()
mActionQuit->plug( fileMenu );
-#ifdef _WIN32_
+#ifdef _OL_IMPORT_
mActionImportOL->plug( ImportMenu );
@@ -2223,4 +2224,4 @@ void KABCore::addActionsManually()
if ( Ir::supported() ) mActionBR->plug(settingsMenu );
-#endif
settingsMenu->insertSeparator();
+#endif
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro
index fbbc026..e73de06 100644
--- a/kaddressbook/kaddressbook.pro
+++ b/kaddressbook/kaddressbook.pro
@@ -30,12 +30,15 @@ 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 = \
@@ -44,3 +47,3 @@ INTERFACES = \
-HEADERS = \
+HEADERS += \
features/mergewidget.h \
@@ -110,3 +113,3 @@ xxport/sharpdtm_xxport.h \
-SOURCES = \
+SOURCES += \
addresseeeditordialog.cpp \
@@ -174,11 +177 @@ xxport/sharpdtm_xxport.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
@@ -9,2 +9,4 @@
#include <qmainwindow.h>
+#include <qmessagebox.h>
+#include <stdlib.h>
#endif
@@ -30,18 +32,18 @@ int main( int argc, char **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
diff --git a/kdepim-desktop.pro b/kdepim-desktop.pro
index b0d60b7..da3a966 100644
--- a/kdepim-desktop.pro
+++ b/kdepim-desktop.pro
@@ -3,3 +3,3 @@
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:{
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 8aa24ee..ea73fd0 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -96,4 +96,6 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
+#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,3 +1,3 @@
TEMPLATE = app
-CONFIG = qt warn_on
+CONFIG += qt warn_off
TARGET = kopi
@@ -38,3 +38,2 @@ LIBS += ../libical/lib/icalss.lib
#LIBS += atls.lib
-LIBS += mfc71u.lib
QMAKE_LINK += /NODEFAULTLIB:LIBC
@@ -44,2 +43,14 @@ 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
+
}
@@ -52,3 +63,3 @@ INTERFACES = kofilterview_base.ui
-HEADERS = \
+HEADERS += \
filteredit_base.h \
@@ -115,3 +126,3 @@ HEADERS = \
-SOURCES = \
+SOURCES += \
filteredit_base.cpp \
@@ -180,14 +191 @@ 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
@@ -13,2 +13,3 @@
#include <qsgistyle.h>
+#include <stdlib.h>
#endif
@@ -31,18 +32,18 @@ int main( int argc, char **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;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 7b07a2e..26ea1e2 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -68,4 +68,6 @@ using namespace KCal;
#else
+#ifdef _OL_IMPORT_
#include "koimportoldialog.h"
#endif
+#endif
#include "mainwindow.h"
@@ -780,3 +782,3 @@ void MainWindow::initActions()
#else
-#ifdef _WIN32_
+#ifdef _OL_IMPORT_
importMenu->insertSeparator();
@@ -1369,4 +1371,4 @@ 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 );