Peter M. Groen / dali-demo

Commit 8d194661ee2c5a366291824b13f7d058028456e0

Authored by Tom Robinson
1 parent 2e5d1124

Removed Actor API from button. Added Icon properties 

Change-Id: Ib21ed8b157a7ce22762bc4ee9c04a2bbf5e770b9
Inline Side-by-side
Showing 24 changed files with 226 additions and 339 deletions
examples/atlas/atlas-example.cpp
  View file @8d19466
... ... @@ -72,8 +72,8 @@ public:
72 72 "Atlas" );
73 73  
74 74 mLoseContextButton = Toolkit::PushButton::New();
75   - mLoseContextButton.SetButtonImage( ResourceImage::New( LOSE_CONTEXT_IMAGE ) );
76   - mLoseContextButton.SetSelectedImage( ResourceImage::New( LOSE_CONTEXT_IMAGE_SELECTED ) );
  75 + mLoseContextButton.SetUnselectedImage( LOSE_CONTEXT_IMAGE );
  76 + mLoseContextButton.SetSelectedImage( LOSE_CONTEXT_IMAGE_SELECTED );
77 77 mLoseContextButton.ClickedSignal().Connect( this, &AtlasController::OnLoseContextButtonClicked );
78 78 mToolBar.AddControl( mLoseContextButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
79 79  
... ...
examples/bubble-effect/bubble-effect-example.cpp
  View file @8d19466
... ... @@ -111,8 +111,8 @@ private:
111 111  
112 112 // Add a button to change background. (right of toolbar)
113 113 mChangeBackgroundButton = Toolkit::PushButton::New();
114   - mChangeBackgroundButton.SetButtonImage( ResourceImage::New( CHANGE_BACKGROUND_ICON ) );
115   - mChangeBackgroundButton.SetSelectedImage( ResourceImage::New( CHANGE_BACKGROUND_ICON_SELECTED ) );
  114 + mChangeBackgroundButton.SetUnselectedImage( CHANGE_BACKGROUND_ICON );
  115 + mChangeBackgroundButton.SetSelectedImage( CHANGE_BACKGROUND_ICON_SELECTED );
116 116 mChangeBackgroundButton.ClickedSignal().Connect( this, &BubbleEffectExample::OnChangeIconClicked );
117 117 toolBar.AddControl( mChangeBackgroundButton,
118 118 DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage,
... ... @@ -120,8 +120,8 @@ private:
120 120 DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
121 121 // Add a button to change bubble shape. ( left of bar )
122 122 mChangeBubbleShapeButton = Toolkit::PushButton::New();
123   - mChangeBubbleShapeButton.SetButtonImage( ResourceImage::New( CHANGE_BUBBLE_SHAPE_ICON ) );
124   - mChangeBubbleShapeButton.SetSelectedImage( ResourceImage::New( CHANGE_BUBBLE_SHAPE_ICON_SELECTED ) );
  123 + mChangeBubbleShapeButton.SetUnselectedImage( CHANGE_BUBBLE_SHAPE_ICON );
  124 + mChangeBubbleShapeButton.SetSelectedImage( CHANGE_BUBBLE_SHAPE_ICON_SELECTED );
125 125 mChangeBubbleShapeButton.ClickedSignal().Connect( this, &BubbleEffectExample::OnChangeIconClicked );
126 126 toolBar.AddControl( mChangeBubbleShapeButton,
127 127 DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage,
... ...
examples/builder/examples.cpp
  View file @8d19466
... ... @@ -513,8 +513,8 @@ public:
513 513  
514 514 // Create an edit mode button. (left of toolbar)
515 515 Toolkit::PushButton editButton = Toolkit::PushButton::New();
516   - editButton.SetButtonImage( ResourceImage::New( EDIT_IMAGE ) );
517   - editButton.SetSelectedImage( ResourceImage::New( EDIT_IMAGE_SELECTED ) );
  516 + editButton.SetUnselectedImage( EDIT_IMAGE );
  517 + editButton.SetSelectedImage( EDIT_IMAGE_SELECTED );
518 518 editButton.ClickedSignal().Connect( this, &ExampleApp::OnToolSelectLayout);
519 519 editButton.SetLeaveRequired( true );
520 520 mToolBar.AddControl( editButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
... ...
examples/buttons/buttons-example.cpp
  View file @8d19466
... ... @@ -49,6 +49,7 @@ const Vector4 BACKGROUND_COLOUR( 1.0f, 1.0f, 1.0f, 0.15f );
49 49  
50 50 // Layout sizes
51 51 const int RADIO_LABEL_THUMBNAIL_SIZE = 60;
  52 +const int RADIO_LABEL_THUMBNAIL_SIZE_SMALL = 40;
52 53 const int RADIO_IMAGE_SPACING = 8;
53 54 const int BUTTON_HEIGHT = 48;
54 55  
... ... @@ -141,54 +142,71 @@ class ButtonsController: public ConnectionTracker
141 142  
142 143 radioGroup2Background.AddChild( radioButtonsGroup2, Toolkit::TableView::CellPosition( 0, 0 ) );
143 144  
  145 + // TableView to lay out 3x Radio buttons on the left, and 3x Image thumbnails on the right.
  146 + Toolkit::TableView imageSelectTableView = Toolkit::TableView::New( 3, 2 );
  147 + imageSelectTableView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
  148 + imageSelectTableView.SetFitHeight( 0 );
  149 + imageSelectTableView.SetFitHeight( 1 );
  150 + imageSelectTableView.SetFitHeight( 2 );
  151 + imageSelectTableView.SetFitWidth( 0 );
  152 + imageSelectTableView.SetFitWidth( 1 );
  153 + imageSelectTableView.SetCellPadding( Vector2( 6.0f, 0.0f ) );
  154 +
  155 + radioButtonsGroup2.Add( imageSelectTableView );
  156 +
144 157 int radioY = 0;
145 158  
146 159 // Radio 1
147 160 {
148   - ImageActor imageActor = ImageActor::New( ResourceImage::New( SMALL_IMAGE_1 ) );
149   - imageActor.SetSize( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) );
150   - mRadioButtonImage1 = Dali::Toolkit::RadioButton::New( imageActor );
  161 + ImageActor image = ImageActor::New( ResourceImage::New( SMALL_IMAGE_1 ) );
  162 + image.SetSize( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) );
  163 +
  164 + mRadioButtonImage1 = Dali::Toolkit::RadioButton::New( "1" );
151 165 mRadioButtonImage1.SetParentOrigin( ParentOrigin::TOP_LEFT );
152 166 mRadioButtonImage1.SetAnchorPoint( AnchorPoint::TOP_LEFT );
153 167 mRadioButtonImage1.SetPosition( 0, DP(radioY) );
154 168 mRadioButtonImage1.SetSelected( true );
155 169  
156   - radioButtonsGroup2.Add( mRadioButtonImage1 );
  170 + imageSelectTableView.AddChild( mRadioButtonImage1, Toolkit::TableView::CellPosition( 0, 0 ) );
  171 + imageSelectTableView.AddChild( image, Toolkit::TableView::CellPosition( 0, 1 ) );
157 172 }
158 173  
159 174 // Radio 2
160 175 {
161 176 radioY += RADIO_LABEL_THUMBNAIL_SIZE + RADIO_IMAGE_SPACING;
162 177  
163   - ImageActor imageActor = ImageActor::New( ResourceImage::New( SMALL_IMAGE_2 ) );
164   - imageActor.SetSize( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) );
  178 + ImageActor image = ImageActor::New( ResourceImage::New( SMALL_IMAGE_2 ) );
  179 + image.SetSize( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) );
165 180  
166   - mRadioButtonImage2 = Dali::Toolkit::RadioButton::New( imageActor );
  181 + mRadioButtonImage2 = Dali::Toolkit::RadioButton::New( "2" );
167 182 mRadioButtonImage2.SetParentOrigin( ParentOrigin::TOP_LEFT );
168 183 mRadioButtonImage2.SetAnchorPoint( AnchorPoint::TOP_LEFT );
169 184 mRadioButtonImage2.SetPosition( 0, DP(radioY) );
170 185  
171   - radioButtonsGroup2.Add( mRadioButtonImage2 );
  186 + imageSelectTableView.AddChild( mRadioButtonImage2, Toolkit::TableView::CellPosition( 1, 0 ) );
  187 + imageSelectTableView.AddChild( image, Toolkit::TableView::CellPosition( 1, 1 ) );
172 188 }
173 189  
174 190 // Radio 3
175 191 {
176 192 radioY += RADIO_LABEL_THUMBNAIL_SIZE + RADIO_IMAGE_SPACING;
177 193  
178   - ImageActor imageActor = ImageActor::New( ResourceImage::New( SMALL_IMAGE_3 ) );
179   - imageActor.SetSize( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) );
  194 + ImageActor image = ImageActor::New( ResourceImage::New( SMALL_IMAGE_3 ) );
  195 + image.SetSize( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) );
180 196  
181   - mRadioButtonImage3 = Dali::Toolkit::RadioButton::New( imageActor );
  197 + mRadioButtonImage3 = Dali::Toolkit::RadioButton::New( "3" );
182 198 mRadioButtonImage3.SetParentOrigin( ParentOrigin::TOP_LEFT );
183 199 mRadioButtonImage3.SetAnchorPoint( AnchorPoint::TOP_LEFT );
184 200 mRadioButtonImage3.SetPosition( 0, DP(radioY) );
185 201  
186   - radioButtonsGroup2.Add( mRadioButtonImage3 );
  202 + imageSelectTableView.AddChild( mRadioButtonImage3, Toolkit::TableView::CellPosition( 2, 0 ) );
  203 + imageSelectTableView.AddChild( image, Toolkit::TableView::CellPosition( 2, 1 ) );
187 204 }
188 205  
189 206 // Create select button
190 207 mUpdateButton = Toolkit::PushButton::New();
191   - mUpdateButton.SetLabel( "Select" );
  208 + mUpdateButton.SetLabelText( "Select" );
  209 + mUpdateButton.SetName( "select-button" );
