Apply 2.1 GUI
authorTaeHo Choi <thanks.choi@samsung.com>
Tue, 19 Mar 2013 08:04:17 +0000 (17:04 +0900)
committerTaeHo Choi <thanks.choi@samsung.com>
Tue, 19 Mar 2013 08:04:17 +0000 (17:04 +0900)
Change-Id: I47220936becb294fcaa4f79a805d636894a5e432

76 files changed:
inc/VpFormFactory.h
inc/VpIVideoPlayerEventListener.h
inc/VpMainFrame.h
inc/VpSoundPathPopup.h
inc/VpTypes.h
inc/VpVideoPlayerApp.h
inc/VpVideoPlayerForm.h
inc/VpVideoPlayerPresentationModel.h
inc/VpVolumeSettingPopup.h
res/screen-density-xhigh/T01-2_Function_icon_screenmode_press.png [moved from res/screen-density-xhigh/T01_icon_title_screenmode02.png with 87% similarity]
res/screen-density-xhigh/T01-2_control_circle_button_01.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_control_circle_button_01_focus.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_control_circle_button_01_press.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_control_circle_button_02.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_control_circle_button_02_focus.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_control_circle_button_02_press.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_control_circle_button_03.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_control_circle_button_03_press.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_control_circle_icon_next.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_control_circle_icon_next_dim.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_control_circle_icon_next_press.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_control_circle_icon_pause.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_control_circle_icon_pause_dim.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_control_circle_icon_pause_press.png [moved from res/screen-density-xhigh/T01_icon_title_screenmode01.png with 87% similarity]
res/screen-density-xhigh/T01-2_control_circle_icon_play.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_control_circle_icon_play_dim.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_control_circle_icon_play_press.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_control_circle_icon_previous.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_control_circle_icon_previous_dim.png [moved from res/screen-density-xhigh/T01_icon_toolbar_next.png with 74% similarity]
res/screen-density-xhigh/T01-2_control_circle_icon_previous_press.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_function_icon_bookmark.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_function_icon_bookmark_press.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_function_icon_multi_window.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_function_icon_multi_window_press.png [moved from res/screen-density-xhigh/T01_controller_progress_handle.png with 86% similarity]
res/screen-density-xhigh/T01-2_function_icon_repeat.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_function_icon_repeat_1.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_function_icon_repeat_1_press.png [moved from res/screen-density-xhigh/T01_btn_toolbar_volume.png with 74% similarity]
res/screen-density-xhigh/T01-2_function_icon_repeat_all.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_function_icon_repeat_all_press.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_function_icon_repeat_press.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_function_icon_screenmode.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_function_icon_screenmode02.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_function_icon_screenmode02_press.png [moved from res/screen-density-xhigh/T01_controller_progress_handle_press.png with 87% similarity]
res/screen-density-xhigh/T01-2_function_icon_screenmode03.png [moved from res/screen-density-xhigh/T01_control_stop.png with 70% similarity]
res/screen-density-xhigh/T01-2_function_icon_screenmode03_press.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_function_icon_share.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_function_icon_share_press.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_function_icon_volume.png [new file with mode: 0644]
res/screen-density-xhigh/T01-2_function_icon_volume_press.png [new file with mode: 0644]
res/screen-density-xhigh/T01_2_control_progress_handle.png [new file with mode: 0644]
res/screen-density-xhigh/T01_2_control_progress_handle_press.png [new file with mode: 0644]
res/screen-density-xhigh/T01_2_icon_back.png [new file with mode: 0644]
res/screen-density-xhigh/T01_2_icon_back_dim_web.png [new file with mode: 0644]
res/screen-density-xhigh/T01_2_icon_back_press_web.png [new file with mode: 0644]
res/screen-density-xhigh/T01_2_icon_back_web.png [new file with mode: 0644]
res/screen-density-xhigh/T01_2_icon_more.png [new file with mode: 0644]
res/screen-density-xhigh/T01_2_icon_more_dim_web.png [new file with mode: 0644]
res/screen-density-xhigh/T01_2_icon_more_press_web.png [new file with mode: 0644]
res/screen-density-xhigh/T01_2_icon_more_web.png [moved from res/screen-density-xhigh/T01_btn_toolbar_back.png with 75% similarity]
res/screen-density-xhigh/T01_2_icon_rotate.png [moved from res/screen-density-xhigh/T01_control_stop_press.png with 64% similarity]
res/screen-density-xhigh/T01_2_icon_rotate_press.png [new file with mode: 0644]
res/screen-density-xhigh/T01_icon_title_screenmode03.png [deleted file]
res/screen-density-xhigh/T01_icon_title_soundpath.png [deleted file]
res/screen-density-xhigh/T01_icon_toolbar_pause.png [deleted file]
res/screen-density-xhigh/T01_icon_toolbar_play.png [deleted file]
res/screen-density-xhigh/T01_icon_toolbar_previous.png [deleted file]
res/screen-density-xhigh/T01_main_folder_bg.png [deleted file]
res/screen-size-normal/IDL_MAIN_FORM.xml
src/VpFormFactory.cpp
src/VpMainFrame.cpp
src/VpSoundPathPopup.cpp
src/VpTypes.cpp
src/VpVideoPlayerEntry.cpp
src/VpVideoPlayerForm.cpp
src/VpVideoPlayerPresentationModel.cpp
src/VpVolumeSettingPopup.cpp

index 3f59110..4dc42c8 100644 (file)
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -35,4 +35,4 @@ public:
                        const Tizen::Ui::Scenes::SceneId& sceneId);
 };
 
-#endif // _VP_FORM_FACTORY_H_
+#endif // _VP_FORM_FACTORY_H_
\ No newline at end of file
index 2602c12..b30099f 100644 (file)
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -38,4 +38,4 @@ public:
        virtual void OnPlayStateChanged(Tizen::Media::PlayerState playState) = 0;
 };
 
-#endif // _VP_IVIDEO_PLAYER_EVENT_LISTENER_H_
+#endif // _VP_IVIDEO_PLAYER_EVENT_LISTENER_H_
\ No newline at end of file
index af5efec..3b09888 100644 (file)
@@ -41,4 +41,4 @@ public:
        virtual void OnFrameTerminating(const Tizen::Ui::Controls::Frame& source);
 };
 
-#endif // _VP_MAIN_FRAME_H_
+#endif // _VP_MAIN_FRAME_H_
\ No newline at end of file
index 4137ddc..faf1227 100644 (file)
@@ -55,4 +55,4 @@ private:
        int __audioRouteMode;
 };
 
-#endif // _VP_SOUND_PATH_POPUP_H_
+#endif // _VP_SOUND_PATH_POPUP_H_
\ No newline at end of file
index 450e2ff..2721f32 100644 (file)
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -57,4 +57,17 @@ extern const wchar_t* IDS_COM_POP_CLOSE;
 extern const wchar_t* IDS_COM_POP_UNSUPPORTED_FILE_TYPE;
 extern const wchar_t* IDS_VPL_POP_UNABLE_TO_PLAY_VIDEO_ERROR_OCCURRED;
 
+extern const wchar_t* IDC_PANEL_HEADER;
+extern const wchar_t* IDC_PANEL_FUNCTION;
+extern const wchar_t* IDC_PANEL_CONTROLLER;
+extern const wchar_t* IDC_BUTTON_PLAY;
+extern const wchar_t* IDC_BUTTON_FASTREWIND;
+extern const wchar_t* IDC_BUTTON_FASTFORWARD;
+extern const wchar_t* IDC_BUTTON_BACK;
+extern const wchar_t* IDC_BUTTON_SCREENMODE;
+extern const wchar_t* IDC_LABEL_CURRENTTIME;
+extern const wchar_t* IDC_LABEL_FULLTIME;
+extern const wchar_t* IDC_LABEL_VIDEO_TITLE;
+extern const wchar_t* IDC_SLIDER;
+
 #endif // _VP_TYPES_H_
\ No newline at end of file
index 043b874..4f1f507 100644 (file)
@@ -67,4 +67,4 @@ private:
        Tizen::Base::Collection::HashMap* __pArguments;
 };
 
-#endif // _VP_VIDEO_PLAYER_APP_H_
+#endif // _VP_VIDEO_PLAYER_APP_H_
\ No newline at end of file
index 93def11..3208aa2 100644 (file)
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -26,8 +26,6 @@
 #include <FBase.h>
 #include <FGraphics.h>
 #include <FMedia.h>
-#include <FMediaAudioRouteInfo.h>
-#include <FMediaAudioRouteManager.h>
 #include <FMediaIAudioRouteEventListener.h>
 #include <FUi.h>
 #include "VpIVideoPlayerEventListener.h"
@@ -139,10 +137,12 @@ private:
        };
 
        friend void DestroyPresentationModelInstance(void);
+       result InitializeHeader(void);
+       result InitializeFuncPanel(void);
+       result InitializeController(void);
        result SetScreenMode(const ScreenMode mode, bool destroyOverlay);
        void UpdateProgressBar(const int currentPlayTime);
        void InitTimer(void);
-       void ChangedControlPos(void);
        void DeleteTimer(void);
        void GetTotalTime(Tizen::Base::String& totalTime);
        void PlayerSoundPathPopupInit(void);
@@ -161,19 +161,17 @@ private:
        SoundPathPopup* __pSoundPathPopup;
        Tizen::Base::Runtime::Timer* __pUiControlTimer;
        Tizen::Media::AudioRouteManager* __pAudioRouteManager;
+       Tizen::Ui::Controls::Panel* __pHeaderPanel;
+       Tizen::Ui::Controls::Panel* __pFunctionPanel;
+       Tizen::Ui::Controls::Panel* __pControllerPanel;
        Tizen::Ui::Controls::Button* __pPlayPauseButton;
        Tizen::Ui::Controls::Button* __pFastForwardButton;
        Tizen::Ui::Controls::Button* __pFastRewindButton;
        Tizen::Ui::Controls::Button* __pBackButton;
-       Tizen::Ui::Controls::ButtonItem* __pButtonLeftItem;
-       Tizen::Ui::Controls::ButtonItem* __pButtonRightItem;
-       Tizen::Ui::Controls::Header* __pHeader;
-       Tizen::Ui::Controls::Label* __pControlLabel;
+       Tizen::Ui::Controls::Button* __pScreenModeButton;
+       Tizen::Ui::Controls::Label* __pHeaderTitle;
        Tizen::Ui::Controls::Label* __pCurrenTimeLabel;
-       Tizen::Ui::Controls::Label* __pFirstLineLabel;
        Tizen::Ui::Controls::Label* __pTotalTimeLabel;
-       Tizen::Ui::Controls::Label* __pVerticalLeftLine;
-       Tizen::Ui::Controls::Label* __pVerticalRightLine;
        Tizen::Ui::Controls::Slider* __pSlider;
        bool __actionTouchLongPressed;
        bool __setPauseState;
index a9aa12d..0bb8141 100644 (file)
@@ -107,7 +107,7 @@ private:
        Tizen::Base::Runtime::Timer* __pTimer;
        Tizen::Base::Runtime::Timer* __pFastForwardTimer;
        Tizen::Base::Runtime::Timer* __pFastRewindTimer;
-       Tizen::Base::String __mediaPathName;
+
        bool __playerSeekCompleted;
        bool __playerLastSeekCompleted;
        bool __playAfterSeek;
@@ -118,4 +118,4 @@ private:
        int __previousMediaIndex;
 };
 
-#endif // _VP_VIDEO_PLAYER_PRESENTATION_MODEL_H_
+#endif // _VP_VIDEO_PLAYER_PRESENTATION_MODEL_H_
\ No newline at end of file
index a51343a..90f30e4 100644 (file)
@@ -77,4 +77,4 @@ private:
        int __volumeLevel;
 };
 
