Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
	build/tizen/CMakeLists.txt
	build/tizen/demo/CMakeLists.txt
	build/tizen/examples/CMakeLists.txt
	demo/dali-table-view.cpp
	examples/buttons/buttons-example.cpp
	examples/shader-effect/dissolve-effect-example.cpp
	examples/shadows/shadow-bone-lighting-example.cpp
	packaging/com.samsung.dali-demo.spec

Change-Id: I57a2de5bfa6d0f05c02b8aba06dec9130f14a906

diff --cc demo/dali-table-view.cpp
index b0c67aca13c02fc719a0d6681d0d58bba5052895,b0376ec7f917edcf262806aafecc08fb21bae2eb..f9e254000106fcc841a3672fd53ef0534eeeb229
--- 1/demo/dali-table-view.cpp
--- 2/demo/dali-table-view.cpp
+++ b/demo/dali-table-view.cpp
@@@ -524,16 -479,20 +468,16 @@@ Actor DaliTableView::CreateTile( const 
      image.Add( stencil );
    }
  
 -  TextView text = TextView::New( title );
 -  text.SetAnchorPoint( AnchorPoint::CENTER );
 -  text.SetParentOrigin( ParentOrigin::CENTER );
 -  text.SetWidthExceedPolicy( Toolkit::TextView::ShrinkToFit );
 -  text.SetMultilinePolicy( Toolkit::TextView::SplitByWord );
 -  text.SetLineJustification( Toolkit::TextView::Center );
 -  text.SetTextAlignment( Toolkit::Alignment::Type( Alignment::HorizontalCenter | Alignment::VerticalCenter ) );
 -  text.SetColor( Color::WHITE );
 -  text.SetZ( 1 );
 -  // make the text 90% of tile
 -  text.SetSize( 0.9f * parentSize.width, 0.9f * parentSize.height );
 -  text.SetStyleToCurrentText( GetTableTextStyle() );
 -  text.SetSnapshotModeEnabled( false );
 -  tile.Add( text );
 +  TextLabel label = TextLabel::New();
 +  label.SetParentOrigin( ParentOrigin::TOP_LEFT );
 +  label.SetAnchorPoint( AnchorPoint::TOP_LEFT );
 +  label.SetProperty( TextLabel::PROPERTY_MULTI_LINE, true );
 +  label.SetProperty( TextLabel::PROPERTY_TEXT, title );
 +  label.SetColor( Color::BLACK );
-   content.Add( label );
++  tile.Add( label );
 +
 +  // FIXME - This is a kludge because size negotiation is not finished
 +  label.SetSize( parentSize );
  
    // Set the tile to be keyboard focusable
    tile.SetKeyboardFocusable(true);

diff --cc examples/builder/examples.cpp
Simple merge

diff --cc examples/buttons/buttons-example.cpp
index af075b54f543e38652c8924513b35ada20c0cfef,45ef0404a1ae8edf35f0c7adeae21d2ee60e2ecd..936fd37e282ea3234147adb602139bc64e67712e
--- 1/examples/buttons/buttons-example.cpp
--- 2/examples/buttons/buttons-example.cpp
+++ b/examples/buttons/buttons-example.cpp
@@@ -234,7 -234,12 +234,7 @@@ class ButtonsController: public Connect
        Toolkit::TableView tableView = Toolkit::TableView::New( 1, 2 );
        tableView.SetSize( DP(260), DP(RADIO_LABEL_THUMBNAIL_SIZE) );
  
-       ImageActor imageActor = ImageActor::New( Image::New( ENABLED_IMAGE ) );
 -      Toolkit::TextView textView = Toolkit::TextView::New( "Select enabled" );
 -      Toolkit::Alignment alignment = Toolkit::Alignment::New( Toolkit::Alignment::HorizontalLeft );
 -      alignment.Add( textView );
 -      tableView.AddChild( alignment, Toolkit::TableView::CellPosition( 0, 0 ) );
 -
+       ImageActor imageActor = ImageActor::New( ResourceImage::New( ENABLED_IMAGE ) );
        imageActor.SetSize( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) );
        tableView.AddChild( imageActor, Toolkit::TableView::CellPosition( 0, 1 ) );
        tableView.SetFixedWidth( 1, DP(RADIO_LABEL_THUMBNAIL_SIZE) );
@@@ -324,7 -343,14 +324,6 @@@
        checkBoxBackground.Add( checkBox );
      }
  
-     // Create toggle button
 -    mCheckBox3State = Toolkit::TextView::New( "CheckBox3 is unselected" );
 -
 -    mCheckBox3State.SetAnchorPoint( AnchorPoint::TOP_LEFT );
 -    mCheckBox3State.SetPosition( DP(80), DP(checkYPos) );
 -
 -    checkBoxBackground.Add( mCheckBox3State );
 -
 -    // Create togglabe button
      yPos += GROUP3_HEIGHT + MARGIN_SIZE;
  
      Actor toggleBackground = Toolkit::CreateSolidColorActor( BACKGROUND_COLOUR );
