Renamed OnActivate to Activate and added space in TC list option

Signed-off-by: rahul varna <rahul.varna@samsung.com>

diff --git a/project/data/config.ini b/project/data/config.ini
index 965362e..ff75189 100644 (file)
--- a/project/data/config.ini
+++ b/project/data/config.ini
@@ -7,29 +7,29 @@ ImeiEmul=990
 
 #tclist
 tslist=Image|Audio|Recorder|Player|Codec
-Image::1.Image Viewer=1
-Image::2.Image Converter=1
-Image::3.Gif Viewer=1
-Image::4.Flip & Rotate=1
-Image::5.Image Resize=1
-Image::6.Color Convert=1
-Recorder::1.Camera Capture=1
-Recorder::2.Video Recorder=1
-Recorder::3.Audio Recorder=1
-Audio::1.TonePlayer=1
-Audio::2.AudioInOut=1
-Audio::3.AudioEqualizer=1
-Audio::4.AudioRoute=1
-Player::1.Media Player=1
-Player::2.Multi Play=1
-Player::3.Camera and Player=1
-Player::4.Video Recorder and Player=1
-Player::5.Player 2.0=0
-Codec::1.AudioDecoder=1
-Codec::2.AudioEncoder=1
-Codec::3.VideoDecoder=1
-Codec::4.VideoEncoder=1
-Codec::5.Frame Extractor=1
+Image::1. Image Viewer=1
+Image::2. Image Converter=1
+Image::3. Gif Viewer=1
+Image::4. Flip & Rotate=1
+Image::5. Image Resize=1
+Image::6. Color Convert=1
+Recorder::1. Camera Capture=1
+Recorder::2. Video Recorder=1
+Recorder::3. Audio Recorder=1
+Audio::1. TonePlayer=1
+Audio::2. AudioInOut=1
+Audio::3. AudioEqualizer=1
+Audio::4. AudioRoute=1
+Player::1. Media Player=1
+Player::2. Multi Play=1
+Player::3. Camera and Player=1
+Player::4. Video Recorder and Player=1
+Player::5. Player 2.0=0
+Codec::1. AudioDecoder=1
+Codec::2. AudioEncoder=1
+Codec::3. VideoDecoder=1
+Codec::4. VideoEncoder=1
+Codec::5. Frame Extractor=1
 
 #ImageViewer
 loadPath=/Image

diff --git a/project/inc/MainForm.h b/project/inc/MainForm.h
index 0ad65ea..d1e9e61 100644 (file)
--- a/project/inc/MainForm.h
+++ b/project/inc/MainForm.h
@@ -63,7 +63,7 @@ public:
        static SceneId GetSceneId();
 
 protected:
-       virtual result OnActivate(void* pParam);
+       result Activate(void* pParam);
        result ShowTsList(void);
        result ShowTcList(int index);
 

diff --git a/project/inc/MultiForm.h b/project/inc/MultiForm.h
index e5ecc09..c413430 100644 (file)
--- a/project/inc/MultiForm.h
+++ b/project/inc/MultiForm.h
@@ -84,7 +84,7 @@ protected:
        CONST_INT(ID_BUTTON_ERROR_POPUP_OK);
 
        virtual result OnInitializing(void);
-       virtual result OnActivate(void* pParam);
+       result Activate(void* pParam);
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
        virtual void OnClientDeactivated(MultiForm* pForm, void* pParam);
        virtual void OnDeactivate(void);

diff --git a/project/src/Audio/AudioEqualizerForm.cpp b/project/src/Audio/AudioEqualizerForm.cpp
index 4f0da56..127b74b 100644 (file)
--- a/project/src/Audio/AudioEqualizerForm.cpp
+++ b/project/src/Audio/AudioEqualizerForm.cpp
@@ -275,7 +275,7 @@ void
 AudioEqualizerForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,\r
                                                                   const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)\r
 {\r
-       OnActivate(null);\r
+       Activate(null);\r
 }\r
 void\r
 AudioEqualizerForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,\r
@@ -284,9 +284,9 @@ AudioEqualizerForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& current
 \r
 }\r
 result\r
-AudioEqualizerForm::OnActivate(void* pParam)\r
+AudioEqualizerForm::Activate(void* pParam)\r
 {\r
-       AppLog("AudioEqualizerForm::OnActivate Enter");\r
+       AppLog("AudioEqualizerForm::Activate Enter");\r
        return E_SUCCESS;\r
 }\r
 \r
@@ -301,7 +301,7 @@ AudioEqualizerForm::OnTerminating(void)
 void\r
 AudioEqualizerForm::OnForeground(void)\r
 {\r
-       AppLog("AudioEqualizerForm::OnActivate Enter");\r
+       AppLog("AudioEqualizerForm::OnForeground Enter");\r
 }\r
 \r
 void\r

diff --git a/project/src/Audio/AudioEqualizerForm.h b/project/src/Audio/AudioEqualizerForm.h
index 04d43a7..9755521 100644 (file)
--- a/project/src/Audio/AudioEqualizerForm.h
+++ b/project/src/Audio/AudioEqualizerForm.h
@@ -46,7 +46,7 @@ public:
 \r
        virtual result OnInitializing(void);\r
        virtual result OnTerminating(void);\r
-       result OnActivate(void* pParam);\r
+       result Activate(void* pParam);\r
 \r
        virtual void OnForeground(void);\r
        virtual void OnBackground(void);\r