-#endif // _VP_VOLUME_SETTING_POPUP_H_
+#endif // _VP_VOLUME_SETTING_POPUP_H_
\ No newline at end of file
similarity index 87%
rename from res/screen-density-xhigh/T01_icon_title_screenmode02.png
rename to res/screen-density-xhigh/T01-2_Function_icon_screenmode_press.png
index 3a545b6..369aeb5 100644 (file)
Binary files a/res/screen-density-xhigh/T01_icon_title_screenmode02.png and b/res/screen-density-xhigh/T01-2_Function_icon_screenmode_press.png differ
diff --git a/res/screen-density-xhigh/T01-2_control_circle_button_01.png b/res/screen-density-xhigh/T01-2_control_circle_button_01.png
new file mode 100644 (file)
index 0000000..5315c79
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_control_circle_button_01.png differ
diff --git a/res/screen-density-xhigh/T01-2_control_circle_button_01_focus.png b/res/screen-density-xhigh/T01-2_control_circle_button_01_focus.png
new file mode 100644 (file)
index 0000000..bb75b73
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_control_circle_button_01_focus.png differ
diff --git a/res/screen-density-xhigh/T01-2_control_circle_button_01_press.png b/res/screen-density-xhigh/T01-2_control_circle_button_01_press.png
new file mode 100644 (file)
index 0000000..080a3fe
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_control_circle_button_01_press.png differ
diff --git a/res/screen-density-xhigh/T01-2_control_circle_button_02.png b/res/screen-density-xhigh/T01-2_control_circle_button_02.png
new file mode 100644 (file)
index 0000000..a031e11
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_control_circle_button_02.png differ
diff --git a/res/screen-density-xhigh/T01-2_control_circle_button_02_focus.png b/res/screen-density-xhigh/T01-2_control_circle_button_02_focus.png
new file mode 100644 (file)
index 0000000..157011c
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_control_circle_button_02_focus.png differ
diff --git a/res/screen-density-xhigh/T01-2_control_circle_button_02_press.png b/res/screen-density-xhigh/T01-2_control_circle_button_02_press.png
new file mode 100644 (file)
index 0000000..43514d7
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_control_circle_button_02_press.png differ
diff --git a/res/screen-density-xhigh/T01-2_control_circle_button_03.png b/res/screen-density-xhigh/T01-2_control_circle_button_03.png
new file mode 100644 (file)
index 0000000..0c9e282
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_control_circle_button_03.png differ
diff --git a/res/screen-density-xhigh/T01-2_control_circle_button_03_press.png b/res/screen-density-xhigh/T01-2_control_circle_button_03_press.png
new file mode 100644 (file)
index 0000000..cd34db4
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_control_circle_button_03_press.png differ
diff --git a/res/screen-density-xhigh/T01-2_control_circle_icon_next.png b/res/screen-density-xhigh/T01-2_control_circle_icon_next.png
new file mode 100644 (file)
index 0000000..7c44366
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_control_circle_icon_next.png differ
diff --git a/res/screen-density-xhigh/T01-2_control_circle_icon_next_dim.png b/res/screen-density-xhigh/T01-2_control_circle_icon_next_dim.png
new file mode 100644 (file)
index 0000000..1d0d9aa
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_control_circle_icon_next_dim.png differ
diff --git a/res/screen-density-xhigh/T01-2_control_circle_icon_next_press.png b/res/screen-density-xhigh/T01-2_control_circle_icon_next_press.png
new file mode 100644 (file)
index 0000000..d589c6b
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_control_circle_icon_next_press.png differ
diff --git a/res/screen-density-xhigh/T01-2_control_circle_icon_pause.png b/res/screen-density-xhigh/T01-2_control_circle_icon_pause.png
new file mode 100644 (file)
index 0000000..d6f5dbd
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_control_circle_icon_pause.png differ
diff --git a/res/screen-density-xhigh/T01-2_control_circle_icon_pause_dim.png b/res/screen-density-xhigh/T01-2_control_circle_icon_pause_dim.png
new file mode 100644 (file)
index 0000000..63986a0
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_control_circle_icon_pause_dim.png differ
similarity index 87%
rename from res/screen-density-xhigh/T01_icon_title_screenmode01.png
rename to res/screen-density-xhigh/T01-2_control_circle_icon_pause_press.png
index 6c9a5d3..1fa5271 100644 (file)
Binary files a/res/screen-density-xhigh/T01_icon_title_screenmode01.png and b/res/screen-density-xhigh/T01-2_control_circle_icon_pause_press.png differ
diff --git a/res/screen-density-xhigh/T01-2_control_circle_icon_play.png b/res/screen-density-xhigh/T01-2_control_circle_icon_play.png
new file mode 100644 (file)
index 0000000..e3169b2
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_control_circle_icon_play.png differ
diff --git a/res/screen-density-xhigh/T01-2_control_circle_icon_play_dim.png b/res/screen-density-xhigh/T01-2_control_circle_icon_play_dim.png
new file mode 100644 (file)
index 0000000..6c64a3e
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_control_circle_icon_play_dim.png differ
diff --git a/res/screen-density-xhigh/T01-2_control_circle_icon_play_press.png b/res/screen-density-xhigh/T01-2_control_circle_icon_play_press.png
new file mode 100644 (file)
index 0000000..22ecae5
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_control_circle_icon_play_press.png differ
diff --git a/res/screen-density-xhigh/T01-2_control_circle_icon_previous.png b/res/screen-density-xhigh/T01-2_control_circle_icon_previous.png
new file mode 100644 (file)
index 0000000..c401aa0
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_control_circle_icon_previous.png differ
similarity index 74%
rename from res/screen-density-xhigh/T01_icon_toolbar_next.png
rename to res/screen-density-xhigh/T01-2_control_circle_icon_previous_dim.png
index e29bc4c..98e2440 100644 (file)
Binary files a/res/screen-density-xhigh/T01_icon_toolbar_next.png and b/res/screen-density-xhigh/T01-2_control_circle_icon_previous_dim.png differ
diff --git a/res/screen-density-xhigh/T01-2_control_circle_icon_previous_press.png b/res/screen-density-xhigh/T01-2_control_circle_icon_previous_press.png
new file mode 100644 (file)
index 0000000..efc8d67
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_control_circle_icon_previous_press.png differ
diff --git a/res/screen-density-xhigh/T01-2_function_icon_bookmark.png b/res/screen-density-xhigh/T01-2_function_icon_bookmark.png
new file mode 100644 (file)
index 0000000..eef20c1
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_function_icon_bookmark.png differ
diff --git a/res/screen-density-xhigh/T01-2_function_icon_bookmark_press.png b/res/screen-density-xhigh/T01-2_function_icon_bookmark_press.png
new file mode 100644 (file)
index 0000000..e3eabaf
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_function_icon_bookmark_press.png differ
diff --git a/res/screen-density-xhigh/T01-2_function_icon_multi_window.png b/res/screen-density-xhigh/T01-2_function_icon_multi_window.png
new file mode 100644 (file)
index 0000000..48cff5d
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_function_icon_multi_window.png differ
similarity index 86%
rename from res/screen-density-xhigh/T01_controller_progress_handle.png
rename to res/screen-density-xhigh/T01-2_function_icon_multi_window_press.png
index fc80139..127eccd 100644 (file)
Binary files a/res/screen-density-xhigh/T01_controller_progress_handle.png and b/res/screen-density-xhigh/T01-2_function_icon_multi_window_press.png differ
diff --git a/res/screen-density-xhigh/T01-2_function_icon_repeat.png b/res/screen-density-xhigh/T01-2_function_icon_repeat.png
new file mode 100644 (file)
index 0000000..a4f045b
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_function_icon_repeat.png differ
diff --git a/res/screen-density-xhigh/T01-2_function_icon_repeat_1.png b/res/screen-density-xhigh/T01-2_function_icon_repeat_1.png
new file mode 100644 (file)
index 0000000..574fba1
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_function_icon_repeat_1.png differ
similarity index 74%
rename from res/screen-density-xhigh/T01_btn_toolbar_volume.png
rename to res/screen-density-xhigh/T01-2_function_icon_repeat_1_press.png
index f7c10e8..5e1cb02 100644 (file)
Binary files a/res/screen-density-xhigh/T01_btn_toolbar_volume.png and b/res/screen-density-xhigh/T01-2_function_icon_repeat_1_press.png differ
diff --git a/res/screen-density-xhigh/T01-2_function_icon_repeat_all.png b/res/screen-density-xhigh/T01-2_function_icon_repeat_all.png
new file mode 100644 (file)
index 0000000..5a03677
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_function_icon_repeat_all.png differ
diff --git a/res/screen-density-xhigh/T01-2_function_icon_repeat_all_press.png b/res/screen-density-xhigh/T01-2_function_icon_repeat_all_press.png
new file mode 100644 (file)
index 0000000..5a57177
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_function_icon_repeat_all_press.png differ
diff --git a/res/screen-density-xhigh/T01-2_function_icon_repeat_press.png b/res/screen-density-xhigh/T01-2_function_icon_repeat_press.png
new file mode 100644 (file)
index 0000000..b4e16f7
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_function_icon_repeat_press.png differ
diff --git a/res/screen-density-xhigh/T01-2_function_icon_screenmode.png b/res/screen-density-xhigh/T01-2_function_icon_screenmode.png
new file mode 100644 (file)
index 0000000..25e974c
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_function_icon_screenmode.png differ
diff --git a/res/screen-density-xhigh/T01-2_function_icon_screenmode02.png b/res/screen-density-xhigh/T01-2_function_icon_screenmode02.png
new file mode 100644 (file)
index 0000000..1a6bd25
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_function_icon_screenmode02.png differ
similarity index 87%
rename from res/screen-density-xhigh/T01_controller_progress_handle_press.png
rename to res/screen-density-xhigh/T01-2_function_icon_screenmode02_press.png
index d14c5f6..59f498d 100644 (file)
Binary files a/res/screen-density-xhigh/T01_controller_progress_handle_press.png and b/res/screen-density-xhigh/T01-2_function_icon_screenmode02_press.png differ
similarity index 70%
rename from res/screen-density-xhigh/T01_control_stop.png
rename to res/screen-density-xhigh/T01-2_function_icon_screenmode03.png
index e9439ca..53891db 100644 (file)
Binary files a/res/screen-density-xhigh/T01_control_stop.png and b/res/screen-density-xhigh/T01-2_function_icon_screenmode03.png differ
diff --git a/res/screen-density-xhigh/T01-2_function_icon_screenmode03_press.png b/res/screen-density-xhigh/T01-2_function_icon_screenmode03_press.png
new file mode 100644 (file)
index 0000000..e23ac0b
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_function_icon_screenmode03_press.png differ
diff --git a/res/screen-density-xhigh/T01-2_function_icon_share.png b/res/screen-density-xhigh/T01-2_function_icon_share.png
new file mode 100644 (file)
index 0000000..5e2104e
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_function_icon_share.png differ
diff --git a/res/screen-density-xhigh/T01-2_function_icon_share_press.png b/res/screen-density-xhigh/T01-2_function_icon_share_press.png
new file mode 100644 (file)
index 0000000..b00c4cb
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_function_icon_share_press.png differ
diff --git a/res/screen-density-xhigh/T01-2_function_icon_volume.png b/res/screen-density-xhigh/T01-2_function_icon_volume.png
new file mode 100644 (file)
index 0000000..e24cb6e
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_function_icon_volume.png differ
diff --git a/res/screen-density-xhigh/T01-2_function_icon_volume_press.png b/res/screen-density-xhigh/T01-2_function_icon_volume_press.png
new file mode 100644 (file)
index 0000000..a3b9dae
Binary files /dev/null and b/res/screen-density-xhigh/T01-2_function_icon_volume_press.png differ
diff --git a/res/screen-density-xhigh/T01_2_control_progress_handle.png b/res/screen-density-xhigh/T01_2_control_progress_handle.png
new file mode 100644 (file)
index 0000000..1802660
Binary files /dev/null and b/res/screen-density-xhigh/T01_2_control_progress_handle.png differ
diff --git a/res/screen-density-xhigh/T01_2_control_progress_handle_press.png b/res/screen-density-xhigh/T01_2_control_progress_handle_press.png
new file mode 100644 (file)
index 0000000..bec5f23
Binary files /dev/null and b/res/screen-density-xhigh/T01_2_control_progress_handle_press.png differ
diff --git a/res/screen-density-xhigh/T01_2_icon_back.png b/res/screen-density-xhigh/T01_2_icon_back.png
new file mode 100644 (file)
index 0000000..aa0ee84
Binary files /dev/null and b/res/screen-density-xhigh/T01_2_icon_back.png differ
diff --git a/res/screen-density-xhigh/T01_2_icon_back_dim_web.png b/res/screen-density-xhigh/T01_2_icon_back_dim_web.png
new file mode 100644 (file)
index 0000000..da01a79
Binary files /dev/null and b/res/screen-density-xhigh/T01_2_icon_back_dim_web.png differ
diff --git a/res/screen-density-xhigh/T01_2_icon_back_press_web.png b/res/screen-density-xhigh/T01_2_icon_back_press_web.png
new file mode 100644 (file)
index 0000000..946fb48
Binary files /dev/null and b/res/screen-density-xhigh/T01_2_icon_back_press_web.png differ
diff --git a/res/screen-density-xhigh/T01_2_icon_back_web.png b/res/screen-density-xhigh/T01_2_icon_back_web.png
new file mode 100644 (file)
index 0000000..ffaf4c1
Binary files /dev/null and b/res/screen-density-xhigh/T01_2_icon_back_web.png differ
diff --git a/res/screen-density-xhigh/T01_2_icon_more.png b/res/screen-density-xhigh/T01_2_icon_more.png
new file mode 100644 (file)
index 0000000..7ea9f18
Binary files /dev/null and b/res/screen-density-xhigh/T01_2_icon_more.png differ
diff --git a/res/screen-density-xhigh/T01_2_icon_more_dim_web.png b/res/screen-density-xhigh/T01_2_icon_more_dim_web.png
new file mode 100644 (file)
index 0000000..f255aa8
Binary files /dev/null and b/res/screen-density-xhigh/T01_2_icon_more_dim_web.png differ
diff --git a/res/screen-density-xhigh/T01_2_icon_more_press_web.png b/res/screen-density-xhigh/T01_2_icon_more_press_web.png
new file mode 100644 (file)
index 0000000..9ff9639
Binary files /dev/null and b/res/screen-density-xhigh/T01_2_icon_more_press_web.png differ
similarity index 75%
rename from res/screen-density-xhigh/T01_btn_toolbar_back.png
rename to res/screen-density-xhigh/T01_2_icon_more_web.png
index e58ce84..7f3a154 100644 (file)
Binary files a/res/screen-density-xhigh/T01_btn_toolbar_back.png and b/res/screen-density-xhigh/T01_2_icon_more_web.png differ
similarity index 64%
rename from res/screen-density-xhigh/T01_control_stop_press.png
rename to res/screen-density-xhigh/T01_2_icon_rotate.png
index 2cc9fe3..c85d23d 100644 (file)
Binary files a/res/screen-density-xhigh/T01_control_stop_press.png and b/res/screen-density-xhigh/T01_2_icon_rotate.png differ
diff --git a/res/screen-density-xhigh/T01_2_icon_rotate_press.png b/res/screen-density-xhigh/T01_2_icon_rotate_press.png
new file mode 100644 (file)
index 0000000..626acd9
Binary files /dev/null and b/res/screen-density-xhigh/T01_2_icon_rotate_press.png differ
diff --git a/res/screen-density-xhigh/T01_icon_title_screenmode03.png b/res/screen-density-xhigh/T01_icon_title_screenmode03.png
deleted file mode 100644 (file)
index 9c001f6..0000000
Binary files a/res/screen-density-xhigh/T01_icon_title_screenmode03.png and /dev/null differ
diff --git a/res/screen-density-xhigh/T01_icon_title_soundpath.png b/res/screen-density-xhigh/T01_icon_title_soundpath.png
deleted file mode 100644 (file)
index 1da849c..0000000
Binary files a/res/screen-density-xhigh/T01_icon_title_soundpath.png and /dev/null differ
diff --git a/res/screen-density-xhigh/T01_icon_toolbar_pause.png b/res/screen-density-xhigh/T01_icon_toolbar_pause.png
deleted file mode 100644 (file)
index cd95fae..0000000
Binary files a/res/screen-density-xhigh/T01_icon_toolbar_pause.png and /dev/null differ
diff --git a/res/screen-density-xhigh/T01_icon_toolbar_play.png b/res/screen-density-xhigh/T01_icon_toolbar_play.png
deleted file mode 100644 (file)
index e939a59..0000000
Binary files a/res/screen-density-xhigh/T01_icon_toolbar_play.png and /dev/null differ
diff --git a/res/screen-density-xhigh/T01_icon_toolbar_previous.png b/res/screen-density-xhigh/T01_icon_toolbar_previous.png
deleted file mode 100644 (file)
index 0c19cc0..0000000
Binary files a/res/screen-density-xhigh/T01_icon_toolbar_previous.png and /dev/null differ
diff --git a/res/screen-density-xhigh/T01_main_folder_bg.png b/res/screen-density-xhigh/T01_main_folder_bg.png
deleted file mode 100644 (file)
index 16d1d59..0000000
Binary files a/res/screen-density-xhigh/T01_main_folder_bg.png and /dev/null differ
index 710bd6a..afceb07 100644 (file)
@@ -1,73 +1,89 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-       This XML file was automatically generated by UiBuilder - do not modify by hand.
--->
-<!DOCTYPE Scene SYSTEM "UIForm.dtd">
-
-<Scene Bversion="3.0.0.201209071509" Dversion="20120315">
-    <LogicalCoordinate>720</LogicalCoordinate>
-    <Form id="IDL_MAIN_FORM">
-        <property backgroundColor="#000000" backgroundColorOpacity="100" orientation="Automatic" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
-        <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER" type="NONE"/>
-        <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER" type="NONE"/>
-    </Form>
-    <Header>
-        <property backgroundBitmapPath="" color="#000000" colorOpacity="40" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="#000000" normalButtonColorOpacity="40" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="VideoPlayer" titleTextColor=""/>
-        <itemSet/>
-    </Header>
-    <Label id="IDC_LABEL_BOTTOM_CONTROL_PANEL" parent="IDL_MAIN_FORM">
-        <property backgroundBitmapPath="" backgroundColor="#1E1E1E" backgroundColorOpacity="40" horizontalAlign="ALIGN_LEFT" text="" textColor="#FFFFFF" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>
-        <layout height="214" mode="Portrait" width="720" x="0" y="895"/>
-        <layout height="226" mode="Landscape" width="1280" x="0" y="343"/>
-    </Label>
-    <Button id="IDC_BUTTON_FASTREWIND" parent="IDL_MAIN_FORM">
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T01_icon_toolbar_previous.png" normalBitmapPath="" normalColor="#1E1E1E" normalColorOpacity="0" normalTextColor="" pressedBGBitmapPath="T01_icon_toolbar_previous.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
-        <layout height="114" mode="Portrait" width="136" x="148" y="995"/>
-        <layout height="114" mode="Landscape" width="136" x="286" y="449"/>
-    </Button>
-    <Button id="IDC_BUTTON_PLAY" parent="IDL_MAIN_FORM">
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T01_icon_toolbar_play.png" normalBitmapPath="" normalColor="#1E1E1E" normalColorOpacity="0" normalTextColor="" pressedBGBitmapPath="T01_icon_toolbar_play.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
-        <layout height="114" mode="Portrait" width="136" x="292" y="995"/>
-        <layout height="114" mode="Landscape" width="136" x="572" y="449"/>
-    </Button>
-    <Button id="IDC_BUTTON_FASTFORWARD" parent="IDL_MAIN_FORM">
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T01_icon_toolbar_next.png" normalBitmapPath="" normalColor="#1E1E1E" normalColorOpacity="0" normalTextColor="" pressedBGBitmapPath="T01_icon_toolbar_next.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
-        <layout height="114" mode="Portrait" width="136" x="436" y="995"/>
-        <layout height="114" mode="Landscape" width="136" x="858" y="449"/>
-    </Button>
-    <Button id="IDC_BUTTON_BACK" parent="IDL_MAIN_FORM">
-        <property DisabledBitmapX="0" DisabledBitmapY="0" NormalBitmapX="0" NormalBitmapY="0" PressedBitmapX="0" PressedBitmapY="0" disableTextColor="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="T01_btn_toolbar_back.png" normalBitmapPath="" normalColor="#1E1E1E" normalColorOpacity="0" normalTextColor="" pressedBGBitmapPath="T01_btn_toolbar_back.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33" verticalAlign="ALIGN_MIDDLE"/>
-        <layout height="114" mode="Portrait" width="136" x="584" y="995"/>
-        <layout height="112" mode="Landscape" width="136" x="1144" y="449"/>
-    </Button>
-    <Label id="IDC_LABEL_LINE1" parent="IDL_MAIN_FORM">
-        <property backgroundBitmapPath="" backgroundColor="#D5C5A9" backgroundColorOpacity="30" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>
-        <layout height="1" mode="Portrait" width="720" x="0" y="894"/>
-        <layout height="1" mode="Landscape" width="1280" x="0" y="392"/>
-    </Label>
-    <Slider id="IDC_SLIDER" parent="IDL_MAIN_FORM">
-        <property backgroundColor="" backgroundStyle="BACKGROUND_STYLE_NONE" barColor="#FFFFFF" color="#1E1E1E" colorOfTitleText="" colorOpacity="0" disabledThumbBitmap="" disabledThumbTextColor="" groupStyle="GROUP_STYLE_NONE" highlightedThumbBitmap="" highlightedThumbTextColor="" leftIconBitmapPath="" max="100" min="0" normalThumbBitmap="" normalThumbTextColor="" pressedThumbBitmap="" pressedThumbTextColor="" rightIconBitmapPath="" showTitleText="false" sliderStyle="SLIDER_STYLE_NONE" titleText="" value="100"/>
-        <layout height="112" mode="Portrait" width="460" x="130" y="895"/>
-        <layout height="112" mode="Landscape" width="962" x="159" y="343"/>
-    </Slider>
-    <Label id="IDC_LABEL_CURRENTTIME" parent="IDL_MAIN_FORM">
-        <property backgroundBitmapPath="" backgroundColor="#1E1E1E" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="00:00:00" textColor="#FFFFFF" textSize="25" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>
-        <layout height="28" mode="Portrait" width="130" x="10" y="935"/>
-        <layout height="26" mode="Landscape" width="130" x="20" y="380"/>
-    </Label>
-    <Label id="IDC_LABEL_FULLTIME" parent="IDL_MAIN_FORM">
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_RIGHT" text="59:59:59" textColor="#909090" textSize="25" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>
-        <layout height="28" mode="Portrait" width="130" x="580" y="935"/>
-        <layout height="26" mode="Landscape" width="130" x="1130" y="380"/>
-    </Label>
-    <Label id="IDC_LABEL_VERTICAL_LINE_LEFT" parent="IDL_MAIN_FORM">
-        <property backgroundBitmapPath="" backgroundColor="#909090" backgroundColorOpacity="30" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>
-        <layout height="114" mode="Portrait" width="1" x="136" y="995"/>
-        <layout height="114" mode="Landscape" width="2" x="212" y="449"/>
-    </Label>
-    <Label id="IDC_LABEL_VERTICAL_LINE_RIGHT" parent="IDL_MAIN_FORM">
-        <property backgroundBitmapPath="" backgroundColor="#909090" backgroundColorOpacity="30" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>
-        <layout height="114" mode="Portrait" width="1" x="584" y="995"/>
-        <layout height="114" mode="Landscape" width="2" x="1066" y="449"/>
-    </Label>
-</Scene>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
+-->\r
+<!DOCTYPE Scene SYSTEM "UIForm.dtd">\r
+\r
+<Scene Bversion="2.0.0.201303111435" Dversion="20120315">\r
+    <LogicalCoordinate>720</LogicalCoordinate>\r
+    <Form id="IDL_MAIN_FORM">\r
+        <property backgroundColor="#000000" backgroundColorOpacity="100" orientation="Automatic" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_LEFT" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>\r
+        <layout mode="Portrait" style="FORM_STYLE_NORMAL" type="LAYOUT_RELATIVE"/>\r
+        <layout mode="Landscape" style="FORM_STYLE_NORMAL" type="LAYOUT_RELATIVE"/>\r
+    </Form>\r
+    <Label id="IDC_LABEL_TOP_BORDER" parent="IDL_MAIN_FORM">\r
+        <property backgroundBitmapPath="" backgroundColor="#8080FF" backgroundColorOpacity="50" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="6" 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="720" x="0" y="0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="6" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MAIN_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_MAIN_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_MAIN_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="0"/>\r
+    </Label>\r
+    <Panel id="IDC_PANEL_HEADER" parent="IDL_MAIN_FORM">\r
+        <property backgroundColor="#000000" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MAIN_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="20" marginRight="26" marginTop="31" mode="Portrait" rightRelation="IDL_MAIN_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_MAIN_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="674" x="20" y="31"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="52" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MAIN_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="26" marginRight="26" marginTop="31" mode="Landscape" rightRelation="IDL_MAIN_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_MAIN_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="1228" x="26" y="31"/>\r
+    </Panel>\r
+    <Label id="IDC_LABEL_VIDEO_TITLE" parent="IDC_PANEL_HEADER">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="#FFFFFF" textSize="35" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDC_PANEL_HEADER" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="50" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL_HEADER" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDC_PANEL_HEADER" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_PANEL_HEADER" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="674" x="0" y="0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="50" 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="1148" x="0" y="0"/>\r
+    </Label>\r
+    <Panel id="IDC_PANEL_CONTROLLER" parent="IDL_MAIN_FORM">\r
+        <property backgroundColor="#292929" backgroundColorOpacity="100" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout bottomRelation="IDL_MAIN_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="336" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MAIN_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="IDL_MAIN_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720" x="0" y="944"/>\r
+        <layout bottomRelation="IDL_MAIN_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="230" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MAIN_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDL_MAIN_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="490"/>\r
+    </Panel>\r
+    <Button id="IDC_BUTTON_BACK" parent="IDC_PANEL_CONTROLLER">\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="T01_2_icon_back.png" normalBitmapPath="" normalColor="#ECEAE2" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T01_2_icon_back_press_web.png" pressedBitmapPath="" pressedColor="#4093F7" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDC_PANEL_CONTROLLER" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="4" marginLeft="0" marginRight="26" marginTop="0" mode="Portrait" rightRelation="IDC_PANEL_CONTROLLER" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="631" y="269"/>\r
+        <layout bottomRelation="IDC_PANEL_CONTROLLER" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="63" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="6" marginLeft="0" marginRight="26" marginTop="0" mode="Landscape" rightRelation="IDC_PANEL_CONTROLLER" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63" x="1191" y="161"/>\r
+    </Button>\r
+    <Button id="IDC_BUTTON_PLAY" parent="IDC_PANEL_CONTROLLER">\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="T01-2_control_circle_button_01.png" normalBitmapPath="T01-2_control_circle_icon_play.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T01-2_control_circle_button_01_press.png" pressedBitmapPath="T01-2_control_circle_icon_play_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDC_PANEL_CONTROLLER" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="132" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL_CONTROLLER" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="4" marginLeft="294" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="132" x="294" y="200"/>\r
+        <layout bottomRelation="IDC_PANEL_CONTROLLER" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="true" centerVertical="false" height="132" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="6" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="132" x="574" y="92"/>\r
+    </Button>\r
+    <Button id="IDC_BUTTON_FASTFORWARD" parent="IDC_PANEL_CONTROLLER">\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="T01-2_control_circle_button_02.png" normalBitmapPath="T01-2_control_circle_icon_next.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T01-2_control_circle_button_02_press.png" pressedBitmapPath="T01-2_control_circle_icon_next_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDC_PANEL_CONTROLLER" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="108" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="16" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="108" x="452" y="212"/>\r
+        <layout bottomRelation="IDC_PANEL_CONTROLLER" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="108" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_BUTTON_PLAY" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="12" marginLeft="27" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="108" x="733" y="110"/>\r
+    </Button>\r
+    <Button id="IDC_BUTTON_FASTREWIND" parent="IDC_PANEL_CONTROLLER">\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="T01-2_control_circle_button_02.png" normalBitmapPath="T01-2_control_circle_icon_previous.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T01-2_control_circle_button_02_press.png" pressedBitmapPath="T01-2_control_circle_icon_previous_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDC_PANEL_CONTROLLER" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="108" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL_CONTROLLER" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="16" marginLeft="159" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="108" x="159" y="212"/>\r
+        <layout bottomRelation="IDC_PANEL_CONTROLLER" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="108" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="12" marginLeft="0" marginRight="27" marginTop="0" mode="Landscape" rightRelation="IDC_BUTTON_PLAY" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="108" x="439" y="110"/>\r
+    </Button>\r
+    <Label id="IDC_LABEL_CURRENTTIME" parent="IDC_PANEL_CONTROLLER">\r
+        <property backgroundBitmapPath="" backgroundColor="#000000" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="00:00:00" textColor="#FFFFFF" textSize="23" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDC_BUTTON_PLAY" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="30" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL_CONTROLLER" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="26" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="130" x="26" y="170"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="30" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL_CONTROLLER" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="34" marginRight="0" marginTop="30" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_PANEL_CONTROLLER" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="130" x="34" y="30"/>\r
+    </Label>\r
+    <Label id="IDC_LABEL_FULLTIME" parent="IDC_PANEL_CONTROLLER">\r
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_RIGHT" text="00:00:00" textColor="#FFFFFF" textSize="23" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDC_BUTTON_PLAY" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="30" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="26" marginTop="0" mode="Portrait" rightRelation="IDC_PANEL_CONTROLLER" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="130" x="564" y="170"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="30" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="34" marginTop="30" mode="Landscape" rightRelation="IDC_PANEL_CONTROLLER" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_PANEL_CONTROLLER" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="130" x="1116" y="30"/>\r
+    </Label>\r
+    <Slider id="IDC_SLIDER" parent="IDC_PANEL_CONTROLLER">\r
+        <property backgroundColor="" backgroundStyle="BACKGROUND_STYLE_NONE" barColor="" color="" colorOfTitleText="" colorOpacity="100" disabledThumbBitmap="" disabledThumbTextColor="" groupStyle="GROUP_STYLE_NONE" highlightedThumbBitmap="" highlightedThumbTextColor="" leftIconBitmapPath="" max="999" min="0" normalThumbBitmap="" normalThumbTextColor="" pressedThumbBitmap="" pressedThumbTextColor="" rightIconBitmapPath="" showTitleText="false" titleText="" value="500"/>\r
+        <layout bottomRelation="IDC_LABEL_CURRENTTIME" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="90" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL_CONTROLLER" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="26" marginRight="26" marginTop="0" mode="Portrait" rightRelation="IDC_PANEL_CONTROLLER" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="668" x="26" y="80"/>\r
+        <layout bottomRelation="IDC_BUTTON_PLAY" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="92" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_LABEL_CURRENTTIME" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0" marginLeft="22" marginRight="22" marginTop="0" mode="Landscape" rightRelation="IDC_LABEL_FULLTIME" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDC_PANEL_CONTROLLER" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="908" x="186" y="0"/>\r
+    </Slider>\r
+    <Button id="IDC_BUTTON_MULTIWINDOW" parent="IDC_PANEL_CONTROLLER">\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="T01-2_control_circle_button_03.png" normalBitmapPath="T01-2_function_icon_repeat.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T01-2_control_circle_button_03_press.png" pressedBitmapPath="T01-2_function_icon_repeat_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDC_SLIDER" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="70" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="26" marginTop="10" mode="Portrait" rightRelation="IDC_PANEL_CONTROLLER" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_PANEL_CONTROLLER" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="70" x="624" y="10"/>\r
+        <layout bottomRelation="IDC_PANEL_CONTROLLER" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="70" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="31" marginLeft="42" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="70" x="1009" y="129"/>\r
+    </Button>\r
+    <Panel id="IDC_PANEL_FUNCTION" parent="IDL_MAIN_FORM">\r
+        <property backgroundColor="#000000" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="70" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MAIN_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="26" marginRight="26" marginTop="10" mode="Portrait" rightRelation="IDL_MAIN_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_PANEL_HEADER" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="668" x="26" y="91"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="70" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MAIN_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="26" marginRight="26" marginTop="0" mode="Landscape" rightRelation="IDL_MAIN_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_PANEL_HEADER" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="1228" x="26" y="83"/>\r
+    </Panel>\r
+    <Button id="IDC_BUTTON_SHARE" parent="IDC_PANEL_FUNCTION">\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="T01-2_control_circle_button_03.png" normalBitmapPath="T01-2_function_icon_share.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T01-2_control_circle_button_03_press.png" pressedBitmapPath="T01-2_function_icon_share_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="70" 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="70" x="26" y="0"/>\r
+        <layout bottomRelation="IDC_PANEL_FUNCTION" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="70" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_PANEL_FUNCTION" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_PANEL_FUNCTION" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="70" x="0" y="0"/>\r
+    </Button>\r
+    <Button id="IDC_BUTTON_SCREENMODE" parent="IDC_PANEL_FUNCTION">\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="T01-2_control_circle_button_03.png" normalBitmapPath="T01-2_function_icon_screenmode.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="T01-2_control_circle_button_03_press.png" pressedBitmapPath="T01-2_Function_icon_screenmode_press.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="IDC_PANEL_FUNCTION" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="70" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="26" marginTop="0" mode="Portrait" rightRelation="IDC_PANEL_FUNCTION" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="70" x="572" y="0"/>\r
+        <layout bottomRelation="IDC_PANEL_FUNCTION" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="70" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="IDC_PANEL_FUNCTION" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_PANEL_FUNCTION" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="70" x="1158" y="0"/>\r
+    </Button>\r
+</Scene>\r
index a0d2092..5d50028 100644 (file)
@@ -53,4 +53,4 @@ FormFactory::CreateFormN(const String& formId, const SceneId& sceneId)
        }
 
        return pNewForm;
