summaryrefslogtreecommitdiffstats
path: root/korganizer/koeditorgeneraljournal.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
commitcc29364f06178f8f6b457384f2ec37a042bd9d43 (patch)
tree7c77a3184c698bbf9d98cef09fb1ba8124daceba /korganizer/koeditorgeneraljournal.cpp
parent4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff)
downloadtdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz
tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip
* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch
* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed * Added journal read support to the CalDAV resource * Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'korganizer/koeditorgeneraljournal.cpp')
-rw-r--r--korganizer/koeditorgeneraljournal.cpp23
1 files changed, 12 insertions, 11 deletions
diff --git a/korganizer/koeditorgeneraljournal.cpp b/korganizer/koeditorgeneraljournal.cpp
index 620417194..0a4e5ec36 100644
--- a/korganizer/koeditorgeneraljournal.cpp
+++ b/korganizer/koeditorgeneraljournal.cpp
@@ -45,10 +45,11 @@
#include <tqwhatsthis.h>
-KOEditorGeneralJournal::KOEditorGeneralJournal( TQObject *parent,
+KOEditorGeneralJournal::KOEditorGeneralJournal( TQWidget *parent,
const char *name )
- : TQObject( parent, name )
+ : KOEditorGeneral( parent, name )
{
+ setType( "Journal" );
}
KOEditorGeneralJournal::~KOEditorGeneralJournal()
@@ -58,7 +59,7 @@ KOEditorGeneralJournal::~KOEditorGeneralJournal()
void KOEditorGeneralJournal::initTitle( TQWidget *parent, TQBoxLayout *topLayout )
{
TQHBoxLayout *hbox = new TQHBoxLayout( topLayout );
-
+
TQString whatsThis = i18n("Sets the title of this journal.");
TQLabel *summaryLabel = new TQLabel( i18n("T&itle:"), parent );
TQWhatsThis::add( summaryLabel, whatsThis );
@@ -78,19 +79,19 @@ void KOEditorGeneralJournal::initDate( TQWidget *parent, TQBoxLayout *topLayout
{
// TQBoxLayout *dateLayout = new TQVBoxLayout(topLayout);
TQBoxLayout *dateLayout = new TQHBoxLayout( topLayout );
-
+
mDateLabel = new TQLabel( i18n("&Date:"), parent);
dateLayout->addWidget( mDateLabel );
mDateEdit = new KDateEdit( parent );
dateLayout->addWidget( mDateEdit );
mDateLabel->setBuddy( mDateEdit );
-
+
dateLayout->addStretch();
-
+
mTimeCheckBox = new TQCheckBox( i18n("&Time: "), parent );
dateLayout->addWidget( mTimeCheckBox );
-
+
mTimeEdit = new KTimeEdit( parent );
dateLayout->addWidget( mTimeEdit );
connect( mTimeCheckBox, TQT_SIGNAL(toggled(bool)),
@@ -135,7 +136,7 @@ void KOEditorGeneralJournal::setDefaults( const TQDate &date )
setDate( date );
}
-void KOEditorGeneralJournal::readJournal( Journal *journal, bool tmpl )
+void KOEditorGeneralJournal::readJournal( Journal *journal, const TQDate &, bool tmpl )
{
setSummary( journal->summary() );
if ( !tmpl ) {
@@ -143,10 +144,10 @@ void KOEditorGeneralJournal::readJournal( Journal *journal, bool tmpl )
if ( !journal->doesFloat() ) {
kdDebug()<<"KOEditorGeneralJournal::readJournal, does not float, time="<<(journal->dtStart().time().toString())<<endl;
setTime( journal->dtStart().time() );
- } else {
+ } else {
kdDebug()<<"KOEditorGeneralJournal::readJournal, does float"<<endl;
setTime( TQTime( -1, -1, -1 ) );
- }
+ }
}
setDescription( journal->description() );
}
@@ -156,7 +157,7 @@ void KOEditorGeneralJournal::writeJournal( Journal *journal )
// kdDebug(5850) << "KOEditorGeneralJournal::writeIncidence()" << endl;
journal->setSummary( mSummaryEdit->text() );
journal->setDescription( mDescriptionEdit->text() );
-
+
TQDateTime tmpDT( mDateEdit->date(), TQTime(0,0,0) );
bool hasTime = mTimeCheckBox->isChecked();
journal->setFloats( !hasTime );