UI fix, removed redundant code

Change-Id: Iea3e9acc70244fdeaaae839316cca3d12e9d51b7
Signed-off-by: chitta ranjan <chitta.rs@samsung.com>

diff --git a/inc/IvImageViewerPresentationModel.h b/inc/IvImageViewerPresentationModel.h
index e07d96d..501aa9b 100644 (file)
--- 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 (file)
--- 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.
 -->
 <!DOCTYPE ScenePopup SYSTEM "UIForm.dtd">
-
-<ScenePopup Bversion="2.0.0.201304011930" Dversion="20120315">
+<ScenePopup Bversion="2.0.0.201304041646" Dversion="20120315">
     <Popup id="IDL_SLIDESHOW_SETTING_POPUP">
         <property accessibilityHint="" color="#FFFFFF" titleText="::IDS_IV_OPT_SLIDE_SHOW" titleTextColor=""/>
         <layout height="440.0" mode="Portrait" style="" type="LAYOUT_RELATIVE" width="580.0"/>
-        <layout height="400.0" mode="Landscape" style="" type="LAYOUT_RELATIVE" width="600.0"/>
+        <layout height="410.0" mode="Landscape" style="" type="LAYOUT_RELATIVE" width="600.0"/>
     </Popup>
     <ListView id="IDC_POPUP_LIST" parent="IDL_SLIDESHOW_SETTING_POPUP">
         <property backgroundBitmapPath="" backgroundColor="#FFFFFF" backgroundColorOpacity="0" bitmapPathOfEmptyList="" colorOfEmptyListText="" fastScroll="false" itemDivider="true" itemDividerColor="" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" sweepEnabled="false" textOfEmptyList=""/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="226.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="540.0" x="0.0" y="3.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="224.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="560.0" x="-1.0" y="2.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="226.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="551.0" x="25.0" y="3.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="224.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="553.0" x="44.0" y="2.0"/>
     </ListView>
     <Button id="IDC_BUTTON" parent="IDL_SLIDESHOW_SETTING_POPUP">
         <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="::IDS_COM_SK_CANCEL" textSize="33.0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="432.0" x="44.0" y="263.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="67.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="381.0" x="90.0" y="236.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="432.0" x="74.0" y="263.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="67.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="381.0" x="102.0" y="238.0"/>
     </Button>
 </ScenePopup>

diff --git a/src/IvImageViewerForm.cpp b/src/IvImageViewerForm.cpp
index 4fa3156..543393b 100644 (file)
--- 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 (file)
--- 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");