# Common
-adaptor_common_src_files = \
- $(adaptor_common_dir)/accessibility-manager.cpp \
- $(adaptor_common_dir)/adaptor.cpp \
- $(adaptor_common_dir)/bitmap-loader.cpp \
- $(adaptor_common_dir)/bitmap-saver.cpp \
- $(adaptor_common_dir)/color-controller.cpp \
- $(adaptor_common_dir)/clipboard.cpp \
- $(adaptor_common_dir)/clipboard-event-notifier.cpp \
- $(adaptor_common_dir)/dali-adaptor-version.cpp \
- $(adaptor_common_dir)/device-layout.cpp \
- $(adaptor_common_dir)/drag-and-drop-detector.cpp \
- $(adaptor_common_dir)/event-feeder.cpp \
- $(adaptor_common_dir)/haptic-player.cpp \
- $(adaptor_common_dir)/imf-manager.cpp \
- $(adaptor_common_dir)/key.cpp \
- $(adaptor_common_dir)/orientation.cpp \
- $(adaptor_common_dir)/physical-keyboard.cpp \
- $(adaptor_common_dir)/pixmap-image.cpp \
- $(adaptor_common_dir)/render-surface.cpp \
- $(adaptor_common_dir)/sound-player.cpp \
- $(adaptor_common_dir)/style-monitor.cpp \
- $(adaptor_common_dir)/tilt-sensor.cpp \
- $(adaptor_common_dir)/timer.cpp \
- $(adaptor_common_dir)/tts-player.cpp \
- $(adaptor_common_dir)/virtual-keyboard.cpp \
- $(adaptor_common_dir)/window.cpp
-
adaptor_common_internal_src_files = \
$(adaptor_common_dir)/accessibility-gesture-detector.cpp \
$(adaptor_common_dir)/adaptor-impl.cpp \
$(adaptor_common_dir)/color-controller-impl.cpp \
$(adaptor_common_dir)/system-settings.cpp
-adaptor_common_application_src_files = \
- $(adaptor_common_dir)/application.cpp
-
adaptor_common_application_internal_src_files = \
$(adaptor_common_dir)/application-impl.cpp \
$(adaptor_common_dir)/command-line-options.cpp \
+++ /dev/null
-/*
- * 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.
- *
- */
-
-// CLASS HEADER
-#include "livebox-plugin.h"
-
-// EXTERNAL INCLUDES
-
-// INTERNAL INCLUDES
-#include <livebox-plugin-impl.h>
-
-namespace Dali
-{
-
-LiveboxPlugin::LiveboxPlugin( int* argc, char **argv[] )
-{
- mImpl = new Internal::Adaptor::LiveboxPlugin(*this, argc, argv, "Dali Livebox", DeviceLayout::DEFAULT_BASE_LAYOUT);
-}
-
-LiveboxPlugin::LiveboxPlugin( int* argc, char **argv[], const std::string& name )
-{
- mImpl = new Internal::Adaptor::LiveboxPlugin(*this, argc, argv, name, DeviceLayout::DEFAULT_BASE_LAYOUT);
-}
-
-LiveboxPlugin::LiveboxPlugin(int* argc, char **argv[], const DeviceLayout& baseLayout)
-{
- mImpl = new Internal::Adaptor::LiveboxPlugin(*this, argc, argv, "Dali Livebox", baseLayout);
-}
-
-LiveboxPlugin::LiveboxPlugin(int* argc, char **argv[], const std::string& name, const DeviceLayout& baseLayout)
-{
- mImpl = new Internal::Adaptor::LiveboxPlugin(*this, argc, argv, name, baseLayout);
-}
-
-LiveboxPlugin::~LiveboxPlugin()
-{
- delete mImpl;
-}
-
-void LiveboxPlugin::SetTitle(const std::string& title)
-{
- mImpl->SetTitle(title);
-}
-
-void LiveboxPlugin::SetContent(const std::string& content)
-{
- mImpl->SetContent(content);
-}
-
-const PositionSize& LiveboxPlugin::GetGlanceBarGeometry() const
-{
- return mImpl->GetGlanceBarGeometry();
-}
-
-const GlanceBarEventInfo& LiveboxPlugin::GetGlanceBarEventInfo() const
-{
- return mImpl->GetGlanceBarEventInfo();
-}
-
-LiveboxSizeType LiveboxPlugin::GetLiveboxSizeType() const
-{
- return mImpl->GetLiveboxSizeType();
-}
-
-void LiveboxPlugin::Run()
-{
- mImpl->Run();
-}
-
-void LiveboxPlugin::Quit()
-{
- mImpl->Quit();
-}
-
-bool LiveboxPlugin::AddIdle(boost::function<void(void)> callBack)
-{
- return mImpl->AddIdle(callBack);
-}
-
-LiveboxPlugin& LiveboxPlugin::Get()
-{
- return Internal::Adaptor::LiveboxPlugin::Get();
-}
-
-LiveboxPlugin::LiveboxPluginSignalV2& LiveboxPlugin::InitializedSignal()
-{
- return mImpl->InitializedSignal();
-}
-
-LiveboxPlugin::LiveboxPluginSignalV2& LiveboxPlugin::TerminatedSignal()
-{
- return mImpl->TerminatedSignal();
-}
-
-LiveboxPlugin::LiveboxPluginSignal LiveboxPlugin::SignalTerminated()
-{
- return mImpl->SignalTerminated();
-}
-
-LiveboxPlugin::LiveboxPluginSignalV2& LiveboxPlugin::PausedSignal()
-{
- return mImpl->PausedSignal();
-}
-
-LiveboxPlugin::LiveboxPluginSignalV2& LiveboxPlugin::ResumedSignal()
-{
- return mImpl->ResumedSignal();
-}
-LiveboxPlugin::LiveboxPluginSignalV2& LiveboxPlugin::ResizedSignal()
-{
- return mImpl->ResizedSignal();
-}
-
-LiveboxPlugin::LiveboxPluginSignalV2& LiveboxPlugin::GlanceCreatedSignal()
-{
- return mImpl->GlanceCreatedSignal();
-}
-
-LiveboxPlugin::LiveboxPluginSignalV2& LiveboxPlugin::GlanceDestroyedSignal()
-{
- return mImpl->GlanceDestroyedSignal();
-}
-
-LiveboxPlugin::LiveboxPluginSignalV2& LiveboxPlugin::GlanceTouchedSignal()
-{
- return mImpl->GlanceTouchedSignal();
-}
-
-LiveboxPlugin::LiveboxPluginSignalV2& LiveboxPlugin::GlanceMovedSignal()
-{
- return mImpl->GlanceMovedSignal();
-}
-
-LiveboxPlugin::LiveboxPluginSignalV2& LiveboxPlugin::GlanceScriptEventSignal()
-{
- return mImpl->GlanceScriptEventSignal();
-}
-
-LiveboxPlugin::LiveboxPluginSignalV2& LiveboxPlugin::LanguageChangedSignal()
-{
- return mImpl->LanguageChangedSignal();
-}
-
-} // namespace Dali
-
*/
-/**
- * @addtogroup CAPI_DALI_ADAPTOR_MODULE
- * @{
- */
-
// EXTERNAL INCLUDES
#include <boost/function.hpp>
} // namespace Dali
-/**
- * @}
- */
#endif // __DALI_ACCESSIBILITY_MANAGER_H__
*
*/
-/**
- * @addtogroup CAPI_DALI_ADAPTOR_MODULE
- * @{
- */
-
// EXTERNAL INCLUDES
#include <boost/function.hpp>
#include "window.h"
} // namespace Dali
-/**
- * @}
- */
#endif // __DALI_ADAPTOR_H__
*
*/
-/**
- * @addtogroup CAPI_DALI_ADAPTOR_MODULE
- * @{
- */
-
// EXTERNAL INCLUDES
#include <boost/function.hpp>
} // namespace Dali
-/**
- * @}
- */
#endif // __DALI_CLIPBOARD_EVENT_NOTIFIER_H__
*/
-/**
- * @addtogroup CAPI_DALI_ADAPTOR_MODULE
- * @{
- */
-
// EXTERNAL INCLUDES
#include <dali/public-api/math/rect.h>
#include <dali/public-api/object/base-handle.h>
};
} // namespace Dali
-/**
- * @}
- */
#endif // __DALI_CLIPBOARD_H__
*
*/
-
-/**
- * @addtogroup CAPI_DALI_ADAPTOR_MODULE
- * @{
- */
-
// EXTERNAL INCLUDES
#include <dali/public-api/math/vector2.h>
} // namespace Dali
-/**
- * @}
- */
#endif // __DALI_DEVICE_LAYOUT_H__
*/
-/**
- * @addtogroup CAPI_DALI_ADAPTOR_MODULE
- * @{
- */
-
// EXTERNAL INCLUDES
#include <boost/function.hpp>
} // namespace Dali
-/**
- * @}
- */
#endif // __DALI_DRAG_AND_DROP_DETECTOR_H__
*
*/
-/**
- * @addtogroup CAPI_DALI_ADAPTOR_MODULE
- * @{
- */
-
// EXTERNAL INCLUDES
#include <dali/public-api/object/base-handle.h>
} // namespace Dali
-/**
- * @}
- */
#endif // __DALI_HAPTIC_PLAYER_H__
-#ifndef IMFMANAGER_H
-#define IMFMANAGER_H
+#ifndef __DALI_IMF_MANAGER_H__
+#define __DALI_IMF_MANAGER_H__
/*
* Copyright (c) 2014 Samsung Electronics Co., Ltd.
*
*/
-/**
- * @addtogroup CAPI_DALI_ADAPTOR_MODULE
- * @{
- */
-
// EXTERNAL INCLUDES
#include <dali/public-api/object/base-handle.h>
#include <dali/public-api/signals/dali-signal-v2.h>
} // namespace Dali
-/**
- * @}
- */
-#endif // IMFMANAGER_H
+#endif // __DALI_IMF_MANAGER_H__
*
*/
-/**
- * @addtogroup CAPI_DALI_ADAPTOR_MODULE
- * @{
- */
-
// EXTERNAL INCLUDES
#include <dali/public-api/events/key-event.h>
} // namespace Dali
-/**
- * @}
- */
#endif // __DALI_KEY_H__
*
*/
-/**
- * @addtogroup CAPI_DALI_ADAPTOR_MODULE
- * @{
- */
-
// EXTERNAL INCLUDES
#include <boost/function.hpp>
} // namespace Dali
-/**
- * @}
- */
#endif // __DALI_ORIENTATION_H__
*
*/
-/**
- * @addtogroup CAPI_DALI_ADAPTOR_MODULE
- * @{
- */
-
// EXTERNAL INCLUDES
#include <dali/public-api/common/vector-wrapper.h>
#include <dali/public-api/images/native-image.h>
} // namespace Dali
-/**
- * @}
- */
#endif // __DALI_PIXMAP_IMAGE_H__
*
*/
-/**
- * @addtogroup CAPI_DALI_ADAPTOR_MODULE
- * @{
- */
-
// EXTERNAL INCLUDES
#include <string>
#include <dali/public-api/math/rect.h>
} // namespace Dali
-/**
- * @}
- */
#endif // __DALI_RENDER_SURFACE_H__
*
*/
-/**
- * @addtogroup CAPI_DALI_ADAPTOR_MODULE
- * @{
- */
-
// EXTERNAL INCLUDES
#include <dali/public-api/object/base-handle.h>
#include <dali/public-api/signals/dali-signal-v2.h>
} // namespace Dali
-/**
- * @}
- */
#endif // __DALI_SOUND_PLAYER_H__
*
*/
-/**
- * @addtogroup CAPI_DALI_ADAPTOR_MODULE
- * @{
- */
-
namespace Dali DALI_IMPORT_API
{
} // namespace Dali
-/**
- * @}
- */
#endif // __DALI_STYLE_CHANGE_H__
*
*/
-/**
- * @addtogroup CAPI_DALI_ADAPTOR_MODULE
- * @{
- */
-
// EXTERNAL INCLUDES
#include <boost/function.hpp>
#include <string>
} // namespace Dali
-/**
- * @}
- */
#endif // __DALI_STYLE_MONITOR_H__
*
*/
-/**
- * @addtogroup CAPI_DALI_ADAPTOR_MODULE
- * @{
- */
-
// EXTERNAL INCLUDES
#include <dali/public-api/object/base-handle.h>
} // namespace Dali
-/**
- * @}
- */
#endif // __DALI_TIMER_H__
*
*/
-/**
- * @addtogroup CAPI_DALI_ADAPTOR_MODULE
- * @{
- */
-
// EXTERNAL INCLUDES
#include <dali/public-api/object/base-handle.h>
} // namespace Dali
-/**
- * @}
- */
#endif // __DALI_TTS_PLAYER_H__
*
*/
-/**
- * @addtogroup CAPI_DALI_ADAPTOR_MODULE
- * @{
- */
-
// EXTERNAL INCLUDES
#include <dali/public-api/signals/dali-signal-v2.h>
#include <dali/public-api/math/rect.h>
} // namespace Dali
-/**
- * @}
- */
#endif // __DALI_VIRTUAL_KEYBOARD_H__
*
*/
-/**
- * @addtogroup CAPI_DALI_ADAPTOR_MODULE
- * @{
- */
-
// EXTERNAL INCLUDES
#include <string>
#include <dali/public-api/math/rect.h>
} // namespace Dali
-
-/**
- * @}
- */
#endif // __DALI_WINDOW_H__
+++ /dev/null
-#ifndef __DALI_DOC_H__
-#define __DALI_DOC_H__
-
-/*
- * 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.
- *
- */
-
-/**
- * @ingroup CAPI_DALI_MODULE
- * @defgroup CAPI_DALI_ADAPTOR_MODULE Adaptor Framework
- * @section CAPI_DALI_ADAPTOR_MODULE_HEADER Required Header
- * \#include <dali/dali.h>
- * @section CAPI_DALI_ADAPTOR_MODULE_OVERVIEW Overview
- * The adaptor framework provides interfaces onto the platform for Dali.
- * <table> <tr><th>API</th><th>Description</th></tr>
- * <tr><td>@ref Dali::EvasPlugin </td><td>Used by EFL applications that wish to use Dali.</td></tr>
- * <tr><td>@ref Dali::NativeBufferPlugin </td><td>Used by Tizen applications that wish to capture Dali output in a buffer.</td></tr>
- * <tr><td>@ref Dali::AccessibilityManager </td><td>Provides signals for accessibility and screen reader.</td></tr>
- * <tr><td>@ref Dali::Adaptor </td><td>An Adaptor object is used to initialize and control how Dali runs.</td></tr>
- * <tr><td>@ref Dali::ClipboardEventNotifier </td><td>Provides signals when clipboard events are received from the device.</td></tr>
- * <tr><td>@ref Dali::Clipboard </td><td>Interface to the device's clipboard.</td></tr>
- * <tr><td>@ref Dali::DeviceLayout </td><td> The attributes of the screen on the device.</td></tr>
- * <tr><td>@ref Dali::DragAndDropDetector </td><td>The DragAndDropDetector s provides signals when draggable objects are dragged into the Dali window.</td></tr>
- * <tr><td>@ref Dali::HapticPlayer </td><td></td>Plays haptic effects.</tr>
- * <tr><td>@ref Dali::ImfManager </td><td>Interface to the device's Input framework.</td></tr>
- * <tr><td>@ref Dali::Orientation </td><td>Determines the device orientation.</td></tr>
- * <tr><td>@ref Dali::PixmapImage </td><td>Used for displaying native Pixmap images.</td></tr>
- * <tr><td>@ref Dali::RenderSurface </td><td>Interface for a render surface onto which Dali draws.</td></tr>
- * <tr><td>@ref Dali::SoundPlayer </td><td>Class for playing sound effects.</td></tr>
- * <tr><td>@ref Dali::StyleChange </td><td>Class for describing what style information has changed.</td></tr>
- * <tr><td>@ref Dali::StyleMonitor </td><td>Monitors the platform for style changes.</td></tr>
- * <tr><td>@ref Dali::Timer </td><td>Mechanism to issue simple periodic or one-shot events.</td></tr>
- * <tr><td>@ref Dali::TtsPlayer </td><td>Interface to the Text-to-Speech player.</td></tr>
- * <tr><td>@ref Dali::VirtualKeyboard </td><td>Interface to the virtual keyboard.</td></tr>
- * <tr><td>@ref Dali::Window </td><td>The Window class is used for drawing Dali.</td></tr>
- * </table>
- */
// These defines come from running pkg-config --cflags with the correct package config file
#if defined(DALI_APPLICATION)
-#include <dali/public-api/application.h>
+#include <dali/public-api/adaptor-framework/application.h>
#endif
-#include <dali/public-api/accessibility-manager.h>
-#include <dali/public-api/adaptor.h>
-#include <dali/public-api/bitmap-loader.h>
-#include <dali/public-api/bitmap-saver.h>
-#include <dali/public-api/clipboard.h>
-#include <dali/public-api/clipboard-event-notifier.h>
-#include <dali/public-api/color-controller.h>
-#include <dali/public-api/device-layout.h>
-#include <dali/public-api/drag-and-drop-detector.h>
-#include <dali/public-api/haptic-player.h>
-#include <dali/public-api/imf-manager.h>
-#include <dali/public-api/key.h>
-#include <dali/public-api/orientation.h>
-#include <dali/public-api/pixmap-image.h>
-#include <dali/public-api/render-surface.h>
-#include <dali/public-api/sound-player.h>
-#include <dali/public-api/style-change.h>
-#include <dali/public-api/style-monitor.h>
-#include <dali/public-api/timer.h>
-#include <dali/public-api/tts-player.h>
-#include <dali/public-api/virtual-keyboard.h>
-#include <dali/public-api/window.h>
-
-#include <dali/public-api/accessibility-action-handler.h>
-#include <dali/public-api/accessibility-gesture-handler.h>
-#include <dali/public-api/event-feeder.h>
-#include <dali/public-api/feedback-plugin.h>
-#include <dali/public-api/physical-keyboard.h>
-#include <dali/public-api/tilt-sensor.h>
+#include <dali/public-api/adaptor-framework/accessibility-action-handler.h>
+#include <dali/public-api/adaptor-framework/accessibility-gesture-handler.h>
+#include <dali/public-api/adaptor-framework/accessibility-manager.h>
+#include <dali/public-api/adaptor-framework/adaptor.h>
+#include <dali/public-api/adaptor-framework/bitmap-loader.h>
+#include <dali/public-api/adaptor-framework/bitmap-saver.h>
+#include <dali/public-api/adaptor-framework/clipboard.h>
+#include <dali/public-api/adaptor-framework/clipboard-event-notifier.h>
+#include <dali/public-api/adaptor-framework/color-controller.h>
+#include <dali/public-api/adaptor-framework/device-layout.h>
+#include <dali/public-api/adaptor-framework/drag-and-drop-detector.h>
+#include <dali/public-api/adaptor-framework/event-feeder.h>
+#include <dali/public-api/adaptor-framework/feedback-plugin.h>
+#include <dali/public-api/adaptor-framework/haptic-player.h>
+#include <dali/public-api/adaptor-framework/imf-manager.h>
+#include <dali/public-api/adaptor-framework/key.h>
+#include <dali/public-api/adaptor-framework/orientation.h>
+#include <dali/public-api/adaptor-framework/physical-keyboard.h>
+#include <dali/public-api/adaptor-framework/pixmap-image.h>
+#include <dali/public-api/adaptor-framework/render-surface.h>
+#include <dali/public-api/adaptor-framework/sound-player.h>
+#include <dali/public-api/adaptor-framework/style-change.h>
+#include <dali/public-api/adaptor-framework/style-monitor.h>
+#include <dali/public-api/adaptor-framework/timer.h>
+#include <dali/public-api/adaptor-framework/tilt-sensor.h>
+#include <dali/public-api/adaptor-framework/tts-player.h>
+#include <dali/public-api/adaptor-framework/virtual-keyboard.h>
+#include <dali/public-api/adaptor-framework/window.h>
#include <dali/public-api/dali-adaptor-version.h>
+public_api_src_files = \
+ $(adaptor_public_api_dir)/adaptor-framework/accessibility-manager.cpp \
+ $(adaptor_public_api_dir)/adaptor-framework/adaptor.cpp \
+ $(adaptor_public_api_dir)/adaptor-framework/bitmap-loader.cpp \
+ $(adaptor_public_api_dir)/adaptor-framework/bitmap-saver.cpp \
+ $(adaptor_public_api_dir)/adaptor-framework/color-controller.cpp \
+ $(adaptor_public_api_dir)/adaptor-framework/clipboard.cpp \
+ $(adaptor_public_api_dir)/adaptor-framework/clipboard-event-notifier.cpp \
+ $(adaptor_public_api_dir)/adaptor-framework/device-layout.cpp \
+ $(adaptor_public_api_dir)/adaptor-framework/drag-and-drop-detector.cpp \
+ $(adaptor_public_api_dir)/adaptor-framework/event-feeder.cpp \
+ $(adaptor_public_api_dir)/adaptor-framework/haptic-player.cpp \
+ $(adaptor_public_api_dir)/adaptor-framework/imf-manager.cpp \
+ $(adaptor_public_api_dir)/adaptor-framework/key.cpp \
+ $(adaptor_public_api_dir)/adaptor-framework/orientation.cpp \
+ $(adaptor_public_api_dir)/adaptor-framework/physical-keyboard.cpp \
+ $(adaptor_public_api_dir)/adaptor-framework/pixmap-image.cpp \
+ $(adaptor_public_api_dir)/adaptor-framework/render-surface.cpp \
+ $(adaptor_public_api_dir)/adaptor-framework/sound-player.cpp \
+ $(adaptor_public_api_dir)/adaptor-framework/style-monitor.cpp \
+ $(adaptor_public_api_dir)/adaptor-framework/tilt-sensor.cpp \
+ $(adaptor_public_api_dir)/adaptor-framework/timer.cpp \
+ $(adaptor_public_api_dir)/adaptor-framework/tts-player.cpp \
+ $(adaptor_public_api_dir)/adaptor-framework/virtual-keyboard.cpp \
+ $(adaptor_public_api_dir)/adaptor-framework/window.cpp \
+ $(adaptor_public_api_dir)/dali-adaptor-version.cpp
+
+public_api_application_src_files = \
+ $(adaptor_public_api_dir)/adaptor-framework/application.cpp
+
public_api_header_files = \
- $(adaptor_public_api_dir)/accessibility-manager.h \
- $(adaptor_public_api_dir)/adaptor.h \
- $(adaptor_public_api_dir)/bitmap-loader.h \
- $(adaptor_public_api_dir)/bitmap-saver.h \
- $(adaptor_public_api_dir)/clipboard-event-notifier.h \
- $(adaptor_public_api_dir)/clipboard.h \
- $(adaptor_public_api_dir)/color-controller.h \
- $(adaptor_public_api_dir)/device-layout.h \
- $(adaptor_public_api_dir)/drag-and-drop-detector.h \
- $(adaptor_public_api_dir)/haptic-player.h \
- $(adaptor_public_api_dir)/imf-manager.h \
- $(adaptor_public_api_dir)/key.h \
- $(adaptor_public_api_dir)/orientation.h \
- $(adaptor_public_api_dir)/pixmap-image.h \
- $(adaptor_public_api_dir)/render-surface.h \
- $(adaptor_public_api_dir)/sound-player.h \
- $(adaptor_public_api_dir)/style-change.h \
- $(adaptor_public_api_dir)/style-monitor.h \
- $(adaptor_public_api_dir)/timer.h \
- $(adaptor_public_api_dir)/tts-player.h \
- $(adaptor_public_api_dir)/virtual-keyboard.h \
- $(adaptor_public_api_dir)/window.h \
- $(adaptor_public_api_dir)/accessibility-action-handler.h \
- $(adaptor_public_api_dir)/accessibility-gesture-handler.h \
- $(adaptor_public_api_dir)/event-feeder.h \
- $(adaptor_public_api_dir)/feedback-plugin.h \
- $(adaptor_public_api_dir)/physical-keyboard.h \
- $(adaptor_public_api_dir)/tilt-sensor.h
+ $(adaptor_public_api_dir)/dali-adaptor-version.h
+
+public_api_adaptor_framework_header_files = \
+ $(adaptor_public_api_dir)/adaptor-framework/accessibility-action-handler.h \
+ $(adaptor_public_api_dir)/adaptor-framework/accessibility-gesture-handler.h \
+ $(adaptor_public_api_dir)/adaptor-framework/accessibility-manager.h \
+ $(adaptor_public_api_dir)/adaptor-framework/adaptor.h \
+ $(adaptor_public_api_dir)/adaptor-framework/bitmap-loader.h \
+ $(adaptor_public_api_dir)/adaptor-framework/bitmap-saver.h \
+ $(adaptor_public_api_dir)/adaptor-framework/clipboard-event-notifier.h \
+ $(adaptor_public_api_dir)/adaptor-framework/clipboard.h \
+ $(adaptor_public_api_dir)/adaptor-framework/color-controller.h \
+ $(adaptor_public_api_dir)/adaptor-framework/device-layout.h \
+ $(adaptor_public_api_dir)/adaptor-framework/drag-and-drop-detector.h \
+ $(adaptor_public_api_dir)/adaptor-framework/event-feeder.h \
+ $(adaptor_public_api_dir)/adaptor-framework/feedback-plugin.h \
+ $(adaptor_public_api_dir)/adaptor-framework/haptic-player.h \
+ $(adaptor_public_api_dir)/adaptor-framework/imf-manager.h \
+ $(adaptor_public_api_dir)/adaptor-framework/key.h \
+ $(adaptor_public_api_dir)/adaptor-framework/orientation.h \
+ $(adaptor_public_api_dir)/adaptor-framework/physical-keyboard.h \
+ $(adaptor_public_api_dir)/adaptor-framework/pixmap-image.h \
+ $(adaptor_public_api_dir)/adaptor-framework/render-surface.h \
+ $(adaptor_public_api_dir)/adaptor-framework/sound-player.h \
+ $(adaptor_public_api_dir)/adaptor-framework/style-change.h \
+ $(adaptor_public_api_dir)/adaptor-framework/style-monitor.h \
+ $(adaptor_public_api_dir)/adaptor-framework/timer.h \
+ $(adaptor_public_api_dir)/adaptor-framework/tilt-sensor.h \
+ $(adaptor_public_api_dir)/adaptor-framework/tts-player.h \
+ $(adaptor_public_api_dir)/adaptor-framework/virtual-keyboard.h \
+ $(adaptor_public_api_dir)/adaptor-framework/window.h
public_api_application_header_files = \
- $(adaptor_public_api_dir)/application.h
+ $(adaptor_public_api_dir)/adaptor-framework/application.h
adaptor_dali_header_file = \
- $(adaptor_public_api_dir)/dali.h \
- $(adaptor_public_api_dir)/dali-adaptor-version.h
+ $(adaptor_public_api_dir)/dali.h
+++ /dev/null
-#ifndef __DALI_LIVEBOX_H__
-#define __DALI_LIVEBOX_H__
-
-/*
- * 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 INCLUDS
-#include <boost/function.hpp>
-#include <string>
-#include <dali/public-api/math/rect.h>
-
-// INTERNAL INCLUDES
-#include "device-layout.h"
-#include "style-monitor.h"
-
-
-namespace Dali DALI_IMPORT_API
-{
-typedef Dali::Rect<int> PositionSize;
-
-/**
-* Livebox's size types
-* It refers "livebox-service.h"
-*/
-enum LiveboxSizeType
-{
- LIVEBOX_SIZE_TYPE_1x1 = 0x0001,
- LIVEBOX_SIZE_TYPE_2x1 = 0x0002,
- LIVEBOX_SIZE_TYPE_2x2 = 0x0004,
- LIVEBOX_SIZE_TYPE_4x1 = 0x0008,
- LIVEBOX_SIZE_TYPE_4x2 = 0x0010,
- LIVEBOX_SIZE_TYPE_4x3 = 0x0020,
- LIVEBOX_SIZE_TYPE_4x4 = 0x0040,
- LIVEBOX_SIZE_TYPE_EASY_1x1 = 0x0100,
- LIVEBOX_SIZE_TYPE_EASY_3x1 = 0x0200,
- LIVEBOX_SIZE_TYPE_EASY_3x3 = 0x0400,
- LIVEBOX_SIZE_TYPE_UNKNOWN = 0xFFFF,
-};
-
-struct GlanceBarEventInfo
-{
- std::string emission;
- std::string source;
-
- struct
- {
- double x;
- double y;
- int down;
- } pointer; ///< touch information for script
-
- struct
- {
- double sx;
- double sy;
- double ex;
- double ey;
- } part; ///<part information for script
-};
-
-namespace Internal DALI_INTERNAL
-{
-namespace Adaptor
-{
-
-class LiveboxPlugin;
-}
-}
-
-/**
- * An LiveboxPlugin class object should be created by every livebox
- * that wishes to use Dali. It provides a means for initialising the
- * resources required by the Dali::Core.
- *
- * The LiveboxPlugin class emits several signals which the user can
- * connect to. The user should not create any Dali objects in the main
- * function and instead should connect to the Init signal of the
- * LiveboxPlugin and create the Dali objects in the connected callback.
- *
- * SLP and Linux Liveboxs should follow the example below:
- *
- * @code
- * void CreateProgram(LiveboxPlugin& livebox)
- * {
- * // Create Dali components...
- * // Can instantiate here, if required
- * }
- *
- * int main (int argc, char **argv)
- * {
- * LiveboxPlugin livebox(&argc, &argv);
- * livebox.InitSignal().Connect(&CreateProgram);
- * livebox.Run();
- * }
- * @endcode
- *
- * If required, you can also connect class member functions to a signal:
- *
- * @code
- * MyLivebox livebox;
- * livebox.SignalResumed().Connect(&app, &MyLivebox::OnResumed);
- * @endcode
- */
-class LiveboxPlugin
-{
-public:
-
- typedef SignalV2< void (LiveboxPlugin&) > LiveboxPluginSignalV2;
-
-public:
-
- /**
- * This is the constructor for Linux & SLP liveboxs.
- * @param argc A pointer to the number of arguments
- * @param argv A pointer the the argument list
- * @note The default base layout (DeviceLayout::DEFAULT_BASE_LAYOUT) will be used with this constructor.
- */
- LiveboxPlugin( int* argc, char **argv[] );
-
- /**
- * This is the constructor for Linux & SLP liveboxs with a name
- * @param argc A pointer to the number of arguments
- * @param argv A pointer the the argument list
- * @param name A name of livebox
- * @note The default base layout (DeviceLayout::DEFAULT_BASE_LAYOUT) will be used with this constructor.
- */
- LiveboxPlugin( int* argc, char **argv[], const std::string& name );
-
- /**
- * This is the constructor for Linux & SLP liveboxs when a layout for the livebox is specified.
- * @param argc A pointer to the number of arguments
- * @param argv A pointer the the argument list
- * @param baseLayout The base layout that the livebox has been written for
- */
- LiveboxPlugin( int* argc, char **argv[], const DeviceLayout& baseLayout );
-
- /**
- * This is the constructor for Linux & SLP liveboxs with a name and when a layout for the livebox is specified.
- * @param argc A pointer to the number of arguments
- * @param argv A pointer the the argument list
- * @param name A name of livebox
- * @param baseLayout The base layout that the livebox has been written for
- */
- LiveboxPlugin( int* argc, char **argv[], const std::string& name, const DeviceLayout& baseLayout );
-
- /**
- * Virtual destructor
- */
- virtual ~LiveboxPlugin();
-
-public:
-
- /**
- * Set title string of the livebox
- * @param[in] title title string
- */
- void SetTitle(const std::string& title);
-
- /**
- * Set content string of the livebox
- * @param[in] content content string
- */
- void SetContent(const std::string& content);
-
- /**
- * Get glance bar's geometry information
- * x, y mean arrow position
- * w, h mean glance size
- * User can use this method in the glance-created signal handler
- * @return PositionSize structure for glance bar information. {-1, -1, -1, -1} means invalid status for glance
- */
- const PositionSize& GetGlanceBarGeometry() const;
-
- /**
- * Get glance bar's event information
- * @return GlanceBarEventInfo structure for glance bar event
- */
- const GlanceBarEventInfo& GetGlanceBarEventInfo() const;
-
- /**
- * Get current size type of livebox
- */
- LiveboxSizeType GetLiveboxSizeType() const;
-
- /**
- * This starts the livebox providing.
- */
- void Run();
-
- /**
- * This quits the livebox providing.
- */
- void Quit();
-
- /**
- * Ensures that the function passed in is called from the main loop when it is idle.
- *
- * A callback of the following type may be used:
- * @code
- * void MyFunction();
- * @endcode
- *
- * @param[in] callBack The function to call.
- * @return true if added successfully, false otherwise
- */
- bool AddIdle(boost::function<void(void)> callBack);
-
- /**
- * Returns the local thread's instance of the LiveboxPlugin class.
- * @return A reference to the local thread's LiveboxPlugin class instance.
- * @pre The LiveboxPlugin class has been initialised.
- * @note This is only valid in the main thread.
- */
- static LiveboxPlugin& Get();
-
-public: // Signals
-
- /**
- * The user should connect to this signal to determine when they should initialise
- * their livebox
- */
- LiveboxPluginSignalV2& InitializedSignal();
-
- /**
- * The user should connect to this signal to determine when they should terminate
- * their livebox
- */
- LiveboxPluginSignalV2& TerminatedSignal();
-
- /**
- * The user should connect to this signal if they need to perform any special
- * activities when the livebox is about to be paused.
- */
- LiveboxPluginSignalV2& PausedSignal();
-
- /**
- * The user should connect to this signal if they need to perform any special
- * activities when the livebox has resumed.
- */
- LiveboxPluginSignalV2& ResumedSignal();
-
- /**
- * This signal is emitted when the surface the livebox is rendering on is resized.
- */
- LiveboxPluginSignalV2& ResizedSignal();
-
- /**
- * This signal is emitted when the glance bar popup was created.
- */
- LiveboxPluginSignalV2& GlanceCreatedSignal();
-
- /**
- * This signal is emitted when the glance bar popup was destroyed.
- */
- LiveboxPluginSignalV2& GlanceDestroyedSignal();
-
- /**
- * This signal is emitted when the glance bar popup was touched.
- */
- LiveboxPluginSignalV2& GlanceTouchedSignal();
-
- /**
- * This signal is emitted when the glance bar popup was moved.
- */
- LiveboxPluginSignalV2& GlanceMovedSignal();
-
- /**
- * This signal is emitted when the glance bar popup was got script event callback.
- * If application registered the edje file for glance bar,
- * this signal will be emitted instead of SignalGlanceTouched.
- * Application can get the event information by using GetGlanceBarEventInfo()
- */
- LiveboxPluginSignalV2& GlanceScriptEventSignal();
-
- /**
- * This signal is emitted when the language is changed on the device.
- */
- LiveboxPluginSignalV2& LanguageChangedSignal();
-
-private:
-
- // Undefined
- LiveboxPlugin(const LiveboxPlugin&);
- LiveboxPlugin& operator=(const LiveboxPlugin&);
-
-private:
-
- Internal::Adaptor::LiveboxPlugin *mImpl;
- friend class Internal::Adaptor::LiveboxPlugin;
-};
-
-} // namespace Dali
-
-#endif // __DALI_LIVEBOX_H__
-
../../../adaptors/common
../../../adaptors/base
../../../adaptors/public-api
+ ../../../adaptors/public-api/adaptor-framework
../../../adaptors/tizen
../../../adaptors/ubuntu
../../../
############# source files #############
-adaptor_src_files = $(adaptor_common_src_files)
-
# COMMON
if COMMON_PROFILE
slp_platform_abstraction_src_files += $(slp_assimp_stubs_src_files)
libdali_adaptor_common_la_SOURCES = \
$(base_adaptor_src_files) \
$(slp_platform_abstraction_src_files) \
- $(adaptor_src_files) \
+ $(public_api_src_files) \
$(adaptor_internal_src_files)
libdali_adaptor_common_la_DEPENDENCIES =
-I../../../platform-abstractions/portable \
-I../../../platform-abstractions/ \
-I../../../adaptors/public-api \
+ -I../../../adaptors/public-api/adaptor-framework \
-I../../../adaptors/common \
-I../../../adaptors/
if WAYLAND
libdali_adaptor_common_la_LIBADD += -ljpeg
endif
-tizenadaptorcommonpublicapidir = $(devincludepath)/dali/public-api/
-tizenadaptorcommonpublicapi_HEADERS = $(public_api_header_files)
+tizenadaptorpublicapidir = $(devincludepath)/dali/public-api
+tizenadaptorpublicapi_HEADERS = $(public_api_header_files)
+
+tizenadaptorframeworkpublicapidir = $(tizenadaptorpublicapidir)/adaptor-framework
+tizenadaptorframeworkpublicapi_HEADERS = $(public_api_adaptor_framework_header_files)
tizenadaptordaliheaderdir = $(devincludepath)/dali
tizenadaptordaliheader_HEADERS = $(adaptor_dali_header_file)
-
-capicommonpublicapidir = $(devincludepath)/dali/public-api/
-capicommonpublicapi_HEADERS = $(public_api_header_files)
-
-capiheaderdir = $(devincludepath)/dali/public-api/
-capiheader_HEADERS = $(adaptor_dali_header_file)
lib_LTLIBRARIES = libdali-application.la
-libdali_application_la_SOURCES = $(adaptor_common_application_src_files)
+libdali_application_la_SOURCES = $(public_api_application_src_files)
libdali_application_la_SOURCES += $(adaptor_common_application_internal_src_files)
-I../../../platform-abstractions/slp/resource-loader \
-I../../../platform-abstractions/portable \
-I../../../adaptors/public-api \
+ -I../../../adaptors/public-api/adaptor-framework \
-I../../../adaptors/common \
-I../../../adaptors/
# Install headers
-tizenadaptorpublicapidir = $(devincludepath)/dali/public-api/
+tizenadaptorpublicapidir = $(devincludepath)/dali/public-api/adaptor-framework
tizenadaptorpublicapi_HEADERS = $(public_api_application_header_files)
linker_test_CXXFLAGS = \
-I../../../adaptors/common \
-I../../../adaptors/public-api \
+ -I../../../adaptors/public-api/adaptor-framework \
$(DALI_ADAPTOR_CFLAGS) \
$(DALICORE_CFLAGS) \
$(DALIX11_CFLAGS) \
$(FEEDBACK_CFLAGS) \
$(DALI_PROFILE_CFLAGS) \
-I../../../adaptors/public-api \
+ -I../../../adaptors/public-api/adaptor-framework \
-Werror -Wall
libdali_feedback_plugin_la_LIBADD = \
projects / platform / core / uifw / dali-adaptor.git / commitdiff