Peter M. Groen / dali-demo

Commit fcffed4a75f0e5fa6d5e13b4de274cfdd6733bd4

Authored by Heeyong Song
1 parent e6f2fd5c

Button refactoring: rename properties 

Change-Id: I20997625d5dcdd03269238bf4086159381907b11
Inline Side-by-side
Showing 2 changed files with 55 additions and 55 deletions
examples/buttons/buttons-example.cpp
  View file @fcffed4
@@ -58,7 +58,7 @@ const char* const BIG_IMAGE_3 = DALI_IMAGE_DIR "gallery-large-13.jpg"; @@ -58,7 +58,7 @@ const char* const BIG_IMAGE_3 = DALI_IMAGE_DIR "gallery-large-13.jpg";
58 const char* const ENABLED_IMAGE = DALI_IMAGE_DIR "item-select-check.png"; 58 const char* const ENABLED_IMAGE = DALI_IMAGE_DIR "item-select-check.png";
59 59
60 const char* const PUSHBUTTON_PRESS_IMAGE = DALI_IMAGE_DIR "button-down.9.png"; 60 const char* const PUSHBUTTON_PRESS_IMAGE = DALI_IMAGE_DIR "button-down.9.png";
61 -const char* const PUSHBUTTON_DIM_IMAGE = DALI_IMAGE_DIR "button-disabled.9.png"; 61 +const char* const PUSHBUTTON_DISABLED_IMAGE = DALI_IMAGE_DIR "button-disabled.9.png";
62 const char* const PUSHBUTTON_BUTTON_IMAGE = DALI_IMAGE_DIR "button-up.9.png"; 62 const char* const PUSHBUTTON_BUTTON_IMAGE = DALI_IMAGE_DIR "button-up.9.png";
63 63
64 const char* const CHECKBOX_UNCHECKED_IMAGE = DALI_IMAGE_DIR "checkbox-unchecked.png"; 64 const char* const CHECKBOX_UNCHECKED_IMAGE = DALI_IMAGE_DIR "checkbox-unchecked.png";
@@ -148,7 +148,7 @@ class ButtonsController: public ConnectionTracker @@ -148,7 +148,7 @@ class ButtonsController: public ConnectionTracker
148 mRadioButtonImage1.SetParentOrigin( ParentOrigin::TOP_LEFT ); 148 mRadioButtonImage1.SetParentOrigin( ParentOrigin::TOP_LEFT );
149 mRadioButtonImage1.SetAnchorPoint( AnchorPoint::TOP_LEFT ); 149 mRadioButtonImage1.SetAnchorPoint( AnchorPoint::TOP_LEFT );
150 mRadioButtonImage1.SetPosition( 0, DP(radioY) ); 150 mRadioButtonImage1.SetPosition( 0, DP(radioY) );
151 - mRadioButtonImage1.SetActive( true ); 151 + mRadioButtonImage1.SetSelected( true );
152 152
153 radioButtonsGroup2.Add( mRadioButtonImage1 ); 153 radioButtonsGroup2.Add( mRadioButtonImage1 );
154 } 154 }
@@ -188,11 +188,11 @@ class ButtonsController: public ConnectionTracker @@ -188,11 +188,11 @@ class ButtonsController: public ConnectionTracker
188 mUpdateButton.SetParentOrigin( ParentOrigin::BOTTOM_CENTER ); 188 mUpdateButton.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
189 mUpdateButton.SetAnchorPoint( AnchorPoint::TOP_CENTER ); 189 mUpdateButton.SetAnchorPoint( AnchorPoint::TOP_CENTER );
190 mUpdateButton.SetPosition( 0, DP(MARGIN_SIZE) ); 190 mUpdateButton.SetPosition( 0, DP(MARGIN_SIZE) );
191 - mUpdateButton.SetLabelText("Select"); 191 + mUpdateButton.SetLabel("Select");
192 mUpdateButton.SetSize( DP(100), DP(BUTTON_HEIGHT) ); 192 mUpdateButton.SetSize( DP(100), DP(BUTTON_HEIGHT) );
193 193
194 - mUpdateButton.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );  
195 - mUpdateButton.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) ); 194 + mUpdateButton.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
  195 + mUpdateButton.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
