X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fstyling%2Fstyle-manager.cpp;h=e7231d6d9cc3309048561f4ba64ff26f41cdef31;hp=126c208396d7cd94195be52c2b07635013a19c71;hb=00fdaec1c1d0ae69756e720ac5d3bc3acc5bd2a9;hpb=b3aff14cae6b3af637e75171422c16661878ba8e diff --git a/dali-toolkit/public-api/styling/style-manager.cpp b/dali-toolkit/public-api/styling/style-manager.cpp index 126c208..e7231d6 100644 --- a/dali-toolkit/public-api/styling/style-manager.cpp +++ b/dali-toolkit/public-api/styling/style-manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * 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. @@ -43,24 +43,14 @@ StyleManager StyleManager::Get() return Internal::StyleManager::Get(); } -void StyleManager::SetOrientationValue( int orientation ) +void StyleManager::ApplyTheme( const std::string& themeFile ) { - GetImpl(*this).SetOrientationValue( orientation ); + GetImpl(*this).ApplyTheme( themeFile ); } -int StyleManager::GetOrientationValue() +void StyleManager::ApplyDefaultTheme() { - return GetImpl(*this).GetOrientationValue(); -} - -void StyleManager::SetOrientation( Orientation orientation ) -{ - GetImpl(*this).SetOrientation( orientation ); -} - -Orientation StyleManager::GetOrientation() -{ - return GetImpl(*this).GetOrientation(); + GetImpl(*this).ApplyDefaultTheme(); } void StyleManager::SetStyleConstant( const std::string& key, const Property::Value& value ) @@ -78,27 +68,16 @@ void StyleManager::ApplyStyle( Toolkit::Control control, const std::string& json GetImpl(*this).ApplyStyle( control, jsonFileName, styleName ); } -StyleManager::StyleManager( Internal::StyleManager *impl ) - : BaseHandle( impl ) +StyleManager::StyleChangedSignalType& StyleManager::StyleChangedSignal() { + return GetImpl( *this ).StyleChangedSignal(); } -StyleManager::StyleChangeSignalType& StyleManager::StyleChangeSignal() -{ - return GetImpl( *this ).StyleChangeSignal(); -} - -void StyleManager::RequestThemeChange( const std::string& themeFile ) -{ - GetImpl(*this).RequestThemeChange( themeFile ); -} - -void StyleManager::RequestDefaultTheme() +StyleManager::StyleManager( Internal::StyleManager *impl ) + : BaseHandle( impl ) { - GetImpl(*this).RequestDefaultTheme(); } } // namespace Toolkit } // namespace Dali -