projects
/
pywienerlinien
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
814c88a
ee6d0b1
)
Merge branch 'master' of github.com:kelvan/gotoVienna
author
Florian Schweikert
<kelvan@logic.at>
Wed, 4 May 2011 13:27:58 +0000
(15:27 +0200)
committer
Florian Schweikert
<kelvan@logic.at>
Wed, 4 May 2011 13:27:58 +0000
(15:27 +0200)
Conflicts:
wlSearch.py
1
2
wlSearch.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
wlSearch.py
index
599f065
,
8b99c90
..
5b5e7f9
---
1
/
wlSearch.py
---
2
/
wlSearch.py
+++ b/
wlSearch.py
@@@
-9,9
-9,10
+9,10
@@@
import urllib
from parseHtml import Parser
+ from PySide.QtCore import Qt
from PySide.QtDeclarative import QDeclarativeView
-def QMLModel(overview):
+def QMLModel(overview, details):
# Mapping from the "overview" data structure to a "plain" data
# structure to be used as model for the qml listview
r = []