diff -r 67457b2ffb33 -r feebad15db8c camerauis/cameraxui/cxui/src/cxuisettingradiobuttonlist.cpp --- a/camerauis/cameraxui/cxui/src/cxuisettingradiobuttonlist.cpp Thu Jul 15 01:52:14 2010 +0300 +++ b/camerauis/cameraxui/cxui/src/cxuisettingradiobuttonlist.cpp Thu Jul 15 01:53:45 2010 +0300 @@ -73,7 +73,7 @@ // Store the original setting value and focus matching item. QString value; mEngine->settings().get(mSettingId, value); - CX_DEBUG(("CxuiSettingRadioButtonList - original value: [%s]", value.toAscii().data())); + CX_DEBUG(("CxuiSettingRadioButtonList - original value: [%s]", qPrintable(value))); setOriginalSelectedItemByValue(QVariant(value)); } } @@ -87,15 +87,21 @@ { CX_DEBUG_ENTER_FUNCTION(); + // Find the index of given value among setting values. + // Default to first item, if given value is not found. int index = mSettingValues.indexOf(QVariant(value)); - if (index >= 0) { - mOriginalIndex = index; - setSelected(index); - // ensure that currently selected item is visible - scrollTo(currentIndex()); - } else { - CX_DEBUG(("[WARNING] Value %s not found, defaulting to first item", value.toString().toAscii().data())); + if (index < 0) { + CX_DEBUG(("[WARNING] Value [%s] not found, selecting first item", qPrintable(value.toString()))); + index = 0; } + + // Store the original value. + mOriginalIndex = index; + // Select the index with current value item. + setSelected(index); + // Ensure that currently selected item is visible. + scrollTo(currentIndex()); + CX_DEBUG_EXIT_FUNCTION(); } @@ -190,12 +196,12 @@ { CX_DEBUG_ENTER_FUNCTION(); - CX_DEBUG(("id: %s", mSettingId.toAscii().data())); + CX_DEBUG(("CxuiSettingRadioButtonList - id: %s", qPrintable(mSettingId))); if (!mSettingId.isEmpty() && !mSettingValues.isEmpty()) { QVariant value = mSettingValues.at(index); if (value.type() == QVariant::Int) { - CX_DEBUG(("index:%d value:%d", index, value.toInt())); + CX_DEBUG(("CxuiSettingRadioButtonList - index:%d value:%d", index, value.toInt())); // Don't set the value again, if it is the current value. // For e.g. video quality it would result in re-preparation etc. @@ -209,11 +215,11 @@ emit valueSelected(value.toInt()); } else if (value.type() == QVariant::String) { - CX_DEBUG(("index:%d value:[%s]", index, value.toString().toAscii().constData())); + CX_DEBUG(("CxuiSettingRadioButtonList - index:%d value:[%s]", index, qPrintable(value.toString()))); QString current; CxeError::Id status(mEngine->settings().get(mSettingId, current)); - CX_DEBUG(("settings model value:[%s]", current.toAscii().constData())); + CX_DEBUG(("CxuiSettingRadioButtonList - settings model value:[%s]", qPrintable(current))); if (status != CxeError::None || current != value.toString()) { mEngine->settings().set(mSettingId, value.toString());