/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
// External includes
#include <dali-toolkit/dali-toolkit.h>
-//#include <dali-toolkit/devel-api/controls/slider/slider.h>
#include <dali-toolkit/devel-api/controls/popup/popup.h>
#include "image-channel-control.h"
#include <cstdio>
StylingApplication::StylingApplication( Application& application )
-: mApplication( application )
+: mApplication( application ),
+ mCurrentTheme( 0 )
{
application.InitSignal().Connect( this, &StylingApplication::Create );
}
for( int i=0; i<3; ++i )
{
std::ostringstream thumbnailName; thumbnailName << "thumbnail" << i+1;
- ImageView image = ImageView::New( ResourceImage::New( images[i] ) );
+ ImageView image = ImageView::New( images[i] );
image.SetName( thumbnailName.str() );
image.SetSize( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) );
mRadioButtons[i].SetName( radioButtonStyleName.str() );
mRadioButtons[i].SetParentOrigin( ParentOrigin::TOP_LEFT );
mRadioButtons[i].SetAnchorPoint( AnchorPoint::TOP_LEFT );
- mRadioButtons[i].SetSelected( false );
+ mRadioButtons[i].SetProperty( Button::Property::SELECTED, false );
mRadioButtons[i].StateChangedSignal().Connect( this, &StylingApplication::OnButtonStateChange );
radioButtonsLayout.AddChild( mRadioButtons[i], TableView::CellPosition( i, 0 ) );
radioButtonsLayout.SetCellAlignment( TableView::CellPosition( i, 1 ), HorizontalAlignment::CENTER, VerticalAlignment::CENTER );
}
- mRadioButtons[0].SetSelected( true );
+ mRadioButtons[0].SetProperty( Button::Property::SELECTED, true );
mImagePlacement = Actor::New();
mImagePlacement.SetParentOrigin( ParentOrigin::CENTER );
mIcc1.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO );
mIcc1.SetParentOrigin( ParentOrigin::CENTER );
mIcc1.SetVisibility( true );
-
+
mImagePlacement.Add( mIcc1 );
mIcc2 = ImageChannelControl::New( BIG_IMAGE_2 );
mCheckButtons[i].SetName( checkBoxStyleName.str() );
mCheckButtons[i].SetParentOrigin( ParentOrigin::CENTER );
mCheckButtons[i].SetAnchorPoint( AnchorPoint::CENTER );
- mCheckButtons[i].SetSelected( true );
+ mCheckButtons[i].SetProperty( Button::Property::SELECTED, true );
mCheckButtons[i].StateChangedSignal().Connect( this, &StylingApplication::OnCheckButtonChange );
mCheckButtons[i].RegisterProperty( "channel", i, Property::READ_WRITE );
}
mResetButton = PushButton::New();
- mResetButton.SetLabelText( "Reset" );
+ mResetButton.SetProperty( Toolkit::Button::Property::LABEL, "Reset" );
mResetButton.SetName("ResetButton");
mResetButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
mResetButton.ClickedSignal().Connect( this, &StylingApplication::OnResetClicked );
mThemeButtons[i].ClickedSignal().Connect( this, &StylingApplication::OnThemeButtonClicked );
themeButtonLayout.AddChild( mThemeButtons[i], TableView::CellPosition( 0, 1+i ) );
}
- mThemeButtons[0].SetLabelText( "Lite" ); // Lightweight changes on top of Dali
- mThemeButtons[1].SetLabelText( "App1" ); // Different application style
- mThemeButtons[2].SetLabelText( "App2" );
+ mThemeButtons[0].SetProperty( Toolkit::Button::Property::LABEL, "Lite" ); // Lightweight changes on top of Dali
+ mThemeButtons[1].SetProperty( Toolkit::Button::Property::LABEL, "App1" ); // Different application style
+ mThemeButtons[2].SetProperty( Toolkit::Button::Property::LABEL, "App2" );
contentLayout.Add( themeButtonLayout );
}
PushButton okayButton = PushButton::New();
okayButton.SetName( POPUP_CONTROL_OK_NAME );
okayButton.SetStyleName( POPUP_CONTROL_OK_NAME );
- okayButton.SetLabelText( "Ok!" );
+ okayButton.SetProperty( Toolkit::Button::Property::LABEL, "Ok!" );
okayButton.ClickedSignal().Connect( this, &StylingApplication::OnReset );
okayButton.SetParentOrigin( ParentOrigin::CENTER );
okayButton.SetAnchorPoint( AnchorPoint::CENTER );
PushButton cancelButton = PushButton::New();
cancelButton.SetName( POPUP_CONTROL_CANCEL_NAME );
cancelButton.SetStyleName( POPUP_CONTROL_CANCEL_NAME );
- cancelButton.SetLabelText( "Cancel" );
+ cancelButton.SetProperty( Toolkit::Button::Property::LABEL, "Cancel" );
cancelButton.ClickedSignal().Connect( this, &StylingApplication::OnResetCancelled );
cancelButton.SetParentOrigin( ParentOrigin::CENTER );
cancelButton.SetAnchorPoint( AnchorPoint::CENTER );
// Todo: save / restore slider states per image
- if( button.IsSelected() )
+ if( button.GetProperty<bool>(Button::Property::SELECTED) )
{
ImageChannelControl prevIcc = mImageChannelControl;
- if( mRadioButtons[0].IsSelected() )
+ if( mRadioButtons[0].GetProperty<bool>(Button::Property::SELECTED) )
{
mImageChannelControl = mIcc1;
}
- else if( mRadioButtons[1].IsSelected() )
+ else if( mRadioButtons[1].GetProperty<bool>(Button::Property::SELECTED) )
{
mImageChannelControl = mIcc2;
}
- else if( mRadioButtons[2].IsSelected() )
+ else if( mRadioButtons[2].GetProperty<bool>(Button::Property::SELECTED) )
{
mImageChannelControl = mIcc3;
}
{
int channel = button.GetProperty<int>( index );
float value = mChannelSliders[channel].GetProperty<float>( Slider::Property::VALUE );
- if( !button.IsSelected() )
+ if( !button.GetProperty<bool>(Button::Property::SELECTED) )
{
// "Turn off" the channel's contribution
value = 0.0f;
if( index != Property::INVALID_INDEX )
{
int channel = slider.GetProperty<int>( index );
- if( mCheckButtons[channel].IsSelected() )
+ if( mCheckButtons[channel].GetProperty<bool>(Button::Property::SELECTED) )
{
Property::Index channelIndex = GetChannelProperty( channel );
mImageChannelControl.SetProperty(channelIndex, value/100.0f);