author | zautrix <zautrix> | 2005-06-15 19:45:57 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-15 19:45:57 (UTC) |
commit | e17a686fcfab42a71f25e9f0a4c3a395ec41a7b1 (patch) (unidiff) | |
tree | 3974dde9d4f9a5c8d3f6af724cafb3206d08f3cc /korganizer | |
parent | ccfe3f97afd65c75ee6c7c931cb3694919a4e29b (diff) | |
download | kdepimpi-e17a686fcfab42a71f25e9f0a4c3a395ec41a7b1.zip kdepimpi-e17a686fcfab42a71f25e9f0a4c3a395ec41a7b1.tar.gz kdepimpi-e17a686fcfab42a71f25e9f0a4c3a395ec41a7b1.tar.bz2 |
fixxx
-rw-r--r-- | korganizer/kofilterview.cpp | 11 | ||||
-rw-r--r-- | korganizer/kofilterview.h | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp index a653c18..105028a 100644 --- a/korganizer/kofilterview.cpp +++ b/korganizer/kofilterview.cpp | |||
@@ -151,6 +151,7 @@ KOCalEditView::KOCalEditView(QWidget* parent, | |||
151 | setFrameStyle ( QFrame::Panel | QFrame::Plain ); | 151 | setFrameStyle ( QFrame::Panel | QFrame::Plain ); |
152 | setLineWidth ( 1 ); | 152 | setLineWidth ( 1 ); |
153 | setMidLineWidth ( 1 ); | 153 | setMidLineWidth ( 1 ); |
154 | setFocusPolicy(NoFocus); | ||
154 | } | 155 | } |
155 | 156 | ||
156 | KOCalEditView::~KOCalEditView() | 157 | KOCalEditView::~KOCalEditView() |
@@ -228,7 +229,7 @@ void KOCalEditView::deleteCal( int id ) | |||
228 | KopiCalendarFile * kkf = KOPrefs::instance()->getCalendar( id ); | 229 | KopiCalendarFile * kkf = KOPrefs::instance()->getCalendar( id ); |
229 | QString name = kkf->mName; | 230 | QString name = kkf->mName; |
230 | QString file = kkf->mFileName; | 231 | QString file = kkf->mFileName; |
231 | if ( KMessageBox::warningContinueCancel( this, i18n("The calendar <b>%1</b> is displaying file <b>%2</b><tr> Do you want to remove this calendar from KO/Pi? (The file is not removed, of course!)").arg(name).arg(file) ) != KMessageBox::Continue ) return; | 232 | if ( KMessageBox::warningContinueCancel( this, i18n("The calendar<tr><b>%1</b><tr>is displaying file<tr><b>%2</b><tr>Do you want to remove<tr>this calendar from KO/Pi?<tr>(The file is not removed!)").arg(name).arg(file) ) != KMessageBox::Continue ) return; |
232 | if ( kkf->isStandard ) | 233 | if ( kkf->isStandard ) |
233 | selectStdCal( 1, true ); | 234 | selectStdCal( 1, true ); |
234 | emit removeCalendar ( id ); | 235 | emit removeCalendar ( id ); |
@@ -241,14 +242,14 @@ void KOCalEditView::infoCal( int id ) | |||
241 | QString name = KOPrefs::instance()->getCalendar( id )->mName; | 242 | QString name = KOPrefs::instance()->getCalendar( id )->mName; |
242 | QString file = KOPrefs::instance()->getCalendar( id )->mFileName; | 243 | QString file = KOPrefs::instance()->getCalendar( id )->mFileName; |
243 | if ( KOPrefs::instance()->getCalendar( id )->mErrorOnLoad ) { | 244 | if ( KOPrefs::instance()->getCalendar( id )->mErrorOnLoad ) { |
244 | if ( KMessageBox::Yes == KMessageBox::questionYesNo( this, i18n("The calendar <b>%1</b> is not loaded! Loading of file <b>%2</b> failed! <b>Try again to load the calendar?</b>").arg(name).arg(file) ) ) { | 245 | if ( KMessageBox::Yes == KMessageBox::questionYesNo( this, i18n("The calendar <tr><b>%1</b><tr> is not loaded! Loading of file <tr><b>%2</b><tr> failed! <tr><b>Try again to load the calendar?</b>").arg(name).arg(file) ) ) { |
245 | emit calendarAdded( id ); | 246 | emit calendarAdded( id ); |
246 | emit needsUpdate(); | 247 | emit needsUpdate(); |
247 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); | 248 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); |
248 | } | 249 | } |
249 | } | 250 | } |
250 | else | 251 | else |
251 | KMessageBox::information( this, i18n("The calendar <b>%1</b> is displaying file <b>%2</b>").arg(name).arg(file) ); | 252 | KMessageBox::information( this, i18n("The calendar <tr><b>%1</b><tr>is displaying file<tr><b>%2</b>").arg(name).arg(file) ); |
252 | } | 253 | } |
253 | void KOCalEditView::readConfig() | 254 | void KOCalEditView::readConfig() |
254 | { | 255 | { |
@@ -266,12 +267,14 @@ void KOCalEditView::readConfig() | |||
266 | mainLayout->setMargin( 3); | 267 | mainLayout->setMargin( 3); |
267 | mainLayout->setSpacing( 2); | 268 | mainLayout->setSpacing( 2); |
268 | QPushButton * addBut = new QPushButton ( mw ); | 269 | QPushButton * addBut = new QPushButton ( mw ); |
270 | addBut->setFocusPolicy(NoFocus); | ||
269 | mainLayout->addWidget( addBut,0,0 ); | 271 | mainLayout->addWidget( addBut,0,0 ); |
270 | addBut->setPixmap ( SmallIcon("plus")); | 272 | addBut->setPixmap ( SmallIcon("plus")); |
271 | connect(addBut,SIGNAL(clicked()),SLOT(addCal())); | 273 | connect(addBut,SIGNAL(clicked()),SLOT(addCal())); |
272 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | 274 | addBut->setMaximumWidth( addBut->sizeHint().height() ); |
273 | 275 | ||
274 | addBut = new QPushButton ( mw ); | 276 | addBut = new QPushButton ( mw ); |
277 | addBut->setFocusPolicy(NoFocus); | ||
275 | mainLayout->addWidget( addBut,0,1 ); | 278 | mainLayout->addWidget( addBut,0,1 ); |
276 | addBut->setPixmap ( SmallIcon("eye")); | 279 | addBut->setPixmap ( SmallIcon("eye")); |
277 | connect(addBut,SIGNAL(clicked()),SLOT(enableAll())); | 280 | connect(addBut,SIGNAL(clicked()),SLOT(enableAll())); |
@@ -283,12 +286,14 @@ void KOCalEditView::readConfig() | |||
283 | mainLayout->addWidget( lab,0,3 ); | 286 | mainLayout->addWidget( lab,0,3 ); |
284 | lab->setFixedWidth( 6 ); | 287 | lab->setFixedWidth( 6 ); |
285 | addBut = new QPushButton ( mw ); | 288 | addBut = new QPushButton ( mw ); |
289 | addBut->setFocusPolicy(NoFocus); | ||
286 | mainLayout->addWidget( addBut,0,4 ); | 290 | mainLayout->addWidget( addBut,0,4 ); |
287 | addBut->setPixmap ( SmallIcon("bell")); | 291 | addBut->setPixmap ( SmallIcon("bell")); |
288 | connect(addBut,SIGNAL(clicked()),SLOT(enableAlarm())); | 292 | connect(addBut,SIGNAL(clicked()),SLOT(enableAlarm())); |
289 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | 293 | addBut->setMaximumWidth( addBut->sizeHint().height() ); |
290 | 294 | ||
291 | addBut = new QPushButton ( mw ); | 295 | addBut = new QPushButton ( mw ); |
296 | addBut->setFocusPolicy(NoFocus); | ||
292 | mainLayout->addWidget( addBut,0,5 ); | 297 | mainLayout->addWidget( addBut,0,5 ); |
293 | addBut->setPixmap ( SmallIcon("pencil")); | 298 | addBut->setPixmap ( SmallIcon("pencil")); |
294 | connect(addBut,SIGNAL(clicked()),SLOT(disableRO())); | 299 | connect(addBut,SIGNAL(clicked()),SLOT(disableRO())); |
diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h index e2ebdd4..3ab316f 100644 --- a/korganizer/kofilterview.h +++ b/korganizer/kofilterview.h | |||
@@ -45,6 +45,7 @@ class KOCalButton : public QPushButton | |||
45 | connect( this, SIGNAL( clicked() ), | 45 | connect( this, SIGNAL( clicked() ), |
46 | SLOT( bottonClicked() )); | 46 | SLOT( bottonClicked() )); |
47 | mNumber = -1; | 47 | mNumber = -1; |
48 | setFocusPolicy(NoFocus); | ||
48 | } | 49 | } |
49 | void setNum ( int num ) {mNumber = num; } | 50 | void setNum ( int num ) {mNumber = num; } |
50 | signals: | 51 | signals: |
@@ -69,6 +70,7 @@ class KOCalCheckButton : public QCheckBox | |||
69 | connect( this, SIGNAL( toggled ( bool ) ), | 70 | connect( this, SIGNAL( toggled ( bool ) ), |
70 | SLOT( bottonClicked( bool ) )); | 71 | SLOT( bottonClicked( bool ) )); |
71 | mNumber = -1; | 72 | mNumber = -1; |
73 | setFocusPolicy(NoFocus); | ||
72 | //setMaximumWidth( 10 ); | 74 | //setMaximumWidth( 10 ); |
73 | 75 | ||
74 | } | 76 | } |