From: Jinkun Jang Date: Fri, 15 Mar 2013 16:05:54 +0000 (+0900) Subject: merge with master X-Git-Tag: accepted/tizen_2.1/20130425.023637~86 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f472de27bc75ccef8d3c686341c9544b79b0a865;p=apps%2Fosp%2FGallery.git merge with master --- diff --git a/inc/GlAlbumListEditorForm.h b/inc/GlAlbumListEditorForm.h index 2a2b710..77d5a8b 100644 --- a/inc/GlAlbumListEditorForm.h +++ b/inc/GlAlbumListEditorForm.h @@ -84,7 +84,9 @@ private: void CreateIconListView(void); void SetAllCheckState(bool state); - void OnRequestEmailAction(void); + void OnRequestMessage(void); + void OnRequestEmail(void); + result DeleteFolder(void); int GetCheckedFolder(void); result Update(void); diff --git a/inc/GlAlbumNameEditorForm.h b/inc/GlAlbumNameEditorForm.h index 0754f12..e45aa20 100644 --- a/inc/GlAlbumNameEditorForm.h +++ b/inc/GlAlbumNameEditorForm.h @@ -27,16 +27,21 @@ #include #include #include +#include #include "GlTypes.h" +#include "GlFileOpInvalidateListener.h" class AlbumListPresentationModel; +class FileListPresentationModel; +class FileMoveTimer; + class AlbumNameEditorForm : public Tizen::Ui::Controls::Form , public Tizen::Ui::IActionEventListener - , public Tizen::Ui::IOrientationEventListener , public Tizen::Ui::ITextEventListener , public Tizen::Ui::Controls::IFormBackEventListener , public Tizen::Ui::Scenes::ISceneEventListener + , public IFileOpInvalidateListener { public: AlbumNameEditorForm(); @@ -49,8 +54,6 @@ public: virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId); virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source); - virtual void OnOrientationChanged(const Tizen::Ui::Control &source, - Tizen::Ui::OrientationStatus orientationStatus); virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs); @@ -60,6 +63,10 @@ public: virtual void OnTextValueChanged(const Tizen::Ui::Control& source); virtual void OnTextValueChangeCanceled(const Tizen::Ui::Control& source); + //From IFileOpInvalidate + void OnFileOpInvalidate(enum FileActionMode __actionId); + void OnFileOpComplete(enum FileActionMode __actionId, result); + private: Tizen::Ui::Controls::EditField* __pNameEditField; Tizen::Base::String __nameEditFieldText; @@ -71,6 +78,10 @@ private: Tizen::Ui::Scenes::SceneId __previousSceneId; Tizen::Ui::Controls::MessageBox* __pMessageBox; AlbumListPresentationModel* __pPresentationModel; + FileListPresentationModel* __pFilePresentationModel; + Tizen::Base::Collection::IList* __pMoveIndexList; + + FileMoveTimer* __pFileMove; }; #endif /* _GL_ALBUM_NAME_EDITOR_FORM_H_ */ diff --git a/inc/GlAllListEditorPanel.h b/inc/GlAllListEditorPanel.h index ba17fc2..2c4c1f3 100644 --- a/inc/GlAllListEditorPanel.h +++ b/inc/GlAllListEditorPanel.h @@ -27,8 +27,10 @@ #include "GlAlbumEventListener.h" #include "GlThumbnailEventListener.h" #include "GlBasePanel.h" +#include "GlFileOpInvalidateListener.h" class FileListPresentationModel; +class FileDeleteTimer; class AllListEditorPanel : public BasePanel @@ -37,6 +39,7 @@ class AllListEditorPanel , public Tizen::Ui::Controls::IIconListViewItemProvider , public Tizen::Ui::Scenes::ISceneEventListener , public IAlbumEventListener + , public IFileOpInvalidateListener { public: AllListEditorPanel(void); @@ -65,14 +68,19 @@ public: virtual void OnFileInfoChanged(const Tizen::Content::ContentType contentType); virtual void OnThumbnailDecoded(const int index); - result OnRequestDeleteAction(void); - result OnRequestEmailAction(void); - result OnRequestMoveToAction(Tizen::Base::String& destDirectory); - result OnRequestSlideShowAction(void); + result OnRequestDelete(void); + result OnRequestMessage(void); + result OnRequestEmail(void); + result OnRequestSlideShow(void); + int GetItemCheckedCount(void) const; + Tizen::Base::Collection::IList* GetItemCheckedIndexListN(void) const; + + //From IFileOpInvalidate + void OnFileOpInvalidate(enum FileActionMode __actionId); + void OnFileOpComplete(enum FileActionMode __actionId, result); private: - Tizen::Base::Collection::IList* GetItemCheckedIndexListN(void) const; void ResetSelection(void); void SetButtonState(void); @@ -82,7 +90,9 @@ private: Tizen::Ui::Controls::Label* __pLabelSelectCnt; Tizen::Ui::Controls::Button* __pButtonSelectRegion; int __itemCount; + bool __deleteInProgress; FileListPresentationModel* __pPresentationModel; + FileDeleteTimer* __pFileDelete; }; #endif /* _GL_ALL_LIST_EDITOR_PANEL_H_ */ diff --git a/inc/GlAllListSelectionPanel.h b/inc/GlAllListSelectionPanel.h index eebedfc..60ed5e6 100644 --- a/inc/GlAllListSelectionPanel.h +++ b/inc/GlAllListSelectionPanel.h @@ -27,17 +27,21 @@ #include "GlAlbumEventListener.h" #include "GlBasePanel.h" #include "GlThumbnailEventListener.h" +#include "GlCommonUtil.h" +#include "GlFileOpInvalidateListener.h" class FileListPresentationModel; +class FileDeleteTimer; class AllListSelectionPanel - : public BasePanel - , public Tizen::Ui::Controls::IIconListViewItemEventListener - , public Tizen::Ui::Controls::IIconListViewItemProvider - , public Tizen::Ui::Scenes::ISceneEventListener - , public IAlbumEventListener -{ -public: +: public BasePanel + , public Tizen::Ui::Controls::IIconListViewItemEventListener + , public Tizen::Ui::Controls::IIconListViewItemProvider + , public Tizen::Ui::Scenes::ISceneEventListener + , public IAlbumEventListener + , public IFileOpInvalidateListener + { + public: AllListSelectionPanel(void); virtual ~AllListSelectionPanel(void); @@ -62,25 +66,34 @@ public: virtual void OnFileInfoChanged(const Tizen::Content::ContentType contentType); virtual void OnThumbnailDecoded(const int index); - result OnRequestDeleteAction(void); - result OnRequestEmailAction(void); - result OnRequestMoveToAction(Tizen::Base::String& destDirectory); - result OnRequestSlideShowAction(void); + result OnRequestDelete(void); + result OnRequestMessage(void); + result OnRequestEmail(void); + result OnRequestMoveTo(Tizen::Base::String& destDirectory); + result OnRequestSlideShow(void); int GetItemCheckedCount(void) const; Tizen::Base::Collection::IList* GetItemCheckedIndexListN(void); -private: + //From IFileOpInvalidate + void OnFileOpInvalidate(enum FileActionMode __actionId); + void OnFileOpComplete(enum FileActionMode __actionId, result); + + + private: int GetRealindexFromVirtualIndex(int virtualIndex); int GetVirtualIndexFromRealIndex(int realIndex); void ResetSelection(void); void SetButtonState(void); -private: + private: Tizen::Ui::Controls::IconListView* __pContentIconListView; Tizen::Base::Collection::IList* __pSeletedIndexList; int __itemCount; + bool __deleteInProgress; FileListPresentationModel* __pPresentationModel; -}; + FileDeleteTimer* __pFileDelete; + }; #endif /* _GL_ALL_LIST_SELECTION_PANEL_H_ */ + diff --git a/inc/GlCommonUtil.h b/inc/GlCommonUtil.h index d597576..50fe9a4 100644 --- a/inc/GlCommonUtil.h +++ b/inc/GlCommonUtil.h @@ -22,9 +22,14 @@ #ifndef _GL_COMMON_UTIL_H_ #define _GL_COMMON_UTIL_H_ +#include #include #include +using namespace Tizen::Base::Runtime; + +class IActionEventListener; + class CommonUtil { public: diff --git a/inc/GlDropDownCustomItem.h b/inc/GlDropDownCustomItem.h new file mode 100644 index 0000000..5d4a4d4 --- /dev/null +++ b/inc/GlDropDownCustomItem.h @@ -0,0 +1,110 @@ +// +// Copyright (c) 2012 Samsung Electronics Co., Ltd. +// +// Licensed under the Flora License, Version 1.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://floralicense.org/license/ +// +// 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. +// +/** + *@file: DropDownCustomItem + *@brief: This class defines common behaviour of Drop down custom Item. + * + */ + +#ifndef _GL_DROPDOWN_CUSTOM_ITEM_H_ +#define _GL_DROPDOWN_CUSTOM_ITEM_H_ + + +#include +#include +#include + +enum DropDownItemState +{ + DROP_DOWN_ITEM_STATE_OPENED = 0, + DROP_DOWN__ITEM_STATE_CLOSED +}; + +class DropDownCustomItem + : public Tizen::Ui::Controls::CustomItem +{ + public: + /** + * Initializes this instance of DropDownCustomItem. + */ + result Construct(int width); + + + /** + * @brief The Default constructor + */ + DropDownCustomItem(void); + + + /** + * @brief The Default Destructor + */ + virtual ~DropDownCustomItem(void); + + //getter and setter methods for Main Text + + /** + * @brief The method used to get the Title text of CustomItem + */ + DropDownItemState GetCurState(void); + + /** + * @brief The method used to get the Title text of CustomItem + */ + Tizen::Base::String GetMainText(void); + + /** + * @brief The method used to get the Sub text of CustomItem + */ + Tizen::Base::String GetSubText(void); + + /** + * @brief Add all the required elements and create the Custom Item. + * + */ + result Make(void); + + /** + * @brief The method used to set the Title text of CustomItem + */ + void SetCurState(DropDownItemState); + + /** + * @brief The method used to set the Title text of CustomItem + */ + void SetMainText(const Tizen::Base::String& text); + + /** + * @brief The method used to set the Sub text of CustomItem + */ + void SetSubText(const Tizen::Base::String& text); + + protected: + static const int IDA_FORMAT_BITMAP; + static const int IDA_FORMAT_MAIN_STRING; + static const int IDA_FORMAT_SUB_STRING; + static const int IDA_FORMAT_DROPPER; + + private: + DropDownItemState __currentState; + int __height; ///Height of the SettingToggleCustomItem Instance + int __width; ///Width of the SettingToggleCustomItem Instance + + Tizen::Base::String __mainText; ///The MainText for the Toggle Button + Tizen::Base::String __subText; ///The SubText for the Toggle Button + }; + +#endif /* _GL_DROPDOWN_CUSTOM_ITEM_H_ */ diff --git a/inc/GlFileDeleteTimer.h b/inc/GlFileDeleteTimer.h new file mode 100644 index 0000000..a19b26e --- /dev/null +++ b/inc/GlFileDeleteTimer.h @@ -0,0 +1,49 @@ +// +// Copyright (c) 2012 Samsung Electronics Co., Ltd. +// +// Licensed under the Flora License, Version 1.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://floralicense.org/license/ +// +// 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. +// + +/** + * @file FileDeleteTimer.h + * @brief This is the header file for FileDeleteTimer class. + */ +#ifndef _GL_FILE_DELETE_TIMER_H_ +#define _GL_FILE_DELETE_TIMER_H_ + +#include "GlTimerBase.h" + +class FileListPresentationModel; + +class FileDeleteTimer +: public GlTimerBase + { +public : + FileDeleteTimer(Tizen::Base::Collection::IList* , FileListPresentationModel*, + IFileOpInvalidateListener*); + ~FileDeleteTimer(void); + +private: + //From GlTimerBase + Tizen::Base::Collection::IList * TimerStart(void); + void TimerExpired(const ContentId& contentId); + void TimerCancel(void); + void TimerComplete(int); + +private : + Tizen::Base::Collection::IList* __pDeleteIndexList; + FileListPresentationModel* __pPresentationModel; + + }; + +#endif // _GL_FILE_DELETE_TIMER_H_ diff --git a/inc/GlFileListEditorForm.h b/inc/GlFileListEditorForm.h index 0ccbe90..08f67f8 100644 --- a/inc/GlFileListEditorForm.h +++ b/inc/GlFileListEditorForm.h @@ -27,13 +27,16 @@ #include #include #include "GlBaseForm.h" +#include "GlFileMoveTimer.h" class FileListPresentationModel; +class FileMoveTimer; class FileListEditorForm : public BaseForm , public Tizen::Ui::IActionEventListener , public Tizen::Ui::Controls::IFormBackEventListener + , public IFileOpInvalidateListener { public: FileListEditorForm(void); @@ -53,6 +56,11 @@ public: void SetFooterButtonsState(bool enableState); result MoveToAlbum(Tizen::Base::String& destDirectory); + bool GetFileMoveProgress(); + //From IFileOpInvalidate + void OnFileOpInvalidate(enum FileActionMode __actionId); + void OnFileOpComplete(enum FileActionMode __actionId, result); + private: result InitializeFooter(void); Tizen::Base::String GetDirecotyNameFromFullPath(const Tizen::Base::String& fullPath)const; @@ -68,6 +76,8 @@ private: Tizen::Base::Collection::IList* __pContentDirectoryList; Tizen::Base::Collection::IList* __pContentDirectoryNameList; FileListPresentationModel* __pPresentationModel; + FileMoveTimer* __pFileMove; + bool __moveInProgress; }; #endif /* _GL_FILE_LIST_EDITOR_FORM_H_ */ diff --git a/inc/GlFileListPresentationModel.h b/inc/GlFileListPresentationModel.h index 68f6337..1e156b5 100644 --- a/inc/GlFileListPresentationModel.h +++ b/inc/GlFileListPresentationModel.h @@ -27,7 +27,9 @@ #include #include #include + #include "GlAlbumEventListener.h" +#include "GlCommonUtil.h" #include "GlResourceManager.h" #include "GlThumbnailEventListener.h" #include "GlTypes.h" @@ -76,6 +78,7 @@ public: Tizen::Content::ContentId GetContentInfoIndex(int index); Tizen::Base::String GetContentFilePath(int index); Tizen::Base::String ConvertToAlbumName(const Tizen::Base::String& targetPath)const; + Tizen::Base::Collection::IList* GetContentIdListN(const Tizen::Base::Collection::IList& contentInfoList); AppControlMode GetAppControlMode(void) const; AppControlMediaType GetAppControlMediaType(void) const; @@ -110,6 +113,8 @@ private: virtual void OnThumbnailReceivedN(Tizen::Base::Runtime::IEventArg& eventArg); + void OnTimerExpired(Timer& timer); + private: static FileListPresentationModel* __pPresentationModelInstance; static ThumbnailProvider* __pThumbnailProvider; @@ -124,6 +129,14 @@ private: AppControlMode __appControlMode; AppControlMediaType __appControlMediaType; AppControlSelectionMode __appControlSelectionMode; + + Timer __moveTimer; + Tizen::Base::Collection::IList * __pContentIdList; + Tizen::Base::String __moveToDir; + int __moveToCount; + + friend class FileMoveTimer; + friend class FileDeleteTimer; }; #endif /* _GL_FILE_LIST_PRESENTATION_MODEL_H_ */ diff --git a/inc/GlFileMoveTimer.h b/inc/GlFileMoveTimer.h new file mode 100644 index 0000000..ff38735 --- /dev/null +++ b/inc/GlFileMoveTimer.h @@ -0,0 +1,50 @@ +// +// Copyright (c) 2012 Samsung Electronics Co., Ltd. +// +// Licensed under the Flora License, Version 1.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://floralicense.org/license/ +// +// 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. +// + +/** + * @file FileMoveTimer.h + * @brief This is the header file for FileMoveTimer class. + */ +#ifndef _GL_FILE_MOVE_TIMER_H_ +#define _GL_FILE_MOVE_TIMER_H_ + +#include "GlTimerBase.h" + +class FileListPresentationModel; + +class FileMoveTimer +: public GlTimerBase + { +public : + FileMoveTimer(Tizen::Base::String& , Tizen::Base::Collection::IList* , FileListPresentationModel*, + IFileOpInvalidateListener*); + ~FileMoveTimer(void); + +private: + //From GlTimerBase + Tizen::Base::Collection::IList * TimerStart(void); + void TimerExpired(const ContentId& contentId); + void TimerCancel(void); + void TimerComplete(int); + +private : + Tizen::Base::Collection::IList* __pMoveIndexList; + Tizen::Base::String __moveToDir; + FileListPresentationModel* __pPresentationModel; + + }; + +#endif //_GL_FILE_MOVE_TIMER_H_ diff --git a/inc/GlFileOpInvalidateListener.h b/inc/GlFileOpInvalidateListener.h new file mode 100644 index 0000000..17a12d2 --- /dev/null +++ b/inc/GlFileOpInvalidateListener.h @@ -0,0 +1,36 @@ +// +// Copyright (c) 2012 Samsung Electronics Co., Ltd. +// +// Licensed under the Flora License, Version 1.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://floralicense.org/license/ +// +// 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. +// + +/** + * @file GlFileOpInvalidateListener.h + * @brief This is the header file for FileOpInvalidateListener class. + */ + +#ifndef _GL_FILE_OP_INVALIDATE_LISTENER_H_ +#define _GL_FILE_OP_INVALIDATE_LISTENER_H_ + +#include "GlTypes.h" + +class IFileOpInvalidateListener +{ +public: + virtual ~IFileOpInvalidateListener(void) {} + virtual void OnFileOpInvalidate(enum FileActionMode __actionId) = 0; + virtual void OnFileOpComplete(enum FileActionMode __actionId, result res) = 0; + +}; + +#endif /* _GL_FILE_OP_INVALIDATE_LISTENER_H_ */ diff --git a/inc/GlGalleryApp.h b/inc/GlGalleryApp.h index ac4ec70..8d3ca1f 100644 --- a/inc/GlGalleryApp.h +++ b/inc/GlGalleryApp.h @@ -45,6 +45,7 @@ public: Tizen::Base::String GetAppControlOperationId(void) const; Tizen::Base::String GetUriData(void) const; + Tizen::Base::String GetMimeType(void) const; const Tizen::Base::Collection::IMap* GetAppControlArguments(void) const; void SendAppControlResult(Tizen::App::AppCtrlResult appControlResult, Tizen::Base::Collection::IMap* pExtraData); @@ -65,6 +66,7 @@ private: RequestId __requestId; Tizen::Base::String __operationId; Tizen::Base::String __uriData; + Tizen::Base::String __mimeType; const Tizen::Base::Collection::HashMap* __pArguments; Tizen::App::AppCtrlResult __appControlResult; }; diff --git a/inc/GlImageListEditorPanel.h b/inc/GlImageListEditorPanel.h index ba157ec..7b770b7 100644 --- a/inc/GlImageListEditorPanel.h +++ b/inc/GlImageListEditorPanel.h @@ -27,8 +27,10 @@ #include "GlAlbumEventListener.h" #include "GlBasePanel.h" #include "GlThumbnailEventListener.h" +#include "GlFileOpInvalidateListener.h" class FileListPresentationModel; +class FileDeleteTimer; class ImageListEditorPanel : public BasePanel @@ -37,6 +39,7 @@ class ImageListEditorPanel , public Tizen::Ui::Controls::IIconListViewItemProvider , public Tizen::Ui::Scenes::ISceneEventListener , public IAlbumEventListener + , public IFileOpInvalidateListener { public: ImageListEditorPanel(void); @@ -65,13 +68,18 @@ public: virtual void OnFileInfoChanged(const Tizen::Content::ContentType contentType); virtual void OnThumbnailDecoded(const int index); - void OnRequestDeleteAction(void); - void OnRequestEmailAction(void); - void OnRequestMoveToAction(Tizen::Base::String& destDirectory); + void OnRequestDelete(void); + void OnRequestMessage(void); + void OnRequestEmail(void); + void OnRequestMoveTo(Tizen::Base::String& destDirectory); void OnRequestAppExitWithMultipleSelectionAppControlResult(void); int GetItemCheckedCount(void) const; + //From IFileOpInvalidate + void OnFileOpInvalidate(enum FileActionMode __actionId); + void OnFileOpComplete(enum FileActionMode __actionId, result); + private: Tizen::Base::Collection::IList* GetItemCheckedIndexList(void) const; @@ -81,6 +89,7 @@ private: Tizen::Ui::Controls::Label* __pLabelSelectCnt; int __itemCount; FileListPresentationModel* __pPresentationModel; + FileDeleteTimer* __pFileDelete; }; #endif /* _GL_IMAGE_LIST_EDITOR_PANEL_H_ */ diff --git a/inc/GlProgressBar.h b/inc/GlProgressBar.h new file mode 100644 index 0000000..08e87b3 --- /dev/null +++ b/inc/GlProgressBar.h @@ -0,0 +1,52 @@ +// +// Copyright (c) 2012 Samsung Electronics Co., Ltd. +// +// Licensed under the Flora License, Version 1.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://floralicense.org/license/ +// +// 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. +// + +/** + * @file GlProgressBar.h + * @brief This is the header file for GlProgressBar class. + */ + +#ifndef _GL_PROGRESS_BAR_H_ +#define _GL_PROGRESS_BAR_H_ + +#include +#include "GlTypes.h" + +class GlProgressBar +{ +public: + GlProgressBar(Tizen::Ui::IActionEventListener* listener); + ~GlProgressBar(void); + + void HideFileProgressingPopup(void); + void ShowFileProgressingPopup(int val, enum FileActionMode action); + void IncProgress(int count); + +private: + result CreateFileProgressingPopup(void); + +private: + int __totalVal; + int __curVal; + Tizen::Ui::Controls::Popup* __pFileProgressingPopup; + Tizen::Ui::Controls::Progress* __pFileProgressingProgress; + Tizen::Ui::Controls::Label* __pFileProgressingHeaderLabel; + Tizen::Ui::Controls::Label* __pFileProgressingLabel; + Tizen::Ui::Controls::Button* __pFileProgressingCancelButton; + Tizen::Ui::IActionEventListener* __pActionListener; +}; + +#endif /* _GL_PROGRESS_BAR_H_ */ diff --git a/inc/GlRadioCustomItem.h b/inc/GlRadioCustomItem.h new file mode 100644 index 0000000..228445f --- /dev/null +++ b/inc/GlRadioCustomItem.h @@ -0,0 +1,115 @@ +// +// Copyright (c) 2012 Samsung Electronics Co., Ltd. +// +// Licensed under the Flora License, Version 1.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://floralicense.org/license/ +// +// 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. +// + +/** + *@file: IntRadioCustomItem.h + *@brief: The RadioCustomItem defines radio custom item. + * + */ + +#ifndef _GL_RADIO_CUSTOM_ITEM_H_ +#define _GL_RADIO_CUSTOM_ITEM_H_ + +#include +#include + +#include "GlTypes.h" + +class RadioCustomItem +: public Tizen::Ui::Controls::CustomItem + { + public: + /** + * @brief The Default Constructor + */ + RadioCustomItem(void); + + /** + * @brief The Default Destructor + */ + virtual ~RadioCustomItem(void); + + /** + * @brief Initializes this instance of %DropDownCustomItem. + * + * @return An error code + * @param[in] width The width of the Custom Item + * @param[in] height The height of the Custom Item + * @exception E_SUCCESS The method is successful. + * @exception E_INVALID_STATE This instance has already been constructed. + * @exception E_INVALID_ARG A specified input parameter is invalid. + * @exception E_OUT_OF_MEMORY The memory is insufficient. + * @exception E_SYSTEM A system error has occurred. + * + */ + result Construct(int width, int height); + + //getter and setter methods for Text + + /** + * @brief The method used to get the text of CustomItem + * @return An error code + */ + Tizen::Base::String GetText(void); + + /** + * @brief The method used to get selection state of the Radio Button + * @return True if selected or false if unselected + */ + bool GetSelected(void); + + + /** + * @brief Add all the required elements and create the Custom Item. + * + * @return An error code + * @param[in] void An instance of the Rectangle class @n + * This instance represents the x and y coordinates of the top-left corner of the created window along with + * the width and height of the window. + * @exception E_SUCCESS The method is successful. + * @exception E_INVALID_STATE This instance has already been constructed. + * @exception E_INVALID_ARG A specified input parameter is invalid. + * @exception E_OUT_OF_MEMORY The memory is insufficient. + * @exception E_SYSTEM A system error has occurred. + * + */ + result Make(void); + + /** + * @brief The method used to set the text of CustomItem + * @return An error code + */ + void SetText(Tizen::Base::String& text); + + /** + * @brief The method used to set the selection state of the Radio Button + * @return void + */ + void SetSelected(bool selectedValue); + + protected: + static const int IDA_FORMAT_STRING; + static const int IDA_FORMAT_RADIO_BUTTON; + + private: + bool __isSelected; + int __width; ///Width of the SettingToggleCustomItem Instance + int __height; ///Height of the SettingToggleCustomItem Instance + Tizen::Base::String __text; ///The Text for the Toggle Button + + }; + +#endif /* _GL_RADIO_CUSTOM_ITEM_H_ */ diff --git a/inc/GlSettingIntervalForm.h b/inc/GlSettingIntervalForm.h deleted file mode 100644 index e7ea5d5..0000000 --- a/inc/GlSettingIntervalForm.h +++ /dev/null @@ -1,89 +0,0 @@ -// -// Copyright (c) 2012 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.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://floralicense.org/license/ -// -// 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. -// - -/** - * @file GlSettingIntervalForm.h - * @brief This is the header file for SettingIntervalForm class. - */ - -#ifndef _GL_SETTING_INTERVAL_FORM_H_ -#define _GL_SETTING_INTERVAL_FORM_H_ - -#include -#include -#include -#include - -class SettingPresentationModel; - -class SettingIntervalForm - : public Tizen::Ui::Controls::Form - , public Tizen::Ui::IActionEventListener - , public Tizen::Ui::Controls::IGroupedTableViewItemProvider - , public Tizen::Ui::Controls::IGroupedTableViewItemEventListener - , public Tizen::Ui::Controls::IFormBackEventListener - , public Tizen::Ui::Scenes::ISceneEventListener -{ -public: - SettingIntervalForm(void); - virtual ~SettingIntervalForm(void); - result Initialize(void); - - virtual result OnInitializing(void); - virtual result OnTerminating(void); - - virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId); - - virtual int GetGroupCount(void); - virtual int GetItemCount(int groupIndex); - virtual Tizen::Ui::Controls::TableViewGroupItem* CreateGroupItem(int groupIndex, int itemWidth); - virtual bool DeleteGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem); - virtual void UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem); - virtual Tizen::Ui::Controls::TableViewItem* CreateItem(int groupIndex, int itemIndex, int itemWidth); - virtual bool DeleteItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem); - virtual void UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem); - virtual int GetDefaultGroupItemHeight(void); - virtual int GetDefaultItemHeight(void); - - virtual void OnGroupedTableViewContextItemActivationStateChanged( - Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, - Tizen::Ui::Controls::TableViewContextItem* pContextItem, bool activated); - virtual void OnGroupedTableViewGroupItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, - int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem, - Tizen::Ui::Controls::TableViewItemStatus status); - virtual void OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, - int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem, - Tizen::Ui::Controls::TableViewItemStatus status); - - virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source); - - virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, - const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs); - virtual void OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, - const Tizen::Ui::Scenes::SceneId& nextSceneId); - -private: - result InitializeFooter(void); - int GetFontSize(void); - void ItemTypeIconAndOneLine(Tizen::Graphics::Rectangle& icon, Tizen::Graphics::Rectangle& main); - void UpdateTableViewRedioButtonState(int senderIndex = -1); - -private: - Tizen::Ui::Controls::GroupedTableView* __pTableView; - SettingPresentationModel* __pPresentationModel; -}; - -#endif /* _GL_SETTING_INTERVAL_FORM_H_ */ diff --git a/inc/GlSettingMainForm.h b/inc/GlSettingMainForm.h index cb51836..3aa88d5 100644 --- a/inc/GlSettingMainForm.h +++ b/inc/GlSettingMainForm.h @@ -27,17 +27,43 @@ #include #include +enum SettingListItemType +{ + ITEM_TYPE_NORMAL = 0, + ITEM_TYPE_TOGGLE, + ITEM_TYPE_DROPDOWN, + ITEM_TYPE_RADIO, +}; + +enum +{ + SETTING_INVALID = -1, + SETTING_SLIDESHOW_INTERVAL_TITLE = 0, //1 + SETTING_INTERVAL_2, //2 + SETTING_INTERVAL_3, //3 + SETTING_INTERVAL_5, //4 + SETTING_INTERVAL_10, //5 + SETTING_INTERVAL_20, //6 + SETTING_REPEAT, //7 + //SETTING_SHUFFLE, //8 + SETTING_TRANSITION_EFFECT_TITLE, //9 + SETTING_TRANSITION_SLIDE, //10 + SETTING_TRANSITION_DISSOLVE, //11 + SETTING_TRANSITION_ZOOM, //12 + SETTING_MAX //13 +}; + class SettingPresentationModel; class SettingMainForm - : public Tizen::Ui::Controls::Form - , public Tizen::Ui::IActionEventListener - , public Tizen::Ui::Controls::IGroupedTableViewItemEventListener - , public Tizen::Ui::Controls::IGroupedTableViewItemProvider - , public Tizen::Ui::Controls::IFormBackEventListener - , public Tizen::Ui::Scenes::ISceneEventListener -{ -public: +: public Tizen::Ui::Controls::Form + , public Tizen::Ui::IActionEventListener + , public Tizen::Ui::Controls::IGroupedListViewItemEventListener + , public Tizen::Ui::Controls::IGroupedListViewItemProvider + , public Tizen::Ui::Controls::IFormBackEventListener + , public Tizen::Ui::Scenes::ISceneEventListener + { + public: SettingMainForm(void); virtual ~SettingMainForm(void); result Initialize(void); @@ -47,26 +73,25 @@ public: virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId); - virtual Tizen::Ui::Controls::TableViewGroupItem* CreateGroupItem(int groupIndex, int itemWidth); - virtual Tizen::Ui::Controls::TableViewItem* CreateItem(int groupIndex, int itemIndex, int itemWidth); - virtual int GetDefaultGroupItemHeight(void); - virtual int GetDefaultItemHeight(void); - virtual bool DeleteGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem); - virtual bool DeleteItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem); - virtual int GetGroupCount(void); - virtual int GetItemCount(int groupIndex); - virtual void UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem); - virtual void UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem); - - virtual void OnGroupedTableViewContextItemActivationStateChanged( - Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, - Tizen::Ui::Controls::TableViewContextItem* pContextItem, bool activated); - virtual void OnGroupedTableViewGroupItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, - int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem, - Tizen::Ui::Controls::TableViewItemStatus status); - virtual void OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, - int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem, - Tizen::Ui::Controls::TableViewItemStatus status); + //IGroupedListViewItemProvider + Tizen::Ui::Controls::GroupItem* CreateGroupItem(int groupIndex, int itemWidth); + + Tizen::Ui::Controls::ListItemBase* CreateItem(int groupIndex, int itemIndex, int itemWidth); + + bool DeleteGroupItem(int groupIndex, Tizen::Ui::Controls::GroupItem* pItem, int itemWidth); + + bool DeleteItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::ListItemBase* pItem, int itemWidth); + + int GetGroupCount(void); + + int GetItemCount(int groupIndex); + + //IGroupedListViewItemEventListener + void OnGroupedListViewContextItemStateChanged(Tizen::Ui::Controls::GroupedListView& listView, int groupIndex, int itemIndex, int elementId, Tizen::Ui::Controls::ListContextItemStatus status); + + void OnGroupedListViewItemStateChanged(Tizen::Ui::Controls::GroupedListView& listView, int groupIndex, int itemIndex, int elementId, Tizen::Ui::Controls::ListItemStatus status); + + void OnGroupedListViewItemSwept(Tizen::Ui::Controls::GroupedListView& listView, int groupIndex, int itemIndex, Tizen::Ui::Controls::SweepDirection direction); virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source); @@ -75,17 +100,41 @@ public: virtual void OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId); -private: - result InitializeFooter(void); - int GetFontSize(void); - void ItemTypeIconAndOneLine(Tizen::Graphics::Rectangle& icon, Tizen::Graphics::Rectangle& main); - int GetSettingInfoItemStatus(int settingIndex); - void ItemTypeTwoLine(Tizen::Graphics::Rectangle& main, Tizen::Graphics::Rectangle& sub, int fontSize); - void UpdateTableViewCheckButtonState(void); + class SettingItemInfo + { + public: + /** + * @brief The Default Constructor + */ + SettingItemInfo(void); + + /** + * @brief The Default Destructor + */ + virtual ~SettingItemInfo(void){}; -private: - Tizen::Ui::Controls::GroupedTableView* __pTableView; + public: + int childCount; //only for ITEM_TYPE_DROPDOWN type items + bool isOpen; //true for opened and false for closed + bool isSelected; //only for ITEM_TYPE_RADIO && ITEM_TYPE_TOGGLE type of items + SettingListItemType itemType; + Tizen::Base::String titleText; + Tizen::Base::String subText; + }; + + int* pGroupItemCount; + SettingItemInfo settingInfo[SETTING_MAX]; + + private: + /** + * @brief Initializes this instance of settings default values. + */ + void InitializeSettingValues(void); + + private: + Tizen::Ui::Controls::GroupedListView* __pList; SettingPresentationModel* __pPresentationModel; -}; + + }; #endif /* _GL_SETTING_MAIN_FORM_H_ */ diff --git a/inc/GlSettingToggleCustomItem.h b/inc/GlSettingToggleCustomItem.h new file mode 100644 index 0000000..665da83 --- /dev/null +++ b/inc/GlSettingToggleCustomItem.h @@ -0,0 +1,99 @@ +// + +// Copyright (c) 2012 Samsung Electronics Co., Ltd. +// +// Licensed under the Flora License, Version 1.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://floralicense.org/license/ +// +// 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. +// + +//!Internet SettingToggleCustomItem class +/*@file: SettingToggleCustomItem.h + *@brief: The SettingToggleCustomItem used to toggle the item. + * + */ + +#ifndef _INT_SETTING_TOGGLE_CUSTOM_ITEM_H_ +#define _INT_SETTING_TOGGLE_CUSTOM_ITEM_H_ + +#include +#include +#include "GlTypes.h" + +class SettingToggleCustomItem + : public Tizen::Ui::Controls::CustomItem +{ + +public: + /** + * @brief The Default constructor + */ + SettingToggleCustomItem(void); + + /** + * @brief The Default destructor + */ + virtual ~SettingToggleCustomItem(void); + + /** + * @brief Initializes this instance of %DropDownCustomItem. + * + * @return An error code + * @param[in] void An instance of the Rectangle class @n + * This instance represents the x and y coordinates of the top-left corner of the created window along with + * the width and height of the window. + * @exception E_SUCCESS The method is successful. + * @exception E_INVALID_STATE This instance has already been constructed. + * @exception E_INVALID_ARG A specified input parameter is invalid. + * @exception E_OUT_OF_MEMORY The memory is insufficient. + * @exception E_SYSTEM A system error has occurred. + * + */ + result Construct(int width, int height); + + //getter and setter methods for __text + + /** + * @brief The method used to get the text of CustomItem + * + * @return A String + */ + Tizen::Base::String GetText(void); + + /** + * @brief Add all the required elements and create the Custom Item. + * + * @return An error code + * @param[in] void An instance of the Rectangle class @n + * This instance represents the x and y coordinates of the top-left corner of the created window along with + * the width and height of the window. + * @exception E_SUCCESS The method is successful. + * @exception E_INVALID_STATE This instance has already been constructed. + * @exception E_INVALID_ARG A specified input parameter is invalid. + * @exception E_OUT_OF_MEMORY The memory is insufficient. + * @exception E_SYSTEM A system error has occurred. + * + */ + result Make(void); + + /** + * @brief The method used to set the text of CustomItem + */ + + void SetText(Tizen::Base::String& text); + +private: + int __width; ///Width of the SettingToggleCustomItem Instance + int __height; ///Height of the SettingToggleCustomItem Instance + Tizen::Base::String __text; ///The Text for the Toggle Button +}; + +#endif /* _INT_SETTING_TOGGLE_CUSTOM_ITEM_H_ */ diff --git a/inc/GlSettingTransitionForm.h b/inc/GlSettingTransitionForm.h deleted file mode 100644 index f572d36..0000000 --- a/inc/GlSettingTransitionForm.h +++ /dev/null @@ -1,89 +0,0 @@ -// -// Copyright (c) 2012 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.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://floralicense.org/license/ -// -// 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. -// - -/** - * @file GlSettingTransitionForm.h - * @brief This is the header file for SettingTransitionForm class. - */ - -#ifndef _GL_SETTING_TRANSITION_FORM_H_ -#define _GL_SETTING_TRANSITION_FORM_H_ - -#include -#include -#include -#include - -class SettingPresentationModel; - -class SettingTransitionForm - : public Tizen::Ui::Controls::Form - , public Tizen::Ui::IActionEventListener - , public Tizen::Ui::Controls::IGroupedTableViewItemEventListener - , public Tizen::Ui::Controls::IGroupedTableViewItemProvider - , public Tizen::Ui::Controls::IFormBackEventListener - , public Tizen::Ui::Scenes::ISceneEventListener -{ -public: - SettingTransitionForm(void); - virtual ~SettingTransitionForm(void); - result Initialize(void); - - virtual result OnInitializing(void); - virtual result OnTerminating(void); - - virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId); - - virtual void OnGroupedTableViewContextItemActivationStateChanged( - Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, - Tizen::Ui::Controls::TableViewContextItem* pContextItem, bool activated); - virtual void OnGroupedTableViewGroupItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, - int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem, - Tizen::Ui::Controls::TableViewItemStatus status); - virtual void OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, - int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem, - Tizen::Ui::Controls::TableViewItemStatus status); - - virtual Tizen::Ui::Controls::TableViewGroupItem* CreateGroupItem(int groupIndex, int itemWidth); - virtual Tizen::Ui::Controls::TableViewItem* CreateItem(int groupIndex, int itemIndex, int itemWidth); - virtual int GetDefaultGroupItemHeight(void); - virtual int GetDefaultItemHeight(void); - virtual bool DeleteGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem); - virtual bool DeleteItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem); - virtual int GetGroupCount(void); - virtual int GetItemCount(int groupIndex); - virtual void UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupItem* pItem); - virtual void UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem); - - virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source); - - virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, - const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs); - virtual void OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, - const Tizen::Ui::Scenes::SceneId& nextSceneId); - -private: - result InitializeFooter(void); - int GetFontSize(void); - void ItemTypeIconAndOneLine(Tizen::Graphics::Rectangle& icon, Tizen::Graphics::Rectangle& main); - void UpdateTableViewRedioButtonState(int senderIndex = -1); - -private: - Tizen::Ui::Controls::GroupedTableView* __pTableView; - SettingPresentationModel* __pPresentationModel; -}; - -#endif /* _GL_SETTING_TRANSITION_FORM_H_ */ diff --git a/inc/GlTimerBase.h b/inc/GlTimerBase.h new file mode 100644 index 0000000..fb950df --- /dev/null +++ b/inc/GlTimerBase.h @@ -0,0 +1,76 @@ +// +// Copyright (c) 2012 Samsung Electronics Co., Ltd. +// +// Licensed under the Flora License, Version 1.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://floralicense.org/license/ +// +// 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. +// + +/** + * @file GlTimerBase.h + * @brief This is the header file for GlTimerBase class. + */ +#ifndef __GL_TIMER_BASE_H_ +#define __GL_TIMER_BASE_H_ + +#include +#include +#include "GlFileOpInvalidateListener.h" + + +using namespace Tizen::Base; +using namespace Tizen::Base::Runtime; +using namespace Tizen::Content; + +class GlProgressBar; + +class GlTimerBase + :public Tizen::Ui::IActionEventListener + , public ITimerEventListener + { + public: + + GlTimerBase(IFileOpInvalidateListener*, enum FileActionMode actionId); + virtual ~GlTimerBase(void); + + bool StartTimer(void); + void CancelTimer(void); + + //From IActionEventListener + void OnActionPerformed(const Tizen::Ui::Control& source, int actionId); + + //From ITimerEventListener + void OnTimerExpired(Timer& timer); + + protected: + virtual Tizen::Base::Collection::IList * TimerStart(void) = 0; + virtual void TimerExpired(const ContentId&) = 0; + virtual void TimerCancel(void) = 0; + virtual void TimerComplete(int) = 0; + + + private: + void OnOpComplete(void); + void OnOpCancelled(void); + + + private: + Timer __moveTimer; + Tizen::Base::Collection::IList * __pContentIdList; + int __moveToCount; + GlProgressBar* __pMoveProBar; + IFileOpInvalidateListener* __pInvalidate; + enum FileActionMode __actionId; + + }; + + +#endif //__GL_TIMER_BASE_H_ diff --git a/inc/GlTypes.h b/inc/GlTypes.h index f50feb6..5b5b0dc 100644 --- a/inc/GlTypes.h +++ b/inc/GlTypes.h @@ -31,12 +31,14 @@ enum ACTION_ID_ ACTION_ID_BUTTON_UNCHECKED = 105, ACTION_ID_CHECK_SELECT_OFF = 201, ACTION_ID_CHECK_SELECT_ON = 202, - ACTION_ID_CONTEXT_MENU_EMAIL = 301, - ACTION_ID_CONTEXT_MENU_MORE_ADD_TAG = 302, - ACTION_ID_CONTEXT_MENU_MORE_EDIT = 303, - ACTION_ID_CONTEXT_MENU_MORE_MOVE = 304, - ACTION_ID_CONTEXT_MENU_MORE_SLIDE_SHOW = 305, - ACTION_ID_CONTEXT_MENU_SHARE_EMAIL = 306, + ACTION_ID_CONTEXT_MENU_MESSAGE = 301, + ACTION_ID_CONTEXT_MENU_EMAIL = 302, + ACTION_ID_CONTEXT_MENU_MORE_ADD_TAG = 303, + ACTION_ID_CONTEXT_MENU_MORE_EDIT = 304, + ACTION_ID_CONTEXT_MENU_MORE_MOVE = 305, + ACTION_ID_CONTEXT_MENU_MORE_SLIDE_SHOW = 306, + ACTION_ID_CONTEXT_MENU_SHARE_MESSAGE = 307, + ACTION_ID_CONTEXT_MENU_SHARE_EMAIL = 308, ACTION_ID_CONTEXTMENU_EDITOR_MOVE_ALBUM_ARRAY_START = 401, ACTION_ID_CONTEXTMENU_EDITOR_MOVE_CREATE_ALBUM = 600, ACTION_ID_CONTEXTMENU_SELECTION_MOVE_ALBUM_ARRAY_START = 601, @@ -56,7 +58,8 @@ enum ACTION_ID_ ACTION_ID_FORMAT_THUMBNAIL = 1002, ACTION_ID_FORMAT_TITLE = 1003, ACTION_ID_SELECTALL_CHECKED = 1001, - ACTION_ID_SELECTALL_UNCHECKED = 1002 + ACTION_ID_SELECTALL_UNCHECKED = 1002, + ACTION_ID_PROGRESSBAR_CANCEL = 2001 }; enum AppControlMode @@ -102,6 +105,19 @@ enum AlbumNameEditorMode ALBUM_NAME_EDITOR_MODE_NONE }; +enum FileActionMode +{ + FILE_DELETE_ACTION, + FILE_MOVE_ACTION, + FILE_RENAME_ACTION +}; + +extern const wchar_t* IDL_FORM_ALBUM_LIST; +extern const wchar_t* IDL_FORM_FILE_LIST; +extern const wchar_t* IDL_FORM_SETTING_MAIN; +extern const wchar_t* IDL_FORM_SETTING_INTERVAL; +extern const wchar_t* IDL_FORM_SETTING_TRANSITION; + extern const wchar_t* IDC_FORM_ALBUM_LIST; extern const wchar_t* IDC_FORM_ALBUM_LIST_EDITOR; extern const wchar_t* IDC_FORM_ALBUM_NAME_EDITOR; @@ -161,6 +177,7 @@ extern const wchar_t* APPCONTROL_DATA_VIDEO; extern const wchar_t* APPCONTROL_DATA_SINGLE; extern const wchar_t* APPCONTROL_DATA_MULTIPLE; extern const wchar_t* APPCONTROL_DATA_SLIDE_SHOW; +extern const wchar_t* APPCONTROL_DATA_SELECTION_MODE; extern const wchar_t* APPCONTROL_RESULT_KEY_LEGACY_RESULT; @@ -193,6 +210,8 @@ extern const wchar_t* SECTION_NAME_VIDEO_PLAYER; extern const wchar_t* ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_INTERVAL; extern const wchar_t* ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_TRANSITION_EFFECT; extern const wchar_t* ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_MUSIC; +extern const wchar_t* ENTRY_NAME_IMAGE_VIEWER_REPEAT_VALUE; +extern const wchar_t* ENTRY_NAME_IMAGE_VIEWER_SHUFFLE_VALUE; extern const wchar_t* FONT_SIZE_SETTING_INFO_KEY; @@ -200,8 +219,10 @@ extern const wchar_t* IDB_BUTTON_CIRCLE_BACKGROUND; extern const wchar_t* IDB_BUTTON_RENAME; extern const wchar_t* IDB_CONTROLBAR_CAMERA; extern const wchar_t* IDB_CONTROLBAR_DELETE; +extern const wchar_t* IDB_CONTROLBAR_DELETE_DIM; extern const wchar_t* IDB_CONTROLBAR_MORE; extern const wchar_t* IDB_CONTROLBAR_SHARE; +extern const wchar_t* IDB_CONTROLBAR_SHARE_DIM; extern const wchar_t* IDB_LISTVIEW_EMPTY; extern const wchar_t* IDB_MAIN_FOLDER_BACKGROUND; extern const wchar_t* IDB_VIDEOTHUMBNAIL_BG; @@ -210,5 +231,25 @@ extern const wchar_t* IDB_VIDEOTHUMBNAIL_FAVORITE; extern const wchar_t* IDB_VIDEOTHUMBNAIL_PLAY; extern const wchar_t* IDB_BUTTON_MOVE_SELECTION; extern const wchar_t* IDB_NO_CONTENTS_BROKEN; +extern const wchar_t* IDB_LIST_EXPAND_CLOSED; +extern const wchar_t* IDB_LIST_EXPAND_CLOSED_PRESS; +extern const wchar_t* IDB_LIST_EXPAND_OPENED; +extern const wchar_t* IDB_LIST_EXPAND_OPENED_PRESS; + +static const unsigned int CUSTOM_COLOR_GREY = Tizen::Graphics::Color32<124,124,124>::Value; +static const unsigned int CUSTOM_COLOR_TRANSPARENT = Tizen::Graphics::Color32<0,0,0>::Value; +static const unsigned int CUSTOM_BACKGROUND_COLOR_LISTVIEW = Tizen::Graphics::Color32<236,240,242>::Value; +static const unsigned int CUSTOM_BACKGROUND_COLOR_LISTVIEW_PRESSED_HIGHLIGHTED = Tizen::Graphics::Color32<42, 137, 194>::Value; +static const unsigned int CUSTOM_COLOR_LISTVIEW_TEXT = Tizen::Graphics::Color32<249,249,249>::Value; +static const unsigned int CUSTOM_COLOR_BROWN = Tizen::Graphics::Color32<32, 32, 32>::Value; +static const unsigned int CUSTOM_COLOR_INFO_LABEL = Tizen::Graphics::Color32<68, 68, 68>::Value; +static const unsigned int CUSTOM_BACKGROUND_COLOR_PREVIEW_PANEL = Tizen::Graphics::Color32<81,81,81>::Value; +static const unsigned int CUSTOM_BACKGROUND_COLOR_PREVIEW_PANEL_INACTIVE = Tizen::Graphics::Color32<0,0,0,20>::Value; +static const unsigned int CUSTOM_COLOR_PREVIEW_PANEL_PRESSED_RECTANGLE = Tizen::Graphics::Color32<7,180,211>::Value; +static const unsigned int CUSTOM_COLOR_LISTVIEW_TEXT2 = Tizen::Graphics::Color32<70,70,70>::Value; +static const unsigned int CUSTOM_COLOR_SETTINGS_TEXT = Tizen::Graphics::Color32<128, 128, 128>::Value; +static const unsigned int CUSTOM_COLOR_SETTINGS_LISTITEM_BACKGROUND = Tizen::Graphics::Color32<248, 246, 239>::Value; +static const unsigned int CUSTOM_COLOR_SETTINGS_LISTITEM_RADIO_BACKGROUND = Tizen::Graphics::Color32<220, 218, 211>::Value; +static const unsigned int CUSTOM_COLOR_SETTINGS_GROUPTITLE = Tizen::Graphics::Color32<59, 115, 182>::Value; #endif /* _GL_TYPES_H_ */ diff --git a/inc/GlVideoListEditorPanel.h b/inc/GlVideoListEditorPanel.h index bd1c174..37a6906 100644 --- a/inc/GlVideoListEditorPanel.h +++ b/inc/GlVideoListEditorPanel.h @@ -27,8 +27,10 @@ #include "GlAlbumEventListener.h" #include "GlBasePanel.h" #include "GlThumbnailEventListener.h" +#include "GlFileOpInvalidateListener.h" class FileListPresentationModel; +class FileDeleteTimer; class VideoListEditorPanel : public BasePanel @@ -37,6 +39,7 @@ class VideoListEditorPanel , public Tizen::Ui::Controls::IListViewItemProvider , public Tizen::Ui::Scenes::ISceneEventListener , public IAlbumEventListener + , public IFileOpInvalidateListener { public: VideoListEditorPanel(); @@ -68,12 +71,17 @@ public: virtual void OnFileInfoChanged(const Tizen::Content::ContentType contentType); virtual void OnThumbnailDecoded(const int index); - void OnRequestDeleteAction(void); - void OnRequestEmailAction(void); - void OnRequestMoveToAction(Tizen::Base::String& destDirectory); + void OnRequestDelete(void); + void OnRequestMessage(void); + void OnRequestEmail(void); + void OnRequestMoveTo(Tizen::Base::String& destDirectory); void OnRequestAppExitWithMultipleSelectionAppControlResult(void); int GetItemCheckedCount(void) const; + //From IFileOpInvalidate + void OnFileOpInvalidate(enum FileActionMode __actionId); + void OnFileOpComplete(enum FileActionMode __actionId, result); + private: Tizen::Base::Collection::IList* GetItemCheckedIndexList(void) const; @@ -83,6 +91,7 @@ private: Tizen::Ui::Controls::Label* __pLabelSelectCnt; int __itemCount; FileListPresentationModel* __pPresentationModel; + FileDeleteTimer* __pFileDelete; }; #endif /* _GL_VIDEO_LIST_EDITOR_PANEL_H_ */ diff --git a/res/ara-AE.xml b/res/ara-AE.xml index 6b99e80..fc14237 100644 --- a/res/ara-AE.xml +++ b/res/ara-AE.xml @@ -2,69 +2,81 @@ - + تم الوصول إلى أقصى عدد من الحروف - حذف - الألبومات + عرض الصور + اختيار الكل + مسح؟ + تعديل + رسالة + جار المعالجة... + ملفات محملة + اسم الألبوم مستخدم بالفعل + 20 ثانية + التفعيل + ثانيتان + الرسائل + تمت + غير قادر على تغيير الاسم. جاري استخدام الملف + بريد إلكتروني + تم النقل + إلغاء + محدد + مسح + الترجمات المصاحبة + إلغاء + تم بلوغ أقصى عدد من الأحرف (%d) + تم بلوغ أقصى عدد من الأحرف (%d) + عرض شرائح + شرائح %s موجود بالفعل - ملفات الكاميرا - إنشاء ألبوم + جاري التحميل ... + الألبومات + يتعذر إعادة التسمية. اسم الألبوم مستخدم بالفعل + جاري الحفظ... + فشلت العملية تأثير الانتقال - إلغاء + الموسيقى + إنشاء مجلد؟ + فشل المسح + فيديو + زوم قوس قزح - موجود بالفعل. هل تريد الاستبدال؟ - بريد إلكتروني - لا يمكن المسح - تحديد الكل + فاصل عرض الشرائح + مشغل فيديو + ثوان الصفحة - فشل المسح - محدد - الموسيقى + 10 ثوان + استوديو + لا يوجد اسم + الصور التلاشي التدريجي - ثانيتان - فشلت العملية - الخلط - إلغاء تعديل - الصور + 5 ثوان + تم المسح حذف؟ - الفيديو - فاصل عرض الشرائح - عرض شرائح - التفعيل - لا يوجد اسم - اسم الألبوم مستخدم بالفعل - لا توجد عناصر - 10 ثوان - موجود مسبقا - إخفاء - تكرار - اختيار الكل - مشغل فيديو - ثوان + موجود بالفعل. هل تريد الاستبدال؟ + جاري المسح... + تمت 3 ثوان + ملفات الكاميرا + تكرار + تم الحفظ + إذابة + الخلط + جاري النقل... فشل النقل + الفيديو + تمت + تحديد الكل كافة الألبومات - 20 ثانية - تم بلوغ أقصى عدد من الأحرف (%d) - زوم - استوديو - 5 ثوان - إذابة - غير قادر على تغيير الاسم. جاري استخدام الملف - فيديو - يتعذر إعادة التسمية. اسم الألبوم مستخدم بالفعل - الترجمات المصاحبة - عرض الصور - ملفات محملة - إنشاء مجلد؟ تغييرالاسم - شرائح نقل + لا يمكن المسح الفترة - تمت - مسح؟ - تعديل - تم بلوغ أقصى عدد من الأحرف (%d) - تمت + موجود مسبقا + إنشاء ألبوم + لا توجد عناصر + إخفاء + فشل الحفظ diff --git a/res/aze-AZ.xml b/res/aze-AZ.xml index a4d27f4..f9ed30a 100644 --- a/res/aze-AZ.xml +++ b/res/aze-AZ.xml @@ -2,69 +2,81 @@ - + Simvol sayı maksimuma çatıb + Slayd göstərmə + Hamısını seç + Silinsin? + Redaktə et + Mesaj + İşlənir... + Yükləmələr + Albom adı artıq ist.edilir + 20 saniyə + Aktivləşdirmə + 2 saniyə + Mesajlar + Bitdi + Yenidən adlandırmaq mümkün deyildir + Elektron poçtlar + Göndərildi + Ləğv et + Seçilmişi Sil - Albomlar + Yarımbaşlıqlar + Ləğv et + Simvolların sayı maksimuma (%d) çatıb + Simvolların sayı maksimuma (%d) çatıb + Slyd nmyşi + Slayd %s hazırda mövcuddur - Kamera çarxı - Albom yaradın + Yüklənir... + Albomlar + Yenidən adlandırmaq mümkün deyil. Albom adı artıq istifadə edilir + Yaddaşa yazılma + Əməliyyat alınmadı Keçid effekti - Ləğv et + Musiqi + Qovluq yaradılsın? + Silmək mümkün olmadı + Video + Yaxınlaşdırma/uzaqlaşdırma Diafraqma - Artıq mövcuddur. Üzərindən yazılsın? - Elektron poçtlar - Silmək mümkün deyil - Hamsnı seç + Slaydşou intervalı + Video pleyer + Saniyələr Səhifə - Silmək mümkün olmadı - Seçilmişi - Musiqi + 10 saniyə + Qalereya + Ad yoxdur + Təsvirlər Tutqunlaşdır - 2 saniyə - Əməliyyat alınmadı - Təsadüfi sıralama - Ləğv et Redaktə et - Təsvirlər + 5 saniyə + Silindi Silinsin? - Video - Slaydşou intervalı - Slyd nmyşi - Aktivləşdirmə - Ad yoxdur - Albom adı artıq ist.edilir - Elementlər yoxdur - 10 saniyə - Artıq var - Sayrışmaq - Təkrar et - Hamısını seç - Video pleyer - Saniyələr + Artıq mövcuddur. Üzərindən yazılsın? + Silinmə + Yerinə yetirildi 3 saniyə + Kamera çarxı + Təkrar et + Yaddaşa yazıldı + Seç + Təsadüfi sıralama + Göndərilmə... Keçmə alınmadı + Video + Tamamlandı + Hamsnı seç Bütün albomlar - 20 saniyə - Simvolların sayı maksimuma (%d) çatıb - Yaxınlaşdırma/uzaqlaşdırma - Qalereya - 5 saniyə - Seç - Yenidən adlandırmaq mümkün deyildir - Video - Yenidən adlandırmaq mümkün deyil. Albom adı artıq istifadə edilir - Yarımbaşlıqlar - Slayd göstərmə - Yükləmələr - Qovluq yaradılsın? Adı dəyişdir - Slayd Göndər + Silmək mümkün deyil İnterval - Tamamlandı - Silinsin? - Redaktə et - Simvolların sayı maksimuma (%d) çatıb - Bitdi + Artıq var + Albom yaradın + Elementlər yoxdur + Sayrışmaq + Yaddaşa yazmaq mümkün olmadı diff --git a/res/bul-BG.xml b/res/bul-BG.xml index 9b2bfbf..aadb4a0 100644 --- a/res/bul-BG.xml +++ b/res/bul-BG.xml @@ -2,69 +2,81 @@ - + Достигнат максимален брой знаци + Слайдшоу + Избери всички + Изтриване? + Редактиране + Съобщение + Обработване... + Изтеглени файлове + Име на албума вече се изп. + 20 секунди + Активиране + 2 секунди + Съобщения + Готово + Не може да се преименува + Email + Преместено + Отказ + Избрани Изтриване - Албуми + Субтитри + Отказ + Достигнат е максималният брой знаци (%d) + Достигнат е максималният брой знаци (%d) + Слайдшоу + Слайд %s вече съществува - Материал камера - Създаване на албум + Зареждане + Албуми + Не може да се преименува. Името на албума вече се използва + Запазване + Операцията е неуспешна Ефект на преход - Отказ + Музика + Създаване на папка? + Неуспешно изтриване + Видеоклип + Зум Ирис - Вече съществува. Презапис? - Email - Невъзможно изтриване - Изб.всички + Интервал на слайдшоуто + Видео плейър + секунди Страница - Неуспешно изтриване - Избрани - Музика + 10 секунди + Галерия + Без име + Изображения Избледняване - 2 секунди - Операцията е неуспешна - Разбъркано - Отказ Редактиране - Изображения + 5 секунди + Изтрито Премахване? - Видеоклипове - Интервал на слайдшоуто - Слайдшоу - Активиране - Без име - Име на албума вече се изп. - Няма елементи - 10 секунди - Вече съществува - Щори - Повтаряне - Избери всички - Видео плейър - секунди + Вече съществува. Презапис? + Изтриване... + Готово 3 секунди + Материал камера + Повтаряне + Записан + Размиване + Разбъркано + Преместване Неуспешно преместване + Видеоклипове + Завършено + Изб.всички Всички албуми - 20 секунди - Достигнат е максималният брой знаци (%d) - Зум - Галерия - 5 секунди - Размиване - Не може да се преименува - Видеоклип - Не може да се преименува. Името на албума вече се използва - Субтитри - Слайдшоу - Изтеглени файлове - Създаване на папка? Промяна на име - Слайд Премести + Невъзможно изтриване Интервал - Завършено - Изтриване? - Редактиране - Достигнат е максималният брой знаци (%d) - Готово + Вече съществува + Създаване на албум + Няма елементи + Щори + Запазване неуспешно diff --git a/res/cat-ES.xml b/res/cat-ES.xml index a031be6..0cdf600 100644 --- a/res/cat-ES.xml +++ b/res/cat-ES.xml @@ -2,69 +2,81 @@ - + S'ha assolit el nombre màxim de caràcters + Presentació de diapositives + Seleccioni-ho tot + Esborrar? + Editar + Missatge + S'està processant... + Descàrregues + Nom d'àlbum ja en ús + 20 segons + Activació + 2 segons + Missatges + Finalit. + No es pot canviar nom + Correu electrònic + Mogut + Cancel·lar + Seleccionat Esborrar - Àlbums + Subtítols + Cancel·lar + S'ha assolit el nombre màxim de caràcters (%d) + S'ha assolit el nombre màxim de caràcters (%d) + Diaposit + Diapositiva %s ja existeix - Rodet càmera - Crear àlbum + Carregant... + Àlbums + No es pot canviar el nom. El nom d'àlbum ja està en ús + Desant... + Operació fallida Efecte de transició - Cancel·lar + Música + Crear carpeta? + Error en esborrar + Vídeo + Zoom Iris - Ja existeix. Sobreescriure? - Correu electrònic - No es pot esborrar - Selec tot + Interval de la presentació de diapositives + Reproductor de vídeo + segons Pàgina - Error en esborrar - Seleccionat - Música + 10 segons + Galeria + Sense nom + Imatges Perdre intensitat - 2 segons - Operació fallida - Ordre aleatori - Cancel·lar Editar - Imatges + 5 segons + Esborrat Eliminar? - Vídeos - Interval de la presentació de diapositives - Diaposit - Activació - Sense nom - Nom d'àlbum ja en ús - No hi ha elements - 10 segons - Ja existeix - Persiana - Repetir - Seleccioni-ho tot - Reproductor de vídeo - segons + Ja existeix. Sobreescriure? + Esborrant... + Finalitzat 3 segons + Rodet càmera + Repetir + Desat + Dissoldre + Ordre aleatori + Movent... Error en moure + Vídeos + Completat + Selec tot Tots els àlbums - 20 segons - S'ha assolit el nombre màxim de caràcters (%d) - Zoom - Galeria - 5 segons - Dissoldre - No es pot canviar nom - Vídeo - No es pot canviar el nom. El nom d'àlbum ja està en ús - Subtítols - Presentació de diapositives - Descàrregues - Crear carpeta? Canviar nom - Diapositiva Moure + No es pot esborrar Interval - Completat - Esborrar? - Editar - S'ha assolit el nombre màxim de caràcters (%d) - Finalit. + Ja existeix + Crear àlbum + No hi ha elements + Persiana + Error en desar diff --git a/res/ces-CZ.xml b/res/ces-CZ.xml index 481fbcc..8a77237 100644 --- a/res/ces-CZ.xml +++ b/res/ces-CZ.xml @@ -2,69 +2,81 @@ - + Bylo dosaženo maximálního počtu znaků + Prezentace + Vybrat vše + Odstranit? + Upravit + Zpráva + Probíhá zpracování... + Stažené položky + Název alba je již použit + 20 sekund + Aktivace + 2 sekund + Zprávy + Hotovo + Nelze přejmenovat + E-mail + Přesunuto + Zrušit + Vybráno Odstranit - Alba + Titulky + Zrušit + Bylo dosaženo maximálního počtu znaků (%d) + Bylo dosaženo maximálního počtu znaků (%d) + Prezent. + Sklouznutí %s již existuje - Soubory z fot. - Vytvořit album + Nahrávám... + Alba + Nelze přejmenovat. Název alba je již použit + Ukládání... + Otevření se nezdařilo Přechodový efekt - Zrušit + Hudba + Chcete vytvořit složku? + Odstranění se nezdařilo + Video + Přiblížení Duha - Již existuje. Přepsat? - E-mail - Nelze odstranit - Vybrat vše + Interval prezentace + Videopřeh. + sekundy Stránka - Odstranění se nezdařilo - Vybráno - Hudba + 10 sekund + Galerie + Žádný název + Obrázky Zvolna mizet - 2 sekund - Otevření se nezdařilo - Náhodně - Zrušit Upravit - Obrázky + 5 sekund + Odstraněno Odstranit? - Videa - Interval prezentace - Prezent. - Aktivace - Žádný název - Název alba je již použit - Žádné položky - 10 sekund - Již existuje - Roleta - Opakovat - Vybrat vše - Videopřeh. - sekundy + Již existuje. Přepsat? + Odstraňování... + Hotovo 3 sekundy + Soubory z fot. + Opakovat + Uloženo + Rozplynout + Náhodně + Probíhá přesouvání Přesunutí se nezdařilo + Videa + Dokončeno + Vybrat vše Všechna alba - 20 sekund - Bylo dosaženo maximálního počtu znaků (%d) - Přiblížení - Galerie - 5 sekund - Rozplynout - Nelze přejmenovat - Video - Nelze přejmenovat. Název alba je již použit - Titulky - Prezentace - Stažené položky - Chcete vytvořit složku? Změnit název - Sklouznutí Přesunout + Nelze odstranit Interval - Dokončeno - Odstranit? - Upravit - Bylo dosaženo maximálního počtu znaků (%d) - Hotovo + Již existuje + Vytvořit album + Žádné položky + Roleta + Uložení se nezdařilo diff --git a/res/dan-DK.xml b/res/dan-DK.xml index f6acc35..4789886 100644 --- a/res/dan-DK.xml +++ b/res/dan-DK.xml @@ -2,69 +2,81 @@ - + Det maksimale antal tegn er nået + Diasshow + Vælg alle + Slet? + Redigér + Meddelelse + Arbejder... + Downloads + Albumnavn allerede i brug + 20 sekunder + Aktivering + 2 sekunder + Meddelelser + Udført + Kunne ikke omdøbe + E-mail + Flyttet + Annullér + Valgte Slet - Albums + Undertekster + Annullér + Det maksimale antal tegn (%d) er nået + Det maksimale antal tegn (%d) er nået + Diasshow + Dias %s eksisterer allerede - Kamerarolle - Opret album + Indlæser data ... + Albums + Kan ikke omdøbe. Albumnavn allerede i brug + Gemmer... + Handlingen mislykkedes Overgangseffekt - Annullér + Musik + Opret mappe? + Sletning mislykkedes + Videoklip + Zoom Iris - Findes allerede. Vil du overskrive? - E-mail - Kunne ikke slette - Vælg alle + Interval for diasshow + Videoafspiller + sekunder Side - Sletning mislykkedes - Valgte - Musik + 10 sekunder + Galleri + Intet navn + Billeder Tone ud - 2 sekunder - Handlingen mislykkedes - Bland - Annullér Redigér - Billeder + 5 sekunder + Slettet Fjern? - Videoklip - Interval for diasshow - Diasshow - Aktivering - Intet navn - Albumnavn allerede i brug - Ingen elementer - 10 sekunder - Findes allerede - Afblænd - Gentag - Vælg alle - Videoafspiller - sekunder + Findes allerede. Vil du overskrive? + Sletter ... + Udført 3 sekunder + Kamerarolle + Gentag + Gemt + Opløs + Bland + Flytter ... Flytning mislykkedes + Videoklip + Udført + Vælg alle Alle album - 20 sekunder - Det maksimale antal tegn (%d) er nået - Zoom - Galleri - 5 sekunder - Opløs - Kunne ikke omdøbe - Videoklip - Kan ikke omdøbe. Albumnavn allerede i brug - Undertekster - Diasshow - Downloads - Opret mappe? Skift navn - Dias Flyt + Kunne ikke slette Interval - Udført - Slet? - Redigér - Det maksimale antal tegn (%d) er nået - Udført + Findes allerede + Opret album + Ingen elementer + Afblænd + Kunne ikke gemme diff --git a/res/deu-DE.xml b/res/deu-DE.xml index 53657d0..a6b78f5 100644 --- a/res/deu-DE.xml +++ b/res/deu-DE.xml @@ -2,69 +2,81 @@ - + Maximal zulässige Zeichenanzahl erreicht. + Diashow + Alle auswählen + Löschen? + Bearbeiten + Nachricht + Wird verarbeitet... + Downloads + Albumn. wird bereits verw. + 20 Sekunden + Aktivierung + 2 Sekunden + Nachrichten + OK + Umbenennen nicht möglich + E-Mail + Verschoben + Abbrechen + Ausgewählt Löschen - Alben + Untertitel + Abbrechen + Maximale Anzahl an Zeichen (%d) erreicht. + Maximale Anzahl an Zeichen (%d) erreicht. + Diashow + Gleiten %s ist bereits vorhanden - Filmrolle - Album erstellen + Lädt... + Alben + Umbenennen nicht möglich. Albumname wird bereits verwendet + Speichern... + Vorgang fehlgeschlagen Übergangseffekt - Abbrechen + Musik + Ordner erstellen? + Löschen fehlgeschlagen + Video + Zoom Iris - Bereits vorhanden. Überschreiben? - E-Mail - Kann nicht gelöscht werden - Alle ausw. + Diashowintervall + Video-Player + Sekunden Seite - Löschen fehlgeschlagen - Ausgewählt - Musik + 10 Sekunden + Galerie + Kein Name + Eigene Bilder Ausblenden - 2 Sekunden - Vorgang fehlgeschlagen - Zufallswiedergabe - Abbrechen Bearbeiten - Eigene Bilder + 5 Sekunden + Gelöscht Entfernen? - Videos - Diashowintervall - Diashow - Aktivierung - Kein Name - Albumn. wird bereits verw. - Keine Elemente - 10 Sekunden - Bereits vorhanden - Blenden - Wiederholen - Alle auswählen - Video-Player - Sekunden + Bereits vorhanden. Überschreiben? + Löschen... + OK 3 Sekunden + Filmrolle + Wiederholen + Gespeichert + Auflösen + Zufallswiedergabe + Verschiebevorgang aktiv... Verschieben fehlgeschlagen + Videos + Abgeschlossen + Alle ausw. Alle Alben - 20 Sekunden - Maximale Anzahl an Zeichen (%d) erreicht. - Zoom - Galerie - 5 Sekunden - Auflösen - Umbenennen nicht möglich - Video - Umbenennen nicht möglich. Albumname wird bereits verwendet - Untertitel - Diashow - Downloads - Ordner erstellen? Name ändern - Gleiten Verschieben + Kann nicht gelöscht werden Intervall - Abgeschlossen - Löschen? - Bearbeiten - Maximale Anzahl an Zeichen (%d) erreicht. - OK + Bereits vorhanden + Album erstellen + Keine Elemente + Blenden + Speichern fehlgeschlagen diff --git a/res/ell-GR.xml b/res/ell-GR.xml index a38ebaa..0eba217 100644 --- a/res/ell-GR.xml +++ b/res/ell-GR.xml @@ -2,69 +2,81 @@ - + Ο μέγιστος αριθμός χαρακτήρων συμπληρώθηκε + Παρουσίαση + Επιλογή όλων + Διαγραφή; + Επεξεργασία + Μήνυμα + Επεξεργασία... + Λήψεις + Το όνομα άλμπουμ χρησ. ήδη + 20 δευτερόλεπτα + Ενεργοποίηση + 2 δευτερόλεπτα + Μηνύματα + Ok + Δεν είναι δυνατή η μετονομασία + Email + Μετακινήθηκε + Ακύρωση + Επιλεγμένο Διαγραφή - Άλμπουμ + Υπότιτλοι + Ακύρωση + Συμπληρώθηκε ο μέγιστος αριθμός χαρακτήρων (%d) + Συμπληρώθηκε ο μέγιστος αριθμός χαρακτήρων (%d) + Παρ/σίαση + Διαφάνεια Το αρχείο %s υπάρχει ήδη - Λήψεις με κάμερα - Δημιουργία άλμπουμ + Φόρτωση... + Άλμπουμ + Δεν είναι δυνατή η μετονομασία. To όνομα άλμπουμ χρησιμοποιείται ήδη + Aποθήκευση... + Λειτουργία απέτυχε Εφέ μετάβασης - Ακύρωση + Μουσική + Δημιουργία φακέλου; + Αποτυχία διαγραφής + Προσθήκη βίντεο + Ζουμ Ίριδα - Υπάρχει ήδη. Αντικατάσταση; - Email - Δεν είναι δυνατή η διαγραφή - Επιλ. όλων + Διάστημα παρουσίασης + Αναπαραγωγή Βίντεο + δευτ. Σελίδα - Αποτυχία διαγραφής - Επιλεγμένο - Μουσική + 10 δευτερόλεπτα + Συλλογή + Κανένα όνομα + Εικόνες Σταδιακή εμφάνιση - 2 δευτερόλεπτα - Λειτουργία απέτυχε - Τυχαία σειρά - Ακύρωση Επεξεργασία - Εικόνες + 5 δευτερόλεπτα + Διαγράφηκε Αφαίρεση; - Βίντεο - Διάστημα παρουσίασης - Παρ/σίαση - Ενεργοποίηση - Κανένα όνομα - Το όνομα άλμπουμ χρησ. ήδη - Κανένα στοιχείο - 10 δευτερόλεπτα - Υπάρχει ήδη - Ρολό - Επανάληψη - Επιλογή όλων - Αναπαραγωγή Βίντεο - δευτ. + Υπάρχει ήδη. Αντικατάσταση; + Διαγραφή... + Τέλος 3 δευτερόλεπτα + Λήψεις με κάμερα + Επανάληψη + Αποθηκεύτηκε + Αποσύνθεση + Τυχαία σειρά + Μετακίνηση... Αποτυχία μετακίνησης + Βίντεο + Ολοκληρώθηκε + Επιλ. όλων Όλα τα άλμπουμ - 20 δευτερόλεπτα - Συμπληρώθηκε ο μέγιστος αριθμός χαρακτήρων (%d) - Ζουμ - Συλλογή - 5 δευτερόλεπτα - Αποσύνθεση - Δεν είναι δυνατή η μετονομασία - Προσθήκη βίντεο - Δεν είναι δυνατή η μετονομασία. To όνομα άλμπουμ χρησιμοποιείται ήδη - Υπότιτλοι - Παρουσίαση - Λήψεις - Δημιουργία φακέλου; Αλλαγή ονόματος - Διαφάνεια Μετακίνηση + Δεν είναι δυνατή η διαγραφή Διάστημα - Ολοκληρώθηκε - Διαγραφή; - Επεξεργασία - Συμπληρώθηκε ο μέγιστος αριθμός χαρακτήρων (%d) - Ok + Υπάρχει ήδη + Δημιουργία άλμπουμ + Κανένα στοιχείο + Ρολό + Αποτυχία αποθήκευσης diff --git a/res/eng-GB.xml b/res/eng-GB.xml index 5588221..b92e76c 100644 --- a/res/eng-GB.xml +++ b/res/eng-GB.xml @@ -2,69 +2,81 @@ - + Maximum number of characters reached + Slide show + Select all + Delete? + Edit + Message + Processing... + Downloads + Album name already in use + 20 seconds + Activation + 2 seconds + Messages + Done + Unable to rename + Email + Moved + Cancel + Selected Delete - Albums + Subtitles + Cancel + Maximum number of characters (%d) reached + Maximum number of characters (%d) reached + Slide show + Slide %s already exists - Camera roll - Create album + Loading... + Albums + Unable to rename. Album name already in use. + Saving... + Operation failed Transition effect - Cancel + Music + Create folder? + Delete failed + Video + Zoom Iris - Already exists. Overwrite? - Email - Unable to delete - Select all + Slideshow interval + Video Player + seconds Page - Delete failed - Selected - Music + 10 seconds + Gallery + No name + Images Fade - 2 seconds - Operation failed - Shuffle - Cancel Edit - Images + 5 seconds + Deleted Remove? - Videos - Slideshow interval - Slide show - Activation - No name - Album name already in use - No items - 10 seconds - Already exists - Blind - Repeat - Select all - Video Player - seconds + Already exists. Overwrite? + Deleting... + Done 3 seconds + Camera roll + Repeat + Saved + Dissolve + Shuffle + Moving... Moving failed + Videos + Completed + Select all All albums - 20 seconds - Maximum number of characters (%d) reached - Zoom - Gallery - 5 seconds - Dissolve - Unable to rename - Video - Unable to rename. Album name already in use - Subtitles - Slide show - Downloads - Create folder? Change name - Slide Move + Unable to delete Interval - Completed - Delete? - Edit - Maximum number of characters (%d) reached - Done + Already exists + Create album + No items + Blind + Saving failed diff --git a/res/eng-PH.xml b/res/eng-PH.xml index 5588221..8de9983 100644 --- a/res/eng-PH.xml +++ b/res/eng-PH.xml @@ -2,69 +2,81 @@ - + Maximum number of characters reached + Slide show + Select all + Delete? + Edit + Message + Processing... + Downloads + Album name already in use + 20 seconds + Activation + 2 seconds + Messages + Done + Unable to rename + Email + Moved + Cancel + Selected Delete - Albums + Subtitles + Cancel + Maximum number of characters (%d) reached + Maximum number of characters (%d) reached + Slide show + Slide %s already exists - Camera roll - Create album + Loading... + Albums + Unable to rename. Album name already in use + Saving... + Operation failed Transition effect - Cancel + Music + Create folder? + Delete failed + Video + Zoom Iris - Already exists. Overwrite? - Email - Unable to delete - Select all + Slideshow interval + Video Player + seconds Page - Delete failed - Selected - Music + 10 seconds + Gallery + No name + Images Fade - 2 seconds - Operation failed - Shuffle - Cancel Edit - Images + 5 seconds + Deleted Remove? - Videos - Slideshow interval - Slide show - Activation - No name - Album name already in use - No items - 10 seconds - Already exists - Blind - Repeat - Select all - Video Player - seconds + Already exists. Overwrite? + Deleting... + Done 3 seconds + Camera roll + Repeat + Saved + Dissolve + Shuffle + Moving... Moving failed + Videos + Completed + Select all All albums - 20 seconds - Maximum number of characters (%d) reached - Zoom - Gallery - 5 seconds - Dissolve - Unable to rename - Video - Unable to rename. Album name already in use - Subtitles - Slide show - Downloads - Create folder? Change name - Slide Move + Unable to delete Interval - Completed - Delete? - Edit - Maximum number of characters (%d) reached - Done + Already exists + Create album + No items + Blind + Saving failed diff --git a/res/eng-US.xml b/res/eng-US.xml index ee937cf..6eb85df 100644 --- a/res/eng-US.xml +++ b/res/eng-US.xml @@ -2,69 +2,81 @@ - + Maximum number of characters reached + Slide show + Select all + Delete? + Edit + Message + Processing... + Downloads + Album name already in use + 20 seconds + Activation + 2 seconds + Messages + Done + Unable to rename + Email + Moved + Cancel + Selected Delete - Albums + Subtitles + Cancel + Maximum number of characters (%d) reached + Maximum number of characters (%d) reached + Slide show + Slide %s already exists - Camera roll - Create album + Loading... + Albums + Unable to rename. Album name already in use + Saving... + Operation failed Transition effect - Cancel + Music + Create folder? + Delete failed + Video + Zoom Iris - Already exists. Overwrite? - Email - Unable to delete - Select all + Slideshow interval + Video Player + Seconds Page - Delete failed - Selected - Music + 10 seconds + Gallery + No name + Images Fade - 2 seconds - Operation failed - Shuffle - Cancel Edit - Images + 5 seconds + Deleted Delete? - Videos - Slideshow interval - Slide show - Activation - No name - Album name already in use - No items - 10 seconds - Already exists - Blind - Repeat - Select all - Video Player - Seconds + Already exists. Overwrite? + Deleting... + Done 3 seconds + Camera roll + Repeat + Saved + Dissolve + Shuffle + Moving... Moving failed + Videos + Completed + Select all All albums - 20 seconds - Maximum number of characters (%d) reached - Zoom - Gallery - 5 seconds - Dissolve - Unable to rename - Video - Unable to rename. Album name already in use - Subtitles - Slide show - Downloads - Create folder? Change name - Slide Move + Unable to delete Interval - Completed - Delete? - Edit - Maximum number of characters (%d) reached - Done + Already exists + Create album + No items + Blind + Saving failed diff --git a/res/est-EE.xml b/res/est-EE.xml index 8e48d4e..e5ea749 100644 --- a/res/est-EE.xml +++ b/res/est-EE.xml @@ -2,69 +2,81 @@ - + Lubatud arv märke on täis + Slaidiseanss + Vali kõik + Kustutada? + Muuda + Sõnum + Töötlemine... + Allalaet. failid + Albumi nimi juba kasutusel + 20 sekundit + Aktiveerimine + 2 sekundit + Sõnumid + Valmis + Ei saa ümber nimetada + E-post + Teisaldatud + Tühista + Valitud Kustuta - Albumid + Subtiitrid + Tühista + Maksimaalne tähemärkide arv (%d) on saavutatud + Maksimaalne tähemärkide arv (%d) on saavutatud + Slaidis. + Slaid %s on juba olemas - Kaamera rullik - Loo album + Laadimine... + Albumid + Ei saa ümber nimetada. Albumi nimi on juba kasutusel + Salvestamine... + Toiming nurjus Ülemineku efekt - Tühista + Muusika + Kas luua kaust? + BT-peakomplekt sees + Video + Suumi Iiris - On juba olemas. Kas kirjutada üle? - E-post - Ei saa kustutada - Vali kõik + Slaidiseansi intervall + Videomängija + sekundit Lehekülg - BT-peakomplekt sees - Valitud - Muusika + 10 sekundit + Galerii + Nimi puudub + Pildid Hajumine - 2 sekundit - Toiming nurjus - Juhuesitus - Tühista Muuda - Pildid + 5 sekundit + Kustutatud Eemaldada? - Videod - Slaidiseansi intervall - Slaidis. - Aktiveerimine - Nimi puudub - Albumi nimi juba kasutusel - Üksusi ei ole - 10 sekundit - Juba olemas - Vari - Korda - Vali kõik - Videomängija - sekundit + On juba olemas. Kas kirjutada üle? + Kustutamine... + Valmis 3 sekundit + Kaamera rullik + Korda + Salvestatud + Lahuta + Juhuesitus + Teisaldamine... Teisaldamine nurjus + Videod + Lõpule viidud + Vali kõik Kõik albumid - 20 sekundit - Maksimaalne tähemärkide arv (%d) on saavutatud - Suumi - Galerii - 5 sekundit - Lahuta - Ei saa ümber nimetada - Video - Ei saa ümber nimetada. Albumi nimi on juba kasutusel - Subtiitrid - Slaidiseanss - Allalaet. failid - Kas luua kaust? Muuda nime - Slaid Teisalda + Ei saa kustutada Intervall - Lõpule viidud - Kustutada? - Muuda - Maksimaalne tähemärkide arv (%d) on saavutatud - Valmis + Juba olemas + Loo album + Üksusi ei ole + Vari + Salvestamine nurjus diff --git a/res/eus-ES.xml b/res/eus-ES.xml index f4bb149..5bd2fe7 100644 --- a/res/eus-ES.xml +++ b/res/eus-ES.xml @@ -2,69 +2,81 @@ - + Gehienezko karaktere kopurura heldu zara + Diapositiba aurkezpena + Denak aukeratu + Ezabatu? + Editatu + Mezua + Prozesatzen... + Deskargak + Izen hori erabilia dago + 20 segundo + Aktibazioa + 2 segundo + Mezuak + Amaituta + Ezin da berrizendatu + Posta elektroniko mezuak + Mugitua + Ezeztatu + Aukeratutakoa(k) Ezabatu - Albumak + Azpitituluak + Ezeztatu + Gehienezko karaktere kopurura (%d) iritsi zara + Gehienezko karaktere kopurura (%d) iritsi zara + Erakusketa + Diapositiba %s dagoeneko bada - Kamera erroilua - Albuma sortu + Kargatzen... + Albumak + Ezin zaio izen berria jarri. Izen hori erabilia dago + Gordetzen + Eragiketak huts egin du Trantsizio efektua - Ezeztatu + Musika + Karpeta sortu? + Akatsa ezabatzerakoan + Bideoa + Zooma Irisa - Dagoeneko bada. Berridatzi? - Posta elektroniko mezuak - Ezin da ezabatu - Haut. den. + Aurkzpen tartea + Bideo Jogailua + segundoak Orria - Akatsa ezabatzerakoan - Aukeratutakoa(k) - Musika + 10 segundo + Galeria + Izenik gabe + Irudiak Koloregabetu - 2 segundo - Eragiketak huts egin du - Ausazko ordena - Ezeztatu Editatu - Irudiak + 5 segundo + Ezabatua Kendu? - Bideoak - Aurkzpen tartea - Erakusketa - Aktibazioa - Izenik gabe - Izen hori erabilia dago - Elementurik ez - 10 segundo - Dagoeneko badago - Itsua - Errepikatu - Denak aukeratu - Bideo Jogailua - segundoak + Dagoeneko bada. Berridatzi? + Ezabatzen... + Amaituta 3 segundo + Kamera erroilua + Errepikatu + Gordeta + Disolbatu + Ausazko ordena + Mugitzen... Errorea mugitzerakoan + Bideoak + Osatua + Haut. den. Album guztiak - 20 segundo - Gehienezko karaktere kopurura (%d) iritsi zara - Zooma - Galeria - 5 segundo - Disolbatu - Ezin da berrizendatu - Bideoa - Ezin zaio izen berria jarri. Izen hori erabilia dago - Azpitituluak - Diapositiba aurkezpena - Deskargak - Karpeta sortu? Izena aldatu - Diapositiba Mugitu + Ezin da ezabatu Tartea - Osatua - Ezabatu? - Editatu - Gehienezko karaktere kopurura (%d) iritsi zara - Amaituta + Dagoeneko badago + Albuma sortu + Elementurik ez + Itsua + Errorea gordetzerakoan diff --git a/res/fin-FI.xml b/res/fin-FI.xml index b272c09..b35ac55 100644 --- a/res/fin-FI.xml +++ b/res/fin-FI.xml @@ -2,69 +2,81 @@ - + Merkkien enimmäismäärä saavutettu + Diaesitys + Valitse kaikki + Poistetaanko? + Muokkaa + Viesti + Käsitellään... + Lataukset + Albumin nimi jo käytössä + 20 sekuntia + Aktivointi + 2 sekuntia + Viestit + Valmis + Ei voi nimetä uudelleen + Sähköposti + Siirretty + Peruuta + Valittu Poista - Albumit + Tekstitys + Peruuta + Merkkien enimmäismäärä (%d) on saavutettu + Merkkien enimmäismäärä (%d) on saavutettu + Diaesitys + Dia %s on jo olemassa - Kamerarulla - Luo albumi + Ladataan... + Albumit + Ei voi nimetä uudelleen. Albumin nimi on jo käytössä + Tallennetaan... + Toiminto epäonnistui Siirtymätehoste - Peruuta + Musiikki + Luodaanko kansio? + Poisto epäonnistui + Video + Zoomaus Iris - On jo olemassa. Päivitetäänkö? - Sähköposti - Ei voi poistaa - V. kaikki + Kuvaesityksen aikaväli + Videosoitin + sekuntia Sivu - Poisto epäonnistui - Valittu - Musiikki + 10 sekuntia + Galleria + Ei nimeä + Kuvat Häivytä - 2 sekuntia - Toiminto epäonnistui - Sekoitus - Peruuta Muokkaa - Kuvat + 5 sekuntia + Poistettu Poistetaanko? - Videot - Kuvaesityksen aikaväli - Diaesitys - Aktivointi - Ei nimeä - Albumin nimi jo käytössä - Ei kohteita - 10 sekuntia - On jo olemassa - Kaihdin - Toista - Valitse kaikki - Videosoitin - sekuntia + On jo olemassa. Päivitetäänkö? + Poistetaan... + Tehty 3 sekuntia + Kamerarulla + Toista + Tallennettu + Ristikuva + Sekoitus + Siirretään... Siirto epäonnistui + Videot + Valmis + V. kaikki Kaikki albumit - 20 sekuntia - Merkkien enimmäismäärä (%d) on saavutettu - Zoomaus - Galleria - 5 sekuntia - Ristikuva - Ei voi nimetä uudelleen - Video - Ei voi nimetä uudelleen. Albumin nimi on jo käytössä - Tekstitys - Diaesitys - Lataukset - Luodaanko kansio? Vaihda nimi - Dia Siirrä + Ei voi poistaa Väli - Valmis - Poistetaanko? - Muokkaa - Merkkien enimmäismäärä (%d) on saavutettu - Valmis + On jo olemassa + Luo albumi + Ei kohteita + Kaihdin + Tallentaminen epäonnistui diff --git a/res/fra-CA.xml b/res/fra-CA.xml index f4ed3f7..d7f41d9 100644 --- a/res/fra-CA.xml +++ b/res/fra-CA.xml @@ -2,69 +2,81 @@ - + Nb. max. de caractères atteint + Diaporama + Sélectionner tout + Supprimer ? + Modifier + Message + Traitement... + Télécharg. + Nom d'album déjà utilisé + 20 secondes + Activation + 2 secondes + Messages + OK + Impossible de renommer l'élément + Courriel + Déplacé + Annuler + Sélectionné Supprimer - Albums + Sous-titres + Annuler + Nombre maximum de caractères (%d) atteint + Nombre maximum de caractères (%d) atteint + Diaporama + Diapo %s existe déjà - Pellicule - Créer un album + Chargement... + Albums + Impossible de renommer l'élément. Nom d'album déjà utilisé + Enregistrement ... + Échec de l'opération Effet de transition - Annuler + Musique + Créer un dossier ? + Échec de suppression + Vidéo + Zoom Iris - Existe déjà. L'écraser? - Courriel - Suppression impossible - Sélectionner tout + Intervalle du diaporama + Lecteur vidéo + secondes Page - Échec de suppression - Sélectionné - Musique + 10 secondes + Galerie + Aucun nom + Images Fondu - 2 secondes - Échec de l'opération - Mode aléatoire - Annuler Modifier - Images + 5 secondes + Supprimé Retirer? - Vidéos - Intervalle du diaporama - Diaporama - Activation - Aucun nom - Nom d'album déjà utilisé - Aucun élément - 10 secondes - Existe déjà - Stores vénitiens - Répéter - Sélectionner tout - Lecteur vidéo - secondes + Existe déjà. L'écraser? + Suppression ... + OK 3 secondes + Pellicule + Répéter + Enregistré + Fondu enchainé + Mode aléatoire + Déplacement... Échec du déplacement + Vidéos + OK + Sélectionner tout Tous les albums - 20 secondes - Nombre maximum de caractères (%d) atteint - Zoom - Galerie - 5 secondes - Fondu enchainé - Impossible de renommer l'élément - Vidéo - Impossible de renommer l'élément. Nom d'album déjà utilisé - Sous-titres - Diaporama - Télécharg. - Créer un dossier ? Modifier le nom - Diapo Déplacer + Suppression impossible Intervalle - OK - Supprimer ? - Modifier - Nombre maximum de caractères (%d) atteint - OK + Existe déjà + Créer un album + Aucun élément + Stores vénitiens + Échec de l'enregistrement diff --git a/res/fra-FR.xml b/res/fra-FR.xml index 5435fc3..84286a9 100644 --- a/res/fra-FR.xml +++ b/res/fra-FR.xml @@ -2,69 +2,81 @@ - + Nb. max. de caractères atteint + Diaporama + Sélect. tout + Supprimer ? + Modifier + Message + Traitement... + Téléchargements + Nom d'album déjà utilisé + 20 secondes + Activation + 2 secondes + Messages + Effectué + Impossible de renommer l'élément + Email + Déplacé + Annuler + Sélectionné Supprimer - Albums + Sous-titres + Annuler + Le nombre maximum de caractères (%d) est atteint + Le nombre maximum de caractères (%d) est atteint + Diaporama + Défilement %s existe déjà - Pellicule - Créer un album + Chargement... + Albums + Impossible de renommer l'élément. Nom d'album déjà utilisé + Enregistrement... + Échec de l'opération Effet de transition - Annuler + Musique + Créer un dossier ? + Échec de suppression + Vidéo + Zoom Iris - Existe déjà. L' écraser ? - Email - Suppression impossible - Sélect. tt + Intervalle du diaporama + Lecteur vidéo + secondes Page - Échec de suppression - Sélectionné - Musique + 10 secondes + Galerie + Aucun nom + Images Fondu - 2 secondes - Échec de l'opération - Mode aléatoire - Annuler Modifier - Images + 5 secondes + Supprimé Supprimer ? - Vidéos - Intervalle du diaporama - Diaporama - Activation - Aucun nom - Nom d'album déjà utilisé - Aucun élément - 10 secondes - Existe déjà - Stores vénitiens - Répéter - Sélect. tout - Lecteur vidéo - secondes + Existe déjà. L' écraser ? + Suppression... + Effectué 3 secondes + Pellicule + Répéter + Enregistré + Fondu enchaîné + Mode aléatoire + Déplacement... Échec du déplacement + Vidéos + OK + Sélect. tt Tous les albums - 20 secondes - Le nombre maximum de caractères (%d) est atteint - Zoom - Galerie - 5 secondes - Fondu enchaîné - Impossible de renommer l'élément - Vidéo - Impossible de renommer l'élément. Nom d'album déjà utilisé - Sous-titres - Diaporama - Téléchargements - Créer un dossier ? Modifier le nom - Défilement Déplacer + Suppression impossible Intervalle - OK - Supprimer ? - Modifier - Le nombre maximum de caractères (%d) est atteint - Effectué + Existe déjà + Créer un album + Aucun élément + Stores vénitiens + Échec de l'enregistrement diff --git a/res/gle-IE.xml b/res/gle-IE.xml index bf5b8c8..5674d1b 100644 --- a/res/gle-IE.xml +++ b/res/gle-IE.xml @@ -2,69 +2,81 @@ - + Uaslíon na gcarachtar bainte amach + Taispeántas sleamhnán + Roghnaigh gach + Scrios? + Cuir in eagar + Teachtaireacht + Ag próiseáil... + Ioslódálacha + Ainm albaim in úsáid cheana + 20 soicind + Gníomhachtú + 2 shoicind + Teachtaireachtaí + Déanta + Ní féidir athainmniú + R-phost + Bogtha + Cuir ar ceal + Roghnaithe Scrios - Albaim + Fotheidil + Cuir ar ceal + Uaslíon na gcarachtar (%d) bainte amach + Uaslíon na gcarachtar (%d) bainte amach + Sleamhnán + Sleamhnán Tá %s ann cheana - Rolla ceamara - Déan albam + Ag lódáil... + Albaim + Ní féidir athainmniú. Ainm an albaim in úsáid cheana + Ag sábháil... + Theip ar oibríocht Maisíocht trasdula - Cuir ar ceal + Ceol + Déan fillteán? + Theip ar scriosadh + Físeán + Zúmáil Feileastram - Ann cheana. Forscríobh? - R-phost - Ní féidir scriosadh - Rogh. gach + Eatramh taispeántais sleamhnán + Seinnteoir Físeán + soicindí Leathanach - Theip ar scriosadh - Roghnaithe - Ceol + 10 soicind + Gailearaí + Níl ainm ann + Íomhánna Céimnigh - 2 shoicind - Theip ar oibríocht - Suaitheadh - Cuir ar ceal Cuir in eagar - Íomhánna + 5 shoicind + Scriosta Bain? - Físeáin - Eatramh taispeántais sleamhnán - Sleamhnán - Gníomhachtú - Níl ainm ann - Ainm albaim in úsáid cheana - Níl míreanna ann - 10 soicind - Ann cheana - Dallóg - Déan arís - Roghnaigh gach - Seinnteoir Físeán - soicindí + Ann cheana. Forscríobh? + Ag scriosadh... + Déanta 3 shoicind + Rolla ceamara + Déan arís + Sábháilte + Leáigh + Suaitheadh + Ag bogadh... Theip ar bhogadh + Físeáin + Curtha i gcrích + Rogh. gach Gach albam - 20 soicind - Uaslíon na gcarachtar (%d) bainte amach - Zúmáil - Gailearaí - 5 shoicind - Leáigh - Ní féidir athainmniú - Físeán - Ní féidir athainmniú. Ainm an albaim in úsáid cheana - Fotheidil - Taispeántas sleamhnán - Ioslódálacha - Déan fillteán? Athraigh ainm - Sleamhnán Bog + Ní féidir scriosadh Eatramh - Curtha i gcrích - Scrios? - Cuir in eagar - Uaslíon na gcarachtar (%d) bainte amach - Déanta + Ann cheana + Déan albam + Níl míreanna ann + Dallóg + Theip ar shábháil diff --git a/res/glg-ES.xml b/res/glg-ES.xml index ffbc26f..3aa8ca8 100644 --- a/res/glg-ES.xml +++ b/res/glg-ES.xml @@ -2,69 +2,81 @@ - + Número máximo de caracteres alcanzado + Presentación de diapositivas + Seleccionar todo + Eliminar? + Editar + Mensaxe + Procesando... + Descargas + Nome de álbum xa en uso + 20 segundos + Activación + 2 segundos + Mensaxes + Finalizado + Non se pode cambiar o nome + Correo electrónico + Movido + Cancelar + Seleccionado Eliminar - Álbums + Subtítulos + Cancelar + Alcanzouse o número máximo de carácteres (%d) + Alcanzouse o número máximo de carácteres (%d) + Diapos + Diapositiva %s xa existe - Rolo de cámara - Crear álbum + Cargando... + Álbums + Non se pode cambiar o nome. Nome de álbum xa en uso + Gardando... + Fallo na operación Efecto de transición - Cancelar + Música + Crear carpeta? + Erro ao eliminar + Vídeo + Zoom Iris - Xa existe. Sobrescribir? - Correo electrónico - Non se pode eliminar - Selec todo + Intervalo de presentación + Reprodutor de Vídeo + segundos Páxina - Erro ao eliminar - Seleccionado - Música + 10 segundos + Galería + Sen nome + Imaxes Atenuar - 2 segundos - Fallo na operación - Orde aleatoria - Cancelar Editar - Imaxes + 5 segundos + Eliminado Eliminar? - Vídeos - Intervalo de presentación - Diapos - Activación - Sen nome - Nome de álbum xa en uso - Sen elementos - 10 segundos - Xa existe - Persiana - Repetir - Seleccionar todo - Reprodutor de Vídeo - segundos + Xa existe. Sobrescribir? + Eliminando... + Finalizado 3 segundos + Rolo de cámara + Repetir + Gardado + Fundir + Orde aleatoria + Movendo... Erro ao mover + Vídeos + Completada + Selec todo Todos os álbums - 20 segundos - Alcanzouse o número máximo de carácteres (%d) - Zoom - Galería - 5 segundos - Fundir - Non se pode cambiar o nome - Vídeo - Non se pode cambiar o nome. Nome de álbum xa en uso - Subtítulos - Presentación de diapositivas - Descargas - Crear carpeta? Cambiar nome - Diapositiva Mover + Non se pode eliminar Intervalo - Completada - Eliminar? - Editar - Alcanzouse o número máximo de carácteres (%d) - Finalizado + Xa existe + Crear álbum + Sen elementos + Persiana + Erro ao gardar diff --git a/res/hin-IN.xml b/res/hin-IN.xml index 94545f5..cd373f2 100644 --- a/res/hin-IN.xml +++ b/res/hin-IN.xml @@ -2,69 +2,81 @@ - + वर्णो की संख्‍या अधिकतम पहुँची + स्लाइड शो + सभी चुनें + हटाएँ? + संपादित करें + सन्देश + कार्यवाही कर रहा है... + डाउनलोड + अल्बम नाम पहले से उपयोग में + 20 सेकंड + सक्रियण + 2 सेकंड + सन्देश + हुआ + नाम बदलने में अक्षम + ईमेल + ले जाया गया + रद्द करें + चुना गया हटाएँ - अल्बम्स + उपशीर्षक + रद्द करें + वर्णों की अधिकतम संख्या (%d) तक पहुँच गया + वर्णों की अधिकतम संख्या (%d) तक पहुँच गया + स्लाइड शो + स्लाइड %s पहले से मौजूद है - कैमरा रोल - अल्बम बनाएँ + लोड हो रहा है... + अल्बम्स + पुनर्नामित करने में अक्षम. अल्बम नाम पहले से उपयोग में + सुरक्षित हो रहा है... + कार्रवाई विफल परिवर्तन प्रभाव - रद्द करें + संगीत + फोल्डर बनाएं? + हटाना विफल + विडियो + ज़ूम आइरिस - पहले से मौजूद है। ओवरराइट करें? - ईमेल - हटाने में अक्षम - सभी चुनें + स्लाइड शो अंतराल + वीडियो प्‍लेयर + सेकेंड पेज - हटाना विफल - चुना गया - संगीत + 10 सेकंड + गैलरी + नाम नहीं + छवियाँ फीका - 2 सेकंड - कार्रवाई विफल - शफ़ल - रद्द करें संपादित करें - छवियाँ + 5 सेकंड + हटाया गया हटाएँ? - विडियो - स्लाइड शो अंतराल - स्लाइड शो - सक्रियण - नाम नहीं - अल्बम नाम पहले से उपयोग में - कोई मदें नहीं - 10 सेकंड - पहले से ही मौजूद - ब्लाइंड - दोहराव - सभी चुनें - वीडियो प्‍लेयर - सेकेंड + पहले से मौजूद है। ओवरराइट करें? + हटाया जा रहा है… + हुआ 3 सेकंड + कैमरा रोल + दोहराव + सुरक्षित किया + विलय + शफ़ल + ले जा रहा है… ले जाना विफल हुआ + विडियो + पूर्ण + सभी चुनें सभी एलबम्‍स - 20 सेकंड - वर्णों की अधिकतम संख्या (%d) तक पहुँच गया - ज़ूम - गैलरी - 5 सेकंड - विलय - नाम बदलने में अक्षम - विडियो - पुनर्नामित करने में अक्षम. अल्बम नाम पहले से उपयोग में - उपशीर्षक - स्लाइड शो - डाउनलोड - फोल्डर बनाएं? नाम बदलें - स्लाइड ले जाएँ + हटाने में अक्षम अन्तराल - पूर्ण - हटाएँ? - संपादित करें - वर्णों की अधिकतम संख्या (%d) तक पहुँच गया - हुआ + पहले से ही मौजूद + अल्बम बनाएँ + कोई मदें नहीं + ब्लाइंड + सेव करना विफल diff --git a/res/hrv-HR.xml b/res/hrv-HR.xml index 0890a0c..6974c57 100644 --- a/res/hrv-HR.xml +++ b/res/hrv-HR.xml @@ -2,69 +2,81 @@ - + Maks. broj znakova + Prezentacija + Odaberi sve + Obrisati? + Uredi + Poruka + Obrađuje se... + Skidanja + Već postoji naziv albuma + 20 sek + Uključivanje + 2 sek + Poruke + OK + Nemoguće preimenovati + Email + Premješteno + Prekid + Odabrano Obriši - Albumi + Titlovi + Prekid + Maksimalan broj znakova (%d) + Maksimalan broj znakova (%d) + Prezentacija + Listanje %s već postoji - Snimke kamere - Novi album + Učitavanje... + Albumi + Nemoguće preimenovati. Već postoji naziv albuma + Spremanje... + Neuspješno Efekt prijelaza - Prekid + Glazba + Nova mapa? + Brisanje neuspješno + Video + Zoom Iris - Već postoji. Piši preko? - Email - Brisanje nemoguće - Označi sve + Interval prezentacije + Video Player + sekundi Stranica - Brisanje neuspješno - Odabrano - Glazba + 10 sek + Album + Nema imena + Slike Zatamni - 2 sek - Neuspješno - Nasumično - Prekid Uredi - Slike + 5 sek + Obrisano Ukloniti? - Video - Interval prezentacije - Prezentacija - Uključivanje - Nema imena - Već postoji naziv albuma - Nema stavki - 10 sek - Već postoji - Roleta - Ponavljanje - Odaberi sve - Video Player - sekundi + Već postoji. Piši preko? + Brisanje... + OK 3 sek + Snimke kamere + Ponavljanje + Spremljeno + Razrijedi + Nasumično + Premještanje... Premještanje neuspješno + Video + Obavljeno + Označi sve Svi albumi - 20 sek - Maksimalan broj znakova (%d) - Zoom - Album - 5 sek - Razrijedi - Nemoguće preimenovati - Video - Nemoguće preimenovati. Već postoji naziv albuma - Titlovi - Prezentacija - Skidanja - Nova mapa? Promijenite ime - Listanje Premjesti + Brisanje nemoguće Interval - Obavljeno - Obrisati? - Uredi - Maksimalan broj znakova (%d) - OK + Već postoji + Novi album + Nema stavki + Roleta + Spremanje neuspješno diff --git a/res/hun-HU.xml b/res/hun-HU.xml index b4e5602..0aa619b 100644 --- a/res/hun-HU.xml +++ b/res/hun-HU.xml @@ -2,69 +2,81 @@ - + Nincs hely több karakternek + Diavetítés + Összes kijelölése + Törli? + Szerkeszt + Üzenet + Feldolgozás... + Letöltések + Ilyen albumnév már van + 20 másodperc + Aktivál + 2 másodperc + Üzenetek + Kész + Nem lehet átnevezni + E-mail + Áthelyezve + Mégse + Kiválasztott Töröl - Albumok + Feliratok + Mégse + Elérte a karakterek maximális számát (%d) + Elérte a karakterek maximális számát (%d) + Diavet. + Dia Már van %s nevű fájl - Filmszalag - Album létrehozása + Betöltés... + Albumok + Nem lehet átnevezni. Ilyen albumnév már van + Mentés... + Sikertelen művelet Áttűnés - Mégse + Zenék + Mappát hoz létre? + Törlés sikertelen + Videó + Nagyítás Írisz - Már létezik. Felülírja? - E-mail - Nem törölhető - Mind kijel. + Diabemutató intervalluma + Videolejátszó + másodperc Oldal - Törlés sikertelen - Kiválasztott - Zenék + 10 másodperc + Galéria + Nincs név + Képek Áttűnés - 2 másodperc - Sikertelen művelet - Véletlen sorrend - Mégse Szerkeszt - Képek + 5 másodperc + Törölve Törli? - Videók - Diabemutató intervalluma - Diavet. - Aktivál - Nincs név - Ilyen albumnév már van - Nincs tétel - 10 másodperc - Már létezik - Rács - Ismétlés - Összes kijelölése - Videolejátszó - másodperc + Már létezik. Felülírja? + Törlés... + Kész 3 másodperc + Filmszalag + Ismétlés + Mentve + Áttűnés + Véletlen sorrend + Áthelyezés... Az áthelyezés sikertelen + Videók + Kész + Mind kijel. Összes album - 20 másodperc - Elérte a karakterek maximális számát (%d) - Nagyítás - Galéria - 5 másodperc - Áttűnés - Nem lehet átnevezni - Videó - Nem lehet átnevezni. Ilyen albumnév már van - Feliratok - Diavetítés - Letöltések - Mappát hoz létre? Név módosítása - Dia Áthelyez + Nem törölhető Intervallum - Kész - Törli? - Szerkeszt - Elérte a karakterek maximális számát (%d) - Kész + Már létezik + Album létrehozása + Nincs tétel + Rács + A mentés nem sikerült diff --git a/res/hye-AM.xml b/res/hye-AM.xml index b49fbd9..4cc58aa 100644 --- a/res/hye-AM.xml +++ b/res/hye-AM.xml @@ -2,69 +2,81 @@ - + Հասել եք նիշերի առավելագույն քանակին + Սլայդ շոու + Ընտրել բոլորը + Ջնջե՞լ + Խմբագրել + Հաղորդագրություն + Մշակվում է... + Բեռնումներ + Ալբմի անունն արդեն գրծվմ է + 20 վայրկյան + Ակտիվացում + 2 վայրկյան + Հղրդգրթ + Պատրաստ + Հնարավոր չէ վերանվանել + Էլ.փոստ + Տեղափոխված է + Չեղարկել + Ընտրված Ջնջել - Ալբոմներ + Ենթավերնագրեր + Չեղարկել + Հասել է նիշերի առավելագույն քանակին (%d) + Հասել է նիշերի առավելագույն քանակին (%d) + Սլյդ շոու + Սլայդ %s-ն արդեն գոյություն ունի - Խցիկի հոլովակ - Ստեղծել ալբոմ + Բեռնում է... + Ալբոմներ + Անհնար է վերանվանել: Ալբոմի անունն արդեն գործածվում է + Պահպանում է... + Գործողությունը ձախողվեց Փոխանցման էֆեկտ - Չեղարկել + Երաժշտությն + Ստեղծե՞լ թղթապանակ + Ջնջումը ձախողվեց + Վիդեո + Մասշտաբ Ծիածան - Արդեն գոյություն ունի: Վերագրանցե՞լ - Էլ.փոստ - Անհար է ջնջել - Ընտրել բլր + Սահկահանդեսի միջակայքը + Տեսանվագարկիչ + վայրկյաններ Էջ - Ջնջումը ձախողվեց - Ընտրված - Երաժշտությն + 10 վայրկյան + Պատկերասրահ + Անուն չկա + Պատկերներ Անհետացող - 2 վայրկյան - Գործողությունը ձախողվեց - Պատահական - Չեղարկել Խմբագրել - Պատկերներ + 5 վայրկյան + Ջնջված է Հեռացնե՞լ - Տեսահոլովակներ - Սահկահանդեսի միջակայքը - Սլյդ շոու - Ակտիվացում - Անուն չկա - Ալբմի անունն արդեն գրծվմ է - Տարրեր չկան - 10 վայրկյան - Արդեն գոյություն ունի - Գալարավարագույր - Կրկնել - Ընտրել բոլորը - Տեսանվագարկիչ - վայրկյաններ + Արդեն գոյություն ունի: Վերագրանցե՞լ + Ջնջվում է... + Կատարված է 3 վայրկյան + Խցիկի հոլովակ + Կրկնել + Պահպանվեց + Լուծել + Պատահական + Տեղափոխում... Տեղափոխումը ձախողվեց + Տեսահոլովակներ + Ավարտված է + Ընտրել բլր Բոլոր ալբոմները - 20 վայրկյան - Հասել է նիշերի առավելագույն քանակին (%d) - Մասշտաբ - Պատկերասրահ - 5 վայրկյան - Լուծել - Հնարավոր չէ վերանվանել - Վիդեո - Անհնար է վերանվանել: Ալբոմի անունն արդեն գործածվում է - Ենթավերնագրեր - Սլայդ շոու - Բեռնումներ - Ստեղծե՞լ թղթապանակ Փոխել անունը - Սլայդ Տեղափոխել + Անհար է ջնջել Դադար - Ավարտված է - Ջնջե՞լ - Խմբագրել - Հասել է նիշերի առավելագույն քանակին (%d) - Պատրաստ + Արդեն գոյություն ունի + Ստեղծել ալբոմ + Տարրեր չկան + Գալարավարագույր + Պահպանումը ձախողվեց diff --git a/res/isl-IS.xml b/res/isl-IS.xml index e060c2e..bf0e522 100644 --- a/res/isl-IS.xml +++ b/res/isl-IS.xml @@ -2,69 +2,81 @@ - + Hámarksfjölda stafa hefur verið náð + Glærusýning + Velja allt + Á að eyða? + Breyta + Skilaboð + Vinnsla í gangi... + Niðurhal + Heitið er þegar í notkun + 20 sekúndur + Virkjun + 2 sekúndur + Skilaboð + Lokið + Mistókst að breyta heiti + Tölvupóstur + Flutt + Hætta við + Valið Eyða - Möppur + Texti + Hætta við + Hámarkfjölda stafa (%d) hefur verið náð + Hámarkfjölda stafa (%d) hefur verið náð + Skyggnur + Glæra %s er til fyrir - Myndarúlla - Búa til albúm + Hleð... + Möppur + Mistókst að endurnefna. Heitið er þegar í notkun + Vista... + Aðgerð mistókst Skipting - Hætta við + Tónlist + Á að búa til möppu? + Ekki tókst að eyða + Myndskeið + Aðdráttur Augasteinn - Er þegar til. Viltu skrifa yfir? - Tölvupóstur - Það er ekki hægt að eyða - Velja allt + Tími milli mynda + Myndspilari + sekúndur Síða - Ekki tókst að eyða - Valið - Tónlist + 10 sekúndur + Gallerí + Ekkert heiti + Myndir Lækka - 2 sekúndur - Aðgerð mistókst - Stokka - Hætta við Breyta - Myndir + 5 sekúndur + Eytt Á að fjarlægja? - Myndskeið - Tími milli mynda - Skyggnur - Virkjun - Ekkert heiti - Heitið er þegar í notkun - Engin atriði - 10 sekúndur - Er þegar til - Rimlagardína - Endurtaka - Velja allt - Myndspilari - sekúndur + Er þegar til. Viltu skrifa yfir? + Verið er að eyða... + Lokið 3 sekúndur + Myndarúlla + Endurtaka + Vistað + Leysa upp + Stokka + Verið er að flytja... Ekki tókst að flytja + Myndskeið + Lokið + Velja allt Allar plötur - 20 sekúndur - Hámarkfjölda stafa (%d) hefur verið náð - Aðdráttur - Gallerí - 5 sekúndur - Leysa upp - Mistókst að breyta heiti - Myndskeið - Mistókst að endurnefna. Heitið er þegar í notkun - Texti - Glærusýning - Niðurhal - Á að búa til möppu? Breyta heiti - Glæra Færa + Það er ekki hægt að eyða Bil - Lokið - Á að eyða? - Breyta - Hámarkfjölda stafa (%d) hefur verið náð - Lokið + Er þegar til + Búa til albúm + Engin atriði + Rimlagardína + Mistókst að vista diff --git a/res/ita-IT.xml b/res/ita-IT.xml index a2853b1..07a0da5 100644 --- a/res/ita-IT.xml +++ b/res/ita-IT.xml @@ -2,69 +2,81 @@ - + Raggiunto numero massimo di caratteri + Presentazione + Seleziona tutto + Eliminare? + Modifica + Messaggio + Elaborazione in corso... + Download + Nome album già in uso + 20 secondi + Attivazione + 2 secondi + Messaggi + Fatto + Impossibile rinominare + E-mail + Spostato + Annulla + Selezionato Elimina - Album + Sottotitoli + Annulla + Raggiunto numero massimo di caratteri (%d) + Raggiunto numero massimo di caratteri (%d) + Present. + Scorrimento %s esiste già - Foto personali - Crea album + Caricamento... + Album + Impossibile rinominare. Nome album già in uso + Salvataggio... + Operazione non eseguita Effetto di transizione - Annulla + Musica + Creare cartella? + Eliminazione non riuscita + Video + Zoom Iride - Già esistente. Sovrascrivere? - E-mail - Impossibile eliminare - Sel. tutto + Intervallo presentazione + Lettore video + secondi Pagina - Eliminazione non riuscita - Selezionato - Musica + 10 secondi + Galleria + Nessun nome + Immagini Sfumatura - 2 secondi - Operazione non eseguita - Riproduzione casuale - Annulla Modifica - Immagini + 5 secondi + Eliminato/i Rimuovere? - Video - Intervallo presentazione - Present. - Attivazione - Nessun nome - Nome album già in uso - Nessun elemento - 10 secondi - Già esiste - Veneziana - Ripeti - Seleziona tutto - Lettore video - secondi + Già esistente. Sovrascrivere? + Eliminazione... + Fatto 3 secondi + Foto personali + Ripeti + Salvato + Dissolvenza + Riproduzione casuale + Spostamento... Spostamento non riuscito + Video + Fatto + Sel. tutto Tutti gli album - 20 secondi - Raggiunto numero massimo di caratteri (%d) - Zoom - Galleria - 5 secondi - Dissolvenza - Impossibile rinominare - Video - Impossibile rinominare. Nome album già in uso - Sottotitoli - Presentazione - Download - Creare cartella? Cambia nome - Scorrimento Sposta + Impossibile eliminare Intervallo - Fatto - Eliminare? - Modifica - Raggiunto numero massimo di caratteri (%d) - Fatto + Già esiste + Crea album + Nessun elemento + Veneziana + Errore salvataggio diff --git a/res/jpn-JP.xml b/res/jpn-JP.xml index 578f445..04b1681 100644 --- a/res/jpn-JP.xml +++ b/res/jpn-JP.xml @@ -2,69 +2,81 @@ - + 最大文字数に達しました。 + スライドショー + 全て選択 + 削除しますか？ + 編集 + メッセージ + 処理中... + ダウンロード + アルバム名は既に使用しています。 + 20秒 + アクティベーション + 2秒 + メッセージ + 完了 + 名前を変更できません。 + Eメール + 移動しました。 + キャンセル + 選択済み 削除 - アルバム + 字幕 + キャンセル + 最大文字数（%d）に達しました。 + 最大文字数（%d）に達しました。 + スライドショー + スライド %sは既に存在します。 - カメラロール - アルバム​作成 + 読み込み中... + アルバム + 名前​を​変更​できません。​アルバム名​は​既に​使用​されて​います + 保存中... + 操作に失敗しました。 通過効果 - キャンセル + 音楽 + フォルダを作成しますか？ + 削除できませんでした。 + 動画 + ズーム アイリス - 同名ファイルがあります。上書きしますか？ - Eメール - 削除できません。 - 全て選択 + スライドショーの間隔 + 動画 + 秒 ページ - 削除できませんでした。 - 選択済み - 音楽 + 10秒 + ギャラリー + 名前なし + 画像 フェード - 2秒 - 操作に失敗しました。 - シャッフル - キャンセル 編集 - 画像 + 5秒 + 削除しました。 削除しますか？ - 動画 - スライドショーの間隔 - スライドショー - アクティベーション - 名前なし - アルバム名は既に使用しています。 - アイテムがありません。 - 10秒 - 既に登録されています。 - ブラインド - 繰り返し - 全て選択 - 動画 - 秒 + 同名ファイルがあります。上書きしますか？ + 削除中... + 完了 3秒 + カメラロール + 繰り返し + 保存しました。 + ディゾルブ + シャッフル + 移動中... 移動に失敗しました。 + 動画 + 完了しました。 + 全て選択 全アルバム - 20秒 - 最大文字数（%d）に達しました。 - ズーム - ギャラリー - 5秒 - ディゾルブ - 名前を変更できません。 - 動画 - 名前​を​変更​できません。​アルバム名​は​既に​使用​されて​います - 字幕 - スライドショー - ダウンロード - フォルダを作成しますか？ 名前を変更 - スライド 移動 + 削除できません。 間隔 - 完了しました。 - 削除しますか？ - 編集 - 最大文字数（%d）に達しました。 - 完了 + 既に登録されています。 + アルバム​作成 + アイテムがありません。 + ブラインド + 保存に失敗しました。 diff --git a/res/kat-GE.xml b/res/kat-GE.xml index de0b8ed..c6c4be7 100644 --- a/res/kat-GE.xml +++ b/res/kat-GE.xml @@ -2,69 +2,81 @@ - + მიღწეულია სიმბოლოების მაქსიმალური რაოდენობა + სლაიდშოუ + ყველას არჩევა + წაიშალოს? + შეცვლა + შეტყობინება + მუშავდება... + გადმოწერილები + ალბომის სახელი უკვე არის + 20 წამი + გააქტიურება + 2 წამი + შეტყობინებები + შესრულდა + სახელს ვერ შეცვლით + ელ-ფოსტა + გადატანილია + გაუქმება + შერჩეული წაშლა - ალბომები + სუბტიტრები + გაუქმება + მიღწეულია სიმბოლოების მაქსიმალური რაოდენობა (%d) + მიღწეულია სიმბოლოების მაქსიმალური რაოდენობა (%d) + სლაიდ–შოუ + სლაიდი %s უკვე არსებობს - ვიდეოფრაგმენტი - ალბომის შექმნა + იტვირთება... + ალბომები + სახელს ვერ შეცვლით. ალბომის სახელი უკვე გამოყენებულია + ინახება... + ოპერაცია ვერ შესრულდა გადასვლის ეფექტი - გაუქმება + მუსიკა + შექმნით საქაღალდეს? + წაშლა არ მოხერხდა + ვიდეო + მასშტაბი ირისი - უკვე არსებობს. გადავაწერო? - ელ-ფოსტა - წაშლა შეუძლებელია - ყველა + სლაიდ–შოუს ინტერვალი + ვიდეო პლეერი + წამი გვერდი - წაშლა არ მოხერხდა - შერჩეული - მუსიკა + 10 წამი + გალერეა + უსახელო + გამოსახულებები ნელ-ნელა ჩაქრობა - 2 წამი - ოპერაცია ვერ შესრულდა - გადანაცვლება - გაუქმება შეცვლა - გამოსახულებები + 5 წამი + წაშლილია წაიშალოს? - ვიდეოები - სლაიდ–შოუს ინტერვალი - სლაიდ–შოუ - გააქტიურება - უსახელო - ალბომის სახელი უკვე არის - ელემენტები არ არის - 10 წამი - უკვე არის - დაბინდვა - გამეორება - ყველას არჩევა - ვიდეო პლეერი - წამი + უკვე არსებობს. გადავაწერო? + წაშლა... + შესრულებულია 3 წამი + ვიდეოფრაგმენტი + გამეორება + შენახულია + თანდათან გაქრობა + გადანაცვლება + გადატანა... გადატანა ვერ შესრულდა + ვიდეოები + დასრულდა + ყველა ყველა ალბომი - 20 წამი - მიღწეულია სიმბოლოების მაქსიმალური რაოდენობა (%d) - მასშტაბი - გალერეა - 5 წამი - თანდათან გაქრობა - სახელს ვერ შეცვლით - ვიდეო - სახელს ვერ შეცვლით. ალბომის სახელი უკვე გამოყენებულია - სუბტიტრები - სლაიდშოუ - გადმოწერილები - შექმნით საქაღალდეს? სახელის შეცვლა - სლაიდი გადატანა + წაშლა შეუძლებელია ინტერვალი - დასრულდა - წაიშალოს? - შეცვლა - მიღწეულია სიმბოლოების მაქსიმალური რაოდენობა (%d) - შესრულდა + უკვე არის + ალბომის შექმნა + ელემენტები არ არის + დაბინდვა + ვერ შეინახა diff --git a/res/kaz-KZ.xml b/res/kaz-KZ.xml index 3105c79..cecfe87 100644 --- a/res/kaz-KZ.xml +++ b/res/kaz-KZ.xml @@ -2,69 +2,81 @@ - + Таңбалардың ен көп саны артты + Слайд-шоу + Бәрін бөлектеу + Өшіресіз бе? + Өзгерту + Хабарлама + Өңделуде... + Жазылған + Альбом атауы пайдаланылуда + 20 секунд + Активтеу + 2 секунд + Хабарламалар + Дайын + Атын өзгерту мүмкін емес + Эл. пошта + Орналастырылды + Тоқтату + Таңдалды Жою - Альбомдар + Субтитрлер + Тоқтату + Ең көп таңбалар санына (%d) жетті + Ең көп таңбалар санына (%d) жетті + Слайдшоу + Слайд %s бар - Камера білігі - Альбом жасау + Жазылуда... + Альбомдар + Атауын өзгерту мүмкін емес. Альбомның атауы пайдаланылуда + Сақталуда... + Әрекет сәтсіз аяқталды Өтпелі әсер - Тоқтату + Музыка + Қалта құрасыз ба? + Жою үстінде үзіліп кетті + Бейне + Ауқымы Жыланқияқ - Бар. Қайта жазу керек пе? - Эл. пошта - Жою мүмкін емес - Барл. таң. + Слайдшоу аралығы + Бейне ойнатқыш + секунд Бет - Жою үстінде үзіліп кетті - Таңдалды - Музыка + 10 секунд + Галерея + Ондай есім жоқ + Суреттер Тегіс пайда болу - 2 секунд - Әрекет сәтсіз аяқталды - Кездейсоқ тәртіп - Тоқтату Өзгерту - Суреттер + 5 секунд + Жойылды Жоясыз ба? - Бейнежазбалар - Слайдшоу аралығы - Слайдшоу - Активтеу - Ондай есім жоқ - Альбом атауы пайдаланылуда - Баптар жоқ - 10 секунд - Қолданыста бар - Көрінбейді - Қайталау - Бәрін бөлектеу - Бейне ойнатқыш - секунд + Бар. Қайта жазу керек пе? + Жойылуда... + Аяқталды 3 секунд + Камера білігі + Қайталау + Сақталған + Жоқ болу + Кездейсоқ тәртіп + Орналастырылды Орналастырылмады + Бейнежазбалар + Аяқталды + Барл. таң. Барлық альбомдар - 20 секунд - Ең көп таңбалар санына (%d) жетті - Ауқымы - Галерея - 5 секунд - Жоқ болу - Атын өзгерту мүмкін емес - Бейне - Атауын өзгерту мүмкін емес. Альбомның атауы пайдаланылуда - Субтитрлер - Слайд-шоу - Жазылған - Қалта құрасыз ба? Атын өзгерту - Слайд Орналастыру + Жою мүмкін емес Аралық - Аяқталды - Өшіресіз бе? - Өзгерту - Ең көп таңбалар санына (%d) жетті - Дайын + Қолданыста бар + Альбом жасау + Баптар жоқ + Көрінбейді + Сақтау сәтсіз diff --git a/res/kor-KR.xml b/res/kor-KR.xml index 91d6ec0..57d3c46 100644 --- a/res/kor-KR.xml +++ b/res/kor-KR.xml @@ -2,69 +2,81 @@ - + 입력 가능한 최대 글자수를 초과하였습니다 + 슬라이드쇼 + 모두 선택 + 삭제할까요? + 편집 + 메시지 + 처리 중... + 다운로드 관리 + 사용 중인 이름입니다 + 20초 + 실행 + 2초 + 메시지 + 완료 + 이름을 변경할 수 없습니다 + 이메일 + 이동되었습니다 + 취소 + 단일 선택 삭제 - 앨범 + 자막 + 취소 + 최대 글자 수(%d개)를 초과하였습니다 + 최대 글자 수(%d개)를 초과하였습니다 + 슬라이드쇼 + 슬라이드 %s이(가) 저장되어 있습니다 - 카메라 앨범 - 앨범 추가 + 로딩 중... + 앨범 + 사용 중인 앨범 이름이므로 변경할 수 없습니다 + 저장 중... + 작업을 수행하지 못하였습니다 전환 효과 - 취소 + 음악 + 폴더를 추가할까요? + 삭제하지 못하였습니다 + 동영상 + 확대/축소 아이리스 - 사용 중인 이름입니다. 덮어쓸까요? - 이메일 - 삭제할 수 없습니다 - 모두 선택 + 슬라이드쇼 전환 간격 + 비디오 플레이어 + 초 페이지 - 삭제하지 못하였습니다 - 단일 선택 - 음악 + 10초 + 갤러리 + 이름이 없습니다 + 이미지 페이드 - 2초 - 작업을 수행하지 못하였습니다 - 셔플 - 취소 편집 - 이미지 + 5초 + 삭제되었습니다 제거할까요? - 동영상 - 슬라이드쇼 전환 간격 - 슬라이드쇼 - 실행 - 이름이 없습니다 - 사용 중인 이름입니다 - 항목이 없습니다 - 10초 - 이미 저장되어 있습니다 - 블라인드 - 반복 - 모두 선택 - 비디오 플레이어 - 초 + 사용 중인 이름입니다. 덮어쓸까요? + 삭제 중... + 완료 3초 + 카메라 앨범 + 반복 + 저장되었습니다 + 디졸브 + 셔플 + 이동 중... 이동하지 못하였습니다 + 동영상 + 완료되었습니다 + 모두 선택 모든 앨범 - 20초 - 최대 글자 수(%d개)를 초과하였습니다 - 확대/축소 - 갤러리 - 5초 - 디졸브 - 이름을 변경할 수 없습니다 - 동영상 - 사용 중인 앨범 이름이므로 변경할 수 없습니다 - 자막 - 슬라이드쇼 - 다운로드 관리 - 폴더를 추가할까요? 이름 변경 - 슬라이드 이동 + 삭제할 수 없습니다 간격 - 완료되었습니다 - 삭제할까요? - 편집 - 최대 글자 수(%d개)를 초과하였습니다 - 완료 + 이미 저장되어 있습니다 + 앨범 추가 + 항목이 없습니다 + 블라인드 + 저장하지 못하였습니다 diff --git a/res/lav-LV.xml b/res/lav-LV.xml index e77c860..6250552 100644 --- a/res/lav-LV.xml +++ b/res/lav-LV.xml @@ -2,69 +2,81 @@ - + Sasniegts maksimālais rakstzīmju skaits + Slaidrāde + Izv. visu + Vai dzēst? + Rediģēt + Ziņa + Apstrādā... + Lejupielādes + Alb.nosauk. jau tiek liet. + 20 sekundes + Aktivizēšana + 2 sekundes + Ziņas + Gatavs + Nevar pārdēvēt + E-pasts + Pārvietots + Atcelt + Izvēlēts Dzēst - Albumi + Subtitri + Atcelt + Sasniegts maksimālais rakstzīmju skaits (%d) + Sasniegts maksimālais rakstzīmju skaits (%d) + Slaidrāde + Slaids %s jau pastāv - Kam.fotoatt.rul. - Izveidot albumu + Ielādē... + Albumi + Nevar pārdēvēt. Albuma nosaukums jau tiek lietots + Saglabā... + Darbība neizdevās Pārejas efekts - Atcelt + Mūzika + Vai izveidot mapi? + Neizdevās izdzēst + Video + Tālummaiņa Varavīksne - Jau pastāv. Vai pārrakstīt? - E-pasts - Nevar izdzēst - Izv. visu + Slaidrādes intervāls + Video atskaņotājs + sekundes Lapa - Neizdevās izdzēst - Izvēlēts - Mūzika + 10 sekundes + Galerija + Nav vārda + Attēli Izgaist - 2 sekundes - Darbība neizdevās - Jaukt - Atcelt Rediģēt - Attēli + 5 sekundes + Izdzēsts Vai noņemt? - Video - Slaidrādes intervāls - Slaidrāde - Aktivizēšana - Nav vārda - Alb.nosauk. jau tiek liet. - Nav vienumu - 10 sekundes - Jau pastāv - Aizēnošana - Atkārtot - Izv. visu - Video atskaņotājs - sekundes + Jau pastāv. Vai pārrakstīt? + Dzēš... + Gatavs 3 sekundes + Kam.fotoatt.rul. + Atkārtot + Saglabāts + Izšķīdināt + Jaukt + Pārvieto... Pārvietošana neizdevās + Video + Pabeigts + Izv. visu Visi albumi - 20 sekundes - Sasniegts maksimālais rakstzīmju skaits (%d) - Tālummaiņa - Galerija - 5 sekundes - Izšķīdināt - Nevar pārdēvēt - Video - Nevar pārdēvēt. Albuma nosaukums jau tiek lietots - Subtitri - Slaidrāde - Lejupielādes - Vai izveidot mapi? Mainīt vārdu - Slaids Pārvietot + Nevar izdzēst Intervāls - Pabeigts - Vai dzēst? - Rediģēt - Sasniegts maksimālais rakstzīmju skaits (%d) - Gatavs + Jau pastāv + Izveidot albumu + Nav vienumu + Aizēnošana + Saglabāšana neizdevās diff --git a/res/lit-LT.xml b/res/lit-LT.xml index f6cae22..3e784a0 100644 --- a/res/lit-LT.xml +++ b/res/lit-LT.xml @@ -2,69 +2,81 @@ - + Pasiektas didžiausias simbolių skaičius + Skaidrių demonstravimas + Pasirinkti viską + Ar trinti? + Redaguoti + Žinutė + Apdorojama... + Atsisiųsti elem. + Albumo pavadinimas jau yra + 20 sekundžių + Aktyvinimas + 2 sekundės + Žinutės + Atlikta + Neįmanoma pervardinti + El. paštas + Perkelta + Atšaukti + Pasirinkta Trinti - Albumai + Subtitrai + Atšaukti + Pasiektas didžiausias simbolių skaičius (%d) + Pasiektas didžiausias simbolių skaičius (%d) + Skaid.rod. + Skaidrė %s jau yra - Nuotr. rodymas - Sukurti albumą + Įkeliama... + Albumai + Neįmanoma pakeisti pavadinimo. Toks albumo pavadinimas jau yra + Įrašoma... + Veiksmas nepavyko Perėjimo efektas - Atšaukti + Muzika + Ar kurti aplanką? + Ištrinti nepavyko + Vaizdo įrašas + Mastelio keitimas Rainelė - Jau yra. Perrašyti? - El. paštas - Ištrinti nepavyko - Rin. Viską + Skaidrių rodymo intervalas + Vaizdo įrašų leistuvas + sekundės Puslapis - Ištrinti nepavyko - Pasirinkta - Muzika + 10 sekundžių + Galerija + Nėra vardo + Vaizdai Išblukimas - 2 sekundės - Veiksmas nepavyko - Maišyti - Atšaukti Redaguoti - Vaizdai + 5 sekundės + Ištrinta Ar šalinti? - Vaizdo įrašai - Skaidrių rodymo intervalas - Skaid.rod. - Aktyvinimas - Nėra vardo - Albumo pavadinimas jau yra - Elementų nėra - 10 sekundžių - Jau yra - Žaliuzės - Kartoti - Pasirinkti viską - Vaizdo įrašų leistuvas - sekundės + Jau yra. Perrašyti? + Trinama... + Atlikta 3 sekundės + Nuotr. rodymas + Kartoti + Išsaugota + Panaikinti + Maišyti + Perkeliama... Perkelti nepavyko + Vaizdo įrašai + Atlikta + Rin. Viską Visi albumai - 20 sekundžių - Pasiektas didžiausias simbolių skaičius (%d) - Mastelio keitimas - Galerija - 5 sekundės - Panaikinti - Neįmanoma pervardinti - Vaizdo įrašas - Neįmanoma pakeisti pavadinimo. Toks albumo pavadinimas jau yra - Subtitrai - Skaidrių demonstravimas - Atsisiųsti elem. - Ar kurti aplanką? Keisti vardą - Skaidrė Perkelti + Ištrinti nepavyko Intervalas - Atlikta - Ar trinti? - Redaguoti - Pasiektas didžiausias simbolių skaičius (%d) - Atlikta + Jau yra + Sukurti albumą + Elementų nėra + Žaliuzės + Išsaugoti nepavyko diff --git a/res/mkd-MK.xml b/res/mkd-MK.xml index 9a172d6..7a018f4 100644 --- a/res/mkd-MK.xml +++ b/res/mkd-MK.xml @@ -2,69 +2,81 @@ - + Достигнат е максималниот број знаци + Слајдови + Избери ги сите + Да се избрише? + Измени + Порака + Се обработува... + Преземено + Името на албумот постои + 20 секунди + Активирање + 2 секунди + Пораки + Готово + Не може да се преименува + Е-пошта + Преместено + Откажи + Избраните Избриши - Албуми + Титли + Откажи + Достигнат е максималниот број знаци (%d) + Достигнат е максималниот број знаци (%d) + Слајдови + Слајд %s веќе постои - Ролна на камера - Нов албум + Активирање... + Албуми + Не може да се преименува. Името на албумот постои + Се снима... + Неуспешна операција Премин - Откажи + Музика + Направи нова папка? + Неуспешно бришење + Видео-запис + Зголемено Зеница - Веќе постои. Пресними? - Е-пошта - Не може да се избрише - Изб. сите + Период на слајдовите + Видео-плеер + секунди Страна - Неуспешно бришење - Избраните - Музика + 10 секунди + Галерија + Нема име + Слики Затемнување - 2 секунди - Неуспешна операција - Произволно - Откажи Измени - Слики + 5 секунди + Избришано Отстрани? - Видео-записи - Период на слајдовите - Слајдови - Активирање - Нема име - Името на албумот постои - Нема записи - 10 секунди - Веќе постои - Ролетна - Повторување - Избери ги сите - Видео-плеер - секунди + Веќе постои. Пресними? + Се брише... + Извршено 3 секунди + Ролна на камера + Повторување + Меморирано + Растворање + Произволно + Се преместува... Неуспешно преместување + Видео-записи + Завршено + Изб. сите Сите албуми - 20 секунди - Достигнат е максималниот број знаци (%d) - Зголемено - Галерија - 5 секунди - Растворање - Не може да се преименува - Видео-запис - Не може да се преименува. Името на албумот постои - Титли - Слајдови - Преземено - Направи нова папка? Смени име - Слајд Премести + Не може да се избрише Интервал - Завршено - Да се избрише? - Измени - Достигнат е максималниот број знаци (%d) - Готово + Веќе постои + Нов албум + Нема записи + Ролетна + Неуспешно снимање diff --git a/res/nld-NL.xml b/res/nld-NL.xml index 38cd2e2..8ba99a5 100644 --- a/res/nld-NL.xml +++ b/res/nld-NL.xml @@ -2,69 +2,81 @@ - + Maximumaantal tekens bereikt + Diapresentatie + Alles selecteren + Verwijderen? + Bewerken + Bericht + Verwerken... + Downloads + Albumnaam al in gebruik + 20 seconden + Inschakelen + 2 seconden + Berichten + Gereed + Kan de naam niet wijzigen + E-mail + Verplaatst + Annuleren + Geselecteerd Wissen - Albums + Ondertitels + Annuleren + Maximumaantal tekens (%d) bereikt + Maximumaantal tekens (%d) bereikt + Diashow + Pictogram %s bestaat al - Camerarol - Album maken + Laden... + Albums + Kan de naam niet wijzigen. Albumnaam al in gebruik + Opslaan... + Bewerking is mislukt Overgangseffect - Annuleren + Muziek + Map maken? + Verwijderen mislukt + Video + Zoomen Iris - Bestaat al. Overschrijven? - E-mail - Kan niet verwijderen - Alles sel. + Interval diashow + Videospeler + seconden Pagina - Verwijderen mislukt - Geselecteerd - Muziek + 10 seconden + Galerij + Geen naam + Afbeeldingen Uitvloeien - 2 seconden - Bewerking is mislukt - Willekeurig - Annuleren Bewerken - Afbeeldingen + 5 seconden + Verwijderd Verwijderen? - Video's - Interval diashow - Diashow - Inschakelen - Geen naam - Albumnaam al in gebruik - Geen items - 10 seconden - Bestaat al - Jaloezie - Herhalen - Alles selecteren - Videospeler - seconden + Bestaat al. Overschrijven? + Verwijderen... + Gereed 3 seconden + Camerarol + Herhalen + Opgeslagen + Oplossen + Willekeurig + Verplaatsen... Verplaatsen is mislukt + Video's + Voltooid + Alles sel. Alle albums - 20 seconden - Maximumaantal tekens (%d) bereikt - Zoomen - Galerij - 5 seconden - Oplossen - Kan de naam niet wijzigen - Video - Kan de naam niet wijzigen. Albumnaam al in gebruik - Ondertitels - Diapresentatie - Downloads - Map maken? Naam wijzigen - Pictogram Verplaatsen + Kan niet verwijderen Interval - Voltooid - Verwijderen? - Bewerken - Maximumaantal tekens (%d) bereikt - Gereed + Bestaat al + Album maken + Geen items + Jaloezie + Opslaan mislukt diff --git a/res/nob-NO.xml b/res/nob-NO.xml index c7dfbb4..059f365 100644 --- a/res/nob-NO.xml +++ b/res/nob-NO.xml @@ -2,69 +2,81 @@ - + Nådd maksimalt antall tegn + Bildefremvisning + Merk alt + Slette? + Rediger + Melding + Behandler... + Nedlast. + Albumnavn allerede i bruk + 20 sekunder + Aktivering + 2 sekunder + Meldinger + Utført + Kan ikke gi nytt navn + E-post + Flyttet + Avbryt + Valgt Slett - Album + Undertekster + Avbryt + Maksimalt antall tegn (%d) er nådd + Maksimalt antall tegn (%d) er nådd + Bildevisn + Lysbilde %s finnes allerede - Kamerabilder - Lag album + Åpner... + Album + Kan ikke gi nytt navn. Albumnavnet er allerede i bruk + Lagrer... + Operasjonen mislyktes Overgangseffekt - Avbryt + Musikk + Opprette mappe? + Kunne ikke slette + Videoklipp + Zoom Iris - Finnes allerede. Vil du overskrive? - E-post - Kan ikke slette - Velg alle + Bildefremvisningsintervall + Videospiller + sekunder Side - Kunne ikke slette - Valgt - Musikk + 10 sekunder + Galleri + Ingen navn + Bilder Fade - 2 sekunder - Operasjonen mislyktes - Tilfeldig avspilling - Avbryt Rediger - Bilder + 5 sekunder + Slettet Fjerne? - Videoklipp - Bildefremvisningsintervall - Bildevisn - Aktivering - Ingen navn - Albumnavn allerede i bruk - Ingen elementer - 10 sekunder - Finnes allerede - Persienne - Gjenta - Merk alt - Videospiller - sekunder + Finnes allerede. Vil du overskrive? + Sletter... + Utført 3 sekunder + Kamerabilder + Gjenta + Lagret + Oppløs + Tilfeldig avspilling + Flytter... Flyttingen mislyktes + Videoklipp + Fullført + Velg alle Alle album - 20 sekunder - Maksimalt antall tegn (%d) er nådd - Zoom - Galleri - 5 sekunder - Oppløs - Kan ikke gi nytt navn - Videoklipp - Kan ikke gi nytt navn. Albumnavnet er allerede i bruk - Undertekster - Bildefremvisning - Nedlast. - Opprette mappe? Endre navn - Lysbilde Flytt + Kan ikke slette Intervall - Fullført - Slette? - Rediger - Maksimalt antall tegn (%d) er nådd - Utført + Finnes allerede + Lag album + Ingen elementer + Persienne + Kunne ikke lagre diff --git a/res/pol-PL.xml b/res/pol-PL.xml index 9c07a54..0491fe7 100644 --- a/res/pol-PL.xml +++ b/res/pol-PL.xml @@ -2,69 +2,81 @@ - + Osiągnięto maksymalną liczbę znaków + Pokaz slajdów + Zaznacz wszystko + Usunąć? + Edytuj + Wiadomość + Przetwarzanie... + Pobrane + Nazwa albumu już w użyciu + 20 sek. + Aktywacja + 2 sek. + Wiadomości + Gotowe + Nie można zmienić nazwy + E-mail + Przeniesiono + Anuluj + Wybrany Usuń - Albumy + Napisy + Anuluj + Osiągnięto maksymalną liczbę znaków (%d) + Osiągnięto maksymalną liczbę znaków (%d) + Pok. slajd + Slajd %s już istnieje - Rolka aparatu - Utwórz album + Ładuję... + Albumy + Nie można zmienić nazwy. Nazwa albumu już w użyciu + Zapisywanie... + Operacja nie powiodła się Efekt przejścia menu - Anuluj + Muzyka + Utworzyć katalog ? + Błąd usuwania + Film + Powiększenie Koło - Już istnieje. Zamienić? - E-mail - Nie można usunąć - Zazn. wsz. + Interwał pokazu slajdów + Odtwarzacz wideo + s Strony - Błąd usuwania - Wybrany - Muzyka + 10 sek. + Galeria + Bez nazwy + Obrazy Zanikanie - 2 sek. - Operacja nie powiodła się - Kolejność losowa - Anuluj Edytuj - Obrazy + 5 sek. + Usunięto Usunąć? - Filmy - Interwał pokazu slajdów - Pok. slajd - Aktywacja - Bez nazwy - Nazwa albumu już w użyciu - Brak elementów - 10 sek. - Już istnieje - Zasłona - Powtórz - Zaznacz wszystko - Odtwarzacz wideo - s + Już istnieje. Zamienić? + Usuwanie... + Gotowe 3 sek. + Rolka aparatu + Powtórz + Zapisano + Przenikanie + Kolejność losowa + Przenoszenie... Błąd przenoszenia + Filmy + Zakończono + Zazn. wsz. Wszystkie albumy - 20 sek. - Osiągnięto maksymalną liczbę znaków (%d) - Powiększenie - Galeria - 5 sek. - Przenikanie - Nie można zmienić nazwy - Film - Nie można zmienić nazwy. Nazwa albumu już w użyciu - Napisy - Pokaz slajdów - Pobrane - Utworzyć katalog ? Zmień nazwę - Slajd Przenieś + Nie można usunąć Okres - Zakończono - Usunąć? - Edytuj - Osiągnięto maksymalną liczbę znaków (%d) - Gotowe + Już istnieje + Utwórz album + Brak elementów + Zasłona + Błąd zapisywania diff --git a/res/por-BR.xml b/res/por-BR.xml index c198dbe..6db7e48 100644 --- a/res/por-BR.xml +++ b/res/por-BR.xml @@ -2,69 +2,81 @@ - + Número máximo de caracteres atingido + Exibição de slides + Selecionar tudo + Apagar? + Editar + Mensagem + Processando... + Downloads + Nome de álbum existente + 20 segundos + Ativação + 2 segundos + Mensagens + Concluído + Impossível renomear + E-mail + Movido + Cancelar + Selecionado Apagar - Álbuns + Legendas + Cancelar + Número máximo de caracteres (%d) atingido + Número máximo de caracteres (%d) atingido + Ver slides + Transição %s já existente - Giro da câmera - Criar álbum + Carregando... + Álbuns + Impossível renomear. Nome de álbum já utilizado + Salvando... + Operação falhou Efeito de transição - Cancelar + Músicas + criar pasta? + Erro ao apagar + Vídeo + Zoom Iris - Já existe. Substituir? - E-mail - Impossível apagar - Sel. Tudo + Intervalo da apresentação de slides + Video Player + segundos Página - Erro ao apagar - Selecionado - Músicas + 10 segundos + Galeria + Sem nome + Imagens Desbotar - 2 segundos - Operação falhou - Modo aleatório - Cancelar Editar - Imagens + 5 segundos + Apagado Remover? - Vídeos - Intervalo da apresentação de slides - Ver slides - Ativação - Sem nome - Nome de álbum existente - Sem itens - 10 segundos - Já existe - Persiana - Repetir - Selecionar tudo - Video Player - segundos + Já existe. Substituir? + Apagando… + Concluído 3 segundos + Giro da câmera + Repetir + Salvo + Dissolver + Modo aleatório + Movendo… Erro ao mover + Vídeos + Concluído + Sel. Tudo Todos os álbuns - 20 segundos - Número máximo de caracteres (%d) atingido - Zoom - Galeria - 5 segundos - Dissolver - Impossível renomear - Vídeo - Impossível renomear. Nome de álbum já utilizado - Legendas - Exibição de slides - Downloads - criar pasta? Alterar nome - Transição Mover + Impossível apagar Intervalo - Concluído - Apagar? - Editar - Número máximo de caracteres (%d) atingido - Concluído + Já existe + Criar álbum + Sem itens + Persiana + Erro ao salvar diff --git a/res/por-PT.xml b/res/por-PT.xml index e275c9b..e8e0455 100644 --- a/res/por-PT.xml +++ b/res/por-PT.xml @@ -2,69 +2,81 @@ - + Número máximo de caracteres atingido. + Apresentação de slides + Selec. tudo + Eliminar? + Editar + Mensagem + A processar... + Transferências + Nome de álbum já utilizado + 20 segundos + Activação + 2 segundos + Mensagem + Concluído + Impossível mudar nome + E-mail + Movido + Cancelar + Seleccionado Eliminar - Álbuns + Legendas + Cancelar + Número máximo de caracteres (%d) atingido + Número máximo de caracteres (%d) atingido + Diaporama + Slide %s já existente - Rolo da câmara - Criar álbum + A carregar... + Álbuns + Impossível mudar o nome. Nome de álbum já utilizado + A guardar... + Operação falhou Efeito de transição - Cancelar + Música + Criar pasta? + Falha ao apagar + Vídeo + Zoom Íris - Já existe. Substituir? - E-mail - Impossível apagar. - Selec. tudo + Duração da apresentação + Leitor de Vídeo + segundos Página - Falha ao apagar - Seleccionado - Música + 10 segundos + Galeria + Sem nome + Imagens Saída gradual - 2 segundos - Operação falhou - Aleatório - Cancelar Editar - Imagens + 5 segundos + Eliminado Remover? - Vídeos - Duração da apresentação - Diaporama - Activação - Sem nome - Nome de álbum já utilizado - Sem itens - 10 segundos - Já existe - Persiana - Repetir - Selec. tudo - Leitor de Vídeo - segundos + Já existe. Substituir? + A eliminar... + Concluído 3 segundos + Rolo da câmara + Repetir + Guardado + Dissolver + Aleatório + A mover... Falha ao mover + Vídeos + Concluída + Selec. tudo Todos os álbuns - 20 segundos - Número máximo de caracteres (%d) atingido - Zoom - Galeria - 5 segundos - Dissolver - Impossível mudar nome - Vídeo - Impossível mudar o nome. Nome de álbum já utilizado - Legendas - Apresentação de slides - Transferências - Criar pasta? Alterar nome - Slide Mover + Impossível apagar. Intervalo - Concluída - Eliminar? - Editar - Número máximo de caracteres (%d) atingido - Concluído + Já existe + Criar álbum + Sem itens + Persiana + Falha ao gravar diff --git a/res/ron-RO.xml b/res/ron-RO.xml index 4b545c3..15f2ea5 100644 --- a/res/ron-RO.xml +++ b/res/ron-RO.xml @@ -2,69 +2,81 @@ - + Adăugare la marcaje + Expuneri diapozitive + Selectare toate + Ştergeţi? + Editare + Mesaj + Se procesează... + Descărcări + Numele este deja în uz + 20 secunde + Activare + 2 secunde + Mesaje + Gata + Imposibil de redenumit + Email + Mutat + Anulare + Selectat Ştergere - Albume + Subtitrare + Anulare + Numărul maxim de caractere (%d) a fost atins + Numărul maxim de caractere (%d) a fost atins + Ex. diap. + Diapozitiv %s există deja - Capturi cameră - Creare album + Încărcare... + Albume + Imposibil de redenumit. Numele albumului este deja în uz + Se salvează... + Operaţie nereuşită Efect de tranziţie - Anulare + Muzică + Creaţi folder? + Ştergerea nu a reuşit + Videoclip + Panoramare Curcubeu - Există deja. Suprascrieţi? - Email - Imposibil de şters - Sel. int. + Interval expunere diapozitive + Player video + secunde Pagină - Ştergerea nu a reuşit - Selectat - Muzică + 10 secunde + Galerie + Nici un nume + Imagini Estompare - 2 secunde - Operaţie nereuşită - Amestecare - Anulare Editare - Imagini + 5 secunde + Şters Eliminare? - Videoclipuri - Interval expunere diapozitive - Ex. diap. - Activare - Nici un nume - Numele este deja în uz - Niciun element - 10 secunde - Există deja - Jaluzele - Repetare - Selectare toate - Player video - secunde + Există deja. Suprascrieţi? + Se şterge... + Efectuat 3 secunde + Capturi cameră + Repetare + Salvat + Dizolvare + Amestecare + Mutare Mutarea nu a reuşit + Videoclipuri + Finalizat + Sel. int. Toate albumele - 20 secunde - Numărul maxim de caractere (%d) a fost atins - Panoramare - Galerie - 5 secunde - Dizolvare - Imposibil de redenumit - Videoclip - Imposibil de redenumit. Numele albumului este deja în uz - Subtitrare - Expuneri diapozitive - Descărcări - Creaţi folder? Schimbare nume - Diapozitiv Mutare + Imposibil de şters Interval - Finalizat - Ştergeţi? - Editare - Numărul maxim de caractere (%d) a fost atins - Gata + Există deja + Creare album + Niciun element + Jaluzele + Salvare nereuşită diff --git a/res/rus-RU.xml b/res/rus-RU.xml index f6fde71..afd9ff3 100644 --- a/res/rus-RU.xml +++ b/res/rus-RU.xml @@ -2,69 +2,81 @@ - + Достигнуто максимальное число символов + Слайд-шоу + Выбрать все + Удалить? + Изменить + Сообщение + Обработка... + Загрузки + Имя альбома используется + 20 секунд + Активация + 2 секунды + Сообщения + Готово + Невозможно переименовать + E-mail + Перемещено + Отмена + Выбрано Удалить - Альбомы + Субтитры + Отмена + Достигнуто максимальное число символов (%d) + Достигнуто максимальное число символов (%d) + Слайд-шоу + Слайд-шоу %s уже существует - Каталог фото - Создать альбом + Загрузка... + Альбомы + Невозможно переименовать. Имя альбома уже используется + Сохранение... + Сбой операции Эффект перехода - Отмена + Музыка + Создать папку? + Сбой удаления + Видео + Масштаб Радуга - Уже существует. Перезаписать? - E-mail - Невозможно удалить - Выбр. все + Интервал для слайд-шоу + Видеоплеер + сек. Страница - Сбой удаления - Выбрано - Музыка + 10 секунд + Галерея + Нет имени + Картинки Растворение - 2 секунды - Сбой операции - Случайный порядок - Отмена Изменить - Картинки + 5 секунд + Удалено Удалить? - Видео - Интервал для слайд-шоу - Слайд-шоу - Активация - Нет имени - Имя альбома используется - Нет элементов - 10 секунд - Уже существует - Жалюзи - Повторить - Выбрать все - Видеоплеер - сек. + Уже существует. Перезаписать? + Удаление... + Готово 3 секунды + Каталог фото + Повторить + Соxранено + Растворение + Случайный порядок + Перемещение... Сбой перемещения + Видео + Завершено + Выбр. все Все альбомы - 20 секунд - Достигнуто максимальное число символов (%d) - Масштаб - Галерея - 5 секунд - Растворение - Невозможно переименовать - Видео - Невозможно переименовать. Имя альбома уже используется - Субтитры - Слайд-шоу - Загрузки - Создать папку? Изменить имя - Слайд-шоу Переместить + Невозможно удалить Интервал - Завершено - Удалить? - Изменить - Достигнуто максимальное число символов (%d) - Готово + Уже существует + Создать альбом + Нет элементов + Жалюзи + Сбой сохранения diff --git a/res/screen-density-xhigh/00_button_radio.png b/res/screen-density-xhigh/00_button_radio.png new file mode 100644 index 0000000..83a1a54 Binary files /dev/null and b/res/screen-density-xhigh/00_button_radio.png differ diff --git a/res/screen-density-xhigh/00_button_radio_selected.png b/res/screen-density-xhigh/00_button_radio_selected.png new file mode 100644 index 0000000..7b00666 Binary files /dev/null and b/res/screen-density-xhigh/00_button_radio_selected.png differ diff --git a/res/screen-density-xhigh/00_circle_button_Expand_closed.png b/res/screen-density-xhigh/00_circle_button_Expand_closed.png new file mode 100644 index 0000000..83e6762 Binary files /dev/null and b/res/screen-density-xhigh/00_circle_button_Expand_closed.png differ diff --git a/res/screen-density-xhigh/00_circle_button_Expand_open.png b/res/screen-density-xhigh/00_circle_button_Expand_open.png new file mode 100644 index 0000000..85e99f9 Binary files /dev/null and b/res/screen-density-xhigh/00_circle_button_Expand_open.png differ diff --git a/res/screen-density-xhigh/00_list_expand_closed_press.png b/res/screen-density-xhigh/00_list_expand_closed_press.png new file mode 100644 index 0000000..b421ad1 Binary files /dev/null and b/res/screen-density-xhigh/00_list_expand_closed_press.png differ diff --git a/res/screen-density-xhigh/00_list_expand_opened_press.png b/res/screen-density-xhigh/00_list_expand_opened_press.png new file mode 100644 index 0000000..1b49c94 Binary files /dev/null and b/res/screen-density-xhigh/00_list_expand_opened_press.png differ diff --git a/res/screen-density-xhigh/T01_toolbar_icon_delete_dim_web.png b/res/screen-density-xhigh/T01_toolbar_icon_delete_dim_web.png new file mode 100644 index 0000000..08e773b Binary files /dev/null and b/res/screen-density-xhigh/T01_toolbar_icon_delete_dim_web.png differ diff --git a/res/screen-density-xhigh/T01_toolbar_icon_share_dim_web.png b/res/screen-density-xhigh/T01_toolbar_icon_share_dim_web.png new file mode 100644 index 0000000..47ee62e Binary files /dev/null and b/res/screen-density-xhigh/T01_toolbar_icon_share_dim_web.png differ diff --git a/res/screen-size-normal/IDL_DEL_PROGRESSING_POPUP.xml b/res/screen-size-normal/IDL_DEL_PROGRESSING_POPUP.xml new file mode 100644 index 0000000..b41c532 --- /dev/null +++ b/res/screen-size-normal/IDL_DEL_PROGRESSING_POPUP.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + diff --git a/res/screen-size-normal/IDL_FORM.xml b/res/screen-size-normal/IDL_FORM.xml deleted file mode 100644 index ae50282..0000000 --- a/res/screen-size-normal/IDL_FORM.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - 720 -
- - - - -
- - -
-
- - -
- -
 diff --git a/res/screen-size-normal/IDL_FORM_ALBUM_LIST.xml b/res/screen-size-normal/IDL_FORM_ALBUM_LIST.xml new file mode 100644 index 0000000..dea3cdf --- /dev/null +++ b/res/screen-size-normal/IDL_FORM_ALBUM_LIST.xml @@ -0,0 +1,27 @@ + + + + + + 720 +
+ + + + +
+ + +
+
+ + +
+ + + + + +
 diff --git a/res/screen-size-normal/IDL_FORM_FILE_LIST.xml b/res/screen-size-normal/IDL_FORM_FILE_LIST.xml new file mode 100644 index 0000000..831f52a --- /dev/null +++ b/res/screen-size-normal/IDL_FORM_FILE_LIST.xml @@ -0,0 +1,22 @@ + + + + + + 720 +
+ + + + +
+ + +
+
+ + +
+
 diff --git a/res/screen-size-normal/IDL_FORM_SETTING_MAIN.xml b/res/screen-size-normal/IDL_FORM_SETTING_MAIN.xml new file mode 100644 index 0000000..a696eae --- /dev/null +++ b/res/screen-size-normal/IDL_FORM_SETTING_MAIN.xml @@ -0,0 +1,26 @@ + + + + + 720 +
+ + + + +
+ + +
+
+ + +
+ + + + + +
 diff --git a/res/slk-SK.xml b/res/slk-SK.xml index f1ffc94..163ab7b 100644 --- a/res/slk-SK.xml +++ b/res/slk-SK.xml @@ -2,69 +2,81 @@ - + Bol dosiahnutý maximálny počet znakov + Prezentácia + Vybrať všetky + Odstrániť? + Upraviť + Správa + Spracováva sa... + Stiahnuté položky + Názov albumu sa už používa + 20 sekúnd + Aktivácia + 2 sekundy + Správy + Hotovo + Nedá sa premenovať + E-mail + Presunuté + Zrušiť + Vybrané Odstrániť - Albumy + Titulky + Zrušiť + Dosiahol sa maximálny počet znakov (%d) + Dosiahol sa maximálny počet znakov (%d) + Prezent. + Vysunutie %s už existuje - Kat. fotoaparátu - Vytvoriť album + Načítava sa... + Albumy + Nedá sa premenovať. Názov albumu sa už používa + Ukladanie... + Operácia zlyhala Efekt prechodu - Zrušiť + Hudba + Vytvoriť priečinok? + Vymazanie sa nepodarilo + Video + Zoom Clona - Už existuje. Prepísať? - E-mail - Nedá sa odstrániť - Vybrať vš. + Interval prezentácie + Prehrávač videí + sekundy Stránka - Vymazanie sa nepodarilo - Vybrané - Hudba + 10 sekúnd + Galéria + Žiadny názov + Obrázky Stmievanie - 2 sekundy - Operácia zlyhala - Náhodné poradie - Zrušiť Upraviť - Obrázky + 5 sekúnd + Odstránené Odstrániť? - Videá - Interval prezentácie - Prezent. - Aktivácia - Žiadny názov - Názov albumu sa už používa - Žiadne položky - 10 sekúnd - Už existuje - Roleta - Opakovať - Vybrať všetky - Prehrávač videí - sekundy + Už existuje. Prepísať? + Odstraňovanie... + Hotovo 3 sekundy + Kat. fotoaparátu + Opakovať + Uložené + Prelínanie + Náhodné poradie + Presúvanie... Presunutie sa nepodarilo + Videá + Dokončené + Vybrať vš. Všetky albumy - 20 sekúnd - Dosiahol sa maximálny počet znakov (%d) - Zoom - Galéria - 5 sekúnd - Prelínanie - Nedá sa premenovať - Video - Nedá sa premenovať. Názov albumu sa už používa - Titulky - Prezentácia - Stiahnuté položky - Vytvoriť priečinok? Zmeniť názov - Vysunutie Presunúť + Nedá sa odstrániť Interval - Dokončené - Odstrániť? - Upraviť - Dosiahol sa maximálny počet znakov (%d) - Hotovo + Už existuje + Vytvoriť album + Žiadne položky + Roleta + Uloženie sa nepodarilo diff --git a/res/slv-SI.xml b/res/slv-SI.xml index f578ee8..3174705 100644 --- a/res/slv-SI.xml +++ b/res/slv-SI.xml @@ -2,69 +2,81 @@ - + Doseženo je največje dovoljeno število znakov + Diaprojekcija + Izberi vse + Izbrišem? + Uredi + Sporočilo + Obdelava ... + Prenosi + Ime albuma se že uporablja + 20 sekund + Vklop + 2 sekundi + Sporočila + Končano + Ni mogoče preimenovati + E-pošta + Premaknjeno + Prekliči + Izbrano Izbriši - Albumi + Podnapisi + Prekliči + Doseženo je največje število znakov (%d) + Doseženo je največje število znakov (%d) + Diaproj. + Prehod %s že obstaja - Mapa s slikami - Ustvari album + Nalaganje... + Albumi + Ni mogoče preimenovati. Ime albuma se že uporablja + Shranjujem + Postopek ni uspel Učinek prehoda - Prekliči + Glasba + Ustvarim mapo? + Brisanje ni uspelo + Video + Povečava Mavrica - Že obstaja. Prepišem? - E-pošta - Brisanje ni mogoče - Izberi vse + Interval diaprojekcije + Video predvajalnik + sekund Stran - Brisanje ni uspelo - Izbrano - Glasba + 10 sekund + Galerija + Brez imena + Slike Zatemnitev - 2 sekundi - Postopek ni uspel - Naključno - Prekliči Uredi - Slike + 5 sekund + Izbrisano Odstranim? - Videoposnetki - Interval diaprojekcije - Diaproj. - Vklop - Brez imena - Ime albuma se že uporablja - Ni predmetov - 10 sekund - Že obstaja - Zastor - Ponovi - Izberi vse - Video predvajalnik - sekund + Že obstaja. Prepišem? + Brišem + Končano 3 sekunde + Mapa s slikami + Ponovi + Shranjeno + Raztopi + Naključno + Premikam Premikanje ni uspelo + Videoposnetki + Končano + Izberi vse Vsi albumi - 20 sekund - Doseženo je največje število znakov (%d) - Povečava - Galerija - 5 sekund - Raztopi - Ni mogoče preimenovati - Video - Ni mogoče preimenovati. Ime albuma se že uporablja - Podnapisi - Diaprojekcija - Prenosi - Ustvarim mapo? Spremeni ime - Prehod Premakni + Brisanje ni mogoče Interval - Končano - Izbrišem? - Uredi - Doseženo je največje število znakov (%d) - Končano + Že obstaja + Ustvari album + Ni predmetov + Zastor + Shranjevanje ni uspelo diff --git a/res/spa-ES.xml b/res/spa-ES.xml index f09c366..c74d00b 100644 --- a/res/spa-ES.xml +++ b/res/spa-ES.xml @@ -2,69 +2,81 @@ - + Alcanzado el número máximo de caracteres + Presentación de diapositivas + Seleccionar todo + ¿Eliminar? + Editar + Mensajes + Procesando... + Descargas + Nombre de álbum ya en uso + 20 segundos + Activación + 2 segundos + Mensajes + Hecho + Imposible cambiar el nombre + Correo electrónico + Movido + Cancelar + Seleccionado Eliminar - Álbumes + Subtítulos + Cancelar + Número máximo de caracteres (%d) alcanzado + Número máximo de caracteres (%d) alcanzado + Pres diap + Diapositiva %s ya existe - Carrete - Crear álbum + Cargando... + Álbumes + No se puede cambiar el nombre. Nombre de álbum ya en uso + Guardando... + Error de funcionamiento Efecto de transición - Cancelar + Música + ¿Crear carpeta? + Error al borrar + Vídeo + Zoom Iris - Ya existe. ¿Desea reemplazarlo? - Correo electrónico - No se puede eliminar - Sele. todo + Intervalo de presentación de diapositivas + Reproductor de vídeo + segundos Página - Error al borrar - Seleccionado - Música + 10 segundos + Galería + Sin nombre + Imágenes Desaparición - 2 segundos - Error de funcionamiento - Reproducción aleatoria - Cancelar Editar - Imágenes + 5 segundos + Eliminado ¿Eliminar? - Vídeos - Intervalo de presentación de diapositivas - Pres diap - Activación - Sin nombre - Nombre de álbum ya en uso - Ningún elemento - 10 segundos - Ya existe - Efecto persiana - Repetir - Seleccionar todo - Reproductor de vídeo - segundos + Ya existe. ¿Desea reemplazarlo? + Eliminando... + Guardar 3 segundos + Carrete + Repetir + Guardado + Fundir + Reproducción aleatoria + Moviendo... Error al mover + Vídeos + Finalizado + Sele. todo Todos los álbumes - 20 segundos - Número máximo de caracteres (%d) alcanzado - Zoom - Galería - 5 segundos - Fundir - Imposible cambiar el nombre - Vídeo - No se puede cambiar el nombre. Nombre de álbum ya en uso - Subtítulos - Presentación de diapositivas - Descargas - ¿Crear carpeta? Cambiar nombre - Diapositiva Mover + No se puede eliminar Intervalo - Finalizado - ¿Eliminar? - Editar - Número máximo de caracteres (%d) alcanzado - Hecho + Ya existe + Crear álbum + Ningún elemento + Efecto persiana + Error al guardar diff --git a/res/spa-MX.xml b/res/spa-MX.xml index ff0f491..e8cce30 100644 --- a/res/spa-MX.xml +++ b/res/spa-MX.xml @@ -2,69 +2,81 @@ - + Se ha alcanzado el número máximo de caracteres + Presentación de diapositivas + Seleccionar todo + ¿Eliminar? + Editar + Mensaje + Procesando... + Descargas + Nombre de álbum ya existe + 20 segundos + Activación + 2 segundos + Mensajes + Realizado + No se puede renombrar + Correo + Movido + Cancelar + Seleccionado Eliminar - Álbumes + Subtítulos + Cancelar + Número máximo de caracteres (%d) alcanzado + Número máximo de caracteres (%d) alcanzado + Pres diap + Deslizar %s ya existe - Carrete - Crear álbum + Cargando... + Álbumes + No se puede renombrar. Nombre de álbum ya existe + Guardando... + Error de funcionamiento Efecto de transición - Cancelar + Música + crear carpeta? + Error al eliminar + Video + Zoom Iris - Ya existe. ¿Desea reemplazarlo? - Correo - No puede eliminar - Todo + Intervalo de presentación de diapositivas + Reproductor de Video + segundos Página - Error al eliminar - Seleccionado - Música + 10 segundos + Galería + Sin nombre + Imágenes Aparecer - 2 segundos - Error de funcionamiento - Aleatorio - Cancelar Editar - Imágenes + 5 segundos + Eliminado ¿Eliminar? - Videos - Intervalo de presentación de diapositivas - Pres diap - Activación - Sin nombre - Nombre de álbum ya existe - Ningún elemento - 10 segundos - Ya existe - Persiana - Repetir - Seleccionar todo - Reproductor de Video - segundos + Ya existe. ¿Desea reemplazarlo? + Eliminando... + Realizado 3 segundos + Carrete + Repetir + Guardado + Fundir + Aleatorio + Moviendo… Error al mover + Videos + Completo + Todo Todos los álbumes - 20 segundos - Número máximo de caracteres (%d) alcanzado - Zoom - Galería - 5 segundos - Fundir - No se puede renombrar - Video - No se puede renombrar. Nombre de álbum ya existe - Subtítulos - Presentación de diapositivas - Descargas - crear carpeta? Renombrar - Deslizar Mover + No puede eliminar Intervalo - Completo - ¿Eliminar? - Editar - Número máximo de caracteres (%d) alcanzado - Realizado + Ya existe + Crear álbum + Ningún elemento + Persiana + Error al guardar diff --git a/res/srp-RS.xml b/res/srp-RS.xml index 977b13f..42f5973 100644 --- a/res/srp-RS.xml +++ b/res/srp-RS.xml @@ -2,69 +2,81 @@ - + Dostignut maksimalan broj karaktera + Slajd-šou + Izaberi sve + Obriši? + Izmeni + Poruka + Obrada... + Preuzimanja + Naziv albuma već u upotr. + 20 sekundi + Aktivacija + 2 sekunde + Poruke + Gotovo + Nemoguće preimenovati + E-pošta + Premešteno + Poništi + Označeno Obriši - Albumi + Titlovi + Poništi + Dostignut maksimalan broj karaktera (%d) + Dostignut maksimalan broj karaktera (%d) + Slajd-šou + Slajd %s već postoji - Traka kamere - Kreiraj album + Učitavanje... + Albumi + Nemoguće preimenovati. Naziv albuma već u upotrebi + Memorisanje... + Operacija neuspešna Efekat prelaza - Poništi + Muzika + Kreiraj folder? + Brisanje neuspešno + Video zapis + Zumiranje Iris - Već postoji. Prebriši? - E-pošta - Nemoguće obrisati - Izab. sve + Interval za slajd-šou + Video plejer + sekunde Strana - Brisanje neuspešno - Označeno - Muzika + 10 sekundi + Galerija + Nema imena + Slike Izbledi - 2 sekunde - Operacija neuspešna - Nasumično - Poništi Izmeni - Slike + 5 sekundi + Obrisano Ukloni? - Video zapisi - Interval za slajd-šou - Slajd-šou - Aktivacija - Nema imena - Naziv albuma već u upotr. - Nema stavki - 10 sekundi - Već postoji - Roletna - Ponovi - Izaberi sve - Video plejer - sekunde + Već postoji. Prebriši? + Brisanje... + Gotovo 3 sekunde + Traka kamere + Ponovi + Sačuvano + Rastvori + Nasumično + Premeštanje Premeštanje neuspešno + Video zapisi + Završeno + Izab. sve Svi albumi - 20 sekundi - Dostignut maksimalan broj karaktera (%d) - Zumiranje - Galerija - 5 sekundi - Rastvori - Nemoguće preimenovati - Video zapis - Nemoguće preimenovati. Naziv albuma već u upotrebi - Titlovi - Slajd-šou - Preuzimanja - Kreiraj folder? Promeni ime - Slajd Premesti + Nemoguće obrisati Interval - Završeno - Obriši? - Izmeni - Dostignut maksimalan broj karaktera (%d) - Gotovo + Već postoji + Kreiraj album + Nema stavki + Roletna + Memorisanje neuspešno diff --git a/res/swe-SE.xml b/res/swe-SE.xml index c311d98..28e68b6 100644 --- a/res/swe-SE.xml +++ b/res/swe-SE.xml @@ -2,69 +2,81 @@ - + Maximalt antal tecken har använts + Bildspel + Välj alla + Radera? + Redigera + Meddelande + Bearbetar... + Nedladdningar + Albumnamnet används redan + 20 sekunder + Aktivera + 2 sekunder + Meddelanden + Klar + Kan inte byta namn + E-post + Flyttad + Avbryt + Markerade Radera - Album + Textning + Avbryt + Högsta antal tecken (%d) har uppnåtts + Högsta antal tecken (%d) har uppnåtts + Bildspel + Bild %s finns redan - Kamerarulle - Skapa album + Laddar... + Album + Kan inte byta namn. Albumnamnet används redan + Sparar... + Åtgärden misslyckades Övergångseffekt - Avbryt + Musik + Skapa mapp? + Radering misslyckades + Videoklipp + Zoom Iris - Används redan.\nSkriv över? - E-post - Kan inte radera - Välj allt + Bildspelsintervall + Videospelare + sekunder Sida - Radering misslyckades - Markerade - Musik + 10 sekunder + Galleri + Inget namn + Bilder Tona - 2 sekunder - Åtgärden misslyckades - Blanda - Avbryt Redigera - Bilder + 5 sekunder + Raderad Ta bort? - Videoklipp - Bildspelsintervall - Bildspel - Aktivera - Inget namn - Albumnamnet används redan - Inga objekt - 10 sekunder - Finns redan - Fördragning - Upprepa - Välj alla - Videospelare - sekunder + Används redan.\nSkriv över? + Raderar... + Klar 3 sekunder + Kamerarulle + Upprepa + Sparad + Lös upp + Blanda + Flyttar... Det gick inte att flytta + Videoklipp + Slutförd + Välj allt Alla album - 20 sekunder - Högsta antal tecken (%d) har uppnåtts - Zoom - Galleri - 5 sekunder - Lös upp - Kan inte byta namn - Videoklipp - Kan inte byta namn. Albumnamnet används redan - Textning - Bildspel - Nedladdningar - Skapa mapp? Byt namn - Bild Flytta + Kan inte radera Intervall - Slutförd - Radera? - Redigera - Högsta antal tecken (%d) har uppnåtts - Klar + Finns redan + Skapa album + Inga objekt + Fördragning + Det gick inte att spara diff --git a/res/tur-TR.xml b/res/tur-TR.xml index b4a9497..deb19a4 100644 --- a/res/tur-TR.xml +++ b/res/tur-TR.xml @@ -2,69 +2,81 @@ - + Maksimum karakter sayısına ulaşıldı + Slayt gösterisi + Hepsini seç + Sil? + Düzenle + Mesaj + İşlem yapılıyor... + İndirilenler + Albüm adı zaten kullanılıyor + 20 saniye + Etkinleştirme + 2 saniye + Mesajlar + Kaydet + Yeniden adlandırılamıyor. Dosya kullanımda. + E-posta + Taşındı + İptal + Seçili Sil - Albümler + Altyazılar + İptal + Maksimum karakter sayısına (%d) ulaşıldı + Maksimum karakter sayısına (%d) ulaşıldı + Slayt şov + Slayt %s zaten var - Kamera klasörü - Albüm oluştur + Yükleniyor... + Albümler + Yeniden adlandırılamıyor. Albüm adı zaten kullanılıyor + Kaydediliyor… + İşlem başarısız Geçiş efekti - İptal + Müzik + Klasör oluşturulsun mu? + Silinemedi + Video + Yakınlaştır İris - Zaten var. Üzerine yazılsın mı? - E-posta - Silinemiyor - Tümünü seç + Slayt gösterisi aralığı + Video Oynatıcı + saniye Sayfa - Silinemedi - Seçili - Müzik + 10 saniye + Galeri + İsim yok + Resimler Soldur - 2 saniye - İşlem başarısız - Karışık - İptal Düzenle - Resimler + 5 saniye + Silindi Kaldır? - Videolar - Slayt gösterisi aralığı - Slayt şov - Etkinleştirme - İsim yok - Albüm adı zaten kullanılıyor - Öğe yok - 10 saniye - Zaten var - Kör - Tekrarla - Hepsini seç - Video Oynatıcı - saniye + Zaten var. Üzerine yazılsın mı? + Siliniyor... + Tamamlandı 3 saniye + Kamera klasörü + Tekrarla + Kaydedildi + Çöz + Karışık + Taşıyor... Taşıma başarısız + Videolar + Tamamlandı + Tümünü seç Tüm albümler - 20 saniye - Maksimum karakter sayısına (%d) ulaşıldı - Yakınlaştır - Galeri - 5 saniye - Çöz - Yeniden adlandırılamıyor. Dosya kullanımda. - Video - Yeniden adlandırılamıyor. Albüm adı zaten kullanılıyor - Altyazılar - Slayt gösterisi - İndirilenler - Klasör oluşturulsun mu? İsim değiştir - Slayt Taşı + Silinemiyor Aralık - Tamamlandı - Sil? - Düzenle - Maksimum karakter sayısına (%d) ulaşıldı - Kaydet + Zaten var + Albüm oluştur + Öğe yok + Kör + Kaydetme başarısız diff --git a/res/ukr-UA.xml b/res/ukr-UA.xml index 71cba66..d9e37c6 100644 --- a/res/ukr-UA.xml +++ b/res/ukr-UA.xml @@ -2,69 +2,81 @@ - + Досягнуто максимальної кількості символів + Слайд-шоу + Вибрати всі + Видалити? + Редагувати + Повідомлення + Обробка... + Завантаження + Ім’я альбому вже викор. + 20 секунд + Активація + 2 секунди + Повідомлення + Готово + Неможливо перейменувати + Email + Переміщено + Скасувати + Вибране Видалити - Альбоми + Субтитри + Скасувати + Досягнуто максимальної кількості символів: %d + Досягнуто максимальної кількості символів: %d + Слайд-шоу + Слайд %s вже існує - Плівка камери - Створити альбом + Завантаження... + Альбоми + Неможливо перейменувати. Ім’я альбому вже використовується + Збереження... + Збій операції Ефект переходу - Скасувати + Музика + Створити папку? + Збій видалення + Відео + Масштаб Ірісова діафрагма - Вже існує. Переписати? - Email - Неможливо видалити - Вибр. всі + Інтервал слайд-шоу + Відеоплеєр + секунди Сторінка - Збій видалення - Вибране - Музика + 10 секунд + Галерея + Немає імені + Зображення Загасання - 2 секунди - Збій операції - Випадковий порядок - Скасувати Редагувати - Зображення + 5 секунд + Видалено Видалити? - Відео - Інтервал слайд-шоу - Слайд-шоу - Активація - Немає імені - Ім’я альбому вже викор. - Немає об’єктів - 10 секунд - Вже існує - Жалюзі - Повторення - Вибрати всі - Відеоплеєр - секунди + Вже існує. Переписати? + Видалення... + Готово 3 секунди + Плівка камери + Повторення + Збережено + Розчинення + Випадковий порядок + Переміщення... Збій переміщення + Відео + Завершено + Вибр. всі Усі альбоми - 20 секунд - Досягнуто максимальної кількості символів: %d - Масштаб - Галерея - 5 секунд - Розчинення - Неможливо перейменувати - Відео - Неможливо перейменувати. Ім’я альбому вже використовується - Субтитри - Слайд-шоу - Завантаження - Створити папку? Змінити ім'я - Слайд Перемістити + Неможливо видалити Інтервал - Завершено - Видалити? - Редагувати - Досягнуто максимальної кількості символів: %d - Готово + Вже існує + Створити альбом + Немає об’єктів + Жалюзі + Збій збереження diff --git a/res/uzb-UZ.xml b/res/uzb-UZ.xml index bbdca24..84d2703 100644 --- a/res/uzb-UZ.xml +++ b/res/uzb-UZ.xml @@ -2,69 +2,81 @@ - + Belgilar soni ruxsat etilgan maksimal miqdorga yetdi + Slayd-shou + Barchasini tanlash + O'chirilsinmi? + Tahrirlash + Xabar + Bajarilmoqda... + Yuklanishlar + Albom nomi ishlatilmoqda + 20 soniya + Faollashtirish + 2 soniya + Xabarlar + Bajarildi + Nomini o‘zgartirib bo‘lmaydi + E-pochta + Ko‘chirilgan + Bekor qilish + Tanlangan O'chirish - Albom + Tagsarlavhalar + Bekor qilish + Belgilar soni ruxsat etilgan maksimal miqdorga (%d) yetdi + Belgilar soni ruxsat etilgan maksimal miqdorga (%d) yetdi + Slayd-shou + Slayd %s avvaldan mavjud - Kamera roli - Albom yaratish + Yuklanmoqda... + Albom + Nomni o‘zgartirib bo‘lmaydi. Albom nomi avvaldan ishlatilmoqda + Saqlanmoqda... + Operatsiya bajarilmadi Almashuvchi effekt - Bekor qilish + Musiqa + Jild yaratilsinmi? + Yo‘q qilish bajarilmadi + Video + Masshtabni o‘zgartirish Gulsapsar - Avvaldan mavjud. Ustidan yozilsinmi? - E-pochta - Yo‘q qilib bo‘lmaydi - Bar. tanla + Slayd-shou intervali + Video pleyer + soniya Sahifa - Yo‘q qilish bajarilmadi - Tanlangan - Musiqa + 10 soniya + Galereya + Nom yo‘q + Tasvirlar Xiralashish - 2 soniya - Operatsiya bajarilmadi - Tasodifiy - Bekor qilish Tahrirlash - Tasvirlar + 5 soniya + O'chirildi Olib tashlansinmi? - Videolar - Slayd-shou intervali - Slayd-shou - Faollashtirish - Nom yo‘q - Albom nomi ishlatilmoqda - Elementlar yo‘q - 10 soniya - Avvaldan mavjud - Jalyuzi - Takrorlash - Barchasini tanlash - Video pleyer - soniya + Avvaldan mavjud. Ustidan yozilsinmi? + O'chirilmoqda… + Bajarildi 3 soniya + Kamera roli + Takrorlash + Saqlandi + Erish + Tasodifiy + Ko‘chirilmoqda... Ko‘chirib bo‘lmadi + Videolar + Yakunlandi + Bar. tanla Barcha albomlar - 20 soniya - Belgilar soni ruxsat etilgan maksimal miqdorga (%d) yetdi - Masshtabni o‘zgartirish - Galereya - 5 soniya - Erish - Nomini o‘zgartirib bo‘lmaydi - Video - Nomni o‘zgartirib bo‘lmaydi. Albom nomi avvaldan ishlatilmoqda - Tagsarlavhalar - Slayd-shou - Yuklanishlar - Jild yaratilsinmi? Nomni o‘zgartirish - Slayd Ko‘chirish + Yo‘q qilib bo‘lmaydi Interval - Yakunlandi - O'chirilsinmi? - Tahrirlash - Belgilar soni ruxsat etilgan maksimal miqdorga (%d) yetdi - Bajarildi + Avvaldan mavjud + Albom yaratish + Elementlar yo‘q + Jalyuzi + Saqlab bo‘lmadi diff --git a/res/zho-CN.xml b/res/zho-CN.xml index 90f2706..2605737 100644 --- a/res/zho-CN.xml +++ b/res/zho-CN.xml @@ -2,69 +2,81 @@ - + 已达到最大字符限制 + 幻灯片 + 全选 + 删除？ + 编辑 + 信息 + 处理中… + 下载列表 + 相册名已使用 + 20 秒 + 激活 + 2 秒 + 信息 + 完成 + 无法重命名 + 电子邮件 + 已移动 + 取消 + 已选择 删除 - 专辑 + 字幕 + 取消 + 已达到最大字符数(%d) + 已达到最大字符数(%d) + 幻灯片 + 幻灯片 %s 已存在 - 滚动照相机 - 新建相册 + 载入中… + 专辑 + 无法重命名。相册名已使用 + 正在保存... + 操作失败 转换效果 - 取消 + 音乐 + 创建文件夹吗？ + 删除失败 + 录像 + 缩放 彩色效果 - 已存在。覆盖？ - 电子邮件 - 无法删除 - 选择全部 + 幻灯片播放间隔 + 视频播放器 + 秒 页面 - 删除失败 - 已选择 - 音乐 + 10 秒 + 图库 + 无名称 + 图片 淡出 - 2 秒 - 操作失败 - 随机播放 - 取消 编辑 - 图片 + 5 秒 + 已删除 移除? - 视频 - 幻灯片播放间隔 - 幻灯片 - 激活 - 无名称 - 相册名已使用 - 无项目 - 10 秒 - 已经存在 - 百叶窗 - 重复 - 全选 - 视频播放器 - 秒 + 已存在。覆盖？ + 删除中.. + 完成 3 秒 + 滚动照相机 + 重复 + 已保存 + 溶解 + 随机播放 + 移动中... 移动失败 + 视频 + 已完成 + 选择全部 所有相册 - 20 秒 - 已达到最大字符数(%d) - 缩放 - 图库 - 5 秒 - 溶解 - 无法重命名 - 录像 - 无法重命名。相册名已使用 - 字幕 - 幻灯片 - 下载列表 - 创建文件夹吗？ 更改名称 - 幻灯片 移动 + 无法删除 间隔 - 已完成 - 删除？ - 编辑 - 已达到最大字符数(%d) - 完成 + 已经存在 + 新建相册 + 无项目 + 百叶窗 + 储存失败 diff --git a/res/zho-HK.xml b/res/zho-HK.xml index ecef1a1..c4733cc 100644 --- a/res/zho-HK.xml +++ b/res/zho-HK.xml @@ -2,69 +2,81 @@ - + 字元數目已達上限 + 投影片播放 + 選擇全部 + 刪除嗎？ + 編輯 + 訊息 + 處理中... + 下載項目 + 相簿名稱已使用 + 20 秒 + 啟動 + 2 秒 + 訊息 + 完成 + 無法重新命名 + 電子郵件 + 已移動 + 取消 + 已選擇 刪除 - 專輯 + 字幕 + 取消 + 已達字元數目上限 (%d) + 已達字元數目上限 (%d) + 投影片放映 + 滑動 %s 已存在 - 相簿 - 建立相簿 + 正在載入... + 專輯 + 無法重新命名。相簿名稱已使用 + 正在儲存... + 操作失敗 過場效果 - 取消 + 音樂 + 要建立資料夾嗎？ + 刪除失敗 + 影片 + 縮放 光圈 - 已存在。要覆蓋嗎？ - 電子郵件 - 無法刪除 - 選擇全部 + 投影片間隔 + 影片播放器 + 秒 頁面 - 刪除失敗 - 已選擇 - 音樂 + 10 秒 + 媒體瀏覽器 + 無名稱 + 圖像 褪色 - 2 秒 - 操作失敗 - 隨機播放 - 取消 編輯 - 圖像 + 5 秒 + 已刪除 要移除嗎？ - 影片 - 投影片間隔 - 投影片放映 - 啟動 - 無名稱 - 相簿名稱已使用 - 無項目 - 10 秒 - 已存在 - 百葉窗 - 重複 - 選擇全部 - 影片播放器 - 秒 + 已存在。要覆蓋嗎？ + 正在刪除... + 完成 3 秒 + 相簿 + 重複 + 已儲存 + 融化 + 隨機播放 + 正在移動... 移動失敗 + 影片 + 已完成 + 選擇全部 全部專輯 - 20 秒 - 已達字元數目上限 (%d) - 縮放 - 媒體瀏覽器 - 5 秒 - 融化 - 無法重新命名 - 影片 - 無法重新命名。相簿名稱已使用 - 字幕 - 投影片播放 - 下載項目 - 要建立資料夾嗎？ 更改名稱 - 滑動 移動 + 無法刪除 間隔 - 已完成 - 刪除嗎？ - 編輯 - 已達字元數目上限 (%d) - 完成 + 已存在 + 建立相簿 + 無項目 + 百葉窗 + 儲存失敗 diff --git a/res/zho-SG.xml b/res/zho-SG.xml index 957704a..445ac2c 100644 --- a/res/zho-SG.xml +++ b/res/zho-SG.xml @@ -2,69 +2,81 @@ - + 已达最大字符数量 + 幻灯片播放 + 全选 + 删除？ + 编辑 + 讯息 + 处理中… + 下载 + 相册名已使用 + 20秒 + 启动 + 2秒 + 讯息 + 已完成 + 无法重命名 + 电邮 + 已移动 + 取消 + 已选定 删除 - 相册 + 说明字幕 + 取消 + 已达到最大字符数(%d) + 已达到最大字符数(%d) + 幻灯片 + 滑动 %s 已存在 - 滚动照相机 - 新建相册 + 裝载中… + 相册 + 无法重命名。相册名已使用 + 储存中… + 操作失败 转换效果 - 取消 + 音乐 + 创建文件夹吗? + 删除失败 + 录像 + 变焦 Iris 效果 - 已存在。覆盖？ - 电邮 - 无法删除 - 选择全部 + 幻灯片播放间隔 + 视频播放器 + 秒 页面 - 删除失败 - 已选定 - 音乐 + 10 秒 + 画廊 + 无名称 + 图像 淡出 - 2秒 - 操作失败 - 随机播放 - 取消 编辑 - 图像 + 5秒 + 已删除 移除？ - 录像 - 幻灯片播放间隔 - 幻灯片 - 启动 - 无名称 - 相册名已使用 - 无项目 - 10 秒 - 已经存在 - 百叶窗 - 重复 - 全选 - 视频播放器 - 秒 + 已存在。覆盖？ + 删除中… + 已完成 3秒 + 滚动照相机 + 重复 + 已储存 + 溶化 + 随机播放 + 移动中… 移动失败 + 录像 + 已完成 + 选择全部 所有相册 - 20秒 - 已达到最大字符数(%d) - 变焦 - 画廊 - 5秒 - 溶化 - 无法重命名 - 录像 - 无法重命名。相册名已使用 - 说明字幕 - 幻灯片播放 - 下载 - 创建文件夹吗? 更改名称 - 滑动 移动 + 无法删除 间隔 - 已完成 - 删除？ - 编辑 - 已达到最大字符数(%d) - 已完成 + 已经存在 + 新建相册 + 无项目 + 百叶窗 + 储存失败 diff --git a/res/zho-TW.xml b/res/zho-TW.xml index 4383a9c..fa89f67 100644 --- a/res/zho-TW.xml +++ b/res/zho-TW.xml @@ -2,69 +2,81 @@ - + 已達字元數上限 + 投影片放映 + 全選 + 要刪除嗎？ + 編輯 + 訊息 + 處理中… + 下載 + 相簿名稱已被使用 + 20 秒 + 啟動 + 2 秒 + 訊息 + 完成 + 無法重新命名 + 電子郵件 + 已移動 + 取消 + 已選擇 刪除 - 相簿 + 字幕 + 取消 + 達到%d個最大字元 + 達到%d個最大字元 + 投影片放映 + 投影片 %s 已存在 - 相簿 - 建立專輯 + 正在載入... + 相簿 + 無法重新命名。相簿名稱已被使用 + 正在儲存... + 操作失敗 轉換效果 - 取消 + 音樂 + 要建立資料夾嗎？ + 刪除失敗 + 影片 + 縮放 光圈 - 已存在。要覆寫嗎？ - 電子郵件 - 無法刪除 - 選擇所有 + 投影片放映間隔 + 影片播放器 + 秒 頁面 - 刪除失敗 - 已選擇 - 音樂 + 10 秒 + 媒體瀏覽器 + 無姓名 + 圖像 淡化 - 2 秒 - 操作失敗 - 隨機播放 - 取消 編輯 - 圖像 + 5 秒 + 已刪除 要移除嗎？ - 影片 - 投影片放映間隔 - 投影片放映 - 啟動 - 無姓名 - 相簿名稱已被使用 - 無項目 - 10 秒 - 已存在 - 百頁窗 - 重複 - 全選 - 影片播放器 - 秒 + 已存在。要覆寫嗎？ + 正在刪除... + 完成 3 秒 + 相簿 + 重複 + 已儲存 + 分解 + 隨機播放 + 正在移動... 移動失敗 + 影片 + 已完成 + 選擇所有 所有相簿 - 20 秒 - 達到%個最大字元 - 縮放 - 媒體瀏覽器 - 5 秒 - 分解 - 無法重新命名 - 影片 - 無法重新命名。相簿名稱已被使用 - 字幕 - 投影片放映 - 下載 - 要建立資料夾嗎？ 變更名稱 - 投影片 移動 + 無法刪除 間隔 - 已完成 - 要刪除嗎？ - 編輯 - 達到%個最大字元 - 完成 + 已存在 + 建立專輯 + 無項目 + 百頁窗 + 儲存失敗 diff --git a/shared/data/GalleryDefaultSettings.ini b/shared/data/GalleryDefaultSettings.ini index 5c13ef3..9a9d3bd 100644 --- a/shared/data/GalleryDefaultSettings.ini +++ b/shared/data/GalleryDefaultSettings.ini @@ -1,3 +1,4 @@ #IMAGE_VIEWER_SETTING SLIDESHOW_INTERVAL_VALUE=3 -TRANSITION_EFFECT_VALUE=0 \ No newline at end of file +TRANSITION_EFFECT_VALUE=0 +REPEAT_VALUE=0 \ No newline at end of file diff --git a/src/GlAlbumInfo.cpp b/src/GlAlbumInfo.cpp index db43812..fbac422 100644 --- a/src/GlAlbumInfo.cpp +++ b/src/GlAlbumInfo.cpp @@ -30,10 +30,10 @@ using namespace Tizen::Graphics; static const int FORMAT_BUFFER_SIZE = 256; AlbumInfo::AlbumInfo(void) - :__albumName(EMPTY_SPACE) - ,__pDirectoryFullPathList(null) - ,__pContentIdList(null) - ,__folderThumnailBitmapCount(0) + : __albumName(EMPTY_SPACE) + , __pDirectoryFullPathList(null) + , __pContentIdList(null) + , __folderThumnailBitmapCount(0) { for (int i = 0; i < FOLDER_BITMAP_MAX; ++i) { diff --git a/src/GlAlbumListEditorForm.cpp b/src/GlAlbumListEditorForm.cpp index 4561cec..0c94dc4 100644 --- a/src/GlAlbumListEditorForm.cpp +++ b/src/GlAlbumListEditorForm.cpp @@ -250,26 +250,37 @@ AlbumListEditorForm::InitializeFooter(void) FooterItem itemShare; itemShare.Construct(ACTION_ID_FOOTER_SHARE); itemShare.SetText(ResourceManager::GetString(L"EMPTY_SPACE")); - Bitmap* pBitmap2 = ResourceManager::GetBitmapN(IDB_CONTROLBAR_SHARE); - if (pBitmap2 != null) + Bitmap* pShareBitmap = ResourceManager::GetBitmapN(IDB_CONTROLBAR_SHARE); + Bitmap* pShareBitmapDim = ResourceManager::GetBitmapN(IDB_CONTROLBAR_SHARE_DIM); + if (pShareBitmap != null && pShareBitmapDim !=null ) { - itemShare.SetIcon(FOOTER_ITEM_STATUS_NORMAL, pBitmap2); + itemShare.SetIcon(FOOTER_ITEM_STATUS_NORMAL, pShareBitmap); + itemShare.SetIcon(FOOTER_ITEM_STATUS_DISABLED, pShareBitmapDim); } + pFooter->AddItem(itemShare); - delete pBitmap2; + delete pShareBitmap; + delete pShareBitmapDim; FooterItem itemDelete; itemDelete.Construct(ACTION_ID_FOOTER_DELETE); itemDelete.SetText(ResourceManager::GetString(L"EMPTY_SPACE")); - Bitmap* pBitmap1 = ResourceManager::GetBitmapN(IDB_CONTROLBAR_DELETE); - if (pBitmap1 != null) + Bitmap* pBitmapDelete = ResourceManager::GetBitmapN(IDB_CONTROLBAR_DELETE); + Bitmap* pBitmapDeleteDim = ResourceManager::GetBitmapN(IDB_CONTROLBAR_DELETE_DIM); + + if (pBitmapDelete != null) { - itemDelete.SetIcon(FOOTER_ITEM_STATUS_NORMAL, pBitmap1); + itemDelete.SetIcon(FOOTER_ITEM_STATUS_NORMAL, pBitmapDelete); } - pFooter->AddItem(itemDelete); - delete pBitmap1; - pBitmap1 = null; + if( pBitmapDeleteDim != null) + { + itemDelete.SetIcon(FOOTER_ITEM_STATUS_DISABLED, pBitmapDeleteDim); + } + + pFooter->AddItem(itemDelete); + delete pBitmapDelete; + delete pBitmapDeleteDim; pFooter->AddActionEventListener(*this); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); @@ -310,7 +321,9 @@ AlbumListEditorForm::InitializeControl() __pShareContextMenu = new ContextMenu(); __pShareContextMenu->Construct(Point(X_POSITION_SHARE_CONTEXTMENU, Y_POSITION_SHARE_CONTEXTMENU), CONTEXT_MENU_STYLE_LIST); - __pShareContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EMAIL"),ACTION_ID_CONTEXT_MENU_EMAIL); + __pShareContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_MESSAGE"), + ACTION_ID_CONTEXT_MENU_MESSAGE); + __pShareContextMenu->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EMAIL"), ACTION_ID_CONTEXT_MENU_EMAIL); __pShareContextMenu->AddActionEventListener(*this); InitializePopup(); @@ -344,8 +357,8 @@ AlbumListEditorForm::InitializePopup(void) Button* pCancelButton = new (std::nothrow) Button(); pCancelButton->Construct( Rectangle(popupClientBounds.width / 2 + GAP_W_POPUP_ITEM, Y_DELETE_BUTTON, - popupClientBounds.width / 2 - GAP_W_POPUP_ITEM, H_DELETE_BUTTON), - ResourceManager::GetString(L"IDS_COM_POP_CANCEL")); + popupClientBounds.width / 2 - GAP_W_POPUP_ITEM, H_DELETE_BUTTON), + ResourceManager::GetString(L"IDS_COM_POP_CANCEL")); pCancelButton->SetActionId(ACTION_ID_DELETE_POPUP_CANCEL); pCancelButton->AddActionEventListener(*this); @@ -626,9 +639,14 @@ AlbumListEditorForm::OnActionPerformed(const Control& source, int actionId) __pShareContextMenu->SetShowState(true); __pShareContextMenu->Show(); break; + case ACTION_ID_CONTEXT_MENU_MESSAGE: + { + OnRequestMessage(); + break; + } case ACTION_ID_CONTEXT_MENU_EMAIL: { - OnRequestEmailAction(); + OnRequestEmail(); break; } case ACTION_ID_DELETE_POPUP_DEL: @@ -670,7 +688,7 @@ AlbumListEditorForm::OnFormBackRequested(Form& source) void AlbumListEditorForm::OnSceneActivatedN(const SceneId& previousSceneId, - const SceneId& currentSceneId, IList* pArgs) + const SceneId& currentSceneId, IList* pArgs) { AppLogDebug("ENTER OnSceneActivatedN"); __pPresentationModel->InitializeAlbumInfoList(CONTENT_TYPE_ALL); @@ -700,7 +718,7 @@ AlbumListEditorForm::OnSceneActivatedN(const SceneId& previousSceneId, void AlbumListEditorForm::OnSceneDeactivated(const SceneId& currentSceneId, - const SceneId& nextSceneId) + const SceneId& nextSceneId) { AppLogDebug("ENTER"); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); @@ -733,7 +751,78 @@ AlbumListEditorForm::Update(void) } void -AlbumListEditorForm::OnRequestEmailAction(void) +AlbumListEditorForm::OnRequestMessage(void) +{ + AppLogDebug("ENTER"); + + int checkCount = GetCheckedFolder(); + + if (checkCount <= 0) + { + AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult())); + + return; + } + + String combineText; + + IList* pAlbumInfoList = __pPresentationModel->GetAlbumInfoList(); + + int maxCount = __pPresentationModel->GetFolderCount(); + ContentManager contentManager; + result r = contentManager.Construct(); + if (r == E_SUCCESS) + { + if (maxCount <= 0) + { + AppLogDebug("EXIT 2(%s)", GetErrorMessage(GetLastResult())); + + return; + } + for (int i = 0 ; i < maxCount; ++i) + { + if (__pEditorFolderIconList->IsItemChecked (i)) + { + AlbumInfo* pAlbumInfo = static_cast(pAlbumInfoList->GetAt(i)); + IList* pContentIdList = pAlbumInfo->GetContentIdListN(); + int loopCount = pContentIdList->GetCount(); + for (int k = 0; k < loopCount; ++k) + { + ContentId* pContentId = static_cast(pContentIdList->GetAt(k)); + ContentInfo* pContentInfo = contentManager.GetContentInfoN(*pContentId); + + if (pContentInfo == null) + { + break; + } + String path = pContentInfo->GetContentPath(); + if (combineText.CompareTo(EMPTY_SPACE) != 0) + { + combineText.Append(L";"); + } + combineText.Append(path); + } + + if (i == 0) + { + break; + } + } + } + + HashMap* pDataList = new (std::nothrow) HashMap(SingleObjectDeleter); + pDataList->Construct(); + pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_ATTACHMENTS), + new (std::nothrow) String(combineText)); + + __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_MESSAGE, APPCONTROL_OPERATION_ID_COMPOSE, + pDataList, null); + } + AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); +} + +void +AlbumListEditorForm::OnRequestEmail(void) { AppLogDebug("ENTER"); @@ -765,11 +854,11 @@ AlbumListEditorForm::OnRequestEmailAction(void) { if (__pEditorFolderIconList->IsItemChecked (i)) { - AlbumInfo* pAlbumInfo = static_cast(pAlbumInfoList->GetAt(i)); - IList* pContentIdList = pAlbumInfo->GetContentIdListN(); - int loopCount = pContentIdList->GetCount(); - for (int k = 0; k < loopCount; ++k) - { + AlbumInfo* pAlbumInfo = static_cast(pAlbumInfoList->GetAt(i)); + IList* pContentIdList = pAlbumInfo->GetContentIdListN(); + int loopCount = pContentIdList->GetCount(); + for (int k = 0; k < loopCount; ++k) + { ContentId* pContentId = static_cast(pContentIdList->GetAt(k)); ContentInfo* pContentInfo = contentManager.GetContentInfoN(*pContentId); @@ -780,15 +869,15 @@ AlbumListEditorForm::OnRequestEmailAction(void) String path = pContentInfo->GetContentPath(); if (combineText.CompareTo(EMPTY_SPACE) != 0) { - combineText.Append(L";"); + combineText.Append(L";"); } combineText.Append(path); - } + } - if (i == 0) - { - break; - } + if (i == 0) + { + break; + } } } diff --git a/src/GlAlbumListForm.cpp b/src/GlAlbumListForm.cpp index f93b17b..456fe02 100644 --- a/src/GlAlbumListForm.cpp +++ b/src/GlAlbumListForm.cpp @@ -63,7 +63,7 @@ result AlbumListForm::Initialize(void) { AppLogDebug("ENTER"); - result r = Construct(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER); + result r = Form::Construct(IDL_FORM_ALBUM_LIST); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); return r; @@ -218,25 +218,21 @@ void AlbumListForm::CreateIconListView(void) { AppLogDebug("ENTER"); - Rectangle clientArea = this->GetClientAreaBounds(); Dimension itemSize(W_FOLDER_SIZE, H_FOLDER_SIZE); - clientArea.x = clientArea.y = 0; - __pAlbumViewIconList = new (std::nothrow) IconListView(); - __pAlbumViewIconList->Construct(Rectangle(0, 0, GetClientAreaBounds().width, GetClientAreaBounds().height), - itemSize, ICON_LIST_VIEW_STYLE_NORMAL , ICON_LIST_VIEW_SCROLL_DIRECTION_VERTICAL); + + __pAlbumViewIconList = static_cast< IconListView* >(GetControl(L"IDC_ICONLISTVIEW_ALBUM_LIST")); + AppAssert(__pAlbumViewIconList); + + __pAlbumViewIconList->SetItemProvider(*this); + __pAlbumViewIconList->SetItemBorderStyle(ICON_LIST_VIEW_ITEM_BORDER_STYLE_NONE); + __pAlbumViewIconList->AddIconListViewItemEventListener(*this); + Bitmap* pBitmap = ResourceManager::GetBitmapN(IDB_LISTVIEW_EMPTY); if (pBitmap != null) { __pAlbumViewIconList->SetBitmapOfEmptyList(pBitmap); delete pBitmap; - pBitmap = null; } - __pAlbumViewIconList->SetTextOfEmptyList(ResourceManager::GetString(L"IDS_COM_BODY_NO_ITEMS")); - __pAlbumViewIconList->SetItemBorderStyle(ICON_LIST_VIEW_ITEM_BORDER_STYLE_NONE); - __pAlbumViewIconList->SetItemProvider(*this); - __pAlbumViewIconList->SetTouchAnimationEnabled(false); - __pAlbumViewIconList->AddIconListViewItemEventListener(*this); - AddControl(*__pAlbumViewIconList); __pAlbumViewIconList->SetShowState(true); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); @@ -500,9 +496,12 @@ AlbumListForm::OnSceneActivatedN(const SceneId& previousSceneId, { __pPresentationModel->InitializeAlbumInfoList(CONTENT_TYPE_ALL); } - __itemCount = __pPresentationModel->GetFolderCount(); - __pAlbumViewIconList->UpdateList(); + + if (__pAlbumViewIconList != null) + { + __pAlbumViewIconList->UpdateList(); + } AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); } diff --git a/src/GlAlbumListPresentationModel.cpp b/src/GlAlbumListPresentationModel.cpp index 1b35fa6..175ba82 100644 --- a/src/GlAlbumListPresentationModel.cpp +++ b/src/GlAlbumListPresentationModel.cpp @@ -93,10 +93,10 @@ ThumbnailEvent* AlbumListPresentationModel::__pThumbnailEvent = null; IList* AlbumListPresentationModel::__pAlbumInfoList = null; AlbumListPresentationModel::AlbumListPresentationModel(void) - :__pFolderBackgroundBitmap(null) - ,__appControlMode(APP_CONTROL_MODE_MAIN) - ,__appControlMediaType(APPCONTROL_MEDIA_TYPE_UNKNOWN) - ,__appControlSelectionMode(APPCONTROL_SELECTION_MODE_UNKNOWN) + : __pFolderBackgroundBitmap(null) + , __appControlMode(APP_CONTROL_MODE_MAIN) + , __appControlMediaType(APPCONTROL_MEDIA_TYPE_IMAGE) + , __appControlSelectionMode(APPCONTROL_SELECTION_MODE_SINGLE) { AppLogDebug("ENTER"); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); @@ -146,6 +146,14 @@ AlbumListPresentationModel::Construct(void) { __appControlMode = APP_CONTROL_MODE_PICK; + String mimeType = pApp->GetMimeType(); + if (mimeType.IsEmpty() != true) + { + if (mimeType.StartsWith(APPCONTROL_DATA_VIDEO, 0) == true) + { + __appControlMediaType = APPCONTROL_MEDIA_TYPE_VIDEO; + } + } if (pArguments != null) { const String* selectionMode = @@ -157,19 +165,11 @@ AlbumListPresentationModel::Construct(void) { __appControlMediaType = APPCONTROL_MEDIA_TYPE_VIDEO; } - else - { - __appControlMediaType = APPCONTROL_MEDIA_TYPE_IMAGE; - } if (selectionMode != null && selectionMode->CompareTo(APPCONTROL_DATA_MULTIPLE) == 0) { __appControlSelectionMode = APPCONTROL_SELECTION_MODE_MULTIPLE; } - else - { - __appControlSelectionMode = APPCONTROL_SELECTION_MODE_SINGLE; - } } } else if (operationId.CompareTo(APPCONTROL_OPERATION_ID_CONFIGURE) == 0) diff --git a/src/GlAlbumNameEditorForm.cpp b/src/GlAlbumNameEditorForm.cpp index 63df8d4..66a7410 100644 --- a/src/GlAlbumNameEditorForm.cpp +++ b/src/GlAlbumNameEditorForm.cpp @@ -23,14 +23,17 @@ #include "GlAlbumInfo.h" #include "GlAlbumNameEditorForm.h" #include "GlAlbumListPresentationModel.h" +#include "GlFileListPresentationModel.h" #include "GlResourceManager.h" #include "GlTypes.h" +#include "GlFileMoveTimer.h" using namespace Tizen::App; using namespace Tizen::Base; using namespace Tizen::Base::Collection; using namespace Tizen::Base::Runtime; using namespace Tizen::Base::Utility; +using namespace Tizen::Content; using namespace Tizen::Graphics; using namespace Tizen::Media; using namespace Tizen::Io; @@ -49,6 +52,9 @@ AlbumNameEditorForm::AlbumNameEditorForm() , __albumNameEditorMode(ALBUM_NAME_EDITOR_MODE_RENAME) , __pMessageBox(null) , __pPresentationModel(null) + , __pFilePresentationModel(null) + , __pMoveIndexList(null) + ,__pFileMove(null) { AppLogDebug("ENTER"); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); @@ -56,6 +62,7 @@ AlbumNameEditorForm::AlbumNameEditorForm() AlbumNameEditorForm::~AlbumNameEditorForm() { + delete __pFileMove; AppLogDebug("ENTER"); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); } @@ -74,29 +81,35 @@ result AlbumNameEditorForm::OnInitializing(void) { AppLogDebug("ENTER"); - SetOrientation(ORIENTATION_PORTRAIT); - AddOrientationEventListener(*this); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - + __pFilePresentationModel = FileListPresentationModel::GetInstance(); return E_SUCCESS; } void -AlbumNameEditorForm::OnOrientationChanged(const Control &source, OrientationStatus orientationStatus) -{ - AppLogDebug("ENTER"); - __pNameEditField->SetBounds(RECT_NAME_EDIT_FIELD); - __pNameEditField->SetFocus(); - Draw(true); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} - -void AlbumNameEditorForm::OnTextValueChanged(const Control& source) { AppLogDebug("ENTER"); String inputString = __pNameEditField->GetText(); + if (inputString.Contains(DIRECTORY_SEPARATOR) == true) + { + if (__pMessageBox == null) + { + __pMessageBox = new (std::nothrow) MessageBox(); + __pMessageBox->Construct(L"", L"Donot use invalid character '/'", MSGBOX_STYLE_NONE, 3000); + int modalResult = 0; + __pMessageBox->ShowAndWait(modalResult); + delete __pMessageBox; + __pMessageBox = null; + } + + __pNameEditField->SetText(__nameEditFieldTempText); + __pNameEditField->SetFocus(); + + return; + } + ByteBuffer* buffer = StringUtil::StringToUtf8N(inputString); int remaining = 0; if (buffer != null) @@ -165,6 +178,16 @@ AlbumNameEditorForm::OnTerminating(void) return E_SUCCESS; } +void AlbumNameEditorForm::OnFileOpInvalidate(enum FileActionMode actionId) +{ + Invalidate(true); + +} +void AlbumNameEditorForm::OnFileOpComplete(enum FileActionMode actionId, result res) +{ + +} + void AlbumNameEditorForm::OnActionPerformed(const Control& source, int actionId) { @@ -202,7 +225,37 @@ AlbumNameEditorForm::OnActionPerformed(const Control& source, int actionId) argsList.Construct(); argsList.Add(new (std::nothrow) String(pPath)); - pSceneManager->GoBackward(BackwardSceneTransition(__callerSceneId), &argsList); + + if (pPath.IsEmpty()) + { + AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult())); + delete __pMoveIndexList; + __pMoveIndexList = null; + return ; + } + + if (__pMoveIndexList == null || __pMoveIndexList->GetCount() <= 0) + { + AppLogDebug("EXIT 2(%s)", GetErrorMessage(GetLastResult())); + delete __pMoveIndexList; + __pMoveIndexList = null; + return ; + } + + delete __pFileMove; + __pFileMove = new FileMoveTimer(pPath, __pMoveIndexList, + __pFilePresentationModel, + this ); + result r = __pFileMove->StartTimer(); + + if (IsFailed(r)) + { + delete __pFileMove; + __pFileMove = null; + } + + AppLogDebug("MoveToContentFileList content failed (%s)", GetErrorMessage(r)); + break; } case ACTION_ID_BUTTON_CREATE_NAME_CANCEL: @@ -213,6 +266,7 @@ AlbumNameEditorForm::OnActionPerformed(const Control& source, int actionId) pSceneManager->GoBackward(BackwardSceneTransition(__callerSceneId)); break; } + default: break; } @@ -238,7 +292,7 @@ AlbumNameEditorForm::OnFormBackRequested(Form& source) void AlbumNameEditorForm::OnSceneActivatedN(const SceneId& previousSceneId, - const SceneId& currentSceneId, IList* pArgs) + const SceneId& currentSceneId, IList* pArgs) { AppLogDebug("ENTER"); __pPresentationModel = AlbumListPresentationModel::GetInstance(); @@ -263,9 +317,9 @@ AlbumNameEditorForm::OnSceneActivatedN(const SceneId& previousSceneId, } if (previousSceneId == IDSCN_ALL_LIST_EDITOR - || previousSceneId == IDSCN_IMAGE_LIST_EDITOR - || previousSceneId == IDSCN_VIDEO_LIST_EDITOR - || previousSceneId == IDSCN_ALL_LIST_SELECTION) + || previousSceneId == IDSCN_IMAGE_LIST_EDITOR + || previousSceneId == IDSCN_VIDEO_LIST_EDITOR + || previousSceneId == IDSCN_ALL_LIST_SELECTION) { if (previousSceneId == IDSCN_ALL_LIST_EDITOR) { @@ -306,7 +360,7 @@ AlbumNameEditorForm::OnSceneActivatedN(const SceneId& previousSceneId, __pNameEditField = new (std::nothrow) EditField(); __pNameEditField->Construct(RECT_NAME_EDIT_FIELD, EDIT_FIELD_STYLE_NORMAL, INPUT_STYLE_OVERLAY, - false, ALBUM_MAX_LENGTH); + EDIT_FIELD_TITLE_STYLE_NONE, true, ALBUM_MAX_LENGTH); __pNameEditField->AddTextEventListener(*this); __pNameEditField->SetColor(EDIT_STATUS_NORMAL, COLOR_NAME_EDIT_FIELD); @@ -342,8 +396,8 @@ AlbumNameEditorForm::OnSceneActivatedN(const SceneId& previousSceneId, pHeader->AddActionEventListener(*this); __pNameEditField = new (std::nothrow) EditField(); - __pNameEditField->Construct(RECT_NAME_EDIT_FIELD, - EDIT_FIELD_STYLE_NORMAL, INPUT_STYLE_OVERLAY); + __pNameEditField->Construct(RECT_NAME_EDIT_FIELD, EDIT_FIELD_STYLE_NORMAL, INPUT_STYLE_OVERLAY, + EDIT_FIELD_TITLE_STYLE_NONE, true, ALBUM_MAX_LENGTH); __pNameEditField->AddTextEventListener(*this); __pNameEditField->SetColor(EDIT_STATUS_NORMAL, COLOR_NAME_EDIT_FIELD); @@ -383,12 +437,18 @@ AlbumNameEditorForm::OnSceneActivatedN(const SceneId& previousSceneId, __pNameEditField->SetText(__nameEditFieldText); } } + + if( pArgs != NULL) + { + __pMoveIndexList = pArgs; + } + AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); } void AlbumNameEditorForm::OnSceneDeactivated(const SceneId& currentSceneId, - const SceneId& nextSceneId) + const SceneId& nextSceneId) { AppLogDebug("ENTER"); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); diff --git a/src/GlAllListEditorPanel.cpp b/src/GlAllListEditorPanel.cpp index bdf466e..2738073 100644 --- a/src/GlAllListEditorPanel.cpp +++ b/src/GlAllListEditorPanel.cpp @@ -27,6 +27,7 @@ #include "GlFileListPresentationModel.h" #include "GlResourceManager.h" #include "GlTypes.h" +#include "GlFileDeleteTimer.h" using namespace Tizen::App; using namespace Tizen::Base; @@ -62,7 +63,9 @@ AllListEditorPanel::AllListEditorPanel(void) , __pLabelSelectCnt(null) , __pButtonSelectRegion(null) , __itemCount(0) + , __deleteInProgress(false) , __pPresentationModel(null) + , __pFileDelete(null) { AppLogDebug("ENTER"); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); @@ -71,6 +74,7 @@ AllListEditorPanel::AllListEditorPanel(void) AllListEditorPanel::~AllListEditorPanel(void) { AppLogDebug("ENTER"); + delete __pFileDelete; AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); } @@ -191,8 +195,17 @@ AllListEditorPanel::OnUpdateContentList() { AppLogDebug("ENTER"); SceneManager* pSceneManager = SceneManager::GetInstance(); - pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALL_LIST)); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); + FileListEditorForm* pFileListEditorForm = + dynamic_cast(pSceneManager->GetCurrentScene()->GetForm()); + TryReturnVoid(pFileListEditorForm != null, "[%s] fail to get SceneManager.", + GetErrorMessage(GetLastResult())); + + if ( pFileListEditorForm->GetFileMoveProgress() == false && __deleteInProgress == false ) + { + SceneManager* pSceneManager = SceneManager::GetInstance(); + pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALL_LIST)); + AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); + } } void @@ -425,15 +438,7 @@ AllListEditorPanel::OnSceneActivatedN(const SceneId& previousSceneId, SceneManager* pSceneManager = SceneManager::GetInstance(); TryReturnVoid(pSceneManager != null, "[%s] fail to get SceneManager.", GetErrorMessage(GetLastResult())); - if (previousSceneId == IDSCN_ALBUM_NAME_EDITOR) - { - if (pArgs != null && pArgs->GetCount() > 0) - { - String* pDirectory = static_cast(pArgs->GetAt(0)); - OnRequestMoveToAction(*pDirectory); - } - } - else if (previousSceneId == IDSCN_ALL_LIST_SELECTION) + if (previousSceneId == IDSCN_ALL_LIST_SELECTION) { ResetSelection(); } @@ -450,6 +455,7 @@ AllListEditorPanel::OnSceneActivatedN(const SceneId& previousSceneId, GetErrorMessage(GetLastResult())); pFileListEditorForm->SetTitleText(ResourceManager::GetString(L"IDS_COM_BODY_EDIT")); + if (pArgs != null && pArgs->GetCount() > 0) { String* pDirectory = static_cast(pArgs->GetAt(0)); @@ -458,6 +464,7 @@ AllListEditorPanel::OnSceneActivatedN(const SceneId& previousSceneId, pFileListEditorForm->MoveToAlbum(*pDirectory); } } + AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); } @@ -515,7 +522,7 @@ AllListEditorPanel::GetItemCheckedIndexListN(void) const } result -AllListEditorPanel::OnRequestDeleteAction(void) +AllListEditorPanel::OnRequestDelete(void) { AppLogDebug("ENTER"); IList* pIndexList = GetItemCheckedIndexListN(); @@ -526,16 +533,40 @@ AllListEditorPanel::OnRequestDeleteAction(void) return E_FAILURE; } - result r = __pPresentationModel->DeleteContentFileList(*pIndexList); - if (r != E_SUCCESS) - { - delete pIndexList; - AppLogDebug("EXIT 2(%s)", GetErrorMessage(GetLastResult())); + delete __pFileDelete; + __pFileDelete = new FileDeleteTimer(pIndexList, + __pPresentationModel, + this ); + result r = __pFileDelete->StartTimer(); + + if (IsFailed(r)) + { + delete __pFileDelete; + __pFileDelete = null; return E_FAILURE; } + else + { + __deleteInProgress = true; + } + return E_SUCCESS; +} +void AllListEditorPanel::OnFileOpInvalidate(enum FileActionMode actionId) +{ + SceneManager* pSceneManager = SceneManager::GetInstance(); + FileListEditorForm* pFileListEditorForm = + dynamic_cast(pSceneManager->GetCurrentScene()->GetForm()); + TryReturnVoid(pFileListEditorForm != null, "[%s] fail to get SceneManager.", + GetErrorMessage(GetLastResult())); + pFileListEditorForm->Invalidate(true); +} + +void AllListEditorPanel::OnFileOpComplete(enum FileActionMode actionId, result res) +{ __pCheckButton->SetSelected(false); + __deleteInProgress = false; String strTmp; strTmp.Format(LENGTH_COUNT_LABEL, L"%ls (%d)", @@ -546,13 +577,21 @@ AllListEditorPanel::OnRequestDeleteAction(void) __pPresentationModel->RefreshCurrentAlbumContentInfoList(CONTENT_TYPE_ALL); __itemCount = __pPresentationModel->GetCurrentAlbumContentInfoCount(); __pContentIconListView->UpdateList(); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - return E_SUCCESS; + SceneManager* pSceneManager = SceneManager::GetInstance(); + if (GetItemCount() > 0) + { + pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALL_LIST)); + } + else + { + pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALBUM_LIST)); + } + AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); } result -AllListEditorPanel::OnRequestEmailAction(void) +AllListEditorPanel::OnRequestMessage(void) { AppLogDebug("ENTER"); IList* pIndexList = GetItemCheckedIndexListN(); @@ -590,96 +629,61 @@ AllListEditorPanel::OnRequestEmailAction(void) pDataList->Construct(); pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_ATTACHMENTS), new (std::nothrow) String(combineText)); - __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_EMAIL, - APPCONTROL_OPERATION_ID_COMPOSE, pDataList, null); + __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_MESSAGE, APPCONTROL_OPERATION_ID_COMPOSE, + pDataList, null); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); return E_SUCCESS; } result -AllListEditorPanel::OnRequestMoveToAction(String& destDirectory) +AllListEditorPanel::OnRequestEmail(void) { AppLogDebug("ENTER"); - if (&destDirectory == null || destDirectory.IsEmpty()) - { - AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult())); - - return E_FAILURE; - } IList* pIndexList = GetItemCheckedIndexListN(); if (pIndexList == null || pIndexList->GetCount() <= 0) { - AppLogDebug("EXIT 2(%s)", GetErrorMessage(GetLastResult())); + AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult())); return E_FAILURE; } - IList* pCollisionList = __pPresentationModel->GetCollisionIndexListN(*pIndexList, destDirectory); + String combineText; + String path; + Integer* pIndex = null; + int checkedIndex; - if (pCollisionList != null) + int loopCount = pIndexList->GetCount(); + AppLogDebug("pIndexList->GetCount(%d)", loopCount); + for (int i = 0; i < loopCount; ++i) { - int loopCount = pCollisionList->GetCount(); - for (int i = 0; i < loopCount; ++i) + pIndex = static_cast(pIndexList->GetAt(i)); + if (pIndex != null) { - String* pCollisionString = const_cast(static_cast(pCollisionList->GetAt(i))); - String tmpString; - if (pCollisionString != null) - { - tmpString = (*pCollisionString); - } - - String delim(MULTI_ITEM_SEPARATOR); - StringTokenizer st(tmpString, delim); - String token; - - int collisionIndex; - String fileNmae; + checkedIndex = pIndex->ToInt(); + path = __pPresentationModel->GetContentFilePath(checkedIndex); + } - if (st.HasMoreTokens() == true) - { - st.GetNextToken(token); - Integer::Parse(token, collisionIndex); - - if (st.HasMoreTokens() == true) - { - st.GetNextToken(fileNmae); - } - - MessageBox messageBox; - messageBox.Construct(L"", fileNmae + ResourceManager::GetString(L"IDS_MEDIABR_POP_ALREADY_EXISTS_OVERWRITE_Q"), MSGBOX_STYLE_YESNO, 0); - int modalResult = 0; - messageBox.ShowAndWait(modalResult); - if (modalResult == MSGBOX_RESULT_NO) - { - int innerLoopCount = pIndexList->GetCount(); - for (int j = 0; j < innerLoopCount; ++j) - { - if(collisionIndex == (const_cast(static_cast(pIndexList->GetAt(j))))->ToInt()) - { - pIndexList->RemoveAt(j, true); - --j; - --innerLoopCount; - } - } - } - } + if (combineText.CompareTo(EMPTY_SPACE) != 0) + { + combineText.Append(L";"); } - delete pCollisionList; + combineText.Append(path); } - result r = __pPresentationModel->MoveToContentFileList(*pIndexList, destDirectory); - delete pIndexList; - TryReturn(r == E_SUCCESS, E_FAILURE, "Failed on OnRequestDeleteAction"); + HashMap* pDataList = new (std::nothrow) HashMap(SingleObjectDeleter); + pDataList->Construct(); + pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_ATTACHMENTS), new (std::nothrow) String(combineText)); - ResetSelection(); + __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_EMAIL, APPCONTROL_OPERATION_ID_COMPOSE, + pDataList, null); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); return E_SUCCESS; } result -AllListEditorPanel::OnRequestSlideShowAction(void) +AllListEditorPanel::OnRequestSlideShow(void) { AppLogDebug("ENTER"); IList* pIndexList = GetItemCheckedIndexListN(); diff --git a/src/GlAllListSelectionPanel.cpp b/src/GlAllListSelectionPanel.cpp index beecfcd..73d591c 100644 --- a/src/GlAllListSelectionPanel.cpp +++ b/src/GlAllListSelectionPanel.cpp @@ -27,6 +27,7 @@ #include "GlFileListPresentationModel.h" #include "GlResourceManager.h" #include "GlTypes.h" +#include "GlFileDeleteTimer.h" using namespace Tizen::App; using namespace Tizen::Base; @@ -52,7 +53,9 @@ AllListSelectionPanel::AllListSelectionPanel(void) : __pContentIconListView(null) , __pSeletedIndexList(null) , __itemCount(0) - , __pPresentationModel(0) + , __deleteInProgress(false) + , __pPresentationModel(null) + , __pFileDelete(null) { AppLogDebug("ENTER"); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); @@ -61,6 +64,7 @@ AllListSelectionPanel::AllListSelectionPanel(void) AllListSelectionPanel::~AllListSelectionPanel(void) { AppLogDebug("ENTER"); + delete __pFileDelete; AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); } @@ -121,8 +125,11 @@ void AllListSelectionPanel::OnUpdateContentList() { AppLogDebug("ENTER"); - SceneManager* pSceneManager = SceneManager::GetInstance(); - pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALL_LIST)); + if ( __deleteInProgress == false ) + { + SceneManager* pSceneManager = SceneManager::GetInstance(); + pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALL_LIST)); + } AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); } @@ -292,7 +299,7 @@ AllListSelectionPanel::OnThumbnailDecoded(const int index) void AllListSelectionPanel::OnSceneActivatedN(const SceneId& previousSceneId, - const SceneId& currentSceneId, IList* pArgs) + const SceneId& currentSceneId, IList* pArgs) { AppLogDebug("ENTER"); __pPresentationModel = FileListPresentationModel::GetInstance(); @@ -300,15 +307,7 @@ AllListSelectionPanel::OnSceneActivatedN(const SceneId& previousSceneId, SceneManager* pSceneManager = SceneManager::GetInstance(); TryReturnVoid(pSceneManager != null, "[%s] fail to get SceneManager.", GetErrorMessage(GetLastResult())); - if (previousSceneId == IDSCN_ALBUM_NAME_EDITOR) - { - if (pArgs != null && pArgs->GetCount() > 0) - { - String* pDirectory = static_cast(pArgs->GetAt(0)); - OnRequestMoveToAction(*pDirectory); - } - } - else if (previousSceneId == IDSCN_ALL_LIST_EDITOR) + if (previousSceneId == IDSCN_ALL_LIST_EDITOR) { if (pArgs != null) { @@ -342,7 +341,7 @@ AllListSelectionPanel::OnSceneActivatedN(const SceneId& previousSceneId, void AllListSelectionPanel::OnSceneDeactivated(const SceneId& currentSceneId, - const SceneId& nextSceneId) + const SceneId& nextSceneId) { AppLogDebug("ENTER"); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); @@ -442,7 +441,7 @@ AllListSelectionPanel::GetVirtualIndexFromRealIndex(int realIndex) } result -AllListSelectionPanel::OnRequestDeleteAction(void) +AllListSelectionPanel::OnRequestDelete(void) { AppLogDebug("ENTER"); IList* pIndexList = GetItemCheckedIndexListN(); @@ -452,22 +451,47 @@ AllListSelectionPanel::OnRequestDeleteAction(void) return E_FAILURE; } - result r = __pPresentationModel->DeleteContentFileList(*pIndexList); - if (r != E_SUCCESS) - { - delete pIndexList; - AppLogDebug("EXIT 2(%s)", GetErrorMessage(GetLastResult())); + delete __pFileDelete; + __pFileDelete = new FileDeleteTimer(pIndexList, + __pPresentationModel, + this ); + result r = __pFileDelete->StartTimer(); + + if (IsFailed(r)) + { + delete __pFileDelete; + __pFileDelete = null; return E_FAILURE; } + else + { + __deleteInProgress = true; + } + + return E_SUCCESS; +} +void AllListSelectionPanel::OnFileOpInvalidate(enum FileActionMode actionId) +{ + SceneManager* pSceneManager = SceneManager::GetInstance(); + FileListEditorForm* pFileListEditorForm = + dynamic_cast(pSceneManager->GetCurrentScene()->GetForm()); + TryReturnVoid(pFileListEditorForm != null, "[%s] fail to get SceneManager.", + GetErrorMessage(GetLastResult())); + pFileListEditorForm->Invalidate(true); +} + +void AllListSelectionPanel::OnFileOpComplete(enum FileActionMode actionId, result res) +{ + __deleteInProgress = false; SceneManager* pSceneManager = SceneManager::GetInstance(); - TryReturn(pSceneManager != null, E_FAILURE, "[%s] fail to get SceneManager.", + TryReturnVoid(pSceneManager != null, "[%s] fail to get SceneManager.", GetErrorMessage(GetLastResult())); FileListEditorForm* pFileListEditorForm = dynamic_cast(pSceneManager->GetCurrentScene()->GetForm()); - TryReturn(pFileListEditorForm != null, E_FAILURE, "[%s] fail to get FileListEditorForm.", + TryReturnVoid(pFileListEditorForm != null, "[%s] fail to get SceneManager.", GetErrorMessage(GetLastResult())); String strTmp; @@ -478,13 +502,20 @@ AllListSelectionPanel::OnRequestDeleteAction(void) __pPresentationModel->RefreshCurrentAlbumContentInfoList(CONTENT_TYPE_ALL); __itemCount = __pPresentationModel->GetCurrentAlbumContentInfoCount(); __pContentIconListView->UpdateList(); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - return E_SUCCESS; + if (GetItemCount() > 0) + { + pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALL_LIST)); + } + else + { + pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALBUM_LIST)); + } + AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); } result -AllListSelectionPanel::OnRequestEmailAction(void) +AllListSelectionPanel::OnRequestMessage(void) { AppLogDebug("ENTER"); IList* pIndexList = GetItemCheckedIndexListN(); @@ -521,97 +552,60 @@ AllListSelectionPanel::OnRequestEmailAction(void) pDataList->Construct(); pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_ATTACHMENTS), new (std::nothrow) String(combineText)); - __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_EMAIL, - APPCONTROL_OPERATION_ID_COMPOSE, pDataList, null); + __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_MESSAGE, APPCONTROL_OPERATION_ID_COMPOSE, + pDataList, null); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); return E_SUCCESS; } result -AllListSelectionPanel::OnRequestMoveToAction(String& destDirectory) +AllListSelectionPanel::OnRequestEmail(void) { AppLogDebug("ENTER"); - if (&destDirectory == null || destDirectory.IsEmpty()) - { - AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult())); - - return E_FAILURE; - } IList* pIndexList = GetItemCheckedIndexListN(); if (pIndexList == null || pIndexList->GetCount() <= 0) { - AppLogDebug("EXIT 2(%s)", GetErrorMessage(GetLastResult())); + AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult())); return E_FAILURE; } - IList* pCollisionList = __pPresentationModel->GetCollisionIndexListN(*pIndexList, destDirectory); + String combineText; + String path; + Integer* pIndex = null; + int checkedIndex; - if (pCollisionList != null) + int loopCount = pIndexList->GetCount(); + AppLogDebug("pIndexList->GetCount(%d)", loopCount); + for (int i = 0; i < loopCount; ++i) { - int loopCount = pCollisionList->GetCount(); - for (int i = 0; i < loopCount; ++i) + pIndex = static_cast(pIndexList->GetAt(i)); + if (pIndex != null) { - String* pCollisionString = const_cast(static_cast(pCollisionList->GetAt(i))); - String tmpString; - if (pCollisionString != null) - { - tmpString = (*pCollisionString); - } - - String delim(MULTI_ITEM_SEPARATOR); - StringTokenizer st(tmpString, delim); - String token; - - int collisionIndex; - String fileNmae; + checkedIndex = pIndex->ToInt(); + path = __pPresentationModel->GetContentFilePath(checkedIndex); + } - if (st.HasMoreTokens() == true) - { - st.GetNextToken(token); - Integer::Parse(token, collisionIndex); - - if (st.HasMoreTokens() == true) - { - st.GetNextToken(fileNmae); - } - - MessageBox messageBox; - messageBox.Construct(L"", fileNmae + ResourceManager::GetString(L"IDS_MEDIABR_POP_ALREADY_EXISTS_OVERWRITE_Q"), MSGBOX_STYLE_YESNO, 0); - int modalResult = 0; - messageBox.ShowAndWait(modalResult); - if (modalResult == MSGBOX_RESULT_NO) - { - int innerLoopCount = pIndexList->GetCount(); - for (int j = 0; j < innerLoopCount; ++j) - { - if(collisionIndex == (const_cast(static_cast(pIndexList->GetAt(j))))->ToInt()) - { - pIndexList->RemoveAt(j, true); - --j; - --innerLoopCount; - } - } - } - } + if (combineText.CompareTo(EMPTY_SPACE) != 0) + { + combineText.Append(L";"); } - delete pCollisionList; + combineText.Append(path); } - result r = __pPresentationModel->MoveToContentFileList(*pIndexList, destDirectory); - delete pIndexList; - pIndexList = null; - TryReturn(r == E_SUCCESS, E_FAILURE, "Failed on OnRequestDeleteAction"); + HashMap* pDataList = new (std::nothrow) HashMap(SingleObjectDeleter); + pDataList->Construct(); + pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_ATTACHMENTS), new (std::nothrow) String(combineText)); - __pSeletedIndexList->RemoveAll(true); - ResetSelection(); + __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_EMAIL, + APPCONTROL_OPERATION_ID_COMPOSE, pDataList, null); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); return E_SUCCESS; } result -AllListSelectionPanel::OnRequestSlideShowAction(void) +AllListSelectionPanel::OnRequestSlideShow(void) { AppLogDebug("ENTER"); IList* pIndexList = GetItemCheckedIndexListN(); @@ -729,3 +723,5 @@ AllListSelectionPanel::SetButtonState(void) } AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); } + + diff --git a/src/GlCommonUtil.cpp b/src/GlCommonUtil.cpp index 5dad1e6..862d300 100644 --- a/src/GlCommonUtil.cpp +++ b/src/GlCommonUtil.cpp @@ -19,9 +19,15 @@ * @brief This is the implementation file for CommonUtil class. */ +#include +#include +#include + #include "GlCommonUtil.h" +using namespace Tizen::App; using namespace Tizen::Base; +using namespace Tizen::Base::Runtime; using namespace Tizen::Graphics; static const int W_DEFAULT_THUMBNAIL = 158; diff --git a/src/GlDropDownCustomItem.cpp b/src/GlDropDownCustomItem.cpp new file mode 100644 index 0000000..330034a --- /dev/null +++ b/src/GlDropDownCustomItem.cpp @@ -0,0 +1,188 @@ +// +// Copyright (c) 2012 Samsung Electronics Co., Ltd. +// +// Licensed under the Flora License, Version 1.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://floralicense.org/license/ +// +// 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. +// + +/** + *@file: DropDownCustomItem + *@brief: To create Drop Down custom item + * + */ + +#include +#include +#include "GlDropDownCustomItem.h" +#include "GlTypes.h" + +using namespace Tizen::App; +using namespace Tizen::Base; +using namespace Tizen::Graphics; +using namespace Tizen::Ui::Controls; + +const int DropDownCustomItem::IDA_FORMAT_BITMAP = 101; +const int DropDownCustomItem::IDA_FORMAT_MAIN_STRING = 102; +const int DropDownCustomItem::IDA_FORMAT_SUB_STRING = 103; +const int DropDownCustomItem::IDA_FORMAT_DROPPER = 104; + +DropDownCustomItem::DropDownCustomItem(void) + : __currentState(DROP_DOWN__ITEM_STATE_CLOSED) + , __height(0) + , __width(0) +{ +} + +DropDownCustomItem::~DropDownCustomItem(void) +{ +} + +result +DropDownCustomItem::Construct(int width) +{ + result r = E_SUCCESS; + __width = width; + __height = 140; + Dimension dim(__width, __height); + r = CustomItem::Construct(dim, LIST_ANNEX_STYLE_NORMAL); + return r; +} + +void +DropDownCustomItem::SetMainText(const Tizen::Base::String& text) +{ + __mainText = text; +} + +String +DropDownCustomItem::GetMainText(void) +{ + return __mainText; +} + +void +DropDownCustomItem::SetSubText(const Tizen::Base::String& text) +{ + __subText = text; +} + +String +DropDownCustomItem::GetSubText(void) +{ + return __subText; +} + +result +DropDownCustomItem::Make() +{ + AppLogDebug("DropDownCustomItem::Make entered"); + result r = E_FAILURE; + EnrichedText* pMainEnText = null; + EnrichedText* pSubEnText = null; + TextElement* pMainTextElement = null; + TextElement* pSubTextElement = null; + Font mainTextFont; + Font subTextFont; + Tizen::Graphics::Bitmap* pDropperBitmapNormal = null; + Tizen::Graphics::Bitmap* pDropperBitmapPressed = null; + + pMainEnText = new(std::nothrow) EnrichedText(); + r = pMainEnText->Construct(Dimension(__width - 80, 54)); + if(IsFailed(r)) + { + delete pMainEnText; + return E_FAILURE; + } + + pMainTextElement = new(std::nothrow) TextElement(); + pMainTextElement->Construct(__mainText); + + mainTextFont.Construct(FONT_STYLE_BOLD, 44); + + Color pressedTextColor = CUSTOM_COLOR_LISTVIEW_TEXT; + pMainTextElement->SetFont(mainTextFont); + pMainTextElement->SetTextColor(CUSTOM_COLOR_TRANSPARENT); + pMainEnText->Add(*pMainTextElement); + + pSubEnText = new(std::nothrow) EnrichedText(); + r = pSubEnText->Construct(Dimension(__width - 80, 42)); + + if(IsFailed(r)) + { + pMainEnText->RemoveAll(true); + delete pMainEnText; + delete pSubEnText; + return E_FAILURE; + } + + pSubTextElement = new(std::nothrow) TextElement(); + pSubTextElement->Construct(__subText); + + subTextFont.Construct(FONT_STYLE_PLAIN, 32); + + pSubTextElement->SetFont(subTextFont); + pSubTextElement->SetTextColor(CUSTOM_COLOR_GREY); + pSubEnText->Add(*pSubTextElement); + + r = AddElement(Rectangle(26, 22, __width - 126, 54), IDA_FORMAT_MAIN_STRING, *pMainEnText); + r = AddElement(Rectangle(26, 76, __width - 126, 42), IDA_FORMAT_SUB_STRING, *pSubEnText); + if(IsFailed(r)) + { + pMainEnText->RemoveAll(true); + pSubEnText->RemoveAll(true); + delete pMainEnText; + delete pSubEnText; + return E_FAILURE; + } + AppResource* pAppResource = UiApp::GetInstance()->GetAppResource(); + if (pAppResource) + { + if (GetCurState() == DROP_DOWN__ITEM_STATE_CLOSED) + { + pDropperBitmapNormal = pAppResource->GetBitmapN(IDB_LIST_EXPAND_CLOSED, BITMAP_PIXEL_FORMAT_ARGB8888); + pDropperBitmapPressed = pAppResource->GetBitmapN(IDB_LIST_EXPAND_CLOSED_PRESS, BITMAP_PIXEL_FORMAT_ARGB8888); + } + else + { + pDropperBitmapNormal = pAppResource->GetBitmapN(IDB_LIST_EXPAND_OPENED, BITMAP_PIXEL_FORMAT_ARGB8888); + pDropperBitmapPressed = pAppResource->GetBitmapN(IDB_LIST_EXPAND_OPENED_PRESS, BITMAP_PIXEL_FORMAT_ARGB8888); + } + + AddElement(Rectangle(__width - 95, (__height - 74) / 2, 74, 74), IDA_FORMAT_DROPPER, *pDropperBitmapNormal, pDropperBitmapPressed, pDropperBitmapNormal); + delete pDropperBitmapNormal; + delete pDropperBitmapPressed; + } + + SetElementSelectionEnabled(IDA_FORMAT_MAIN_STRING, true); + SetElementSelectionEnabled(IDA_FORMAT_SUB_STRING, true); + SetElementSelectionEnabled(IDA_FORMAT_DROPPER, true); + + pSubEnText->RemoveAllTextElements(true); + pMainEnText->RemoveAllTextElements(true); + + delete pMainEnText; + delete pSubEnText; + + return E_SUCCESS; +} + +DropDownItemState +DropDownCustomItem::GetCurState(void) +{ + return __currentState; +} + +void +DropDownCustomItem::SetCurState(DropDownItemState state) +{ + __currentState = state; +} diff --git a/src/GlFileDeleteTimer.cpp b/src/GlFileDeleteTimer.cpp new file mode 100644 index 0000000..6726c30 --- /dev/null +++ b/src/GlFileDeleteTimer.cpp @@ -0,0 +1,76 @@ +// +// Copyright (c) 2012 Samsung Electronics Co., Ltd. +// +// Licensed under the Flora License, Version 1.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://floralicense.org/license/ +// +// 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. +// + +/** + * @file FileDeleteTimer.cpp + * @brief This is the source file for FileDeleteTimer class. + */ + + +#include +#include +#include +#include +#include + +#include "GlFileDeleteTimer.h" +#include "GlFileListPresentationModel.h" + +using namespace Tizen::Base; +using namespace Tizen::Base::Collection; +using namespace Tizen::Base::Utility; +using namespace Tizen::Content; +using namespace Tizen::Io; +using namespace Tizen::Ui; +using namespace Tizen::Ui::Controls; +using namespace Tizen::Ui::Scenes; + + + +FileDeleteTimer::FileDeleteTimer(Tizen::Base::Collection::IList* pDelList, FileListPresentationModel* pPM + , IFileOpInvalidateListener* invalidate) + : GlTimerBase(invalidate, FILE_DELETE_ACTION) + , __pDeleteIndexList(pDelList) + , __pPresentationModel(pPM) +{ +} + +FileDeleteTimer::~FileDeleteTimer(void) +{ + delete __pDeleteIndexList; +} + +IList* +FileDeleteTimer::TimerStart(void) +{ + return __pPresentationModel->GetContentIdListN(*__pDeleteIndexList); +} + +void +FileDeleteTimer::TimerExpired(const ContentId& contentId) +{ + __pPresentationModel->DeleteContentFile(contentId); +} + +void +FileDeleteTimer::TimerCancel(void) +{ +} + +void +FileDeleteTimer::TimerComplete(int) +{ +} diff --git a/src/GlFileListEditorForm.cpp b/src/GlFileListEditorForm.cpp index b1d2e2f..7fcc0b2 100644 --- a/src/GlFileListEditorForm.cpp +++ b/src/GlFileListEditorForm.cpp @@ -28,6 +28,8 @@ #include "GlResourceManager.h" #include "GlTypes.h" #include "GlVideoListEditorPanel.h" +#include "GlFileMoveTimer.h" + using namespace Tizen::App; using namespace Tizen::Base; @@ -56,6 +58,8 @@ FileListEditorForm::FileListEditorForm(void) , __pContentDirectoryList(null) , __pContentDirectoryNameList(null) , __pPresentationModel(null) + , __pFileMove(null) + ,__moveInProgress(false) { AppLogDebug("ENTER"); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); @@ -72,6 +76,7 @@ FileListEditorForm::~FileListEditorForm(void) { delete __pContentDirectoryNameList; } + delete __pFileMove; AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); } @@ -133,7 +138,6 @@ FileListEditorForm::InitializeFooter(void) else { pFooter->SetStyle(FOOTER_STYLE_SEGMENTED_TEXT); - pFooter->SetBackButton(); SetFormBackEventListener(this); } @@ -155,28 +159,34 @@ FileListEditorForm::InitializeFooter(void) r = footerShare.Construct(ACTION_ID_FOOTER_SHARE); TryReturn(r == E_SUCCESS, r, "[%s] Unable to construct footer item", GetErrorMessage(r)); Bitmap* pBitmapShare = ResourceManager::GetBitmapN(IDB_CONTROLBAR_SHARE); - if (pBitmapShare != null) + Bitmap* pBitmapShareDim = ResourceManager::GetBitmapN(IDB_CONTROLBAR_SHARE_DIM); + + if (pBitmapShare != null && pBitmapShareDim != null ) { - r = footerShare.SetIcon(FOOTER_ITEM_STATUS_NORMAL, pBitmapShare); - TryReturn(r == E_SUCCESS, r, "[%s] Unable to set text", GetErrorMessage(r)); + footerShare.SetIcon(FOOTER_ITEM_STATUS_NORMAL, pBitmapShare); + footerShare.SetIcon(FOOTER_ITEM_STATUS_DISABLED, pBitmapShareDim); } + r = pFooter->AddItem(footerShare); delete pBitmapShare; - pBitmapShare = null; + delete pBitmapShareDim; TryReturn(r == E_SUCCESS, r, "[%s] Unable to add item", GetErrorMessage(r)); FooterItem footerDelete; r = footerDelete.Construct(ACTION_ID_FOOTER_DELETE); TryReturn(r == E_SUCCESS, r, "[%s] Unable to construct footer item", GetErrorMessage(r)); Bitmap* pBitmapDelete = ResourceManager::GetBitmapN(IDB_CONTROLBAR_DELETE); - if (pBitmapDelete != null) + Bitmap* pBitmapDeleteDim = ResourceManager::GetBitmapN(IDB_CONTROLBAR_DELETE_DIM); + + if (pBitmapDelete != null && pBitmapDeleteDim != null) { - r = footerDelete.SetIcon(FOOTER_ITEM_STATUS_NORMAL, pBitmapDelete); - TryReturn(r == E_SUCCESS, r, "[%s] Unable to set text", GetErrorMessage(r)); + footerDelete.SetIcon(FOOTER_ITEM_STATUS_NORMAL, pBitmapDelete); + footerDelete.SetIcon(FOOTER_ITEM_STATUS_DISABLED, pBitmapDeleteDim); } + r = pFooter->AddItem(footerDelete); delete pBitmapDelete; - pBitmapDelete = null; + delete pBitmapDeleteDim; TryReturn(r == E_SUCCESS, r, "[%s] Unable to add item", GetErrorMessage(r)); pFooter->SetBackButton(); @@ -213,11 +223,13 @@ FileListEditorForm::InitializeFooter(void) __pContextMenuMore = new (std::nothrow) ContextMenu(); __pContextMenuMore->Construct(Point(0, 0), CONTEXT_MENU_STYLE_LIST); - __pContextMenuMore->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_MOVE"), ACTION_ID_CONTEXT_MENU_MORE_MOVE); + __pContextMenuMore->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_MOVE"), + ACTION_ID_CONTEXT_MENU_MORE_MOVE); if (checkedCount > 1) { - __pContextMenuMore->AddItem(ResourceManager::GetString(L"IDS_MEDIABR_BUTTON_SLIDE_SHOW"), ACTION_ID_CONTEXT_MENU_MORE_SLIDE_SHOW); + __pContextMenuMore->AddItem(ResourceManager::GetString(L"IDS_MEDIABR_BUTTON_SLIDE_SHOW"), + ACTION_ID_CONTEXT_MENU_MORE_SLIDE_SHOW); } __pContextMenuMore->SetShowState(false); @@ -225,7 +237,10 @@ FileListEditorForm::InitializeFooter(void) __pContextMenuShare = new (std::nothrow) ContextMenu(); __pContextMenuShare->Construct(Point(0, 0), CONTEXT_MENU_STYLE_LIST); - __pContextMenuShare->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EMAIL"), ACTION_ID_CONTEXT_MENU_SHARE_EMAIL); + __pContextMenuShare->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_MESSAGE"), + ACTION_ID_CONTEXT_MENU_SHARE_MESSAGE); + __pContextMenuShare->AddItem(ResourceManager::GetString(L"IDS_COM_BODY_EMAIL"), + ACTION_ID_CONTEXT_MENU_SHARE_EMAIL); __pContextMenuShare->SetShowState(false); __pContextMenuShare->AddActionEventListener(*this); @@ -391,7 +406,8 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId) } if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION) { - AllListSelectionPanel* pSelectionPanel = dynamic_cast(pSceneManager->GetCurrentScene()->GetPanel()); + AllListSelectionPanel* pSelectionPanel = dynamic_cast + (pSceneManager->GetCurrentScene()->GetPanel()); if (pSelectionPanel != null && pSelectionPanel->GetItemCheckedCount() > 0) { __pDeletePopup->SetShowState(true); @@ -447,7 +463,7 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId) AllListEditorPanel* pEditorPanel = dynamic_cast(pSceneManager->GetCurrentScene()->GetPanel()); if (pEditorPanel != null) { - pEditorPanel->OnRequestSlideShowAction(); + pEditorPanel->OnRequestSlideShow(); } } else if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION) @@ -455,20 +471,20 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId) AllListSelectionPanel* pSelectionPanel = dynamic_cast(pSceneManager->GetCurrentScene()->GetPanel()); if (pSelectionPanel != null) { - pSelectionPanel->OnRequestSlideShowAction(); + pSelectionPanel->OnRequestSlideShow(); } } break; } - case ACTION_ID_CONTEXT_MENU_SHARE_EMAIL: + case ACTION_ID_CONTEXT_MENU_SHARE_MESSAGE: { if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_EDITOR) { AllListEditorPanel* pEditorPanel = dynamic_cast(pSceneManager->GetCurrentScene()->GetPanel()); if (pEditorPanel != null) { - pEditorPanel->OnRequestEmailAction(); + pEditorPanel->OnRequestMessage(); } } else if (pSceneManager->GetCurrentSceneId() == IDSCN_IMAGE_LIST_EDITOR) @@ -476,7 +492,7 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId) ImageListEditorPanel* pEditorPanel = dynamic_cast(pSceneManager->GetCurrentScene()->GetPanel()); if (pEditorPanel != null) { - pEditorPanel->OnRequestEmailAction(); + pEditorPanel->OnRequestMessage(); } } else if (pSceneManager->GetCurrentSceneId() == IDSCN_VIDEO_LIST_EDITOR) @@ -484,7 +500,7 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId) VideoListEditorPanel* pEditorPanel = dynamic_cast(pSceneManager->GetCurrentScene()->GetPanel()); if (pEditorPanel != null) { - pEditorPanel->OnRequestEmailAction(); + pEditorPanel->OnRequestMessage(); } } @@ -493,17 +509,56 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId) AllListSelectionPanel* pSelectionPanel = dynamic_cast(pSceneManager->GetCurrentScene()->GetPanel()); if (pSelectionPanel != null) { - pSelectionPanel->OnRequestEmailAction(); + pSelectionPanel->OnRequestMessage(); + } + } + break; + } + case ACTION_ID_CONTEXT_MENU_SHARE_EMAIL: + { + if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_EDITOR) + { + AllListEditorPanel* pEditorPanel = dynamic_cast(pSceneManager->GetCurrentScene()->GetPanel()); + if (pEditorPanel != null) + { + pEditorPanel->OnRequestEmail(); + } + } + else if (pSceneManager->GetCurrentSceneId() == IDSCN_IMAGE_LIST_EDITOR) + { + ImageListEditorPanel* pEditorPanel = dynamic_cast(pSceneManager->GetCurrentScene()->GetPanel()); + if (pEditorPanel != null) + { + pEditorPanel->OnRequestEmail(); } } + else if (pSceneManager->GetCurrentSceneId() == IDSCN_VIDEO_LIST_EDITOR) + { + VideoListEditorPanel* pEditorPanel = dynamic_cast(pSceneManager->GetCurrentScene()->GetPanel()); + if (pEditorPanel != null) + { + pEditorPanel->OnRequestEmail(); + } + } + else if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION) + { + AllListSelectionPanel* pSelectionPanel = dynamic_cast(pSceneManager->GetCurrentScene()->GetPanel()); + if (pSelectionPanel != null) + { + pSelectionPanel->OnRequestEmail(); + } + } break; } case ACTION_ID_CONTEXTMENU_EDITOR_MOVE_CREATE_ALBUM: { if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_EDITOR) { - pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALBUM_NAME_EDITOR)); + AllListEditorPanel* pListEditorPanel = dynamic_cast(pSceneManager->GetCurrentScene()->GetPanel()); + IList* pList = pListEditorPanel->GetItemCheckedIndexListN(); + + pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALBUM_NAME_EDITOR), pList); } break; } @@ -511,7 +566,10 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId) { if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION) { - pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALBUM_NAME_EDITOR)); + AllListSelectionPanel* pSelectionPanel = dynamic_cast + (pSceneManager->GetCurrentScene()->GetPanel()); + IList* pList = pSelectionPanel->GetItemCheckedIndexListN(); + pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALBUM_NAME_EDITOR), pList); } break; } @@ -525,17 +583,10 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId) AllListEditorPanel* pEditorPanel = dynamic_cast(pSceneManager->GetCurrentScene()->GetPanel()); if (pEditorPanel != null) { - result r = pEditorPanel->OnRequestDeleteAction(); - if (r == E_SUCCESS) + result r = pEditorPanel->OnRequestDelete(); + if ( IsFailed(r) ) { - if (pEditorPanel->GetItemCount() > 0) - { - pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALL_LIST)); - } - else - { - pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALBUM_LIST)); - } + AppLogDebug("OnRequestDelete failed with %s", GetErrorMessage(r)); } } } @@ -544,33 +595,30 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId) ImageListEditorPanel* pEditorPanel = dynamic_cast(pSceneManager->GetCurrentScene()->GetPanel()); if (pEditorPanel != null) { - pEditorPanel->OnRequestDeleteAction(); + pEditorPanel->OnRequestDelete(); } } else if (pSceneManager->GetCurrentSceneId() == IDSCN_VIDEO_LIST_EDITOR) { - VideoListEditorPanel* pEditorPanel = dynamic_cast(pSceneManager->GetCurrentScene()->GetPanel()); + VideoListEditorPanel* pEditorPanel = dynamic_cast + (pSceneManager->GetCurrentScene()->GetPanel()); + if (pEditorPanel != null) { - pEditorPanel->OnRequestDeleteAction(); + pEditorPanel->OnRequestDelete(); } } else if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION) { - AllListSelectionPanel* pSelectionPanel = dynamic_cast(pSceneManager->GetCurrentScene()->GetPanel()); + AllListSelectionPanel* pSelectionPanel = dynamic_cast + (pSceneManager->GetCurrentScene()->GetPanel()); + if (pSelectionPanel != null) { - result r = pSelectionPanel->OnRequestDeleteAction(); - if (r == E_SUCCESS) + result r = pSelectionPanel->OnRequestDelete(); + if ( IsFailed(r) ) { - if (pSelectionPanel->GetItemCount() > 0) - { - pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALL_LIST)); - } - else - { - pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALBUM_LIST)); - } + AppLogDebug("OnRequestDelete failed with %s", GetErrorMessage(r)); } } } @@ -607,7 +655,8 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId) { if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_EDITOR) { - if ((ACTION_ID_CONTEXTMENU_EDITOR_MOVE_ALBUM_ARRAY_START <= actionId) && (actionId <= ACTION_ID_CONTEXTMENU_EDITOR_MOVE_CREATE_ALBUM + 1000)) + if ((ACTION_ID_CONTEXTMENU_EDITOR_MOVE_ALBUM_ARRAY_START <= actionId) && + (actionId <= ACTION_ID_CONTEXTMENU_EDITOR_MOVE_CREATE_ALBUM + 1000)) { if (__pContentDirectoryList == null) { @@ -616,15 +665,25 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId) } if (__pContentDirectoryList->GetCount() > actionId - ACTION_ID_CONTEXTMENU_EDITOR_MOVE_ALBUM_ARRAY_START) { - String* pDirectory = static_cast(__pContentDirectoryList->GetAt(actionId - ACTION_ID_CONTEXTMENU_EDITOR_MOVE_ALBUM_ARRAY_START)); + String* pDirectory = static_cast + (__pContentDirectoryList->GetAt(actionId - ACTION_ID_CONTEXTMENU_EDITOR_MOVE_ALBUM_ARRAY_START)); + + AllListEditorPanel* pEditorPanel = dynamic_cast + (pSceneManager->GetCurrentScene()->GetPanel()); - AllListEditorPanel* pEditorPanel = dynamic_cast(pSceneManager->GetCurrentScene()->GetPanel()); if (pEditorPanel != null) { - result r = pEditorPanel->OnRequestMoveToAction(*pDirectory); - if (r == E_SUCCESS) + delete __pFileMove; + __pFileMove = new FileMoveTimer(*pDirectory, pEditorPanel->GetItemCheckedIndexListN(), + __pPresentationModel, this ); + result r = __pFileMove->StartTimer(); + if (IsFailed(r)) { - MoveToAlbum(*pDirectory); + delete __pFileMove; + __pFileMove = null; + } else + { + __moveInProgress = true; } } } @@ -632,7 +691,8 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId) } else if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION) { - if ((ACTION_ID_CONTEXTMENU_SELECTION_MOVE_ALBUM_ARRAY_START <= actionId) && (actionId <= ACTION_ID_CONTEXTMENU_SELECTION_MOVE_CREATE_ALBUM + 1000)) + if ((ACTION_ID_CONTEXTMENU_SELECTION_MOVE_ALBUM_ARRAY_START <= actionId) && + (actionId <= ACTION_ID_CONTEXTMENU_SELECTION_MOVE_CREATE_ALBUM + 1000)) { if (__pContentDirectoryList == null) { @@ -641,15 +701,26 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId) } if (__pContentDirectoryList->GetCount() > actionId - ACTION_ID_CONTEXTMENU_SELECTION_MOVE_ALBUM_ARRAY_START) { - String* pDirectory = static_cast(__pContentDirectoryList->GetAt(actionId - ACTION_ID_CONTEXTMENU_SELECTION_MOVE_ALBUM_ARRAY_START)); + String* pDirectory = static_cast + (__pContentDirectoryList->GetAt(actionId - ACTION_ID_CONTEXTMENU_SELECTION_MOVE_ALBUM_ARRAY_START)); + + AllListSelectionPanel* pSelectionPanel = dynamic_cast + (pSceneManager->GetCurrentScene()->GetPanel()); - AllListSelectionPanel* pSelectionPanel = dynamic_cast(pSceneManager->GetCurrentScene()->GetPanel()); if (pSelectionPanel != null) { - result r = pSelectionPanel->OnRequestMoveToAction(*pDirectory); - if (r == E_SUCCESS) + delete __pFileMove; + __pFileMove = new FileMoveTimer(*pDirectory, pSelectionPanel->GetItemCheckedIndexListN(), + __pPresentationModel, this ); + result r = __pFileMove->StartTimer(); + if (IsFailed(r)) { - MoveToAlbum(*pDirectory); + delete __pFileMove; + __pFileMove = null; + } + else + { + __moveInProgress = true; } } } @@ -662,6 +733,21 @@ FileListEditorForm::OnActionPerformed(const Control& source, int actionId) AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); } +void FileListEditorForm::OnFileOpInvalidate(enum FileActionMode actionId) +{ + Invalidate(true); +} + +bool FileListEditorForm::GetFileMoveProgress() +{ + return __moveInProgress; +} + +void FileListEditorForm::OnFileOpComplete(enum FileActionMode actionId, result res) +{ + __moveInProgress = false; +} + void FileListEditorForm::OnUpdateContentList() { @@ -689,18 +775,21 @@ FileListEditorForm::SetUpPopup(void) Rectangle popupClientBounds = __pDeletePopup->GetClientAreaBounds(); Label* pLabelText = new (std::nothrow) Label(); - pLabelText->Construct(Rectangle(0, 0, popupClientBounds.width, H_DELETE_LABEL), ResourceManager::GetString(L"IDS_COM_POP_DELETE_Q")); + pLabelText->Construct(Rectangle(0, 0, popupClientBounds.width, H_DELETE_LABEL), + ResourceManager::GetString(L"IDS_COM_POP_DELETE_Q")); pLabelText->SetTextHorizontalAlignment(ALIGNMENT_CENTER); __pDeletePopup->AddControl(*pLabelText); Button* pButtonDel = new (std::nothrow) Button(); - pButtonDel->Construct(Rectangle(0, Y_DELETE_BUTTON, popupClientBounds.width / 2 - GAP_W_POPUP_ITEM, H_DELETE_BUTTON), ResourceManager::GetString(L"IDS_COM_BODY_DELETE")); + pButtonDel->Construct(Rectangle(0, Y_DELETE_BUTTON, popupClientBounds.width / 2 - GAP_W_POPUP_ITEM, H_DELETE_BUTTON), + ResourceManager::GetString(L"IDS_COM_BODY_DELETE")); pButtonDel->SetActionId(ACTION_ID_DELETE_POPUP_DEL); pButtonDel->AddActionEventListener(*this); __pDeletePopup->AddControl(*pButtonDel); Button* pButtonCancel = new (std::nothrow) Button(); - pButtonCancel->Construct(Rectangle(popupClientBounds.width / 2 + GAP_W_POPUP_ITEM, Y_DELETE_BUTTON, popupClientBounds.width / 2 - GAP_W_POPUP_ITEM, H_DELETE_BUTTON), ResourceManager::GetString(L"IDS_COM_POP_CANCEL")); + pButtonCancel->Construct(Rectangle(popupClientBounds.width / 2 + GAP_W_POPUP_ITEM, Y_DELETE_BUTTON, + popupClientBounds.width / 2 - GAP_W_POPUP_ITEM, H_DELETE_BUTTON), ResourceManager::GetString(L"IDS_COM_POP_CANCEL")); pButtonCancel->SetActionId(ACTION_ID_DELETE_POPUP_CANCEL); pButtonCancel->AddActionEventListener(*this); __pDeletePopup->AddControl(*pButtonCancel); @@ -750,16 +839,20 @@ FileListEditorForm::RefreshFolderList(void) __pContentDirectoryNameList->Add(pDirName); } __pContextEditorMenuMove->RemoveAllItems(); - __pContextEditorMenuMove->AddItem(ResourceManager::GetString(L"IDS_MEDIABR_OPT_CREATE_ALBUM"), ACTION_ID_CONTEXTMENU_EDITOR_MOVE_CREATE_ALBUM); + __pContextEditorMenuMove->AddItem(ResourceManager::GetString(L"IDS_MEDIABR_OPT_CREATE_ALBUM"), + ACTION_ID_CONTEXTMENU_EDITOR_MOVE_CREATE_ALBUM); __pContextSelectionMenuMove->RemoveAllItems(); - __pContextSelectionMenuMove->AddItem(ResourceManager::GetString(L"IDS_MEDIABR_OPT_CREATE_ALBUM"), ACTION_ID_CONTEXTMENU_SELECTION_MOVE_CREATE_ALBUM); + __pContextSelectionMenuMove->AddItem(ResourceManager::GetString(L"IDS_MEDIABR_OPT_CREATE_ALBUM"), + ACTION_ID_CONTEXTMENU_SELECTION_MOVE_CREATE_ALBUM); loopCount = __pContentDirectoryNameList->GetCount(); for (int i = 0; i < loopCount; ++i) { pDirName = static_cast(__pContentDirectoryNameList->GetAt(i)); - __pContextEditorMenuMove->AddItem(*(new (std::nothrow) String(*pDirName)), ACTION_ID_CONTEXTMENU_EDITOR_MOVE_ALBUM_ARRAY_START + i); - __pContextSelectionMenuMove->AddItem(*(new (std::nothrow) String(*pDirName)), ACTION_ID_CONTEXTMENU_SELECTION_MOVE_ALBUM_ARRAY_START + i); + __pContextEditorMenuMove->AddItem(*(new (std::nothrow) String(*pDirName)), + ACTION_ID_CONTEXTMENU_EDITOR_MOVE_ALBUM_ARRAY_START + i); + __pContextSelectionMenuMove->AddItem(*(new (std::nothrow) String(*pDirName)), + ACTION_ID_CONTEXTMENU_SELECTION_MOVE_ALBUM_ARRAY_START + i); } __pContextEditorMenuMove->SetShowState(false); __pContextSelectionMenuMove->SetShowState(false); @@ -801,7 +894,8 @@ FileListEditorForm::OnFormBackRequested(Form& source) } else if (pSceneManager->GetCurrentSceneId() == IDSCN_ALL_LIST_SELECTION) { - AllListSelectionPanel* pSelectionPanel = dynamic_cast(pSceneManager->GetCurrentScene()->GetPanel()); + AllListSelectionPanel* pSelectionPanel = dynamic_cast + (pSceneManager->GetCurrentScene()->GetPanel()); if (pSelectionPanel != null) { IList* pList = pSelectionPanel->GetItemCheckedIndexListN(); diff --git a/src/GlFileListForm.cpp b/src/GlFileListForm.cpp index c2628bc..c8ccbec 100644 --- a/src/GlFileListForm.cpp +++ b/src/GlFileListForm.cpp @@ -35,8 +35,6 @@ using namespace Tizen::Ui::Controls; using namespace Tizen::Ui::Scenes; using namespace Tizen::Content; -static const String DEFAULT_TITLE = L"File View"; - FileListForm::FileListForm(void) : __pContextMenuMore(null) , __pPresentationModel(null) @@ -55,7 +53,7 @@ result FileListForm::Initialize(void) { AppLogDebug("ENTER"); - result r = Construct(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER); + result r = Form::Construct(IDL_FORM_FILE_LIST); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); return r; @@ -70,9 +68,6 @@ FileListForm::OnInitializing(void) __pPresentationModel = FileListPresentationModel::GetInstance(); __pPresentationModel->ClearThumbnailRequests(); - pHeader->SetStyle(HEADER_STYLE_TITLE); - pHeader->SetTitleText(DEFAULT_TITLE); - InitializeFooter(); SetFormBackEventListener(this); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); diff --git a/src/GlFileListPresentationModel.cpp b/src/GlFileListPresentationModel.cpp index 7ae73b0..5ed5a9c 100644 --- a/src/GlFileListPresentationModel.cpp +++ b/src/GlFileListPresentationModel.cpp @@ -80,10 +80,10 @@ IList* FileListPresentationModel::__pDirectoryList = null; IList* FileListPresentationModel::__pContentInfoList = null; FileListPresentationModel::FileListPresentationModel(void) - :__albumContentType(CONTENT_TYPE_ALL) - ,__appControlMode(APP_CONTROL_MODE_MAIN) - ,__appControlMediaType(APPCONTROL_MEDIA_TYPE_UNKNOWN) - ,__appControlSelectionMode(APPCONTROL_SELECTION_MODE_UNKNOWN) + : __albumContentType(CONTENT_TYPE_ALL) + , __appControlMode(APP_CONTROL_MODE_MAIN) + , __appControlMediaType(APPCONTROL_MEDIA_TYPE_UNKNOWN) + , __appControlSelectionMode(APPCONTROL_SELECTION_MODE_SINGLE) { AppLogDebug("ENTER"); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); @@ -181,6 +181,7 @@ FileListPresentationModel::Construct(void) { __appControlMode = APP_CONTROL_MODE_SETTING; } + AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); return E_SUCCESS; @@ -336,7 +337,8 @@ FileListPresentationModel::IsContainContentInDirectory(const String& directoryPa int pageNo = SIZE_PAGE_NO; int countPerPage = SIZE_CONUNT_PER_PAGE; - IList* pContentList = contentDirectory.GetContentDirectoryItemListN(directoryPath, pageNo, countPerPage, CONTENT_INFO_ORDER, SORT_ORDER_ASCENDING); + IList* pContentList = contentDirectory.GetContentDirectoryItemListN(directoryPath, pageNo, countPerPage, + CONTENT_INFO_ORDER, SORT_ORDER_ASCENDING); if (pContentList == null || pContentList->GetCount() <= 0) { @@ -407,7 +409,7 @@ FileListPresentationModel::GetThumbnailInSyncCacheN(const int index, String*& pN Bitmap* pThumbnailBgBitmap = ResourceManager::GetBitmapN(IDB_VIDEOTHUMBNAIL_BG); Rectangle thumbnailRect(RECTANGLE_THUMBNAIL_OFFSET_POSION); pDstBitmap->Scale(Dimension(RECTANGLE_THUMBNAIL_OFFSET_POSION.width - RECTANGLE_THUMBNAIL_OFFSET_POSION.x - , RECTANGLE_THUMBNAIL_OFFSET_POSION.height - RECTANGLE_THUMBNAIL_OFFSET_POSION.y)); + , RECTANGLE_THUMBNAIL_OFFSET_POSION.height - RECTANGLE_THUMBNAIL_OFFSET_POSION.y)); if (pThumbnailBgBitmap != null) { pThumbnailBgBitmap->Scale(DIMENSION_REAL_ICON); @@ -477,7 +479,7 @@ FileListPresentationModel::GetThumbnailVideoInSyncCacheN(const int index, String Bitmap* pThumbnailBgBitmap = ResourceManager::GetBitmapN(IDB_VIDEOTHUMBNAIL_BG); Rectangle thumbnailRect(RECTANGLE_VIDEO_THUMBNAIL_OFFSET_POSION); pOrgBitmap->Scale(Dimension(RECTANGLE_VIDEO_THUMBNAIL_OFFSET_POSION.width - RECTANGLE_VIDEO_THUMBNAIL_OFFSET_POSION.x - , RECTANGLE_VIDEO_THUMBNAIL_OFFSET_POSION.height - RECTANGLE_VIDEO_THUMBNAIL_OFFSET_POSION.y)); + , RECTANGLE_VIDEO_THUMBNAIL_OFFSET_POSION.height - RECTANGLE_VIDEO_THUMBNAIL_OFFSET_POSION.y)); if (pThumbnailBgBitmap != null) { pThumbnailBgBitmap->Scale(Dimension(W_WIDE_THUMBNAIL, H_WIDE_THUMBNAIL)); @@ -530,7 +532,7 @@ FileListPresentationModel::RequestThumbnail(const int index) return; } - __pThumbnailProvider->RequestThumbnail(pContentInfo->GetContentId(), __pThumbnailEvent); + __pThumbnailProvider->RequestThumbnail(pContentInfo->GetContentId(), __pThumbnailEvent); AppLogDebug("EXIT"); } @@ -548,7 +550,7 @@ FileListPresentationModel::CancelThumbnailRequest(const int index) AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult())); return; } - __pThumbnailProvider->CancelThumbnailRequest(pContentInfo->GetContentId(), __pThumbnailEvent); + __pThumbnailProvider->CancelThumbnailRequest(pContentInfo->GetContentId(), __pThumbnailEvent); } AppLogDebug("EXIT"); } @@ -560,7 +562,7 @@ FileListPresentationModel::ClearThumbnailRequests(bool appTerminating) if (__pThumbnailProvider != null) { - __pThumbnailProvider->ClearThumbnailRequests(appTerminating); + __pThumbnailProvider->ClearThumbnailRequests(appTerminating); } AppLogDebug("EXIT"); @@ -621,7 +623,8 @@ FileListPresentationModel::OnThumbnailReceivedN(IEventArg& eventArg) { __pIconListViewCache->RemoveAt(0, true); } - AppLogDebug("[CHASEFIRE] (all:%d) Add Thumbail(%ls)",__pIconListViewCache->GetCount(), pThumbnailInfo->GetFilePath().GetPointer()); + AppLogDebug("[CHASEFIRE] (all:%d) Add Thumbail(%ls)",__pIconListViewCache->GetCount(), + pThumbnailInfo->GetFilePath().GetPointer()); __pIconListViewCache->Add(pThumbnailInfo); } } @@ -715,7 +718,8 @@ FileListPresentationModel::DeleteContentFileList(const IList& contentIndexList) if ((pIndex != null) && (pIndex->ToInt())>=0 && __pContentInfoList->GetCount() > pIndex->ToInt()) { - pContentIdList->Add(new (std::nothrow) ContentId((static_cast(__pContentInfoList->GetAt(pIndex->ToInt())))->GetContentId())); + pContentIdList->Add(new (std::nothrow) ContentId((static_cast + (__pContentInfoList->GetAt(pIndex->ToInt())))->GetContentId())); } } @@ -737,7 +741,8 @@ IList* FileListPresentationModel::GetCollisionIndexListN(const IList& contentIndexList, const String& destDirectory) { AppLogDebug("ENTER"); - if (&contentIndexList == null || contentIndexList.GetCount() <= 0 || &destDirectory == null || destDirectory.IsEmpty() == true) + if (&contentIndexList == null || contentIndexList.GetCount() <= 0 || &destDirectory == null + || destDirectory.IsEmpty() == true) { AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult())); @@ -805,7 +810,8 @@ FileListPresentationModel::MoveToContentFileList(const IList& contentIndexList, Directory::Create(destDirectory, true); } - IList * pContentIdList = new (std::nothrow) ArrayList(SingleObjectDeleter); + delete __pContentIdList; + __pContentIdList = new (std::nothrow) ArrayList(SingleObjectDeleter); int loopCount = contentIndexList.GetCount(); for (int i = 0; i < loopCount; ++i) { @@ -813,19 +819,11 @@ FileListPresentationModel::MoveToContentFileList(const IList& contentIndexList, if ((pIndex != null) && (pIndex->ToInt())>=0 && __pContentInfoList->GetCount() > pIndex->ToInt()) { - pContentIdList->Add(new (std::nothrow) ContentId((static_cast(__pContentInfoList->GetAt(pIndex->ToInt())))->GetContentId())); + __pContentIdList->Add(new (std::nothrow) ContentId((static_cast(__pContentInfoList->GetAt(pIndex->ToInt())))->GetContentId())); } } - loopCount = pContentIdList->GetCount(); - for (int i = 0; i < loopCount; ++i) - { - ContentId* pContentId = static_cast(pContentIdList->GetAt(i)); - if (pContentId != null) - { - MoveToContentFile(*pContentId, destDirectory); - } - } + AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); return E_SUCCESS; @@ -869,6 +867,7 @@ FileListPresentationModel::MoveToContentFile(const ContentId& contentId, const S ContentInfo* pContentInfo = contentManager.GetContentInfoN(contentId); if (pContentInfo == null) { + AppLogDebug("Santhosh %s", destDirectory.GetPointer()); AppLogDebug("EXIT 2(%s)", GetErrorMessage(GetLastResult())); return E_FAILURE; } @@ -957,7 +956,7 @@ FileListPresentationModel::MoveToContentFile(const ContentId& contentId, const S result FileListPresentationModel::StartAppControl( const String& providerId, const String& operationId, - const IMap* pDataList, IAppControlResponseListener* pListener) + const IMap* pDataList, IAppControlResponseListener* pListener) { AppLogDebug("ENTER"); AppLogDebug("FindAppControlN(%ls, %ls)", providerId.GetPointer(), operationId.GetPointer()); @@ -972,7 +971,8 @@ FileListPresentationModel::StartAppControl( const String& providerId, const Stri String* pKey = const_cast(static_cast(pKeyList->GetAt(i))); String* pValue = const_cast(static_cast(pDataList->GetValue(*pKey))); - AppLogDebug("(%ls:%ls)", pKey == null ? L"(null)" : pKey->GetPointer(), pValue == null ? L"(null)" : pValue->GetPointer()); + AppLogDebug("(%ls:%ls)", pKey == null ? L"(null)" : pKey->GetPointer(), + pValue == null ? L"(null)" : pValue->GetPointer()); } } } @@ -1054,7 +1054,8 @@ FileListPresentationModel::SetCurrentAlbumInfo(const String& albumName, const IL int loopCount = directoryList.GetCount(); for (int i = 0; i < loopCount; ++i) { - __pDirectoryList->Add(new (std::nothrow) String(*(const_cast(static_cast(directoryList.GetAt(i)))))); + __pDirectoryList->Add(new (std::nothrow) String(*(const_cast + (static_cast(directoryList.GetAt(i)))))); } if (__pContentInfoList != null) @@ -1114,6 +1115,7 @@ FileListPresentationModel::RefreshContentInfoList(ContentType contentType) if (__pContentInfoList != null) { delete __pContentInfoList; + __pContentInfoList = null; } __pContentInfoList = GetContentInfoListInDirectoryListN(*__pDirectoryList, __albumContentType); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); @@ -1233,6 +1235,24 @@ FileListPresentationModel::GetContentInfo(int index) return pContentInfo; } + +IList* FileListPresentationModel::GetContentIdListN(const IList& contentInfoList) +{ + IList* pContentIdList = new (std::nothrow) ArrayList(SingleObjectDeleter); + int loopCount = contentInfoList.GetCount(); + for (int i = 0; i < loopCount; ++i) + { + const Integer* pIndex = static_cast(contentInfoList.GetAt(i)); + + if ((pIndex != null) && (pIndex->ToInt())>=0 && __pContentInfoList->GetCount() > pIndex->ToInt()) + { + pContentIdList->Add(new (std::nothrow) ContentId((static_cast(__pContentInfoList->GetAt(pIndex->ToInt())))->GetContentId())); + } + } + + return pContentIdList; +} + int FileListPresentationModel::GetCurrentAlbumContentInfoCount(void) { @@ -1299,7 +1319,7 @@ FileListPresentationModel::GetContentFilePath(int index) Bitmap* FileListPresentationModel::CoverVideoOverlayedImageOnThumbnailN(Bitmap& thumbnail, - const ThumbnailInfo& thumbmailInfo) + const ThumbnailInfo& thumbmailInfo) { AppLogDebug("ENTER"); Bitmap* overlayedImage = null; @@ -1357,8 +1377,8 @@ FileListPresentationModel::CoverVideoOverlayedImageOnThumbnailN(Bitmap& thumbnai Bitmap* FileListPresentationModel::GetShadedBackgroundBitmapN(Bitmap& bgBitmap, - const Bitmap& orgBitmap, - const Rectangle& orgBitmapPosition) + const Bitmap& orgBitmap, + const Rectangle& orgBitmapPosition) { AppLogDebug("ENTER"); if (&orgBitmap == null || &orgBitmap == null) @@ -1385,7 +1405,7 @@ FileListPresentationModel::GetShadedBackgroundBitmapN(Bitmap& bgBitmap, IList* FileListPresentationModel::GetContentInfoListInDirectoryListN(const IList& contentDirectoryList, - ContentType contentType)const + ContentType contentType)const { AppLogDebug("ENTER"); IList* pContentList = new (std::nothrow) ArrayList(SingleObjectDeleter); diff --git a/src/GlFileMoveTimer.cpp b/src/GlFileMoveTimer.cpp new file mode 100644 index 0000000..537643a --- /dev/null +++ b/src/GlFileMoveTimer.cpp @@ -0,0 +1,174 @@ +// +// Copyright (c) 2012 Samsung Electronics Co., Ltd. +// +// Licensed under the Flora License, Version 1.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://floralicense.org/license/ +// +// 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. +// + +/** + * @file FileMoveTimer.cpp + * @brief This is the source file for FileMoveTimer class. + */ + +#include +#include +#include +#include +#include + +#include "GlFileListPresentationModel.h" +#include "GlFileMoveTimer.h" + +using namespace Tizen::Base; +using namespace Tizen::Base::Collection; +using namespace Tizen::Base::Utility; +using namespace Tizen::Content; +using namespace Tizen::Io; +using namespace Tizen::Ui; +using namespace Tizen::Ui::Controls; +using namespace Tizen::Ui::Scenes; + +FileMoveTimer::FileMoveTimer(String& destDirectory, IList* list , FileListPresentationModel* presentationModel + , IFileOpInvalidateListener* pInvalidate) + : GlTimerBase(pInvalidate, FILE_MOVE_ACTION) + , __pMoveIndexList(list) + ,__moveToDir(destDirectory) + ,__pPresentationModel(presentationModel) +{ +} + +FileMoveTimer::~FileMoveTimer(void) +{ + delete __pMoveIndexList; +} + +IList* +FileMoveTimer::TimerStart(void) +{ + AppLogDebug("ENTER"); + if (&__moveToDir == null || __moveToDir.IsEmpty()) + { + AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult())); + return null; + } + + if (__pMoveIndexList == null || __pMoveIndexList->GetCount() <= 0) + { + AppLogDebug("EXIT 2(%s)", GetErrorMessage(GetLastResult())); + return null; + } + + IList* pCollisionList = __pPresentationModel->GetCollisionIndexListN(*__pMoveIndexList, __moveToDir); + + if (pCollisionList != null) + { + int loopCount = pCollisionList->GetCount(); + for (int i = 0; i < loopCount; ++i) + { + String* pCollisionString = const_cast(static_cast(pCollisionList->GetAt(i))); + String tmpString; + + if (pCollisionString != null) + { + tmpString = (*pCollisionString); + } + + String delim(MULTI_ITEM_SEPARATOR); + StringTokenizer st(tmpString, delim); + String token; + + int collisionIndex; + String fileNmae; + + if (st.HasMoreTokens() == true) + { + st.GetNextToken(token); + Integer::Parse(token, collisionIndex); + + if (st.HasMoreTokens() == true) + { + st.GetNextToken(fileNmae); + } + + MessageBox messageBox; + messageBox.Construct(L"", fileNmae + ResourceManager::GetString(L"IDS_MEDIABR_POP_ALREADY_EXISTS_OVERWRITE_Q"), + MSGBOX_STYLE_YESNO, 0); + int modalResult = 0; + messageBox.ShowAndWait(modalResult); + + if (modalResult == MSGBOX_RESULT_NO) + { + int innerLoopCount = __pMoveIndexList->GetCount(); + for (int j = 0; j < innerLoopCount; ++j) + { + if(collisionIndex == (const_cast(static_cast + (__pMoveIndexList->GetAt(j))))->ToInt()) + { + __pMoveIndexList->RemoveAt(j, true); + --j; + --innerLoopCount; + } + } + } + } + } + delete pCollisionList; + } + + if ( __pMoveIndexList->GetCount() > 0 ) + { + if (File::IsFileExist(__moveToDir) == false) + { + Directory::Create(__moveToDir, true); + } + AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); + return __pPresentationModel->GetContentIdListN(*__pMoveIndexList); + + } + else + { + return null; + } +} + +void +FileMoveTimer::TimerExpired(const ContentId& contentId) +{ + AppLogDebug("ENTER"); + __pPresentationModel->MoveToContentFile(contentId, __moveToDir); + AppLogDebug("EXIT"); +} + +void +FileMoveTimer::TimerCancel(void) +{ +} + +void +FileMoveTimer::TimerComplete(int) +{ + AppLogDebug("ENTER"); + String albumName = __pPresentationModel->ConvertToAlbumName(__moveToDir); + + if (albumName != EMPTY_SPACE) + { + IList* pDirectoryList = new (std::nothrow) ArrayList(SingleObjectDeleter); + pDirectoryList->Add(new (std::nothrow) String(__moveToDir)); + __pPresentationModel->SetCurrentAlbumInfo(albumName, *pDirectoryList); + __pPresentationModel->SetCurrentAlbumContentType(CONTENT_TYPE_ALL); + delete pDirectoryList; + + SceneManager* pSceneManager = SceneManager::GetInstance(); + pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ALL_LIST)); + } + AppLogDebug("EXIt"); +} diff --git a/src/GlFormFactory.cpp b/src/GlFormFactory.cpp index a70f321..ed59d46 100644 --- a/src/GlFormFactory.cpp +++ b/src/GlFormFactory.cpp @@ -25,9 +25,7 @@ #include "GlFileListEditorForm.h" #include "GlFileListForm.h" #include "GlFormFactory.h" -#include "GlSettingIntervalForm.h" #include "GlSettingMainForm.h" -#include "GlSettingTransitionForm.h" #include "GlTypes.h" using namespace Tizen::Base; @@ -95,20 +93,7 @@ FormFactory::CreateFormN(const String& formId, const SceneId& sceneId) pSceneManager->AddSceneEventListener(sceneId, *pForm); pNewForm = pForm; } - else if (formId == IDC_FORM_SETTING_INTERVAL) - { - SettingIntervalForm* pForm = new (std::nothrow) SettingIntervalForm(); - pForm->Initialize(); - pSceneManager->AddSceneEventListener(sceneId, *pForm); - pNewForm = pForm; - } - else if (formId == IDC_FORM_SETTING_TRANSITION) - { - SettingTransitionForm* pForm = new (std::nothrow) SettingTransitionForm(); - pForm->Initialize(); - pSceneManager->AddSceneEventListener(sceneId, *pForm); - pNewForm = pForm; - } + AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); return pNewForm; diff --git a/src/GlGalleryApp.cpp b/src/GlGalleryApp.cpp index b8da117..db54b7c 100644 --- a/src/GlGalleryApp.cpp +++ b/src/GlGalleryApp.cpp @@ -42,9 +42,9 @@ static const wchar_t* PARAM_LANGUAGE = L"http://tizen.org/setting/locale.languag static const wchar_t* PARAM_LOCALE = L"http://tizen.org/setting/locale.country"; GalleryApp::GalleryApp(void) - :__requestId(0) - ,__pArguments(null) - ,__appControlResult(APP_CTRL_RESULT_SUCCEEDED) + : __requestId(0) + , __pArguments(null) + , __appControlResult(APP_CTRL_RESULT_SUCCEEDED) { AppLogDebug("ENTER"); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); @@ -83,6 +83,14 @@ GalleryApp::GetUriData(void) const return __uriData; } +String +GalleryApp::GetMimeType(void) const +{ + AppLogDebug("ENTER"); + AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); + return __mimeType; +} + const IMap* GalleryApp::GetAppControlArguments(void) const { @@ -173,7 +181,8 @@ GalleryApp::OnForeground(void) BasePanel* pBasePanel = dynamic_cast(pScene->GetPanel()); BaseForm* pBaseForm = dynamic_cast(pScene->GetForm()); - if(pBasePanel != null) + + if(pBasePanel != null ) { pBasePanel->OnUpdateContentList(); } @@ -199,6 +208,10 @@ GalleryApp::OnAppControlRequestReceived(RequestId reqId, const String& operation { __uriData = *pUriData; } + if (pMimeType != null) + { + __mimeType = *pMimeType; + } if (pExtraData != null) { HashMap* pArguments = new (std::nothrow) HashMap(SingleObjectDeleter); @@ -216,7 +229,6 @@ GalleryApp::OnAppControlRequestReceived(RequestId reqId, const String& operation if (pValue != null && pKey->CompareTo(APPCONTROL_RESULT_KEY_LEGACY_RESULT) != 0) { - AppLogDebug("(%ls:%ls)", pKey == null ? L"(null)" : pKey->GetPointer(), pValue == null ? L"(null)" : pValue->GetPointer()); pArguments->Add(new (std::nothrow) String(*pKey), new (std::nothrow) String(*pValue)); } } diff --git a/src/GlImageListEditorPanel.cpp b/src/GlImageListEditorPanel.cpp index 3311669..ca3dd27 100644 --- a/src/GlImageListEditorPanel.cpp +++ b/src/GlImageListEditorPanel.cpp @@ -28,6 +28,8 @@ #include "GlImageListEditorPanel.h" #include "GlResourceManager.h" #include "GlTypes.h" +#include "GlFileDeleteTimer.h" +#include "GlFileListEditorForm.h" using namespace Tizen::App; using namespace Tizen::Base; @@ -55,6 +57,7 @@ ImageListEditorPanel::ImageListEditorPanel(void) , __pLabelSelectCnt(null) , __itemCount(0) , __pPresentationModel(null) + , __pFileDelete(null) { AppLogDebug("ENTER"); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); @@ -63,6 +66,7 @@ ImageListEditorPanel::ImageListEditorPanel(void) ImageListEditorPanel::~ImageListEditorPanel(void) { AppLogDebug("ENTER"); + delete __pFileDelete; AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); } @@ -561,7 +565,7 @@ ImageListEditorPanel::GetItemCheckedIndexList(void) const } void -ImageListEditorPanel::OnRequestDeleteAction(void) +ImageListEditorPanel::OnRequestDelete(void) { AppLogDebug("ENTER"); IList* pIndexList = GetItemCheckedIndexList(); @@ -573,15 +577,98 @@ ImageListEditorPanel::OnRequestDeleteAction(void) return; } + //TODO To test this properly, seems like OnRequestDelete is unused + delete __pFileDelete; + __pFileDelete = new FileDeleteTimer(pIndexList, + __pPresentationModel, + this ); + result r = __pFileDelete->StartTimer(); + + if (IsFailed(r)) + { + delete __pFileDelete; + __pFileDelete = null; + return ; + } - __pPresentationModel->DeleteContentFileList(*pIndexList); - delete pIndexList; + AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); +} +void ImageListEditorPanel::OnFileOpInvalidate(enum FileActionMode actionId) +{ + SceneManager* pSceneManager = SceneManager::GetInstance(); + FileListEditorForm* pFileListEditorForm = + dynamic_cast(pSceneManager->GetCurrentScene()->GetForm()); + TryReturnVoid(pFileListEditorForm != null, "[%s] fail to get SceneManager.", + GetErrorMessage(GetLastResult())); + pFileListEditorForm->Invalidate(true); +} + +void ImageListEditorPanel::OnFileOpComplete(enum FileActionMode actionId, result res) +{ + if ( actionId == FILE_DELETE_ACTION ) + { + //Do nothing + } + else if ( actionId == FILE_MOVE_ACTION ) + { + + } +} + + + +void +ImageListEditorPanel::OnRequestMessage(void) +{ + AppLogDebug("ENTER"); + IList* pIndexList = GetItemCheckedIndexList(); + if (pIndexList->GetCount() <= 0) + { + AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult())); + + return; + } + + String combineText; + String path; + int loopCount = pIndexList->GetCount(); + for (int i = 0; i < loopCount; ++i) + { + path = __pPresentationModel->GetContentFilePath(i); + + if (path.EndsWith(CONTENT_EXT_PNG) + || path.EndsWith(CONTENT_EXT_BMP) + || path.EndsWith(CONTENT_EXT_JPG) + || path.EndsWith(CONTENT_EXT_GIF) + || path.EndsWith(CONTENT_EXT_TIF) + || path.EndsWith(CONTENT_EXT_MP4) + || path.EndsWith(CONTENT_EXT_3GP) + || path.EndsWith(CONTENT_EXT_AVI) + || path.EndsWith(CONTENT_EXT_RM) + || path.EndsWith(CONTENT_EXT_WMV) + || path.EndsWith(CONTENT_EXT_ASF) + ) + { + if (combineText.CompareTo(EMPTY_SPACE) != 0) + { + combineText.Append(L";"); + } + combineText.Append(path); + } + } + + HashMap* pDataList = new (std::nothrow) HashMap(SingleObjectDeleter); + pDataList->Construct(); + pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_ATTACHMENTS), + new (std::nothrow) String(combineText)); + __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_MESSAGE, APPCONTROL_OPERATION_ID_COMPOSE, + pDataList, null); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); } void -ImageListEditorPanel::OnRequestEmailAction(void) +ImageListEditorPanel::OnRequestEmail(void) { AppLogDebug("ENTER"); IList* pIndexList = GetItemCheckedIndexList(); @@ -625,13 +712,13 @@ ImageListEditorPanel::OnRequestEmailAction(void) pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_ATTACHMENTS), new (std::nothrow) String(combineText)); - __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_EMAIL, - APPCONTROL_OPERATION_ID_COMPOSE, pDataList, null); + __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_EMAIL, APPCONTROL_OPERATION_ID_COMPOSE, + pDataList, null); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); } void -ImageListEditorPanel::OnRequestMoveToAction(String& destDirectory) +ImageListEditorPanel::OnRequestMoveTo(String& destDirectory) { AppLogDebug("ENTER"); if (&destDirectory == null || destDirectory.IsEmpty()) @@ -648,6 +735,7 @@ ImageListEditorPanel::OnRequestMoveToAction(String& destDirectory) return; } + //TODO TO rework this, update to use the FileMoveTimer, When this func is used.. result r = __pPresentationModel->MoveToContentFileList(*pIndexList, destDirectory); delete pIndexList; pIndexList = null; diff --git a/src/GlProgressBar.cpp b/src/GlProgressBar.cpp new file mode 100644 index 0000000..ac0bd1b --- /dev/null +++ b/src/GlProgressBar.cpp @@ -0,0 +1,170 @@ +// +// Copyright (c) 2012 Samsung Electronics Co., Ltd. +// +// Licensed under the Flora License, Version 1.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://floralicense.org/license/ +// +// 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. +// + +/** + * @file GlProgressBar.cpp + * @brief This is the implementation file for GlProgressBar class. + */ + +#include +#include +#include "GlProgressBar.h" +#include "GlResourceManager.h" +#include "GlTypes.h" + +using namespace Tizen::App; +using namespace Tizen::Base; +using namespace Tizen::Base::Runtime; +using namespace Tizen::Graphics; +using namespace Tizen::Ui; +using namespace Tizen::Ui::Controls; + +GlProgressBar::GlProgressBar(IActionEventListener* listener) + : __totalVal(1) + , __curVal(1) + , __pFileProgressingPopup(null) + , __pFileProgressingProgress(null) + , __pFileProgressingHeaderLabel(null) + , __pFileProgressingLabel(null) + , __pFileProgressingCancelButton(null) + , __pActionListener(listener) +{ + AppLogDebug("ENTER"); + AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); +} + +GlProgressBar::~GlProgressBar(void) +{ + AppLogDebug("ENTER"); + if (__pFileProgressingPopup != null) + { + delete __pFileProgressingPopup; + } + AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); +} + +void +GlProgressBar::HideFileProgressingPopup(void) +{ + AppLogDebug("ENTER"); + if (__pFileProgressingPopup != null && __pFileProgressingPopup->IsVisible()) + { + __pFileProgressingPopup->SetShowState(false); + + delete __pFileProgressingPopup; + __pFileProgressingPopup = null; + } + AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); +} + +result +GlProgressBar::CreateFileProgressingPopup(void) +{ + AppLogDebug("ENTER"); + __pFileProgressingPopup = new (std::nothrow) Popup(); + result r = __pFileProgressingPopup->Construct(L"IDL_DEL_PROGRESSING_POPUP"); + + if (__pFileProgressingPopup != null && r == E_SUCCESS) + { + __pFileProgressingCancelButton = static_cast< Button* >(__pFileProgressingPopup->GetControl(L"IDC_CANCEL_BUTTON", true)); + + if (__pFileProgressingCancelButton != null) + { + __pFileProgressingCancelButton->SetActionId(ACTION_ID_PROGRESSBAR_CANCEL); + __pFileProgressingCancelButton->AddActionEventListener(*__pActionListener); + __pFileProgressingCancelButton->SetShowState(true); + } + + __pFileProgressingProgress = static_cast< Progress* >(__pFileProgressingPopup->GetControl(L"IDC_PROGRESS_BAR", true)); + + if (__pFileProgressingProgress != null) + { + __pFileProgressingProgress->SetName(L"IDC_ANIMATION_PROGRESS"); + __pFileProgressingProgress->SetValue(0); + } + + __pFileProgressingHeaderLabel = static_cast< Label* >(__pFileProgressingPopup->GetControl(L"IDC_ANIMATION_HEADER", true)); + + if (__pFileProgressingHeaderLabel != null) + { + __pFileProgressingHeaderLabel->SetName(L"IDC_ANIMATION_HEADER"); + __pFileProgressingHeaderLabel->SetShowState(true); + } + + __pFileProgressingLabel = static_cast< Label* >(__pFileProgressingPopup->GetControl(L"IDC_ANIMATION_LABEL", true)); + + if (__pFileProgressingLabel != null) + { + __pFileProgressingLabel->SetName(L"IDC_FILE_COUNT_LABEL"); + __pFileProgressingLabel->SetShowState(true); + } + + } + AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); + return r; +} + +void +GlProgressBar::ShowFileProgressingPopup(int val, enum FileActionMode action) +{ + AppLogDebug("ENTER"); + CreateFileProgressingPopup(); + + if (val > 0) + { + __totalVal = val; + } + else + { + __totalVal = 1; + } + __pFileProgressingProgress->SetRange(1, val); + + if (__pFileProgressingPopup != null) + { + if (__pFileProgressingHeaderLabel != null) + { + switch(action) + { + case FILE_MOVE_ACTION: + __pFileProgressingHeaderLabel->SetText(ResourceManager::GetString(L"IDS_COM_POP_MOVING")); + break; + case FILE_DELETE_ACTION: + __pFileProgressingHeaderLabel->SetText(L"Deleting..."); + break; + default: + break; + } + + __pFileProgressingHeaderLabel->Invalidate(true); + } + + __pFileProgressingPopup->SetShowState(true); + __pFileProgressingPopup->Show(); + } + AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); +} + +void +GlProgressBar::IncProgress(int count) +{ + AppLogDebug("ENTER"); + __curVal = count; + __pFileProgressingProgress->SetValue( count ); + __pFileProgressingPopup->SetShowState(true); + __pFileProgressingPopup->Show(); + AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); +} diff --git a/src/GlRadioCustomItem.cpp b/src/GlRadioCustomItem.cpp new file mode 100644 index 0000000..3333516 --- /dev/null +++ b/src/GlRadioCustomItem.cpp @@ -0,0 +1,119 @@ +// +// Copyright (c) 2012 Samsung Electronics Co., Ltd. +// +// Licensed under the Flora License, Version 1.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://floralicense.org/license/ +// +// 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. +// + +/** + * @file: RadioCustomItem.cpp + *@brief: The RadioCustomItem + */ + +#include +#include + +#include "GlRadioCustomItem.h" + +using namespace Tizen::App; +using namespace Tizen::Base; +using namespace Tizen::Graphics; +using namespace Tizen::Ui::Controls; + +static const wchar_t* IDB_BUTTON_RADIO_PRESS2 = L"00_button_radio_selected.png"; +static const wchar_t* IDB_BUTTON_RADIO_PRESS1 = L"00_button_radio.png"; + +const int RadioCustomItem::IDA_FORMAT_STRING = 500; +const int RadioCustomItem::IDA_FORMAT_RADIO_BUTTON = 501; + +RadioCustomItem::RadioCustomItem(void) + : __isSelected(false) + , __width(0) + , __height(0) +{ +} + +RadioCustomItem::~RadioCustomItem(void) +{ +} + +result +RadioCustomItem::Construct(int width, int height) +{ + result r = E_FAILURE; + + __width = width; + __height = height; + const Dimension dim(width, height); + r = CustomItem::Construct(dim, LIST_ANNEX_STYLE_NORMAL); + + return r; +} + +void +RadioCustomItem::SetText(Tizen::Base::String& text) +{ + __text = text; +} + +String +RadioCustomItem::GetText(void) +{ + return __text; +} + +result +RadioCustomItem::Make(void) +{ + result r = E_FAILURE; + Color textColor = CUSTOM_COLOR_LISTVIEW_TEXT2; + Color pressedTextColor = CUSTOM_COLOR_LISTVIEW_TEXT; + Bitmap* pBitmap = null; + + if (__isSelected == true) + { + pBitmap = AppResource::GetInstance()->GetBitmapN(IDB_BUTTON_RADIO_PRESS2); + } + else + { + pBitmap = AppResource::GetInstance()->GetBitmapN(IDB_BUTTON_RADIO_PRESS1); + } + + if ( pBitmap != NULL) + { + AddElement(Rectangle(26, (__height-pBitmap->GetHeight())/2, pBitmap->GetWidth(), pBitmap->GetHeight()), + IDA_FORMAT_RADIO_BUTTON, *pBitmap, null); + AppLogDebug("RadioCustomItem::the text is %ls",__text.GetPointer()); + + r = AddElement(Rectangle(26 + pBitmap->GetWidth() + 10, 5, __width - 26 - 10 - pBitmap->GetWidth(), __height), IDA_FORMAT_STRING, __text, 40, textColor, textColor, textColor, true); + delete pBitmap; + } + TryCatch(!IsFailed(r),,"RadioCustomItem::the value is %s",GetErrorMessage(r)); + + r = SetElementSelectionEnabled(IDA_FORMAT_STRING, true); + TryCatch(!IsFailed(r),,"RadioCustomItem::the value is %s",GetErrorMessage(r)); + + CATCH: + return r; +} + +void +RadioCustomItem::SetSelected(bool selectedValue) +{ + __isSelected = selectedValue; +} + +bool +RadioCustomItem::GetSelected(void) +{ + return __isSelected; +} diff --git a/src/GlResourceManager.cpp b/src/GlResourceManager.cpp index f694a85..fb07e0d 100644 --- a/src/GlResourceManager.cpp +++ b/src/GlResourceManager.cpp @@ -32,7 +32,6 @@ ResourceManager::GetBitmapN(const String& id) AppResource* pAppResource = Application::GetInstance()->GetAppResource(); if (pAppResource == null) { - return null; } @@ -45,7 +44,6 @@ ResourceManager::GetString(const String& id) AppResource* pAppResource = Application::GetInstance()->GetAppResource(); if (pAppResource == null) { - return null; } diff --git a/src/GlSettingIntervalForm.cpp b/src/GlSettingIntervalForm.cpp deleted file mode 100644 index b7297ec..0000000 --- a/src/GlSettingIntervalForm.cpp +++ /dev/null @@ -1,677 +0,0 @@ -// -// Copyright (c) 2012 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.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://floralicense.org/license/ -// -// 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. -// - -/** - * @file GlSettingIntervalForm.cpp - * @brief This is the implementation file for SettingIntervalForm class. - */ - -#include "GlGalleryApp.h" -#include "GlResourceManager.h" -#include "GlSettingIntervalForm.h" -#include "GlSettingPresentationModel.h" -#include "GlTypes.h" - -using namespace Tizen::App; -using namespace Tizen::Base; -using namespace Tizen::Base::Collection; -using namespace Tizen::Content; -using namespace Tizen::Graphics; -using namespace Tizen::System; -using namespace Tizen::Ui; -using namespace Tizen::Ui::Controls; -using namespace Tizen::Ui::Scenes; - -static const int FONT_MAIN_TEXT_SIZE_GIANT = 100; -static const int FONT_MAIN_TEXT_SIZE_HUGE = 70; -static const int FONT_MAIN_TEXT_SIZE_LARGE = 55; -static const int FONT_MAIN_TEXT_SIZE_NORMAL = 44; -static const int FONT_MAIN_TEXT_SIZE_SMALL = 32; - -static const int X_GROUP_DEFAULT = 16; -static const int Y_GROUP_DEFAULT = 0; -static const int GAP_WIDTH = 2; - -static const int H_GROUP_ITEM_DEFAULT_LABEL = 114; -static const int X_GROUP_ITEM_DEFAULT_LABEL = 16; - -static const int H_GROUP_INDEX_DEFAULT = 82; -static const int H_GROUP_INDEX_TITLE_TEXT = 36; - -static const int X_ITEM_TYPE_3_ICON = 26; -static const int Y_ITEM_TYPE_3_ICON = 21; -static const int W_ITEM_TYPE_3_ICON = 0; -static const int H_ITEM_TYPE_3_ICON = 74; - -static const int H_GROUP_ITEM_DEFAULT = 114; -static const int W_GROUP_ITEM_DEFAULT = 720; - -static const int X_ITEM_TYPE_1_LABEL = 16; -static const int W_ITEM_TYPE_1_LABEL = (720 - X_ITEM_TYPE_1_LABEL); -static const int H_ITEM_TYPE_1_LABEL = 114; - -static const int W_ITEM_TYPE_2_LABEL_MAIN = W_ITEM_TYPE_1_LABEL; - -static const int X_ITEM_TYPE_3_LABEL = (X_ITEM_TYPE_3_ICON + W_ITEM_TYPE_3_ICON); -static const int Y_ITEM_TYPE_3_LABEL = 0; -static const int W_ITEM_TYPE_3_LABEL = (W_ITEM_TYPE_2_LABEL_MAIN - X_ITEM_TYPE_3_LABEL); -static const int H_ITEM_TYPE_3_LABEL = H_ITEM_TYPE_1_LABEL; - -static const unsigned int COLOR_MAIN_TEXT = Color32<0, 0, 0>::Value; -static const unsigned int COLOR_GROUP_TITLE_TEXT = Color32<93, 110, 141>::Value; -static const unsigned int COLOR_BG_GROUP_INDEX_DEFAULT = Color32<249, 249, 249>::Value; -static const unsigned int COLOR_BG_GROUP_ITEM_DEFAULT = Color32<236, 240, 242>::Value; - -static const int FONT_SIZE_GROUP_TITLE_TEXT = 32; - -static const int H_GROUP_INDEX_NO_TITLE_DEFAULT = 40; - -static const wchar_t* FONT_SIZE_SETTING_TYPE_GIANT = L"giant"; -static const wchar_t* FONT_SIZE_SETTING_TYPE_HUGE = L"huge"; -static const wchar_t* FONT_SIZE_SETTING_TYPE_LARGE = L"large"; -static const wchar_t* FONT_SIZE_SETTING_TYPE_MEDIUM = L"medium"; - -static const int GROUP_TIMEINTERVAL = 0; - -static const int GROUP_COUNT = 1; -static const int GROUP_INDEX_1 = 0; - -static const int TIMEINTERVAL_ITEM_COUNT = 5; - -static const int ITEM_SLIDESHOW_INTERVAL_SEC_2 = 0; -static const int ITEM_SLIDESHOW_INTERVAL_SEC_3 = 1; -static const int ITEM_SLIDESHOW_INTERVAL_SEC_5 = 2; -static const int ITEM_SLIDESHOW_INTERVAL_SEC_10 = 3; -static const int ITEM_SLIDESHOW_INTERVAL_SEC_20 = 4; - -SettingIntervalForm::SettingIntervalForm(void) - : __pTableView(null) - , __pPresentationModel(null) -{ - AppLogDebug("ENTER"); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} - -SettingIntervalForm::~SettingIntervalForm(void) -{ - AppLogDebug("ENTER"); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} - -result -SettingIntervalForm::Initialize(void) -{ - AppLogDebug("ENTER"); - result r = Construct(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - - return r; -} -result -SettingIntervalForm::OnInitializing(void) -{ - AppLogDebug("ENTER"); - __pPresentationModel = SettingPresentationModel::GetInstance(); - - Header* pHeader = GetHeader(); - AppAssert(pHeader); - pHeader->SetStyle(HEADER_STYLE_TITLE); - pHeader->SetTitleText(ResourceManager::GetString(L"IDS_COM_BODY_GALLERY")); - - Rectangle bounds = GetClientAreaBounds(); - bounds.x = X_GROUP_DEFAULT; - bounds.y = Y_GROUP_DEFAULT; - bounds.width -= (bounds.x * GAP_WIDTH); - - __pTableView = new (std::nothrow) GroupedTableView(); - - __pTableView->Construct(bounds, true, TABLE_VIEW_SCROLL_BAR_STYLE_NONE); - __pTableView->SetItemProvider(this); - - AddControl(*__pTableView); - __pTableView->SetGroupedLookEnabled(true); - __pTableView->AddGroupedTableViewItemEventListener(*this); - - InitializeFooter(); - SetFormBackEventListener(this); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - - return E_SUCCESS; -} - -result -SettingIntervalForm::OnTerminating(void) -{ - AppLogDebug("ENTER"); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - - return E_SUCCESS; -} - -void -SettingIntervalForm::OnActionPerformed(const Control& source, int actionId) -{ - AppLogDebug("ENTER"); - SceneManager* pSceneManager = SceneManager::GetInstance(); - AppAssert(pSceneManager); - - switch (actionId) - { - default: - { - break; - } - } - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} - -void -SettingIntervalForm::OnFormBackRequested(Form& source) -{ - AppLogDebug("ENTER"); - - SceneManager* pSceneManager = SceneManager::GetInstance(); - AppAssert(pSceneManager); - pSceneManager->GoBackward(BackwardSceneTransition(IDSCN_SETTING_MAIN)); - - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} - -result -SettingIntervalForm::InitializeFooter(void) -{ - AppLogDebug("ENTER"); - result r = E_SUCCESS; - Footer* pFooter = GetFooter(); - AppAssert(pFooter); - pFooter->RemoveAllItems(); - pFooter->SetStyle(FOOTER_STYLE_BUTTON_ICON); - - pFooter->SetBackButton(); - - pFooter->AddActionEventListener(*this); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - - return r; -} - -void -SettingIntervalForm::OnSceneActivatedN(const SceneId& previousSceneId, - const SceneId& currentSceneId, IList* pArgs) -{ - AppLogDebug("ENTER"); - __pTableView->UpdateTableView(); - UpdateTableViewRedioButtonState(); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} - -void -SettingIntervalForm::OnSceneDeactivated(const SceneId& currentSceneId, - const SceneId& nextSceneId) -{ - AppLogDebug("ENTER"); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} - -TableViewGroupItem* -SettingIntervalForm::CreateGroupItem(int groupIndex, int itemWidth) -{ - AppLogDebug("ENTER"); - - int itemHeight = H_GROUP_INDEX_DEFAULT; - LabelTextStyle style = LABEL_TEXT_STYLE_BOLD; - Rectangle itemRectangle; - String groupText = ResourceManager::GetString(L"IDS_MEDIABR_POP_NO_NAME"); - Label* pLabel = null; - - switch (groupIndex) - { - case GROUP_TIMEINTERVAL: - { - groupText = ResourceManager::GetString(L"IDS_IV_BODY_INTERVAL"); - } - break; - - default: - break; - } - - TableViewGroupItem* pItem = new (std::nothrow) TableViewGroupItem(); - - itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL; - itemRectangle.y = H_GROUP_INDEX_TITLE_TEXT; - itemRectangle.width = itemWidth; - itemRectangle.height = (itemHeight - H_GROUP_INDEX_TITLE_TEXT); - - pItem->Construct(Dimension(itemWidth, itemHeight)); - pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT); - - pLabel = new (std::nothrow) Label(); - pLabel->Construct(itemRectangle, groupText); - pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT); - pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP); - pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style); - pLabel->SetTextColor(COLOR_GROUP_TITLE_TEXT); - - pItem->AddControl(*pLabel); - pItem->SetEnabled(false); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - - return pItem; -} - -TableViewItem* -SettingIntervalForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) -{ - AppLogDebug("ENTER"); - AppLogDebug("group[%d] item[%d]", groupIndex, itemIndex); - - int fontSize = GetFontSize(); - - unsigned int itemHeight = 0; - bool isDrawBitmapIcon = true; - - Rectangle itemRectIcon; - Rectangle itemRectLabel; - Rectangle itemRectSecondLabel; - String itemText(L""); - String itemTextTwoLine(L""); - TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL; - Bitmap* pBitmap = null; - Label* pLabel = null; - - itemHeight = H_GROUP_ITEM_DEFAULT_LABEL; - ItemTypeIconAndOneLine(itemRectIcon, itemRectLabel); - - switch (groupIndex) - { - case GROUP_TIMEINTERVAL: - { - switch (itemIndex) - { - case ITEM_SLIDESHOW_INTERVAL_SEC_2: - { - style = TABLE_VIEW_ANNEX_STYLE_RADIO; - itemText = ResourceManager::GetString(L"IDS_MEDIABR_OPT_2_SECONDS"); - } - break; - - case ITEM_SLIDESHOW_INTERVAL_SEC_3: - { - style = TABLE_VIEW_ANNEX_STYLE_RADIO; - itemText = ResourceManager::GetString(L"IDS_MEDIABR_OPT_3_SECONDS"); - } - break; - - case ITEM_SLIDESHOW_INTERVAL_SEC_5: - { - style = TABLE_VIEW_ANNEX_STYLE_RADIO; - itemText = ResourceManager::GetString(L"IDS_MEDIABR_BODY_5_SECONDS"); - } - break; - - case ITEM_SLIDESHOW_INTERVAL_SEC_10: - { - style = TABLE_VIEW_ANNEX_STYLE_RADIO; - itemText = ResourceManager::GetString(L"IDS_MEDIABR_BODY_10_SECONDS"); - } - break; - - case ITEM_SLIDESHOW_INTERVAL_SEC_20: - { - style = TABLE_VIEW_ANNEX_STYLE_RADIO; - itemText = ResourceManager::GetString(L"IDS_MEDIABR_BODY_20_SECONDS"); - } - break; - - default: - { - } - break; - } - } - break; - - default: - break; - } - - TableViewItem* pItem = new (std::nothrow) TableViewItem(); - - if (pItem) - { - pItem->Construct(Dimension(W_GROUP_ITEM_DEFAULT, itemHeight), style); - pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT); - - if (isDrawBitmapIcon) - { - pLabel = new (std::nothrow) Label(); - pLabel->Construct(itemRectIcon, L""); - pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT); - pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE); - pLabel->SetBackgroundBitmap(*pBitmap); - - pItem->AddControl(*pLabel); - } - - pLabel = new (std::nothrow) Label(); - pLabel->Construct(itemRectLabel, itemText); - pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT); - pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL); - pLabel->SetTextColor(COLOR_MAIN_TEXT); - - pItem->AddControl(*pLabel); - } - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - - return pItem; -} - -int -SettingIntervalForm::GetDefaultGroupItemHeight(void) -{ - return H_GROUP_INDEX_NO_TITLE_DEFAULT; -} - -int -SettingIntervalForm::GetDefaultItemHeight(void) -{ - return H_GROUP_ITEM_DEFAULT; -} - -bool -SettingIntervalForm::DeleteGroupItem(int groupIndex, TableViewGroupItem* pItem) -{ - AppLogDebug("ENTER"); - delete pItem; - pItem = null; - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - - return true; -} - -bool -SettingIntervalForm::DeleteItem(int groupIndex, int itemIndex, TableViewItem* pItem) -{ - AppLogDebug("ENTER"); - delete pItem; - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - - return true; -} - -int -SettingIntervalForm::GetGroupCount(void) -{ - AppLogDebug("ENTER groupItemCount(%d)", GROUP_COUNT); - int groupItemCount = GROUP_COUNT; - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - - return groupItemCount; -} - -int -SettingIntervalForm::GetItemCount(int groupIndex) -{ - AppLogDebug("ENTER"); - - int itemCount = 0; - - switch (groupIndex) - { - case GROUP_INDEX_1: - { - itemCount = TIMEINTERVAL_ITEM_COUNT ; - } - break; - - default: - break; - } - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - - return itemCount; -} - -void -SettingIntervalForm::OnGroupedTableViewItemStateChanged(GroupedTableView& tableView, int groupIndex, - int itemIndex, TableViewItem* pItem, TableViewItemStatus status) -{ - AppLogDebug("ENTER"); - SceneManager* pSceneManager = SceneManager::GetInstance(); - AppAssert(pSceneManager); - - AppLogDebug("Group(%d) index(%d)", groupIndex, itemIndex); - - switch (groupIndex) - { - case GROUP_TIMEINTERVAL: - { - switch (itemIndex) - { - case ITEM_SLIDESHOW_INTERVAL_SEC_2: - { - int inputValue = 2; - __pPresentationModel->SetValue(SECTION_NAME_IMAGE_VIEWER, - ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_INTERVAL, inputValue); - __pTableView->SetItemChecked(groupIndex, itemIndex, true); - AppLogDebug("SETTINGS : setvalue interval(%d)", inputValue); - } - break; - - case ITEM_SLIDESHOW_INTERVAL_SEC_3: - { - int inputValue = 3; - __pPresentationModel->SetValue(SECTION_NAME_IMAGE_VIEWER, - ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_INTERVAL, inputValue); - __pTableView->SetItemChecked(groupIndex, itemIndex, true); - AppLogDebug("SETTINGS : setvalue interval(%d)", inputValue); - } - break; - - case ITEM_SLIDESHOW_INTERVAL_SEC_5: - { - int inputValue = 5; - __pPresentationModel->SetValue(SECTION_NAME_IMAGE_VIEWER, - ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_INTERVAL, inputValue); - __pTableView->SetItemChecked(groupIndex, itemIndex, true); - AppLogDebug("SETTINGS : setvalue interval(%d)", inputValue); - } - break; - - case ITEM_SLIDESHOW_INTERVAL_SEC_10: - { - int inputValue = 10; - __pPresentationModel->SetValue(SECTION_NAME_IMAGE_VIEWER, - ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_INTERVAL, inputValue); - __pTableView->SetItemChecked(groupIndex, itemIndex, true); - AppLogDebug("SETTINGS : setvalue interval(%d)", inputValue); - } - break; - - case ITEM_SLIDESHOW_INTERVAL_SEC_20: - { - int inputValue = 20; - __pPresentationModel->SetValue(SECTION_NAME_IMAGE_VIEWER, - ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_INTERVAL, inputValue); - __pTableView->SetItemChecked(groupIndex, itemIndex, true); - AppLogDebug("SETTINGS : setvalue interval(%d)", inputValue); - } - break; - - default: - { - } - break; - } - UpdateTableViewRedioButtonState(itemIndex); - } - break; - - default: - { - } - break; - } - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} - -void -SettingIntervalForm::UpdateGroupItem(int groupIndex, TableViewGroupItem* pItem) -{ - AppLogDebug("ENTER"); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} - -void -SettingIntervalForm::UpdateItem(int groupIndex, int itemIndex, TableViewItem* pItem) -{ - AppLogDebug("ENTER"); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} - -void -SettingIntervalForm::OnGroupedTableViewContextItemActivationStateChanged(GroupedTableView& tableView, - int groupIndex, int itemIndex, TableViewContextItem* pContextItem, bool activated) -{ - AppLogDebug("ENTER"); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} - -void -SettingIntervalForm::OnGroupedTableViewGroupItemStateChanged(GroupedTableView& tableView, int groupIndex, - TableViewGroupItem* pItem, TableViewItemStatus status) -{ - AppLogDebug("ENTER"); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} - -int -SettingIntervalForm::GetFontSize(void) -{ - AppLogDebug("ENTER"); - result r = E_SUCCESS; - - int fontSize = FONT_MAIN_TEXT_SIZE_NORMAL; - String fontSizeValue(L""); - - if ((r = SettingInfo::GetValue(FONT_SIZE_SETTING_INFO_KEY, fontSizeValue)) == E_SUCCESS) - { - AppLogDebug("GetValue Fail [%s]", GetErrorMessage(r)); - - if (fontSizeValue.Equals(FONT_SIZE_SETTING_TYPE_GIANT, false)) - { - fontSize = FONT_MAIN_TEXT_SIZE_GIANT; - } - else if (fontSizeValue.Equals(FONT_SIZE_SETTING_TYPE_HUGE, false)) - { - fontSize = FONT_MAIN_TEXT_SIZE_HUGE; - } - else if (fontSizeValue.Equals(FONT_SIZE_SETTING_TYPE_LARGE, false)) - { - fontSize = FONT_MAIN_TEXT_SIZE_LARGE; - } - else if (fontSizeValue.Equals(FONT_SIZE_SETTING_TYPE_MEDIUM, false)) - { - fontSize = FONT_MAIN_TEXT_SIZE_NORMAL; - } - else - { - fontSize = FONT_MAIN_TEXT_SIZE_SMALL; - } - } - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - - return fontSize; -} - -void -SettingIntervalForm::ItemTypeIconAndOneLine(Rectangle& icon, Rectangle& main) -{ - AppLogDebug("ENTER"); - icon.x = X_ITEM_TYPE_3_ICON; - icon.y = Y_ITEM_TYPE_3_ICON; - icon.width = W_ITEM_TYPE_3_ICON; - icon.height = H_ITEM_TYPE_3_ICON; - - main.x = X_ITEM_TYPE_3_LABEL; - main.y = Y_ITEM_TYPE_3_LABEL; - main.width = W_ITEM_TYPE_3_LABEL; - main.height = H_ITEM_TYPE_3_LABEL; - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} - -void -SettingIntervalForm::UpdateTableViewRedioButtonState(int senderIndex) -{ - AppLogDebug("ENTER senderIndex(%d)", senderIndex); - - int selectedIndex = 0; - int realValue = 0; - __pPresentationModel->GetValue(SECTION_NAME_IMAGE_VIEWER, ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_INTERVAL, - realValue); - switch (realValue) - { - case 2: - { - selectedIndex = 0; - break; - } - case 3: - { - selectedIndex = 1; - break; - } - case 5: - { - selectedIndex = 2; - break; - } - case 10: - { - selectedIndex = 3; - break; - } - case 20: - { - selectedIndex = 4; - break; - } - default: - { - selectedIndex = 0; - break; - } - } - AppLogDebug("selectedIndex(%d)", selectedIndex); - - for (int i = 0; i < TIMEINTERVAL_ITEM_COUNT; ++i) - { - if (senderIndex != i) - { - if (selectedIndex == i) - { - __pTableView->SetItemChecked(GROUP_TIMEINTERVAL, i, true); - } - else - { - __pTableView->SetItemChecked(GROUP_TIMEINTERVAL, i, false); - } - __pTableView->RefreshItem(GROUP_TIMEINTERVAL, i, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY); - } - } - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} diff --git a/src/GlSettingMainForm.cpp b/src/GlSettingMainForm.cpp index 4772fc1..6bb5876 100644 --- a/src/GlSettingMainForm.cpp +++ b/src/GlSettingMainForm.cpp @@ -19,10 +19,13 @@ * @brief This is the implementation file for SettingMainForm class. */ +#include "GlDropDownCustomItem.h" #include "GlGalleryApp.h" +#include "GlRadioCustomItem.h" #include "GlResourceManager.h" #include "GlSettingMainForm.h" #include "GlSettingPresentationModel.h" +#include "GlSettingToggleCustomItem.h" #include "GlTypes.h" using namespace Tizen::App; @@ -35,85 +38,7 @@ using namespace Tizen::Ui; using namespace Tizen::Ui::Controls; using namespace Tizen::Ui::Scenes; -static const int FONT_MAIN_TEXT_SIZE_GIANT = 100; -static const int FONT_MAIN_TEXT_SIZE_HUGE = 70; -static const int FONT_MAIN_TEXT_SIZE_LARGE = 55; -static const int FONT_MAIN_TEXT_SIZE_NORMAL = 44; -static const int FONT_MAIN_TEXT_SIZE_SMALL = 32; - -static const int X_GROUP_DEFAULT = 16; -static const int Y_GROUP_DEFAULT = 0; -static const int GAP_WIDTH = 2; - -static const int H_GROUP_ITEM_DEFAULT_LABEL = 114; -static const int X_GROUP_ITEM_DEFAULT_LABEL = 16; - -static const int H_GROUP_INDEX_DEFAULT = 82; -static const int H_GROUP_INDEX_TITLE_TEXT = 36; - -static const int X_ITEM_TYPE_3_ICON = 26; -static const int Y_ITEM_TYPE_3_ICON = 21; -static const int W_ITEM_TYPE_3_ICON = 0; -static const int H_ITEM_TYPE_3_ICON = 74; - -static const int H_GROUP_ITEM_DEFAULT = 114; -static const int W_GROUP_ITEM_DEFAULT = 720; - -static const int X_ITEM_TYPE_1_LABEL = 16; -static const int Y_ITEM_TYPE_1_LABEL = 0; -static const int W_ITEM_TYPE_1_LABEL = (720 - X_ITEM_TYPE_1_LABEL); -static const int H_ITEM_TYPE_1_LABEL = 114; - -static const int X_ITEM_TYPE_2_LABEL_MAIN = X_ITEM_TYPE_1_LABEL; -static const int Y_ITEM_TYPE_2_LABEL_MAIN = Y_ITEM_TYPE_1_LABEL; -static const int W_ITEM_TYPE_2_LABEL_MAIN = W_ITEM_TYPE_1_LABEL; -static const int H_ITEM_TYPE_2_LABEL_MAIN = 70; - -static const int X_ITEM_TYPE_2_LABEL_SUB = X_ITEM_TYPE_1_LABEL; -static const int Y_ITEM_TYPE_2_LABEL_SUB = H_ITEM_TYPE_2_LABEL_MAIN; -static const int H_ITEM_TYPE_2_LABEL_SUB = 48; - -static const int X_ITEM_TYPE_3_LABEL = (X_ITEM_TYPE_3_ICON + W_ITEM_TYPE_3_ICON); -static const int Y_ITEM_TYPE_3_LABEL = 0; -static const int W_ITEM_TYPE_3_LABEL = (W_ITEM_TYPE_2_LABEL_MAIN - X_ITEM_TYPE_3_LABEL); -static const int H_ITEM_TYPE_3_LABEL = H_ITEM_TYPE_1_LABEL; - -static const unsigned int COLOR_MAIN_TEXT = Color32<0, 0, 0>::Value; -static const unsigned int COLOR_SUB_TEXT = Color32<42, 137, 194>::Value; -static const unsigned int COLOR_GROUP_TITLE_TEXT = Color32<93, 110, 141>::Value; -static const unsigned int COLOR_BG_GROUP_INDEX_DEFAULT = Color32<249, 249, 249>::Value; -static const unsigned int COLOR_BG_GROUP_ITEM_DEFAULT = Color32<236, 240, 242>::Value; - -static const int FONT_SIZE_SUB_TEXT = 32; -static const int FONT_SIZE_GROUP_TITLE_TEXT = 32; - -static const int H_GROUP_INDEX_NO_TITLE_DEFAULT = 40; - -static const wchar_t* FONT_SIZE_SETTING_TYPE_GIANT = L"giant"; -static const wchar_t* FONT_SIZE_SETTING_TYPE_HUGE = L"huge"; -static const wchar_t* FONT_SIZE_SETTING_TYPE_LARGE = L"large"; -static const wchar_t* FONT_SIZE_SETTING_TYPE_MEDIUM = L"medium"; - -static const int GROUP_SLIDESHOW = 0; -static const int GROUP_SUBTITLES = 1; -static const int GROUP_COUNT = 1; -static const int GROUP_INDEX_1 = 0; -static const int GROUP_INDEX_2 = 1; - -static const int SLIDESHOW_ITEM_COUNT = 2; -static const int SUBTITLES_ITEM_COUNT = 0; - -static const int ITEM_SLIDESHOW_INTERVAL = 0; -static const int ITEM_SLIDESHOW_TRANSITION = 1; - -static const int SETTING_INFO_KEY_INDEX_SLIDESHOW_INTERVAL = 0; -static const int SETTING_INFO_KEY_INDEX_SLIDESHOW_TRANSITION = 1; - -const int GAP_TWO_LINE_ITEM_WIDTH = 80; - SettingMainForm::SettingMainForm(void) - : __pTableView(null) - , __pPresentationModel(null) { AppLogDebug("ENTER"); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); @@ -122,6 +47,10 @@ SettingMainForm::SettingMainForm(void) SettingMainForm::~SettingMainForm(void) { AppLogDebug("ENTER"); + if (pGroupItemCount) + { + delete[] pGroupItemCount; + } AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); } @@ -129,35 +58,40 @@ result SettingMainForm::Initialize(void) { AppLogDebug("ENTER"); - result r = Construct(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER); + result r = Form::Construct(IDL_FORM_SETTING_MAIN); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); return r; } + result SettingMainForm::OnInitializing(void) { AppLogDebug("ENTER"); __pPresentationModel = SettingPresentationModel::GetInstance(); + InitializeSettingValues(); + Header* pHeader = GetHeader(); AppAssert(pHeader); pHeader->SetStyle(HEADER_STYLE_TITLE); pHeader->SetTitleText(ResourceManager::GetString(L"IDS_COM_BODY_GALLERY")); - Rectangle bounds = GetClientAreaBounds(); - bounds.x = X_GROUP_DEFAULT; - bounds.y = Y_GROUP_DEFAULT; - bounds.width -= (bounds.x * GAP_WIDTH); + __pList = static_cast< GroupedListView* >(GetControl(L"IDC_SETTING_LIST")); - __pTableView = new (std::nothrow) GroupedTableView(); - __pTableView->Construct(bounds, true, TABLE_VIEW_SCROLL_BAR_STYLE_NONE); - __pTableView->SetItemProvider(this); - AddControl(*__pTableView); - __pTableView->SetGroupedLookEnabled(true); - __pTableView->AddGroupedTableViewItemEventListener(*this); + if ( __pList != NULL ) + { + __pList->SetItemProvider(*this); + __pList->AddGroupedListViewItemEventListener(*this); + } + + Footer* pFooter = GetFooter(); + if (pFooter) + { + AppLogDebug("setting back button"); + pFooter->SetBackButtonEnabled(true); + } - InitializeFooter(); SetFormBackEventListener(this); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); @@ -208,609 +142,590 @@ SettingMainForm::OnFormBackRequested(Form& source) AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); } -result -SettingMainForm::InitializeFooter(void) -{ - AppLogDebug("ENTER"); - result r = E_SUCCESS; - Footer* pFooter = GetFooter(); - AppAssert(pFooter); - pFooter->RemoveAllItems(); - pFooter->SetStyle(FOOTER_STYLE_BUTTON_ICON); - - pFooter->SetBackButton(); - - pFooter->AddActionEventListener(*this); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - - return r; -} - void SettingMainForm::OnSceneActivatedN(const SceneId& previousSceneId, - const SceneId& currentSceneId, IList* pArgs) + const SceneId& currentSceneId, IList* pArgs) { AppLogDebug("ENTER"); - __pTableView->UpdateTableView(); - UpdateTableViewCheckButtonState(); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); } void SettingMainForm::OnSceneDeactivated(const SceneId& currentSceneId, - const SceneId& nextSceneId) + const SceneId& nextSceneId) { AppLogDebug("ENTER"); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); } -TableViewGroupItem* -SettingMainForm::CreateGroupItem(int groupIndex, int itemWidth) +void +SettingMainForm::OnGroupedListViewContextItemStateChanged(GroupedListView& listView, int groupIndex, int itemIndex, int elementId, ListContextItemStatus status) { - AppLogDebug("ENTER"); - - int itemHeight = H_GROUP_INDEX_DEFAULT; - LabelTextStyle style = LABEL_TEXT_STYLE_BOLD; - Rectangle itemRectangle; - String groupText = ResourceManager::GetString(L"IDS_MEDIABR_POP_NO_NAME"); - - Label* pLabel = null; - - switch (groupIndex) - { - case GROUP_SLIDESHOW: - { - groupText = ResourceManager::GetString(L"IDS_MEDIABR_BUTTON_SLIDE_SHOW"); - } - break; - - default: - break; - } - - TableViewGroupItem* pItem = new (std::nothrow) TableViewGroupItem(); - - itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL; - itemRectangle.y = H_GROUP_INDEX_TITLE_TEXT; - itemRectangle.width = itemWidth; - itemRectangle.height = (itemHeight - H_GROUP_INDEX_TITLE_TEXT); - - pItem->Construct(Dimension(itemWidth, itemHeight)); - pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT); - - pLabel = new (std::nothrow) Label(); - pLabel->Construct(itemRectangle, groupText); - pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT); - pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP); - pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style); - pLabel->SetTextColor(COLOR_GROUP_TITLE_TEXT); - - pItem->AddControl(*pLabel); - pItem->SetEnabled(false); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - - return pItem; } -TableViewItem* -SettingMainForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) +void +SettingMainForm::OnGroupedListViewItemStateChanged(GroupedListView& listView, int groupIndex, int itemIndex, int elementId, ListItemStatus status) { - AppLogDebug("ENTER"); - AppLogDebug("group[%d] item[%d]", groupIndex, itemIndex); - int fontSize = GetFontSize(); - unsigned int itemHeight = 0; - bool isTwoLineItemText = false; - bool isDrawBitmapIcon = true; - - Rectangle itemRectIcon; - Rectangle itemRectLabel; - Rectangle itemRectSecondLabel; - String itemText(L""); - String itemTextTwoLine(L""); - TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL; - Bitmap* pBitmap = null; - Label* pLabel = null; - - itemHeight = H_GROUP_ITEM_DEFAULT_LABEL; - ItemTypeIconAndOneLine(itemRectIcon, itemRectLabel); + int effectiveIndex = 0; + int inputValue = 0 ; - switch (groupIndex) + // for (int i = 0; i < groupIndex; i++) + // effectiveIndex = effectiveIndex + pGroupItemCount[i]; + effectiveIndex = effectiveIndex + itemIndex; + + if (settingInfo[effectiveIndex].itemType == ITEM_TYPE_DROPDOWN) { - case GROUP_SLIDESHOW: + AppLogDebug("refreshing data child count is %d", settingInfo[effectiveIndex].childCount); + if (settingInfo[effectiveIndex].isOpen == false) { - switch (itemIndex) + settingInfo[effectiveIndex].isOpen = true; + settingInfo[effectiveIndex].childCount = 0; + for (int iter = effectiveIndex + 1; iter < SETTING_MAX; iter++) { - case ITEM_SLIDESHOW_INTERVAL: + if (settingInfo[iter].itemType == ITEM_TYPE_RADIO) { - isTwoLineItemText = true; - isDrawBitmapIcon = false; - ItemTypeTwoLine(itemRectLabel, itemRectSecondLabel, fontSize); - itemHeight = (itemRectLabel.height + itemRectSecondLabel.height); - - int returnValue = 0; - result r = __pPresentationModel->GetValue(SECTION_NAME_IMAGE_VIEWER, - ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_INTERVAL, returnValue); - - AppLogDebug("interval(%d)", returnValue); - if (r == E_SUCCESS) - { - switch (returnValue) - { - case 2: - { - itemTextTwoLine = ResourceManager::GetString(L"IDS_MEDIABR_OPT_2_SECONDS"); - } - break; - - case 3: - { - itemTextTwoLine = ResourceManager::GetString(L"IDS_MEDIABR_OPT_3_SECONDS"); - } - break; - - case 5: - { - itemTextTwoLine = ResourceManager::GetString(L"IDS_MEDIABR_BODY_5_SECONDS"); - } - break; - - case 10: - { - itemTextTwoLine = ResourceManager::GetString(L"IDS_MEDIABR_BODY_10_SECONDS"); - } - break; - - case 20: - { - itemTextTwoLine = ResourceManager::GetString(L"IDS_MEDIABR_BODY_20_SECONDS"); - } - break; - - default: - { - - } - break; - } - } - itemText = ResourceManager::GetString(L"IDS_IV_BODY_INTERVAL"); + settingInfo[effectiveIndex].childCount++; } - break; - case ITEM_SLIDESHOW_TRANSITION: - { - isTwoLineItemText = true; - isDrawBitmapIcon = false; - ItemTypeTwoLine(itemRectLabel, itemRectSecondLabel, fontSize); - itemHeight = (itemRectLabel.height + itemRectSecondLabel.height); - - int returnValue = 0; - result r = __pPresentationModel->GetValue(SECTION_NAME_IMAGE_VIEWER, - ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_TRANSITION_EFFECT, returnValue); - - if (r == E_SUCCESS) - { - switch (returnValue) - { - case 0: - { - itemTextTwoLine = ResourceManager::GetString(L"IDS_MEDIABR_OPT_SLIDE"); - } - break; - case 1: - { - itemTextTwoLine = ResourceManager::GetString(L"IDS_EBOOK_BODY_PAGE"); - } - break; - - case 2: - { - itemTextTwoLine = ResourceManager::GetString(L"IDS_MEDIABR_BODY_DISSOLVE"); - } - break; - - case 3: - { - itemTextTwoLine = ResourceManager::GetString(L"IDS_IV_OPT_ZOOM"); - } - break; - - default: - { - } - break; - } - } - - itemText = ResourceManager::GetString(L"IDS_MEDIABR_BODY_TRANSITION_EFFECT"); - } - break; - - default: + else { + break; } + } + listView.UpdateList(); + } + else + { + settingInfo[effectiveIndex].isOpen = false; + listView.UpdateList(); + } + } + else if (settingInfo[effectiveIndex].itemType == ITEM_TYPE_RADIO) + { + int parentIndex = 0; + for (parentIndex = effectiveIndex; parentIndex > SETTING_INVALID; parentIndex--) + { + if (settingInfo[parentIndex].itemType == ITEM_TYPE_DROPDOWN) + { break; } } - break; + settingInfo[parentIndex].subText = settingInfo[effectiveIndex].titleText; - case GROUP_SUBTITLES: + for (int iter = 0; iter < settingInfo[parentIndex].childCount; iter++) { - switch (itemIndex) + if (parentIndex + iter + 1 != effectiveIndex) { - default: - { - } - break; + AppLogDebug("long effectiveIndex %d set to false", itemIndex - (effectiveIndex - parentIndex) + iter + 1); + settingInfo[parentIndex + iter + 1].isSelected = false; + } + else + { + AppLogDebug("effectiveIndex %d set to true", effectiveIndex); + settingInfo[effectiveIndex].isSelected = true; } } - break; - default: - break; + Invalidate(true); } - - TableViewItem* pItem = new (std::nothrow) TableViewItem(); - - if (pItem) + else if (settingInfo[effectiveIndex].itemType == ITEM_TYPE_TOGGLE) { - pItem->Construct(Dimension(W_GROUP_ITEM_DEFAULT, itemHeight), style); - pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT); - - if (isDrawBitmapIcon) + if (settingInfo[effectiveIndex].isSelected == true) { - pLabel = new (std::nothrow) Label(); - pLabel->Construct(itemRectIcon, L""); - pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT); - pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE); - pLabel->SetBackgroundBitmap(*pBitmap); - - pItem->AddControl(*pLabel); + settingInfo[effectiveIndex].isSelected = false; + } + else + { + settingInfo[effectiveIndex].isSelected = true; } + if (__pList != null) + { + __pList->SetItemChecked(groupIndex, itemIndex, settingInfo[effectiveIndex].isSelected); + } + } - pLabel = new (std::nothrow) Label(); - pLabel->Construct(itemRectLabel, itemText); - pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT); - pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL); - pLabel->SetTextColor(COLOR_MAIN_TEXT); + switch (effectiveIndex) + { + case SETTING_INTERVAL_2: + { + inputValue = 2 ; + __pPresentationModel->SetValue(SECTION_NAME_IMAGE_VIEWER, ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_INTERVAL, + inputValue); + listView.UpdateList(); + } + break; + case SETTING_INTERVAL_3: + { + inputValue = 3 ; + __pPresentationModel->SetValue(SECTION_NAME_IMAGE_VIEWER, + ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_INTERVAL, inputValue); + listView.UpdateList(); + } + break; - pItem->AddControl(*pLabel); + case SETTING_INTERVAL_5: + { + inputValue = 5 ; + __pPresentationModel->SetValue(SECTION_NAME_IMAGE_VIEWER, + ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_INTERVAL, inputValue); + listView.UpdateList(); + } + break; - if (isTwoLineItemText) - { - pLabel = new (std::nothrow) Label(); - pLabel->Construct(itemRectSecondLabel, itemTextTwoLine); - pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT); - pLabel->SetTextConfig(FONT_SIZE_SUB_TEXT, LABEL_TEXT_STYLE_NORMAL); - pLabel->SetTextColor(COLOR_SUB_TEXT); + case SETTING_INTERVAL_10: + { + inputValue = 10 ; + __pPresentationModel->SetValue(SECTION_NAME_IMAGE_VIEWER, + ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_INTERVAL, inputValue); + listView.UpdateList(); + } + break; - pItem->AddControl(*pLabel); - } + case SETTING_INTERVAL_20: + { + inputValue = 20 ; + __pPresentationModel->SetValue(SECTION_NAME_IMAGE_VIEWER, + ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_INTERVAL, inputValue); + listView.UpdateList(); } - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); + break; - return pItem; -} + case SETTING_TRANSITION_SLIDE: + { + inputValue = 0 ; + __pPresentationModel->SetValue(SECTION_NAME_IMAGE_VIEWER, + ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_TRANSITION_EFFECT, inputValue); + listView.UpdateList(); + } + break; -int -SettingMainForm::GetDefaultGroupItemHeight(void) -{ - AppLogDebug("ENTER"); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); + case SETTING_TRANSITION_DISSOLVE: + { + inputValue = 1 ; + result r = __pPresentationModel->SetValue(SECTION_NAME_IMAGE_VIEWER, + ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_TRANSITION_EFFECT, inputValue); + if ( r == E_SUCCESS) + { + AppLogDebug(" Passed") ; + } - return H_GROUP_INDEX_NO_TITLE_DEFAULT; -} + listView.UpdateList(); + } + break; + case SETTING_TRANSITION_ZOOM: + { + inputValue = 2 ; + __pPresentationModel->SetValue(SECTION_NAME_IMAGE_VIEWER, + ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_TRANSITION_EFFECT, inputValue); + listView.UpdateList(); + } + break; -int -SettingMainForm::GetDefaultItemHeight(void) -{ - AppLogDebug("ENTER"); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); + case SETTING_REPEAT: + { + int repeatValue = 0 ; - return H_GROUP_ITEM_DEFAULT; -} + __pPresentationModel->GetValue(SECTION_NAME_IMAGE_VIEWER, + ENTRY_NAME_IMAGE_VIEWER_REPEAT_VALUE, repeatValue); -bool -SettingMainForm::DeleteGroupItem(int groupIndex, TableViewGroupItem* pItem) -{ - AppLogDebug("ENTER"); - delete pItem; - pItem = null; - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); + if ( repeatValue == 0) + { + inputValue = 1; + } + else + { + inputValue = 0; + } - return true; -} + __pPresentationModel->SetValue(SECTION_NAME_IMAGE_VIEWER, + ENTRY_NAME_IMAGE_VIEWER_REPEAT_VALUE, inputValue); -bool -SettingMainForm::DeleteItem(int groupIndex, int itemIndex, TableViewItem* pItem) -{ - AppLogDebug("ENTER"); - delete pItem; - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); + } + break; - return true; -} +// case SETTING_SHUFFLE: +// { +// int shuffleValue = 0; +// +// __pPresentationModel->GetValue(SECTION_NAME_IMAGE_VIEWER, +// ENTRY_NAME_IMAGE_VIEWER_SHUFFLE_VALUE, shuffleValue); +// +// if ( shuffleValue == 0) +// { +// inputValue = 1; +// } +// else +// { +// inputValue = 0; +// } +// +// __pPresentationModel->SetValue(SECTION_NAME_IMAGE_VIEWER, +// ENTRY_NAME_IMAGE_VIEWER_SHUFFLE_VALUE, inputValue); +// } +// break; -int -SettingMainForm::GetGroupCount(void) + default: + break; + } +} +void +SettingMainForm::OnGroupedListViewItemSwept(GroupedListView& listView, int groupIndex, int itemIndex, + SweepDirection direction) { - AppLogDebug("ENTER"); - int groupItemCount = GROUP_COUNT; - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - - return groupItemCount; } -int -SettingMainForm::GetItemCount(int groupIndex) +GroupItem* +SettingMainForm::CreateGroupItem(int groupIndex, int itemWidth) { - AppLogDebug("ENTER"); + result r = E_FAILURE; + String text(L""); + GroupItem* pItem = null; + const Color ITEM_TEXT_COLOR = CUSTOM_COLOR_SETTINGS_GROUPTITLE; - int itemCount = 0; + pItem = new(std::nothrow) GroupItem(); + if (pItem == null) + { + return null; + } + r = pItem->Construct(Dimension(itemWidth, 46)); + if (IsFailed(r)) + { + delete pItem; + return null; + } switch (groupIndex) { - case GROUP_INDEX_1: - { - itemCount = SLIDESHOW_ITEM_COUNT ; - } + case 0: + text = ResourceManager::GetString(L"IDS_MEDIABR_BUTTON_SLIDE_SHOW"); // IDS_SLIDESHOW break; - case GROUP_INDEX_2: - { - itemCount = SUBTITLES_ITEM_COUNT ; - } - break; default: break; } - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - return itemCount; -} + pItem->SetElement(text, null); -void -SettingMainForm::OnGroupedTableViewItemStateChanged(GroupedTableView& tableView, int groupIndex, int itemIndex, - TableViewItem* pItem, TableViewItemStatus status) -{ - AppLogDebug("ENTER"); - SceneManager* pSceneManager = SceneManager::GetInstance(); - AppAssert(pSceneManager); - AppLogDebug("Group(%d) index(%d)", groupIndex, itemIndex); + AppLogDebug("background color set result %s", GetErrorMessage(r)); - switch (groupIndex) - { - case GROUP_SLIDESHOW: - { + pItem->SetTextColor(ITEM_TEXT_COLOR); + return pItem; +} - switch (itemIndex) - { - case ITEM_SLIDESHOW_INTERVAL: - { - SceneManager* pSceneManager = SceneManager::GetInstance(); - AppAssert(pSceneManager); - pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SETTING_INTERVAL)); +ListItemBase* +SettingMainForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) +{ + AppLog("SettingMainForm::CreateItem --> groupIndex : %d, itemIndex: %d itemWidth: %d ", groupIndex, itemIndex, + itemWidth); - break; - } - case ITEM_SLIDESHOW_TRANSITION: - { - SceneManager* pSceneManager = SceneManager::GetInstance(); - AppAssert(pSceneManager); - pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SETTING_TRANSITION)); + result r = E_SUCCESS; + int effectiveIndex = 0; + const Color ITEM_BACKGROUND_COLOR = CUSTOM_COLOR_SETTINGS_LISTITEM_BACKGROUND; + const Color ITEM_RADIO_ITEM_BACKGROUND_COLOR = CUSTOM_COLOR_SETTINGS_LISTITEM_RADIO_BACKGROUND; - break; - } - default: - { + // for (int i = 0; i < groupIndex; i++) + // effectiveIndex = effectiveIndex + pGroupItemCount[i]; + effectiveIndex = effectiveIndex + itemIndex; + AppLogDebug("SettingMainForm::CreateItem --> groupIndex : %d, itemIndex: %d itemWidth: %d effectiveIndex %d", groupIndex, itemIndex, itemWidth, effectiveIndex); - break; - } - } - } - break; + if (settingInfo[effectiveIndex].itemType == ITEM_TYPE_TOGGLE) + { + SettingToggleCustomItem* pItem = new(std::nothrow) SettingToggleCustomItem(); + r = pItem->Construct(itemWidth, 112); - case GROUP_SUBTITLES: + if (IsFailed(r)) { + delete pItem; + return null; } - break; - default: + pItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_NORMAL,ITEM_BACKGROUND_COLOR); + pItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_PRESSED,ITEM_BACKGROUND_COLOR); + + if (__pList != null) { + __pList->SetItemChecked(groupIndex, itemIndex, settingInfo[effectiveIndex].isSelected); } - break; - } - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} -void -SettingMainForm::UpdateGroupItem(int groupIndex, TableViewGroupItem* pItem) -{ - AppLogDebug("ENTER"); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} + pItem->SetText(settingInfo[effectiveIndex].titleText); + pItem->Make(); -void -SettingMainForm::UpdateItem(int groupIndex, int itemIndex, TableViewItem* pItem) -{ - AppLogDebug("ENTER"); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} + return pItem; + } + else if (settingInfo[effectiveIndex].itemType == ITEM_TYPE_DROPDOWN) + { + DropDownCustomItem* pItem = new(std::nothrow) DropDownCustomItem(); + r = pItem->Construct(itemWidth); + if (IsFailed(r)) + { + delete pItem; + return null; + } -void -SettingMainForm::OnGroupedTableViewContextItemActivationStateChanged(GroupedTableView& tableView, int groupIndex, - int itemIndex, TableViewContextItem* pContextItem, bool activated) -{ - AppLogDebug("ENTER"); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} + pItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_NORMAL,ITEM_BACKGROUND_COLOR); + pItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_PRESSED,ITEM_BACKGROUND_COLOR); -void -SettingMainForm::OnGroupedTableViewGroupItemStateChanged(GroupedTableView& tableView, int groupIndex, - TableViewGroupItem* pItem, TableViewItemStatus status) -{ - AppLogDebug("ENTER"); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} + pItem->SetMainText(settingInfo[effectiveIndex].titleText); + pItem->SetSubText(settingInfo[effectiveIndex].subText); + if (settingInfo[effectiveIndex].isOpen) + { + pItem->SetCurState(DROP_DOWN_ITEM_STATE_OPENED); + } + else + { + pItem->SetCurState(DROP_DOWN__ITEM_STATE_CLOSED); + } -int -SettingMainForm::GetFontSize(void) -{ - AppLogDebug("ENTER"); - result r = E_SUCCESS; + r = pItem->Make(); - int fontSize = FONT_MAIN_TEXT_SIZE_NORMAL; - String fontSizeValue(L""); + if (IsFailed(r)) + { + delete pItem; + return null; + } - if ((r = SettingInfo::GetValue(FONT_SIZE_SETTING_INFO_KEY, fontSizeValue)) == E_SUCCESS) + return pItem; + } + else if (settingInfo[effectiveIndex].itemType == ITEM_TYPE_RADIO) { - AppLogDebug("GetValue Fail [%s]", GetErrorMessage(r)); + RadioCustomItem* pItem = new(std::nothrow) RadioCustomItem(); + int parentIndex = 0; - if (fontSizeValue.Equals(FONT_SIZE_SETTING_TYPE_GIANT, false)) - { - fontSize = FONT_MAIN_TEXT_SIZE_GIANT; - } - else if (fontSizeValue.Equals(FONT_SIZE_SETTING_TYPE_HUGE, false)) - { - fontSize = FONT_MAIN_TEXT_SIZE_HUGE; - } - else if (fontSizeValue.Equals(FONT_SIZE_SETTING_TYPE_LARGE, false)) + for (parentIndex = effectiveIndex; parentIndex > SETTING_INVALID; parentIndex--) { - fontSize = FONT_MAIN_TEXT_SIZE_LARGE; + if (settingInfo[parentIndex].itemType == ITEM_TYPE_DROPDOWN) + break; } - else if (fontSizeValue.Equals(FONT_SIZE_SETTING_TYPE_MEDIUM, false)) + + if (settingInfo[parentIndex].isOpen == false ) { - fontSize = FONT_MAIN_TEXT_SIZE_NORMAL; + r = pItem->Construct(itemWidth, 0); + AppLogDebug("construct with height 0 %s", GetErrorMessage(r)); + return pItem; } else { - fontSize = FONT_MAIN_TEXT_SIZE_SMALL; + pItem->Construct(itemWidth, 112); } + + pItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_NORMAL,ITEM_RADIO_ITEM_BACKGROUND_COLOR); + pItem->SetBackgroundColor(LIST_ITEM_DRAWING_STATUS_PRESSED,ITEM_RADIO_ITEM_BACKGROUND_COLOR); + + pItem->SetText(settingInfo[effectiveIndex].titleText); + AppLogDebug("effectiveIndex %d SettingInfo[effectiveIndex].isSelected %d", effectiveIndex, settingInfo[effectiveIndex].isSelected); + + pItem->SetSelected(settingInfo[effectiveIndex].isSelected); + pItem->Make(); + + return pItem; } - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); + else + { + return null; + } +} - return fontSize; +bool +SettingMainForm::DeleteGroupItem(int groupIndex, GroupItem* pItem, int itemWidth) +{ + delete pItem; + return true; } -void -SettingMainForm::ItemTypeIconAndOneLine(Rectangle& icon, Rectangle& main) +bool +SettingMainForm::DeleteItem(int groupIndex, int itemIndex, ListItemBase* pItem, int itemWidth) { - AppLogDebug("ENTER"); - icon.x = X_ITEM_TYPE_3_ICON; - icon.y = Y_ITEM_TYPE_3_ICON; - icon.width = W_ITEM_TYPE_3_ICON; - icon.height = H_ITEM_TYPE_3_ICON; - - main.x = X_ITEM_TYPE_3_LABEL; - main.y = Y_ITEM_TYPE_3_LABEL; - main.width = W_ITEM_TYPE_3_LABEL; - main.height = H_ITEM_TYPE_3_LABEL; - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); + delete pItem; + return true; } int -SettingMainForm::GetSettingInfoItemStatus(int settingIndex) +SettingMainForm::GetGroupCount(void) { - AppLogDebug("ENTER"); - int returnValue = 0; + int groupCount = 1 ; + + return groupCount; +} + +int +SettingMainForm::GetItemCount(int groupIndex) +{ + AppLog(" SettingMainForm::GetItemCount --> groupIndex : %d,", groupIndex); + return pGroupItemCount[groupIndex]; +} - switch (settingIndex) +void +SettingMainForm::InitializeSettingValues(void) +{ + pGroupItemCount = new(std::nothrow) int[1]; + pGroupItemCount[0] = 12; + int interval = 0; + int transitionValue = 0; + int repeatValue = 0; + //int shuffletValue = 0; + String selectedInterval; + String selectedTransition; + + for (int iter = (int) SETTING_INVALID + 1; iter < (int) SETTING_MAX; ++iter) { - case SETTING_INFO_KEY_INDEX_SLIDESHOW_INTERVAL: + settingInfo[iter].isSelected = false; + } + + result r =__pPresentationModel->GetValue(SECTION_NAME_IMAGE_VIEWER, ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_INTERVAL, + interval); + + if (r == E_SUCCESS) { - int realValue = 0; - __pPresentationModel->GetValue(SECTION_NAME_IMAGE_VIEWER, ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_INTERVAL, - realValue); - switch (realValue) + switch(interval) { case 2: { - returnValue = 0; - break; + selectedInterval = ResourceManager::GetString(L"IDS_MEDIABR_OPT_2_SECONDS"); + settingInfo[SETTING_INTERVAL_2].isSelected = true; } + break; + case 3: { - returnValue = 1; - break; + selectedInterval = ResourceManager::GetString(L"IDS_MEDIABR_OPT_3_SECONDS"); + settingInfo[SETTING_INTERVAL_3].isSelected = true; } + break; + case 5: { - returnValue = 2; - break; + selectedInterval = ResourceManager::GetString(L"IDS_MEDIABR_BODY_5_SECONDS"); + settingInfo[SETTING_INTERVAL_5].isSelected = true; } + break; + case 10: { - returnValue = 3; - break; + selectedInterval = ResourceManager::GetString(L"IDS_MEDIABR_BODY_10_SECONDS"); + settingInfo[SETTING_INTERVAL_10].isSelected = true; } + break; + case 20: { - returnValue = 4; - break; + selectedInterval = ResourceManager::GetString(L"IDS_MEDIABR_BODY_20_SECONDS"); + settingInfo[SETTING_INTERVAL_20].isSelected = true; } + break; + default: - { - returnValue = 0; break; } - } + } - AppLogDebug("SETTINGS : interval (%d)", returnValue); + r = __pPresentationModel->GetValue(SECTION_NAME_IMAGE_VIEWER, + ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_TRANSITION_EFFECT, transitionValue); - break; - } - case SETTING_INFO_KEY_INDEX_SLIDESHOW_TRANSITION: + if (r == E_SUCCESS) { - __pPresentationModel->GetValue(SECTION_NAME_IMAGE_VIEWER, SETTING_INFO_KEY_INDEX_SLIDESHOW_TRANSITION, - returnValue); - - AppLogDebug("SETTINGS : transition(%d)", returnValue); + switch (transitionValue) + { + case 0: + { + selectedTransition = ResourceManager::GetString(L"IDS_MEDIABR_OPT_SLIDE"); + settingInfo[SETTING_TRANSITION_SLIDE].isSelected = true; + } + break; + case 1: + { + selectedTransition = ResourceManager::GetString(L"IDS_MEDIABR_BODY_DISSOLVE"); + settingInfo[SETTING_TRANSITION_DISSOLVE].isSelected = true; + } break; - } - default: - { + + case 2: + { + selectedTransition = ResourceManager::GetString(L"IDS_IV_OPT_ZOOM"); + settingInfo[SETTING_TRANSITION_ZOOM].isSelected = true; + } break; + + default: + break; + } } - } - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - return returnValue; -} + settingInfo[SETTING_SLIDESHOW_INTERVAL_TITLE].titleText = ResourceManager::GetString(L"IDS_MEDIABR_BODY_SLIDESHOW_INTERVAL"); + settingInfo[SETTING_SLIDESHOW_INTERVAL_TITLE].subText = selectedInterval ; + settingInfo[SETTING_SLIDESHOW_INTERVAL_TITLE].itemType = ITEM_TYPE_DROPDOWN; -void -SettingMainForm::ItemTypeTwoLine(Rectangle& main, Rectangle& sub, int fontSize) -{ - Rectangle clientRect = GetClientAreaBounds(); + settingInfo[SETTING_INTERVAL_2].titleText = ResourceManager::GetString(L"IDS_MEDIABR_OPT_2_SECONDS"); + settingInfo[SETTING_INTERVAL_2].subText = L""; + settingInfo[SETTING_INTERVAL_2].itemType = ITEM_TYPE_RADIO; + + settingInfo[SETTING_INTERVAL_3].titleText = ResourceManager::GetString(L"IDS_MEDIABR_OPT_3_SECONDS"); + settingInfo[SETTING_INTERVAL_3].subText = L""; + settingInfo[SETTING_INTERVAL_3].itemType = ITEM_TYPE_RADIO; + + settingInfo[SETTING_INTERVAL_5].titleText = ResourceManager::GetString(L"IDS_MEDIABR_BODY_5_SECONDS"); + settingInfo[SETTING_INTERVAL_5].subText = L""; + settingInfo[SETTING_INTERVAL_5].itemType = ITEM_TYPE_RADIO; + + settingInfo[SETTING_INTERVAL_10].titleText = ResourceManager::GetString(L"IDS_MEDIABR_BODY_10_SECONDS"); + settingInfo[SETTING_INTERVAL_10].subText = L""; + settingInfo[SETTING_INTERVAL_10].itemType = ITEM_TYPE_RADIO; - if (fontSize > FONT_MAIN_TEXT_SIZE_LARGE) + settingInfo[SETTING_INTERVAL_20].titleText = ResourceManager::GetString(L"IDS_MEDIABR_BODY_20_SECONDS"); + settingInfo[SETTING_INTERVAL_20].subText = L""; + settingInfo[SETTING_INTERVAL_20].itemType = ITEM_TYPE_RADIO; + + r = __pPresentationModel->GetValue(SECTION_NAME_IMAGE_VIEWER, ENTRY_NAME_IMAGE_VIEWER_REPEAT_VALUE, repeatValue); + + settingInfo[SETTING_REPEAT].titleText = L"Repeat"; + settingInfo[SETTING_REPEAT].itemType = ITEM_TYPE_TOGGLE; + + if ( repeatValue == 0) { - main.x = X_ITEM_TYPE_2_LABEL_MAIN; - main.y = Y_ITEM_TYPE_2_LABEL_MAIN; - main.width = (clientRect.width - GAP_TWO_LINE_ITEM_WIDTH); - main.height = H_ITEM_TYPE_1_LABEL; - - sub.x = X_ITEM_TYPE_2_LABEL_SUB; - sub.y = H_ITEM_TYPE_1_LABEL; - sub.width = (clientRect.width - GAP_TWO_LINE_ITEM_WIDTH); - sub.height = H_ITEM_TYPE_2_LABEL_SUB; + settingInfo[SETTING_REPEAT].isSelected = false ; } else { - main.x = X_ITEM_TYPE_2_LABEL_MAIN; - main.y = Y_ITEM_TYPE_2_LABEL_MAIN; - main.width = (clientRect.width - GAP_TWO_LINE_ITEM_WIDTH); - main.height = H_ITEM_TYPE_2_LABEL_MAIN; - - sub.x = X_ITEM_TYPE_2_LABEL_SUB; - sub.y = Y_ITEM_TYPE_2_LABEL_SUB; - sub.width = (clientRect.width - GAP_TWO_LINE_ITEM_WIDTH); - sub.height = H_ITEM_TYPE_2_LABEL_SUB; + settingInfo[SETTING_REPEAT].isSelected = true ; } + +// r = __pPresentationModel->GetValue(SECTION_NAME_IMAGE_VIEWER, +// ENTRY_NAME_IMAGE_VIEWER_SHUFFLE_VALUE, shuffletValue); +// +// settingInfo[SETTING_SHUFFLE].titleText = L"Shuffle"; +// settingInfo[SETTING_SHUFFLE].itemType = ITEM_TYPE_TOGGLE; +// +// if ( shuffletValue == 0) +// { +// settingInfo[SETTING_SHUFFLE].isSelected = false ; +// } +// else +// { +// settingInfo[SETTING_SHUFFLE].isSelected = true ; +// } + + settingInfo[SETTING_TRANSITION_EFFECT_TITLE].titleText = ResourceManager::GetString(L"IDS_MEDIABR_BODY_TRANSITION_EFFECT"); + settingInfo[SETTING_TRANSITION_EFFECT_TITLE].subText = selectedTransition; + settingInfo[SETTING_TRANSITION_EFFECT_TITLE].itemType = ITEM_TYPE_DROPDOWN; + + settingInfo[SETTING_TRANSITION_SLIDE].titleText = ResourceManager::GetString(L"IDS_MEDIABR_OPT_SLIDE"); + settingInfo[SETTING_TRANSITION_SLIDE].subText = L""; + settingInfo[SETTING_TRANSITION_SLIDE].itemType = ITEM_TYPE_RADIO; + + settingInfo[SETTING_TRANSITION_DISSOLVE].titleText = ResourceManager::GetString(L"IDS_MEDIABR_BODY_DISSOLVE"); + settingInfo[SETTING_TRANSITION_DISSOLVE].subText = L""; + settingInfo[SETTING_TRANSITION_DISSOLVE].itemType = ITEM_TYPE_RADIO; + + settingInfo[SETTING_TRANSITION_ZOOM].titleText = ResourceManager::GetString(L"IDS_IV_OPT_ZOOM"); + settingInfo[SETTING_TRANSITION_ZOOM].subText = L""; + settingInfo[SETTING_TRANSITION_ZOOM].itemType = ITEM_TYPE_RADIO; + } -void -SettingMainForm::UpdateTableViewCheckButtonState(void) +SettingMainForm::SettingItemInfo::SettingItemInfo(void) { - AppLogDebug("ENTER"); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); + titleText = L""; + subText = L""; + childCount = 0; + isOpen = false; + isSelected = false ; } diff --git a/src/GlSettingPresentationModel.cpp b/src/GlSettingPresentationModel.cpp index 0230200..74f94ce 100644 --- a/src/GlSettingPresentationModel.cpp +++ b/src/GlSettingPresentationModel.cpp @@ -29,6 +29,8 @@ using namespace std; static const int DEFAULT_VALUE_EFFECT_SLIDE = 0; static const int DEFAULT_VALUE_INTERVAL = 3; +static const int DEFAULT_VALUE_REPEAT = 0; +static const int DEFAULT_VALUE_SHUFFLE = 0; const wchar_t* GALLERY_APP_ID = L"ijudt7w61q.Gallery"; @@ -42,12 +44,14 @@ const wchar_t* SECTION_VIDEO_PLAYER = L"VIDEO_PLAYER_SETTING"; const wchar_t* SLIDESHOW_INTERVAL_VALUE = L"SLIDESHOW_INTERVAL_VALUE"; const wchar_t* TRANSITION_EFFECT_VALUE = L"TRANSITION_EFFECT_VALUE"; +const wchar_t* REPEAT_VALUE = L"REPEAT_VALUE"; +const wchar_t* SHUFFLE_VALUE = L"SHUFFLE_VALUE"; SettingPresentationModel* SettingPresentationModel::__pPresentationModelInstance = null; SettingPresentationModel::SettingPresentationModel(void) - :__pDefaultGalleryRegistry(null) - ,__pAppGalleryRegistry(null) + : __pDefaultGalleryRegistry(null) + , __pAppGalleryRegistry(null) { AppLogDebug("ENTER"); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); @@ -114,6 +118,18 @@ SettingPresentationModel::Construct(void) r = __pAppGalleryRegistry->AddValue(SECTION_IMAGE_VIEWER, TRANSITION_EFFECT_VALUE, valueRegistryString); TryCatch(r == E_SUCCESS, , "Registry::AddValue() failed[%s]", GetErrorMessage(r)); + r = __pDefaultGalleryRegistry->GetValue(SECTION_IMAGE_VIEWER, REPEAT_VALUE, + valueRegistryNumber); + TryCatch(r == E_SUCCESS, , "Registry::GetValue() failed[%s]", GetErrorMessage(r)); + r = __pAppGalleryRegistry->AddValue(SECTION_IMAGE_VIEWER, REPEAT_VALUE, valueRegistryNumber); + TryCatch(r == E_SUCCESS, , "Registry::AddValue() failed[%s]", GetErrorMessage(r)); + + r = __pDefaultGalleryRegistry->GetValue(SECTION_IMAGE_VIEWER, SHUFFLE_VALUE, + valueRegistryString); + TryCatch(r == E_SUCCESS, , "Registry::GetValue() failed[%s]", GetErrorMessage(r)); + r = __pAppGalleryRegistry->AddValue(SECTION_IMAGE_VIEWER, SHUFFLE_VALUE, valueRegistryNumber); + TryCatch(r == E_SUCCESS, , "Registry::AddValue() failed[%s]", GetErrorMessage(r)); + r = __pAppGalleryRegistry->Flush(); TryCatch(r == E_SUCCESS, , "Registry::Flush() failed[%s]", GetErrorMessage(r)); r = __pDefaultGalleryRegistry->Flush(); @@ -123,7 +139,7 @@ SettingPresentationModel::Construct(void) return r; -CATCH: + CATCH: delete __pDefaultGalleryRegistry; __pDefaultGalleryRegistry = null; @@ -174,7 +190,7 @@ SettingPresentationModel::GetValue(const String& strSectionName, const String& e return r; -CATCH: + CATCH: AppLogDebug("EXIT with exception(%s)", GetErrorMessage(GetLastResult())); return r; @@ -190,7 +206,7 @@ SettingPresentationModel::GetValue(const String& strSectionName, const String& e return r; -CATCH: + CATCH: AppLogDebug("EXIT with exception(%s)", GetErrorMessage(GetLastResult())); return r; @@ -207,7 +223,7 @@ SettingPresentationModel::SetValue(const String& strSectionName, const String& e return r; -CATCH: + CATCH: AppLogDebug("EXIT with exception(%s)", GetErrorMessage(GetLastResult())); return r; @@ -224,7 +240,7 @@ SettingPresentationModel::SetValue(const String& strSectionName, const String& e return r; -CATCH: + CATCH: AppLogDebug("EXIT with exception(%s)", GetErrorMessage(GetLastResult())); return r; @@ -263,6 +279,14 @@ SettingPresentationModel::CreateDefaultRegistry(void) DEFAULT_VALUE_EFFECT_SLIDE); TryCatch(r == E_SUCCESS, , "Registry::AddValue() failed[%s]", GetErrorMessage(r)); + r = __pDefaultGalleryRegistry->AddValue(SECTION_IMAGE_VIEWER, REPEAT_VALUE, + DEFAULT_VALUE_REPEAT); + TryCatch(r == E_SUCCESS, , "Registry::AddValue() failed[%s]", GetErrorMessage(r)); + + r = __pDefaultGalleryRegistry->AddValue(SECTION_IMAGE_VIEWER, SHUFFLE_VALUE, + DEFAULT_VALUE_SHUFFLE); + TryCatch(r == E_SUCCESS, , "Registry::AddValue() failed[%s]", GetErrorMessage(r)); + r = __pDefaultGalleryRegistry->Flush(); TryCatch(r == E_SUCCESS, , "Registry::Flush() failed[%s]", GetErrorMessage(r)); } @@ -270,7 +294,7 @@ SettingPresentationModel::CreateDefaultRegistry(void) return r; -CATCH: + CATCH: AppLogDebug("EXIT with exception(%s)", GetErrorMessage(GetLastResult())); return r; @@ -296,7 +320,7 @@ SettingPresentationModel::ResetGallerySettingsRegistry(void) return r; -CATCH: + CATCH: AppLogDebug("EXIT with exception(%s)", GetErrorMessage(GetLastResult())); return r; diff --git a/src/GlSettingToggleCustomItem.cpp b/src/GlSettingToggleCustomItem.cpp new file mode 100644 index 0000000..6cf93d0 --- /dev/null +++ b/src/GlSettingToggleCustomItem.cpp @@ -0,0 +1,83 @@ +// + +// Copyright (c) 2012 Samsung Electronics Co., Ltd. +// +// Licensed under the Flora License, Version 1.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://floralicense.org/license/ +// +// 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. +// + +//!Internet SettingToggleCustomItem class +/*@file: SettingToggleCustomItem.cpp + *@brief: The SettingToggleCustomItem + * + */ + +#include + +#include "GlSettingToggleCustomItem.h" + +using namespace Tizen::App; +using namespace Tizen::Base; +using namespace Tizen::Graphics; +using namespace Tizen::Ui::Controls; + +static const int IDA_FORMAT_STRING = 101; + +SettingToggleCustomItem::SettingToggleCustomItem(void) + : __width(0) + , __height(0) +{ +} + +SettingToggleCustomItem::~SettingToggleCustomItem(void) +{ +} + +result +SettingToggleCustomItem::Construct(int width, int height) +{ + result r = E_FAILURE; + + __width = width; + __height = height; + const Dimension dim(width, height); + r = CustomItem::Construct(dim, LIST_ANNEX_STYLE_ONOFF_SLIDING); + + return r; +} + +void +SettingToggleCustomItem::SetText(Tizen::Base::String& text) +{ + __text = text; +} + +String +SettingToggleCustomItem::GetText(void) +{ + return __text; +} + +result +SettingToggleCustomItem::Make(void) +{ + const Color textColor = CUSTOM_COLOR_TRANSPARENT; + const Color pressedTextColor = CUSTOM_COLOR_TRANSPARENT; + const int X_Margin = 26; + const int Y_Margin = 26; + const int textSize = 40; + + AddElement(Rectangle(X_Margin, Y_Margin, __width - 60, 60), IDA_FORMAT_STRING, __text, textSize, textColor, pressedTextColor, pressedTextColor, true); + SetElementSelectionEnabled(IDA_FORMAT_STRING, false); + + return E_SUCCESS; +} diff --git a/src/GlSettingTransitionForm.cpp b/src/GlSettingTransitionForm.cpp deleted file mode 100644 index 6526abe..0000000 --- a/src/GlSettingTransitionForm.cpp +++ /dev/null @@ -1,618 +0,0 @@ -// -// Copyright (c) 2012 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.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://floralicense.org/license/ -// -// 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. -// - -/** - * @file GlSettingTransitionForm.cpp - * @brief This is the implementation file for SettingTransitionForm class. - */ - -#include "GlGalleryApp.h" -#include "GlResourceManager.h" -#include "GlSettingPresentationModel.h" -#include "GlSettingTransitionForm.h" -#include "GlTypes.h" - -using namespace Tizen::App; -using namespace Tizen::Base; -using namespace Tizen::Base::Collection; -using namespace Tizen::Content; -using namespace Tizen::Graphics; -using namespace Tizen::System; -using namespace Tizen::Ui; -using namespace Tizen::Ui::Controls; -using namespace Tizen::Ui::Scenes; - -static const int FONT_MAIN_TEXT_SIZE_GIANT = 100; -static const int FONT_MAIN_TEXT_SIZE_HUGE = 70; -static const int FONT_MAIN_TEXT_SIZE_LARGE = 55; -static const int FONT_MAIN_TEXT_SIZE_NORMAL = 44; -static const int FONT_MAIN_TEXT_SIZE_SMALL = 32; - -static const int X_GROUP_DEFAULT = 16; -static const int Y_GROUP_DEFAULT = 0; -static const int GAP_WIDTH = 2; - -static const int H_GROUP_ITEM_DEFAULT_LABEL = 114; -static const int X_GROUP_ITEM_DEFAULT_LABEL = 16; - -static const int H_GROUP_INDEX_DEFAULT = 82; -static const int H_GROUP_INDEX_TITLE_TEXT = 36; - -static const int X_ITEM_TYPE_3_ICON = 26; -static const int Y_ITEM_TYPE_3_ICON = 21; -static const int W_ITEM_TYPE_3_ICON = 0; -static const int H_ITEM_TYPE_3_ICON = 74; - -static const int H_GROUP_ITEM_DEFAULT = 114; -static const int W_GROUP_ITEM_DEFAULT = 720; - -static const int X_ITEM_TYPE_1_LABEL = 16; -static const int W_ITEM_TYPE_1_LABEL = (720 - X_ITEM_TYPE_1_LABEL); -static const int H_ITEM_TYPE_1_LABEL = 114; - -static const int W_ITEM_TYPE_2_LABEL_MAIN = W_ITEM_TYPE_1_LABEL; - -static const int X_ITEM_TYPE_3_LABEL = (X_ITEM_TYPE_3_ICON + W_ITEM_TYPE_3_ICON); -static const int Y_ITEM_TYPE_3_LABEL = 0; -static const int W_ITEM_TYPE_3_LABEL = (W_ITEM_TYPE_2_LABEL_MAIN - X_ITEM_TYPE_3_LABEL); -static const int H_ITEM_TYPE_3_LABEL = H_ITEM_TYPE_1_LABEL; - -static const unsigned int COLOR_MAIN_TEXT = Color32<0, 0, 0>::Value; -static const unsigned int COLOR_GROUP_TITLE_TEXT = Color32<93, 110, 141>::Value; -static const unsigned int COLOR_BG_GROUP_INDEX_DEFAULT = Color32<249, 249, 249>::Value; -static const unsigned int COLOR_BG_GROUP_ITEM_DEFAULT = Color32<236, 240, 242>::Value; -static const int FONT_SIZE_GROUP_TITLE_TEXT = 32; - -static const int H_GROUP_INDEX_NO_TITLE_DEFAULT = 40; - -static const wchar_t* FONT_SIZE_SETTING_TYPE_GIANT = L"giant"; -static const wchar_t* FONT_SIZE_SETTING_TYPE_HUGE = L"huge"; -static const wchar_t* FONT_SIZE_SETTING_TYPE_LARGE = L"large"; -static const wchar_t* FONT_SIZE_SETTING_TYPE_MEDIUM = L"medium"; - -static const int GROUP_TRANSITION = 0; - -static const int GROUP_COUNT = 1; -static const int GROUP_INDEX_1 = 0; - -static const int TRANSITION_ITEM_COUNT = 4; - -static const int ITEM_SLIDESHOW_TRANSITION_EFFECT_SLIDE = 0; -static const int ITEM_SLIDESHOW_TRANSITION_EFFECT_PAGE = 1; -static const int ITEM_SLIDESHOW_TRANSITION_EFFECT_DISSOLVE = 2; -static const int ITEM_SLIDESHOW_TRANSITION_EFFECT_ZOOM = 3; - -SettingTransitionForm::SettingTransitionForm(void) - : __pTableView(null) - , __pPresentationModel(null) -{ - AppLogDebug("ENTER"); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} - -SettingTransitionForm::~SettingTransitionForm(void) -{ - AppLogDebug("ENTER"); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} - -result -SettingTransitionForm::Initialize(void) -{ - AppLogDebug("ENTER"); - result r = Construct(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - - return r; -} -result -SettingTransitionForm::OnInitializing(void) -{ - AppLogDebug("ENTER"); - __pPresentationModel = SettingPresentationModel::GetInstance(); - - Header* pHeader = GetHeader(); - AppAssert(pHeader); - pHeader->SetStyle(HEADER_STYLE_TITLE); - pHeader->SetTitleText(ResourceManager::GetString(L"IDS_COM_BODY_GALLERY")); - - Rectangle bounds = GetClientAreaBounds(); - bounds.x = X_GROUP_DEFAULT; - bounds.y = Y_GROUP_DEFAULT; - bounds.width -= (bounds.x * GAP_WIDTH); - - __pTableView = new (std::nothrow) GroupedTableView(); - - __pTableView->Construct(bounds, true, TABLE_VIEW_SCROLL_BAR_STYLE_NONE); - __pTableView->SetItemProvider(this); - - AddControl(*__pTableView); - __pTableView->SetGroupedLookEnabled(true); - __pTableView->AddGroupedTableViewItemEventListener(*this); - - InitializeFooter(); - SetFormBackEventListener(this); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - - return E_SUCCESS; -} - -result -SettingTransitionForm::OnTerminating(void) -{ - AppLogDebug("ENTER"); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - - return E_SUCCESS; -} - -void -SettingTransitionForm::OnActionPerformed(const Control& source, int actionId) -{ - AppLogDebug("ENTER"); - SceneManager* pSceneManager = SceneManager::GetInstance(); - AppAssert(pSceneManager); - - switch (actionId) - { - default: - { - break; - } - } - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} - -void -SettingTransitionForm::OnFormBackRequested(Form& source) -{ - AppLogDebug("ENTER"); - SceneManager* pSceneManager = SceneManager::GetInstance(); - AppAssert(pSceneManager); - pSceneManager->GoBackward(BackwardSceneTransition(IDSCN_SETTING_MAIN)); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} - -result -SettingTransitionForm::InitializeFooter(void) -{ - AppLogDebug("ENTER"); - result r = E_SUCCESS; - Footer* pFooter = GetFooter(); - AppAssert(pFooter); - pFooter->RemoveAllItems(); - pFooter->SetStyle(FOOTER_STYLE_BUTTON_ICON); - - pFooter->SetBackButton(); - - pFooter->AddActionEventListener(*this); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - - return r; -} - -void -SettingTransitionForm::OnSceneActivatedN(const SceneId& previousSceneId, - const SceneId& currentSceneId, IList* pArgs) -{ - AppLogDebug("ENTER"); - __pTableView->UpdateTableView(); - UpdateTableViewRedioButtonState(); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} - -void -SettingTransitionForm::OnSceneDeactivated(const SceneId& currentSceneId, - const SceneId& nextSceneId) -{ - AppLogDebug("ENTER"); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} - -TableViewGroupItem* -SettingTransitionForm::CreateGroupItem(int groupIndex, int itemWidth) -{ - AppLogDebug("ENTER"); - - int itemHeight = H_GROUP_INDEX_DEFAULT; - LabelTextStyle style = LABEL_TEXT_STYLE_BOLD; - Rectangle itemRectangle; - String groupText = ResourceManager::GetString(L"IDS_MEDIABR_POP_NO_NAME"); - Label* pLabel = null; - - switch (groupIndex) - { - case GROUP_TRANSITION: - { - groupText = ResourceManager::GetString(L"IDS_MEDIABR_BODY_TRANSITION_EFFECT"); - } - break; - - default: - break; - } - - TableViewGroupItem* pItem = new (std::nothrow) TableViewGroupItem(); - - itemRectangle.x = X_GROUP_ITEM_DEFAULT_LABEL; - itemRectangle.y = H_GROUP_INDEX_TITLE_TEXT; - itemRectangle.width = itemWidth; - itemRectangle.height = (itemHeight - H_GROUP_INDEX_TITLE_TEXT); - - pItem->Construct(Dimension(itemWidth, itemHeight)); - pItem->SetBackgroundColor(COLOR_BG_GROUP_INDEX_DEFAULT); - - pLabel = new (std::nothrow) Label(); - pLabel->Construct(itemRectangle, groupText); - pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT); - pLabel->SetTextVerticalAlignment(ALIGNMENT_TOP); - pLabel->SetTextConfig(FONT_SIZE_GROUP_TITLE_TEXT, style); - pLabel->SetTextColor(COLOR_GROUP_TITLE_TEXT); - - pItem->AddControl(*pLabel); - pItem->SetEnabled(false); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - - return pItem; -} - -TableViewItem* -SettingTransitionForm::CreateItem(int groupIndex, int itemIndex, int itemWidth) -{ - AppLogDebug("ENTER"); - AppLogDebug("group[%d] item[%d]", groupIndex, itemIndex); - - int fontSize = GetFontSize(); - - unsigned int itemHeight = 0; - bool isDrawBitmapIcon = true; - - Rectangle itemRectIcon; - Rectangle itemRectLabel; - Rectangle itemRectSecondLabel; - String itemText(L""); - String itemTextTwoLine(L""); - TableViewAnnexStyle style = TABLE_VIEW_ANNEX_STYLE_NORMAL; - Bitmap* pBitmap = null; - Label* pLabel = null; - - itemHeight = H_GROUP_ITEM_DEFAULT_LABEL; - ItemTypeIconAndOneLine(itemRectIcon, itemRectLabel); - - switch (groupIndex) - { - case GROUP_TRANSITION: - { - switch (itemIndex) - { - case ITEM_SLIDESHOW_TRANSITION_EFFECT_SLIDE: - { - style = TABLE_VIEW_ANNEX_STYLE_RADIO; - itemText = ResourceManager::GetString(L"IDS_MEDIABR_OPT_SLIDE"); - } - break; - case ITEM_SLIDESHOW_TRANSITION_EFFECT_PAGE: - { - style = TABLE_VIEW_ANNEX_STYLE_RADIO; - itemText = ResourceManager::GetString(L"IDS_EBOOK_BODY_PAGE"); - } - break; - - case ITEM_SLIDESHOW_TRANSITION_EFFECT_DISSOLVE: - { - style = TABLE_VIEW_ANNEX_STYLE_RADIO; - itemText = ResourceManager::GetString(L"IDS_MEDIABR_BODY_DISSOLVE"); - } - break; - - case ITEM_SLIDESHOW_TRANSITION_EFFECT_ZOOM: - { - style = TABLE_VIEW_ANNEX_STYLE_RADIO; - itemText = ResourceManager::GetString(L"IDS_IV_OPT_ZOOM"); - } - break; - - default: - { - } - break; - } - } - break; - - default: - break; - } - - TableViewItem* pItem = new (std::nothrow) TableViewItem(); - - if (pItem) - { - pItem->Construct(Dimension(W_GROUP_ITEM_DEFAULT, itemHeight), style); - pItem->SetBackgroundColor(COLOR_BG_GROUP_ITEM_DEFAULT); - - if (isDrawBitmapIcon) - { - pLabel = new (std::nothrow) Label(); - pLabel->Construct(itemRectIcon, L""); - pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT); - pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE); - pLabel->SetBackgroundBitmap(*pBitmap); - - pItem->AddControl(*pLabel); - } - - pLabel = new (std::nothrow) Label(); - pLabel->Construct(itemRectLabel, itemText); - pLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT); - pLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL); - pLabel->SetTextColor(COLOR_MAIN_TEXT); - - pItem->AddControl(*pLabel); - } - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - - return pItem; -} - -int -SettingTransitionForm::GetDefaultGroupItemHeight(void) -{ - return H_GROUP_INDEX_NO_TITLE_DEFAULT; -} - -int -SettingTransitionForm::GetDefaultItemHeight(void) -{ - return H_GROUP_ITEM_DEFAULT; -} - -bool -SettingTransitionForm::DeleteGroupItem(int groupIndex, TableViewGroupItem* pItem) -{ - AppLogDebug("ENTER"); - - delete pItem; - pItem = null; - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - - return true; -} - -bool -SettingTransitionForm::DeleteItem(int groupIndex, int itemIndex, TableViewItem* pItem) -{ - AppLogDebug("ENTER"); - delete pItem; - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - - return true; -} - -int -SettingTransitionForm::GetGroupCount(void) -{ - int groupItemCount = GROUP_COUNT; - - return groupItemCount; -} - -int -SettingTransitionForm::GetItemCount(int groupIndex) -{ - AppLogDebug("ENTER"); - - int itemCount = 0; - - switch (groupIndex) - { - case GROUP_INDEX_1: - { - itemCount = TRANSITION_ITEM_COUNT ; - } - break; - - default: - break; - } - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - - return itemCount; -} - -void -SettingTransitionForm::OnGroupedTableViewItemStateChanged(GroupedTableView& tableView, int groupIndex, - int itemIndex, TableViewItem* pItem, TableViewItemStatus status) -{ - AppLogDebug("ENTER"); - SceneManager* pSceneManager = SceneManager::GetInstance(); - AppAssert(pSceneManager); - - AppLogDebug("Group(%d) index(%d)", groupIndex, itemIndex); - - switch (groupIndex) - { - case GROUP_TRANSITION: - { - switch (itemIndex) - { - case ITEM_SLIDESHOW_TRANSITION_EFFECT_SLIDE: - { - int inputValue = ITEM_SLIDESHOW_TRANSITION_EFFECT_SLIDE; - __pPresentationModel->SetValue(SECTION_NAME_IMAGE_VIEWER, - ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_TRANSITION_EFFECT, inputValue); - __pTableView->SetItemChecked(groupIndex, itemIndex, true); - AppLogDebug("SETTINGS : setvalue interval(%d)", inputValue); - } - break; - case ITEM_SLIDESHOW_TRANSITION_EFFECT_PAGE: - { - int inputValue = ITEM_SLIDESHOW_TRANSITION_EFFECT_PAGE; - __pPresentationModel->SetValue(SECTION_NAME_IMAGE_VIEWER, - ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_TRANSITION_EFFECT, inputValue); - __pTableView->SetItemChecked(groupIndex, itemIndex, true); - AppLogDebug("SETTINGS : setvalue interval(%d)", inputValue); - } - break; - - case ITEM_SLIDESHOW_TRANSITION_EFFECT_DISSOLVE: - { - int inputValue = ITEM_SLIDESHOW_TRANSITION_EFFECT_DISSOLVE; - __pPresentationModel->SetValue(SECTION_NAME_IMAGE_VIEWER, - ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_TRANSITION_EFFECT, inputValue); - __pTableView->SetItemChecked(groupIndex, itemIndex, true); - AppLogDebug("SETTINGS : setvalue interval(%d)", inputValue); - } - break; - - case ITEM_SLIDESHOW_TRANSITION_EFFECT_ZOOM: - { - int inputValue = ITEM_SLIDESHOW_TRANSITION_EFFECT_ZOOM; - __pPresentationModel->SetValue(SECTION_NAME_IMAGE_VIEWER, - ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_TRANSITION_EFFECT, inputValue); - __pTableView->SetItemChecked(groupIndex, itemIndex, true); - AppLogDebug("SETTINGS : setvalue interval(%d)", inputValue); - } - break; - - default: - { - } - break; - } - UpdateTableViewRedioButtonState(itemIndex); - } - break; - - default: - { - } - break; - } - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} - -void -SettingTransitionForm::UpdateGroupItem(int groupIndex, TableViewGroupItem* pItem) -{ - AppLogDebug("ENTER"); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} - -void -SettingTransitionForm::UpdateItem(int groupIndex, int itemIndex, TableViewItem* pItem) -{ - AppLogDebug("ENTER"); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} - -void -SettingTransitionForm::OnGroupedTableViewContextItemActivationStateChanged(GroupedTableView& tableView, - int groupIndex, int itemIndex, TableViewContextItem* pContextItem, bool activated) -{ - AppLogDebug("ENTER"); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} - -void -SettingTransitionForm::OnGroupedTableViewGroupItemStateChanged(GroupedTableView& tableView, int groupIndex, - TableViewGroupItem* pItem, TableViewItemStatus status) -{ - AppLogDebug("ENTER"); - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} - -int -SettingTransitionForm::GetFontSize(void) -{ - AppLogDebug("ENTER"); - result r = E_SUCCESS; - - int fontSize = FONT_MAIN_TEXT_SIZE_NORMAL; - String fontSizeValue(L""); - - if ((r = SettingInfo::GetValue(FONT_SIZE_SETTING_INFO_KEY, fontSizeValue)) == E_SUCCESS) - { - AppLogDebug("GetValue Fail [%s]", GetErrorMessage(r)); - - if (fontSizeValue.Equals(FONT_SIZE_SETTING_TYPE_GIANT, false)) - { - fontSize = FONT_MAIN_TEXT_SIZE_GIANT; - } - else if (fontSizeValue.Equals(FONT_SIZE_SETTING_TYPE_HUGE, false)) - { - fontSize = FONT_MAIN_TEXT_SIZE_HUGE; - } - else if (fontSizeValue.Equals(FONT_SIZE_SETTING_TYPE_LARGE, false)) - { - fontSize = FONT_MAIN_TEXT_SIZE_LARGE; - } - else if (fontSizeValue.Equals(FONT_SIZE_SETTING_TYPE_MEDIUM, false)) - { - fontSize = FONT_MAIN_TEXT_SIZE_NORMAL; - } - else - { - fontSize = FONT_MAIN_TEXT_SIZE_SMALL; - } - } - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); - - return fontSize; -} - -void -SettingTransitionForm::ItemTypeIconAndOneLine(Rectangle& icon, Rectangle& main) -{ - AppLogDebug("ENTER"); - icon.x = X_ITEM_TYPE_3_ICON; - icon.y = Y_ITEM_TYPE_3_ICON; - icon.width = W_ITEM_TYPE_3_ICON; - icon.height = H_ITEM_TYPE_3_ICON; - - main.x = X_ITEM_TYPE_3_LABEL; - main.y = Y_ITEM_TYPE_3_LABEL; - main.width = W_ITEM_TYPE_3_LABEL; - main.height = H_ITEM_TYPE_3_LABEL; - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} - -void -SettingTransitionForm::UpdateTableViewRedioButtonState(int senderIndex) -{ - AppLogDebug("ENTER senderIndex(%d)", senderIndex); - int selectedIndex = 0; - __pPresentationModel->GetValue(SECTION_NAME_IMAGE_VIEWER, ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_TRANSITION_EFFECT, - selectedIndex); - AppLogDebug("selectedIndex(%d)", selectedIndex); - - for (int i = 0; i < TRANSITION_ITEM_COUNT; ++i) - { - if (senderIndex != i) - { - if (selectedIndex == i) - { - __pTableView->SetItemChecked(GROUP_TRANSITION, i, true); - } - else - { - __pTableView->SetItemChecked(GROUP_TRANSITION, i, false); - } - __pTableView->RefreshItem(GROUP_TRANSITION, i, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY); - } - } - AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); -} diff --git a/src/GlTimerBase.cpp b/src/GlTimerBase.cpp new file mode 100644 index 0000000..8a86fc3 --- /dev/null +++ b/src/GlTimerBase.cpp @@ -0,0 +1,150 @@ +// +// Copyright (c) 2012 Samsung Electronics Co., Ltd. +// +// Licensed under the Flora License, Version 1.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://floralicense.org/license/ +// +// 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. +// + +/** + * @file GlTimerBase.cpp + * @brief This is the source file for GlTimerBase class. + */ + +#include + +#include "GlProgressBar.h" +#include "GlTimerBase.h" +#include "GlTypes.h" + +using namespace Tizen::Ui; + +GlTimerBase::GlTimerBase(IFileOpInvalidateListener* invalidateListener, enum FileActionMode actionId) + : __pInvalidate(invalidateListener) + , __actionId(actionId) +{ +} + +GlTimerBase::~GlTimerBase(void) +{ + AppLogDebug("ENTER"); + __pInvalidate = null; + __moveTimer.Cancel(); + delete __pContentIdList; + AppLogDebug("ENTER"); +} + +bool GlTimerBase::StartTimer(void) +{ + AppLogDebug("ENTER"); + __pContentIdList = TimerStart(); + if (__pContentIdList != null && __pContentIdList->GetCount() > 0 ) + { + AppLogDebug("Starting timer"); + __pMoveProBar = new GlProgressBar(static_cast(this)); + __pMoveProBar->ShowFileProgressingPopup( __pContentIdList->GetCount(), __actionId ); + __moveToCount = 0; + __moveTimer.Construct(*this); + __moveTimer.Start(1); + AppLogDebug("Returned true"); + return E_SUCCESS; + } + AppLogDebug("Returned false"); + return E_FAILURE; +} + +void GlTimerBase::CancelTimer(void) +{ + AppLogDebug("ENTER"); + __moveTimer.Cancel(); + OnOpCancelled(); + __moveToCount = 0; + AppLogDebug("EXIT"); +} + +void GlTimerBase::OnTimerExpired(Timer& timer) +{ + AppLogDebug("ENTER"); + if (&timer == &__moveTimer) + { + AppLogDebug("__pContentIdList count is %d", __pContentIdList->GetCount()); + if (__moveToCount < __pContentIdList->GetCount()) + { + AppLogDebug("__pContentIdList count is %d", __pContentIdList->GetCount()); + ContentId* pContentId = static_cast(__pContentIdList->GetAt(__moveToCount)); + if (pContentId != null) + { + TimerExpired(*pContentId); + } + __moveToCount++; + __pMoveProBar->IncProgress( __moveToCount ); + if (__pInvalidate) + { + __pInvalidate->OnFileOpInvalidate(__actionId); + } + __moveTimer.Start(1); + } + else + { + __moveTimer.Cancel(); + OnOpComplete(); + __moveToCount = 0; + } + } + AppLogDebug("EXIT"); +} + +void +GlTimerBase::OnActionPerformed(const Control& source, int actionId) +{ + switch (actionId) + { + case ACTION_ID_PROGRESSBAR_CANCEL: + { + CancelTimer(); + break; + } + default: + break; + } +} + +void GlTimerBase::OnOpCancelled(void) +{ + AppLogDebug("ENTER"); + if (__moveToCount > 0) + { + OnOpComplete(); + } + else + { + __pMoveProBar->HideFileProgressingPopup(); + if (__pInvalidate) + { + __pInvalidate->OnFileOpInvalidate(__actionId); + __pInvalidate->OnFileOpComplete(__actionId, true); + } + } + AppLogDebug("EXIT"); +} + +void GlTimerBase::OnOpComplete(void) +{ + AppLogDebug("ENTER"); + __pMoveProBar->HideFileProgressingPopup(); + if (__pInvalidate) + { + __pInvalidate->OnFileOpInvalidate(__actionId); + __pInvalidate->OnFileOpComplete(__actionId, true); + } + TimerComplete(__moveToCount); + AppLogDebug("EXIT"); +} diff --git a/src/GlTypes.cpp b/src/GlTypes.cpp index f71e463..fb672d8 100644 --- a/src/GlTypes.cpp +++ b/src/GlTypes.cpp @@ -24,14 +24,20 @@ using namespace Tizen::Graphics; -const wchar_t* IDC_FORM_ALBUM_LIST = L"AlbumListForm"; -const wchar_t* IDC_FORM_ALBUM_LIST_EDITOR = L"AlbumListEditorForm"; -const wchar_t* IDC_FORM_ALBUM_NAME_EDITOR = L"AlbumNameEditorForm"; -const wchar_t* IDC_FORM_FILE_LIST = L"FileListForm"; -const wchar_t* IDC_FORM_FILE_LIST_EDITOR = L"FileListEditorForm"; -const wchar_t* IDC_FORM_SETTING_MAIN = L"SettingMainForm"; -const wchar_t* IDC_FORM_SETTING_INTERVAL = L"SettingIntervalForm"; -const wchar_t* IDC_FORM_SETTING_TRANSITION = L"SettingTransitionForm"; +const wchar_t* IDL_FORM_ALBUM_LIST = L"IDL_FORM_ALBUM_LIST"; +const wchar_t* IDL_FORM_FILE_LIST = L"IDL_FORM_FILE_LIST"; +const wchar_t* IDL_FORM_SETTING_MAIN = L"IDL_FORM_SETTING_MAIN"; +const wchar_t* IDL_FORM_SETTING_INTERVAL = L"IDL_FORM_SETTING_INTERVAL"; +const wchar_t* IDL_FORM_SETTING_TRANSITION = L"IDL_FORM_SETTING_TRANSITION"; + +const wchar_t* IDC_FORM_ALBUM_LIST = L"AlbumListForm"; +const wchar_t* IDC_FORM_ALBUM_LIST_EDITOR = L"AlbumListEditorForm"; +const wchar_t* IDC_FORM_ALBUM_NAME_EDITOR = L"AlbumNameEditorForm"; +const wchar_t* IDC_FORM_FILE_LIST = L"FileListForm"; +const wchar_t* IDC_FORM_FILE_LIST_EDITOR = L"FileListEditorForm"; +const wchar_t* IDC_FORM_SETTING_MAIN = L"SettingMainForm"; +const wchar_t* IDC_FORM_SETTING_INTERVAL = L"SettingIntervalForm"; +const wchar_t* IDC_FORM_SETTING_TRANSITION = L"SettingTransitionForm"; const wchar_t* IDC_PANEL_BLANK = L""; const wchar_t* IDC_PANEL_ALL_LIST = L"AllListPanel"; @@ -83,6 +89,7 @@ const wchar_t* APPCONTROL_DATA_VIDEO = L"video"; const wchar_t* APPCONTROL_DATA_SINGLE = L"single"; const wchar_t* APPCONTROL_DATA_MULTIPLE = L"multiple"; const wchar_t* APPCONTROL_DATA_SLIDE_SHOW = L"slideshow"; +const wchar_t* APPCONTROL_DATA_SELECTION_MODE = L"http://tizen.org/appcontrol/data/selection/mode"; const wchar_t* APPCONTROL_RESULT_KEY_LEGACY_RESULT = L"http://tizen.org/appcontrol/data/legacyresult"; @@ -114,6 +121,8 @@ const wchar_t* SECTION_NAME_VIDEO_PLAYER = L"VIDEO_PLAYER_SETTING"; const wchar_t* ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_INTERVAL = L"SLIDESHOW_INTERVAL_VALUE"; const wchar_t* ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_TRANSITION_EFFECT = L"TRANSITION_EFFECT_VALUE"; const wchar_t* ENTRY_NAME_IMAGE_VIEWER_SLIDESHOW_MUSIC = L"MUSIC_VALUE"; +const wchar_t* ENTRY_NAME_IMAGE_VIEWER_REPEAT_VALUE = L"REPEAT_VALUE"; +const wchar_t* ENTRY_NAME_IMAGE_VIEWER_SHUFFLE_VALUE = L"SHUFFLE_VALUE"; const wchar_t* FONT_SIZE_SETTING_INFO_KEY = L"http://tizen.org/setting/font.size"; @@ -121,8 +130,10 @@ const wchar_t* IDB_BUTTON_CIRCLE_BACKGROUND = L"T01_button_circle_bg_normal.png" const wchar_t* IDB_BUTTON_RENAME = L"T01_button_rename.png"; const wchar_t* IDB_CONTROLBAR_CAMERA = L"T01_controlbar_icon_camera.png"; const wchar_t* IDB_CONTROLBAR_DELETE = L"T01_controlbar_icon_delete.png"; +const wchar_t* IDB_CONTROLBAR_DELETE_DIM = L"T01_toolbar_icon_delete_dim_web.png"; const wchar_t* IDB_CONTROLBAR_MORE = L"T01_controlbar_icon_more.png"; const wchar_t* IDB_CONTROLBAR_SHARE = L"T01_controlbar_icon_share02.png"; +const wchar_t* IDB_CONTROLBAR_SHARE_DIM = L"T01_toolbar_icon_share_dim_web.png"; const wchar_t* IDB_LISTVIEW_EMPTY = L"T01_Nocontents_picture.png"; const wchar_t* IDB_MAIN_FOLDER_BACKGROUND = L"T01_main_folder_bg.png"; const wchar_t* IDB_VIDEOTHUMBNAIL_BG = L"T01_places_thumbnail_bg.png"; @@ -131,3 +142,7 @@ const wchar_t* IDB_VIDEOTHUMBNAIL_FAVORITE = L"T01_icon_thumbnail_favorite.png"; const wchar_t* IDB_VIDEOTHUMBNAIL_PLAY = L"T01_btn_play.png"; const wchar_t* IDB_BUTTON_MOVE_SELECTION = L"T01_button_reveal.png"; const wchar_t* IDB_NO_CONTENTS_BROKEN = L"T01_Nocontents_broken.png"; +const wchar_t* IDB_LIST_EXPAND_CLOSED = L"00_circle_button_Expand_closed.png"; +const wchar_t* IDB_LIST_EXPAND_CLOSED_PRESS = L"00_list_expand_closed_press.png"; +const wchar_t* IDB_LIST_EXPAND_OPENED = L"00_circle_button_Expand_open.png"; +const wchar_t* IDB_LIST_EXPAND_OPENED_PRESS = L"00_list_expand_opened_press.png"; diff --git a/src/GlVideoListEditorPanel.cpp b/src/GlVideoListEditorPanel.cpp index 5ed5ebd..5bbcb2b 100644 --- a/src/GlVideoListEditorPanel.cpp +++ b/src/GlVideoListEditorPanel.cpp @@ -28,6 +28,8 @@ #include "GlResourceManager.h" #include "GlTypes.h" #include "GlVideoListEditorPanel.h" +#include "GlFileListEditorForm.h" +#include "GlFileDeleteTimer.h" using namespace Tizen::App; using namespace Tizen::Base; @@ -68,6 +70,7 @@ VideoListEditorPanel::VideoListEditorPanel() , __pLabelSelectCnt(null) , __itemCount(0) , __pPresentationModel(null) + , __pFileDelete(null) { AppLogDebug("ENTER"); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); @@ -76,6 +79,7 @@ VideoListEditorPanel::VideoListEditorPanel() VideoListEditorPanel::~VideoListEditorPanel() { AppLogDebug("ENTER"); + delete __pFileDelete; AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); } @@ -695,7 +699,7 @@ VideoListEditorPanel::GetItemCheckedIndexList(void) const } void -VideoListEditorPanel::OnRequestDeleteAction(void) +VideoListEditorPanel::OnRequestDelete(void) { AppLogDebug("ENTER"); IList* pIndexList = GetItemCheckedIndexList(); @@ -707,14 +711,95 @@ VideoListEditorPanel::OnRequestDeleteAction(void) return; } + delete __pFileDelete; + __pFileDelete = new FileDeleteTimer(pIndexList, + __pPresentationModel, + this ); + result r = __pFileDelete->StartTimer(); - __pPresentationModel->DeleteContentFileList(*pIndexList); - delete pIndexList; + if (IsFailed(r)) + { + delete __pFileDelete; + __pFileDelete = null; + return ; + } + + AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); +} +void VideoListEditorPanel::OnFileOpInvalidate(enum FileActionMode actionId) +{ + SceneManager* pSceneManager = SceneManager::GetInstance(); + FileListEditorForm* pFileListEditorForm = + dynamic_cast(pSceneManager->GetCurrentScene()->GetForm()); + TryReturnVoid(pFileListEditorForm != null, "[%s] fail to get SceneManager.", + GetErrorMessage(GetLastResult())); + pFileListEditorForm->Invalidate(true); +} + +void VideoListEditorPanel::OnFileOpComplete(enum FileActionMode actionId, result res) +{ + if ( actionId == FILE_DELETE_ACTION ) + { + //Do nothing + } + else if ( actionId == FILE_MOVE_ACTION ) + { + + } +} +void +VideoListEditorPanel::OnRequestMessage(void) +{ + AppLogDebug("ENTER"); + IList* pIndexList = GetItemCheckedIndexList(); + if (pIndexList->GetCount() <= 0) + { + AppLogDebug("EXIT 1(%s)", GetErrorMessage(GetLastResult())); + + return; + } + + String combineText; + String path; + + int loopCount = pIndexList->GetCount(); + for (int i = 0; i < loopCount; ++i) + { + path = __pPresentationModel->GetContentFilePath(i); + + if ( path.EndsWith(CONTENT_EXT_PNG) + || path.EndsWith(CONTENT_EXT_BMP) + || path.EndsWith(CONTENT_EXT_JPG) + || path.EndsWith(CONTENT_EXT_GIF) + || path.EndsWith(CONTENT_EXT_TIF) + || path.EndsWith(CONTENT_EXT_MP4) + || path.EndsWith(CONTENT_EXT_3GP) + || path.EndsWith(CONTENT_EXT_AVI) + || path.EndsWith(CONTENT_EXT_RM) + || path.EndsWith(CONTENT_EXT_WMV) + || path.EndsWith(CONTENT_EXT_ASF) + ) + { + if (combineText.CompareTo(EMPTY_SPACE) != 0) + { + combineText.Append(L";"); + } + combineText.Append(path); + } + } + + HashMap* pDataList = new (std::nothrow) HashMap(SingleObjectDeleter); + pDataList->Construct(); + pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_ATTACHMENTS), + new (std::nothrow) String(combineText)); + + __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_MESSAGE, APPCONTROL_OPERATION_ID_COMPOSE, + pDataList, null); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); } void -VideoListEditorPanel::OnRequestEmailAction(void) +VideoListEditorPanel::OnRequestEmail(void) { AppLogDebug("ENTER"); IList* pIndexList = GetItemCheckedIndexList(); @@ -759,13 +844,13 @@ VideoListEditorPanel::OnRequestEmailAction(void) pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_ATTACHMENTS), new (std::nothrow) String(combineText)); - __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_EMAIL, - APPCONTROL_OPERATION_ID_COMPOSE, pDataList, null); + __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_EMAIL, APPCONTROL_OPERATION_ID_COMPOSE, + pDataList, null); AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult())); } void -VideoListEditorPanel::OnRequestMoveToAction(String& destDirectory) +VideoListEditorPanel::OnRequestMoveTo(String& destDirectory) { AppLogDebug("ENTER"); if (&destDirectory == null || destDirectory.IsEmpty()) @@ -782,6 +867,7 @@ VideoListEditorPanel::OnRequestMoveToAction(String& destDirectory) return; } + //TODO TO rework this, update to use the FileMoveTimer, When this func is used.. result r = __pPresentationModel->MoveToContentFileList(*pIndexList, destDirectory); delete pIndexList; pIndexList = null;