summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/journalentry.cpp7
-rw-r--r--korganizer/kojournalview.cpp2
2 files changed, 4 insertions, 5 deletions
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 232ea58..58863fe 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -8,150 +8,149 @@
8 (at your option) any later version. 8 (at your option) any later version.
9 9
10 This program is distributed in the hope that it will be useful, 10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 13 GNU General Public License for more details.
14 14
15 You should have received a copy of the GNU General Public License 15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18 18
19 As a special exception, permission is given to link this program 19 As a special exception, permission is given to link this program
20 with any edition of Qt, and distribute the resulting executable, 20 with any edition of Qt, and distribute the resulting executable,
21 without including the source code for Qt in the source distribution. 21 without including the source code for Qt in the source distribution.
22*/ 22*/
23 23
24// 24//
25// Journal Entry 25// Journal Entry
26 26
27#include <qlabel.h> 27#include <qlabel.h>
28#include <qlayout.h> 28#include <qlayout.h>
29#include <qvbox.h> 29#include <qvbox.h>
30#include <qfile.h> 30#include <qfile.h>
31#include <qdir.h> 31#include <qdir.h>
32#include <qtextstream.h> 32#include <qtextstream.h>
33#include <qtextcodec.h> 33#include <qtextcodec.h>
34#include <qpixmap.h> 34#include <qpixmap.h>
35#include <qpushbutton.h> 35#include <qpushbutton.h>
36#include <qapplication.h> 36#include <qapplication.h>
37 37
38#include <kdebug.h> 38#include <kdebug.h>
39#include <kglobal.h> 39#include <kglobal.h>
40#include <klocale.h> 40#include <klocale.h>
41#include <ktextedit.h> 41#include <ktextedit.h>
42#include <kfiledialog.h> 42#include <kfiledialog.h>
43#include <kmessagebox.h> 43#include <kmessagebox.h>
44#include "koprefs.h" 44#include "koprefs.h"
45#include <klineedit.h> 45#include <klineedit.h>
46 46
47#include <libkcal/journal.h> 47#include <libkcal/journal.h>
48#include <libkcal/calendarresources.h> 48#include <libkcal/calendarresources.h>
49#include <libkcal/resourcecalendar.h> 49#include <libkcal/resourcecalendar.h>
50#include <kresources/resourceselectdialog.h> 50#include <kresources/resourceselectdialog.h>
51 51
52#include "journalentry.h" 52#include "journalentry.h"
53//#include "journalentry.moc" 53//#include "journalentry.moc"
54#ifndef DESKTOP_VERSION 54#ifndef DESKTOP_VERSION
55#include <qpe/qpeapplication.h> 55#include <qpe/qpeapplication.h>
56#endif 56#endif
57JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) : 57JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
58 QFrame(parent) 58 QFrame(parent)
59{ 59{
60 heiHint = QApplication::desktop()->height() / 5 ; 60 heiHint = QApplication::desktop()->height() / 5 ;
61 showOnlyMode = false; 61 showOnlyMode = false;
62 mCalendar = calendar; 62 mCalendar = calendar;
63 mJournal = 0; 63 mJournal = 0;
64 mDirty = false; 64 mDirty = false;
65 65
66 QHBox * vb = new QHBox ( this ); 66 QHBox * vb = new QHBox ( this );
67 QIconSet icon; 67 QIconSet icon;
68 68
69 QPushButton * toggleJournal = new QPushButton( vb ); 69 QPushButton * toggleJournal = new QPushButton( vb );
70 icon = SmallIcon("1updownarrow"); 70 icon = SmallIcon("1updownarrow");
71 toggleJournal->setIconSet (icon ) ; 71 toggleJournal->setIconSet (icon ) ;
72 int size = toggleJournal->sizeHint().height();
73 toggleJournal->setFixedSize( size * 2 /3 , size );
74 new QLabel(i18n(" Title: "),vb); 72 new QLabel(i18n(" Title: "),vb);
75 mTitle = new KLineEdit ( vb ); 73 mTitle = new KLineEdit ( vb );
76 mTitleLabel = new QLabel(i18n("Title"),vb); 74 mTitleLabel = new QLabel(i18n("Title"),vb);
77 mTitleLabel->setMargin(0); 75 mTitleLabel->setMargin(0);
78 mTitleLabel->setAlignment(AlignCenter); 76 mTitleLabel->setAlignment(AlignCenter);
79 QPushButton * loadTemplate = new QPushButton( vb ); 77 QPushButton * loadTemplate = new QPushButton( vb );
80 QPushButton * saveTemplate = new QPushButton( vb ); 78 QPushButton * saveTemplate = new QPushButton( vb );
81 if ( QApplication::desktop()->width() < 321 ) 79 if ( QApplication::desktop()->width() < 321 )
82 icon = SmallIcon("fileexport16"); 80 icon = SmallIcon("fileexport16");
83 else 81 else
84 icon = SmallIcon("fileexport"); 82 icon = SmallIcon("fileexport");
85 saveTemplate->setIconSet (icon ) ; 83 saveTemplate->setIconSet (icon ) ;
86 //size = saveTemplate->sizeHint().height(); 84 int size = saveTemplate->sizeHint().height();
87 saveTemplate->setFixedSize( size, size );
88 if ( QApplication::desktop()->width() < 321 ) 85 if ( QApplication::desktop()->width() < 321 )
89 icon = SmallIcon("fileimport16"); 86 icon = SmallIcon("fileimport16");
90 else 87 else
91 icon = SmallIcon("fileimport"); 88 icon = SmallIcon("fileimport");
92 loadTemplate->setIconSet (icon ) ; 89 loadTemplate->setIconSet (icon ) ;
93 loadTemplate->setFixedSize( size, size ); 90 loadTemplate->setFixedSize( size, size );
91 saveTemplate->setFixedSize( size, size );
92 toggleJournal->setFixedSize( size , size );
94 mEditor = new KTextEdit(this); 93 mEditor = new KTextEdit(this);
95 connect(mEditor,SIGNAL(textChanged()),SLOT(setDirty())); 94 connect(mEditor,SIGNAL(textChanged()),SLOT(setDirty()));
96#ifndef DESKTOP_VERSION 95#ifndef DESKTOP_VERSION
97 QPEApplication::setStylusOperation( mEditor, QPEApplication::RightOnHold ); 96 QPEApplication::setStylusOperation( mEditor, QPEApplication::RightOnHold );
98#endif 97#endif
99 mEditor->setWordWrap( KTextEdit::WidgetWidth ); 98 mEditor->setWordWrap( KTextEdit::WidgetWidth );
100 QBoxLayout *topLayout = new QVBoxLayout(this); 99 QBoxLayout *topLayout = new QVBoxLayout(this);
101 topLayout->addWidget(vb); 100 topLayout->addWidget(vb);
102 topLayout->addWidget(mEditor); 101 topLayout->addWidget(mEditor);
103 mEditor->installEventFilter(this); 102 mEditor->installEventFilter(this);
104 connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) ); 103 connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) );
105 connect( mTitle, SIGNAL( textChanged ( const QString & ) ), this , SLOT( setDirty() ) ); 104 connect( mTitle, SIGNAL( textChanged ( const QString & ) ), this , SLOT( setDirty() ) );
106 connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) ); 105 connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) );
107 connect( toggleJournal, SIGNAL( clicked() ), this , SLOT( toggleShowJournal() ) ); 106 connect( toggleJournal, SIGNAL( clicked() ), this , SLOT( toggleShowJournal() ) );
108} 107}
109 108
110JournalEntry::~JournalEntry() 109JournalEntry::~JournalEntry()
111{ 110{
112 //qDebug("JournalEntry::~JournalEntry() "); 111 //qDebug("JournalEntry::~JournalEntry() ");
113} 112}
114QSize JournalEntry::sizeHint() const 113QSize JournalEntry::sizeHint() const
115{ 114{
116 return QSize ( 240, heiHint ); 115 return QSize ( 240, heiHint );
117} 116}
118void JournalEntry::slotSaveTemplate() 117void JournalEntry::slotSaveTemplate()
119{ 118{
120 QString fileName =locateLocal( "templates", "journals" ); 119 QString fileName =locateLocal( "templates", "journals" );
121 QDir t_dir; 120 QDir t_dir;
122 if ( !t_dir.exists(fileName) ) 121 if ( !t_dir.exists(fileName) )
123 t_dir.mkdir ( fileName ); 122 t_dir.mkdir ( fileName );
124 fileName += "/journal"; 123 fileName += "/journal";
125 fileName = KFileDialog::getSaveFileName( fileName , i18n("Save as Journal template"), this ); 124 fileName = KFileDialog::getSaveFileName( fileName , i18n("Save as Journal template"), this );
126 if ( fileName.length() == 0 ) 125 if ( fileName.length() == 0 )
127 return; 126 return;
128 127
129 QFile fileIn( fileName ); 128 QFile fileIn( fileName );
130 if (!fileIn.open( IO_WriteOnly ) ) { 129 if (!fileIn.open( IO_WriteOnly ) ) {
131 KMessageBox::error( this, i18n("Error saving template file\n '%1'.") 130 KMessageBox::error( this, i18n("Error saving template file\n '%1'.")
132 .arg( fileName ) ); 131 .arg( fileName ) );
133 return; 132 return;
134 } 133 }
135 // QString text; 134 // QString text;
136 QTextStream tsIn( &fileIn ); 135 QTextStream tsIn( &fileIn );
137 tsIn.setCodec( QTextCodec::codecForName("utf8") ); 136 tsIn.setCodec( QTextCodec::codecForName("utf8") );
138 tsIn << mEditor->text(); 137 tsIn << mEditor->text();
139 fileIn.close(); 138 fileIn.close();
140} 139}
141void JournalEntry::slotLoadTemplate() 140void JournalEntry::slotLoadTemplate()
142{ 141{
143 QString fileName =locateLocal( "templates", "journals" ); 142 QString fileName =locateLocal( "templates", "journals" );
144 QDir t_dir; 143 QDir t_dir;
145 if ( !t_dir.exists(fileName) ) 144 if ( !t_dir.exists(fileName) )
146 t_dir.mkdir ( fileName ); 145 t_dir.mkdir ( fileName );
147 fileName += "/journal"; 146 fileName += "/journal";
148 fileName = KFileDialog::getOpenFileName( fileName , i18n("Insert Journal template"), this ); 147 fileName = KFileDialog::getOpenFileName( fileName , i18n("Insert Journal template"), this );
149 if ( fileName.length() == 0 ) 148 if ( fileName.length() == 0 )
150 return; 149 return;
151 QFile fileIn( fileName ); 150 QFile fileIn( fileName );
152 if (!fileIn.open( IO_ReadOnly ) ) { 151 if (!fileIn.open( IO_ReadOnly ) ) {
153 KMessageBox::error( this, i18n("Error loading template file\n '%1'.") 152 KMessageBox::error( this, i18n("Error loading template file\n '%1'.")
154 .arg( fileName ) ); 153 .arg( fileName ) );
155 return; 154 return;
156 } 155 }
157 QTextStream tsIn( &fileIn ); 156 QTextStream tsIn( &fileIn );
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp
index 4fc9013..ff87ef4 100644
--- a/korganizer/kojournalview.cpp
+++ b/korganizer/kojournalview.cpp
@@ -8,129 +8,129 @@
8 (at your option) any later version. 8 (at your option) any later version.
9 9
10 This program is distributed in the hope that it will be useful, 10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 13 GNU General Public License for more details.
14 14
15 You should have received a copy of the GNU General Public License 15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18 18
19 As a special exception, permission is given to link this program 19 As a special exception, permission is given to link this program
20 with any edition of Qt, and distribute the resulting executable, 20 with any edition of Qt, and distribute the resulting executable,
21 without including the source code for Qt in the source distribution. 21 without including the source code for Qt in the source distribution.
22*/ 22*/
23 23
24// 24//
25// View of Journal entries 25// View of Journal entries
26 26
27#include <qlayout.h> 27#include <qlayout.h>
28#include <qscrollview.h> 28#include <qscrollview.h>
29#include <qpopupmenu.h> 29#include <qpopupmenu.h>
30#include <qhbox.h> 30#include <qhbox.h>
31#include <qpushbutton.h> 31#include <qpushbutton.h>
32#include <qlabel.h> 32#include <qlabel.h>
33#include <qpushbutton.h> 33#include <qpushbutton.h>
34#include <qapplication.h> 34#include <qapplication.h>
35 35
36#include <klocale.h> 36#include <klocale.h>
37#include <kdebug.h> 37#include <kdebug.h>
38#include "koprefs.h" 38#include "koprefs.h"
39#include <kglobal.h> 39#include <kglobal.h>
40 40
41#include <libkcal/calendar.h> 41#include <libkcal/calendar.h>
42 42
43#include "journalentry.h" 43#include "journalentry.h"
44 44
45#include "kojournalview.h" 45#include "kojournalview.h"
46using namespace KOrg; 46using namespace KOrg;
47 47
48KOJournalView::KOJournalView(Calendar *calendar, QWidget *parent, 48KOJournalView::KOJournalView(Calendar *calendar, QWidget *parent,
49 const char *name) 49 const char *name)
50 : KOrg::BaseView(calendar, parent, name) 50 : KOrg::BaseView(calendar, parent, name)
51{ 51{
52 mCalendar = calendar; 52 mCalendar = calendar;
53 QScrollView * sv = new QScrollView( this ); 53 QScrollView * sv = new QScrollView( this );
54 QHBoxLayout * hbl = new QHBoxLayout( this ); 54 QHBoxLayout * hbl = new QHBoxLayout( this );
55 hbl->addWidget( sv ); 55 hbl->addWidget( sv );
56 parWid = new QWidget( sv->viewport() ); 56 parWid = new QWidget( sv->viewport() );
57 sv->addChild(parWid); 57 sv->addChild(parWid);
58 sv->setResizePolicy( QScrollView:: AutoOneFit ); 58 sv->setResizePolicy( QScrollView:: AutoOneFit );
59 mTopLayout = new QVBoxLayout(parWid); 59 mTopLayout = new QVBoxLayout(parWid);
60 QHBox * vb = new QHBox ( parWid ); 60 QHBox * vb = new QHBox ( parWid );
61 QPushButton * newJournal = new QPushButton( vb ); 61 QPushButton * newJournal = new QPushButton( vb );
62 QIconSet icon; 62 QIconSet icon;
63 if ( QApplication::desktop()->width() < 321 ) 63 if ( QApplication::desktop()->width() < 321 )
64 icon = SmallIcon("ko16old"); 64 icon = SmallIcon("ko16old");
65 else 65 else
66 icon = SmallIcon("ko24old"); 66 icon = SmallIcon("ko24old");
67 newJournal->setIconSet (icon ) ; 67 newJournal->setIconSet (icon ) ;
68 int size = newJournal->sizeHint().height(); 68 int size = newJournal->sizeHint().height();
69 newJournal->setFixedSize( size, size ); 69 newJournal->setFixedSize( size, size );
70 mDateLabel = new QLabel ( vb ); 70 mDateLabel = new QLabel ( vb );
71 mTopLayout->addWidget( vb ); 71 mTopLayout->addWidget( vb );
72 mDateLabel->setMargin(2); 72 mDateLabel->setMargin(1);
73 mDateLabel->setAlignment(AlignCenter); 73 mDateLabel->setAlignment(AlignCenter);
74 connect( newJournal, SIGNAL( clicked() ), this , SLOT( newJournal() ) ); 74 connect( newJournal, SIGNAL( clicked() ), this , SLOT( newJournal() ) );
75 getNewEntry(); 75 getNewEntry();
76} 76}
77 77
78KOJournalView::~KOJournalView() 78KOJournalView::~KOJournalView()
79{ 79{
80} 80}
81 81
82int KOJournalView::currentDateCount() 82int KOJournalView::currentDateCount()
83{ 83{
84 return 0; 84 return 0;
85} 85}
86JournalEntry* KOJournalView::getNewEntry() 86JournalEntry* KOJournalView::getNewEntry()
87{ 87{
88 JournalEntry* Entry = new JournalEntry(mCalendar,parWid); 88 JournalEntry* Entry = new JournalEntry(mCalendar,parWid);
89 jEntries.append( Entry ); 89 jEntries.append( Entry );
90 mTopLayout->addWidget(Entry); 90 mTopLayout->addWidget(Entry);
91 Entry->setFont ( KOPrefs::instance()->mJornalViewFont ); 91 Entry->setFont ( KOPrefs::instance()->mJornalViewFont );
92 connect ( Entry,SIGNAL(deleteJournal(Journal *) ),this ,SIGNAL(deleteJournal(Journal *) ) ) ; 92 connect ( Entry,SIGNAL(deleteJournal(Journal *) ),this ,SIGNAL(deleteJournal(Journal *) ) ) ;
93 connect ( Entry,SIGNAL(newJournal() ),this ,SLOT(newJournal() ) ) ; 93 connect ( Entry,SIGNAL(newJournal() ),this ,SLOT(newJournal() ) ) ;
94 connect ( Entry,SIGNAL(showJournalOnly( Journal * ) ),this ,SLOT(showOnly ( Journal* ) ) ) ; 94 connect ( Entry,SIGNAL(showJournalOnly( Journal * ) ),this ,SLOT(showOnly ( Journal* ) ) ) ;
95 return Entry; 95 return Entry;
96} 96}
97 97
98QPtrList<Incidence> KOJournalView::selectedIncidences() 98QPtrList<Incidence> KOJournalView::selectedIncidences()
99{ 99{
100 QPtrList<Incidence> eventList; 100 QPtrList<Incidence> eventList;
101 101
102 return eventList; 102 return eventList;
103} 103}
104void KOJournalView::updateConfig() 104void KOJournalView::updateConfig()
105{ 105{
106 JournalEntry* mEntry = jEntries.first(); 106 JournalEntry* mEntry = jEntries.first();
107 while ( mEntry ) { 107 while ( mEntry ) {
108 mEntry->setFont ( KOPrefs::instance()->mJornalViewFont ); 108 mEntry->setFont ( KOPrefs::instance()->mJornalViewFont );
109 mEntry = jEntries.next(); 109 mEntry = jEntries.next();
110 } 110 }
111} 111}
112void KOJournalView::updateView() 112void KOJournalView::updateView()
113{ 113{
114 JournalEntry* mEntry = jEntries.first(); 114 JournalEntry* mEntry = jEntries.first();
115 while ( mEntry ) { 115 while ( mEntry ) {
116 mEntry->setFont ( KOPrefs::instance()->mJornalViewFont ); 116 mEntry->setFont ( KOPrefs::instance()->mJornalViewFont );
117 mEntry = jEntries.next(); 117 mEntry = jEntries.next();
118 } 118 }
119 showDates( mDate, QDate() ); 119 showDates( mDate, QDate() );
120} 120}
121 121
122void KOJournalView::flushView() 122void KOJournalView::flushView()
123{ 123{
124 JournalEntry* mEntry = jEntries.first(); 124 JournalEntry* mEntry = jEntries.first();
125 while ( mEntry ) { 125 while ( mEntry ) {
126 mEntry->flushEntry(); 126 mEntry->flushEntry();
127 mEntry = jEntries.next(); 127 mEntry = jEntries.next();
128 } 128 }
129} 129}
130 130
131void KOJournalView::clearList() 131void KOJournalView::clearList()
132{ 132{
133 JournalEntry* mEntry = jEntries.first(); 133 JournalEntry* mEntry = jEntries.first();
134 while ( mEntry ) { 134 while ( mEntry ) {
135 mEntry->clear(); 135 mEntry->clear();
136 mEntry = jEntries.next(); 136 mEntry = jEntries.next();