196 mUpdateButton.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) ); 196 mUpdateButton.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
197 197
198 mUpdateButton.ClickedSignal().Connect( this, &ButtonsController::OnButtonClicked ); 198 mUpdateButton.ClickedSignal().Connect( this, &ButtonsController::OnButtonClicked );
@@ -249,9 +249,9 @@ class ButtonsController: public ConnectionTracker @@ -249,9 +249,9 @@ class ButtonsController: public ConnectionTracker
249 radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); 249 radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
250 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); 250 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
251 radioButton.SetPosition( 0, 0 ); 251 radioButton.SetPosition( 0, 0 );
252 - radioButton.SetActive( true ); 252 + radioButton.SetSelected( true );
253 253
254 - radioButton.ToggledSignal().Connect( this, &ButtonsController::EnableSelectButtonToggle ); 254 + radioButton.StateChangedSignal().Connect( this, &ButtonsController::EnableSelectButtonToggle );
255 255
256 radioButtonsGroup1.Add( radioButton ); 256 radioButtonsGroup1.Add( radioButton );
257 } 257 }
@@ -264,7 +264,7 @@ class ButtonsController: public ConnectionTracker @@ -264,7 +264,7 @@ class ButtonsController: public ConnectionTracker
264 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); 264 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
265 radioButton.SetPosition( 0, DP(50) ); 265 radioButton.SetPosition( 0, DP(50) );
266 266
267 - radioButton.ToggledSignal().Connect( this, &ButtonsController::EnableSelectButtonToggle ); 267 + radioButton.StateChangedSignal().Connect( this, &ButtonsController::EnableSelectButtonToggle );
268 268
269 radioButtonsGroup1.Add( radioButton ); 269 radioButtonsGroup1.Add( radioButton );
270 } 270 }
@@ -293,7 +293,7 @@ class ButtonsController: public ConnectionTracker @@ -293,7 +293,7 @@ class ButtonsController: public ConnectionTracker
293 checkBox.SetBackgroundImage( unchecked ); 293 checkBox.SetBackgroundImage( unchecked );
294 checkBox.SetCheckedImage( checked ); 294 checkBox.SetCheckedImage( checked );
295 checkBox.SetSize( DP(48), DP(48) ); 295 checkBox.SetSize( DP(48), DP(48) );
296 - checkBox.ToggledSignal().Connect( this, &ButtonsController::OnCheckBoxesToggled ); 296 + checkBox.StateChangedSignal().Connect( this, &ButtonsController::OnCheckBoxesToggled );
297 297
298 checkBoxBackground.Add( checkBox ); 298 checkBoxBackground.Add( checkBox );
299 } 299 }
@@ -316,7 +316,7 @@ class ButtonsController: public ConnectionTracker @@ -316,7 +316,7 @@ class ButtonsController: public ConnectionTracker
316 checkBox.SetCheckedImage( checked ); 316 checkBox.SetCheckedImage( checked );
317 checkBox.SetSize( DP(48), DP(48) ); 317 checkBox.SetSize( DP(48), DP(48) );
318 checkBox.SetChecked( true ); 318 checkBox.SetChecked( true );
319 - checkBox.ToggledSignal().Connect( this, &ButtonsController::OnCheckBoxesToggled ); 319 + checkBox.StateChangedSignal().Connect( this, &ButtonsController::OnCheckBoxesToggled );
320 320
321 checkBoxBackground.Add( checkBox ); 321 checkBoxBackground.Add( checkBox );
322 } 322 }
@@ -338,7 +338,7 @@ class ButtonsController: public ConnectionTracker @@ -338,7 +338,7 @@ class ButtonsController: public ConnectionTracker
338 checkBox.SetBackgroundImage( unchecked ); 338 checkBox.SetBackgroundImage( unchecked );
339 checkBox.SetCheckedImage( checked ); 339 checkBox.SetCheckedImage( checked );
340 checkBox.SetSize( DP(48), DP(48) ); 340 checkBox.SetSize( DP(48), DP(48) );
341 - checkBox.ToggledSignal().Connect( this, &ButtonsController::OnCheckBoxesToggled ); 341 + checkBox.StateChangedSignal().Connect( this, &ButtonsController::OnCheckBoxesToggled );
342 342
343 checkBoxBackground.Add( checkBox ); 343 checkBoxBackground.Add( checkBox );
344 } 344 }
@@ -365,14 +365,14 @@ class ButtonsController: public ConnectionTracker @@ -365,14 +365,14 @@ class ButtonsController: public ConnectionTracker
365 toggleButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); 365 toggleButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
366 toggleButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); 366 toggleButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
367 toggleButton.SetPosition( DP(MARGIN_SIZE), DP(MARGIN_SIZE) ); 367 toggleButton.SetPosition( DP(MARGIN_SIZE), DP(MARGIN_SIZE) );
368 - toggleButton.SetLabelText( "Toggle OFF" ); 368 + toggleButton.SetLabel( "Toggle OFF" );
369 toggleButton.SetSize( DP(150), DP(BUTTON_HEIGHT) ); 369 toggleButton.SetSize( DP(150), DP(BUTTON_HEIGHT) );
370 370
371 - toggleButton.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );  
372 - toggleButton.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) ); 371 + toggleButton.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
  372 + toggleButton.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
