From: srinivasa.mr Date: Fri, 7 Jun 2013 02:48:55 +0000 (+0900) Subject: Changing Title from MEDIA APP to Media App X-Git-Tag: 2.2_release~50 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c0b590c6eb3ee5d7030165665b5eb60f7d0413d9;p=samples%2Fnative%2FMediaApp.git Changing Title from MEDIA APP to Media App Also the subtitles are changed ex MEDIA APP - IMAGE -> Media App - Image All the sub forms titles are changed Change-Id: I5fb0c3990de1d8dede753257fc8f61df02dd2960 Signed-off-by: srinivasa.mr --- diff --git a/project/src/Audio/AudioEqualizerForm.cpp b/project/src/Audio/AudioEqualizerForm.cpp index cf2358c..aef06b4 100644 --- a/project/src/Audio/AudioEqualizerForm.cpp +++ b/project/src/Audio/AudioEqualizerForm.cpp @@ -109,7 +109,7 @@ AudioEqualizerForm::OnInitializing(void) // Initialize Recording form - SetHeaderText(L"AUDIO EQUALIZER"); + SetHeaderText(L"Audio Equalizer"); SetFooterStyle(FOOTER_STYLE_BUTTON_TEXT, false, this); AddFooterItem(L"Play", ID_BUTTON_PLAY); AddFooterItem(L"Stop", ID_BUTTON_STOP); diff --git a/project/src/Audio/AudioInOut.cpp b/project/src/Audio/AudioInOut.cpp index 10152fa..068fe30 100644 --- a/project/src/Audio/AudioInOut.cpp +++ b/project/src/Audio/AudioInOut.cpp @@ -118,7 +118,7 @@ AudioInOut::OnInitializing(void) result r = E_SUCCESS; // Initialize Recording form - SetHeaderText(L"AUDIO IN OUT TEST"); + SetHeaderText(L"Audio In Out Test"); SetFooterStyle(FOOTER_STYLE_BUTTON_TEXT, false, this); AddFooterItem(L"Record", ID_BUTTON_RECORD); AddFooterItem(L"Play", ID_BUTTON_PLAY); diff --git a/project/src/Audio/GlesCubePlayer.cpp b/project/src/Audio/GlesCubePlayer.cpp index bd1fc5e..7ffc329 100644 --- a/project/src/Audio/GlesCubePlayer.cpp +++ b/project/src/Audio/GlesCubePlayer.cpp @@ -744,7 +744,7 @@ GlesCubePlayerForm::OnInitializing() { result r = E_SUCCESS; - SetHeaderText("GLES-CUBE PLAYER"); + SetHeaderText("Gles-Cube Player"); SetFooterStyle(FOOTER_STYLE_BUTTON_TEXT, ID_BACK, this); AddFooterItem("Play", ID_PLAY); diff --git a/project/src/Audio/TonePlayerForm.cpp b/project/src/Audio/TonePlayerForm.cpp index fc818f1..220b642 100644 --- a/project/src/Audio/TonePlayerForm.cpp +++ b/project/src/Audio/TonePlayerForm.cpp @@ -196,7 +196,7 @@ TonePlayerForm::OnInitializing(void) result r = E_SUCCESS; AppLog("Enter"); - SetHeaderText("TONE PLAYER"); + SetHeaderText("Tone Player"); Footer* pfooter = GetFooter(); pfooter->SetBackButton(); String tones; diff --git a/project/src/Camera/CameraCaptureForm.cpp b/project/src/Camera/CameraCaptureForm.cpp index 1fcf1a9..753d98b 100644 --- a/project/src/Camera/CameraCaptureForm.cpp +++ b/project/src/Camera/CameraCaptureForm.cpp @@ -282,7 +282,7 @@ CameraCaptureForm::OnInitializing(void) result r = E_SUCCESS; int defaultPreviewFormatValue = 0; - SetHeaderText("CAMERA CAPTURE"); + SetHeaderText("Camera Capture"); SetFooterStyle(FOOTER_STYLE_BUTTON_TEXT, ID_BUTTON_BACK, this); AddFooterItem(L"Settings", ID_BUTTON_SETTING); AddFooterItem(L"Capture", ID_BUTTON_CAPTURE); diff --git a/project/src/Codec/AudioDecoderForm.cpp b/project/src/Codec/AudioDecoderForm.cpp index 82a2f94..c3ddacc 100644 --- a/project/src/Codec/AudioDecoderForm.cpp +++ b/project/src/Codec/AudioDecoderForm.cpp @@ -195,7 +195,7 @@ AudioDecoderForm::OnInitializing(void) int count = 0; Frame* pFrame = null; - r = SetHeaderText("AUDIO DECODER"); + r = SetHeaderText("Audio Decoder"); TryCatch( r == E_SUCCESS, , "Error Occurred" ); r = SetFooterStyle(FOOTER_STYLE_BUTTON_TEXT, ID_BACK, this); diff --git a/project/src/Codec/AudioEncoderForm.cpp b/project/src/Codec/AudioEncoderForm.cpp index 5adc4c0..7a586e4 100644 --- a/project/src/Codec/AudioEncoderForm.cpp +++ b/project/src/Codec/AudioEncoderForm.cpp @@ -227,7 +227,7 @@ AudioEncoderForm::OnInitializing(void) int count = 0; Frame* pFrame = null; - r = SetHeaderText("AUDIO ENCODER"); + r = SetHeaderText("Audio Encoder"); TryCatch( r == E_SUCCESS, , "Error Occurred" ); r = SetFooterStyle(FOOTER_STYLE_BUTTON_TEXT, ID_BACK, this); diff --git a/project/src/Codec/VideoDecoderForm.cpp b/project/src/Codec/VideoDecoderForm.cpp index 58d402b..3cab45a 100644 --- a/project/src/Codec/VideoDecoderForm.cpp +++ b/project/src/Codec/VideoDecoderForm.cpp @@ -183,7 +183,7 @@ VideoDecoderForm::OnInitializing(void) bool isValidRect = false; Frame* pFrame = null; - r = SetHeaderText("VIDEO DECODER"); + r = SetHeaderText("Video Decoder"); TryCatch( r == E_SUCCESS, , "Error Occurred" ); r = SetFooterStyle(FOOTER_STYLE_BUTTON_TEXT, ID_BACK, this); TryCatch( r == E_SUCCESS, , "Error Occurred" ); diff --git a/project/src/Codec/VideoEncoderForm.cpp b/project/src/Codec/VideoEncoderForm.cpp index 632577b..8b3ed49 100644 --- a/project/src/Codec/VideoEncoderForm.cpp +++ b/project/src/Codec/VideoEncoderForm.cpp @@ -198,7 +198,7 @@ VideoEncoderForm::OnInitializing(void) bool isValidRect = false; Frame* pFrame = null; - r = SetHeaderText("VIDEO ENCODER"); + r = SetHeaderText("Video Encoder"); TryCatch( r == E_SUCCESS, , "Error Occurred"); r = SetFooterStyle(FOOTER_STYLE_BUTTON_TEXT, ID_BACK, this); TryCatch( r == E_SUCCESS, , "Error Occurred"); diff --git a/project/src/Codec/VideoFrameExtractorForm.cpp b/project/src/Codec/VideoFrameExtractorForm.cpp index d0e526c..9bdee43 100644 --- a/project/src/Codec/VideoFrameExtractorForm.cpp +++ b/project/src/Codec/VideoFrameExtractorForm.cpp @@ -126,7 +126,7 @@ VideoFrameExtractorForm::OnInitializing(void) { result r = E_SUCCESS; - SetHeaderText("FRAME EXTRACTOR"); + SetHeaderText("Frame Extractor"); SetFooterStyle(FOOTER_STYLE_BUTTON_TEXT, ID_BACK, this); AddFooterItem(L"Prev", ID_PREV); AddFooterItem(L"Next", ID_NEXT); diff --git a/project/src/Image/GifDecoderForm.cpp b/project/src/Image/GifDecoderForm.cpp index 916a8e6..21d6601 100644 --- a/project/src/Image/GifDecoderForm.cpp +++ b/project/src/Image/GifDecoderForm.cpp @@ -105,7 +105,7 @@ GifDecoderForm::OnInitializing(void) { result r = E_SUCCESS; - SetHeaderText("GIF VIEWER"); + SetHeaderText("Gif Viewer"); SetFooterStyle(FOOTER_STYLE_BUTTON_TEXT, ID_BACK, this); r = AddFooterItem(pixelformatName[!__pixFmtIndex], ID_PIXFMT); diff --git a/project/src/Image/ImageColorConvertForm.cpp b/project/src/Image/ImageColorConvertForm.cpp index bba7ec7..5a416e4 100644 --- a/project/src/Image/ImageColorConvertForm.cpp +++ b/project/src/Image/ImageColorConvertForm.cpp @@ -105,7 +105,7 @@ ImageColorConvertForm::OnInitializing(void) { result r = E_SUCCESS; - SetHeaderText("COLOR CONVERTER"); + SetHeaderText("Color Converter"); SetFooterStyle(FOOTER_STYLE_BUTTON_TEXT, ID_BACK, this); AddFooterItem(pixelFormatMap[(__pixFmtIndex + 1)%3].key, ID_FORMAT); diff --git a/project/src/Image/ImageConverterForm.cpp b/project/src/Image/ImageConverterForm.cpp index 7857dbe..c121aeb 100644 --- a/project/src/Image/ImageConverterForm.cpp +++ b/project/src/Image/ImageConverterForm.cpp @@ -118,7 +118,7 @@ ImageConverterForm::OnInitializing(void) AppLog("ImageConverterForm::OnInitializing\n"); - SetHeaderText("IMAGE CONVERTER"); + SetHeaderText("Image Converter"); SetFooterStyle(FOOTER_STYLE_BUTTON_TEXT, ID_BACK, this); AddFooterItem(L"JPEG", ID_FORMAT); AddFooterItem(L"Prev", ID_PREV); diff --git a/project/src/Image/ImageFlipRotateForm.cpp b/project/src/Image/ImageFlipRotateForm.cpp index 97083a8..e036c26 100644 --- a/project/src/Image/ImageFlipRotateForm.cpp +++ b/project/src/Image/ImageFlipRotateForm.cpp @@ -139,7 +139,7 @@ ImageFlipRotateForm::OnInitializing(void) { result r = E_SUCCESS; - SetHeaderText("FLIP & ROTATE"); + SetHeaderText("Flip & Rotate"); SetFooterStyle(FOOTER_STYLE_BUTTON_TEXT, ID_BACK, this); AddFooterItem(L"Prev", ID_PREV); AddFooterItem(L"Next", ID_NEXT); diff --git a/project/src/Image/ImageResizeForm.cpp b/project/src/Image/ImageResizeForm.cpp index e03b5ca..dc1c5a3 100644 --- a/project/src/Image/ImageResizeForm.cpp +++ b/project/src/Image/ImageResizeForm.cpp @@ -95,7 +95,7 @@ ImageResizeForm::OnInitializing(void) { result r = E_SUCCESS; - SetHeaderText("IMAGE RESIZE"); + SetHeaderText("Image Resize"); SetFooterStyle(FOOTER_STYLE_BUTTON_TEXT, ID_BACK, this); AddFooterItem(L"Prev", ID_PREV); AddFooterItem(L"Next", ID_NEXT); diff --git a/project/src/Image/ImageViewerForm.cpp b/project/src/Image/ImageViewerForm.cpp index 4a71895..218daf2 100644 --- a/project/src/Image/ImageViewerForm.cpp +++ b/project/src/Image/ImageViewerForm.cpp @@ -128,7 +128,7 @@ ImageViewerForm::OnInitializing(void) result r = E_SUCCESS; String dirName; - SetHeaderText("IMAGE VIEWER"); + SetHeaderText("Image Viewer"); SetFooterStyle(FOOTER_STYLE_BUTTON_TEXT, ID_BACK, this); r = AddFooterItem(pixelformatName[!__pixFmtIndex], ID_PIXFMT); TryReturn(r == E_SUCCESS, r, "[%s] Failed to add \"PixFormat\" button.", GetErrorMessage(r)); diff --git a/project/src/MainForm.cpp b/project/src/MainForm.cpp index b2e2740..bc5a3bf 100644 --- a/project/src/MainForm.cpp +++ b/project/src/MainForm.cpp @@ -144,7 +144,7 @@ MainForm::OnInitializing(void) { result r = E_SUCCESS; - SetHeaderText(L"MEDIA APP"); + SetHeaderText(L"Media App"); Footer* pFooter = GetFooter(); pFooter->SetStyle(FOOTER_STYLE_BUTTON_TEXT); pFooter->SetBackButton(); @@ -398,7 +398,7 @@ MainForm::ShowTsList(void) __tsMode = true; - SetHeaderText(L"MEDIA APP"); + SetHeaderText(L"Media App"); RequestRedraw(); @@ -445,10 +445,11 @@ MainForm::ShowTcList(int index) __tsName = *pTsName; pTsName->ToUpperCase(titleText); + titleText = *pTsName; AppLog("pFactory->GetTsName(%d, %ls) : %s", index, __tsName.GetPointer(), GetErrorMessage(r)); - SetHeaderText(String(L"MEDIA APP - ") + titleText); + SetHeaderText(String(L"Media App - ") + titleText); pTsList->RemoveAll(true); delete pTsList; diff --git a/project/src/MediaPlayerForm.cpp b/project/src/MediaPlayerForm.cpp index 68da412..fa2deb9 100644 --- a/project/src/MediaPlayerForm.cpp +++ b/project/src/MediaPlayerForm.cpp @@ -333,15 +333,15 @@ MediaPlayerForm::InitializeMediaPlayer(void) if (__isMediaVideo == true) { - SetHeaderText(L"VIDEO PLAYER"); + SetHeaderText(L"Video Player"); } else if (__isMediaAudio == true) { - SetHeaderText(L"AUDIO PLAYER"); + SetHeaderText(L"Audio Player"); } else if (__isMediaImage == true) { - SetHeaderText(L"IMAGE VIEWER"); + SetHeaderText(L"Image Viewer"); SetFooterStyle(FOOTER_STYLE_BUTTON_TEXT, true, this); SetFormBackEventListener(this); diff --git a/project/src/Player/CameraPlayerForm.cpp b/project/src/Player/CameraPlayerForm.cpp index c0f4c92..b0dc900 100644 --- a/project/src/Player/CameraPlayerForm.cpp +++ b/project/src/Player/CameraPlayerForm.cpp @@ -104,7 +104,7 @@ CameraPlayerForm::OnInitializing(void) Footer* pFooter = GetFooter(); Header* pHeader = GetHeader(); - SetHeaderText("CAMERA & PLAYER"); + SetHeaderText("Camera & Player"); SetFooterStyle(FOOTER_STYLE_BUTTON_TEXT, ID_BUTTON_BACK, this); AddFooterItem(L"Start", ID_BUTTON_START); diff --git a/project/src/Player/CaptureVideoForm.cpp b/project/src/Player/CaptureVideoForm.cpp index 6dfe821..637ad77 100644 --- a/project/src/Player/CaptureVideoForm.cpp +++ b/project/src/Player/CaptureVideoForm.cpp @@ -123,7 +123,7 @@ CaptureVideoForm::OnInitializing(void) bool modified = false; bool isValidRect = false; AddKeyEventListener(*this); - SetHeaderText("CAPTURE VIDEO PLAYER"); + SetHeaderText("Capture Video Player"); __pVideoThread = new (std::nothrow) VideoThread(this); diff --git a/project/src/Player/MultiPlayForm.cpp b/project/src/Player/MultiPlayForm.cpp index 7fcad45..b3d3630 100644 --- a/project/src/Player/MultiPlayForm.cpp +++ b/project/src/Player/MultiPlayForm.cpp @@ -94,7 +94,7 @@ MultiPlayForm::OnInitializing(void) { result r = E_SUCCESS; - SetHeaderText("MULTI PLAY"); + SetHeaderText("Multi Play"); SetFooterStyle(FOOTER_STYLE_BUTTON_TEXT, ID_BACK, this); AddFooterItem(L"Reset", ID_RESET); SetFooterItem(INDEX_RESET,L"Reset",ID_RESET); diff --git a/project/src/Player/PlayerForm.cpp b/project/src/Player/PlayerForm.cpp index 732bb69..8a6f0c2 100644 --- a/project/src/Player/PlayerForm.cpp +++ b/project/src/Player/PlayerForm.cpp @@ -160,7 +160,7 @@ PlayerForm::OnInitializing(void) result r = E_SUCCESS; int count = 0; - SetHeaderText("MEDIA PLAYER"); + SetHeaderText("Media Player"); SetFooterStyle(FOOTER_STYLE_BUTTON_TEXT, ID_BACK, this); AddFooterItem(L"Prev", ID_PREV); AddFooterItem(L"Next", ID_NEXT); @@ -292,7 +292,7 @@ PlayerForm::GetFilePathFromConfig(void) path = _pConfig->GetContentPath(MEDIA_PLAYER_SECTION_NAME, "srcfile%d", __configFileCount); __relativePath = _pConfig->GetRelativePath(MEDIA_PLAYER_SECTION_NAME, "srcfile%d", __configFileCount); - String str = L"MEDIA PLAYER"; + String str = L"Media Player"; int val = __configFileCount + 1; str.Append('('); str.Append(val); diff --git a/project/src/Player/VideoRecorderPlayerForm.cpp b/project/src/Player/VideoRecorderPlayerForm.cpp index f23c50d..89b1839 100644 --- a/project/src/Player/VideoRecorderPlayerForm.cpp +++ b/project/src/Player/VideoRecorderPlayerForm.cpp @@ -120,7 +120,7 @@ VideoRecorderPlayerForm::OnInitializing(void) Footer* pFooter = GetFooter(); Header* pHeader = GetHeader(); - SetHeaderText("VIDEO RECORDER & PLAYER"); + SetHeaderText("Video Recorder & Player"); SetFooterStyle(FOOTER_STYLE_BUTTON_TEXT, ID_BUTTON_BACK, this); AddFooterItem(L"Start", ID_BUTTON_START); diff --git a/project/src/Recorder/AudioRecorderForm.cpp b/project/src/Recorder/AudioRecorderForm.cpp index 9b2f7f6..121411e 100644 --- a/project/src/Recorder/AudioRecorderForm.cpp +++ b/project/src/Recorder/AudioRecorderForm.cpp @@ -368,7 +368,7 @@ AudioRecorderForm::OnInitializing(void) __contextMenuYCoordinate = 0; - r = SetHeaderText("AUDIO RECORDER"); + r = SetHeaderText("Audio Recorder"); TryCatch(r == E_SUCCESS, ShowError(r, METHOD_FILE_LINENO),"[%s] SetHeaderText", GetErrorMessage(r)); r = SetFooterStyle(FOOTER_STYLE_BUTTON_TEXT, ID_BACK, this); diff --git a/project/src/Recorder/VideoRecorderForm.cpp b/project/src/Recorder/VideoRecorderForm.cpp index 98dac6f..1ba7bde 100644 --- a/project/src/Recorder/VideoRecorderForm.cpp +++ b/project/src/Recorder/VideoRecorderForm.cpp @@ -348,7 +348,7 @@ VideoRecorderForm::OnInitializing(void) Rectangle rect = GetClientAreaBounds(); Rectangle clientRect = GetClientAreaBounds(); - SetHeaderText("VIDEO RECORDER"); + SetHeaderText("Video Recorder"); SetFooterStyle(FOOTER_STYLE_BUTTON_TEXT, ID_BACK, this); AddFooterItem(L"Settings", ID_SETTING); AddFooterItem(L"Back", ID_TOGGLE_CAMERA_TYPE);