summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-06-25 09:40:16 (UTC)
committer zautrix <zautrix>2005-06-25 09:40:16 (UTC)
commitb81bdd12cadbae5a3ab5a7f1f689bb4ae45cf315 (patch) (unidiff)
treef56786fad0627a81fb175c363447da2c99f63429
parent5ee9f9bbbdfaa8c1bf9c07ce295fe3a6b0b49c98 (diff)
downloadkdepimpi-b81bdd12cadbae5a3ab5a7f1f689bb4ae45cf315.zip
kdepimpi-b81bdd12cadbae5a3ab5a7f1f689bb4ae45cf315.tar.gz
kdepimpi-b81bdd12cadbae5a3ab5a7f1f689bb4ae45cf315.tar.bz2
fixxx
Diffstat (more/less context) (ignore 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
@@ -1432,10 +1432,13 @@
1432{ "Do you really want to set\nthe state to stopped\nwithout saving the data?","Möchten sie den Zustand\nwirklich auf gestoppt setzen\nohne die Daten abzuspeichern?" }, 1432{ "Do you really want to set\nthe state to stopped\nwithout saving the data?","Möchten sie den Zustand\nwirklich auf gestoppt setzen\nohne die Daten abzuspeichern?" },
1433{ "Time mismatch!","Zeiten stimmen nicht!" }, 1433{ "Time mismatch!","Zeiten stimmen nicht!" },
1434{ "The start time is\nafter the end time!","Die Startzeit ist\nhinter der Endzeit!" }, 1434{ "The start time is\nafter the end time!","Die Startzeit ist\nhinter der Endzeit!" },
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{ "","" },
1441{ "","" }, \ No newline at end of file 1444{ "","" }, \ No newline at end of file
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index ce2880a..9709324 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -142,14 +142,14 @@ void KOCalEditView::selectStdCal( int id, bool b )
142 it->setChecked( true ); 142 it->setChecked( true );
143 it->blockSignals( false ); 143 it->blockSignals( false );
144 return; 144 return;
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 ) {
153 it->blockSignals( true ); 153 it->blockSignals( true );
154 it->setChecked( false ); 154 it->setChecked( false );
155 it->blockSignals( false ); 155 it->blockSignals( false );
@@ -233,13 +233,15 @@ void KOCalEditView::readConfig()
233 mainLayout = new QGridLayout ( mw , 2, 8 ); 233 mainLayout = new QGridLayout ( mw , 2, 8 );
234 mainLayout->setMargin( 2 ); 234 mainLayout->setMargin( 2 );
235 mainLayout->setSpacing( 2 ); 235 mainLayout->setSpacing( 2 );
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 );
243 addBut->setFocusPolicy(NoFocus); 245 addBut->setFocusPolicy(NoFocus);
244 mainLayout->addWidget( addBut,0,++ii ); 246 mainLayout->addWidget( addBut,0,++ii );
245 addBut->setPixmap ( SmallIcon("eye")); 247 addBut->setPixmap ( SmallIcon("eye"));
@@ -287,20 +289,20 @@ void KOCalEditView::readConfig()
287 289
288 290
289 KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); 291 KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
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 );
304 if ( kkf->mErrorOnLoad ) 306 if ( kkf->mErrorOnLoad )
305 cb->setEnabled( false ); 307 cb->setEnabled( false );
306 connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCal(int,bool) ) ); 308 connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCal(int,bool) ) );
@@ -344,12 +346,18 @@ void KOCalEditView::readConfig()
344 } 346 }
345 lab = new QLabel ( "", mw ); 347 lab = new QLabel ( "", mw );
346 mainLayout->addWidget( lab,row,0 ); 348 mainLayout->addWidget( lab,row,0 );
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;
353 QString name, file; 361 QString name, file;
354 while ( tryagain ) { 362 while ( tryagain ) {
355 KONewCalPrefs prefs ( this ); 363 KONewCalPrefs prefs ( this );
diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h
index 5495d60..b57a6e9 100644
--- a/korganizer/kofilterview.h
+++ b/korganizer/kofilterview.h
@@ -22,12 +22,13 @@
22*/ 22*/
23#ifndef KOFILTERVIEW_H 23#ifndef KOFILTERVIEW_H
24#define KOFILTERVIEW_H 24#define KOFILTERVIEW_H
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>
31#include <qscrollview.h> 32#include <qscrollview.h>
32#include <qpushbutton.h> 33#include <qpushbutton.h>
33#include <kconfig.h> 34#include <kconfig.h>
@@ -145,12 +146,40 @@ private:
145 } 146 }
146 147
147private slots : 148private 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
154{ 183{
155 Q_OBJECT 184 Q_OBJECT
156 public: 185 public:
@@ -191,25 +220,26 @@ class KOCalEditView : public QScrollView
191 void selectCalAlarm(int,bool ); 220 void selectCalAlarm(int,bool );
192 void selectReadOnly(int,bool ); 221 void selectReadOnly(int,bool );
193 void setColor(const QColor &,int) ; 222 void setColor(const QColor &,int) ;
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 );
200 void calendarReadonly ( int cal, bool readonly ); 230 void calendarReadonly ( int cal, bool readonly );
201 void setCalendarDefault ( int cal ); 231 void setCalendarDefault ( int cal );
202 void removeCalendar ( int cal ); 232 void removeCalendar ( int cal );
203 void calendarAdded( int ); 233 void calendarAdded( int );
204 void needsUpdate(); 234 void needsUpdate();
205 235
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;
213 QGridLayout* mainLayout; 243 QGridLayout* mainLayout;
214}; 244};
215 245