--- a/src/hbinput/inputwidgets/hbinputsettingwidget.cpp	Fri Sep 17 08:32:10 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputsettingwidget.cpp	Mon Oct 04 00:38:12 2010 +0300
@@ -43,6 +43,15 @@
 #include <hbinputmethod.h>
 #include <hbmainwindow.h>
 
+/*!
+@stable
+@hbinput
+\class HbInputSettingWidget
+\brief Displays settings for Hb inputs.
+
+This is a input settings widget to be embedded in e.g. control panel view or input settings popup.
+*/
+
 const QString statusOff = QObject::tr("Off");
 const QString statusOn = QObject::tr("On");
 const QString bestPrediction = QObject::tr("Best prediction");
@@ -420,7 +429,7 @@
 
         mCnDefaultLanguageItem = new HbDataFormModelItem(HbDataFormModelItem::ComboBoxItem, QObject::tr("Default language for keyboard input"));
         mChineseInputGroup->appendChild(mCnDefaultLanguageItem);
-        int defaultLanguageIndex = HbInputSettingProxy::instance()->useWesternDefaultKeypadForChinese()?1:0;
+        int defaultLanguageIndex = HbInputSettingProxy::instance()->useWesternDefaultKeypadForChinese() ? 1 : 0;
         mCnDefaultLanguageItem->setContentWidgetData(QString("items"), mCnDefaultLanguageNames);
         mCnDefaultLanguageItem->setContentWidgetData(QString("currentIndex"), defaultLanguageIndex);
         mCnDefaultLanguageItem->setContentWidgetData(QString("objectName"), QString("default_language_for_keyboard_input"));
@@ -476,7 +485,7 @@
     }
 
     if(mChineseInputGroup && mCnDefaultLanguageItem) {
-        int defaultLanguageIndex = HbInputSettingProxy::instance()->useWesternDefaultKeypadForChinese()?1:0;
+        int defaultLanguageIndex = HbInputSettingProxy::instance()->useWesternDefaultKeypadForChinese() ? 1 : 0;
         mCnDefaultLanguageItem->setContentWidgetData(QString("currentIndex"), defaultLanguageIndex);
     }
 }
@@ -588,6 +597,11 @@
         createChineseSettingGroup(mModel);
     }
     mForm->setModel(mModel);
+
+    // expand language selection
+    QModelIndex index = mModel->indexFromItem(mLanguageGroup);
+    mForm->setExpanded(index, true);
+
     QObject::connect(mModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)), q, SLOT(dataChange(QModelIndex, QModelIndex)));
 }