author | zautrix <zautrix> | 2005-04-04 13:27:55 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-04 13:27:55 (UTC) |
commit | 13fa1e5e1d5e4663bbbc79e0c68caf725ad2e31b (patch) (unidiff) | |
tree | 956518730f29846d70544142b6875636713a8b9b /korganizer | |
parent | 919f1060a9ef41e6c865f28132cf9e82c3f67409 (diff) | |
download | kdepimpi-13fa1e5e1d5e4663bbbc79e0c68caf725ad2e31b.zip kdepimpi-13fa1e5e1d5e4663bbbc79e0c68caf725ad2e31b.tar.gz kdepimpi-13fa1e5e1d5e4663bbbc79e0c68caf725ad2e31b.tar.bz2 |
monthview fix
-rw-r--r-- | korganizer/komonthview.cpp | 25 | ||||
-rw-r--r-- | korganizer/komonthview.h | 3 |
2 files changed, 27 insertions, 1 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index ab9a4b6..9f7db69 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -80,17 +80,39 @@ KNoScrollListBox::KNoScrollListBox(QWidget *parent,const char *name) | |||
80 | : QListBox(parent, name, WRepaintNoErase) | 80 | : QListBox(parent, name, WRepaintNoErase) |
81 | { | 81 | { |
82 | #ifndef DESKTOP_VERSION | 82 | #ifndef DESKTOP_VERSION |
83 | QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold ); | 83 | QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold ); |
84 | #endif | 84 | #endif |
85 | mWT = new KNOWhatsThis(this); | 85 | mWT = new KNOWhatsThis(this); |
86 | resetOnFocusIn = true; | ||
86 | } | 87 | } |
87 | KNoScrollListBox::~KNoScrollListBox() | 88 | KNoScrollListBox::~KNoScrollListBox() |
88 | { | 89 | { |
89 | 90 | ||
90 | } | 91 | } |
92 | |||
93 | |||
94 | void KNoScrollListBox::focusInEvent ( QFocusEvent * e ) | ||
95 | { | ||
96 | QListBox::focusInEvent ( e ); | ||
97 | QListBoxItem * i = item ( 0 ); | ||
98 | if ( i && resetOnFocusIn ) { | ||
99 | setCurrentItem( i ); | ||
100 | setSelected ( 0, true ); | ||
101 | } | ||
102 | resetOnFocusIn = true; | ||
103 | } | ||
104 | void KNoScrollListBox::focusOutEvent ( QFocusEvent * e ) | ||
105 | { | ||
106 | int i = currentItem (); | ||
107 | if ( i >= 0 ) { | ||
108 | setSelected ( i, false ); | ||
109 | } | ||
110 | QListBox::focusOutEvent ( e ); | ||
111 | } | ||
112 | |||
91 | QString KNoScrollListBox::getWhatsThisText(QPoint p) | 113 | QString KNoScrollListBox::getWhatsThisText(QPoint p) |
92 | { | 114 | { |
93 | QListBoxItem* item = itemAt ( p ); | 115 | QListBoxItem* item = itemAt ( p ); |
94 | if ( ! item ) { | 116 | if ( ! item ) { |
95 | return i18n("Click in the cell\nto add an event!"); | 117 | return i18n("Click in the cell\nto add an event!"); |
96 | } | 118 | } |
@@ -149,13 +171,13 @@ void KNoScrollListBox::keyPressEvent(QKeyEvent *e) | |||
149 | setTopItem(topItem()+1); | 171 | setTopItem(topItem()+1); |
150 | } | 172 | } |
151 | } | 173 | } |
152 | } | 174 | } |
153 | break; | 175 | break; |
154 | case Key_I: | 176 | case Key_I: |
155 | QTimer::singleShot( 11, this, SLOT ( oneDown() ) ); | 177 | QTimer::singleShot( 1, this, SLOT ( oneDown() ) ); |
156 | e->ignore(); | 178 | e->ignore(); |
157 | break; | 179 | break; |
158 | case Key_Return: | 180 | case Key_Return: |
159 | case Key_Enter: | 181 | case Key_Enter: |
160 | { | 182 | { |
161 | if ( currentItem() >= 0 ) { | 183 | if ( currentItem() >= 0 ) { |
@@ -175,12 +197,13 @@ void KNoScrollListBox::keyPressEvent(QKeyEvent *e) | |||
175 | } | 197 | } |
176 | } | 198 | } |
177 | 199 | ||
178 | void KNoScrollListBox::oneDown() | 200 | void KNoScrollListBox::oneDown() |
179 | { | 201 | { |
180 | if ( count () ) { | 202 | if ( count () ) { |
203 | resetOnFocusIn = false; | ||
181 | setCurrentItem((currentItem()+1)%count()); | 204 | setCurrentItem((currentItem()+1)%count()); |
182 | if(!itemVisible(currentItem())) { | 205 | if(!itemVisible(currentItem())) { |
183 | if(currentItem() == 0) { | 206 | if(currentItem() == 0) { |
184 | setTopItem(0); | 207 | setTopItem(0); |
185 | } else { | 208 | } else { |
186 | setTopItem(topItem()+1); | 209 | setTopItem(topItem()+1); |
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h index 88050fe..e04cdf5 100644 --- a/korganizer/komonthview.h +++ b/korganizer/komonthview.h | |||
@@ -85,14 +85,17 @@ class KNoScrollListBox: public QListBox | |||
85 | 85 | ||
86 | protected slots: | 86 | protected slots: |
87 | void oneDown(); | 87 | void oneDown(); |
88 | void keyPressEvent(QKeyEvent *); | 88 | void keyPressEvent(QKeyEvent *); |
89 | void keyReleaseEvent(QKeyEvent *); | 89 | void keyReleaseEvent(QKeyEvent *); |
90 | void mousePressEvent(QMouseEvent *); | 90 | void mousePressEvent(QMouseEvent *); |
91 | void focusInEvent ( QFocusEvent * ); | ||
92 | void focusOutEvent ( QFocusEvent * ); | ||
91 | 93 | ||
92 | private: | 94 | private: |
95 | bool resetOnFocusIn; | ||
93 | KNOWhatsThis * mWT; | 96 | KNOWhatsThis * mWT; |
94 | }; | 97 | }; |
95 | 98 | ||
96 | 99 | ||
97 | class MonthViewItem: public QListBoxItem | 100 | class MonthViewItem: public QListBoxItem |
98 | { | 101 | { |