Missing part of MediaConverter patch. Was a problem with svn getting lost.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40032 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Adrien Destugues
2010-12-29 15:57:26 +00:00
parent a27a534c3b
commit 58a25e2114
5 changed files with 16 additions and 271 deletions
+16 -11
View File
@@ -5,12 +5,16 @@
#include "MediaFileInfoView.h"
#include <Alert.h>
#include <Catalog.h>
#include <ControlLook.h>
#include <Locale.h>
#include <MediaFile.h>
#include <MediaTrack.h>
#include <String.h>
#include "Strings.h"
#undef B_TRANSLATE_CONTEXT
#define B_TRANSLATE_CONTEXT "MediaConverter-FileInfo"
const float kSpacing = 5.0f;
@@ -44,7 +48,7 @@ MediaFileInfoView::Draw(BRect /*update*/)
BPoint labelStart(kSpacing, fh.ascent + fh.leading + 1);
if (fMediaFile == NULL) {
DrawString(NO_FILE_LABEL, labelStart);
DrawString(B_TRANSLATE("No file selected"), labelStart);
return;
}
@@ -54,13 +58,13 @@ MediaFileInfoView::Draw(BRect /*update*/)
BPoint infoStart(labelStart.x + fMaxLabelWidth + kSpacing, labelStart.y);
// draw labels
DrawString(AUDIO_INFO_LABEL, labelStart);
DrawString(B_TRANSLATE("Audio:"), labelStart);
labelStart.y += fLineHeight * 2;
DrawString(VIDEO_INFO_LABEL, labelStart);
DrawString(B_TRANSLATE("Video:"), labelStart);
labelStart.y += fLineHeight * 2;
DrawString(DURATION_LABEL, labelStart);
DrawString(B_TRANSLATE("Duration:"), labelStart);
labelStart.y += fLineHeight * 2;
// draw audio/video/duration info
@@ -125,11 +129,11 @@ MediaFileInfoView::SetFont(const BFont* font, uint32 mask)
bold.SetFace(B_BOLD_FACE);
fMaxLabelWidth = 0;
BString labels[] = {VIDEO_INFO_LABEL, DURATION_LABEL, AUDIO_INFO_LABEL};
BString labels[] = {B_TRANSLATE("Video:"), B_TRANSLATE("Duration:"), B_TRANSLATE("Audio:")};
int32 labelCount = sizeof(labels) / sizeof(BString);
fMaxLabelWidth = _MaxLineWidth(labels, labelCount, bold);
fNoFileLabelWidth = ceilf(bold.StringWidth(NO_FILE_LABEL));
fNoFileLabelWidth = ceilf(bold.StringWidth(B_TRANSLATE("No file selected")));
InvalidateLayout();
}
@@ -155,11 +159,12 @@ MediaFileInfoView::Update(BMediaFile* file, entry_ref* ref)
fRef = *ref;
status_t ret = fInfo.LoadInfo(file);
if (ret != B_OK) {
BString error("An error has occurred reading the "
"file info.\n\nError : ");
BString error(B_TRANSLATE("An error has occurred reading the "
"file info.\n\nError : "));
error << strerror(ret);
BAlert* alert = new BAlert("File Error", error.String(),
"OK");
BAlert* alert = new BAlert(
B_TRANSLATE("File Error"), error.String(),
B_TRANSLATE("OK"));
alert->Go(NULL);
}
} else {
-92
View File
@@ -1,92 +0,0 @@
// Copyright 1999, Be Incorporated. All Rights Reserved.
// Copyright 2000-2004, Jun Suzuki. All Rights Reserved.
// Copyright 2007, Stephan Aßmus. All Rights Reserved.
// This file may be used under the terms of the Be Sample Code License.
#ifndef STRINGS_H
#define STRINGS_H
#include <BeBuild.h>
#if B_BEOS_VERSION >= 0x520
typedef const char Char;
#if B_BEOS_VERSION>=0x530 // 0x530 RC3
#include <locale/Locale.h>
#else
#include <Locale.h>
#endif
#else
#define _T(str) str
typedef char Char;
#endif
#define VERSION "1.3.0"
#define SOURCE_BOX_LABEL _T("Source files")
#define INFO_BOX_LABEL _T("File details")
#define OUTPUT_BOX_LABEL _T("Output format")
#define FORMAT_LABEL _T("File format:")
#define VIDEO_LABEL _T("Video encoding:")
#define AUDIO_LABEL _T("Audio encoding:")
//
#define OUTPUT_FOLDER_LABEL _T("Output folder")
#define PREVIEW_BUTTON_LABEL _T("Preview")
#define START_LABEL _T("Start [ms]: ")
#define END_LABEL _T("End [ms]: ")
//
#define FORMAT_MENU_LABEL _T("Format")
#define VIDEO_MENU_LABEL _T("Video")
#define AUDIO_MENU_LABEL _T("Audio")
#define DURATION_LABEL _T("Duration:")
#define VIDEO_INFO_LABEL _T("Video:")
#define AUDIO_INFO_LABEL _T("Audio:")
#define CONVERT_LABEL _T("Convert")
#define CANCEL_LABEL _T("Cancel")
#define VIDEO_QUALITY_LABEL _T("Video quality: %3d%%")
#define AUDIO_QUALITY_LABEL _T("Audio quality: %3d%%")
#define SLIDER_LOW_LABEL _T("Low")
#define SLIDER_HIGH_LABEL _T("High")
#define NONE_LABEL _T("None available")
#define DROP_MEDIA_FILE_LABEL _T("Drop media files onto this window")
#define CANCELLING_LABEL _T("Cancelling")
#define ABOUT_TITLE_LABEL _T("About")
#define OK_LABEL _T("OK")
#define CONV_COMPLETE_LABEL _T("Conversion completed")
#define CONV_CANCEL_LABEL _T("Conversion cancelled")
#define SELECT_DIR_LABEL _T("Select this folder")
#define SELECT_LABEL _T("Select")
#define SAVE_DIR_LABEL _T("MediaConverter+:SaveDirectory")
#define NO_FILE_LABEL _T("No file selected")
//
#define FILE_MENU_LABEL _T("File")
#define OPEN_MENU_LABEL _T("Open")
#define ABOUT_MENU_LABEL _T("About MediaConverter")
#define QUIT_MENU_LABEL _T("Quit")
#define WRITE_AUDIO_STRING _T("Writing audio track:")
#define WRITE_VIDEO_STRING _T("Writing video track:")
#define COMPLETE_STRING _T("complete")
#define OUTPUT_FILE_STRING1 _T("Output file")
#define OUTPUT_FILE_STRING2 _T("created")
#define AUDIO_SUPPORT_STRING _T("Audio quality not supported")
#define VIDEO_SUPPORT_STRING _T("Video quality not supported")
#define VIDEO_PARAMFORM_STRING _T("Video using parameters form settings")
#define CONTINUE_STRING _T("Continue")
#define FILES _T("files")
#define FILE _T("file")
#define NOTRECOGNIZE _T(" were not recognized as supported media files:")
//
#define LAUNCH_ERROR _T("Error launching: ")
#define OUTPUT_FILE_STRING3 _T("Error creating")
#define CONVERT_ERROR_STRING _T("Error converting")
#define ERROR_WRITE_VIDEO_STRING _T("Error writing video frame ")
#define ERROR_WRITE_AUDIO_STRING _T("Error writing audio frame ")
#define ERROR_READ_VIDEO_STRING _T("Error read video frame ")
#define ERROR_READ_AUDIO_STRING _T("Error read audio frame ")
#define ERROR_LOAD_STRING _T("Error loading file")
#define ENCODER_PARAMETERS _T("Encoder parameters")
#endif // STRINGS_H
@@ -1,56 +0,0 @@
"File" "Fichier"
"Open" "Ouvrir"
"About" "A propos"
"Priority" "Priorité"
"Source files" "Fichiers sources"
"File details" "Détail du fichier"
"Output format" "Format de sortie"
"File format" "Format du fichier"
"Video encoding" "Codage Vidéo"
"Audio encoding" "Codage Audio"
"Output folder" "Dossier de sortie"
"Preview" "Prévue"
"Start [ms] " "Début (mSec)"
"End [ms] " "FIn (mSec)"
"Format" "Format"
"Video" "Vidéo"
"Audio" "Audio"
"Video:" "Vidéo:"
"Audio:" "Audio:"
"Duration:" "Durée:"
"Convert" "Convertir"
"Cancel" "Annuler"
"Low" "Faible"
"High" "Haute"
"Video quality %3d%%" "Qualité vidéo %3d%%"
"Audio quality %3d%%" "Qualité audio %3d%%"
"Drop media files onto this window" "Jeter les fichiers media dans cette fenêtre"
"None available" "Non disponible"
"Converting" "Conversion en cours"
"Conversion cancelled" "Conversion annulée"
"Conversion completed" "Conversion terminée"
"About" "A propos"
"Cancelling" "Annulation en cours"
"OK" "Ok"
"No file selected" "Aucun fichier sélectionné"
"Select this folder" "Choisir ce dossier"
"Select" "Sélectionner"
"MediaConverter+:SaveDirectory" "MediaConverter+:DossierSauvegarde"
"Output file" "Fichier cible"
"created" "créé"
"Audio quality doesn't support" "Qualité audio non supportée"
"Video quality doesn't support" "Qualité vidéo non supportée"
"Writing audio track:" "Ecriture de la piste audio:"
"Writing video track:" "Ecriture de la piste vidéo:"
"Error launching: " "Erreur de lancement : "
"Error creating" "Erreur de création"
"Error converting" "Erreur de conversion"
"Error writing video frame " "Erreur d'écriture de la frame vidéo"
"Error writing audio frame " "Erreur d'écriture de la frame audio"
"Error read video frame " "Erreur de lecture de la frame vidéo"
"Error read audio frame " "Erreur de lecture de la frame audio"
"complete" "terminé"
"file" "fichier"
"files" "fichiers"
"Continue" "Continuer"
" were not recognized as supported media files:" " ne sont pas reconnus comme des fichiers media supportés:"
@@ -1,56 +0,0 @@
"File" "F) File"
"Open" "A) Apri"
"About" "R) A Proposito"
"Priority" "P) Priorità"
"Source files" "Files sorgente"
"File details" "Dettagli"
"Output format" "Formato di output"
"File format" "Formato del file"
"Video encoding" "Codifica video"
"Audio encoding" "Codifica audio"
"Output folder" "Cartella di destinazione"
"Preview" "Anteprima"
"Start [ms] " "Inizio mSec"
"End [ms] " "Fine mSec"
"Format" "Formato"
"Video" "Video"
"Audio" "Audio"
"Video:" "Video:"
"Audio:" "Audio:"
"Duration:" "Durata:"
"Convert" "Converti"
"Cancel" "Annulla"
"Low" "Bassa"
"High" "Alta"
"Video quality %3d%%" "Qualità video %3d%%"
"Audio quality %3d%%" "Qualità audio %3d%%"
"Drop media files onto this window" "Trascina i files multimediali in questa finestra"
"None available" "Nessuno disponibile"
"Converting" "Conversione in corso"
"Conversion cancelled" "Conversione annullata"
"Conversion completed" "Conversione completata"
"About" "A Proposito"
"Cancelling" "Interruzione"
"OK" "OK"
"No file selected" "Nessun file selezionato"
"Select this folder" "Seleziona questa directory"
"Select" "Seleziona"
"MediaConverter+:SaveDirectory" "MediaConverter+:Directory di salvataggio"
"Output file" "File di output"
"created" "creato"
"Audio quality doesn't support" "Audio quality non supportata"
"Video quality doesn't support" "Video quality non supportata"
"Writing audio track:" "Scrittura traccia audio in corso:"
"Writing video track:" "Scrittura traccia video in corso:"
"Error launching: " "Errore lanciando: "
"Error creating" "Errore creando"
"Error converting" "Errore convertendo"
"Error writing video frame " "Errore scrivendo un frame video"
"Error writing audio frame " "Errore scrivendo un frame audio"
"Error read video frame " "Errore leggendo un frame video"
"Error read audio frame " "Errore leggendo un frame audio"
"complete" "completato"
"file" "file"
"files" "files"
"Continue" "Continua"
" were not recognized as supported media files:" "non sono stati riconosciuti come files multimediali:"
@@ -1,56 +0,0 @@
"File" "F) ファイル"
"Open" "O) 開く"
"About" "A) アプリケーション情報"
"Priority" "P) 優先度"
"Source files" "ソースファイル"
"File details" "ファイルの詳細"
"Output format" "出力形式"
"File format" "ファイル形式"
"Video encoding" "映像エンコード形式"
"Audio encoding" "音声エンコード形式"
"Output folder" "出力フォルダ"
"Preview" "プレビュー"
"Start [ms] " "開始 mSec"
"End [ms] " "終了 mSec"
"Format" "形式"
"Video" "映像"
"Audio" "音声"
"Video:" "映像:"
"Audio:" "音声:"
"Duration:" "長さ:"
"Convert" "変換開始"
"Cancel" "キャンセル"
"Low" "低"
"High" "高"
"Video quality %3d%%" "画質 %3d%%"
"Audio quality %3d%%" "音質 %3d%%"
"Drop media files onto this window" "メディア・ファイルをドロップできます。"
"None available" "利用不可"
"Converting" "変寒中"
"Conversion cancelled" "変換中止"
"Conversion completed" "変換完了"
"About" "アプリケーション情報"
"Cancelling" "中止しています"
"OK" "了解"
"No file selected" "ファイル未選択"
"Select this folder" "現在のディレクトリを選択"
"Select" "選択"
"MediaConverter+:SaveDirectory" "MediaConverter+:保存先のディレクトリ"
"Output file" "出力ファイル"
"created" "生成"
"Audio quality doesn't support" "音質調整機能なし"
"Video quality doesn't support" "画質調整機能なし"
"Writing audio track:" "音声トラック書き込み中:"
"Writing video track:" "映像トラック書き込み中:"
"Error launching: " "起動エラー : "
"Error creating" "ファイル書き込みエラー "
"Error converting" "変換エラー"
"Error writing video frame " "映像トラック書き込みエラー"
"Error writing audio frame " "音声トラック書き込みエラー"
"Error read video frame " "映像トラック読み込みエラー"
"Error read audio frame " "音声トラック読み込みエラー"
"complete" "完了"
"file" "つのメディアファイル"
"files" "つのメディアファイル"
"Continue" "継続"
" were not recognized as supported media files:" "はサポート外形式のため処理できません:"