FCL/sf/mw/hb: comparison src/hbapps/hbthemechanger/themeselectionlist.cpp

equal deleted inserted replaced

-:11d3954df52a
+:627c4a0fd0e7
 #include <hbinstance.h>
 #include <hbmenu.h>
 #include <hbaction.h>
 #include <hbicon.h>
 #include <hblistwidgetitem.h>
+#include <restricted/hbthemeservices_r.h>
 #include <QDebug>
 #include <QTime>
 #include <QThread>
 #include "themeselectionlist.h"
 #include "themechangerdefs.h"
 /**
 * Constructor
 */
-ThemeSelectionList::ThemeSelectionList(
+ThemeSelectionList::ThemeSelectionList():
-#ifdef Q_OS_SYMBIAN
-ThemeClientSymbian* client
-#else
-ThemeClientQt* client
-#endif
-):
 oldItemIndex(-1),
 themelist(new HbListWidget(this)),
 rightMark(new HbIcon(QString("qtg_small_tick"))),
-noMark(new HbIcon(QString(""))),
+noMark(new HbIcon(QString("")))
-client(client)
 {
 connect(themelist, SIGNAL(activated(HbListWidgetItem *)),this, SLOT(setChosen(HbListWidgetItem *)));
 setWidget(themelist);
 // Automatic updation of the themelist when some theme is installed or uninstalled
 ThemeSelectionList::~ThemeSelectionList()
 {
 // Set the theme to the applied theme before exiting.
 setChosen(themelist->item(oldItemIndex));
 delete noMark;
 noMark=NULL;
 delete rightMark;
 rightMark=NULL;
 // Reset the item view
 themelist->reset();
 delete themelist;
 themelist=NULL;
+// Delete preview thubnails
+qDeleteAll(thumbnails);
+thumbnails.clear();
 }
 /**
 * displayThemes
 QDir iconThemePath(root.path()+"/themes/icons/"+themefolder);
 if(iconThemePath.exists("index.theme")) {
 QSettings iniSetting(iconThemePath.path()+"/index.theme",QSettings::IniFormat);
 iniSetting.beginGroup("Icon Theme");
 QString hidden = iniSetting.value("Hidden").toString();
-QString name = iniSetting.value("Name").toString();
 iniSetting.endGroup();
-if((hidden == "true") ||( hidden == "")||(name!=themefolder) ) {
+if((hidden == "true") ||( hidden == "")) {
 iconthemeslist.removeOne(themefolder);
 }
 }
 else {
 iconthemeslist.removeOne(themefolder);
 }
 }
 if(!entryAdded){
-iconthemeslist.insert(0,"hbdefault"); //adding one default entry
+//adding one default entry
+HbListWidgetItem *item = new HbListWidgetItem();
+item->setText("hbdefault");
+item->setSecondaryText("hbdefault");
+QString thumbPath(":/themes/icons/hbdefault/scalable/qtg_graf_theme_preview_thumbnail.svg");
+HbIcon *icon = new HbIcon(thumbPath);
+thumbnails.append(icon);
+item->setIcon(*icon);
+if (HbInstance::instance()->theme()->name() == "hbdefault") {
+item->setSecondaryIcon(*rightMark);
+themelist->addItem(item);
+oldItemIndex=themelist->count()-1;
+themelist->setCurrentRow(oldItemIndex);
+} else {
+item->setSecondaryIcon(*noMark);
+themelist->addItem(item);
+}
 entryAdded = true;
 }
 list=iconthemeslist;
 for (int i=0; i <list.count();i++) {
 // populate theme list with existing themes
-if((HbInstance::instance()->theme()->name())==(list.at(i))) {
+HbListWidgetItem *item = new HbListWidgetItem();
-themelist->addItem(*rightMark,list.at(i));
+QSettings iniSetting(root.path()+"/themes/icons/"+list.at(i)+"/index.theme",QSettings::IniFormat);
+iniSetting.beginGroup("Icon Theme");
+QString name = iniSetting.value("Name").toString();
+iniSetting.endGroup();
+item->setText(name);
+item->setSecondaryText(root.path()+"/themes/icons/"+list.at(i));
+QString thumbPath(root.path()+"/themes/icons/"+list.at(i)+"/scalable/qtg_graf_theme_preview_thumbnail.svg");
+HbIcon *icon = new HbIcon(thumbPath);
+thumbnails.append(icon);
+item->setIcon(*icon);
+if (QFileInfo(HbThemeServices::themePath()) == QFileInfo(item->secondaryText())) {
+item->setSecondaryIcon(*rightMark);
+themelist->addItem(item);
 oldItemIndex=themelist->count()-1;
 themelist->setCurrentRow(oldItemIndex);
 }
 else {
-themelist->addItem(*noMark,list.at(i));
+item->setSecondaryIcon(*noMark);
+themelist->addItem(item);
 }
 }
 }
 }
 //    else{//add a case for no theme ,make hbdefault entry
 if(!themePresent) {
 QStringList defaultList;
 defaultList.insert(0,"hbdefault"); //adding one default entry
-themelist->addItem(*rightMark,defaultList.at(0));
+HbListWidgetItem *item = new HbListWidgetItem();
+item->setText(defaultList.at(0));
+item->setSecondaryText(defaultList.at(0));
+QString thumbPath(":/themes/icons/hbdefault/scalable/qtg_graf_theme_preview_thumbnail.svg");
+HbIcon *icon = new HbIcon(thumbPath);
+thumbnails.append(icon);
+item->setIcon(*icon);
+item->setSecondaryIcon(*rightMark);
+themelist->addItem(item);
 QString themeName=HbInstance::instance()->theme()->name();
 if (themeName != "hbdefault")
 {
-if (!client->isConnected()) {
+emit newThemeSelected("hbdefault");
-bool success = client->connectToServer();
-if (success) {
-emit newThemeSelected("hbdefault");
-}
-}
-else {
-emit newThemeSelected("hbdefault");
-}
 }
 }
 }
 /**
 * setChosen
 */
 void ThemeSelectionList::setChosen(HbListWidgetItem *item)
 {
-QString str=item->text();
 #ifdef THEME_CHANGER_TRACES
-qDebug() << "ThemeSelectionList::Setchosen with ThemeName: "<<str;
+qDebug() << "ThemeSelectionList::Setchosen with ThemeName: "<<item->secondaryText();
 #endif
-if(iCurrentTheme != str ) {
+if(iCurrentTheme != item->secondaryText()) {
 #ifdef THEME_CHANGER_TIMER_LOG
 timer.start();
-qDebug() << "Selected theme: " << str;
+qDebug() << "Selected theme: " << item->secondaryText();
 #endif
-iCurrentTheme = str;
+iCurrentTheme = item->secondaryText();
-if (!client->isConnected()) {
+QThread::currentThread()->setPriority(QThread::HighPriority);
-bool success = client->connectToServer();
+emit newThemeSelected(item->secondaryText());
-if (success) {
-QThread::currentThread()->setPriority(QThread::HighPriority);
-emit newThemeSelected(str);
-}
-}
-else {
-QThread::currentThread()->setPriority(QThread::HighPriority);
-emit newThemeSelected(str);
-}
 }
 else
 {
 applySelection(); //double tap //put a tick
 }
 * applySelection
 */
 void ThemeSelectionList::applySelection()
 {
 if(oldItemIndex!=themelist->currentRow()) {
-themelist->setIcon(themelist->currentRow(),*rightMark);
+HbListWidgetItem *item = themelist->item(themelist->currentRow());
+item->setSecondaryIcon(*rightMark);
 if(oldItemIndex >= 0) {
-themelist->setIcon(oldItemIndex,*noMark);
+HbListWidgetItem *olditem = themelist->item(oldItemIndex);
+olditem->setSecondaryIcon(*noMark);
 }
 oldItemIndex = themelist->currentRow();
 }
 }
 /**
 * sendThemeName
 */
 void ThemeSelectionList::sendThemeName(const QString& name)
 {
-client->changeTheme(name);
+HbThemeServices::setTheme(name);
 }
 /**
 * \internal
 */
 void ThemeSelectionList::processWhenIdle()
 {
 qDebug() << "Theme changed applied in " << timer.elapsed() << " msec";
 idleTimer->stop();
 QThread::currentThread()->setPriority(QThread::NormalPriority);
-if (!client->isConnected()) {
-client->connectToServer();
-}
 }
 void ThemeSelectionList::themeChanged()
 {
 idleTimer->start(0);

changeset 5	627c4a0fd0e7
parent 2	06ff229162e9
child 6	c3690ec91ef8