enum CamcorderGeneralTabSubMenuContent
{
CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_TIMER_MODE = 0,
- CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE,
CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_GUIDELINE_MODE,
CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_STORAGE_TYPE_MODE,
CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_RESET_MODE,
result DrawRecord(bool isRecord);
result DrawRecordTimer(void);
+ result InitElapsedTimeLable(void);
void OnCameraActionPerformed(CameraActionEvent event);
};
void Update(bool isInvalidated);
-
+ bool IsAppControlRequest(void);
void InitAppTimer(void);
void InitSettingTimer(void);
void InitMakerFocusTimer(void);
void SetCamcorderTabSubMenuListviewState(const int menuCount, const CamcorderTabSubMenuContent mode);
result SetMenuTitle(Tizen::Graphics::Canvas* pCanvas, const Tizen::Base::String& str, const int fntSize);
+ int GetTimerIntervalValue(void) const;
void SetGuideLine(int guideLineEnable);
- void SetRecordMode(int timerInterval);
+ void SetStartRecording(void);
void SetStorageType(int storageType);
result RestoreDefaultSetting(void);
- result SettingTimerRecord(int timerInterval);
+ result SetRecordStartTimer(int timerInterval);
result DrawMarker(bool useGuidline);
result DrawFocus(int focusMode);
void EndRecordTimer(void);
result StartPopupTimer(void);
- result EndPopupTimer(void);
+ result StopPopupTimer(void);
void SetRecordButton(bool start);
void SetContinuousAutoFocusButton(void);
result CreateExposureSlider(void);
result DrawExposureSlider(const Tizen::Graphics::Point& currentPosition, int DrawMode);
result DrawExposureSlider(void);
+ void ShowExposureSlider(void);
result UpdateUiPanelIcon(void);
result UpdateUiActionPanelIcon(void);
void ShowMessageBox(const Tizen::Base::String& title, Tizen::Ui::Controls::MessageBoxStyle style, const Tizen::Base::String& text);
void HidePopup(void);
+ void SetControlAlwaysOnTopPanel();
void HidePanel(bool isWideMode, bool isInvalidated);
void HideUiPanel(bool state);
void HideUiModeChangedButton(void);
void CheckStorageInfo(void);
result LaunchAppControl(const Tizen::Base::String& providerId, const Tizen::Base::String& operationId, const Tizen::Base::String* pUriData, const Tizen::Base::String* pDataType, const Tizen::Base::Collection::IMap* extraData);
+ void SetCamcorderMode(void);
+ void SetOverlayPanelWideMode(bool isRemoved);
+ void SetOverlayPanelNormalMode(bool isRemoved);
+ void SetOverlayRendererRotation(void);
+ void SetOverlayPanelOrientationChanged(Tizen::Ui::OrientationStatus orientationStatus);
+
result SetScreenMode(const ScreenMode mode, bool destory);
void InDrawFocus(void);
void StartRecord(void);
void DoRecording(void);
void OnTouchLaunchImageview(void);
result SetScreenOverlayHelpTimer(void);
+ void HideScreenOverlayHelp(void);
result DrawScreenOverlayHelp(void);
private:
ScreenMode __screenMode;
Tizen::Ui::Controls::OverlayPanel* __pOverlayPanel;
Tizen::Base::Runtime::Timer* __pAppTimer;
- Tizen::Base::Runtime::Timer* __pSettingTimer;
+ Tizen::Base::Runtime::Timer* __pIntervalValueTimer;
Tizen::Base::Runtime::Timer* __pRecordTimer;
Tizen::Base::Runtime::Timer* __pPopupTimer;
Tizen::Base::Runtime::Timer* __pExposureCloseTimer;
Tizen::Ui::Controls::Button* __pExposureValueButton;
Tizen::Ui::Controls::Button* __pCloseButton;
Tizen::Ui::Controls::Button* __pAutoFocus;
+ Tizen::Ui::Controls::Label* __pSettingLine;
Tizen::Ui::Controls::Label* __pCameraIconLabel;
Tizen::Ui::Controls::Label* __pCamcoderIconLabel;
Tizen::Ui::Controls::Button* __pSwButton;
Tizen::Ui::Controls::Button* __pBackButton;
Tizen::Ui::Controls::Button* __pBack;
Tizen::Ui::Controls::Label* __pBatteryState;
- Tizen::Ui::Controls::Label* __pRecLabel;
Tizen::Ui::Controls::Label* __pRecLabelRed;
Tizen::Ui::Controls::Label* __pRecLabelText;
Tizen::Ui::Controls::Label* __pElapsedTimeLable;
Tizen::Graphics::Point __pButtonPoint;
CameraThumbnailPanel* __pThumbnailPanel;
CameraInfoPanel* __pCameraInfoPanel;
- CamraInfoSubPanel* __pCamraInfoSubPanel;
+ CameraInfoSubPanel* __pCameraInfoSubPanel;
+ CameraInfoGeneralSubPanel* __pCameraInfoGeneralSubPanel;
Tizen::Base::String** __pSettingMenuString;
Tizen::Base::String** __pSettingGeneralMenuString;
CameraStarterThread* __pCameraStarterThread;
enum GeneralTabSubMenuContent
{
GENERAL_TAB_SUB_MENU_CONTENT_TIMER_MODE = 0,
- GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE,
GENERAL_TAB_SUB_MENU_CONTENT_GUIDELINE_MODE,
GENERAL_TAB_SUB_MENU_CONTENT_STORAGE_TYPE_MODE,
GENERAL_TAB_SUB_MENU_CONTENT_RESET_MODE,
result ProcessGeneraTabSubListPopup(int index);
result ProcessFlashListPopup(int index);
result StartPopupTimer(void);
- result EndPopupTimer(void);
+ result StopPopupTimer(void);
Tizen::Graphics::Bitmap* RotationImageN(Tizen::Graphics::Bitmap* pSrcBitmap, Tizen::Media::ImageRotationType rotationType);
result CreateExposureSlider(void);
result DrawExposureSlider(const Tizen::Graphics::Point& currentPosition, int DrawMode);
result DrawExposureSlider(void);
+ void ShowExposureSlider(void);
result UpdateUiPanelIcon(void);
result UpdateUiActionPanelIcon(void);
void SetCameraMode(bool isWideMode);
void SetOverlayRendererRotation(void);
- void SetNormalOverlayPanel(bool destory);
- void SetWideOverlayPanel(bool destory);
+ void SetOverlayPanelNormalMode(bool isRemoved);
+ void SetOverlayPanelWideMode(bool isRemoved);
+ void SetOverlayPanelOrientationChanged(Tizen::Ui::OrientationStatus orientationStatus);
void SetControlAlwaysOnTopPanel(void);
void HidePanel(bool isWideMode, bool isInvalidated);
Tizen::Ui::Controls::Button* __pWhiteBalanceButton;
Tizen::Ui::Controls::Button* __pExposureValueButton;
Tizen::Ui::Controls::Button* __pCloseButton;
+ Tizen::Ui::Controls::Label* __pSettingLine;
Tizen::Ui::Controls::Label* __pCameraIconLabel;
Tizen::Ui::Controls::Label* __pCamcoderIconLabel;
Tizen::Ui::Controls::Button* __pSwButton;
Tizen::Base::Collection::ArrayList* __pIsoList;
CameraThumbnailPanel* __pThumbnailPanel;
CameraInfoPanel* __pCameraInfoPanel;
- CamraInfoSubPanel* __pCamraInfoSubPanel;
+ CameraInfoSubPanel* __pCameraInfoSubPanel;
+ CameraInfoGeneralSubPanel* __pCameraInfoGeneralSubPanel;
Tizen::Base::String** __pSettingMenuString;
Tizen::Base::String** __pSettingGeneralMenuString;
CameraStarterThread* __pCameraStarterThread;
#include "CmCameraResourceManager.h"
#include "CmTypes.h"
-class CamraInfoSubPanel;
+class CameraInfoSubPanel;
+class CameraInfoGeneralSubPanel;
class CameraInfoPanel
: public Tizen::Base::Runtime::ITimerEventListener
Tizen::Graphics::Bitmap* __pTimerTypeBitmap;
};
-class CamraInfoSubPanel
+class CameraInfoSubPanel
: public Tizen::Ui::Controls::Panel
, public Tizen::Ui::IOrientationEventListener
{
public:
- CamraInfoSubPanel(void);
- virtual ~CamraInfoSubPanel(void);
+ CameraInfoSubPanel(void);
+ virtual ~CameraInfoSubPanel(void);
+ result Initialize(Tizen::Graphics::Rectangle rect);
+
+ void SetMenuTitle(Tizen::Base::String& title);
+
+ virtual result OnInitializing(void);
+ virtual result OnTerminating(void);
+ virtual result OnDraw(void);
+ virtual void OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus);
+
+private:
+ result DrawSettingSubMenuBackground(Tizen::Graphics::Canvas* pCanvas);
+ result DrawSubMenuTile(Tizen::Graphics::Canvas* pCanvas);
+
+private:
+ bool __drawSubMenuBG;
+ Tizen::Base::String __subMenuTitle;
+};
+
+class CameraInfoGeneralSubPanel
+ : public Tizen::Ui::Controls::Panel
+ , public Tizen::Ui::IOrientationEventListener
+{
+public:
+ CameraInfoGeneralSubPanel(void);
+ virtual ~CameraInfoGeneralSubPanel(void);
result Initialize(Tizen::Graphics::Rectangle rect);
void SetMenuTitle(Tizen::Base::String& title);
RESOURCE_ID_CAMERA_MODE_QUICK_SETTING_PRESS,
RESOURCE_ID_CAMERA_MODE_SETTING_NOR,
RESOURCE_ID_CAMERA_MODE_SETTING_PRESS,
+ RESOURCE_ID_CAMERA_MODE_SETTING_LINE,
RESOURCE_ID_CAMERA_MODE_CAMCORDER_ON,
RESOURCE_ID_CAMERA_MODE_CAMERA_ON,
RESOURCE_ID_CAMERA_MODE_BG,
RESOURCE_ID_CAMERA_INDICATOR_TIMER_OFF,
RESOURCE_ID_CAMERA_INDICATOR_VOICE,
RESOURCE_ID_CAMERA_WHITEBALANCE,
+ RESOURCE_ID_CAMERA_WHITEBALANCE_DIM_PRESS,
RESOURCE_ID_CAMERA_WHITEBALANCE_PRESS,
RESOURCE_ID_CAMERA_EXPOSURE,
RESOURCE_ID_CAMERA_EXPOSURE_PRESS,
RESOURCE_ID_SCREEN_OVERLAY_HELP_12,
RESOURCE_ID_EXPOSURE_PROGRESS_HANDLE,
RESOURCE_ID_EXPOSURE_PROGRESS_BG_9_,
+ RESOURCE_ID_PHOTO_SIZE_0_3M,
RESOURCE_ID_PHOTO_SIZE_2M,
RESOURCE_ID_PHOTO_SIZE_6M,
RESOURCE_ID_640X480,
RESOURCE_ID_CAMERA_MODE_BACK_PRESS,
RESOURCE_ID_CAMERA_MODE_FRONT,
RESOURCE_ID_CAMERA_MODE_FRONT_PRESS,
+ RESOURCE_ID_CAMERA_HELP,
+ RESOURCE_ID_CAMERA_HELP_PRESS,
RESOURCE_ID_MAX
};
IDA_BUTTON_CAMCORDER_THUMBNAIL = 105,
IDA_BUTTON_CAMCORDER_CANCEL = 106,
IDA_BUTTON_CAMCORDER_BACK = 107,
- IDA_BUTTON_CAMCORDER_QUICK_SETTING = 205,
+ IDA_BUTTON_CAMCORDER_QUICK_SETTING = 108,
+ IDA_BUTTON_CAMCORDER_AUTO_FOCUS = 109,
IDA_BUTTON_CAMERA_FLASH = 201,
IDA_BUTTON_CAMERA_SELF = 202,
IDA_BUTTON_CAMERA_SETTING = 203,
extern const unsigned int COLOR_PANEL_BACKGROUND_BLACK;
extern const unsigned int COLOR_PANEL_BACKGROUND_GRAY;
extern const unsigned int COLOR_GUIDELINE;
+extern const unsigned int COLOR_SETTING_LINE;
+extern const unsigned int COLOR_SETTING_UNDER_LINE;
extern const unsigned int COLOR_TITLE;
extern const unsigned int COLOR_TIMER_TEXT;
<Button id="IDC_RECORD_BUTTON" parent="IDL_CAMCORDER_FORM">\r
<property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>\r
<layout bottomRelation="IDL_CAMCORDER_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="108" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CAMCORDER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="22" marginLeft="260" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="214" x="260" y="1150"/>\r
- <layout bottomRelation="IDL_CAMCORDER_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="214" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="253" marginLeft="0" marginRight="26" marginTop="0" mode="Landscape" rightRelation="IDL_CAMCORDER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="108" x="1146" y="206"/>\r
- </Button>\r
+ <layout bottomRelation="IDL_CAMCORDER_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="214" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="253" marginLeft="0" marginRight="26" marginTop="0" mode="Landscape" rightRelation="IDL_CAMCORDER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="108" x="1146" y="253"/>\r
+ </Button>\r
<Button id="IDC_BACK_BUTTON" parent="IDL_CAMCORDER_FORM">\r
<property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>\r
<layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="104" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="104" x="26" y="26"/>\r
</Button>\r
<Label id="IDC_BATTERY_STATE" parent="IDL_CAMCORDER_FORM">\r
<property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
- <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="17" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="116" x="305" y="4"/>\r
+ <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="17" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="116" x="300" y="4"/>\r
<layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="17" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="116" x="532" y="4"/>\r
</Label>\r
- <Label id="IDC_REC_LABEL" parent="IDL_CAMCORDER_FORM">\r
- <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
- <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="182" x="494" y="16"/>\r
- <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="94" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="182" x="20" y="16"/>\r
- </Label>\r
<Label id="IDC_REC_LABEL_RED" parent="IDL_CAMCORDER_FORM">\r
<property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
- <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="48" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="48" x="507" y="29"/>\r
- <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="48" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="48" x="38" y="40"/>\r
+ <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="48" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="48" x="525" y="26"/>\r
+ <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="48" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="48" x="40" y="37"/>\r
</Label>\r
<Label id="IDC_REC_LABEL_TEXT" parent="IDL_CAMCORDER_FORM">\r
- <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
- <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="48" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="94" x="569" y="29"/>\r
- <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="48" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="94" x="90" y="40"/>\r
+ <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="REC" textColor="#FF0000" textSize="36" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+ <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="48" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="103" x="569" y="29"/>\r
+ <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="48" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="119" x="90" y="37"/>\r
</Label>\r
<Button id="IDC_CAMERA_BACK" parent="IDL_CAMCORDER_FORM">\r
<property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>\r
- <layout bottomRelation="IDL_CAMCORDER_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="94" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CAMCORDER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="10" marginLeft="622" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="94" x="622" y="1176"/>\r
- <layout bottomRelation="IDL_CAMCORDER_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="96" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="620" marginLeft="0" marginRight="5" marginTop="0" mode="Landscape" rightRelation="IDL_CAMCORDER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="97" x="1178" y="4"/>\r
+ <layout bottomRelation="IDL_CAMCORDER_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="94" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CAMCORDER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="45" marginLeft="612" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="94" x="612" y="1161"/>\r
+ <layout bottomRelation="IDL_CAMCORDER_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="96" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="630" marginLeft="0" marginRight="45" marginTop="0" mode="Landscape" rightRelation="IDL_CAMCORDER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="97" x="1158" y="14"/>\r
</Button>\r
<Label id="IDC_REC_TIME" parent="IDL_CAMCORDER_FORM">\r
<property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
</Label>\r
<Button id="IDC_CAMERA_SETTING_POPUP" parent="IDL_CAMCORDER_FORM">\r
<property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>\r
- <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="60" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="60" x="147" y="188"/>\r
- <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="60" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="60" x="302" y="95"/>\r
+ <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="60" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="60" x="147" y="208"/>\r
+ <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="60" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="60" x="302" y="119"/>\r
</Button>\r
<Button id="IDC_GENERAL_SETTING_POPUP" parent="IDL_CAMCORDER_FORM">\r
<property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>\r
- <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="60" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="60" x="409" y="188"/>\r
- <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="60" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="60" x="560" y="95"/>\r
+ <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="60" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="60" x="409" y="207"/>\r
+ <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="60" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="60" x="560" y="118"/>\r
</Button>\r
<Label id="IDC_CAMCORDER_ICON_LABEL" parent="IDL_CAMCORDER_FORM">\r
<property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
<layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="49" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="280" x="209" y="617"/>\r
</Label>\r
<Label id="IDC_LABEL_TEXT_03" parent="IDL_CAMCORDER_FORM">\r
- <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="Record video" textColor="#FFFFFF" textSize="36" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
- <layout bottomRelation="IDL_CAMCORDER_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="49" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CAMCORDER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="300" marginLeft="10" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="254" x="10" y="931"/>\r
+ <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="Capture image" textColor="#FFFFFF" textSize="36" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+ <layout bottomRelation="IDL_CAMCORDER_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="49" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CAMCORDER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="300" marginLeft="10" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="280" x="10" y="931"/>\r
<layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="52" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_CAMCORDER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="451" x="829" y="454"/>\r
</Label>\r
<Label id="IDC_LABEL_TEXT_02" parent="IDL_CAMCORDER_FORM">\r
<layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="266" x="302" y="27"/>\r
</Label>\r
<Label id="IDC_LABEL_TEXT_05" parent="IDL_CAMCORDER_FORM">\r
- <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_RIGHT" text="Shutter" textColor="#FFFFFF" textSize="36" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
- <layout bottomRelation="IDL_CAMCORDER_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="57" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CAMCORDER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="226" marginLeft="272" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="175" x="272" y="997"/>\r
+ <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_RIGHT" text="Recorder" textColor="#FFFFFF" textSize="36" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+ <layout bottomRelation="IDL_CAMCORDER_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="57" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CAMCORDER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="226" marginLeft="272" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="194" x="272" y="997"/>\r
<layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="52" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="199" marginTop="0" mode="Landscape" rightRelation="IDL_CAMCORDER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="194" x="887" y="280"/>\r
</Label>\r
<Label id="IDC_LABEL_TEXT_06" parent="IDL_CAMCORDER_FORM">\r
<layout bottomRelation="IDL_CAMCORDER_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="40" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CAMCORDER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="187" marginLeft="283" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="433" x="283" y="1053"/>\r
<layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="60" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="206" marginTop="0" mode="Landscape" rightRelation="IDL_CAMCORDER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="389" x="685" y="29"/>\r
</Label>\r
+ <Label id="IDC_SETTING_LINE" parent="IDL_CAMCORDER_FORM">\r
+ <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+ <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="4" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="82" x="628" y="129"/>\r
+ <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="82" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="4" x="130" y="11"/>\r
+ </Label>\r
</Scene>\r
</Button>\r
<Button id="IDC_CAMERA_BACK" parent="IDL_CAMERA_FORM">\r
<property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>\r
- <layout bottomRelation="IDL_CAMERA_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="94" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CAMERA_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="10" marginLeft="622" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="94" x="622" y="1176"/>\r
- <layout bottomRelation="IDL_CAMERA_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="96" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="620" marginLeft="0" marginRight="5" marginTop="0" mode="Landscape" rightRelation="IDL_CAMERA_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="97" x="1178" y="4"/>\r
+ <layout bottomRelation="IDL_CAMERA_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="94" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CAMERA_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="45" marginLeft="612" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="94" x="612" y="1161"/>\r
+ <layout bottomRelation="IDL_CAMERA_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="96" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="630" marginLeft="0" marginRight="45" marginTop="0" mode="Landscape" rightRelation="IDL_CAMERA_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="97" x="1178" y="4"/>\r
</Button>\r
<Label id="IDC_BATTERY_STATE" parent="IDL_CAMERA_FORM">\r
<property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="18" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
- <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="17" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="116" x="305" y="9"/>\r
- <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="17" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="116" x="532" y="13"/>\r
+ <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="17" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="116" x="300" y="4"/>\r
+ <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="17" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="116" x="532" y="4"/>\r
</Label>\r
<Button id="IDC_CAMERA_SETTING_POPUP" parent="IDL_CAMERA_FORM">\r
<property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>\r
- <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="60" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="60" x="147" y="188"/>\r
- <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="60" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="60" x="302" y="95"/>\r
+ <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="60" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="60" x="147" y="208"/>\r
+ <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="60" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="60" x="302" y="119"/>\r
</Button>\r
<Button id="IDC_GENERAL_SETTING_POPUP" parent="IDL_CAMERA_FORM">\r
<property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0" highlightedBitmapY="0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>\r
- <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="60" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="60" x="409" y="187"/>\r
- <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="60" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="60" x="560" y="95"/>\r
+ <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="60" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="60" x="409" y="207"/>\r
+ <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="60" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="60" x="560" y="118"/>\r
</Button>\r
<Label id="IDC_OVERLAY_HELP_10" parent="IDL_CAMERA_FORM">\r
<property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
</Label>\r
<Label id="IDC_CAMERA_SETTING_LABEL" parent="IDL_CAMERA_FORM">\r
<property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
- <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="68" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="257" x="48" y="184"/>\r
- <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="42" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="228" x="218" y="104"/>\r
+ <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="68" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="257" x="48" y="204"/>\r
+ <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="62" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="239" x="218" y="118"/>\r
</Label>\r
<Label id="IDC_GENERAL_SETTING_LABEL" parent="IDL_CAMERA_FORM">\r
<property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
- <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="68" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="257" x="304" y="184"/>\r
- <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="43" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="215" x="482" y="103"/>\r
+ <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="68" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="257" x="304" y="204"/>\r
+ <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="60" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="226" x="469" y="118"/>\r
</Label>\r
<Label id="IDC_CAMCORDER_ICON_LABEL" parent="IDL_CAMERA_FORM">\r
<property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
<layout bottomRelation="IDL_CAMERA_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="50" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CAMERA_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="48" marginLeft="19" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="50" x="19" y="1182"/>\r
<layout bottomRelation="IDL_CAMERA_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="50" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="170" marginLeft="0" marginRight="55" marginTop="0" mode="Landscape" rightRelation="IDL_CAMERA_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="50" x="1175" y="500"/>\r
</Label>\r
+ <Label id="IDC_SETTING_LINE" parent="IDL_CAMERA_FORM">\r
+ <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+ <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="4" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="82" x="628" y="129"/>\r
+ <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="82" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="4" x="130" y="11"/>\r
+ </Label>\r
</Scene>\r
static const int CAMERA_FOCUS_READY = 1;
static const int CAMERA_FOCUS_FAIL = 2;
static const int UI_INDICATOR_STORAGE_FREE_SPACE_BUFFER_LEN = 2048;
-static const int X_ACTION_PANEL_CAMERA_CAMCODER_BUTTON_PORTRAIT = 53;
+static const int X_ACTION_PANEL_CAMERA_CAMCODER_BUTTON_PORTRAIT = 55;
static const int Y_ACTION_PANEL_CAMERA_CAMCODER_BUTTON_PORTRAIT = 8;
static const int X_ACTION_PANEL_CAMERA_CAMCODER_BUTTON_LANDSCAPE = 8;
-static const int Y_ACTION_PANEL_CAMERA_CAMCODER_BUTTON_LANDSCAPE = 53;
-static const int FONT_SIZE_SETTING_MENU_ITEM = 36;
+static const int Y_ACTION_PANEL_CAMERA_CAMCODER_BUTTON_LANDSCAPE = 55;
+static const int FONT_SIZE_SETTING_MENU_ITEM = 34;
static const int FONT_SIZE_SETTING_SUB_MENU_ITEM = 34;
static const int H_SETTING_MENU_ITEM = 67;
static const int X_SETTING_MENU_LIST_LANDSCAPE = 30;
static const int Y_SETTING_MENU_LIST_LANDSCAPE = 350;
-static const int Y_SETTING_MENU_LIST_LANDSCAPE_MARGIN = 80;
+static const int Y_SETTING_MENU_LIST_LANDSCAPE_MARGIN = 200;
static const int W_SETTING_MENU_LIST_LANDSCAPE = 556;
static const int H_SETTING_MENU_LIST_LANDSCAPE = 540;
static const int X_SETTING_MENU_LIST_PORTRAIT = 26;
-static const int Y_SETTING_MENU_LIST_PORTRAIT = 90;
+static const int Y_SETTING_MENU_LIST_PORTRAIT = 135;
static const int W_SETTING_MENU_LIST_PORTRAIT = 556;
static const int H_SETTING_MENU_LIST_PORTRAIT = 540;
static const int X_SETTING_MENU_CONTESTS = 34;
static const int H_SETTING_MENU_CONTENTS_VALUE = 67;
static const int H_SETTING_SUBMENU_ITEM = 88;
static const int X_SETTING_SUBMENU_RADIO_ICON = 0;
+static const int X_FLASH_SETTING_SUBMENU_RADIO_ICON_MARGIN = 400;
+static const int X_WHITE_BALANCE_RADIO_ICON_MARGIN = 412;
+static const int X_SETTING_SUBMENU_RADIO_ICON_MARGIN = 360;
static const int Y_SETTING_SUBMENU_RADIO_ICON = 0;
static const int W_SETTING_SUBMENU_RADIO_ICON = 84;
static const int H_SETTING_SUBMENU_RADIO_ICON = 84;
static const int X_SETTING_SUBMENU_ICON = 75;
+static const int X_SETTING_SUBMENU_ICON_MARGIN = 65;
static const int Y_SETTING_SUBMENU_ICON = 0;
-static const int W_SETTING_SUBMENU_ICON = 84;
-static const int H_SETTING_SUBMENU_ICON = 84;
+static const int W_SETTING_SUBMENU_ICON = 88;
+static const int H_SETTING_SUBMENU_ICON = 88;
static const int X_SETTING_SUBMENU_2TEXT_ITEM = 75;
static const int Y_SETTING_SUBMENU_2TEXT_ITEM = 0;
static const int W_SETTING_SUBMENU_2TEXT_ITEM = 320;
static const int H_SETTING_SUBMENU_2TEXT_ITEM = 84;
+static const int X_FLASH_SETTING_SUBMENU_3TEXT_ITEM = 57;
static const int X_SETTING_SUBMENU_3TEXT_ITEM = 165;
+static const int X_SETTING_SUBMENU_3TEXT_ITEM_MARGIN = 80;
static const int Y_SETTING_SUBMENU_3TEXT_ITEM = 0;
static const int W_SETTING_SUBMENU_3TEXT_ITEM = 320;
static const int H_SETTING_SUBMENU_3TEXT_ITEM = 84;
-static const int X_SETTING_SUBMENU_3ITEM_TEXT = 165;
-static const int Y_SETTING_SUBMENU_3ITEM_TEXT = 0;
-static const int W_SETTING_SUBMENU_3ITEM_TEXT = 320;
-static const int H_SETTING_SUBMENU_3ITEM_TEXT = 84;
static const int X_SUBMENU_PANEL_START_PORTRAIT = 170;
static const int X_SUBMENU_PANEL_START_LANDSCAPE = 340;
static const int Y_SUBMENU_PANEL_OFFSET_PORTRAIT = 150;
static const int X_SUBMENU_WB_MODE_PANEL = 340;
static const int Y_SUBMENU_WB_MODE_PANEL = 60;
static const int W_SUBMENU_WB_MODE_PANEL = 460;
-static const int X_SUBMENU_WB_MODE_LIST = 2;
+static const int H_SUBMENU_WB_MODE_PANEL_MARGIN = 88;
+static const int X_SUBMENU_WB_MODE_LIST = 10;
static const int Y_SUBMENU_WB_MODE_LIST = 64;
static const int W_SUBMENU_WB_MODE_LIST = 456;
-
+static const int H_SUBMENU_WB_MODE_LIST = 90;
+static const int X_CLOSE_BUTTON_PORTRAIT = 82;
+static const int Y_CLOSE_BUTTON_PORTRAIT = 40;
+static const int X_CLOSE_BUTTON_LANDSCAPE = 40;
+static const int Y_CLOSE_BUTTON_LANDSCAPE = 82;
static const int X_EXPOSURE_PANEL_SLIDER_LANDSCAPE = 28;
static const int Y_EXPOSURE_PANEL_SLIDER_LANDSCAPE = 190;
static const int W_EXPOSURE_PANEL_SLIDER_LANDSCAPE = 60;
static const int Y_FLASH_MODE_SETTING_LIST_RECT = 94;
static const int W_FLASH_MODE_SETTING_LIST_RECT = 428;
static const int H_FLASH_MODE_SETTING_LIST_RECT = 350;
-static const int X_FLASH_MODE_LIST_START_POS_PORTRAIT = 100;
-static const int X_FLASH_MODE_LIST_START_POS_LANDSCAPE = 26;
static const int X_FLASH_MODE_SETTING_LIST_LANDSCAPE = 26;
-static const int Y_FLASH_MODE_SETTING_LIST_LANDSCAPE = 194;
+static const int Y_FLASH_MODE_SETTING_LIST_LANDSCAPE_MARGIN = 150;
+static const int Y_FLASH_MODE_SETTING_LIST_LANDSCAPE = 94;
static const int W_FLASH_MODE_SETTING_LIST_LANDSCAPE = 502;
static const int H_FLASH_MODE_SETTING_LIST_LANDSCAPE = 350;
+static const int H_WHITE_BALANC_SETTING_LIST_LANDSCAPE_MARGIN = 200;
static const int X_FLASH_MODE_SETTING_LIST_PORTRAIT = 100;
+static const int Y_FLASH_MODE_SETTING_LIST_PORTRAIT_MARGIN = 50;
static const int Y_FLASH_MODE_SETTING_LIST_PORTRAIT = 85;
static const int W_FLASH_MODE_SETTING_LIST_PORTRAIT = 502;
static const int H_FLASH_MODE_SETTING_LIST_PORTRAIT = 350;
+static const int H_WHITE_BALANC_SETTING_LIST_PORTRAIT_MARGIN = 200;
static const int X_INDICATOR_STORAGE_FREE_SPACE_PORTRAIT = 311;
static const int Y_INDICATOR_STORAGE_FREE_SPACE_PORTRAIT = 6;
static const int W_INDICATOR_STORAGE_CLEAR_AREA_PORTRAIT = 48;
static const int W_INDICATOR_STORAGE_CLEAR_AREA_LANDSCAPE = 90;
static const int H_INDICATOR_STORAGE_CLEAR_AREA_LANDSCAPE = 48;
static const int FONT_SIZE_INDICATOR_STORAGE_FREE_SPACE = 38;
+static const int CAMERA_PANEL_SUM_SIZE = 320;
+static const int PREVIEW_OVERLAY_PANEL_SIZE = 960;
+static const int PREVIEW_OVERLAY_PANEL_SIZE_MARGIN = 80;
static const int X_PREVIEW_OVERLAY_PORTRAIT = 0;
static const int Y_PREVIEW_OVERLAY_PORTRAIT = 160;
static const int W_PREVIEW_OVERLAY_PORTRAIT = 720;
static const int H_PREVIEW_OVERLAY_PORTRAIT = 960;
-static const int X_FULL_PREVIEW_OVERLAY_PORTRAIT = 0;
-static const int Y_FULL_PREVIEW_OVERLAY_PORTRAIT = 0;
static const int W_FULL_PREVIEW_OVERLAY_PORTRAIT = 720;
-static const int H_FULL_PREVIEW_OVERLAY_PORTRAIT = 1280;
static const int X_PREVIEW_OVERLAY_LANDSCAPE = 160;
static const int Y_PREVIEW_OVERLAY_LANDSCAPE = 0;
static const int W_PREVIEW_OVERLAY_LANDSCAPE = 960;
static const int H_PREVIEW_OVERLAY_LANDSCAPE = 720;
-static const int X_FULL_PREVIEW_OVERLAY_LANDSCAPE = 0;
-static const int Y_FULL_PREVIEW_OVERLAY_LANDSCAPE = 0;
static const int W_FULL_PREVIEW_OVERLAY_LANDSCAPE = 1280;
-static const int H_FULL_PREVIEW_OVERLAY_LANDSCAPE = 720;
static const int W_THUMBNAIL_SCALE_SIZE = 80;
static const int H_THUMBNAIL_SCALE_SIZE = 80;
static const int X_THUMBNAIL_BUTTON_IMG = 14;
static const int FLASH_MODE_OFF = 0;
static const int FLASH_MODE_ON = 1;
static const int FLASH_MODE_AUTO = 2;
+static const int SET_RECORD_START_TIMER_0_SEC = 0;
+static const int SET_RECORD_START_TIMER_2_SEC = 1;
+static const int SET_RECORD_START_TIMER_5_SEC = 2;
+static const int SET_RECORD_START_TIMER_10_SEC = 3;
+static const int CAMCORDER_TIMER_1_SEC = 1000;
+static const int CAMCORDER_TIMER_2_SEC = 2000;
+static const int CAMCORDER_TIMER_5_SEC = 5000;
+static const int CAMCORDER_TIMER_10_SEC = 10000;
+static const int SETTING_TIMER_2_SEC_COUNT = 2;
+static const int SETTING_TIMER_5_SEC_COUNT = 5;
+static const int SETTING_TIMER_10_SEC_COUNT = 10;
+static const int CAMCORDER_TIMER_LIMIT = 120000;
+static const int CAMCORDER_CHARGING_TIMER = 1000;
static const int SETTING_TIMER_RECORD_0_SEC = 0;
static const int SETTING_TIMER_RECORD_2_SEC = 1;
static const int SETTING_TIMER_RECORD_5_SEC = 2;
static const int SETTING_TIMER_RECORD_10_SEC = 3;
-static const int CAMERA_TIMER_1_SEC = 1000;
-static const int CAMERA_TIMER_2_SEC = 2000;
-static const int CAMERA_TIMER_5_SEC = 5000;
-static const int CAMERA_TIMER_10_SEC = 10000;
-static const int SERRING_TIMER_2_SEC_COUNT = 2;
-static const int SERRING_TIMER_5_SEC_COUNT = 5;
-static const int SERRING_TIMER_10_SEC_COUNT = 10;
-static const int CAMCORDER_TIMER_LIMIT = 120000;
-static const int CAMCORDER_CHARGING_TIMER = 1000;
-static const int SETTING_TIMER_CAPTURE_0_SEC = 0;
-static const int SETTING_TIMER_CAPTURE_2_SEC = 1;
-static const int SETTING_TIMER_CAPTURE_5_SEC = 2;
-static const int SETTING_TIMER_CAPTURE_10_SEC = 3;
static const int CAMCORDER_TIMER_ONE_SEC = 1000;
static const int CAMCORDER_FORM_PRIMARY_MODE = 0;
static const int CAMCORDER_FORM_SECONDARY_MODE = 1;
static const int DRAW_RELEASED = 2;
static const int DISABLE_GUIDELINE = 0;
static const int MAX_SETTING_MENU_COUNT = 2;
-static const int MAX_GENERAL_TAB_SETTING_MENU_COUNT = 6;
+static const int MAX_GENERAL_TAB_SETTING_MENU_COUNT = 5;
static const int MAX_FLASH_MENU_COUNT = 3;
static const int MENU_COUNT_CLEAR = 0;
static const int SECONDS_PER_MINUTE = 60;
static const int FRAME_RATE = 2;
static const int UNIT_TEN = 10;
+static const int UNIT_HUNDRED = 100;
+static const int UNIT_THOUSAND = 1000;
static const int X_SUBMENU_TIMER_MODE_PANEL = 340;
static const int Y_SUBMENU_TIMER_MODE_PANEL = 120;
static const int W_SUBMENU_TIMER_MODE_PANEL = 460;
-static const int H_SUBMENU_TIMER_MODE_PANEL = 420;
+static const int H_SUBMENU_TIMER_MODE_PANEL = 445;
-static const int X_SUBMENU_TIMER_MODE_LIST = 2;
+static const int X_SUBMENU_TIMER_MODE_LIST = 10;
static const int Y_SUBMENU_TIMER_MODE_LIST = 64;
static const int W_SUBMENU_TIMER_MODE_LIST = 456;
static const int H_SUBMENU_TIMER_MODE_LIST = 420;
static const int X_SUBMENU_GUIDELINE_MODE_PANEL = 340;
-static const int Y_SUBMENU_GUIDELINE_MODE_PANEL = 360;
+static const int Y_SUBMENU_GUIDELINE_MODE_PANEL = 260;
static const int W_SUBMENU_GUIDELINE_MODE_PANEL = 460;
-static const int H_SUBMENU_GUIDELINE_MODE_PANEL = 240;
-static const int X_SUBMENU_GUIDELINE_MODE_LIST = 2;
+static const int H_SUBMENU_GUIDELINE_MODE_PANEL = 265;
+static const int X_SUBMENU_GUIDELINE_MODE_LIST = 10;
static const int Y_SUBMENU_GUIDELINE_MODE_LIST = 64;
static const int W_SUBMENU_GUIDELINE_MODE_LIST = 456;
static const int H_SUBMENU_GUIDELINE_MODE_LIST = 240;
-static const int X_SUBMENU_STORAGE_MODE_LIST = 2;
+static const int X_SUBMENU_STORAGE_MODE_LIST = 10;
static const int Y_SUBMENU_STORAGE_MODE_LIST = 64;
static const int W_SUBMENU_STORAGE_MODE_LIST = 456;
static const int H_SUBMENU_STORAGE_MODE_LIST = 240;
static const int X_SUBMENU_STORAGE_MODE_PANEL = 340;
-static const int Y_SUBMENU_STORAGE_MODE_PANEL = 470;
+static const int Y_SUBMENU_STORAGE_MODE_PANEL = 320;
static const int W_SUBMENU_STORAGE_MODE_PANEL = 460;
-static const int H_SUBMENU_STORAGE_MODE_PANEL = 240;
+static const int H_SUBMENU_STORAGE_MODE_PANEL = 265;
static const int RECORDING_RESOLOTION_WIDTH = 640;
static const int RECORDING_RESOLOTION_HEIGHT = 480;
static const int X_INDICATOR_BATTERY_PORTRAIT = 300;
static const int Y_INDICATOR_BATTERY_PORTRAIT = 4;
-static const int X_INDICATOR_BATTERY_LANDSCAPE = 400;
+static const int X_INDICATOR_BATTERY_LANDSCAPE = 532;
static const int Y_INDICATOR_BATTERY_LANDSCAPE = 4;
static const int SCREEN_OVERLAY_HELP_ENABLE = 1;
, __screenMode(SCREEN_MODE_NORMAL)
, __pOverlayPanel(null)
, __pAppTimer(null)
- , __pSettingTimer(null)
+ , __pIntervalValueTimer(null)
, __pRecordTimer(null)
, __pPopupTimer(null)
, __pExposureCloseTimer(null)
, __pExposureValueButton(null)
, __pCloseButton(null)
, __pAutoFocus(null)
+ , __pSettingLine(null)
, __pCameraIconLabel(null)
, __pCamcoderIconLabel(null)
, __pSwButton(null)
, __pBackButton(null)
, __pBack(null)
, __pBatteryState(null)
- , __pRecLabel(null)
, __pRecLabelRed(null)
, __pRecLabelText(null)
, __pElapsedTimeLable(null)
, __pButtonPoint(Point(0, 0))
, __pThumbnailPanel(null)
, __pCameraInfoPanel(null)
- , __pCamraInfoSubPanel(null)
+ , __pCameraInfoSubPanel(null)
+ , __pCameraInfoGeneralSubPanel(null)
, __pSettingMenuString(null)
, __pSettingGeneralMenuString(null)
, __pCameraStarterThread(null)
SetBackgroundColor(COLOR_PANEL_BACKGROUND_BLACK);
r = InitSettingMenuPanel();
- TryCatch(r == E_SUCCESS, , "InitSettingMenuPanel() fail[%s]", GetErrorMessage(r));
+ //TryCatch(r == E_SUCCESS, , "InitSettingMenuPanel() fail[%s]", GetErrorMessage(r));
r = InitActionMenuPanel();
TryCatch(r == E_SUCCESS, , "InitActionMenuPanel() fail[%s]", GetErrorMessage(r));
+ if (__pRecLabelRed)
+ {
+ __pRecLabelRed->SetShowState(false);
+ __pRecLabelRed->Invalidate(true);
+ }
+
+ if (__pRecLabelText)
+ {
+ __pRecLabelText->SetShowState(false);
+ __pRecLabelText->Invalidate(true);
+ }
+
InitScreenOverlayHelp();
CheckBatteryStatus();
HideUiPanel(false);
}
void
-CamcorderForm::SetRecordMode(int timerInterval)
+CamcorderForm::SetStartRecording(void)
{
AppLogDebug("ENTER");
result r = E_SUCCESS;
+ int timerInterval = 0;
- if (timerInterval == SETTING_TIMER_RECORD_0_SEC)
- {
- result r = E_SUCCESS;
+ timerInterval = GetTimerIntervalValue();
- AppLogDebug("Record start");
+ switch (timerInterval)
+ {
+ case SETTING_TIMER_RECORD_0_SEC:
+ {
+ if (__pIntervalValueTimer)
+ {
+ __pIntervalValueTimer->Cancel();
+ }
+ __isRecording = true;
- __pSettingTimer->Cancel();
+ __pCamcorderPresentationModel->StartRecord();
+ r = StartRecordTimer();
+ TryReturnVoid(r == E_SUCCESS, "StartRecordTimer() fail[%s]", GetErrorMessage(r));
- __isRecording = true;
+ SetRecordButton(true);
- __pCamcorderPresentationModel->StartRecord();
- r = StartRecordTimer();
- TryReturnVoid(r == E_SUCCESS, "StartRecordTimer() fail[%s]", GetErrorMessage(r));
- SetRecordButton(true);
+ if (__pCameraInfoPanel->GetDrawPopupTimer() == true)
+ {
+ __pCameraInfoPanel->SetDrawPopupTimer(false);
- if (__pCameraInfoPanel->GetDrawPopupTimer() == true)
- {
- __pCameraInfoPanel->SetDrawPopupTimer(false);
+ __pCameraInfoPanel->Invalidate(true);
+ }
- __pCameraInfoPanel->Invalidate(true);
+ StopPopupTimer();
}
+ break;
- EndPopupTimer();
- }
- else
- {
- r = SettingTimerRecord(timerInterval);
- TryReturnVoid(r == E_SUCCESS, "SettingTimerCapture() fail[%s]", GetErrorMessage(r));
+ case SETTING_TIMER_RECORD_2_SEC:
+ // fall through
+ case SETTING_TIMER_RECORD_5_SEC:
+ // fall through
+ case SETTING_TIMER_RECORD_10_SEC:
+ {
+ r = SetRecordStartTimer(timerInterval);
+ TryReturnVoid(r == E_SUCCESS, "SetRecordStartTimer() fail[%s]", GetErrorMessage(r));
- __timeCount = 0;
+ __timeCount = 0;
+
+ r = DrawTimerPopup();
+ TryReturnVoid(r == E_SUCCESS, "DrawTimerPopup() fail[%s]", GetErrorMessage(r));
+ }
+ break;
- r = DrawTimerPopup();
- TryReturnVoid(r == E_SUCCESS, "DrawTimerPopup() fail[%s]", GetErrorMessage(r));
+ default:
+ break;
}
AppLogDebug("EXIT");
}
if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
{
r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
-
- if (r == E_SUCCESS)
- {
- SetWhiteBalancePopop();
- }
- else
- {
- AppLogDebug("CAMERA_PRIMARY_WHITE_BALANCE NOT SUPPORT");
- }
}
else
{
r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
- if (r == E_SUCCESS)
- {
- SetWhiteBalancePopop();
- }
- else
- {
- AppLogDebug("CAMERA_PRIMARY_WHITE_BALANCE NOT SUPPORT");
- }
+ }
+
+ if (r == E_SUCCESS)
+ {
+ SetWhiteBalancePopop();
+ }
+ else
+ {
+ AppLogDebug("WB is not support");
}
}
break;
- case IDA_BUTTON_CAMCORDER_THUMBNAIL:
+ case IDA_BUTTON_CAMCORDER_AUTO_FOCUS:
{
Point currentPosition;
int selfPortraitEnable = 0;
currentPosition.y = (H_PREVIEW_OVERLAY_LANDSCAPE / DIVIDE_BY_TWO);
}
- if (__pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING)
+ if (__pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING || __isRecording == true)
{
- if (__isRecording == true)
- {
- r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
- TryReturnVoid(r == E_SUCCESS, "Reg getValue fail[%s]", GetErrorMessage(r));
-
- if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
- {
- r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
-
- if (focusSupport == true && r == E_SUCCESS)
- {
- AppLogDebug("focus is Support");
-
- __pCameraInfoPanel->SetCurrentPoint(currentPosition);
+ r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+ TryReturnVoid(r == E_SUCCESS, "Reg getValue fail[%s]", GetErrorMessage(r));
- __pCameraInfoPanel->SetDrawMarkerFocus(true);
+ if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
+ {
+ r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
+ }
+ else
+ {
+ r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_FOCUS, focusSupport);
+ }
- DrawFocus(CAMERA_FOCUS_NOT_READY);
- }
- else
- {
- __pCameraInfoPanel->SetDrawMarkerFocus(false);
+ if (focusSupport == true && r == E_SUCCESS)
+ {
+ AppLogDebug("focus is Support");
- __pCameraInfoPanel->Invalidate(true);
- }
- }
- else
- {
- r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_FOCUS, focusSupport);
- if (focusSupport == true && r == E_SUCCESS)
- {
- __pCameraInfoPanel->SetCurrentPoint(currentPosition);
+ __pCameraInfoPanel->SetCurrentPoint(currentPosition);
- __pCameraInfoPanel->SetDrawMarkerFocus(true);
+ __pCameraInfoPanel->SetDrawMarkerFocus(true);
- DrawFocus(CAMERA_FOCUS_NOT_READY);
- }
- else
- {
- __pCameraInfoPanel->SetDrawMarkerFocus(false);
+ DrawFocus(CAMERA_FOCUS_NOT_READY);
+ }
+ else
+ {
+ __pCameraInfoPanel->SetDrawMarkerFocus(false);
- __pCameraInfoPanel->Invalidate(true);
- }
- }
- __pCamcorderPresentationModel->SetContinuousAutoFocus();
+ __pCameraInfoPanel->Invalidate(true);
}
+
+ __pCamcorderPresentationModel->SetContinuousAutoFocus();
}
}
}
break;
+ case IDA_BUTTON_CAMCORDER_THUMBNAIL:
+ {
+ }
+ break;
+
case IDA_BUTTON_CAMCORDER_BACK:
{
- bool isAppControl = false;
-
if (__pHelpGoToGallery->GetShowState() == true)
{
OnHelpCloseTimerExpired();
}
else
{
- isAppControl = (static_cast<CameraApp*>(UiApp::GetInstance()))->IsAppControl();
-
- if (isAppControl == true)
+ if (IsAppControlRequest() == true)
{
SetThumbNailButton();
}
int mode = CameraPresentationModel::CAMERA_MODE_SNAPSHOT;
String filePath = L"";
int requestType = 0;
- bool isAppControl = false;
HashMap* pDataList = new (std::nothrow) HashMap(SingleObjectDeleter);
pDataList->Construct();
AppControlProviderManager* pAppManager = AppControlProviderManager::GetInstance();
- isAppControl = (static_cast<CameraApp*>(UiApp::GetInstance()))->IsAppControl();
-
- if (isAppControl == true)
+ if (IsAppControlRequest() == true)
{
requestType = __pCamcorderPresentationModel->GetAppControlRequestType();
HidePopup();
+ if (__pRecLabelRed)
+ {
+ __pRecLabelRed->SetShowState(false);
+ __pRecLabelRed->Invalidate(true);
+ }
+
+ if (__pRecLabelText)
+ {
+ __pRecLabelText->SetShowState(false);
+ __pRecLabelText->Invalidate(true);
+ }
+
isRunStartPreviewThread = (static_cast<CameraApp*>(UiApp::GetInstance()))->GetUsedRunStartPreviewThread();
AppLogDebug("isRunStartPreviewThread [%d]", isRunStartPreviewThread);
__pAppTimer->Cancel();
}
- if (__pSettingTimer)
+ if (__pIntervalValueTimer)
{
- __pSettingTimer->Cancel();
+ __pIntervalValueTimer->Cancel();
}
if (__pChargingTimer)
AppLogDebug("EXIT");
}
+bool
+CamcorderForm::IsAppControlRequest(void)
+{
+ AppLogDebug("ENTER");
+ bool isAppControl = false;
+
+ isAppControl = (static_cast<CameraApp*>(UiApp::GetInstance()))->IsAppControl();
+ AppLogDebug("IsAppControlRequest = %d", isAppControl);
+
+ if (isAppControl)
+ {
+ AppLogDebug("EXIT");
+ return true;
+ }
+ else
+ {
+ AppLogDebug("EXIT");
+ return false;
+ }
+}
+
void
CamcorderForm::Update(bool isInvalidated)
{
Bitmap* pThumbnailBitmap = null;
Bitmap* pRotateBitmap = null;
Bitmap* pBitmap = null;
- bool isAppControl = false;
-
- isAppControl = (static_cast<CameraApp*>(UiApp::GetInstance()))->IsAppControl();
- if (isAppControl == false)
+ if (IsAppControlRequest() == false)
{
if (__isRecording || __pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING)
{
AppLogDebug("ENTER");
__timeCount = 0;
- __pSettingTimer->Cancel();
+ __pIntervalValueTimer->Cancel();
if (__pPopupTimer)
{
AppLogDebug("VIDEO_RECORDER_CLOSED_LISTENER.");
CameraFlashMode cameraFlashMode = CAMERA_FLASH_MODE_OFF;
int selfPortraitEnable = 0;
- bool isAppControl = false;
int requestType = 0;
result r = E_SUCCESS;
Bitmap* pThumbnailBitmap = null;
Bitmap* pRotateBitmap = null;
- isAppControl = (static_cast<CameraApp*>(UiApp::GetInstance()))->IsAppControl();
-
requestType = __pCamcorderPresentationModel->GetAppControlRequestType();
HideUiPanel(false);
__pCamcorderPresentationModel->SetOnVideoRecorderStopped(false);
- if (isAppControl == true && requestType == CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_SUCCEEDED)
+ if (IsAppControlRequest() == true && requestType == CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_SUCCEEDED)
{
AppLogDebug("Recrrder after OnFormBackRequested");
case CAMERA_ACTION_EVENT_VIDEO_RECORDER_END_REACHED:
{
AppLogDebug("CAMERA_ACTION_EVENT_VIDEO_RECORDER_END_REACHED.");
-
- bool isAppControl = false;
int requestType = 0;
- isAppControl = (static_cast<CameraApp*>(UiApp::GetInstance()))->IsAppControl();
-
requestType = __pCamcorderPresentationModel->GetAppControlRequestType();
HideUiPanel(false);
__pCamcorderPresentationModel->SetOnVideoRecorderStopped(false);
- if (isAppControl == true && requestType == CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_SUCCEEDED)
+ if (IsAppControlRequest() == true && requestType == CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_SUCCEEDED)
{
AppLogDebug("RECORDER_END_REACHED after OnFormBackRequested");
CamcorderForm::OnFormBackRequested(*this);
case CAMERA_ACTION_EVENT_VIDEO_RECORDER_ERROR_OCCURRED:
{
AppLogDebug("VIDEO_RECORDER_ERROR_OCCURRED_LISTENER.");
- bool isAppControl = false;
int requestType = 0;
HideUiPanel(false);
__pCamcorderPresentationModel->SetOnVideoRecorderStopped(false);
- isAppControl = (static_cast<CameraApp*>(UiApp::GetInstance()))->IsAppControl();
requestType = __pCamcorderPresentationModel->GetAppControlRequestType();
- if (isAppControl == true && requestType == CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED)
+ if (IsAppControlRequest() == true && requestType == CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED)
{
AppLogDebug("RECORDER_ERROR_OCCURRED after OnFormBackRequested");
AppLogDebug("FRAME_ACTIVATED:CAMERA_STATE_ERROR");
__pCamcorderPresentationModel->ToggleCameraCamcorder(CameraPresentationModel::CAMERA_MODE_RECORD);
-#if true
+
r = __pOverlayPanel->GetBackgroundBufferInfo(bufferinfo);
TryReturnVoid(r == E_SUCCESS, "GetBackgroundBufferInfo fail[%s]", GetErrorMessage(r));
__pCamcorderPresentationModel->StartPreview(&bufferinfo);
-#else
- r = RunStartPreviewThread();
- TryReturnVoid(r == E_SUCCESS, "RunStartPreviewThread fail[%s]", GetErrorMessage(r));
-#endif
}
AppLogDebug("CAMERA_ACTION_EVENT_FRAME_ACTIVATED:CameraPoweredOn");
}
HideUiQuickMenu();
HideUiModeChangedButton();
DrawThumbnail();
+ InitElapsedTimeLable();
SendCameraToBackground();
}
break;
{
AppLogDebug("CAMERA_ACTION_EVENT_STORAGE_CARD_UNMOUNT happen");
bool doHidePopup = false;
- bool isAppControl = false;
int requestType = 0;
- isAppControl = (static_cast<CameraApp*>(UiApp::GetInstance()))->IsAppControl();
-
requestType = __pCamcorderPresentationModel->GetAppControlRequestType();
- if (isAppControl == true && requestType == CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED)
+ if (IsAppControlRequest() == true && requestType == CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED)
{
AppLogDebug("Camera Captured after OnFormBackRequested");
__pSettingButton->AddActionEventListener(*this);
__pSettingButton->AddTouchEventListener(*this);
+ __pSettingLine = static_cast<Label*>(GetControl(L"IDC_SETTING_LINE"));
+ TryCatch(__pSettingLine != null, r = E_SYSTEM, "pSettingButton is null");
+ __pSettingLine->AddTouchEventListener(*this);
+
__pQuickSettingButton = static_cast<Button*>(GetControl(L"IDC_QUICK_SETTING_BUTTON"));
TryCatch(__pQuickSettingButton != null, r = E_SYSTEM, "pQuickSettingButton is null");
__pAutoFocus = static_cast<Button*>(GetControl(L"IDC_AUTOFOCUS_BUTTON"));
TryCatch(__pAutoFocus != null, r = E_SYSTEM, "__pAutoFocus is null");
+ __pAutoFocus->SetActionId(IDA_BUTTON_CAMCORDER_AUTO_FOCUS);
__pAutoFocus->AddTouchEventListener(*this);
__pAutoFocus->AddActionEventListener(*this);
r = UpdateUiPanelIcon();
- TryCatch(r == E_SUCCESS, r = E_SYSTEM, "UpdateUiPanelIcon() fail[%s]", GetErrorMessage(r));
+ //TryCatch(r == E_SUCCESS, r = E_SYSTEM, "UpdateUiPanelIcon() fail[%s]", GetErrorMessage(r));
AppLogDebug("EXIT");
return r;
__pFlashButton = null;
__pSelfShotButton = null;
__pSettingButton = null;
+ __pSettingLine = null;
__pQuickSettingButton = null;
__pWhiteBalanceButton = null;
__pExposureValueButton = null;
r = __pCamcorderPresentationModel->SetValue(FLASH_MODE, FLASH_MODE_OFF);
TryCatch(r == E_SUCCESS, , "SetValue Reg Fail[%s]", GetErrorMessage(r));
- pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_FLASH_OFF_NOR);
+ pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_FLASH_OFF_PRESS_DIM);
TryCatch(pBitmap != null, r = E_SYSTEM, "FlashButton::pBitmap is null");
pBitmapRotate = RotationImageN(pBitmap, rotationType);
delete pBitmapRotate;
pBitmapRotate = null;
}
- else
+ else if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
{
r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
r = __pCamcorderPresentationModel->SetValue(FLASH_MODE, FLASH_MODE_OFF);
TryCatch(r == E_SUCCESS, , "SetValue Reg Fail[%s]", GetErrorMessage(r));
- pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_FLASH_OFF_NOR);
+ pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_FLASH_OFF_PRESS_DIM);
TryCatch(pBitmap != null, r = E_SYSTEM, "FlashButton::pBitmap is null");
pBitmapRotate = RotationImageN(pBitmap, rotationType);
}
}
+ TryCatch(__pSelfShotButton != null, r = E_SYSTEM, "__pSelfShotButton is null");
+
if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
{
- TryCatch(__pSelfShotButton != null, r = E_SYSTEM, "__pSelfShotButton is null");
-
pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_BACK);
- TryCatch(pBitmap != null, r = E_SYSTEM, "pBitmap is null");
-
- pBitmapRotate = RotationImageN(pBitmap, IMAGE_ROTATION_0);
- TryCatch(pBitmapRotate != null, r = E_SYSTEM, "ChangeMode::pBitmapRotate is null");
-
- __pSelfShotButton->SetNormalBackgroundBitmap(*pBitmapRotate);
-
- delete pBitmap;
- pBitmap = null;
-
- delete pBitmapRotate;
- pBitmapRotate = null;
-
- pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_BACK_PRESS);
- TryCatch(pBitmap != null, r = E_SYSTEM, "pBitmap is null");
-
- pBitmapRotate = RotationImageN(pBitmap, IMAGE_ROTATION_0);
- TryCatch(pBitmapRotate != null, r = E_SYSTEM, "ChangeMode::pBitmapRotate is null");
-
- __pSelfShotButton->SetPressedBackgroundBitmap(*pBitmapRotate);
-
- delete pBitmap;
- pBitmap = null;
-
- delete pBitmapRotate;
- pBitmapRotate = null;
}
- else
+ else if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY)
{
- TryCatch(__pSelfShotButton != null, r = E_SYSTEM, "__pSelfShotButton is null");
-
pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_FRONT);
- TryCatch(pBitmap != null, r = E_SYSTEM, "pBitmap is null");
+ }
+ TryCatch(pBitmap != null, r = E_SYSTEM, "SelfShot::pBitmap is null");
- pBitmapRotate = RotationImageN(pBitmap, IMAGE_ROTATION_0);
- TryCatch(pBitmapRotate != null, r = E_SYSTEM, "ChangeMode::pBitmapRotate is null");
+ pBitmapRotate = RotationImageN(pBitmap, rotationType);
+ TryCatch(pBitmapRotate != null, r = E_SYSTEM, "SwButton::pBitmapRotate is null");
- __pSelfShotButton->SetNormalBackgroundBitmap(*pBitmapRotate);
+ __pSelfShotButton->SetNormalBackgroundBitmap(*pBitmapRotate);
- delete pBitmap;
- pBitmap = null;
+ delete pBitmap;
+ pBitmap = null;
- delete pBitmapRotate;
- pBitmapRotate = null;
+ delete pBitmapRotate;
+ pBitmapRotate = null;
+ if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
+ {
+ pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_BACK_PRESS);
+ }
+ else if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY)
+ {
pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_FRONT_PRESS);
- TryCatch(pBitmap != null, r = E_SYSTEM, "pBitmap is null");
+ }
+ TryCatch(pBitmap != null, r = E_SYSTEM, "SelfShot::pBitmap is null");
- pBitmapRotate = RotationImageN(pBitmap, IMAGE_ROTATION_0);
- TryCatch(pBitmapRotate != null, r = E_SYSTEM, "ChangeMode::pBitmapRotate is null");
+ pBitmapRotate = RotationImageN(pBitmap, rotationType);
+ TryCatch(pBitmapRotate != null, r = E_SYSTEM, "SwButton::pBitmapRotate is null");
- __pSelfShotButton->SetPressedBackgroundBitmap(*pBitmapRotate);
+ __pSelfShotButton->SetPressedBackgroundBitmap(*pBitmapRotate);
- delete pBitmap;
- pBitmap = null;
+ delete pBitmap;
+ pBitmap = null;
- delete pBitmapRotate;
- pBitmapRotate = null;
- }
+ delete pBitmapRotate;
+ pBitmapRotate = null;
if (__dir == ORIENTATION_STATUS_PORTRAIT
|| __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
{
- __pCloseButton->SetSize(82, 40);
+ __pCloseButton->SetSize(X_CLOSE_BUTTON_PORTRAIT, Y_CLOSE_BUTTON_PORTRAIT);
}
else
{
rotationType = IMAGE_ROTATION_270;
- __pCloseButton->SetSize(40, 82);
+ __pCloseButton->SetSize(X_CLOSE_BUTTON_LANDSCAPE, Y_CLOSE_BUTTON_LANDSCAPE);
}
pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_SETTING_NOR);
delete pBitmapRotate;
pBitmapRotate = null;
+ TryCatch(__pSettingLine != null, r = E_SYSTEM, "__pSettingLine is null");
+
+ pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_SETTING_LINE);
+ TryCatch(pBitmap != null, r = E_SYSTEM, "SettingLine::pBitmap is null");
+
+ pBitmapRotate = RotationImageN(pBitmap, rotationType);
+ TryCatch(pBitmapRotate != null, r = E_SYSTEM, "SettingLine::pBitmapRotate is null");
+
+ __pSettingLine->SetBackgroundBitmap(*pBitmapRotate);
+
+ delete pBitmap;
+ pBitmap = null;
+
+ delete pBitmapRotate;
+ pBitmapRotate = null;
+
TryCatch(__pQuickSettingButton != null, r = E_SYSTEM, "__pQuickSettingButton is null");
pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_QUICK_SETTING_NOR);
TryCatch(pBitmap != null, r = E_SYSTEM, "QuickSetting::pBitmap is null");
TryCatch(__pWhiteBalanceButton != null, r = E_SYSTEM, "__pWhiteBalanceButton is null");
- pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_WHITEBALANCE);
- TryCatch(pBitmap != null, r = E_SYSTEM, "WhiteBalance::pBitmap is null");
+ if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
+ {
+ r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
+ }
+ else
+ {
+ r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
+ }
+
+ if (r == E_SUCCESS)
+ {
+ pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_WHITEBALANCE);
+ TryCatch(pBitmap != null, r = E_SYSTEM, "WhiteBalance::pBitmap is null");
- __pWhiteBalanceButton->SetNormalBackgroundBitmap(*pBitmap);
+ __pWhiteBalanceButton->SetNormalBackgroundBitmap(*pBitmap);
+
+ delete pBitmap;
+ pBitmap = null;
- pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_WHITEBALANCE_PRESS);
- TryCatch(pBitmap != null, r = E_SYSTEM, "WhiteBalance::pBitmap is null");
+ pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_WHITEBALANCE_PRESS);
+ TryCatch(pBitmap != null, r = E_SYSTEM, "WhiteBalance::pBitmap is null");
- __pWhiteBalanceButton->SetPressedBackgroundBitmap(*pBitmap);
+ __pWhiteBalanceButton->SetPressedBackgroundBitmap(*pBitmap);
- delete pBitmap;
- pBitmap = null;
+ delete pBitmap;
+ pBitmap = null;
+ }
+ else
+ {
+ pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_WHITEBALANCE_DIM_PRESS);
+ TryCatch(pBitmap != null, r = E_SYSTEM, "WhiteBalance::pBitmap is null");
+
+ __pWhiteBalanceButton->SetNormalBackgroundBitmap(*pBitmap);
+
+ delete pBitmap;
+ pBitmap = null;
+
+ pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_WHITEBALANCE_DIM_PRESS);
+ TryCatch(pBitmap != null, r = E_SYSTEM, "WhiteBalance::pBitmap is null");
+
+ __pWhiteBalanceButton->SetPressedBackgroundBitmap(*pBitmap);
+
+ delete pBitmap;
+ pBitmap = null;
+ }
TryCatch(__pExposureValueButton != null, r = E_SYSTEM, "__pExposureValueButton is null");
|| __pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_STOPPED
)
{
+ __pCameraInfoPanel->SetDrawIndicator(false);
+ __pCameraInfoPanel->Draw();
+ __pCameraInfoPanel->Show();
+
HideUiPanel(true);
+ HidePopup();
+
onVideoRecorderStopped = __pCamcorderPresentationModel->GetOnVideoRecorderStopped();
if (onVideoRecorderStopped == false)
}
else
{
- HideUiPanel(false);
-
StopRecord();
- }
- AppLogDebug("EXIT");
-}
-void
-CamcorderForm::OnTouchLaunchImageview(void)
-{
- AppLogDebug("ENTER");
- bool onVideoRecorderStopped = false;
- int storageCardChageState = CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_UNKNOWN;
- String fullFileName = L"";
+ if (__pElapsedTimeLable)
+ {
+ __pElapsedTimeLable->SetShowState(false);
+ __pElapsedTimeLable->Invalidate(true);
+ }
+
+ if (__pElapsedTimeMaxLable)
+ {
+ __pElapsedTimeMaxLable->SetShowState(false);
+ __pElapsedTimeMaxLable->Invalidate(true);
+ }
+
+ if (__pElapsedRecordSizeLable)
+ {
+ __pElapsedRecordSizeLable->SetShowState(false);
+ __pElapsedRecordSizeLable->Invalidate(true);
+ }
+
+ if (__pRecLabelRed)
+ {
+ __pRecLabelRed->SetShowState(false);
+ __pRecLabelRed->Invalidate(true);
+ }
+
+ if (__pRecLabelText)
+ {
+ __pRecLabelText->SetShowState(false);
+ __pRecLabelText->Invalidate(true);
+ }
+
+ HideUiPanel(false);
+ }
+ AppLogDebug("EXIT");
+}
+
+void
+CamcorderForm::OnTouchLaunchImageview(void)
+{
+ AppLogDebug("ENTER");
+ bool onVideoRecorderStopped = false;
+ int storageCardChageState = CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_UNKNOWN;
+ String fullFileName = L"";
if (__pCamcorderPresentationModel->GetLatestThumbnail() != null)
{
AppLogDebug("ENTER");
String controlName = source.GetName();
bool doHidePopup = false;
- bool isAppControl = false;
-
- isAppControl = (static_cast<CameraApp*>(UiApp::GetInstance()))->IsAppControl();
if (__pCameraInfoPanel->GetDrawExposure() == true)
{
if (controlName.Equals(String(IDS_THUMBNAIL_PANLE_NAME))
&& __pThumbnailPanel->GetShowState() == true
- && isAppControl == false
+ && IsAppControlRequest() == false
&& __pCamcorderPresentationModel->GetRecorderState() != RECORDER_STATE_RECORDING
)
{
AppLogDebug("ENTER");
result r = E_SUCCESS;
- __pSettingTimer->Cancel();
+ __pIntervalValueTimer->Cancel();
__pCameraInfoPanel->SetDrawPopupTimerUpdate(false);
__pCameraInfoPanel->SetDrawPopupTimerCount(__timeCount);
- __pCameraInfoPanel->Invalidate(true);
+ __pCameraInfoPanel->SetDrawIndicator(false);
- if (__dir == ORIENTATION_STATUS_LANDSCAPE
- || __dir == ORIENTATION_STATUS_LANDSCAPE_REVERSE)
- {
- __pCameraInfoPanel->SetDrawIndicator(true);
- __pCameraInfoPanel->Invalidate(true);
- }
+ __pCameraInfoPanel->Invalidate(true);
AppLogDebug("__timeCount=%d", __timeCount);
if (__timeCount == INDEX_UNIT_ZERO || __timeCount == INDEX_UNIT_ONE)
{
- EndPopupTimer();
+ StopPopupTimer();
}
}
AppLogDebug("EXIT");
AppLogDebug("__pAppTimer");
OnAppTimerExpired();
}
- else if (timer.Equals(*__pSettingTimer))
+ else if (timer.Equals(*__pIntervalValueTimer))
{
- AppLogDebug("__pSettingTimer");
+ AppLogDebug("__pIntervalValueTimer");
OnSettingTimerExpired();
}
else if (timer.Equals(*__pPopupTimer))
__pGeneralSetting->AddActionEventListener(*this);
__pGeneralSetting->SetShowState(false);
- __pRecLabel = static_cast<Label*>(GetControl(L"IDC_REC_LABEL"));
- TryCatch(__pRecLabel != null, r = E_SYSTEM, "__pRecLabel is null");
- __pRecLabel->AddTouchEventListener(*this);
- __pRecLabel->SetShowState(true);
-
__pRecLabelRed = static_cast<Label*>(GetControl(L"IDC_REC_LABEL_RED"));
TryCatch(__pRecLabelRed != null, r = E_SYSTEM, "__pRecLabelRed is null");
__pRecLabelRed->AddTouchEventListener(*this);
CamcorderForm::InitSettingTimer(void)
{
AppLogDebug("ENTER");
- __pSettingTimer = new (std::nothrow) Timer();
- __pSettingTimer->Construct(*this);
+ __pIntervalValueTimer = new (std::nothrow) Timer();
+ __pIntervalValueTimer->Construct(*this);
AppLogDebug("EXIT");
}
}
result
-CamcorderForm::SettingTimerRecord(int timeInterval)
+CamcorderForm::SetRecordStartTimer(int timeInterval)
{
AppLogDebug("ENTER");
result r = E_SUCCESS;
+ AppLogDebug("timeInterval = %d", timeInterval);
+
switch (timeInterval)
{
- case SETTING_TIMER_RECORD_0_SEC:
+ case SET_RECORD_START_TIMER_0_SEC:
{
- AppLogDebug("settingTimer = 0");
}
break;
- case SETTING_TIMER_RECORD_2_SEC:
+ case SET_RECORD_START_TIMER_2_SEC:
{
- AppLogDebug("settingTimer = 2");
- __pSettingTimer->Cancel();
+ __pIntervalValueTimer->Cancel();
- r = __pSettingTimer->Start(CAMERA_TIMER_2_SEC);
- TryCatch(r == E_SUCCESS, , "__pSettingTimer start fail[%s]", GetErrorMessage(r));
+ r = __pIntervalValueTimer->Start(CAMCORDER_TIMER_2_SEC);
+ TryCatch(r == E_SUCCESS, , "__pIntervalValueTimer start fail[%s]", GetErrorMessage(r));
}
break;
- case SETTING_TIMER_RECORD_5_SEC:
+ case SET_RECORD_START_TIMER_5_SEC:
{
- AppLogDebug("settingTimer = 5");
- __pSettingTimer->Cancel();
+ __pIntervalValueTimer->Cancel();
- r = __pSettingTimer->Start(CAMERA_TIMER_5_SEC);
- TryCatch(r == E_SUCCESS, , "__pSettingTimer start fail[%s]", GetErrorMessage(r));
+ r = __pIntervalValueTimer->Start(CAMCORDER_TIMER_5_SEC);
+ TryCatch(r == E_SUCCESS, , "__pIntervalValueTimer start fail[%s]", GetErrorMessage(r));
}
break;
- case SETTING_TIMER_RECORD_10_SEC:
+ case SET_RECORD_START_TIMER_10_SEC:
{
- AppLogDebug("settingTimer = 10");
- __pSettingTimer->Cancel();
+ __pIntervalValueTimer->Cancel();
- r = __pSettingTimer->Start(CAMERA_TIMER_10_SEC);
- TryCatch(r == E_SUCCESS, , "__pSettingTimer start fail[%s]", GetErrorMessage(r));
+ r = __pIntervalValueTimer->Start(CAMCORDER_TIMER_10_SEC);
+ TryCatch(r == E_SUCCESS, , "__pIntervalValueTimer start fail[%s]", GetErrorMessage(r));
}
break;
__pAppTimer->Cancel();
}
- if (__pSettingTimer != null)
+ if (__pIntervalValueTimer != null)
{
- __pSettingTimer->Cancel();
+ __pIntervalValueTimer->Cancel();
}
if (__pPopupTimer)
__pAppTimer = null;
}
- if (__pSettingTimer)
+ if (__pIntervalValueTimer)
{
- __pSettingTimer->Cancel();
+ __pIntervalValueTimer->Cancel();
- delete __pSettingTimer;
- __pSettingTimer = null;
+ delete __pIntervalValueTimer;
+ __pIntervalValueTimer = null;
}
if (__pPopupTimer)
CamcorderForm::OnKeyPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode)
{
AppLogDebug("ENTER OnKeyPressed Control : %ls, KeyCode : %d", source.GetName().GetPointer(), keyCode);
- if (keyCode == KEY_POWER_HOLD)
- {
- AppLogDebug("ENTER OnKeyPressed Control : KEY_POWER_HOLD");
- }
AppLogDebug("EXIT");
}
CamcorderForm::OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode)
{
AppLogDebug("ENTER OnKeyReleased Control : %ls, KeyCode : %d", source.GetName().GetPointer(), keyCode);
- if (keyCode == KEY_POWER_HOLD)
- {
- AppLogDebug("ENTER OnKeyPressed Control : KEY_POWER_HOLD");
- }
AppLogDebug("EXIT");
}
CamcorderForm::OnKeyLongPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode)
{
AppLogDebug("ENTER OnKeyLongPressed Control : %ls, KeyCode : %d", source.GetName().GetPointer(), keyCode);
- if (keyCode == KEY_SIDE_UP
- || keyCode == KEY_SIDE_DOWN)
- {
- // Empty statement
- }
- else if (keyCode == KEY_POWER_HOLD)
- {
- AppLogDebug("ENTER OnKeyPressed Control : KEY_POWER_HOLD");
- __isLockScreenMode = true;
- }
AppLogDebug("EXIT");
}
+int
+CamcorderForm::GetTimerIntervalValue(void) const
+{
+ AppLogDebug("ENTER");
+ result r = E_SUCCESS;
+ int timerInterval = 0;
+
+ r = __pCamcorderPresentationModel->GetValue(TIMER_INTERVAL, timerInterval);
+ TryCatch(r == E_SUCCESS, , "Faled to get value to registry");
+
+ AppLogDebug("EXIT");
+ return timerInterval;
+
+CATCH:
+ return 0;
+}
+
void
CamcorderForm::SetGuideLine(int guideLineEnable)
{
if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
{
r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
-
- if (r == E_SUCCESS)
- {
- r = __pCamcorderPresentationModel->GetValue(WHITE_BALANCE_TYPE, adjustValue);
- TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
-
- AppLogDebug("adjustValue = %d", adjustValue);
-
- __pCamcorderPresentationModel->SetWhiteBalance((CameraWhiteBalance)adjustValue);
- }
}
else
{
r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
+ }
- if (r == E_SUCCESS)
- {
- r = __pCamcorderPresentationModel->GetValue(WHITE_BALANCE_TYPE, adjustValue);
- TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
+ if (r == E_SUCCESS)
+ {
+ r = __pCamcorderPresentationModel->GetValue(WHITE_BALANCE_TYPE, adjustValue);
+ TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
- AppLogDebug("adjustValue = %d", adjustValue);
+ AppLogDebug("adjustValue = %d", adjustValue);
- __pCamcorderPresentationModel->SetWhiteBalance((CameraWhiteBalance)adjustValue);
- }
+ __pCamcorderPresentationModel->SetWhiteBalance((CameraWhiteBalance)adjustValue);
}
AppLogDebug("EXIT");
if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
{
r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
-
- if (focusSupport == true && r == E_SUCCESS)
- {
- AppLogDebug("focus is Support");
-
- __pCameraInfoPanel->SetDrawMarkerFocus(true);
-
- __pCameraInfoPanel->SetDrawMarkerFocusType(focusMode);
-
- __pCameraInfoPanel->Invalidate(true);
- }
- else
- {
- __pCameraInfoPanel->SetDrawMarkerFocus(false);
-
- __pCameraInfoPanel->Invalidate(true);
- }
}
else
{
- r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_FOCUS, focusSupport);
+ r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
+ }
- if (focusSupport == true && r == E_SUCCESS)
- {
- __pCameraInfoPanel->SetDrawMarkerFocus(true);
+ if (focusSupport == true && r == E_SUCCESS)
+ {
+ __pCameraInfoPanel->SetDrawMarkerFocus(true);
- __pCameraInfoPanel->SetDrawMarkerFocusType(focusMode);
+ __pCameraInfoPanel->SetDrawMarkerFocusType(focusMode);
- __pCameraInfoPanel->Invalidate(true);
- }
- else
- {
- __pCameraInfoPanel->SetDrawMarkerFocus(false);
+ __pCameraInfoPanel->Invalidate(true);
+ }
+ else
+ {
+ __pCameraInfoPanel->SetDrawMarkerFocus(false);
- __pCameraInfoPanel->Invalidate(true);
- }
+ __pCameraInfoPanel->Invalidate(true);
}
AppLogDebug("EXIT");
if (__dir == ORIENTATION_STATUS_PORTRAIT
|| __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
{
- rectList.x = X_FLASH_MODE_LIST_START_POS_PORTRAIT;
- rectList.y = Y_FLASH_MODE_SETTING_LIST_RECT - 10;
+ rectList = Rectangle(X_FLASH_MODE_SETTING_LIST_PORTRAIT, Y_FLASH_MODE_SETTING_LIST_PORTRAIT + Y_FLASH_MODE_SETTING_LIST_PORTRAIT_MARGIN,
+ W_FLASH_MODE_SETTING_LIST_PORTRAIT, H_FLASH_MODE_SETTING_LIST_PORTRAIT);
}
else
{
- rectList.x = X_FLASH_MODE_LIST_START_POS_LANDSCAPE;
- rectList.y = Y_FLASH_MODE_SETTING_LIST_LANDSCAPE;
+ rectList = Rectangle(X_FLASH_MODE_SETTING_LIST_LANDSCAPE, Y_FLASH_MODE_SETTING_LIST_LANDSCAPE + Y_FLASH_MODE_SETTING_LIST_LANDSCAPE_MARGIN,
+ W_FLASH_MODE_SETTING_LIST_LANDSCAPE, H_FLASH_MODE_SETTING_LIST_LANDSCAPE);
}
__pCameraInfoPanel->SetDrawFlashMenuBackground(true);
if (__dir == ORIENTATION_STATUS_PORTRAIT
|| __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
{
- rectList = Rectangle(X_FLASH_MODE_SETTING_LIST_PORTRAIT, Y_FLASH_MODE_SETTING_LIST_PORTRAIT,
- W_FLASH_MODE_SETTING_LIST_PORTRAIT, H_FLASH_MODE_SETTING_LIST_PORTRAIT + 200);
+ rectList = Rectangle(X_FLASH_MODE_SETTING_LIST_PORTRAIT, Y_FLASH_MODE_SETTING_LIST_PORTRAIT + Y_FLASH_MODE_SETTING_LIST_PORTRAIT_MARGIN,
+ W_FLASH_MODE_SETTING_LIST_PORTRAIT, H_FLASH_MODE_SETTING_LIST_PORTRAIT + H_WHITE_BALANC_SETTING_LIST_PORTRAIT_MARGIN);
}
else
{
- rectList = Rectangle(X_FLASH_MODE_SETTING_LIST_LANDSCAPE, Y_FLASH_MODE_SETTING_LIST_LANDSCAPE,
- W_FLASH_MODE_SETTING_LIST_LANDSCAPE, H_FLASH_MODE_SETTING_LIST_LANDSCAPE + 200);
+ rectList = Rectangle(X_FLASH_MODE_SETTING_LIST_LANDSCAPE, Y_FLASH_MODE_SETTING_LIST_LANDSCAPE + Y_FLASH_MODE_SETTING_LIST_LANDSCAPE_MARGIN,
+ W_FLASH_MODE_SETTING_LIST_LANDSCAPE, H_FLASH_MODE_SETTING_LIST_LANDSCAPE + H_WHITE_BALANC_SETTING_LIST_LANDSCAPE_MARGIN);
}
__pCameraInfoPanel->SetDrawWhiteBalanceBackground(true);
if (listName.Equals(String(IDS_MENU_SETTING_MAIN_MENU_NAME)))
{
- if (__pCamraInfoSubPanel && __pListViewCamcoderTabSubMenu)
+ if (__pCameraInfoSubPanel && __pListViewCamcoderTabSubMenu)
{
- __pCamraInfoSubPanel->SetShowState(false);
- __pCamraInfoSubPanel->RemoveControl(*__pListViewCamcoderTabSubMenu);
+ __pCameraInfoSubPanel->SetShowState(false);
+ __pCameraInfoSubPanel->RemoveControl(*__pListViewCamcoderTabSubMenu);
__pListViewCamcoderTabSubMenu = null;
- RemoveControl(*__pCamraInfoSubPanel);
- __pCamraInfoSubPanel = null;
+ RemoveControl(*__pCameraInfoSubPanel);
+ __pCameraInfoSubPanel = null;
SetCamcorderTabSubMenuListviewState(MENU_COUNT_CLEAR, CAMCORDER_SUB_MENU_CONTENT_MAX);
}
int X_Panel = X_SUBMENU_WB_MODE_PANEL;
int Y_Panel = Y_SUBMENU_WB_MODE_PANEL + 85;
int W_Panel = W_SUBMENU_WB_MODE_PANEL;
- int H_Panel = Y_SUBMENU_WB_MODE_LIST + (captrueResolutionCnt * 88);
+ int H_Panel = H_SUBMENU_WB_MODE_LIST + (captrueResolutionCnt * H_SUBMENU_WB_MODE_PANEL_MARGIN);
int X_List = X_SUBMENU_WB_MODE_LIST;
int Y_List = Y_SUBMENU_WB_MODE_LIST;
rectPanel.x = X_SUBMENU_PANEL_START_LANDSCAPE;
}
- if (__pCamraInfoSubPanel == null)
+ if (__pCameraInfoSubPanel == null)
{
- __pCamraInfoSubPanel = new (std::nothrow) CamraInfoSubPanel();
- TryCatch(__pCamraInfoSubPanel != null, r = E_FAILURE, "__pCamraInfoSubPanel is null");
+ __pCameraInfoSubPanel = new (std::nothrow) CameraInfoSubPanel();
+ TryCatch(__pCameraInfoSubPanel != null, r = E_FAILURE, "__pCameraInfoSubPanel is null");
- r = __pCamraInfoSubPanel->Initialize(rectPanel);
- TryCatch(r == E_SUCCESS, , "__pCamraInfoSubPanel Initialize fail[%s]", GetErrorMessage(r));
+ r = __pCameraInfoSubPanel->Initialize(rectPanel);
+ TryCatch(r == E_SUCCESS, , "__pCameraInfoSubPanel Initialize fail[%s]", GetErrorMessage(r));
- __pCamraInfoSubPanel->AddTouchEventListener(*this);
+ __pCameraInfoSubPanel->AddTouchEventListener(*this);
AddOrientationEventListener(*this);
- AddControl(*__pCamraInfoSubPanel);
- SetControlAlwaysOnTop(*__pCamraInfoSubPanel, true);
+ AddControl(*__pCameraInfoSubPanel);
+ SetControlAlwaysOnTop(*__pCameraInfoSubPanel, true);
}
- __pCamraInfoSubPanel->SetMenuTitle(strTitle);
+ __pCameraInfoSubPanel->SetMenuTitle(strTitle);
__pCameraInfoPanel->Invalidate(true);
- __pCamraInfoSubPanel->Invalidate(true);
+ __pCameraInfoSubPanel->Invalidate(true);
__pListViewCamcoderTabSubMenu = new (std::nothrow) ListView();
__pListViewCamcoderTabSubMenu->Construct(rectList, true, SCROLL_STYLE_FAST_SCROLL);
__pListViewCamcoderTabSubMenu->SetItemProvider(*this);
__pListViewCamcoderTabSubMenu->AddListViewItemEventListener(*this);
- __pCamraInfoSubPanel->AddControl(*__pListViewCamcoderTabSubMenu);
+ __pCameraInfoSubPanel->AddControl(*__pListViewCamcoderTabSubMenu);
__pListViewCamcoderTabSubMenu->UpdateList();
}
return r;
CATCH:
- if (__pCamraInfoSubPanel)
+ if (__pCameraInfoSubPanel)
{
- RemoveControl(*__pCamraInfoSubPanel);
+ RemoveControl(*__pCameraInfoSubPanel);
SetCamcorderTabSubMenuListviewState(MENU_COUNT_CLEAR, CAMCORDER_SUB_MENU_CONTENT_MAX);
}
else
delete __pListViewCamcoderTabSubMenu;
}
- __pCamraInfoSubPanel = null;
+ __pCameraInfoSubPanel = null;
__pListViewCamcoderTabSubMenu = null;
return r;
if (listName.Equals(String(IDS_MENU_SETTING_GEN_MAIN_MENU_NAME)))
{
- if (__pCamraInfoSubPanel && __pListViewGeneralTabSubMenu)
+ if (__pCameraInfoGeneralSubPanel && __pListViewGeneralTabSubMenu)
{
- __pCamraInfoSubPanel->SetShowState(false);
- __pCamraInfoSubPanel->RemoveControl(*__pListViewGeneralTabSubMenu);
+ __pCameraInfoGeneralSubPanel->SetShowState(false);
+ __pCameraInfoGeneralSubPanel->RemoveControl(*__pListViewGeneralTabSubMenu);
__pListViewGeneralTabSubMenu = null;
- RemoveControl(*__pCamraInfoSubPanel);
- __pCamraInfoSubPanel = null;
+ RemoveControl(*__pCameraInfoGeneralSubPanel);
+ __pCameraInfoGeneralSubPanel = null;
SetGeneralTabSubMenuListviewState(MENU_COUNT_CLEAR, CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_MAX);
}
}
break;
- case CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE:
- {
- drawPopup = false;
- bool exposureValue = false;
- bool brighnesstValue = false;
- int selfPortraitEnable = 0;
- int adjustValue = 0;
-
- r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
- TryCatch(r == E_SUCCESS, , "Reg GetValue() fail:%s", GetErrorMessage(r));
-
- if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
- {
- r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
- }
- else
- {
- r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
- }
-
- if (exposureValue == true && r == E_SUCCESS)
- {
- AppLogDebug("CAMCORDER_SUB_MENU_CONTENT_EXPOSURE_MODE");
-
- r = __pCamcorderPresentationModel->GetValue(EXPOSURE_VALUE, adjustValue);
- TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
-
- AppLogDebug("adjustValue = %d", adjustValue);
-
- __pCamcorderPresentationModel->SetExposure(adjustValue);
-
- MakeSettingPopupTab(false);
-
- HidePopup();
-
- r = CreateExposureSlider();
- TryCatch(r == E_SUCCESS, , "CreateExposureSlider() fail[%s]", GetErrorMessage(r));
-
- r = DrawExposureSlider();
- TryCatch(r == E_SUCCESS, , "DrawExposureSlider() fail[%s]", GetErrorMessage(r));
- }
- else
- {
- if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
- {
- r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
- }
- else
- {
- r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
- }
-
- if (brighnesstValue == true && r == E_SUCCESS)
- {
- AppLogDebug("CAMCORDER_SUB_MENU_CONTENT_EXPOSURE_MODE");
-
- r = __pCamcorderPresentationModel->GetValue(BRIGHTNESS_VALUE, adjustValue);
- TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
-
- AppLogDebug("adjustValue = %d", adjustValue);
-
- __pCamcorderPresentationModel->SetBrightness(adjustValue);
-
- MakeSettingPopupTab(false);
-
- HidePopup();
-
- r = CreateExposureSlider();
- TryCatch(r == E_SUCCESS, , "CreateExposureSlider() fail[%s]", GetErrorMessage(r));
-
- r = DrawExposureSlider();
- TryCatch(r == E_SUCCESS, , "DrawExposureSlider() fail[%s]", GetErrorMessage(r));
- }
- else
- {
- AppLogDebug("Exposure do not support");
- }
- }
- }
- break;
-
case CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_GUIDELINE_MODE:
{
AppLogDebug("Set geo tag or guideline mode");
case CAMCORDER_GENERAL_TAB_SUB_MENU_OVERLAY_HELP_MODE:
{
- //pAppResource->GetString(IDS_MENU_OVERLAY_HELP_VALUE, strTitle);
- strTitle = IDS_MENU_OVERLAY_HELP_VALUE;
- rectPanel = Rectangle(X_SUBMENU_STORAGE_MODE_PANEL, Y_SUBMENU_STORAGE_MODE_PANEL,
- W_SUBMENU_STORAGE_MODE_PANEL, H_SUBMENU_STORAGE_MODE_PANEL);
- rectList = Rectangle(X_SUBMENU_STORAGE_MODE_LIST, Y_SUBMENU_STORAGE_MODE_LIST,
- W_SUBMENU_STORAGE_MODE_LIST, H_SUBMENU_STORAGE_MODE_LIST);
- SetGeneralTabSubMenuListviewState(SUBMENU_STORAGE_TYPE_COUNT, CAMCORDER_GENERAL_TAB_SUB_MENU_OVERLAY_HELP_MODE);
+ result r = E_SUCCESS;
+
+ r = __pCamcorderPresentationModel->SetValue(OVERLAY_HELP_ENABLE, SCREEN_OVERLAY_HELP_ENABLE);
+ TryCatch(r == E_SUCCESS, , "SetValue() fail[%s]", GetErrorMessage(r));
+
+ AppLogDebug("Setting - OVERLAY_HELP_ENABLE = %d", OVERLAY_HELP_ENABLE);
+
+ r = SetScreenOverlayHelpTimer();
+ TryCatch(r == E_SUCCESS, , "SetScreenOverlayHelpTimer() [%s]", GetErrorMessage(r));
+
+ r = DrawScreenOverlayHelp();
+ TryCatch(r == E_SUCCESS, , "DrawScreenOverlayHelp() [%s]", GetErrorMessage(r));
+
+ drawPopup = false;
+
+ MakeSettingPopupTab(false);
+
+ HidePopup();
+ HideUiQuickMenu();
}
break;
rectPanel.x = X_SUBMENU_PANEL_START_LANDSCAPE;
}
- if (__pCamraInfoSubPanel == null)
+ if (__pCameraInfoGeneralSubPanel == null)
{
- __pCamraInfoSubPanel = new (std::nothrow) CamraInfoSubPanel();
- TryCatch(__pCamraInfoSubPanel != null, r = E_FAILURE, "__pCamraInfoSubPanel is null");
+ __pCameraInfoGeneralSubPanel = new (std::nothrow) CameraInfoGeneralSubPanel();
+ TryCatch(__pCameraInfoGeneralSubPanel != null, r = E_FAILURE, "__pCameraInfoGeneralSubPanel is null");
- r = __pCamraInfoSubPanel->Initialize(rectPanel);
- TryCatch(r == E_SUCCESS, , "__pCamraInfoSubPanel Initialize fail[%s]", GetErrorMessage(r));
+ r = __pCameraInfoGeneralSubPanel->Initialize(rectPanel);
+ TryCatch(r == E_SUCCESS, , "__pCameraInfoGeneralSubPanel Initialize fail[%s]", GetErrorMessage(r));
- __pCamraInfoSubPanel->AddTouchEventListener(*this);
+ __pCameraInfoGeneralSubPanel->AddTouchEventListener(*this);
AddOrientationEventListener(*this);
- AddControl(*__pCamraInfoSubPanel);
- SetControlAlwaysOnTop(*__pCamraInfoSubPanel, true);
+ AddControl(*__pCameraInfoGeneralSubPanel);
+ SetControlAlwaysOnTop(*__pCameraInfoGeneralSubPanel, true);
}
- __pCamraInfoSubPanel->SetMenuTitle(strTitle);
+ __pCameraInfoGeneralSubPanel->SetMenuTitle(strTitle);
__pCameraInfoPanel->Invalidate(true);
- __pCamraInfoSubPanel->Invalidate(true);
+ __pCameraInfoGeneralSubPanel->Invalidate(true);
__pListViewGeneralTabSubMenu = new (std::nothrow) ListView();
__pListViewGeneralTabSubMenu->Construct(rectList, true, SCROLL_STYLE_FAST_SCROLL);
__pListViewGeneralTabSubMenu->SetItemProvider(*this);
__pListViewGeneralTabSubMenu->AddListViewItemEventListener(*this);
- __pCamraInfoSubPanel->AddControl(*__pListViewGeneralTabSubMenu);
+ __pCameraInfoGeneralSubPanel->AddControl(*__pListViewGeneralTabSubMenu);
__pListViewGeneralTabSubMenu->UpdateList();
}
return E_SUCCESS;
CATCH:
- if (__pCamraInfoSubPanel)
+ if (__pCameraInfoGeneralSubPanel)
{
- RemoveControl(*__pCamraInfoSubPanel);
+ RemoveControl(*__pCameraInfoGeneralSubPanel);
SetGeneralTabSubMenuListviewState(MENU_COUNT_CLEAR, CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_MAX);
}
else
delete __pListViewGeneralTabSubMenu;
}
- __pCamraInfoSubPanel = null;
+ __pCameraInfoGeneralSubPanel = null;
__pListViewGeneralTabSubMenu = null;
AppLogDebug("EXIT - CATCH");
}
break;
- case CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE:
- {
- AppLogDebug("Setting - EXPOSURE");
- }
- break;
-
case CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_GUIDELINE_MODE:
{
r = SubListPopupGuidelineMode(index);
case CAMCORDER_GENERAL_TAB_SUB_MENU_OVERLAY_HELP_MODE:
{
- SubListPopupOverlayHelpMode(index);
}
break;
__pPopupTimer = new (std::nothrow) Timer();
__pPopupTimer->Construct(*this);
- r = __pPopupTimer->StartAsRepeatable(CAMERA_TIMER_1_SEC);
+ r = __pPopupTimer->StartAsRepeatable(CAMCORDER_TIMER_1_SEC);
TryCatch(r == E_SUCCESS, , "__pPopupTimer start fail[%s]", GetErrorMessage(r));
r = __pCamcorderPresentationModel->GetValue(TIMER_INTERVAL, settingTimer);
if (settingTimer == SETTING_TIMER_RECORD_2_SEC)
{
- __timeCount = SERRING_TIMER_2_SEC_COUNT;
+ __timeCount = SETTING_TIMER_2_SEC_COUNT;
}
else if (settingTimer == SETTING_TIMER_RECORD_5_SEC)
{
- __timeCount = SERRING_TIMER_5_SEC_COUNT;
+ __timeCount = SETTING_TIMER_5_SEC_COUNT;
}
else if (settingTimer == SETTING_TIMER_RECORD_10_SEC)
{
- __timeCount = SERRING_TIMER_10_SEC_COUNT;
+ __timeCount = SETTING_TIMER_10_SEC_COUNT;
}
__pCameraInfoPanel->SetDrawPopupTimerUpdate(true);
}
result
-CamcorderForm::EndPopupTimer(void)
+CamcorderForm::StopPopupTimer(void)
{
AppLogDebug("ENTER");
result r = E_SUCCESS;
CamcorderForm::SetContinuousAutoFocusButton(void)
{
AppLogDebug("ENTER");
+ result r = E_SUCCESS;
+ int selfPortraitEnable = 0;
+ bool focusSupport = false;
Bitmap* pBitmap = null;
+ r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+ TryReturnVoid(r == E_SUCCESS, "Reg getValue fail[%s]", GetErrorMessage(r));
+
+ if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
+ {
+ r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
+ }
+ else
+ {
+ r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_FOCUS, focusSupport);
+ }
+
pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMCODER_AUTOFOCUS);
TryReturnVoid(pBitmap != null, "pBitmap is null");
delete pBitmap;
pBitmap = null;
+
+ if (focusSupport == true && r == E_SUCCESS)
+ {
+ __pAutoFocus->SetShowState(true);
+ }
+ else
+ {
+ __pAutoFocus->SetShowState(false);
+ }
+ __pAutoFocus->Invalidate(true);
AppLogDebug("EXIT");
}
CamcorderForm::SetThumbNailButton(void)
{
AppLogDebug("ENTER");
- bool isAppControl = false;
Point ptThumbnailImg = Point(X_THUMBNAIL_BUTTON_IMG, Y_THUMBNAIL_BUTTON_IMG);
Bitmap* pBitmap = null;
bool onVideoRecorderStopped = false;
onVideoRecorderStopped = __pCamcorderPresentationModel->GetOnVideoRecorderStopped();
- isAppControl = (static_cast<CameraApp*>(UiApp::GetInstance()))->IsAppControl();
-
- if (isAppControl == true)
+ if (IsAppControlRequest() == true)
{
if (onVideoRecorderStopped == false)
{
ToggleCameraDirection(CAMCORDER_FORM_SECONDARY_MODE);
r = UpdateUiPanelIcon();
- TryReturnVoid(r == E_SUCCESS, "UpdateUiPanelIcon() fail[%s]", GetErrorMessage(r));
+ //TryReturnVoid(r == E_SUCCESS, "UpdateUiPanelIcon() fail[%s]", GetErrorMessage(r));
}
else if (selfPortraitEnable == CAMCORDER_FORM_SECONDARY_MODE)
{
ToggleCameraDirection(CAMCORDER_FORM_PRIMARY_MODE);
r = UpdateUiPanelIcon();
- TryReturnVoid(r == E_SUCCESS, "UpdateUiPanelIcon() fail[%s]", GetErrorMessage(r));
+ //TryReturnVoid(r == E_SUCCESS, "UpdateUiPanelIcon() fail[%s]", GetErrorMessage(r));
}
}
TryReturnVoid(__pFlashButton != null, "__pFlashButton is null");
if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
{
r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
-
- if (r == E_SUCCESS)
- {
- r =__pCamcorderPresentationModel->GetValue(WHITE_BALANCE_TYPE, wbIndex);
- TryReturnVoid(r == E_SUCCESS, "WB Faled to Get value to registry[%s]", GetErrorMessage(r));
-
- __pCamcorderPresentationModel->SetWhiteBalance((CameraWhiteBalance)wbIndex);
- }
}
else
{
r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
+ }
- if (r == E_SUCCESS)
- {
- AppLogDebug("WB unsupport");
- }
+ if (r == E_SUCCESS)
+ {
+ r =__pCamcorderPresentationModel->GetValue(WHITE_BALANCE_TYPE, wbIndex);
+ TryReturnVoid(r == E_SUCCESS, "WB Faled to Get value to registry[%s]", GetErrorMessage(r));
+
+ __pCamcorderPresentationModel->SetWhiteBalance((CameraWhiteBalance)wbIndex);
}
AppLogDebug("EXIT");
}
MakeSettingPopupTab(false);
r = UpdateUiPanelIcon();
- TryReturnVoid(r == E_SUCCESS, "UpdateUiPanelIcon() fail(%s)", GetErrorMessage(r));
+ //TryReturnVoid(r == E_SUCCESS, "UpdateUiPanelIcon() fail(%s)", GetErrorMessage(r));
r = SetScreenOverlayHelpTimer();
TryReturnVoid(r == E_SUCCESS, "SetScreenOverlayHelpTimer() fail(%s)", GetErrorMessage(r));
r = DrawScreenOverlayHelp();
- TryReturnVoid(r == E_SUCCESS, "UpdateUiPanelIcon() fail(%s)", GetErrorMessage(r));
+ TryReturnVoid(r == E_SUCCESS, "DrawScreenOverlayHelp() fail(%s)", GetErrorMessage(r));
TryReturnVoid(__pFlashButton != null, "__pFlashButton is null");
__pFlashButton->Invalidate(true);
}
void
-CamcorderForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus)
+CamcorderForm::ShowExposureSlider(void)
{
AppLogDebug("ENTER");
result r = E_SUCCESS;
- Rectangle rect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
- BufferInfo bufferinfo;
int selfPortraitEnable = CAMCORDER_FORM_PRIMARY_MODE;
- int guideLineEnable = DISABLE_GUIDELINE;
- String listName = L"";
bool exposureValue = false;
bool brighnesstValue = false;
- bool isValidRect = false;
- bool modified = false;
- if (__dir != orientationStatus)
+ if (__pExposureCloseTimer)
{
- __isOrientationChanged = true;
-
- if (__pAppTimer != null)
+ if (__pExposureCloseTimer->Cancel() == E_SUCCESS)
{
- __pAppTimer->Cancel();
-
- r = __pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
- }
-
- r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
- TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
+ HidePopup();
- if (orientationStatus == ORIENTATION_STATUS_PORTRAIT_REVERSE
- || orientationStatus == ORIENTATION_STATUS_PORTRAIT)
- {
- if (__screenMode == SCREEN_MODE_NORMAL)
- {
- AppLogDebug("SCREEN_MODE_NORMAL");
- rect = Rectangle(X_PREVIEW_OVERLAY_PORTRAIT, Y_PREVIEW_OVERLAY_PORTRAIT, W_PREVIEW_OVERLAY_PORTRAIT, H_PREVIEW_OVERLAY_PORTRAIT);
- }
- else
- {
- rect = Rectangle(X_FULL_PREVIEW_OVERLAY_PORTRAIT, Y_FULL_PREVIEW_OVERLAY_PORTRAIT, W_FULL_PREVIEW_OVERLAY_PORTRAIT, H_FULL_PREVIEW_OVERLAY_PORTRAIT);
- }
- }
- else
- {
- if (__screenMode == SCREEN_MODE_NORMAL)
+ if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
{
- AppLogDebug("SCREEN_MODE_NORMAL");
- rect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
+ r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
}
else
{
- rect = Rectangle(X_FULL_PREVIEW_OVERLAY_LANDSCAPE, Y_FULL_PREVIEW_OVERLAY_LANDSCAPE, W_FULL_PREVIEW_OVERLAY_LANDSCAPE, H_FULL_PREVIEW_OVERLAY_LANDSCAPE);
+ r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
}
- }
+
+ if (exposureValue == true && r == E_SUCCESS)
+ {
+ r = CreateExposureSlider();
+ TryReturnVoid(r == E_SUCCESS, "CreateExposureSlider() fail[%s]", GetErrorMessage(r));
+
+ r = DrawExposureSlider();
+ TryReturnVoid(r == E_SUCCESS, "DrawExposureSlider() fail[%s]", GetErrorMessage(r));
+ }
+ else
+ {
+ if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
+ {
+ r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+ }
+ else
+ {
+ r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+ }
+
+ if (brighnesstValue == true && r == E_SUCCESS)
+ {
+ r = CreateExposureSlider();
+ TryReturnVoid(r == E_SUCCESS, "CreateExposureSlider() fail[%s]", GetErrorMessage(r));
+
+ r = DrawExposureSlider();
+ TryReturnVoid(r == E_SUCCESS, "DrawExposureSlider() fail[%s]", GetErrorMessage(r));
+ }
+ }
+ }
+ }
+ AppLogDebug("EXIT");
+}
+
+void
+CamcorderForm::SetOverlayPanelOrientationChanged(Tizen::Ui::OrientationStatus orientationStatus)
+{
+ AppLogDebug("ENTER");
+ result r = E_SUCCESS;
+ bool modified = false;
+ bool isValidRect = false;
+
+ if (__screenMode == SCREEN_MODE_NORMAL)
+ {
+ Dimension dim = Dimension(0, 0);
+ Rectangle rect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
+ Rectangle evaluateBoundsRect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
+ Rectangle clientRect = GetClientAreaBounds();
+ bool isToCompensated = false;
+
+ if (orientationStatus == ORIENTATION_STATUS_PORTRAIT
+ || orientationStatus == ORIENTATION_STATUS_PORTRAIT_REVERSE)
+ {
+ if (clientRect.height == (CAMERA_PANEL_SUM_SIZE + PREVIEW_OVERLAY_PANEL_SIZE))
+ {
+ evaluateBoundsRect = Rectangle(X_PREVIEW_OVERLAY_PORTRAIT, Y_PREVIEW_OVERLAY_PORTRAIT, W_PREVIEW_OVERLAY_PORTRAIT, H_PREVIEW_OVERLAY_PORTRAIT);
+ rect = Rectangle(X_PREVIEW_OVERLAY_PORTRAIT, Y_PREVIEW_OVERLAY_PORTRAIT, W_PREVIEW_OVERLAY_PORTRAIT, H_PREVIEW_OVERLAY_PORTRAIT);
+ }
+ else
+ {
+ evaluateBoundsRect = Rectangle(X_PREVIEW_OVERLAY_PORTRAIT, Y_PREVIEW_OVERLAY_PORTRAIT, W_PREVIEW_OVERLAY_PORTRAIT, H_PREVIEW_OVERLAY_PORTRAIT - PREVIEW_OVERLAY_PANEL_SIZE_MARGIN);
+ rect = Rectangle(X_PREVIEW_OVERLAY_PORTRAIT, Y_PREVIEW_OVERLAY_PORTRAIT, W_PREVIEW_OVERLAY_PORTRAIT, H_PREVIEW_OVERLAY_PORTRAIT - PREVIEW_OVERLAY_PANEL_SIZE_MARGIN);
+ }
+ }
+ else
+ {
+ if (clientRect.width == (CAMERA_PANEL_SUM_SIZE + PREVIEW_OVERLAY_PANEL_SIZE))
+ {
+ evaluateBoundsRect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
+ rect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
+ }
+ else
+ {
+ evaluateBoundsRect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE - PREVIEW_OVERLAY_PANEL_SIZE_MARGIN, H_PREVIEW_OVERLAY_LANDSCAPE);
+ rect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE - PREVIEW_OVERLAY_PANEL_SIZE_MARGIN, H_PREVIEW_OVERLAY_LANDSCAPE);
+ }
+ }
+
+ TryReturnVoid(__pOverlayPanel != null, "__pOverlayPanel is null");
+
+ AppLogDebug("Client area rect (%d, %d, %d, %d)", clientRect.x, clientRect.y, clientRect.width, clientRect.height);
+ AppLogDebug("Input EvaluateBounds (%d, %d, %d, %d)", evaluateBoundsRect.x, evaluateBoundsRect.y, evaluateBoundsRect.width, evaluateBoundsRect.height);
+
+ isValidRect = OverlayRegion::EvaluateBounds(OVERLAY_REGION_EVALUATION_OPTION_LESS_THAN, evaluateBoundsRect, modified);
+ TryReturnVoid(isValidRect == true, "OverlayRegion::EvaluateBounds returned error[%s]", GetErrorMessage(GetLastResult()));
+
+ if (modified == true)
+ {
+ AppLogDebug("OverlayRegion::EvaluateBounds is modified to (%d,%d,%d,%d)", evaluateBoundsRect.x, evaluateBoundsRect.y, evaluateBoundsRect.width, evaluateBoundsRect.height);
+ }
+
+ if (orientationStatus == ORIENTATION_STATUS_PORTRAIT
+ || orientationStatus == ORIENTATION_STATUS_PORTRAIT_REVERSE)
+ {
+ if (evaluateBoundsRect.height == rect.height)
+ {
+ isToCompensated = false;
+ }
+ else
+ {
+ isToCompensated = true;
+ }
+ }
+ else
+ {
+ if (evaluateBoundsRect.width == rect.width)
+ {
+ isToCompensated = false;
+ }
+ else
+ {
+ isToCompensated = true;
+ }
+ }
+
+ if (isToCompensated == false)
+ {
+ AppLogDebug("isToCompensated = false");
+
+ r = __pOverlayPanel->SetBounds(rect);
+ AppLogDebug("pOverlayPanel->SetBounds() [%s]", GetErrorMessage(r));
+
+ AppLogDebug("__pOverlayPanel->SetBounds() area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+ }
+ else
+ {
+ AppLogDebug("isToCompensated = true");
+
+ r = __pOverlayPanel->SetBounds(rect);
+ AppLogDebug("pOverlayPanel->SetBounds() [%s]", GetErrorMessage(r));
+
+ rect = __pOverlayPanel->GetBounds();
+
+ AppLogDebug("__pOverlayPanel GetBounds area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+
+ if (orientationStatus == ORIENTATION_STATUS_PORTRAIT
+ || orientationStatus == ORIENTATION_STATUS_PORTRAIT_REVERSE)
+ {
+ rect.x = 0; //imsi
+ rect.y = 160; //imsi
+ }
+ else
+ {
+ rect.x = 160; //imsi
+ rect.y = 0; //imsi
+ }
+
+ r = __pOverlayPanel->SetBounds(rect);
+
+ AppLogDebug("__pOverlayPanel->SetBounds() area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+ }
+ }
+ else
+ {
+ Rectangle evaluateBoundsRect = Rectangle(X_BASE_POS, Y_BASE_POS, GetClientAreaBounds().width, GetClientAreaBounds().height);
+ Rectangle rect = Rectangle(X_BASE_POS, Y_BASE_POS, GetClientAreaBounds().width, GetClientAreaBounds().height);
+ Rectangle clientRect = GetClientAreaBounds();
+ bool isToCompensated = false;
+
+ if (orientationStatus == ORIENTATION_STATUS_PORTRAIT
+ || orientationStatus == ORIENTATION_STATUS_PORTRAIT_REVERSE)
+ {
+ if (clientRect.height == (CAMERA_PANEL_SUM_SIZE + PREVIEW_OVERLAY_PANEL_SIZE))
+ {
+ rect = Rectangle(X_BASE_POS, Y_BASE_POS, GetClientAreaBounds().width, GetClientAreaBounds().height);
+ }
+ else
+ {
+ rect = Rectangle(X_BASE_POS, Y_BASE_POS, GetClientAreaBounds().width, GetClientAreaBounds().height - PREVIEW_OVERLAY_PANEL_SIZE_MARGIN);
+ }
+ }
+ else
+ {
+ if (clientRect.width == (CAMERA_PANEL_SUM_SIZE + PREVIEW_OVERLAY_PANEL_SIZE))
+ {
+ rect = Rectangle(X_BASE_POS, Y_BASE_POS, GetClientAreaBounds().width, GetClientAreaBounds().height);
+ }
+ else
+ {
+ rect = Rectangle(X_BASE_POS, Y_BASE_POS, GetClientAreaBounds().width - PREVIEW_OVERLAY_PANEL_SIZE_MARGIN, GetClientAreaBounds().height);
+ }
+ }
+
+ TryReturnVoid(__pOverlayPanel != null, "__pOverlayPanel is null");
+
+ AppLogDebug("Client area rect (%d, %d, %d, %d)", clientRect.x, clientRect.y, clientRect.width, clientRect.height);
+ AppLogDebug("Input EvaluateBounds (%d, %d, %d, %d)", evaluateBoundsRect.x, evaluateBoundsRect.y, evaluateBoundsRect.width, evaluateBoundsRect.height);
+
+ isValidRect = OverlayRegion::EvaluateBounds(OVERLAY_REGION_EVALUATION_OPTION_GREATER_THAN, evaluateBoundsRect, modified);
+ TryReturnVoid(isValidRect == true, "OverlayRegion::EvaluateBounds returned error[%s]", GetErrorMessage(GetLastResult()));
+
+ if (modified == true)
+ {
+ AppLogDebug("OverlayRegion::EvaluateBounds is modified to (%d,%d,%d,%d)", evaluateBoundsRect.x, evaluateBoundsRect.y, evaluateBoundsRect.width, evaluateBoundsRect.height);
+ }
+
+ if (orientationStatus == ORIENTATION_STATUS_PORTRAIT
+ || orientationStatus == ORIENTATION_STATUS_PORTRAIT_REVERSE)
+ {
+ if (evaluateBoundsRect.height == rect.height)
+ {
+ isToCompensated = false;
+ }
+ else
+ {
+ isToCompensated = true;
+ }
+ }
+ else
+ {
+ if (evaluateBoundsRect.width == rect.width)
+ {
+ isToCompensated = false;
+ }
+ else
+ {
+ isToCompensated = true;
+ }
+ }
+
+ if (isToCompensated == false)
+ {
+ AppLogDebug("isToCompensated = false");
+
+ r = __pOverlayPanel->SetBounds(rect);
+ AppLogDebug("pOverlayPanel->SetBounds() [%s]", GetErrorMessage(r));
+
+ AppLogDebug("__pOverlayPanel->SetBounds() area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+ }
+ else
+ {
+ AppLogDebug("isToCompensated = true");
+
+ r = __pOverlayPanel->SetBounds(rect);
+ AppLogDebug("pOverlayPanel->SetBounds() [%s]", GetErrorMessage(r));
+
+ rect = __pOverlayPanel->GetBounds();
+ AppLogDebug("__pOverlayPanel GetBounds area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+
+ rect.x = 0; //imsi
+ rect.y = 0; //imsi
+
+ r = __pOverlayPanel->SetBounds(rect);
+
+ AppLogDebug("__pOverlayPanel->SetBounds() area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+ }
+ }
+ AppLogDebug("EXIT");
+}
+
+void
+CamcorderForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus)
+{
+ AppLogDebug("ENTER");
+ result r = E_SUCCESS;
+ Rectangle rect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
+ BufferInfo bufferinfo;
+ int selfPortraitEnable = CAMCORDER_FORM_PRIMARY_MODE;
+ int guideLineEnable = DISABLE_GUIDELINE;
+ String listName = L"";
+
+ if (__dir != orientationStatus)
+ {
+ __isOrientationChanged = true;
+
+ if (__pAppTimer != null)
+ {
+ __pAppTimer->Cancel();
+
+ r = __pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
+ }
+
+ r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+ TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
+
+ SetOverlayPanelOrientationChanged(orientationStatus);
if (__pOverlayPanel)
{
default:
break;
}
-
- __pOverlayPanel->SetBounds(rect);
}
__dir = orientationStatus;
if (__screenMode == SCREEN_MODE_FULL)
{
- isValidRect = OverlayRegion::EvaluateBounds(OVERLAY_REGION_EVALUATION_OPTION_GREATER_THAN, rect, modified);
if (__pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING || __isRecording == true)
{
HidePanel(true, true);
HidePanel(false, true);
}
}
- else
- {
- isValidRect = OverlayRegion::EvaluateBounds(OVERLAY_REGION_EVALUATION_OPTION_LESS_THAN, rect, modified);
- AppLogDebug("SCREEN_MODE_NORMAL Bounds is modified to (%d,%d,%d,%d)", rect.x, rect.y, rect.width, rect.height);
- }
r = __pCamcorderPresentationModel->GetValue(GUIDELINE_ENABLE, guideLineEnable);
TryReturnVoid(r == E_SUCCESS, "Read Reg fail[%s]", GetErrorMessage(r));
if (__isRecording || __pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING)
{
- if (__dir == ORIENTATION_STATUS_LANDSCAPE
- || __dir == ORIENTATION_STATUS_LANDSCAPE_REVERSE)
- {
- __pCameraInfoPanel->SetDrawIndicator(false);
- __pCameraInfoPanel->Invalidate(true);
- }
- else
+ if (__pHelpCloseTimer)
{
-// if (__screenMode == SCREEN_MODE_FULL)
-// {
-// __pCameraInfoPanel->Invalidate(true);
-// }
-// else
- {
- __pCameraInfoPanel->SetDrawIndicator(false);
- __pCameraInfoPanel->Invalidate(true);
- }
+ __pHelpCloseTimer->Cancel();
+
+ delete __pHelpCloseTimer;
+ __pHelpCloseTimer = null;
}
+
+ HideScreenOverlayHelp();
+
+ __pCameraInfoPanel->SetDrawIndicator(false);
+ __pCameraInfoPanel->Invalidate(true);
}
if (__pListViewCamcoderTabMainMenu != null)
}
}
+ if (__pListViewGeneralTabMainMenu != null)
+ {
+ listName = __pListViewGeneralTabMainMenu->GetName();
+ if (listName.Equals(String(IDS_MENU_SETTING_GEN_MAIN_MENU_NAME)) && __pListViewGeneralTabMainMenu->GetShowState() == true)
+ {
+ HidePopup();
+ }
+ }
+
if (__pListFlashMainMenu != null)
{
listName = __pListFlashMainMenu->GetName();
}
}
- MakeSettingPopupTab(false);
-
- if (__pExposureCloseTimer)
+ if (__pListViewGeneralTabSubMenu != null)
{
- if (__pExposureCloseTimer->Cancel() == E_SUCCESS)
+ if (__pListViewGeneralTabSubMenu->GetShowState() == true)
{
HidePopup();
-
- if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
- {
- r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
- }
- else
- {
- r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
- }
-
- if (exposureValue == true && r == E_SUCCESS)
- {
- r = CreateExposureSlider();
- TryReturnVoid(r == E_SUCCESS, "CreateExposureSlider() fail[%s]", GetErrorMessage(r));
-
- r = DrawExposureSlider();
- TryReturnVoid(r == E_SUCCESS, "DrawExposureSlider() fail[%s]", GetErrorMessage(r));
- }
- else
- {
- if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
- {
- r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
- }
- else
- {
- r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
- }
-
- if (brighnesstValue == true && r == E_SUCCESS)
- {
- r = CreateExposureSlider();
- TryReturnVoid(r == E_SUCCESS, "CreateExposureSlider() fail[%s]", GetErrorMessage(r));
-
- r = DrawExposureSlider();
- TryReturnVoid(r == E_SUCCESS, "DrawExposureSlider() fail[%s]", GetErrorMessage(r));
- }
- }
}
}
+ MakeSettingPopupTab(false);
+
+ ShowExposureSlider();
Invalidate(true);
__isOrientationChanged = false;
}
if (__pListViewCamcoderTabSubMenu)
{
- if (__pCamraInfoSubPanel != null)
+ if (__pCameraInfoSubPanel != null)
{
- __pCamraInfoSubPanel->SetShowState(false);
+ __pCameraInfoSubPanel->SetShowState(false);
}
__pListViewCamcoderTabSubMenu->SetShowState(false);
}
if (__pListViewGeneralTabSubMenu)
{
- if (__pCamraInfoSubPanel != null)
+ if (__pCameraInfoGeneralSubPanel != null)
{
- __pCamraInfoSubPanel->SetShowState(false);
+ __pCameraInfoGeneralSubPanel->SetShowState(false);
}
__pListViewGeneralTabSubMenu->SetShowState(false);
}
result r = E_SUCCESS;
MessageBox messageBox;
int result = 0;
- int timerInterval = 0;
String strTemp = L"";
int remainedNum = 0;
{
if (__isRecording == false)
{
- r = __pCamcorderPresentationModel->GetValue(TIMER_INTERVAL, timerInterval);
- TryReturnVoid(r == E_SUCCESS, "Reg getvalue fail[%s]", GetErrorMessage(r));
-
- HidePopup();
-
- AppLogDebug("__isRecording = false -> true");
-
- __pCameraInfoPanel->SetDrawIndicator(false);
- __pCameraInfoPanel->Invalidate(true);
-
- SetRecordMode(timerInterval);
+ SetStartRecording();
}
else
{
AppLogDebug("EXIT");
}
-result
-CamcorderForm::SetScreenMode(const ScreenMode mode, bool destory)
+void
+CamcorderForm::SetOverlayRendererRotation(void)
{
AppLogDebug("ENTER");
- result r = E_SUCCESS;
- Point currentPosition;
- bool modified = false;
- bool isValidRect = false;
- int previewResolutionSize = 0;
- int selfPortraitEnable = 0;
- Dimension dim;
- Rectangle rect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE,
- W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
+ TryReturnVoid(__pOverlayPanel != null, "__pOverlayPanel is null");
+
+ switch (__dir)
+ {
+ case ORIENTATION_STATUS_PORTRAIT:
+ {
+ AppLogDebug("PORTRAIT");
+ __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_90);
+ }
+ break;
+
+ case ORIENTATION_STATUS_PORTRAIT_REVERSE:
+ {
+ AppLogDebug("PORTRAIT REVERSE");
+ __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_270);
+ }
+ break;
+
+ case ORIENTATION_STATUS_LANDSCAPE:
+ {
+ AppLogDebug("LANDSCAPE");
+ __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_NONE);
+ }
+ break;
+
+ case ORIENTATION_STATUS_LANDSCAPE_REVERSE:
+ {
+ AppLogDebug("LANDSCAPE REVERSE");
+ __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_180);
+ }
+ break;
+
+ default:
+ break;
+ }
+ AppLogDebug("EXIT");
+}
+
+void
+CamcorderForm::SetOverlayPanelWideMode(bool isRemoved)
+{
+ AppLogDebug("ENTER");
+ result r = E_SUCCESS;
+ bool modified = false;
+ bool isValidRect = false;
+ Rectangle evaluateBoundsRect = Rectangle(X_BASE_POS, Y_BASE_POS, GetClientAreaBounds().width, GetClientAreaBounds().height);
+ Rectangle rect = Rectangle(X_BASE_POS, Y_BASE_POS, GetClientAreaBounds().width, GetClientAreaBounds().height);
Rectangle clientRect = GetClientAreaBounds();
+ bool isToCompensated = false;
- AppLogDebug("__screenMode[%d] mode[%d]", __screenMode, mode);
- __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+ if (__dir == ORIENTATION_STATUS_PORTRAIT
+ || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
+ {
+ if (clientRect.height == (CAMERA_PANEL_SUM_SIZE + PREVIEW_OVERLAY_PANEL_SIZE))
+ {
+ rect = Rectangle(X_BASE_POS, Y_BASE_POS, GetClientAreaBounds().width, GetClientAreaBounds().height);
+ }
+ else
+ {
+ rect = Rectangle(X_BASE_POS, Y_BASE_POS, GetClientAreaBounds().width, GetClientAreaBounds().height - PREVIEW_OVERLAY_PANEL_SIZE_MARGIN);
+ }
+ }
+ else
+ {
+ if (clientRect.width == (CAMERA_PANEL_SUM_SIZE + PREVIEW_OVERLAY_PANEL_SIZE))
+ {
+ rect = Rectangle(X_BASE_POS, Y_BASE_POS, GetClientAreaBounds().width, GetClientAreaBounds().height);
+ }
+ else
+ {
+ rect = Rectangle(X_BASE_POS, Y_BASE_POS, GetClientAreaBounds().width - PREVIEW_OVERLAY_PANEL_SIZE_MARGIN, GetClientAreaBounds().height);
+ }
+ }
- switch (mode)
+ if (isRemoved == true)
{
- case SCREEN_MODE_NORMAL:
+ if (__pOverlayPanel)
{
- if (destory == true)
+ RemoveControl(*__pOverlayPanel);
+ __pOverlayPanel = null;
+ }
+
+ AppLogDebug("Client area rect (%d, %d, %d, %d)", clientRect.x, clientRect.y, clientRect.width, clientRect.height);
+ AppLogDebug("Input bounds (%d, %d, %d, %d)", evaluateBoundsRect.x, evaluateBoundsRect.y, evaluateBoundsRect.width, evaluateBoundsRect.height);
+
+ isValidRect = OverlayRegion::EvaluateBounds(OVERLAY_REGION_EVALUATION_OPTION_GREATER_THAN, evaluateBoundsRect, modified);
+ TryReturnVoid(isValidRect == true, "OverlayRegion::EvaluateBounds returned error[%s]", GetErrorMessage(GetLastResult()));
+
+ if (modified == true)
+ {
+ AppLogDebug("OverlayRegion::EvaluateBounds is modified to (%d,%d,%d,%d)", evaluateBoundsRect.x, evaluateBoundsRect.y, evaluateBoundsRect.width, evaluateBoundsRect.height);
+ }
+
+ if (__dir == ORIENTATION_STATUS_PORTRAIT
+ || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
+ {
+ if (evaluateBoundsRect.height == rect.height)
{
- if (__screenMode != mode)
- {
- TryCatch(__pAppTimer != null, r = E_SYSTEM, "__pAppTimer is null");
- __pAppTimer->Cancel();
+ isToCompensated = false;
+ }
+ else
+ {
+ isToCompensated = true;
+ }
+ }
+ else
+ {
+ if (evaluateBoundsRect.width == rect.width)
+ {
+ isToCompensated = false;
+ }
+ else
+ {
+ isToCompensated = true;
+ }
+ }
- r = __pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
- TryCatch(r == E_SUCCESS, , "__pAppTimer start fail[%s]", GetErrorMessage(r));
+ if (isToCompensated == false)
+ {
+ __pOverlayPanel = new (std::nothrow) OverlayPanel();
+ __pOverlayPanel->Construct(rect);
+ AddControl(*__pOverlayPanel);
- __pCamcorderPresentationModel->KeepScreenOnState(true, false);
+ AppLogDebug("__pOverlayPanel area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+ }
+ else
+ {
+ AppLogDebug("isToCompensated = true");
+ __pOverlayPanel = new (std::nothrow) OverlayPanel();
+ __pOverlayPanel->Construct(rect);
+ AddControl(*__pOverlayPanel);
- __pCamcorderPresentationModel->StopCamera();
- }
+ rect = __pOverlayPanel->GetBounds();
+ AppLogDebug("__pOverlayPanel->GetBounds area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
- if (__pOverlayPanel)
- {
- RemoveControl(*__pOverlayPanel);
- __pOverlayPanel = null;
- }
+ rect.x = 0; //imsi
+ rect.y = 0; //imsi
- if (__dir == ORIENTATION_STATUS_PORTRAIT
- || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
- {
- rect = Rectangle(X_PREVIEW_OVERLAY_PORTRAIT, Y_PREVIEW_OVERLAY_PORTRAIT, W_PREVIEW_OVERLAY_PORTRAIT, H_PREVIEW_OVERLAY_PORTRAIT);
- }
- else
- {
- rect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
- }
+ r = __pOverlayPanel->SetBounds(rect);
+ AppLogDebug("__pOverlayPanel->SetBounds() area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+ }
+ }
+ else
+ {
+ TryReturnVoid(__pOverlayPanel != null, "__pOverlayPanel is null");
- AppLogDebug("Client area rect (%d, %d, %d, %d)", clientRect.x, clientRect.y, clientRect.width, clientRect.height);
- AppLogDebug("Input bounds (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+ AppLogDebug("Client area rect (%d, %d, %d, %d)", clientRect.x, clientRect.y, clientRect.width, clientRect.height);
+ AppLogDebug("Input EvaluateBounds (%d, %d, %d, %d)", evaluateBoundsRect.x, evaluateBoundsRect.y, evaluateBoundsRect.width, evaluateBoundsRect.height);
- __pOverlayPanel = new (std::nothrow) OverlayPanel();
- __pOverlayPanel->Construct(rect);
- AddControl(*__pOverlayPanel);
+ isValidRect = OverlayRegion::EvaluateBounds(OVERLAY_REGION_EVALUATION_OPTION_GREATER_THAN, evaluateBoundsRect, modified);
+ TryReturnVoid(isValidRect == true, "OverlayRegion::EvaluateBounds returned error[%s]", GetErrorMessage(GetLastResult()));
- if (rect.width > clientRect.width
- || rect.height > clientRect.height)
- {
- rect.width = clientRect.width;
- rect.height = clientRect.height;
- }
+ if (modified == true)
+ {
+ AppLogDebug("OverlayRegion::EvaluateBounds is modified to (%d,%d,%d,%d)", evaluateBoundsRect.x, evaluateBoundsRect.y, evaluateBoundsRect.width, evaluateBoundsRect.height);
+ }
- isValidRect = OverlayRegion::EvaluateBounds(OVERLAY_REGION_EVALUATION_OPTION_LESS_THAN, rect, modified);
- TryCatch(isValidRect, r = GetLastResult(), "OverlayRegion::EvaluateBounds failed : %s", GetErrorMessage(r));
+ if (__dir == ORIENTATION_STATUS_PORTRAIT
+ || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
+ {
+ if (evaluateBoundsRect.height == rect.height)
+ {
+ isToCompensated = false;
+ }
+ else
+ {
+ isToCompensated = true;
+ }
+ }
+ else
+ {
+ if (evaluateBoundsRect.width == rect.width)
+ {
+ isToCompensated = false;
+ }
+ else
+ {
+ isToCompensated = true;
+ }
+ }
- AppLogDebug("SCREEN_MODE_NORMAL Bounds is modified to (%d,%d,%d,%d)", rect.x, rect.y, rect.width, rect.height);
+ if (isToCompensated == false)
+ {
+ AppLogDebug("isToCompensated = false");
- switch (__dir)
- {
- case ORIENTATION_STATUS_PORTRAIT:
- {
- AppLogDebug("PORTRAIT");
- __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_90);
- }
- break;
+ r = __pOverlayPanel->SetBounds(rect);
+ AppLogDebug("pOverlayPanel->SetBounds() [%s]", GetErrorMessage(r));
- case ORIENTATION_STATUS_PORTRAIT_REVERSE:
- {
- AppLogDebug("PORTRAIT REVERSE");
- __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_270);
- }
- break;
+ AppLogDebug("__pOverlayPanel->SetBounds() area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+ }
+ else
+ {
+ AppLogDebug("isToCompensated = true");
- case ORIENTATION_STATUS_LANDSCAPE:
- {
- AppLogDebug("LANDSCAPE");
- __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_NONE);
- }
- break;
+ r = __pOverlayPanel->SetBounds(rect);
+ AppLogDebug("pOverlayPanel->SetBounds() [%s]", GetErrorMessage(r));
- case ORIENTATION_STATUS_LANDSCAPE_REVERSE:
- {
- AppLogDebug("LANDSCAPE REVERSE");
- __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_180);
- }
- break;
+ rect = __pOverlayPanel->GetBounds();
+ AppLogDebug("__pOverlayPanel GetBounds area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
- default:
- break;
- }
+ rect.x = 0; //imsi
+ rect.y = 0; //imsi
- if (__screenMode != mode)
- {
- AppLogDebug("__screenMode[%d] mode[%d]", __screenMode, mode );
- BufferInfo bufferinfo;
+ r = __pOverlayPanel->SetBounds(rect);
- __pCamcorderPresentationModel->SetMode(CameraPresentationModel::CAMERA_MODE_RECORD);
+ AppLogDebug("__pOverlayPanel->SetBounds() area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+ }
+ }
+ AppLogDebug("EXIT");
+}
- dim = __pCamcorderPresentationModel->GetPreviewResolution();
- AppLogDebug("CamcorderForm::GetPreviewResolution(W:%d, H:%d)", dim.width, dim.height);
+void
+CamcorderForm::SetOverlayPanelNormalMode(bool isRemoved)
+{
+ AppLogDebug("ENTER");
+ result r = E_SUCCESS;
+ bool modified = false;
+ bool isValidRect = false;
+ Dimension dim = Dimension(0, 0);
+ Rectangle rect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
+ Rectangle evaluateBoundsRect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
+ Rectangle clientRect = GetClientAreaBounds();
+ bool isToCompensated = false;
- __previewResolutionWidth = dim.width;
- __previewResolutionHeight = dim.height;
-#if true
- r = __pOverlayPanel->GetBackgroundBufferInfo(bufferinfo);
- TryCatch(r == E_SUCCESS, , "GetBackgroundBufferInfo fail[%s]", GetErrorMessage(r));
+ if (__dir == ORIENTATION_STATUS_PORTRAIT
+ || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
+ {
+ if (clientRect.height == (CAMERA_PANEL_SUM_SIZE + PREVIEW_OVERLAY_PANEL_SIZE))
+ {
+ evaluateBoundsRect = Rectangle(X_PREVIEW_OVERLAY_PORTRAIT, Y_PREVIEW_OVERLAY_PORTRAIT, W_PREVIEW_OVERLAY_PORTRAIT, H_PREVIEW_OVERLAY_PORTRAIT);
+ rect = Rectangle(X_PREVIEW_OVERLAY_PORTRAIT, Y_PREVIEW_OVERLAY_PORTRAIT, W_PREVIEW_OVERLAY_PORTRAIT, H_PREVIEW_OVERLAY_PORTRAIT);
+ }
+ else
+ {
+ evaluateBoundsRect = Rectangle(X_PREVIEW_OVERLAY_PORTRAIT, Y_PREVIEW_OVERLAY_PORTRAIT, W_PREVIEW_OVERLAY_PORTRAIT, H_PREVIEW_OVERLAY_PORTRAIT - PREVIEW_OVERLAY_PANEL_SIZE_MARGIN);
+ rect = Rectangle(X_PREVIEW_OVERLAY_PORTRAIT, Y_PREVIEW_OVERLAY_PORTRAIT, W_PREVIEW_OVERLAY_PORTRAIT, H_PREVIEW_OVERLAY_PORTRAIT - PREVIEW_OVERLAY_PANEL_SIZE_MARGIN);
+ }
+ }
+ else
+ {
+ if (clientRect.width == (CAMERA_PANEL_SUM_SIZE + PREVIEW_OVERLAY_PANEL_SIZE))
+ {
+ evaluateBoundsRect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
+ rect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
+ }
+ else
+ {
+ evaluateBoundsRect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE - PREVIEW_OVERLAY_PANEL_SIZE_MARGIN, H_PREVIEW_OVERLAY_LANDSCAPE);
+ rect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE - PREVIEW_OVERLAY_PANEL_SIZE_MARGIN, H_PREVIEW_OVERLAY_LANDSCAPE);
+ }
+ }
- __pCamcorderPresentationModel->StartPreview(&bufferinfo);
-#else
- r = RunStartPreviewThread();
- TryCatch(r == E_SUCCESS, , "RunStartPreviewThread fail[%s]", GetErrorMessage(r));
-#endif
- __pCamcorderPresentationModel->SetContinuousAutoFocus();
+ if (isRemoved)
+ {
+ if (__pOverlayPanel)
+ {
+ RemoveControl(*__pOverlayPanel);
+ __pOverlayPanel = null;
+ }
- previewResolutionSize = __previewResolutionWidth * __previewResolutionHeight;
+ AppLogDebug("Client area rect (%d, %d, %d, %d)", clientRect.x, clientRect.y, clientRect.width, clientRect.height);
+ AppLogDebug("Input EvaluateBounds (%d, %d, %d, %d)", evaluateBoundsRect.x, evaluateBoundsRect.y, evaluateBoundsRect.width, evaluateBoundsRect.height);
- __pCameraInfoPanel->SetPreviewResolutionSize(previewResolutionSize);
- }
- else
- {
- AppLogDebug("__screenMode = mode");
- }
- __screenMode = SCREEN_MODE_NORMAL;
+ isValidRect = OverlayRegion::EvaluateBounds(OVERLAY_REGION_EVALUATION_OPTION_LESS_THAN, evaluateBoundsRect, modified);
+ TryReturnVoid(isValidRect == true, "OverlayRegion::EvaluateBounds returned error[%s]", GetErrorMessage(GetLastResult()));
+
+ if (modified == true)
+ {
+ AppLogDebug("OverlayRegion::EvaluateBounds is modified to (%d,%d,%d,%d)", evaluateBoundsRect.x, evaluateBoundsRect.y, evaluateBoundsRect.width, evaluateBoundsRect.height);
+ }
+
+ if (__dir == ORIENTATION_STATUS_PORTRAIT
+ || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
+ {
+ if (evaluateBoundsRect.height == rect.height)
+ {
+ isToCompensated = false;
}
else
{
- if (__dir == ORIENTATION_STATUS_PORTRAIT
- || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
- {
- rect = Rectangle(X_PREVIEW_OVERLAY_PORTRAIT, Y_PREVIEW_OVERLAY_PORTRAIT, W_PREVIEW_OVERLAY_PORTRAIT, H_PREVIEW_OVERLAY_PORTRAIT);
- }
- else
- {
- rect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
- }
+ isToCompensated = true;
+ }
+ }
+ else
+ {
+ if (evaluateBoundsRect.width == rect.width)
+ {
+ isToCompensated = false;
+ }
+ else
+ {
+ isToCompensated = true;
+ }
+ }
- if (__pOverlayPanel)
- {
- switch (__dir)
- {
- case ORIENTATION_STATUS_PORTRAIT:
- {
- AppLogDebug("PORTRAIT");
- __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_90);
- }
- break;
+ if (isToCompensated == false)
+ {
+ AppLogDebug("isToCompensated = false");
+ __pOverlayPanel = new (std::nothrow) OverlayPanel();
+ __pOverlayPanel->Construct(rect);
+ AddControl(*__pOverlayPanel);
- case ORIENTATION_STATUS_PORTRAIT_REVERSE:
- {
- AppLogDebug("PORTRAIT REVERSE");
- __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_270);
- }
- break;
+ AppLogDebug("__pOverlayPanel area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+ }
+ else
+ {
+ AppLogDebug("isToCompensated = true");
+ __pOverlayPanel = new (std::nothrow) OverlayPanel();
+ __pOverlayPanel->Construct(rect);
+ AddControl(*__pOverlayPanel);
- case ORIENTATION_STATUS_LANDSCAPE:
- {
- AppLogDebug("LANDSCAPE");
- __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_NONE);
- }
- break;
+ rect = __pOverlayPanel->GetBounds();
+ AppLogDebug("__pOverlayPanel->GetBounds area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
- case ORIENTATION_STATUS_LANDSCAPE_REVERSE:
- {
- AppLogDebug("LANDSCAPE REVERSE");
- __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_180);
- }
- break;
+ rect.x = 0; //imsi
+ rect.y = 0; //imsi
- default:
- break;
- }
+ r = __pOverlayPanel->SetBounds(rect);
+ AppLogDebug("__pOverlayPanel->SetBounds() area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+ }
+ }
+ else
+ {
+ TryReturnVoid(__pOverlayPanel != null, "__pOverlayPanel is null");
- r = __pOverlayPanel->SetBounds(rect);
- AppLogDebug("pOverlayPanel->SetBounds() [%s]", GetErrorMessage(r));
- }
+ AppLogDebug("Client area rect (%d, %d, %d, %d)", clientRect.x, clientRect.y, clientRect.width, clientRect.height);
+ AppLogDebug("Input EvaluateBounds (%d, %d, %d, %d)", evaluateBoundsRect.x, evaluateBoundsRect.y, evaluateBoundsRect.width, evaluateBoundsRect.height);
- AppLogDebug("Client area rect (%d, %d, %d, %d)", clientRect.x, clientRect.y, clientRect.width, clientRect.height);
- AppLogDebug("Input bounds (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+ isValidRect = OverlayRegion::EvaluateBounds(OVERLAY_REGION_EVALUATION_OPTION_LESS_THAN, evaluateBoundsRect, modified);
+ TryReturnVoid(isValidRect == true, "OverlayRegion::EvaluateBounds returned error[%s]", GetErrorMessage(GetLastResult()));
- if (rect.width > clientRect.width
- || rect.height > clientRect.height)
- {
- rect.width = clientRect.width;
- rect.height = clientRect.height;
- }
+ if (modified == true)
+ {
+ AppLogDebug("OverlayRegion::EvaluateBounds is modified to (%d,%d,%d,%d)", evaluateBoundsRect.x, evaluateBoundsRect.y, evaluateBoundsRect.width, evaluateBoundsRect.height);
+ }
- isValidRect = OverlayRegion::EvaluateBounds(OVERLAY_REGION_EVALUATION_OPTION_LESS_THAN, rect, modified);
- TryCatch(isValidRect, r = GetLastResult(), "OverlayRegion::EvaluateBounds failed : %s", GetErrorMessage(r));
+ if (__dir == ORIENTATION_STATUS_PORTRAIT
+ || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
+ {
+ if (evaluateBoundsRect.height == rect.height)
+ {
+ isToCompensated = false;
+ }
+ else
+ {
+ isToCompensated = true;
+ }
+ }
+ else
+ {
+ if (evaluateBoundsRect.width == rect.width)
+ {
+ isToCompensated = false;
+ }
+ else
+ {
+ isToCompensated = true;
+ }
+ }
- AppLogDebug("SCREEN_MODE_NORMAL Bounds is modified to (%d,%d,%d,%d)", rect.x, rect.y, rect.width, rect.height);
+ if (isToCompensated == false)
+ {
+ AppLogDebug("isToCompensated = false");
- __screenMode = SCREEN_MODE_NORMAL;
- }
+ r = __pOverlayPanel->SetBounds(rect);
+ AppLogDebug("pOverlayPanel->SetBounds() [%s]", GetErrorMessage(r));
- HidePanel(false, false);
+ AppLogDebug("__pOverlayPanel->SetBounds() area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+ }
+ else
+ {
+ AppLogDebug("isToCompensated = true");
- __pCameraInfoPanel->SetOverlayPanelMode(__screenMode);
+ r = __pOverlayPanel->SetBounds(rect);
+ AppLogDebug("pOverlayPanel->SetBounds() [%s]", GetErrorMessage(r));
+
+ rect = __pOverlayPanel->GetBounds();
+
+ AppLogDebug("__pOverlayPanel GetBounds area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+
+ rect.x = 0; //imsi
+ rect.y = 0; //imsi
+
+ r = __pOverlayPanel->SetBounds(rect);
+
+ AppLogDebug("__pOverlayPanel->SetBounds() area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
}
- break;
+ }
+ AppLogDebug("EXIT");
+}
- case SCREEN_MODE_FULL:
- {
- Rectangle rect = Rectangle(0, 0, GetClientAreaBounds().width, GetClientAreaBounds().height);
+void
+CamcorderForm::SetCamcorderMode(void)
+{
+ AppLogDebug("ENTER");
+ result r = E_SUCCESS;
+ int previewResolutionSize = 0;
+ Dimension dim;
+ BufferInfo bufferinfo;
+
+ __pCamcorderPresentationModel->SetMode(CameraPresentationModel::CAMERA_MODE_RECORD);
+
+ dim = __pCamcorderPresentationModel->GetPreviewResolution();
+ AppLogDebug("CamcorderForm::GetPreviewResolution(W:%d, H:%d)", dim.width, dim.height);
+
+ __previewResolutionWidth = dim.width;
+ __previewResolutionHeight = dim.height;
+
+ r = __pOverlayPanel->GetBackgroundBufferInfo(bufferinfo);
+ TryReturnVoid(r == E_SUCCESS, "GetBackgroundBufferInfo() fail(%s)", GetErrorMessage(r));
+
+ __pCamcorderPresentationModel->StartPreview(&bufferinfo);
+
+ __pCamcorderPresentationModel->SetContinuousAutoFocus();
+
+ previewResolutionSize = __previewResolutionWidth * __previewResolutionHeight;
+
+ __pCameraInfoPanel->SetPreviewResolutionSize(previewResolutionSize);
+ AppLogDebug("EXIT");
+}
+
+result
+CamcorderForm::SetScreenMode(const ScreenMode mode, bool destory)
+{
+ AppLogDebug("ENTER");
+ result r = E_SUCCESS;
+ Dimension dim;
+ AppLogDebug("__screenMode[%d] mode[%d]", __screenMode, mode);
+
+ switch (mode)
+ {
+ case SCREEN_MODE_NORMAL:
+ {
if (destory == true)
{
if (__screenMode != mode)
__pCamcorderPresentationModel->StopCamera();
}
- if (__pOverlayPanel)
- {
- RemoveControl(*__pOverlayPanel);
- __pOverlayPanel = null;
- }
-
- __pOverlayPanel = new (std::nothrow) OverlayPanel();
- __pOverlayPanel->Construct(rect);
- AddControl(*__pOverlayPanel);
-
- AppLogDebug("Client area rect (%d, %d, %d, %d)", clientRect.x, clientRect.y, clientRect.width, clientRect.height);
- AppLogDebug("Input bounds (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
-
- isValidRect = OverlayRegion::EvaluateBounds(OVERLAY_REGION_EVALUATION_OPTION_GREATER_THAN, rect, modified);
- TryCatch(isValidRect, r = GetLastResult(), "OverlayRegion::EvaluateBounds failed : %s", GetErrorMessage(r));
+ SetOverlayPanelNormalMode(true);
- AppLogDebug("SCREEN_MODE_FULL Bounds is modified to (%d,%d,%d,%d)", rect.x, rect.y, rect.width, rect.height);
+ SetOverlayRendererRotation();
- switch (__dir)
+ if (__screenMode != mode)
{
- case ORIENTATION_STATUS_PORTRAIT:
- {
- AppLogDebug("PORTRAIT");
- __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_90);
- }
- break;
+ SetCamcorderMode();
+ }
+ else
+ {
+ AppLogDebug("__screenMode = mode");
+ }
+ __screenMode = SCREEN_MODE_NORMAL;
+ }
+ else
+ {
+ SetOverlayPanelNormalMode(false);
- case ORIENTATION_STATUS_PORTRAIT_REVERSE:
- {
- AppLogDebug("PORTRAIT REVERSE");
- __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_270);
- }
- break;
+ SetOverlayRendererRotation();
- case ORIENTATION_STATUS_LANDSCAPE:
- {
- AppLogDebug("LANDSCAPE");
- __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_NONE);
- }
- break;
+ __screenMode = SCREEN_MODE_NORMAL;
+ }
- case ORIENTATION_STATUS_LANDSCAPE_REVERSE:
- {
- AppLogDebug("LANDSCAPE REVERSE");
- __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_180);
- }
- break;
+ HidePanel(false, false);
- default:
- break;
- }
+ __pCameraInfoPanel->SetOverlayPanelMode(__screenMode);
+ }
+ break;
+
+ case SCREEN_MODE_FULL:
+ {
+ Rectangle rect = Rectangle(0, 0, GetClientAreaBounds().width, GetClientAreaBounds().height);
+ if (destory == true)
+ {
if (__screenMode != mode)
{
- AppLogDebug("__screenMode[%d] mode[%d]", __screenMode, mode);
- BufferInfo bufferinfo;
+ TryCatch(__pAppTimer != null, r = E_SYSTEM, "__pAppTimer is null");
+ __pAppTimer->Cancel();
- __pCamcorderPresentationModel->SetMode(CameraPresentationModel::CAMERA_MODE_RECORD);
+ r = __pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
+ TryCatch(r == E_SUCCESS, , "__pAppTimer start fail[%s]", GetErrorMessage(r));
- dim = __pCamcorderPresentationModel->GetPreviewResolution();
- AppLogDebug("CamcorderForm::GetPreviewResolution(W:%d, H:%d)", dim.width, dim.height);
+ __pCamcorderPresentationModel->KeepScreenOnState(true, false);
- __previewResolutionWidth = dim.width;
- __previewResolutionHeight = dim.height;
-#if true
- r = __pOverlayPanel->GetBackgroundBufferInfo(bufferinfo);
- TryCatch(r == E_SUCCESS, , "GetBackgroundBufferInfo fail[%s]", GetErrorMessage(r));
+ __pCamcorderPresentationModel->StopCamera();
+ }
- __pCamcorderPresentationModel->StartPreview(&bufferinfo);
-#else
- r = RunStartPreviewThread();
- TryCatch(r == E_SUCCESS, , "RunStartPreviewThread fail[%s]", GetErrorMessage(r));
-#endif
- __pCamcorderPresentationModel->SetContinuousAutoFocus();
+ SetOverlayPanelWideMode(true);
- previewResolutionSize = __previewResolutionWidth * __previewResolutionHeight;
+ SetOverlayRendererRotation();
- __pCameraInfoPanel->SetPreviewResolutionSize(previewResolutionSize);
+ if (__screenMode != mode)
+ {
+ SetCamcorderMode();
}
else
{
}
else
{
- if (__pOverlayPanel)
- {
- switch (__dir)
- {
- case ORIENTATION_STATUS_PORTRAIT:
- {
- AppLogDebug("PORTRAIT");
- __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_90);
- }
- break;
-
- case ORIENTATION_STATUS_PORTRAIT_REVERSE:
- {
- AppLogDebug("PORTRAIT REVERSE");
- __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_270);
- }
- break;
-
- case ORIENTATION_STATUS_LANDSCAPE:
- {
- AppLogDebug("LANDSCAPE");
- __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_NONE);
- }
- break;
-
- case ORIENTATION_STATUS_LANDSCAPE_REVERSE:
- {
- AppLogDebug("LANDSCAPE REVERSE");
- __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_180);
- }
- break;
-
- default:
- break;
- }
-
- r = __pOverlayPanel->SetBounds(rect);
- AppLogDebug("pOverlayPanel->SetBounds() [%s]", GetErrorMessage(r));
- }
-
- AppLogDebug("Client area rect (%d, %d, %d, %d)", clientRect.x, clientRect.y, clientRect.width, clientRect.height);
- AppLogDebug("Input bounds (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+ SetOverlayPanelWideMode(false);
- isValidRect = OverlayRegion::EvaluateBounds(OVERLAY_REGION_EVALUATION_OPTION_GREATER_THAN, rect, modified);
- TryCatch(isValidRect, r = GetLastResult(), "OverlayRegion::EvaluateBounds failed : %s", GetErrorMessage(r));
-
- AppLogDebug("SCREEN_MODE_FULL Bounds is modified to (%d,%d,%d,%d)", rect.x, rect.y, rect.width, rect.height);
+ SetOverlayRendererRotation();
__screenMode = SCREEN_MODE_FULL;
}
if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
{
r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
-
- if (focusSupport == true && r == E_SUCCESS)
- {
- AppLogDebug("focus is Support");
-
- __pCameraInfoPanel->SetCurrentPoint(currentPosition);
- __pCameraInfoPanel->SetDrawMarkerFocus(true);
- __pCameraInfoPanel->SetDrawMarkerFocusType(CAMERA_FOCUS_NOT_READY);
- }
- else
- {
- __pCameraInfoPanel->SetDrawMarkerFocus(false);
- __pCameraInfoPanel->Draw();
- __pCameraInfoPanel->Show();
- }
}
else
{
r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_FOCUS, focusSupport);
+ }
- if (focusSupport == true && r == E_SUCCESS)
- {
- __pCameraInfoPanel->SetCurrentPoint(currentPosition);
- __pCameraInfoPanel->SetDrawMarkerFocus(true);
- __pCameraInfoPanel->SetDrawMarkerFocusType(CAMERA_FOCUS_NOT_READY);
- }
- else
- {
- __pCameraInfoPanel->SetDrawMarkerFocus(false);
- __pCameraInfoPanel->Draw();
- __pCameraInfoPanel->Show();
- }
+ if (focusSupport == true && r == E_SUCCESS)
+ {
+ __pCameraInfoPanel->SetCurrentPoint(currentPosition);
+ __pCameraInfoPanel->SetDrawMarkerFocus(true);
+ __pCameraInfoPanel->SetDrawMarkerFocusType(CAMERA_FOCUS_NOT_READY);
+ }
+ else
+ {
+ __pCameraInfoPanel->SetDrawMarkerFocus(false);
+ __pCameraInfoPanel->Draw();
+ __pCameraInfoPanel->Show();
}
AppLogDebug("EXIT");
}
CamcorderForm::StartRecord(void)
{
AppLogDebug("ENTER");
- result r = E_SUCCESS;
- int selfPortraitEnable = 0;
- bool focusSupport = false;
- bool isAppControl = false;
- AppLogDebug("Record Start");
-
InitMakerFocusTimer();
- isAppControl = (static_cast<CameraApp*>(UiApp::GetInstance()))->IsAppControl();
-
__pCameraInfoPanel->SetDrawMarkerFocus(false);
- if (__dir == ORIENTATION_STATUS_LANDSCAPE
- || __dir == ORIENTATION_STATUS_LANDSCAPE_REVERSE)
- {
- __pCameraInfoPanel->SetDrawIndicator(true);
- __pCameraInfoPanel->Invalidate(true);
- }
- else
- {
- if (__screenMode == SCREEN_MODE_FULL)
- {
- __pCameraInfoPanel->SetDrawIndicator(false);
- __pCameraInfoPanel->Invalidate(true);
- }
- else
- {
- __pCameraInfoPanel->SetDrawIndicator(true);
- __pCameraInfoPanel->Invalidate(true);
- }
- }
+ __pCameraInfoPanel->SetDrawIndicator(false);
+
+ __pCameraInfoPanel->Invalidate(true);
__pMakerFocusTimer->Cancel();
CheckStorageInfo();
- r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
- TryReturnVoid(r == E_SUCCESS, "Reg getValue fail[%s]", GetErrorMessage(r));
-
- if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
- {
- r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
- }
- else
- {
- r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_FOCUS, focusSupport);
- }
-
SetContinuousAutoFocusButton();
- if (focusSupport == true && r == E_SUCCESS)
- {
- AppLogDebug("focus is Support");
-
- __pAutoFocus->SetShowState(true);
- __pAutoFocus->Invalidate(true);
- }
- else
- {
- __pAutoFocus->SetShowState(false);
- __pAutoFocus->Invalidate(true);
- }
-
if (__pBackButton)
{
__pBackButton->SetShowState(false);
__timeCount = 0;
- __pSettingTimer->Cancel();
+ if (__pIntervalValueTimer)
+ {
+ __pIntervalValueTimer->Cancel();
+ }
if (__pPopupTimer)
{
__timeCount = 0;
- __pSettingTimer->Cancel();
+ __pIntervalValueTimer->Cancel();
if (__pPopupTimer)
{
__timeCount = 0;
- __pSettingTimer->Cancel();
+ if (__pIntervalValueTimer)
+ {
+ __pIntervalValueTimer->Cancel();
+ }
if (__pPopupTimer)
{
__timeCount = 0;
- __pSettingTimer->Cancel();
+ if (__pIntervalValueTimer)
+ {
+ __pIntervalValueTimer->Cancel();
+ }
if (__pPopupTimer)
{
if (__pListViewCamcoderTabSubMenu)
{
- if (__pCamraInfoSubPanel != null)
+ if (__pCameraInfoSubPanel != null)
{
- __pCamraInfoSubPanel->SetShowState(false);
+ __pCameraInfoSubPanel->SetShowState(false);
}
__pListViewCamcoderTabSubMenu->SetShowState(false);
}
if (__pListViewGeneralTabSubMenu)
{
- if (__pCamraInfoSubPanel != null)
+ if (__pCameraInfoGeneralSubPanel != null)
{
- __pCamraInfoSubPanel->SetShowState(false);
+ __pCameraInfoGeneralSubPanel->SetShowState(false);
}
__pListViewGeneralTabSubMenu->SetShowState(false);
}
__pSettingButton->Invalidate(true);
}
+ if (__pSettingLine != null)
+ {
+ __pSettingLine->SetShowState(true);
+ __pSettingLine->Invalidate(true);
+ }
+
if (__pCameraInfoPanel != null)
{
__pCameraInfoPanel->SetDrawIndicator(true);
__pSettingButton->Invalidate(true);
}
+ if (__pSettingLine)
+ {
+ __pSettingLine->SetShowState(false);
+ __pSettingLine->Invalidate(true);
+ }
+
if (__pFlashButton)
{
__pFlashButton->SetShowState(true);
CamcorderForm::HideUiModeChangedButton(void)
{
AppLogDebug("ENTER");
- bool isAppControl = false;
- isAppControl = (static_cast<CameraApp*>(UiApp::GetInstance()))->IsAppControl();
-
- if (isAppControl == true)
+ if (IsAppControlRequest() == true)
{
if (__pCameraIconLabel)
{
CamcorderForm::HideUiPanel(bool state)
{
AppLogDebug("ENTER");
- bool isAppControl = false;
- isAppControl = (static_cast<CameraApp*>(UiApp::GetInstance()))->IsAppControl();
-
if (state == true)
{
__pFlashButton->SetShowState(false);
__pSelfShotButton->SetShowState(false);
__pSettingButton->SetShowState(false);
+ __pSettingLine->SetShowState(false);
__pCameraIconLabel->SetShowState(false);
-
__pCamcoderIconLabel->SetShowState(false);
__pSwButton->SetShowState(false);
__pBack->SetShowState(true);
__pFlashButton->SetShowState(false);
__pSelfShotButton->SetShowState(true);
__pSettingButton->SetShowState(true);
-
+ __pSettingLine->SetShowState(true);
__pQuickSettingButton->SetShowState(false);
__pWhiteBalanceButton->SetShowState(false);
__pExposureValueButton->SetShowState(false);
__pCloseButton->SetShowState(false);
__pAutoFocus->SetShowState(false);
- if (isAppControl)
+ if (IsAppControlRequest())
{
__pCameraIconLabel->SetShowState(false);
__pCamcoderIconLabel->SetShowState(false);
}
void
-CamcorderForm::HidePanel(bool isWideMode, bool isInvalidated)
+CamcorderForm::SetControlAlwaysOnTopPanel(void)
{
AppLogDebug("ENTER");
- result r = E_SUCCESS;
-
if (__pSettingPanel)
{
if (IsControlAlwaysOnTop(*__pSettingPanel) == false)
}
}
+ if (__pSettingLine)
+ {
+ if (IsControlAlwaysOnTop(*__pSettingLine) == false)
+ {
+ AppLogDebug("IsControlAlwaysOnTop __pSettingLine");
+ SetControlAlwaysOnTop(*__pSettingLine, true);
+ }
+ }
+
if (__pCameraIconLabel)
{
if (IsControlAlwaysOnTop(*__pCameraIconLabel) == false)
}
}
+ if (__pCamcoderSetting)
+ {
+ if (IsControlAlwaysOnTop(*__pCamcoderSetting) == false)
+ {
+ AppLogDebug("IsControlAlwaysOnTop __pCamcoderSetting");
+ SetControlAlwaysOnTop(*__pCamcoderSetting, true);
+ }
+ }
+
+ if (__pGeneralSetting)
+ {
+ if (IsControlAlwaysOnTop(*__pGeneralSetting) == false)
+ {
+ AppLogDebug("IsControlAlwaysOnTop __pGeneralSetting");
+ SetControlAlwaysOnTop(*__pGeneralSetting, true);
+ }
+ }
+ AppLogDebug("EXIT");
+}
+
+void
+CamcorderForm::HidePanel(bool isWideMode, bool isInvalidated)
+{
+ AppLogDebug("ENTER");
+ result r = E_SUCCESS;
+
+ SetControlAlwaysOnTopPanel();
+
if (isWideMode == true)
{
- AppLogDebug("Wide MODE");
if (__pSettingPanel)
{
r = __pSettingPanel->SetShowState(false);
}
else
{
- AppLogDebug("Normal MODE");
if (__pSettingPanel)
{
r = __pSettingPanel->SetShowState(true);
if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
{
r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
-
- if (focusSupport == true && r == E_SUCCESS)
- {
- AppLogDebug("focus is Support");
-
- __pCameraInfoPanel->SetDrawMarkerFocusType(CAMERA_FOCUS_NOT_READY);
- __pCameraInfoPanel->SetCurrentPoint(currentPosition);
- __pCameraInfoPanel->SetDrawMarkerFocus(true);
- __pCameraInfoPanel->Invalidate(true);
- }
- else
- {
- __pCameraInfoPanel->SetDrawMarkerFocus(false);
- __pCameraInfoPanel->Invalidate(true);
- }
}
else
{
r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_FOCUS, focusSupport);
-
- if (focusSupport == true && r == E_SUCCESS)
- {
- __pCameraInfoPanel->SetDrawMarkerFocusType(CAMERA_FOCUS_NOT_READY);
- __pCameraInfoPanel->SetCurrentPoint(currentPosition);
- __pCameraInfoPanel->SetDrawMarkerFocus(true);
- __pCameraInfoPanel->Invalidate(true);
- }
- else
- {
- __pCameraInfoPanel->SetDrawMarkerFocus(false);
- __pCameraInfoPanel->Invalidate(true);
- }
}
+ if (focusSupport == true && r == E_SUCCESS)
+ {
+ __pCameraInfoPanel->SetDrawMarkerFocusType(CAMERA_FOCUS_NOT_READY);
+ __pCameraInfoPanel->SetCurrentPoint(currentPosition);
+ __pCameraInfoPanel->SetDrawMarkerFocus(true);
+ __pCameraInfoPanel->Invalidate(true);
+ }
+ else
+ {
+ __pCameraInfoPanel->SetDrawMarkerFocus(false);
+ __pCameraInfoPanel->Invalidate(true);
+ }
__pCamcorderPresentationModel->SetAutoFocusPoint(currentPosition);
AppLogDebug("EXIT");
}
InDrawFocus();
-#if true
r = __pOverlayPanel->GetBackgroundBufferInfo(bufferinfo);
TryReturnVoid(r == E_SUCCESS, "GetBackgroundBufferInfo fail[%s]", GetErrorMessage(r));
__pCamcorderPresentationModel->StartPreview(&bufferinfo);
-#else
- r = RunStartPreviewThread();
- TryReturnVoid(r == E_SUCCESS, "RunStartPreviewThread failed:%s", GetErrorMessage(r));
-#endif
__pCamcorderPresentationModel->SetContinuousAutoFocus();
if (__isRecording == true)
{
- AppLogDebug("StopRecord");
__pCamcorderPresentationModel->StopRecord();
}
__timeCount = 0;
- __pSettingTimer->Cancel();
+ if (__pIntervalValueTimer)
+ {
+ __pIntervalValueTimer->Cancel();
+ }
if (__pPopupTimer)
{
CamcorderForm::DrawThumbnail(void)
{
AppLogDebug("ENTER");
- bool isAppControl = false;
-
- isAppControl = (static_cast<CameraApp*>(UiApp::GetInstance()))->IsAppControl();
-
- if (isAppControl == true)
+ if (IsAppControlRequest() == true)
{
if (__pBackButton)
{
AppLogDebug("batteryLevel = %d", batteryLevel);
- if (batteryLevel == BATTERY_CRITICAL || batteryLevel == BATTERY_EMPTY)// || batteryLevel == BATTERY_LOW)
+ if (batteryLevel == BATTERY_CRITICAL || batteryLevel == BATTERY_EMPTY)
{
if (isCharging == false)
{
__pCamcorderPresentationModel->GetValue(OVERLAY_HELP_ENABLE, overlayHelpEnable);
- AppLogDebug("SetScreenOverlayHelpTimer : overlayHelpEnable = %d", overlayHelpEnable);
+ AppLogDebug("SetScreenOverlayHelpTimer : overlayHelpEnable = %d", overlayHelpEnable);
+
+ if (overlayHelpEnable == SCREEN_OVERLAY_HELP_ENABLE)
+ {
+ __pHelpCloseTimer = new (std::nothrow) Timer();
+ __pHelpCloseTimer->Construct(*this);
+
+ r = __pHelpCloseTimer->Start(MESSAGEBOX_DISPLAY_TIME_3_SEC);
+ TryCatch(r == E_SUCCESS, , "Timer::start fail[%s]", GetErrorMessage(r));
+ }
+
+ AppLogDebug("EXIT");
+ return r;
+
+CATCH:
+ delete __pHelpCloseTimer;
+ __pHelpCloseTimer = null;
+
+ AppLogDebug("EXIT - CATCH");
+ return r;
+}
+
+void
+CamcorderForm::HideScreenOverlayHelp(void)
+{
+ AppLogDebug("ENTER");
+ if (__pHelpGoToGallery)
+ {
+ __pHelpGoToGallery->SetShowState(false);
+ }
+
+ if (__pHelpGoToGalleryText)
+ {
+ __pHelpGoToGalleryText->SetShowState(false);
+ }
+
+ if (__pHelpSwitchCamera)
+ {
+ __pHelpSwitchCamera->SetShowState(false);
+ }
+
+ if (__pHelpSwitchCameraText)
+ {
+ __pHelpSwitchCameraText->SetShowState(false);
+ }
+
+ if (__pHelpQuickSetting)
+ {
+ __pHelpQuickSetting->SetShowState(false);
+ }
+
+ if (__pHelpQuickSettingText)
+ {
+ __pHelpQuickSettingText->SetShowState(false);
+ }
+
+ if (__pHelpRecordVideo)
+ {
+ __pHelpRecordVideo->SetShowState(false);
+ }
+
+ if (__pHelpRecordVideoText)
+ {
+ __pHelpRecordVideoText->SetShowState(false);
+ }
+
+ if (__pHelpShutter)
+ {
+ __pHelpShutter->SetShowState(false);
+ }
- if (overlayHelpEnable == SCREEN_OVERLAY_HELP_ENABLE)
+ if (__pHelpShutterText)
{
- __pHelpCloseTimer = new (std::nothrow) Timer();
- __pHelpCloseTimer->Construct(*this);
+ __pHelpShutterText->SetShowState(false);
+ }
- r = __pHelpCloseTimer->Start(MESSAGEBOX_DISPLAY_TIME_3_SEC);
- TryCatch(r == E_SUCCESS, , "Timer::start fail[%s]", GetErrorMessage(r));
+ if (__pHelpGoToPreviousScreen)
+ {
+ __pHelpGoToPreviousScreen->SetShowState(false);
}
+ if (__pHelpGoToPreviousScreenText)
+ {
+ __pHelpGoToPreviousScreenText->SetShowState(false);
+ }
AppLogDebug("EXIT");
- return r;
-
-CATCH:
- delete __pHelpCloseTimer;
- __pHelpCloseTimer = null;
-
- AppLogDebug("EXIT - CATCH");
- return r;
}
result
if (__isRecording == true)
{
- if (__pRecLabel)
- {
- if (IsControlAlwaysOnTop(*__pRecLabel) == false)
- {
- AppLogDebug("IsControlAlwaysOnTop __pRecLabel");
- SetControlAlwaysOnTop(*__pRecLabel, true);
- }
- }
-
if (__pRecLabelRed)
{
if (IsControlAlwaysOnTop(*__pRecLabelRed) == false)
}
}
- if (((++timeCnt) % FRAME_RATE) == 0)
+ if (((++timeCnt) % FRAME_RATE) == INDEX_UNIT_ZERO)
{
pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMCODER_ICON_RECODING);
TryCatch(pBitmap != null, r = E_SYSTEM, "pBitmap is null");
__pRecLabelRed->Invalidate(true);
}
- pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMCODER_ICON_RECODING_TEXT);
- TryCatch(pBitmap != null, r = E_SYSTEM, "pBitmap is null");
-
- __pRecLabelText->SetBackgroundBitmap(*pBitmap);
__pRecLabelText->SetShowState(true);
__pRecLabelText->Invalidate(true);
- delete pBitmap;
- pBitmap = null;
-
- pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMCODER_ICON_RECODING_BG);
- TryCatch(pBitmap != null, r = E_SYSTEM, "pBitmap is null");
-
- __pRecLabel->SetBackgroundBitmap(*pBitmap);
- __pRecLabel->SetShowState(true);
- __pRecLabel->Invalidate(true);
-
- delete pBitmap;
- pBitmap = null;
-
__pBatteryState->SetShowState(false);
__pBatteryState->Invalidate(true);
}
__pRecLabelText->SetShowState(false);
__pRecLabelText->Invalidate(true);
- __pRecLabel->SetShowState(false);
- __pRecLabel->Invalidate(true);
-
__pBatteryState->SetShowState(true);
__pBatteryState->Invalidate(true);
}
}
result
+CamcorderForm::InitElapsedTimeLable(void)
+{
+ AppLogDebug("ENTER");
+ result r = E_SUCCESS;
+
+ String endTime = L"";
+ String maxTime = L"";
+ String recSize = L"";
+
+ if (__isRecording == true)
+ {
+ TryCatch(__pElapsedTimeLable != null, r = E_FAILURE, "__pElapsedTimeLable is null");
+ TryCatch(__pElapsedTimeMaxLable != null, r = E_FAILURE, "__pElapsedTimeMaxLable is null");
+ TryCatch(__pElapsedRecordSizeLable != null, r = E_FAILURE, "__pElapsedRecordSizeLable is null");
+ TryCatch(__pRecLabelRed != null, r = E_FAILURE, "__pRecLabelRed is null");
+ TryCatch(__pRecLabelText != null, r = E_FAILURE, "__pRecLabelText is null");
+
+ r = endTime.Append(INIT_REC_TIME);
+ TryCatch(r == E_SUCCESS, , "endTime::Append() fail[%s]", GetErrorMessage(r));
+
+ r = maxTime.Append(INIT_MAX_REC_TIME);
+ TryCatch(r == E_SUCCESS, , "maxTime::Append() fail[%s]", GetErrorMessage(r));
+
+ r = recSize.Append(INIT_REC_SIZE);
+ TryCatch(r == E_SUCCESS, , "recSize::Append() fail[%s]", GetErrorMessage(r));
+
+ __pElapsedTimeLable->SetText(endTime);
+ __pElapsedTimeLable->SetTextColor(Color::GetColor(COLOR_ID_WHITE));
+
+ __pElapsedTimeMaxLable->SetText(maxTime);
+ __pElapsedTimeMaxLable->SetTextColor(Color::GetColor(COLOR_ID_WHITE));
+
+ __pElapsedRecordSizeLable->SetText(recSize);
+ __pElapsedRecordSizeLable->SetTextColor(Color::GetColor(COLOR_ID_WHITE));
+
+ __pElapsedTimeLable->SetShowState(false);
+ __pElapsedTimeLable->Invalidate(true);
+
+ __pElapsedTimeMaxLable->SetShowState(false);
+ __pElapsedTimeMaxLable->Invalidate(true);
+
+ __pElapsedRecordSizeLable->SetShowState(false);
+ __pElapsedRecordSizeLable->Invalidate(true);
+
+ __pRecLabelRed->SetShowState(false);
+ __pRecLabelRed->Invalidate(true);
+
+ __pRecLabelText->SetShowState(false);
+ __pRecLabelText->Invalidate(true);
+ }
+
+ AppLogDebug("EXIT");
+ return r;
+
+CATCH:
+ return r;
+}
+
+result
CamcorderForm::DrawRecordTimer(void)
{
AppLogDebug("ENTER");
recMin = (timeCnt % SECONDS_PER_HOUR) / SECONDS_PER_MINUTE;
recSec = timeCnt % SECONDS_PER_MINUTE;
- if (__recordingMaxTime > 0)
+ if (__recordingMaxTime > INDEX_UNIT_ZERO)
{
__recordingMaxTime = __recordingMaxTime / DIVIDE_THOUSAND;
maxHour =__recordingMaxTime / SECONDS_PER_HOUR;
r = recSize.Append(L"000");
TryCatch(r == E_SUCCESS, , "recSize::Append() fail[%s]", GetErrorMessage(r));
}
- else if (recSizeMB < 100)
+ else if (recSizeMB < UNIT_HUNDRED)
{
r = recSize.Append(L"00");
TryCatch(r == E_SUCCESS, , "recSize::Append() fail[%s]", GetErrorMessage(r));
}
- else if (recSizeMB < 1000)
+ else if (recSizeMB < UNIT_THOUSAND)
{
r = recSize.Append(L"0");
TryCatch(r == E_SUCCESS, , "recSize::Append() fail[%s]", GetErrorMessage(r));
result r = E_SUCCESS;
int elementId = 0;
Bitmap* pBitmap = null;
- Rectangle rectRadioIcon = Rectangle(X_SETTING_SUBMENU_RADIO_ICON + 360, Y_SETTING_SUBMENU_RADIO_ICON,
+ Rectangle rectRadioIcon = Rectangle(X_SETTING_SUBMENU_RADIO_ICON + X_SETTING_SUBMENU_RADIO_ICON_MARGIN, Y_SETTING_SUBMENU_RADIO_ICON,
W_SETTING_SUBMENU_RADIO_ICON, H_SETTING_SUBMENU_RADIO_ICON);
- Rectangle rectIcon = Rectangle(X_SETTING_SUBMENU_ICON - 75, Y_SETTING_SUBMENU_ICON,
+ Rectangle rectIcon = Rectangle(X_SETTING_SUBMENU_ICON - X_SETTING_SUBMENU_ICON_MARGIN, Y_SETTING_SUBMENU_ICON,
W_SETTING_SUBMENU_ICON, H_SETTING_SUBMENU_ICON);
Rectangle rectTwoTextItem = Rectangle(X_SETTING_SUBMENU_2TEXT_ITEM, Y_SETTING_SUBMENU_2TEXT_ITEM,
W_SETTING_SUBMENU_2TEXT_ITEM, H_SETTING_SUBMENU_2TEXT_ITEM);
- Rectangle rectThreeTextItem = Rectangle(X_SETTING_SUBMENU_3TEXT_ITEM - 80, Y_SETTING_SUBMENU_3TEXT_ITEM,
+ Rectangle rectThreeTextItem = Rectangle(X_SETTING_SUBMENU_3TEXT_ITEM - X_SETTING_SUBMENU_3TEXT_ITEM_MARGIN, Y_SETTING_SUBMENU_3TEXT_ITEM,
W_SETTING_SUBMENU_3TEXT_ITEM, H_SETTING_SUBMENU_3TEXT_ITEM);
String tmpString;
strTmp = __pSettingGeneralMenuString[index][0];
elementId++;
- if (strTmp.GetLength())
- {
- if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY)
- {
- if (index == CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE)
- {
- bool exposureValue = false;
- bool brighnesstValue = false;
-
- r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
-
- if (exposureValue == true && r == E_SUCCESS)
- {
- r = pItem->AddElement(rectContents, elementId, strTmp, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, false);
- TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
- }
- else
- {
- r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
-
- if (brighnesstValue == true && r == E_SUCCESS)
- {
- r = pItem->AddElement(rectContents, elementId, strTmp, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, false);
- TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
- }
- else
- {
- r = pItem->AddElement(rectContents, elementId, strTmp, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_VALUE_DISABLE, COLOR_SETTING_MENU_VALUE_DISABLE, COLOR_SETTING_MENU_VALUE_DISABLE, false);
- TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail:%s", GetErrorMessage(r));
- }
- }
- }
- else
- {
- r = pItem->AddElement(rectContents, elementId, strTmp, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, false);
- TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
- }
- }
- else
- {
- bool value = false;
- bool exposureValue = false;
- bool brighnesstValue = false;
-
- if (index == CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE)
- {
- r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, value);
-
- if (exposureValue == true && r == E_SUCCESS)
- {
- r = pItem->AddElement(rectContents, elementId, strTmp, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, false);
- TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
- }
- else
- {
- r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
-
- if (brighnesstValue == true && r == E_SUCCESS)
- {
- r = pItem->AddElement(rectContents, elementId, strTmp, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, false);
- TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
- }
- else
- {
- r = pItem->AddElement(rectContents, elementId, strTmp, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_VALUE_DISABLE, COLOR_SETTING_MENU_VALUE_DISABLE, COLOR_SETTING_MENU_VALUE_DISABLE, false);
- TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
- }
- }
- }
- else
- {
- r = pItem->AddElement(rectContents, elementId, strTmp, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, false);
- TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
- }
- }
- }
+ r = pItem->AddElement(rectContents, elementId, strTmp, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, false);
+ TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
String arrRegStringSupporExposure[] =
{
TIMER_INTERVAL,
- EXPOSURE_VALUE,
- GUIDELINE_ENABLE,
- STORAGE_TYPE,
- OVERLAY_HELP_ENABLE,
- };
-
- String arrRegStringSupportBrightness[] =
- {
- TIMER_INTERVAL,
- BRIGHTNESS_VALUE,
GUIDELINE_ENABLE,
STORAGE_TYPE,
OVERLAY_HELP_ENABLE,
r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, value);
}
- if (value == true && r == E_SUCCESS)
- {
- r = __pCamcorderPresentationModel->GetValue(arrRegStringSupportBrightness[index], regVal);
- TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
- }
- else
- {
- r = __pCamcorderPresentationModel->GetValue(arrRegStringSupporExposure[index], regVal);
- TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
- }
+ r = __pCamcorderPresentationModel->GetValue(arrRegStringSupporExposure[index], regVal);
+ TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
}
AppLogDebug("Setting Main Menu");
TryCatch(r == E_SUCCESS, , "CustomItem::SetElementTextHorizontalAlignment() fail[%s]", GetErrorMessage(r));
}
}
- else
- {
- if (index == CAMCORDER_GENERAL_TAB_SUB_MENU_OVERLAY_HELP_MODE)
- {
- int regVal = 0;
-
- __pCamcorderPresentationModel->GetValue(OVERLAY_HELP_ENABLE, regVal);
-
- AppLogDebug("%ls[%d]", strTmp.GetPointer(), regVal);
- AppLogDebug("Err = %s", GetErrorMessage(GetLastResult()));
-
- strTmp = __pSettingGeneralMenuString[index][regVal + INDEX_UNIT_ONE];
-
- elementId++;
-
- if (strTmp.GetLength())
- {
- r = pItem->AddElement(rectContentsValue, elementId, strTmp, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_VAULE, COLOR_SETTING_MENU_VAULE, COLOR_SETTING_MENU_VAULE, false);
- TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
-
- r = pItem->SetElementTextHorizontalAlignment(elementId, ALIGNMENT_CENTER);
- TryCatch(r == E_SUCCESS, , "CustomItem::SetElementTextHorizontalAlignment() fail[%s]", GetErrorMessage(r));
- }
- }
- }
}
else
{
int elementId = 0;
int regVal = 0;
Bitmap* pBitmap = null;
+ Rectangle rectRadioIcon = Rectangle(X_SETTING_SUBMENU_RADIO_ICON + X_FLASH_SETTING_SUBMENU_RADIO_ICON_MARGIN, Y_SETTING_SUBMENU_RADIO_ICON,
+ W_SETTING_SUBMENU_RADIO_ICON, H_SETTING_SUBMENU_RADIO_ICON);
+ Rectangle rectIcon = Rectangle(X_SETTING_SUBMENU_ICON - X_SETTING_SUBMENU_ICON_MARGIN, Y_SETTING_SUBMENU_ICON,
+ W_SETTING_SUBMENU_ICON, H_SETTING_SUBMENU_ICON);
+
+ String listName = L"";
+ Rectangle rectThreeTextItem = Rectangle(X_SETTING_SUBMENU_3TEXT_ITEM - X_FLASH_SETTING_SUBMENU_3TEXT_ITEM, Y_SETTING_SUBMENU_3TEXT_ITEM,
+ W_SETTING_SUBMENU_3TEXT_ITEM, H_SETTING_SUBMENU_3TEXT_ITEM);
+
AppResource* pAppResource = Application::GetInstance()->GetAppResource();
- String tmpString;
+ String tmpString = L"";
- String listName = __pListFlashMainMenu->GetName();
+ listName = __pListFlashMainMenu->GetName();
if (listName.Equals(String(IDS_MENU_FLASH_MENU_NAME)))
{
elementId = (index * MENU_THREE_ELEMENT);
elementId++;
- r = pItem->AddElement(Rectangle(X_SETTING_SUBMENU_RADIO_ICON, Y_SETTING_SUBMENU_RADIO_ICON, W_SETTING_SUBMENU_RADIO_ICON, H_SETTING_SUBMENU_RADIO_ICON), elementId, *pBitmap, null, null);
+
+ r = pItem->AddElement(rectRadioIcon, elementId, *pBitmap, null, null);
TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
delete pBitmap;
pBitmap = ResourceManager::GetBitmapN(resId);
TryCatch(pBitmap != null, r = E_SYSTEM, "pBitmap is null");
- r = pItem->AddElement(Rectangle(X_SETTING_SUBMENU_ICON, Y_SETTING_SUBMENU_ICON, W_SETTING_SUBMENU_ICON, H_SETTING_SUBMENU_ICON), elementId, *pBitmap, null, null);
+ r = pItem->AddElement(rectIcon, elementId, *pBitmap, null, null);
TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
delete pBitmap;
elementId++;
- if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY)
+ r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
+
+ if (value == true && r == E_SUCCESS)
{
- pItem->AddElement(Rectangle(X_SETTING_SUBMENU_3ITEM_TEXT, Y_SETTING_SUBMENU_3ITEM_TEXT, W_SETTING_SUBMENU_3ITEM_TEXT, H_SETTING_SUBMENU_3ITEM_TEXT), elementId, tmpString, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_VALUE_DISABLE, COLOR_SETTING_MENU_VALUE_DISABLE, COLOR_SETTING_MENU_VALUE_DISABLE, false);
+ r = pItem->AddElement(rectThreeTextItem, elementId, tmpString, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, false);
+ TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
}
else
{
- r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
-
- if (value == true && r == E_SUCCESS)
- {
- pItem->AddElement(Rectangle(X_SETTING_SUBMENU_3ITEM_TEXT, Y_SETTING_SUBMENU_3ITEM_TEXT, W_SETTING_SUBMENU_3ITEM_TEXT, H_SETTING_SUBMENU_3ITEM_TEXT), elementId, tmpString, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, false);
- }
- else
- {
- pItem->AddElement(Rectangle(X_SETTING_SUBMENU_3ITEM_TEXT, Y_SETTING_SUBMENU_3ITEM_TEXT, W_SETTING_SUBMENU_3ITEM_TEXT, H_SETTING_SUBMENU_3ITEM_TEXT), elementId, tmpString, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_VALUE_DISABLE, COLOR_SETTING_MENU_VALUE_DISABLE, COLOR_SETTING_MENU_VALUE_DISABLE, false);
- }
+ r = pItem->AddElement(rectThreeTextItem, elementId, tmpString, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_VALUE_DISABLE, COLOR_SETTING_MENU_VALUE_DISABLE, COLOR_SETTING_MENU_VALUE_DISABLE, false);
+ TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
}
}
else
AppLogDebug("ENTER");
CustomItem* pItem = null;
Bitmap* pBitmap = null;
- Rectangle rectRadioIcon = Rectangle(422, Y_SETTING_SUBMENU_RADIO_ICON,
+ Rectangle rectRadioIcon = Rectangle(X_WHITE_BALANCE_RADIO_ICON_MARGIN, Y_SETTING_SUBMENU_RADIO_ICON,
W_SETTING_SUBMENU_RADIO_ICON, H_SETTING_SUBMENU_RADIO_ICON);
- Rectangle rectIcon = Rectangle(12, Y_SETTING_SUBMENU_ICON,
+ Rectangle rectIcon = Rectangle(X_SETTING_SUBMENU_ICON - X_SETTING_SUBMENU_ICON_MARGIN, Y_SETTING_SUBMENU_ICON,
W_SETTING_SUBMENU_ICON, H_SETTING_SUBMENU_ICON);
String listName = L"";
Rectangle rectTwoTextItem = Rectangle(X_SETTING_SUBMENU_2TEXT_ITEM, Y_SETTING_SUBMENU_2TEXT_ITEM,
W_SETTING_SUBMENU_2TEXT_ITEM, H_SETTING_SUBMENU_2TEXT_ITEM);
- Rectangle rectThreeTextItem = Rectangle(112, Y_SETTING_SUBMENU_3TEXT_ITEM,
+ Rectangle rectThreeTextItem = Rectangle(X_SETTING_SUBMENU_3TEXT_ITEM - X_FLASH_SETTING_SUBMENU_3TEXT_ITEM, Y_SETTING_SUBMENU_3TEXT_ITEM,
W_SETTING_SUBMENU_3TEXT_ITEM, H_SETTING_SUBMENU_3TEXT_ITEM);
AppResource* pAppResource = Application::GetInstance()->GetAppResource();
{
r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
- if (true)//(r == E_SUCCESS)
+ if (r == E_SUCCESS)
{
AppLogDebug("CAMERA_PRIMARY_SUPPORT_FLASH is support");
}
AppLogDebug("ENTER");
if (isShow)
{
- if (IsControlAlwaysOnTop(*__pCamcoderSetting) == false)
+ if (__pCamcoderSetting)
{
- SetControlAlwaysOnTop(*__pCamcoderSetting, true);
+ __pCamcoderSetting->SetShowState(true);
+ __pCamcoderSetting->Invalidate(true);
}
- __pCamcoderSetting->SetShowState(true);
- __pCamcoderSetting->Invalidate(true);
-
- if (IsControlAlwaysOnTop(*__pGeneralSetting) == false)
+ if (__pGeneralSetting)
{
- SetControlAlwaysOnTop(*__pGeneralSetting, true);
+ __pGeneralSetting->SetShowState(true);
+ __pGeneralSetting->Invalidate(true);
}
-
- __pGeneralSetting->SetShowState(true);
- __pGeneralSetting->Invalidate(true);
}
else
{
}
else
{
- rectList = Rectangle(X_SETTING_MENU_LIST_LANDSCAPE, Y_SETTING_MENU_LIST_LANDSCAPE_MARGIN + 74,
+ rectList = Rectangle(X_SETTING_MENU_LIST_LANDSCAPE, Y_SETTING_MENU_LIST_LANDSCAPE_MARGIN,
W_SETTING_MENU_LIST_LANDSCAPE, H_SETTING_MENU_LIST_LANDSCAPE);
}
}
else
{
- rectList = Rectangle(X_SETTING_MENU_LIST_LANDSCAPE, Y_SETTING_MENU_LIST_LANDSCAPE_MARGIN + 74,
+ rectList = Rectangle(X_SETTING_MENU_LIST_LANDSCAPE, Y_SETTING_MENU_LIST_LANDSCAPE_MARGIN,
W_SETTING_MENU_LIST_LANDSCAPE, H_SETTING_MENU_LIST_LANDSCAPE);
}
pAppResource->GetString(IDS_CAM_BODY_10_SEC, tmpString);
__pSettingGeneralMenuString[CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_TIMER_MODE][MENU_IDX_05] = tmpString;
- pAppResource->GetString(IDS_CAM_OPT_EXPOSURE_VALUE, tmpString);
- __pSettingGeneralMenuString[CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE][MENU_IDX_01] = tmpString;
- __pSettingGeneralMenuString[CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE][MENU_IDX_02] = IDS_MENU_EXPOSURE_P20;
- __pSettingGeneralMenuString[CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE][MENU_IDX_03] = IDS_MENU_EXPOSURE_P15;
- __pSettingGeneralMenuString[CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE][MENU_IDX_04] = IDS_MENU_EXPOSURE_P10;
- __pSettingGeneralMenuString[CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE][MENU_IDX_05] = IDS_MENU_EXPOSURE_P05;
- __pSettingGeneralMenuString[CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE][MENU_IDX_06] = IDS_MENU_EXPOSURE_00;
- __pSettingGeneralMenuString[CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE][MENU_IDX_07] = IDS_MENU_EXPOSURE_M05;
- __pSettingGeneralMenuString[CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE][MENU_IDX_08] = IDS_MENU_EXPOSURE_M10;
- __pSettingGeneralMenuString[CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE][MENU_IDX_09] = IDS_MENU_EXPOSURE_M15;
- __pSettingGeneralMenuString[CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE][MENU_IDX_10] = IDS_MENU_EXPOSURE_M20;
-
pAppResource->GetString(IDS_CAM_BODY_GUIDELINE, tmpString);
__pSettingGeneralMenuString[CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_GUIDELINE_MODE][MENU_IDX_01] = tmpString;
pAppResource->GetString(IDS_CAM_BODY_OFF, tmpString);
//pAppResource->GetString(IDS_CAM_OVERLAY_HELP_VALUE, tmpString);
//__pSettingGeneralMenuString[CAMCORDER_GENERAL_TAB_SUB_MENU_OVERLAY_HELP_MODE][MENU_IDX_01] = tmpString;
__pSettingGeneralMenuString[CAMCORDER_GENERAL_TAB_SUB_MENU_OVERLAY_HELP_MODE][MENU_IDX_01] = IDS_MENU_OVERLAY_HELP_VALUE;
- pAppResource->GetString(IDS_CAM_BODY_OFF, tmpString);
- __pSettingGeneralMenuString[CAMCORDER_GENERAL_TAB_SUB_MENU_OVERLAY_HELP_MODE][MENU_IDX_02] = tmpString;
- pAppResource->GetString(IDS_CAM_BODY_ON, tmpString);
- __pSettingGeneralMenuString[CAMCORDER_GENERAL_TAB_SUB_MENU_OVERLAY_HELP_MODE][MENU_IDX_03] = tmpString;
}
AppLogDebug("EXIT");
AppLogDebug("ENTER");
CustomItem* pItem = null;
Bitmap* pBitmap = null;
- Rectangle rectRadioIcon = Rectangle(X_SETTING_SUBMENU_RADIO_ICON + 360, Y_SETTING_SUBMENU_RADIO_ICON,
+ Rectangle rectRadioIcon = Rectangle(X_SETTING_SUBMENU_RADIO_ICON + X_SETTING_SUBMENU_RADIO_ICON_MARGIN, Y_SETTING_SUBMENU_RADIO_ICON,
W_SETTING_SUBMENU_RADIO_ICON, H_SETTING_SUBMENU_RADIO_ICON);
- Rectangle rectIcon = Rectangle(X_SETTING_SUBMENU_ICON - 75, Y_SETTING_SUBMENU_ICON,
+ Rectangle rectIcon = Rectangle(X_SETTING_SUBMENU_ICON - X_SETTING_SUBMENU_ICON_MARGIN, Y_SETTING_SUBMENU_ICON,
W_SETTING_SUBMENU_ICON, H_SETTING_SUBMENU_ICON);
Rectangle rectTwoTextItem = Rectangle(X_SETTING_SUBMENU_2TEXT_ITEM, Y_SETTING_SUBMENU_2TEXT_ITEM,
W_SETTING_SUBMENU_2TEXT_ITEM, H_SETTING_SUBMENU_2TEXT_ITEM);
- Rectangle rectThreeTextItem = Rectangle(X_SETTING_SUBMENU_3TEXT_ITEM - 80, Y_SETTING_SUBMENU_3TEXT_ITEM,
+ Rectangle rectThreeTextItem = Rectangle(X_SETTING_SUBMENU_3TEXT_ITEM - X_SETTING_SUBMENU_3TEXT_ITEM_MARGIN, Y_SETTING_SUBMENU_3TEXT_ITEM,
W_SETTING_SUBMENU_3TEXT_ITEM, H_SETTING_SUBMENU_3TEXT_ITEM);
AppResource* pAppResource = Application::GetInstance()->GetAppResource();
switch (index)
{
- case SETTING_TIMER_CAPTURE_0_SEC:
+ case SETTING_TIMER_RECORD_0_SEC:
{
resId = RESOURCE_ID_TIMER_OFF;
}
break;
- case SETTING_TIMER_CAPTURE_2_SEC:
+ case SETTING_TIMER_RECORD_2_SEC:
{
resId = RESOURCE_ID_TIMER_2SEC;
}
break;
- case SETTING_TIMER_CAPTURE_5_SEC:
+ case SETTING_TIMER_RECORD_5_SEC:
{
resId = RESOURCE_ID_TIMER_5SEC;
}
break;
- case SETTING_TIMER_CAPTURE_10_SEC:
+ case SETTING_TIMER_RECORD_10_SEC:
{
resId = RESOURCE_ID_TIMER_10SEC;
}
}
break;
- case CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE:
- {
- }
- break;
-
case CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_GUIDELINE_MODE:
{
ResourceId resId = RESOURCE_ID_GUIDELINE_OFF;
case CAMCORDER_GENERAL_TAB_SUB_MENU_OVERLAY_HELP_MODE:
{
- String str = L"";
- elementId = (index * MENU_TWO_ELEMENT);
-
- r = __pCamcorderPresentationModel->GetValue(OVERLAY_HELP_ENABLE, regVal);
- TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
-
- if (index == regVal)
- {
- pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_RADIO_BTN_ON);
- }
- else
- {
- pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_RADIO_BTN_OFF);
- }
- TryCatch(pBitmap != null, r = E_SYSTEM, "pBitmap is null");
-
- if (index == SUBMENU_MODE_OFF)
- {
- str = IDS_CAM_BODY_OFF;
- }
- else
- {
- str = IDS_CAM_BODY_ON;
- }
-
- pAppResource->GetString(str, tmpString);
-
- r = pItem->AddElement(rectRadioIcon, elementId, *pBitmap, null, null);
- TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
-
- delete pBitmap;
- pBitmap = null;
-
- elementId++;
-
- r = pItem->AddElement(rectTwoTextItem, elementId, tmpString, FONT_SIZE_SETTING_SUB_MENU_ITEM, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, false);
- TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
}
break;
static const int W_EXPOSURE_PANEL_SIDER_PORTRAIT = 336;
static const int H_EXPOSURE_PANEL_SIDER_PORTRAIT = 60;
static const int OFFSET_EXPOSURE_PANEL_SLIDER_BUTTON = 30;
-static const int FONT_SIZE_SETTING_MENU_ITEM = 38;
+static const int FONT_SIZE_SETTING_MENU_ITEM = 34;
static const int FONT_SIZE_SETTING_SUB_MENU_ITEM = 34;
static const int H_SETTING_MENU_TITLE_TOP_MARGIN_PORTRAIT = 26;
static const int H_SETTING_MENU_TITLE_TOP_MARGIN_LANDSCAPE = 94;
static const int H_SETTING_MENU_PANEL_TITLE = 50;
static const int H_SETTING_MENU_ITEM = 65;
static const int X_SETTING_MENU_LIST_PORTRAIT = 24;
-static const int Y_SETTING_MENU_LIST_PORTRAIT = 90;
+static const int Y_SETTING_MENU_LIST_PORTRAIT = 135;
static const int W_SETTING_MENU_LIST_PORTRAIT = 556;
static const int H_SETTING_MENU_LIST_PORTRAIT = 540;
static const int X_SETTING_MENU_LIST_LANDSCAPE = 26;
static const int Y_SETTING_MENU_LIST_LANDSCAPE = 74;
-static const int Y_SETTING_MENU_LIST_LANDSCAPE_MARGIN = 80;
+static const int Y_SETTING_MENU_LIST_LANDSCAPE_MARGIN = 130;
static const int W_SETTING_MENU_LIST_LANDSCAPE = 556;
static const int H_SETTING_MENU_LIST_LANDSCAPE = 540;
static const int X_SETTING_MENU_CONTESTS = 34;
static const int W_SETTING_MENU_CONTENTS_VALUE = 290;
static const int H_SETTING_MENU_CONTENTS_VALUE = 65;
static const int H_SETTING_SUBMENU_ITEM = 88;
+static const int X_FLASH_SETTING_SUBMENU_RADIO_ICON_MARGIN = 400;
+static const int X_WHITE_BALANCE_RADIO_ICON_MARGIN = 412;
static const int X_SETTING_SUBMENU_RADIO_ICON = 0;
static const int X_SETTING_SUBMENU_RADIO_ICON_MARGIN = 360;
static const int Y_SETTING_SUBMENU_RADIO_ICON = 0;
static const int W_SETTING_SUBMENU_2TEXT_ITEM = 320;
static const int H_SETTING_SUBMENU_2TEXT_ITEM = 84;
static const int X_SETTING_SUBMENU_3TEXT_ITEM = 165;
+static const int X_FLASH_SETTING_SUBMENU_3TEXT_ITEM = 57;
static const int X_SETTING_SUBMENU_3TEXT_ITEM_MARGIN = 80;
static const int Y_SETTING_SUBMENU_3TEXT_ITEM = 0;
static const int W_SETTING_SUBMENU_3TEXT_ITEM = 320;
static const int X_SUBMENU_TIMER_MODE_PANEL = 340;
static const int Y_SUBMENU_TIMER_MODE_PANEL = 120;
static const int W_SUBMENU_TIMER_MODE_PANEL = 460;
-static const int H_SUBMENU_TIMER_MODE_PANEL = 420;
-static const int X_SUBMENU_TIMER_MODE_LIST = 2;
+static const int H_SUBMENU_TIMER_MODE_PANEL = 445;
+static const int X_SUBMENU_TIMER_MODE_LIST = 10;
static const int Y_SUBMENU_TIMER_MODE_LIST = 64;
static const int W_SUBMENU_TIMER_MODE_LIST = 456;
static const int H_SUBMENU_TIMER_MODE_LIST = 420;
static const int X_SUBMENU_ISO_MODE_PANEL = 340;
static const int Y_SUBMENU_ISO_MODE_PANEL = 205;
static const int W_SUBMENU_ISO_MODE_PANEL = 460;
-static const int X_SUBMENU_ISO_MODE_LIST = 2;
+static const int X_SUBMENU_ISO_MODE_LIST = 10;
static const int Y_SUBMENU_ISO_MODE_LIST = 64;
static const int H_SUBMENU_ISO_MODE_PANEL_MARGIN = 88;
static const int W_SUBMENU_ISO_MODE_LIST = 456;
static const int Y_SUBMENU_WB_MODE_PANEL = 205;
static const int W_SUBMENU_WB_MODE_PANEL = 460;
static const int H_SUBMENU_WB_MODE_PANEL_MARGIN = 88;
-static const int X_SUBMENU_WB_MODE_LIST = 2;
+static const int X_SUBMENU_WB_MODE_LIST = 10;
static const int Y_SUBMENU_WB_MODE_LIST = 64;
static const int W_SUBMENU_WB_MODE_LIST = 456;
+static const int H_SUBMENU_WB_MODE_LIST = 90;
static const int W_SUBMENU_WB_MODE_LIST_MARGIN = 90;
static const int X_SUBMENU_GUIDELINE_MODE_PANEL = 340;
-static const int Y_SUBMENU_GUIDELINE_MODE_PANEL = 360;
+static const int Y_SUBMENU_GUIDELINE_MODE_PANEL = 260;
static const int W_SUBMENU_GUIDELINE_MODE_PANEL = 460;
-static const int H_SUBMENU_GUIDELINE_MODE_PANEL = 240;
-static const int X_SUBMENU_GUIDELINE_MODE_LIST = 2;
+static const int H_SUBMENU_GUIDELINE_MODE_PANEL = 265;
+static const int X_SUBMENU_GUIDELINE_MODE_LIST = 10;
static const int Y_SUBMENU_GUIDELINE_MODE_LIST = 64;
static const int W_SUBMENU_GUIDELINE_MODE_LIST = 456;
static const int H_SUBMENU_GUIDELINE_MODE_LIST = 240;
static const int X_SUBMENU_STORAGE_MODE_PANEL = 340;
-static const int Y_SUBMENU_STORAGE_MODE_PANEL = 470;
+static const int Y_SUBMENU_STORAGE_MODE_PANEL = 320;
static const int W_SUBMENU_STORAGE_MODE_PANEL = 460;
-static const int H_SUBMENU_STORAGE_MODE_PANEL = 240;
-static const int X_SUBMENU_STORAGE_MODE_LIST = 2;
+static const int H_SUBMENU_STORAGE_MODE_PANEL = 265;
+static const int X_SUBMENU_STORAGE_MODE_LIST = 10;
static const int Y_SUBMENU_STORAGE_MODE_LIST = 64;
static const int W_SUBMENU_STORAGE_MODE_LIST = 456;
static const int H_SUBMENU_STORAGE_MODE_LIST = 240;
static const int X_FLASH_MODE_SETTING_LIST_LANDSCAPE = 26;
static const int Y_FLASH_MODE_SETTING_LIST_LANDSCAPE = 94;
-static const int Y_FLASH_MODE_SETTING_LIST_LANDSCAPE_MARGIN = 100;
+static const int Y_FLASH_MODE_SETTING_LIST_LANDSCAPE_MARGIN = 150;
static const int W_FLASH_MODE_SETTING_LIST_LANDSCAPE = 502;
static const int H_FLASH_MODE_SETTING_LIST_LANDSCAPE = 350;
static const int H_WHITE_BALANC_SETTING_LIST_LANDSCAPE_MARGIN = 200;
static const int X_FLASH_MODE_SETTING_LIST_PORTRAIT = 100;
static const int Y_FLASH_MODE_SETTING_LIST_PORTRAIT = 85;
+static const int Y_FLASH_MODE_SETTING_LIST_PORTRAIT_MARGIN = 50;
static const int W_FLASH_MODE_SETTING_LIST_PORTRAIT = 502;
static const int H_FLASH_MODE_SETTING_LIST_PORTRAIT = 350;
static const int H_WHITE_BALANC_SETTING_LIST_PORTRAIT_MARGIN = 200;
static const int H_FLASH_MODE_TITLE_TOP_MARGIN = 28;
static const int X_FLASH_MODE_LIST_START_POS_PORTRAIT = 288;
+static const int CAMERA_PANEL_SUM_SIZE = 320;
+static const int PREVIEW_OVERLAY_PANEL_SIZE = 960;
+static const int PREVIEW_OVERLAY_PANEL_SIZE_MARGIN = 80;
static const int X_PREVIEW_OVERLAY_PORTRAIT = 0;
static const int Y_PREVIEW_OVERLAY_PORTRAIT = 160;
static const int W_PREVIEW_OVERLAY_PORTRAIT = 720;
static const int H_PREVIEW_OVERLAY_PORTRAIT = 960;
-static const int X_FULL_PREVIEW_OVERLAY_PORTRAIT = 0;
-static const int Y_FULL_PREVIEW_OVERLAY_PORTRAIT = 0;
static const int W_FULL_PREVIEW_OVERLAY_PORTRAIT = 720;
-static const int H_FULL_PREVIEW_OVERLAY_PORTRAIT = 1280;
static const int X_PREVIEW_OVERLAY_LANDSCAPE = 160;
static const int Y_PREVIEW_OVERLAY_LANDSCAPE = 0;
static const int W_PREVIEW_OVERLAY_LANDSCAPE = 960;
static const int H_PREVIEW_OVERLAY_LANDSCAPE = 720;
-static const int X_FULL_PREVIEW_OVERLAY_LANDSCAPE = 0;
-static const int Y_FULL_PREVIEW_OVERLAY_LANDSCAPE = 0;
static const int W_FULL_PREVIEW_OVERLAY_LANDSCAPE = 1280;
-static const int H_FULL_PREVIEW_OVERLAY_LANDSCAPE = 720;
static const int W_THUMBNAIL_SCALE_SIZE = 80;
static const int H_THUMBNAIL_SCALE_SIZE = 80;
static const int X_THUMBNAIL_BUTTON_IMG = 14;
static const int DISABLE_GUIDELINE = 0;
static const int EXPOSURE_TIMER_IS_ALIVE = 1;
static const int MAX_SETTING_MENU_COUNT = 2;
-static const int MAX_GENERAL_TAB_SETTING_MENU_COUNT = 6;
+static const int MAX_GENERAL_TAB_SETTING_MENU_COUNT = 5;
static const int MAX_FLASH_MENU_COUNT = 3;
static const int MAX_WHITE_BALANCE_MENU_COUNT = 5;
static const int MENU_COUNT_CLEAR = 0;
static const int MODE_CLOUDY = 4;
static const int X_INDICATOR_BATTERY_PORTRAIT = 300;
static const int Y_INDICATOR_BATTERY_PORTRAIT = 4;
-static const int X_INDICATOR_BATTERY_LANDSCAPE = 400;
+static const int X_INDICATOR_BATTERY_LANDSCAPE = 532;
static const int Y_INDICATOR_BATTERY_LANDSCAPE = 4;
static const int X_ACTION_PANEL_CAMERA_CAMCODER_BUTTON_PORTRAIT = 10;
static const int Y_ACTION_PANEL_CAMERA_CAMCODER_BUTTON_PORTRAIT = 7;
static const wchar_t* IDS_ACTION_UI_CAMERA_MODE = L"ActionCameraMode";
static const wchar_t* IDS_ACTION_BACK = L"ActionBack";
static const wchar_t* IDS_INIT_REG_KEY = L"NONE";
-static const wchar_t* PHOTO_SIZE_640_480 = L"640X480(16:9)";
+static const wchar_t* PHOTO_SIZE_640_480 = L"640X480(6:4)";
static const wchar_t* PHOTO_SIZE_1280_720 = L"1280X720(16:9)";
-static const wchar_t* PHOTO_SIZE_2948_1536 = L"2948X1536(16:9)";
+static const wchar_t* PHOTO_SIZE_2948_1536 = L"2948X1536(6:4)";
static const wchar_t* PHOTO_SIZE_3264_1960 = L"3264X1960(16:9)";
-static const wchar_t* PHOTO_SIZE_3264_2488 = L"3264X2488(16:9)";
+static const wchar_t* PHOTO_SIZE_3264_2488 = L"3264X2488(6:4)";
enum MenuIdx
{
, __pWhiteBalanceButton(null)
, __pExposureValueButton(null)
, __pCloseButton(null)
+ , __pSettingLine(null)
, __pCameraIconLabel(null)
, __pCamcoderIconLabel(null)
, __pSwButton(null)
, __pIsoList(null)
, __pThumbnailPanel(null)
, __pCameraInfoPanel(null)
- , __pCamraInfoSubPanel(null)
+ , __pCameraInfoSubPanel(null)
+ , __pCameraInfoGeneralSubPanel(null)
, __pSettingMenuString(null)
, __pSettingGeneralMenuString(null)
, __pCameraStarterThread(null)
InDrawFocus();
- EndPopupTimer();
+ StopPopupTimer();
__isUsedTimerCaptured = false;
__pSettingButton->SetActionId(IDA_BUTTON_CAMERA_SETTING);
__pSettingButton->AddActionEventListener(*this);
+ __pSettingLine = static_cast<Label*>(GetControl(L"IDC_SETTING_LINE"));
+ TryCatch(__pSettingLine != null, r = E_SYSTEM, "pSettingButton is null");
+ __pSettingLine->AddTouchEventListener(*this);
+
__pQuickSettingButton = static_cast<Button*>(GetControl(L"IDC_QUICK_SETTING_BUTTON"));
TryCatch(__pQuickSettingButton != null, r = E_SYSTEM, "pQuickSettingButton is null");
__pQuickSettingButton->AddTouchEventListener(*this);
__pCloseButton->AddActionEventListener(*this);
r = UpdateUiPanelIcon();
- TryCatch(r == E_SUCCESS, r = E_SYSTEM, "UpdateSetUiPanelIcon() - fail[%s]", GetErrorMessage(r));
+ //TryCatch(r == E_SUCCESS, r = E_SYSTEM, "UpdateSetUiPanelIcon() - fail[%s]", GetErrorMessage(r));
AppLogDebug("EXIT");
return E_SUCCESS;
__pFlashButton = null;
__pSelfShotButton = null;
__pSettingButton = null;
+ __pSettingLine = null;
__pQuickSettingButton = null;
__pWhiteBalanceButton = null;
__pExposureValueButton = null;
{
OnHelpCloseTimerExpired();
}
-
+
if ((controlName.Equals(String(IDS_ACTION_UI_PANEL_CAPTURE_NAME))) && (__pCameraPresentationModel->GetCameraState() == CAMERA_STATE_PREVIEW))
{
if (source.Equals(*__pShutterButton) == true)
if (__timeCount == INDEX_UNIT_ZERO || __timeCount == INDEX_UNIT_ONE)
{
- EndPopupTimer();
+ StopPopupTimer();
}
}
AppLogDebug("EXIT");
if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
{
r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
-
- if (focusSupport == true && r == E_SUCCESS)
- {
- AppLogDebug("focus is Support");
-
- __pCameraInfoPanel->SetDrawMarkerFocus(true);
-
- DrawFocus(CAMERA_FOCUS_NOT_READY);
- }
- else
- {
- __pCameraInfoPanel->SetDrawMarkerFocus(false);
-
- __pCameraInfoPanel->Invalidate(true);
- }
}
else
{
r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_FOCUS, focusSupport);
+ }
- if (focusSupport == true && r == E_SUCCESS)
- {
- __pCameraInfoPanel->SetDrawMarkerFocus(true);
+ if (focusSupport == true && r == E_SUCCESS)
+ {
+ __pCameraInfoPanel->SetDrawMarkerFocus(true);
- DrawFocus(CAMERA_FOCUS_NOT_READY);
- }
- else
- {
- __pCameraInfoPanel->SetDrawMarkerFocus(false);
+ DrawFocus(CAMERA_FOCUS_NOT_READY);
+ }
+ else
+ {
+ __pCameraInfoPanel->SetDrawMarkerFocus(false);
- __pCameraInfoPanel->Invalidate(true);
- }
+ __pCameraInfoPanel->Invalidate(true);
}
}
+
__pCameraPresentationModel->Capture();
__isTimerRunning = false;
r = __pCameraPresentationModel->SetValue(FLASH_MODE, FLASH_MODE_OFF);
TryCatch(r == E_SUCCESS, , "SetValue Reg Fail[%s]", GetErrorMessage(r));
- pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_FLASH_OFF_NOR);
+ pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_FLASH_OFF_PRESS_DIM);
TryCatch(pBitmap != null, r = E_SYSTEM, "FlashButton::pBitmap is null");
pBitmapRotate = RotationImageN(pBitmap, rotationType);
delete pBitmapRotate;
pBitmapRotate = null;
}
- else
+ else if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
{
r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
r = __pCameraPresentationModel->SetValue(FLASH_MODE, FLASH_MODE_OFF);
TryCatch(r == E_SUCCESS, , "Read Reg Fail[%s]", GetErrorMessage(r));
- pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_FLASH_OFF_NOR);
+ pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_FLASH_OFF_PRESS_DIM);
TryCatch(pBitmap != null, r = E_SYSTEM, "FlashButton::pBitmap is null");
pBitmapRotate = RotationImageN(pBitmap, rotationType);
}
}
+ TryCatch(__pSelfShotButton != null, r = E_SYSTEM, "__pSelfShotButton is null");
+
if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
{
- TryCatch(__pSelfShotButton != null, r = E_SYSTEM, "__pSelfShotButton is null");
-
pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_BACK);
- TryCatch(pBitmap != null, r = E_SYSTEM, "SelfShot::pBitmap is null");
-
- pBitmapRotate = RotationImageN(pBitmap, rotationType);
- TryCatch(pBitmapRotate != null, r = E_SYSTEM, "SwButton::pBitmapRotate is null");
-
- __pSelfShotButton->SetNormalBackgroundBitmap(*pBitmapRotate);
-
- delete pBitmap;
- pBitmap = null;
-
- delete pBitmapRotate;
- pBitmapRotate = null;
-
- pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_BACK_PRESS);
- TryCatch(pBitmap != null, r = E_SYSTEM, "SelfShot::pBitmap is null");
-
- pBitmapRotate = RotationImageN(pBitmap, rotationType);
- TryCatch(pBitmapRotate != null, r = E_SYSTEM, "SwButton::pBitmapRotate is null");
-
- __pSelfShotButton->SetPressedBackgroundBitmap(*pBitmapRotate);
-
- delete pBitmap;
- pBitmap = null;
-
- delete pBitmapRotate;
- pBitmapRotate = null;
}
- else
+ else if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY)
{
- TryCatch(__pSelfShotButton != null, r = E_SYSTEM, "__pSelfShotButton is null");
-
pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_FRONT);
- TryCatch(pBitmap != null, r = E_SYSTEM, "SelfShot::pBitmap is null");
-
- pBitmapRotate = RotationImageN(pBitmap, rotationType);
- TryCatch(pBitmapRotate != null, r = E_SYSTEM, "SwButton::pBitmapRotate is null");
+ }
+ TryCatch(pBitmap != null, r = E_SYSTEM, "SelfShot::pBitmap is null");
+
+ pBitmapRotate = RotationImageN(pBitmap, rotationType);
+ TryCatch(pBitmapRotate != null, r = E_SYSTEM, "SwButton::pBitmapRotate is null");
- __pSelfShotButton->SetNormalBackgroundBitmap(*pBitmapRotate);
+ __pSelfShotButton->SetNormalBackgroundBitmap(*pBitmapRotate);
- delete pBitmap;
- pBitmap = null;
+ delete pBitmap;
+ pBitmap = null;
- delete pBitmapRotate;
- pBitmapRotate = null;
+ delete pBitmapRotate;
+ pBitmapRotate = null;
+ if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
+ {
+ pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_BACK_PRESS);
+ }
+ else if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY)
+ {
pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_FRONT_PRESS);
- TryCatch(pBitmap != null, r = E_SYSTEM, "SelfShot::pBitmap is null");
+ }
+ TryCatch(pBitmap != null, r = E_SYSTEM, "SelfShot::pBitmap is null");
- pBitmapRotate = RotationImageN(pBitmap, rotationType);
- TryCatch(pBitmapRotate != null, r = E_SYSTEM, "SwButton::pBitmapRotate is null");
+ pBitmapRotate = RotationImageN(pBitmap, rotationType);
+ TryCatch(pBitmapRotate != null, r = E_SYSTEM, "SwButton::pBitmapRotate is null");
- __pSelfShotButton->SetPressedBackgroundBitmap(*pBitmapRotate);
+ __pSelfShotButton->SetPressedBackgroundBitmap(*pBitmapRotate);
- delete pBitmap;
- pBitmap = null;
+ delete pBitmap;
+ pBitmap = null;
- delete pBitmapRotate;
- pBitmapRotate = null;
- }
+ delete pBitmapRotate;
+ pBitmapRotate = null;
if (__dir == ORIENTATION_STATUS_LANDSCAPE
|| __dir == ORIENTATION_STATUS_LANDSCAPE_REVERSE)
delete pBitmapRotate;
pBitmapRotate = null;
+ TryCatch(__pSettingLine != null, r = E_SYSTEM, "__pSettingLine is null");
+
+ pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_SETTING_LINE);
+ TryCatch(pBitmap != null, r = E_SYSTEM, "SettingLine::pBitmap is null");
+
+ pBitmapRotate = RotationImageN(pBitmap, rotationType);
+ TryCatch(pBitmapRotate != null, r = E_SYSTEM, "SettingLine::pBitmapRotate is null");
+
+ __pSettingLine->SetBackgroundBitmap(*pBitmapRotate);
+
+ delete pBitmap;
+ pBitmap = null;
+
+ delete pBitmapRotate;
+ pBitmapRotate = null;
+
TryCatch(__pQuickSettingButton != null, r = E_SYSTEM, "__pQuickSettingButton is null");
pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_QUICK_SETTING_NOR);
TryCatch(__pWhiteBalanceButton != null, r = E_SYSTEM, "__pWhiteBalanceButton is null");
- pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_WHITEBALANCE);
- TryCatch(pBitmap != null, r = E_SYSTEM, "WhiteBalance::pBitmap is null");
+ if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
+ {
+ r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
+ }
+ else
+ {
+ r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
+ }
+
+ if (r == E_SUCCESS)
+ {
+ pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_WHITEBALANCE);
+ TryCatch(pBitmap != null, r = E_SYSTEM, "WhiteBalance::pBitmap is null");
- __pWhiteBalanceButton->SetNormalBackgroundBitmap(*pBitmap);
+ __pWhiteBalanceButton->SetNormalBackgroundBitmap(*pBitmap);
- pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_WHITEBALANCE_PRESS);
- TryCatch(pBitmap != null, r = E_SYSTEM, "WhiteBalance::pBitmap is null");
+ delete pBitmap;
+ pBitmap = null;
- __pWhiteBalanceButton->SetPressedBackgroundBitmap(*pBitmap);
+ pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_WHITEBALANCE_PRESS);
+ TryCatch(pBitmap != null, r = E_SYSTEM, "WhiteBalance::pBitmap is null");
- delete pBitmap;
- pBitmap = null;
+ __pWhiteBalanceButton->SetPressedBackgroundBitmap(*pBitmap);
+
+ delete pBitmap;
+ pBitmap = null;
+ }
+ else
+ {
+ pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_WHITEBALANCE_DIM_PRESS);
+ TryCatch(pBitmap != null, r = E_SYSTEM, "WhiteBalance::pBitmap is null");
+
+ __pWhiteBalanceButton->SetNormalBackgroundBitmap(*pBitmap);
+
+ delete pBitmap;
+ pBitmap = null;
+
+ pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_WHITEBALANCE_DIM_PRESS);
+ TryCatch(pBitmap != null, r = E_SYSTEM, "WhiteBalance::pBitmap is null");
+
+ __pWhiteBalanceButton->SetPressedBackgroundBitmap(*pBitmap);
+
+ delete pBitmap;
+ pBitmap = null;
+ }
TryCatch(__pExposureValueButton != null, r = E_SYSTEM, "__pExposureValueButton is null");
if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
{
r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
-
- if (r == E_SUCCESS)
- {
- SetWhiteBalancePopop();
- }
- else
- {
- AppLogDebug("CAMERA_PRIMARY_WHITE_BALANCE NOT SUPPORT");
- }
}
else
{
r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
- if (r == E_SUCCESS)
- {
- SetWhiteBalancePopop();
- }
- else
- {
- AppLogDebug("CAMERA_PRIMARY_WHITE_BALANCE NOT SUPPORT");
- }
+ }
+
+ if (r == E_SUCCESS)
+ {
+ SetWhiteBalancePopop();
+ }
+ else
+ {
+ AppLogDebug("WB is not support");
}
}
break;
AppLogDebug("ENTER");
if (isShow)
{
- if (IsControlAlwaysOnTop(*__pCameraSetting) == false)
- {
- SetControlAlwaysOnTop(*__pCameraSetting, true);
- }
-
- if (IsControlAlwaysOnTop(*__pCameraSettingLable) == false)
- {
- SetControlAlwaysOnTop(*__pCameraSettingLable, true);
- }
-
- if (IsControlAlwaysOnTop(*__pGeneralSetting) == false)
- {
- SetControlAlwaysOnTop(*__pGeneralSetting, true);
- }
-
- if (IsControlAlwaysOnTop(*__pGeneralSettingLable) == false)
- {
- SetControlAlwaysOnTop(*__pGeneralSettingLable, true);
- }
-
if (__pCameraSetting)
{
__pCameraSetting->SetShowState(true);
CameraForm::OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode)
{
AppLogDebug("ENTER OnKeyReleased Control : %ls, KeyCode : %d", source.GetName().GetPointer(), keyCode);
- if (keyCode == KEY_POWER_HOLD)
- {
- AppLogDebug("ENTER OnKeyReleased Control : KEY_POWER_HOLD");
- }
AppLogDebug("EXIT");
}
CameraForm::OnKeyLongPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode)
{
AppLogDebug("ENTER OnKeyLongPressed Control : %ls, KeyCode : %d", source.GetName().GetPointer(), keyCode);
- if (keyCode == KEY_SIDE_UP
- || keyCode == KEY_SIDE_DOWN)
- {
- // Empty statement
- }
- else if (keyCode == KEY_POWER_HOLD)
- {
- __isLockScreenMode = true;
- AppLogDebug("ENTER OnKeyLongPressed Control : KEY_POWER_HOLD");
- }
AppLogDebug("EXIT");
}
if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
{
r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
-
- if (r == E_SUCCESS)
- {
- r = __pCameraPresentationModel->GetValue(WHITE_BALANCE_TYPE, adjustValue);
- TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
-
- AppLogDebug("adjustValue = %d", adjustValue);
-
- __pCameraPresentationModel->SetWhiteBalance((CameraWhiteBalance)adjustValue);
- }
}
else
{
r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
+ }
- if (r == E_SUCCESS)
- {
- r = __pCameraPresentationModel->GetValue(WHITE_BALANCE_TYPE, adjustValue);
- TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
+ if (r == E_SUCCESS)
+ {
+ r = __pCameraPresentationModel->GetValue(WHITE_BALANCE_TYPE, adjustValue);
+ TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
- AppLogDebug("adjustValue = %d", adjustValue);
+ AppLogDebug("adjustValue = %d", adjustValue);
- __pCameraPresentationModel->SetWhiteBalance((CameraWhiteBalance)adjustValue);
- }
+ __pCameraPresentationModel->SetWhiteBalance((CameraWhiteBalance)adjustValue);
}
AppLogDebug("EXIT");
{
wideMode = true;
- SetWideOverlayPanel(true);
+ SetOverlayPanelWideMode(true);
+
+ SetOverlayRendererRotation();
}
else
{
wideMode = false;
- SetNormalOverlayPanel(true);
+ SetOverlayPanelNormalMode(true);
+
+ SetOverlayRendererRotation();
}
__pCameraPresentationModel->KeepScreenOnState(true, false);
if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
{
r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
-
- if (focusSupport == true && r == E_SUCCESS)
- {
- AppLogDebug("focus is Support");
-
- __pCameraInfoPanel->SetDrawMarkerFocus(true);
-
- __pCameraInfoPanel->SetDrawMarkerFocusType(focusMode);
-
- __pCameraInfoPanel->Invalidate(true);
- }
- else
- {
- __pCameraInfoPanel->SetDrawMarkerFocus(false);
-
- __pCameraInfoPanel->Invalidate(true);
- }
}
else
{
r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_FOCUS, focusSupport);
+ }
- if (focusSupport == true && r == E_SUCCESS)
- {
- __pCameraInfoPanel->SetDrawMarkerFocus(true);
-
- __pCameraInfoPanel->SetDrawMarkerFocusType(focusMode);
-
- __pCameraInfoPanel->Invalidate(true);
- }
- else
- {
- __pCameraInfoPanel->SetDrawMarkerFocus(false);
+ if (focusSupport == true && r == E_SUCCESS)
+ {
+ __pCameraInfoPanel->SetDrawMarkerFocus(true);
- __pCameraInfoPanel->Invalidate(true);
- }
+ __pCameraInfoPanel->SetDrawMarkerFocusType(focusMode);
+ __pCameraInfoPanel->Invalidate(true);
+ }
+ else
+ {
+ __pCameraInfoPanel->SetDrawMarkerFocus(false);
+ __pCameraInfoPanel->Invalidate(true);
}
AppLogDebug("EXIT");
if (__dir == ORIENTATION_STATUS_PORTRAIT
|| __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
{
- rectList = Rectangle(X_FLASH_MODE_SETTING_LIST_PORTRAIT, Y_FLASH_MODE_SETTING_LIST_PORTRAIT,
- W_FLASH_MODE_SETTING_LIST_PORTRAIT, H_FLASH_MODE_SETTING_LIST_PORTRAIT);
+ rectList = Rectangle(X_FLASH_MODE_SETTING_LIST_PORTRAIT, Y_FLASH_MODE_SETTING_LIST_PORTRAIT + Y_FLASH_MODE_SETTING_LIST_PORTRAIT_MARGIN,
+ W_FLASH_MODE_SETTING_LIST_PORTRAIT, H_FLASH_MODE_SETTING_LIST_PORTRAIT);
}
else
{
if (__dir == ORIENTATION_STATUS_PORTRAIT
|| __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
{
- rectList = Rectangle(X_FLASH_MODE_SETTING_LIST_PORTRAIT, Y_FLASH_MODE_SETTING_LIST_PORTRAIT,
+ rectList = Rectangle(X_FLASH_MODE_SETTING_LIST_PORTRAIT, Y_FLASH_MODE_SETTING_LIST_PORTRAIT + Y_FLASH_MODE_SETTING_LIST_PORTRAIT_MARGIN,
W_FLASH_MODE_SETTING_LIST_PORTRAIT, H_FLASH_MODE_SETTING_LIST_PORTRAIT + H_WHITE_BALANC_SETTING_LIST_PORTRAIT_MARGIN);
}
else
{
- rectList = Rectangle(X_FLASH_MODE_SETTING_LIST_LANDSCAPE, Y_FLASH_MODE_SETTING_LIST_LANDSCAPE,
+ rectList = Rectangle(X_FLASH_MODE_SETTING_LIST_LANDSCAPE, Y_FLASH_MODE_SETTING_LIST_LANDSCAPE + Y_FLASH_MODE_SETTING_LIST_LANDSCAPE_MARGIN,
W_FLASH_MODE_SETTING_LIST_LANDSCAPE, H_FLASH_MODE_SETTING_LIST_LANDSCAPE + H_WHITE_BALANC_SETTING_LIST_LANDSCAPE_MARGIN);
}
if (listName.Equals(String(IDS_MENU_SETTING_MAIN_MENU_NAME)))
{
- if (__pCamraInfoSubPanel && __pListViewCameraTabSubMenu)
+ if (__pCameraInfoSubPanel && __pListViewCameraTabSubMenu)
{
- __pCamraInfoSubPanel->SetShowState(false);
- __pCamraInfoSubPanel->RemoveControl(*__pListViewCameraTabSubMenu);
+ __pCameraInfoSubPanel->SetShowState(false);
+ __pCameraInfoSubPanel->RemoveControl(*__pListViewCameraTabSubMenu);
__pListViewCameraTabSubMenu = null;
- RemoveControl(*__pCamraInfoSubPanel);
- __pCamraInfoSubPanel = null;
+ RemoveControl(*__pCameraInfoSubPanel);
+ __pCameraInfoSubPanel = null;
SetCameraTabSubMenuListviewState(MENU_COUNT_CLEAR, CAMERA_TAB_SUB_MENU_CONTENT_MAX);
}
int X_Panel = X_SUBMENU_WB_MODE_PANEL;
int Y_Panel = Y_SUBMENU_WB_MODE_PANEL;
int W_Panel = W_SUBMENU_WB_MODE_PANEL;
- int H_Panel = Y_SUBMENU_WB_MODE_LIST + (captrueResolutionCnt * H_SUBMENU_WB_MODE_PANEL_MARGIN);
+ int H_Panel = H_SUBMENU_WB_MODE_LIST + (captrueResolutionCnt * H_SUBMENU_WB_MODE_PANEL_MARGIN);
int X_List = X_SUBMENU_WB_MODE_LIST;
int Y_List = Y_SUBMENU_WB_MODE_LIST;
rectPanel.x = X_SUBMENU_PANEL_START_LANDSCAPE;
}
- if (__pCamraInfoSubPanel == null)
+ if (__pCameraInfoSubPanel == null)
{
- __pCamraInfoSubPanel = new (std::nothrow) CamraInfoSubPanel();
- TryCatch(__pCamraInfoSubPanel != null, r = E_FAILURE, "__pCamraInfoSubPanel is null");
+ __pCameraInfoSubPanel = new (std::nothrow) CameraInfoSubPanel();
+ TryCatch(__pCameraInfoSubPanel != null, r = E_FAILURE, "__pCameraInfoSubPanel is null");
- r = __pCamraInfoSubPanel->Initialize(rectPanel);
- TryCatch(r == E_SUCCESS, , "__pCamraInfoSubPanel Initialize fail[%s]", GetErrorMessage(r));
+ r = __pCameraInfoSubPanel->Initialize(rectPanel);
+ TryCatch(r == E_SUCCESS, , "__pCameraInfoSubPanel Initialize fail[%s]", GetErrorMessage(r));
- __pCamraInfoSubPanel->AddTouchEventListener(*this);
+ __pCameraInfoSubPanel->AddTouchEventListener(*this);
AddOrientationEventListener(*this);
- AddControl(*__pCamraInfoSubPanel);
- SetControlAlwaysOnTop(*__pCamraInfoSubPanel, true);
+ AddControl(*__pCameraInfoSubPanel);
+ SetControlAlwaysOnTop(*__pCameraInfoSubPanel, true);
}
- __pCamraInfoSubPanel->SetMenuTitle(strTitle);
+ __pCameraInfoSubPanel->SetMenuTitle(strTitle);
__pCameraInfoPanel->Invalidate(true);
- __pCamraInfoSubPanel->Invalidate(true);
+ __pCameraInfoSubPanel->Invalidate(true);
__pListViewCameraTabSubMenu = new (std::nothrow) ListView();
__pListViewCameraTabSubMenu->Construct(rectList, true, SCROLL_STYLE_FAST_SCROLL);
__pListViewCameraTabSubMenu->SetItemProvider(*this);
__pListViewCameraTabSubMenu->AddListViewItemEventListener(*this);
- __pCamraInfoSubPanel->AddControl(*__pListViewCameraTabSubMenu);
+ __pCameraInfoSubPanel->AddControl(*__pListViewCameraTabSubMenu);
__pListViewCameraTabSubMenu->UpdateList();
}
return E_SUCCESS;
CATCH:
- if (__pCamraInfoSubPanel)
+ if (__pCameraInfoSubPanel)
{
- RemoveControl(*__pCamraInfoSubPanel);
+ RemoveControl(*__pCameraInfoSubPanel);
SetCameraTabSubMenuListviewState(MENU_COUNT_CLEAR, CAMERA_TAB_SUB_MENU_CONTENT_MAX);
}
else
delete __pListViewCameraTabSubMenu;
}
- __pCamraInfoSubPanel = null;
+ __pCameraInfoSubPanel = null;
__pListViewCameraTabSubMenu = null;
return r;
if (listName.Equals(String(IDS_MENU_SETTING_GEN_MAIN_MENU_NAME)))
{
- if (__pCamraInfoSubPanel && __pListViewGeneralTabSubMenu)
+ if (__pCameraInfoGeneralSubPanel && __pListViewGeneralTabSubMenu)
{
- __pCamraInfoSubPanel->SetShowState(false);
- __pCamraInfoSubPanel->RemoveControl(*__pListViewGeneralTabSubMenu);
+ __pCameraInfoGeneralSubPanel->SetShowState(false);
+ __pCameraInfoGeneralSubPanel->RemoveControl(*__pListViewGeneralTabSubMenu);
__pListViewGeneralTabSubMenu = null;
- RemoveControl(*__pCamraInfoSubPanel);
- __pCamraInfoSubPanel = null;
+ RemoveControl(*__pCameraInfoGeneralSubPanel);
+ __pCameraInfoGeneralSubPanel = null;
SetGeneralTabSubMenuListviewState(MENU_COUNT_CLEAR, GENERAL_TAB_SUB_MENU_CONTENT_MAX);
}
}
break;
- case GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE:
+ case GENERAL_TAB_SUB_MENU_CONTENT_GUIDELINE_MODE:
{
- drawPopup = false;
- bool exposureValue = false;
- bool brighnesstValue = false;
- int selfPortraitEnable = 0;
- int adjustValue = 0;
-
- r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
- TryCatch(r == E_SUCCESS, , "Reg GetValue() fail:%s", GetErrorMessage(r));
+ pAppResource->GetString(IDS_CAM_BODY_GUIDELINE, strTitle);
+ SetGeneralTabSubMenuListviewState(SUBMENU_GUIDELINE_COUNT, GENERAL_TAB_SUB_MENU_CONTENT_GUIDELINE_MODE);
- if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
- {
- r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
- }
- else
- {
- r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
- }
-
- if (exposureValue == true && r == E_SUCCESS)
- {
- r = __pCameraPresentationModel->GetValue(EXPOSURE_VALUE, adjustValue);
- TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
-
- AppLogDebug("adjustValue = %d", adjustValue);
-
- __pCameraPresentationModel->SetExposure(adjustValue);
-
- MakeSettingPopupTab(false);
-
- HidePopup();
-
- r = CreateExposureSlider();
- TryCatch(r == E_SUCCESS, , "CreateExposureSlider() fail[%s]", GetErrorMessage(r));
-
- r = DrawExposureSlider();
- TryCatch(r == E_SUCCESS, , "DrawExposureSlider() fail[%s]", GetErrorMessage(r));
- }
- else
- {
- if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
- {
- r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
- }
- else
- {
- r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
- }
-
- if (brighnesstValue == true && r == E_SUCCESS)
- {
- r = __pCameraPresentationModel->GetValue(BRIGHTNESS_VALUE, adjustValue);
- TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
-
- AppLogDebug("adjustValue = %d", adjustValue);
-
- __pCameraPresentationModel->SetBrightness(adjustValue);
-
- MakeSettingPopupTab(false);
-
- HidePopup();
-
- r = CreateExposureSlider();
- TryCatch(r == E_SUCCESS, , "CreateExposureSlider() fail[%s]", GetErrorMessage(r));
-
- r = DrawExposureSlider();
- TryCatch(r == E_SUCCESS, , "DrawExposureSlider() fail[%s]", GetErrorMessage(r));
- }
- else
- {
- AppLogDebug("Exposure do not support");
- }
- }
- }
- break;
-
- case GENERAL_TAB_SUB_MENU_CONTENT_GUIDELINE_MODE:
- {
- pAppResource->GetString(IDS_CAM_BODY_GUIDELINE, strTitle);
- SetGeneralTabSubMenuListviewState(SUBMENU_GUIDELINE_COUNT, GENERAL_TAB_SUB_MENU_CONTENT_GUIDELINE_MODE);
-
- rectPanel = Rectangle(X_SUBMENU_GUIDELINE_MODE_PANEL, Y_SUBMENU_GUIDELINE_MODE_PANEL,
- W_SUBMENU_GUIDELINE_MODE_PANEL, H_SUBMENU_GUIDELINE_MODE_PANEL);
- rectList = Rectangle(X_SUBMENU_GUIDELINE_MODE_LIST, Y_SUBMENU_GUIDELINE_MODE_LIST,
- W_SUBMENU_GUIDELINE_MODE_LIST, H_SUBMENU_GUIDELINE_MODE_LIST);
- }
- break;
+ rectPanel = Rectangle(X_SUBMENU_GUIDELINE_MODE_PANEL, Y_SUBMENU_GUIDELINE_MODE_PANEL,
+ W_SUBMENU_GUIDELINE_MODE_PANEL, H_SUBMENU_GUIDELINE_MODE_PANEL);
+ rectList = Rectangle(X_SUBMENU_GUIDELINE_MODE_LIST, Y_SUBMENU_GUIDELINE_MODE_LIST,
+ W_SUBMENU_GUIDELINE_MODE_LIST, H_SUBMENU_GUIDELINE_MODE_LIST);
+ }
+ break;
case GENERAL_TAB_SUB_MENU_CONTENT_STORAGE_TYPE_MODE:
{
case GENERAL_TAB_SUB_MENU_OVERLAY_HELP_MODE:
{
- strTitle = IDS_MENU_OVERLAY_HELP_VALUE;
- rectPanel = Rectangle(X_SUBMENU_STORAGE_MODE_PANEL, Y_SUBMENU_STORAGE_MODE_PANEL,
- W_SUBMENU_STORAGE_MODE_PANEL, H_SUBMENU_STORAGE_MODE_PANEL);
- rectList = Rectangle(X_SUBMENU_STORAGE_MODE_LIST, Y_SUBMENU_STORAGE_MODE_LIST,
- W_SUBMENU_STORAGE_MODE_LIST, H_SUBMENU_STORAGE_MODE_LIST);
- SetGeneralTabSubMenuListviewState(SUBMENU_STORAGE_TYPE_COUNT, GENERAL_TAB_SUB_MENU_OVERLAY_HELP_MODE);
+ result r = E_SUCCESS;
+
+ r = __pCameraPresentationModel->SetValue(OVERLAY_HELP_ENABLE, SCREEN_OVERLAY_HELP_ENABLE);
+ TryCatch(r == E_SUCCESS, , "SetValue() fail[%s]", GetErrorMessage(r));
+
+ r = SetScreenOverlayHelpTimer();
+ TryCatch(r == E_SUCCESS, , "SetScreenOverlayHelpTimer() [%s]", GetErrorMessage(r));
+
+ r = DrawScreenOverlayHelp();
+ TryCatch(r == E_SUCCESS, , "DrawScreenOverlayHelp() [%s]", GetErrorMessage(r));
+
+ drawPopup = false;
+
+ MakeSettingPopupTab(false);
+
+ HidePopup();
+ HideUiQuickMenu();
}
break;
rectPanel.x = X_SUBMENU_PANEL_START_LANDSCAPE;
}
- if (__pCamraInfoSubPanel == null)
+ if (__pCameraInfoGeneralSubPanel == null)
{
- __pCamraInfoSubPanel = new (std::nothrow) CamraInfoSubPanel();
- TryCatch(__pCamraInfoSubPanel != null, r = E_FAILURE, "__pCamraInfoSubPanel is null");
+ __pCameraInfoGeneralSubPanel = new (std::nothrow) CameraInfoGeneralSubPanel();
+ TryCatch(__pCameraInfoGeneralSubPanel != null, r = E_FAILURE, "__pCameraInfoSubPanel is null");
- r = __pCamraInfoSubPanel->Initialize(rectPanel);
- TryCatch(r == E_SUCCESS, , "__pCamraInfoSubPanel Initialize fail[%s]", GetErrorMessage(r));
+ r = __pCameraInfoGeneralSubPanel->Initialize(rectPanel);
+ TryCatch(r == E_SUCCESS, , "__pCameraInfoGeneralSubPanel Initialize fail[%s]", GetErrorMessage(r));
- __pCamraInfoSubPanel->AddTouchEventListener(*this);
+ __pCameraInfoGeneralSubPanel->AddTouchEventListener(*this);
AddOrientationEventListener(*this);
- AddControl(*__pCamraInfoSubPanel);
- SetControlAlwaysOnTop(*__pCamraInfoSubPanel, true);
+ AddControl(*__pCameraInfoGeneralSubPanel);
+ SetControlAlwaysOnTop(*__pCameraInfoGeneralSubPanel, true);
}
- __pCamraInfoSubPanel->SetMenuTitle(strTitle);
+ __pCameraInfoGeneralSubPanel->SetMenuTitle(strTitle);
__pCameraInfoPanel->Invalidate(true);
- __pCamraInfoSubPanel->Invalidate(true);
+ __pCameraInfoGeneralSubPanel->Invalidate(true);
__pListViewGeneralTabSubMenu = new (std::nothrow) ListView();
__pListViewGeneralTabSubMenu->Construct(rectList, true, SCROLL_STYLE_FAST_SCROLL);
__pListViewGeneralTabSubMenu->SetItemProvider(*this);
__pListViewGeneralTabSubMenu->AddListViewItemEventListener(*this);
- __pCamraInfoSubPanel->AddControl(*__pListViewGeneralTabSubMenu);
+ __pCameraInfoGeneralSubPanel->AddControl(*__pListViewGeneralTabSubMenu);
__pListViewGeneralTabSubMenu->UpdateList();
}
return r;
CATCH:
- if (__pCamraInfoSubPanel)
+ if (__pCameraInfoGeneralSubPanel)
{
- RemoveControl(*__pCamraInfoSubPanel);
+ RemoveControl(*__pCameraInfoGeneralSubPanel);
SetGeneralTabSubMenuListviewState(MENU_COUNT_CLEAR, GENERAL_TAB_SUB_MENU_CONTENT_MAX);
}
else
delete __pListViewGeneralTabSubMenu;
}
- __pCamraInfoSubPanel = null;
+ __pCameraInfoGeneralSubPanel = null;
__pListViewGeneralTabSubMenu = null;
AppLogDebug("EXIT - CATCH");
}
break;
- case GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE:
- {
- AppLogDebug("Setting - EXPOSURE");
- }
- break;
-
case GENERAL_TAB_SUB_MENU_CONTENT_GUIDELINE_MODE:
{
r = SubListPopupGuidelineMode(index);
case GENERAL_TAB_SUB_MENU_OVERLAY_HELP_MODE:
{
- SubListPopupOverlayHelpMode(index);
}
break;
}
result
-CameraForm::EndPopupTimer(void)
+CameraForm::StopPopupTimer(void)
{
AppLogDebug("ENTER");
result r = E_SUCCESS;
if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
{
r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
-
- if (r == E_SUCCESS)
- {
- r =__pCameraPresentationModel->GetValue(WHITE_BALANCE_TYPE, wbIndex);
- TryReturnVoid(r == E_SUCCESS, "WB Faled to Get value to registry[%s]", GetErrorMessage(r));
-
- __pCameraPresentationModel->SetWhiteBalance((CameraWhiteBalance)wbIndex);
- }
}
else
{
r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
+ }
- if (r == E_SUCCESS)
- {
- AppLogDebug("Target unsupport");
- }
+ if (r == E_SUCCESS)
+ {
+ r =__pCameraPresentationModel->GetValue(WHITE_BALANCE_TYPE, wbIndex);
+ TryReturnVoid(r == E_SUCCESS, "WB Faled to Get value to registry[%s]", GetErrorMessage(r));
+
+ __pCameraPresentationModel->SetWhiteBalance((CameraWhiteBalance)wbIndex);
}
AppLogDebug("EXIT");
}
MakeSettingPopupTab(false);
r = UpdateUiPanelIcon();
- TryReturnVoid(r == E_SUCCESS, "UpdateUiPanelIcon() fail(%s)", GetErrorMessage(r));
+ //TryReturnVoid(r == E_SUCCESS, "UpdateUiPanelIcon() fail(%s)", GetErrorMessage(r));
r = SetScreenOverlayHelpTimer();
TryReturnVoid(r == E_SUCCESS, "SetScreenOverlayHelpTimer() fail(%s)", GetErrorMessage(r));
r = DrawScreenOverlayHelp();
- TryReturnVoid(r == E_SUCCESS, "UpdateUiPanelIcon() fail(%s)", GetErrorMessage(r));
+ TryReturnVoid(r == E_SUCCESS, "DrawScreenOverlayHelp() fail(%s)", GetErrorMessage(r));
TryReturnVoid(__pFlashButton != null, "__pFlashButton is null");
__pFlashButton->Invalidate(true);
}
void
-CameraForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus)
+CameraForm::ShowExposureSlider(void)
{
AppLogDebug("ENTER");
- result r = E_SUCCESS;
- Rectangle rect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE,
- W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
- BufferInfo bufferinfo;
- String listName = L"";
int selfPortraitEnable = CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY;
- int guideLineEnable = DISABLE_GUIDELINE;
bool exposureValue = false;
bool brighnesstValue = false;
- bool isValidRect = false;
- bool modified = false;
+ result r = E_SUCCESS;
- if (__dir != orientationStatus)
+ if (__pExposureCloseTimer)
{
- __isOrientationChanged = true;
-
- if (__pAppTimer != null)
+ if (__pExposureCloseTimer->Cancel() == E_SUCCESS)
{
- __pAppTimer->Cancel();
+ HidePopup();
- r = __pAppTimer->Start(CAMERA_TIMER_LIMIT);
- }
- r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
- TryReturnVoid(r == E_SUCCESS, "Read Reg fail[%s]", GetErrorMessage(r));
+ r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+ TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
- if (orientationStatus == ORIENTATION_STATUS_PORTRAIT_REVERSE
- || orientationStatus == ORIENTATION_STATUS_PORTRAIT)
- {
- if (__screenMode == SCREEN_MODE_NORMAL)
+ if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
{
- AppLogDebug("SCREEN_MODE_NORMAL");
- rect = Rectangle(X_PREVIEW_OVERLAY_PORTRAIT, Y_PREVIEW_OVERLAY_PORTRAIT,
- W_PREVIEW_OVERLAY_PORTRAIT, H_PREVIEW_OVERLAY_PORTRAIT);
+ r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
}
else
{
- rect = Rectangle(X_FULL_PREVIEW_OVERLAY_PORTRAIT, Y_FULL_PREVIEW_OVERLAY_PORTRAIT,
- W_FULL_PREVIEW_OVERLAY_PORTRAIT, H_FULL_PREVIEW_OVERLAY_PORTRAIT);
+ r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
}
- }
- else
- {
- if (__screenMode == SCREEN_MODE_NORMAL)
+
+ if (exposureValue == true && r == E_SUCCESS)
{
- AppLogDebug("SCREEN_MODE_NORMAL");
- rect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE,
- W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
+ r = CreateExposureSlider();
+ TryReturnVoid(r == E_SUCCESS, "CreateExposureSlider() fail[%s]", GetErrorMessage(r));
+
+ r = DrawExposureSlider();
+ TryReturnVoid(r == E_SUCCESS, "DrawExposureSlider() fail[%s]", GetErrorMessage(r));
}
else
{
- rect = Rectangle(X_FULL_PREVIEW_OVERLAY_LANDSCAPE, Y_FULL_PREVIEW_OVERLAY_LANDSCAPE,
- W_FULL_PREVIEW_OVERLAY_LANDSCAPE, H_FULL_PREVIEW_OVERLAY_LANDSCAPE);
- }
- }
-
- if (__pOverlayPanel)
- {
- switch (orientationStatus)
- {
- case ORIENTATION_STATUS_PORTRAIT:
+ if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
{
- AppLogDebug("PORTRAIT");
- __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_90);
+ r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
}
- break;
-
- case ORIENTATION_STATUS_PORTRAIT_REVERSE:
+ else
{
- AppLogDebug("PORTRAIT_REVERSE");
- __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_270);
+ r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
}
- break;
- case ORIENTATION_STATUS_LANDSCAPE:
+ if (brighnesstValue == true && r == E_SUCCESS)
{
- AppLogDebug("LANDSCAPE");
- __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_NONE);
- }
- break;
+ r = CreateExposureSlider();
+ TryReturnVoid(r == E_SUCCESS, "CreateExposureSlider() fail[%s]", GetErrorMessage(r));
- case ORIENTATION_STATUS_LANDSCAPE_REVERSE:
- {
- AppLogDebug("LANDSCAPE_REVERSE");
- __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_180);
+ r = DrawExposureSlider();
+ TryReturnVoid(r == E_SUCCESS, "DrawExposureSlider() fail[%s]", GetErrorMessage(r));
}
- break;
-
- default:
- break;
}
- __pOverlayPanel->SetBounds(rect);
}
+ }
+ AppLogDebug("EXIT");
+}
- if (__screenMode == SCREEN_MODE_FULL)
- {
- isValidRect = OverlayRegion::EvaluateBounds(OVERLAY_REGION_EVALUATION_OPTION_GREATER_THAN, rect, modified);
- AppLogDebug("OVERLAY_REGION_EVALUATION_OPTION_GREATER_THAN Bounds is modified to (%d,%d,%d,%d)", rect.x, rect.y, rect.width, rect.height);
+void
+CameraForm::SetOverlayPanelOrientationChanged(Tizen::Ui::OrientationStatus orientationStatus)
+{
+ AppLogDebug("ENTER");
+ result r = E_SUCCESS;
+ bool modified = false;
+ bool isValidRect = false;
- HidePanel(true, true);
+ if (__screenMode == SCREEN_MODE_NORMAL)
+ {
+ Dimension dim = Dimension(0, 0);
+ Rectangle rect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
+ Rectangle evaluateBoundsRect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
+ Rectangle clientRect = GetClientAreaBounds();
+ bool isToCompensated = false;
+
+ if (orientationStatus == ORIENTATION_STATUS_PORTRAIT
+ || orientationStatus == ORIENTATION_STATUS_PORTRAIT_REVERSE)
+ {
+ if (clientRect.height == (CAMERA_PANEL_SUM_SIZE + PREVIEW_OVERLAY_PANEL_SIZE))
+ {
+ evaluateBoundsRect = Rectangle(X_PREVIEW_OVERLAY_PORTRAIT, Y_PREVIEW_OVERLAY_PORTRAIT, W_PREVIEW_OVERLAY_PORTRAIT, H_PREVIEW_OVERLAY_PORTRAIT);
+ rect = Rectangle(X_PREVIEW_OVERLAY_PORTRAIT, Y_PREVIEW_OVERLAY_PORTRAIT, W_PREVIEW_OVERLAY_PORTRAIT, H_PREVIEW_OVERLAY_PORTRAIT);
+ }
+ else
+ {
+ evaluateBoundsRect = Rectangle(X_PREVIEW_OVERLAY_PORTRAIT, Y_PREVIEW_OVERLAY_PORTRAIT, W_PREVIEW_OVERLAY_PORTRAIT, H_PREVIEW_OVERLAY_PORTRAIT - PREVIEW_OVERLAY_PANEL_SIZE_MARGIN);
+ rect = Rectangle(X_PREVIEW_OVERLAY_PORTRAIT, Y_PREVIEW_OVERLAY_PORTRAIT, W_PREVIEW_OVERLAY_PORTRAIT, H_PREVIEW_OVERLAY_PORTRAIT - PREVIEW_OVERLAY_PANEL_SIZE_MARGIN);
+ }
}
else
{
- isValidRect = OverlayRegion::EvaluateBounds(OVERLAY_REGION_EVALUATION_OPTION_LESS_THAN, rect, modified);
- AppLogDebug("SCREEN_MODE_NORMAL Bounds is modified to (%d,%d,%d,%d)", rect.x, rect.y, rect.width, rect.height);
+ if (clientRect.width == (CAMERA_PANEL_SUM_SIZE + PREVIEW_OVERLAY_PANEL_SIZE))
+ {
+ evaluateBoundsRect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
+ rect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
+ }
+ else
+ {
+ evaluateBoundsRect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE - PREVIEW_OVERLAY_PANEL_SIZE_MARGIN, H_PREVIEW_OVERLAY_LANDSCAPE);
+ rect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE - PREVIEW_OVERLAY_PANEL_SIZE_MARGIN, H_PREVIEW_OVERLAY_LANDSCAPE);
+ }
}
- __dir = orientationStatus;
- __deviceOrientation = orientationStatus;
+ TryReturnVoid(__pOverlayPanel != null, "__pOverlayPanel is null");
- __pCameraPresentationModel->SetOrientation(__dir);
+ AppLogDebug("Client area rect (%d, %d, %d, %d)", clientRect.x, clientRect.y, clientRect.width, clientRect.height);
+ AppLogDebug("Input EvaluateBounds (%d, %d, %d, %d)", evaluateBoundsRect.x, evaluateBoundsRect.y, evaluateBoundsRect.width, evaluateBoundsRect.height);
- r = __pCameraPresentationModel->GetValue(GUIDELINE_ENABLE, guideLineEnable);
- TryReturnVoid(r == E_SUCCESS, "Read Reg fail[%s]", GetErrorMessage(r));
+ isValidRect = OverlayRegion::EvaluateBounds(OVERLAY_REGION_EVALUATION_OPTION_LESS_THAN, evaluateBoundsRect, modified);
+ TryReturnVoid(isValidRect == true, "OverlayRegion::EvaluateBounds returned error[%s]", GetErrorMessage(GetLastResult()));
- if (guideLineEnable == DISABLE_GUIDELINE)
- {
- DrawMarker(false);
- }
- else
+ if (modified == true)
{
- DrawMarker(true);
+ AppLogDebug("OverlayRegion::EvaluateBounds is modified to (%d,%d,%d,%d)", evaluateBoundsRect.x, evaluateBoundsRect.y, evaluateBoundsRect.width, evaluateBoundsRect.height);
}
- UpdateUiPanelIcon();
- UpdateUiActionPanelIcon();
-
- SetScreenOverlayHelpTimer();
- DrawScreenOverlayHelp();
-
- if (__pListViewCameraTabMainMenu != null)
+ if (orientationStatus == ORIENTATION_STATUS_PORTRAIT
+ || orientationStatus == ORIENTATION_STATUS_PORTRAIT_REVERSE)
{
- listName = __pListViewCameraTabMainMenu->GetName();
- if (listName.Equals(String(IDS_MENU_SETTING_MAIN_MENU_NAME)) && __pListViewCameraTabMainMenu->GetShowState() == true)
+ if (evaluateBoundsRect.height == rect.height)
{
- HidePopup();
+ isToCompensated = false;
+ }
+ else
+ {
+ isToCompensated = true;
}
}
-
- if (__pListViewGeneralTabMainMenu != null)
+ else
{
- listName = __pListViewGeneralTabMainMenu->GetName();
- if (listName.Equals(String(IDS_MENU_SETTING_GEN_MAIN_MENU_NAME)) && __pListViewGeneralTabMainMenu->GetShowState() == true)
+ if (evaluateBoundsRect.width == rect.width)
{
- HidePopup();
+ isToCompensated = false;
+ }
+ else
+ {
+ isToCompensated = true;
}
}
- if (__pListFlashMainMenu != null)
+ if (isToCompensated == false)
{
- listName = __pListFlashMainMenu->GetName();
+ AppLogDebug("isToCompensated = false");
- if (listName.Equals(String(IDS_MENU_FLASH_MENU_NAME))&& __pListFlashMainMenu->GetShowState() == true)
- {
- HidePopup();
- }
- }
+ r = __pOverlayPanel->SetBounds(rect);
+ AppLogDebug("pOverlayPanel->SetBounds() [%s]", GetErrorMessage(r));
- if (__pListWbMainMenu != null)
+ AppLogDebug("__pOverlayPanel->SetBounds() area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+ }
+ else
{
- listName = __pListWbMainMenu->GetName();
+ AppLogDebug("isToCompensated = true");
- if (listName.Equals(String(IDS_MENU_WB_MENU_NAME))&& __pListWbMainMenu->GetShowState() == true)
+ r = __pOverlayPanel->SetBounds(rect);
+ AppLogDebug("pOverlayPanel->SetBounds() [%s]", GetErrorMessage(r));
+
+ rect = __pOverlayPanel->GetBounds();
+
+ AppLogDebug("__pOverlayPanel GetBounds area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+
+ if (orientationStatus == ORIENTATION_STATUS_PORTRAIT
+ || orientationStatus == ORIENTATION_STATUS_PORTRAIT_REVERSE)
{
- HidePopup();
+ rect.x = 0; //imsi
+ rect.y = 160; //imsi
}
- }
-
- if (__pListViewCameraTabSubMenu != null)
- {
- if (__pListViewCameraTabSubMenu->GetShowState() == true)
+ else
{
- HidePopup();
+ rect.x = 160; //imsi
+ rect.y = 0; //imsi
}
+
+ r = __pOverlayPanel->SetBounds(rect);
+
+ AppLogDebug("__pOverlayPanel->SetBounds() area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
}
+ }
+ else
+ {
+ Rectangle evaluateBoundsRect = Rectangle(X_BASE_POS, Y_BASE_POS, GetClientAreaBounds().width, GetClientAreaBounds().height);
+ Rectangle rect = Rectangle(X_BASE_POS, Y_BASE_POS, GetClientAreaBounds().width, GetClientAreaBounds().height);
+ Rectangle clientRect = GetClientAreaBounds();
+ bool isToCompensated = false;
- if (__pListViewGeneralTabSubMenu != null)
+ if (orientationStatus == ORIENTATION_STATUS_PORTRAIT
+ || orientationStatus == ORIENTATION_STATUS_PORTRAIT_REVERSE)
{
- if (__pListViewGeneralTabSubMenu->GetShowState() == true)
+ if (clientRect.height == (CAMERA_PANEL_SUM_SIZE + PREVIEW_OVERLAY_PANEL_SIZE))
{
- HidePopup();
+ rect = Rectangle(X_BASE_POS, Y_BASE_POS, GetClientAreaBounds().width, GetClientAreaBounds().height);
+ }
+ else
+ {
+ rect = Rectangle(X_BASE_POS, Y_BASE_POS, GetClientAreaBounds().width, GetClientAreaBounds().height - PREVIEW_OVERLAY_PANEL_SIZE_MARGIN);
}
}
-
- if (__pExposureCloseTimer)
+ else
{
- if (__pExposureCloseTimer->Cancel() == E_SUCCESS)
+ if (clientRect.width == (CAMERA_PANEL_SUM_SIZE + PREVIEW_OVERLAY_PANEL_SIZE))
{
- HidePopup();
+ rect = Rectangle(X_BASE_POS, Y_BASE_POS, GetClientAreaBounds().width, GetClientAreaBounds().height);
+ }
+ else
+ {
+ rect = Rectangle(X_BASE_POS, Y_BASE_POS, GetClientAreaBounds().width - PREVIEW_OVERLAY_PANEL_SIZE_MARGIN, GetClientAreaBounds().height);
+ }
+ }
- r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
- TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
+ TryReturnVoid(__pOverlayPanel != null, "__pOverlayPanel is null");
- if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
+ AppLogDebug("Client area rect (%d, %d, %d, %d)", clientRect.x, clientRect.y, clientRect.width, clientRect.height);
+ AppLogDebug("Input EvaluateBounds (%d, %d, %d, %d)", evaluateBoundsRect.x, evaluateBoundsRect.y, evaluateBoundsRect.width, evaluateBoundsRect.height);
+
+ isValidRect = OverlayRegion::EvaluateBounds(OVERLAY_REGION_EVALUATION_OPTION_GREATER_THAN, evaluateBoundsRect, modified);
+ TryReturnVoid(isValidRect == true, "OverlayRegion::EvaluateBounds returned error[%s]", GetErrorMessage(GetLastResult()));
+
+ if (modified == true)
+ {
+ AppLogDebug("OverlayRegion::EvaluateBounds is modified to (%d,%d,%d,%d)", evaluateBoundsRect.x, evaluateBoundsRect.y, evaluateBoundsRect.width, evaluateBoundsRect.height);
+ }
+
+ if (orientationStatus == ORIENTATION_STATUS_PORTRAIT
+ || orientationStatus == ORIENTATION_STATUS_PORTRAIT_REVERSE)
+ {
+ if (evaluateBoundsRect.height == rect.height)
+ {
+ isToCompensated = false;
+ }
+ else
+ {
+ isToCompensated = true;
+ }
+ }
+ else
+ {
+ if (evaluateBoundsRect.width == rect.width)
+ {
+ isToCompensated = false;
+ }
+ else
+ {
+ isToCompensated = true;
+ }
+ }
+
+ if (isToCompensated == false)
+ {
+ AppLogDebug("isToCompensated = false");
+
+ r = __pOverlayPanel->SetBounds(rect);
+ AppLogDebug("pOverlayPanel->SetBounds() [%s]", GetErrorMessage(r));
+
+ AppLogDebug("__pOverlayPanel->SetBounds() area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+ }
+ else
+ {
+ AppLogDebug("isToCompensated = true");
+
+ r = __pOverlayPanel->SetBounds(rect);
+ AppLogDebug("pOverlayPanel->SetBounds() [%s]", GetErrorMessage(r));
+
+ rect = __pOverlayPanel->GetBounds();
+ AppLogDebug("__pOverlayPanel GetBounds area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+
+ rect.x = 0; //imsi
+ rect.y = 0; //imsi
+
+ r = __pOverlayPanel->SetBounds(rect);
+
+ AppLogDebug("__pOverlayPanel->SetBounds() area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+ }
+ }
+ AppLogDebug("EXIT");
+}
+
+void
+CameraForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus)
+{
+ AppLogDebug("ENTER");
+ result r = E_SUCCESS;
+ Rectangle rect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
+ Rectangle evaluateBoundsRect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
+ Rectangle clientRect = GetClientAreaBounds();
+ BufferInfo bufferinfo;
+ String listName = L"";
+ int selfPortraitEnable = CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY;
+ int guideLineEnable = DISABLE_GUIDELINE;
+
+ if (__dir != orientationStatus)
+ {
+ __isOrientationChanged = true;
+
+ if (__pAppTimer != null)
+ {
+ __pAppTimer->Cancel();
+
+ r = __pAppTimer->Start(CAMERA_TIMER_LIMIT);
+ }
+ r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+ TryReturnVoid(r == E_SUCCESS, "Read Reg fail[%s]", GetErrorMessage(r));
+
+ SetOverlayPanelOrientationChanged(orientationStatus);
+
+ if (__pOverlayPanel)
+ {
+ switch (orientationStatus)
+ {
+ case ORIENTATION_STATUS_PORTRAIT:
{
- r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
+ AppLogDebug("PORTRAIT");
+ __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_90);
}
- else
+ break;
+
+ case ORIENTATION_STATUS_PORTRAIT_REVERSE:
{
- r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
+ AppLogDebug("PORTRAIT_REVERSE");
+ __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_270);
}
+ break;
- if (exposureValue == true && r == E_SUCCESS)
+ case ORIENTATION_STATUS_LANDSCAPE:
{
- r = CreateExposureSlider();
- TryReturnVoid(r == E_SUCCESS, "CreateExposureSlider() fail[%s]", GetErrorMessage(r));
-
- r = DrawExposureSlider();
- TryReturnVoid(r == E_SUCCESS, "DrawExposureSlider() fail[%s]", GetErrorMessage(r));
+ AppLogDebug("LANDSCAPE");
+ __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_NONE);
}
- else
+ break;
+
+ case ORIENTATION_STATUS_LANDSCAPE_REVERSE:
{
- if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
- {
- r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
- }
- else
- {
- r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
- }
+ AppLogDebug("LANDSCAPE_REVERSE");
+ __pOverlayPanel->SetRendererRotation(__pOverlayPanel->ROTATION_180);
+ }
+ break;
- if (brighnesstValue == true && r == E_SUCCESS)
- {
- r = CreateExposureSlider();
- TryReturnVoid(r == E_SUCCESS, "CreateExposureSlider() fail[%s]", GetErrorMessage(r));
+ default:
+ break;
+ }
+ }
- r = DrawExposureSlider();
- TryReturnVoid(r == E_SUCCESS, "DrawExposureSlider() fail[%s]", GetErrorMessage(r));
- }
- }
+ if (__screenMode == SCREEN_MODE_FULL)
+ {
+ HidePanel(true, true);
+ }
+
+ __dir = orientationStatus;
+ __deviceOrientation = orientationStatus;
+
+ __pCameraPresentationModel->SetOrientation(__dir);
+
+ r = __pCameraPresentationModel->GetValue(GUIDELINE_ENABLE, guideLineEnable);
+ TryReturnVoid(r == E_SUCCESS, "Read Reg fail[%s]", GetErrorMessage(r));
+
+ if (guideLineEnable == DISABLE_GUIDELINE)
+ {
+ DrawMarker(false);
+ }
+ else
+ {
+ DrawMarker(true);
+ }
+
+ UpdateUiPanelIcon();
+ UpdateUiActionPanelIcon();
+
+ SetScreenOverlayHelpTimer();
+ DrawScreenOverlayHelp();
+
+ if (__isTimerRunning)
+ {
+ if (__pHelpCloseTimer)
+ {
+ __pHelpCloseTimer->Cancel();
+
+ delete __pHelpCloseTimer;
+ __pHelpCloseTimer = null;
+ }
+
+ HideScreenOverlayHelp();
+ }
+
+ if (__pListViewCameraTabMainMenu != null)
+ {
+ listName = __pListViewCameraTabMainMenu->GetName();
+ if (listName.Equals(String(IDS_MENU_SETTING_MAIN_MENU_NAME)) && __pListViewCameraTabMainMenu->GetShowState() == true)
+ {
+ HidePopup();
+ }
+ }
+
+ if (__pListViewGeneralTabMainMenu != null)
+ {
+ listName = __pListViewGeneralTabMainMenu->GetName();
+ if (listName.Equals(String(IDS_MENU_SETTING_GEN_MAIN_MENU_NAME)) && __pListViewGeneralTabMainMenu->GetShowState() == true)
+ {
+ HidePopup();
}
}
+ if (__pListFlashMainMenu != null)
+ {
+ listName = __pListFlashMainMenu->GetName();
+
+ if (listName.Equals(String(IDS_MENU_FLASH_MENU_NAME))&& __pListFlashMainMenu->GetShowState() == true)
+ {
+ HidePopup();
+ }
+ }
+
+ if (__pListWbMainMenu != null)
+ {
+ listName = __pListWbMainMenu->GetName();
+
+ if (listName.Equals(String(IDS_MENU_WB_MENU_NAME))&& __pListWbMainMenu->GetShowState() == true)
+ {
+ HidePopup();
+ }
+ }
+
+ if (__pListViewCameraTabSubMenu != null)
+ {
+ if (__pListViewCameraTabSubMenu->GetShowState() == true)
+ {
+ HidePopup();
+ }
+ }
+
+ if (__pListViewGeneralTabSubMenu != null)
+ {
+ if (__pListViewGeneralTabSubMenu->GetShowState() == true)
+ {
+ HidePopup();
+ }
+ }
+
+ ShowExposureSlider();
+
MakeSettingPopupTab(false);
Invalidate(true);
if (__pListViewCameraTabSubMenu)
{
- if (__pCamraInfoSubPanel != null)
+ if (__pCameraInfoSubPanel != null)
{
- __pCamraInfoSubPanel->SetShowState(false);
+ __pCameraInfoSubPanel->SetShowState(false);
}
__pListViewCameraTabSubMenu->SetShowState(false);
if (__pListViewGeneralTabSubMenu)
{
- if (__pCamraInfoSubPanel != null)
+ if (__pCameraInfoGeneralSubPanel != null)
{
- __pCamraInfoSubPanel->SetShowState(false);
+ __pCameraInfoGeneralSubPanel->SetShowState(false);
}
__pListViewGeneralTabSubMenu->SetShowState(false);
}
__pFlashButton->SetShowState(false);
__pSelfShotButton->SetShowState(false);
__pSettingButton->SetShowState(false);
+ __pSettingLine->SetShowState(false);
__pCameraIconLabel->SetShowState(false);
__pCamcoderIconLabel->SetShowState(false);
__pQuickSettingButton->SetShowState(false);
__pFlashButton->SetShowState(false);
__pSelfShotButton->SetShowState(true);
__pSettingButton->SetShowState(true);
+ __pSettingLine->SetShowState(true);
__pQuickSettingButton->SetShowState(false);
__pWhiteBalanceButton->SetShowState(false);
__pExposureValueButton->SetShowState(false);
CameraForm::HideUiSettingMenu(void)
{
AppLogDebug("ENTER");
- if (__pCamraInfoSubPanel)
+ if (__pCameraInfoPanel)
{
__pCameraInfoPanel->SetDrawExposure(false);
__pCameraInfoPanel->SetDrawWhiteBalanceBackground(false);
if (__pListViewCameraTabSubMenu)
{
- if (__pCamraInfoSubPanel != null)
+ if (__pCameraInfoSubPanel != null)
{
- __pCamraInfoSubPanel->SetShowState(false);
+ __pCameraInfoSubPanel->SetShowState(false);
}
__pListViewCameraTabSubMenu->SetShowState(false);
if (__pListViewGeneralTabSubMenu)
{
- if (__pCamraInfoSubPanel != null)
+ if (__pCameraInfoGeneralSubPanel != null)
{
- __pCamraInfoSubPanel->SetShowState(false);
+ __pCameraInfoGeneralSubPanel->SetShowState(false);
}
__pListViewGeneralTabSubMenu->SetShowState(false);
}
__pSettingButton->Invalidate(true);
}
+ if (__pSettingLine != null)
+ {
+ __pSettingLine->SetShowState(true);
+ __pSettingLine->Invalidate(true);
+ }
+
if (__pCameraInfoPanel != null)
{
__pCameraInfoPanel->SetDrawIndicator(true);
__pSettingButton->Invalidate(true);
}
+ if (__pSettingLine != null)
+ {
+ __pSettingLine->SetShowState(false);
+ __pSettingLine->Invalidate(true);
+ }
+
if (__pFlashButton != null)
{
__pFlashButton->SetShowState(true);
CameraForm::SetOverlayRendererRotation(void)
{
AppLogDebug("ENTER");
+ TryReturnVoid(__pOverlayPanel != null, "__pOverlayPanel is null");
switch (__dir)
{
case ORIENTATION_STATUS_PORTRAIT:
}
void
-CameraForm::SetNormalOverlayPanel(bool destory)
+CameraForm::SetOverlayPanelNormalMode(bool isRemoved)
{
AppLogDebug("ENTER");
result r = E_SUCCESS;
bool modified = false;
bool isValidRect = false;
-
- Rectangle rect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE,
- W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
+ Dimension dim = Dimension(0, 0);
+ Rectangle rect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
+ Rectangle evaluateBoundsRect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
Rectangle clientRect = GetClientAreaBounds();
- int selfPortraitEnable = 0;
+ bool isToCompensated = false;
- r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
- TryReturnVoid(r == E_SUCCESS, "Reg getValue fail[%s]", GetErrorMessage(r));
+ if (__dir == ORIENTATION_STATUS_PORTRAIT
+ || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
+ {
+ if (clientRect.height == (CAMERA_PANEL_SUM_SIZE + PREVIEW_OVERLAY_PANEL_SIZE))
+ {
+ evaluateBoundsRect = Rectangle(X_PREVIEW_OVERLAY_PORTRAIT, Y_PREVIEW_OVERLAY_PORTRAIT, W_PREVIEW_OVERLAY_PORTRAIT, H_PREVIEW_OVERLAY_PORTRAIT);
+ rect = Rectangle(X_PREVIEW_OVERLAY_PORTRAIT, Y_PREVIEW_OVERLAY_PORTRAIT, W_PREVIEW_OVERLAY_PORTRAIT, H_PREVIEW_OVERLAY_PORTRAIT);
+ }
+ else
+ {
+ evaluateBoundsRect = Rectangle(X_PREVIEW_OVERLAY_PORTRAIT, Y_PREVIEW_OVERLAY_PORTRAIT, W_PREVIEW_OVERLAY_PORTRAIT, H_PREVIEW_OVERLAY_PORTRAIT - PREVIEW_OVERLAY_PANEL_SIZE_MARGIN);
+ rect = Rectangle(X_PREVIEW_OVERLAY_PORTRAIT, Y_PREVIEW_OVERLAY_PORTRAIT, W_PREVIEW_OVERLAY_PORTRAIT, H_PREVIEW_OVERLAY_PORTRAIT - PREVIEW_OVERLAY_PANEL_SIZE_MARGIN);
+ }
+ }
+ else
+ {
+ if (clientRect.width == (CAMERA_PANEL_SUM_SIZE + PREVIEW_OVERLAY_PANEL_SIZE))
+ {
+ evaluateBoundsRect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
+ rect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
+ }
+ else
+ {
+ evaluateBoundsRect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE - PREVIEW_OVERLAY_PANEL_SIZE_MARGIN, H_PREVIEW_OVERLAY_LANDSCAPE);
+ rect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE - PREVIEW_OVERLAY_PANEL_SIZE_MARGIN, H_PREVIEW_OVERLAY_LANDSCAPE);
+ }
+ }
- if (destory == true)
+ if (isRemoved == true)
{
if (__pOverlayPanel)
{
__pOverlayPanel = null;
}
+ AppLogDebug("Client area rect (%d, %d, %d, %d)", clientRect.x, clientRect.y, clientRect.width, clientRect.height);
+ AppLogDebug("Input EvaluateBounds (%d, %d, %d, %d)", evaluateBoundsRect.x, evaluateBoundsRect.y, evaluateBoundsRect.width, evaluateBoundsRect.height);
+
+ isValidRect = OverlayRegion::EvaluateBounds(OVERLAY_REGION_EVALUATION_OPTION_LESS_THAN, evaluateBoundsRect, modified);
+ TryReturnVoid(isValidRect == true, "OverlayRegion::EvaluateBounds returned error[%s]", GetErrorMessage(GetLastResult()));
+
+ if (modified == true)
+ {
+ AppLogDebug("OverlayRegion::EvaluateBounds is modified to (%d,%d,%d,%d)", evaluateBoundsRect.x, evaluateBoundsRect.y, evaluateBoundsRect.width, evaluateBoundsRect.height);
+ }
+
if (__dir == ORIENTATION_STATUS_PORTRAIT
|| __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
{
- rect = Rectangle(X_PREVIEW_OVERLAY_PORTRAIT, Y_PREVIEW_OVERLAY_PORTRAIT, W_PREVIEW_OVERLAY_PORTRAIT, H_PREVIEW_OVERLAY_PORTRAIT);
+ if (evaluateBoundsRect.height == rect.height)
+ {
+ isToCompensated = false;
+ }
+ else
+ {
+ isToCompensated = true;
+ }
}
else
{
- rect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
+ if (evaluateBoundsRect.width == rect.width)
+ {
+ isToCompensated = false;
+ }
+ else
+ {
+ isToCompensated = true;
+ }
}
- __pOverlayPanel = new (std::nothrow) OverlayPanel();
- __pOverlayPanel->Construct(rect);
- AddControl(*__pOverlayPanel);
-
- AppLogDebug("Client area rect (%d, %d, %d, %d)", clientRect.x, clientRect.y, clientRect.width, clientRect.height);
- AppLogDebug("Input bounds (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
-
- if (rect.width > clientRect.width
- || rect.height > clientRect.height)
+ if (isToCompensated == false)
{
- rect.width = clientRect.width;
- rect.height = clientRect.height;
+ AppLogDebug("isToCompensated = false");
+ __pOverlayPanel = new (std::nothrow) OverlayPanel();
+ __pOverlayPanel->Construct(rect);
+ AddControl(*__pOverlayPanel);
+
+ AppLogDebug("__pOverlayPanel area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
}
+ else
+ {
+ AppLogDebug("isToCompensated = true");
+ __pOverlayPanel = new (std::nothrow) OverlayPanel();
+ __pOverlayPanel->Construct(rect);
+ AddControl(*__pOverlayPanel);
- isValidRect = OverlayRegion::EvaluateBounds(OVERLAY_REGION_EVALUATION_OPTION_LESS_THAN, rect, modified);
- AppLogDebug("SCREEN_MODE_NORMAL Bounds is modified to (%d,%d,%d,%d)", rect.x, rect.y, rect.width, rect.height);
+ rect = __pOverlayPanel->GetBounds();
+ AppLogDebug("__pOverlayPanel->GetBounds area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
- SetOverlayRendererRotation();
+ if (__dir == ORIENTATION_STATUS_PORTRAIT
+ || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
+ {
+ rect.x = 0; //imsi
+ rect.y = 160; //imsi
+ }
+ else
+ {
+ rect.x = 160; //imsi
+ rect.y = 0; //imsi
+ }
+
+ r = __pOverlayPanel->SetBounds(rect);
+ AppLogDebug("__pOverlayPanel->SetBounds() area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+ }
}
else
{
+ TryReturnVoid(__pOverlayPanel != null, "__pOverlayPanel is null");
+
+ AppLogDebug("Client area rect (%d, %d, %d, %d)", clientRect.x, clientRect.y, clientRect.width, clientRect.height);
+ AppLogDebug("Input EvaluateBounds (%d, %d, %d, %d)", evaluateBoundsRect.x, evaluateBoundsRect.y, evaluateBoundsRect.width, evaluateBoundsRect.height);
+
+ isValidRect = OverlayRegion::EvaluateBounds(OVERLAY_REGION_EVALUATION_OPTION_LESS_THAN, evaluateBoundsRect, modified);
+ TryReturnVoid(isValidRect == true, "OverlayRegion::EvaluateBounds returned error[%s]", GetErrorMessage(GetLastResult()));
+
+ if (modified == true)
+ {
+ AppLogDebug("OverlayRegion::EvaluateBounds is modified to (%d,%d,%d,%d)", evaluateBoundsRect.x, evaluateBoundsRect.y, evaluateBoundsRect.width, evaluateBoundsRect.height);
+ }
+
if (__dir == ORIENTATION_STATUS_PORTRAIT
|| __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
{
- rect = Rectangle(X_PREVIEW_OVERLAY_PORTRAIT, Y_PREVIEW_OVERLAY_PORTRAIT, W_PREVIEW_OVERLAY_PORTRAIT, H_PREVIEW_OVERLAY_PORTRAIT);
+ if (evaluateBoundsRect.height == rect.height)
+ {
+ isToCompensated = false;
+ }
+ else
+ {
+ isToCompensated = true;
+ }
}
else
{
- rect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
+ if (evaluateBoundsRect.width == rect.width)
+ {
+ isToCompensated = false;
+ }
+ else
+ {
+ isToCompensated = true;
+ }
}
- if (__pOverlayPanel)
+ if (isToCompensated == false)
{
- SetOverlayRendererRotation();
-
+ AppLogDebug("isToCompensated = false");
r = __pOverlayPanel->SetBounds(rect);
AppLogDebug("pOverlayPanel->SetBounds() [%s]", GetErrorMessage(r));
- }
- if (rect.width > clientRect.width
- || rect.height > clientRect.height)
- {
- rect.width = clientRect.width;
- rect.height = clientRect.height;
+ AppLogDebug("__pOverlayPanel->SetBounds() area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
}
+ else
+ {
+ AppLogDebug("isToCompensated = true");
- isValidRect = OverlayRegion::EvaluateBounds(OVERLAY_REGION_EVALUATION_OPTION_LESS_THAN, rect, modified);
- AppLogDebug("SCREEN_MODE_NORMAL Bounds is modified to (%d,%d,%d,%d)", rect.x, rect.y, rect.width, rect.height);
+ r = __pOverlayPanel->SetBounds(rect);
+ AppLogDebug("pOverlayPanel->SetBounds() [%s]", GetErrorMessage(r));
+
+ rect = __pOverlayPanel->GetBounds();
+
+ AppLogDebug("__pOverlayPanel GetBounds area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+
+ if (__dir == ORIENTATION_STATUS_PORTRAIT
+ || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
+ {
+ rect.x = 0; //imsi
+ rect.y = 160; //imsi
+ }
+ else
+ {
+ rect.x = 160; //imsi
+ rect.y = 0; //imsi
+ }
+
+ r = __pOverlayPanel->SetBounds(rect);
+
+ AppLogDebug("__pOverlayPanel->SetBounds() area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+ }
}
AppLogDebug("EXIT");
}
void
-CameraForm::SetWideOverlayPanel(bool destory)
+CameraForm::SetOverlayPanelWideMode(bool isRemoved)
{
AppLogDebug("ENTER");
result r = E_SUCCESS;
bool modified = false;
bool isValidRect = false;
+ Rectangle evaluateBoundsRect = Rectangle(X_BASE_POS, Y_BASE_POS, GetClientAreaBounds().width, GetClientAreaBounds().height);
+ Rectangle rect = Rectangle(X_BASE_POS, Y_BASE_POS, GetClientAreaBounds().width, GetClientAreaBounds().height);
+ Rectangle clientRect = GetClientAreaBounds();
+ bool isToCompensated = false;
- Rectangle rect = Rectangle(0, 0, GetClientAreaBounds().width, GetClientAreaBounds().height);
+ if (__dir == ORIENTATION_STATUS_PORTRAIT
+ || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
+ {
+ if (clientRect.height == (CAMERA_PANEL_SUM_SIZE + PREVIEW_OVERLAY_PANEL_SIZE))
+ {
+ rect = Rectangle(X_BASE_POS, Y_BASE_POS, GetClientAreaBounds().width, GetClientAreaBounds().height);
+ }
+ else
+ {
+ rect = Rectangle(X_BASE_POS, Y_BASE_POS, GetClientAreaBounds().width, GetClientAreaBounds().height - PREVIEW_OVERLAY_PANEL_SIZE_MARGIN);
+ }
+ }
+ else
+ {
+ if (clientRect.width == (CAMERA_PANEL_SUM_SIZE + PREVIEW_OVERLAY_PANEL_SIZE))
+ {
+ rect = Rectangle(X_BASE_POS, Y_BASE_POS, GetClientAreaBounds().width, GetClientAreaBounds().height);
+ }
+ else
+ {
+ rect = Rectangle(X_BASE_POS, Y_BASE_POS, GetClientAreaBounds().width - PREVIEW_OVERLAY_PANEL_SIZE_MARGIN, GetClientAreaBounds().height);
+ }
+ }
- if (destory == true)
+ if (isRemoved == true)
{
if (__pOverlayPanel)
{
RemoveControl(*__pOverlayPanel);
__pOverlayPanel = null;
}
- __pOverlayPanel = new (std::nothrow) OverlayPanel();
- __pOverlayPanel->Construct(rect);
- AddControl(*__pOverlayPanel);
- AppLogDebug("Input bounds (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+ AppLogDebug("Client area rect (%d, %d, %d, %d)", clientRect.x, clientRect.y, clientRect.width, clientRect.height);
+ AppLogDebug("Input bounds (%d, %d, %d, %d)", evaluateBoundsRect.x, evaluateBoundsRect.y, evaluateBoundsRect.width, evaluateBoundsRect.height);
+
+ isValidRect = OverlayRegion::EvaluateBounds(OVERLAY_REGION_EVALUATION_OPTION_GREATER_THAN, evaluateBoundsRect, modified);
+ TryReturnVoid(isValidRect == true, "OverlayRegion::EvaluateBounds returned error[%s]", GetErrorMessage(GetLastResult()));
- isValidRect = OverlayRegion::EvaluateBounds(OVERLAY_REGION_EVALUATION_OPTION_GREATER_THAN, rect, modified);
- AppLogDebug("SCREEN_MODE_FULL Bounds is modified to (%d,%d,%d,%d)", rect.x, rect.y, rect.width, rect.height);
+ if (modified == true)
+ {
+ AppLogDebug("OverlayRegion::EvaluateBounds is modified to (%d,%d,%d,%d)", evaluateBoundsRect.x, evaluateBoundsRect.y, evaluateBoundsRect.width, evaluateBoundsRect.height);
+ }
- SetOverlayRendererRotation();
+ if (__dir == ORIENTATION_STATUS_PORTRAIT
+ || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
+ {
+ if (evaluateBoundsRect.height == rect.height)
+ {
+ isToCompensated = false;
+ }
+ else
+ {
+ isToCompensated = true;
+ }
+ }
+ else
+ {
+ if (evaluateBoundsRect.width == rect.width)
+ {
+ isToCompensated = false;
+ }
+ else
+ {
+ isToCompensated = true;
+ }
+ }
+
+ if (isToCompensated == false)
+ {
+ __pOverlayPanel = new (std::nothrow) OverlayPanel();
+ __pOverlayPanel->Construct(rect);
+ AddControl(*__pOverlayPanel);
+ AppLogDebug("__pOverlayPanel area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+ }
+ else
+ {
+ __pOverlayPanel = new (std::nothrow) OverlayPanel();
+ __pOverlayPanel->Construct(rect);
+ AddControl(*__pOverlayPanel);
+
+ rect = __pOverlayPanel->GetBounds();
+ AppLogDebug("__pOverlayPanel->GetBounds area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+
+ if (__dir == ORIENTATION_STATUS_PORTRAIT
+ || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
+ {
+ rect.x = 0; //imsi
+ rect.y = 0; //imsi
+ }
+ else
+ {
+ rect.x = 0; //imsi
+ rect.y = 0; //imsi
+ }
+
+ r = __pOverlayPanel->SetBounds(rect);
+ AppLogDebug("__pOverlayPanel->SetBounds() area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+ }
}
else
{
- if (__pOverlayPanel)
+ TryReturnVoid(__pOverlayPanel != null, "__pOverlayPanel is null");
+
+ AppLogDebug("Client area rect (%d, %d, %d, %d)", clientRect.x, clientRect.y, clientRect.width, clientRect.height);
+ AppLogDebug("Input EvaluateBounds (%d, %d, %d, %d)", evaluateBoundsRect.x, evaluateBoundsRect.y, evaluateBoundsRect.width, evaluateBoundsRect.height);
+
+ isValidRect = OverlayRegion::EvaluateBounds(OVERLAY_REGION_EVALUATION_OPTION_GREATER_THAN, evaluateBoundsRect, modified);
+ TryReturnVoid(isValidRect == true, "OverlayRegion::EvaluateBounds returned error[%s]", GetErrorMessage(GetLastResult()));
+
+ if (modified == true)
+ {
+ AppLogDebug("OverlayRegion::EvaluateBounds is modified to (%d,%d,%d,%d)", evaluateBoundsRect.x, evaluateBoundsRect.y, evaluateBoundsRect.width, evaluateBoundsRect.height);
+ }
+
+ if (__dir == ORIENTATION_STATUS_PORTRAIT
+ || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
+ {
+ if (evaluateBoundsRect.height == rect.height)
+ {
+ isToCompensated = false;
+ }
+ else
+ {
+ isToCompensated = true;
+ }
+ }
+ else
{
- SetOverlayRendererRotation();
+ if (evaluateBoundsRect.width == rect.width)
+ {
+ isToCompensated = false;
+ }
+ else
+ {
+ isToCompensated = true;
+ }
+ }
+ if (isToCompensated == false)
+ {
r = __pOverlayPanel->SetBounds(rect);
AppLogDebug("pOverlayPanel->SetBounds() [%s]", GetErrorMessage(r));
+
+ AppLogDebug("__pOverlayPanel->SetBounds() area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
}
+ else
+ {
+ r = __pOverlayPanel->SetBounds(rect);
+ AppLogDebug("pOverlayPanel->SetBounds() [%s]", GetErrorMessage(r));
+
+ rect = __pOverlayPanel->GetBounds();
+
+ AppLogDebug("__pOverlayPanel GetBounds area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+
+ if (__dir == ORIENTATION_STATUS_PORTRAIT
+ || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
+ {
+ rect.x = 0; //imsi
+ rect.y = 0; //imsi
+ }
+ else
+ {
+ rect.x = 0; //imsi
+ rect.y = 0; //imsi
+ }
+
+ r = __pOverlayPanel->SetBounds(rect);
- isValidRect = OverlayRegion::EvaluateBounds(OVERLAY_REGION_EVALUATION_OPTION_GREATER_THAN, rect, modified);
- AppLogDebug("SCREEN_MODE_NORMAL Bounds is modified to (%d,%d,%d,%d)", rect.x, rect.y, rect.width, rect.height);
+ AppLogDebug("__pOverlayPanel->SetBounds() area rect (%d, %d, %d, %d)", rect.x, rect.y, rect.width, rect.height);
+ }
}
AppLogDebug("EXIT");
}
{
if (IsControlAlwaysOnTop(*__pSettingButton) == false)
{
- AppLogDebug("IsControlAlwaysOnTop __pSelfShotButton");
+ AppLogDebug("IsControlAlwaysOnTop __pSettingButton");
SetControlAlwaysOnTop(*__pSettingButton, true);
}
}
+ if (__pSettingLine)
+ {
+ if (IsControlAlwaysOnTop(*__pSettingLine) == false)
+ {
+ AppLogDebug("IsControlAlwaysOnTop __pSettingLine");
+ SetControlAlwaysOnTop(*__pSettingLine, true);
+ }
+ }
+
if (__pCameraIconLabel)
{
if (IsControlAlwaysOnTop(*__pCameraIconLabel) == false)
}
}
- if (__pHelpShutterText)
+ if (__pHelpShutterText)
+ {
+ if (IsControlAlwaysOnTop(*__pHelpShutterText) == false)
+ {
+ AppLogDebug("IsControlAlwaysOnTop __pHelpShutterText");
+ SetControlAlwaysOnTop(*__pHelpShutterText, true);
+ }
+ }
+
+ if (__pHelpGoToPreviousScreen)
+ {
+ if (IsControlAlwaysOnTop(*__pHelpGoToPreviousScreen) == false)
+ {
+ AppLogDebug("IsControlAlwaysOnTop __pHelpGoToPreviousScreen");
+ SetControlAlwaysOnTop(*__pHelpGoToPreviousScreen, true);
+ }
+ }
+
+ if (__pHelpGoToPreviousScreenText)
+ {
+ if (IsControlAlwaysOnTop(*__pHelpGoToPreviousScreenText) == false)
+ {
+ AppLogDebug("IsControlAlwaysOnTop __pHelpGoToPreviousScreenText");
+ SetControlAlwaysOnTop(*__pHelpGoToPreviousScreenText, true);
+ }
+ }
+
+ if (__pCameraSetting)
+ {
+ if (IsControlAlwaysOnTop(*__pCameraSetting) == false)
+ {
+ AppLogDebug("IsControlAlwaysOnTop __pCameraSetting");
+ SetControlAlwaysOnTop(*__pCameraSetting, true);
+ }
+ }
+
+ if (__pCameraSettingLable)
{
- if (IsControlAlwaysOnTop(*__pHelpShutterText) == false)
+ if (IsControlAlwaysOnTop(*__pCameraSettingLable) == false)
{
- AppLogDebug("IsControlAlwaysOnTop __pHelpShutterText");
- SetControlAlwaysOnTop(*__pHelpShutterText, true);
+ AppLogDebug("IsControlAlwaysOnTop __pCameraSettingLable");
+ SetControlAlwaysOnTop(*__pCameraSettingLable, true);
}
}
- if (__pHelpGoToPreviousScreen)
+ if (__pGeneralSetting)
{
- if (IsControlAlwaysOnTop(*__pHelpGoToPreviousScreen) == false)
+ if (IsControlAlwaysOnTop(*__pGeneralSetting) == false)
{
- AppLogDebug("IsControlAlwaysOnTop __pHelpGoToPreviousScreen");
- SetControlAlwaysOnTop(*__pHelpGoToPreviousScreen, true);
+ AppLogDebug("IsControlAlwaysOnTop __pGeneralSetting");
+ SetControlAlwaysOnTop(*__pGeneralSetting, true);
}
}
- if (__pHelpGoToPreviousScreenText)
+ if (__pGeneralSettingLable)
{
- if (IsControlAlwaysOnTop(*__pHelpGoToPreviousScreenText) == false)
+ if (IsControlAlwaysOnTop(*__pGeneralSettingLable) == false)
{
- AppLogDebug("IsControlAlwaysOnTop __pHelpGoToPreviousScreenText");
- SetControlAlwaysOnTop(*__pHelpGoToPreviousScreenText, true);
+ AppLogDebug("IsControlAlwaysOnTop __pGeneralSettingLable");
+ SetControlAlwaysOnTop(*__pGeneralSettingLable, true);
}
}
AppLogDebug("EXIT");
}
}
- SetNormalOverlayPanel(true);
+ SetOverlayPanelNormalMode(true);
+
+ SetOverlayRendererRotation();
if (__screenMode != mode)
{
}
else
{
- SetNormalOverlayPanel(false);
+ SetOverlayPanelNormalMode(false);
+
+ SetOverlayRendererRotation();
__screenMode = SCREEN_MODE_NORMAL;
}
}
}
- SetWideOverlayPanel(true);
+ SetOverlayPanelWideMode(true);
+
+ SetOverlayRendererRotation();
if (__screenMode != mode)
{
}
else
{
- SetWideOverlayPanel(false);
+ SetOverlayPanelWideMode(false);
+
+ SetOverlayRendererRotation();
__screenMode = SCREEN_MODE_FULL;
}
if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
{
r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
-
- if (focusSupport == true && r == E_SUCCESS)
- {
- __pCameraInfoPanel->SetDrawMarkerFocusType(CAMERA_FOCUS_NOT_READY);
- __pCameraInfoPanel->SetCurrentPoint(currentPosition);
- __pCameraInfoPanel->SetDrawMarkerFocus(true);
- __pCameraInfoPanel->Invalidate(true);
- }
- else
- {
- __pCameraInfoPanel->SetDrawMarkerFocus(false);
- __pCameraInfoPanel->Invalidate(true);
- }
- __pCameraPresentationModel->SetAutoFocusPoint(currentPosition);
}
else
{
r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_FOCUS, focusSupport);
+ }
- if (focusSupport == true && r == E_SUCCESS)
- {
- __pCameraInfoPanel->SetDrawMarkerFocusType(CAMERA_FOCUS_NOT_READY);
- __pCameraInfoPanel->SetCurrentPoint(currentPosition);
- __pCameraInfoPanel->SetDrawMarkerFocus(true);
- __pCameraInfoPanel->Invalidate(true);
- }
- else
- {
- __pCameraInfoPanel->SetDrawMarkerFocus(false);
- __pCameraInfoPanel->Invalidate(true);
- }
-
- __pCameraPresentationModel->SetAutoFocusPoint(currentPosition);
+ if (focusSupport == true && r == E_SUCCESS)
+ {
+ __pCameraInfoPanel->SetDrawMarkerFocusType(CAMERA_FOCUS_NOT_READY);
+ __pCameraInfoPanel->SetCurrentPoint(currentPosition);
+ __pCameraInfoPanel->SetDrawMarkerFocus(true);
+ __pCameraInfoPanel->Invalidate(true);
+ }
+ else
+ {
+ __pCameraInfoPanel->SetDrawMarkerFocus(false);
+ __pCameraInfoPanel->Invalidate(true);
}
+ __pCameraPresentationModel->SetAutoFocusPoint(currentPosition);
}
else
{
if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
{
r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
-
- if (focusSupport == true && r == E_SUCCESS)
- {
- __pCameraInfoPanel->SetCurrentPoint(currentPosition);
- __pCameraInfoPanel->SetDrawMarkerFocus(true);
- __pCameraInfoPanel->SetDrawMarkerFocusType(CAMERA_FOCUS_NOT_READY);
- }
- else
- {
- __pCameraInfoPanel->SetDrawMarkerFocus(false);
-// __pCameraInfoPanel->Invalidate(true);
- __pCameraInfoPanel->Draw();
- __pCameraInfoPanel->Show();
- }
}
else
{
r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_FOCUS, focusSupport);
+ }
- if (focusSupport == true && r == E_SUCCESS)
- {
- __pCameraInfoPanel->SetCurrentPoint(currentPosition);
- __pCameraInfoPanel->SetDrawMarkerFocus(true);
- __pCameraInfoPanel->SetDrawMarkerFocusType(CAMERA_FOCUS_NOT_READY);
- }
- else
- {
- __pCameraInfoPanel->SetDrawMarkerFocus(false);
-// __pCameraInfoPanel->Invalidate(true);
- __pCameraInfoPanel->Draw();
- __pCameraInfoPanel->Show();
- }
+ if (focusSupport == true && r == E_SUCCESS)
+ {
+ __pCameraInfoPanel->SetCurrentPoint(currentPosition);
+ __pCameraInfoPanel->SetDrawMarkerFocus(true);
+ __pCameraInfoPanel->SetDrawMarkerFocusType(CAMERA_FOCUS_NOT_READY);
+ }
+ else
+ {
+ __pCameraInfoPanel->SetDrawMarkerFocus(false);
+ __pCameraInfoPanel->Draw();
+ __pCameraInfoPanel->Show();
}
AppLogDebug("EXIT");
}
AppLogDebug("ENTER");
if (__isTimerRunning == true)
{
- EndPopupTimer();
+ StopPopupTimer();
__timeCount = INDEX_UNIT_ZERO;
InDrawFocus();
- EndPopupTimer();
+ StopPopupTimer();
__isUsedTimerCaptured = false;
pAppResource->GetString(IDS_CAM_BODY_10_SEC, tmpString);
__pSettingGeneralMenuString[GENERAL_TAB_SUB_MENU_CONTENT_TIMER_MODE][MENU_IDX_05] = tmpString;
- pAppResource->GetString(IDS_CAM_OPT_EXPOSURE_VALUE, tmpString);
- __pSettingGeneralMenuString[GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE][MENU_IDX_01] = tmpString;
- __pSettingGeneralMenuString[GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE][MENU_IDX_02] = IDS_MENU_EXPOSURE_P20;
- __pSettingGeneralMenuString[GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE][MENU_IDX_03] = IDS_MENU_EXPOSURE_P15;
- __pSettingGeneralMenuString[GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE][MENU_IDX_04] = IDS_MENU_EXPOSURE_P10;
- __pSettingGeneralMenuString[GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE][MENU_IDX_05] = IDS_MENU_EXPOSURE_P05;
- __pSettingGeneralMenuString[GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE][MENU_IDX_06] = IDS_MENU_EXPOSURE_00;
- __pSettingGeneralMenuString[GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE][MENU_IDX_07] = IDS_MENU_EXPOSURE_M05;
- __pSettingGeneralMenuString[GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE][MENU_IDX_08] = IDS_MENU_EXPOSURE_M10;
- __pSettingGeneralMenuString[GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE][MENU_IDX_09] = IDS_MENU_EXPOSURE_M15;
- __pSettingGeneralMenuString[GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE][MENU_IDX_10] = IDS_MENU_EXPOSURE_M20;
-
pAppResource->GetString(IDS_CAM_BODY_GUIDELINE, tmpString);
__pSettingGeneralMenuString[GENERAL_TAB_SUB_MENU_CONTENT_GUIDELINE_MODE][MENU_IDX_01] = tmpString;
pAppResource->GetString(IDS_CAM_BODY_OFF, tmpString);
//pAppResource->GetString(IDS_CAM_OVERLAY_HELP_VALUE, tmpString);
//__pSettingGeneralMenuString[GENERAL_TAB_SUB_MENU_OVERLAY_HELP_MODE][MENU_IDX_01] = tmpString;
__pSettingGeneralMenuString[GENERAL_TAB_SUB_MENU_OVERLAY_HELP_MODE][MENU_IDX_01] = IDS_MENU_OVERLAY_HELP_VALUE;
- pAppResource->GetString(IDS_CAM_BODY_OFF, tmpString);
- __pSettingGeneralMenuString[GENERAL_TAB_SUB_MENU_OVERLAY_HELP_MODE][MENU_IDX_02] = tmpString;
- pAppResource->GetString(IDS_CAM_BODY_ON, tmpString);
- __pSettingGeneralMenuString[GENERAL_TAB_SUB_MENU_OVERLAY_HELP_MODE][MENU_IDX_03] = tmpString;
}
AppLogDebug("EXIT");
return r;
if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
{
r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
-
- if (r == E_SUCCESS)
- {
- __pCameraPresentationModel->SetWhiteBalance((CameraWhiteBalance)index);
- }
}
else
{
r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
+ }
- if (r == E_SUCCESS)
- {
- AppLogDebug("Target unsupport - white balance");
- }
+ if (r == E_SUCCESS)
+ {
+ __pCameraPresentationModel->SetWhiteBalance((CameraWhiteBalance)index);
}
__settingWhiteBalance = index;
str = *(static_cast<String*>(__pCaptureResolutionList->GetAt(index)));
- if (str.Equals(String(PHOTO_SIZE_640_480)))
+ if (str.CompareTo(PHOTO_SIZE_640_480))
{
- pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_PHOTO_SIZE_2M); //0.3M
+ pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_PHOTO_SIZE_0_3M); //0.3M
}
- else if(str.Equals(String(PHOTO_SIZE_1280_720)))
+ else if (str.CompareTo(PHOTO_SIZE_1280_720))
{
pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_PHOTO_SIZE_6M); //0.9M
}
- else if(str.Equals(String(PHOTO_SIZE_2948_1536)))
+ else if (str.CompareTo(PHOTO_SIZE_2948_1536))
{
pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_PHOTO_SIZE_6M); //3.2M
}
- else if(str.Equals(String(PHOTO_SIZE_3264_1960)))
+ else if (str.CompareTo(PHOTO_SIZE_3264_1960))
{
pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_PHOTO_SIZE_6M); //6M
}
- else if(str.Equals(String(PHOTO_SIZE_3264_2488 ))) //8M
+ else if (str.CompareTo(PHOTO_SIZE_3264_2488))//8M
{
pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_PHOTO_SIZE_6M);
}
else
{
- pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_PHOTO_SIZE_6M);
+ pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_PHOTO_SIZE_0_3M);
}
TryCatch(pBitmap != null, r = E_SYSTEM, "pBitmap is null");
if (strTmp.GetLength())
{
- if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY)
- {
- if (index == GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE)
- {
- bool exposureValue = false;
- bool brighnesstValue = false;
-
- r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
-
- if (exposureValue == true && r == E_SUCCESS)
- {
- r = pItem->AddElement(rectContents, elementId, strTmp, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, false);
- TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
- }
- else
- {
- r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
-
- if (brighnesstValue == true && r == E_SUCCESS)
- {
- r = pItem->AddElement(rectContents, elementId, strTmp, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, false);
- TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
- }
- else
- {
- r = pItem->AddElement(rectContents, elementId, strTmp, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_VALUE_DISABLE, COLOR_SETTING_MENU_VALUE_DISABLE, COLOR_SETTING_MENU_VALUE_DISABLE, false);
- TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail:%s", GetErrorMessage(r));
- }
- }
- }
- else
- {
- r = pItem->AddElement(rectContents, elementId, strTmp, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, false);
- TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
- }
- }
- else
- {
- bool value = false;
- bool exposureValue = false;
- bool brighnesstValue = false;
-
- if (index == GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE)
- {
- r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, value);
-
- if (exposureValue == true && r == E_SUCCESS)
- {
- r = pItem->AddElement(rectContents, elementId, strTmp, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, false);
- TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
- }
- else
- {
- r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
-
- if (brighnesstValue == true && r == E_SUCCESS)
- {
- r = pItem->AddElement(rectContents, elementId, strTmp, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, false);
- TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
- }
- else
- {
- r = pItem->AddElement(rectContents, elementId, strTmp, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_VALUE_DISABLE, COLOR_SETTING_MENU_VALUE_DISABLE, COLOR_SETTING_MENU_VALUE_DISABLE, false);
- TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
- }
- }
- }
- else
- {
- r = pItem->AddElement(rectContents, elementId, strTmp, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, false);
- TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
- }
- }
+ r = pItem->AddElement(rectContents, elementId, strTmp, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, false);
+ TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
}
- String arrRegStringSupporExposure[] =
- {
- TIMER_INTERVAL,
- EXPOSURE_VALUE,
- GUIDELINE_ENABLE,
- STORAGE_TYPE,
- OVERLAY_HELP_ENABLE,
- };
-
- String arrRegStringSupportBrightness[] =
+ String arrRegStringSuppor[] =
{
TIMER_INTERVAL,
- BRIGHTNESS_VALUE,
GUIDELINE_ENABLE,
STORAGE_TYPE,
OVERLAY_HELP_ENABLE,
if (index < (GetGeneralTabSettingMainMenuCount() - INDEX_UNIT_ONE))
{
- bool value = false;
int storageType = STORAGE_TYPE_PHONE;
__pCameraPresentationModel->GetValue(STORAGE_TYPE, storageType);
__pCameraPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_UNMOUNT);
}
- if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
- {
- r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, value);
- }
- else
- {
- r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, value);
- }
-
- if (value == true && r == E_SUCCESS)
- {
- r = __pCameraPresentationModel->GetValue(arrRegStringSupporExposure[index], regVal);
- TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
- }
- else
- {
- if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
- {
- r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, value);
- }
- else
- {
- r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, value);
- }
-
- if (value == true && r == E_SUCCESS)
- {
- r = __pCameraPresentationModel->GetValue(arrRegStringSupportBrightness[index], regVal);
- TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
- }
- else
- {
- r = __pCameraPresentationModel->GetValue(arrRegStringSupporExposure[index], regVal);
- TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
- }
- }
+ r = __pCameraPresentationModel->GetValue(arrRegStringSuppor[index], regVal);
+ TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
AppLogDebug("Setting Main Menu");
AppLogDebug("%ls[%d]", strTmp.GetPointer(), regVal);
if (strTmp.GetLength())
{
- if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY)
- {
- r = pItem->AddElement(rectContentsValue, elementId, strTmp, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_VAULE, COLOR_SETTING_MENU_VAULE, COLOR_SETTING_MENU_VAULE, false);
- TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
- }
- else
- {
- r = pItem->AddElement(rectContentsValue, elementId, strTmp, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_VAULE, COLOR_SETTING_MENU_VAULE, COLOR_SETTING_MENU_VAULE, false);
- TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
- }
+ r = pItem->AddElement(rectContentsValue, elementId, strTmp, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_VAULE, COLOR_SETTING_MENU_VAULE, COLOR_SETTING_MENU_VAULE, false);
+ TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
r = pItem->SetElementTextHorizontalAlignment(elementId, ALIGNMENT_CENTER);
TryCatch(r == E_SUCCESS, , "CustomItem::SetElementTextHorizontalAlignment() fail[%s]", GetErrorMessage(r));
}
}
- else
- {
- if (index == GENERAL_TAB_SUB_MENU_OVERLAY_HELP_MODE)
- {
- int regVal = 0;
-
- __pCameraPresentationModel->GetValue(OVERLAY_HELP_ENABLE, regVal);
-
- AppLogDebug("%ls[%d]", strTmp.GetPointer(), regVal);
- AppLogDebug("Err = %s", GetErrorMessage(GetLastResult()));
-
- strTmp = __pSettingGeneralMenuString[index][regVal + INDEX_UNIT_ONE];
-
- elementId++;
-
- if (strTmp.GetLength())
- {
- r = pItem->AddElement(rectContentsValue, elementId, strTmp, FONT_SIZE_SETTING_MENU_ITEM, COLOR_SETTING_MENU_VAULE, COLOR_SETTING_MENU_VAULE, COLOR_SETTING_MENU_VAULE, false);
- TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
-
- r = pItem->SetElementTextHorizontalAlignment(elementId, ALIGNMENT_CENTER);
- TryCatch(r == E_SUCCESS, , "CustomItem::SetElementTextHorizontalAlignment() fail[%s]", GetErrorMessage(r));
- }
- }
- }
}
else
{
}
break;
- case GENERAL_TAB_SUB_MENU_CONTENT_EXPOSURE_MODE:
- {
- }
- break;
-
case GENERAL_TAB_SUB_MENU_CONTENT_GUIDELINE_MODE:
{
ResourceId resId = RESOURCE_ID_GUIDELINE_OFF;
case GENERAL_TAB_SUB_MENU_OVERLAY_HELP_MODE:
{
- String str = L"";
- elementId = (index * MENU_TWO_ELEMENT);
-
- r = __pCameraPresentationModel->GetValue(OVERLAY_HELP_ENABLE, regVal);
- TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
-
- if (index == regVal)
- {
- pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_RADIO_BTN_ON);
- }
- else
- {
- pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_RADIO_BTN_OFF);
- }
- TryCatch(pBitmap != null, r = E_SYSTEM, "pBitmap is null");
-
- if (index == SUBMENU_MODE_OFF)
- {
- str = IDS_CAM_BODY_OFF;
- }
- else
- {
- str = IDS_CAM_BODY_ON;
- }
-
- pAppResource->GetString(str, tmpString);
-
- r = pItem->AddElement(rectRadioIcon, elementId, *pBitmap, null, null);
- TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
-
- delete pBitmap;
- pBitmap = null;
-
- elementId++;
-
- r = pItem->AddElement(rectTwoTextItem, elementId, tmpString, FONT_SIZE_SETTING_SUB_MENU_ITEM, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, COLOR_SETTING_MENU_TITLE, false);
- TryCatch(r == E_SUCCESS, , "CustomItem::AddElement() fail[%s]", GetErrorMessage(r));
}
break;
AppLogDebug("ENTER");
CustomItem* pItem = null;
Bitmap* pBitmap = null;
- Rectangle rectRadioIcon = Rectangle(X_SETTING_SUBMENU_RADIO_ICON + 400, Y_SETTING_SUBMENU_RADIO_ICON,
+ Rectangle rectRadioIcon = Rectangle(X_SETTING_SUBMENU_RADIO_ICON + X_FLASH_SETTING_SUBMENU_RADIO_ICON_MARGIN, Y_SETTING_SUBMENU_RADIO_ICON,
W_SETTING_SUBMENU_RADIO_ICON, H_SETTING_SUBMENU_RADIO_ICON);
Rectangle rectIcon = Rectangle(X_SETTING_SUBMENU_ICON - X_SETTING_SUBMENU_ICON_MARGIN, Y_SETTING_SUBMENU_ICON,
W_SETTING_SUBMENU_ICON, H_SETTING_SUBMENU_ICON);
String listName = L"";
- Rectangle rectContents = Rectangle(X_SETTING_MENU_CONTESTS, Y_SETTING_MENU_CONTESTS,
- W_SETTING_MENU_CONTESTS, H_SETTING_MENU_CONTESTS);
-
- Rectangle rectContentsValue = Rectangle(X_SETTING_MENU_CONTENTS_VALUE, Y_SETTING_MENU_CONTENTS_VALUE,
- W_SETTING_MENU_CONTENTS_VALUE, H_SETTING_MENU_CONTENTS_VALUE);
-
- Rectangle rectTwoTextItem = Rectangle(X_SETTING_SUBMENU_2TEXT_ITEM, Y_SETTING_SUBMENU_2TEXT_ITEM,
- W_SETTING_SUBMENU_2TEXT_ITEM, H_SETTING_SUBMENU_2TEXT_ITEM);
- Rectangle rectThreeTextItem = Rectangle(X_SETTING_SUBMENU_3TEXT_ITEM - 57, Y_SETTING_SUBMENU_3TEXT_ITEM,
- W_SETTING_SUBMENU_3TEXT_ITEM, H_SETTING_SUBMENU_3TEXT_ITEM);
+ Rectangle rectThreeTextItem = Rectangle(X_SETTING_SUBMENU_3TEXT_ITEM - X_FLASH_SETTING_SUBMENU_3TEXT_ITEM, Y_SETTING_SUBMENU_3TEXT_ITEM,
+ W_SETTING_SUBMENU_3TEXT_ITEM, H_SETTING_SUBMENU_3TEXT_ITEM);
AppResource* pAppResource = Application::GetInstance()->GetAppResource();
String tmpString;
AppLogDebug("ENTER");
CustomItem* pItem = null;
Bitmap* pBitmap = null;
- Rectangle rectRadioIcon = Rectangle(422, Y_SETTING_SUBMENU_RADIO_ICON,
+ Rectangle rectRadioIcon = Rectangle(X_WHITE_BALANCE_RADIO_ICON_MARGIN, Y_SETTING_SUBMENU_RADIO_ICON,
W_SETTING_SUBMENU_RADIO_ICON, H_SETTING_SUBMENU_RADIO_ICON);
- Rectangle rectIcon = Rectangle(12, Y_SETTING_SUBMENU_ICON,
+ Rectangle rectIcon = Rectangle(X_SETTING_SUBMENU_ICON - X_SETTING_SUBMENU_ICON_MARGIN, Y_SETTING_SUBMENU_ICON,
W_SETTING_SUBMENU_ICON, H_SETTING_SUBMENU_ICON);
String listName = L"";
Rectangle rectTwoTextItem = Rectangle(X_SETTING_SUBMENU_2TEXT_ITEM, Y_SETTING_SUBMENU_2TEXT_ITEM,
W_SETTING_SUBMENU_2TEXT_ITEM, H_SETTING_SUBMENU_2TEXT_ITEM);
- Rectangle rectThreeTextItem = Rectangle(112, Y_SETTING_SUBMENU_3TEXT_ITEM,
+ Rectangle rectThreeTextItem = Rectangle(X_SETTING_SUBMENU_3TEXT_ITEM - X_FLASH_SETTING_SUBMENU_3TEXT_ITEM, Y_SETTING_SUBMENU_3TEXT_ITEM,
W_SETTING_SUBMENU_3TEXT_ITEM, H_SETTING_SUBMENU_3TEXT_ITEM);
AppResource* pAppResource = Application::GetInstance()->GetAppResource();
static const int MAX_STORAGE_VALUE = 5000;
static const int PREVIEW_RESOLUTION_DEFAULT_SIZE = 307200;
+static const int X_HELP_POSITION_PORTRAIT = 495;
+static const int Y_HELP_POSITION_PORTRAIT = 45;
+static const int X_HELP_POSITION_LANDSCAPE = 430;
+static const int Y_HELP_POSITION_LANDSCAPE = 150;
+
+static const int H_FLASH_SETTING_MENU_PANEL_TITLE_MARGIN = 52;
static const int H_SETTING_MENU_PANEL_TITLE = 50;
static const int FONT_SIZE_SETTING_MENU_TITLE = 36;
static const int H_SETTING_MENU_PANEL_MARGIN = 6;
static const int H_SETTING_MENU_TEXT_MARGIN = 18;
static const int X_MENU_TITLE_MARGIN = 18;
+static const int X_SUB_MENU_TITLE_MARGIN = 10;
+static const int X_FLASH_MENU_TITLE_MARGIN = 20;
static const int X_FLASH_MODE_SETTING_PANEL_RECT_PORTRAIT = 0;
static const int Y_FLASH_MODE_SETTING_PANEL_RECT_PORTRAIT = 160;
static const int Y_FLASH_MODE_SETTING_PANEL_BG_RECT_PORTRAIT = 26;
static const int W_FLASH_MODE_SETTING_PANEL_BG_RECT_PORTRAIT = 502;
static const int H_FLASH_MODE_SETTING_PANEL_BG_RECT_PORTRAIT = 325;
+static const int H_FLASH_MODE_SETTING_PANEL_BG_RECT_MARGIN = 60;
static const int X_FLASH_MODE_SETTING_PANEL_BG_RECT_LANDSCAPE = 26;
static const int Y_FLASH_MODE_SETTING_PANEL_BG_RECT_LANDSCAPE = 128;
static const int W_FLASH_MODE_SETTING_PANEL_BG_RECT_LANDSCAPE = 502;
static const int H_FLASH_MODE_SETTING_PANEL_BG_RECT_LANDSCAPE = 330;
-static const int H_FLASH_MODE_SETTING_PANEL_BG_RECT_PORTRAIT_MARGIN = 175;
-static const int H_FLASH_MODE_SETTING_PANEL_BG_RECT_LANDSCAPE_MARGIN = 175;
+static const int H_FLASH_MODE_SETTING_PANEL_BG_RECT_PORTRAIT_MARGIN = 235;
+static const int H_FLASH_MODE_SETTING_PANEL_BG_RECT_LANDSCAPE_MARGIN = 235;
static const int X_SETTING_MENU_MAIN_PANEL_LANDSCAPE = 0;
static const int Y_SETTING_MENU_MAIN_PANEL_LANDSCAPE = 0;
static const int Y_SETTING_MENU_BG_IMG_LANDSCAPE = 10;
static const int W_SETTING_MENU_BG_IMG_LANDSCAPE = 560;
static const int H_SETTING_MENU_BG_IMG_LANDSCAPE = 470;
-static const int H_SETTING_MENU_BG_IMG_MARGIN_LANDSCAPE = 270;
+static const int H_SETTING_MENU_BG_IMG_MARGIN_LANDSCAPE = 200;
static const int Y_SETTING_MENU_BG_IMG_LANDSCAPE_MARGIN = 80;
-static const int H_SETTING_MENU_BG_IMG_MARGIN_PORTRAIT = 260;
-
-static const int X_CAMCORDER_SETTING_MENU_BG_IMG_LANDSCAPE = 26;
-static const int Y_CAMCORDER_SETTING_MENU_BG_IMG_LANDSCAPE = 286;
-static const int W_CAMCORDER_SETTING_MENU_BG_IMG_LANDSCAPE = 560;
-static const int H_CAMCORDER_SETTING_MENU_BG_IMG_LANDSCAPE = 500;
-static const int H_CAMCORDER_SETTING_MENU_BG_IMG_MARGIN_LANDSCAPE = 300;
-static const int H_CAMCORDER_GENERAL_SETTING_MENU_BG_IMG_MARGIN_LANDSCAPE = 65;
-static const int Y_CAMCORDER_SETTING_MENU_BG_IMG_MARGIN_LANDSCAPE = 189;
-
-static const int X_CAMCORDER_SETTING_MENU_BG_IMG_PORTRAIT = 26;
-static const int Y_CAMCORDER_SETTING_MENU_BG_IMG_PORTRAIT = 26;
-static const int W_CAMCORDER_SETTING_MENU_BG_IMG_PORTRAIT = 560;
-static const int H_CAMCORDER_SETTING_MENU_BG_IMG_PORTRAIT = 405;
-static const int W_CAMCORDER_SETTING_MENU_BG_IMG_MARGIN_PORTRAIT = 190;
+static const int H_SETTING_MENU_BG_IMG_MARGIN_PORTRAIT = 200;
static const int X_GUIDELINE_HOR_LINE_TOP_START_POS_LANDSCAPE = 0;
static const int Y_GUIDELINE_HOR_LINE_TOP_START_POS_LANDSCAPE = 239;
static const int X_EXPOSURE_PANEL_LINE_PORTRAIT = 355;
static const int Y_EXPOSURE_PANEL_LINE_PORTRAIT = 23;
+static const int X_SETTING_MENU_LINE_IMG_PORTRAIT = 0;
+static const int Y_SETTING_MENU_LINE_IMG_PORTRAIT = 60;
+static const int W_SETTING_MENU_LINE_IMG_PORTRAIT = 720;
+static const int H_SETTING_MENU_LINE_IMG_PORTRAIT = 120;
+static const int X_SETTING_MENU_LINE_IMG_LANDSCAPE = 0;
+static const int Y_SETTING_MENU_LINE_IMG_LANDSCAPE = 125;
+static const int W_SETTING_MENU_LINE_IMG_LANDSCAPE = 720;
+static const int H_SETTING_MENU_LINE_IMG_LANDSCAPE = 120;
+
+static const int SETTING_MENU_LINE_LENGTH = 2;
+static const int SETTING_MENU_UNDER_LINE_LENGTH = 10;
+static const int X_LINE_START_POSITION = 300;
+static const int Y_LINE_START_POSITION = 0;
+static const int X_LINE_END_POSITION = 300;
+static const int Y_LINE_END_POSITION = 34;
+static const int X_UNDER_LINE_START_POSITION = 40;
+static const int X_UNDER_LINE_START_POSITION_GENERAL = 270;
+static const int Y_UNDER_LINE_START_POSITION = 70;
+static const int X_UNDER_LINE_START_POSITION_GENERALS = 275;
+static const int X_UNDER_LINE_END_POSITION = 290;
+static const int Y_UNDER_LINE_END_POSITION = 70;
+
static const int MAKER_FOCUS_TYPE_NOT_READY = 0;
static const int MAKER_FOCUS_TYPE_READY = 1;
static const int MAKER_FOCUS_TYPE_FAIL = 2;
static const int FLASH_MODE_ON = 1;
static const int FLASH_MODE_AUTO = 2;
-static const int SETTING_TIMER_CAPTURE_0_SEC = 0;
-static const int SETTING_TIMER_CAPTURE_2_SEC = 1;
-static const int SETTING_TIMER_CAPTURE_5_SEC = 2;
-static const int SETTING_TIMER_CAPTURE_10_SEC = 3;
+static const int TIMER_SETTING_ZERO_SEC = 0;
+static const int TIMER_SETTING_TWO_SEC = 1;
+static const int TIMER_SETTING_FIVE_SEC = 2;
+static const int TIMER_SETTING_TEN_SEC = 3;
CameraInfoPanel::CameraInfoPanel(void)
: __currentMode(CameraPresentationModel::CAMERA_MODE_SNAPSHOT)
Bitmap* pBitmap = null;
Rectangle rectPanel = Rectangle(X_SETTING_MENU_MAIN_PANEL_LANDSCAPE, Y_SETTING_MENU_MAIN_PANEL_LANDSCAPE, W_SETTING_MENU_MAIN_PANEL_LANDSCAPE, H_SETTING_MENU_MAIN_PANEL_LANDSCAPE);
Rectangle rectPanelBG = Rectangle(X_SETTING_MENU_BG_IMG_LANDSCAPE, Y_SETTING_MENU_BG_IMG_LANDSCAPE, W_SETTING_MENU_BG_IMG_LANDSCAPE, H_SETTING_MENU_BG_IMG_LANDSCAPE);
+ Rectangle rectLinePortrait = Rectangle(X_SETTING_MENU_LINE_IMG_PORTRAIT, Y_SETTING_MENU_LINE_IMG_PORTRAIT, W_SETTING_MENU_LINE_IMG_PORTRAIT, H_SETTING_MENU_LINE_IMG_PORTRAIT);
+ Rectangle rectLineLandscape = Rectangle(X_SETTING_MENU_LINE_IMG_LANDSCAPE, Y_SETTING_MENU_LINE_IMG_LANDSCAPE, W_SETTING_MENU_LINE_IMG_LANDSCAPE, H_SETTING_MENU_LINE_IMG_LANDSCAPE);
Point ptTitle;
Font fnt;
Dimension dim;
Canvas* pMyCanvas = null;
+ Canvas* pMyCanvasLine = null;
+ Canvas* pMyCanvasUnderLine = null;
String strTitle;
- if (__currentMode != CameraPresentationModel::CAMERA_MODE_SNAPSHOT)
+ if (__dir == ORIENTATION_STATUS_PORTRAIT
+ || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
{
- if (__dir == ORIENTATION_STATUS_PORTRAIT
- || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
- {
- rectPanelBG = Rectangle(X_CAMCORDER_SETTING_MENU_BG_IMG_PORTRAIT, Y_CAMCORDER_SETTING_MENU_BG_IMG_PORTRAIT, W_CAMCORDER_SETTING_MENU_BG_IMG_PORTRAIT, H_CAMCORDER_SETTING_MENU_BG_IMG_PORTRAIT - W_CAMCORDER_SETTING_MENU_BG_IMG_MARGIN_PORTRAIT);
- }
- else
- {
- rectPanelBG = Rectangle(X_CAMCORDER_SETTING_MENU_BG_IMG_LANDSCAPE, Y_CAMCORDER_SETTING_MENU_BG_IMG_LANDSCAPE - Y_CAMCORDER_SETTING_MENU_BG_IMG_MARGIN_LANDSCAPE, W_CAMCORDER_SETTING_MENU_BG_IMG_LANDSCAPE, H_CAMCORDER_SETTING_MENU_BG_IMG_LANDSCAPE - H_CAMCORDER_SETTING_MENU_BG_IMG_MARGIN_LANDSCAPE);
- }
+ rectPanelBG = Rectangle(X_SETTING_MENU_BG_IMG_PORTRAIT, Y_SETTING_MENU_BG_IMG_PORTRAIT, W_SETTING_MENU_BG_IMG_PORTRAIT, H_SETTING_MENU_BG_IMG_PORTRAIT - H_SETTING_MENU_BG_IMG_MARGIN_PORTRAIT);
}
else
{
- if (__dir == ORIENTATION_STATUS_PORTRAIT
- || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
- {
- rectPanelBG = Rectangle(X_SETTING_MENU_BG_IMG_PORTRAIT, Y_SETTING_MENU_BG_IMG_PORTRAIT, W_SETTING_MENU_BG_IMG_PORTRAIT, H_SETTING_MENU_BG_IMG_PORTRAIT - H_SETTING_MENU_BG_IMG_MARGIN_PORTRAIT);
- }
- else
- {
- rectPanelBG = Rectangle(X_SETTING_MENU_BG_IMG_LANDSCAPE, Y_SETTING_MENU_BG_IMG_LANDSCAPE + Y_SETTING_MENU_BG_IMG_LANDSCAPE_MARGIN, W_SETTING_MENU_BG_IMG_LANDSCAPE, H_SETTING_MENU_BG_IMG_LANDSCAPE - H_SETTING_MENU_BG_IMG_MARGIN_LANDSCAPE);
- }
+ rectPanelBG = Rectangle(X_SETTING_MENU_BG_IMG_LANDSCAPE, Y_SETTING_MENU_BG_IMG_LANDSCAPE + Y_SETTING_MENU_BG_IMG_LANDSCAPE_MARGIN, W_SETTING_MENU_BG_IMG_LANDSCAPE, H_SETTING_MENU_BG_IMG_LANDSCAPE - H_SETTING_MENU_BG_IMG_MARGIN_LANDSCAPE);
}
pMyCanvas = GetCanvasN(rectPanelBG);
delete pBitmap;
pBitmap = null;
+ if (__dir == ORIENTATION_STATUS_PORTRAIT
+ || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
+ {
+ pMyCanvasLine = GetCanvasN(rectLinePortrait);
+ pMyCanvasUnderLine = GetCanvasN(rectLinePortrait);
+ }
+ else
+ {
+ pMyCanvasLine = GetCanvasN(rectLineLandscape);
+ pMyCanvasUnderLine = GetCanvasN(rectLineLandscape);
+ }
+ pMyCanvasLine->SetLineWidth(SETTING_MENU_LINE_LENGTH);
+ pMyCanvasLine->SetForegroundColor(COLOR_SETTING_LINE);
+ pMyCanvasLine->DrawLine(Point(X_LINE_START_POSITION, Y_LINE_START_POSITION), Point(X_LINE_END_POSITION, Y_LINE_END_POSITION));
+
+ pMyCanvasUnderLine->SetLineWidth(SETTING_MENU_UNDER_LINE_LENGTH);
+ pMyCanvasUnderLine->SetForegroundColor(COLOR_SETTING_UNDER_LINE);
+ pMyCanvasUnderLine->DrawLine(Point(X_UNDER_LINE_START_POSITION, Y_UNDER_LINE_START_POSITION), Point(X_UNDER_LINE_END_POSITION, Y_UNDER_LINE_END_POSITION));
+
+ delete pMyCanvasLine;
+ delete pMyCanvasUnderLine;
+
ptTitle.x = X_MENU_TITLE_MARGIN;
if (__currentMode == CameraPresentationModel::CAMERA_MODE_RECORD)
Bitmap* pBitmap = null;
Rectangle rectPanel = Rectangle(X_SETTING_MENU_MAIN_PANEL_LANDSCAPE, Y_SETTING_MENU_MAIN_PANEL_LANDSCAPE, W_SETTING_MENU_MAIN_PANEL_LANDSCAPE, H_SETTING_MENU_MAIN_PANEL_LANDSCAPE);
Rectangle rectPanelBG = Rectangle(X_SETTING_MENU_BG_IMG_LANDSCAPE, Y_SETTING_MENU_BG_IMG_LANDSCAPE, W_SETTING_MENU_BG_IMG_LANDSCAPE, H_SETTING_MENU_BG_IMG_LANDSCAPE);
+ Rectangle rectLinePortrait = Rectangle(X_SETTING_MENU_LINE_IMG_PORTRAIT, Y_SETTING_MENU_LINE_IMG_PORTRAIT, W_SETTING_MENU_LINE_IMG_PORTRAIT, H_SETTING_MENU_LINE_IMG_PORTRAIT);
+ Rectangle rectLineLandscape = Rectangle(X_SETTING_MENU_LINE_IMG_LANDSCAPE, Y_SETTING_MENU_LINE_IMG_LANDSCAPE, W_SETTING_MENU_LINE_IMG_LANDSCAPE, H_SETTING_MENU_LINE_IMG_LANDSCAPE);
Point ptTitle;
Font fnt;
Dimension dim;
Canvas* pMyCanvas = null;
+ Canvas* pMyCanvasLine = null;
+ Canvas* pMyCanvasUnderLine = null;
String strTitle;
- if (__currentMode != CameraPresentationModel::CAMERA_MODE_SNAPSHOT)
+ if (__dir == ORIENTATION_STATUS_PORTRAIT
+ || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
{
- if (__dir == ORIENTATION_STATUS_PORTRAIT
- || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
- {
- rectPanelBG = Rectangle(X_CAMCORDER_SETTING_MENU_BG_IMG_PORTRAIT, Y_CAMCORDER_SETTING_MENU_BG_IMG_PORTRAIT, W_CAMCORDER_SETTING_MENU_BG_IMG_PORTRAIT, H_CAMCORDER_SETTING_MENU_BG_IMG_PORTRAIT + H_CAMCORDER_GENERAL_SETTING_MENU_BG_IMG_MARGIN_LANDSCAPE);
- }
- else
- {
- rectPanelBG = Rectangle(X_CAMCORDER_SETTING_MENU_BG_IMG_LANDSCAPE, Y_CAMCORDER_SETTING_MENU_BG_IMG_LANDSCAPE - Y_CAMCORDER_SETTING_MENU_BG_IMG_MARGIN_LANDSCAPE, W_CAMCORDER_SETTING_MENU_BG_IMG_LANDSCAPE, H_SETTING_MENU_BG_IMG_LANDSCAPE);
- }
+ rectPanelBG = Rectangle(X_SETTING_MENU_BG_IMG_PORTRAIT, Y_SETTING_MENU_BG_IMG_PORTRAIT, W_SETTING_MENU_BG_IMG_PORTRAIT, H_SETTING_MENU_BG_IMG_PORTRAIT);
}
else
{
- if (__dir == ORIENTATION_STATUS_PORTRAIT
- || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
- {
- rectPanelBG = Rectangle(X_SETTING_MENU_BG_IMG_PORTRAIT, Y_SETTING_MENU_BG_IMG_PORTRAIT, W_SETTING_MENU_BG_IMG_PORTRAIT, H_SETTING_MENU_BG_IMG_PORTRAIT);
- }
- else
- {
- rectPanelBG = Rectangle(X_SETTING_MENU_BG_IMG_LANDSCAPE, Y_SETTING_MENU_BG_IMG_LANDSCAPE + Y_SETTING_MENU_BG_IMG_LANDSCAPE_MARGIN, W_SETTING_MENU_BG_IMG_LANDSCAPE, H_SETTING_MENU_BG_IMG_LANDSCAPE);
- }
+ rectPanelBG = Rectangle(X_SETTING_MENU_BG_IMG_LANDSCAPE, Y_SETTING_MENU_BG_IMG_LANDSCAPE + Y_SETTING_MENU_BG_IMG_LANDSCAPE_MARGIN, W_SETTING_MENU_BG_IMG_LANDSCAPE, H_SETTING_MENU_BG_IMG_LANDSCAPE);
}
pMyCanvas = GetCanvasN(rectPanelBG);
delete pBitmap;
pBitmap = null;
+ if (__dir == ORIENTATION_STATUS_PORTRAIT
+ || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
+ {
+ pMyCanvasLine = GetCanvasN(rectLinePortrait);
+ pMyCanvasUnderLine = GetCanvasN(rectLinePortrait);
+ }
+ else
+ {
+ pMyCanvasLine = GetCanvasN(rectLineLandscape);
+ pMyCanvasUnderLine = GetCanvasN(rectLineLandscape);
+ }
+ pMyCanvasLine->SetLineWidth(SETTING_MENU_LINE_LENGTH);
+ pMyCanvasLine->SetForegroundColor(COLOR_SETTING_LINE);
+ pMyCanvasLine->DrawLine(Point(X_LINE_START_POSITION, Y_LINE_START_POSITION), Point(X_LINE_END_POSITION, Y_LINE_END_POSITION));
+
+ pMyCanvasUnderLine->SetLineWidth(SETTING_MENU_UNDER_LINE_LENGTH);
+ pMyCanvasUnderLine->SetForegroundColor(COLOR_SETTING_UNDER_LINE);
+ pMyCanvasUnderLine->DrawLine(Point(X_UNDER_LINE_START_POSITION + X_UNDER_LINE_START_POSITION_GENERAL, Y_UNDER_LINE_START_POSITION), Point(X_UNDER_LINE_END_POSITION + X_UNDER_LINE_START_POSITION_GENERALS, Y_UNDER_LINE_END_POSITION));
+
+ delete pMyCanvasLine;
+ delete pMyCanvasUnderLine;
+
AppLogDebug("EXIT");
return r;
Font fnt;
Dimension dim;
String strTitle;
+ Point cameraHelp;
if (__dir == ORIENTATION_STATUS_PORTRAIT
|| __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
{
rectPanel = Rectangle(X_FLASH_MODE_SETTING_PANEL_RECT_PORTRAIT,Y_FLASH_MODE_SETTING_PANEL_RECT_PORTRAIT,W_FLASH_MODE_SETTING_PANEL_RECT_PORTRAIT,H_FLASH_MODE_SETTING_PANEL_RECT_PORTRAIT);
- rectPanelBG = Rectangle(X_FLASH_MODE_SETTING_PANEL_BG_RECT_PORTRAIT, Y_FLASH_MODE_SETTING_PANEL_BG_RECT_PORTRAIT, W_FLASH_MODE_SETTING_PANEL_BG_RECT_PORTRAIT, H_FLASH_MODE_SETTING_PANEL_BG_RECT_PORTRAIT);
+ rectPanelBG = Rectangle(X_FLASH_MODE_SETTING_PANEL_BG_RECT_PORTRAIT, Y_FLASH_MODE_SETTING_PANEL_BG_RECT_PORTRAIT, W_FLASH_MODE_SETTING_PANEL_BG_RECT_PORTRAIT, H_FLASH_MODE_SETTING_PANEL_BG_RECT_PORTRAIT + H_FLASH_MODE_SETTING_PANEL_BG_RECT_MARGIN);
+ cameraHelp = Point(X_HELP_POSITION_PORTRAIT, Y_HELP_POSITION_PORTRAIT);
}
else
{
rectPanel = Rectangle(X_FLASH_MODE_SETTING_PANEL_RECT_LANDSCAPE,Y_FLASH_MODE_SETTING_PANEL_RECT_LANDSCAPE,W_FLASH_MODE_SETTING_PANEL_RECT_LANDSCAPE,H_FLASH_MODE_SETTING_PANEL_RECT_LANDSCAPE);
- rectPanelBG = Rectangle(X_FLASH_MODE_SETTING_PANEL_BG_RECT_LANDSCAPE, Y_FLASH_MODE_SETTING_PANEL_BG_RECT_LANDSCAPE, W_FLASH_MODE_SETTING_PANEL_BG_RECT_LANDSCAPE, H_FLASH_MODE_SETTING_PANEL_BG_RECT_LANDSCAPE);
+ rectPanelBG = Rectangle(X_FLASH_MODE_SETTING_PANEL_BG_RECT_LANDSCAPE, Y_FLASH_MODE_SETTING_PANEL_BG_RECT_LANDSCAPE, W_FLASH_MODE_SETTING_PANEL_BG_RECT_LANDSCAPE, H_FLASH_MODE_SETTING_PANEL_BG_RECT_LANDSCAPE + H_FLASH_MODE_SETTING_PANEL_BG_RECT_MARGIN);
+ cameraHelp = Point(X_HELP_POSITION_LANDSCAPE, Y_HELP_POSITION_LANDSCAPE);
}
AppResource* pAppResource = Application::GetInstance()->GetAppResource();
- pAppResource->GetString(IDS_CAM_BODY_SETTINGS, strTitle);
+ pAppResource->GetString(IDS_CAM_BODY_FLASH, strTitle);
fnt.Construct(FONT_STYLE_PLAIN, FONT_SIZE_SETTING_MENU_TITLE);
fnt.GetTextExtent(strTitle, strTitle.GetLength(), dim);
delete pBitmap;
pBitmap = null;
- ptTitle.x = rectPanelBG.x + X_MENU_TITLE_MARGIN;
- ptTitle.y = ((H_SETTING_MENU_PANEL_TITLE / DIVIDE_BY_TWO) - (dim.height / DIVIDE_BY_TWO)) + rectPanelBG.y;
+ ptTitle.x = rectPanelBG.x + X_MENU_TITLE_MARGIN + X_FLASH_MENU_TITLE_MARGIN;
+ ptTitle.y = (((H_SETTING_MENU_PANEL_TITLE + H_FLASH_SETTING_MENU_PANEL_TITLE_MARGIN) / DIVIDE_BY_TWO) - (dim.height / DIVIDE_BY_TWO)) + rectPanelBG.y;
pCanvas->SetFont(fnt);
pCanvas->SetForegroundColor(COLOR_TITLE);
pCanvas->DrawText(ptTitle, strTitle);
+ pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_HELP);
+ TryCatch(pBitmap != null, r = E_FAILURE, "pBitmap != null");
+
+ pCanvas->SetBackgroundColor(Color(COLOR_ID_WHITE, true));
+ pCanvas->DrawBitmap(cameraHelp, *pBitmap);
+
+ delete pBitmap;
+ pBitmap = null;
+
AppLogDebug("EXIT");
return r;
delete pBitmap;
pBitmap = null;
- ptTitle.x = rectPanelBG.x + X_MENU_TITLE_MARGIN;
- ptTitle.y = ((H_SETTING_MENU_PANEL_TITLE / DIVIDE_BY_TWO) - (dim.height / DIVIDE_BY_TWO)) + rectPanelBG.y;
+ ptTitle.x = rectPanelBG.x + X_MENU_TITLE_MARGIN + X_FLASH_MENU_TITLE_MARGIN;
+ ptTitle.y = (((H_SETTING_MENU_PANEL_TITLE + H_FLASH_SETTING_MENU_PANEL_TITLE_MARGIN) / DIVIDE_BY_TWO) - (dim.height / DIVIDE_BY_TWO)) + rectPanelBG.y;
pCanvas->SetFont(fnt);
pCanvas->SetForegroundColor(COLOR_TITLE);
switch (__timerType)
{
- case SETTING_TIMER_CAPTURE_0_SEC:
+ case TIMER_SETTING_ZERO_SEC:
{
__pTimerTypeBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_INDICATOR_TIMER_OFF);
TryReturnVoid(__pTimerTypeBitmap != null, "pBitmap is null");
}
break;
- case SETTING_TIMER_CAPTURE_2_SEC:
+ case TIMER_SETTING_TWO_SEC:
{
__pTimerTypeBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_INDICATOR_TIMER_2S);
TryReturnVoid(__pTimerTypeBitmap != null, "pBitmap is null");
}
break;
- case SETTING_TIMER_CAPTURE_5_SEC:
+ case TIMER_SETTING_FIVE_SEC:
{
__pTimerTypeBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_INDICATOR_TIMER_5S);
TryReturnVoid(__pTimerTypeBitmap != null, "pBitmap is null");
}
break;
- case SETTING_TIMER_CAPTURE_10_SEC:
+ case TIMER_SETTING_TEN_SEC:
{
__pTimerTypeBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_INDICATOR_TIMER_10S);
TryReturnVoid(__pTimerTypeBitmap != null, "pBitmap is null");
Point ptTimerIcon = Point(0, 0);
Canvas* pMyCanvas = null;
int timerType = 0;
- __pTimerTypeBitmap = SETTING_TIMER_CAPTURE_0_SEC;
+ __pTimerTypeBitmap = TIMER_SETTING_ZERO_SEC;
+
+ r = CameraPresentationModel::GetInstance()->GetValue(TIMER_INTERVAL, timerType);
+ if (r != E_SUCCESS)
+ {
+ timerType = TIMER_SETTING_ZERO_SEC;
+ }
+
+ if (timerType == TIMER_SETTING_ZERO_SEC)
+ {
+ AppLogDebug("EXIT - TIMER_SETTING_ZERO_SEC");
+ return E_SUCCESS;
+ }
if (__dir == ORIENTATION_STATUS_PORTRAIT
|| __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
ptTimerIcon = Point(X_TIMER_ICON_START_POSITION_LANDSCAPE, Y_TIMER_ICON_START_POSITION_LANDSCAPE);
}
- r = CameraPresentationModel::GetInstance()->GetValue(TIMER_INTERVAL, timerType);
- TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
-
SetTimerType(timerType);
pMyCanvas = GetCanvasN(Rectangle(ptTimerIcon.x, ptTimerIcon.y, W_INDICATOR_PANEL_RECT, H_INDICATOR_PANEL_RECT));
AppLogDebug("EXIT");
return r;
-
-CATCH:
- return r;
}
result
AppLogDebug("ENTER");
if (CameraPresentationModel::GetInstance()->IsCameraInstance())
{
- __remainedPhotoNum = CheckStorageInfo();
+ __remainedPhotoNum = CheckStorageInfo();
AppLogDebug("OnDraw : %d", __remainedPhotoNum);
}
else
AppLogDebug("EXIT");
}
-CamraInfoSubPanel::CamraInfoSubPanel(void)
+void
+CameraInfoPanel::SetCurrentPoint(Tizen::Graphics::Point currentPosition)
+{
+ AppLogDebug("ENTER");
+ __currentPosition = currentPosition;
+ AppLogDebug("EXIT");
+}
+
+CameraInfoSubPanel::CameraInfoSubPanel(void)
: __drawSubMenuBG(0)
, __subMenuTitle(L"")
{
AppLogDebug("EXIT");
}
-CamraInfoSubPanel::~CamraInfoSubPanel(void)
+CameraInfoSubPanel::~CameraInfoSubPanel(void)
{
AppLogDebug("ENTER");
AppLogDebug("EXIT");
}
result
-CamraInfoSubPanel::Initialize(Tizen::Graphics::Rectangle rect)
+CameraInfoSubPanel::Initialize(Tizen::Graphics::Rectangle rect)
{
AppLogDebug("ENTER");
AppLogDebug("EXIT");
}
result
-CamraInfoSubPanel::OnInitializing(void)
+CameraInfoSubPanel::OnInitializing(void)
{
AppLogDebug("ENTER");
result r = E_SUCCESS;
}
result
-CamraInfoSubPanel::OnTerminating(void)
+CameraInfoSubPanel::OnTerminating(void)
{
AppLogDebug("ENTER");
result r = E_SUCCESS;
}
result
-CamraInfoSubPanel::OnDraw(void)
+CameraInfoSubPanel::OnDraw(void)
{
AppLogDebug("ENTER");
result r = E_SUCCESS;
}
void
-CamraInfoSubPanel::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus)
+CameraInfoSubPanel::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus)
{
AppLogDebug("ENTER");
AppLogDebug("EXIT");
}
result
-CamraInfoSubPanel::DrawSettingSubMenuBackground(Canvas* pCanvas)
+CameraInfoSubPanel::DrawSettingSubMenuBackground(Canvas* pCanvas)
{
AppLogDebug("ENTER");
result r = E_SUCCESS;
}
result
-CamraInfoSubPanel::DrawSubMenuTile(Tizen::Graphics::Canvas* pCanvas)
+CameraInfoSubPanel::DrawSubMenuTile(Tizen::Graphics::Canvas* pCanvas)
{
AppLogDebug("ENTER");
result r = E_SUCCESS;
fnt.Construct(FONT_STYLE_PLAIN, FONT_SIZE_SETTING_MENU_TITLE);
fnt.GetTextExtent(strTitle, strTitle.GetLength(), dim);
- ptTitle.x = rect.x + X_MENU_TITLE_MARGIN;
- ptTitle.y = ((H_SETTING_MENU_PANEL_TITLE / DIVIDE_BY_TWO) - (dim.height / DIVIDE_BY_TWO)) + rect.y;
+ ptTitle.x = rect.x + X_MENU_TITLE_MARGIN + X_SUB_MENU_TITLE_MARGIN;
+ ptTitle.y = ((H_SETTING_MENU_PANEL_TITLE / DIVIDE_BY_TWO) - (dim.height / DIVIDE_BY_TWO)) + rect.y + X_SUB_MENU_TITLE_MARGIN;
pCanvas->SetFont(fnt);
pCanvas->SetForegroundColor(COLOR_TITLE);
}
void
-CamraInfoSubPanel::SetMenuTitle(Tizen::Base::String& title)
+CameraInfoSubPanel::SetMenuTitle(Tizen::Base::String& title)
{
AppLogDebug("ENTER");
__subMenuTitle = title;
AppLogDebug("EXIT");
}
+CameraInfoGeneralSubPanel::CameraInfoGeneralSubPanel(void)
+ : __drawSubMenuBG(0)
+ , __subMenuTitle(L"")
+{
+ AppLogDebug("ENTER");
+ AppLogDebug("EXIT");
+}
+
+CameraInfoGeneralSubPanel::~CameraInfoGeneralSubPanel(void)
+{
+ AppLogDebug("ENTER");
+ AppLogDebug("EXIT");
+}
+
+result
+CameraInfoGeneralSubPanel::Initialize(Tizen::Graphics::Rectangle rect)
+{
+ AppLogDebug("ENTER");
+ AppLogDebug("EXIT");
+ return Panel::Construct(rect);
+}
+
+result
+CameraInfoGeneralSubPanel::OnInitializing(void)
+{
+ AppLogDebug("ENTER");
+ result r = E_SUCCESS;
+
+ AppLogDebug("EXIT");
+ return r;
+}
+
+result
+CameraInfoGeneralSubPanel::OnTerminating(void)
+{
+ AppLogDebug("ENTER");
+ result r = E_SUCCESS;
+
+ AppLogDebug("EXIT");
+ return r;
+}
+
+result
+CameraInfoGeneralSubPanel::OnDraw(void)
+{
+ AppLogDebug("ENTER");
+ result r = E_SUCCESS;
+ Canvas* pCanvas = GetCanvasN();
+ pCanvas->Clear();
+ DrawSettingSubMenuBackground(pCanvas);
+
+ delete pCanvas;
+ pCanvas = null;
+
+ AppLogDebug("EXIT");
+ return r;
+}
+
void
-CameraInfoPanel::SetCurrentPoint(Tizen::Graphics::Point currentPosition)
+CameraInfoGeneralSubPanel::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus)
{
AppLogDebug("ENTER");
- __currentPosition = currentPosition;
+ AppLogDebug("EXIT");
+}
+
+result
+CameraInfoGeneralSubPanel::DrawSettingSubMenuBackground(Canvas* pCanvas)
+{
+ AppLogDebug("ENTER");
+ result r = E_SUCCESS;
+ Bitmap* pBitmap = null;
+ Rectangle rectPanelBG = pCanvas->GetBounds();
+
+ pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_OPTION_POPUP_BG_2DEPTH_9_);
+ TryCatch(pBitmap != null, r = E_FAILURE, "Bitmap is null");
+
+ if (pBitmap->IsNinePatchedBitmap())
+ {
+ r = pCanvas->DrawNinePatchedBitmap(rectPanelBG, *pBitmap);
+ TryCatch(r == E_SUCCESS, , "pMyCanvas::DrawNinePatchedBitmap() fail[%s]", GetErrorMessage(r));
+ }
+
+ DrawSubMenuTile(pCanvas);
+
+ delete pBitmap;
+ pBitmap = null;
+
+ AppLogDebug("EXIT");
+ return r;
+
+CATCH:
+ if (pBitmap != null)
+ {
+ delete pBitmap;
+ pBitmap = null;
+ }
+
+ return r;
+}
+
+result
+CameraInfoGeneralSubPanel::DrawSubMenuTile(Tizen::Graphics::Canvas* pCanvas)
+{
+ AppLogDebug("ENTER");
+ result r = E_SUCCESS;
+ Rectangle rect = pCanvas->GetBounds();
+ Dimension dim;
+ Font fnt;
+ Point ptTitle;
+ String strTitle = __subMenuTitle;
+
+ TryCatch(strTitle.GetLength() > ZERO_LEN_STRING, r = E_FAILURE, "Title is empty");
+
+ fnt.Construct(FONT_STYLE_PLAIN, FONT_SIZE_SETTING_MENU_TITLE);
+ fnt.GetTextExtent(strTitle, strTitle.GetLength(), dim);
+
+ ptTitle.x = rect.x + X_MENU_TITLE_MARGIN + X_SUB_MENU_TITLE_MARGIN;
+ ptTitle.y = ((H_SETTING_MENU_PANEL_TITLE / DIVIDE_BY_TWO) - (dim.height / DIVIDE_BY_TWO)) + rect.y + X_SUB_MENU_TITLE_MARGIN;
+
+ pCanvas->SetFont(fnt);
+ pCanvas->SetForegroundColor(COLOR_TITLE);
+ pCanvas->DrawText(ptTitle, strTitle);
+
+ AppLogDebug("EXIT");
+ return r;
+
+CATCH:
+ return E_FAILURE;
+}
+
+void
+CameraInfoGeneralSubPanel::SetMenuTitle(Tizen::Base::String& title)
+{
+ AppLogDebug("ENTER");
+ __subMenuTitle = title;
AppLogDebug("EXIT");
}
\ No newline at end of file
return r;
CATCH:
- return r;
+ return E_FAILURE;
}
result
return r;
CATCH:
- return r;
+ return E_FAILURE;
}
result
CATCH:
AppLogDebug("EXIT - CATCH");
- return r;
+ return E_FAILURE;
}
void
L"camera_settings_press.png",
L"camera_quick_settings_open_v.png",
L"camera_quick_settings_open_v_press.png",
+ L"camera_guick_settings_line_v.png",
L"camera_mode_camcorder_on.png",
L"camera_mode_camera_on.png",
L"camera_mode_bg.png",
L"indicator_storage_memoryfull.png",
L"camera_ev_icon.png",
L"camera_option_popup_bg.png",
- L"camera_option_popup_bg.#.png",
+ L"camera_setting_popup_bg.#.png",
L"camera_option_popup_bg_2depth.png",
- L"camera_option_popup_bg_2depth.#.png",
+ L"camera_setting_popup_2depth_bg.#.png",
L"camera_popup_bg.#.png",
L"camera_popup_ex.png",
L"camera_popup_exposure_vertical_bg.png",
L"indicator_timer_off.png",
L"indicator_voice_on.png",
L"camera_edit_shortcut_ic_whitebalance.png",
+ L"camera_edit_shortcut_ic_whitebalance_dim.png",
L"camera_edit_shortcut_ic_whitebalance_press.png",
L"camera_edit_shortcut_ic_exposuremode.png",
L"camera_edit_shortcut_ic_exposuremode_press.png",
L"help_12.png",
L"T05_camera_progress_handle.png",
L"T05_camera_progress_bg.png",
+ L"camera_photosize_0.3m.png",
L"camera_photosize_2mw.png",
L"camera_photosize_6mw.png",
L"camera_moviesize_640x480.png",
L"camera_mode_back_press.png",
L"camera_mode_front.png",
L"camera_mode_front_press.png",
+ L"camera_help.png",
+ L"camera_help_press.png",
};
Bitmap*
const unsigned int COLOR_PANEL_BACKGROUND_BLACK = Color32<0, 0, 0>::Value;
const unsigned int COLOR_PANEL_BACKGROUND_GRAY = Color32<41, 41, 41>::Value;
const unsigned int COLOR_GUIDELINE = Color32<255, 255, 255>::Value;
+const unsigned int COLOR_SETTING_LINE = Color32<255, 255, 255>::Value;
+const unsigned int COLOR_SETTING_UNDER_LINE = Color32<170, 213, 240>::Value;
const unsigned int COLOR_TITLE = Color32<255, 255, 255>::Value;
const unsigned int COLOR_TIMER_TEXT = Color32<249, 249, 249>::Value;
projects / apps / osp / Camera.git / commitdiff
