[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [okular/mart/okularActive] active: updates decoration
From: Marco Martin <notmart () gmail ! com>
Date: 2012-07-31 19:33:37
Message-ID: 20120731193337.C3D2FA6094 () git ! kde ! org
[Download RAW message or body]
Git commit 407921c33e579e025f5c080443aa65fb4e4eac08 by Marco Martin.
Committed on 31/07/2012 at 21:33.
Pushed by mart into branch 'mart/okularActive'.
updates decoration
still buggy
M +10 -2 active/app/package/contents/ui/TreeDelegate.qml
M +2 -1 active/components/documentitem.cpp
http://commits.kde.org/okular/407921c33e579e025f5c080443aa65fb4e4eac08
diff --git a/active/app/package/contents/ui/TreeDelegate.qml \
b/active/app/package/contents/ui/TreeDelegate.qml index 1001266..249acd5 100644
--- a/active/app/package/contents/ui/TreeDelegate.qml
+++ b/active/app/package/contents/ui/TreeDelegate.qml
@@ -30,7 +30,7 @@ Column {
MouseArea {
width: parent.width
- height: childrenRect.height
+ height: label.height
visible: display.toLowerCase().indexOf(searchField.searchQuery.toLowerCase()) \
!== -1
onClicked: {
@@ -40,10 +40,18 @@ Column {
resourceBrowser.open = false
}
+ QIconItem {
+ id: icon
+ icon: decoration
+ width: theme.smallIconSize
+ height: width
+ anchors.verticalCenter: parent.verticalCenter
+ }
PlasmaComponents.Label {
id: label
text: display
verticalAlignment: Text.AlignBottom
+ anchors.left: icon.right
}
//there isn't a sane way to do a dotted line in QML1
Rectangle {
@@ -58,7 +66,7 @@ Column {
}
PlasmaComponents.Label {
id: pageNumber
- text: page
+ text: pageLabel
anchors.right: parent.right
verticalAlignment: Text.AlignBottom
anchors.rightMargin: 40
diff --git a/active/components/documentitem.cpp b/active/components/documentitem.cpp
index d5d49fb..67c9bb6 100644
--- a/active/components/documentitem.cpp
+++ b/active/components/documentitem.cpp
@@ -49,8 +49,8 @@ void DocumentItem::setPath(const QString &path)
//TODO: remote urls
m_document->openDocument(path, KUrl(path), KMimeType::findByUrl(KUrl(path)));
- m_tocModel->setCurrentViewport(m_document->viewport());
m_tocModel->fill(m_document->documentSynopsis());
+ m_tocModel->setCurrentViewport(m_document->viewport());
m_matchingPages.clear();
for (uint i = 0; i < m_document->pages(); ++i) {
@@ -71,6 +71,7 @@ QString DocumentItem::path() const
void DocumentItem::setCurrentPage(int page)
{
m_document->setViewportPage(page);
+ m_tocModel->setCurrentViewport(m_document->viewport());
emit currentPageChanged();
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic