merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:17:12 +0000 (01:17 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:17:12 +0000 (01:17 +0900)
commit973a86904bfe005e6e779ae73687ac117e3b5e6a
tree2cc6fe701f22fcc3df2424cd5ff303e65d6794c3
parentc5cede9433b312d2d0e96b3a3b4287256fcf1672
merge with master
109 files changed:
AUTHORS
inc/FShell.h
inc/FShellIBadgeEventListener.h [new file with mode: 0755]
inc/FShellILiveboxAddRequestListener.h [new file with mode: 0755]
inc/FShellILiveboxPopupProviderFactory.h [new file with mode: 0644]
inc/FShellILiveboxProviderFactory.h [new file with mode: 0644]
inc/FShellIShortcutRequestListener.h [new file with mode: 0755]
inc/FShellLiveboxFrame.h [new file with mode: 0644]
inc/FShellLiveboxManager.h [new file with mode: 0755]
inc/FShellLiveboxPopup.h [new file with mode: 0644]
inc/FShellLiveboxPopupProvider.h [new file with mode: 0755]
inc/FShellLiveboxProvider.h [new file with mode: 0755]
inc/FShellLiveboxProviderInfo.h [new file with mode: 0644]
inc/FShellLiveboxProviderManager.h [new file with mode: 0755]
inc/FShellLiveboxSizeInfo.h [new file with mode: 0644]
inc/FShellLiveboxView.h [new file with mode: 0644]
inc/FShellLockManager.h [new file with mode: 0755]
inc/FShellNotificationManager.h
inc/FShellNotificationRequest.h
inc/FShellQuickPanelFrame.h [changed mode: 0755->0644]
inc/FShellShortcutManager.h [new file with mode: 0755]
packaging/osp-shell.spec [changed mode: 0644->0755]
src/CMakeLists.txt
src/FShellLiveboxFrame.cpp [new file with mode: 0644]
src/FShellLiveboxManager.cpp [new file with mode: 0755]
src/FShellLiveboxPopup.cpp [new file with mode: 0644]
src/FShellLiveboxPopupProvider.cpp [new file with mode: 0644]
src/FShellLiveboxProvider.cpp [new file with mode: 0644]
src/FShellLiveboxProviderInfo.cpp [new file with mode: 0644]
src/FShellLiveboxProviderManager.cpp [new file with mode: 0644]
src/FShellLiveboxSizeInfo.cpp [new file with mode: 0644]
src/FShellLiveboxView.cpp [new file with mode: 0644]
src/FShellQuickPanelFrame.cpp
src/FShell_ILiveboxPopupViewEventListener.h [new file with mode: 0644]
src/FShell_LiveboxFrame.cpp [new file with mode: 0644]
src/FShell_LiveboxFrame.h [new file with mode: 0644]
src/FShell_LiveboxFrameImpl.cpp [new file with mode: 0644]
src/FShell_LiveboxFrameImpl.h [new file with mode: 0644]
src/FShell_LiveboxFrameModel.cpp [new file with mode: 0644]
src/FShell_LiveboxFrameModel.h [new file with mode: 0644]
src/FShell_LiveboxFramePresenter.cpp [new file with mode: 0644]
src/FShell_LiveboxFramePresenter.h [new file with mode: 0644]
src/FShell_LiveboxLayer.cpp [new file with mode: 0644]
src/FShell_LiveboxLayer.h [new file with mode: 0644]
src/FShell_LiveboxManagerImpl.cpp [new file with mode: 0644]
src/FShell_LiveboxManagerIpcMessage.cpp [moved from src/core/FShell_NotificationManagerIpcMessages.cpp with 66% similarity]
src/FShell_LiveboxManagerProxy.cpp [new file with mode: 0644]
src/FShell_LiveboxPopup.cpp [new file with mode: 0755]
src/FShell_LiveboxPopup.h [new file with mode: 0644]
src/FShell_LiveboxPopupImpl.cpp [new file with mode: 0644]
src/FShell_LiveboxPopupImpl.h [new file with mode: 0644]
src/FShell_LiveboxPopupModel.cpp [new file with mode: 0644]
src/FShell_LiveboxPopupModel.h [new file with mode: 0644]
src/FShell_LiveboxPopupPresenter.cpp [new file with mode: 0644]
src/FShell_LiveboxPopupPresenter.h [new file with mode: 0644]
src/FShell_LiveboxPopupProviderImpl.cpp [new file with mode: 0644]
src/FShell_LiveboxPopupView.cpp [new file with mode: 0644]
src/FShell_LiveboxPopupView.h [new file with mode: 0644]
src/FShell_LiveboxPopupViewEvent.cpp [new file with mode: 0644]
src/FShell_LiveboxPopupViewEvent.h [new file with mode: 0644]
src/FShell_LiveboxPopupViewPresenter.cpp [new file with mode: 0644]
src/FShell_LiveboxPopupViewPresenter.h [new file with mode: 0644]
src/FShell_LiveboxProviderImpl.cpp [new file with mode: 0644]
src/FShell_LiveboxProviderInfoImpl.cpp [new file with mode: 0644]
src/FShell_LiveboxProviderManagerImpl.cpp [new file with mode: 0644]
src/FShell_LiveboxSizeInfoImpl.cpp [new file with mode: 0644]
src/FShell_LiveboxView.cpp [new file with mode: 0755]
src/FShell_LiveboxView.h [new file with mode: 0644]
src/FShell_LiveboxViewImpl.cpp [new file with mode: 0644]
src/FShell_LiveboxViewImpl.h [new file with mode: 0644]
src/FShell_LiveboxViewManager.cpp [new file with mode: 0644]
src/FShell_LiveboxViewManager.h [new file with mode: 0644]
src/FShell_LiveboxViewModel.cpp [new file with mode: 0644]
src/FShell_LiveboxViewModel.h [new file with mode: 0644]
src/FShell_LiveboxViewPresenter.cpp [new file with mode: 0644]
src/FShell_LiveboxViewPresenter.h [new file with mode: 0644]
src/FShell_QuickPanelFrame.cpp
src/FShell_QuickPanelFrameImpl.cpp
src/FShell_QuickPanelFramePresenter.cpp
src/core/CMakeLists.txt
src/core/FShellLockManager.cpp [new file with mode: 0644]
src/core/FShellNotificationManager.cpp
src/core/FShellNotificationRequest.cpp
src/core/FShellShortcutManager.cpp [new file with mode: 0644]
src/core/FShell_LockManagerImpl.cpp [new file with mode: 0644]
src/core/FShell_NotificationManagerImpl.cpp
src/core/FShell_NotificationManagerProxy.cpp [deleted file]
src/core/FShell_NotificationRequestImpl.cpp
src/core/FShell_ShortcutManagerImpl.cpp [new file with mode: 0644]
src/inc/FShell_ILiveboxTouchEventListener.h [new file with mode: 0644]
src/inc/FShell_LiveboxManagerImpl.h [new file with mode: 0644]
src/inc/FShell_LiveboxManagerIpcMessage.h [new file with mode: 0644]
src/inc/FShell_LiveboxManagerProxy.h [new file with mode: 0644]
src/inc/FShell_LiveboxPopupProviderImpl.h [new file with mode: 0644]
src/inc/FShell_LiveboxProviderImpl.h [new file with mode: 0644]
src/inc/FShell_LiveboxProviderInfoImpl.h [new file with mode: 0644]
src/inc/FShell_LiveboxProviderManagerImpl.h [new file with mode: 0644]
src/inc/FShell_LiveboxSizeInfoImpl.h [new file with mode: 0644]
src/inc/FShell_LockManagerImpl.h [new file with mode: 0755]
src/inc/FShell_NotificationManagerEventParamTraits.h [deleted file]
src/inc/FShell_NotificationManagerImpl.h
src/inc/FShell_NotificationManagerIpcMessages.h [deleted file]
src/inc/FShell_NotificationManagerProxy.h [deleted file]
src/inc/FShell_NotificationRequestImpl.h
src/inc/FShell_QuickPanelFrame.h
src/inc/FShell_QuickPanelFrameImpl.h
src/inc/FShell_QuickPanelFramePresenter.h
src/inc/FShell_ShortcutManagerImpl.h [new file with mode: 0644]
src/inc/FShell_TemplateUtil.h [new file with mode: 0644]