author | zautrix <zautrix> | 2005-01-25 15:12:21 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-25 15:12:21 (UTC) |
commit | fe4e6e85abc2ec90cc80108fc7434899b6e13048 (patch) (unidiff) | |
tree | 9a3cf83ecf8796d0020076e4e8e275d193fb2584 | |
parent | 165d969ce6ac38c5e3d7b5c629af0b00d0fff017 (diff) | |
download | kdepimpi-fe4e6e85abc2ec90cc80108fc7434899b6e13048.zip kdepimpi-fe4e6e85abc2ec90cc80108fc7434899b6e13048.tar.gz kdepimpi-fe4e6e85abc2ec90cc80108fc7434899b6e13048.tar.bz2 |
small fixes
-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 | |||
@@ -156,6 +156,7 @@ $Id$ | |||
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> |
@@ -1292,5 +1293,5 @@ void KABCore::importVCard( const KURL &url, bool showPreview ) | |||
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(); |
@@ -2167,5 +2168,5 @@ void KABCore::addActionsManually() | |||
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(); |
@@ -2179,5 +2180,5 @@ void KABCore::addActionsManually() | |||
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 |
@@ -2222,6 +2223,6 @@ void KABCore::addActionsManually() | |||
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 ); |
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro index fbbc026..e73de06 100644 --- a/kaddressbook/kaddressbook.pro +++ b/kaddressbook/kaddressbook.pro | |||
@@ -29,19 +29,22 @@ 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 \ |
@@ -109,5 +112,5 @@ xxport/sharpdtm_xxport.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 \ |
@@ -173,12 +176,2 @@ xxport/sharpdtm_xxport.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 | |||
@@ -8,4 +8,6 @@ | |||
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 | ||
@@ -29,20 +31,20 @@ int main( int argc, char **argv ) | |||
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; |
diff --git a/kdepim-desktop.pro b/kdepim-desktop.pro index b0d60b7..da3a966 100644 --- a/kdepim-desktop.pro +++ b/kdepim-desktop.pro | |||
@@ -2,5 +2,5 @@ | |||
2 | 2 | ||
3 | TEMPLATE = subdirs | 3 | TEMPLATE = subdirs |
4 | 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 | 4 | SUBDIRS = libical libkcal kabc libkdepim microkde korganizer kaddressbook kabc/plugins/file kabc/plugins/dir kabc/plugins/qtopia gammu/emb/common gammu/emb/gammu |
5 | unix:{ | 5 | unix:{ |
6 | SUBDIRS += kmicromail/libetpan kmicromail/libmailwrapper kmicromail pwmanager/libcrypt/cipher pwmanager/libcrypt/error pwmanager/libcrypt/mpi pwmanager/libcrypt/zlib pwmanager/pwmanager | 6 | 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 | |||
@@ -95,6 +95,8 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : | |||
95 | //setupGroupAutomationTab(); | 95 | //setupGroupAutomationTab(); |
96 | 96 | ||
97 | #ifndef DESKTOP_VERSION | ||
97 | if ( QApplication::desktop()->height() == 480 ) | 98 | if ( QApplication::desktop()->height() == 480 ) |
98 | hideButtons(); | 99 | hideButtons(); |
100 | #endif | ||
99 | } | 101 | } |
100 | 102 | ||
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro index c2602b2..4d67dca 100644 --- a/korganizer/korganizer.pro +++ b/korganizer/korganizer.pro | |||
@@ -1,4 +1,4 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | CONFIG = qt warn_on | 2 | CONFIG += qt warn_off |
3 | TARGET = kopi | 3 | TARGET = kopi |
4 | OBJECTS_DIR = _obj/ | 4 | OBJECTS_DIR = _obj/ |
@@ -37,5 +37,4 @@ LIBS += ../libical/lib/ical.lib | |||
37 | LIBS += ../libical/lib/icalss.lib | 37 | LIBS += ../libical/lib/icalss.lib |
38 | #LIBS += atls.lib | 38 | #LIBS += atls.lib |
39 | LIBS += mfc71u.lib | ||
40 | QMAKE_LINK += /NODEFAULTLIB:LIBC | 39 | QMAKE_LINK += /NODEFAULTLIB:LIBC |
41 | #QMAKE_LINK += /NODEFAULTLIB:MSVCRT | 40 | #QMAKE_LINK += /NODEFAULTLIB:MSVCRT |
@@ -43,4 +42,16 @@ QMAKE_LINK += /NODEFAULTLIB:LIBC | |||
43 | OBJECTS_DIR = obj/win | 42 | OBJECTS_DIR = obj/win |
44 | MOC_DIR = moc/win | 43 | MOC_DIR = moc/win |
44 | #olimport section | ||
45 | #blabla: { | ||
46 | LIBS += mfc71u.lib | ||
47 | DEFINES += _OL_IMPORT_ | ||
48 | |||
49 | HEADERS += ../outport/msoutl9.h \ | ||
50 | koimportoldialog.h | ||
51 | SOURCES += ../outport/msoutl9.cpp \ | ||
52 | koimportoldialog.cpp | ||
53 | #} | ||
54 | #olimport section end | ||
55 | |||
45 | } | 56 | } |
46 | 57 | ||
@@ -51,5 +62,5 @@ INTERFACES = kofilterview_base.ui | |||
51 | # kdateedit.h \ | 62 | # kdateedit.h \ |
52 | 63 | ||
53 | HEADERS = \ | 64 | HEADERS += \ |
54 | filteredit_base.h \ | 65 | filteredit_base.h \ |
55 | alarmclient.h \ | 66 | alarmclient.h \ |
@@ -114,5 +125,5 @@ HEADERS = \ | |||
114 | 125 | ||
115 | 126 | ||
116 | SOURCES = \ | 127 | SOURCES += \ |
117 | filteredit_base.cpp \ | 128 | filteredit_base.cpp \ |
118 | calendarview.cpp \ | 129 | calendarview.cpp \ |
@@ -179,15 +190,2 @@ INTERFACES += calprintdayconfig_base.ui \ | |||
179 | SOURCES += calprintbase.cpp calprinter.cpp calprintplugins.cpp cellitem.cpp | 190 | SOURCES += calprintbase.cpp calprinter.cpp calprintplugins.cpp cellitem.cpp |
180 | 191 | ||
181 | |||
182 | |||
183 | win32: { | ||
184 | HEADERS += ../outport/msoutl9.h \ | ||
185 | koimportoldialog.h | ||
186 | |||
187 | |||
188 | SOURCES += ../outport/msoutl9.cpp \ | ||
189 | koimportoldialog.cpp | ||
190 | |||
191 | |||
192 | } | ||
193 | |||
diff --git a/korganizer/main.cpp b/korganizer/main.cpp index 2481ca4..4b207d9 100644 --- a/korganizer/main.cpp +++ b/korganizer/main.cpp | |||
@@ -12,4 +12,5 @@ | |||
12 | #include <qplatinumstyle.h> | 12 | #include <qplatinumstyle.h> |
13 | #include <qsgistyle.h> | 13 | #include <qsgistyle.h> |
14 | #include <stdlib.h> | ||
14 | #endif | 15 | #endif |
15 | #include <qtextcodec.h> | 16 | #include <qtextcodec.h> |
@@ -30,20 +31,20 @@ int main( int argc, char **argv ) | |||
30 | QApplication a( argc, argv ); | 31 | QApplication a( argc, argv ); |
31 | QApplication::setStyle( new QPlatinumStyle ()); | 32 | QApplication::setStyle( new QPlatinumStyle ()); |
32 | QString hdir = QDir::homeDirPath(); | 33 | #ifdef _WIN32_ |
33 | // there is a bug when creating dirs for WIN 98 | 34 | QString hdir ( getenv( "HOME") ); |
34 | // it is difficult to fix, because we have no WIN 98 runnung | 35 | if ( hdir.isEmpty() ) { |
35 | // such that we try it to create the dirs at startup here | 36 | QString hd ("C:/" ); |
36 | if ( hdir == "C:\\" ) { // win 98 or ME | 37 | //QMessageBox::information(0,"hh",QDir::homeDirPath()+" xx" +hd ); |
37 | QDir app_dir; | 38 | if ( QDir::homeDirPath().lower() == hd.lower() ) { |
38 | if ( !app_dir.exists("C:\\kdepim") ) | 39 | _putenv( "HOME=C:"); |
39 | app_dir.mkdir ("C:\\kdepim"); | 40 | //QMessageBox::information(0,"hh",QString ( getenv( "HOME") ) ); |
40 | if ( !app_dir.exists("C:\\kdepim\\apps") ) | 41 | } |
41 | app_dir.mkdir ("C:\\kdepim\\apps"); | 42 | } else { |
42 | if ( !app_dir.exists("C:\\kdepim\\config") ) | 43 | QDir app_dir; |
43 | app_dir.mkdir ("C:\\kdepim\\config"); | 44 | if ( !app_dir.exists(hdir) ) |
44 | if ( !app_dir.exists("C:\\kdepim\\apps\\korganizer") ) | 45 | app_dir.mkdir (hdir); |
45 | app_dir.mkdir ("C:\\kdepim\\apps\\korganizer"); | ||
46 | } | 46 | } |
47 | #endif | 47 | #endif |
48 | #endif | ||
48 | bool exitHelp = false; | 49 | bool exitHelp = false; |
49 | if ( argc > 1 ) { | 50 | if ( argc > 1 ) { |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 7b07a2e..26ea1e2 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -67,6 +67,8 @@ using namespace KCal; | |||
67 | #include <unistd.h> | 67 | #include <unistd.h> |
68 | #else | 68 | #else |
69 | #ifdef _OL_IMPORT_ | ||
69 | #include "koimportoldialog.h" | 70 | #include "koimportoldialog.h" |
70 | #endif | 71 | #endif |
72 | #endif | ||
71 | #include "mainwindow.h" | 73 | #include "mainwindow.h" |
72 | 74 | ||
@@ -779,5 +781,5 @@ void MainWindow::initActions() | |||
779 | connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) ); | 781 | connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) ); |
780 | #else | 782 | #else |
781 | #ifdef _WIN32_ | 783 | #ifdef _OL_IMPORT_ |
782 | importMenu->insertSeparator(); | 784 | importMenu->insertSeparator(); |
783 | action = new QAction( "import_ol", i18n("Import from OL"), 0, | 785 | action = new QAction( "import_ol", i18n("Import from OL"), 0, |
@@ -1368,6 +1370,6 @@ void MainWindow::enableIncidenceActions( bool enabled ) | |||
1368 | 1370 | ||
1369 | void MainWindow::importOL() | 1371 | void MainWindow::importOL() |
1370 | { | 1372 | { |
1371 | #ifdef _WIN32_ | 1373 | #ifdef _OL_IMPORT_ |
1372 | KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this ); | 1374 | KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this ); |
1373 | id->exec(); | 1375 | id->exec(); |