Binary file controlpanelplugins/themeplugin/image/themePreview.nvg has changed

--- a/controlpanelplugins/themeplugin/rom/themeplugin.iby	Tue Aug 31 15:15:28 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-#ifndef __THEMEPLUGIN_IBY__
-#define __THEMEPLUGIN_IBY__
-
-#include <bldvariant.hrh>
-#include <data_caging_paths_for_iby.hrh>
-
-file=ABI_DIR\BUILD_DIR\cpthemeplugin.dll                     SHARED_LIB_DIR\cpthemeplugin.dll
-
-data=\epoc32\data\c\resource\qt\plugins\controlpanel\cpthemeplugin.qtplugin                       resource\qt\plugins\controlpanel\cpthemeplugin.qtplugin
-
-#endif

--- a/controlpanelplugins/themeplugin/rom/themeplugin_rom.pri	Tue Aug 31 15:15:28 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
-#
-
-symbian {
-		BLD_INF_RULES.prj_exports += \
-				"$${LITERAL_HASH}include<platform_paths.hrh>" \
-				"rom/themeplugin.iby CORE_APP_LAYER_IBY_EXPORT_PATH(themeplugin.iby)"
-}
\ No newline at end of file

--- a/controlpanelplugins/themeplugin/src/cpthemechanger.cpp	Tue Aug 31 15:15:28 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0""
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *   
- */
-#include <QString>
-
-#include "cpthemechanger.h"
-#include "cpthemeutil.h"
-#include "cpthemeinfo.h"
-
-#include <hbinstance.h>
-#include <restricted/hbthemeservices_r.h>
-
-/*!
-  \class CpThemeChanger
-
-  \brief CpThemeChanger provides an interface for changing the current
-  theme.
-  This API is only for use with the control panel and its theme
-  changing plugin.
-*/
-
-/*!
-  Constructor.
-*/
-CpThemeChanger::CpThemeChanger(QObject* p) :
-    QObject(p),
-    mCurrentTheme(0)
-{
-    if(hbInstance->theme()) {
-        connect(hbInstance->theme(),SIGNAL(changeFinished()), this, SLOT(changeFinished()));
-    }
-       
-    setCurrentTheme();
-}
-
-/*!
-    Returns a ThemeInfo object containing the current theme name and
-    corresponding icons.
-
-    If no repersentative icons exist, the HbIcon returned will be
-    uninitialized.
-*/
-const CpThemeInfo* CpThemeChanger::currentTheme() const
-{
-    return mCurrentTheme;
-}
-
-/*!
- * Private helper function that gets the current theme from hbinstance and s
- * ets class' current theme.  
- */
-void CpThemeChanger::setCurrentTheme()
-{
-    QString themeName = "";
-    if (HbInstance::instance()) {
-        HbTheme *hbTheme = HbInstance::instance()->theme();
-        if(hbTheme) {
-            themeName = hbTheme->name();
-        }
-         
-    }
-       
-    if(mCurrentTheme && mCurrentTheme->name() == themeName) {
-        return;
-    } else {
-        //buildThemeInfo creates new theme info.
-        CpThemeInfo* tmpTheme = CpThemeUtil::buildThemeInfo(HbThemeServices::themePath(), themeName);
-         
-        //delete old value. set the new value.
-        if(tmpTheme) {
-            if(mCurrentTheme){
-                delete mCurrentTheme;
-            }
-            mCurrentTheme = tmpTheme;
-        }
-    }
-}
-
-
-/*!
- Change a theme. Returns true on success, false otherwise.
- */
-bool CpThemeChanger::changeTheme(const CpThemeInfo& newTheme)
-{
-    bool result = false;
-    // Skip doing this if the request is for the current theme
-    if (newTheme.name().isEmpty() || (mCurrentTheme && newTheme.name() == mCurrentTheme->name())) {
-        return result;
-    }
-
-    QString themePath = newTheme.itemData();
-    
-    if(!themePath.isEmpty()) {
-        HbThemeServices::setTheme(themePath);
-        result = true;
-    }
-    return result;
-}
-
-/*!
- Destructor
- */
-CpThemeChanger::~CpThemeChanger()
-{
-    delete mCurrentTheme;
-    mCurrentTheme = 0;
-}
-
-/*!
- *  Slot to handle notification from theme server that theme change
- *  is done.  Notify the owner.
- */
-void CpThemeChanger::changeFinished()
-{
-    setCurrentTheme();
-    emit themeChangeFinished();
-}
-
-// End of file
-

--- a/controlpanelplugins/themeplugin/src/cpthemechanger.h	Tue Aug 31 15:15:28 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0""
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *   
- */
-
-#ifndef CPTHEMECHANGER_H
-#define CPTHEMECHANGER_H
-
-#include <QStringList>
-
-#include <hbicon.h>
-#include <hbglobal.h>
-
-class CpThemeChangerPrivate;
-class CpThemeInfo;
-
-QT_BEGIN_NAMESPACE
-class QAbstractItemModel;
-QT_END_NAMESPACE
-
-class CpThemeChanger : public QObject
-{
-    Q_OBJECT
-    
-public:
-     explicit CpThemeChanger(QObject* parent=0);
-    ~CpThemeChanger();
-    
-    const CpThemeInfo* currentTheme() const;
-    bool changeTheme(const CpThemeInfo& newtheme);
-    
-signals:
-    void themeChangeFinished();
-    
-private slots:
-    void changeFinished();
-	
-private:
-    void setCurrentTheme();
-    
-    CpThemeInfo* mCurrentTheme;
-};
-
-
-#endif /* CPTHEMECHANGER_H */

--- a/controlpanelplugins/themeplugin/src/cpthemecontrol.cpp	Tue Aug 31 15:15:28 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,317 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *   
- */
-
-/*!
-    \class CpThemeControl
-    \brief CpThemeControl creates and controls views for Theme Changer plugin and handles
-	user interaction to preview and change the themes.
-
-	This class also connects to the theme server using the HbThemeChanger and sets the theme
-	based on user interaction with the views.  
-
- */
-
-#include <QString>
-#include <QModelIndex>
-#include <QTranslator>
-#include <QSortFilterProxyModel>
-#include <QThread>
-#include <QTimer>
-#include <QDesktopServices>
-#include <QUrl>
-
-#include <hbmainwindow.h>
-#include <hbinstance.h>
-#include "cpthemechanger.h"
-
-#include "cpthemecontrol.h"
-#include "cpthemelistview.h"
-#include "cpthemeinfo.h"
-#include "cpthemelistmodel.h"
-
-#include <hbdialog.h>
-#include <hblabel.h>
-
-//time out time before showing a processing dialog.
-static const int KThemeChangeTimeOutMilliSeconds = 2000;  
-
-/*!
-	Helper function to fetch the main window.
-*/
-static HbMainWindow *mainWindow() 
-{
-    QList< HbMainWindow* > mainWindows = hbInstance->allMainWindows();
-    if (!mainWindows.isEmpty()) {
-        return mainWindows.front();
-    }
-    return 0;
-}
-
-/*!
-	constructor.
-*/
-CpThemeControl::CpThemeControl(): mThemeListView(0), 
-    mThemeChanger(0),
-    mListModel(0),
-    mThemeChangeFinished(false),
-    mWaitDialog(0)
-{
-    mThemeChanger = new CpThemeChanger();
-       
-    QTranslator *translator = new QTranslator(this);
-    QString lang = QLocale::system().name();
-    QString path = "Z:/resource/qt/translations/";
-    translator->load("control_panel_" + lang, path);
-    qApp->installTranslator(translator);
-    
-    connect(mThemeChanger,SIGNAL(themeChangeFinished()), this, SLOT(themeChangeFinished()));
-   
-}
-
-
-/*!
-	destorys the list view and theme changer objects.
-*/
-CpThemeControl::~CpThemeControl()
-{
-    delete mThemeListView;
-    mThemeListView = 0;
-
-    delete mThemeChanger;
-    mThemeChanger = 0;
-
-    delete mWaitDialog;
-    mWaitDialog = 0;
-}
-
-/*!
-	Creates the theme list view.  Gets the themes, creates a model  and sets the list model.
-*/
-void CpThemeControl::createThemeList()
-{
-   
-    mThemeListView = new CpThemeListView();
-    
-    if(!mListModel) {
-        mListModel = new CpThemeListModel(this);
-    }
-    
-    // Set the model for theme list.
-    mThemeListView->setModel(mListModel);
-    
-    setActiveThemeIndex();
-    
-    //connect to signal for selecting a list item.
-    connect(mThemeListView,SIGNAL(newThemeSelected(QModelIndex)),
-            this,SLOT(newThemeSelected(QModelIndex)));
-    
-    connect(mThemeListView, SIGNAL(oviClicked()), this, SLOT(getOviTheme()));
-
-	//handle signal for list view closing. (e.g Back softkey pressed)
-    connect(mThemeListView,SIGNAL(aboutToClose()),
-            this,SLOT(themeListClosed()));
-}
-
-/*!
-	returns the instance of themelist view.  Used by control panel to set
-	the view.  
-*/
-CpBaseSettingView* CpThemeControl::themeListView()
-{
-    //If the view was removed before by control panel app, create it again.
-    if(!mThemeListView) {
-        createThemeList();
-    }
-
-    return mThemeListView;
-}
-
-/*!
-        returns the name of the current theme.
-*/
-QString CpThemeControl::currentThemeName() const
-{
-    QString name = "";
-    if(mThemeChanger->currentTheme()) {
-        name = mThemeChanger->currentTheme()->name();
-    }
-    return name;
-}
-
-/*!
-        returns the repersenatative icon of the current theme.
-*/
-HbIcon CpThemeControl::currentThemeIcon() const
-{
-    HbIcon icon;
-    if(mThemeChanger->currentTheme()) {
-        icon = mThemeChanger->currentTheme()->icon();
-    }
-    return icon;
-}
-
-/*!
-	Slot called when a list item of the theme list is selected.
-*/
-void CpThemeControl::newThemeSelected(const QModelIndex& index)
-{
-    if(!index.isValid()) {
-        return;
-    }
-    
-    CpThemeInfo themeInfo;
-    QVariant data;
-
-    //reset the current index to active theme, so that the selection remains on current
-    //theme even though another list item is selected.
-    setActiveThemeIndex();
-    
-    //get the theme name.
-    data = index.data(Qt::DisplayRole);
-    if(data.isValid()) {
-        themeInfo.setName(data.toString());
-    }
-    
-    //get theme path
-    data = index.data(CpThemeListModel::ItemDataRole);
-    if(data.isValid()) {
-        themeInfo.setItemData(data.toString());
-    }
-    
-    applyTheme(themeInfo);
-
-}
-
-void CpThemeControl::getOviTheme()
-{
-    QString url = QString("http://lr.ovi.mobi/store/themes");
-    // Launch the URL in the browser and 
-    // continue to Preview if not successful
-    QDesktopServices::openUrl(QUrl(url, QUrl::TolerantMode));
-                              
-}
-
-/*!
-	Slot called when a Select key is pressed in theme preview view.
-*/
-void CpThemeControl::applyTheme(const CpThemeInfo& theme)
-{
-    QThread::currentThread()->setPriority(QThread::HighPriority);  
-    
-    if(mThemeChanger->changeTheme(theme)) {
-    
-        //Start a timer. If theme change takes more than 1 seconds,
-        //we will show a dialog (mWaitDialog) until theme change
-        //is done (themeChangeFinished is called).
-        QTimer::singleShot(KThemeChangeTimeOutMilliSeconds, this, SLOT(themeWaitTimeout()));
-        
-        mThemeChangeFinished = false;
-    } else {
-        //theme change failed, go back to control panel.
-        setActiveThemeIndex();
-    }
-   
-}
-
-/*!
-    Slot for when the theme list view is closed. Ownership of the theme list was given to
-    control panel, so the class won't delete it.
-    
-*/
-void CpThemeControl::themeListClosed()
-{
-    mThemeListView = 0;
-}
-
-/*!
-    asks the theme list view to close.  
-*/
-void CpThemeControl::triggerThemeListClose()
-{
-    mThemeListView->closeView();
-}
-
-void CpThemeControl::themeChangeTimeout()
-{
-    //Theme change is finished and idle timer has timed out,
-    //so revert back the application priority to normal
-    //and go back to control panel view.
-    if(mWaitDialog && mWaitDialog->isVisible()) {
-        mWaitDialog->hide();
-    }
-    setActiveThemeIndex();
-    QThread::currentThread()->setPriority(QThread::NormalPriority); 
-}
-
-void CpThemeControl::themeWaitTimeout()
-{
-    //If after this timeOut, theme change is still in progress,
-    //show a processing dialog.
-    if(!mThemeChangeFinished){
-        if(!mWaitDialog) {
-            mWaitDialog = new HbDialog();
-            mWaitDialog->setDismissPolicy(HbPopup::NoDismiss);
-            mWaitDialog->setModal(false);
-            mWaitDialog->setTimeout(HbPopup::NoTimeout);
-            // Create and set HbLabel as content widget.
-            QString processingText = hbTrId("txt_common_info_processing") + QString("...");
-            HbLabel *label = new HbLabel(processingText);
-            label->setAlignment(Qt::AlignCenter);
-            mWaitDialog->setContentWidget(label);
-        }
-       // as we do not need any signals, calling show() instead of open()
-       mWaitDialog->show();
-    }
-}
-
-void CpThemeControl::themeChangeFinished()
-{
-    //Theme change is done. Start an idle timer to let the UI
-    //finish remaining tasks.
-    QTimer::singleShot(0, this, SLOT(themeChangeTimeout()));
-    mThemeChangeFinished = true;
-    
-    if(mThemeChanger->currentTheme()) {
-        emit themeUpdated(mThemeChanger->currentTheme()->name(), mThemeChanger->currentTheme()->icon());
-    }
-    
-}
-
-/*!
- * Private function that sets the current index of theme list view to indicate
- * the active theme.
- */
-void CpThemeControl::setActiveThemeIndex()
-{
-    //Get the index of current theme.
-    CpThemeListModel* themeListModel = dynamic_cast<CpThemeListModel*>(mListModel);
-    const CpThemeInfo* currentTheme = mThemeChanger->currentTheme();
-    if(themeListModel && currentTheme) {
-        QModelIndex sourceIndex = mListModel->index(themeListModel->indexOf(*currentTheme),0);
-        //set current index.
-        mThemeListView->themeList()->setCurrentIndex(sourceIndex, QItemSelectionModel::SelectCurrent);
-    }
-    else {
-        mThemeListView->themeList()->setCurrentIndex(QModelIndex(), QItemSelectionModel::Clear);
-    }
-}
-    
-
-
-
-
-

--- a/controlpanelplugins/themeplugin/src/cpthemecontrol.h	Tue Aug 31 15:15:28 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0""
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *   
- */
-
-#ifndef CPTHEMECONTROL_H
-#define CPTHEMECONTROL_H
-
-#include <QObject>
-#include <QList>
-
-#include "cpthemechanger.h"
-#include <hbicon.h>
-
-QT_BEGIN_NAMESPACE
-class QModelIndex;
-class QString;
-class QSortFilterProxyModel;
-QT_END_NAMESPACE
-
-class HbDialog;
-class CpThemeListView;
-class CpBaseSettingView;
-class CpThemeListModel;
-
-
-class CpThemeControl : public QObject
-{
-    Q_OBJECT
-
-public:
-    CpThemeControl();
-    ~CpThemeControl();
-    CpBaseSettingView* themeListView();
-    QString currentThemeName() const;
-    HbIcon currentThemeIcon() const;
-
-signals:
-    void themeUpdated(const QString& themeName, const HbIcon& icon);
-
-private slots:
-    void newThemeSelected(const QModelIndex& index);
-    void applyTheme(const CpThemeInfo& theme);
-    void themeListClosed();
-    void themeChangeTimeout();
-    void themeWaitTimeout();
-    void themeChangeFinished();
-    void getOviTheme();
-
-private:
-    void createThemeList();
-    void triggerThemeListClose();
-    void setActiveThemeIndex();
-
-private:
-    CpThemeListView* mThemeListView;
-    CpThemeChanger* mThemeChanger;
-    QAbstractItemModel* mListModel;
-    bool mThemeChangeFinished;
-    HbDialog* mWaitDialog;
-};
-
-#endif //CPTHEMECONTROL_H

--- a/controlpanelplugins/themeplugin/src/cpthemeinfo.cpp	Tue Aug 31 15:15:28 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0""
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *   
- */
-
-/*!
- * A simple class to represent theme information. This information includes:
- *  1. Theme Name
- *  2. Theme Preview Thumbnail
- *  3. Theme Preview landscape and portrait icon
- *  4. Theme list type: either an item representing a theme, or a link (e.g OviStore).
- *  5. Item type data. Represents additional information (e.g for link type, the URL).
- */
-#include <hbicon.h>
-
-#include "cpthemeinfo.h"
-
- CpThemeInfo::CpThemeInfo()
-{
-}
-
- 
- CpThemeInfo::~CpThemeInfo()
-{
-}
-      
-QString CpThemeInfo::name() const
-{
-    return mName;
-}
-
-void CpThemeInfo::setName(const QString& newName)
-{
-    mName = newName;
-}
-      
-CpThemeInfo::ThemeListItemType CpThemeInfo::itemType() const
-{
-    return mItemType;
-}
-
-void CpThemeInfo::setItemType(CpThemeInfo::ThemeListItemType type)
-{
-    mItemType = type;
-}
-
-      
-QString CpThemeInfo::itemData() const
-{
-    return mItemData;
-}
-
-void CpThemeInfo::setItemData(const QString& data)
-{
-    mItemData = data;
-}
-
-      
-HbIcon CpThemeInfo::icon() const
-{
-    return mIcon;
-}
-  
-void CpThemeInfo::setIcon(const HbIcon& newIcon)
-{
-    mIcon = newIcon;
-}
-
-      
-HbIcon CpThemeInfo::portraitPreviewIcon() const
-{
-    return mPortraitPreviewIcon;
-}
-
-void CpThemeInfo::setPortraitPreviewIcon(const HbIcon& newIcon)
-{
-    mPortraitPreviewIcon = newIcon;
-}
-
-      
-HbIcon CpThemeInfo::landscapePreviewIcon() const
-{
-    return mLandscapePreviewIcon;
-}
-
-void CpThemeInfo::setLandscapePreviewIcon(const HbIcon& newIcon)
-{
-    mLandscapePreviewIcon = newIcon;
-}
-

