projects / platform / core / uifw / dali-toolkit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update SWIG interface files to create binding for TextVisual and KeyInputFocusManager
[platform/core/uifw/dali-toolkit.git] / plugins / dali-swig / SWIG / dali-toolkit.i
diff --git a/plugins/dali-swig/SWIG/dali-toolkit.i b/plugins/dali-swig/SWIG/dali-toolkit.i
index 16040a8..cfa1c57 100644 (file)
--- a/plugins/dali-swig/SWIG/dali-toolkit.i
+++ b/plugins/dali-swig/SWIG/dali-toolkit.i
@@ -32,7 +32,6 @@
 %ignore *::ImageView(Dali::Internal::CustomActor*);
 %ignore *::ItemView(Internal::ItemView&);
 %ignore *::ItemView(Dali::Internal::CustomActor*);
-%ignore *::KeyboardFocusManager(Internal::KeyboardFocusManager*);
 %ignore *::Model3dView(Internal::Model3dView&);
 %ignore *::Model3dView(Dali::Internal::CustomActor*);
 %ignore *::PageTurnLandscapeView(Internal::PageTurnLandscapeView&);
@@ -43,6 +42,8 @@
 %ignore *::PageTurnView(Dali::Internal::CustomActor*);
 %ignore *::Popup(Internal::Popup&);
 %ignore *::Popup(Dali::Internal::CustomActor*);
+%ignore *::ProgressBar(Internal::ProgressBar&);
+%ignore *::ProgressBar(Dali::Internal::CustomActor*);
 %ignore *::PushButton(Internal::PushButton&);
 %ignore *::PushButton(Dali::Internal::CustomActor*);
 %ignore *::RadioButton(Internal::RadioButton&);
@@ -72,7 +73,27 @@
 %ignore *::GetExtension();
 %ignore *::GetControlExtension();
 
-%rename(ControlImpl) Dali::Toolkit::Internal::Control;
+%ignore *::Button::SetAnimationTime(float animationTime);
+%ignore *::Button::SetAutoRepeating(bool);
+%ignore *::Button::SetBackgroundImage(const std::string &);
+%ignore *::Button::SetButtonImage(Dali::Image);
+%ignore *::Button::SetDisabled(bool);
+%ignore *::Button::SetDisabledBackgroundImage(const std::string &);
+%ignore *::Button::SetDisabledImage(const std::string &);
+%ignore *::Button::SetDisabledSelectedImage(const std::string &);
+%ignore *::Button::SetInitialAutoRepeatingDelay(float);
+%ignore *::Button::SetLabel(Dali::Actor);
+%ignore *::Button::SetLabelText(const std::string &);
+%ignore *::Button::SetNextAutoRepeatingDelay(float);
+%ignore *::Button::SetSelected(bool);
+%ignore *::Button::SetSelectedBackgroundImage(const std::string &);
+%ignore *::Button::SetSelectedImage(const std::string &);
+%ignore *::Button::SetSelectedImage(Dali::Image);
+%ignore *::Button::SetTogglableButton(bool);
+%ignore *::Button::SetUnselectedImage(const std::string &);
+
+%rename(View) Dali::Toolkit::Control;
+%rename(ViewImpl) Dali::Toolkit::Internal::Control;
 %rename(VisualBase) Dali::Toolkit::Visual::Base;
 %rename(ControlOrientationType) Dali::Toolkit::ControlOrientation::Type;
 %rename(DefaultItemLayoutType) Dali::Toolkit::DefaultItemLayout::Type;
@@ -104,10 +125,34 @@
 %rename(IMAGE_VISUAL_DESIRED_HEIGHT) Dali::Toolkit::ImageVisual::Property::DESIRED_HEIGHT;
 %rename(IMAGE_VISUAL_SYNCHRONOUS_LOADING) Dali::Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING;
 %rename(IMAGE_VISUAL_BORDER_ONLY) Dali::Toolkit::ImageVisual::Property::BORDER_ONLY;
