Merge "Move illegal file access from style manager to adaptor" into tizen

diff --git a/dali-toolkit/internal/styling/style-manager-impl.cpp b/dali-toolkit/internal/styling/style-manager-impl.cpp
index bc249b3..69eee7b 100644 (file)
--- a/dali-toolkit/internal/styling/style-manager-impl.cpp
+++ b/dali-toolkit/internal/styling/style-manager-impl.cpp
@@ -18,9 +18,6 @@
 #include "style-manager-impl.h"
 
 // EXTERNAL INCLUDES
-#include <fstream>
-#include <iostream>
-#include <sstream>
 #include <dali/devel-api/adaptor-framework/singleton-service.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/devel-api/object/type-registry-helper.h>
@@ -38,7 +35,7 @@ const char* LANDSCAPE_QUALIFIER = "landscape";
 const char* PORTRAIT_QUALIFIER  = "portrait";
 const char* FONT_SIZE_QUALIFIER = "font-size-";
 
-const char* DEFAULT_THEME = DALI_STYLE_DIR "tizen-default-theme.json";
+const char* DEFAULT_THEME = DALI_STYLE_DIR "dali-toolkit-default-theme.json";
 
 const char* PACKAGE_PATH_KEY = "PACKAGE_PATH";
 const char* DEFAULT_PACKAGE_PATH = DALI_DATA_READ_ONLY_DIR "/toolkit/";
@@ -107,12 +104,12 @@ StyleManager::StyleManager()
   // Add theme builder constants
   mThemeBuilderConstants[ PACKAGE_PATH_KEY ] = DEFAULT_PACKAGE_PATH;
 
-  StyleMonitor styleMonitor( StyleMonitor::Get() );
-  if( styleMonitor )
+  mStyleMonitor = StyleMonitor::Get();
+  if( mStyleMonitor )
   {
-    styleMonitor.StyleChangeSignal().Connect( this, &StyleManager::StyleMonitorChange );
+    mStyleMonitor.StyleChangeSignal().Connect( this, &StyleManager::StyleMonitorChange );
 
-    mDefaultFontSize = styleMonitor.GetDefaultFontSize();
+    mDefaultFontSize = mStyleMonitor.GetDefaultFontSize();
   }
 }
 
@@ -328,17 +325,11 @@ bool StyleManager::LoadFile( const std::string& filename, std::string& stringOut
 {
   DALI_ASSERT_DEBUG( 0 != filename.length());
 
-  std::ifstream in( filename.c_str(), std::ios::in );
-  if( in )
+  // as toolkit is platform agnostic, it cannot load files from filesystem
+  // ask style monitor to load the style sheet
+  if( mStyleMonitor )
   {
-    std::stringstream buffer;
-    buffer << in.rdbuf();
-
-    stringOut = buffer.str();
-
-    in.close();
-
-    return true;
+    return mStyleMonitor.LoadThemeFile( filename, stringOut );
   }
 
   return false;

diff --git a/dali-toolkit/internal/styling/style-manager-impl.h b/dali-toolkit/internal/styling/style-manager-impl.h
index 4e3cc56..154aec8 100644 (file)
--- a/dali-toolkit/internal/styling/style-manager-impl.h
+++ b/dali-toolkit/internal/styling/style-manager-impl.h
@@ -19,7 +19,7 @@
 
 // EXTERNAL INCLUDES
 #include <string>
-#include <list>
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/devel-api/common/map-wrapper.h>
 #include <dali/devel-api/adaptor-framework/style-monitor.h>
 #include <dali/public-api/object/base-object.h>
@@ -140,7 +140,7 @@ public:
 
 private:
 
-  typedef std::list<std::string> StringList;
+  typedef std::vector<std::string> StringList;
 
   /**
    * @brief Internal helper method to read a file from file system.
@@ -237,6 +237,7 @@ private:
   typedef std::map< std::string, Toolkit::Builder > BuilderMap;
 
   Toolkit::Builder mThemeBuilder;     ///< Builder for all default theme properties
+  StyleMonitor mStyleMonitor;         ///< Style monitor handle
 
   Orientation mOrientation;           ///< Handle to application orientation object
   int mOrientationDegrees;            ///< Directly set value of orientation

diff --git a/dali-toolkit/styles/tizen-dark-theme.json b/dali-toolkit/styles/dali-toolkit-default-theme.json
similarity index 100%
rename from dali-toolkit/styles/tizen-dark-theme.json
rename to dali-toolkit/styles/dali-toolkit-default-theme.json

diff --git a/dali-toolkit/styles/mobile/tizen-dark-theme.json b/dali-toolkit/styles/mobile/dali-toolkit-default-theme.json
similarity index 100%
rename from dali-toolkit/styles/mobile/tizen-dark-theme.json
rename to dali-toolkit/styles/mobile/dali-toolkit-default-theme.json

diff --git a/dali-toolkit/styles/mobile/tizen-default-theme.json b/dali-toolkit/styles/mobile/tizen-default-theme.json
deleted file mode 120000 (symlink)
index bdcd8ba..0000000
--- a/dali-toolkit/styles/mobile/tizen-default-theme.json
+++ /dev/null
@@ -1 +0,0 @@
-./tizen-dark-theme.json
\ No newline at end of file

diff --git a/dali-toolkit/styles/tizen-default-theme.json b/dali-toolkit/styles/tizen-default-theme.json
deleted file mode 120000 (symlink)
index c09c1a1..0000000
--- a/dali-toolkit/styles/tizen-default-theme.json
+++ /dev/null
@@ -1 +0,0 @@
-tizen-dark-theme.json
\ No newline at end of file