-}
+}
\ No newline at end of file
index edeb13a..e9967de 100644 (file)
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -130,4 +130,4 @@ void
 MainFrame::OnFrameTerminating(const Frame& source)
 {
        AppLogDebug("OnFrameTerminating");
-}
+}
\ No newline at end of file
index 6ad276d..3fbaea9 100644 (file)
@@ -454,4 +454,4 @@ SoundPathPopup::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
        default:
                break;
        }
-}
+}
\ No newline at end of file
index 196c77b..14d4d7b 100644 (file)
@@ -37,4 +37,17 @@ const wchar_t* IDS_COM_OPT_SPEAKER_ABB = L"IDS_COM_OPT_SPEAKER_ABB";
 const wchar_t* IDS_COM_OPT_HEADPHONES_ABB = L"IDS_COM_OPT_HEADPHONES_ABB";
 const wchar_t* IDS_COM_POP_CLOSE = L"IDS_COM_POP_CLOSE";
 const wchar_t* IDS_COM_POP_UNSUPPORTED_FILE_TYPE = L"IDS_COM_POP_UNSUPPORTED_FILE_TYPE";
-const wchar_t* IDS_VPL_POP_UNABLE_TO_PLAY_VIDEO_ERROR_OCCURRED = L"IDS_VPL_POP_UNABLE_TO_PLAY_VIDEO_ERROR_OCCURRED";
\ No newline at end of file
+const wchar_t* IDS_VPL_POP_UNABLE_TO_PLAY_VIDEO_ERROR_OCCURRED = L"IDS_VPL_POP_UNABLE_TO_PLAY_VIDEO_ERROR_OCCURRED";
+
+const wchar_t* IDC_PANEL_HEADER = L"IDC_PANEL_HEADER";
+const wchar_t* IDC_PANEL_FUNCTION = L"IDC_PANEL_FUNCTION";
+const wchar_t* IDC_PANEL_CONTROLLER = L"IDC_PANEL_CONTROLLER";
+const wchar_t* IDC_BUTTON_PLAY = L"IDC_BUTTON_PLAY";
+const wchar_t* IDC_BUTTON_FASTREWIND = L"IDC_BUTTON_FASTREWIND";
+const wchar_t* IDC_BUTTON_FASTFORWARD = L"IDC_BUTTON_FASTFORWARD";
+const wchar_t* IDC_BUTTON_BACK = L"IDC_BUTTON_BACK";
+const wchar_t* IDC_BUTTON_SCREENMODE = L"IDC_BUTTON_SCREENMODE";
+const wchar_t* IDC_LABEL_CURRENTTIME = L"IDC_LABEL_CURRENTTIME";
+const wchar_t* IDC_LABEL_FULLTIME = L"IDC_LABEL_FULLTIME";
+const wchar_t* IDC_LABEL_VIDEO_TITLE = L"IDC_LABEL_VIDEO_TITLE";
+const wchar_t* IDC_SLIDER = L"IDC_SLIDER";
\ No newline at end of file
index 0a5fbde..e4fde27 100644 (file)
@@ -54,4 +54,4 @@ OspMain(int argc, char *pArgv[])
 }
 #ifdef __cplusplus
 }
-#endif // __cplusplus
+#endif // __cplusplus
\ No newline at end of file
index e7db4ac..2ed4c15 100644 (file)
@@ -58,189 +58,6 @@ static const int Y_NORMAL = 310;
 static const int W_NORMAL = 720;
 static const int H_NORMAL = 432;
 
-static const int W_WVGA_PORTRAIT_HEIGHT = 1200;
-static const int W_WVGA_LANDSCAPE_WIDTH = 1200;
-
-static const int X_WVGA_PORTRAIT_CONTROLLER = 0;
-static const int Y_WVGA_PORTRAIT_CONTROLLER = 974;
-static const int W_WVGA_PORTRAIT_CONTROLLER = 720;
-static const int H_WVGA_PORTRAIT_CONTROLLER = 226;
-static const int X_WVGA_PORTRAIT_FIRST_LINE = 0;
-static const int Y_WVGA_PORTRAIT_FIRST_LINE = 973;
-static const int W_WVGA_PORTRAIT_FIRST_LINE = 720;
-static const int H_WVGA_PORTRAIT_FIRST_LINE = 1;
-static const int X_WVGA_PORTRAIT_CURRENT_TIME = 10;
-static const int Y_WVGA_PORTRAIT_CURRENT_TIME = 1016;
-static const int W_WVGA_PORTRAIT_CURRENT_TIME = 130;
-static const int H_WVGA_PORTRAIT_CURRENT_TIME = 28;
-static const int X_WVGA_PORTRAIT_SLIDER = 136;
-static const int Y_WVGA_PORTRAIT_SLIDER = 974;
-static const int W_WVGA_PORTRAIT_SLIDER = 460;
-static const int H_WVGA_PORTRAIT_SLIDER = 112;
-static const int X_WVGA_PORTRAIT_TOTAL_TIME = 580;
-static const int Y_WVGA_PORTRAIT_TOTAL_TIME = 1016;
-static const int W_WVGA_PORTRAIT_TOTAL_TIME = 130;
-static const int H_WVGA_PORTRAIT_TOTAL_TIME = 28;
-static const int X_WVGA_PORTRAIT_VERTICAL_LEFT_LINE = 136;
-static const int Y_WVGA_PORTRAIT_VERTICAL_LEFT_LINE = 1086;
-static const int W_WVGA_PORTRAIT_VERTICAL_LEFT_LINE = 1;
-static const int H_WVGA_PORTRAIT_VERTICAL_LEFT_LINE = 114;
-static const int X_WVGA_PORTRAIT_FASTREWIND_BTN = 148;
-static const int Y_WVGA_PORTRAIT_FASTREWIND_BTN = 1086;
-static const int W_WVGA_PORTRAIT_FASTREWIND_BTN = 136;
-static const int H_WVGA_PORTRAIT_FASTREWIND_BTN = 114;
-static const int X_WVGA_PORTRAIT_PLAYPAUSE_BTN = 292;
-static const int Y_WVGA_PORTRAIT_PLAYPAUSE_BTN = 1086;
-static const int W_WVGA_PORTRAIT_PLAYPAUSE_BTN = 136;
-static const int H_WVGA_PORTRAIT_PLAYPAUSE_BTN = 114;
-static const int X_WVGA_PORTRAIT_FASTFORWARD_BTN = 436;
-static const int Y_WVGA_PORTRAIT_FASTFORWARD_BTN = 1086;
-static const int W_WVGA_PORTRAIT_FASTFORWARD_BTN = 136;
-static const int H_WVGA_PORTRAIT_FASTFORWARD_BTN = 114;
-static const int X_WVGA_PORTRAIT_VERTICAL_RIGHT_LINE = 584;
-static const int Y_WVGA_PORTRAIT_VERTICAL_RIGHT_LINE = 1086;
-static const int W_WVGA_PORTRAIT_VERTICAL_RIGHT_LINE = 1;
-static const int H_WVGA_PORTRAIT_VERTICAL_RIGHT_LINE = 114;
-static const int X_WVGA_PORTRAIT_BACK_BTN = 584;
-static const int Y_WVGA_PORTRAIT_BACK_BTN = 1086;
-static const int W_WVGA_PORTRAIT_BACK_BTN = 136;
-static const int H_WVGA_PORTRAIT_BACK_BTN = 114;
-
-static const int X_WVGA_LANDSCAPE_CONTROLLER = 0;
-static const int Y_WVGA_LANDSCAPE_CONTROLLER = 494;
-static const int W_WVGA_LANDSCAPE_CONTROLLER = 1200;
-static const int H_WVGA_LANDSCAPE_CONTROLLER = 226;
-static const int X_WVGA_LANDSCAPE_FIRST_LINE = 0;
-static const int Y_WVGA_LANDSCAPE_FIRST_LINE = 493;
-static const int W_WVGA_LANDSCAPE_FIRST_LINE = 1200;
-static const int H_WVGA_LANDSCAPE_FIRST_LINE = 1;
-static const int X_WVGA_LANDSCAPE_CURRENT_TIME = 20;
-static const int Y_WVGA_LANDSCAPE_CURRENT_TIME = 537;
-static const int W_WVGA_LANDSCAPE_CURRENT_TIME = 130;
-static const int H_WVGA_LANDSCAPE_CURRENT_TIME = 26;
-static const int X_WVGA_LANDSCAPE_SLIDER = 140;
-static const int Y_WVGA_LANDSCAPE_SLIDER = 494;
-static const int W_WVGA_LANDSCAPE_SLIDER = 940;
-static const int H_WVGA_LANDSCAPE_SLIDER = 112;
-static const int X_WVGA_LANDSCAPE_TOTAL_TIME = 1060;
-static const int Y_WVGA_LANDSCAPE_TOTAL_TIME = 537;
-static const int W_WVGA_LANDSCAPE_TOTAL_TIME = 130;
-static const int H_WVGA_LANDSCAPE_TOTAL_TIME = 26;
-static const int X_WVGA_LANDSCAPE_VERTICAL_LEFT_LINE = 212;
-static const int Y_WVGA_LANDSCAPE_VERTICAL_LEFT_LINE = 606;
-static const int W_WVGA_LANDSCAPE_VERTICAL_LEFT_LINE = 2;
-static const int H_WVGA_LANDSCAPE_VERTICAL_LEFT_LINE = 114;
-static const int X_WVGA_LANDSCAPE_FASTREWIND_BTN = 236;
-static const int Y_WVGA_LANDSCAPE_FASTREWIND_BTN = 606;
-static const int W_WVGA_LANDSCAPE_FASTREWIND_BTN = 136;
-static const int H_WVGA_LANDSCAPE_FASTREWIND_BTN = 114;
-static const int X_WVGA_LANDSCAPE_PLAYPAUSE_BTN = 552;
-static const int Y_WVGA_LANDSCAPE_PLAYPAUSE_BTN = 606;
-static const int W_WVGA_LANDSCAPE_PLAYPAUSE_BTN = 136;
-static const int H_WVGA_LANDSCAPE_PLAYPAUSE_BTN = 114;
-static const int X_WVGA_LANDSCAPE_FASTFORWARD_BTN = 858;
-static const int Y_WVGA_LANDSCAPE_FASTFORWARD_BTN = 606;
-static const int W_WVGA_LANDSCAPE_FASTFORWARD_BTN = 136;
-static const int H_WVGA_LANDSCAPE_FASTFORWARD_BTN = 114;
-static const int X_WVGA_LANDSCAPE_VERTICAL_RIGHT_LINE = 1016;
-static const int Y_WVGA_LANDSCAPE_VERTICAL_RIGHT_LINE = 606;
-static const int W_WVGA_LANDSCAPE_VERTICAL_RIGHT_LINE = 2;
-static const int H_WVGA_LANDSCAPE_VERTICAL_RIGHT_LINE = 114;
-static const int X_WVGA_LANDSCAPE_BACK_BTN = 1064;
-static const int Y_WVGA_LANDSCAPE_BACK_BTN = 606;
-static const int W_WVGA_LANDSCAPE_BACK_BTN = 136;
-static const int H_WVGA_LANDSCAPE_BACK_BTN = 114;
-
-static const int X_HVGA_PORTRAIT_CONTROLLER = 0;
-static const int Y_HVGA_PORTRAIT_CONTROLLER = 1054;
-static const int W_HVGA_PORTRAIT_CONTROLLER = 720;
-static const int H_HVGA_PORTRAIT_CONTROLLER = 226;
-static const int X_HVGA_PORTRAIT_FIRST_LINE = 0;
-static const int Y_HVGA_PORTRAIT_FIRST_LINE = 1053;
-static const int W_HVGA_PORTRAIT_FIRST_LINE = 720;
-static const int H_HVGA_PORTRAIT_FIRST_LINE = 1;
-static const int X_HVGA_PORTRAIT_CURRENT_TIME = 10;
-static const int Y_HVGA_PORTRAIT_CURRENT_TIME = 1096;
-static const int W_HVGA_PORTRAIT_CURRENT_TIME = 130;
-static const int H_HVGA_PORTRAIT_CURRENT_TIME = 28;
-static const int X_HVGA_PORTRAIT_SLIDER = 136;
-static const int Y_HVGA_PORTRAIT_SLIDER = 1054;
-static const int W_HVGA_PORTRAIT_SLIDER = 460;
-static const int H_HVGA_PORTRAIT_SLIDER = 112;
-static const int X_HVGA_PORTRAIT_TOTAL_TIME = 580;
-static const int Y_HVGA_PORTRAIT_TOTAL_TIME = 1096;
-static const int W_HVGA_PORTRAIT_TOTAL_TIME = 130;
-static const int H_HVGA_PORTRAIT_TOTAL_TIME = 28;
-static const int X_HVGA_PORTRAIT_VERTICAL_LEFT_LINE = 136;
-static const int Y_HVGA_PORTRAIT_VERTICAL_LEFT_LINE = 1166;
-static const int W_HVGA_PORTRAIT_VERTICAL_LEFT_LINE = 1;
-static const int H_HVGA_PORTRAIT_VERTICAL_LEFT_LINE = 114;
-static const int X_HVGA_PORTRAIT_FASTREWIND_BTN = 148;
-static const int Y_HVGA_PORTRAIT_FASTREWIND_BTN = 1166;
-static const int W_HVGA_PORTRAIT_FASTREWIND_BTN = 136;
-static const int H_HVGA_PORTRAIT_FASTREWIND_BTN = 114;
-static const int X_HVGA_PORTRAIT_PLAYPAUSE_BTN = 292;
-static const int Y_HVGA_PORTRAIT_PLAYPAUSE_BTN = 1166;
-static const int W_HVGA_PORTRAIT_PLAYPAUSE_BTN = 136;
-static const int H_HVGA_PORTRAIT_PLAYPAUSE_BTN = 114;
-static const int X_HVGA_PORTRAIT_FASTFORWARD_BTN = 436;
-static const int Y_HVGA_PORTRAIT_FASTFORWARD_BTN = 1166;
-static const int W_HVGA_PORTRAIT_FASTFORWARD_BTN = 136;
-static const int H_HVGA_PORTRAIT_FASTFORWARD_BTN = 114;
-static const int X_HVGA_PORTRAIT_VERTICAL_RIGHT_LINE = 584;
-static const int Y_HVGA_PORTRAIT_VERTICAL_RIGHT_LINE = 1166;
-static const int W_HVGA_PORTRAIT_VERTICAL_RIGHT_LINE = 1;
-static const int H_HVGA_PORTRAIT_VERTICAL_RIGHT_LINE = 114;
-static const int X_HVGA_PORTRAIT_BACK_BTN = 584;
-static const int Y_HVGA_PORTRAIT_BACK_BTN = 1166;
-static const int W_HVGA_PORTRAIT_BACK_BTN = 136;
-static const int H_HVGA_PORTRAIT_BACK_BTN = 114;
-
-static const int X_HVGA_LANDSCAPE_CONTROLLER = 0;
-static const int Y_HVGA_LANDSCAPE_CONTROLLER = 494;
-static const int W_HVGA_LANDSCAPE_CONTROLLER = 1280;
-static const int H_HVGA_LANDSCAPE_CONTROLLER = 226;
-static const int X_HVGA_LANDSCAPE_FIRST_LINE = 0;
-static const int Y_HVGA_LANDSCAPE_FIRST_LINE = 493;
-static const int W_HVGA_LANDSCAPE_FIRST_LINE = 1280;
-static const int H_HVGA_LANDSCAPE_FIRST_LINE = 1;
-static const int X_HVGA_LANDSCAPE_CURRENT_TIME = 20;
-static const int Y_HVGA_LANDSCAPE_CURRENT_TIME = 537;
-static const int W_HVGA_LANDSCAPE_CURRENT_TIME = 130;
-static const int H_HVGA_LANDSCAPE_CURRENT_TIME = 26;
-static const int X_HVGA_LANDSCAPE_SLIDER = 160;
-static const int Y_HVGA_LANDSCAPE_SLIDER = 494;
-static const int W_HVGA_LANDSCAPE_SLIDER = 960;
-static const int H_HVGA_LANDSCAPE_SLIDER = 112;
-static const int X_HVGA_LANDSCAPE_TOTAL_TIME = 1130;
-static const int Y_HVGA_LANDSCAPE_TOTAL_TIME = 537;
-static const int W_HVGA_LANDSCAPE_TOTAL_TIME = 130;
-static const int H_HVGA_LANDSCAPE_TOTAL_TIME = 26;
-static const int X_HVGA_LANDSCAPE_VERTICAL_LEFT_LINE = 212;
-static const int Y_HVGA_LANDSCAPE_VERTICAL_LEFT_LINE = 606;
-static const int W_HVGA_LANDSCAPE_VERTICAL_LEFT_LINE = 2;
-static const int H_HVGA_LANDSCAPE_VERTICAL_LEFT_LINE = 114;
-static const int X_HVGA_LANDSCAPE_FASTREWIND_BTN = 286;
-static const int Y_HVGA_LANDSCAPE_FASTREWIND_BTN = 606;
-static const int W_HVGA_LANDSCAPE_FASTREWIND_BTN = 136;
-static const int H_HVGA_LANDSCAPE_FASTREWIND_BTN = 114;
-static const int X_HVGA_LANDSCAPE_PLAYPAUSE_BTN = 572;
-static const int Y_HVGA_LANDSCAPE_PLAYPAUSE_BTN = 606;
-static const int W_HVGA_LANDSCAPE_PLAYPAUSE_BTN = 136;
-static const int H_HVGA_LANDSCAPE_PLAYPAUSE_BTN = 114;
-static const int X_HVGA_LANDSCAPE_FASTFORWARD_BTN = 858;
-static const int Y_HVGA_LANDSCAPE_FASTFORWARD_BTN = 606;
-static const int W_HVGA_LANDSCAPE_FASTFORWARD_BTN = 136;
-static const int H_HVGA_LANDSCAPE_FASTFORWARD_BTN = 114;
-static const int X_HVGA_LANDSCAPE_VERTICAL_RIGHT_LINE = 1066;
-static const int Y_HVGA_LANDSCAPE_VERTICAL_RIGHT_LINE = 606;
-static const int W_HVGA_LANDSCAPE_VERTICAL_RIGHT_LINE = 2;
-static const int H_HVGA_LANDSCAPE_VERTICAL_RIGHT_LINE = 114;
-static const int X_HVGA_LANDSCAPE_BACK_BTN = 1144;
-static const int Y_HVGA_LANDSCAPE_BACK_BTN = 606;
-static const int W_HVGA_LANDSCAPE_BACK_BTN = 136;
-static const int H_HVGA_LANDSCAPE_BACK_BTN = 114;
-
 static const int COLOR_THUMB_RED = 0;
 static const int COLOR_THUMB_GREEN = 0;
 static const int COLOR_THUMB_BLUE = 0;
@@ -266,19 +83,17 @@ VideoPlayerForm::VideoPlayerForm(void)
        , __pSoundPathPopup(null)
        , __pUiControlTimer(null)
        , __pAudioRouteManager(null)
+       , __pHeaderPanel(null)
+       , __pFunctionPanel(null)
+       , __pControllerPanel(null)
        , __pPlayPauseButton(null)
        , __pFastForwardButton(null)
        , __pFastRewindButton(null)
        , __pBackButton(null)
-       , __pButtonLeftItem(null)
-       , __pButtonRightItem(null)
-       , __pHeader(null)
-       , __pControlLabel(null)
+       , __pScreenModeButton(null)
+       , __pHeaderTitle(null)
        , __pCurrenTimeLabel(null)
-       , __pFirstLineLabel(null)
        , __pTotalTimeLabel(null)
-       , __pVerticalLeftLine(null)
-       , __pVerticalRightLine(null)
        , __pSlider(null)
        , __actionTouchLongPressed(false)
        , __setPauseState(false)
@@ -483,27 +298,17 @@ VideoPlayerForm::OnInitializing(void)
 {
        result r = E_FAILURE;
 
-       Bitmap* pBitmapScreenMode = null;
-       Bitmap* pBitmapSoundPath = null;
-       Bitmap* pSliderThumbNormalBitmap = null;
-       Bitmap* pSliderThumbPressedBitmap = null;
-       Bitmap* pSliderThumbDisableBitmap = null;
-
        AppLogDebug("OnInitializing");
 
-       AppResource* pAppResource = Application::GetInstance()->GetAppResource();
-
        AddOrientationEventListener(*this);
        AddKeyEventListener(*this);
        AddTouchEventListener(*this);
 
-       r = SetActionBarsTranslucent(FORM_ACTION_BAR_INDICATOR | FORM_ACTION_BAR_HEADER, true);
-       TryCatch(r == E_SUCCESS, , "SetActionBarsTranslucent() failed:%s", GetErrorMessage(r));
-
        __pAudioRouteManager = AudioRouteManager::GetInstance();
        __pAudioRouteManager->SetAudioRouteEventListener(this);
 
-       SetScreenMode(SCREEN_MODE_NORMAL, true);
+       r = SetScreenMode(SCREEN_MODE_NORMAL, true);
+       TryCatch(r == E_SUCCESS, , "SetScreenMode() failed:%s", GetErrorMessage(r));
 
        __pVideoPlayerPresentationModel = VideoPlayerPresentationModel::GetInstance();
        TryCatch(__pVideoPlayerPresentationModel != null, r = E_SYSTEM, "__pVideoPlayerPresentationModel is null");
@@ -514,77 +319,112 @@ VideoPlayerForm::OnInitializing(void)
        __pVideoPlayerPresentationModel->SetVideoPlayerEventListener(this);
 
        InitTimer();
-
        InitAudioRouteList();
 
-       __pHeader = GetHeader();
+       r = InitializeHeader();
+       TryCatch(r == E_SUCCESS, , "InitializeHeader() failed : %s", GetErrorMessage(r));
+       r = InitializeFuncPanel();
+       TryCatch(r == E_SUCCESS, , "InitializeFuncPanel() failed : %s", GetErrorMessage(r));
+       r = InitializeController();
+       TryCatch(r == E_SUCCESS, , "InitializeController() failed : %s", GetErrorMessage(r));
 
-       __pButtonLeftItem = new (std::nothrow) ButtonItem();
-       __pButtonRightItem = new (std::nothrow) ButtonItem();
+       return r;
 
-       r = __pButtonLeftItem->Construct(BUTTON_ITEM_STYLE_ICON, IDA_BUTTON_FULLSCREEN);
-       TryCatch(r == E_SUCCESS, , "buttonLeftItem->Construct() Failed:%s", GetErrorMessage(r));
+CATCH:
+       DestroyPresentationModelInstance();
 
-       r = __pButtonRightItem->Construct(BUTTON_ITEM_STYLE_ICON, IDA_BUTTON_SOUNDPATH);
-       TryCatch(r == E_SUCCESS, , "buttonRightItem->Construct() Failed:%s", GetErrorMessage(r));
+       return r;
+}
 
