Change-Id: I20997625d5dcdd03269238bf4086159381907b11
const char* const ENABLED_IMAGE = DALI_IMAGE_DIR "item-select-check.png";
const char* const PUSHBUTTON_PRESS_IMAGE = DALI_IMAGE_DIR "button-down.9.png";
const char* const ENABLED_IMAGE = DALI_IMAGE_DIR "item-select-check.png";
const char* const PUSHBUTTON_PRESS_IMAGE = DALI_IMAGE_DIR "button-down.9.png";
-const char* const PUSHBUTTON_DIM_IMAGE = DALI_IMAGE_DIR "button-disabled.9.png";
+const char* const PUSHBUTTON_DISABLED_IMAGE = DALI_IMAGE_DIR "button-disabled.9.png";
const char* const PUSHBUTTON_BUTTON_IMAGE = DALI_IMAGE_DIR "button-up.9.png";
const char* const CHECKBOX_UNCHECKED_IMAGE = DALI_IMAGE_DIR "checkbox-unchecked.png";
const char* const PUSHBUTTON_BUTTON_IMAGE = DALI_IMAGE_DIR "button-up.9.png";
const char* const CHECKBOX_UNCHECKED_IMAGE = DALI_IMAGE_DIR "checkbox-unchecked.png";
mRadioButtonImage1.SetParentOrigin( ParentOrigin::TOP_LEFT );
mRadioButtonImage1.SetAnchorPoint( AnchorPoint::TOP_LEFT );
mRadioButtonImage1.SetPosition( 0, DP(radioY) );
mRadioButtonImage1.SetParentOrigin( ParentOrigin::TOP_LEFT );
mRadioButtonImage1.SetAnchorPoint( AnchorPoint::TOP_LEFT );
mRadioButtonImage1.SetPosition( 0, DP(radioY) );
- mRadioButtonImage1.SetActive( true );
+ mRadioButtonImage1.SetSelected( true );
radioButtonsGroup2.Add( mRadioButtonImage1 );
}
radioButtonsGroup2.Add( mRadioButtonImage1 );
}
mUpdateButton.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
mUpdateButton.SetAnchorPoint( AnchorPoint::TOP_CENTER );
mUpdateButton.SetPosition( 0, DP(MARGIN_SIZE) );
mUpdateButton.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
mUpdateButton.SetAnchorPoint( AnchorPoint::TOP_CENTER );
mUpdateButton.SetPosition( 0, DP(MARGIN_SIZE) );
- mUpdateButton.SetLabelText("Select");
+ mUpdateButton.SetLabel("Select");
mUpdateButton.SetSize( DP(100), DP(BUTTON_HEIGHT) );
mUpdateButton.SetSize( DP(100), DP(BUTTON_HEIGHT) );
- mUpdateButton.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
- mUpdateButton.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) );
+ mUpdateButton.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
+ mUpdateButton.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
mUpdateButton.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
mUpdateButton.ClickedSignal().Connect( this, &ButtonsController::OnButtonClicked );
mUpdateButton.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
mUpdateButton.ClickedSignal().Connect( this, &ButtonsController::OnButtonClicked );
radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
radioButton.SetPosition( 0, 0 );
radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
radioButton.SetPosition( 0, 0 );
- radioButton.SetActive( true );
+ radioButton.SetSelected( true );
- radioButton.ToggledSignal().Connect( this, &ButtonsController::EnableSelectButtonToggle );
+ radioButton.StateChangedSignal().Connect( this, &ButtonsController::EnableSelectButtonToggle );
radioButtonsGroup1.Add( radioButton );
}
radioButtonsGroup1.Add( radioButton );
}
radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
radioButton.SetPosition( 0, DP(50) );
radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
radioButton.SetPosition( 0, DP(50) );
- radioButton.ToggledSignal().Connect( this, &ButtonsController::EnableSelectButtonToggle );
+ radioButton.StateChangedSignal().Connect( this, &ButtonsController::EnableSelectButtonToggle );
radioButtonsGroup1.Add( radioButton );
}
radioButtonsGroup1.Add( radioButton );
}
checkBox.SetBackgroundImage( unchecked );
checkBox.SetCheckedImage( checked );
checkBox.SetSize( DP(48), DP(48) );
checkBox.SetBackgroundImage( unchecked );
checkBox.SetCheckedImage( checked );
checkBox.SetSize( DP(48), DP(48) );
- checkBox.ToggledSignal().Connect( this, &ButtonsController::OnCheckBoxesToggled );
+ checkBox.StateChangedSignal().Connect( this, &ButtonsController::OnCheckBoxesToggled );
checkBoxBackground.Add( checkBox );
}
checkBoxBackground.Add( checkBox );
}
checkBox.SetCheckedImage( checked );
checkBox.SetSize( DP(48), DP(48) );
checkBox.SetChecked( true );
checkBox.SetCheckedImage( checked );
checkBox.SetSize( DP(48), DP(48) );
checkBox.SetChecked( true );
- checkBox.ToggledSignal().Connect( this, &ButtonsController::OnCheckBoxesToggled );
+ checkBox.StateChangedSignal().Connect( this, &ButtonsController::OnCheckBoxesToggled );
checkBoxBackground.Add( checkBox );
}
checkBoxBackground.Add( checkBox );
}
checkBox.SetBackgroundImage( unchecked );
checkBox.SetCheckedImage( checked );
checkBox.SetSize( DP(48), DP(48) );
checkBox.SetBackgroundImage( unchecked );
checkBox.SetCheckedImage( checked );
checkBox.SetSize( DP(48), DP(48) );
- checkBox.ToggledSignal().Connect( this, &ButtonsController::OnCheckBoxesToggled );
+ checkBox.StateChangedSignal().Connect( this, &ButtonsController::OnCheckBoxesToggled );
checkBoxBackground.Add( checkBox );
}
checkBoxBackground.Add( checkBox );
}
toggleButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
toggleButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
toggleButton.SetPosition( DP(MARGIN_SIZE), DP(MARGIN_SIZE) );
toggleButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
toggleButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
toggleButton.SetPosition( DP(MARGIN_SIZE), DP(MARGIN_SIZE) );
- toggleButton.SetLabelText( "Toggle OFF" );
+ toggleButton.SetLabel( "Toggle OFF" );
toggleButton.SetSize( DP(150), DP(BUTTON_HEIGHT) );
toggleButton.SetSize( DP(150), DP(BUTTON_HEIGHT) );
- toggleButton.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
- toggleButton.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) );
+ toggleButton.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
+ toggleButton.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
toggleButton.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
toggleButton.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
- toggleButton.ToggledSignal().Connect( this, &ButtonsController::OnButtonToggled );
+ toggleButton.StateChangedSignal().Connect( this, &ButtonsController::OnButtonToggled );
toggleBackground.Add( toggleButton );
}
toggleBackground.Add( toggleButton );
}
- pushButton.SetLabelText( "Toggle ON" );
+ pushButton.SetLabel( "Toggle ON" );
- pushButton.SetLabelText( "Toggle OFF" );
+ pushButton.SetLabel( "Toggle OFF" );
{
if( button.GetName() == "radio-select-enable" && state == true )
{
{
if( button.GetName() == "radio-select-enable" && state == true )
{
- mUpdateButton.SetDimmed( false );
+ mUpdateButton.SetDisabled( false );
}
else if( button.GetName() == "radio-select-disable" && state == true )
{
}
else if( button.GetName() == "radio-select-disable" && state == true )
{
- mUpdateButton.SetDimmed( true );
+ mUpdateButton.SetDisabled( true );
bool OnButtonClicked(Toolkit::Button button)
{
bool OnButtonClicked(Toolkit::Button button)
{
- if( mRadioButtonImage1.IsActive() )
+ if( mRadioButtonImage1.IsSelected() )
{
mImage.SetImage( mBigImage1 );
}
{
mImage.SetImage( mBigImage1 );
}
- else if( mRadioButtonImage2.IsActive() )
+ else if( mRadioButtonImage2.IsSelected() )
{
mImage.SetImage( mBigImage2 );
}
{
mImage.SetImage( mBigImage2 );
}
- else if( mRadioButtonImage3.IsActive() )
+ else if( mRadioButtonImage3.IsSelected() )
{
mImage.SetImage( mBigImage3 );
}
{
mImage.SetImage( mBigImage3 );
}
const char* const PUSHBUTTON_PRESS_IMAGE = DALI_IMAGE_DIR "button-down.9.png";
const char* const PUSHBUTTON_BUTTON_IMAGE = DALI_IMAGE_DIR "button-up.9.png";
const char* const PUSHBUTTON_PRESS_IMAGE = DALI_IMAGE_DIR "button-down.9.png";
const char* const PUSHBUTTON_BUTTON_IMAGE = DALI_IMAGE_DIR "button-up.9.png";
-const char* const PUSHBUTTON_DIM_IMAGE = DALI_IMAGE_DIR "button-disabled.9.png";
+const char* const PUSHBUTTON_DISABLED_IMAGE = DALI_IMAGE_DIR "button-disabled.9.png";
// Button IDs
const char* const LOGGER_1_RADIO_ID = "LOGGER_1_RADIO";
// Button IDs
const char* const LOGGER_1_RADIO_ID = "LOGGER_1_RADIO";
radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
radioButton.SetPosition( DP(radioX), DP(radioY) );
radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
radioButton.SetPosition( DP(radioX), DP(radioY) );
- radioButton.SetActive( true );
+ radioButton.SetSelected( true );
- radioButton.ToggledSignal().Connect( this, &LoggingController::LoggingRadioSelect );
+ radioButton.StateChangedSignal().Connect( this, &LoggingController::LoggingRadioSelect );
radioButtonsGroup.Add( radioButton );
mLogRadioButtons[0] = radioButton;
radioButtonsGroup.Add( radioButton );
mLogRadioButtons[0] = radioButton;
radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
radioButton.SetPosition( DP(radioX), DP(radioY) );
radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
radioButton.SetPosition( DP(radioX), DP(radioY) );
- radioButton.ToggledSignal().Connect( this, &LoggingController::LoggingRadioSelect );
+ radioButton.StateChangedSignal().Connect( this, &LoggingController::LoggingRadioSelect );
radioButtonsGroup.Add( radioButton );
mLogRadioButtons[1] = radioButton;
radioButtonsGroup.Add( radioButton );
mLogRadioButtons[1] = radioButton;
radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
radioButton.SetPosition( DP(radioX), DP(radioY) );
radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
radioButton.SetPosition( DP(radioX), DP(radioY) );
- radioButton.ToggledSignal().Connect( this, &LoggingController::LoggingRadioSelect );
+ radioButton.StateChangedSignal().Connect( this, &LoggingController::LoggingRadioSelect );
radioButtonsGroup.Add( radioButton );
mLogRadioButtons[2] = radioButton;
radioButtonsGroup.Add( radioButton );
mLogRadioButtons[2] = radioButton;
{
Toolkit::PushButton button = Toolkit::PushButton::New();
button.SetName( CREATE_BUTTON_ID );
{
Toolkit::PushButton button = Toolkit::PushButton::New();
button.SetName( CREATE_BUTTON_ID );
- button.SetLabelText( CREATE_BUTTON_TEXT );
+ button.SetLabel( CREATE_BUTTON_TEXT );
button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
button.SetPosition( buttonXDP, 0 );
button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
button.SetPosition( buttonXDP, 0 );
button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
- button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
+ button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
- button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) );
+ button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
Toolkit::PushButton button = Toolkit::PushButton::New();
button.SetName( DELETE_BUTTON_ID );
Toolkit::PushButton button = Toolkit::PushButton::New();
button.SetName( DELETE_BUTTON_ID );
- button.SetLabelText( DELETE_BUTTON_TEXT );
+ button.SetLabel( DELETE_BUTTON_TEXT );
button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
button.SetPosition( buttonXDP, 0 );
button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
button.SetPosition( buttonXDP, 0 );
button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
- button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
+ button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
- button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) );
+ button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
{
Toolkit::PushButton button = Toolkit::PushButton::New();
button.SetName( START_BUTTON_ID );
{
Toolkit::PushButton button = Toolkit::PushButton::New();
button.SetName( START_BUTTON_ID );
- button.SetLabelText( START_BUTTON_TEXT );
+ button.SetLabel( START_BUTTON_TEXT );
button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
button.SetPosition( buttonXDP, 0 );
button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
button.SetPosition( buttonXDP, 0 );
button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
- button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
+ button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
- button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) );
+ button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
Toolkit::PushButton button = Toolkit::PushButton::New();
button.SetName( STOP_BUTTON_ID );
Toolkit::PushButton button = Toolkit::PushButton::New();
button.SetName( STOP_BUTTON_ID );
- button.SetLabelText( STOP_BUTTON_TEXT );
+ button.SetLabel( STOP_BUTTON_TEXT );
button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
button.SetPosition( buttonXDP, 0 );
button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
button.SetPosition( buttonXDP, 0 );
button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
- button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
+ button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
- button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) );
+ button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
{
Toolkit::PushButton button = Toolkit::PushButton::New();
button.SetName( ENABLE_BUTTON_ID );
{
Toolkit::PushButton button = Toolkit::PushButton::New();
button.SetName( ENABLE_BUTTON_ID );
- button.SetLabelText( ENABLE_BUTTON_TEXT );
+ button.SetLabel( ENABLE_BUTTON_TEXT );
button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
button.SetPosition( buttonXDP, 0 );
button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
button.SetPosition( buttonXDP, 0 );
button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
- button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
+ button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
- button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) );
+ button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
Toolkit::PushButton button = Toolkit::PushButton::New();
button.SetName( DISABLE_BUTTON_ID );
Toolkit::PushButton button = Toolkit::PushButton::New();
button.SetName( DISABLE_BUTTON_ID );
- button.SetLabelText( DISABLE_BUTTON_TEXT );
+ button.SetLabel( DISABLE_BUTTON_TEXT );
button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
button.SetPosition( buttonXDP, 0 );
button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
button.SetPosition( buttonXDP, 0 );
button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
- button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
+ button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
- button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) );
+ button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
radioButton.SetPosition( DP(radioX), DP(radioY) );
radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
radioButton.SetPosition( DP(radioX), DP(radioY) );
- radioButton.ToggledSignal().Connect( this, &LoggingController::FrequencyRadioSelect );
+ radioButton.StateChangedSignal().Connect( this, &LoggingController::FrequencyRadioSelect );
frequencyRadioButtonsGroup.Add( radioButton );
mFrequencyRadioButtons[0] = radioButton;
frequencyRadioButtonsGroup.Add( radioButton );
mFrequencyRadioButtons[0] = radioButton;
radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
radioButton.SetPosition( DP(radioX), DP(radioY) );
radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
radioButton.SetPosition( DP(radioX), DP(radioY) );
- radioButton.SetActive( true );
+ radioButton.SetSelected( true );
- radioButton.ToggledSignal().Connect( this, &LoggingController::FrequencyRadioSelect );
+ radioButton.StateChangedSignal().Connect( this, &LoggingController::FrequencyRadioSelect );
frequencyRadioButtonsGroup.Add( radioButton );
mFrequencyRadioButtons[1] = radioButton;
frequencyRadioButtonsGroup.Add( radioButton );
mFrequencyRadioButtons[1] = radioButton;
radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
radioButton.SetPosition( DP(radioX), DP(radioY) );
radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
radioButton.SetPosition( DP(radioX), DP(radioY) );
- radioButton.ToggledSignal().Connect( this, &LoggingController::FrequencyRadioSelect );
+ radioButton.StateChangedSignal().Connect( this, &LoggingController::FrequencyRadioSelect );
frequencyRadioButtonsGroup.Add( radioButton );
mFrequencyRadioButtons[2] = radioButton;
frequencyRadioButtonsGroup.Add( radioButton );
mFrequencyRadioButtons[2] = radioButton;
{
Toolkit::PushButton button = Toolkit::PushButton::New();
button.SetName( VSYNC_BUTTON_ID );
{
Toolkit::PushButton button = Toolkit::PushButton::New();
button.SetName( VSYNC_BUTTON_ID );
- button.SetLabelText( VSYNC_BUTTON_TEXT );
+ button.SetLabel( VSYNC_BUTTON_TEXT );
button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
button.SetPosition( buttonXDP, 0 );
button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
button.SetPosition( buttonXDP, 0 );
button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
- button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
+ button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
- button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) );
+ button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
const unsigned int frequency = mLoggerStates[mCurrentLogger].frequency;
if( frequency == HIGH_FREQUENCY )
{
const unsigned int frequency = mLoggerStates[mCurrentLogger].frequency;
if( frequency == HIGH_FREQUENCY )
{
- mFrequencyRadioButtons[0].SetActive( true );
+ mFrequencyRadioButtons[0].SetSelected( true );
}
else if( frequency == MEDIUM_FREQUENCY )
{
}
else if( frequency == MEDIUM_FREQUENCY )
{
- mFrequencyRadioButtons[1].SetActive( true );
+ mFrequencyRadioButtons[1].SetSelected( true );
}
else if( frequency == LOW_FREQUENCY )
{
}
else if( frequency == LOW_FREQUENCY )
{
- mFrequencyRadioButtons[2].SetActive( true );
+ mFrequencyRadioButtons[2].SetSelected( true );