New feature: It's now possible to configure a default location and default categories for new events. (Options available in configuration dialog.)

5 files changed, 250 insertions, 71 deletions

diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 6dd8918..cf1eeca 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -244,2 +244,16 @@ void DateBook::slotSettings()
 
+	bool found=false;
+	for (int i=0; i<(frmSettings.comboLocation->count()); i++) {
+		if ( frmSettings.comboLocation->text(i) == defaultLocation ) {
+			frmSettings.comboLocation->setCurrentItem(i);
+			found=true;
+			break;
+		}
+	}
+	if(!found) {
+		frmSettings.comboLocation->insertItem(defaultLocation);
+		frmSettings.comboLocation->setCurrentItem(frmSettings.comboLocation->count()-1);
+	}
+	frmSettings.comboCategory->setCategories(defaultCategories,"Calendar", tr("Calendar"));
+
 #if defined (Q_WS_QWS) || defined(_WS_QWS_)
@@ -257,2 +271,4 @@ void DateBook::slotSettings()
 		weeklistviewconfig=frmSettings.comboWeekListView->currentItem();
+		defaultLocation=frmSettings.comboLocation->currentText();
+		defaultCategories=frmSettings.comboCategory->currentCategories();
 
@@ -387,4 +403,6 @@ void DateBook::insertEvent( const Event &e )
 {
-	qWarning("Adding Event!");
-	db->addEvent(e);
+	Event dupEvent=e;
+	dupEvent.setLocation(defaultLocation);
+	dupEvent.setCategories(defaultCategories);
+	db->addEvent(dupEvent);
 	emit newEvent();
@@ -608,2 +626,11 @@ void DateBook::loadSettings()
 	weeklistviewconfig = config.readNumEntry("weeklistviewconfig",NORMAL);
+
+	defaultLocation=config.readEntry("defaultLocation");
+	QString tmpString=config.readEntry("defaultCategories");
+	QStringList tmpStringList=QStringList::split(",",tmpString);
+	defaultCategories.truncate(0);
+	for( QStringList::Iterator i=tmpStringList.begin(); i!=tmpStringList.end(); i++) {
+		defaultCategories.resize(defaultCategories.count()+1);
+		defaultCategories[defaultCategories.count()-1]=(*i).toInt();
+	}
 }
@@ -622,2 +649,9 @@ void DateBook::saveSettings()
 	configDB.writeEntry("weeklistviewconfig",weeklistviewconfig);
+
+	configDB.writeEntry("defaultLocation",defaultLocation);
+	QStringList tmpStringList;
+	for( uint i=0; i<defaultCategories.count(); i++) {
+		tmpStringList << QString::number(defaultCategories[i]);
+	}
+	configDB.writeEntry("defaultCategories",tmpStringList.join(","));
 }