diff --git a/project/src/Audio/AudioInOut.cpp b/project/src/Audio/AudioInOut.cpp
index 8679b87..c86b195 100644 (file)
--- a/project/src/Audio/AudioInOut.cpp
+++ b/project/src/Audio/AudioInOut.cpp
@@ -213,7 +213,7 @@ void
 AudioInOut::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                                                                   const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
-       OnActivate(null);
+       Activate(null);
 }
 void
 AudioInOut::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
@@ -222,9 +222,9 @@ AudioInOut::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
 
 }
 result
-AudioInOut::OnActivate(void* pParam)
+AudioInOut::Activate(void* pParam)
 {
-       AppLog("OnActivate");
+       AppLog("Activate");
        return E_SUCCESS;
 }
 

diff --git a/project/src/Audio/AudioInOut.h b/project/src/Audio/AudioInOut.h
index 86090ed..0fbbe1c 100644 (file)
--- a/project/src/Audio/AudioInOut.h
+++ b/project/src/Audio/AudioInOut.h
@@ -58,7 +58,7 @@ public:
        virtual void OnTimerExpired(Tizen::Base::Runtime::Timer& timer);
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);
-       result OnActivate(void* pParam);
+       result Activate(void* pParam);
 
        virtual void OnForeground(void);
        virtual void OnBackground(void);

diff --git a/project/src/Camera/CameraCaptureForm.cpp b/project/src/Camera/CameraCaptureForm.cpp
index ad06753..12d71d0 100644 (file)
--- a/project/src/Camera/CameraCaptureForm.cpp
+++ b/project/src/Camera/CameraCaptureForm.cpp
@@ -266,7 +266,7 @@ void
 CameraCaptureForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                                                                   const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
-       OnActivate(null);
+       Activate(null);
 }
 void
 CameraCaptureForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
@@ -1252,7 +1252,7 @@ CATCH:
 }
 
 result
-CameraCaptureForm::OnActivate(void* pActivateParam)
+CameraCaptureForm::Activate(void* pActivateParam)
 {
        result r = E_SUCCESS;
        int tempVal = INIT;
@@ -3769,7 +3769,7 @@ CameraCaptureForm::OnForeground(void)
        if (__background)
        {
                __background = false;
-               CameraCaptureForm::OnActivate(null);
+               CameraCaptureForm::Activate(null);
        }
 
        Draw();
@@ -3917,7 +3917,7 @@ CameraCaptureForm::OnBatteryLevelChanged(Tizen::System::BatteryLevel batteryLeve
        {
                if (__batteryLevelFlag == true)
                {
-                       this->OnActivate(null);
+                       Activate(null);
                }
        }
 }

diff --git a/project/src/Camera/CameraCaptureForm.h b/project/src/Camera/CameraCaptureForm.h
index f7bea05..006e18f 100644 (file)
--- a/project/src/Camera/CameraCaptureForm.h
+++ b/project/src/Camera/CameraCaptureForm.h
@@ -64,7 +64,7 @@ protected:
        virtual result OnTerminating(void);
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
 
-       virtual result OnActivate(void* pActivateParam);
+       result Activate(void* pActivateParam);
        virtual void OnBatteryLevelChanged(Tizen::System::BatteryLevel batteryLevel);
 
        virtual void OnAdjustmentValueChanged(const Tizen::Ui::Control& source, int adjustment);

diff --git a/project/src/Codec/AudioDecoderForm.cpp b/project/src/Codec/AudioDecoderForm.cpp
index 41648ca..14a80ac 100644 (file)
--- a/project/src/Codec/AudioDecoderForm.cpp
+++ b/project/src/Codec/AudioDecoderForm.cpp
@@ -171,7 +171,7 @@ void
 AudioDecoderForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                                                                   const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
-       OnActivate(null);
+       Activate(null);
 }
 void
 AudioDecoderForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
@@ -179,9 +179,8 @@ AudioDecoderForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSc
 {
 }
 
-
 result
-AudioDecoderForm::OnActivate(void* pParam)
+AudioDecoderForm::Activate(void* pParam)
 {
        SetDefault();
        return E_SUCCESS;

diff --git a/project/src/Codec/AudioDecoderForm.h b/project/src/Codec/AudioDecoderForm.h
index b188c61..c5b78ed 100644 (file)
--- a/project/src/Codec/AudioDecoderForm.h
+++ b/project/src/Codec/AudioDecoderForm.h
@@ -81,7 +81,7 @@ public:
 
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);
-       virtual result OnActivate(void* activateParam);
+       result Activate(void* activateParam);
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
        virtual void OnBatteryLevelChanged(Tizen::System::BatteryLevel batteryLevel);

diff --git a/project/src/Codec/AudioEncoderForm.cpp b/project/src/Codec/AudioEncoderForm.cpp
index 7fe0ac0..94eca2e 100644 (file)
--- a/project/src/Codec/AudioEncoderForm.cpp
+++ b/project/src/Codec/AudioEncoderForm.cpp
@@ -203,7 +203,7 @@ void
 AudioEncoderForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                                                                   const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
-       OnActivate(null);
+       Activate(null);
 }
 void
 AudioEncoderForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
@@ -213,7 +213,7 @@ AudioEncoderForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSc
 
 
 result
-AudioEncoderForm::OnActivate(void* pParam)
+AudioEncoderForm::Activate(void* pParam)
 {
        SetDefault();
        return E_SUCCESS;

diff --git a/project/src/Codec/AudioEncoderForm.h b/project/src/Codec/AudioEncoderForm.h
index 52571e6..b111fd6 100644 (file)
--- a/project/src/Codec/AudioEncoderForm.h
+++ b/project/src/Codec/AudioEncoderForm.h
@@ -93,7 +93,7 @@ public:
 
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);
-       virtual result OnActivate(void* activateParam);
+       result Activate(void* activateParam);
        virtual void OnBatteryLevelChanged(Tizen::System::BatteryLevel batteryLevel);
        virtual void OnDeviceStateChanged(Tizen::System::DeviceType deviceType, const Tizen::Base::String &state);
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);

