summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-27 13:36:25 (UTC)
committer zautrix <zautrix>2004-10-27 13:36:25 (UTC)
commite099c37ac90e95c5a3110941aaae2be229bccb8e (patch) (unidiff)
treedad2ae54474767c4c5797e1780c4a3fee8c132e5
parent2f3396d84d2f3c92e1e0e420d677892c1f9c0778 (diff)
downloadkdepimpi-e099c37ac90e95c5a3110941aaae2be229bccb8e.zip
kdepimpi-e099c37ac90e95c5a3110941aaae2be229bccb8e.tar.gz
kdepimpi-e099c37ac90e95c5a3110941aaae2be229bccb8e.tar.bz2
wn view enhancements
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kalarmd/simplealarmdaemonapplet.cpp1
-rw-r--r--kalarmd/simplealarmdaemonapplet.h1
-rw-r--r--kalarmd/simplealarmdaemonimpl.cpp18
-rw-r--r--korganizer/koprefs.cpp3
-rw-r--r--korganizer/koprefs.h1
-rw-r--r--korganizer/koprefsdialog.cpp38
-rw-r--r--korganizer/kowhatsnextview.cpp79
7 files changed, 78 insertions, 63 deletions
diff --git a/kalarmd/simplealarmdaemonapplet.cpp b/kalarmd/simplealarmdaemonapplet.cpp
index 7e8125d..94d8428 100644
--- a/kalarmd/simplealarmdaemonapplet.cpp
+++ b/kalarmd/simplealarmdaemonapplet.cpp
@@ -6,24 +6,25 @@
6#include <qlabel.h> 6#include <qlabel.h>
7#include <qapp.h> 7#include <qapp.h>
8#include <qpe/resource.h> 8#include <qpe/resource.h>
9SimpleAlarmDaemonApplet::SimpleAlarmDaemonApplet() 9SimpleAlarmDaemonApplet::SimpleAlarmDaemonApplet()
10 : mApplet( 0 ), ref( 0 ) 10 : mApplet( 0 ), ref( 0 )
11{ 11{
12 12
13} 13}
14 14
15SimpleAlarmDaemonApplet::~SimpleAlarmDaemonApplet() 15SimpleAlarmDaemonApplet::~SimpleAlarmDaemonApplet()
16{ 16{
17 delete mApplet; 17 delete mApplet;
18 mApplet = 0;
18} 19}
19 20
20 21
21QWidget *SimpleAlarmDaemonApplet::applet( QWidget *parent ) 22QWidget *SimpleAlarmDaemonApplet::applet( QWidget *parent )
22{ 23{
23 if ( !mApplet ) { 24 if ( !mApplet ) {
24 mApplet = new SimpleAlarmDaemonImpl( parent ); 25 mApplet = new SimpleAlarmDaemonImpl( parent );
25 if ( QApplication::desktop()->width() < 480 ) 26 if ( QApplication::desktop()->width() < 480 )
26 mApplet->setPixmap( Resource::loadPixmap( "ko16" ) ); 27 mApplet->setPixmap( Resource::loadPixmap( "ko16" ) );
27 else 28 else
28 mApplet->setPixmap( Resource::loadPixmap( "ko24" ) ); 29 mApplet->setPixmap( Resource::loadPixmap( "ko24" ) );
29 QCopChannel* c = new QCopChannel("koalarm",mApplet , "channel" ) ; 30 QCopChannel* c = new QCopChannel("koalarm",mApplet , "channel" ) ;
diff --git a/kalarmd/simplealarmdaemonapplet.h b/kalarmd/simplealarmdaemonapplet.h
index a4cbee4..1787bf3 100644
--- a/kalarmd/simplealarmdaemonapplet.h
+++ b/kalarmd/simplealarmdaemonapplet.h
@@ -1,19 +1,18 @@
1#ifndef SIMPLEALARMDAEMONAPPLET_H 1#ifndef SIMPLEALARMDAEMONAPPLET_H
2#define SIMPLEALARMDAEMONAPPLET_H 2#define SIMPLEALARMDAEMONAPPLET_H
3 3
4#include <qpe/taskbarappletinterface.h> 4#include <qpe/taskbarappletinterface.h>
5 5
6class SimpleAlarmDaemonImpl; 6class SimpleAlarmDaemonImpl;
7class ScreenshotApplet;
8 7
9class SimpleAlarmDaemonApplet : public TaskbarAppletInterface 8class SimpleAlarmDaemonApplet : public TaskbarAppletInterface
10{ 9{
11 public: 10 public:
12 SimpleAlarmDaemonApplet(); 11 SimpleAlarmDaemonApplet();
13 virtual ~SimpleAlarmDaemonApplet(); 12 virtual ~SimpleAlarmDaemonApplet();
14 13
15 QRESULT queryInterface( const QUuid&, QUnknownInterface** ); 14 QRESULT queryInterface( const QUuid&, QUnknownInterface** );
16 Q_REFCOUNT 15 Q_REFCOUNT
17 16
18 virtual QWidget *applet( QWidget *parent ); 17 virtual QWidget *applet( QWidget *parent );
19 virtual int position() const; 18 virtual int position() const;
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index 4ff6861..50c4605 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -39,58 +39,58 @@
39#include <qtopia/qcopenvelope_qws.h> 39#include <qtopia/qcopenvelope_qws.h>
40#include <qtopia/alarmserver.h> 40#include <qtopia/alarmserver.h>
41 41
42#include <stdlib.h> 42#include <stdlib.h>
43#include <stdio.h> 43#include <stdio.h>
44#include <unistd.h> 44#include <unistd.h>
45 45
46 46
47SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent ) 47SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
48 : QLabel( parent ) 48 : QLabel( parent )
49{ 49{
50 mAlarmDialog = new AlarmDialog( 0 ); 50 mAlarmDialog = new AlarmDialog( 0 );
51 mPopUp = new QPopupMenu( 0 ); 51 mPopUp = new QPopupMenu( this );
52 mPopUp->insertItem( "What's Next?", this, SLOT ( showWN() ) ); 52 mPopUp->insertItem( "What's Next?", this, SLOT ( showWN() ) );
53 mPopUp->insertItem( "Next Days!", this, SLOT ( showKO() ) ); 53 mPopUp->insertItem( "Next Days!", this, SLOT ( showKO() ) );
54 mPopUp->insertSeparator(); 54 mPopUp->insertSeparator();
55 mPopUp->insertItem( "What's Todo?", this, SLOT ( showTodo() ) ); 55 mPopUp->insertItem( "What's Todo?", this, SLOT ( showTodo() ) );
56 mPopUp->insertSeparator(); 56 mPopUp->insertSeparator();
57 mPopUp->insertItem( "Addresses", this, SLOT ( showAdd() ) ); 57 mPopUp->insertItem( "Addresses", this, SLOT ( showAdd() ) );
58 mPopUp->insertSeparator(); 58 mPopUp->insertSeparator();
59 mPopUp->insertItem( "Edit Journal", this, SLOT ( writeJournal() ) ); 59 mPopUp->insertItem( "Edit Journal", this, SLOT ( writeJournal() ) );
60 mPopUp->insertItem( "New Event", this, SLOT ( newEvent() ) ); 60 mPopUp->insertItem( "New Event", this, SLOT ( newEvent() ) );
61 mPopUp->insertItem( "New Todo", this, SLOT ( newTodo() ) ); 61 mPopUp->insertItem( "New Todo", this, SLOT ( newTodo() ) );
62 mPopUp->insertItem( "New Mail", this, SLOT ( newMail() ) ); 62 mPopUp->insertItem( "New Mail", this, SLOT ( newMail() ) );
63 mPopUp->insertSeparator(); 63 mPopUp->insertSeparator();
64 mPopUp->insertItem( "Multi Sync", this, SLOT ( ringSync() ) ); 64 mPopUp->insertItem( "Multi Sync", this, SLOT ( ringSync() ) );
65 mTimerPopUp = new QPopupMenu( mPopUp ); 65 mTimerPopUp = new QPopupMenu( this );
66 66
67 mBeepPopUp = new QPopupMenu( mPopUp ); 67 mBeepPopUp = new QPopupMenu( this );
68 mSoundPopUp = new QPopupMenu( mBeepPopUp ); 68 mSoundPopUp = new QPopupMenu( this );
69 mPausePopUp = new QPopupMenu( mBeepPopUp ); 69 mPausePopUp = new QPopupMenu( this );
70 QPopupMenu* savePopUp = new QPopupMenu( mBeepPopUp ); 70 QPopupMenu* savePopUp = new QPopupMenu( this );
71 savePopUp->insertItem( "Save", 0 ); 71 savePopUp->insertItem( "Save", 0 );
72 savePopUp->insertItem( "Load", 1 ); 72 savePopUp->insertItem( "Load", 1 );
73 mSoundPopUp->insertItem( "Buzzer", 0 ); 73 mSoundPopUp->insertItem( "Buzzer", 0 );
74 mSoundPopUp->insertItem( "Wav file", 1 ); 74 mSoundPopUp->insertItem( "Wav file", 1 );
75 mPausePopUp->insertItem( " 1 sec", 1 ); 75 mPausePopUp->insertItem( " 1 sec", 1 );
76 mPausePopUp->insertItem( " 2 sec", 2 ); 76 mPausePopUp->insertItem( " 2 sec", 2 );
77 mPausePopUp->insertItem( " 3 sec", 3 ); 77 mPausePopUp->insertItem( " 3 sec", 3 );
78 mPausePopUp->insertItem( " 5 sec", 5 ); 78 mPausePopUp->insertItem( " 5 sec", 5 );
79 mPausePopUp->insertItem( "10 sec", 10 ); 79 mPausePopUp->insertItem( "10 sec", 10 );
80 mPausePopUp->insertItem( "30 sec", 30 ); 80 mPausePopUp->insertItem( "30 sec", 30 );
81 mPausePopUp->insertItem( " 1 min", 60 ); 81 mPausePopUp->insertItem( " 1 min", 60 );
82 mPausePopUp->insertItem( " 5 min", 300 ); 82 mPausePopUp->insertItem( " 5 min", 300 );
83 mPausePopUp->insertItem( "10 min", 600 ); 83 mPausePopUp->insertItem( "10 min", 600 );
84 mSuspendPopUp = new QPopupMenu( mBeepPopUp ); 84 mSuspendPopUp = new QPopupMenu( this );
85 mSuspendPopUp->insertItem( "Off", 0 ); 85 mSuspendPopUp->insertItem( "Off", 0 );
86 mSuspendPopUp->insertItem( " 1x", 1 ); 86 mSuspendPopUp->insertItem( " 1x", 1 );
87 mSuspendPopUp->insertItem( " 2x", 2 ); 87 mSuspendPopUp->insertItem( " 2x", 2 );
88 mSuspendPopUp->insertItem( " 3x", 3 ); 88 mSuspendPopUp->insertItem( " 3x", 3 );
89 mSuspendPopUp->insertItem( " 5x", 5 ); 89 mSuspendPopUp->insertItem( " 5x", 5 );
90 mSuspendPopUp->insertItem( "10x", 10 ); 90 mSuspendPopUp->insertItem( "10x", 10 );
91 mSuspendPopUp->insertItem( "20x", 20 ); 91 mSuspendPopUp->insertItem( "20x", 20 );
92 mSuspendPopUp->insertItem( "30x", 30 ); 92 mSuspendPopUp->insertItem( "30x", 30 );
93 mBeepPopUp->insertItem( "Auto suspend",mSuspendPopUp ); 93 mBeepPopUp->insertItem( "Auto suspend",mSuspendPopUp );
94 mBeepPopUp->insertItem( "Beep interval",mPausePopUp ); 94 mBeepPopUp->insertItem( "Beep interval",mPausePopUp );
95 mBeepPopUp->insertItem( "Replay",mSoundPopUp ); 95 mBeepPopUp->insertItem( "Replay",mSoundPopUp );
96 mBeepPopUp->insertItem( "Config",savePopUp ); 96 mBeepPopUp->insertItem( "Config",savePopUp );
@@ -133,25 +133,25 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
133 wavAlarm = false; 133 wavAlarm = false;
134 mSoundPopUp->setItemChecked ( 0, true ); 134 mSoundPopUp->setItemChecked ( 0, true );
135 } 135 }
136 else { 136 else {
137 wavAlarm = true; 137 wavAlarm = true;
138 mSoundPopUp->setItemChecked ( 1, true ); 138 mSoundPopUp->setItemChecked ( 1, true );
139 } 139 }
140 saveSlot( 1 ); 140 saveSlot( 1 );
141} 141}
142 142
143SimpleAlarmDaemonImpl::~SimpleAlarmDaemonImpl() 143SimpleAlarmDaemonImpl::~SimpleAlarmDaemonImpl()
144{ 144{
145 delete mPopUp; 145 //delete mPopUp;
146 delete mAlarmDialog; 146 delete mAlarmDialog;
147} 147}
148void SimpleAlarmDaemonImpl::saveSlot( int load ) 148void SimpleAlarmDaemonImpl::saveSlot( int load )
149{ 149{
150 QString fileName = QDir::homeDirPath() +"/.kopialarmrc"; 150 QString fileName = QDir::homeDirPath() +"/.kopialarmrc";
151 //qDebug("save %d ", load ); 151 //qDebug("save %d ", load );
152 QFile file( fileName ); 152 QFile file( fileName );
153 if ( load ) { 153 if ( load ) {
154 if( !QFile::exists( fileName) ) 154 if( !QFile::exists( fileName) )
155 return; 155 return;
156 if (!file.open( IO_ReadOnly ) ) { 156 if (!file.open( IO_ReadOnly ) ) {
157 return ; 157 return ;
@@ -555,25 +555,25 @@ void SimpleAlarmDaemonImpl::newTodo()
555 555
556void SimpleAlarmDaemonImpl::newEvent() 556void SimpleAlarmDaemonImpl::newEvent()
557{ 557{
558 QCopEnvelope e("QPE/Application/kopi", "-newEvent"); 558 QCopEnvelope e("QPE/Application/kopi", "-newEvent");
559 559
560} 560}
561void SimpleAlarmDaemonImpl::newMail() 561void SimpleAlarmDaemonImpl::newMail()
562{ 562{
563 QCopEnvelope e("QPE/Application/ompi", "newMail()"); 563 QCopEnvelope e("QPE/Application/ompi", "newMail()");
564} 564}
565void SimpleAlarmDaemonImpl::showAdd() 565void SimpleAlarmDaemonImpl::showAdd()
566{ 566{
567 QCopEnvelope e("QPE/Application/kapi", " "); 567 QCopEnvelope e("QPE/Application/kapi", "raise()");
568} 568}
569void SimpleAlarmDaemonImpl::ringSync() 569void SimpleAlarmDaemonImpl::ringSync()
570{ 570{
571 QCopEnvelope e("QPE/Application/kopi", "-ringSync"); 571 QCopEnvelope e("QPE/Application/kopi", "-ringSync");
572 572
573} 573}
574void SimpleAlarmDaemonImpl::newCountdown() 574void SimpleAlarmDaemonImpl::newCountdown()
575{ 575{
576 //recieve("cal_alarm", 10 ); 576 //recieve("cal_alarm", 10 );
577} 577}
578void SimpleAlarmDaemonImpl::simulate() 578void SimpleAlarmDaemonImpl::simulate()
579{ 579{
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 8dca3ae..1cdb2fb 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -220,25 +220,26 @@ KOPrefs::KOPrefs() :
220 addItemBool("ShowShortMonthName",&mMonthShowShort,false); 220 addItemBool("ShowShortMonthName",&mMonthShowShort,false);
221 addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true); 221 addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true);
222 addItemBool("Enable ToolTips",&mEnableToolTips,false); 222 addItemBool("Enable ToolTips",&mEnableToolTips,false);
223 addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false); 223 addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false);
224 addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false); 224 addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false);
225 addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true); 225 addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true);
226 addItemBool("EditOnDoubleClick",&mEditOnDoubleClick,true); 226 addItemBool("EditOnDoubleClick",&mEditOnDoubleClick,true);
227 addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,false); 227 addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,false);
228 addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,false); 228 addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,false);
229 addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false); 229 addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false);
230 addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true); 230 addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true);
231 addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true); 231 addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true);
232 addItemBool("WNViewShowsParents",&mWNViewShowsParents,true); 232 addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);;
233 addItemBool("WNViewShowsPast",&mWNViewShowsPast,true);
233 addItemBool("WNViewShowLocation",&mWNViewShowLocation,false); 234 addItemBool("WNViewShowLocation",&mWNViewShowLocation,false);
234 addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false); 235 addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false);
235 addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true); 236 addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true);
236 addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false); 237 addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false);
237 addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false); 238 addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false);
238 addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,false); 239 addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,false);
239 addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false); 240 addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false);
240 addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false); 241 addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false);
241#ifdef DESKTOP_VERSION 242#ifdef DESKTOP_VERSION
242 addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,true); 243 addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,true);
243#else 244#else
244 addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,false); 245 addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,false);
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 0656644..f2fe77a 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -223,24 +223,25 @@ class KOPrefs : public KPimPrefs
223 int mDestination; 223 int mDestination;
224 224
225 225
226 bool mEditOnDoubleClick; 226 bool mEditOnDoubleClick;
227 bool mViewChangeHoldFullscreen; 227 bool mViewChangeHoldFullscreen;
228 bool mViewChangeHoldNonFullscreen; 228 bool mViewChangeHoldNonFullscreen;
229 bool mCenterOnCurrentTime; 229 bool mCenterOnCurrentTime;
230 bool mSetTimeToDayStartAt; 230 bool mSetTimeToDayStartAt;
231 bool mHighlightCurrentDay; 231 bool mHighlightCurrentDay;
232 bool mUseHighlightLightColor; 232 bool mUseHighlightLightColor;
233 bool mListViewMonthTimespan; 233 bool mListViewMonthTimespan;
234 bool mWNViewShowsParents; 234 bool mWNViewShowsParents;
235 bool mWNViewShowsPast;
235 bool mWNViewShowLocation; 236 bool mWNViewShowLocation;
236 bool mTodoViewShowsPercentage; 237 bool mTodoViewShowsPercentage;
237 bool mTodoViewUsesCatColors; 238 bool mTodoViewUsesCatColors;
238 bool mTodoViewUsesSmallFont; 239 bool mTodoViewUsesSmallFont;
239 bool mTodoViewUsesForegroundColor; 240 bool mTodoViewUsesForegroundColor;
240 bool mMonthViewUsesForegroundColor; 241 bool mMonthViewUsesForegroundColor;
241 242
242 bool mHightlightDateTimeEdit; 243 bool mHightlightDateTimeEdit;
243 bool mShortDateInViewer; 244 bool mShortDateInViewer;
244 245
245 QStringList mLocationDefaults; 246 QStringList mLocationDefaults;
246 QStringList mEventSummaryUser; 247 QStringList mEventSummaryUser;
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 393e6e6..578c0e9 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -775,56 +775,64 @@ void KOPrefsDialog::setupViewsTab()
775 addWidColor(i18n("Day color odd months"), 775 addWidColor(i18n("Day color odd months"),
776 &(KOPrefs::instance()->mMonthViewOddColor),topFrame); 776 &(KOPrefs::instance()->mMonthViewOddColor),topFrame);
777 topLayout->addWidget(holidayColor->label(),ii,0); 777 topLayout->addWidget(holidayColor->label(),ii,0);
778 topLayout->addWidget(holidayColor->button(),ii++,1); 778 topLayout->addWidget(holidayColor->button(),ii++,1);
779 779
780 holidayColor = 780 holidayColor =
781 addWidColor(i18n("Day color even months"), 781 addWidColor(i18n("Day color even months"),
782 &(KOPrefs::instance()->mMonthViewEvenColor),topFrame); 782 &(KOPrefs::instance()->mMonthViewEvenColor),topFrame);
783 topLayout->addWidget(holidayColor->label(),ii,0); 783 topLayout->addWidget(holidayColor->label(),ii,0);
784 topLayout->addWidget(holidayColor->button(),ii++,1); 784 topLayout->addWidget(holidayColor->button(),ii++,1);
785 785
786 786
787 holidayColor = 787 holidayColor =
788 addWidColor(i18n("Color for Sundays + category \"Holiday\""), 788 addWidColor(i18n("Color for Sundays + category \"Holiday\""),
789 &(KOPrefs::instance()->mMonthViewHolidayColor),topFrame); 789 &(KOPrefs::instance()->mMonthViewHolidayColor),topFrame);
790 topLayout->addWidget(holidayColor->label(),ii,0); 790 topLayout->addWidget(holidayColor->label(),ii,0);
791 topLayout->addWidget(holidayColor->button(),ii++,1); 791 topLayout->addWidget(holidayColor->button(),ii++,1);
792 // *********************** What'sNext View 792 // *********************** What'sNext View
793 topFrame = addPage(i18n("What's Next View"),0,0); 793 topFrame = addPage(i18n("What's Next View"),0,0);
794 // DesktopIcon("viewmag",KIcon::SizeMedium)); 794 // DesktopIcon("viewmag",KIcon::SizeMedium));
795 795
796 topLayout = new QGridLayout(topFrame,4,1); 796 topLayout = new QGridLayout(topFrame,4,1);
797 topLayout->setSpacing(spacingHint()); 797 topLayout->setSpacing(spacingHint());
798 topLayout->setMargin(marginHint()); 798 topLayout->setMargin(marginHint());
799 ii = 0; 799 ii = 0;
800 KPrefsDialogWidBool *passwdk = 800 KPrefsDialogWidBool *passwdk =
801 addWidBool(i18n("Show parent To-Do's in What's Next view"), 801
802 &(KOPrefs::instance()->mWNViewShowsParents),topFrame); 802 addWidBool(i18n("Show events, that are done in \nWhat's Next view"),
803 topLayout->addWidget(passwdk->checkBox(), ii++,0); 803 &(KOPrefs::instance()->mWNViewShowsPast),topFrame);
804 topLayout->addWidget(passwdk->checkBox(), ii++,0);
805 passwdk =
806 addWidBool(i18n("Show parent To-Do's in What's Next view"),
807 &(KOPrefs::instance()->mWNViewShowsParents),topFrame);
808 topLayout->addWidget(passwdk->checkBox(), ii++,0);
804 809
805 passwdk = 810 passwdk =
806 addWidBool(i18n("Show location in What's Next view"), 811 addWidBool(i18n("Show location in What's Next view"),
807 &(KOPrefs::instance()->mWNViewShowLocation),topFrame); 812 &(KOPrefs::instance()->mWNViewShowLocation),topFrame);
808 topLayout->addWidget(passwdk->checkBox(), ii++,0); 813 topLayout->addWidget(passwdk->checkBox(), ii++,0);
809 814
810 passwdk = 815 passwdk =
811 addWidBool(i18n("Show Sync Events in \nWhat's Next/Agenda view"), 816 addWidBool(i18n("Show Sync Events in \nWhat's Next/Agenda view"),
812 &(KOPrefs::instance()->mShowSyncEvents),topFrame); 817 &(KOPrefs::instance()->mShowSyncEvents),topFrame);
813 topLayout->addWidget(passwdk->checkBox(), ii++,0); 818 topLayout->addWidget(passwdk->checkBox(), ii++,0);
814 passwdk = 819 passwdk =
815 addWidBool(i18n("Use short date in \nWhat's Next/Event view"), 820 addWidBool(i18n("Use short date in \nWhat's Next/Event view"),
816 &(KOPrefs::instance()->mShortDateInViewer),topFrame); 821 &(KOPrefs::instance()->mShortDateInViewer),topFrame);
817 topLayout->addMultiCellWidget(passwdk->checkBox(), ii,ii,0,1); 822 topLayout->addWidget(passwdk->checkBox(), ii++,0);
818 823
824
825
826
819 // *********************** Todo View 827 // *********************** Todo View
820 828
821 topFrame = addPage(i18n("Todo View"),0,0); 829 topFrame = addPage(i18n("Todo View"),0,0);
822 // DesktopIcon("viewmag",KIcon::SizeMedium)); 830 // DesktopIcon("viewmag",KIcon::SizeMedium));
823 831
824 topLayout = new QGridLayout(topFrame,4,1); 832 topLayout = new QGridLayout(topFrame,4,1);
825 topLayout->setSpacing(spacingHint()); 833 topLayout->setSpacing(spacingHint());
826 topLayout->setMargin(marginHint()); 834 topLayout->setMargin(marginHint());
827 ii = 0; 835 ii = 0;
828 836
829 KPrefsDialogWidBool *showCompletedTodo = 837 KPrefsDialogWidBool *showCompletedTodo =
830 addWidBool(i18n("To-do view shows completed Todos"), 838 addWidBool(i18n("To-do view shows completed Todos"),
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 0f0bf11..aa33588 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -348,25 +348,25 @@ void KOWhatsNextView::updateView()
348 mView->setText(mText); 348 mView->setText(mText);
349 mView->setFocus(); 349 mView->setFocus();
350 350
351 // QPixmap bPix = SmallIcon( "back" ); 351 // QPixmap bPix = SmallIcon( "back" );
352 // qDebug("xxxxxxxxxxxxxxxxxxxxx "); 352 // qDebug("xxxxxxxxxxxxxxxxxxxxx ");
353 // QWidget* test = new QWidget(); 353 // QWidget* test = new QWidget();
354 // test->setBackgroundMode(FixedPixmap ); 354 // test->setBackgroundMode(FixedPixmap );
355 // test->setBackgroundPixmap ( bPix ); 355 // test->setBackgroundPixmap ( bPix );
356 // test->resize( 300, 400 ); 356 // test->resize( 300, 400 );
357 // test->show(); 357 // test->show();
358 // mView->setBackgroundMode(FixedPixmap ); 358 // mView->setBackgroundMode(FixedPixmap );
359 // mView->setBackgroundPixmap ( bPix ); 359 // mView->setBackgroundPixmap ( bPix );
360 qDebug("%s ",mText.latin1()); 360 // qDebug("%s ",mText.latin1());
361} 361}
362 362
363void KOWhatsNextView::appendDay( int i, QDate eventDate ) 363void KOWhatsNextView::appendDay( int i, QDate eventDate )
364{ 364{
365 QString date; 365 QString date;
366 QString day = KGlobal::locale()->formatDate( eventDate , KOPrefs::instance()->mShortDateInViewer); 366 QString day = KGlobal::locale()->formatDate( eventDate , KOPrefs::instance()->mShortDateInViewer);
367 if ( ! KOPrefs::instance()->mShortDateInViewer && QApplication::desktop()->width() < 320 ) { 367 if ( ! KOPrefs::instance()->mShortDateInViewer && QApplication::desktop()->width() < 320 ) {
368 if ( i == 0 ) { 368 if ( i == 0 ) {
369 mText += "<table>\n"; 369 mText += "<table>\n";
370 return;//date = "<em><font color=\"#008000\"><em>" + day+"</font></em>"; 370 return;//date = "<em><font color=\"#008000\"><em>" + day+"</font></em>";
371 } 371 }
372 else if ( i == 1 ) 372 else if ( i == 1 )
@@ -427,37 +427,38 @@ void KOWhatsNextView::changeEventDisplay(Event *, int action)
427 default: 427 default:
428 updateView(); 428 updateView();
429 kdDebug() << "KOWhatsNextView::changeEventDisplay(): Illegal action " << action << endl; 429 kdDebug() << "KOWhatsNextView::changeEventDisplay(): Illegal action " << action << endl;
430 } 430 }
431} 431}
432 432
433void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed ) 433void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed )
434{ 434{
435 if ( !KOPrefs::instance()->mShowSyncEvents && ev->uid().left(15) == QString("last-syncEvent-") ) 435 if ( !KOPrefs::instance()->mShowSyncEvents && ev->uid().left(15) == QString("last-syncEvent-") )
436 return; 436 return;
437 QDateTime cdt = QDateTime::currentDateTime(); 437 QDateTime cdt = QDateTime::currentDateTime();
438 QDateTime noc; 438 QDateTime noc;
439 QString tempText;
439 bool ok = true; 440 bool ok = true;
440 if ( reply ) { 441 if ( reply ) {
441 noc = ev->getNextOccurence( cdt, &ok ); 442 noc = ev->getNextOccurence( cdt, &ok );
442 if (! ok && ev->type() == "Event") 443 if (! ok && ev->type() == "Event")
443 return; 444 return;
444 } 445 }
445 mText += "<tr><td><b>"; 446 tempText += "<tr><td><b>";
446 if (ev->type()=="Event") { 447 if (ev->type()=="Event") {
447 if (reply) { 448 if (reply) {
448 if (!ev->doesFloat()) 449 if (!ev->doesFloat())
449 mText += KGlobal::locale()->formatDateTime( noc , KOPrefs::instance()->mShortDateInViewer) +": "; 450 tempText += KGlobal::locale()->formatDateTime( noc , KOPrefs::instance()->mShortDateInViewer) +": ";
450 else 451 else
451 mText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": "; 452 tempText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": ";
452 453
453 } else { 454 } else {
454 if (!ev->doesFloat()) { 455 if (!ev->doesFloat()) {
455 Event *event = static_cast<Event *>(ev); 456 Event *event = static_cast<Event *>(ev);
456 QDateTime st,end; 457 QDateTime st,end;
457 if ( event->recurrence()->doesRecur() ) { 458 if ( event->recurrence()->doesRecur() ) {
458 QDate recDate= mEventDate; 459 QDate recDate= mEventDate;
459 int days = event->dtStart().date().daysTo (event->dtEnd().date() ); 460 int days = event->dtStart().date().daysTo (event->dtEnd().date() );
460 while ( ! event->recursOn( recDate ) ) { 461 while ( ! event->recursOn( recDate ) ) {
461 recDate = recDate.addDays( -1 ); 462 recDate = recDate.addDays( -1 );
462 463
463 } 464 }
@@ -472,113 +473,117 @@ void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed )
472 473
473 QString dateText; 474 QString dateText;
474 // qDebug("%s %s %s %s ", mEventDate.toString().latin1(),event->summary().latin1(), st .toString().latin1(),end.toString().latin1() ); 475 // qDebug("%s %s %s %s ", mEventDate.toString().latin1(),event->summary().latin1(), st .toString().latin1(),end.toString().latin1() );
475 if ( st.date() < mEventDate ) 476 if ( st.date() < mEventDate )
476 dateText = "++:++-"; 477 dateText = "++:++-";
477 else 478 else
478 dateText = event->dtStartTimeStr() + "-"; 479 dateText = event->dtStartTimeStr() + "-";
479 if ( end.date() > mEventDate ) 480 if ( end.date() > mEventDate )
480 dateText += "++:++"; 481 dateText += "++:++";
481 else 482 else
482 dateText += event->dtEndTimeStr(); 483 dateText += event->dtEndTimeStr();
483 if ( notRed ) 484 if ( notRed )
484 mText += dateText; 485 tempText += dateText;
485 else { 486 else {
486 if ( end < cdt ) 487 if ( end < cdt ) {
487 mText += "<font color=\"#F00000\">" + dateText + "</font>"; 488 if ( !KOPrefs::instance()->mWNViewShowsPast )
489 return;
490 tempText += "<font color=\"#F00000\">" + dateText + "</font>";
491 }
488 else if ( st < cdt ) 492 else if ( st < cdt )
489 mText += "<font color=\"#008000\">" + dateText + "</font>"; 493 tempText += "<font color=\"#008000\">" + dateText + "</font>";
490 else 494 else
491 mText += dateText; 495 tempText += dateText;
492 496
493 } 497 }
494 498
495 } else { 499 } else {
496 mText += i18n("Allday:"); 500 tempText += i18n("Allday:");
497 501
498 } 502 }
499 } 503 }
500 } else { 504 } else {
501 mTodos.append( ev ); 505 mTodos.append( ev );
502 mText += i18n("ToDo:"); 506 tempText += i18n("ToDo:");
503 if (reply) { 507 if (reply) {
504 mText += " "; 508 tempText += " ";
505 if ( noc != cdt ) { 509 if ( noc != cdt ) {
506 mText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": "; 510 tempText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": ";
507 } 511 }
508 } else { 512 } else {
509 if ( ((Todo*)ev)->dtDue().date() < QDate::currentDate() ) { 513 if ( ((Todo*)ev)->dtDue().date() < QDate::currentDate() ) {
510 // mText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>"; 514 // tempText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>";
511 QString dfs = KGlobal::locale()->dateFormatShort(); 515 QString dfs = KGlobal::locale()->dateFormatShort();
512 KGlobal::locale()->setDateFormatShort("%d.%b"); 516 KGlobal::locale()->setDateFormatShort("%d.%b");
513 mText +="<font color=\"#F00000\">" + KGlobal::locale()->formatDate(((Todo*)ev)->dtDue().date(), true, KLocale::Userdefined) + "</font>"; 517 tempText +="<font color=\"#F00000\">" + KGlobal::locale()->formatDate(((Todo*)ev)->dtDue().date(), true, KLocale::Userdefined) + "</font>";
514 KGlobal::locale()->setDateFormatShort(dfs); 518 KGlobal::locale()->setDateFormatShort(dfs);
515 } else { 519 } else {
516 if (!ev->doesFloat() ) 520 if (!ev->doesFloat() )
517 if( ( (Todo*)ev)->dtDue() < cdt ) { 521 if( ( (Todo*)ev)->dtDue() < cdt ) {
518 mText +="<font color=\"#F00000\">" + ((Todo*)ev)->dtDueTimeStr() + "</font>"; 522 tempText +="<font color=\"#F00000\">" + ((Todo*)ev)->dtDueTimeStr() + "</font>";
519 523
520 524
521 } else 525 } else
522 mText +=((Todo*)ev)->dtDueTimeStr(); 526 tempText +=((Todo*)ev)->dtDueTimeStr();
523 mTodos.append( ev ); 527 mTodos.append( ev );
524 } 528 }
525 } 529 }
526 } 530 }
527 mText += "</b></td><td>"; 531 tempText += "</b></td><td>";
528 bool needClose = false; 532 bool needClose = false;
529 if ( ev->cancelled() ) { 533 if ( ev->cancelled() ) {
530 mText += "<font color=\"#F00000\">[c"; 534 tempText += "<font color=\"#F00000\">[c";
531 needClose =true; 535 needClose =true;
532 536
533 } 537 }
534 if ( ev->isAlarmEnabled() ) { 538 if ( ev->isAlarmEnabled() ) {
535 if ( !needClose) 539 if ( !needClose)
536 mText +="["; 540 tempText +="[";
537 mText += "a"; 541 tempText += "a";
538 needClose =true; 542 needClose =true;
539 543
540 } 544 }
541 if ( ev->description().length() > 0 ) { 545 if ( ev->description().length() > 0 ) {
542 if ( !needClose) 546 if ( !needClose)
543 mText +="["; 547 tempText +="[";
544 mText += "i"; 548 tempText += "i";
545 needClose =true; 549 needClose =true;
546 } 550 }
547 if ( ev->recurrence()->doesRecur() ) { 551 if ( ev->recurrence()->doesRecur() ) {
548 if ( !needClose) 552 if ( !needClose)
549 mText +="["; 553 tempText +="[";
550 mText += "r"; 554 tempText += "r";
551 needClose =true; 555 needClose =true;
552 } 556 }
553 if ( needClose ) { 557 if ( needClose ) {
554 mText += "] "; 558 tempText += "] ";
555 } 559 }
556 if ( ev->cancelled() ) 560 if ( ev->cancelled() )
557 mText += "</font>"; 561 tempText += "</font>";
558 mText += "<a "; 562 tempText += "<a ";
559 if (ev->type()=="Event") mText += "href=\"event:"; 563 if (ev->type()=="Event") tempText += "href=\"event:";
560 if (ev->type()=="Todo") mText += "href=\"todo:"; 564 if (ev->type()=="Todo") tempText += "href=\"todo:";
561 mText += ev->uid() + "\">"; 565 tempText += ev->uid() + "\">";
562 if ( ev->summary().length() > 0 ) 566 if ( ev->summary().length() > 0 )
563 mText += ev->summary(); 567 tempText += ev->summary();
564 else 568 else
565 mText += i18n("-no summary-"); 569 tempText += i18n("-no summary-");
566 mText += "</a>"; 570 tempText += "</a>";
567 if ( KOPrefs::instance()->mWNViewShowLocation ) 571 if ( KOPrefs::instance()->mWNViewShowLocation )
568 if ( !ev->location().isEmpty() ) 572 if ( !ev->location().isEmpty() )
569 mText += " ("+ev->location() +")"; 573 tempText += " ("+ev->location() +")";
570 if ( ev->relatedTo() && KOPrefs::instance()->mWNViewShowsParents) 574 if ( ev->relatedTo() && KOPrefs::instance()->mWNViewShowsParents)
571 mText += " ["+ev->relatedTo()->summary() +"]"; 575 tempText += " ["+ev->relatedTo()->summary() +"]";
572 mText += "</td></tr>\n"; 576 tempText += "</td></tr>\n";
577 mText += tempText;
573} 578}
574 579
575bool KOWhatsNextView::appendTodo(Incidence *ev, QString ind , bool isSub ) 580bool KOWhatsNextView::appendTodo(Incidence *ev, QString ind , bool isSub )
576{ 581{
577 if ( mTodos.find( ev ) != mTodos.end() ) return false; 582 if ( mTodos.find( ev ) != mTodos.end() ) return false;
578 583
579 mTodos.append( ev ); 584 mTodos.append( ev );
580 if ( !isSub ) 585 if ( !isSub )
581 mText += "<p>"; 586 mText += "<p>";
582 else 587 else
583 mText += "<li>"; 588 mText += "<li>";
584 mText += "[" +QString::number(ev->priority()) + "/" + QString::number(((Todo*)ev)->percentComplete())+"%] "; 589 mText += "[" +QString::number(ev->priority()) + "/" + QString::number(((Todo*)ev)->percentComplete())+"%] ";