@@ -827,19 +861,23 @@ void DateBook::slotNewEventFromKey( const QString &str )
 void DateBook::slotNewEntry(const QDateTime &start, const QDateTime &end, const QString &str, const QString &location) {
-    // argh!  This really needs to be encapsulated in a class
-    // or function.
-    QDialog newDlg( this, 0, TRUE );
-    newDlg.setCaption( DateEntryBase::tr("New Event") );
-    DateEntry *e;
-    QVBoxLayout *vb = new QVBoxLayout( &newDlg );
-    QScrollView *sv = new QScrollView( &newDlg );
-    sv->setResizePolicy( QScrollView::AutoOneFit );
-    sv->setFrameStyle( QFrame::NoFrame );
-    sv->setHScrollBarMode( QScrollView::AlwaysOff );
-    vb->addWidget( sv );
+	// argh!  This really needs to be encapsulated in a class
+	// or function.
+	QDialog newDlg( this, 0, TRUE );
+	newDlg.setCaption( DateEntryBase::tr("New Event") );
+	DateEntry *e;
+	QVBoxLayout *vb = new QVBoxLayout( &newDlg );
+	QScrollView *sv = new QScrollView( &newDlg );
+	sv->setResizePolicy( QScrollView::AutoOneFit );
+	sv->setFrameStyle( QFrame::NoFrame );
+	sv->setHScrollBarMode( QScrollView::AlwaysOff );
+	vb->addWidget( sv );
 
-    Event ev;
-    ev.setDescription(  str );
-    // When the new gui comes in, change this...
+	Event ev;
+	ev.setDescription(  str );
+	// When the new gui comes in, change this...
 	if(location==0) {
-		ev.setLocation( tr("(Unknown)") );
+		if(defaultLocation.isEmpty()) {
+			ev.setLocation(tr("(Unknown)"));
+		} else {
+			ev.setLocation( defaultLocation );
+		}
 	} else {
@@ -847,24 +885,24 @@ void DateBook::slotNewEntry(const QDateTime &start, const QDateTime &end, const
 	}
-    ev.setStart( start );
-    ev.setEnd( end );
+	ev.setCategories(defaultCategories);
+	ev.setStart( start );
+	ev.setEnd( end );
 
-    e = new DateEntry( onMonday, ev, ampm, &newDlg );
-    e->setAlarmEnabled( aPreset, presetTime, Event::Loud );
-    sv->addChild( e );
+	e = new DateEntry( onMonday, ev, ampm, &newDlg );
+	e->setAlarmEnabled( aPreset, presetTime, Event::Loud );
+	sv->addChild( e );
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
-    newDlg.showMaximized();
+	newDlg.showMaximized();
 #endif
-    while (newDlg.exec()) {
-	ev = e->event();
-	ev.assignUid();
-	QString error = checkEvent( ev );
-	if ( !error.isNull() ) {
-	    if ( QMessageBox::warning( this, tr("Error!"),
-				       error, tr("Fix it"), tr("Continue"), 0, 0, 1 ) == 0 )
-		continue;
+	while (newDlg.exec()) {
+		ev = e->event();
+		ev.assignUid();
+		QString error = checkEvent( ev );
+		if ( !error.isNull() ) {
+		if ( QMessageBox::warning( this, tr("Error!"), error, tr("Fix it"), tr("Continue"), 0, 0, 1 ) == 0 )
+			continue;
+		}
+		db->addEvent( ev );
+		emit newEvent();
+		break;
 	}
-	db->addEvent( ev );
-	emit newEvent();
-	break;
-    }
 }
diff --git a/core/pim/datebook/datebook.h b/core/pim/datebook/datebook.h
index 3f57d4a..eeb8666 100644
--- a/core/pim/datebook/datebook.h
+++ b/core/pim/datebook/datebook.h
@@ -110,21 +110,23 @@ private:
 private:
-    DateBookDBHack *db;
-    QWidgetStack *views;
-    DateBookDay *dayView;
-    DateBookWeek *weekView;
-    DateBookMonth *monthView;
-    DateBookWeekLst *weekLstView;
-    QAction *dayAction, *weekAction, *weekLstAction, *monthAction;
+	DateBookDBHack *db;
+	QWidgetStack *views;
+	DateBookDay *dayView;
+	DateBookWeek *weekView;
+	DateBookMonth *monthView;
+	DateBookWeekLst *weekLstView;
+	QAction *dayAction, *weekAction, *weekLstAction, *monthAction;
 	int weeklistviewconfig;
-    bool aPreset;    // have everything set to alarm?
-    int presetTime;  // the standard time for the alarm
-    int startTime;
-    int rowStyle;
+	bool aPreset;    // have everything set to alarm?
+	int presetTime;  // the standard time for the alarm
+	int startTime;
+	int rowStyle;
 	int defaultView;
+	QArray<int> defaultCategories;
+	QString defaultLocation;
 	bool bJumpToCurTime; //should jump to current time in dayview?
-    bool ampm;
-    bool onMonday;
+	bool ampm;
+	bool onMonday;
 
-    bool syncing;
-    bool inSearch;
+	bool syncing;
+	bool inSearch;
 
diff --git a/core/pim/datebook/datebooksettings.cpp b/core/pim/datebook/datebooksettings.cpp
index 49fcd17..675b17f 100644
--- a/core/pim/datebook/datebooksettings.cpp
+++ b/core/pim/datebook/datebooksettings.cpp
@@ -33,5 +33,6 @@ DateBookSettings::DateBookSettings( bool whichClock, QWidget *parent,
 {
-    init();
-    QObject::connect( qApp, SIGNAL( clockChanged( bool ) ),
-                      this, SLOT( slotChangeClock( bool ) ) );
+	init();
+	QObject::connect( qApp, SIGNAL( clockChanged( bool ) ), this, SLOT( slotChangeClock( bool ) ) );
+	QArray<int> categories;
+	comboCategory->setCategories( categories, "Calendar", tr("Calendar") );
 }
diff --git a/core/pim/datebook/datebooksettings.h b/core/pim/datebook/datebooksettings.h
index 90a07f9..c3036e1 100644
--- a/core/pim/datebook/datebooksettings.h
+++ b/core/pim/datebook/datebooksettings.h
@@ -23,2 +23,3 @@
 #include "datebooksettingsbase.h"
+#include <qpe/categoryselect.h>
 
diff --git a/core/pim/datebook/datebooksettingsbase.ui b/core/pim/datebook/datebooksettingsbase.ui
index 3836330..e613db1 100644
--- a/core/pim/datebook/datebooksettingsbase.ui
+++ b/core/pim/datebook/datebooksettingsbase.ui
@@ -35,3 +35,3 @@
             <width>273</width>
-            <height>303</height>
+            <height>340</height>
         </rect>
@@ -532,23 +532,138 @@
                     </widget>
-                    <spacer>
-                        <property>
-                            <name>name</name>
-                            <cstring>Spacer9</cstring>
-                        </property>
+                    <widget>
+                        <class>QGroupBox</class>
                         <property stdset="1">
-                            <name>orientation</name>
-                            <enum>Vertical</enum>
+                            <name>name</name>
+                            <cstring>GroupBox5_2_2</cstring>
                         </property>
                         <property stdset="1">
-                            <name>sizeType</name>
-                            <enum>Expanding</enum>
-                        </property>
-                        <property>
-                            <name>sizeHint</name>
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
+                            <name>title</name>
+                            <string>Defaults</string>
                         </property>
-                    </spacer>
+                        <vbox>
+                            <property stdset="1">
+                                <name>margin</name>
+                                <number>11</number>
+                            </property>
+                            <property stdset="1">
+                                <name>spacing</name>
+                                <number>6</number>
+                            </property>
+                            <widget>
+                                <class>QLayoutWidget</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>Layout6_2</cstring>
+                                </property>
+                                <hbox>
+                                    <property stdset="1">
+                                        <name>margin</name>
+                                        <number>0</number>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>spacing</name>
+                                        <number>6</number>
+                                    </property>
+                                    <widget>
+                                        <class>QLabel</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>TextLabel2_2_3</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>frameShape</name>
+                                            <enum>MShape</enum>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>frameShadow</name>
+                                            <enum>MShadow</enum>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>text</name>
+                                            <string>Location:</string>
+                                        </property>
+                                    </widget>
+                                    <widget>
+                                        <class>QComboBox</class>
+                                        <item>
+                                            <property>
+                                                <name>text</name>
+                                                <string></string>
+                                            </property>
+                                        </item>
+                                        <item>
+                                            <property>
+                                                <name>text</name>
+                                                <string>Office</string>
+                                            </property>
+                                        </item>
+                                        <item>
+                                            <property>
+                                                <name>text</name>
+                                                <string>Home</string>
+                                            </property>
+                                        </item>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>comboLocation</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>sizePolicy</name>
+                                            <sizepolicy>
+                                                <hsizetype>7</hsizetype>
+                                                <vsizetype>0</vsizetype>
+                                            </sizepolicy>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>editable</name>
+                                            <bool>true</bool>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>currentItem</name>
+                                            <number>0</number>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>duplicatesEnabled</name>
+                                            <bool>false</bool>
+                                        </property>
+                                    </widget>
+                                </hbox>
+                            </widget>
+                            <widget>
+                                <class>QLayoutWidget</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>Layout7_2</cstring>
+                                </property>
+                                <hbox>
+                                    <property stdset="1">
+                                        <name>margin</name>
+                                        <number>0</number>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>spacing</name>
+                                        <number>6</number>
+                                    </property>
+                                    <widget>
+                                        <class>QLabel</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>TextLabel2_2_2_2</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>text</name>
+                                            <string>Category:</string>
+                                        </property>
+                                    </widget>
+                                    <widget>
+                                        <class>CategorySelect</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>comboCategory</cstring>
+                                        </property>
+                                    </widget>
+                                </hbox>
+                            </widget>
+                        </vbox>
+                    </widget>
                 </vbox>
@@ -558,2 +673,24 @@
 </widget>
+<customwidgets>
+    <customwidget>
+        <class>CategorySelect</class>
+        <header location="global">qpe/categoryselect.h</header>
+        <sizehint>
+            <width>-1</width>
+            <height>-1</height>
+        </sizehint>
+        <container>0</container>
+        <sizepolicy>
+            <hordata>7</hordata>
+            <verdata>1</verdata>
+        </sizepolicy>
+        <pixmap>image0</pixmap>
+    </customwidget>
+</customwidgets>
+<images>
+    <image>
+        <name>image0</name>
+        <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
+    </image>
+</images>
 <connections>