@@@ -412,8 -438,44 +411,8 @@@
      return true;
    }
  
-   bool OnCheckBoxesToggled( Toolkit::Button button, bool state )
+   bool OnCheckBoxesSelected( Toolkit::Button button )
    {
 -    if( button.GetName() == "checkbox1" )
 -    {
 -      if( button.IsSelected() )
 -      {
 -        mCheckBox1State.SetText("CheckBox1 is selected");
 -      }
 -      else
 -      {
 -        mCheckBox1State.SetText("CheckBox1 is unselected");
 -      }
 -    }
 -
 -    if( button.GetName() == "checkbox2" )
 -    {
 -      if( button.IsSelected() )
 -      {
 -        mCheckBox2State.SetText("CheckBox2 is selected");
 -      }
 -      else
 -      {
 -        mCheckBox2State.SetText("CheckBox2 is unselected");
 -      }
 -    }
 -
 -    if( button.GetName() == "checkbox3" )
 -    {
 -      if( button.IsSelected() )
 -      {
 -        mCheckBox3State.SetText("CheckBox3 is selected");
 -      }
 -      else
 -      {
 -        mCheckBox3State.SetText("CheckBox3 is unselected");
 -      }
 -    }
 -
      return true;
    }
  

diff --cc examples/cluster/cluster-example.cpp
Simple merge

diff --cc examples/hello-world/hello-world-example.cpp
Simple merge

diff --cc examples/image/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
Simple merge

diff --cc examples/item-view/item-view-example.cpp
Simple merge

diff --cc examples/logging/logging-example.cpp
index c6fc20c7a63318c16a949bfb4aa1b5c4f81e8347,2dc943f4d6335e825df404dcf311919a7b06b0f2..5de3dc6f21843f3adf8ab263bc8f8471bc36fbe9
--- 1/examples/logging/logging-example.cpp
--- 2/examples/logging/logging-example.cpp
+++ b/examples/logging/logging-example.cpp
@@@ -514,12 -534,29 +514,12 @@@ class LoggingController: public Connect
  
    void WriteConsole()
    {
 -    for( unsigned int i = 0; i < NUM_LOGGERS; ++i)
 -    {
 -      std::stringstream ss;
 -      ss << (i + 1) << ") " << ((mPerformanceLoggers[i]) ? "Created" : "Deleted")
 -         << ", " << ((mLoggerStates[i].isTiming) ? "Started" : "Stopped")
 -         << ", " << ((mLoggerStates[i].isEnabled) ? "Enabled" : "Disabled");
 -
 -      Dali::TextStyle textStyle;
 -      textStyle.SetFontName( "HelveticaNue" );
 -      textStyle.SetFontStyle( "Regular" );
 -      textStyle.SetFontPointSize( Dali::PointSize( DemoHelper::ScalePointSize( 7.0f ) ) );
 -      textStyle.SetWeight( Dali::TextStyle::REGULAR );
 -
 -      Toolkit::TextView textView = Toolkit::TextView::New( ss.str() );
 -      textView.SetStyleToCurrentText( textStyle );
 -
 -      mLogRadioButtons[i].SetLabel( textView );
 -    }
 +    // TODO
    }
  
