X-Git-Url: http://git.maemo.org/git/?p=quicknewsreader;a=blobdiff_plain;f=qml%2FQuickNewsReader%2Fcontent%2Fview%2FNewsDelegate.qml;h=6278690c324ae918c154b6e41dc759c2c8001193;hp=d51f3ee30be6d59facd557515a714f8726430f0b;hb=e237a1774640dcf77590fc06584925fa30f077b6;hpb=a51793a460112730f0fed3d58dcc3c4b2393553e

diff --git a/qml/QuickNewsReader/content/view/NewsDelegate.qml b/qml/QuickNewsReader/content/view/NewsDelegate.qml
index d51f3ee..6278690 100644
--- a/qml/QuickNewsReader/content/view/NewsDelegate.qml
+++ b/qml/QuickNewsReader/content/view/NewsDelegate.qml
@@ -1,44 +1,21 @@
-/****************************************************************************
+/***
+** Copyright (C) 2012 Christophe CHAPUIS <chris.chapuis _at_ gmail _dot_ com>
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** This package is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This package is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** You should have received a copy of the GNU General Public License
+** along with this package; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 **
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
+***/
 import QtQuick 1.0
 
 Item {
@@ -59,6 +36,7 @@ Item {
 
 
         Row {
+            id: descriptionRow
             spacing: 5
 
             Image {
@@ -67,7 +45,7 @@ Item {
             }
 
             Text {
-                anchors.verticalCenter: detailImage.verticalCenter
+                anchors.verticalCenter: descriptionRow.verticalCenter
                 text: description; width: column.width - detailImage.width - 10; wrapMode: Text.WordWrap
                 font.family: "Helvetica"
             }
@@ -78,9 +56,10 @@ Item {
         anchors.fill: delegate
 
         onClicked: {
-            if (typeof detailedContent != "undefined") {
-                var currentSourceDepth = delegate.ListView.view.model.sourceDepth
+            var currentSourceDepth = delegate.ListView.view.model.sourceDepth
 
+            if (listSourceModel[window.currentSourceIndex].listViews.length >= currentSourceDepth+1)
+            {
                 // here we remove everything in viewsModel after index "nextSourceDepth"
                 while(window.windowViewsModel.count>currentSourceDepth+1)
                     window.windowViewsModel.remove(window.windowViewsModel.count-1)
@@ -88,18 +67,10 @@ Item {
                 delegate.ListView.view.currentIndex = index
                 var path = listSourceModel[window.currentSourceIndex].currentPath
                 path[currentSourceDepth] = index
-                listSourceModel[window.currentSourceIndex].currentPath = path
+                listSourceModel[window.currentSourceIndex].currentPath = path.slice(0,currentSourceDepth+1)
 
                 window.windowViewsModel.append({ component: listSourceModel[window.currentSourceIndex].listViews[currentSourceDepth].viewComponent,
-                                                 componentId: listSourceModel[window.currentSourceIndex].listViews[currentSourceDepth].viewId,
                                                  componentDepth: currentSourceDepth+1 })
-
-                window.windowViewsList.currentIndex = currentSourceDepth+1;
-
-                //newsDetailRect.webViewAction.enabled = false
-           ////     sourcesRect.x -= window.width + newsRect.x
-                //newsDetailRect.webViewAction.enabled = true
-                //newsDetailRect.webViewAction.trigger()
             }
         }
     }