373 toggleButton.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) ); 373 toggleButton.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
374 374
375 - toggleButton.ToggledSignal().Connect( this, &ButtonsController::OnButtonToggled ); 375 + toggleButton.StateChangedSignal().Connect( this, &ButtonsController::OnButtonToggled );
376 376
377 toggleBackground.Add( toggleButton ); 377 toggleBackground.Add( toggleButton );
378 } 378 }
@@ -396,11 +396,11 @@ class ButtonsController: public ConnectionTracker @@ -396,11 +396,11 @@ class ButtonsController: public ConnectionTracker
396 { 396 {
397 if( state ) 397 if( state )
398 { 398 {
399 - pushButton.SetLabelText( "Toggle ON" ); 399 + pushButton.SetLabel( "Toggle ON" );
400 } 400 }
401 else 401 else
402 { 402 {
403 - pushButton.SetLabelText( "Toggle OFF" ); 403 + pushButton.SetLabel( "Toggle OFF" );
404 } 404 }
405 } 405 }
406 406
@@ -411,11 +411,11 @@ class ButtonsController: public ConnectionTracker @@ -411,11 +411,11 @@ class ButtonsController: public ConnectionTracker
411 { 411 {
412 if( button.GetName() == "radio-select-enable" && state == true ) 412 if( button.GetName() == "radio-select-enable" && state == true )
413 { 413 {
414 - mUpdateButton.SetDimmed( false ); 414 + mUpdateButton.SetDisabled( false );
415 } 415 }
416 else if( button.GetName() == "radio-select-disable" && state == true ) 416 else if( button.GetName() == "radio-select-disable" && state == true )
417 { 417 {
418 - mUpdateButton.SetDimmed( true ); 418 + mUpdateButton.SetDisabled( true );
419 } 419 }
420 420
421 return true; 421 return true;
@@ -423,15 +423,15 @@ class ButtonsController: public ConnectionTracker @@ -423,15 +423,15 @@ class ButtonsController: public ConnectionTracker
423 423
424 bool OnButtonClicked(Toolkit::Button button) 424 bool OnButtonClicked(Toolkit::Button button)
425 { 425 {
426 - if( mRadioButtonImage1.IsActive() ) 426 + if( mRadioButtonImage1.IsSelected() )
427 { 427 {
428 mImage.SetImage( mBigImage1 ); 428 mImage.SetImage( mBigImage1 );
429 } 429 }
430 - else if( mRadioButtonImage2.IsActive() ) 430 + else if( mRadioButtonImage2.IsSelected() )
431 { 431 {
432 mImage.SetImage( mBigImage2 ); 432 mImage.SetImage( mBigImage2 );
433 } 433 }
434 - else if( mRadioButtonImage3.IsActive() ) 434 + else if( mRadioButtonImage3.IsSelected() )
435 { 435 {
436 mImage.SetImage( mBigImage3 ); 436 mImage.SetImage( mBigImage3 );
437 } 437 }
examples/logging/logging-example.cpp
  View file @fcffed4
@@ -79,7 +79,7 @@ const Vector4 BACKGROUND_COLOUR( 1.0f, 1.0f, 1.0f, 0.15f ); @@ -79,7 +79,7 @@ const Vector4 BACKGROUND_COLOUR( 1.0f, 1.0f, 1.0f, 0.15f );
79 79
80 const char* const PUSHBUTTON_PRESS_IMAGE = DALI_IMAGE_DIR "button-down.9.png"; 80 const char* const PUSHBUTTON_PRESS_IMAGE = DALI_IMAGE_DIR "button-down.9.png";
81 const char* const PUSHBUTTON_BUTTON_IMAGE = DALI_IMAGE_DIR "button-up.9.png"; 81 const char* const PUSHBUTTON_BUTTON_IMAGE = DALI_IMAGE_DIR "button-up.9.png";
82 -const char* const PUSHBUTTON_DIM_IMAGE = DALI_IMAGE_DIR "button-disabled.9.png"; 82 +const char* const PUSHBUTTON_DISABLED_IMAGE = DALI_IMAGE_DIR "button-disabled.9.png";
83 83
84 // Button IDs 84 // Button IDs
85 const char* const LOGGER_1_RADIO_ID = "LOGGER_1_RADIO"; 85 const char* const LOGGER_1_RADIO_ID = "LOGGER_1_RADIO";
@@ -224,9 +224,9 @@ class LoggingController: public ConnectionTracker @@ -224,9 +224,9 @@ class LoggingController: public ConnectionTracker
224 radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); 224 radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
225 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); 225 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
226 radioButton.SetPosition( DP(radioX), DP(radioY) ); 226 radioButton.SetPosition( DP(radioX), DP(radioY) );
227 - radioButton.SetActive( true ); 227 + radioButton.SetSelected( true );
228 228
229 - radioButton.ToggledSignal().Connect( this, &LoggingController::LoggingRadioSelect ); 229 + radioButton.StateChangedSignal().Connect( this, &LoggingController::LoggingRadioSelect );
230 230
231 radioButtonsGroup.Add( radioButton ); 231 radioButtonsGroup.Add( radioButton );
232 mLogRadioButtons[0] = radioButton; 232 mLogRadioButtons[0] = radioButton;
@@ -242,7 +242,7 @@ class LoggingController: public ConnectionTracker @@ -242,7 +242,7 @@ class LoggingController: public ConnectionTracker
242 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); 242 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
243 radioButton.SetPosition( DP(radioX), DP(radioY) ); 243 radioButton.SetPosition( DP(radioX), DP(radioY) );
244 244
245 - radioButton.ToggledSignal().Connect( this, &LoggingController::LoggingRadioSelect ); 245 + radioButton.StateChangedSignal().Connect( this, &LoggingController::LoggingRadioSelect );
246 246
247 radioButtonsGroup.Add( radioButton ); 247 radioButtonsGroup.Add( radioButton );
248 mLogRadioButtons[1] = radioButton; 248 mLogRadioButtons[1] = radioButton;
@@ -258,7 +258,7 @@ class LoggingController: public ConnectionTracker @@ -258,7 +258,7 @@ class LoggingController: public ConnectionTracker
258 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); 258 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
259 radioButton.SetPosition( DP(radioX), DP(radioY) ); 259 radioButton.SetPosition( DP(radioX), DP(radioY) );
260 260
261 - radioButton.ToggledSignal().Connect( this, &LoggingController::LoggingRadioSelect ); 261 + radioButton.StateChangedSignal().Connect( this, &LoggingController::LoggingRadioSelect );
262 262
263 radioButtonsGroup.Add( radioButton ); 263 radioButtonsGroup.Add( radioButton );
264 mLogRadioButtons[2] = radioButton; 264 mLogRadioButtons[2] = radioButton;
@@ -280,15 +280,15 @@ class LoggingController: public ConnectionTracker @@ -280,15 +280,15 @@ class LoggingController: public ConnectionTracker
280 { 280 {
281 Toolkit::PushButton button = Toolkit::PushButton::New(); 281 Toolkit::PushButton button = Toolkit::PushButton::New();
282 button.SetName( CREATE_BUTTON_ID ); 282 button.SetName( CREATE_BUTTON_ID );
283 - button.SetLabelText( CREATE_BUTTON_TEXT ); 283 + button.SetLabel( CREATE_BUTTON_TEXT );
284 button.SetParentOrigin( ParentOrigin::CENTER_LEFT ); 284 button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
285 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT ); 285 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
286 button.SetPosition( buttonXDP, 0 ); 286 button.SetPosition( buttonXDP, 0 );
287 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) ); 287 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
288 288
289 - button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) ); 289 + button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
290 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) ); 290 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
291 - button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) ); 291 + button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
292 292
293 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked ); 293 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
294 294
@@ -300,15 +300,15 @@ class LoggingController: public ConnectionTracker @@ -300,15 +300,15 @@ class LoggingController: public ConnectionTracker
300 300
301 Toolkit::PushButton button = Toolkit::PushButton::New(); 301 Toolkit::PushButton button = Toolkit::PushButton::New();
302 button.SetName( DELETE_BUTTON_ID ); 302 button.SetName( DELETE_BUTTON_ID );
303 - button.SetLabelText( DELETE_BUTTON_TEXT ); 303 + button.SetLabel( DELETE_BUTTON_TEXT );
304 button.SetParentOrigin( ParentOrigin::CENTER_LEFT ); 304 button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
305 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT ); 305 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
306 button.SetPosition( buttonXDP, 0 ); 306 button.SetPosition( buttonXDP, 0 );
307 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) ); 307 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
308 308
309 - button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) ); 309 + button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
310 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) ); 310 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
311 - button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) ); 311 + button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
312 312
313 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked ); 313 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
314 314
@@ -331,15 +331,15 @@ class LoggingController: public ConnectionTracker @@ -331,15 +331,15 @@ class LoggingController: public ConnectionTracker
331 { 331 {
332 Toolkit::PushButton button = Toolkit::PushButton::New(); 332 Toolkit::PushButton button = Toolkit::PushButton::New();
333 button.SetName( START_BUTTON_ID ); 333 button.SetName( START_BUTTON_ID );
334 - button.SetLabelText( START_BUTTON_TEXT ); 334 + button.SetLabel( START_BUTTON_TEXT );
335 button.SetParentOrigin( ParentOrigin::CENTER_LEFT ); 335 button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
336 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT ); 336 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
337 button.SetPosition( buttonXDP, 0 ); 337 button.SetPosition( buttonXDP, 0 );
338 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) ); 338 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
339 339
340 - button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) ); 340 + button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
341 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) ); 341 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
342 - button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) ); 342 + button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
343 343
344 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked ); 344 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
345 345
@@ -351,15 +351,15 @@ class LoggingController: public ConnectionTracker @@ -351,15 +351,15 @@ class LoggingController: public ConnectionTracker
351 351
352 Toolkit::PushButton button = Toolkit::PushButton::New(); 352 Toolkit::PushButton button = Toolkit::PushButton::New();
353 button.SetName( STOP_BUTTON_ID ); 353 button.SetName( STOP_BUTTON_ID );
354 - button.SetLabelText( STOP_BUTTON_TEXT ); 354 + button.SetLabel( STOP_BUTTON_TEXT );
355 button.SetParentOrigin( ParentOrigin::CENTER_LEFT ); 355 button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
356 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT ); 356 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
357 button.SetPosition( buttonXDP, 0 ); 357 button.SetPosition( buttonXDP, 0 );
358 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) ); 358 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
359 359
360 - button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) ); 360 + button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
361 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) ); 361 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
362 - button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) ); 362 + button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
363 363
364 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked ); 364 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
365 365
@@ -382,15 +382,15 @@ class LoggingController: public ConnectionTracker @@ -382,15 +382,15 @@ class LoggingController: public ConnectionTracker
382 { 382 {
383 Toolkit::PushButton button = Toolkit::PushButton::New(); 383 Toolkit::PushButton button = Toolkit::PushButton::New();
384 button.SetName( ENABLE_BUTTON_ID ); 384 button.SetName( ENABLE_BUTTON_ID );
385 - button.SetLabelText( ENABLE_BUTTON_TEXT ); 385 + button.SetLabel( ENABLE_BUTTON_TEXT );
386 button.SetParentOrigin( ParentOrigin::CENTER_LEFT ); 386 button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
387 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT ); 387 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
388 button.SetPosition( buttonXDP, 0 ); 388 button.SetPosition( buttonXDP, 0 );
389 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) ); 389 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
390 390
391 - button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) ); 391 + button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
392 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) ); 392 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
393 - button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) ); 393 + button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
394 394
395 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked ); 395 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
396 396
@@ -402,15 +402,15 @@ class LoggingController: public ConnectionTracker @@ -402,15 +402,15 @@ class LoggingController: public ConnectionTracker
402 402
403 Toolkit::PushButton button = Toolkit::PushButton::New(); 403 Toolkit::PushButton button = Toolkit::PushButton::New();
404 button.SetName( DISABLE_BUTTON_ID ); 404 button.SetName( DISABLE_BUTTON_ID );
405 - button.SetLabelText( DISABLE_BUTTON_TEXT ); 405 + button.SetLabel( DISABLE_BUTTON_TEXT );
406 button.SetParentOrigin( ParentOrigin::CENTER_LEFT ); 406 button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
407 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT ); 407 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
408 button.SetPosition( buttonXDP, 0 ); 408 button.SetPosition( buttonXDP, 0 );
409 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) ); 409 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
410 410
411 - button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) ); 411 + button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
412 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) ); 412 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
413 - button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) ); 413 + button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
414 414
415 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked ); 415 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
416 416
@@ -459,7 +459,7 @@ class LoggingController: public ConnectionTracker @@ -459,7 +459,7 @@ class LoggingController: public ConnectionTracker
459 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); 459 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
460 radioButton.SetPosition( DP(radioX), DP(radioY) ); 460 radioButton.SetPosition( DP(radioX), DP(radioY) );
461 461
462 - radioButton.ToggledSignal().Connect( this, &LoggingController::FrequencyRadioSelect ); 462 + radioButton.StateChangedSignal().Connect( this, &LoggingController::FrequencyRadioSelect );
463 463
464 frequencyRadioButtonsGroup.Add( radioButton ); 464 frequencyRadioButtonsGroup.Add( radioButton );
465 mFrequencyRadioButtons[0] = radioButton; 465 mFrequencyRadioButtons[0] = radioButton;
@@ -474,9 +474,9 @@ class LoggingController: public ConnectionTracker @@ -474,9 +474,9 @@ class LoggingController: public ConnectionTracker
474 radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); 474 radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
475 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); 475 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
476 radioButton.SetPosition( DP(radioX), DP(radioY) ); 476 radioButton.SetPosition( DP(radioX), DP(radioY) );
477 - radioButton.SetActive( true ); 477 + radioButton.SetSelected( true );
478 478
479 - radioButton.ToggledSignal().Connect( this, &LoggingController::FrequencyRadioSelect ); 479 + radioButton.StateChangedSignal().Connect( this, &LoggingController::FrequencyRadioSelect );
480 480
481 frequencyRadioButtonsGroup.Add( radioButton ); 481 frequencyRadioButtonsGroup.Add( radioButton );
482 mFrequencyRadioButtons[1] = radioButton; 482 mFrequencyRadioButtons[1] = radioButton;
@@ -492,7 +492,7 @@ class LoggingController: public ConnectionTracker @@ -492,7 +492,7 @@ class LoggingController: public ConnectionTracker
492 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); 492 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
493 radioButton.SetPosition( DP(radioX), DP(radioY) ); 493 radioButton.SetPosition( DP(radioX), DP(radioY) );
494 494
495 - radioButton.ToggledSignal().Connect( this, &LoggingController::FrequencyRadioSelect ); 495 + radioButton.StateChangedSignal().Connect( this, &LoggingController::FrequencyRadioSelect );
496 496
497 frequencyRadioButtonsGroup.Add( radioButton ); 497 frequencyRadioButtonsGroup.Add( radioButton );
498 mFrequencyRadioButtons[2] = radioButton; 498 mFrequencyRadioButtons[2] = radioButton;
@@ -514,15 +514,15 @@ class LoggingController: public ConnectionTracker @@ -514,15 +514,15 @@ class LoggingController: public ConnectionTracker
514 { 514 {
515 Toolkit::PushButton button = Toolkit::PushButton::New(); 515 Toolkit::PushButton button = Toolkit::PushButton::New();
516 button.SetName( VSYNC_BUTTON_ID ); 516 button.SetName( VSYNC_BUTTON_ID );
517 - button.SetLabelText( VSYNC_BUTTON_TEXT ); 517 + button.SetLabel( VSYNC_BUTTON_TEXT );
518 button.SetParentOrigin( ParentOrigin::CENTER_LEFT ); 518 button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
519 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT ); 519 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
520 button.SetPosition( buttonXDP, 0 ); 520 button.SetPosition( buttonXDP, 0 );
521 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) ); 521 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
522 522
523 - button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) ); 523 + button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
524 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) ); 524 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
525 - button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) ); 525 + button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
526 526
527 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked ); 527 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
528 528
@@ -580,15 +580,15 @@ class LoggingController: public ConnectionTracker @@ -580,15 +580,15 @@ class LoggingController: public ConnectionTracker
580 const unsigned int frequency = mLoggerStates[mCurrentLogger].frequency; 580 const unsigned int frequency = mLoggerStates[mCurrentLogger].frequency;
581 if( frequency == HIGH_FREQUENCY ) 581 if( frequency == HIGH_FREQUENCY )
582 { 582 {
583 - mFrequencyRadioButtons[0].SetActive( true ); 583 + mFrequencyRadioButtons[0].SetSelected( true );
584 } 584 }
585 else if( frequency == MEDIUM_FREQUENCY ) 585 else if( frequency == MEDIUM_FREQUENCY )
586 { 586 {
587 - mFrequencyRadioButtons[1].SetActive( true ); 587 + mFrequencyRadioButtons[1].SetSelected( true );
588 } 588 }
589 else if( frequency == LOW_FREQUENCY ) 589 else if( frequency == LOW_FREQUENCY )
590 { 590 {
591 - mFrequencyRadioButtons[2].SetActive( true ); 591 + mFrequencyRadioButtons[2].SetSelected( true );
592 } 592 }
593 } 593 }
594 594