-       if (__audioRouteMode == AUDIO_ROUTE_SPEAKER_ONLY)
-       {
-               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode01.png");
-               r = __pButtonRightItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-               TryCatch(r == E_SUCCESS, , "__pButtonRightItem->SetIcon() Failed:%s", GetErrorMessage(r));
+result
+VideoPlayerForm::InitializeHeader(void)
+{
+       result r = E_FAILURE;
 
-               __pButtonRightItem->SetActionId(IDA_BUTTON_FULLSCREEN);
+       AppLogDebug("InitializeHeader");
 
-               __pHeader->SetButton(BUTTON_POSITION_LEFT, *__pButtonLeftItem);
-               __pHeader->SetButton(BUTTON_POSITION_RIGHT, *__pButtonRightItem);
-               __pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, false);
-       }
-       else
-       {
-               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode01.png");
-               r = __pButtonLeftItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-               TryCatch(r == E_SUCCESS, , "__pButtonLeftItem->SetIcon() Failed:%s", GetErrorMessage(r));
+       __pHeaderPanel = static_cast<Panel*>(GetControl(IDC_PANEL_HEADER));
+       TryCatch(__pHeaderPanel != null, r = E_SYSTEM, "__pHeaderPanel is null");
 
-               __pButtonLeftItem->SetActionId(IDA_BUTTON_FULLSCREEN);
-               __pHeader->SetButton(BUTTON_POSITION_LEFT, *__pButtonLeftItem);
+       __pHeaderTitle = static_cast<Label*>(__pHeaderPanel->GetControl(IDC_LABEL_VIDEO_TITLE));
+       TryCatch(__pHeaderTitle != null, r = E_SYSTEM, "__pHeaderTitle is null");
 
-               pBitmapSoundPath = pAppResource->GetBitmapN(L"T01_icon_title_soundpath.png");
-               r = __pButtonRightItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapSoundPath);
-               TryCatch(r == E_SUCCESS, , "__pButtonRightItem->SetIcon() Failed:%s", GetErrorMessage(r));
+       return E_SUCCESS;
+CATCH:
+       return r;
+}
 
-               __pButtonRightItem->SetActionId(IDA_BUTTON_SOUNDPATH);
-               __pHeader->SetButton(BUTTON_POSITION_RIGHT, *__pButtonRightItem);
-       }
+result
+VideoPlayerForm::InitializeFuncPanel(void)
+{
+       result r = E_FAILURE;
+
+       AppLogDebug("InitializeFuncPanel");
+
+       __pFunctionPanel = static_cast<Panel*>(GetControl(IDC_PANEL_FUNCTION));
+       TryCatch(__pFunctionPanel != null, r = E_SYSTEM, "__pFunctionPanel is null");
+
+       __pScreenModeButton = static_cast<Button*>(__pFunctionPanel->GetControl(IDC_BUTTON_SCREENMODE));
+       TryCatch(__pScreenModeButton != null, r = E_SYSTEM, "__pScreenModeButton is null");
+       __pScreenModeButton->SetActionId(IDA_BUTTON_FULLSCREEN);
+       __pScreenModeButton->AddActionEventListener(*this);
+       __pScreenModeButton->AddTouchEventListener(*this);
+
+       return E_SUCCESS;
+
+CATCH:
+       return r;
+}
+
+result
+VideoPlayerForm::InitializeController(void)
+{
+       result r = E_FAILURE;
 
-       __pHeader->AddActionEventListener(*this);
-       __pHeader->AddTouchEventListener(*this);
+       Bitmap* pSliderThumbNormalBitmap = null;
+       Bitmap* pSliderThumbPressedBitmap = null;
+       Bitmap* pSliderThumbDisableBitmap = null;
 
-       __pPlayPauseButton = static_cast<Button*>(GetControl("IDC_BUTTON_PLAY"));
+       AppLogDebug("InitializeController");
+
+       AppResource* pAppResource = Application::GetInstance()->GetAppResource();
+
+       __pControllerPanel = static_cast<Panel*>(GetControl(IDC_PANEL_CONTROLLER));
+       TryCatch(__pControllerPanel != null, r = E_SYSTEM, "__pControllerPanel is null");
+
+       __pPlayPauseButton = static_cast<Button*>(__pControllerPanel->GetControl(IDC_BUTTON_PLAY));
        TryCatch(__pPlayPauseButton != null, r = E_SYSTEM, "__pPlayPauseButton is null");
        __pPlayPauseButton->SetActionId(IDA_BUTTON_PLAY);
        __pPlayPauseButton->AddActionEventListener(*this);
        __pPlayPauseButton->AddTouchEventListener(*this);
 
-       __pFastRewindButton = static_cast<Button*>(GetControl("IDC_BUTTON_FASTREWIND"));
+       __pFastRewindButton  = static_cast<Button*>(__pControllerPanel->GetControl(IDC_BUTTON_FASTREWIND));
        TryCatch(__pFastRewindButton != null, r = E_SYSTEM, "__pFastRewindButton is null");
-       __pFastRewindButton->SetActionId(IDA_BUTTON_FASTREWIND);
-       __pFastRewindButton->AddActionEventListener(*this);
+       __pFastRewindButton ->SetActionId(IDA_BUTTON_FASTREWIND);
+       __pFastRewindButton ->AddActionEventListener(*this);
        __pFastRewindButton->AddTouchEventListener(*this);
 
-       __pFastForwardButton = static_cast<Button*>(GetControl("IDC_BUTTON_FASTFORWARD"));
+       __pFastForwardButton = static_cast<Button*>(__pControllerPanel->GetControl(IDC_BUTTON_FASTFORWARD));
        TryCatch(__pFastForwardButton != null, r = E_SYSTEM, "__pFastForwardButton is null");
        __pFastForwardButton->SetActionId(IDA_BUTTON_FASTFORWARD);
        __pFastForwardButton->AddActionEventListener(*this);
        __pFastForwardButton->AddTouchEventListener(*this);
 
-       __pBackButton = static_cast<Button*>(GetControl("IDC_BUTTON_BACK"));
+       __pBackButton = static_cast<Button*>(__pControllerPanel->GetControl(IDC_BUTTON_BACK));
        TryCatch(__pBackButton != null, r = E_SYSTEM, "__pBackButton is null");
        __pBackButton->SetActionId(IDA_BUTTON_BACK);
        __pBackButton->AddActionEventListener(*this);
        __pBackButton->AddTouchEventListener(*this);
 
-       __pSlider = static_cast<Slider*>(GetControl("IDC_SLIDER"));
+       __pCurrenTimeLabel = static_cast<Label*>(__pControllerPanel->GetControl(IDC_LABEL_CURRENTTIME));
+       TryCatch(__pCurrenTimeLabel != null, r = E_SYSTEM, "__pCurrenTimeLabel is null");
+       __pCurrenTimeLabel->AddTouchEventListener(*this);
+
+       __pTotalTimeLabel = static_cast<Label*>(__pControllerPanel->GetControl(IDC_LABEL_FULLTIME));
+       TryCatch(__pTotalTimeLabel != null, r = E_SYSTEM, "__pTotalTimeLabel is null");
+       __pTotalTimeLabel->AddTouchEventListener(*this);
+
+       __pSlider = static_cast<Slider*>(__pControllerPanel->GetControl(IDC_SLIDER));
        TryCatch(__pSlider != null, r = E_SYSTEM, "__pSlider is null");
        __pSlider->SetEnabled(true);
        __pSlider->SetRange(MIN_PROGRESS_RANGE, MAX_PROGRESS_RANGE);
@@ -596,64 +436,26 @@ VideoPlayerForm::OnInitializing(void)
        __pSlider->SetThumbTextColor(SLIDER_THUMB_STATUS_DISABLED,
                        Color(COLOR_THUMB_RED, COLOR_THUMB_GREEN, COLOR_THUMB_BLUE, COLOR_THUMB_ALPHA));
 
-       pSliderThumbNormalBitmap = pAppResource->GetBitmapN(L"T01_controller_progress_handle.png");
+       pSliderThumbNormalBitmap = pAppResource->GetBitmapN(L"T01_2_control_progress_handle.png");
        r = __pSlider->SetThumbBitmap(SLIDER_THUMB_STATUS_NORMAL, *pSliderThumbNormalBitmap);
        TryCatch(r == E_SUCCESS, , "__pSlider->SetThumbBitmap() Failed:%s", GetErrorMessage(r));
 
-       pSliderThumbPressedBitmap = pAppResource->GetBitmapN(L"T01_controller_progress_handle_press.png");
+       pSliderThumbPressedBitmap = pAppResource->GetBitmapN(L"T01_2_control_progress_handle_press.png");
        r = __pSlider->SetThumbBitmap(SLIDER_THUMB_STATUS_PRESSED, *pSliderThumbPressedBitmap);
        TryCatch(r == E_SUCCESS, , "__pSlider->SetThumbBitmap() Failed:%s", GetErrorMessage(r));
 
-       pSliderThumbDisableBitmap = pAppResource->GetBitmapN(L"T01_controller_progress_handle.png");
+       pSliderThumbDisableBitmap = pAppResource->GetBitmapN(L"T01_2_control_progress_handle.png");
        r = __pSlider->SetThumbBitmap(SLIDER_THUMB_STATUS_DISABLED, *pSliderThumbDisableBitmap);
        TryCatch(r == E_SUCCESS, , "__pSlider->SetThumbBitmap() Failed:%s", GetErrorMessage(r));
 
        __pSlider->AddAdjustmentEventListener(*this);
        __pSlider->AddTouchEventListener(*this);
 
-       __pCurrenTimeLabel = static_cast<Label*>(GetControl("IDC_LABEL_CURRENTTIME"));
-       TryCatch(__pCurrenTimeLabel != null, r = E_SYSTEM, "__pCurrenTimeLabel is null");
-       __pCurrenTimeLabel->AddTouchEventListener(*this);
-
-       __pCurrenTimeLabel->SetText(INIT_TIME);
-
-       __pTotalTimeLabel = static_cast<Label*>(GetControl("IDC_LABEL_FULLTIME"));
-       TryCatch(__pTotalTimeLabel != null, r = E_SYSTEM, "__pTotalTimeLabel is null");
-       __pTotalTimeLabel->AddTouchEventListener(*this);
-
-       __pTotalTimeLabel->SetText(INIT_TIME);
-
-       __pControlLabel = static_cast<Label*>(GetControl("IDC_LABEL_BOTTOM_CONTROL_PANEL"));
-       TryCatch(__pControlLabel != null, r = E_SYSTEM, "__pControlLabel is null");
-
-       __pFirstLineLabel = static_cast<Label*>(GetControl("IDC_LABEL_LINE1"));
-       TryCatch(__pFirstLineLabel != null, r = E_SYSTEM, "__pFirstLineLabel is null");
-
-       __pVerticalLeftLine = static_cast<Label*>(GetControl("IDC_LABEL_VERTICAL_LINE_LEFT"));
-       TryCatch(__pVerticalLeftLine != null, r = E_SYSTEM, "__pVerticalLeftLine is null");
-
-       __pVerticalRightLine = static_cast<Label*>(GetControl("IDC_LABEL_VERTICAL_LINE_RIGHT"));
-       TryCatch(__pVerticalRightLine != null, r = E_SYSTEM, "__pVerticalRightLine is null");
-
-       ChangedControlPos();
-
-       delete pBitmapScreenMode;
-       delete pBitmapSoundPath;
-       delete pSliderThumbNormalBitmap;
-       delete pSliderThumbPressedBitmap;
-       delete pSliderThumbDisableBitmap;
-
-       return r;
-
 CATCH:
-       delete pBitmapScreenMode;
-       delete pBitmapSoundPath;
        delete pSliderThumbNormalBitmap;
        delete pSliderThumbPressedBitmap;
        delete pSliderThumbDisableBitmap;
 
-       DestroyPresentationModelInstance();
-
        return r;
 }
 
@@ -664,12 +466,6 @@ VideoPlayerForm::OnTerminating(void)
        DeleteTimer();
        DestroyPresentationModelInstance();
 
-       delete __pButtonLeftItem;
-       __pButtonLeftItem = null;
-
-       delete __pButtonRightItem;
-       __pButtonRightItem = null;
-
        RemoveControl(*__pOverlayPanel);
        __pOverlayPanel = null;
 
@@ -686,10 +482,10 @@ VideoPlayerForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId
        AppLogDebug("OnSceneActivatedN");
 
        String totalTime;
+       Rectangle rect;
+       Point point(X_BASE, Y_BASE);
        Bitmap* pBitmapScreenMode = null;
 
-       Rectangle rect(0, 0, 0, 0);
-
        AppResource* pAppResource = Application::GetInstance()->GetAppResource();
 
        CheckCallStatus();
@@ -699,7 +495,6 @@ VideoPlayerForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId
        TryReturnVoid(r == E_SUCCESS, "__pVideoPlayerPresentationModel->StartPlay() failed:%s", GetErrorMessage(r));
 
        GetTotalTime(totalTime);
-
        AppLogDebug("totalTime [%ls]", totalTime.GetPointer());
 
        __pTotalTimeLabel->SetText(totalTime);
@@ -710,18 +505,10 @@ VideoPlayerForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId
 
        if (rect.width > W_NORMAL || rect.height > W_NORMAL)
        {
-               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode03.png");
-
-               if (__audioRouteMode == AUDIO_ROUTE_SPEAKER_ONLY)
-               {
-                       __pButtonRightItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                       __pHeader->SetButton(BUTTON_POSITION_RIGHT, *__pButtonRightItem);
-               }
-               else
-               {
-                       __pButtonLeftItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                       __pHeader->SetButton(BUTTON_POSITION_LEFT, *__pButtonLeftItem);
-               }
+               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01-2_function_icon_screenmode03.png");
+               __pScreenModeButton->SetNormalBitmap(point, *pBitmapScreenMode);
+               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01-2_function_icon_screenmode03_press.png");
+               __pScreenModeButton->SetNormalBitmap(point, *pBitmapScreenMode);
        }
 
        r = PowerManager::KeepScreenOnState(true, false);
@@ -756,9 +543,8 @@ VideoPlayerForm::OnPlayEndOfClip(bool playNextContent)
 {
        result r = E_FAILURE;
 
+       Point point(X_BASE, Y_BASE);
        Bitmap* pPlayBitmap = null;
-       Bitmap* pBitmapScreenMode = null;
-       Bitmap* pBitmapSoundPath = null;
 
        AppLogDebug("OnPlayEndOfClip : %d", playNextContent);
 
@@ -779,29 +565,18 @@ VideoPlayerForm::OnPlayEndOfClip(bool playNextContent)
        __pCurrenTimeLabel->SetText(INIT_TIME);
        __pCurrenTimeLabel->Invalidate(true);
 
-       pPlayBitmap = pAppResource->GetBitmapN(L"T01_icon_toolbar_play.png");
+       pPlayBitmap = pAppResource->GetBitmapN(L"T01-2_control_circle_icon_play.png");
        TryCatch(pPlayBitmap != null, r = E_SYSTEM, "pPlayBitmap is null");
-       __pPlayPauseButton->SetNormalBackgroundBitmap(*pPlayBitmap);
-
-       Invalidate(true);
 
+       __pPlayPauseButton->SetNormalBitmap(point ,*pPlayBitmap);
        __pPlayPauseButton->SetActionId(IDA_BUTTON_PLAY);
+       Invalidate(true);
 
        __pSlider->SetEnabled(false);
 
-       if (__audioRouteMode == AUDIO_ROUTE_SPEAKER_ONLY)
+       if (__pScreenModeButton->GetShowState() == true)
        {
-               r = __pButtonRightItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, null);
-               TryCatch(r == E_SUCCESS, , "__pButtonRightItem->SetIcon() Failed:%s", GetErrorMessage(r));
-
-               __pHeader->SetButton(BUTTON_POSITION_RIGHT, *__pButtonRightItem);
-       }
-       else
-       {
-               r = __pButtonLeftItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, null);
-               TryCatch(r == E_SUCCESS, , "__pButtonLeftItem->SetIcon() Failed:%s", GetErrorMessage(r));
-
-               __pHeader->SetButton(BUTTON_POSITION_LEFT, *__pButtonLeftItem);
+               __pScreenModeButton->SetShowState(false);
        }
 
        if (playNextContent == true)
@@ -810,33 +585,9 @@ VideoPlayerForm::OnPlayEndOfClip(bool playNextContent)
                __pVideoPlayerPresentationModel->SetOverlayPanel(__pOverlayPanel);
                __pVideoPlayerPresentationModel->InitializePlayer();
 