-   bool LoggingRadioSelect( Toolkit::Button button, bool state )
+   bool LoggingRadioSelect( Toolkit::Button button )
    {
-     if( button.GetName() == LOGGER_1_RADIO_ID && state == true )
+     if( button.GetName() == LOGGER_1_RADIO_ID && button.IsSelected() == true )
      {
        mCurrentLogger = 0;
      }

diff --cc examples/motion/motion-blur-example.cpp
Simple merge

diff --cc examples/motion/motion-stretch-example.cpp
Simple merge

diff --cc examples/new-window/new-window-example.cpp
Simple merge

diff --cc examples/scroll-view/scroll-view-example.cpp
Simple merge

diff --cc examples/shader-effect/dissolve-effect-example.cpp
index 7373a6f83c89263e70b302a1f557b2fe7e7605c3,6ed310495dd89d8678abb53a59b94ed95f75d097..25f52054eb8307e294e0f4ffd53e68f8ddab0179
--- 1/examples/shader-effect/dissolve-effect-example.cpp
--- 2/examples/shader-effect/dissolve-effect-example.cpp
+++ b/examples/shader-effect/dissolve-effect-example.cpp
@@@ -138,6 -138,8 +138,7 @@@ private
    Toolkit::View                   mView;
    Toolkit::ToolBar                mToolBar;
    Layer                           mContent;
 -  Toolkit::TextView               mTitleActor;
+   Actor                           mParent;
  
    ImageActor                      mCurrentImage;
    ImageActor                      mNextImage;
@@@ -199,11 -201,14 +200,11 @@@ void DissolveEffectApp::OnInit( Applica
    mToolBar.AddControl( mEffectChangeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
  
    // Add title to the tool bar.
 -  mTitleActor = Toolkit::TextView::New();
 -  mTitleActor.SetText( APPLICATION_TITLE_HIGHP );
 -  mTitleActor.SetStyleToCurrentText(DemoHelper::GetDefaultTextStyle());
 -  mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Toolkit::Alignment::HorizontalCenter );
 +  // TODO
  
    // Add an slide-show button on the right of the title
-   mIconPlay = Image::New( PLAY_ICON );
-   mIconStop = Image::New( STOP_ICON );
+   mIconPlay = ResourceImage::New( PLAY_ICON );
+   mIconStop = ResourceImage::New( STOP_ICON );
    mPlayStopButton = Toolkit::PushButton::New();
    mPlayStopButton.SetBackgroundImage( mIconPlay );
    mPlayStopButton.ClickedSignal().Connect( this, &DissolveEffectApp::OnSildeshowButtonClicked );

diff --cc examples/shadows/shadow-bone-lighting-example.cpp
index 094821fc308f142be7ad9453b8397e099c9e153c,fbacd8219920ef1da58b677e864e150152d69b18..3a17597652f9830530d41b65af6c77afa498ea65
--- 1/examples/shadows/shadow-bone-lighting-example.cpp
--- 2/examples/shadows/shadow-bone-lighting-example.cpp
+++ b/examples/shadows/shadow-bone-lighting-example.cpp
@@@ -155,10 -170,16 +170,10 @@@ public
      toolBar.AddControl( effectChangeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
  
      // Add title to the tool bar.
 -    mTitleActor = Toolkit::TextView::New();
 -    toolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Toolkit::Alignment::HorizontalCenter );
 -
 -    // Set Title text
 -    mTitleActor.SetText( APPLICATION_TITLE_PAN_SCENE );
 -    mTitleActor.SetSize( Font::New().MeasureText( APPLICATION_TITLE_PAN_SCENE ) );
 -    mTitleActor.SetStyleToCurrentText( DemoHelper::GetDefaultTextStyle() );
 +    // TODO
  
      //Add a reset button
-     Image resetImage = Image::New( RESET_ICON );
+     Image resetImage = ResourceImage::New( RESET_ICON );
      Toolkit::PushButton resetButton = Toolkit::PushButton::New();
      resetButton.SetBackgroundImage( resetImage );
      resetButton.ClickedSignal().Connect( this, &TestApp::OnResetPressed );
@@@ -464,6 -494,11 +449,9 @@@ private
    float                     mPinchScale;
    float                     mScaleAtPinchStart;
  
 -  Toolkit::TextView         mTitleActor;
 -
+   Property::Index           mAngle1Index;
+   Property::Index           mAngle3Index;
+ 
    enum PanState
    {
      PAN_SCENE,

diff --cc examples/shared/view.h
Simple merge

diff --cc examples/transition/cube-transition-effect-example.cpp
index abcb3948bcecad799f9e7a3c8eaa86797ea9c871,f75e541303d67fa08adddba12f9633f5b478500f..f38d36e2feaa7fa994ad94b4ad1f805313a2b30b
--- 1/examples/transition/cube-transition-effect-example.cpp
--- 2/examples/transition/cube-transition-effect-example.cpp
+++ b/examples/transition/cube-transition-effect-example.cpp
@@@ -216,9 -217,13 +216,9 @@@ void CubeTransitionApp::OnInit( Applica
    mEffectChangeButton.ClickedSignal().Connect( this, &CubeTransitionApp::OnEffectButtonClicked );
    mToolBar.AddControl( mEffectChangeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
  
 -  // Add title to the tool bar.
 -  mTitleActor = Toolkit::TextView::New();
 -  mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Toolkit::Alignment::HorizontalCenter );
 -
    //Add an slideshow icon on the right of the title
-   mIconSlideshowStart = Image::New( SLIDE_SHOW_START_ICON );
-   mIconSlideshowStop = Image::New( SLIDE_SHOW_STOP_ICON );
+   mIconSlideshowStart = ResourceImage::New( SLIDE_SHOW_START_ICON );
+   mIconSlideshowStop = ResourceImage::New( SLIDE_SHOW_STOP_ICON );
    mSlideshowButton = Toolkit::PushButton::New();
    mSlideshowButton.SetBackgroundImage( mIconSlideshowStart );
    mSlideshowButton.ClickedSignal().Connect( this, &CubeTransitionApp::OnSildeshowButtonClicked );

diff --cc packaging/com.samsung.dali-demo.spec
Simple merge