--- a/textinput/peninputarc/gsplugin/gspeninputplugin/src/gspeninputimple.cpp Tue Feb 02 01:02:04 2010 +0200
+++ b/textinput/peninputarc/gsplugin/gspeninputplugin/src/gspeninputimple.cpp Fri Feb 19 23:09:27 2010 +0200
@@ -497,36 +497,41 @@
TBool CGSPenInputImple::ShowGuideLinePageL()
{
TInt currentItem = iModel->GuideLine();
+ currentItem = ( 0 == currentItem ) ? 1 : 0;
- if (currentItem == 1)
- {
- currentItem = 0;
- }
- else
- {
- currentItem = 1;
- }
-
- CAknRadioButtonSettingPage* dlg = new (ELeave) CAknRadioButtonSettingPage(
- R_GS_GUIDLINE_TEXT_SETTING_PAGE,
- currentItem,
- iGuideLineItems);
-
- CleanupStack::PushL(dlg);
+ iModel->SetGuideLine(currentItem);
+
+ return ETrue;
- TBool ret = EFalse;
- if (dlg->ExecuteLD(CAknSettingPage::EUpdateWhenChanged))
- {
- if(currentItem == iModel->GuideLine())
- {
- iModel->SetGuideLine(currentItem == 0? 1:0);
- ret = ETrue;
- }
- }
-
- CleanupStack::Pop(dlg);
+// if (currentItem == 1)
+// {
+// currentItem = 0;
+// }
+// else
+// {
+// currentItem = 1;
+// }
+//
+// CAknRadioButtonSettingPage* dlg = new (ELeave) CAknRadioButtonSettingPage(
+// R_GS_GUIDLINE_TEXT_SETTING_PAGE,
+// currentItem,
+// iGuideLineItems);
+//
+// CleanupStack::PushL(dlg);
+//
+// TBool ret = EFalse;
+// if (dlg->ExecuteLD(CAknSettingPage::EUpdateWhenChanged))
+// {
+// if(currentItem == iModel->GuideLine())
+// {
+// iModel->SetGuideLine(currentItem == 0? 1:0);
+// ret = ETrue;
+// }
+// }
+//
+// CleanupStack::Pop(dlg);
- return ret;
+// return ret;
}
// ---------------------------------------------------------
@@ -653,26 +658,30 @@
TBool CGSPenInputImple::ShowInputMethodForFindPageL()
{
TInt currentItem = iModel->InputMethodForFind();
-
- CAknRadioButtonSettingPage* dlg = new (ELeave) CAknRadioButtonSettingPage(
- R_GS_INPUTMETHODFORFIND_TEXT_SETTING_PAGE,
- currentItem,
- iInputMethodForFindItems);
-
- CleanupStack::PushL(dlg);
- TBool ret = EFalse;
+ currentItem = ( 0 == currentItem ) ? 1 : 0;
+
+ iModel->SetInputMethodForFind(currentItem);
- if (dlg->ExecuteLD(CAknSettingPage::EUpdateWhenChanged))
- {
- if(currentItem != iModel->InputMethodForFind())
- {
- iModel->SetInputMethodForFind(currentItem);
- ret = ETrue;
- }
- }
-
- CleanupStack::Pop(dlg);
- return ret;
+ return ETrue;
+// CAknRadioButtonSettingPage* dlg = new (ELeave) CAknRadioButtonSettingPage(
+// R_GS_INPUTMETHODFORFIND_TEXT_SETTING_PAGE,
+// currentItem,
+// iInputMethodForFindItems);
+//
+// CleanupStack::PushL(dlg);
+// TBool ret = EFalse;
+//
+// if (dlg->ExecuteLD(CAknSettingPage::EUpdateWhenChanged))
+// {
+// if(currentItem != iModel->InputMethodForFind())
+// {
+// iModel->SetInputMethodForFind(currentItem);
+// ret = ETrue;
+// }
+// }
+//
+// CleanupStack::Pop(dlg);
+// return ret;
}
// ---------------------------------------------------------
@@ -681,13 +690,14 @@
//
TBool CGSPenInputImple::ShowChineseFindMethodPageL()
{
- TInt currentItem = iModel->ChineseFindMethod();
+
TBool ret = EFalse;
if ( !iChineseFindMethodItems )
{
// In that case, don't open setting page
- return EFalse;
+ return ret;
}
+ TInt currentItem = iModel->ChineseFindMethod();
CAknRadioButtonSettingPage* dlg
= new (ELeave) CAknRadioButtonSettingPage(
R_GS_CHINESEFINDMETHOD_TEXT_SETTING_PAGE,