192 210 mUpdateButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
193 211  
194 212 mUpdateButton.ClickedSignal().Connect( this, &ButtonsController::OnButtonClicked );
... ... @@ -227,26 +245,29 @@ class ButtonsController: public ConnectionTracker
227 245  
228 246 radioGroup1Background.Add( radioButtonsGroup1 );
229 247  
  248 + // TableView to lay out 2x Radio buttons on the left, and 1x Tick image on the right.
  249 + Toolkit::TableView tableView = Toolkit::TableView::New( 2, 2 );
  250 + tableView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
  251 + tableView.SetFitHeight( 0 );
  252 + tableView.SetFitHeight( 1 );
  253 + tableView.SetFitWidth( 0 );
  254 + tableView.SetFitWidth( 1 );
  255 +
  256 + Toolkit::TextLabel textLabel = Toolkit::TextLabel::New( "Select enabled" );
  257 + textLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::WIDTH );
  258 + textLabel.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT );
  259 + textLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
  260 +
  261 + ImageActor imageActor = ImageActor::New( ResourceImage::New( ENABLED_IMAGE ) );
  262 + imageActor.SetSize( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) );
  263 + imageActor.SetPadding( Padding( DP(20.0f), 0.0f, 0.0f, 0.0f ) );
  264 + tableView.AddChild( imageActor, Toolkit::TableView::CellPosition( 0, 1 ) );
  265 +
  266 + radioButtonsGroup1.Add( tableView );
  267 +
230 268 // First radio button
231 269 {
232   - Toolkit::TableView tableView = Toolkit::TableView::New( 1, 2 );
233   - tableView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
234   - tableView.SetFitHeight( 0 );
235   - tableView.SetFitWidth( 0 );
236   - tableView.SetFitWidth( 1 );
237   -
238   - Toolkit::TextLabel textLabel = Toolkit::TextLabel::New( "Select enabled" );
239   - textLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::WIDTH );
240   - textLabel.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT );
241   - textLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
242   - tableView.AddChild( textLabel, Toolkit::TableView::CellPosition( 0, 0 ) );
243   -
244   - ImageActor imageActor = ImageActor::New( ResourceImage::New( ENABLED_IMAGE ) );
245   - imageActor.SetSize( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) );
246   - imageActor.SetPadding( Padding( DP(20.0f), 0.0f, 0.0f, 0.0f ) );
247   - tableView.AddChild( imageActor, Toolkit::TableView::CellPosition( 0, 1 ) );
248   -
249   - Toolkit::RadioButton radioButton = Dali::Toolkit::RadioButton::New( tableView );
  270 + Toolkit::RadioButton radioButton = Dali::Toolkit::RadioButton::New( "Select enabled" );
250 271 radioButton.SetName( "radio-select-enable" );
251 272 radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
252 273 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
... ... @@ -255,7 +276,7 @@ class ButtonsController: public ConnectionTracker
255 276  
256 277 radioButton.StateChangedSignal().Connect( this, &ButtonsController::EnableSelectButton );
257 278  
258   - radioButtonsGroup1.Add( radioButton );
  279 + tableView.AddChild( radioButton, Toolkit::TableView::CellPosition( 0, 0 ) );
259 280 }
260 281  
261 282 // Second radio button
... ... @@ -268,7 +289,7 @@ class ButtonsController: public ConnectionTracker
268 289  
269 290 radioButton.StateChangedSignal().Connect( this, &ButtonsController::EnableSelectButton );
270 291  
271   - radioButtonsGroup1.Add( radioButton );
  292 + tableView.AddChild( radioButton, Toolkit::TableView::CellPosition( 1, 0 ) );
272 293 }
273 294  
274 295 // CheckBoxes
... ... @@ -276,7 +297,7 @@ class ButtonsController: public ConnectionTracker
276 297 checkBoxBackground.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
277 298 checkBoxBackground.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
278 299 checkBoxBackground.SetBackgroundColor( BACKGROUND_COLOUR );
279   - checkBoxBackground.SetCellPadding( Size( MARGIN_SIZE, MARGIN_SIZE ) );
  300 + checkBoxBackground.SetCellPadding( Size( MARGIN_SIZE / 2.0f, MARGIN_SIZE / 2.0f ) );
