Peter M. Groen / dali-demo

Commit ba13215a46d3eae6dae26748d62c592bf68b3224

Authored by Anton Obzhirov
2 parents 5983ca33 fc459055

[dali_1.4.41] Merge branch 'devel/master' 

Change-Id: I20d6a7c699dc68d5eeeb7049a6074d12b0c746ea
Inline Side-by-side
Showing 2 changed files with 3 additions and 1 deletions
packaging/com.samsung.dali-demo.spec
  View file @ba13215
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 Name: com.samsung.dali-demo 3 Name: com.samsung.dali-demo
4 Summary: The OpenGLES Canvas Core Demo 4 Summary: The OpenGLES Canvas Core Demo
5 -Version: 1.4.40 5 +Version: 1.4.41
6 Release: 1 6 Release: 1
7 Group: System/Libraries 7 Group: System/Libraries
8 License: Apache-2.0 8 License: Apache-2.0
shared/dali-table-view.cpp
  View file @ba13215
@@ -95,6 +95,7 @@ const unsigned int BACKGROUND_ANIMATION_DURATION = 15000; // 15 secs @@ -95,6 +95,7 @@ const unsigned int BACKGROUND_ANIMATION_DURATION = 15000; // 15 secs
95 const float BUBBLE_MIN_Z = -1.0; 95 const float BUBBLE_MIN_Z = -1.0;
96 const float BUBBLE_MAX_Z = 0.0f; 96 const float BUBBLE_MAX_Z = 0.0f;
97 97
  98 +const char * const DEMO_BUILD_DATE = __DATE__ " " __TIME__;
98 99
99 /** 100 /**
100 * Creates the background image 101 * Creates the background image
@@ -905,6 +906,7 @@ void DaliTableView::OnLogoTapped( Dali::Actor actor, const Dali::TapGesture& tap @@ -905,6 +906,7 @@ void DaliTableView::OnLogoTapped( Dali::Actor actor, const Dali::TapGesture& tap
905 stream << "DALi Core: " << CORE_MAJOR_VERSION << "." << CORE_MINOR_VERSION << "." << CORE_MICRO_VERSION << std::endl << "(" << CORE_BUILD_DATE << ")\n"; 906 stream << "DALi Core: " << CORE_MAJOR_VERSION << "." << CORE_MINOR_VERSION << "." << CORE_MICRO_VERSION << std::endl << "(" << CORE_BUILD_DATE << ")\n";
906 stream << "DALi Adaptor: " << ADAPTOR_MAJOR_VERSION << "." << ADAPTOR_MINOR_VERSION << "." << ADAPTOR_MICRO_VERSION << std::endl << "(" << ADAPTOR_BUILD_DATE << ")\n"; 907 stream << "DALi Adaptor: " << ADAPTOR_MAJOR_VERSION << "." << ADAPTOR_MINOR_VERSION << "." << ADAPTOR_MICRO_VERSION << std::endl << "(" << ADAPTOR_BUILD_DATE << ")\n";
907 stream << "DALi Toolkit: " << TOOLKIT_MAJOR_VERSION << "." << TOOLKIT_MINOR_VERSION << "." << TOOLKIT_MICRO_VERSION << std::endl << "(" << TOOLKIT_BUILD_DATE << ")\n"; 908 stream << "DALi Toolkit: " << TOOLKIT_MAJOR_VERSION << "." << TOOLKIT_MINOR_VERSION << "." << TOOLKIT_MICRO_VERSION << std::endl << "(" << TOOLKIT_BUILD_DATE << ")\n";
  909 + stream << "DALi Demo:" << "\n(" << DEMO_BUILD_DATE << ")\n";
908 910
909 mVersionPopup = Dali::Toolkit::Popup::New(); 911 mVersionPopup = Dali::Toolkit::Popup::New();
910 912