diff --git a/project/src/Codec/VideoDecoderForm.cpp b/project/src/Codec/VideoDecoderForm.cpp
index 2f4472f..86c7e9e 100644 (file)
--- a/project/src/Codec/VideoDecoderForm.cpp
+++ b/project/src/Codec/VideoDecoderForm.cpp
@@ -152,7 +152,7 @@ void
 VideoDecoderForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                                                                   const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
-       OnActivate(null);
+       Activate(null);
 }
 void
 VideoDecoderForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
@@ -162,11 +162,11 @@ VideoDecoderForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSc
 
 
 result
-VideoDecoderForm::OnActivate(void* pParam)
+VideoDecoderForm::Activate(void* pParam)
 {
        result r = E_SUCCESS;
 
-       AppLog("VideoDecoderForm OnActivate");
+       AppLog("VideoDecoderForm Activate");
        SetDefault();
        RequestRedraw();
        return r;

diff --git a/project/src/Codec/VideoDecoderForm.h b/project/src/Codec/VideoDecoderForm.h
index 9f74b83..3fefa28 100644 (file)
--- a/project/src/Codec/VideoDecoderForm.h
+++ b/project/src/Codec/VideoDecoderForm.h
@@ -79,7 +79,7 @@ public:
 
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);
-       virtual result OnActivate(void* pActivateParam);
+       result Activate(void* pActivateParam);
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
        virtual void OnBatteryLevelChanged(Tizen::System::BatteryLevel batteryLevel);

diff --git a/project/src/Codec/VideoEncoderForm.cpp b/project/src/Codec/VideoEncoderForm.cpp
index 236ee77..e4f98dc 100644 (file)
--- a/project/src/Codec/VideoEncoderForm.cpp
+++ b/project/src/Codec/VideoEncoderForm.cpp
@@ -169,7 +169,7 @@ void
 VideoEncoderForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                                                                   const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
-       OnActivate(null);
+       Activate(null);
 }
 void
 VideoEncoderForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
@@ -179,7 +179,7 @@ VideoEncoderForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSc
 
 
 result
-VideoEncoderForm::OnActivate(void* pParam)
+VideoEncoderForm::Activate(void* pParam)
 {
        result r = E_SUCCESS;
        SetDefault();

diff --git a/project/src/Codec/VideoEncoderForm.h b/project/src/Codec/VideoEncoderForm.h
index 0d718b9..22c6101 100644 (file)
--- a/project/src/Codec/VideoEncoderForm.h
+++ b/project/src/Codec/VideoEncoderForm.h
@@ -83,7 +83,7 @@ public:
 
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);
-       virtual result OnActivate(void* pActivateParam);
+       result Activate(void* pActivateParam);
        virtual void OnBatteryLevelChanged(Tizen::System::BatteryLevel batteryLevel);
        virtual void OnDeviceStateChanged(Tizen::System::DeviceType deviceType, const Tizen::Base::String &state);
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);

diff --git a/project/src/Codec/VideoFrameExtractorForm.cpp b/project/src/Codec/VideoFrameExtractorForm.cpp
index 832b082..46429b3 100644 (file)
--- a/project/src/Codec/VideoFrameExtractorForm.cpp
+++ b/project/src/Codec/VideoFrameExtractorForm.cpp
@@ -92,7 +92,7 @@ void
 VideoFrameExtractorForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                                                                   const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
-       OnActivate(null);
+       Activate(null);
 }
 void
 VideoFrameExtractorForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
@@ -101,7 +101,7 @@ VideoFrameExtractorForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& cu
 }
 
 result
-VideoFrameExtractorForm::OnActivate(void* pParam)
+VideoFrameExtractorForm::Activate(void* pParam)
 {
        result r = E_SUCCESS;
        String filePath = L"";

diff --git a/project/src/Codec/VideoFrameExtractorForm.h b/project/src/Codec/VideoFrameExtractorForm.h
index 59b253b..0eb1308 100644 (file)
--- a/project/src/Codec/VideoFrameExtractorForm.h
+++ b/project/src/Codec/VideoFrameExtractorForm.h
@@ -44,7 +44,7 @@ public:
        static String GetFormId();
        static SceneId GetSceneId();
 
-       result OnActivate(void* pParam);
+       result Activate(void* pParam);
        result GetFilesList(void);
        void ConstructFrame(String filePath);
 

diff --git a/project/src/Image/GifDecoderForm.cpp b/project/src/Image/GifDecoderForm.cpp
index c07e0c3..f2ea017 100644 (file)
--- a/project/src/Image/GifDecoderForm.cpp
+++ b/project/src/Image/GifDecoderForm.cpp
@@ -140,7 +140,7 @@ void
 GifDecoderForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                                                                   const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
-       OnActivate(null);
+       Activate(null);
 }
 void
 GifDecoderForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
@@ -150,7 +150,7 @@ GifDecoderForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentScen
 
 
 result
