author | zautrix <zautrix> | 2005-05-24 22:30:39 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-05-24 22:30:39 (UTC) |
commit | c0ca8beceaa7a366a2d74a82504cad19f4ccd642 (patch) (side-by-side diff) | |
tree | 80d7934f39d856801c2491d735455cea1b119e8b | |
parent | a3a535e57c53071eb15aa034472d402d619ca84d (diff) | |
download | kdepimpi-c0ca8beceaa7a366a2d74a82504cad19f4ccd642.zip kdepimpi-c0ca8beceaa7a366a2d74a82504cad19f4ccd642.tar.gz kdepimpi-c0ca8beceaa7a366a2d74a82504cad19f4ccd642.tar.bz2 |
todo fix
-rw-r--r-- | gammu/emb/gammu/gammu.pro | 5 | ||||
-rw-r--r-- | kaddressbook/kaddressbook.pro | 6 | ||||
-rw-r--r-- | korganizer/calendarview.cpp | 6 | ||||
-rw-r--r-- | korganizer/korganizer.pro | 10 | ||||
-rw-r--r-- | korganizer/kotodoview.h | 1 | ||||
-rw-r--r-- | korganizer/koviewmanager.cpp | 5 |
6 files changed, 25 insertions, 8 deletions
diff --git a/gammu/emb/gammu/gammu.pro b/gammu/emb/gammu/gammu.pro index 55bfdec..c8aa3f0 100644 --- a/gammu/emb/gammu/gammu.pro +++ b/gammu/emb/gammu/gammu.pro @@ -1,64 +1,65 @@ ###################################################################### # Automatically generated by qmake (1.07a) Fri Jul 30 22:22:02 2004 ###################################################################### TEMPLATE = app DEPENDPATH += msvc06.mak \ msvc2003.mak \ smsd \ depend/nokia \ depend/siemens \ depend/nokia/dct3trac INCLUDEPATH += . smsd depend/nokia depend/nokia/dct3trac depend/siemens -CONFIG = warn_off release console +CONFIG += warn_off console # Input +include( ../../../variables.pri ) HEADERS += gammu.h \ sniff.h \ smsd/s_files.h \ smsd/s_mysql.h \ smsd/smsdcore.h \ depend/nokia/dct3.h \ depend/nokia/dct4.h \ depend/siemens/chiffre.h \ depend/siemens/dsiemens.h \ depend/nokia/dct3trac/type-cc.h \ depend/nokia/dct3trac/type-mm.h \ depend/nokia/dct3trac/type-rr.h \ depend/nokia/dct3trac/type-sms.h \ depend/nokia/dct3trac/type-ss.h \ depend/nokia/dct3trac/wmx-gsm.h \ depend/nokia/dct3trac/wmx-list.h \ depend/nokia/dct3trac/wmx-sim.h \ depend/nokia/dct3trac/wmx-util.h \ depend/nokia/dct3trac/wmx.h SOURCES += gammu.c \ sniff.c \ smsd/s_files.c \ smsd/smsdcore.c \ depend/nokia/dct3.c \ depend/nokia/dct4.c \ depend/siemens/chiffre.c \ depend/siemens/dsiemens.c \ depend/nokia/dct3trac/wmx-gsm.c \ depend/nokia/dct3trac/wmx-list.c \ depend/nokia/dct3trac/wmx-sim.c \ depend/nokia/dct3trac/wmx-util.c \ depend/nokia/dct3trac/wmx.c unix : { LIBS += ../../../bin/libmicrogammu.so /usr/lib/libpthread.so # bluetooth disabled for now #/usr/lib/libbluetooth.so /usr/lib/libsdp.so OBJECTS_DIR = obj/unix } win32 : { -CONFIG = qt warn_on +CONFIG += qt warn_on #LIBS += mfc71u.lib LIBS += libc.lib #LIBS += msvcrt.lib QMAKE_LINK += /NODEFAULTLIB:msvcrt LIBS += ../../../bin/microgammu.lib OBJECTS_DIR = obj/win } DESTDIR = ../../../bin TARGET = kammu diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro index 7203eb3..f9d22d5 100644 --- a/kaddressbook/kaddressbook.pro +++ b/kaddressbook/kaddressbook.pro @@ -30,50 +30,54 @@ LIBS += ../libical/lib/libical.a LIBS += ../libical/lib/libicalss.a } else { LIBS += ../bin/libmicrokdepim.so LIBS += ../bin/libmicrokde.so LIBS += ../bin/libmicrokabc.so LIBS += ../bin/libmicrokcal.so #LIBS += -lldap } OBJECTS_DIR = obj/unix MOC_DIR = moc/unix } win32: { RC_FILE = winicons.rc DEFINES += _WIN32_ 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: { - +debug: { +LIBS += mfc71ud.lib +} +release: { 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 += \ features/mergewidget.h \ features/distributionlistwidget.h \ kcmconfigs/addresseewidget.h \ kcmconfigs/extensionconfigdialog.h \ kcmconfigs/kcmkabconfig.h \ kcmconfigs/kabconfigwidget.h \ addresseeeditordialog.h \ addresseeeditorwidget.h \ addresseditwidget.h \ addresseeconfig.h \ diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 904bbe2..a8ad467 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -1637,50 +1637,52 @@ bool CalendarView::importQtopia( const QString &categories, void CalendarView::setSyncEventsReadOnly() { Event * ev; QPtrList<Event> eL = mCalendar->rawEvents(); ev = eL.first(); while ( ev ) { if ( ev->uid().left(15) == QString("last-syncEvent-") ) ev->setReadOnly( true ); ev = eL.next(); } } bool CalendarView::openCalendar(QString filename, bool merge) { if (filename.isEmpty()) { return false; } if (!QFile::exists(filename)) { KMessageBox::error(this,i18n("File does not exist:\n '%1'.").arg(filename)); return false; } globalFlagBlockAgenda = 1; - if (!merge) mCalendar->close(); - + if (!merge) { + mCalendar->close(); + mTodoList->clearList(); + } mStorage->setFileName( filename ); if ( mStorage->load() ) { if ( merge ) ;//setModified( true ); else { //setModified( true ); mViewManager->setDocumentId( filename ); mDialogManager->setDocumentId( filename ); mTodoList->setDocumentId( filename ); } globalFlagBlockAgenda = 2; // if ( getLastSyncEvent() ) // getLastSyncEvent()->setReadOnly( true ); mCalendar->reInitAlarmSettings(); setSyncEventsReadOnly(); updateUnmanagedViews(); updateView(); if ( filename != MainWindow::defaultFileName() ) { saveCalendar( MainWindow::defaultFileName() ); } else { QFileInfo finf ( MainWindow::defaultFileName()); if ( finf.exists() ) { setLoadedFileVersion( finf.lastModified () ); } diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro index d88c300..32ad10a 100644 --- a/korganizer/korganizer.pro +++ b/korganizer/korganizer.pro @@ -35,59 +35,65 @@ LIBS += ../libical/lib/libicalss.a } else { LIBS += ../bin/libmicrokdepim.so LIBS += ../bin/libmicrokcal.so LIBS += ../bin/libmicrokde.so LIBS += ../bin/libmicrokabc.so #LIBS += -lbluetooth #LIBS += -lsdp #LIBS += -lldap } OBJECTS_DIR = obj/unix MOC_DIR = moc/unix } win32: { RC_FILE = winicons.rc DEFINES += _WIN32_ 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 QMAKE_LINK += /NODEFAULTLIB:LIBC -#QMAKE_LINK += /NODEFAULTLIB:MSVCRT -#QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib +QMAKE_LINK += /NODEFAULTLIB:MSVCRT +QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib OBJECTS_DIR = obj/win MOC_DIR = moc/win #olimport section #blabla: { +debug: { +LIBS += mfc71ud.lib +} +release: { 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 += datenavigatorcontainer.h \ filteredit_base.h \ alarmclient.h \ calendarview.h \ customlistviewitem.h \ datenavigator.h \ docprefs.h \ filtereditdialog.h \ incomingdialog.h \ incomingdialog_base.h \ interfaces/korganizer/baseview.h \ diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h index d368513..1ffc34a 100644 --- a/korganizer/kotodoview.h +++ b/korganizer/kotodoview.h @@ -118,48 +118,49 @@ class KOTodoView : public KOrg::BaseView public: KOTodoView(Calendar *, QWidget* parent=0, const char* name=0 ); ~KOTodoView(); QPtrList<Incidence> selectedIncidences(); QPtrList<Todo> selectedTodos(); DateList selectedDates() {DateList q; return q;} /** Return number of shown dates. TodoView does not show dates, */ int currentDateCount() { return 0; } void printPreview(CalPrinter *calPrinter, const QDate &fd, const QDate &td); void setDocumentId( const QString & ); void saveLayout(KConfig *config, const QString &group) const; void restoreLayout(KConfig *config, const QString &group); /** Create a popup menu to set categories */ QPopupMenu *getCategoryPopupMenu (KOTodoViewItem *todoItem); void setNavigator( DateNavigator* nav ) {mNavigator = nav;} QString getWhatsThisText(QPoint p); + void clearList() {mTodoListView->clear(); } public slots: void updateView(); void updateConfig(); void changeEventDisplay(Event *, int); void showDates(const QDate &start, const QDate &end); void showEvents(QPtrList<Event> eventList); void clearSelection(); void jumpToDate (); void editItem(QListViewItem *item); void showItem(QListViewItem *item,const QPoint &,int); void popupMenu(QListViewItem *item,const QPoint &,int); void newTodo(); void newSubTodo(); void unparentTodo(); void reparentTodo(); void showTodo(); void editTodo(); void cloneTodo(); void cancelTodo(); diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 2e5a943..fb4de37 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -810,26 +810,29 @@ Incidence *KOViewManager::currentSelection() return mCurrentView->selectedIncidences().first(); } QDate KOViewManager::currentSelectionDate() { QDate qd; if (mCurrentView) { DateList qvl = mCurrentView->selectedDates(); if (!qvl.isEmpty()) qd = qvl.first(); } return qd; } void KOViewManager::addView(KOrg::BaseView *view) { #if QT_VERSION >= 0x030000 mMainView->viewStack()->addWidget( view ); #else mMainView->viewStack()->addWidget( view, 1 ); #endif } void KOViewManager::setDocumentId( const QString &id ) { - if (mTodoView) mTodoView->setDocumentId( id ); + if (mTodoView) { + mTodoView->clearList(); + mTodoView->setDocumentId( id ); + } } |