--- a/controlpanelplugins/themeplugin/src/cpthemeinfo.h	Tue Aug 31 15:15:28 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0""
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *   
- */
-#ifndef CPTHEMEINFO_H_
-#define CPTHEMEINFO_H_
-
-
-#include <QString>
-
-#include <hbicon.h>
-
-class CpThemeInfo {
-
-public:
-    
-    
-    enum ThemeListItemType {
-                 ThemeListItemType_default = 0,
-                 ThemeListItemType_URL,
-                 ThemeListItemType_APP
-             };
-    
-     CpThemeInfo();
-     ~CpThemeInfo();
-     
-     QString name() const;
-     void setName(const QString& newName);
-     
-     ThemeListItemType itemType() const;
-     void setItemType(ThemeListItemType type);
-     
-     QString itemData() const;
-     void setItemData(const QString& data);
-     
-     HbIcon icon() const;
-     void setIcon(const HbIcon& newIcon);
-     
-     HbIcon portraitPreviewIcon() const;
-     void setPortraitPreviewIcon(const HbIcon& newIcon);
-     
-     HbIcon landscapePreviewIcon() const;
-     void setLandscapePreviewIcon(const HbIcon& newIcon);
-     
-     bool operator < (const CpThemeInfo &other) const   {            
-         return mName.toCaseFolded().localeAwareCompare(other.mName.toCaseFolded()) < 0;
-     }
-     bool operator == (const CpThemeInfo &other) const {
-         return mName.localeAwareCompare(other.mName) == 0;
-     }
-     
-private:
-     CpThemeInfo::ThemeListItemType mItemType;
-     QString mItemData;
-     QString mName;
-     HbIcon mIcon;
-     HbIcon mPortraitPreviewIcon;
-     HbIcon mLandscapePreviewIcon;
-
-};    
-Q_DECLARE_METATYPE(CpThemeInfo::ThemeListItemType)
-
-   
-#endif /* CPTHEMEINFO_H_ */

--- a/controlpanelplugins/themeplugin/src/cpthemelistmodel.cpp	Tue Aug 31 15:15:28 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0""
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *   
- */
-
-#include <QDir>
-#include <QStringList>
-#include <QFileSystemWatcher>
-#include <QPair>
-
-#include <HbIcon>
-
-#include "cpthemelistmodel.h"
-#include "cpthemeinfo.h"
-#include "cpthemeutil.h"
-
-/*
-    CpThemeChangerModel provides an interface to the data contained in the
-    theme list using QAbstractListModel.
-*/
-
-/*
-    Constructor
-*/
-CpThemeListModel::CpThemeListModel(QObject* parent)
-    : QAbstractListModel(parent)
-    , mTopThemeList()
-    , mThemeList()
-    , mBottomThemeList()
-    , mFileWatcher(new QFileSystemWatcher(this))
-{
-    //Build theme list
-    mThemeList = CpThemeUtil::buildThemeList();
-    
-    //Look into theme paths and add a file watcher for it
-    //to get notified when themes are added.
-    QStringList themePaths = CpThemeUtil::themeDirectories(mThemeList);
-    if(!themePaths.empty()) {
-        mFileWatcher->addPaths(themePaths);
-    }
-   
-    connect(mFileWatcher, SIGNAL(directoryChanged(QString)),
-           this, SLOT(themeListChanged()));
-   
-}
-
-/*
-    Destructor
-*/
-CpThemeListModel::~CpThemeListModel()
-{
-    delete mFileWatcher;
-    mFileWatcher = 0;
-
-}
-
-/*
-    Reimplemented from QAbstractListModel.
-*/
-int CpThemeListModel::rowCount(const QModelIndex&) const
-{
-    return mTopThemeList.size() +
-        mThemeList.size() +
-        mBottomThemeList.size();
-}
-
-/*
-    Reimplemented from QAbstractListModel. 
-*/
-QVariant CpThemeListModel::data(const QModelIndex& index, int role) const
-{
-    QVariant retVal = QVariant();
-
-    if (index.isValid()) {
-        // figure out which list we're in and do the appropriate mapping
-        int row = index.row();
-        const QList<CpThemeInfo> *list = 0;
-        if (row < mTopThemeList.size()) {
-            list = &mTopThemeList;
-        } else {
-            row -= mTopThemeList.size();
-            if ( row < mThemeList.size() ) {
-                list = &mThemeList;
-            } else {
-                row -= mThemeList.size();
-                if ( row < mBottomThemeList.size() ) {
-                    list = &mBottomThemeList;
-                }
-            }
-        }
-
-        if (list) {
-            switch (role) {
-                case Qt::DisplayRole:
-                    retVal = list->at(row).name();
-                    break;
-                    
-                case Qt::SizeHintRole:
-                    retVal = list->at(row).icon().size();
-                    break;
-                                
-                case ItemDataRole:
-                    retVal = list->at(row).itemData();
-                    break;
-
-                case ItemTypeRole:
-                    retVal = QVariant::fromValue<CpThemeInfo::ThemeListItemType>(list->at(row).itemType());
-                    break;
-
-                default:
-                    // do nothing
-                    qt_noop();
-            }
-        }
-    }
-
-    return retVal;
-}
-
-/*
-    Responds appropriately when the underlying data in the theme changer is modified.
-
-    Unfortunately the directory watcher from QFileWatcher only says when something changed
-    not what changed.  Therefore the model is considered reset rather than having rows
-    with dataChanged.
-*/
-void CpThemeListModel::themeListChanged()
-{
-    beginResetModel();
-    if(!mThemeList.empty()) {
-        mThemeList.clear();
-    }
-    mThemeList = CpThemeUtil::buildThemeList();
-  
-    endResetModel();
-}
-/*!
- * Returns index of theme infor within the theme list.
- */
-int CpThemeListModel::indexOf(const CpThemeInfo& theme) const
-{
-    return mThemeList.indexOf(theme);
-}

--- a/controlpanelplugins/themeplugin/src/cpthemelistmodel.h	Tue Aug 31 15:15:28 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0""
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *   
- */
-
-#ifndef CP_THEME_LIST_MODEL_P_H
-#define CP_THEME_LIST_MODEL_P_H
-
-#include <QAbstractListModel>
-#include <QModelIndex>
-#include <QObject>
-#include "cpthemeutil.h"
-
-class QFileSystemWatcher;
-
-class CpThemeListModel : public QAbstractListModel
-{
-    Q_OBJECT
-
-public:
-    
-    enum ThemeListUserRole {
-        ItemTypeRole = Qt::UserRole,
-        ItemDataRole
-    };
-    
-    explicit CpThemeListModel(QObject *parent = 0);
-    virtual ~CpThemeListModel();
-
-    virtual int rowCount(const QModelIndex& parent = QModelIndex()) const;
-    virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
-    int indexOf(const CpThemeInfo& theme) const;
-    
-public slots:
-    void themeListChanged();
-
-private:
-    QList<CpThemeInfo> mTopThemeList;
-    QList<CpThemeInfo> mThemeList;
-    QList<CpThemeInfo> mBottomThemeList;
-    QFileSystemWatcher *mFileWatcher;
-};
-
-#endif //CP_THEME_LIST_MODEL_P_H