280 301  
281 302 for( unsigned int i = 0; i < checkBoxBackground.GetRows(); ++i )
282 303 {
... ... @@ -288,7 +309,7 @@ class ButtonsController: public ConnectionTracker
288 309 {
289 310 mCheckboxButton1 = Toolkit::CheckBoxButton::New();
290 311 mCheckboxButton1.SetName( "checkbox1" );
291   - mCheckboxButton1.SetLabel( "CheckBox1 is unselected" );
  312 + mCheckboxButton1.SetLabelText( "CheckBox1 is unselected" );
292 313 mCheckboxButton1.StateChangedSignal().Connect( this, &ButtonsController::OnCheckBoxesSelected );
293 314  
294 315 checkBoxBackground.Add( mCheckboxButton1 );
... ... @@ -297,7 +318,7 @@ class ButtonsController: public ConnectionTracker
297 318 {
298 319 mCheckboxButton2 = Toolkit::CheckBoxButton::New();
299 320 mCheckboxButton2.SetName( "checkbox2" );
300   - mCheckboxButton2.SetLabel( "CheckBox2 is selected" );
  321 + mCheckboxButton2.SetLabelText( "CheckBox2 is selected" );
301 322 mCheckboxButton2.SetSelected( true );
302 323 mCheckboxButton2.StateChangedSignal().Connect( this, &ButtonsController::OnCheckBoxesSelected );
303 324  
... ... @@ -307,7 +328,7 @@ class ButtonsController: public ConnectionTracker
307 328 {
308 329 mCheckboxButton3 = Toolkit::CheckBoxButton::New();
309 330 mCheckboxButton3.SetName( "checkbox3" );
310   - mCheckboxButton3.SetLabel( "CheckBox3 is unselected" );
  331 + mCheckboxButton3.SetLabelText( "CheckBox3 is unselected" );
311 332 mCheckboxButton3.StateChangedSignal().Connect( this, &ButtonsController::OnCheckBoxesSelected );
312 333  
313 334 checkBoxBackground.Add( mCheckboxButton3 );
... ... @@ -329,7 +350,7 @@ class ButtonsController: public ConnectionTracker
329 350  
330 351 mToggleButton = Toolkit::PushButton::New();
331 352 mToggleButton.SetTogglableButton( true );
332   - mToggleButton.SetLabel( "Unselected" );
  353 + mToggleButton.SetLabelText( "Unselected" );
333 354 mToggleButton.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
334 355 mToggleButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
335 356 mToggleButton.StateChangedSignal().Connect( this, &ButtonsController::OnButtonSelected );
... ... @@ -356,11 +377,11 @@ class ButtonsController: public ConnectionTracker
356 377 {
357 378 if( button.IsSelected() )
358 379 {
359   - pushButton.SetLabel( "Selected" );
  380 + pushButton.SetLabelText( "Selected" );
360 381 }
361 382 else
362 383 {
363   - pushButton.SetLabel( "Unselected" );
  384 + pushButton.SetLabelText( "Unselected" );
364 385 }
365 386 }
366 387  
... ... @@ -424,11 +445,11 @@ class ButtonsController: public ConnectionTracker
424 445 {
425 446 if( button.IsSelected() )
426 447 {
427   - button.SetLabel("CheckBox1 is selected");
  448 + button.SetLabelText("CheckBox1 is selected");
428 449 }
429 450 else
430 451 {
431   - button.SetLabel("CheckBox1 is unselected");
  452 + button.SetLabelText("CheckBox1 is unselected");
432 453 }
433 454 }
434 455  
... ... @@ -436,11 +457,11 @@ class ButtonsController: public ConnectionTracker
436 457 {
437 458 if( button.IsSelected() )
438 459 {
439   - button.SetLabel("CheckBox2 is selected");
  460 + button.SetLabelText("CheckBox2 is selected");
440 461 }
441 462 else
442 463 {
443   - button.SetLabel("CheckBox2 is unselected");
  464 + button.SetLabelText("CheckBox2 is unselected");
444 465 }
445 466 }
446 467  
... ... @@ -448,11 +469,11 @@ class ButtonsController: public ConnectionTracker
448 469 {
449 470 if( button.IsSelected() )
450 471 {
451   - button.SetLabel("CheckBox3 is selected");
  472 + button.SetLabelText("CheckBox3 is selected");
452 473 }
453 474 else
454 475 {
455   - button.SetLabel("CheckBox3 is unselected");
  476 + button.SetLabelText("CheckBox3 is unselected");
456 477 }
457 478 }
458 479  
... ...
examples/cluster/cluster-example.cpp
  View file @8d19466
... ... @@ -325,8 +325,8 @@ struct ShrinkConstraint
325 325  
326 326 struct ButtonImages
327 327 {
328   - Image mButtonImage;
329   - Image mSelectedImage;
  328 + std::string mButtonImage;
  329 + std::string mSelectedImage;
330 330 };
331 331  
332 332  
... ... @@ -390,14 +390,14 @@ public:
390 390 mContentLayer.SetProperty(Layer::Property::BEHAVIOR, "Dali::Layer::LAYER_3D");
391 391  
392 392 // Create a effect toggle button. (right of toolbar)
393   - mLayoutButtonImages[ NO_EFFECT ].mButtonImage = ResourceImage::New( LAYOUT_NONE_IMAGE );
394   - mLayoutButtonImages[ NO_EFFECT ].mSelectedImage = ResourceImage::New( LAYOUT_NONE_IMAGE_SELECTED );
395   - mLayoutButtonImages[ MOTION_BLUR_EFFECT ].mButtonImage = ResourceImage::New( LAYOUT_MOTION_BLUR_IMAGE );
396   - mLayoutButtonImages[ MOTION_BLUR_EFFECT ].mSelectedImage = ResourceImage::New( LAYOUT_MOTION_BLUR_IMAGE_SELECTED );
397   - mLayoutButtonImages[ CAROUSEL_EFFECT ].mButtonImage = ResourceImage::New( LAYOUT_CAROUSEL_IMAGE );
398   - mLayoutButtonImages[ CAROUSEL_EFFECT ].mSelectedImage = ResourceImage::New( LAYOUT_CAROUSEL_IMAGE_SELECTED );
399   - mLayoutButtonImages[ SPHERE_EFFECT ].mButtonImage = ResourceImage::New( LAYOUT_SPHERE_IMAGE );
400   - mLayoutButtonImages[ SPHERE_EFFECT ].mSelectedImage = ResourceImage::New( LAYOUT_SPHERE_IMAGE_SELECTED );
  393 + mLayoutButtonImages[ NO_EFFECT ].mButtonImage = LAYOUT_NONE_IMAGE;
  394 + mLayoutButtonImages[ NO_EFFECT ].mSelectedImage = LAYOUT_NONE_IMAGE_SELECTED;
  395 + mLayoutButtonImages[ MOTION_BLUR_EFFECT ].mButtonImage = LAYOUT_MOTION_BLUR_IMAGE;
  396 + mLayoutButtonImages[ MOTION_BLUR_EFFECT ].mSelectedImage = LAYOUT_MOTION_BLUR_IMAGE_SELECTED;
  397 + mLayoutButtonImages[ CAROUSEL_EFFECT ].mButtonImage = LAYOUT_CAROUSEL_IMAGE;
  398 + mLayoutButtonImages[ CAROUSEL_EFFECT ].mSelectedImage = LAYOUT_CAROUSEL_IMAGE_SELECTED;
  399 + mLayoutButtonImages[ SPHERE_EFFECT ].mButtonImage = LAYOUT_SPHERE_IMAGE;
  400 + mLayoutButtonImages[ SPHERE_EFFECT ].mSelectedImage = LAYOUT_SPHERE_IMAGE_SELECTED;
401 401  
402 402 mLayoutButton = Toolkit::PushButton::New();
403 403 mLayoutButton.ClickedSignal().Connect( this, &ClusterController::OnEffectTouched );
... ... @@ -631,7 +631,7 @@ public:
631 631 // Remove all shader-effects from mScrollView and it's children (the clusters)
632 632 mScrollView.SetPosition(Vector3::ZERO);
633 633  
634   - mLayoutButton.SetButtonImage( mLayoutButtonImages[ type ].mButtonImage );
  634 + mLayoutButton.SetUnselectedImage( mLayoutButtonImages[ type ].mButtonImage );
635 635 mLayoutButton.SetSelectedImage( mLayoutButtonImages[ type ].mSelectedImage );
636 636  
637 637 for( std::vector<ClusterInfo>::iterator i = mClusterInfo.begin(); i != mClusterInfo.end(); ++i )
... ...
examples/cube-transition-effect/cube-transition-effect-example.cpp
  View file @8d19466
... ... @@ -201,20 +201,10 @@ private:
201 201 bool mSlideshow;
202 202 Timer mViewTimer;
203 203 Toolkit::PushButton mSlideshowButton;
204   - Image mIconSlideshowStart;
205   - Image mIconSlideshowStartSelected;
206   - Image mIconSlideshowStop;
207   - Image mIconSlideshowStopSelected;
208 204  
209 205 Vector2 mPanPosition;
210 206 Vector2 mPanDisplacement;
211 207  
212   - Image mImageWave;
213   - Image mImageWaveSelected;
214   - Image mImageCross;
215   - Image mImageCrossSelected;
216   - Image mImageFold;
217   - Image mImageFoldSelected;
218 208 Toolkit::PushButton mEffectChangeButton;
219 209 };
220 210  
... ... @@ -241,15 +231,9 @@ void CubeTransitionApp::OnInit( Application&amp; application )
241 231 mContent.SetBehavior( Layer::LAYER_3D );
242 232  
243 233 // Add an effect-changing button on the right of the tool bar.
244   - mImageWave = ResourceImage::New( EFFECT_WAVE_IMAGE );
245   - mImageWaveSelected = ResourceImage::New( EFFECT_WAVE_IMAGE_SELECTED );
246   - mImageCross = ResourceImage::New( EFFECT_CROSS_IMAGE );
247   - mImageCrossSelected = ResourceImage::New( EFFECT_CROSS_IMAGE_SELECTED );
248   - mImageFold = ResourceImage::New( EFFECT_FOLD_IMAGE );
249   - mImageFoldSelected = ResourceImage::New( EFFECT_FOLD_IMAGE_SELECTED );
250 234 mEffectChangeButton = Toolkit::PushButton::New();
251   - mEffectChangeButton.SetButtonImage( mImageWave );
252   - mEffectChangeButton.SetSelectedImage( mImageWaveSelected );
  235 + mEffectChangeButton.SetUnselectedImage( EFFECT_WAVE_IMAGE );
  236 + mEffectChangeButton.SetSelectedImage( EFFECT_WAVE_IMAGE_SELECTED );
253 237 mEffectChangeButton.ClickedSignal().Connect( this, &CubeTransitionApp::OnEffectButtonClicked );
254 238 mToolBar.AddControl( mEffectChangeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
255 239  
... ... @@ -258,13 +242,9 @@ void CubeTransitionApp::OnInit( Application&amp; application )
258 242 mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Toolkit::Alignment::HorizontalCenter );
259 243  
260 244 //Add an slideshow icon on the right of the title
261   - mIconSlideshowStart = ResourceImage::New( SLIDE_SHOW_START_ICON );
262   - mIconSlideshowStartSelected = ResourceImage::New( SLIDE_SHOW_START_ICON_SELECTED );
263   - mIconSlideshowStop = ResourceImage::New( SLIDE_SHOW_STOP_ICON );
264   - mIconSlideshowStopSelected = ResourceImage::New( SLIDE_SHOW_STOP_ICON_SELECTED );
265 245 mSlideshowButton = Toolkit::PushButton::New();
266   - mSlideshowButton.SetButtonImage( mIconSlideshowStart );
267   - mSlideshowButton.SetSelectedImage( mIconSlideshowStartSelected );
  246 + mSlideshowButton.SetUnselectedImage( SLIDE_SHOW_START_ICON );
  247 + mSlideshowButton.SetSelectedImage( SLIDE_SHOW_START_ICON_SELECTED );
268 248 mSlideshowButton.ClickedSignal().Connect( this, &CubeTransitionApp::OnSildeshowButtonClicked );
269 249 mToolBar.AddControl( mSlideshowButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING );
270 250  
... ... @@ -375,23 +355,23 @@ bool CubeTransitionApp::OnEffectButtonClicked( Toolkit::Button button )
375 355 {
376 356 mCurrentEffect = mCubeCrossEffect;
377 357 mTitleActor.SetProperty( TextLabel::Property::TEXT, std::string(APPLICATION_TITLE_CROSS) );
378   - mEffectChangeButton.SetButtonImage( mImageCross );
379   - mEffectChangeButton.SetSelectedImage( mImageCrossSelected );
  358 + mEffectChangeButton.SetUnselectedImage( EFFECT_CROSS_IMAGE );
  359 + mEffectChangeButton.SetSelectedImage( EFFECT_CROSS_IMAGE_SELECTED );
380 360  
381 361 }
382 362 else if(mCurrentEffect == mCubeCrossEffect)
383 363 {
384 364 mCurrentEffect = mCubeFoldEffect;
385 365 mTitleActor.SetProperty( TextLabel::Property::TEXT, std::string(APPLICATION_TITLE_FOLD) );
386   - mEffectChangeButton.SetButtonImage( mImageFold );
387   - mEffectChangeButton.SetSelectedImage( mImageFoldSelected );
  366 + mEffectChangeButton.SetUnselectedImage( EFFECT_FOLD_IMAGE );
  367 + mEffectChangeButton.SetSelectedImage( EFFECT_FOLD_IMAGE_SELECTED );
388 368 }
389 369 else
390 370 {
391 371 mCurrentEffect = mCubeWaveEffect;
392 372 mTitleActor.SetProperty( TextLabel::Property::TEXT, std::string(APPLICATION_TITLE_WAVE) );
393   - mEffectChangeButton.SetButtonImage( mImageWave );
394   - mEffectChangeButton.SetSelectedImage( mImageWaveSelected );
  373 + mEffectChangeButton.SetUnselectedImage( EFFECT_WAVE_IMAGE );
  374 + mEffectChangeButton.SetSelectedImage( EFFECT_WAVE_IMAGE_SELECTED );
395 375 }
396 376  
397 377 // Set the current image to cube transition effect
... ... @@ -406,8 +386,8 @@ bool CubeTransitionApp::OnSildeshowButtonClicked( Toolkit::Button button )
406 386 if( mSlideshow )
407 387 {
408 388 mPanGestureDetector.Detach( mParent );
409   - mSlideshowButton.SetButtonImage( mIconSlideshowStop );
410   - mSlideshowButton.SetSelectedImage( mIconSlideshowStopSelected );
  389 + mSlideshowButton.SetUnselectedImage( SLIDE_SHOW_STOP_ICON );
  390 + mSlideshowButton.SetSelectedImage( SLIDE_SHOW_STOP_ICON_SELECTED );
411 391 mPanPosition = Vector2( mViewSize.width, mViewSize.height*0.5f );
412 392 mPanDisplacement = Vector2( -10.f, 0.f );
413 393 mViewTimer.Start();
... ... @@ -415,8 +395,8 @@ bool CubeTransitionApp::OnSildeshowButtonClicked( Toolkit::Button button )
415 395 else
416 396 {
417 397 mPanGestureDetector.Attach( mParent );
418   - mSlideshowButton.SetButtonImage( mIconSlideshowStart );
419   - mSlideshowButton.SetSelectedImage( mIconSlideshowStartSelected );
  398 + mSlideshowButton.SetUnselectedImage( SLIDE_SHOW_START_ICON );
  399 + mSlideshowButton.SetSelectedImage( SLIDE_SHOW_START_ICON_SELECTED );
420 400 mViewTimer.Stop();
421 401 }
422 402 return true;
... ...
examples/dissolve-effect/dissolve-effect-example.cpp
  View file @8d19466
... ... @@ -180,16 +180,8 @@ private:
180 180 bool mTimerReady;
181 181 unsigned int mCentralLineIndex;
182 182  
183   - Image mIconPlay;
184   - Image mIconPlaySelected;
185   - Image mIconStop;
186   - Image mIconStopSelected;
187 183 Toolkit::PushButton mPlayStopButton;
188 184  
189   - Image mIconHighP;
190   - Image mIconHighPSelected;
191   - Image mIconMediumP;
192   - Image mIconMediumPSelected;
193 185 Toolkit::PushButton mEffectChangeButton;
194 186 };
195 187  
... ... @@ -218,13 +210,9 @@ void DissolveEffectApp::OnInit( Application&amp; application )
218 210 mContent = DemoHelper::CreateView( application, mView,mToolBar, "", TOOLBAR_IMAGE, "" );
219 211  
220 212 // Add an effect-changing button on the right of the tool bar.
221   - mIconHighP = ResourceImage::New( EFFECT_HIGHP_IMAGE );
222   - mIconHighPSelected = ResourceImage::New( EFFECT_HIGHP_IMAGE_SELECTED );
223   - mIconMediumP = ResourceImage::New( EFFECT_MEDIUMP_IMAGE );
224   - mIconMediumPSelected = ResourceImage::New( EFFECT_MEDIUMP_IMAGE_SELECTED );
225 213 mEffectChangeButton = Toolkit::PushButton::New();
226   - mEffectChangeButton.SetButtonImage( mIconHighP );
227   - mEffectChangeButton.SetSelectedImage( mIconHighPSelected );
  214 + mEffectChangeButton.SetUnselectedImage( EFFECT_HIGHP_IMAGE );
  215 + mEffectChangeButton.SetSelectedImage( EFFECT_HIGHP_IMAGE_SELECTED );
228 216 mEffectChangeButton.ClickedSignal().Connect( this, &DissolveEffectApp::OnEffectButtonClicked );
229 217 mToolBar.AddControl( mEffectChangeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
230 218  
... ... @@ -233,13 +221,9 @@ void DissolveEffectApp::OnInit( Application&amp; application )
233 221 mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Toolkit::Alignment::HorizontalCenter );
234 222  
235 223 // Add an slide-show button on the right of the title
236   - mIconPlay = ResourceImage::New( PLAY_ICON );
237   - mIconPlaySelected = ResourceImage::New( PLAY_ICON_SELECTED );
238   - mIconStop = ResourceImage::New( STOP_ICON );
239   - mIconStopSelected = ResourceImage::New( STOP_ICON_SELECTED );
240 224 mPlayStopButton = Toolkit::PushButton::New();
241   - mPlayStopButton.SetButtonImage( mIconPlay );
242   - mPlayStopButton.SetSelectedImage( mIconPlaySelected );
  225 + mPlayStopButton.SetUnselectedImage( PLAY_ICON );
  226 + mPlayStopButton.SetSelectedImage( PLAY_ICON_SELECTED );
243 227 mPlayStopButton.ClickedSignal().Connect( this, &DissolveEffectApp::OnSildeshowButtonClicked );
244 228 mToolBar.AddControl( mPlayStopButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING );
245 229  
... ... @@ -350,14 +334,14 @@ bool DissolveEffectApp::OnEffectButtonClicked( Toolkit::Button button )
350 334 if(mUseHighPrecision)
351 335 {
352 336 mTitleActor.SetProperty( TextLabel::Property::TEXT, std::string(APPLICATION_TITLE_HIGHP) );
353   - mEffectChangeButton.SetButtonImage( mIconHighP );
354   - mEffectChangeButton.SetSelectedImage( mIconHighPSelected );
  337 + mEffectChangeButton.SetUnselectedImage( EFFECT_HIGHP_IMAGE );
  338 + mEffectChangeButton.SetSelectedImage( EFFECT_HIGHP_IMAGE_SELECTED );
355 339 }
356 340 else
357 341 {
358 342 mTitleActor.SetProperty( TextLabel::Property::TEXT, std::string(APPLICATION_TITLE_MEDIUMP) );
359   - mEffectChangeButton.SetButtonImage( mIconMediumP );
360   - mEffectChangeButton.SetSelectedImage( mIconMediumPSelected );
  343 + mEffectChangeButton.SetUnselectedImage( EFFECT_MEDIUMP_IMAGE );
  344 + mEffectChangeButton.SetSelectedImage( EFFECT_MEDIUMP_IMAGE_SELECTED );
361 345 }
362 346  
363 347 return true;
... ... @@ -368,16 +352,16 @@ bool DissolveEffectApp::OnSildeshowButtonClicked( Toolkit::Button button )
368 352 mSlideshow = !mSlideshow;
369 353 if( mSlideshow )
370 354 {
371   - mPlayStopButton.SetButtonImage( mIconStop );
372   - mPlayStopButton.SetSelectedImage( mIconStopSelected );
  355 + mPlayStopButton.SetUnselectedImage( STOP_ICON );
  356 + mPlayStopButton.SetSelectedImage( STOP_ICON_SELECTED );
373 357 mPanGestureDetector.Detach( mParent );
374 358 mViewTimer.Start();
375 359 mTimerReady = false;
376 360 }
377 361 else
378 362 {
379   - mPlayStopButton.SetButtonImage( mIconPlay );
380   - mPlayStopButton.SetSelectedImage( mIconPlaySelected );
  363 + mPlayStopButton.SetUnselectedImage( PLAY_ICON );
  364 + mPlayStopButton.SetSelectedImage( PLAY_ICON_SELECTED );
381 365 mTimerReady = true;
382 366 mPanGestureDetector.Attach( mParent );
383 367 }
... ...
examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
  View file @8d19466
... ... @@ -337,7 +337,6 @@ public:
337 337 fittingModeGroup.Add( label );
338 338  
339 339 Toolkit::PushButton button = CreateButton( FITTING_BUTTON_ID, StringFromScalingMode( mFittingMode ) );
340   - button.GetLabel().SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_TEXT );
341 340 fittingModeGroup.Add( button );
342 341 mFittingModeButton = button;
343 342  
... ... @@ -359,7 +358,6 @@ public:
359 358 samplingModeGroup.Add( label );
360 359  
361 360 Toolkit::PushButton button = CreateButton( SAMPLING_BUTTON_ID, StringFromFilterMode( mSamplingMode ) );
362   - button.GetLabel().SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_TEXT );
363 361 samplingModeGroup.Add( button );
364 362 mSamplingModeButton = button;
365 363  
... ... @@ -372,7 +370,7 @@ public:
372 370 Toolkit::PushButton button = Toolkit::PushButton::New();
373 371 button.SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_TEXT );
374 372 button.SetName( id );
375   - button.SetLabel( label );
  373 + button.SetLabelText( label );
