From: chitta ranjan Date: Tue, 9 Apr 2013 03:38:21 +0000 (+0900) Subject: UI fix, removed redundant code X-Git-Tag: accepted/tizen_2.1/20130425.023641~29 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc7b94a41c4adcffc3bbacc33fac49412855d465;p=apps%2Fosp%2FImageViewer.git UI fix, removed redundant code Change-Id: Iea3e9acc70244fdeaaae839316cca3d12e9d51b7 Signed-off-by: chitta ranjan --- diff --git a/inc/IvImageViewerPresentationModel.h b/inc/IvImageViewerPresentationModel.h index e07d96d..501aa9b 100644 --- a/inc/IvImageViewerPresentationModel.h +++ b/inc/IvImageViewerPresentationModel.h @@ -73,8 +73,6 @@ public: int GetSetterIndex(void) const; void SetSetterIndex(const int index); - void SetImageRotateStatus(bool value); - int GetDurationOfSlideShow(void) const; SlideShowTransitionEffect GetTransitionEffectOfSlideShow(void) const; @@ -103,7 +101,6 @@ private: void LoadSettingValue(); int GetImageCacheIndex(const Tizen::Base::String& ); - bool GetImageRotateStatus(void) const; private: static ImageViewerPresentationModel* __pPresentationModelInstance; @@ -120,7 +117,6 @@ private: SlideShowTransitionEffect __transitionEffectOfSlideShow; Tizen::Content::ContentManager* __pCntMgr; SettingPresentationModel* __pSettingPresentationModel; - bool __isImageRotated; bool __ivTriggeredEvent; short __contentFileEventType; Tizen::Content::ContentId __contentId; diff --git a/res/screen-size-normal/IDL_SLIDESHOW_SETTING_POPUP.xml b/res/screen-size-normal/IDL_SLIDESHOW_SETTING_POPUP.xml index fe5d1f6..a2ea9e5 100644 --- a/res/screen-size-normal/IDL_SLIDESHOW_SETTING_POPUP.xml +++ b/res/screen-size-normal/IDL_SLIDESHOW_SETTING_POPUP.xml @@ -3,21 +3,20 @@ This XML file was automatically generated by UiBuilder - do not modify by hand. --> - - + - + - - + + diff --git a/src/IvImageViewerForm.cpp b/src/IvImageViewerForm.cpp index 4fa3156..543393b 100644 --- a/src/IvImageViewerForm.cpp +++ b/src/IvImageViewerForm.cpp @@ -1437,12 +1437,7 @@ ImageViewerForm::OnActionPerformed(const Control& source, int actionId) int currentIndex = __pGallery->GetCurrentItemIndex(); String filePath = __pPresentationModel->GetFilePathAt(currentIndex); RotateMode rotateMode = ROTATE_MODE_RIGHT; - __pPresentationModel->SetImageRotateStatus(true); RotateImage(filePath, rotateMode); - ImageInfo* pImageInfo = null; - pImageInfo->Construct(filePath, null); - pImageInfo->ClearBitmap(); - __pGallery->RefreshGallery(currentIndex, GALLERY_REFRESH_TYPE_ITEM_MODIFY); __pPresentationModel->RequestImage(filePath); ContentManager::ScanFile(filePath); } @@ -1452,7 +1447,6 @@ ImageViewerForm::OnActionPerformed(const Control& source, int actionId) int currentIndex = __pGallery->GetCurrentItemIndex(); String filePath = __pPresentationModel->GetFilePathAt(currentIndex); RotateMode rotateMode = ROTATE_MODE_LEFT; - __pPresentationModel->SetImageRotateStatus(true); RotateImage(filePath, rotateMode); __pPresentationModel->RequestImage(filePath); ContentManager::ScanFile(filePath); diff --git a/src/IvImageViewerPresentationModel.cpp b/src/IvImageViewerPresentationModel.cpp index 57733b3..ff6fd48 100644 --- a/src/IvImageViewerPresentationModel.cpp +++ b/src/IvImageViewerPresentationModel.cpp @@ -61,7 +61,6 @@ ImageViewerPresentationModel::ImageViewerPresentationModel(void) , __durationOfSlideShow(0) , __transitionEffectOfSlideShow(SLIDE_SHOW_TRANSITION_EFFECT_SLIDE) , __pSettingPresentationModel(null) - , __isImageRotated(false) , __ivTriggeredEvent(false) , __contentFileEventType(-1) ,__ivTriggeredDeleteEvent(false) @@ -555,16 +554,6 @@ int ImageViewerPresentationModel::GetImageCacheIndex(const String& afilePath) return -1; } -void ImageViewerPresentationModel::SetImageRotateStatus(bool value) -{ - __isImageRotated = true; -} - -bool ImageViewerPresentationModel::GetImageRotateStatus(void) const -{ - return __isImageRotated; -} - void ImageViewerPresentationModel::OnContentFileCreated(Tizen::Content::ContentId contentId, Tizen::Content::ContentType contentType, result r) { AppLogDebug(" Enter");