X-Git-Url: http://git.maemo.org/git/?p=quicknewsreader;a=blobdiff_plain;f=qml%2FQuickNewsReader%2Fcontent%2Fview%2FSourceDelegate.qml;h=8e3495d0f659a7436c6ebeb710e310123d3ca039;hp=88242820d778b465069109df5d778b70aafa5eb5;hb=1e026a772f96cbe14ecd16fa27ab911877a59701;hpb=a51793a460112730f0fed3d58dcc3c4b2393553e

diff --git a/qml/QuickNewsReader/content/view/SourceDelegate.qml b/qml/QuickNewsReader/content/view/SourceDelegate.qml
index 8824282..8e3495d 100644
--- a/qml/QuickNewsReader/content/view/SourceDelegate.qml
+++ b/qml/QuickNewsReader/content/view/SourceDelegate.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 {
@@ -78,7 +55,7 @@ Item {
             // show the configuration for this journal
             if( listSourceModel[index].hasSettings )
             {
-                window.showConfigDialog(listSourceModel[index].settingsComponent)
+                window.showConfigDialog(index)
             }
         }
 
@@ -91,15 +68,14 @@ Item {
 
                 delegate.ListView.view.currentIndex = index
 
-                window.windowViewsModel.append({ component: listSourceModel[index].listViews[0].viewComponent,
-                                                 componentId: listSourceModel[index].listViews[0].viewId,
-                                                 componentDepth: 1 })
-
                 listSourceModel[index].currentPath = [index]
+                currentSourceIndex = index
 
-                window.currentSourceIndex = index
+                window.windowViewsModel.append({ component: listSourceModel[index].listViews[0].viewComponent,
+                                                 componentDepth: 1 })
 
-                window.windowViewsList.currentIndex = 1;
+                //window.currentSourceIndex = index // doesn't work well with Qt 4.7.3 on Maemo...
+                window.currentContentX = 1*window.width
             }
         }
     }