X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-style-monitor.h;h=b69a7dba263bcf7f331039fab7f50aff2133c450;hb=fc15ec07d0937a073085cfb763ba5d15c6ddbe1c;hp=3eec7e1717de005a140ce6724859ef7522bb0ecd;hpb=fa6279fb2830427d5ab569ca14e6ade1557ef2fa;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h
index 3eec7e1..b69a7db 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h
@@ -1,21 +1,22 @@
 #ifndef __DALI_TOOLKIT_TOOLKIT_STYLE_MONITOR_H__
 #define __DALI_TOOLKIT_TOOLKIT_STYLE_MONITOR_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>
@@ -23,8 +24,8 @@
 // INTERNAL INCLUDES
 #define __DALI_STYLE_MONITOR_H__
 #include <dali/public-api/object/base-handle.h>
-#include <dali/public-api/signals/dali-signal-v2.h>
-#include <dali/public-api/adaptor-framework/common/style-change.h>
+#include <dali/public-api/signals/dali-signal.h>
+#include <dali/public-api/adaptor-framework/style-change.h>
 
 namespace Dali
 {
@@ -40,27 +41,29 @@ class StyleMonitor;
 class StyleMonitor : public BaseHandle
 {
 public: // Typedefs
-  typedef SignalV2< void (StyleMonitor, StyleChange) > StyleChangeSignalV2;
+  typedef Signal< void (StyleMonitor, StyleChange::Type) > StyleChangeSignalType;
   static const std::string DEFAULT_FONT_FAMILY;
+  static const std::string DEFAULT_FONT_STYLE;
   static const float       DEFAULT_FONT_SIZE;
 
 public: // Creation & Destruction
   StyleMonitor();
   StyleMonitor(const StyleMonitor& monitor);
   static StyleMonitor Get();
-  virtual ~StyleMonitor();
+  ~StyleMonitor();
   static StyleMonitor DownCast( BaseHandle handle );
-  using BaseHandle::operator=;
 
 public: // Style Information
   std::string GetDefaultFontFamily() const;
+  std::string GetDefaultFontStyle() const;
   float GetDefaultFontSize() const;
   const std::string& GetTheme() const;
   void SetTheme(std::string themeFilePath);
+  bool LoadThemeFile( const std::string& filename, std::string& output );
 
 public: // Signals
-  StyleChangeSignalV2& StyleChangeSignal();
-  void EmitStyleChangeSignal(StyleChange handle);
+  StyleChangeSignalType& StyleChangeSignal();
+  void EmitStyleChangeSignal(StyleChange::Type handle);
 
 public: // Operators
   StyleMonitor& operator=(const StyleMonitor& monitor);
@@ -72,4 +75,16 @@ public:
 
 } // namespace Dali
 
+namespace Test
+{
+namespace StyleMonitor
+{
+void SetThemeFileOutput( const std::string& name, const std::string& output );
+void SetDefaultFontFamily(const std::string& family);
+void SetDefaultFontStyle(const std::string& style);
+void SetDefaultFontSize( float size );
+
+}
+}
+
 #endif // __DALI_TOOLKIT_TOOLKIT_STYLE_MONITOR_H__