-               if (__audioRouteMode == AUDIO_ROUTE_SPEAKER_ONLY)
+               if (__pScreenModeButton->GetShowState() == false)
                {
-                       pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode01.png");
-                       r = __pButtonRightItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                       TryCatch(r == E_SUCCESS, , "__pButtonRightItem->SetIcon() Failed:%s", GetErrorMessage(r));
-
-                       __pButtonRightItem->SetActionId(IDA_BUTTON_FULLSCREEN);
-
-                       __pHeader->SetButton(BUTTON_POSITION_LEFT, *__pButtonLeftItem);
-                       __pHeader->SetButton(BUTTON_POSITION_RIGHT, *__pButtonRightItem);
-                       __pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, false);
-               }
-               else
-               {
-                       pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode01.png");
-                       r = __pButtonLeftItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                       TryCatch(r == E_SUCCESS, , "__pButtonLeftItem->SetIcon() Failed:%s", GetErrorMessage(r));
-
-                       __pButtonLeftItem->SetActionId(IDA_BUTTON_FULLSCREEN);
-                       __pHeader->SetButton(BUTTON_POSITION_LEFT, *__pButtonLeftItem);
-
-                       pBitmapSoundPath = pAppResource->GetBitmapN(L"T01_icon_title_soundpath.png");
-                       r = __pButtonRightItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapSoundPath);
-                       TryCatch(r == E_SUCCESS, , "__pButtonRightItem->SetIcon() Failed:%s", GetErrorMessage(r));
-
-                       __pButtonRightItem->SetActionId(IDA_BUTTON_SOUNDPATH);
-                       __pHeader->SetButton(BUTTON_POSITION_RIGHT, *__pButtonRightItem);
+                       __pScreenModeButton->SetShowState(true);
                }
 
                __pSlider->SetEnabled(true);
@@ -933,6 +684,7 @@ VideoPlayerForm::OnActionPerformed(const Control& source, int actionId)
        String currentTime;
        String totalTime;
        Rectangle rect;
+       Point point(X_BASE, Y_BASE);
        Bitmap* pBitmapScreenMode = null;
 
        PlayerState playState = PLAYER_STATE_ERROR;
@@ -969,73 +721,9 @@ VideoPlayerForm::OnActionPerformed(const Control& source, int actionId)
                        rect = __pVideoPlayerPresentationModel->GetVideoInfoN(
                                        __pVideoPlayerPresentationModel->GetMediaPathName());
 
-                       if (__audioRouteMode == AUDIO_ROUTE_SPEAKER_ONLY)
-                       {
-                               if (rect.width > W_NORMAL || rect.height > W_NORMAL)
-                               {
-                                       if (__screenMode == SCREEN_MODE_NORMAL)
-                                       {
-                                               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode03.png");
-                                       }
-                                       else if (__screenMode == SCREEN_MODE_FULL)
-                                       {
-                                               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode02.png");
-                                       }
-                               }
-                               else
-                               {
-                                       if (__screenMode == SCREEN_MODE_FIT)
-                                       {
-                                               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode03.png");
-                                       }
-                                       else if (__screenMode == SCREEN_MODE_NORMAL)
-                                       {
-                                               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode01.png");
-                                       }
-                                       else
-                                       {
-                                               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode02.png");
-                                       }
-                               }
-
-                               r = __pButtonRightItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                               TryCatch(r == E_SUCCESS, , "__pButtonRightItem->SetIcon() Failed:%s", GetErrorMessage(r));
-
-                               __pHeader->SetButton(BUTTON_POSITION_RIGHT, *__pButtonRightItem);
-                       }
-                       else
+                       if (__pScreenModeButton->GetShowState() == false)
                        {
-                               if (rect.width > W_NORMAL || rect.height > W_NORMAL)
-                               {
-                                       if (__screenMode == SCREEN_MODE_NORMAL)
-                                       {
-                                               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode03.png");
-                                       }
-                                       else if (__screenMode == SCREEN_MODE_FULL)
-                                       {
-                                               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode02.png");
-                                       }
-                               }
-                               else
-                               {
-                                       if (__screenMode == SCREEN_MODE_FIT)
-                                       {
-                                               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode03.png");
-                                       }
-                                       else if (__screenMode == SCREEN_MODE_NORMAL)
-                                       {
-                                               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode01.png");
-                                       }
-                                       else
-                                       {
-                                               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode02.png");
-                                       }
-                               }
-
-                               r = __pButtonLeftItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                               TryCatch(r == E_SUCCESS, , "__pButtonLeftItem->SetIcon() Failed:%s", GetErrorMessage(r));
-
-                               __pHeader->SetButton(BUTTON_POSITION_LEFT, *__pButtonLeftItem);
+                               __pScreenModeButton->SetShowState(true);
                        }
 
                        r = PowerManager::KeepScreenOnState(true, false);
@@ -1054,19 +742,9 @@ VideoPlayerForm::OnActionPerformed(const Control& source, int actionId)
                        TryCatch(r == E_SUCCESS, , "__pVideoPlayerPresentationModel->PausePlay() failed:%s",
                                        GetErrorMessage(r));
 
-                       if (__audioRouteMode == AUDIO_ROUTE_SPEAKER_ONLY)
+                       if (__pScreenModeButton->GetShowState() == true)
                        {
-                               r = __pButtonRightItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, null);
-                               TryCatch(r == E_SUCCESS, , "__pButtonRightItem->SetIcon() Failed:%s", GetErrorMessage(r));
-
-                               __pHeader->SetButton(BUTTON_POSITION_RIGHT, *__pButtonRightItem);
-                       }
-                       else
-                       {
-                               r = __pButtonLeftItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, null);
-                               TryCatch(r == E_SUCCESS, , "__pButtonLeftItem->SetIcon() Failed:%s", GetErrorMessage(r));
-
-                               __pHeader->SetButton(BUTTON_POSITION_LEFT, *__pButtonLeftItem);
+                               __pScreenModeButton->SetShowState(false);
                        }
 
                        r = PowerManager::KeepScreenOnState(false);
@@ -1099,25 +777,10 @@ VideoPlayerForm::OnActionPerformed(const Control& source, int actionId)
                                        __pVideoPlayerPresentationModel->SetOverlayPanel(__pOverlayPanel);
                                        __pVideoPlayerPresentationModel->SetRenderingBuffer();
 
-                                       pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode02.png");
-
-                                       if (__audioRouteMode == AUDIO_ROUTE_SPEAKER_ONLY)
-                                       {
-                                               r = __pButtonRightItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                                               TryCatch(r == E_SUCCESS, , "__pButtonRightItem->SetIcon failed:%s", GetErrorMessage(r));
-
-                                               __pHeader->SetButton(BUTTON_POSITION_RIGHT, *__pButtonRightItem);
-                                       }
-                                       else
-                                       {
-                                               r = __pButtonLeftItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                                               TryCatch(r == E_SUCCESS, , "__pButtonLeftItem->SetIcon failed:%s", GetErrorMessage(r));
-
-                                               __pHeader->SetButton(BUTTON_POSITION_LEFT, *__pButtonLeftItem);
-                                       }
-
-                                       delete pBitmapScreenMode;
-                                       pBitmapScreenMode = null;
+                                       pBitmapScreenMode = pAppResource->GetBitmapN(L"T01-2_function_icon_screenmode02.png");
+                                       __pScreenModeButton->SetNormalBitmap(point, *pBitmapScreenMode);
+                                       pBitmapScreenMode = pAppResource->GetBitmapN(L"T01-2_function_icon_screenmode02_press.png");
+                                       __pScreenModeButton->SetPressedBitmap(point, *pBitmapScreenMode);
                                }
                                break;
 
@@ -1131,24 +794,10 @@ VideoPlayerForm::OnActionPerformed(const Control& source, int actionId)
                                                __pVideoPlayerPresentationModel->SetOverlayPanel(__pOverlayPanel);
                                                __pVideoPlayerPresentationModel->SetRenderingBuffer();
 
-                                               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode03.png");
-
-                                               if (__audioRouteMode == AUDIO_ROUTE_SPEAKER_ONLY)
-                                               {
-                                                       r = __pButtonRightItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                                                       TryCatch(r == E_SUCCESS, , "__pButtonRightItem->SetIcon failed:%s",
-                                                                       GetErrorMessage(r));
-
-                                                       __pHeader->SetButton(BUTTON_POSITION_RIGHT, *__pButtonRightItem);
-                                               }
-                                               else
-                                               {
-                                                       r = __pButtonLeftItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                                                       TryCatch(r == E_SUCCESS, , "__pButtonLeftItem->SetIcon failed:%s",
-                                                                       GetErrorMessage(r));
-
-                                                       __pHeader->SetButton(BUTTON_POSITION_LEFT, *__pButtonLeftItem);
-                                               }
+                                               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01-2_function_icon_screenmode03.png");
+                                               __pScreenModeButton->SetNormalBitmap(point, *pBitmapScreenMode);
+                                               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01-2_function_icon_screenmode03_press.png");
+                                               __pScreenModeButton->SetPressedBitmap(point, *pBitmapScreenMode);
                                        }
                                        else
                                        {
@@ -1158,28 +807,11 @@ VideoPlayerForm::OnActionPerformed(const Control& source, int actionId)
                                                __pVideoPlayerPresentationModel->SetOverlayPanel(__pOverlayPanel);
                                                __pVideoPlayerPresentationModel->SetRenderingBuffer();
 
-                                               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode01.png");
-
-                                               if (__audioRouteMode == AUDIO_ROUTE_SPEAKER_ONLY)
-                                               {
-                                                       r = __pButtonRightItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                                                       TryCatch(r == E_SUCCESS, , "__pButtonRightItem->SetIcon failed:%s",
-                                                                       GetErrorMessage(r));
-
-                                                       __pHeader->SetButton(BUTTON_POSITION_RIGHT, *__pButtonRightItem);
-                                               }
-                                               else
-                                               {
-                                                       r = __pButtonLeftItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                                                       TryCatch(r == E_SUCCESS, , "__pButtonLeftItem->SetIcon failed:%s",
-                                                                       GetErrorMessage(r));
-
-                                                       __pHeader->SetButton(BUTTON_POSITION_LEFT, *__pButtonLeftItem);
-                                               }
+                                               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01-2_function_icon_screenmode.png");
+                                               __pScreenModeButton->SetNormalBitmap(point, *pBitmapScreenMode);
+                                               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01-2_Function_icon_screenmode_press.png");
+                                               __pScreenModeButton->SetPressedBitmap(point, *pBitmapScreenMode);
                                        }
-
-                                       delete pBitmapScreenMode;
-                                       pBitmapScreenMode = null;
                                }
                                break;
 
@@ -1193,24 +825,10 @@ VideoPlayerForm::OnActionPerformed(const Control& source, int actionId)
                                                __pVideoPlayerPresentationModel->SetOverlayPanel(__pOverlayPanel);
                                                __pVideoPlayerPresentationModel->SetRenderingBuffer();
 
-                                               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode02.png");
-
-                                               if (__audioRouteMode == AUDIO_ROUTE_SPEAKER_ONLY)
-                                               {
-                                                       r = __pButtonRightItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                                                       TryCatch(r == E_SUCCESS, , "__pButtonRightItem->SetIcon failed:%s",
-                                                                       GetErrorMessage(r));
-
-                                                       __pHeader->SetButton(BUTTON_POSITION_RIGHT, *__pButtonRightItem);
-                                               }
-                                               else
-                                               {
-                                                       r = __pButtonLeftItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                                                       TryCatch(r == E_SUCCESS, , "__pButtonLeftItem->SetIcon failed:%s",
-                                                                       GetErrorMessage(r));
-
-                                                       __pHeader->SetButton(BUTTON_POSITION_LEFT, *__pButtonLeftItem);
-                                               }
+                                               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01-2_function_icon_screenmode02.png");
+                                               __pScreenModeButton->SetNormalBitmap(point, *pBitmapScreenMode);
+                                               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01-2_function_icon_screenmode02_press.png");
+                                               __pScreenModeButton->SetPressedBitmap(point, *pBitmapScreenMode);
                                        }
                                        else
                                        {
@@ -1220,28 +838,11 @@ VideoPlayerForm::OnActionPerformed(const Control& source, int actionId)
                                                __pVideoPlayerPresentationModel->SetOverlayPanel(__pOverlayPanel);
                                                __pVideoPlayerPresentationModel->SetRenderingBuffer();
 
-                                               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode03.png");
-
-                                               if (__audioRouteMode == AUDIO_ROUTE_SPEAKER_ONLY)
-                                               {
-                                                       r = __pButtonRightItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                                                       TryCatch(r == E_SUCCESS, , "__pButtonRightItem->SetIcon failed:%s",
-                                                                       GetErrorMessage(r));
-
-                                                       __pHeader->SetButton(BUTTON_POSITION_RIGHT, *__pButtonRightItem);
-                                               }
-                                               else
-                                               {
-                                                       r = __pButtonLeftItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                                                       TryCatch(r == E_SUCCESS, , "__pButtonLeftItem->SetIcon failed:%s",
-                                                                       GetErrorMessage(r));
-
-                                                       __pHeader->SetButton(BUTTON_POSITION_LEFT, *__pButtonLeftItem);
-                                               }
+                                               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01-2_function_icon_screenmode03.png");
+                                               __pScreenModeButton->SetNormalBitmap(point, *pBitmapScreenMode);
+                                               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01-2_function_icon_screenmode03_press.png");
+                                               __pScreenModeButton->SetPressedBitmap(point, *pBitmapScreenMode);
                                        }
-
-                                       delete pBitmapScreenMode;
-                                       pBitmapScreenMode = null;
                                }
                                break;
 
