Merge "Fixed bug in model3d-view control" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / slider / slider.cpp

diff --git a/dali-toolkit/public-api/controls/slider/slider.cpp b/dali-toolkit/public-api/controls/slider/slider.cpp
index c81a2c1..8aa47d0 100644 (file)
--- a/dali-toolkit/public-api/controls/slider/slider.cpp
+++ b/dali-toolkit/public-api/controls/slider/slider.cpp
@@ -1,20 +1,24 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
 #include <dali-toolkit/public-api/controls/slider/slider.h>
+
+// INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/slider/slider-impl.h>
 
 using namespace Dali;
@@ -25,46 +29,6 @@ namespace Dali
 namespace Toolkit
 {
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Slider
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-// Signals
-const char* const Slider::SIGNAL_VALUE_CHANGED = "value-changed";
-const char* const Slider::SIGNAL_MARK = "mark";
-
-// Properties
-const std::string Slider::LOWER_BOUND_PROPERTY_NAME( "lower-bound" );
-const std::string Slider::UPPER_BOUND_PROPERTY_NAME( "upper-bound" );
-const std::string Slider::VALUE_PROPERTY_NAME( "value" );
-const std::string Slider::HIT_REGION_PROPERTY_NAME( "hit-region" );
-const std::string Slider::BACKING_REGION_PROPERTY_NAME( "backing-region" );
-const std::string Slider::HANDLE_REGION_PROPERTY_NAME( "handle-region" );
-
-const std::string Slider::BACKING_IMAGE_NAME_PROPERTY_NAME( "backing-image-name" );
-const std::string Slider::HANDLE_IMAGE_NAME_PROPERTY_NAME( "handle-image-name" );
-const std::string Slider::PROGRESS_IMAGE_NAME_PROPERTY_NAME( "progress-image-name" );
-const std::string Slider::POPUP_IMAGE_NAME_PROPERTY_NAME( "popup-image-name" );
-const std::string Slider::POPUP_ARROW_IMAGE_NAME_PROPERTY_NAME( "popup-arrow-image-name" );
-
-const std::string Slider::BACKING_SCALE9_BORDER_PROPERTY_NAME( "backing-scale9-border" );
-const std::string Slider::PROGRESS_SCALE9_BORDER_PROPERTY_NAME( "progress-scale9-border" );
-const std::string Slider::POPUP_SCALE9_BORDER_PROPERTY_NAME( "popup-scale9-border" );
-
-const std::string Slider::DISABLE_COLOR_PROPERTY_NAME( "disable-color" );
-const std::string Slider::POPUP_TEXT_COLOR_PROPERTY_NAME( "popup-text-color" );
-
-const std::string Slider::VALUE_PRECISION_PROPERTY_NAME( "value-precision" );
-
-const std::string Slider::SHOW_POPUP_PROPERTY_NAME( "show-popup" );
-const std::string Slider::SHOW_VALUE_PROPERTY_NAME( "show-value" );
-
-const std::string Slider::ENABLED_PROPERTY_NAME( "enabled" );
-
-const std::string Slider::MARKS_PROPERTY_NAME( "marks" );
-const std::string Slider::SNAP_TO_MARKS_PROPERTY_NAME( "snap-to-marks" );
-const std::string Slider::MARK_TOLERANCE_PROPERTY_NAME( "mark-tolerance" );
-
 Slider::Slider()
 {
 }
@@ -108,9 +72,14 @@ Slider::ValueChangedSignalType& Slider::ValueChangedSignal()
   return GetImpl( *this ).ValueChangedSignal();
 }
 
-Slider::MarkSignalType& Slider::MarkSignal()
+Slider::ValueChangedSignalType& Slider::SlidingFinishedSignal()
+{
+  return GetImpl( *this ).SlidingFinishedSignal();
+}
+
+Slider::MarkReachedSignalType& Slider::MarkReachedSignal()
 {
-  return GetImpl( *this ).MarkSignal();
+  return GetImpl( *this ).MarkReachedSignal();
 }
 
 Slider Slider::DownCast( BaseHandle handle )