author | zautrix <zautrix> | 2005-01-21 15:38:31 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-21 15:38:31 (UTC) |
commit | 4afdcfcac216b428ada79f4750cf7447e3175333 (patch) (unidiff) | |
tree | 8f70936ac23137c3f6fb00fce33edbfe3d821f59 | |
parent | 234b9425bebd41b556277cdd94138fafecc32b45 (diff) | |
download | kdepimpi-4afdcfcac216b428ada79f4750cf7447e3175333.zip kdepimpi-4afdcfcac216b428ada79f4750cf7447e3175333.tar.gz kdepimpi-4afdcfcac216b428ada79f4750cf7447e3175333.tar.bz2 |
some fixes
-rw-r--r-- | bin/kdepim/SyncHowto.txt | 2 | ||||
-rw-r--r-- | korganizer/kotodoviewitem.cpp | 6 | ||||
-rw-r--r-- | microkde/kdeui/klistview.cpp | 14 | ||||
-rw-r--r-- | version | 2 |
4 files changed, 16 insertions, 8 deletions
diff --git a/bin/kdepim/SyncHowto.txt b/bin/kdepim/SyncHowto.txt index 64f6f14..b0473a1 100644 --- a/bin/kdepim/SyncHowto.txt +++ b/bin/kdepim/SyncHowto.txt | |||
@@ -77,25 +77,25 @@ b) Give your device a unique name. | |||
77 | the same name as this sync profile! The same name is important, | 77 | the same name as this sync profile! The same name is important, |
78 | because it makes it possible to sync first A->B | 78 | because it makes it possible to sync first A->B |
79 | (A local device, that performs the sync, B remote device) | 79 | (A local device, that performs the sync, B remote device) |
80 | and then B->A. Such that the B->A sync knows about the | 80 | and then B->A. Such that the B->A sync knows about the |
81 | already performed A->B sync. | 81 | already performed A->B sync. |
82 | That means: It is unimportant if you sync A->B or B->A, | 82 | That means: It is unimportant if you sync A->B or B->A, |
83 | the devices A and B will be synced properly. | 83 | the devices A and B will be synced properly. |
84 | c) Create a new sync profile and give it a unique name. | 84 | c) Create a new sync profile and give it a unique name. |
85 | (unique in the set of all sync profiles on this device). | 85 | (unique in the set of all sync profiles on this device). |
86 | If you want to sync with a device, where KO/Pi is already installed | 86 | If you want to sync with a device, where KO/Pi is already installed |
87 | and which has a given unique device name, use this device name as | 87 | and which has a given unique device name, use this device name as |
88 | your profile name ( refer to b) ). | 88 | your profile name ( refer to b) ). |
89 | d) Coose the profile kind of your syncing method: | 89 | d) Choose the profile kind of your syncing method: |
90 | (i) Local file or | 90 | (i) Local file or |
91 | (ii) Pi-Sync or | 91 | (ii) Pi-Sync or |
92 | (iii) Remote file or | 92 | (iii) Remote file or |
93 | (iiii) Mobile Phone. | 93 | (iiii) Mobile Phone. |
94 | Detailed explanation in 6) | 94 | Detailed explanation in 6) |
95 | e) Choose the other profile options. | 95 | e) Choose the other profile options. |
96 | Detailed explanation in 2) | 96 | Detailed explanation in 2) |
97 | f) Close sync dialog with OK. | 97 | f) Close sync dialog with OK. |
98 | g) Sync. | 98 | g) Sync. |
99 | 99 | ||
100 | NOTE: | 100 | NOTE: |
101 | AFTER SYNCING THERE ARE "SYNC EVENTS" CREATED | 101 | AFTER SYNCING THERE ARE "SYNC EVENTS" CREATED |
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp index 347d982..ead8628 100644 --- a/korganizer/kotodoviewitem.cpp +++ b/korganizer/kotodoviewitem.cpp | |||
@@ -185,27 +185,27 @@ void KOTodoViewItem::setMyPixmap() | |||
185 | } | 185 | } |
186 | if ( mTodo->isAlarmEnabled() ) { | 186 | if ( mTodo->isAlarmEnabled() ) { |
187 | pixi.resize(size, pixSize+size); | 187 | pixi.resize(size, pixSize+size); |
188 | pPix.fill( Qt::red ); | 188 | pPix.fill( Qt::red ); |
189 | p.begin( &pixi ); | 189 | p.begin( &pixi ); |
190 | p. drawPixmap ( 0, pixSize, pPix); | 190 | p. drawPixmap ( 0, pixSize, pPix); |
191 | p.end(); | 191 | p.end(); |
192 | pixSize += size; | 192 | pixSize += size; |
193 | } | 193 | } |
194 | // } | 194 | // } |
195 | if ( pixi.width() > 1 ) { | 195 | if ( pixi.width() > 1 ) { |
196 | setPixmap ( 0,pixi ) ; | 196 | setPixmap ( 0,pixi ) ; |
197 | } else { | ||
198 | setPixmap ( 0,QPixmap() ) ; | ||
197 | } | 199 | } |
198 | |||
199 | |||
200 | } | 200 | } |
201 | void KOTodoViewItem::stateChange(bool state) | 201 | void KOTodoViewItem::stateChange(bool state) |
202 | { | 202 | { |
203 | // qDebug("KOTodoViewItem::stateChange "); | 203 | // qDebug("KOTodoViewItem::stateChange "); |
204 | // do not change setting on startup | 204 | // do not change setting on startup |
205 | if ( m_init ) return; | 205 | if ( m_init ) return; |
206 | 206 | ||
207 | kdDebug() << "State changed, modified " << state << endl; | 207 | kdDebug() << "State changed, modified " << state << endl; |
208 | QString keyd = "=="; | 208 | QString keyd = "=="; |
209 | QString keyt = "=="; | 209 | QString keyt = "=="; |
210 | 210 | ||
211 | if (state) mTodo->setCompleted(state); | 211 | if (state) mTodo->setCompleted(state); |
@@ -240,26 +240,26 @@ void KOTodoViewItem::stateChange(bool state) | |||
240 | else { | 240 | else { |
241 | if (mTodo->isCompleted()) setSortKey(2,QString::number(999)); | 241 | if (mTodo->isCompleted()) setSortKey(2,QString::number(999)); |
242 | else setSortKey(2,QString::number(99)); | 242 | else setSortKey(2,QString::number(99)); |
243 | } | 243 | } |
244 | QListViewItem * myChild = firstChild(); | 244 | QListViewItem * myChild = firstChild(); |
245 | KOTodoViewItem *item; | 245 | KOTodoViewItem *item; |
246 | while( myChild ) { | 246 | while( myChild ) { |
247 | item = static_cast<KOTodoViewItem*>(myChild); | 247 | item = static_cast<KOTodoViewItem*>(myChild); |
248 | item->stateChange(state); | 248 | item->stateChange(state); |
249 | myChild = myChild->nextSibling(); | 249 | myChild = myChild->nextSibling(); |
250 | } | 250 | } |
251 | mTodoView->modified(true); | 251 | mTodoView->modified(true); |
252 | mTodoView->setTodoModified( mTodo ); | ||
253 | setMyPixmap(); | 252 | setMyPixmap(); |
253 | mTodoView->setTodoModified( mTodo ); | ||
254 | } | 254 | } |
255 | 255 | ||
256 | bool KOTodoViewItem::isAlternate() | 256 | bool KOTodoViewItem::isAlternate() |
257 | { | 257 | { |
258 | #ifndef KORG_NOLVALTERNATION | 258 | #ifndef KORG_NOLVALTERNATION |
259 | KOTodoListView *lv = static_cast<KOTodoListView *>(listView()); | 259 | KOTodoListView *lv = static_cast<KOTodoListView *>(listView()); |
260 | if (lv && lv->alternateBackground().isValid()) | 260 | if (lv && lv->alternateBackground().isValid()) |
261 | { | 261 | { |
262 | KOTodoViewItem *above = 0; | 262 | KOTodoViewItem *above = 0; |
263 | above = dynamic_cast<KOTodoViewItem *>(itemAbove()); | 263 | above = dynamic_cast<KOTodoViewItem *>(itemAbove()); |
264 | m_known = above ? above->m_known : true; | 264 | m_known = above ? above->m_known : true; |
265 | if (m_known) | 265 | if (m_known) |
diff --git a/microkde/kdeui/klistview.cpp b/microkde/kdeui/klistview.cpp index 6859d36..154cd02 100644 --- a/microkde/kdeui/klistview.cpp +++ b/microkde/kdeui/klistview.cpp | |||
@@ -1900,27 +1900,35 @@ void KListView::emitContextMenu (KListView*, QListViewItem* i) | |||
1900 | // qDebug("KListView::emitContextMenu "); | 1900 | // qDebug("KListView::emitContextMenu "); |
1901 | 1901 | ||
1902 | if (i) | 1902 | if (i) |
1903 | p = viewport()->mapToGlobal(itemRect(i).center()); | 1903 | p = viewport()->mapToGlobal(itemRect(i).center()); |
1904 | else | 1904 | else |
1905 | p = mapToGlobal(rect().center()); | 1905 | p = mapToGlobal(rect().center()); |
1906 | 1906 | ||
1907 | emit contextMenu (this, i, p); | 1907 | emit contextMenu (this, i, p); |
1908 | } | 1908 | } |
1909 | 1909 | ||
1910 | void KListView::emitContextMenu (QListViewItem* i, const QPoint& p, int col) | 1910 | void KListView::emitContextMenu (QListViewItem* i, const QPoint& p, int col) |
1911 | { | 1911 | { |
1912 | // qDebug("KListView::emitContextMenu col"); | 1912 | QListViewItem* item = i; |
1913 | emit contextRequest( i, p, col ); | 1913 | int c = col; |
1914 | emit contextMenu (this, i, p); | 1914 | // do not trust the values for QListViewItem* i and int col; |
1915 | // qDebug("KListView::emitContextMenu col"); | ||
1916 | if ( col == -1 ) { | ||
1917 | QPoint pp = viewport()->mapFromGlobal(p); | ||
1918 | item = itemAt( pp); | ||
1919 | c = header()->sectionAt(pp.x() ); | ||
1920 | } | ||
1921 | emit contextRequest( item, p, c ); | ||
1922 | emit contextMenu (this, item, p); | ||
1915 | } | 1923 | } |
1916 | 1924 | ||
1917 | void KListView::setAcceptDrops (bool val) | 1925 | void KListView::setAcceptDrops (bool val) |
1918 | { | 1926 | { |
1919 | QListView::setAcceptDrops (val); | 1927 | QListView::setAcceptDrops (val); |
1920 | viewport()->setAcceptDrops (val); | 1928 | viewport()->setAcceptDrops (val); |
1921 | } | 1929 | } |
1922 | 1930 | ||
1923 | int KListView::dropVisualizerWidth () const | 1931 | int KListView::dropVisualizerWidth () const |
1924 | { | 1932 | { |
1925 | return d->mDropVisualizerWidth; | 1933 | return d->mDropVisualizerWidth; |
1926 | } | 1934 | } |
@@ -1 +1 @@ | |||
version = "1.9.19"; | version = "1.9.20"; | ||