@@ -1334,8 +935,6 @@ VideoPlayerForm::OnTouchReleased(const Control& source, const Point& currentPosi
 
        AppLogDebug("OnTouchReleased");
 
-       ChangedControlPos();
-
        if ((&source == __pFastForwardButton
                || &source == __pFastRewindButton)
                && __actionTouchLongPressed == true)
@@ -1508,20 +1107,21 @@ VideoPlayerForm::SetPlayPauseButtonImage(PlayerState playState)
 
        Bitmap* pPlayBitmap = null;
        Bitmap* pPauseBitmap = null;
+       Point point(X_BASE, Y_BASE);
 
        AppLogDebug("SetPlayPauseButtonImage : %d", playState);
 
        AppResource* pAppResource = Application::GetInstance()->GetAppResource();
 
-       __pPlayPauseButton = static_cast<Button*>(GetControl("IDC_BUTTON_PLAY"));
+       __pPlayPauseButton = static_cast<Button*>(__pControllerPanel->GetControl(IDC_BUTTON_PLAY));
        TryCatch(__pPlayPauseButton != null, r = E_SYSTEM, "__pPlayPauseButton is null");
 
        if (playState == PLAYER_STATE_PLAYING)
        {
-               pPauseBitmap = pAppResource->GetBitmapN(L"T01_icon_toolbar_pause.png");
+               pPauseBitmap = pAppResource->GetBitmapN(L"T01-2_control_circle_icon_pause.png");
                TryCatch(pPauseBitmap != null, r = E_SYSTEM, "pPauseBitmap is null");
 
-               __pPlayPauseButton->SetNormalBackgroundBitmap(*pPauseBitmap);
+               __pPlayPauseButton->SetNormalBitmap(point, *pPauseBitmap);
 
                __pPlayPauseButton->SetActionId(IDA_BUTTON_PAUSE);
                __pPlayPauseButton->Invalidate(true);
@@ -1530,17 +1130,16 @@ VideoPlayerForm::SetPlayPauseButtonImage(PlayerState playState)
        }
        else
        {
-               pPlayBitmap = pAppResource->GetBitmapN(L"T01_icon_toolbar_play.png");
+               pPlayBitmap = pAppResource->GetBitmapN(L"T01-2_control_circle_icon_play.png");
                TryCatch(pPlayBitmap != null, r = E_SYSTEM, "pPlayBitmap is null");
 
-               __pPlayPauseButton->SetNormalBackgroundBitmap(*pPlayBitmap);
+               __pPlayPauseButton->SetNormalBitmap(point, *pPlayBitmap);
 
                __pPlayPauseButton->SetActionId(IDA_BUTTON_PLAY);
                __pPlayPauseButton->Invalidate(true);
 
                delete pPlayBitmap;
        }
-
        return r;
 
 CATCH:
@@ -1569,7 +1168,7 @@ VideoPlayerForm::OnOrientationChanged(const Control& source, OrientationStatus o
        {
        case ORIENTATION_STATUS_PORTRAIT:
                {
-                       ChangedControlPos();
+                       // Empty statement
                }
                break;
 
@@ -1577,7 +1176,7 @@ VideoPlayerForm::OnOrientationChanged(const Control& source, OrientationStatus o
                // fall through
        case ORIENTATION_STATUS_LANDSCAPE_REVERSE:
                {
-                       ChangedControlPos();
+                       // Empty statement
                }
                break;
 
@@ -1616,191 +1215,39 @@ VideoPlayerForm::ShowControl(bool setShow)
 
        if (setShow == true)
        {
-               SetActionBarsVisible(FORM_ACTION_BAR_INDICATOR|FORM_ACTION_BAR_HEADER, true);
-
-               __pPlayPauseButton->SetShowState(true);
-               __pFastForwardButton->SetShowState(true);
-               __pFastRewindButton->SetShowState(true);
-               __pBackButton->SetShowState(true);
-               __pCurrenTimeLabel->SetShowState(true);
-               __pTotalTimeLabel->SetShowState(true);
-               __pSlider->SetShowState(true);
-               __pControlLabel->SetShowState(true);
-               __pFirstLineLabel->SetShowState(true);
-               __pVerticalLeftLine->SetShowState(true);
-               __pVerticalRightLine->SetShowState(true);
-
+               __pHeaderPanel->SetShowState(true);
+               __pFunctionPanel->SetShowState(true);
+               __pControllerPanel->SetShowState(true);
                __isControlVisibleState = true;
-
-               Invalidate(true);
        }
        else
        {
-               SetActionBarsVisible(FORM_ACTION_BAR_INDICATOR|FORM_ACTION_BAR_HEADER, false);
-
-               __pPlayPauseButton->SetShowState(false);
-               __pFastForwardButton->SetShowState(false);
-               __pFastRewindButton->SetShowState(false);
-               __pBackButton->SetShowState(false);
-               __pCurrenTimeLabel->SetShowState(false);
-               __pTotalTimeLabel->SetShowState(false);
-               __pSlider->SetShowState(false);
-               __pControlLabel->SetShowState(false);
-               __pFirstLineLabel->SetShowState(false);
-               __pVerticalLeftLine->SetShowState(false);
-               __pVerticalRightLine->SetShowState(false);
-
+               __pHeaderPanel->SetShowState(false);
+               __pFunctionPanel->SetShowState(false);
+               __pControllerPanel->SetShowState(false);
                __isControlVisibleState = false;
        }
 }
 
 void
-VideoPlayerForm::ChangedControlPos(void)
-{
-       AppLogDebug("ChangedControlPos");
-
-       switch (GetOrientationStatus())
-       {
-       case ORIENTATION_STATUS_PORTRAIT:
-               {
-                       if (GetClientAreaBounds().height <= W_WVGA_PORTRAIT_HEIGHT)
-                       {
-                               __pControlLabel->SetBounds(X_WVGA_PORTRAIT_CONTROLLER, Y_WVGA_PORTRAIT_CONTROLLER, W_WVGA_PORTRAIT_CONTROLLER, H_WVGA_PORTRAIT_CONTROLLER);
-                               __pFirstLineLabel->SetBounds(X_WVGA_PORTRAIT_FIRST_LINE, Y_WVGA_PORTRAIT_FIRST_LINE, W_WVGA_PORTRAIT_FIRST_LINE, H_WVGA_PORTRAIT_FIRST_LINE);
-
-                               __pCurrenTimeLabel->SetBounds(X_WVGA_PORTRAIT_CURRENT_TIME, Y_WVGA_PORTRAIT_CURRENT_TIME, W_WVGA_PORTRAIT_CURRENT_TIME, H_WVGA_PORTRAIT_CURRENT_TIME);
-                               __pSlider->SetBounds(X_WVGA_PORTRAIT_SLIDER, Y_WVGA_PORTRAIT_SLIDER, W_WVGA_PORTRAIT_SLIDER, H_WVGA_PORTRAIT_SLIDER);
-                               __pTotalTimeLabel->SetBounds(X_WVGA_PORTRAIT_TOTAL_TIME, Y_WVGA_PORTRAIT_TOTAL_TIME, W_WVGA_PORTRAIT_TOTAL_TIME, H_WVGA_PORTRAIT_TOTAL_TIME);
-
-                               __pVerticalLeftLine->SetBounds(X_WVGA_PORTRAIT_VERTICAL_LEFT_LINE, Y_WVGA_PORTRAIT_VERTICAL_LEFT_LINE, W_WVGA_PORTRAIT_VERTICAL_LEFT_LINE,H_WVGA_PORTRAIT_VERTICAL_LEFT_LINE);
-                               __pFastRewindButton->SetBounds(X_WVGA_PORTRAIT_FASTREWIND_BTN, Y_WVGA_PORTRAIT_FASTREWIND_BTN, W_WVGA_PORTRAIT_FASTREWIND_BTN, H_WVGA_PORTRAIT_FASTREWIND_BTN);
-                               __pPlayPauseButton->SetBounds(X_WVGA_PORTRAIT_PLAYPAUSE_BTN, Y_WVGA_PORTRAIT_PLAYPAUSE_BTN, W_WVGA_PORTRAIT_PLAYPAUSE_BTN, H_WVGA_PORTRAIT_PLAYPAUSE_BTN);
-                               __pFastForwardButton->SetBounds(X_WVGA_PORTRAIT_FASTFORWARD_BTN, Y_WVGA_PORTRAIT_FASTFORWARD_BTN, W_WVGA_PORTRAIT_FASTFORWARD_BTN, H_WVGA_PORTRAIT_FASTFORWARD_BTN);
-                               __pVerticalRightLine->SetBounds(X_WVGA_PORTRAIT_VERTICAL_RIGHT_LINE, Y_WVGA_PORTRAIT_VERTICAL_RIGHT_LINE, W_WVGA_PORTRAIT_VERTICAL_RIGHT_LINE, H_WVGA_PORTRAIT_VERTICAL_RIGHT_LINE);
-                               __pBackButton->SetBounds(X_WVGA_PORTRAIT_BACK_BTN, Y_WVGA_PORTRAIT_BACK_BTN, W_WVGA_PORTRAIT_BACK_BTN, H_WVGA_PORTRAIT_BACK_BTN);
-                       }
-                       else
-                       {
-                               __pControlLabel->SetBounds(X_HVGA_PORTRAIT_CONTROLLER, Y_HVGA_PORTRAIT_CONTROLLER, W_HVGA_PORTRAIT_CONTROLLER, H_HVGA_PORTRAIT_CONTROLLER);
-                               __pFirstLineLabel->SetBounds(X_HVGA_PORTRAIT_FIRST_LINE, Y_HVGA_PORTRAIT_FIRST_LINE, W_HVGA_PORTRAIT_FIRST_LINE, H_HVGA_PORTRAIT_FIRST_LINE);
-
-                               __pCurrenTimeLabel->SetBounds(X_HVGA_PORTRAIT_CURRENT_TIME, Y_HVGA_PORTRAIT_CURRENT_TIME, W_HVGA_PORTRAIT_CURRENT_TIME, H_HVGA_PORTRAIT_CURRENT_TIME);
-                               __pSlider->SetBounds(X_HVGA_PORTRAIT_SLIDER, Y_HVGA_PORTRAIT_SLIDER, W_HVGA_PORTRAIT_SLIDER, H_HVGA_PORTRAIT_SLIDER);
-                               __pTotalTimeLabel->SetBounds(X_HVGA_PORTRAIT_TOTAL_TIME, Y_HVGA_PORTRAIT_TOTAL_TIME, W_HVGA_PORTRAIT_TOTAL_TIME, H_HVGA_PORTRAIT_TOTAL_TIME);
-
-                               __pVerticalLeftLine->SetBounds(X_HVGA_PORTRAIT_VERTICAL_LEFT_LINE, Y_HVGA_PORTRAIT_VERTICAL_LEFT_LINE, W_HVGA_PORTRAIT_VERTICAL_LEFT_LINE, H_HVGA_PORTRAIT_VERTICAL_LEFT_LINE);
-                               __pFastRewindButton->SetBounds(X_HVGA_PORTRAIT_FASTREWIND_BTN, Y_HVGA_PORTRAIT_FASTREWIND_BTN, W_HVGA_PORTRAIT_FASTREWIND_BTN, H_HVGA_PORTRAIT_FASTREWIND_BTN);
-                               __pPlayPauseButton->SetBounds(X_HVGA_PORTRAIT_PLAYPAUSE_BTN, Y_HVGA_PORTRAIT_PLAYPAUSE_BTN, W_HVGA_PORTRAIT_PLAYPAUSE_BTN, H_HVGA_PORTRAIT_PLAYPAUSE_BTN);
-                               __pFastForwardButton->SetBounds(X_HVGA_PORTRAIT_FASTFORWARD_BTN, Y_HVGA_PORTRAIT_FASTFORWARD_BTN, W_HVGA_PORTRAIT_FASTFORWARD_BTN, H_HVGA_PORTRAIT_FASTFORWARD_BTN);
-                               __pVerticalRightLine->SetBounds(X_HVGA_PORTRAIT_VERTICAL_RIGHT_LINE, Y_HVGA_PORTRAIT_VERTICAL_RIGHT_LINE, W_HVGA_PORTRAIT_VERTICAL_RIGHT_LINE, H_HVGA_PORTRAIT_VERTICAL_RIGHT_LINE);
-                               __pBackButton->SetBounds(X_HVGA_PORTRAIT_BACK_BTN, Y_HVGA_PORTRAIT_BACK_BTN, W_HVGA_PORTRAIT_BACK_BTN, H_HVGA_PORTRAIT_BACK_BTN);
-                       }
-               }
-               break;
-
-       case ORIENTATION_STATUS_LANDSCAPE:
-               // fall throuth
-       case ORIENTATION_STATUS_LANDSCAPE_REVERSE:
-               {
-                       if (GetClientAreaBounds().width <= W_WVGA_LANDSCAPE_WIDTH)
-                       {
-                               __pControlLabel->SetBounds(X_WVGA_LANDSCAPE_CONTROLLER, Y_WVGA_LANDSCAPE_CONTROLLER, W_WVGA_LANDSCAPE_CONTROLLER, H_WVGA_LANDSCAPE_CONTROLLER);
-                               __pFirstLineLabel->SetBounds(X_WVGA_LANDSCAPE_FIRST_LINE, Y_WVGA_LANDSCAPE_FIRST_LINE, W_WVGA_LANDSCAPE_FIRST_LINE, H_WVGA_LANDSCAPE_FIRST_LINE);
-
-                               __pCurrenTimeLabel->SetBounds(X_WVGA_LANDSCAPE_CURRENT_TIME, Y_WVGA_LANDSCAPE_CURRENT_TIME, W_WVGA_LANDSCAPE_CURRENT_TIME, H_WVGA_LANDSCAPE_CURRENT_TIME);
-                               __pSlider->SetBounds(X_WVGA_LANDSCAPE_SLIDER, Y_WVGA_LANDSCAPE_SLIDER, W_WVGA_LANDSCAPE_SLIDER, H_WVGA_LANDSCAPE_SLIDER);
-                               __pTotalTimeLabel->SetBounds(X_WVGA_LANDSCAPE_TOTAL_TIME, Y_WVGA_LANDSCAPE_TOTAL_TIME, W_WVGA_LANDSCAPE_TOTAL_TIME, H_WVGA_LANDSCAPE_TOTAL_TIME);
-
-                               __pVerticalLeftLine->SetBounds(X_WVGA_LANDSCAPE_VERTICAL_LEFT_LINE, Y_WVGA_LANDSCAPE_VERTICAL_LEFT_LINE, W_WVGA_LANDSCAPE_VERTICAL_LEFT_LINE, H_WVGA_LANDSCAPE_VERTICAL_LEFT_LINE);
-                               __pFastRewindButton->SetBounds(X_WVGA_LANDSCAPE_FASTREWIND_BTN, Y_WVGA_LANDSCAPE_FASTREWIND_BTN, W_WVGA_LANDSCAPE_FASTREWIND_BTN, H_WVGA_LANDSCAPE_FASTREWIND_BTN);
-                               __pPlayPauseButton->SetBounds(X_WVGA_LANDSCAPE_PLAYPAUSE_BTN, Y_WVGA_LANDSCAPE_PLAYPAUSE_BTN, W_WVGA_LANDSCAPE_PLAYPAUSE_BTN, H_WVGA_LANDSCAPE_PLAYPAUSE_BTN);
-                               __pFastForwardButton->SetBounds(X_WVGA_LANDSCAPE_FASTFORWARD_BTN, Y_WVGA_LANDSCAPE_FASTFORWARD_BTN, W_WVGA_LANDSCAPE_FASTFORWARD_BTN, H_WVGA_LANDSCAPE_FASTFORWARD_BTN);
-                               __pVerticalRightLine->SetBounds(X_WVGA_LANDSCAPE_VERTICAL_RIGHT_LINE, Y_WVGA_LANDSCAPE_VERTICAL_RIGHT_LINE, W_WVGA_LANDSCAPE_VERTICAL_RIGHT_LINE, H_WVGA_LANDSCAPE_VERTICAL_RIGHT_LINE);
-                               __pBackButton->SetBounds(X_WVGA_LANDSCAPE_BACK_BTN, Y_WVGA_LANDSCAPE_BACK_BTN, W_WVGA_LANDSCAPE_BACK_BTN, H_WVGA_LANDSCAPE_BACK_BTN);
-                       }
-                       else
-                       {
-                               __pControlLabel->SetBounds(X_HVGA_LANDSCAPE_CONTROLLER, Y_HVGA_LANDSCAPE_CONTROLLER, W_HVGA_LANDSCAPE_CONTROLLER, H_HVGA_LANDSCAPE_CONTROLLER);
-                               __pFirstLineLabel->SetBounds(X_HVGA_LANDSCAPE_FIRST_LINE, Y_HVGA_LANDSCAPE_FIRST_LINE, W_HVGA_LANDSCAPE_FIRST_LINE, H_HVGA_LANDSCAPE_FIRST_LINE);
-
-                               __pCurrenTimeLabel->SetBounds(X_HVGA_LANDSCAPE_CURRENT_TIME, Y_HVGA_LANDSCAPE_CURRENT_TIME, W_HVGA_LANDSCAPE_CURRENT_TIME, H_HVGA_LANDSCAPE_CURRENT_TIME);
-                               __pSlider->SetBounds(X_HVGA_LANDSCAPE_SLIDER, Y_HVGA_LANDSCAPE_SLIDER, W_HVGA_LANDSCAPE_SLIDER, H_HVGA_LANDSCAPE_SLIDER);
-                               __pTotalTimeLabel->SetBounds(X_HVGA_LANDSCAPE_TOTAL_TIME, Y_HVGA_LANDSCAPE_TOTAL_TIME, W_HVGA_LANDSCAPE_TOTAL_TIME, H_HVGA_LANDSCAPE_TOTAL_TIME);
-
-                               __pVerticalLeftLine->SetBounds(X_HVGA_LANDSCAPE_VERTICAL_LEFT_LINE, Y_HVGA_LANDSCAPE_VERTICAL_LEFT_LINE, W_HVGA_LANDSCAPE_VERTICAL_LEFT_LINE, H_HVGA_LANDSCAPE_VERTICAL_LEFT_LINE);
-                               __pFastRewindButton->SetBounds(X_HVGA_LANDSCAPE_FASTREWIND_BTN, Y_HVGA_LANDSCAPE_FASTREWIND_BTN, W_HVGA_LANDSCAPE_FASTREWIND_BTN, H_HVGA_LANDSCAPE_FASTREWIND_BTN);
-                               __pPlayPauseButton->SetBounds(X_HVGA_LANDSCAPE_PLAYPAUSE_BTN, Y_HVGA_LANDSCAPE_PLAYPAUSE_BTN, W_HVGA_LANDSCAPE_PLAYPAUSE_BTN, H_HVGA_LANDSCAPE_PLAYPAUSE_BTN);
-                               __pFastForwardButton->SetBounds(X_HVGA_LANDSCAPE_FASTFORWARD_BTN, Y_HVGA_LANDSCAPE_FASTFORWARD_BTN, W_HVGA_LANDSCAPE_FASTFORWARD_BTN, H_HVGA_LANDSCAPE_FASTFORWARD_BTN);
-                               __pVerticalRightLine->SetBounds(X_HVGA_LANDSCAPE_VERTICAL_RIGHT_LINE, Y_HVGA_LANDSCAPE_VERTICAL_RIGHT_LINE, W_HVGA_LANDSCAPE_VERTICAL_RIGHT_LINE, H_HVGA_LANDSCAPE_VERTICAL_RIGHT_LINE);
-                               __pBackButton->SetBounds(X_HVGA_LANDSCAPE_BACK_BTN, Y_HVGA_LANDSCAPE_BACK_BTN, W_HVGA_LANDSCAPE_BACK_BTN, H_HVGA_LANDSCAPE_BACK_BTN);
-                       }
-               }
-               break;
-
-       default:
-               break;
-       }
-}
-
-void
 VideoPlayerForm::ShowControlByFrameActivated(void)
 {
-       Bitmap* pPlayBitmap = null;
-
        AppLogDebug("ShowControlByFrameActivated");
 
-       AppResource* pAppResource = Application::GetInstance()->GetAppResource();
-
-       SetActionBarsVisible(FORM_ACTION_BAR_INDICATOR|FORM_ACTION_BAR_HEADER, true);
-
-       pPlayBitmap = pAppResource->GetBitmapN(L"T01_icon_toolbar_play.png");
-       __pPlayPauseButton->SetNormalBackgroundBitmap(*pPlayBitmap);
-
-       __pPlayPauseButton->SetShowState(true);
-       __pFastRewindButton->SetShowState(true);
-       __pFastForwardButton->SetShowState(true);
-       __pBackButton->SetShowState(true);
-       __pSlider->SetShowState(true);
-       __pCurrenTimeLabel->SetShowState(true);
-       __pTotalTimeLabel->SetShowState(true);
-       __pControlLabel->SetShowState(true);
-       __pFirstLineLabel->SetShowState(true);
-       __pVerticalLeftLine->SetShowState(true);
-       __pVerticalRightLine->SetShowState(true);
-
-       Invalidate(true);
-
        CheckCallStatus();
        CheckLowBatteryStatus();
-
-       delete pPlayBitmap;
 }
 
 void
 VideoPlayerForm::CancelTimerByFrameDeactivated(void)
 {
-       result r = E_FAILURE;
-
        AppLogDebug("CancelTimerByFrameDeactivated");
 
        __pUiControlTimer->Cancel();
-
        __setPauseState = true;
 
-       if (__audioRouteMode == AUDIO_ROUTE_SPEAKER_ONLY)
-       {
-               r = __pButtonRightItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, null);
-               TryReturnVoid(r == E_SUCCESS, "__pButtonRightItem->SetIcon() Failed:%s", GetErrorMessage(r));
-
-               __pHeader->SetButton(BUTTON_POSITION_RIGHT, *__pButtonRightItem);
-       }
-       else
-       {
-               r = __pButtonLeftItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, null);
-               TryReturnVoid(r == E_SUCCESS, "__pButtonLeftItem->SetIcon() Failed:%s", GetErrorMessage(r));
-
-               __pHeader->SetButton(BUTTON_POSITION_LEFT, *__pButtonLeftItem);
-       }
+       ShowControl(true);
+       __pScreenModeButton->SetShowState(false);
 }
 
 void
@@ -1812,8 +1259,7 @@ VideoPlayerForm::OnPlayContentChanged(const String& fileName)
 
        GetTotalTime(totalTime);
 
-       __pHeader->SetTitleText(fileName);
-       __pHeader->Invalidate(true);
+       __pHeaderTitle->SetText(fileName);
 
        __pTotalTimeLabel->SetText(totalTime);
        __pTotalTimeLabel->Invalidate(true);
@@ -1947,15 +1393,10 @@ VideoPlayerForm::OnActiveAudioRouteChanged(const AudioRouteInfo& route)
 {
        Color BtnColor(0, 0, 0, 0);
        int currentOutputAudioDevice = 0;
-       Bitmap* pBitmapScreenMode = null;
-       Bitmap* pBitmapSoundPath = null;
        ArrayList* pArgs = null;
-       result r = E_FAILURE;
 
        AudioRouteInfo currentAudioRoute(INPUT_AUDIO_DEVICE_NONE, OUTPUT_AUDIO_DEVICE_NONE);
 
-       AppResource* pAppResource = Application::GetInstance()->GetAppResource();
-
        AppLogDebug("OnActiveAudioRouteChanged");
 
        switch (route.GetOutputAudioDevice())
@@ -2009,40 +1450,6 @@ VideoPlayerForm::OnActiveAudioRouteChanged(const AudioRouteInfo& route)
                        {
                                __audioRouteMode = AUDIO_ROUTE_WIRED_ACCESSORY_AND_SPEAKER;
 
-                               if (__pHeader->GetButtonStatus(BUTTON_POSITION_LEFT) == BUTTON_ITEM_STATUS_DISABLED)
-                               {
-                                       if (__screenMode == SCREEN_MODE_FIT)
-                                       {
-                                               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode03.png");
-                                               r = __pButtonLeftItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                                               TryCatch(r == E_SUCCESS, , "__pButtonLeftItem->SetIcon() Failed:%s", GetErrorMessage(r));
-                                       }
-                                       else if (__screenMode == SCREEN_MODE_NORMAL)
-                                       {
-                                               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode01.png");
-                                               r = __pButtonLeftItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                                               TryCatch(r == E_SUCCESS, , "__pButtonLeftItem->SetIcon() Failed:%s", GetErrorMessage(r));
-                                       }
-                                       else
-                                       {
-                                               pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode02.png");
-                                               r = __pButtonLeftItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                                               TryCatch(r == E_SUCCESS, , "__pButtonLeftItem->SetIcon() Failed:%s", GetErrorMessage(r));
-                                       }
-
-                                       __pButtonLeftItem->SetActionId(IDA_BUTTON_FULLSCREEN);
-                                       __pHeader->SetButton(BUTTON_POSITION_LEFT, *__pButtonLeftItem);
-                                       __pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, true);
-                               }
-
-                               pBitmapSoundPath = pAppResource->GetBitmapN(L"T01_icon_title_soundpath.png");
-                               r = __pButtonRightItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapSoundPath);
-                               TryCatch(r == E_SUCCESS, , "__pButtonRightItem->SetIcon() Failed:%s", GetErrorMessage(r));
-
-                               __pButtonRightItem->SetActionId(IDA_BUTTON_SOUNDPATH);
-                               __pHeader->SetButton(BUTTON_POSITION_RIGHT, *__pButtonRightItem);
-                               __pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, true);
-
                                if (__pSoundPathPopup != null)
                                {
                                        currentAudioRoute = __pAudioRouteManager->GetActiveAudioRoute();
@@ -2067,52 +1474,6 @@ VideoPlayerForm::OnActiveAudioRouteChanged(const AudioRouteInfo& route)
                        {
                                __audioRouteMode = AUDIO_ROUTE_SPEAKER_ONLY;
 
-                               if (__screenMode == SCREEN_MODE_FIT)
-                               {
-                                       r = __pButtonLeftItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, null);
-                                       TryCatch(r == E_SUCCESS, , "__pButtonLeftItem->SetIcon() Failed:%s", GetErrorMessage(r));
-
-                                       pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode03.png");
-                                       r = __pButtonRightItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                                       TryCatch(r == E_SUCCESS, , "__pButtonRightItem->SetIcon() Failed:%s", GetErrorMessage(r));
-
-                                       __pButtonRightItem->SetActionId(IDA_BUTTON_FULLSCREEN);
-
-                                       __pHeader->SetButton(BUTTON_POSITION_LEFT, *__pButtonLeftItem);
-                                       __pHeader->SetButton(BUTTON_POSITION_RIGHT, *__pButtonRightItem);
-                                       __pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, false);
-                               }
-                               else if (__screenMode == SCREEN_MODE_NORMAL)
-                               {
-                                       r = __pButtonLeftItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, null);
-                                       TryCatch(r == E_SUCCESS, , "__pButtonLeftItem->SetIcon() Failed:%s", GetErrorMessage(r));
-
-                                       pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode01.png");
-                                       r = __pButtonRightItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                                       TryCatch(r == E_SUCCESS, , "__pButtonRightItem->SetIcon() Failed:%s", GetErrorMessage(r));
-
-                                       __pButtonRightItem->SetActionId(IDA_BUTTON_FULLSCREEN);
-
-                                       __pHeader->SetButton(BUTTON_POSITION_LEFT, *__pButtonLeftItem);
-                                       __pHeader->SetButton(BUTTON_POSITION_RIGHT, *__pButtonRightItem);
-                                       __pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, false);
-                               }
-                               else
-                               {
-                                       r = __pButtonLeftItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, null);
-                                       TryCatch(r == E_SUCCESS, , "__pButtonLeftItem->SetIcon() Failed:%s", GetErrorMessage(r));
-
-                                       pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode02.png");
-                                       r = __pButtonRightItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                                       TryCatch(r == E_SUCCESS, , "__pButtonRightItem->SetIcon() Failed:%s", GetErrorMessage(r));
-
-                                       __pButtonRightItem->SetActionId(IDA_BUTTON_FULLSCREEN);
-
-                                       __pHeader->SetButton(BUTTON_POSITION_LEFT, *__pButtonLeftItem);
-                                       __pHeader->SetButton(BUTTON_POSITION_RIGHT, *__pButtonRightItem);
-                                       __pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, false);
-                               }
-
                                if (__pSoundPathPopup != null)
                                {
                                        if (__pSoundPathPopup->GetShowState() == true)
@@ -2126,37 +1487,6 @@ VideoPlayerForm::OnActiveAudioRouteChanged(const AudioRouteInfo& route)
                        {
                                __audioRouteMode = AUDIO_ROUTE_WIRED_ACCESSORY_AND_SPEAKER;
 
-                               if (__screenMode == SCREEN_MODE_FIT)
-                               {
-                                       pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode03.png");
-                                       r = __pButtonLeftItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                                       TryCatch(r == E_SUCCESS, , "__pButtonLeftItem->SetIcon() Failed:%s", GetErrorMessage(r));
-                               }
-                               else if (__screenMode == SCREEN_MODE_NORMAL)
-                               {
-                                       pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode01.png");
-                                       r = __pButtonLeftItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                                       TryCatch(r == E_SUCCESS, , "__pButtonLeftItem->SetIcon() Failed:%s", GetErrorMessage(r));
-                               }
-                               else
-                               {
-                                       pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode02.png");
-                                       r = __pButtonLeftItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                                       TryCatch(r == E_SUCCESS, , "__pButtonLeftItem->SetIcon() Failed:%s", GetErrorMessage(r));
-                               }
-
-                               __pButtonLeftItem->SetActionId(IDA_BUTTON_FULLSCREEN);
-                               __pHeader->SetButton(BUTTON_POSITION_LEFT, *__pButtonLeftItem);
-                               __pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, true);
-
-                               pBitmapSoundPath = pAppResource->GetBitmapN(L"T01_icon_title_soundpath.png");
-                               r = __pButtonRightItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapSoundPath);
-                               TryCatch(r == E_SUCCESS, , "__pButtonRightItem->SetIcon() Failed:%s", GetErrorMessage(r));
-
-                               __pButtonRightItem->SetActionId(IDA_BUTTON_SOUNDPATH);
-                               __pHeader->SetButton(BUTTON_POSITION_RIGHT, *__pButtonRightItem);
-                               __pHeader->SetButtonEnabled(BUTTON_POSITION_RIGHT, true);
-
                                if (__pSoundPathPopup != null)
                                {
                                        currentAudioRoute = __pAudioRouteManager->GetActiveAudioRoute();
@@ -2177,13 +1507,6 @@ VideoPlayerForm::OnActiveAudioRouteChanged(const AudioRouteInfo& route)
        default:
                break;
        }
