-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 | |||
@@ -83,13 +83,13 @@ b) Give your device a unique name. | |||
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. |
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp index 347d982..ead8628 100644 --- a/korganizer/kotodoviewitem.cpp +++ b/korganizer/kotodoviewitem.cpp | |||
@@ -191,15 +191,15 @@ void KOTodoViewItem::setMyPixmap() | |||
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; |
@@ -246,14 +246,14 @@ void KOTodoViewItem::stateChange(bool state) | |||
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()); |
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 | |||
@@ -1906,15 +1906,23 @@ void KListView::emitContextMenu (KListView*, QListViewItem* i) | |||
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); |
@@ -1 +1 @@ | |||
version = "1.9.19"; | version = "1.9.20"; | ||