X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Finternal%2Fstyling%2Fstyle-manager-impl.h;h=d8d97b40b350c1ff515dd3aa9bed942d8d94f356;hp=2c15f89e8ca820f8dd164f84aa3213e772aa87ae;hb=d5e3ed5f5b1c8fdba3ae97ead8729620f54b3836;hpb=022b76df6f53c2860f2684ef1ffee81af1805e2e

diff --git a/base/dali-toolkit/internal/styling/style-manager-impl.h b/base/dali-toolkit/internal/styling/style-manager-impl.h
index 2c15f89..d8d97b4 100644
--- a/base/dali-toolkit/internal/styling/style-manager-impl.h
+++ b/base/dali-toolkit/internal/styling/style-manager-impl.h
@@ -1,21 +1,21 @@
 #ifndef __DALI_TOOLKIT_INTERNAL_STYLE_MANAGER_H__
 #define __DALI_TOOLKIT_INTERNAL_STYLE_MANAGER_H__
 
-//
-// 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) 2014 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.
+ */
 
 // EXTERNAL INCLUDES
 #include <string>
@@ -116,9 +116,9 @@ public:
   // SIGNALS
 
   /**
-   * @copydoc Toolkit::StyleManager::ThemeChangeSignal
+   * @copydoc Toolkit::StyleManager::StyleChangeSignal
    */
-  Toolkit::StyleManager::ThemeChangeSignalType& ThemeChangeSignal();
+  Toolkit::StyleManager::StyleChangeSignalType& StyleChangeSignal();
 
 protected:
 
@@ -193,11 +193,6 @@ private:
   void ApplyStyle( Toolkit::Builder builder, Toolkit::Control control );
 
   /**
-   * @brief Emit theme changed signal
-   */
-  void EmitThemeChangeSignal();
-
-  /**
    * @brief Callback for orientation changes
    *
    * @param[in] orientation The orientation object
@@ -220,6 +215,14 @@ private:
    */
   void CacheBuilder( Toolkit::Builder builder, const std::string& key );
 
+  /**
+   * Callback for when style monitor raises a signal
+   *
+   * @param[in] styleMonitor The style monitor object
+   * @param[in] styleChange The style change data
+   */
+  void StyleMonitorChange( StyleMonitor styleMonitor, StyleChange styleChange );
+
   // Undefined
   StyleManager(const StyleManager&);
 
@@ -245,7 +248,7 @@ private:
   bool mSetThemeConnection;           ///< Has the callback to set the theme been set
 
   // Signals
-  Toolkit::StyleManager::ThemeChangeSignalType       mThemeChangeSignal;         ///< Emitted when the theme changes
+  Toolkit::StyleManager::StyleChangeSignalType       mStyleChangeSignal;         ///< Emitted when the style( theme/font ) changes
 };
 
 } // namespace Internal