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=1537e0565e273c50234e678e94542d6532a5a97b;hpb=b987c87a4fb8f149be93e84e520a0a6ac3866343;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 1537e05..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
@@ -24,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/style-change.h>
+#include <dali/public-api/signals/dali-signal.h>
+#include <dali/public-api/adaptor-framework/style-change.h>
 
 namespace Dali
 {
@@ -41,8 +41,9 @@ 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
@@ -51,17 +52,18 @@ public: // Creation & Destruction
   static StyleMonitor Get();
   ~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);
@@ -73,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__