376 374 button.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
377 375 button.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
378 376 button.ClickedSignal().Connect( this, &ImageScalingAndFilteringController::OnButtonClicked );
... ... @@ -401,9 +399,7 @@ public:
401 399 {
402 400 Toolkit::PushButton button = Toolkit::PushButton::New();
403 401 button.SetName( id );
404   - button.SetLabel( id );
405   - Toolkit::TextLabel textLabel = Toolkit::TextLabel::DownCast( button.GetLabel() );
406   - textLabel.SetProperty( TextLabel::Property::POINT_SIZE, 12.0f );
  402 + button.SetLabelText( id );
407 403  
408 404 button.SetAnchorPoint( AnchorPoint::TOP_LEFT );
409 405 button.SetParentOrigin( ParentOrigin::BOTTOM_LEFT );
... ... @@ -492,8 +488,7 @@ public:
492 488 if( button.GetName() == modeName )
493 489 {
494 490 mFittingMode = mode;
495   - mFittingModeButton.SetLabel( modeName );
496   - mFittingModeButton.GetLabel().SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_TEXT );
  491 + mFittingModeButton.SetLabelText( modeName );
497 492 ResizeImage();
498 493 mPopup.Hide();
499 494 mPopup.Reset();
... ... @@ -508,8 +503,7 @@ public:
508 503 if( button.GetName() == modeName )
509 504 {
510 505 mSamplingMode = mode;
511   - mSamplingModeButton.SetLabel( modeName );
512   - mSamplingModeButton.GetLabel().SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_TEXT );
  506 + mSamplingModeButton.SetLabelText( modeName );
513 507 ResizeImage();
514 508 mPopup.Hide();
515 509 mPopup.Reset();
... ... @@ -657,15 +651,13 @@ public:
657 651 else if ( event.keyPressedName == "f" )
658 652 {
659 653 mSamplingMode = NextFilterMode( mSamplingMode );
660   - mSamplingModeButton.SetLabel( StringFromFilterMode( mSamplingMode ) );
661   - mSamplingModeButton.GetLabel().SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_TEXT );
  654 + mSamplingModeButton.SetLabelText( StringFromFilterMode( mSamplingMode ) );
662 655 }
663 656 // Cycle filter and scaling modes:
664 657 else if ( event.keyPressedName == "s" )
665 658 {
666 659 mFittingMode = NextScalingMode( mFittingMode );
667   - mFittingModeButton.SetLabel( StringFromScalingMode( mFittingMode ) );
668   - mFittingModeButton.GetLabel().SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_TEXT );
  660 + mFittingModeButton.SetLabelText( StringFromScalingMode( mFittingMode ) );
669 661 }
670 662 else
671 663 {
... ...
examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
  View file @8d19466
... ... @@ -306,11 +306,9 @@ public:
306 306 "" );
307 307  
308 308 // Create an image scaling toggle button. (right of toolbar)
309   - Image toggleScalingImage = ResourceImage::New( TOGGLE_SCALING_IMAGE );
310   - Image toggleScalingImageSelected = ResourceImage::New( TOGGLE_SCALING_IMAGE_SELECTED );
311 309 Toolkit::PushButton toggleScalingButton = Toolkit::PushButton::New();
312   - toggleScalingButton.SetButtonImage( toggleScalingImage );
313   - toggleScalingButton.SetSelectedImage( toggleScalingImageSelected );
  310 + toggleScalingButton.SetUnselectedImage( TOGGLE_SCALING_IMAGE );
  311 + toggleScalingButton.SetSelectedImage( TOGGLE_SCALING_IMAGE_SELECTED );
