resolved merge conflict

12 files changed, 81 insertions, 42 deletions

diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 10a9b59..07d7164 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -191,8 +191,10 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
 #endif
 
 	qDebug("done t=%d", t.elapsed() );
 
+        connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) );
+        connect( qApp, SIGNAL( reload()), this, SLOT( reload() ) );
     /*
      *  Here is a problem description:
      *  When Weekview is the default view
      *  a DateBookWeekView get's created
@@ -401,8 +403,10 @@ void DateBook::viewMonth() {
 
 void DateBook::insertEvent( const Event &e )
 {
 	Event dupEvent=e;
+	if(!dupEvent.isValidUid() ) // tkcRom seems to be different
+	    dupEvent.assignUid();
 	dupEvent.setLocation(defaultLocation);
 	dupEvent.setCategories(defaultCategories);
 	db->addEvent(dupEvent);
 	emit newEvent();
@@ -451,8 +455,10 @@ void DateBook::duplicateEvent( const Event &e )
                  */
                 Event::RepeatPattern rp = newEv.repeatPattern();
                 rp.createTime = ::time( NULL );
                 newEv.setRepeat( TRUE, rp ); // has repeat and repeatPattern...
+		if( newEv.uid() == e.uid() || !newEv.isValidUid() )
+		    newEv.assignUid();
 
 		db->addEvent(newEv);
 		emit newEvent();
 		break;
diff --git a/core/pim/datebook/datebookweekheaderimpl.cpp b/core/pim/datebook/datebookweekheaderimpl.cpp
index 770410e..84b4f1b 100644
--- a/core/pim/datebook/datebookweekheaderimpl.cpp
+++ b/core/pim/datebook/datebookweekheaderimpl.cpp
@@ -100,20 +100,21 @@ void DateBookWeekHeader::setDate(const QDate &d) {
 	dayofweek=d.dayOfWeek();
 	if(bStartOnMonday) 
 	    dayofweek--;
 	else if( dayofweek == 7 )
-	    /* we already have the right day -7 would lead to the current week..*/
+	    // we already have the right day -7 would lead to the current week..
 	    dayofweek = 0;
 	    	    
 	date=date.addDays(-dayofweek);
 	calcWeek(date,week,year,bStartOnMonday);
 	QDate start=date;
 	QDate stop=start.addDays(6);
 	labelDate->setText( QString::number(start.day()) + "." +
-			start.monthName(start.month()) + "-" +
+			Calendar::nameOfMonth( start.month()) + "-" +
 			QString::number(stop.day()) + "." +
-			start.monthName(stop.month()) +" ("+
+			Calendar::nameOfMonth( stop.month()) +" ("+
 			tr("w")+":"+QString::number( week ) +")");
+	date = d; // bugfix: 0001126 - date has to be the selected date, not monday!
 	emit dateChanged(date);
 }
 
 void DateBookWeekHeader::setStartOfWeek( bool onMonday )
diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp
index aad1f3a..24fb0ba 100644
--- a/core/pim/datebook/datebookweeklst.cpp
+++ b/core/pim/datebook/datebookweeklst.cpp
@@ -1,31 +1,16 @@
 #include "datebookweeklst.h"
 
-#include "datebookweekheaderimpl.h"
 
 #include "datebook.h"
 
-#include <qpe/calendar.h>
-#include <qpe/datebookdb.h>
-#include <qpe/event.h>
-#include <qpe/qpeapplication.h>
-#include <qpe/timestring.h>
 #include <qpe/datebookmonth.h>
 #include <qpe/config.h>
 #include <qpe/resource.h>
+#include <qpe/calendar.h>
 
-#include <qdatetime.h>
-#include <qheader.h>
-#include <qlabel.h>
 #include <qlayout.h>
-#include <qpainter.h>
-#include <qpopupmenu.h>
-#include <qtimer.h>
-#include <qstyle.h>
 #include <qtoolbutton.h>
-#include <qvbox.h>
-#include <qsizepolicy.h>
-#include <qabstractlayout.h>
 #include <qtl.h>
 
 bool calcWeek(const QDate &d, int &week, int &year,bool startOnMonday = false);
 