-GifDecoderForm::OnActivate(void* pParam)
+GifDecoderForm::Activate(void* pParam)
 {
        int count = _pConfig->GetInt(0, SECTION_NAME, L"count");
 

diff --git a/project/src/Image/GifDecoderForm.h b/project/src/Image/GifDecoderForm.h
index 3b34ff5..e2dea1a 100644 (file)
--- a/project/src/Image/GifDecoderForm.h
+++ b/project/src/Image/GifDecoderForm.h
@@ -53,7 +53,7 @@ public:
 
 
 protected:
-       virtual result OnActivate(void* activateParam);
+       result Activate(void* activateParam);
        virtual result OnInitializing(void);
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);

diff --git a/project/src/Image/ImageColorConvertForm.cpp b/project/src/Image/ImageColorConvertForm.cpp
index b8fc885..d63f0eb 100644 (file)
--- a/project/src/Image/ImageColorConvertForm.cpp
+++ b/project/src/Image/ImageColorConvertForm.cpp
@@ -142,7 +142,7 @@ void
 ImageColorConvertForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                                                                   const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
-       OnActivate(null);
+       Activate(null);
 }
 void
 ImageColorConvertForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
@@ -150,7 +150,7 @@ ImageColorConvertForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& curr
 {
 }
 result
-ImageColorConvertForm::OnActivate(void* pParam)
+ImageColorConvertForm::Activate(void* pParam)
 {
        result r = E_SUCCESS;
 

diff --git a/project/src/Image/ImageColorConvertForm.h b/project/src/Image/ImageColorConvertForm.h
index f20c887..3485058 100644 (file)
--- a/project/src/Image/ImageColorConvertForm.h
+++ b/project/src/Image/ImageColorConvertForm.h
@@ -41,7 +41,7 @@ public:
        static Tizen::Ui::Scenes::SceneId GetSceneId();
 
 protected:
-       virtual result OnActivate(void* pActivateParam);
+       result Activate(void* pActivateParam);
        virtual result OnInitializing(void);
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
 

diff --git a/project/src/Image/ImageConverterForm.cpp b/project/src/Image/ImageConverterForm.cpp
index cd31620..0fd5c6f 100644 (file)
--- a/project/src/Image/ImageConverterForm.cpp
+++ b/project/src/Image/ImageConverterForm.cpp
@@ -250,7 +250,7 @@ ImageConverterForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previous
                                                                   const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
        result r = E_SUCCESS;
-       OnActivate(__pParam);
+       Activate(__pParam);
        r = Process(CurrStep());
        UpdateLog(r);
 }
@@ -260,7 +260,7 @@ ImageConverterForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& current
 {
 }
 result
-ImageConverterForm::OnActivate(void* pParam)
+ImageConverterForm::Activate(void* pParam)
 {
        int count = _pConfig->GetInt(0, SECTION_NAME, L"count");
        SetStepInfo(count, 0, 1, 2);

diff --git a/project/src/Image/ImageConverterForm.h b/project/src/Image/ImageConverterForm.h
index 8a4cd40..6b4a074 100644 (file)
--- a/project/src/Image/ImageConverterForm.h
+++ b/project/src/Image/ImageConverterForm.h
@@ -54,7 +54,7 @@ public:
        virtual ~ImageConverterForm(void);
        bool Initialize(void);
        virtual result OnInitializing(void);
-       virtual result OnActivate(void* activateParam);
+       result Activate(void* activateParam);
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
        virtual void OnAdjustmentValueChanged(const Tizen::Ui::Control& source, int adjustment);
        result Convert(void);

diff --git a/project/src/Image/ImageFlipRotateForm.cpp b/project/src/Image/ImageFlipRotateForm.cpp
index 0b49f4c..2e74f02 100644 (file)
--- a/project/src/Image/ImageFlipRotateForm.cpp
+++ b/project/src/Image/ImageFlipRotateForm.cpp
@@ -187,7 +187,7 @@ void
 ImageFlipRotateForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                                                                   const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
-       OnActivate(null);
+       Activate(null);
 }
 void
 ImageFlipRotateForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
@@ -196,7 +196,7 @@ ImageFlipRotateForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& curren
 }
 
 result
-ImageFlipRotateForm::OnActivate(void* pParam)
+ImageFlipRotateForm::Activate(void* pParam)
 {
 
        int count = _pConfig->GetInt(0, SECTION_NAME, L"count");

diff --git a/project/src/Image/ImageFlipRotateForm.h b/project/src/Image/ImageFlipRotateForm.h
index 1164beb..dacc0ca 100644 (file)
--- a/project/src/Image/ImageFlipRotateForm.h
+++ b/project/src/Image/ImageFlipRotateForm.h
@@ -52,7 +52,7 @@ public:
 
 
 protected:
-       virtual result OnActivate(void* pActivateParam);
+       result Activate(void* pActivateParam);
        virtual result OnInitializing(void);
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);

diff --git a/project/src/Image/ImageResizeForm.cpp b/project/src/Image/ImageResizeForm.cpp
index ea4c852..b6fdb83 100644 (file)
--- a/project/src/Image/ImageResizeForm.cpp
+++ b/project/src/Image/ImageResizeForm.cpp
@@ -132,7 +132,7 @@ void
 ImageResizeForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                                                                   const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
-       OnActivate(null);
+       Activate(null);
 }
 void
 ImageResizeForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
@@ -141,7 +141,7 @@ ImageResizeForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSce
 }
 
 result
