--- a/controlpanelui/src/cpplugins/personalizationplugin/src/cpprofilesettingform.cpp Wed Aug 18 09:49:35 2010 +0300
+++ b/controlpanelui/src/cpplugins/personalizationplugin/src/cpprofilesettingform.cpp Thu Sep 02 20:27:31 2010 +0300
@@ -215,197 +215,7 @@
}
-/*
-void CpProfileSettingForm::initGeneralTonesGroup()
-{
- CpProfileSettings profileSettings;
- mProfileModel->profileSettings( EProfileWrapperGeneralId, profileSettings );
-
- //HbDataFormModelItem *tonesGroup = mModel->appendDataFormGroup(
- // hbTrId("txt_cp_subhead_tones"),mGeneralPage);
- QFileInfo ringToneFileInfo( profileSettings.mRingTone );
- mModel->appendDataFormItem( new CpPersonalizationEntryItemData( *mItemDataHelper,
- hbTrId("txt_cp_dblist_ringtone"), ringToneFileInfo.fileName(), mFileIconProvider->icon( ringToneFileInfo ) ), mGeneralPage);
-
- QFileInfo messageToneFileInfo( profileSettings.mMessageTone );
- mModel->appendDataFormItem( new CpPersonalizationEntryItemData( *mItemDataHelper,
- hbTrId("txt_cp_dblist_message_tone"), messageToneFileInfo.fileName(), mFileIconProvider->icon( messageToneFileInfo ) ), mGeneralPage);
-
- QFileInfo emailToneFileInfo( profileSettings.mEmailTone );
- mModel->appendDataFormItem( new CpPersonalizationEntryItemData( *mItemDataHelper,
- hbTrId("txt_cp_dblist_email_tone"), emailToneFileInfo.fileName(), mFileIconProvider->icon( emailToneFileInfo ) ), mGeneralPage);
-
- QFileInfo reminderToneFileInfo( profileSettings.mReminderTone );
- mModel->appendDataFormItem( new CpPersonalizationEntryItemData( *mItemDataHelper,
- hbTrId("txt_cp_dblist_reminder_tone"), reminderToneFileInfo.fileName(), mFileIconProvider->icon( reminderToneFileInfo ) ), mGeneralPage);
-
- HbDataFormModelItem *notificationTones = mModel->appendDataFormItem(HbDataFormModelItem::CheckBoxItem,QString(),mGeneralPage);
- notificationTones->setContentWidgetData("text", hbTrId("txt_cp_list_notification_tones"));
- notificationTones->setContentWidgetData( "checkState", profileSettings.mNotificationTone?2:0 );
-
- mGeneralKeysAndScreenToneSlider =
- mModel->appendDataFormItem(HbDataFormModelItem::SliderItem ,QString(hbTrId("txt_cp_setlabel_key_and_touchscreen_tones")),mGeneralPage);
-
- //QMap< QString, QVariant > elements;
- //elements.insert(QString("IncreaseElement") , QVariant(":/icon/hb_vol_slider_increment.svg"));
- //elements.insert(QString("DecreaseElement"), QVariant(":/icon/hb_vol_slider_decrement.svg") );
- //elements.insert(QString("IconElement"), QVariant(":/icon/hb_vol_slider_muted.svg") );
- //mGeneralKeysAndScreenToneSlider->setContentWidgetData( QString( "elementIcons" ), elements );
-
- //TODO: profileModel need provide Max and Min value( 0-5 ), current max value from profileModel is 3
- mGeneralKeysAndScreenToneSlider->setContentWidgetData( QString( "minimum" ), 0 );
- mGeneralKeysAndScreenToneSlider->setContentWidgetData( QString( "maximum" ), 5 );
- mGeneralKeysAndScreenToneSlider->setContentWidgetData( QString("value"), profileSettings.mKeyTouchScreenTone );
-
-
- mGeneralSreenVibra = mModel->appendDataFormItem( HbDataFormModelItem::SliderItem, QString( hbTrId( "txt_cp_setlabel_touch_screen_vibra" ) ), mGeneralPage );
- //TODO: profileModel need provide Max and Min value( 0-5 ), current max value from profileModel is 3
- mGeneralSreenVibra->setContentWidgetData( QString( "minimum" ), 0 );
- mGeneralSreenVibra->setContentWidgetData( QString( "maximum" ), 5 );
- mGeneralSreenVibra->setContentWidgetData( QString("value"), profileSettings.mKeyTouchScreenVibra );
-
- addConnection( notificationTones, SIGNAL( stateChanged( int )), this, SLOT( on_general_notificationTones_stateChanged( int )));
- addConnection( mGeneralKeysAndScreenToneSlider, SIGNAL( valueChanged( int )), this, SLOT( on_general_keysAndScreenToneSlider_ValueChanged( int )));
- addConnection( mGeneralSreenVibra, SIGNAL( valueChanged( int )), this, SLOT( on_general_screenVibra_ValueChanged( int )));
-}
-*/
-/*void CpProfileSettingForm::initGeneralVibraGroup()
-{
- CpProfileSettings profileSettings;
- mProfileModel->profileSettings( EProfileWrapperGeneralId, profileSettings );
-
- HbDataFormModelItem *vibraGroup = mModel->appendDataFormGroup(
- hbTrId( "txt_cp_subhead_vibra" ), mGeneralPage );
- HbDataFormModelItem *ringVibar = mModel->appendDataFormItem( HbDataFormModelItem::CheckBoxItem, QString(), vibraGroup );
- ringVibar->setContentWidgetData( "text", hbTrId( "txt_cp_list_ring_alet" ) );
- ringVibar->setContentWidgetData( "checkState", profileSettings.mRingAlertVibra?2:0 );
-
- HbDataFormModelItem *messageVibra = mModel->appendDataFormItem( HbDataFormModelItem::CheckBoxItem, QString(), vibraGroup );
- messageVibra->setContentWidgetData( "text", hbTrId( "txt_cp_list_received_message" ) );
- messageVibra->setContentWidgetData( "checkState", profileSettings.mMessageVibra?2:0 );
-
- HbDataFormModelItem *emailVibra = mModel->appendDataFormItem( HbDataFormModelItem::CheckBoxItem, QString(), vibraGroup );
- emailVibra->setContentWidgetData( "text", hbTrId( "txt_cp_list_received_email" ) );
- emailVibra->setContentWidgetData( "checkState", profileSettings.mEmailVibra?2:0 );
-
- HbDataFormModelItem *reminderVibra = mModel->appendDataFormItem( HbDataFormModelItem::CheckBoxItem, QString(), vibraGroup );
- reminderVibra->setContentWidgetData( "text", hbTrId( "txt_cp_list_reminder_alert" ));
- reminderVibra->setContentWidgetData( "checkState", profileSettings.mReminderAlertVibra?2:0 );
-
- HbDataFormModelItem *notificationVibra = mModel->appendDataFormItem( HbDataFormModelItem::CheckBoxItem, QString(), vibraGroup );
- notificationVibra->setContentWidgetData( "text", hbTrId( "txt_cp_list_notification" ) );
- notificationVibra->setContentWidgetData( "checkState", profileSettings.mNotificationVibra?2:0 );
-
- mGeneralSreenVibra = mModel->appendDataFormItem( HbDataFormModelItem::SliderItem, QString( hbTrId( "txt_cp_setlabel_touch_screen_vibra" ) ), vibraGroup );
- //TODO: profileModel need provide Max and Min value( 0-5 ), current max value from profileModel is 3
- mGeneralSreenVibra->setContentWidgetData( QString( "minimum" ), 0 );
- mGeneralSreenVibra->setContentWidgetData( QString( "maximum" ), 5 );
- mGeneralSreenVibra->setContentWidgetData( QString("value"), profileSettings.mKeyTouchScreenVibra );
-
- addConnection( ringVibar, SIGNAL( stateChanged( int )), this, SLOT( on_general_ringVibar_stateChanged( int )));
- addConnection( messageVibra, SIGNAL( stateChanged( int )), this, SLOT( on_general_messageVibra_stateChanged( int )));
- addConnection( emailVibra, SIGNAL( stateChanged( int )), this, SLOT( on_general_emailVibra_stateChanged( int )));
- addConnection( reminderVibra, SIGNAL( stateChanged( int )), this, SLOT( on_general_reminderVibra_stateChanged( int )));
- addConnection( notificationVibra, SIGNAL( stateChanged( int )), this, SLOT( on_general_notificationVibra_stateChanged( int )));
-
- addConnection( mGeneralSreenVibra, SIGNAL( valueChanged( int )), this, SLOT( on_general_screenVibra_ValueChanged( int )));
-}*/
-
-////////////////////////////////////////////////////////////
-/*void CpProfileSettingForm::initMeetingTonesGroup()
-{
- CpProfileSettings profileSettings;
- mProfileModel->profileSettings( EProfileWrapperMeetingId, profileSettings );
-
- //HbDataFormModelItem *tonesGroup = mModel->appendDataFormGroup(
- // hbTrId("txt_cp_subhead_tones"),mMeetingPage);
- QFileInfo ringToneFileInfo( profileSettings.mRingTone );
- mModel->appendDataFormItem( new CpPersonalizationEntryItemData( *mItemDataHelper,
- hbTrId("txt_cp_dblist_ringtone"), ringToneFileInfo.fileName(), mFileIconProvider->icon( ringToneFileInfo ) ), mMeetingPage);
-
- QFileInfo messageToneFileInfo( profileSettings.mMessageTone );
- mModel->appendDataFormItem( new CpPersonalizationEntryItemData( *mItemDataHelper,
- hbTrId("txt_cp_dblist_message_tone"), messageToneFileInfo.fileName(), mFileIconProvider->icon( messageToneFileInfo ) ), mMeetingPage);
-
- QFileInfo emailToneFileInfo( profileSettings.mEmailTone );
- mModel->appendDataFormItem( new CpPersonalizationEntryItemData( *mItemDataHelper,
- hbTrId("txt_cp_dblist_email_tone"), emailToneFileInfo.fileName(), mFileIconProvider->icon( emailToneFileInfo ) ), mMeetingPage);
-
- QFileInfo reminderToneFileInfo( profileSettings.mReminderTone );
- mModel->appendDataFormItem( new CpPersonalizationEntryItemData( *mItemDataHelper,
- hbTrId("txt_cp_dblist_reminder_tone"), reminderToneFileInfo.fileName(), mFileIconProvider->icon( reminderToneFileInfo ) ), mMeetingPage);
-
- HbDataFormModelItem *notificationTones = mModel->appendDataFormItem(HbDataFormModelItem::CheckBoxItem,QString(),mMeetingPage);
- notificationTones->setContentWidgetData("text", hbTrId("txt_cp_list_notification_tones"));
- notificationTones->setContentWidgetData( "checkState", profileSettings.mNotificationTone?2:0 );
-
- mMeetingKeysAndScreenToneSlider =
- mModel->appendDataFormItem(HbDataFormModelItem::SliderItem ,QString(hbTrId("txt_cp_setlabel_key_and_touchscreen_tones")),mMeetingPage);
-
- //QMap< QString, QVariant > elements;
- //elements.insert(QString("IncreaseElement") , QVariant(":/icon/hb_vol_slider_increment.svg"));
- //elements.insert(QString("DecreaseElement"), QVariant(":/icon/hb_vol_slider_decrement.svg") );
- //elements.insert(QString("IconElement"), QVariant(":/icon/hb_vol_slider_muted.svg") );
- //mMeetingkeysAndScreenSlider->setContentWidgetData( QString( "elementIcons" ), elements );
-
- //TODO: profileModel need provide Max and Min value( 0-5 ), current max value from profileModel is 3
- mMeetingKeysAndScreenToneSlider->setContentWidgetData( QString( "minimum" ), 0 );
- mMeetingKeysAndScreenToneSlider->setContentWidgetData( QString( "maximum" ), 5 );
- mMeetingKeysAndScreenToneSlider->setContentWidgetData( QString("value"), profileSettings.mKeyTouchScreenTone );
-
- mMeetingSreenVibra = mModel->appendDataFormItem( HbDataFormModelItem::SliderItem, QString( hbTrId( "txt_cp_setlabel_touch_screen_vibra" ) ), mMeetingPage );
- //TODO: profileModel need provide Max and Min value( 0-5 ), current max value from profileModel is 3
- mMeetingSreenVibra->setContentWidgetData( QString( "minimum" ), 0 );
- mMeetingSreenVibra->setContentWidgetData( QString( "maximum" ), 5 );
- mMeetingSreenVibra->setContentWidgetData( QString("value"), profileSettings.mKeyTouchScreenVibra );
-
- addConnection( notificationTones, SIGNAL( stateChanged( int )), this, SLOT( on_meeting_notificationTones_stateChanged( int )));
- addConnection( mMeetingKeysAndScreenToneSlider, SIGNAL( valueChanged( int )), this, SLOT( on_meeting_keysAndScreenSlider_ValueChanged( int )));
- addConnection( mMeetingSreenVibra, SIGNAL( valueChanged( int )), this, SLOT( on_meeting_screenVibra_ValueChanged( int )));
-}
-*/
-/*void CpProfileSettingForm::initMeetingVibraGroup()
-{
- CpProfileSettings profileSettings;
- mProfileModel->profileSettings( EProfileWrapperMeetingId, profileSettings );
-
- HbDataFormModelItem *vibraGroup = mModel->appendDataFormGroup(
- hbTrId( "txt_cp_subhead_vibra" ), mMeetingPage );
- HbDataFormModelItem *ringVibar = mModel->appendDataFormItem( HbDataFormModelItem::CheckBoxItem, QString(), vibraGroup );
- ringVibar->setContentWidgetData( "text", hbTrId( "txt_cp_list_ring_alet" ) );
- ringVibar->setContentWidgetData( "checkState", profileSettings.mRingAlertVibra?2:0 );
-
- HbDataFormModelItem *messageVibra = mModel->appendDataFormItem( HbDataFormModelItem::CheckBoxItem, QString(), vibraGroup );
- messageVibra->setContentWidgetData( "text", hbTrId( "txt_cp_list_received_message" ) );
- messageVibra->setContentWidgetData( "checkState", profileSettings.mMessageVibra?2:0 );
-
- HbDataFormModelItem *emailVibra = mModel->appendDataFormItem( HbDataFormModelItem::CheckBoxItem, QString(), vibraGroup );
- emailVibra->setContentWidgetData( "text", hbTrId( "txt_cp_list_received_email" ) );
- emailVibra->setContentWidgetData( "checkState", profileSettings.mEmailVibra?2:0 );
-
- HbDataFormModelItem *reminderVibra = mModel->appendDataFormItem( HbDataFormModelItem::CheckBoxItem, QString(), vibraGroup );
- reminderVibra->setContentWidgetData( "text", hbTrId( "txt_cp_list_reminder_alert" ));
- reminderVibra->setContentWidgetData( "checkState", profileSettings.mReminderAlertVibra?2:0 );
-
- HbDataFormModelItem *notificationVibra = mModel->appendDataFormItem( HbDataFormModelItem::CheckBoxItem, QString(), vibraGroup );
- notificationVibra->setContentWidgetData( "text", hbTrId( "txt_cp_list_notification" ) );
- notificationVibra->setContentWidgetData( "checkState", profileSettings.mNotificationVibra?2:0 );
-
- mMeetingSreenVibra = mModel->appendDataFormItem( HbDataFormModelItem::SliderItem, QString( hbTrId( "txt_cp_setlabel_touch_screen_vibra" ) ), vibraGroup );
- //TODO: profileModel need provide Max and Min value( 0-5 ), current max value from profileModel is 3
- mMeetingSreenVibra->setContentWidgetData( QString( "minimum" ), 0 );
- mMeetingSreenVibra->setContentWidgetData( QString( "maximum" ), 5 );
- mMeetingSreenVibra->setContentWidgetData( QString("value"), profileSettings.mKeyTouchScreenVibra );
-
- addConnection( ringVibar, SIGNAL( stateChanged( int )), this, SLOT( on_meeting_ringVibar_stateChanged( int )));
- addConnection( messageVibra, SIGNAL( stateChanged( int )), this, SLOT( on_meeting_messageVibra_stateChanged( int )));
- addConnection( emailVibra, SIGNAL( stateChanged( int )), this, SLOT( on_meeting_emailVibra_stateChanged( int )));
- addConnection( reminderVibra, SIGNAL( stateChanged( int )), this, SLOT( on_meeting_reminderVibra_stateChanged( int )));
- addConnection( notificationVibra, SIGNAL( stateChanged( int )), this, SLOT( on_meeting_notificationVibra_stateChanged( int )));
-
- addConnection( mMeetingSreenVibra, SIGNAL( valueChanged( int )), this, SLOT( on_meeting_screenVibra_ValueChanged( int )));
-}*/
////////////////////////////////////////////////////
//general tones
@@ -426,26 +236,6 @@
//general vibra
-void CpProfileSettingForm::on_general_ringVibar_stateChanged( int state )
-{
- mProfileModel->setRingAlertVibra( EProfileWrapperGeneralId, checkBoxStateToBool( state ) );
-}
-void CpProfileSettingForm::on_general_messageVibra_stateChanged( int state )
-{
- mProfileModel->setMessageVibra( EProfileWrapperGeneralId, checkBoxStateToBool( state ) );
-}
-void CpProfileSettingForm::on_general_emailVibra_stateChanged( int state )
-{
- mProfileModel->setEmailVibra( EProfileWrapperGeneralId, checkBoxStateToBool( state ) );
-}
-void CpProfileSettingForm::on_general_reminderVibra_stateChanged( int state )
-{
- mProfileModel->setReminderVibra( EProfileWrapperGeneralId, checkBoxStateToBool( state ) );
-}
-void CpProfileSettingForm::on_general_notificationVibra_stateChanged( int state )
-{
- mProfileModel->setNotificationVibra( EProfileWrapperGeneralId, checkBoxStateToBool( state ) );
-}
void CpProfileSettingForm::on_general_screenVibra_ValueChanged( int value )
{
mProfileModel->setKeyTouchScreenVibra( EProfileWrapperGeneralId, value );
@@ -475,28 +265,6 @@
}
}
-
-//meeting vibra
-void CpProfileSettingForm::on_meeting_ringVibar_stateChanged( int state )
-{
- mProfileModel->setRingAlertVibra( EProfileWrapperMeetingId, checkBoxStateToBool( state ) );
-}
-void CpProfileSettingForm::on_meeting_messageVibra_stateChanged( int state )
-{
- mProfileModel->setMessageVibra( EProfileWrapperMeetingId, checkBoxStateToBool( state ) );
-}
-void CpProfileSettingForm::on_meeting_emailVibra_stateChanged( int state )
-{
- mProfileModel->setEmailVibra( EProfileWrapperMeetingId, checkBoxStateToBool( state ) );
-}
-void CpProfileSettingForm::on_meeting_reminderVibra_stateChanged( int state )
-{
- mProfileModel->setReminderVibra( EProfileWrapperMeetingId, checkBoxStateToBool( state ) );
-}
-void CpProfileSettingForm::on_meeting_notificationVibra_stateChanged( int state )
-{
- mProfileModel->setNotificationVibra( EProfileWrapperMeetingId, checkBoxStateToBool( state ) );
-}
void CpProfileSettingForm::on_meeting_screenVibra_ValueChanged( int value )
{
mProfileModel->setKeyTouchScreenVibra( EProfileWrapperMeetingId, value );