summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/korganizer/bell.pngbin1449 -> 1128 bytes
-rw-r--r--bin/kdepim/korganizer/eye.pngbin1339 -> 1475 bytes
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt3
-rw-r--r--korganizer/kofilterview.cpp28
-rw-r--r--korganizer/kofilterview.h32
5 files changed, 52 insertions, 11 deletions
diff --git a/bin/kdepim/korganizer/bell.png b/bin/kdepim/korganizer/bell.png
index 0b15133..2239c60 100644
--- a/bin/kdepim/korganizer/bell.png
+++ b/bin/kdepim/korganizer/bell.png
Binary files differ
diff --git a/bin/kdepim/korganizer/eye.png b/bin/kdepim/korganizer/eye.png
index fd70996..c2a0251 100644
--- a/bin/kdepim/korganizer/eye.png
+++ b/bin/kdepim/korganizer/eye.png
Binary files differ
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index b60ae7b..578f78d 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1435,6 +1435,9 @@
1435{ "Yes, stop todo","Ja, stoppe Todo" }, 1435{ "Yes, stop todo","Ja, stoppe Todo" },
1436{ "Todo stopped - no data saved because runtime was < 15 sec!","Todo gestoppt - nichts gespeichert da Laufzeit < 15 sec!" }, 1436{ "Todo stopped - no data saved because runtime was < 15 sec!","Todo gestoppt - nichts gespeichert da Laufzeit < 15 sec!" },
1437{ "Todo started! Double click again to stop!","Todo gestartet! Doppelklicke um es zu stoppen!" }, 1437{ "Todo started! Double click again to stop!","Todo gestartet! Doppelklicke um es zu stoppen!" },
1438{ "Please choose the <b>default calendar</b> in this column. Newly created or imported items are added to the default calendar.","Bitte wählen Sie den <b>Default-Kalender</b> in dieser Spalte. Neu angelegte oder importierte Einträge werden dem Default-Kalender hinzugefügt." },
1439{ "","" },
1440{ "","" },
1438{ "","" }, 1441{ "","" },
1439{ "","" }, 1442{ "","" },
1440{ "","" }, 1443{ "","" },
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index ce2880a..9709324 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -145,8 +145,8 @@ void KOCalEditView::selectStdCal( int id, bool b )
145 } 145 }
146 return; 146 return;
147 } 147 }
148 KOCalCheckButton* sen = (KOCalCheckButton*) sender(); 148 KOCalRadioButton* sen = (KOCalRadioButton*) sender();
149 KOCalCheckButton* it = mStdandardB.first(); 149 KOCalRadioButton* it = mStdandardB.first();
150 while ( it ) { 150 while ( it ) {
151 if ( it->isChecked() ) { 151 if ( it->isChecked() ) {
152 if ( it != sen ) { 152 if ( it != sen ) {
@@ -236,7 +236,9 @@ void KOCalEditView::readConfig()
236 QPushButton * addBut = new QPushButton ( mw ); 236 QPushButton * addBut = new QPushButton ( mw );
237 addBut->setFocusPolicy(NoFocus); 237 addBut->setFocusPolicy(NoFocus);
238 mainLayout->addWidget( addBut,0,0 ); 238 mainLayout->addWidget( addBut,0,0 );
239 addBut->setPixmap ( SmallIcon("greenhook16")); 239 addBut->setText( "D");
240 connect(addBut,SIGNAL(clicked()),SLOT(defaultInfo()));
241 //addBut->setPixmap ( SmallIcon("greenhook16"));
240 addBut->setMaximumWidth( addBut->sizeHint().height() ); 242 addBut->setMaximumWidth( addBut->sizeHint().height() );
241 int max = addBut->sizeHint().height(); 243 int max = addBut->sizeHint().height();
242 addBut = new QPushButton ( mw ); 244 addBut = new QPushButton ( mw );
@@ -290,14 +292,14 @@ void KOCalEditView::readConfig()
290 int row = 1; 292 int row = 1;
291 while ( kkf ) { 293 while ( kkf ) {
292 int iii = 0; 294 int iii = 0;
293 KOCalCheckButton* cb = new KOCalCheckButton( mw ); 295 KOCalRadioButton* rb = new KOCalRadioButton( mw );
294 mainLayout->addWidget( cb,row,0 );mStdandardB.append( cb ); 296 mainLayout->addWidget( rb,row,0 );mStdandardB.append( rb );
295 cb->setChecked( kkf->isStandard ); 297 rb->setChecked( kkf->isStandard );
296 cb->setNum( kkf->mCalNumber ); 298 rb->setNum( kkf->mCalNumber );
297 connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) ); 299 connect (rb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) );
298 if ( kkf->mErrorOnLoad || kkf->isReadOnly ) 300 if ( kkf->mErrorOnLoad || kkf->isReadOnly )
299 cb->setEnabled( false ); 301 rb->setEnabled( false );
300 cb = new KOCalCheckButton( mw ); 302 KOCalCheckButton* cb = new KOCalCheckButton( mw );
301 mainLayout->addWidget( cb,row,++iii );mEnabledB.append( cb ); 303 mainLayout->addWidget( cb,row,++iii );mEnabledB.append( cb );
302 cb->setChecked( kkf->isEnabled ); 304 cb->setChecked( kkf->isEnabled );
303 cb->setNum( kkf->mCalNumber ); 305 cb->setNum( kkf->mCalNumber );
@@ -347,6 +349,12 @@ void KOCalEditView::readConfig()
347 mw->show(); 349 mw->show();
348 350
349} 351}
352
353
354void KOCalEditView::defaultInfo()
355{
356 KMessageBox::information( this, i18n("Please choose the <b>default calendar</b> in this column. Newly created or imported items are added to the default calendar.") );
357}
350void KOCalEditView::addCal() 358void KOCalEditView::addCal()
351{ 359{
352 bool tryagain = true; 360 bool tryagain = true;
diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h
index 5495d60..b57a6e9 100644
--- a/korganizer/kofilterview.h
+++ b/korganizer/kofilterview.h
@@ -25,6 +25,7 @@
25 25
26#include <qstring.h> 26#include <qstring.h>
27#include <qcheckbox.h> 27#include <qcheckbox.h>
28#include <qradiobutton.h>
28#include <qlayout.h> 29#include <qlayout.h>
29#include <qlabel.h> 30#include <qlabel.h>
30#include <qdialog.h> 31#include <qdialog.h>
@@ -148,6 +149,34 @@ private slots :
148 void bottonClicked( bool b) { if ( mNumber > 0 ) emit selectNum ( mNumber , b); } 149 void bottonClicked( bool b) { if ( mNumber > 0 ) emit selectNum ( mNumber , b); }
149}; 150};
150 151
152class KOCalRadioButton : public QRadioButton
153{
154 Q_OBJECT
155 public:
156 KOCalRadioButton( QWidget *parent=0, const char *name=0 ) :
157 QRadioButton( parent, name)
158 {
159 connect( this, SIGNAL( toggled ( bool ) ),
160 SLOT( bottonClicked( bool ) ));
161 mNumber = -1;
162 setFocusPolicy(NoFocus);
163 //setMaximumWidth( 10 );
164
165 }
166 void setNum ( int num ) {mNumber = num; }
167 signals:
168 void selectNum ( int, bool );
169private:
170 int mNumber;
171 void keyPressEvent ( QKeyEvent * e )
172 {
173 e->ignore();
174 }
175
176private slots :
177 void bottonClicked( bool b) { if ( mNumber > 0 ) emit selectNum ( mNumber , b); }
178};
179
151 180
152 181
153class KOFilterView : public KOFilterView_base 182class KOFilterView : public KOFilterView_base
@@ -194,6 +223,7 @@ class KOCalEditView : public QScrollView
194 void deleteCal(int) ; 223 void deleteCal(int) ;
195 void infoCal(int) ; 224 void infoCal(int) ;
196 void readConfig(); 225 void readConfig();
226 void defaultInfo();
197 signals: 227 signals:
198 void alarmEnabled ( int cal, bool enable ); 228 void alarmEnabled ( int cal, bool enable );
199 void calendarEnabled ( int cal, bool enable ); 229 void calendarEnabled ( int cal, bool enable );
@@ -206,7 +236,7 @@ class KOCalEditView : public QScrollView
206 private: 236 private:
207 QWidget *mw; 237 QWidget *mw;
208 void toggleList ( QPtrList<KOCalCheckButton> ); 238 void toggleList ( QPtrList<KOCalCheckButton> );
209 QPtrList<KOCalCheckButton> mStdandardB; 239 QPtrList<KOCalRadioButton> mStdandardB;
210 QPtrList<KOCalCheckButton> mEnabledB; 240 QPtrList<KOCalCheckButton> mEnabledB;
211 QPtrList<KOCalCheckButton> mAlarmB; 241 QPtrList<KOCalCheckButton> mAlarmB;
212 QPtrList<KOCalCheckButton> mROB; 242 QPtrList<KOCalCheckButton> mROB;