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 | |
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 | |||
@@ -130,48 +130,49 @@ void KOFilterView::setSelectedFilter(QString filterName) | |||
130 | if (mSelectionCombo->text(i)==filterName) | 130 | if (mSelectionCombo->text(i)==filterName) |
131 | mSelectionCombo->setCurrentItem(i); | 131 | mSelectionCombo->setCurrentItem(i); |
132 | } | 132 | } |
133 | emit filterChanged(); | 133 | emit filterChanged(); |
134 | } | 134 | } |
135 | void KOFilterView::setSelectedFilter( int fil ) | 135 | void KOFilterView::setSelectedFilter( int fil ) |
136 | { | 136 | { |
137 | if ( fil >= mSelectionCombo->count() ) | 137 | if ( fil >= mSelectionCombo->count() ) |
138 | return; | 138 | return; |
139 | mSelectionCombo->setCurrentItem( fil ); | 139 | mSelectionCombo->setCurrentItem( fil ); |
140 | emit filterChanged(); | 140 | emit filterChanged(); |
141 | } | 141 | } |
142 | 142 | ||
143 | 143 | ||
144 | 144 | ||
145 | KOCalEditView::KOCalEditView(QWidget* parent, | 145 | KOCalEditView::KOCalEditView(QWidget* parent, |
146 | const char* name ) | 146 | const char* name ) |
147 | : QScrollView(parent,name) | 147 | : QScrollView(parent,name) |
148 | { | 148 | { |
149 | mw = 0; | 149 | mw = 0; |
150 | setResizePolicy( AutoOneFit ); | 150 | setResizePolicy( AutoOneFit ); |
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() |
157 | { | 158 | { |
158 | // no need to delete child widgets, Qt does it all for us | 159 | // no need to delete child widgets, Qt does it all for us |
159 | } | 160 | } |
160 | void KOCalEditView::selectCal(int id ,bool b) | 161 | void KOCalEditView::selectCal(int id ,bool b) |
161 | { | 162 | { |
162 | KOPrefs::instance()->getCalendar( id )->isEnabled = b; | 163 | KOPrefs::instance()->getCalendar( id )->isEnabled = b; |
163 | emit calendarEnabled ( id, b ); | 164 | emit calendarEnabled ( id, b ); |
164 | emit needsUpdate(); | 165 | emit needsUpdate(); |
165 | 166 | ||
166 | } | 167 | } |
167 | void KOCalEditView::selectStdCal( int id, bool b ) | 168 | void KOCalEditView::selectStdCal( int id, bool b ) |
168 | { | 169 | { |
169 | 170 | ||
170 | if ( !b ) { | 171 | if ( !b ) { |
171 | KOCalCheckButton* it = (KOCalCheckButton*) sender(); | 172 | KOCalCheckButton* it = (KOCalCheckButton*) sender(); |
172 | if ( it ) { | 173 | if ( it ) { |
173 | it->blockSignals( true ); | 174 | it->blockSignals( true ); |
174 | it->setChecked( true ); | 175 | it->setChecked( true ); |
175 | it->blockSignals( false ); | 176 | it->blockSignals( false ); |
176 | return; | 177 | return; |
177 | } | 178 | } |
@@ -207,109 +208,113 @@ void KOCalEditView::selectCalAlarm(int id ,bool b ) | |||
207 | } | 208 | } |
208 | void KOCalEditView::selectReadOnly(int id ,bool b ) | 209 | void KOCalEditView::selectReadOnly(int id ,bool b ) |
209 | { | 210 | { |
210 | KOPrefs::instance()->getCalendar( id )->isReadOnly = b; | 211 | KOPrefs::instance()->getCalendar( id )->isReadOnly = b; |
211 | emit calendarReadonly ( id , b ); | 212 | emit calendarReadonly ( id , b ); |
212 | if ( KOPrefs::instance()->getCalendar( id )->isStandard && b && id > 1 ) { | 213 | if ( KOPrefs::instance()->getCalendar( id )->isStandard && b && id > 1 ) { |
213 | KOPrefs::instance()->getCalendar( id )->isStandard = false; | 214 | KOPrefs::instance()->getCalendar( id )->isStandard = false; |
214 | KOPrefs::instance()->getCalendar( 1 )->isStandard = true; | 215 | KOPrefs::instance()->getCalendar( 1 )->isStandard = true; |
215 | emit setCalendarDefault ( 1 ); | 216 | emit setCalendarDefault ( 1 ); |
216 | } | 217 | } |
217 | emit needsUpdate(); | 218 | emit needsUpdate(); |
218 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); | 219 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); |
219 | 220 | ||
220 | } | 221 | } |
221 | void KOCalEditView::setColor( const QColor& c, int id ) | 222 | void KOCalEditView::setColor( const QColor& c, int id ) |
222 | { | 223 | { |
223 | KOPrefs::instance()->getCalendar( id )->mDefaultColor = c; | 224 | KOPrefs::instance()->getCalendar( id )->mDefaultColor = c; |
224 | emit needsUpdate(); | 225 | emit needsUpdate(); |
225 | } | 226 | } |
226 | void KOCalEditView::deleteCal( int id ) | 227 | void KOCalEditView::deleteCal( int id ) |
227 | { | 228 | { |
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 ); |
235 | KOPrefs::instance()->mCalendars.remove ( kkf ); | 236 | KOPrefs::instance()->mCalendars.remove ( kkf ); |
236 | emit needsUpdate(); | 237 | emit needsUpdate(); |
237 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); | 238 | QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); |
238 | } | 239 | } |
239 | void KOCalEditView::infoCal( int id ) | 240 | void KOCalEditView::infoCal( int id ) |
240 | { | 241 | { |
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 | { |
255 | 256 | ||
256 | mStdandardB.clear(); | 257 | mStdandardB.clear(); |
257 | mEnabledB.clear(); | 258 | mEnabledB.clear(); |
258 | mAlarmB.clear(); | 259 | mAlarmB.clear(); |
259 | mROB.clear(); | 260 | mROB.clear(); |
260 | 261 | ||
261 | if ( mw ) delete mw; | 262 | if ( mw ) delete mw; |
262 | mw = new QWidget ( viewport() ); | 263 | mw = new QWidget ( viewport() ); |
263 | addChild(mw); | 264 | addChild(mw); |
264 | 265 | ||
265 | mainLayout = new QGridLayout ( mw , 2, 8 ); | 266 | mainLayout = new QGridLayout ( mw , 2, 8 ); |
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())); |
278 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | 281 | addBut->setMaximumWidth( addBut->sizeHint().height() ); |
279 | 282 | ||
280 | QLabel* lab = new QLabel (i18n(" Calendar \n Resource "), mw ); | 283 | QLabel* lab = new QLabel (i18n(" Calendar \n Resource "), mw ); |
281 | mainLayout->addWidget( lab,0,2 ); | 284 | mainLayout->addWidget( lab,0,2 ); |
282 | lab = new QLabel ( i18n(" "), mw ); | 285 | lab = new QLabel ( i18n(" "), mw ); |
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())); |
295 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | 300 | addBut->setMaximumWidth( addBut->sizeHint().height() ); |
296 | 301 | ||
297 | lab = new QLabel ( i18n(" Color "), mw ); | 302 | lab = new QLabel ( i18n(" Color "), mw ); |
298 | mainLayout->addWidget( lab,0,6 ); | 303 | mainLayout->addWidget( lab,0,6 ); |
299 | #if 0 | 304 | #if 0 |
300 | addBut = new QPushButton ( mw ); | 305 | addBut = new QPushButton ( mw ); |
301 | mainLayout->addWidget( addBut,0,6 ); | 306 | mainLayout->addWidget( addBut,0,6 ); |
302 | addBut->setPixmap ( SmallIcon("minus")); | 307 | addBut->setPixmap ( SmallIcon("minus")); |
303 | connect(addBut,SIGNAL(clicked()),SLOT(deleteAll())); | 308 | connect(addBut,SIGNAL(clicked()),SLOT(deleteAll())); |
304 | addBut->setMaximumWidth( addBut->sizeHint().height() ); | 309 | addBut->setMaximumWidth( addBut->sizeHint().height() ); |
305 | #endif | 310 | #endif |
306 | 311 | ||
307 | 312 | ||
308 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); | 313 | KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); |
309 | int row = 1; | 314 | int row = 1; |
310 | while ( kkf ) { | 315 | while ( kkf ) { |
311 | int iii = 0; | 316 | int iii = 0; |
312 | KOCalCheckButton* cb = new KOCalCheckButton( mw ); | 317 | KOCalCheckButton* cb = new KOCalCheckButton( mw ); |
313 | mainLayout->addWidget( cb,row,0 );mStdandardB.append( cb ); | 318 | mainLayout->addWidget( cb,row,0 );mStdandardB.append( cb ); |
314 | cb->setChecked( kkf->isStandard ); | 319 | cb->setChecked( kkf->isStandard ); |
315 | cb->setNum( kkf->mCalNumber ); | 320 | cb->setNum( kkf->mCalNumber ); |
diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h index e2ebdd4..3ab316f 100644 --- a/korganizer/kofilterview.h +++ b/korganizer/kofilterview.h | |||
@@ -24,72 +24,74 @@ | |||
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 <qscrollview.h> | 28 | #include <qscrollview.h> |
29 | #include <qpushbutton.h> | 29 | #include <qpushbutton.h> |
30 | #include <kconfig.h> | 30 | #include <kconfig.h> |
31 | #include "kofilterview_base.h" | 31 | #include "kofilterview_base.h" |
32 | 32 | ||
33 | #include <libkcal/calfilter.h> | 33 | #include <libkcal/calfilter.h> |
34 | 34 | ||
35 | class QGridLayout; | 35 | class QGridLayout; |
36 | 36 | ||
37 | using namespace KCal; | 37 | using namespace KCal; |
38 | class KOCalButton : public QPushButton | 38 | class KOCalButton : public QPushButton |
39 | { | 39 | { |
40 | Q_OBJECT | 40 | Q_OBJECT |
41 | public: | 41 | public: |
42 | KOCalButton( QWidget *parent=0, const char *name=0 ) : | 42 | KOCalButton( QWidget *parent=0, const char *name=0 ) : |
43 | QPushButton( parent, name) | 43 | QPushButton( parent, name) |
44 | { | 44 | { |
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: |
51 | void selectNum ( int ); | 52 | void selectNum ( int ); |
52 | private: | 53 | private: |
53 | int mNumber; | 54 | int mNumber; |
54 | void keyPressEvent ( QKeyEvent * e ) | 55 | void keyPressEvent ( QKeyEvent * e ) |
55 | { | 56 | { |
56 | e->ignore(); | 57 | e->ignore(); |
57 | } | 58 | } |
58 | 59 | ||
59 | private slots : | 60 | private slots : |
60 | void bottonClicked() { if ( mNumber > 0 ) emit selectNum ( mNumber ); } | 61 | void bottonClicked() { if ( mNumber > 0 ) emit selectNum ( mNumber ); } |
61 | }; | 62 | }; |
62 | class KOCalCheckButton : public QCheckBox | 63 | class KOCalCheckButton : public QCheckBox |
63 | { | 64 | { |
64 | Q_OBJECT | 65 | Q_OBJECT |
65 | public: | 66 | public: |
66 | KOCalCheckButton( QWidget *parent=0, const char *name=0 ) : | 67 | KOCalCheckButton( QWidget *parent=0, const char *name=0 ) : |
67 | QCheckBox( parent, name) | 68 | QCheckBox( parent, name) |
68 | { | 69 | { |
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 | } |
75 | void setNum ( int num ) {mNumber = num; } | 77 | void setNum ( int num ) {mNumber = num; } |
76 | signals: | 78 | signals: |
77 | void selectNum ( int, bool ); | 79 | void selectNum ( int, bool ); |
78 | private: | 80 | private: |
79 | int mNumber; | 81 | int mNumber; |
80 | void keyPressEvent ( QKeyEvent * e ) | 82 | void keyPressEvent ( QKeyEvent * e ) |
81 | { | 83 | { |
82 | e->ignore(); | 84 | e->ignore(); |
83 | } | 85 | } |
84 | 86 | ||
85 | private slots : | 87 | private slots : |
86 | void bottonClicked( bool b) { if ( mNumber > 0 ) emit selectNum ( mNumber , b); } | 88 | void bottonClicked( bool b) { if ( mNumber > 0 ) emit selectNum ( mNumber , b); } |
87 | }; | 89 | }; |
88 | 90 | ||
89 | 91 | ||
90 | 92 | ||
91 | class KOFilterView : public KOFilterView_base | 93 | class KOFilterView : public KOFilterView_base |
92 | { | 94 | { |
93 | Q_OBJECT | 95 | Q_OBJECT |
94 | public: | 96 | public: |
95 | KOFilterView(QPtrList<CalFilter> *filterList,QWidget* parent=0,const char* name=0, WFlags fl=0); | 97 | KOFilterView(QPtrList<CalFilter> *filterList,QWidget* parent=0,const char* name=0, WFlags fl=0); |