--- a/controlpanelplugins/themeplugin/src/cpthemelistview.cpp	Tue Aug 31 15:15:28 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0""
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *   
- */
-
-
-#include <QGraphicsLinearLayout>
-#include <QModelIndex>
-
-#include <hbview.h>
-#include <hblistview.h>
-#include <hblistviewitem.h>
-#include <hbtoolbar.h>
-#include <hbaction.h>
-#include <hbgroupbox.h>
-
-
-#include "cpthemelistview.h"
-
-/*!
-    \class CpThemeListView
-    \brief CpThemeListView displays a heading (e.g Theme) and a list of themes with
-    corresponding icons.
-
-    Note: This class is a subclass of CpBaseSettingView for compatibility with Control Panel
-          framework.  
- */
-
-/*!
-    constructor.  Creates the heading label and the list and adds it to layout.
-*/
-CpThemeListView::CpThemeListView(QGraphicsItem *parent) : CpBaseSettingView(0, parent),
-    mThemeList(new HbListView(this))
-{
-   
-    //Create a layout with a heading at top and the list below it.
-    HbWidget* contentWidget = new HbWidget(this);
-    QGraphicsLinearLayout* layout = new QGraphicsLinearLayout(Qt::Vertical);
-    layout->setContentsMargins(0,0,0,0);
-    
-    //setup the heading.
-    HbGroupBox *simpleLabel = new HbGroupBox();
-    simpleLabel->setHeading(hbTrId("txt_cp_title_select_theme"));
-     
-    layout->addItem(simpleLabel);
-      
-    connect(mThemeList, SIGNAL(activated(QModelIndex)),
-            this, SIGNAL(newThemeSelected(QModelIndex)));
-    
-    //set list item icons to be large.
-    HbListViewItem* listViewItem = mThemeList->listItemPrototype();
-    listViewItem->setGraphicsSize(HbListViewItem::LargeIcon);
-    //set singleSelection to enable showing an indicator (e.g check mark) next to active theme.
-    mThemeList->setSelectionMode(HbAbstractItemView::SingleSelection);
-  
-    //add the list to layout.
-    layout->addItem(mThemeList);
-    
-    //Create the toolbar for Ovi Store.
-    HbToolBar* toolBar = new HbToolBar(this);
-
-    HbAction* oviAction = new HbAction(HbIcon("qtg_large_ovistore"), hbTrId("txt_cp_list_get_more_tones"));
-    QObject::connect( oviAction, SIGNAL(triggered()), 
-                          this, SIGNAL(oviClicked()));
-       
-    //Add Action to the toolbar and show toolbar
-    toolBar->addAction(oviAction);
-       
-    setToolBar(toolBar);
-
-    contentWidget->setLayout(layout);
-   
-    setWidget(contentWidget);
-   
-}
-
-/*!
-    destructor.
-*/
-CpThemeListView::~CpThemeListView()
-{
-}
-
-/*!
-    returns the listview instance (list of themes).
-*/
-HbListView* CpThemeListView::themeList() const
-{
-    return mThemeList;
-}
-
-/*!
-    Sets the model of its listView.
-*/
-void CpThemeListView::setModel(QAbstractItemModel* model)
-{
-    mThemeList->setModel(model);
-}
-
-/*!
-    sets the widget. Reimplementation from HbView. 
-*/
-void CpThemeListView::setWidget(QGraphicsWidget *widget)
-{
-    HbView::setWidget(widget);
-}
-
-/*!
-    emits aboutToClose() signal.
-*/
-void CpThemeListView::closeView()
-{
-    emit aboutToClose();
-}
-
-

--- a/controlpanelplugins/themeplugin/src/cpthemelistview.h	Tue Aug 31 15:15:28 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0""
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *   
- */
-#ifndef CPTHEMELISTVIEW_H
-#define CPTHEMELISTVIEW_H
-
-#include <QAbstractItemModel>
-
-#include <hbview.h>
-#include <hblistview.h>
-
-#include <cpbasesettingview.h>
-
-
-class CpThemeSelectionList;
-
-class CpThemeListView : public CpBaseSettingView
-{
-    Q_OBJECT
-
-public:
-    explicit CpThemeListView(QGraphicsItem *parent = 0);
-    ~CpThemeListView();
-    void setWidget(QGraphicsWidget *widget);
-    HbListView* themeList() const;
-    void setModel(QAbstractItemModel* model);
-    void closeView();
-	
-signals:
-    void newThemeSelected(const QModelIndex& index);
-    void oviClicked();
-
-private:
-    HbListView* mThemeList;
-   
-};
-
-#endif //CPTHEMELISTVIEW_H
-

--- a/controlpanelplugins/themeplugin/src/cpthemeplugin.cpp	Tue Aug 31 15:15:28 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0""
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *   
- */
-#include "cpthemeplugin.h"
-#include "cpthemepluginentryitemdata.h"
-
-/*!
-    \class CpThemePlugin
-    \brief CpThemePlugin is a control panel plugin that allows a user to view available themes and
-           change the current theme of the phone.
-
-*/
-
-/*!
-    constructor.
-*/
-CpThemePlugin::CpThemePlugin()
-{
-}
-
-/*!
-    destructor.
-*/
-CpThemePlugin::~CpThemePlugin()
-{
-}
-
-/*!
-    create the control panel entry item data for Theme settins.
-*/
-
-QList<CpSettingFormItemData*> CpThemePlugin::createSettingFormItemData(CpItemDataHelper &itemDataHelper) const
-{
-
-    //create a cpthemepluginentryitemdata with default values and return it.
-    CpSettingFormEntryItemData *entryItem = new CpThemePluginEntryItemData(
-        itemDataHelper,
-        hbTrId("txt_cp_dblist_theme"),
-        QString(),
-        HbIcon());
-        return QList<CpSettingFormItemData*>() << entryItem;
-}
-
-Q_EXPORT_PLUGIN2(cpthemeplugin, CpThemePlugin);
-

--- a/controlpanelplugins/themeplugin/src/cpthemeplugin.h	Tue Aug 31 15:15:28 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0""
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *   
- */
-
-#ifndef	CPTHEMEPLUGIN_H
-#define	CPTHEMEPLUGIN_H
-
-#include <qobject.h>
-#include <cpplugininterface.h>
-
-class CpThemePlugin : public QObject, public CpPluginInterface
-{
-    Q_OBJECT
-    Q_INTERFACES(CpPluginInterface)
-public:
-    CpThemePlugin();
-    virtual ~CpThemePlugin();
-    virtual QList<CpSettingFormItemData*> createSettingFormItemData(CpItemDataHelper &itemDataHelper) const;
-};
-
-#endif	//CPTHEMEPLUGIN_H