314 312 toggleScalingButton.ClickedSignal().Connect( this, &ImageScalingIrregularGridController::OnToggleScalingTouched );
315 313 mToolBar.AddControl( toggleScalingButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
316 314  
... ...
examples/item-view/item-view-example.cpp
  View file @8d19466
... ... @@ -231,16 +231,16 @@ public:
231 231  
232 232 // Create an edit mode button. (left of toolbar)
233 233 Toolkit::PushButton editButton = Toolkit::PushButton::New();
234   - editButton.SetButtonImage( ResourceImage::New( EDIT_IMAGE ) );
235   - editButton.SetSelectedImage( ResourceImage::New( EDIT_IMAGE_SELECTED ) );
  234 + editButton.SetUnselectedImage( EDIT_IMAGE );
  235 + editButton.SetSelectedImage( EDIT_IMAGE_SELECTED );
236 236 editButton.ClickedSignal().Connect( this, &ItemViewExample::OnModeButtonClicked);
237 237 editButton.SetLeaveRequired( true );
238 238 mToolBar.AddControl( editButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
239 239  
240 240 // Create a layout toggle button. (right of toolbar)
241 241 mLayoutButton = Toolkit::PushButton::New();
242   - mLayoutButton.SetButtonImage( ResourceImage::New( SPIRAL_LAYOUT_IMAGE ) );
243   - mLayoutButton.SetSelectedImage( ResourceImage::New( SPIRAL_LAYOUT_IMAGE_SELECTED ) );
  242 + mLayoutButton.SetUnselectedImage( SPIRAL_LAYOUT_IMAGE );
  243 + mLayoutButton.SetSelectedImage(SPIRAL_LAYOUT_IMAGE_SELECTED );
244 244 mLayoutButton.ClickedSignal().Connect( this, &ItemViewExample::OnLayoutButtonClicked);
245 245 mLayoutButton.SetLeaveRequired( true );
246 246 mToolBar.AddControl( mLayoutButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
... ... @@ -251,9 +251,9 @@ public:
251 251 mDeleteButton.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT);
252 252 mDeleteButton.SetPosition( BUTTON_BORDER, BUTTON_BORDER );
253 253 mDeleteButton.SetDrawMode( DrawMode::OVERLAY_2D );
254   - mDeleteButton.SetButtonImage( ResourceImage::New( DELETE_IMAGE ) );
255   - mDeleteButton.SetSelectedImage( ResourceImage::New( DELETE_IMAGE_SELECTED ) );
256   - mDeleteButton.SetBackgroundImage( ResourceImage::New( TOOLBAR_IMAGE ) );
  254 + mDeleteButton.SetUnselectedImage( DELETE_IMAGE );
  255 + mDeleteButton.SetSelectedImage( DELETE_IMAGE_SELECTED );
  256 + mDeleteButton.SetBackgroundImage( TOOLBAR_IMAGE );
257 257 mDeleteButton.SetSize( Vector2( stageSize.width * 0.15f, stageSize.width * 0.15f ) );
258 258 mDeleteButton.ClickedSignal().Connect( this, &ItemViewExample::OnDeleteButtonClicked);
259 259 mDeleteButton.SetLeaveRequired( true );
... ... @@ -266,9 +266,9 @@ public:
266 266 mInsertButton.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT);
267 267 mInsertButton.SetPosition( BUTTON_BORDER, BUTTON_BORDER );
268 268 mInsertButton.SetDrawMode( DrawMode::OVERLAY_2D );
269   - mInsertButton.SetButtonImage( ResourceImage::New( INSERT_IMAGE ) );
270   - mInsertButton.SetSelectedImage( ResourceImage::New( INSERT_IMAGE_SELECTED ) );
271   - mInsertButton.SetBackgroundImage( ResourceImage::New( TOOLBAR_IMAGE ) );
  269 + mInsertButton.SetUnselectedImage( INSERT_IMAGE );
  270 + mInsertButton.SetSelectedImage( INSERT_IMAGE_SELECTED );
  271 + mInsertButton.SetBackgroundImage( TOOLBAR_IMAGE );
272 272 mInsertButton.SetSize( stageSize.width * 0.15f, stageSize.width * 0.15f );
273 273 mInsertButton.ClickedSignal().Connect( this, &ItemViewExample::OnInsertButtonClicked);
274 274 mInsertButton.SetLeaveRequired( true );
... ... @@ -281,9 +281,9 @@ public:
281 281 mReplaceButton.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT);
282 282 mReplaceButton.SetPosition( BUTTON_BORDER, BUTTON_BORDER );
283 283 mReplaceButton.SetDrawMode( DrawMode::OVERLAY_2D );
284   - mReplaceButton.SetButtonImage( ResourceImage::New( REPLACE_IMAGE ) );
285   - mReplaceButton.SetSelectedImage( ResourceImage::New( REPLACE_IMAGE_SELECTED ) );
286   - mReplaceButton.SetBackgroundImage( ResourceImage::New( TOOLBAR_IMAGE ) );
  284 + mReplaceButton.SetUnselectedImage( REPLACE_IMAGE );
  285 + mReplaceButton.SetSelectedImage( REPLACE_IMAGE_SELECTED );
  286 + mReplaceButton.SetBackgroundImage( TOOLBAR_IMAGE );