-ImageResizeForm::OnActivate(void* pParam)
+ImageResizeForm::Activate(void* pParam)
 {
        result r = E_SUCCESS;
        int index = 0;

diff --git a/project/src/Image/ImageResizeForm.h b/project/src/Image/ImageResizeForm.h
index d7e7fb0..1ff0875 100644 (file)
--- a/project/src/Image/ImageResizeForm.h
+++ b/project/src/Image/ImageResizeForm.h
@@ -54,7 +54,7 @@ public:
        OnDeviceStateChanged(Tizen::System::DeviceType deviceType, const Tizen::Base::String &state);
 
 protected:
-       virtual result OnActivate(void* pActivateParam);
+       result Activate(void* pActivateParam);
        virtual result OnInitializing(void);
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
        virtual void OnAdjustmentValueChanged(const Tizen::Ui::Control& source, int adjustment);

diff --git a/project/src/Image/ImageViewerForm.cpp b/project/src/Image/ImageViewerForm.cpp
index 10c7eca..636cc27 100644 (file)
--- a/project/src/Image/ImageViewerForm.cpp
+++ b/project/src/Image/ImageViewerForm.cpp
@@ -188,7 +188,7 @@ void
 ImageViewerForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                                                                   const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
-       OnActivate(__pParam);
+       Activate(__pParam);
 }
 void
 ImageViewerForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
@@ -196,7 +196,7 @@ ImageViewerForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSce
 {
 }
 result
-ImageViewerForm::OnActivate(void* pParam)
+ImageViewerForm::Activate(void* pParam)
 {
        result r = E_SUCCESS;
        String* pFileName = null;

diff --git a/project/src/Image/ImageViewerForm.h b/project/src/Image/ImageViewerForm.h
index d0401a9..b8a703d 100644 (file)
--- a/project/src/Image/ImageViewerForm.h
+++ b/project/src/Image/ImageViewerForm.h
@@ -57,7 +57,7 @@ public:
 
        bool Initialize(void);
        virtual result OnInitializing(void);
-       virtual result OnActivate(void* pActivateParam);
+       result Activate(void* pActivateParam);
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
        virtual void OnAdjustmentValueChanged(const Tizen::Ui::Control& source, int adjustment);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);

diff --git a/project/src/MainForm.cpp b/project/src/MainForm.cpp
index e6da8cd..7b46904 100644 (file)
--- a/project/src/MainForm.cpp
+++ b/project/src/MainForm.cpp
@@ -94,7 +94,7 @@ void
 MainForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                                                                   const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
-       OnActivate(null);
+       Activate(null);
 }
 void
 MainForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
@@ -105,36 +105,36 @@ MainForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
 void MainForm::RegisterAllForms(void)
 {
        //Image
-       new UnitTestInfo(L"Image", L"1.Image Viewer", IMAGE_VIEWER_SCENE_ID, 0);
-       new UnitTestInfo(L"Image", L"2.Image Converter", IMAGE_CONVERTER_SCENE_ID, 0);
-       new UnitTestInfo(L"Image", L"3.Gif Viewer", GIF_DECODER_SCENE_ID, 0);
-       new UnitTestInfo(L"Image", L"4.Flip & Rotate", IMAGE_FLIP_ROTATE_SCENE_ID, 0);
-       new UnitTestInfo(L"Image", L"5.Image Resize", IMAGE_RESIZE_SCENE_ID, 0);
-       new UnitTestInfo(L"Image", L"6.Color Convert", IMAGE_COLOR_CONVERTER_SCENE_ID, 0);
+       new UnitTestInfo(L"Image", L"1. Image Viewer", IMAGE_VIEWER_SCENE_ID, 0);
+       new UnitTestInfo(L"Image", L"2. Image Converter", IMAGE_CONVERTER_SCENE_ID, 0);
+       new UnitTestInfo(L"Image", L"3. Gif Viewer", GIF_DECODER_SCENE_ID, 0);
+       new UnitTestInfo(L"Image", L"4. Flip & Rotate", IMAGE_FLIP_ROTATE_SCENE_ID, 0);
+       new UnitTestInfo(L"Image", L"5. Image Resize", IMAGE_RESIZE_SCENE_ID, 0);
+       new UnitTestInfo(L"Image", L"6. Color Convert", IMAGE_COLOR_CONVERTER_SCENE_ID, 0);
 
        //Audio
-       new UnitTestInfo(L"Audio", L"1.TonePlayer", TONE_PLAYER_SCENE_ID, 0);
-       new UnitTestInfo(L"Audio", L"2.AudioInOut", AUDIO_INOUT_SCENE_ID, 0);
-       new UnitTestInfo(L"Audio", L"3.AudioEqualizer", AUDIO_EQUALIZER_SCENE_ID, 0);
+       new UnitTestInfo(L"Audio", L"1. TonePlayer", TONE_PLAYER_SCENE_ID, 0);
+       new UnitTestInfo(L"Audio", L"2. AudioInOut", AUDIO_INOUT_SCENE_ID, 0);
+       new UnitTestInfo(L"Audio", L"3. AudioEqualizer", AUDIO_EQUALIZER_SCENE_ID, 0);
 
        //recorder
-       new UnitTestInfo(L"Recorder", L"1.Camera Capture", CAMERA_CAPTURE_SCENE_ID, 0);
-       new UnitTestInfo(L"Recorder", L"2.Video Recorder", VIDEO_RECORDER_SCENE_ID, 0);
-       new UnitTestInfo(L"Recorder", L"3.Audio Recorder", AUDIO_RECORDER_SCENE_ID, 0);
+       new UnitTestInfo(L"Recorder", L"1. Camera Capture", CAMERA_CAPTURE_SCENE_ID, 0);
+       new UnitTestInfo(L"Recorder", L"2. Video Recorder", VIDEO_RECORDER_SCENE_ID, 0);
+       new UnitTestInfo(L"Recorder", L"3. Audio Recorder", AUDIO_RECORDER_SCENE_ID, 0);
 
        //player
-       new UnitTestInfo(L"Player", L"1.Media Player", PLAYER_SCENE_ID, 0);
-       new UnitTestInfo(L"Player", L"2.Multi Play", MULTI_PLAY_SCENE_ID, 0);
-       new UnitTestInfo(L"Player", L"3.Camera and Player", CAMERA_PLAYER_SCENE_ID, 0);
-       new UnitTestInfo(L"Player", L"4.Video Recorder and Player", VIDEO_RECORDER_PLAYER_SCENE_ID, 0);
-       new UnitTestInfo(L"Player", L"5.Player 2.0", CAPTURE_VIDEO_SCENE_ID, 0);
+       new UnitTestInfo(L"Player", L"1. Media Player", PLAYER_SCENE_ID, 0);
+       new UnitTestInfo(L"Player", L"2. Multi Play", MULTI_PLAY_SCENE_ID, 0);
+       new UnitTestInfo(L"Player", L"3. Camera and Player", CAMERA_PLAYER_SCENE_ID, 0);
+       new UnitTestInfo(L"Player", L"4. Video Recorder and Player", VIDEO_RECORDER_PLAYER_SCENE_ID, 0);
+       new UnitTestInfo(L"Player", L"5. Player 2.0", CAPTURE_VIDEO_SCENE_ID, 0);
 
        //codec
-       new UnitTestInfo(L"Codec", L"1.AudioDecoder", AUDIO_DECODER_SCENE_ID, 0);
-       new UnitTestInfo(L"Codec", L"2.AudioEncoder", AUDIO_ENCODER_SCENE_ID, 0);
-       new UnitTestInfo(L"Codec", L"3.VideoDecoder", VIDEO_DECODER_SCENE_ID, 0);
-       new UnitTestInfo(L"Codec", L"4.VideoEncoder", VIDEO_ENCODER_SCENE_ID, 0);
-       new UnitTestInfo(L"Codec", L"5.Frame Extractor", FRAME_EXTRACTOR_SCENE_ID, 0);
+       new UnitTestInfo(L"Codec", L"1. AudioDecoder", AUDIO_DECODER_SCENE_ID, 0);
+       new UnitTestInfo(L"Codec", L"2. AudioEncoder", AUDIO_ENCODER_SCENE_ID, 0);
+       new UnitTestInfo(L"Codec", L"3. VideoDecoder", VIDEO_DECODER_SCENE_ID, 0);
+       new UnitTestInfo(L"Codec", L"4. VideoEncoder", VIDEO_ENCODER_SCENE_ID, 0);
+       new UnitTestInfo(L"Codec", L"5. Frame Extractor", FRAME_EXTRACTOR_SCENE_ID, 0);
 
 }
 