--- a/controlpanelplugins/themeplugin/src/cpthemepluginentryitemdata.cpp	Tue Aug 31 15:15:28 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0""
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *   
- */
-
-#include <hbdataform.h>
-#include <hbiconitem.h>
-
-#include <cpbasesettingview.h>
-#include "cpthemecontrol.h"
-#include "cpthemepluginentryitemdata.h"
-#include <cpitemdatahelper.h>
-
-/*!
-    \class CpThemePluginEntryItemData
-    \brief CpThemePluginEntryItemData is the entry item view for Theme Changer plugin.  It displays a title "Theme",
-    the name of current theme and the preview icon of the current theme.
-
-*/
-
-/*!
-    constructor.
-*/
-CpThemePluginEntryItemData::CpThemePluginEntryItemData(CpItemDataHelper &itemDataHelper,
-                                            const QString &text,
-                                            const QString &description,
-                                            const HbIcon &icon,
-                                            const HbDataFormModelItem *parent) :
-                                        CpSettingFormEntryItemData(itemDataHelper,
-                                                                   text,
-                                                                   description,
-                                                                   icon,
-                                                                   parent)
-{
-    //Create a CpThemeControl. the themeControl takes care of displaying the themes
-    //and letting user select a theme and apply a theme change.
-    mThemeControl = new CpThemeControl();
-    
-    setEntryItemIcon(mThemeControl->currentThemeIcon());
-    setDescription(mThemeControl->currentThemeName());
-
-    //connect to signal to update the current theme name and icon whenever the theme changes.
-    QObject::connect(mThemeControl, SIGNAL(themeUpdated(const QString&, const HbIcon&)), this, 
-                            SLOT(themeUpdated(const QString&, const HbIcon&)));
-}
-
-/*!
-    destructor.
-*/
-CpThemePluginEntryItemData::~CpThemePluginEntryItemData()
-{
-    delete mThemeControl;
-    mThemeControl = 0;
-}
-
-/*!
-    Slot used for updating entry item's description and icon with current theme name and its 
-    preview icon.
- */
-void CpThemePluginEntryItemData::themeUpdated(const QString& themeName, const HbIcon& icon)
-{
-    setEntryItemIcon(icon);
-    setDescription(themeName);
-}
-
-/*!
-    Return the theme changer UI view.  Returns 0 if it can't create
-    the view.
-*/
-CpBaseSettingView *CpThemePluginEntryItemData::createSettingView() const
-{
-    if(mThemeControl) {
-        CpBaseSettingView *view = mThemeControl->themeListView();
-        return view;
-    }
-    
-    return 0;
-}

--- a/controlpanelplugins/themeplugin/src/cpthemepluginentryitemdata.h	Tue Aug 31 15:15:28 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0""
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *   
- */
-
-#ifndef CPTHEMEPLUGINENTRYITEMDATA_H
-#define CPTHEMEPLUGINENTRYITEMDATA_H
-
-#include <QObject>
-#include <cpsettingformentryitemdata.h>
-
-class CpThemeControl;
-
-class CpThemePluginEntryItemData : public CpSettingFormEntryItemData
-{
-    Q_OBJECT
-    
-public:
-    explicit CpThemePluginEntryItemData(CpItemDataHelper &itemDataHelper,
-                    const QString &text = QString(),
-                    const QString &description = QString(),
-                    const HbIcon &icon = HbIcon(),
-                    const HbDataFormModelItem *parent = 0);     
-                    virtual ~CpThemePluginEntryItemData();
-
-private slots:
-    void themeUpdated(const QString& themeName, const HbIcon& icon);
-private:
-    CpThemeControl* mThemeControl;
-    virtual CpBaseSettingView *createSettingView() const;
-    
-};
-
-#endif //CPTHEMEPLUGINENTRYITEMDATA_H