-
-       delete pBitmapSoundPath;
-       pBitmapSoundPath = null;
-
-CATCH:
-       delete pBitmapSoundPath;
-       pBitmapSoundPath = null;
 }
 
 void
@@ -2237,16 +1560,12 @@ VideoPlayerForm::OnAudioRouteAdded(const AudioRouteInfo& route)
 void
 VideoPlayerForm::OnAudioRouteRemoved(const AudioRouteInfo& route)
 {
-       result r = E_FAILURE;
        ArrayList* pArgs = null;
-       Bitmap* pBitmapScreenMode = null;
        int currentOutputDevice = 0;
        AudioRouteInfo currentAudioRoute(INPUT_AUDIO_DEVICE_NONE, OUTPUT_AUDIO_DEVICE_NONE);
 
        AppLogDebug("OnAudioRouteRemoved");
 
-       AppResource* pAppResource = Application::GetInstance()->GetAppResource();
-
        currentAudioRoute = __pAudioRouteManager->GetActiveAudioRoute();
 
        switch (route.GetOutputAudioDevice())
@@ -2386,49 +1705,6 @@ VideoPlayerForm::OnAudioRouteRemoved(const AudioRouteInfo& route)
                        {
                                __audioRouteMode = AUDIO_ROUTE_SPEAKER_ONLY;
 
-                               if (__screenMode == SCREEN_MODE_FIT)
-                               {
-                                       __pButtonLeftItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, null);
-
-                                       pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode03.png");
-                                       r = __pButtonRightItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                                       TryCatch(r == E_SUCCESS, , "__pButtonRightItem->SetIcon() Failed:%s", GetErrorMessage(r));
-
-                                       __pButtonRightItem->SetActionId(IDA_BUTTON_FULLSCREEN);
-
-                                       __pHeader->SetButton(BUTTON_POSITION_LEFT, *__pButtonLeftItem);
-                                       __pHeader->SetButton(BUTTON_POSITION_RIGHT, *__pButtonRightItem);
-                                       __pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, false);
-                               }
-                               else if (__screenMode == SCREEN_MODE_NORMAL)
-                               {
-                                       __pButtonLeftItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, null);
-
-                                       pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode01.png");
-                                       r = __pButtonRightItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                                       TryCatch(r == E_SUCCESS, , "__pButtonRightItem->SetIcon() Failed:%s", GetErrorMessage(r));
-
-                                       __pButtonRightItem->SetActionId(IDA_BUTTON_FULLSCREEN);
-
-                                       __pHeader->SetButton(BUTTON_POSITION_LEFT, *__pButtonLeftItem);
-                                       __pHeader->SetButton(BUTTON_POSITION_RIGHT, *__pButtonRightItem);
-                                       __pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, false);
-                               }
-                               else
-                               {
-                                       __pButtonLeftItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, null);
-
-                                       pBitmapScreenMode = pAppResource->GetBitmapN(L"T01_icon_title_screenmode02.png");
-                                       r = __pButtonRightItem->SetIcon(BUTTON_ITEM_STATUS_NORMAL, pBitmapScreenMode);
-                                       TryCatch(r == E_SUCCESS, , "__pButtonRightItem->SetIcon() Failed:%s", GetErrorMessage(r));
-
-                                       __pButtonRightItem->SetActionId(IDA_BUTTON_FULLSCREEN);
-
-                                       __pHeader->SetButton(BUTTON_POSITION_LEFT, *__pButtonLeftItem);
-                                       __pHeader->SetButton(BUTTON_POSITION_RIGHT, *__pButtonRightItem);
-                                       __pHeader->SetButtonEnabled(BUTTON_POSITION_LEFT, false);
-                               }
-
                                if (__pSoundPathPopup != null)
                                {
                                        if (__pSoundPathPopup->GetShowState() == true)
@@ -2439,13 +1715,6 @@ VideoPlayerForm::OnAudioRouteRemoved(const AudioRouteInfo& route)
                        }
                }
        }
-
-       delete pBitmapScreenMode;
-       pBitmapScreenMode = null;
-
-CATCH:
-       delete pBitmapScreenMode;
-       pBitmapScreenMode = null;
 }
 
 void
index a93424c..c4d59b2 100644 (file)
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -101,7 +101,6 @@ VideoPlayerPresentationModel::Construct(void)
        String currentPath;
        String tempPath;
        String delim = L";";
-       String* mediaName = null;
        wchar_t tempChar[2] = L"";
 
        VideoPlayerApp* pVideoPlayerApp = static_cast<VideoPlayerApp*>(VideoPlayerApp::GetInstance());
@@ -149,9 +148,6 @@ VideoPlayerPresentationModel::Construct(void)
                        __pMediaPathArrayList->Add((new (std::nothrow) String(tempPath)));
                }
 
-               mediaName = static_cast<String*>(__pMediaPathArrayList->GetAt(INIT_CONTENT_INDEX));
-               __mediaPathName = *mediaName;
-
                if (__pMediaPathArrayList->GetCount() < MULTI_CONTENT_COUNT)
                {
                        __previousMediaIndex = INIT_CONTENT_INDEX;
@@ -167,7 +163,12 @@ VideoPlayerPresentationModel::Construct(void)
        }
        else
        {
-               __mediaPathName = uriData;
+               __pMediaPathArrayList = new (std::nothrow) ArrayList();
+               r = __pMediaPathArrayList->Construct();
+               TryCatch(r == E_SUCCESS, , "__pMediaPathArrayList->Construct() failed:%s", GetErrorMessage(r));
+
+               AppLogDebug("uriData : %ls", uriData.GetPointer());
+               __pMediaPathArrayList->Add((new (std::nothrow) String(uriData)));
        }
 
        InitTimer();
@@ -286,7 +287,7 @@ VideoPlayerPresentationModel::SeekTo(long msTime)
 {
        result r = E_FAILURE;
 
-       PlayerState playState = GetState();
+       PlayerState playState = __pPlayer->GetState();
 
        switch (playState)
        {
@@ -405,6 +406,23 @@ VideoPlayerPresentationModel::StartPlay(void)
                                r = __pPlayer->Play();
                                TryCatch(r == E_SUCCESS, , "__pPlayer->Play() failed:%s", GetErrorMessage(r));
 
+                               if (__pMediaPathArrayList->GetCount() >= MULTI_CONTENT_COUNT)
+                               {
+                                       mediaName.Append(L"(");
+                                       mediaName.Append(__currentMediaIndex + 1);
+                                       mediaName.Append(L"/");
+                                       mediaName.Append(__pMediaPathArrayList->GetCount());
+                                       mediaName.Append(L")");
+                               }
+                               else if(__pMediaPathArrayList->GetCount() < MULTI_CONTENT_COUNT)
+                               {
+                                       mediaName.Append(L"(");
+                                       mediaName.Append(L"1");
+                                       mediaName.Append(L"/");
+                                       mediaName.Append(L"1");
+                                       mediaName.Append(L")");
+                               }
+
                                CallOnPlayContentChanged(mediaName);
 
                                r = __pTimer->Start(PROGRESS_TIMER_DURATION);
@@ -630,7 +648,7 @@ VideoPlayerPresentationModel::OnPlayerInterrupted(void)
 void
 VideoPlayerPresentationModel::OnPlayerAudioFocusChanged(void)
 {
-       AppLog("OnPlayerAudioFocusChanged");
+       AppLogDebug("OnPlayerAudioFocusChanged");
 
        CallOnPlayStateChanged(__pPlayer->GetState());
 }
index 836e70d..2d1e839 100644 (file)
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Flora License, Version 1.0 (the License);
@@ -278,4 +278,4 @@ VolumeSettingPopup::OnSliderBarMoved(Slider& source, int value)
        __volumeLevel = value;
 
        __pVolumeSliderTimer->Start(VOLUME_SETTING_DURATION);
-}
+}
\ No newline at end of file