@@ -209,9 +209,9 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 }
 
 result
-MainForm::OnActivate(void* pParam)
+MainForm::Activate(void* pParam)
 {
-       AppLog("OnActivate");
+       AppLog("Activate");
        return E_SUCCESS;
 }
 

diff --git a/project/src/MultiForm.cpp b/project/src/MultiForm.cpp
index 7b55ee1..3e34d23 100644 (file)
--- a/project/src/MultiForm.cpp
+++ b/project/src/MultiForm.cpp
@@ -124,7 +124,7 @@ MultiForm::OnInitializing(void)
 
 
 result
-MultiForm::OnActivate(void* pParam)
+MultiForm::Activate(void* pParam)
 {
        return E_SUCCESS;
 }

diff --git a/project/src/Player/CameraPlayerForm.cpp b/project/src/Player/CameraPlayerForm.cpp
index 10cba47..b729586 100644 (file)
--- a/project/src/Player/CameraPlayerForm.cpp
+++ b/project/src/Player/CameraPlayerForm.cpp
@@ -197,7 +197,7 @@ void
 CameraPlayerForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                                                                   const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
-       OnActivate(null);
+       Activate(null);
 }
 void
 CameraPlayerForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
@@ -206,7 +206,7 @@ CameraPlayerForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSc
 }
 
 result
-CameraPlayerForm::OnActivate(void* pActivateParam)
+CameraPlayerForm::Activate(void* pActivateParam)
 {
        result r = E_SUCCESS;
 
@@ -668,7 +668,7 @@ CameraPlayerForm::OnBatteryLevelChanged(Tizen::System::BatteryLevel batteryLevel
        {
                if (__batteryLevelFlag == true)
                {
-                       this->OnActivate(null);
+                       Activate(null);
                }
        }
 }

diff --git a/project/src/Player/CameraPlayerForm.h b/project/src/Player/CameraPlayerForm.h
index 37627a5..6babc88 100644 (file)
--- a/project/src/Player/CameraPlayerForm.h
+++ b/project/src/Player/CameraPlayerForm.h
@@ -47,7 +47,7 @@ public:
 protected:
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);
-       virtual result OnActivate(void* pActivateParam);
+       result Activate(void* pActivateParam);
        virtual void OnCameraAutoFocused(bool completeCondition);
        virtual void OnCameraCaptured(Tizen::Base::ByteBuffer& capturedData, result r);
        virtual void OnCameraErrorOccurred(Tizen::Media::CameraErrorReason r);

diff --git a/project/src/Player/CaptureVideoForm.cpp b/project/src/Player/CaptureVideoForm.cpp
index 6640b25..2d4fde4 100644 (file)
--- a/project/src/Player/CaptureVideoForm.cpp
+++ b/project/src/Player/CaptureVideoForm.cpp
@@ -191,7 +191,7 @@ void
 CaptureVideoForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                                                                   const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