--- a/controlpanelplugins/themeplugin/src/cpthemepreview.cpp	Tue Aug 31 15:15:28 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,201 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0""
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *   
- */
-
-#include <QObject>
-#include <QString>
-#include <QGraphicsPixmapItem>
-#include <QGraphicsLinearLayout>
-
-#include <hbaction.h>
-#include <hbtoolbar.h>
-#include <hbicon.h>
-#include <hbaction.h>
-#include <hblabel.h>
-#include <hbiconitem.h>
-#include <hbmainwindow.h>
-#include <HbParameterLengthLimiter>
-#include <HbDataForm>
-
-#include "cpthemepreview.h"
-#include "cpthemeinfo.h"
-
-/*!
-    \class CpThemePreview
-    \brief CpThemePreview shows a preview of a selected theme with a heading displaying the name of the theme as well as
-           a toolbar with Select and Cancel buttons.  This view is used for the user to either select the theme and apply
-           the theme change or press Cancel and go back to theme list view.
-*/
-
-
-/*!
-    constructor.
-*/
-CpThemePreview::CpThemePreview(const CpThemeInfo& theme, QGraphicsItem *parent) :
-     HbView(parent), 
-     mTheme(theme),
-     mSoftKeyBackAction(0),
-     mPreviewIcon(0)
-{
-    QGraphicsLinearLayout* containerLayout = new QGraphicsLinearLayout(Qt::Vertical);
-    QGraphicsLinearLayout* bottomLayout = new QGraphicsLinearLayout(Qt::Vertical);
-        
-    //Preview icon margins.
-    qreal leftMargin = 0.0;
-    qreal rightMargin = 0.0;
-    qreal topMargin = 0.0;
-    qreal bottomMargin = 0.0;
-        
-    style()->parameter(QString("hb-param-margin-gene-left"), leftMargin);
-    style()->parameter("hb-param-margin-gene-right", rightMargin);
-    style()->parameter("hb-param-margin-gene-top", topMargin);
-    style()->parameter("hb-param-margin-gene-bottom", bottomMargin);
-
-    containerLayout->setContentsMargins(0,0,0,0);
-    bottomLayout->setContentsMargins(leftMargin, topMargin, rightMargin, bottomMargin);
-       
-    //Using an empty dataform as heading because the heading should
-    //look like an HbDataForm headiing.
-    HbDataForm* heading = new HbDataForm(this);
-    QString themeHeading = HbParameterLengthLimiter("txt_cp_title_preview_1").arg(mTheme.name());   
-    heading->setHeading(themeHeading);
-       
-    containerLayout->addItem(heading);
-    //Fixed vertical policy so that the heading doesn't expand.
-    heading->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed,QSizePolicy::DefaultType);
-    
-    if(mainWindow()->orientation() == Qt::Horizontal) {
-        mPreviewIcon = new HbIconItem(mTheme.landscapePreviewIcon(), this);
-    }
-    else {
-        mPreviewIcon = new HbIconItem(mTheme.portraitPreviewIcon(), this);
-        //set to ignore aspect ratio so the layout would rezise the icon correctly.
-          
-    }
-    mPreviewIcon->setAspectRatioMode(Qt::IgnoreAspectRatio);
-  
-    // set an object name for preview icon to make it testable for automation testing
-    mPreviewIcon->setObjectName(QString("themePreviewIcon"));
-
-    
-    bottomLayout->addItem(mPreviewIcon);
-    containerLayout->addItem(bottomLayout);
-
-    setLayout(containerLayout);
-        
-    //Create the toolbar and "Select" and "Cancel" actions.
-    HbToolBar* mToolBar = new HbToolBar(this);
-
-    HbAction* selectAction = new HbAction(hbTrId("txt_common_button_select"));
-    
-    //Add Action to the toolbar and show toolbar
-    mToolBar->addAction( selectAction );
-
-    HbAction* cancelAction = new HbAction(hbTrId("txt_common_button_cancel"));
-    mToolBar->addAction( cancelAction );
-
-    QObject::connect( selectAction, SIGNAL(triggered()), 
-                      this, SLOT(themeSelected()));
-
-    QObject::connect( cancelAction, SIGNAL(triggered()), 
-                      this, SIGNAL(aboutToClose()));
-    QObject::connect( mainWindow(), SIGNAL(orientationChanged(Qt::Orientation)),
-                      this, SLOT(previewOrientationChanged(Qt::Orientation)));
-       
-        
-    setToolBar(mToolBar);
-    //Setup the Back button action and set softkey. Back button 
-    //takes the user to the theme list view.
-    mSoftKeyBackAction = new HbAction(Hb::BackNaviAction, this);
-    QObject::connect(mSoftKeyBackAction, SIGNAL(triggered()), 
-            this, SIGNAL(aboutToClose()) );
-
-    setNavigationAction(mSoftKeyBackAction);
-    
-}
-
-/*!
-    destructor.
-*/
-CpThemePreview::~CpThemePreview()
-{
-}
-
-/*!
-  sets the theme to \a theme.
-*/
-void CpThemePreview::setThemeInfo(const CpThemeInfo& theme)
-{
-    mTheme = theme;
-}
-
-/*!
-    returns the themeName.
-*/
-const QString CpThemePreview::themeName() const
-{
-    return mTheme.name();
-}
-
-/*!
-    returns the repersentative themeIcon of the current theme.
-*/
-const HbIcon CpThemePreview::themeIcon() const
-{
-    return mTheme.icon();
-}
-
-/*!
-    Slot to handle when the user selects a theme.  
-*/
-void CpThemePreview::themeSelected()
-{
-    emit applyTheme(mTheme);
-}
-
-/*! 
- *  Slot to handle landscape/portrait orientation change to use the
- *  right graphics.
- */
-void CpThemePreview::previewOrientationChanged(Qt::Orientation orientation)
-{
-   
-    QGraphicsLinearLayout* containerLayout = dynamic_cast<QGraphicsLinearLayout*>(layout());
-    QGraphicsLinearLayout* previewLayout = 0;
-    if(containerLayout) {
-        //get the layout that preview icon belongs to.
-        previewLayout = dynamic_cast<QGraphicsLinearLayout*>(containerLayout->itemAt(1));
-    }
-   
-    if(previewLayout && mPreviewIcon && mPreviewIcon == dynamic_cast<HbIconItem*>(previewLayout->itemAt(0)) ) {
-        //Remove preview icon.
-        previewLayout->removeAt(0);
-        
-        if(orientation == Qt::Horizontal) {
-            mPreviewIcon->setIcon(mTheme.landscapePreviewIcon());
-                    
-        }
-        else {
-            mPreviewIcon->setIcon(mTheme.portraitPreviewIcon());
-        }
-        
-        previewLayout->addItem(mPreviewIcon);
-    }
-    
-}
-
-
-    

--- a/controlpanelplugins/themeplugin/src/cpthemepreview.h	Tue Aug 31 15:15:28 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0""
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *   
- */
-
-#ifndef CPTHEMEPREVIEW_H
-#define CPTHEMEPREVIEW_H
-
-#include <hbview.h>
-#include <QObject>
-#include <hbicon.h>
-#include "cpthemechanger.h"
-#include "cpthemeinfo.h"
-
-
-QT_BEGIN_NAMESPACE
-class QString;
-QT_END_NAMESPACE
-
-class HbAction;
-class HbMainWindow;
-class HbIconItem;
-
-class CpThemePreview : public HbView
-{
-    Q_OBJECT
-
-public:
-    explicit CpThemePreview(const CpThemeInfo &theme, QGraphicsItem *parent = 0);
-    ~CpThemePreview();
-    void setThemeInfo(const CpThemeInfo& theme);
-    const QString themeName() const;
-    const HbIcon themeIcon() const;
-	
-signals:
-    void applyTheme(const CpThemeInfo&);
-    void aboutToClose();
-
-private slots:
-    void themeSelected();
-    void previewOrientationChanged(Qt::Orientation orientation);
-  
-private:
-    CpThemeInfo mTheme;
-    HbAction* mSoftKeyBackAction;
-    HbIconItem* mPreviewIcon;
-
-};
-
-#endif //CPTHEMEPREVIEW_H