287 287 mReplaceButton.SetSize( stageSize.width * 0.15f, stageSize.width * 0.15f );
288 288 mReplaceButton.ClickedSignal().Connect( this, &ItemViewExample::OnReplaceButtonClicked);
289 289 mReplaceButton.SetLeaveRequired( true );
... ... @@ -812,22 +812,22 @@ public:
812 812 {
813 813 case SPIRAL_LAYOUT:
814 814 {
815   - mLayoutButton.SetButtonImage( ResourceImage::New( SPIRAL_LAYOUT_IMAGE ) );
816   - mLayoutButton.SetSelectedImage( ResourceImage::New( SPIRAL_LAYOUT_IMAGE_SELECTED ) );
  815 + mLayoutButton.SetUnselectedImage( SPIRAL_LAYOUT_IMAGE );
  816 + mLayoutButton.SetSelectedImage( SPIRAL_LAYOUT_IMAGE_SELECTED );
817 817 break;
818 818 }
819 819  
820 820 case GRID_LAYOUT:
821 821 {
822   - mLayoutButton.SetButtonImage( ResourceImage::New( GRID_LAYOUT_IMAGE ) );
823   - mLayoutButton.SetSelectedImage( ResourceImage::New( GRID_LAYOUT_IMAGE_SELECTED ) );
  822 + mLayoutButton.SetUnselectedImage( GRID_LAYOUT_IMAGE );
  823 + mLayoutButton.SetSelectedImage( GRID_LAYOUT_IMAGE_SELECTED );
824 824 break;
825 825 }
826 826  
827 827 case DEPTH_LAYOUT:
828 828 {
829   - mLayoutButton.SetButtonImage( ResourceImage::New( DEPTH_LAYOUT_IMAGE ) );
830   - mLayoutButton.SetSelectedImage( ResourceImage::New( DEPTH_LAYOUT_IMAGE_SELECTED ) );
  829 + mLayoutButton.SetUnselectedImage( DEPTH_LAYOUT_IMAGE );
  830 + mLayoutButton.SetSelectedImage( DEPTH_LAYOUT_IMAGE_SELECTED );
831 831 break;
832 832 }
833 833  
... ...
examples/logging/logging-example.cpp
  View file @8d19466
... ... @@ -285,7 +285,7 @@ class LoggingController: public ConnectionTracker
285 285 {
286 286 Toolkit::PushButton button = Toolkit::PushButton::New();
287 287 button.SetName( CREATE_BUTTON_ID );
288   - button.SetLabel( CREATE_BUTTON_TEXT );
  288 + button.SetLabelText( CREATE_BUTTON_TEXT );
289 289 button.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
290 290 button.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
291 291 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
... ... @@ -296,7 +296,7 @@ class LoggingController: public ConnectionTracker
296 296 {
297 297 Toolkit::PushButton button = Toolkit::PushButton::New();
298 298 button.SetName( DELETE_BUTTON_ID );
299   - button.SetLabel( DELETE_BUTTON_TEXT );
  299 + button.SetLabelText( DELETE_BUTTON_TEXT );
300 300 button.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
301 301 button.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
302 302 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
... ... @@ -318,7 +318,7 @@ class LoggingController: public ConnectionTracker
318 318 {
319 319 Toolkit::PushButton button = Toolkit::PushButton::New();
320 320 button.SetName( START_BUTTON_ID );
321   - button.SetLabel( START_BUTTON_TEXT );
  321 + button.SetLabelText( START_BUTTON_TEXT );
322 322 button.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
323 323 button.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
324 324 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
... ... @@ -329,7 +329,7 @@ class LoggingController: public ConnectionTracker
329 329 {
330 330 Toolkit::PushButton button = Toolkit::PushButton::New();
331 331 button.SetName( STOP_BUTTON_ID );
332   - button.SetLabel( STOP_BUTTON_TEXT );
  332 + button.SetLabelText( STOP_BUTTON_TEXT );
333 333 button.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
334 334 button.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
335 335 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
... ... @@ -350,7 +350,7 @@ class LoggingController: public ConnectionTracker
350 350 {
351 351 Toolkit::PushButton button = Toolkit::PushButton::New();
352 352 button.SetName( ENABLE_BUTTON_ID );
353   - button.SetLabel( ENABLE_BUTTON_TEXT );
  353 + button.SetLabelText( ENABLE_BUTTON_TEXT );
354 354 button.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
355 355 button.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
356 356 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
... ... @@ -361,7 +361,7 @@ class LoggingController: public ConnectionTracker
361 361 {
362 362 Toolkit::PushButton button = Toolkit::PushButton::New();
363 363 button.SetName( DISABLE_BUTTON_ID );
364   - button.SetLabel( DISABLE_BUTTON_TEXT );
  364 + button.SetLabelText( DISABLE_BUTTON_TEXT );
365 365 button.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
366 366 button.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
367 367 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
... ... @@ -444,7 +444,7 @@ class LoggingController: public ConnectionTracker
444 444 {
445 445 Toolkit::PushButton button = Toolkit::PushButton::New();
446 446 button.SetName( VSYNC_BUTTON_ID );
447   - button.SetLabel( VSYNC_BUTTON_TEXT );
  447 + button.SetLabelText( VSYNC_BUTTON_TEXT );
448 448 button.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
449 449 button.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
450 450 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
... ... @@ -464,9 +464,7 @@ class LoggingController: public ConnectionTracker
464 464 << ", " << ((mLoggerStates[i].isTiming) ? "Started" : "Stopped")
465 465 << ", " << ((mLoggerStates[i].isEnabled) ? "Enabled" : "Disabled");
466 466  
467   - Toolkit::TextLabel textLabel = Toolkit::TextLabel::New( ss.str() );
468   -
469   - mLogRadioButtons[i].SetLabel( textLabel );
  467 + mLogRadioButtons[i].SetLabelText( ss.str() );
470 468 }
471 469 }
472 470  
... ...
examples/motion-blur/motion-blur-example.cpp
  View file @8d19466
... ... @@ -166,23 +166,17 @@ public:
166 166 APPLICATION_TITLE );
167 167  
168 168 //Add an effects icon on the right of the title
169   - mIconEffectsOff = ResourceImage::New( EFFECTS_OFF_ICON );
170   - mIconEffectsOffSelected = ResourceImage::New( EFFECTS_OFF_ICON_SELECTED );
171   - mIconEffectsOn = ResourceImage::New( EFFECTS_ON_ICON );
172   - mIconEffectsOnSelected = ResourceImage::New( EFFECTS_ON_ICON_SELECTED );
173 169 mActorEffectsButton = Toolkit::PushButton::New();
174   - mActorEffectsButton.SetButtonImage( mIconEffectsOff );
175   - mActorEffectsButton.SetSelectedImage( mIconEffectsOffSelected );
  170 + mActorEffectsButton.SetUnselectedImage( EFFECTS_OFF_ICON );
  171 + mActorEffectsButton.SetSelectedImage( EFFECTS_OFF_ICON_SELECTED );
176 172 mActorEffectsButton.ClickedSignal().Connect( this, &MotionBlurExampleApp::OnEffectButtonClicked );
177 173 mToolBar.AddControl( mActorEffectsButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING );
178 174  
179 175 // Creates a mode button.
180 176 // Create a effect toggle button. (right of toolbar)
181   - Image imageLayout = ResourceImage::New( LAYOUT_IMAGE );
182   - Image imageLayoutSelected = ResourceImage::New( LAYOUT_IMAGE_SELECTED );
183 177 Toolkit::PushButton layoutButton = Toolkit::PushButton::New();
184   - layoutButton.SetButtonImage( imageLayout );
185   - layoutButton.SetSelectedImage( imageLayoutSelected );
  178 + layoutButton.SetUnselectedImage( LAYOUT_IMAGE );
  179 + layoutButton.SetSelectedImage( LAYOUT_IMAGE_SELECTED );
186 180 layoutButton.ClickedSignal().Connect( this, &MotionBlurExampleApp::OnLayoutButtonClicked);
187 181 layoutButton.SetLeaveRequired( true );
188 182 mToolBar.AddControl( layoutButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
... ... @@ -455,14 +449,14 @@ public:
455 449 if(!mActorEffectsEnabled)
456 450 {
457 451 mActorEffectsEnabled = true;
458   - mActorEffectsButton.SetButtonImage( mIconEffectsOn );
459   - mActorEffectsButton.SetSelectedImage( mIconEffectsOnSelected );
  452 + mActorEffectsButton.SetUnselectedImage( EFFECTS_ON_ICON );
  453 + mActorEffectsButton.SetSelectedImage( EFFECTS_ON_ICON_SELECTED );
460 454 }
461 455 else
462 456 {
463 457 mActorEffectsEnabled = false;
464   - mActorEffectsButton.SetButtonImage( mIconEffectsOff );
465   - mActorEffectsButton.SetSelectedImage( mIconEffectsOffSelected );
  458 + mActorEffectsButton.SetUnselectedImage( EFFECTS_OFF_ICON );
  459 + mActorEffectsButton.SetSelectedImage( EFFECTS_OFF_ICON_SELECTED );
466 460 }
467 461 }
468 462  
... ... @@ -522,10 +516,6 @@ private:
522 516 Application& mApplication; ///< Application instance
523 517 Toolkit::Control mView;
524 518 Toolkit::ToolBar mToolBar;
525   - Image mIconEffectsOff;
526   - Image mIconEffectsOffSelected;
527   - Image mIconEffectsOn;
528   - Image mIconEffectsOnSelected;
529 519  
530 520 Layer mContentLayer; ///< Content layer (contains actor for this blur demo)
531 521  
... ...
examples/motion-stretch/motion-stretch-example.cpp
  View file @8d19466
... ... @@ -140,23 +140,17 @@ public:
140 140 APPLICATION_TITLE );
141 141  
142 142 //Add an slideshow icon on the right of the title
143   - mIconEffectsOff = ResourceImage::New( EFFECTS_OFF_ICON );
144   - mIconEffectsOffSelected = ResourceImage::New( EFFECTS_OFF_ICON_SELECTED );
145   - mIconEffectsOn = ResourceImage::New( EFFECTS_ON_ICON );
146   - mIconEffectsOnSelected = ResourceImage::New( EFFECTS_ON_ICON_SELECTED );
147 143 mActorEffectsButton = Toolkit::PushButton::New();
148   - mActorEffectsButton.SetButtonImage( mIconEffectsOff );
149   - mActorEffectsButton.SetSelectedImage( mIconEffectsOffSelected );
  144 + mActorEffectsButton.SetUnselectedImage( EFFECTS_OFF_ICON );
  145 + mActorEffectsButton.SetSelectedImage( EFFECTS_OFF_ICON_SELECTED );
150 146 mActorEffectsButton.ClickedSignal().Connect( this, &MotionStretchExampleApp::OnEffectButtonClicked );
151 147 mToolBar.AddControl( mActorEffectsButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING );
152 148  
153 149 // Creates a mode button.
154 150 // Create a effect toggle button. (right of toolbar)
155   - Image imageLayout = ResourceImage::New( LAYOUT_IMAGE );
156   - Image imageLayoutSelected = ResourceImage::New( LAYOUT_IMAGE_SELECTED );
157 151 Toolkit::PushButton layoutButton = Toolkit::PushButton::New();
158   - layoutButton.SetButtonImage( imageLayout );
159   - layoutButton.SetSelectedImage( imageLayoutSelected );
  152 + layoutButton.SetUnselectedImage( LAYOUT_IMAGE );
  153 + layoutButton.SetSelectedImage( LAYOUT_IMAGE_SELECTED );
160 154 layoutButton.ClickedSignal().Connect( this, &MotionStretchExampleApp::OnLayoutButtonClicked);
161 155 layoutButton.SetLeaveRequired( true );
162 156 mToolBar.AddControl( layoutButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
... ... @@ -349,14 +343,14 @@ public:
349 343 if(!mActorEffectsEnabled)
350 344 {
351 345 mActorEffectsEnabled = true;
352   - mActorEffectsButton.SetButtonImage( mIconEffectsOn );
353   - mActorEffectsButton.SetSelectedImage( mIconEffectsOnSelected );
  346 + mActorEffectsButton.SetUnselectedImage( EFFECTS_ON_ICON );
  347 + mActorEffectsButton.SetSelectedImage( EFFECTS_ON_ICON_SELECTED );
354 348 }
355 349 else
356 350 {
357 351 mActorEffectsEnabled = false;
358   - mActorEffectsButton.SetButtonImage( mIconEffectsOff );
359   - mActorEffectsButton.SetSelectedImage( mIconEffectsOffSelected );
  352 + mActorEffectsButton.SetUnselectedImage( EFFECTS_OFF_ICON );
  353 + mActorEffectsButton.SetSelectedImage( EFFECTS_OFF_ICON_SELECTED );
360 354 }
361 355 }
362 356  
... ... @@ -416,10 +410,6 @@ private:
416 410 Application& mApplication; ///< Application instance
417 411 Toolkit::Control mView;
418 412 Toolkit::ToolBar mToolBar;
419   - Image mIconEffectsOff;
420   - Image mIconEffectsOffSelected;
421   - Image mIconEffectsOn;
422   - Image mIconEffectsOnSelected;
423 413 Layer mContentLayer; ///< Content layer (contains actor for this stretch demo)
424 414  
425 415 PushButton mActorEffectsButton; ///< The actor effects toggling Button.
... ...
examples/new-window/new-window-example.cpp
  View file @8d19466
... ... @@ -199,8 +199,8 @@ void NewWindowController::Create( Application&amp; app )
199 199 }
200 200  
201 201 mLoseContextButton = Toolkit::PushButton::New();
202   - mLoseContextButton.SetButtonImage( ResourceImage::New( LOSE_CONTEXT_IMAGE ) );
203   - mLoseContextButton.SetSelectedImage( ResourceImage::New( LOSE_CONTEXT_IMAGE_SELECTED ) );
  202 + mLoseContextButton.SetUnselectedImage( LOSE_CONTEXT_IMAGE );
  203 + mLoseContextButton.SetSelectedImage( LOSE_CONTEXT_IMAGE_SELECTED );
204 204 mLoseContextButton.ClickedSignal().Connect( this, &NewWindowController::OnLoseContextButtonClicked );
205 205 mToolBar.AddControl( mLoseContextButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
206 206  
... ...
examples/radial-menu/radial-menu-example.cpp
  View file @8d19466
... ... @@ -108,10 +108,6 @@ private: // Member variables
108 108 Animation mAnimation;
109 109 AnimState mAnimationState;
110 110  
111   - Image mIconPlay;
112   - Image mIconPlaySelected;
113   - Image mIconStop;
114   - Image mIconStopSelected;
115 111 Toolkit::PushButton mPlayStopButton;
116 112 ImageView mDialView;
117 113 RadialSweepView mRadialSweepView1;
... ... @@ -148,13 +144,9 @@ void RadialMenuExample::OnInit(Application&amp; app)
148 144 TOOLBAR_IMAGE,
149 145 APPLICATION_TITLE );
150 146  
151   - mIconPlay = ResourceImage::New( PLAY_ICON );
152   - mIconPlaySelected = ResourceImage::New( PLAY_ICON_SELECTED );
153   - mIconStop = ResourceImage::New( STOP_ICON );
154   - mIconStopSelected = ResourceImage::New( STOP_ICON_SELECTED );
155 147 mPlayStopButton = Toolkit::PushButton::New();
156   - mPlayStopButton.SetButtonImage( mIconStop );
157   - mPlayStopButton.SetSelectedImage( mIconStopSelected );
  148 + mPlayStopButton.SetUnselectedImage( STOP_ICON );
  149 + mPlayStopButton.SetSelectedImage( STOP_ICON_SELECTED );
158 150  
159 151 mPlayStopButton.ClickedSignal().Connect( this, &RadialMenuExample::OnButtonClicked );
160 152  
... ... @@ -223,8 +215,8 @@ bool RadialMenuExample::OnButtonClicked( Toolkit::Button button )
223 215 {
224 216 mAnimation.Pause();
225 217 mAnimationState = PAUSED;
226   - mPlayStopButton.SetButtonImage( mIconPlay );
227   - mPlayStopButton.SetSelectedImage( mIconPlaySelected );
  218 + mPlayStopButton.SetUnselectedImage( PLAY_ICON );
  219 + mPlayStopButton.SetSelectedImage( PLAY_ICON_SELECTED );
228 220 }
229 221 break;
230 222  
... ... @@ -232,15 +224,15 @@ bool RadialMenuExample::OnButtonClicked( Toolkit::Button button )
232 224 {
233 225 mAnimation.Play();
234 226 mAnimationState = PLAYING;
235   - mPlayStopButton.SetButtonImage( mIconStop );
236   - mPlayStopButton.SetSelectedImage( mIconStopSelected );
  227 + mPlayStopButton.SetUnselectedImage( STOP_ICON );
  228 + mPlayStopButton.SetSelectedImage( STOP_ICON_SELECTED );
237 229 }
238 230 break;
239 231  
240 232 case STOPPED:
241 233 {
242   - mPlayStopButton.SetButtonImage( mIconStop );
243   - mPlayStopButton.SetSelectedImage( mIconStopSelected );
  234 + mPlayStopButton.SetUnselectedImage( STOP_ICON );
  235 + mPlayStopButton.SetSelectedImage( STOP_ICON_SELECTED );
244 236 mRadialSweepView1.Deactivate();
245 237 mRadialSweepView2.Deactivate();
246 238 mRadialSweepView3.Deactivate();
... ... @@ -253,8 +245,8 @@ bool RadialMenuExample::OnButtonClicked( Toolkit::Button button )
253 245 void RadialMenuExample::OnAnimationFinished( Animation& source )
254 246 {
255 247 mAnimationState = STOPPED;
256   - mPlayStopButton.SetButtonImage( mIconPlay );
257   - mPlayStopButton.SetSelectedImage( mIconPlaySelected );
  248 + mPlayStopButton.SetUnselectedImage( PLAY_ICON );
  249 + mPlayStopButton.SetSelectedImage( PLAY_ICON_SELECTED );
258 250 }
259 251  
260 252 RadialSweepView RadialMenuExample::CreateSweepView( std::string imageName,
... ...
examples/refraction-effect/refraction-effect-example.cpp
  View file @8d19466
... ... @@ -257,8 +257,8 @@ private:
257 257  
258 258 // Add a button to change background. (right of toolbar)
259 259 mChangeTextureButton = Toolkit::PushButton::New();
260   - mChangeTextureButton.SetButtonImage( ResourceImage::New( CHANGE_TEXTURE_ICON ) );
261   - mChangeTextureButton.SetSelectedImage( ResourceImage::New( CHANGE_TEXTURE_ICON_SELECTED ) );
  260 + mChangeTextureButton.SetUnselectedImage( CHANGE_TEXTURE_ICON );
  261 + mChangeTextureButton.SetSelectedImage( CHANGE_TEXTURE_ICON_SELECTED );
262 262 mChangeTextureButton.ClickedSignal().Connect( this, &RefractionEffectExample::OnChangeTexture );
263 263 toolBar.AddControl( mChangeTextureButton,
264 264 DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage,
... ... @@ -266,8 +266,8 @@ private:
266 266 DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
267 267 // Add a button to change mesh pattern. ( left of bar )
268 268 mChangeMeshButton = Toolkit::PushButton::New();
269   - mChangeMeshButton.SetButtonImage( ResourceImage::New( CHANGE_MESH_ICON ) );
270   - mChangeMeshButton.SetSelectedImage( ResourceImage::New( CHANGE_MESH_ICON_SELECTED ) );
  269 + mChangeMeshButton.SetUnselectedImage( CHANGE_MESH_ICON );
  270 + mChangeMeshButton.SetSelectedImage( CHANGE_MESH_ICON_SELECTED );
271 271 mChangeMeshButton.ClickedSignal().Connect( this, &RefractionEffectExample::OnChangeMesh );
272 272 toolBar.AddControl( mChangeMeshButton,
273 273 DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage,
... ...
examples/scroll-view/scroll-view-example.cpp
  View file @8d19466
... ... @@ -173,14 +173,14 @@ public:
173 173 TOOLBAR_IMAGE,
174 174 "" );
175 175  
176   - mEffectIcon[ PageCarouselEffect ] = ResourceImage::New( EFFECT_CAROUSEL_IMAGE );
177   - mEffectIconSelected[ PageCarouselEffect ] = ResourceImage::New( EFFECT_CAROUSEL_IMAGE_SELECTED );
178   - mEffectIcon[ PageCubeEffect ] = ResourceImage::New( EFFECT_CAROUSEL_IMAGE );
179   - mEffectIconSelected[ PageCubeEffect ] = ResourceImage::New( EFFECT_CAROUSEL_IMAGE_SELECTED );
180   - mEffectIcon[ PageSpiralEffect ] = ResourceImage::New( EFFECT_CAROUSEL_IMAGE );
181   - mEffectIconSelected[ PageSpiralEffect ] = ResourceImage::New( EFFECT_CAROUSEL_IMAGE_SELECTED );
182   - mEffectIcon[ PageWaveEffect ] = ResourceImage::New( EFFECT_CAROUSEL_IMAGE );
183   - mEffectIconSelected[ PageWaveEffect ] = ResourceImage::New( EFFECT_CAROUSEL_IMAGE_SELECTED );
  176 + mEffectIcon[ PageCarouselEffect ] = EFFECT_CAROUSEL_IMAGE;
  177 + mEffectIconSelected[ PageCarouselEffect ] = EFFECT_CAROUSEL_IMAGE_SELECTED;
  178 + mEffectIcon[ PageCubeEffect ] = EFFECT_CAROUSEL_IMAGE;
  179 + mEffectIconSelected[ PageCubeEffect ] = EFFECT_CAROUSEL_IMAGE_SELECTED;
  180 + mEffectIcon[ PageSpiralEffect ] = EFFECT_CAROUSEL_IMAGE;
  181 + mEffectIconSelected[ PageSpiralEffect ] = EFFECT_CAROUSEL_IMAGE_SELECTED;
  182 + mEffectIcon[ PageWaveEffect ] = EFFECT_CAROUSEL_IMAGE;
  183 + mEffectIconSelected[ PageWaveEffect ] = EFFECT_CAROUSEL_IMAGE_SELECTED;
184 184  
185 185 // Create a effect change button. (right of toolbar)
186 186 mEffectChangeButton = Toolkit::PushButton::New();
... ... @@ -244,7 +244,7 @@ private:
244 244 ss << APPLICATION_TITLE << ": " << EFFECT_MODE_NAME[mEffectMode];
245 245 SetTitle(ss.str());
246 246  
247   - mEffectChangeButton.SetButtonImage( mEffectIcon[ mEffectMode ] );
  247 + mEffectChangeButton.SetUnselectedImage( mEffectIcon[ mEffectMode ] );
248 248 mEffectChangeButton.SetSelectedImage( mEffectIconSelected[ mEffectMode ] );
249 249  
250 250 // remove old Effect if exists.
... ... @@ -582,8 +582,8 @@ private:
582 582  
583 583 EffectMode mEffectMode; ///< Current Effect mode
584 584  
585   - Image mEffectIcon[Total]; ///< Icons for the effect button
586   - Image mEffectIconSelected[Total]; ///< Icons for the effect button when its selected
  585 + std::string mEffectIcon[Total]; ///< Icons for the effect button
  586 + std::string mEffectIconSelected[Total]; ///< Icons for the effect button when its selected
587 587 Toolkit::PushButton mEffectChangeButton; ///< Effect Change Button
588 588 };
589 589  
... ...
examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp
  View file @8d19466
... ... @@ -146,11 +146,9 @@ public:
146 146 "" );
147 147  
148 148 // Add an effect-changing button on the right of the tool bar.
149   - Image imageChangeEffect = ResourceImage::New( CHANGE_EFFECT_IMAGE );
150   - Image imageChangeEffectSelected = ResourceImage::New( CHANGE_EFFECT_IMAGE_SELECTED );
151 149 Toolkit::PushButton effectChangeButton = Toolkit::PushButton::New();
152   - effectChangeButton.SetButtonImage( imageChangeEffect );
153   - effectChangeButton.SetSelectedImage( imageChangeEffectSelected );
  150 + effectChangeButton.SetUnselectedImage( CHANGE_EFFECT_IMAGE );
  151 + effectChangeButton.SetSelectedImage( CHANGE_EFFECT_IMAGE_SELECTED );
154 152 effectChangeButton.ClickedSignal().Connect( this, &TestApp::OnEffectButtonClicked );
155 153 toolBar.AddControl( effectChangeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
156 154  
... ... @@ -162,11 +160,9 @@ public:
162 160 mTitleActor.SetProperty( TextLabel::Property::TEXT, std::string(APPLICATION_TITLE_PAN_SCENE) );
163 161  
164 162 //Add a reset button
165   - Image resetImage = ResourceImage::New( RESET_ICON );
166   - Image resetImageSelected = ResourceImage::New( RESET_ICON_SELECTED );
167 163 Toolkit::PushButton resetButton = Toolkit::PushButton::New();
168   - resetButton.SetButtonImage( resetImage );
169   - resetButton.SetSelectedImage( resetImageSelected );
  164 + resetButton.SetUnselectedImage( RESET_ICON );
  165 + resetButton.SetSelectedImage( RESET_ICON_SELECTED );
170 166 resetButton.ClickedSignal().Connect( this, &TestApp::OnResetPressed );
171 167 toolBar.AddControl( resetButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING );
172 168  
... ...
examples/size-negotiation/size-negotiation-example.cpp
  View file @8d19466
... ... @@ -176,8 +176,8 @@ public:
176 176  
177 177 // Create menu button
178 178 Toolkit::PushButton viewButton = Toolkit::PushButton::New();
179   - viewButton.SetButtonImage( ResourceImage::New( MENU_ICON_IMAGE ) );
180   - viewButton.SetSelectedImage( ResourceImage::New( MENU_ICON_IMAGE_SELECTED ) );
  179 + viewButton.SetUnselectedImage( MENU_ICON_IMAGE );
  180 + viewButton.SetSelectedImage( MENU_ICON_IMAGE_SELECTED );
181 181 viewButton.ClickedSignal().Connect( this, &SizeNegotiationController::OnMenu );
182 182 mToolBar.AddControl( viewButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
183 183  
... ... @@ -259,9 +259,9 @@ public:
259 259 {
260 260 Toolkit::PushButton menuButton = Toolkit::PushButton::New();
261 261 menuButton.SetName( MENU_ITEMS[ i ].name );
262   - menuButton.SetLabel( MENU_ITEMS[ i ].text );
263   - menuButton.SetButtonImage( Actor() );
264   - menuButton.SetSelectedImage( Actor() );
  262 + menuButton.SetLabelText( MENU_ITEMS[ i ].text );
  263 + menuButton.SetUnselectedImage( "" );
  264 + menuButton.SetSelectedImage( "" );
265 265 menuButton.ClickedSignal().Connect( this, &SizeNegotiationController::OnMenuSelect );
266 266  
267 267 tableView.Add( menuButton );
... ... @@ -354,7 +354,7 @@ public:
354 354  
355 355 Toolkit::PushButton okayButton = Toolkit::PushButton::New();
356 356 okayButton.SetName( OKAY_BUTTON_ID );
357   - okayButton.SetLabel( "OK!" );
  357 + okayButton.SetLabelText( "OK!" );
358 358  
359 359 okayButton.ClickedSignal().Connect( this, &SizeNegotiationController::OnButtonClicked );
360 360  
... ... @@ -368,7 +368,7 @@ public:
368 368  
369 369 Toolkit::PushButton cancelButton = Toolkit::PushButton::New();
370 370 cancelButton.SetName( CANCEL_BUTTON_ID );
371   - cancelButton.SetLabel( "Cancel" );
  371 + cancelButton.SetLabelText( "Cancel" );
372 372  
373 373 cancelButton.ClickedSignal().Connect( this, &SizeNegotiationController::OnButtonClicked );
374 374  
... ... @@ -376,7 +376,7 @@ public:
376 376  
377 377 Toolkit::PushButton okayButton = Toolkit::PushButton::New();
378 378 okayButton.SetName( OKAY_BUTTON_ID );
379   - okayButton.SetLabel( "OK!" );
  379 + okayButton.SetLabelText( "OK!" );
380 380  
381 381 okayButton.ClickedSignal().Connect( this, &SizeNegotiationController::OnButtonClicked );
382 382  
... ... @@ -391,7 +391,7 @@ public:
391 391  
392 392 Toolkit::PushButton cancelButton = Toolkit::PushButton::New();
393 393 cancelButton.SetName( CANCEL_BUTTON_ID );
394   - cancelButton.SetLabel( "Cancel" );
  394 + cancelButton.SetLabelText( "Cancel" );
395 395  
396 396 cancelButton.ClickedSignal().Connect( this, &SizeNegotiationController::OnButtonClicked );
397 397  
... ... @@ -399,7 +399,7 @@ public:
399 399  
400 400 Toolkit::PushButton okayButton = Toolkit::PushButton::New();
401 401 okayButton.SetName( OKAY_BUTTON_ID );
402   - okayButton.SetLabel( "OK!" );
  402 + okayButton.SetLabelText( "OK!" );
403 403  
404 404 okayButton.ClickedSignal().Connect( this, &SizeNegotiationController::OnButtonClicked );
405 405  
... ... @@ -513,7 +513,7 @@ public:
513 513  
514 514 Toolkit::PushButton cancelButton = Toolkit::PushButton::New();
515 515 cancelButton.SetName( CANCEL_BUTTON_ID );
516   - cancelButton.SetLabel( "Cancel" );
  516 + cancelButton.SetLabelText( "Cancel" );
517 517  
518 518 cancelButton.ClickedSignal().Connect( this, &SizeNegotiationController::OnButtonClicked );
519 519  
... ... @@ -521,7 +521,7 @@ public:
521 521  
522 522 Toolkit::PushButton okayButton = Toolkit::PushButton::New();
523 523 okayButton.SetName( OKAY_BUTTON_ID );
524   - okayButton.SetLabel( "OK!" );
  524 + okayButton.SetLabelText( "OK!" );
525 525  
526 526 okayButton.ClickedSignal().Connect( this, &SizeNegotiationController::OnButtonClicked );
527 527  
... ... @@ -591,7 +591,7 @@ public:
591 591 // Buttons
592 592 Toolkit::PushButton cancelButton = Toolkit::PushButton::New();
593 593 cancelButton.SetName( CANCEL_BUTTON_ID );
594   - cancelButton.SetLabel( "Cancel" );
  594 + cancelButton.SetLabelText( "Cancel" );
595 595  
596 596 cancelButton.ClickedSignal().Connect( this, &SizeNegotiationController::OnButtonClicked );
597 597  
... ... @@ -599,7 +599,7 @@ public:
599 599  
600 600 Toolkit::PushButton okayButton = Toolkit::PushButton::New();
601 601 okayButton.SetName( OKAY_BUTTON_ID );
602   - okayButton.SetLabel( "OK!" );
  602 + okayButton.SetLabelText( "OK!" );
603 603  
604 604 okayButton.ClickedSignal().Connect( this, &SizeNegotiationController::OnButtonClicked );
605 605  
... ... @@ -1226,7 +1226,7 @@ public: // From ItemFactory
1226 1226 {
1227 1227 Toolkit::PushButton popupButton = Toolkit::PushButton::New();
1228 1228 popupButton.SetName( buttonDataArray[ itemId ].name );
1229   - popupButton.SetLabel( buttonDataArray[ itemId ].text );
  1229 + popupButton.SetLabelText( buttonDataArray[ itemId ].text );
1230 1230 popupButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
1231 1231  
1232 1232 popupButton.ClickedSignal().Connect( this, &SizeNegotiationController::OnButtonClicked );
... ...
examples/text-field/text-field-example.cpp
  View file @8d19466
... ... @@ -38,6 +38,7 @@ namespace
38 38 {
39 39  
40 40 const char* const FOLDER_ICON_IMAGE = DALI_IMAGE_DIR "folder_appicon_empty_bg.png";
  41 + const char* const FOLDER_OPEN_ICON_IMAGE = DALI_IMAGE_DIR "folder_appicon_empty_open_bg.png";
41 42  
42 43 const float BORDER_WIDTH = 4.0f;
43 44  
... ... @@ -82,14 +83,12 @@ public:
82 83 PushButton CreateFolderButton()
83 84 {
84 85 PushButton button = PushButton::New();
85   - ResourceImage image = ResourceImage::New( FOLDER_ICON_IMAGE );
86   - ImageActor folderButton = ImageActor::New( image );
87   - folderButton.SetColor( Color::WHITE );
88   - button.SetButtonImage( folderButton );
89   - button.SetSelectedImage( Actor() );
  86 + button.SetUnselectedImage( FOLDER_ICON_IMAGE );
  87 + button.SetSelectedImage( FOLDER_OPEN_ICON_IMAGE );
90 88 button.SetAnchorPoint( AnchorPoint::TOP_LEFT );
91 89 button.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
92   - button.SetSize( image.GetWidth(), image.GetHeight() );
  90 + ResourceImage imageClosed = ResourceImage::New( FOLDER_ICON_IMAGE );
  91 + button.SetSize( imageClosed.GetWidth(), imageClosed.GetHeight() );
93 92  
94 93 return button;
95 94 }
... ... @@ -149,7 +148,7 @@ public:
149 148 {
150 149 Property::Value text = mField.GetProperty( TextField::Property::TEXT );
151 150 mButtonLabel = text.Get< std::string >();
152   - mButton.SetLabel( mButtonLabel );
  151 + mButton.SetLabelText( mButtonLabel );
153 152 }
154 153  
155 154 // Hide & discard the pop-up
... ... @@ -175,7 +174,7 @@ public:
175 174 {
176 175 Property::Value text = mField.GetProperty( TextField::Property::TEXT );
177 176 mButtonLabel = text.Get< std::string >();
178   - mButton.SetLabel( mButtonLabel );
  177 + mButton.SetLabelText( mButtonLabel );
179 178 mField.ClearKeyInputFocus();
180 179 }
181 180 break;
... ...
resources/images/folder_appicon_empty_open_bg.png 0 → 100644
View file @8d19466

6.21 KB
resources/scripts/button.json
  View file @8d19466
... ... @@ -26,18 +26,8 @@
26 26 "anchor-point": "TOP_CENTER",
27 27 "position": [0, 0, 0],
28 28 "size": [400, 200, 0],
29   - "normal-state-actor": {
30   - "type": "ImageActor",
31   - "image": {
32   - "filename": "{DALI_IMAGE_DIR}blocks-brick-1.png"
33   - }
34   - },
35   - "selected-state-actor": {
36   - "type": "ImageActor",
37   - "image": {
38   - "filename": "{DALI_IMAGE_DIR}blocks-brick-2.png"
39   - }
40   - },
  29 + "unselected-state-actor": "{DALI_IMAGE_DIR}blocks-brick-1.png",
  30 + "selected-state-actor": "{DALI_IMAGE_DIR}blocks-brick-2.png",
41 31 "label-actor": {
42 32 "type": "TextLabel",
43 33 "text": "Normal"
... ... @@ -56,24 +46,9 @@
56 46 "text": "Disabled"
57 47 },
58 48 "disabled": true,
59   - "normal-state-actor": {
60   - "type": "ImageActor",
61   - "image": {
62   - "filename": "{DALI_IMAGE_DIR}blocks-brick-1.png"
63   - }
64   - },
65   - "selected-state-actor": {
66   - "type": "ImageActor",
67   - "image": {
68   - "filename": "{DALI_IMAGE_DIR}blocks-brick-2.png"
69   - }
70   - },
71   - "disabled-state-actor": {
72   - "type": "ImageActor",
73   - "image": {
74   - "filename": "{DALI_IMAGE_DIR}blocks-brick-3.png"
75   - }
76   - }
  49 + "unselected-state-actor": "{DALI_IMAGE_DIR}blocks-brick-1.png",
  50 + "selected-state-actor": "{DALI_IMAGE_DIR}blocks-brick-2.png",
  51 + "disabled-state-actor": "{DALI_IMAGE_DIR}blocks-brick-3.png"
77 52 },
78 53  
79 54 // Third Button
... ... @@ -89,22 +64,8 @@
89 64 "text": "Toggle"
90 65 },
91 66 "togglable": true,
92   - "normal-state-actor": {
93   - "type": "ImageActor",
94   - "style": "STYLE_NINE_PATCH",
95   - "border": [26, 24, 26, 23],
96   - "image": {
97   - "filename": "{DALI_IMAGE_DIR}blocks-brick-1.png"
98   - }
99   - },
100   - "selected-state-actor": {
101   - "type": "ImageActor",
102   - "style": "STYLE_NINE_PATCH",
103   - "border": [26, 24, 26, 23],
104   - "image": {
105   - "filename": "{DALI_IMAGE_DIR}blocks-paddle.png"
106   - }
107   - },
  67 + "unselected-state-actor": "{DALI_IMAGE_DIR}blocks-brick-1.png",
  68 + "selected-state-actor": "{DALI_IMAGE_DIR}blocks-paddle.png",
108 69 "signals": [{
109 70 "name": "selected",
110 71 "action": "set",
... ...
resources/scripts/super-blur-view.json
  View file @8d19466
... ... @@ -70,22 +70,8 @@
70 70 "type": "TextLabel",
71 71 "text": "Blur"
72 72 },
73   - "normal-state-actor": {
74   - "type": "ImageActor",
75   - "style": "STYLE_NINE_PATCH",
76   - "border": [26, 24, 26, 23],
77   - "image": {
78   - "filename": "{DALI_IMAGE_DIR}button-background.png"
79   - }
80   - },
81   - "selected-state-actor": {
82   - "type": "ImageActor",
83   - "style": "STYLE_NINE_PATCH",
84   - "border": [26, 24, 26, 23],
85   - "image": {
86   - "filename": "{DALI_IMAGE_DIR}button-background.png"
87   - }
88   - },
  73 + "unselected-state-actor": "{DALI_IMAGE_DIR}button-background.png",
  74 + "selected-state-actor": "{DALI_IMAGE_DIR}button-background.png",
89 75 "signals": [{
90 76 "name": "pressed",
91 77 "action": "play",
... ...
resources/style/demo-theme.json
  View file @8d19466
... ... @@ -53,7 +53,7 @@ distributing this software or its derivatives.
53 53 "option-divider-size":[2,0],
54 54 "popup-divider-color":[0.23,0.72,0.8,0.11],
55 55 "popup-icon-color":[1.0,1.0,1.0,1.0],
56   - "popup-pressed-color":[0.24,0.72,0.8,0.11],
  56 + "popup-pressed-color":[0.24,0.72,0.8,0.9],
57 57 "background-image": {
58 58 "filename": "{DALI_IMAGE_DIR}selection-popup-bg.9.png"
59 59 }
... ...