-       OnActivate(null);
+       Activate(null);
 }
 void
 CaptureVideoForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
@@ -200,7 +200,7 @@ CaptureVideoForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSc
 }
 
 result
-CaptureVideoForm::OnActivate(void* pParam)
+CaptureVideoForm::Activate(void* pParam)
 {
        __progressCnt = 0;
        __isPausedInMove = false;

diff --git a/project/src/Player/CaptureVideoForm.h b/project/src/Player/CaptureVideoForm.h
index d78c890..bd7fdf8 100644 (file)
--- a/project/src/Player/CaptureVideoForm.h
+++ b/project/src/Player/CaptureVideoForm.h
@@ -88,8 +88,8 @@ public:
        virtual void OnKeyPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode);
        virtual void OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode);
        virtual void OnKeyLongPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode);
-       //MultiForm's
-       result OnActivate(void* pParam);
+
+       result Activate(void* pParam);
        // Called when the application's frame moves to the top of the screen.
        virtual void OnForeground(void);
        // Called when this application's frame is moved from top of the screen to the background.

diff --git a/project/src/Player/MultiPlayForm.cpp b/project/src/Player/MultiPlayForm.cpp
index b7da453..6b7f8aa 100644 (file)
--- a/project/src/Player/MultiPlayForm.cpp
+++ b/project/src/Player/MultiPlayForm.cpp
@@ -118,7 +118,7 @@ void
 MultiPlayForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                                                                   const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
-       OnActivate(null);
+       Activate(null);
 }
 void
 MultiPlayForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
@@ -127,7 +127,7 @@ MultiPlayForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentScene
 }
 
 result
-MultiPlayForm::OnActivate(void* pParam)
+MultiPlayForm::Activate(void* pParam)
 {
        AppLog("ENTER");
        __nConfigFileCount = 0;

diff --git a/project/src/Player/MultiPlayForm.h b/project/src/Player/MultiPlayForm.h
index 5cd6ff8..cd0dd7e 100644 (file)
--- a/project/src/Player/MultiPlayForm.h
+++ b/project/src/Player/MultiPlayForm.h
@@ -76,7 +76,7 @@ public:
        MultiPlayForm* GetListener(void);
 
 protected:
-       virtual result OnActivate(void* activateParam);
+       result Activate(void* activateParam);
 
        result OnInitializing(void);
        void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);

diff --git a/project/src/Player/PlayerForm.cpp b/project/src/Player/PlayerForm.cpp
index 0eb8f73..796cf3e 100644 (file)
--- a/project/src/Player/PlayerForm.cpp
+++ b/project/src/Player/PlayerForm.cpp
@@ -247,7 +247,7 @@ void
 PlayerForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                                                                   const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
-       OnActivate(null);
+       Activate(null);
 }
 void
 PlayerForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
@@ -256,7 +256,7 @@ PlayerForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
 }
 
 result
-PlayerForm::OnActivate(void* pParam)
+PlayerForm::Activate(void* pParam)
 {
        AppLog("ENTER");
        __pSliderPos->SetValue(0);

diff --git a/project/src/Player/PlayerForm.h b/project/src/Player/PlayerForm.h
index 3b67a90..7cbf5b8 100644 (file)
--- a/project/src/Player/PlayerForm.h
+++ b/project/src/Player/PlayerForm.h
@@ -57,8 +57,7 @@ public:
        PlayerForm* GetListener(void);
 
 protected:
-       //MultiFomms Implementaion
-       virtual result OnActivate(void* activateParam);
+       result Activate(void* pParam);
        result OnInitializing(void);
        void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
        // Called when the application's frame moves to the top of the screen.

diff --git a/project/src/Player/VideoRecorderPlayerForm.cpp b/project/src/Player/VideoRecorderPlayerForm.cpp
index fe4b00e..9911682 100644 (file)
--- a/project/src/Player/VideoRecorderPlayerForm.cpp
+++ b/project/src/Player/VideoRecorderPlayerForm.cpp
@@ -233,7 +233,7 @@ void
 VideoRecorderPlayerForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                                                                   const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
-       OnActivate(null);
+       Activate(null);
 }
 void
 VideoRecorderPlayerForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
@@ -242,7 +242,7 @@ VideoRecorderPlayerForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& cu
 }
 
 result
-VideoRecorderPlayerForm::OnActivate(void* activateParam)
+VideoRecorderPlayerForm::Activate(void* activateParam)
 {
        result r = E_SUCCESS;
 
@@ -914,7 +914,7 @@ VideoRecorderPlayerForm::OnForeground(void)
        AppLog("VideoRecorderPlayerForm::OnForeground");
        if (__backGroundFlag == true)
        {
-               VideoRecorderPlayerForm::OnActivate(null);
+               VideoRecorderPlayerForm::Activate(null);
        }
 
        __backGroundFlag = false;
@@ -1133,7 +1133,7 @@ VideoRecorderPlayerForm::OnBatteryLevelChanged(Tizen::System::BatteryLevel batte
        {
                if (__batteryLevelFlag == true)
                {
-                       this->OnActivate(null);
+                       Activate(null);
                }
        }
 }
@@ -1334,7 +1334,7 @@ VideoRecorderPlayerForm::OnVideoRecorderClosed(result r)
        else
        {
                FreeResources();
-               VideoRecorderPlayerForm::OnActivate(null);
+               VideoRecorderPlayerForm::Activate(null);
                AppLog("Could not launch the mediaplayer");
        }
 }

