Merge "Changed text controls to re-apply style after system font size change" into...

[platform/core/uifw/dali-toolkit.git] / docs / content / shared-javascript-and-cpp-documentation / popup.md

diff --git a/docs/content/shared-javascript-and-cpp-documentation/popup.md b/docs/content/shared-javascript-and-cpp-documentation/popup.md
index a86442f..af526f4 100644 (file)
--- a/docs/content/shared-javascript-and-cpp-documentation/popup.md
+++ b/docs/content/shared-javascript-and-cpp-documentation/popup.md
@@ -44,7 +44,7 @@ Example: Image only popup (using the content field):
 ### Example content: {#popupfieldexample}
   
 - Title:   TextLabel
-- Content: ImageActor or TextLabel
+- Content: ImageView or TextLabel
 - Footer:  PushButton or Actor containing two PushButtons
   
 ## Setting and getting the display state {#popupdisplaystate}
@@ -86,7 +86,7 @@ The default to fading in and out.
   
 The Popup can be configured to a preset type by using named types within the type-registry.
   
-These types are modifications / specialisations of a Popup. They provide the library user with a shortcut way of creating a specific type of Popup.
+These types are modifications / specializations of a Popup. They provide the library user with a shortcut way of creating a specific type of Popup.
   
 
 The Popup control features a "Toast" popup type. This is a Popup that appears at the bottom of the screen, typically with some text. They are normally for informational purposes only.
@@ -180,7 +180,7 @@ The ConfirmationPopup control provides a simple interface for providing automati
   
 ConfirmationPopup will automatically provide signals for 1 or 2 controls.
 Note: The controls do not need to be PushButtons.
-These signals are dynamically created. The controls (typically PushButtons) must be specifially named so the ConfirmationPopup can locate them.
+These signals are dynamically created. The controls (typically PushButtons) must be specifically named so the ConfirmationPopup can locate them.
   
 ## Step 1 {#popupconfirmationstep1}
 Name your controls.
@@ -204,8 +204,8 @@ Connect to the following respective signals within ConfirmationPopup:
   
 The ConfirmationPopup will dynamically make the connection between the signalling control, and your signal handler.
   
-This allows connection of signals within both C++, JSON and Javascript APIs.
-If more manual control or customisable layout is needed, then it is recommended to use the Popup widget directly for full control.
+This allows connection of signals within both C++, JSON and JavaScript APIs.
+If more manual control or customizable layout is needed, then it is recommended to use the Popup widget directly for full control.
   
 The JSON code example at the bottom of this document uses the ConfirmationPopup to allow signal connection from within the JSON description.
   
@@ -216,7 +216,7 @@ This example creates a Popup with:
   
 - Title:   TextLabel
 - Content: TextLabel
-- Footer:  ImageActor (an image border around the buttons)
+- Footer:  ImageView (an image border around the buttons)
             - PushButton (OK control)
             - PushButton (Cancel control)
   
@@ -237,7 +237,7 @@ contentActor.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "C
 popup.SetContent( contentActor );
 
 // Create the footer: Two buttons surrounded by an image.
-ImageActor footer = ImageActor::New( ResourceImage::New( DEFAULT_CONTROL_AREA_IMAGE_PATH ) );
+ImageView footer = ImageView::New( DEFAULT_CONTROL_AREA_IMAGE_PATH );
 footer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
 footer.SetResizePolicy( ResizePolicy::FIXED, Dimension::HEIGHT );
 footer.SetSize( 0.0f, 80.0f );