From: Adeel Kazmi Date: Thu, 4 Jun 2015 15:08:31 +0000 (-0700) Subject: Merge "Added TextChanged signal to TextField" into tizen X-Git-Tag: accepted/tizen/3.0.2015.q2/common/20150615.091817^0 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=5f6e04b26996da4c06716ce044bdfdb0e7e2e61b;hp=f6c466b8b87ca95014ce563d1a5b905cd82c8d6f Merge "Added TextChanged signal to TextField" into tizen --- diff --git a/automated-tests/.gitignore b/automated-tests/.gitignore index f039d8a..39d9377 100644 --- a/automated-tests/.gitignore +++ b/automated-tests/.gitignore @@ -2,3 +2,4 @@ build build.log tct*core.h +results_xml.* diff --git a/automated-tests/coverage.sh b/automated-tests/coverage.sh index ad7d29b..c5fbed7 100755 --- a/automated-tests/coverage.sh +++ b/automated-tests/coverage.sh @@ -13,7 +13,11 @@ for i in `find . -name "*.dir"` ; do if [[ $? -eq 0 ]] then lcov $LCOV_OPTS --directory . -c -o dali.info - lcov $LCOV_OPTS --remove dali.info "/usr/include/*" "*/automated-tests/*" -o dali.info + lcov $LCOV_OPTS --remove dali.info "/usr/include/*" "*/automated-tests/*" "*/dali-env/*" -o dali.info + if [ ! -s dali.info ] + then + rm -f dali.info + fi fi ) done diff --git a/automated-tests/scripts/retriever.sh b/automated-tests/scripts/retriever.sh index 37cabf6..c1d466d 100755 --- a/automated-tests/scripts/retriever.sh +++ b/automated-tests/scripts/retriever.sh @@ -182,9 +182,9 @@ elif [[ $# == 2 && -f $DIR/$2 ]] ; then FILE=$2 fi -#Debug needs to be output on stderr ( calling script redirects stdout to file ) #echo "Dir: $DIR File: $FILE" >& 2 + # populate $TC_FILES with files declared in CMakeLists.txt if [[ -z $FILE ]]; then get_tc_files $DIR diff --git a/build/tizen/Makefile.am b/build/tizen/Makefile.am index f633e75..e116401 100644 --- a/build/tizen/Makefile.am +++ b/build/tizen/Makefile.am @@ -55,7 +55,7 @@ cov_data: @for i in `find $(COVERAGE_DIR) -name "libdali_toolkit_la-*.gcda" -o -name "libdali_toolkit_la-*.gcno"` ;\ do mv $$i `echo $$i | sed s/libdali_toolkit_la-//` ; echo $$i ; done @cd $(COVERAGE_DIR) ; lcov $(LCOV_OPTS) --base-directory . --directory . -c -o dali.info - @cd $(COVERAGE_DIR) ; lcov $(LCOV_OPTS) --remove dali.info "*boost*" "/usr/include/*" "*/dali-env/*" -o dali.info + @cd $(COVERAGE_DIR) ; lcov $(LCOV_OPTS) --remove dali.info "/usr/include/*" "*/dali-env/*" -o dali.info @test -z $(COVERAGE_OUTPUT_DIR) || mkdir -p $(COVERAGE_OUTPUT_DIR) coverage: cov_data diff --git a/build/tizen/docs/dali_doxygen.css b/build/tizen/docs/dali_doxygen.css index 4b68ddf..223b8ef 100644 --- a/build/tizen/docs/dali_doxygen.css +++ b/build/tizen/docs/dali_doxygen.css @@ -1,7 +1,8 @@ .image { text-align: left; - margin-left: 50px; + margin-left: 20px; + margin-right: 20px; } div.image img { diff --git a/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp b/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp index e445a65..f2fe0b9 100644 --- a/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp +++ b/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp @@ -281,20 +281,6 @@ void ShadowView::OnSizeSet(const Vector3& targetSize) { } -void ShadowView::OnStageConnection() -{ - // TODO: can't call this here, since SetImage() calls fail to connect images to stage, since parent chain not fully on stage yet - // Need to fix the stage connection so this callback can be used arbitrarily. At that point we can simplify the API by removing the need for Activate() / Deactivate() - //Activate(); -} - -void ShadowView::OnStageDisconnection() -{ - // TODO: can't call this here, since SetImage() calls fails similarly to above - // Need to fix the stage connection so this callback can be used arbitrarily. At that point we can simplify the API by removing the need for Activate() / Deactivate() - //Deactivate(); -} - void ShadowView::ConstrainCamera() { if( mPointLight && mShadowPlane ) diff --git a/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h b/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h index cbac96e..5aa3595 100644 --- a/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h +++ b/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h @@ -125,8 +125,6 @@ private: virtual void OnInitialize(); virtual void OnSizeSet(const Vector3& targetSize); - virtual void OnStageConnection(); - virtual void OnStageDisconnection(); /** * Constrain the camera actor to the position of the point light, pointing diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp index 9df4e58..59e5a69 100644 --- a/dali-toolkit/public-api/dali-toolkit-version.cpp +++ b/dali-toolkit/public-api/dali-toolkit-version.cpp @@ -31,7 +31,7 @@ namespace Toolkit const unsigned int TOOLKIT_MAJOR_VERSION = 1; const unsigned int TOOLKIT_MINOR_VERSION = 0; -const unsigned int TOOLKIT_MICRO_VERSION = 42; +const unsigned int TOOLKIT_MICRO_VERSION = 43; const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__; #ifdef DEBUG_ENABLED diff --git a/docs/content/images/item-view/depth.png b/docs/content/images/item-view/depth.png new file mode 100644 index 0000000..86c879d Binary files /dev/null and b/docs/content/images/item-view/depth.png differ diff --git a/docs/content/images/item-view/grid.png b/docs/content/images/item-view/grid.png new file mode 100644 index 0000000..398da01 Binary files /dev/null and b/docs/content/images/item-view/grid.png differ diff --git a/docs/content/images/item-view/spiral.png b/docs/content/images/item-view/spiral.png new file mode 100644 index 0000000..1825a11 Binary files /dev/null and b/docs/content/images/item-view/spiral.png differ diff --git a/docs/content/main.md b/docs/content/main.md index 27937d2..c34c256 100644 --- a/docs/content/main.md +++ b/docs/content/main.md @@ -56,7 +56,7 @@ + Buttons + TableView + [Scroll View](@ref scroll-view) - + ItemView + + [ItemView](@ref item-view) ### RenderTasks diff --git a/docs/content/programming-guide/item-view.h b/docs/content/programming-guide/item-view.h deleted file mode 100644 index 43cd656..0000000 --- a/docs/content/programming-guide/item-view.h +++ /dev/null @@ -1,7 +0,0 @@ -/*! \page item-view Item View - * Your text here - * - * References to Dali::Toolkit::ItemView will work... - * - */ - diff --git a/docs/content/shared-javascript-and-cpp-documentation/item-view.md b/docs/content/shared-javascript-and-cpp-documentation/item-view.md new file mode 100644 index 0000000..1313253 --- /dev/null +++ b/docs/content/shared-javascript-and-cpp-documentation/item-view.md @@ -0,0 +1,73 @@ + + +# Item View {#item-view} + +An Item view is a scrollable container that contains several items. +It can have several layouts. +There are a few built-in layouts that the application writer can use: + +|GRID |SPIRAL |DEPTH | +|:----------------------:|:------------------------:|:-----------------------:| +|![ ](item-view/grid.png)|![ ](item-view/spiral.png)|![ ](item-view/depth.png)| + +The application writer can also create their own custom layout by inheriting from Dali::Toolkit::ItemLayout. + +## Item Factory + +To create an item-view, the application writer has to provide an item-factory. +An ItemFactory provides methods to create items and how many items there are among other things. + +~~~{.cpp} +class MyFactory : public Dali::Toolkit::ItemFactory +{ +public: + virtual unsigned int GetNumberOfItems() + { + // Should return the number of items + return MY_ITEM_COUNT; + } + + virtual Actor NewItem( unsigned int itemId ) + { + // We should create the actor here that represents our item based on the itemId given. + + // Here we'll create an ImageActor which uses the the itemId to parse the image in a particular directory. + std::ostringstream imageName; + imageName << "my-image-folder/" << itemId << ".png"; // If item was 10, then this would result in my-image-folder/10.png + Dali::ResourceImage image = Dali::ResourceImage::New( imageName.str() ); + + // Create an Image Actor from the image and return + return Dali::ImageActor::New( image ); + } +}; +~~~ +These overridden methods in our factory will be called by the Item View. + +## Creating an ItemView + +~~~{.cpp} +MyFactory factory; // Should store this as a member variable +Dali::Toolkit::ItemView itemView = Dali::Toolkit::ItemView::New( factory ); // Pass in our factory +itemView.SetParentOrigin( ParentOrigin::CENTER ); +itemView.SetAnchorPoint( AnchorPoint::CENTER ); + +// Now create a layout +Dali::Toolkit::ItemLayoutPtr spiralLayout = Dali::Toolkit::DefaultItemLayout::New( Dali::Toolkit::DefaultItemLayout::SPIRAL ); + +// ... and add the layout to the item view +itemView.AddLayout( spiralLayout ); + +// More layouts can be created and added to the item-view + +// Activate the layout +itemView.ActivateLayout( + 0, // The layout ID matches the order in which layouts are added + Dali::Stage::GetCurrent().GetSize(), // Use the stage's size as our item-view size + 0 ); // We want the item-view to appear straight away + +// And add to the stage +Dali::Stage::GetCurrent().Add( itemView ); +~~~ + +*/ \ No newline at end of file diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec index 434e3d4..de3867f 100644 --- a/packaging/dali-toolkit.spec +++ b/packaging/dali-toolkit.spec @@ -1,6 +1,6 @@ Name: dali-toolkit Summary: The OpenGLES Canvas Core Library Toolkit -Version: 1.0.42 +Version: 1.0.43 Release: 1 Group: System/Libraries License: Apache-2.0