+%rename(IMAGE_VISUAL_BATCHING_ENABLED) Dali::Toolkit::ImageVisual::Property::BATCHING_ENABLED;
+%rename(IMAGE_VISUAL_PIXEL_AREA) Dali::Toolkit::ImageVisual::Property::PIXEL_AREA;
+%rename(IMAGE_VISUAL_WRAP_MODE_U) Dali::Toolkit::ImageVisual::Property::WRAP_MODE_U;
+%rename(IMAGE_VISUAL_WRAP_MODE_V) Dali::Toolkit::ImageVisual::Property::WRAP_MODE_V;
 %rename(COLOR_VISUAL_MIX_COLOR) Dali::Toolkit::Color::Visual::Property::MIX_COLOR;
+%rename(TEXT_VISUAL_RENDERING_BACKEND) Dali::Toolkit::Text::Visual::Property::RENDERING_BACKEND;
+%rename(TEXT_VISUAL_TEXT) Dali::Toolkit::Text::Visual::Property::TEXT;
+%rename(TEXT_VISUAL_FONT_FAMILY) Dali::Toolkit::Text::Visual::Property::FONT_FAMILY;
+%rename(TEXT_VISUAL_FONT_STYLE) Dali::Toolkit::Text::Visual::Property::FONT_STYLE;
+%rename(TEXT_VISUAL_POINT_SIZE) Dali::Toolkit::Text::Visual::Property::POINT_SIZE;
+%rename(TEXT_VISUAL_MULTI_LINE) Dali::Toolkit::Text::Visual::Property::MULTI_LINE;
+%rename(TEXT_VISUAL_HORIZONTAL_ALIGNMENT) Dali::Toolkit::Text::Visual::Property::HORIZONTAL_ALIGNMENT;
+%rename(TEXT_VISUAL_VERTICAL_ALIGNMENT) Dali::Toolkit::Text::Visual::Property::VERTICAL_ALIGNMENT;
+%rename(TEXT_VISUAL_TEXT_COLOR) Dali::Toolkit::Text::Visual::Property::TEXT_COLOR;
+%rename(TEXT_VISUAL_ENABLE_MARKUP) Dali::Toolkit::Text::Visual::Property::ENABLE_MARKUP;
+%rename(TEXT_VISUAL_ENABLE_AUTO_SCROLL) Dali::Toolkit::Text::Visual::Property::ENABLE_AUTO_SCROLL;
+%rename(TEXT_VISUAL_AUTO_SCROLL_SPEED) Dali::Toolkit::Text::Visual::Property::AUTO_SCROLL_SPEED;
+%rename(TEXT_VISUAL_AUTO_SCROLL_LOOP_COUNT) Dali::Toolkit::Text::Visual::Property::AUTO_SCROLL_LOOP_COUNT;
+%rename(TEXT_VISUAL_AUTO_SCROLL_GAP) Dali::Toolkit::Text::Visual::Property::AUTO_SCROLL_GAP;
+%rename(TEXT_VISUAL_LINE_SPACING) Dali::Toolkit::Text::Visual::Property::LINE_SPACING;
+%rename(TEXT_VISUAL_UNDERLINE) Dali::Toolkit::Text::Visual::Property::UNDERLINE;
+%rename(TEXT_VISUAL_SHADOW) Dali::Toolkit::Text::Visual::Property::SHADOW;
+%rename(TEXT_VISUAL_EMBOSS) Dali::Toolkit::Text::Visual::Property::EMBOSS;
+%rename(TEXT_VISUAL_OUTLINE) Dali::Toolkit::Text::Visual::Property::OUTLINE;
+%rename(TEXT_VISUAL_BATCHING_ENABLED) Dali::Toolkit::Text::Visual::Property::BATCHING_ENABLED;
 
 %csconstvalue("PropertyRanges.PROPERTY_REGISTRATION_START_INDEX") PROPERTY_START_INDEX;
-%csconstvalue("Control.PropertyRange.PROPERTY_START_INDEX+1000") PROPERTY_END_INDEX;
+%csconstvalue("View.PropertyRange.PROPERTY_START_INDEX+1000") PROPERTY_END_INDEX;
 %csconstvalue("PropertyRanges.CHILD_PROPERTY_REGISTRATION_START_INDEX") CHILD_PROPERTY_START_INDEX;
 %csconstvalue("PropertyRanges.CHILD_PROPERTY_REGISTRATION_START_INDEX+1000") CHILD_PROPERTY_END_INDEX;
 %csconstvalue("PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX") ANIMATABLE_PROPERTY_START_INDEX;