@@ -72,12 +57,13 @@ void DateBookWeekLstHeader::setDate(const QDate &d) {
 	calcWeek(date,week,year,bStartOnMonday);
 	QDate start=date;
 	QDate stop=start.addDays(6);
 	labelDate->setText( QString::number(start.day()) + "." +
-			start.monthName(start.month()) + "-" +
+			Calendar::nameOfMonth( start.month() ) + "-" +
 			QString::number(stop.day()) + "." +
-			start.monthName(stop.month()) +" ("+
+                                                Calendar::nameOfMonth( stop.month()) +" ("+
 			tr("w")+":"+QString::number( week ) +")");
+	date = d; // bugfix: 0001126 - date has to be the selected date, not monday!
 	emit dateChanged(date);
 }
 
 void DateBookWeekLstHeader::pickDate() {
@@ -124,9 +110,11 @@ DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool /* onM */,
 
 	static const QString wdays=tr("MTWTFSSM",  "Week days");
 	char day=wdays[d.dayOfWeek()-1];
 
+    //dont use dayOfWeek() to save space !
 	label->setText( QString(QObject::tr(QString(QChar(day)))) + " " +QString::number(d.day()) );
+
 	add->setText("+");
 
 	if (d == QDate::currentDate()) {
 		QPalette pal=label->palette();
@@ -340,10 +328,25 @@ void DateBookWeekLst::redraw() {getEvents();}
 QDate DateBookWeekLst::date() {
 	return bdate;
 }
 
+// return the date at the beginning of the week...
+// copied from DateBookWeek
+QDate DateBookWeekLst::weekDate() const
+{
+	QDate d=bdate;
+
+	// Calculate offset to first day of week.
+	int dayoffset=d.dayOfWeek();
+	if(bStartOnMonday) dayoffset--;
+	else if( dayoffset == 7 )
+	    dayoffset = 0;
+
+	return d.addDays(-dayoffset);
+}
+
 void DateBookWeekLst::getEvents() {
-	QDate start = date();
+	QDate start = weekDate(); //date();
 	QDate stop = start.addDays(6);
 	QValueList<EffectiveEvent> el = db->getEffectiveEvents(start, stop);
 
 	if (view) delete view;
diff --git a/core/pim/datebook/datebookweeklst.h b/core/pim/datebook/datebookweeklst.h
index 0bfbcda..f683ce7 100644
--- a/core/pim/datebook/datebookweeklst.h
+++ b/core/pim/datebook/datebookweeklst.h
@@ -119,8 +119,9 @@ public:
     void setDate( int y, int w );
     void setDate(const QDate &d );
     int week() const { return _week; };
     QDate date();
+    QDate weekDate() const;
 
 public slots:
     void redraw();
     void dateChanged(QDate &date);
diff --git a/core/pim/osearch/datebooksearch.cpp b/core/pim/osearch/datebooksearch.cpp
index be2bf25..5da7ae9 100644
--- a/core/pim/osearch/datebooksearch.cpp
+++ b/core/pim/osearch/datebooksearch.cpp
@@ -75,9 +75,9 @@ void DatebookSearch::insertItem( void *rec )
 	if ( !actionSearchInDates->isOn() && (
 	      ev->lastHitField() == Qtopia::StartDateTime ||
  	      ev->lastHitField() == Qtopia::EndDateTime )
 	    ) return;
-	(void)new EventItem( this, ev );
+	new EventItem( this, ev );
 	_resultCount++;
 }
 
 QPopupMenu* DatebookSearch::popupMenu()
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index aa52061..f768d81 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -81,13 +81,13 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
   mainLayout->addWidget( buttonBox );
   detailsFrame->hide();
   buttonBox->hide();
 
-  searches.append( new AppLnkSearch( resultsList, tr("applications") ) );
-  searches.append( new DocLnkSearch( resultsList, tr("documents") ) );
-  searches.append( new TodoSearch( resultsList, tr("todo") ) );
-  searches.append( new DatebookSearch( resultsList, tr("datebook") ) );
-  searches.append( new AdressSearch( resultsList, tr("adressbook") ) );
+  searches.append( new AppLnkSearch( resultsList, tr("Applications") ) );
+  searches.append( new DocLnkSearch( resultsList, tr("Documents") ) );
+  searches.append( new TodoSearch( resultsList, tr("Todo List") ) );
+  searches.append( new DatebookSearch( resultsList, tr("Calendar") ) );
+  searches.append( new AdressSearch( resultsList, tr("Contacts") ) );
 
   setCentralWidget( mainFrame );
 
   popupTimer = new QTimer();
diff --git a/core/pim/osearch/mainwindow.h b/core/pim/osearch/mainwindow.h
index 1f5c4bb..75054f0 100644
--- a/core/pim/osearch/mainwindow.h
+++ b/core/pim/osearch/mainwindow.h
@@ -6,16 +6,21 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
-// (c) 2002 Patrick S. Vogt <tille@handhelds.org>
+// (c) 2002-2003 Patrick S. Vogt <tille@handhelds.org>
 
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
 #include <qmainwindow.h>
+#include <qdialog.h>
+#include <qaction.h>
 #include <qlist.h>
+
 #include <qmap.h>
+#include <qtimer.h>
+#include <qpopupmenu.h>
 
 class QAction;
 class QPEToolBar;
 class QHBox;
@@ -25,10 +30,13 @@ class QFrame;
 class OListView;
 class OListViewItem;
 class QListViewItem;
 class QPopupMenu;
-class QSignalMapper;
 class QTimer;
+
+class QSignalMapper;
+class QButton;
+
 class SearchGroup;
 
 class MainWindow : public QMainWindow
 {
@@ -37,9 +45,9 @@ class MainWindow : public QMainWindow
 
 public:
   MainWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
   ~MainWindow();
-
+  static QString appName() { return QString::fromLatin1("osearch"); }
 
 public slots:
   void setCurrent(QListViewItem*);
   void setSearch( const QString& );
diff --git a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
index b79c679..8863192 100644
--- a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
+++ b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
@@ -77,8 +77,14 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent,  const char*
     SpinDaysClip = new QSpinBox( box3, "SpinDays" );
     SpinDaysClip->setMaxValue( 200 );
     QWhatsThis::add( SpinDaysClip , tr( "How many days we should search forward" ) );
 
+//     QHBox *box4 = new QHBox( this );
+
+//     QLabel* colorLabel = new QLabel( box4, "" );
+//     colorLabel->setText( tr( "To activate settings: Restart application !" ) );
+
+
     QHBox *box5 = new QHBox( this );
     QLabel* colorLabel2 = new QLabel( box5, "" );
     colorLabel2->setText( tr( "Set Headline Color: " ) );
     headlineColor = new OColorButton( box5, black , "headlineColor" );
@@ -103,9 +109,9 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent,  const char*
     QWhatsThis::add( urgentColor , tr( "This urgent color will be used if we are close to the event !" ) );
     QWhatsThis::add( SpinUrgentClip , tr( "The urgent color will be used if the birthday/anniversary is closer than given days !" ) );
 
 
-    layout->addWidget( b_group );
+    //layout->addWidget( box4 );
     layout->addWidget( box1 );
     //    layout->addWidget( box2 );
     layout->addWidget( box3 );
     layout->addWidget( box5 );
diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
index dad09db..d47bc0b 100644
--- a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
+++ b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
@@ -115,8 +115,12 @@ void AddressBookPluginWidget::getAddress() {
 	if ( m_showBirthdays ){
 		qWarning("Searching from now (%s) until %s ! ", 
 			 QDate::currentDate().toString().latin1(), 
 			 lookAheadDate.toString().latin1() );
+    }
+
+    if ( m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){
+
 
 		OContact querybirthdays;
 		querybirthdays.setBirthday( lookAheadDate );
 		
diff --git a/core/pim/today/plugins/datebook/datebookpluginconfig.h b/core/pim/today/plugins/datebook/datebookpluginconfig.h
index bc412dd..2d303fc 100644
--- a/core/pim/today/plugins/datebook/datebookpluginconfig.h
+++ b/core/pim/today/plugins/datebook/datebookpluginconfig.h
@@ -22,12 +22,15 @@
 #include <qspinbox.h>
 
 #include <opie/todayconfigwidget.h>
 
+#include "datebookpluginconfigbase.h"
+
 class DatebookPluginConfig : public TodayConfigWidget {
 
     Q_OBJECT
 
+
 public:
     DatebookPluginConfig( QWidget *parent,  const char *name );
    ~DatebookPluginConfig();
 
@@ -38,15 +41,10 @@ private:
      */
     bool changed();
     void readConfig();
 
-    QCheckBox* CheckBox2;
-    QCheckBox* CheckBox1;
-    QCheckBox* CheckBox3;
-    QSpinBox* SpinBox1;
-    QSpinBox* SpinBox2;
-
 
+    DatebookPluginConfigBase *m_gui;
     // how many lines should be showed in the datebook section
     int m_max_lines_meet;
     // If location is to be showed too, 1 to activate it.
     int m_show_location;
diff --git a/core/pim/today/plugins/todolist/todopluginconfig.h b/core/pim/today/plugins/todolist/todopluginconfig.h
index e09251c..54d35cf 100644
--- a/core/pim/today/plugins/todolist/todopluginconfig.h
+++ b/core/pim/today/plugins/todolist/todopluginconfig.h
@@ -16,13 +16,14 @@
 
 #ifndef TODOLIST_PLUGIN_CONFIG_H
 #define TODOLIST_PLUGIN_CONFIG_H
 
-//#include <qwidget.h>
 #include <qspinbox.h>
 
 #include <opie/todayconfigwidget.h>
 
+#include "todopluginconfigbase.h"
+
 class TodolistPluginConfig : public TodayConfigWidget {
 
 Q_OBJECT
 
@@ -38,10 +39,10 @@ private:
     bool changed();
     void readConfig();
     void writeConfig();
 
-    QSpinBox* SpinBox2;
-    QSpinBox* SpinBoxClip;
+    TodoPluginConfigBase *m_gui;
+
 
     // how many lines should be showed in the todolist section
     int m_max_lines_task;
     // clip the lines after X chars
diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp
index c4726b3..00ea105 100644
--- a/core/settings/security/security.cpp
+++ b/core/settings/security/security.cpp
@@ -110,25 +110,29 @@ void Security::updateGUI()
 
 
 void Security::show()
 {
-    valid=FALSE;
+    //valid=FALSE;
     setEnabled(FALSE);
     SecurityBase::show();
     if ( passcode.isEmpty() ) {
         // could insist...
         //changePassCode();
         //if ( passcode.isEmpty() )
         //reject();
     } else {
+
+		if (!valid) // security passcode was not asked yet, so ask now
+		{
         QString pc = enterPassCode(tr("Enter passcode"));
         if ( pc != passcode ) {
             QMessageBox::critical(this, tr("Passcode incorrect"),
                     tr("The passcode entered is incorrect.\nAccess denied"));
             reject();
             return;
         }
     }
+    }
     setEnabled(TRUE);
     valid=TRUE;
 }
 
@@ -212,15 +216,20 @@ void Security::loadUsers ( void )
         passwd.close();
     }
 
 }
+
 void Security::toggleAutoLogin(bool val)
 {
     autoLogin=val;
     userlist->setEnabled(val);
     if (!autoLogin)
         autoLoginName=userlist->currentText();
 }
+
+
+
+
 void Security::setSyncNet(const QString& sn)
 {
     int auth_peer,auth_peer_bits;
     parseNet(sn,auth_peer,auth_peer_bits);
@@ -229,8 +238,9 @@ void Security::setSyncNet(const QString& sn)
 
 void Security::applySecurity()
 {
     if ( valid ) {
+<<<<<<< security.cpp
         Config cfg("Security");
         cfg.setGroup("Passcode");
         cfg.writeEntry("passcode",passcode);
         cfg.writeEntry("passcode_poweron",passcode_poweron->isChecked());
@@ -261,8 +271,9 @@ void Security::applySecurity()
         }
 
 	cfg.setGroup("SyncMode");
 	cfg.writeEntry("Mode", syncModeCombo->currentItem()+1 );
+
     }
 }
 
 void Security::changeLoginName( int idx )