merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:05:54 +0000 (01:05 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:05:54 +0000 (01:05 +0900)
commitf472de27bc75ccef8d3c686341c9544b79b0a865
tree2d12a790bba0388dbe1ad489763d670e0ef2086d
parente8f8ab0a1e515863264900fc8bc087885b43ee46
merge with master
115 files changed:
inc/GlAlbumListEditorForm.h
inc/GlAlbumNameEditorForm.h
inc/GlAllListEditorPanel.h
inc/GlAllListSelectionPanel.h
inc/GlCommonUtil.h
inc/GlDropDownCustomItem.h [new file with mode: 0644]
inc/GlFileDeleteTimer.h [new file with mode: 0644]
inc/GlFileListEditorForm.h
inc/GlFileListPresentationModel.h
inc/GlFileMoveTimer.h [new file with mode: 0644]
inc/GlFileOpInvalidateListener.h [new file with mode: 0644]
inc/GlGalleryApp.h
inc/GlImageListEditorPanel.h
inc/GlProgressBar.h [new file with mode: 0644]
inc/GlRadioCustomItem.h [new file with mode: 0644]
inc/GlSettingIntervalForm.h [deleted file]
inc/GlSettingMainForm.h
inc/GlSettingToggleCustomItem.h [new file with mode: 0644]
inc/GlSettingTransitionForm.h [deleted file]
inc/GlTimerBase.h [new file with mode: 0644]
inc/GlTypes.h
inc/GlVideoListEditorPanel.h
res/ara-AE.xml
res/aze-AZ.xml
res/bul-BG.xml
res/cat-ES.xml
res/ces-CZ.xml
res/dan-DK.xml
res/deu-DE.xml
res/ell-GR.xml
res/eng-GB.xml
res/eng-PH.xml
res/eng-US.xml
res/est-EE.xml
res/eus-ES.xml
res/fin-FI.xml
res/fra-CA.xml
res/fra-FR.xml
res/gle-IE.xml
res/glg-ES.xml
res/hin-IN.xml
res/hrv-HR.xml
res/hun-HU.xml
res/hye-AM.xml
res/isl-IS.xml
res/ita-IT.xml
res/jpn-JP.xml
res/kat-GE.xml
res/kaz-KZ.xml
res/kor-KR.xml
res/lav-LV.xml
res/lit-LT.xml
res/mkd-MK.xml
res/nld-NL.xml
res/nob-NO.xml
res/pol-PL.xml
res/por-BR.xml
res/por-PT.xml
res/ron-RO.xml
res/rus-RU.xml
res/screen-density-xhigh/00_button_radio.png [new file with mode: 0644]
res/screen-density-xhigh/00_button_radio_selected.png [new file with mode: 0644]
res/screen-density-xhigh/00_circle_button_Expand_closed.png [new file with mode: 0644]
res/screen-density-xhigh/00_circle_button_Expand_open.png [new file with mode: 0644]
res/screen-density-xhigh/00_list_expand_closed_press.png [new file with mode: 0644]
res/screen-density-xhigh/00_list_expand_opened_press.png [new file with mode: 0644]
res/screen-density-xhigh/T01_toolbar_icon_delete_dim_web.png [new file with mode: 0644]
res/screen-density-xhigh/T01_toolbar_icon_share_dim_web.png [new file with mode: 0644]
res/screen-size-normal/IDL_DEL_PROGRESSING_POPUP.xml [new file with mode: 0644]
res/screen-size-normal/IDL_FORM.xml [deleted file]
res/screen-size-normal/IDL_FORM_ALBUM_LIST.xml [new file with mode: 0644]
res/screen-size-normal/IDL_FORM_FILE_LIST.xml [new file with mode: 0644]
res/screen-size-normal/IDL_FORM_SETTING_MAIN.xml [new file with mode: 0644]
res/slk-SK.xml
res/slv-SI.xml
res/spa-ES.xml
res/spa-MX.xml
res/srp-RS.xml
res/swe-SE.xml
res/tur-TR.xml
res/ukr-UA.xml
res/uzb-UZ.xml
res/zho-CN.xml
res/zho-HK.xml
res/zho-SG.xml
res/zho-TW.xml
shared/data/GalleryDefaultSettings.ini
src/GlAlbumInfo.cpp
src/GlAlbumListEditorForm.cpp
src/GlAlbumListForm.cpp
src/GlAlbumListPresentationModel.cpp
src/GlAlbumNameEditorForm.cpp
src/GlAllListEditorPanel.cpp
src/GlAllListSelectionPanel.cpp
src/GlCommonUtil.cpp
src/GlDropDownCustomItem.cpp [new file with mode: 0644]
src/GlFileDeleteTimer.cpp [new file with mode: 0644]
src/GlFileListEditorForm.cpp
src/GlFileListForm.cpp
src/GlFileListPresentationModel.cpp
src/GlFileMoveTimer.cpp [new file with mode: 0644]
src/GlFormFactory.cpp
src/GlGalleryApp.cpp
src/GlImageListEditorPanel.cpp
src/GlProgressBar.cpp [new file with mode: 0644]
src/GlRadioCustomItem.cpp [new file with mode: 0644]
src/GlResourceManager.cpp
src/GlSettingIntervalForm.cpp [deleted file]
src/GlSettingMainForm.cpp
src/GlSettingPresentationModel.cpp
src/GlSettingToggleCustomItem.cpp [new file with mode: 0644]
src/GlSettingTransitionForm.cpp [deleted file]
src/GlTimerBase.cpp [new file with mode: 0644]
src/GlTypes.cpp
src/GlVideoListEditorPanel.cpp