diff --git a/project/src/Player/VideoRecorderPlayerForm.h b/project/src/Player/VideoRecorderPlayerForm.h
old mode 100755 (executable)
new mode 100644 (file)
index db0bd25..897c4ed
--- a/project/src/Player/VideoRecorderPlayerForm.h
+++ b/project/src/Player/VideoRecorderPlayerForm.h
@@ -53,7 +53,7 @@ public:
 protected:
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);
-       virtual result OnActivate(void* activateParam);
+       result Activate(void* activateParam);
        virtual void OnCameraAutoFocused(bool completeCondition);
        virtual void OnCameraCaptured(Tizen::Base::ByteBuffer& capturedData, result r);
        virtual void OnCameraErrorOccurred(CameraErrorReason r);

diff --git a/project/src/Recorder/AudioRecorderForm.cpp b/project/src/Recorder/AudioRecorderForm.cpp
index 4b0bc7e..ae89631 100644 (file)
--- a/project/src/Recorder/AudioRecorderForm.cpp
+++ b/project/src/Recorder/AudioRecorderForm.cpp
@@ -347,7 +347,7 @@ void
 AudioRecorderForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                                                                   const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
-       OnActivate(null);
+       Activate(null);
 }
 void
 AudioRecorderForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
@@ -777,7 +777,7 @@ AudioRecorderForm::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView& sou
 
 
 result
-AudioRecorderForm::OnActivate(void* pActivateParam)
+AudioRecorderForm::Activate(void* pActivateParam)
 {
        MediaContainerType tempContainerType;
        CodecType tempCodecType;

diff --git a/project/src/Recorder/AudioRecorderForm.h b/project/src/Recorder/AudioRecorderForm.h
index 35533a6..f79752e 100644 (file)
--- a/project/src/Recorder/AudioRecorderForm.h
+++ b/project/src/Recorder/AudioRecorderForm.h
@@ -66,7 +66,7 @@ protected:
        virtual result OnTerminating(void);
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
 
-       virtual result OnActivate(void* pActivateParam);
+       result Activate(void* pActivateParam);
 
        virtual void OnKeyPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode);
 

diff --git a/project/src/Recorder/VideoRecorderForm.cpp b/project/src/Recorder/VideoRecorderForm.cpp
index cb112d1..a4f245a 100644 (file)
--- a/project/src/Recorder/VideoRecorderForm.cpp
+++ b/project/src/Recorder/VideoRecorderForm.cpp
@@ -330,7 +330,7 @@ void
 VideoRecorderForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                                                                   const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
-       OnActivate(null);
+       Activate(null);
 }
 void
 VideoRecorderForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
@@ -1199,7 +1199,7 @@ VideoRecorderForm::DeleteItem(int index, Tizen::Ui::Controls::ListItemBase* pIte
 }
 
 result
-VideoRecorderForm::OnActivate(void* pActivateParam)
+VideoRecorderForm::Activate(void* pActivateParam)
 {
        result r = E_SUCCESS;
 
@@ -1214,7 +1214,7 @@ VideoRecorderForm::OnActivate(void* pActivateParam)
        PixelFormat pixFormat = PIXEL_FORMAT_YCbCr420_PLANAR;
        Footer* pFotter = null;
 
-       AppLog("VideoRecorderForm::OnActivate enter CAM TYPE = %d", __camType);
+       AppLog("VideoRecorderForm::Activate enter CAM TYPE = %d", __camType);
 
        Tizen::System::BatteryLevel batteryLevel;
        Tizen::System::Battery::GetCurrentLevel(batteryLevel);
@@ -2200,7 +2200,7 @@ VideoRecorderForm::ToggleCamera(void)
                SetFooterItem(1, L"Back", ID_TOGGLE_CAMERA_TYPE);
        }
 
-       OnActivate(null);
+       Activate(null);
        return E_SUCCESS;
 }
 
@@ -4509,7 +4509,7 @@ VideoRecorderForm::OnVideoRecorderClosed(result r)
                default:
                {
                        FreeResources();
-                       VideoRecorderForm::OnActivate(null);
+                       VideoRecorderForm::Activate(null);
                }
                break;
        }
@@ -5066,7 +5066,7 @@ VideoRecorderForm::OnForeground(void)
        if (__backGround == true)
        {
                __backGround = false;
-               VideoRecorderForm::OnActivate(null);
+               VideoRecorderForm::Activate(null);
                AppLog("VideoRecorderForm::OnForeground Enter 1");
                Draw();
        }
@@ -5649,7 +5649,7 @@ VideoRecorderForm::OnBatteryLevelChanged(Tizen::System::BatteryLevel batteryLeve
        {
                if (__batteryLevelFlag == true)
                {
-                       this->OnActivate(null);
+                       Activate(null);
                }
        }
 }

diff --git a/project/src/Recorder/VideoRecorderForm.h b/project/src/Recorder/VideoRecorderForm.h
index 3401ecd..6730e7b 100644 (file)
--- a/project/src/Recorder/VideoRecorderForm.h
+++ b/project/src/Recorder/VideoRecorderForm.h
@@ -76,7 +76,7 @@ protected:
        virtual result OnTerminating(void);
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
 
-       virtual result OnActivate(void* activateParam);
+       result Activate(void* activateParam);
        virtual void OnBatteryLevelChanged(Tizen::System::BatteryLevel batteryLevel);
 
        virtual void OnVideoRecorderCanceled(result r);