--- a/controlpanelplugins/themeplugin/src/cpthemeutil.cpp	Tue Aug 31 15:15:28 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,217 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0""
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:  
- *   
- */
-
-#include "cpthemeinfo.h"
-#include "cpthemeutil.h"
-
-#include <QStringList>
-#include <QSettings>  
-#include <QFileInfoList>
-#include <QDir>
-#include <QList>
-
-#include <hbicon.h>
-#include <hbinstance.h>
-#include <restricted/hbthemeservices_r.h>
-
-/*!
- * This class provides utility function to get Theme information.  
- */
-
-#if defined(Q_OS_SYMBIAN)
-#include <e32std.h>
-#include <centralrepository.h>
-        static const TUid KServerUid3={0x20022E82};
-        static const TUint32 KDefaultThemeNameKey = 0x2;
-  
-#endif
-
-
-    //Location of theme preview and background icons.
-    static const QString KPreviewThumbnailNVG = "/scalable/qtg_graf_theme_preview_thumbnail.nvg";
-    static const QString KPreviewThumbnailSVG = "/scalable/qtg_graf_theme_preview_thumbnail.svg";
-    
-    static const QString KBackgroundPrtNVG    = "/scalable/qtg_graf_screen_bg_prt.nvg";
-    static const QString KBackgroundLscNVG    = "/scalable/qtg_graf_screen_bg_lsc.nvg";
-    static const QString KBackgroundPrtSVG    = "/scalable/qtg_graf_screen_bg_prt.svg";
-    static const QString KBackgroundLscSVG    = "/scalable/qtg_graf_screen_bg_lsc.svg";
-    
-    
-
-
-
-/*
- * Builds a CpThemeInfo object given theme path and theme name.  It creates the name and 
- * preview icons for the object.  Creates a new CpThemeInfo objects. Caller takes ownership.
- * Returns NULL if can't build the object.
- */
-CpThemeInfo* CpThemeUtil::buildThemeInfo(const QString& themePath, const QString& themeName)
-{
-    CpThemeInfo *themeInfo = new CpThemeInfo();
-    QString iconPath;
-    
-    QString name = themeName;
-    QString hidden = "";
-    
-    //first look into the index.theme file to get theme information.
-   
-    if(QFileInfo(themePath + "/index.theme").exists()) {
-        QSettings iniSetting(themePath + "/index.theme", QSettings::IniFormat);
-        iniSetting.beginGroup("Icon Theme");
-        name = iniSetting.value("Name").toString();
-        hidden = iniSetting.value("Hidden").toString();
-        iconPath = iniSetting.value("PreviewThumbnailPath").toString();
-        iniSetting.endGroup();
-       
-    }
-                       
-    if(name.isEmpty() || (hidden == "true") ||( hidden == "")) {
-        return NULL;
-    }
-   
-    themeInfo->setName(name);
-    themeInfo->setItemType(CpThemeInfo::ThemeListItemType_default);
-    themeInfo->setItemData(themePath);
-          
-    //Get the icons. Logic is as follow:
-    /* 1. If the icon path is in index.theme and the icon exist, use it.
-     * 2. Otherwise look for the icon in the theme folder.
-     * 2. If preview icon doesn't exist, use background icon.
-     * 3. If no icon exist (background or preview),use default theme icon.
-     */
-    if(iconPath.isEmpty() || !QFileInfo(themePath + iconPath).exists()){
-        //Set thumbnail
-        HbIcon themeIcon = getPreviewIcon(themePath);
-        if(themeIcon.isNull()){
-            QString defaultThemePath = defaultTheme();
-            if(!defaultThemePath.isEmpty()) {
-                themeIcon = getPreviewIcon(defaultThemePath);
-            }
-        }
-        themeInfo->setIcon(themeIcon);
-    } else {
-        themeInfo->setIcon(HbIcon(themePath + iconPath));
-    }
-          
-    return themeInfo;
-
-}
-
-/*!
- * given a path to the theme, returns the preview icon or just a Null icon
- * if it doesn't exist.
- */
-HbIcon CpThemeUtil::getPreviewIcon(const QString& themePath)
-{
-    HbIcon themeIcon;
-    if(QFileInfo(themePath + KPreviewThumbnailNVG).exists()){
-        themeIcon = HbIcon(themePath + KPreviewThumbnailNVG);
-    }else if(QFileInfo(themePath + KPreviewThumbnailSVG).exists()){
-        themeIcon = HbIcon(themePath + KPreviewThumbnailSVG);
-    }else if(QFileInfo(themePath + KBackgroundPrtNVG).exists()){
-        themeIcon = HbIcon(themePath + KBackgroundPrtNVG);
-    }else if(QFileInfo(themePath + KBackgroundPrtSVG).exists()){
-        themeIcon = HbIcon(themePath + KBackgroundPrtSVG);
-    }
-    return themeIcon;
-    
-}
-
-/*! Creates a list of CpThemeInfo objects representing theme information.
- *  
- */
-QList<CpThemeInfo> CpThemeUtil::buildThemeList()
-{
-    QList<CpThemeInfo> themeList; 
-    
-    QList<QPair<QString, QString> > mThemesPathList = availableThemes();
-    QPair<QString, QString>pair;
-    foreach (pair, mThemesPathList) {
-        QDir themeDir;
-        QString name = pair.first;
-        QString path = pair.second;
-        themeDir.setPath( path ) ;
-        CpThemeInfo* themeInfo;
-        if(themeDir.exists("index.theme") &&
-          (themeDir.exists("scalable") || themeDir.exists("pixmap") )) {
-            themeInfo = buildThemeInfo(path, name);
-            if(themeInfo && !themeInfo->name().isEmpty()) {
-                themeList.append(*themeInfo);
-            }
-        }
-    }
-    qSort( themeList );
-    return themeList;
-}
-
-/*!
- * Returns the default theme path. 
- */
-QString CpThemeUtil::defaultTheme()
-{
-    //static because default theme doesn't change.
-    static QString defaultThemePath("");
-    
-    if(defaultThemePath.isEmpty()) {
-       
-
-#ifdef Q_OS_SYMBIAN
-        CRepository *repository = 0;
-        TRAP_IGNORE(repository = CRepository::NewL(KServerUid3));
-        if (repository) {
-            TBuf<256> value;
-            if (KErrNone == repository->Get((TUint32)KDefaultThemeNameKey, value)) {
-                QString qvalue((QChar*)value.Ptr(), value.Length());
-                defaultThemePath = qvalue.trimmed();
-            }
-            value.Zero();
-           delete repository;
-        }
-          
-#endif
-        
-    }
-    return defaultThemePath;
-}
-
-
-const QStringList CpThemeUtil::themeDirectories(const QList<CpThemeInfo>& themeInfoList)
-{
-    QStringList themeDirs;
-    
-    foreach(const CpThemeInfo& themeInfo, themeInfoList) {
-        QDir themePath(themeInfo.itemData());
-        QString topDir;
-        if(themePath.cdUp()) {
-            topDir = themePath.path();
-            if(!themeDirs.contains(topDir)) {
-                themeDirs.append(topDir);
-            }
-        }
-    }
-    return themeDirs;
-}
-
-const QList< QPair< QString, QString > > CpThemeUtil::availableThemes( )
-{
-    
-    QList<QPair<QString, QString> > result = HbThemeServices::availableThemes();
-    return result;
-    
-}
-
-