FCL/sf/mw/hb: comparison src/hbservers/themechanger/themeselectionlist.cpp

equal deleted inserted replaced

-:16d8024aca5e
+:f7ac710697a9
 **
 ****************************************************************************/
 #include <QSettings>
 #include <QStringList>
 #include <QDir>
+#include <QTimer>
 #include <hbinstance.h>
 #include <hbmenu.h>
 #include <hbaction.h>
 #include <hbicon.h>
+#include <hblistwidgetitem.h>
 #include <QDebug>
+#include <QTime>
 #include "themeselectionlist.h"
 #include "themechangerdefs.h"
 /**
 ThemeClientSymbian* client
 #else
 ThemeClientQt* client
 #endif
 ):
-themelist(new HbListView(this)),
+oldItemIndex(-1),
-model(new QStandardItemModel(this)),
+themelist(new HbListWidget(this)),
 rightMark(new HbIcon(QString("qtg_small_tick"))),
 noMark(new HbIcon(QString(""))),
 client(client)
 {
-connect(themelist, SIGNAL(activated(const QModelIndex&)),this, SLOT(setChosen(const QModelIndex&)));
+connect(themelist, SIGNAL(activated(HbListWidgetItem *)),this, SLOT(setChosen(HbListWidgetItem *)));
 setWidget(themelist);
 // Automatic updation of the themelist when some theme is installed or uninstalled
 // when the themechanger app is open
 watcher=new QFileSystemWatcher();
 watcher->addPath(KThemeRootPath+"/themes/icons/");
 }
 }
 connect(watcher,SIGNAL(directoryChanged(const QString &)),this,SLOT(updateThemeList(const QString &)));
 QObject::connect(this,SIGNAL(newThemeSelected(QString)),this,SLOT(sendThemeName(QString)));
+#ifdef THEME_CHANGER_TIMER_LOG
+idleTimer = new QTimer(this);
+connect(idleTimer, SIGNAL(timeout()), this, SLOT(processWhenIdle()));
+connect(hbInstance->theme(),SIGNAL(changeFinished()), this, SLOT(themeChanged()));
+idleTimer->start(0); // to make a connection to server
+#endif
 }
 /**
 * Destructor
 */
 ThemeSelectionList::~ThemeSelectionList()
 {
 // Set the theme to the applied theme before exiting.
-setChosen(oldItemIndex);
+setChosen(themelist->item(oldItemIndex));
 delete noMark;
 noMark=NULL;
 delete rightMark;
 rightMark=NULL;
-// Remove all the items from model, then delete
-model->clear();
-delete model;
-model=NULL;
 // Reset the item view
 themelist->reset();
 delete themelist;
 themelist=NULL;
 bool entryAdded = false;
 bool themePresent = false;
 foreach(const QString &KThemeRootPath, rootPaths()){
 dir.setPath(KThemeRootPath) ;
 QStringList list = dir.entryList(QDir::AllDirs|QDir::NoDotAndDotDot,QDir::Name);
-if(list.contains("themes",Qt::CaseSensitive )) {
+if(list.contains("themes",Qt::CaseInsensitive )) {
 themePresent = true;
 QDir root = KThemeRootPath;
 dir.setPath(root.path()+"/themes/icons/") ;
 QStringList iconthemeslist=dir.entryList(QDir::AllDirs|QDir::NoDotAndDotDot,QDir::Name);
 foreach(QString themefolder, iconthemeslist) {
 iconthemeslist.insert(0,"hbdefault"); //adding one default entry
 entryAdded = true;
 }
 list=iconthemeslist;
 for (int i=0; i <list.count();i++) {
-// Items are populated to create the model
+// populate theme list with existing themes
-QStandardItem *item=new QStandardItem(list.at(i));
-model->appendRow(item);
 if((HbInstance::instance()->theme()->name())==(list.at(i))) {
-item->setIcon(rightMark->qicon());
+themelist->addItem(*rightMark,list.at(i));
-oldItemIndex=item->index();
+oldItemIndex=themelist->count()-1;
-themelist->setCurrentIndex(oldItemIndex,QItemSelectionModel::Select);
+themelist->setCurrentRow(oldItemIndex);
 }
 else {
-item->setIcon(noMark->qicon());
+themelist->addItem(*noMark,list.at(i));
 }
 }
 }
 }
 //    else{//add a case for no theme ,make hbdefault entry
 if(!themePresent) {
 QStringList defaultList;
 defaultList.insert(0,"hbdefault"); //adding one default entry
-QStandardItem *item=new QStandardItem(defaultList.at(0));
+themelist->addItem(*rightMark,defaultList.at(0));
-model->appendRow(item);
-item->setIcon(rightMark->qicon());
 QString themeName=HbInstance::instance()->theme()->name();
 if (themeName != "hbdefault")
 {
 if (!client->isConnected()) {
 bool success = client->connectToServer();
 emit newThemeSelected("hbdefault");
 }
 }
 }
-// Set the this model for the list
-themelist->setModel(model);
 }
 /**
 * setChosen
 */
-void ThemeSelectionList::setChosen(const QModelIndex &index)
+void ThemeSelectionList::setChosen(HbListWidgetItem *item)
 {
-// Extract the string from the model index
+QString str=item->text();
-QVariant variant=index.data();
-QString str=variant.toString();
 #ifdef THEME_CHANGER_TRACES
 qDebug() << "ThemeSelectionList::Setchosen with ThemeName: "<<str;
 #endif
 if(iCurrentTheme != str ) {
+#ifdef THEME_CHANGER_TIMER_LOG
+timer.start();
+qDebug() << "Selected theme: " << str;
+#endif
 iCurrentTheme = str;
 if (!client->isConnected()) {
 bool success = client->connectToServer();
 if (success) {
 emit newThemeSelected(str);
 /**
 * applySelection
 */
 void ThemeSelectionList::applySelection()
 {
-QModelIndex currentItemIndex = (themelist)->currentIndex();
+if(oldItemIndex!=themelist->currentRow()) {
-if(oldItemIndex!=currentItemIndex) {
+themelist->setIcon(themelist->currentRow(),*rightMark);
-(model->itemFromIndex(currentItemIndex))->setIcon(rightMark->qicon());
+if(oldItemIndex >= 0) {
-if(oldItemIndex.isValid()) {
+themelist->setIcon(oldItemIndex,*noMark);
-(model->itemFromIndex(oldItemIndex))->setIcon(noMark->qicon());
+}
-}
+oldItemIndex = themelist->currentRow();
-oldItemIndex = currentItemIndex;
+}
-}
 }
 /**
 * event
 */
 bool ThemeSelectionList::event(QEvent *e)
 {
 if((e->type()==QEvent::ShortcutOverride)||(e->type()==QEvent::WindowDeactivate)) {
-themelist->setCurrentIndex(oldItemIndex,QItemSelectionModel::Select);
+// save old applied theme
+themelist->setCurrentRow(oldItemIndex);
 themelist->setFocus();
-setChosen(oldItemIndex);
+setChosen(themelist->item(oldItemIndex));
 return true;
 }
 return (HbView::event(e));
 }
 * updateThemeList
 */
 void ThemeSelectionList::updateThemeList(const QString &path)
 {
 Q_UNUSED(path);
-model->clear();
+themelist->clear();
 this->displayThemes();
 }
 /**
 QStringList ThemeSelectionList::rootPaths()
 {
 QStringList rootDirs;
 #if defined(Q_OS_SYMBIAN)
 rootDirs << "c:/resource/hb"
-<< "z:/resource/hb";
+<< "z:/resource/hb"
+<< "e:/resource/hb"
+<< "f:/resource/hb";
 #else
 QString envDir = qgetenv("HB_THEMES_DIR");
 if (!envDir.isEmpty())
 rootDirs << envDir;
 #endif
 #elif !defined(Q_OS_SYMBIAN)
 rootDirs << HB_RESOURCES_DIR;
 #endif
 return rootDirs;
 }
+#ifdef THEME_CHANGER_TIMER_LOG
+void ThemeSelectionList::processWhenIdle()
+{
+qDebug() << "Theme changed applied in " << timer.elapsed() << " msec";
+idleTimer->stop();
+if (!client->isConnected()) {
+client->connectToServer();
+}
+}
+void ThemeSelectionList::themeChanged()
+{
+idleTimer->start(0);
+}
+#endif //THEME_CHANGER_TIMER_LOG

changeset 1	f7ac710697a9
parent 0	16d8024aca5e