@@ -131,31 +176,31 @@ typedef Dali::IntrusivePtr<Dali::Toolkit::Ruler> RulerPtr;
 %include <dali-toolkit/public-api/visuals/image-visual-properties.h>
 %include <dali-toolkit/public-api/visuals/mesh-visual-properties.h>
 %include <dali-toolkit/public-api/visuals/primitive-visual-properties.h>
+%include <dali-toolkit/public-api/visuals/text-visual-properties.h>
 
 %include <dali-toolkit/devel-api/builder/builder.h>
 
+%include <dali-toolkit/devel-api/visual-factory/transition-data.h>
+
 %include <dali-toolkit/public-api/controls/control-impl.h>
 %include <dali-toolkit/public-api/controls/control.h>
 
+%include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
+
 %include <dali-toolkit/public-api/controls/alignment/alignment.h>
 %include <dali-toolkit/public-api/controls/buttons/button.h>
 %include <dali-toolkit/public-api/controls/buttons/check-box-button.h>
 %include <dali-toolkit/public-api/controls/buttons/push-button.h>
 %include <dali-toolkit/public-api/controls/buttons/radio-button.h>
 %include <dali-toolkit/public-api/controls/flex-container/flex-container.h>
-%include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
 %include <dali-toolkit/public-api/controls/image-view/image-view.h>
 %include <dali-toolkit/public-api/controls/model3d-view/model3d-view.h>
-%include <dali-toolkit/public-api/controls/page-turn-view/page-factory.h>
-%include <dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h>
-%include <dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h>
-%include <dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h>
 %include <dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h>
 %include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
 %include <dali-toolkit/public-api/enums.h>
+%include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 %include <dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout.h>
 %include <dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h>
-%include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 %include <dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h>
 %include <dali-toolkit/public-api/controls/scrollable/item-view/item-view.h>
 %include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h>
@@ -168,11 +213,17 @@ typedef Dali::IntrusivePtr<Dali::Toolkit::Ruler> RulerPtr;
 %include <dali-toolkit/public-api/controls/text-controls/text-field.h>
 %include <dali-toolkit/public-api/controls/text-controls/text-label.h>
 %include <dali-toolkit/public-api/accessibility-manager/accessibility-manager.h>
-%include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
 %include <dali-toolkit/public-api/styling/style-manager.h>
 %include <dali-toolkit/public-api/controls/slider/slider.h>
 %include <dali-toolkit/public-api/controls/video-view/video-view.h>
+
 %include <dali-toolkit/devel-api/controls/popup/popup.h>
+%include <dali-toolkit/devel-api/controls/progress-bar/progress-bar.h>
+%include <dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h>
+%include <dali-toolkit/devel-api/controls/page-turn-view/page-factory.h>
+%include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h>
+%include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h>
+%include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h>
 
 %include <dali-toolkit/devel-api/visual-factory/visual-base.h>
 %include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
@@ -185,7 +236,6 @@ typedef Dali::IntrusivePtr<Dali::Toolkit::Ruler> RulerPtr;
 %template(AccessibilityActionScrollSignal) Dali::Signal<bool(Dali::Toolkit::AccessibilityManager&, const Dali::TouchEvent&)>;
 %template(AccessibilityFocusOvershotSignal) Dali::Signal<void(Dali::Actor, Dali::Toolkit::AccessibilityManager::FocusOvershotDirection)>;
 %template(FocusChangedSignal) Dali::Signal<void(Dali::Actor, Dali::Actor)>;
-%template(KeyboardPreFocusChangeSignal) Dali::Signal<Dali::Actor(Dali::Actor, Dali::Actor, Dali::Toolkit::Control::KeyboardFocus::Direction)>;
 %template(FocusGroupChangedSignal) Dali::Signal<void(Dali::Actor, bool)>;
 %template(StyleChangedSignal) Dali::Signal<void(Dali::Toolkit::StyleManager, Dali::StyleChange::Type)>;
 %template(ButtonSignal) Dali::Signal<bool(Dali::Toolkit::Button)>;
Domain: Graphics System / DALi;