FCL/sf/app/settingsuis: comparison controlpanelplugins/themeplugin/src/cpthemecontrol.cpp

equal deleted inserted replaced

-:19394c261aa5
+:e79ce701c376
 #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.
 */
 setActiveThemeIndex();
 //connect to signal for selecting a list item.
-connect(mThemeListView,SIGNAL(newThemeSelected(const QModelIndex&)),
+connect(mThemeListView,SIGNAL(newThemeSelected(QModelIndex)),
-this,SLOT(newThemeSelected(const QModelIndex&)));
+this,SLOT(newThemeSelected(QModelIndex)));
 	//handle signal for list view closing. (e.g Back softkey pressed)
 connect(mThemeListView,SIGNAL(aboutToClose()),
 this,SLOT(themeListClosed()));
 }
 data = index.data(Qt::DisplayRole);
 if(data.isValid()) {
 themeInfo.setName(data.toString());
 }
+data = index.data(CpThemeListModel::ItemDataRole);
+if(data.isValid()) {
+themeInfo.setItemData(data.toString());
+}
 //get theme icon.
 data = index.data(Qt::DecorationRole);
 if(data.isValid()) {
 themeInfo.setIcon(data.value<HbIcon>());
 }
 data = index.data(CpThemeListModel::LandscapePreviewRole);
 if(data.isValid()) {
 themeInfo.setLandscapePreviewIcon(data.value<HbIcon>());
 }
+#ifdef CP_THEME_PREVIEW_DEFINED
 //Set up the theme preview and set it to
 //the current view of main window.
 HbMainWindow*  mWindow = ::mainWindow();
 if(!mThemePreview){
 mThemePreview = new CpThemePreview(themeInfo);
 mWindow->addView(mThemePreview);
 connect(mThemePreview,SIGNAL(aboutToClose()),
 this, SLOT(previewClosed()));
-connect(mThemePreview, SIGNAL(applyTheme(const QString&)),
+connect(mThemePreview, SIGNAL(applyTheme(CpThemeInfo)),
-this, SLOT(themeApplied(const QString&)));
+this, SLOT(themeApplied(CpThemeInfo)));
 } else {
 mThemePreview->setThemeInfo(themeInfo);
 }
 mThemePreview->setTitle(hbTrId("txt_cp_title_control_panel"));
 mWindow->setCurrentView(mThemePreview);
+#else
+themeApplied(themeInfo);
+#endif
 }
 /*!
 	Slot called when a Select key is pressed in theme preview view.
 */
-void CpThemeControl::themeApplied(const QString& theme)
+void CpThemeControl::themeApplied(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(1000, this, SLOT(themeWaitTimeout()));
+QTimer::singleShot(KThemeChangeTimeOutMilliSeconds, this, SLOT(themeWaitTimeout()));
 mThemeChangeFinished = false;
 } else {
 //theme change failed, go back to control panel.
+#ifdef CP_THEME_PREVIEW_DEFINED
 previewClosed();
 triggerThemeListClose();
+#else
+setActiveThemeIndex();
+#endif
 }
 }
 /*!
 void CpThemeControl::previewClosed()
 {
 //The theme preview closed, go back
 //to theme list view.
 HbMainWindow*  mainWindow = ::mainWindow();
-	mainWindow->removeView(mThemePreview);
+if(mThemePreview){
-mThemePreview->deleteLater();
+mainWindow->removeView(mThemePreview);
-mThemePreview = 0;
+mThemePreview->deleteLater();
+mThemePreview = 0;
+}
 //reset the current index to active theme, so that the selection remains on current
 //theme even though another list item is selected.
 setActiveThemeIndex();
 	mainWindow->setCurrentView(mThemeListView);
 //so revert back the application priority to normal
 //and go back to control panel view.
 if(mWaitDialog && mWaitDialog->isVisible()) {
 mWaitDialog->hide();
 }
-previewClosed();
+#ifdef CP_THEME_PREVIEW_DEFINED
-//ask the themelistview to close.  Control Panel will
+previewClosed();
-//take care of removing it from window.
+//ask the themelistview to close.  Control Panel will
-triggerThemeListClose();
+//take care of removing it from window.
+triggerThemeListClose();
+#else
+setActiveThemeIndex();
+#endif
 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(!mThemeChangeFinished){
-{
 if(!mWaitDialog) {
 mWaitDialog = new HbDialog();
 mWaitDialog->setDismissPolicy(HbPopup::NoDismiss);
 mWaitDialog->setModal(false);
 mWaitDialog->setTimeout(HbPopup::NoTimeout);
-//TODO: need localized text for Hb Dialog
 // Create and set HbLabel as content widget.
-HbLabel *label = new HbLabel("Processing ...");
+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();
 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);
+}
+}

changeset 31	e79ce701c376
parent 25	19394c261aa5
child 37	cb294e641644