From e9a776d0a7f585d5c4ed4103878cfde78502d3e4 Mon Sep 17 00:00:00 2001 From: SET Date: Mon, 17 Oct 2022 15:46:35 +0200 Subject: [PATCH] Default UI and keys to EN locale. --- UI/T7.pjd | 3306 +++++++++++++++++++++++++------------------------ UI/t7app.cpp | 2 +- UI/t7main.cpp | 30 +- XT7Main.cpp | 144 ++- 4 files changed, 1758 insertions(+), 1724 deletions(-) diff --git a/UI/T7.pjd b/UI/T7.pjd index db17fea..2cdfb4c 100644 --- a/UI/T7.pjd +++ b/UI/T7.pjd @@ -1,30 +1,25 @@
- 0 - "" - "" - "" - "" - "" - 0 - 0 - 0 - 1 - 1 - 1 - 1 - 0 - "Saleem EDAH-TALLY" - "Copyright Saleem EDAH-TALLY." - "" - 0 - 0 - 0 - 0 - "<All platforms>" - "2.9.2" + 1 + "Application" + "app.h" + "app.cpp" "Standard" + 0 + 1 + 1 + "" + "<None>" + "Copyright SET." + " /// %BODY% +" + " +/* + * %BODY% + */ + +" "///////////////////////////////////////////////////////////////////////////// // Name: %HEADER-FILENAME% // Purpose: @@ -37,6 +32,7 @@ ///////////////////////////////////////////////////////////////////////////// " + "" "///////////////////////////////////////////////////////////////////////////// // Name: %SOURCE-FILENAME% // Purpose: @@ -48,6 +44,18 @@ // Licence: ///////////////////////////////////////////////////////////////////////////// +" + "// For compilers that support precompilation, includes "wx/wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ +#pragma hdrstop +#endif + +#ifndef WX_PRECOMP +#include "wx/wx.h" +#endif + " "///////////////////////////////////////////////////////////////////////////// // Name: %SYMBOLS-FILENAME% @@ -61,54 +69,47 @@ ///////////////////////////////////////////////////////////////////////////// " - "" - "// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#ifndef WX_PRECOMP -#include "wx/wx.h" -#endif - -" - " /// %BODY% -" - " -/* - * %BODY% - */ - -" - "app_resources.h" - "app_resources.cpp" - "AppResources" - "app.h" - "app.cpp" - "Application" - 0 + "<All platforms>" + "" "" - "<None>" - "utf-8" - "utf-8" + 0 + 0 + 0 + 0 + 0 + "" + 0 + 4 + 0 + 1 + 0 "utf-8" "" - 0 - 0 - 4 - " " + "AppResources" + "app_resources.h" + "app_resources.cpp" + "" "" - 0 + "utf-8" + "2.9.2" + 0 + "" + 1 + 0 0 - 1 + 1 0 - 1 - 1 - 0 - 1 + 0 + 0 + 0 + 0 + "SET" + " " + 1 + "utf-8" + "" 0 + 1 0
@@ -122,75 +123,75 @@ 0 0 - "Configurations" - "config-data-document" - "" - "" - 0 - 1 - 0 - 0 - "" - 1 - 4286447616 - "" "Debug" - "Unicode" - "Static" - "Modular" - "GUI" - "wxGTK+2" - "Default" - "Dynamic" - "Yes" - "No" - "Yes" - "No" - "No" - "Yes" - "Yes" - "Yes" - "Yes" - "Yes" - "builtin" - "Yes" - "%EXECUTABLE%" - "" - "%AUTO%" - "%AUTO%" - "%AUTO%" - "%AUTO%" - "%WXVERSION%" - "%AUTO%" - "%AUTO%" - "%AUTO%" - "%AUTO%" - "%AUTO%" + "%AUTO%" + "%AUTO%" "" - "%AUTO%" "%AUTO%" "%AUTO%" "%AUTO%" - "%AUTO%" - "%AUTO%" - "%AUTO%" - "%AUTO%" - "%AUTO%" - "%AUTO%" - "%AUTO%" - "%AUTO%" - "%AUTO%" + "%AUTO%" + "" "%AUTO%" + 1 + 1 + "%EXECUTABLE%" "%AUTO%" + "%AUTO%" + "" + "GUI" + "" + "%AUTO%" + 0 "%AUTO%" "%AUTO%" + "%AUTO%" "%AUTO%" - "%AUTO%" + 0 + "%AUTO%" + 4286447616 + "Modular" + "%AUTO%" + "%AUTO%" + "%AUTO%" + 1 + "%AUTO%" + "%AUTO%" + "Default" + "" + "%AUTO%" + "%AUTO%" "%AUTO%" "%AUTO%" - "%AUTO%" + "Dynamic" + "Static" 0 - 1 + "" + "Configurations" + 0 + "wxGTK+2" + "config-data-document" + "Unicode" + "Yes" + "No" + "No" + "Yes" + "Yes" + "No" + "Yes" + "builtin" + "Yes" + "Yes" + "Yes" + "Yes" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%AUTO%" + "%WXVERSION%" @@ -215,1957 +216,1992 @@ 0 1 - "T7App" - "dialog-document" + "wbAppProxy" + "Standard" + 10000 "" "app" - 0 - 1 - 0 - 0 - "wbAppProxy" - 10000 - 0 "" - 0 "" - "Standard" + 0 + 0 + 1 + "wxApp" + "T7App" + "" + "t7app.h" + "" + "t7app.cpp" + "" + "T7App" + 0 + "dialog-document" + 0 + 0 0 0 - "T7App" - "wxApp" - "t7app.cpp" - "t7app.h" - "" - "" - "" - "T7" - "dialog-document" + "wbFrameProxy" + "Standard" + 10000 "" "frame" - 0 - 1 - 0 - 0 - "wbFrameProxy" - 10000 - 0 "" - 0 "" - "Standard" - 0 - 0 + "itemFrame1" + 0 + 0 + 1 + 0 + "" + "wxFrame" + 1 + "T7Main" + "" + "" + "" + "" + "" + "" + 0 + 1 + "" + 0 + "" + "" + "t7main.h" + 400 + "" + 0 + "" "ID_T7MAIN" 10000 - "T7Main" - "wxFrame" "t7main.cpp" - "t7main.h" - "" - "T7" - 1 - "" - 0 - "" - "" - "" - "" - "" - 0 - 1 "<Any platform>" - "" - "" - "" - "" - "" - 0 + "T7" + "" + 500 + 0 1 - 1 - 1 - 0 - 0 - 0 - 0 + 0 1 - 0 + 0 + 0 + 0 0 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 0 - 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 0 - 0 + 0 0 0 - "" - 0 - 0 + 0 -1 + "" -1 - 500 - 400 - 0 - "" + "T7" + 0 + "dialog-document" + 0 + 0 + 0 + 0 - "wxScrolledWindow: ID_SCROLLEDWINDOW" - "dialog-control-document" + "wbScrolledWindowProxy" "" "scrolledwindow" + "itemScrolledWindow2" 0 - 1 - 0 0 - "wbScrolledWindowProxy" - "ID_SCROLLEDWINDOW" - 10001 - "" - "wxScrolledWindow" - "wxScrolledWindow" - 1 - 0 - "" - "" - "scrlMain" - 1 - 1 - 0 - 0 - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - 1 - 0 - 0 - 0 - 0 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 1 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 + 1 "Centre" "Centre" - 0 + 0 + "" + "wxScrolledWindow" 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 + "wxScrolledWindow" "" "" + "" + "" + "" + "" + "" + "" + 1 "" - 0 + 1 + 1 + "" + "" + "" + -1 + "" + 0 + "ID_SCROLLEDWINDOW" + 10001 + "" + "scrlMain" + "" + "<Any platform>" + 1 + 1 + 0 + 0 + "" + 0 + 0 + -1 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 1 + 1 + 0 + 0 + -1 + -1 + "wxScrolledWindow: ID_SCROLLEDWINDOW" + 0 + "dialog-control-document" - "wxBoxSizer V" - "dialog-control-document" + "wbBoxSizerProxy" "" "sizer" + "itemBoxSizer3" 0 - 1 - 0 0 - "wbBoxSizerProxy" - "Vertical" - "szMain" + 1 "Centre" "Centre" - 0 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 + "szMain" + "Vertical" "<Any platform>" + 0 + 0 + 1 + 0 + 1 + 0 + 1 + 0 + 1 + "wxBoxSizer V" + 0 + "dialog-control-document" - "wxPanel: ID_PANEL1" - "dialog-control-document" + "wbPanelProxy" "" "panel" + "itemPanel4" 0 - 1 - 0 0 - "wbPanelProxy" - "ID_PANEL1" - 10049 - "" - "wxPanel" - "wxPanel" - 1 - 0 - "" - "" - "panPedals" - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "Tiled" - 0 - 0 - 0 - 0 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 0 - 0 - 0 - "" - 1 - -1 - -1 - -1 - -1 + 1 "Expand" "Centre" - 1 + 0 + "" + "wxPanel" 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 + "wxPanel" "" "" + "" + "" + "" + "" + "" + "" + 1 "" - 0 + 1 + 1 + "" + "" + "" + -1 + "" + 0 + "ID_PANEL1" + 10049 + "" + "panPedals" + "" + "<Any platform>" + 0 + 1 + "" + "Tiled" + "" + -1 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 1 + 1 + 1 + 0 + 0 + 0 + 0 + -1 + -1 + "wxPanel: ID_PANEL1" + 0 + "dialog-control-document" - "wxBoxSizer V" - "dialog-control-document" + "wbBoxSizerProxy" "" "sizer" + "itemBoxSizer5" 0 - 1 - 0 0 - "wbBoxSizerProxy" - "Vertical" - "szMediaMain" + 1 "Centre" "Centre" - 0 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 + "szMediaMain" + "Vertical" "<Any platform>" + 0 + 0 + 1 + 0 + 1 + 0 + 1 + 0 + 1 + "wxBoxSizer V" + 0 + "dialog-control-document" - "wxBoxSizer V" - "dialog-control-document" + "wbBoxSizerProxy" "" "sizer" + "itemBoxSizer6" 0 - 1 - 0 0 - "wbBoxSizerProxy" - "Vertical" - "szMediaTop" + 1 "Expand" "Centre" - 1 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 + "szMediaTop" + "Vertical" "<Any platform>" + 1 + 0 + 1 + 0 + 1 + 0 + 1 + 0 + 1 + "wxBoxSizer V" + 0 + "dialog-control-document" - "wxMediaCtrl: ID_MEDIACTRL" - "dialog-control-document" + "wbMediaCtrlProxy" "" "window" + "itemMediaCtrl7" 0 - 1 - 0 0 - "wbMediaCtrlProxy" - "ID_MEDIACTRL" - 10068 - "" - "wxMediaCtrl" - "wxMediaCtrl" - 1 - 0 - "" - "" - "medMain" - "" - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 + 1 "Centre" "Expand" - 0 + "" + "wxMediaCtrl" 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 + "wxMediaCtrl" "" "" + "" + "" + "" + "" + "" + "" + "" + "" + 1 "" + 1 + "" + "" + "" + "" + -1 + "" + 0 + "ID_MEDIACTRL" + 10068 + "" + "medMain" + "" + "<Any platform>" + 0 + 0 + "" + -1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + -1 + -1 + "wxMediaCtrl: ID_MEDIACTRL" + 0 + "dialog-control-document" - "wxSlider: ID_SLIDER" - "dialog-control-document" + "wbSliderProxy" "" "slider" + "itemSlider8" 0 - 1 - 0 0 - "wbSliderProxy" + 1 + "Expand" + "Centre" + "" + "wxSlider" + 5 + "wxSlider" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + 1 + 1 + "" + "" + "" + -1 + "" + 0 "ID_SLIDER" 10069 - "" - "wxSlider" - "wxSlider" - 1 - 0 "" - "" + 0 + 100 "sldMediaPosition" 0 - 100 - 0 - "" - "" - "" - "" - "" - 0 - 1 + "" "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 1 - 0 + 0 + 0 + "" + -1 + 0 + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + 0 0 + 1 + 0 0 0 0 - 0 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 + 0 0 + 0 + 1 0 - 0 - 0 - "" -1 -1 - -1 - -1 - "Expand" - "Centre" - 0 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 - "" - "" + "wxSlider: ID_SLIDER" + 0 + "dialog-control-document" - "wxBoxSizer H" - "dialog-control-document" + "wbBoxSizerProxy" "" "sizer" + "itemBoxSizer9" 0 - 1 - 0 0 - "wbBoxSizerProxy" - "Horizontal" - "szMediaInfo" + 1 "Right" "Centre" - 0 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 + "szMediaInfo" + "Horizontal" "<Any platform>" + 0 + 0 + 1 + 0 + 1 + 0 + 1 + 0 + 1 + "wxBoxSizer H" + 0 + "dialog-control-document" - "wxStaticText: wxID_STATIC" - "dialog-control-document" + "wbStaticTextProxy" "" "statictext" + "itemStaticText10" 0 - 1 - 0 0 - "wbStaticTextProxy" + 1 + "Centre" + "Centre" + "" + "wxStaticText" + 5 + "wxStaticText" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + 1 + 1 + "" + "" + "" + -1 + "" + 0 "wxID_STATIC" 5105 - "" - "wxStaticText" - "wxStaticText" - 1 - 0 "" - "" - "lblMediaCurrent" "Position" - -1 - "" - "" - "" - "" - "" - 0 - 1 + "lblMediaCurrent" + "" "<Any platform>" - "" - "" - "" - "" - "" - "" - "" + 0 + 0 + "" + -1 + -1 + 0 + 0 0 1 - 0 - 0 - 0 - 0 - 0 0 - 0 - 0 - 0 - 0 - 0 + 1 + 0 + 0 0 - "" + 1 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + 0 -1 -1 - -1 - -1 - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 - "" - "" + "wxStaticText: wxID_STATIC" + 0 + "dialog-control-document" - "wxStaticText: wxID_STATIC" - "dialog-control-document" + "wbStaticTextProxy" "" "statictext" + "itemStaticText11" 0 - 1 - 0 0 - "wbStaticTextProxy" - "wxID_STATIC" - 5105 - "" - "wxStaticText" - "wxStaticText" - 1 - 0 - "" - "" - "lblMediaLength" - "Total" - -1 - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 + 1 "Centre" "Centre" - 0 + "" + "wxStaticText" 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 + "wxStaticText" "" "" + "" + "" + "" + "" + "" + "" + "" + "" + 1 + 1 + "" + "" + "" + -1 + "" + 0 + "wxID_STATIC" + 5105 + "" + "Total" + "lblMediaLength" + "" + "<Any platform>" + 0 + 0 + "" + -1 + -1 + 0 + 0 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + -1 + -1 + "wxStaticText: wxID_STATIC" + 0 + "dialog-control-document" - "Spacer" - "dialog-control-document" + "wbSpacerProxy" "" "spacer" + "itemSpacer12" 0 - 1 - 0 0 - "wbSpacerProxy" - 10 - 5 + 1 "Centre" "Centre" - 0 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 + 5 "<Any platform>" + 0 + 10 + 0 + 1 + 0 + 1 + 0 + 1 + 0 + 1 + "Spacer" + 0 + "dialog-control-document" - "wxBoxSizer H" - "dialog-control-document" + "wbBoxSizerProxy" "" "sizer" + "itemBoxSizer13" 0 - 1 - 0 0 - "wbBoxSizerProxy" - "Horizontal" - "" + 1 "Expand" "Centre" - 0 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 + "" + "Horizontal" "<Any platform>" + 0 + 0 + 1 + 0 + 1 + 0 + 1 + 0 + 1 + "wxBoxSizer H" + 0 + "dialog-control-document" - "wxButton: ID_BUTTON1" - "dialog-control-document" + "wbButtonProxy" "" "dialogcontrol" + "itemButton14" 0 - 1 - 0 0 - "wbButtonProxy" + 1 + "Centre" + "Centre" + "" + "wxButton" + 5 + "wxButton" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + 0 + 1 + 1 + "" + "" + "" + -1 + "" + 0 "ID_BUTTON1" 10079 - "" - "wxButton" - "wxButton" - 1 - 0 "" - "" + "Refresh" "btnMediaRootRefresh" - "Rafraîchir" - 0 - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - 0 - 1 + "" "<Any platform>" + 0 + 0 + "Update file list." + -1 + 0 + 1 + 0 + 0 0 0 0 - 0 - 0 - 0 - 0 - 0 + 0 0 - "" + 1 + 0 + 0 + 0 + 1 + 0 + 1 + 0 -1 -1 - -1 - -1 - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 - "" - "" + "wxButton: ID_BUTTON1" + 0 + "dialog-control-document" - "wxDirPickerCtrl: ID_DIRPICKERCTRL1" - "dialog-control-document" + "wbDirPickerCtrlProxy" "" "dialogcontrol" + "itemDirPickerCtrl15" 0 - 1 - 0 0 - "wbDirPickerCtrlProxy" - "ID_DIRPICKERCTRL1" - 10078 - "" - "wxDirPickerCtrl" - "wxDirPickerCtrl" - 1 - 0 - "" - "" - "dpkMediaRoot" - "" - "" - "" - "Dossier racine des médias." - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 + 1 "Centre" "Centre" - 1 + "" + "wxDirPickerCtrl" 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 + "wxDirPickerCtrl" "" "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + 1 + 1 + "" + "" + "" + -1 + "" + 0 + "ID_DIRPICKERCTRL1" + 10078 + "" + "dpkMediaRoot" + "" + "" + "<Any platform>" + 0 + 1 + "Media source directory." + -1 + 0 + 0 + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + -1 + -1 + "wxDirPickerCtrl: ID_DIRPICKERCTRL1" + 0 + "dialog-control-document" - "wxCollapsiblePane: ID_COLLAPSIBLEPANE6" - "dialog-control-document" + "wbCollapsiblePaneProxy" "" "panel" + "itemCollapsiblePane16" 0 - 1 - 0 0 - "wbCollapsiblePaneProxy" - "ID_COLLAPSIBLEPANE6" - 10070 - "" - "wxCollapsiblePane" - "wxCollapsiblePane" - 1 - 0 - "" - "" - "panePedalIDs" - "Configuration du pédalier" - 1 - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 + 1 "Expand" "Centre" - 0 + "" + "wxCollapsiblePane" 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 + "wxCollapsiblePane" + 1 "" "" + "" + "" + "" + "" + "" + "" + "" + "" + 1 "" + 1 + "" + "" + "" + -1 + "" + 0 + "ID_COLLAPSIBLEPANE6" + 10070 + "" + "Device configuration" + "panePedalIDs" + "" + "<Any platform>" + 0 + 0 + "" + -1 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + -1 + -1 + "wxCollapsiblePane: ID_COLLAPSIBLEPANE6" + 0 + "dialog-control-document" - "wxBoxSizer V" - "dialog-control-document" + "wbBoxSizerProxy" "" "sizer" + "itemBoxSizer17" 0 - 1 - 0 0 - "wbBoxSizerProxy" - "Vertical" - "szPedalMain" + 1 "Centre" "Centre" - 0 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 + "szPedalMain" + "Vertical" "<Any platform>" + 0 + 0 + 1 + 0 + 1 + 0 + 1 + 0 + 1 + "wxBoxSizer V" + 0 + "dialog-control-document" - "wxCollapsiblePane: ID_COLLAPSIBLEPANE7" - "dialog-control-document" + "wbCollapsiblePaneProxy" "" "panel" + "itemCollapsiblePane18" 0 - 1 - 0 0 - "wbCollapsiblePaneProxy" - "ID_COLLAPSIBLEPANE7" - 10077 - "" - "wxCollapsiblePane" - "wxCollapsiblePane" - 1 - 0 - "" - "" - "panePedalHardware" - "Matériel" - 1 - "" - "Vous ne devez pas jouer avec ces valeurs une fois paramétrées." - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 + 1 "Expand" "Centre" - 0 + "" + "wxCollapsiblePane" 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 + "wxCollapsiblePane" + 1 "" "" + "" + "" + "" + "" + "" + "" + "" + "" + 1 "" + 1 + "" + "" + "" + -1 + "" + 0 + "ID_COLLAPSIBLEPANE7" + 10077 + "" + "Device" + "panePedalHardware" + "" + "<Any platform>" + 0 + 0 + "You should not play with these parameters once rightly set." + -1 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + -1 + -1 + "wxCollapsiblePane: ID_COLLAPSIBLEPANE7" + 0 + "dialog-control-document" - "wxBoxSizer V" - "dialog-control-document" + "wbBoxSizerProxy" "" "sizer" + "itemBoxSizer19" 0 - 1 - 0 0 - "wbBoxSizerProxy" - "Vertical" - "szPedalHardware" + 1 "Centre" "Centre" - 0 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 + "szPedalHardware" + "Vertical" "<Any platform>" + 0 + 0 + 1 + 0 + 1 + 0 + 1 + 0 + 1 + "wxBoxSizer V" + 0 + "dialog-control-document" - "wxBoxSizer H" - "dialog-control-document" + "wbBoxSizerProxy" "" "sizer" + "itemBoxSizer20" 0 - 1 - 0 0 - "wbBoxSizerProxy" - "Horizontal" - "" + 1 "Expand" "Centre" - 0 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 + "" + "Horizontal" "<Any platform>" + 0 + 0 + 1 + 0 + 1 + 0 + 1 + 0 + 1 + "wxBoxSizer H" + 0 + "dialog-control-document" - "wxStaticText: wxID_STATIC" - "dialog-control-document" + "wbStaticTextProxy" "" "statictext" + "itemStaticText21" 0 - 1 - 0 0 - "wbStaticTextProxy" + 1 + "Centre" + "Centre" + "" + "wxStaticText" + 5 + "wxStaticText" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + 1 + 1 + "" + "" + "" + -1 + "" + 0 "wxID_STATIC" 5105 - "" - "wxStaticText" - "wxStaticText" - 1 - 0 "" - "" + "1. Select a device" "" - "1. Périphérique" - -1 - "" - "" - "" - "" - "" - 0 - 1 + "" "<Any platform>" - "" - "" - "" - "" - "" - "" - "" + 0 + 0 + "" + -1 + -1 + 0 + 0 0 0 - 0 - 0 - 0 - 0 - 0 0 - 0 - 0 - 0 - 0 - 0 + 1 + 0 + 0 0 - "" + 1 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + 0 -1 -1 - -1 - -1 - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 - "" - "" + "wxStaticText: wxID_STATIC" + 0 + "dialog-control-document" - "wxComboBox: ID_COMBOBOX_HW" - "dialog-control-document" + "wbComboBoxProxy" "" "combobox" + "itemComboBox22" 0 - 1 - 0 0 - "wbComboBoxProxy" - "ID_COMBOBOX_HW" - 10003 - "" - "wxComboBox" - "wxComboBox" - 1 - 0 - "" - "" - "cmbHIDDevices" - "" - "" - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 - 0 - 1 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 + 1 "Centre" "Centre" - 0 + "" + "wxComboBox" 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 + "wxComboBox" "" "" + "" + "" + "" + "" + "" + "" + "" + "" + 1 + 1 + "" + "" + "" + -1 + "" + 0 + "ID_COMBOBOX_HW" + 10003 + "" + "" + "cmbHIDDevices" + "" + "<Any platform>" + 0 + 0 + "" + "" + -1 + 0 + 1 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 1 + 0 + 0 + 1 + 0 + -1 + -1 + "wxComboBox: ID_COMBOBOX_HW" + 0 + "dialog-control-document" - "wxBoxSizer H" - "dialog-control-document" + "wbBoxSizerProxy" "" "sizer" + "itemBoxSizer23" 0 - 1 - 0 0 - "wbBoxSizerProxy" - "Horizontal" - "" + 1 "Expand" "Centre" - 0 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 + "" + "Horizontal" "<Any platform>" + 0 + 0 + 1 + 0 + 1 + 0 + 1 + 0 + 1 + "wxBoxSizer H" + 0 + "dialog-control-document" - "wxStaticText: wxID_STATIC" - "dialog-control-document" + "wbStaticTextProxy" "" "statictext" + "itemStaticText24" 0 - 1 - 0 0 - "wbStaticTextProxy" - "wxID_STATIC" - 5105 - "" - "wxStaticText" - "wxStaticText" - 1 - 0 - "" - "" - "" - "2. Appuyez sur la pédale" - -1 - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 + 1 "Centre" "Centre" - 0 + "" + "wxStaticText" 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 + "wxStaticText" "" "" + "" + "" + "" + "" + "" + "" + "" + "" + 1 + 1 + "" + "" + "" + -1 + "" + 0 + "wxID_STATIC" + 5105 + "" + "2. Press pedal" + "" + "" + "<Any platform>" + 0 + 0 + "" + -1 + -1 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + -1 + -1 + "wxStaticText: wxID_STATIC" + 0 + "dialog-control-document" - "wxComboBox: ID_XCOMBOBOX6" - "dialog-control-document" + "wbComboBoxProxy" "" "combobox" + "itemComboBox25" 0 - 1 - 0 0 - "wbComboBoxProxy" - "ID_XCOMBOBOX6" - 10072 - "" - "wxComboBox" - "wxComboBox" - 1 - 0 - "" - "" - "cmbPedals" - "" - "" - "" - "Vous ne devriez pas jouer avec cette valeur une fois bien paramétrée." - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 - 0 - 1 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 + 1 "Centre" "Centre" - 0 + "" + "wxComboBox" 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 + "wxComboBox" "%PARENT%, %IDENTIFIER%, %Initial value%, %POSITION%, %SIZE%, %Strings%, %STYLE%" "" - - - "wxStaticText: wxID_STATIC" - "dialog-control-document" - "" - "statictext" - 0 - 1 - 0 - 0 - "wbStaticTextProxy" - "wxID_STATIC" - 5105 - "" - "wxStaticText" - "wxStaticText" - 1 - 0 - "" - "" - "lblPedalCode" - "" - -1 - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 "" + "" + "" + "" + "" + "" + "" + "" + 1 + 1 + "" + "" + "" + -1 + "" + 0 + "ID_XCOMBOBOX6" + 10072 + "" + "" + "cmbPedals" + "" + "<Any platform>" + 0 + 0 + "" + "You should not play with this once rightly configured." + -1 + 0 + 1 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 1 + 0 + 0 + 1 + 0 -1 -1 - -1 - -1 - "Centre" - "Centre" - 1 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 - "" - "" + "wxComboBox: ID_XCOMBOBOX6" + 0 + "dialog-control-document" - "wxButton: ID_BUTTON" + "wbStaticTextProxy" + "" + "statictext" + "itemStaticText26" + 0 + 0 + 1 + "Centre" + "Centre" + "" + "wxStaticText" + 5 + "wxStaticText" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + 1 + 1 + "" + "" + "" + -1 + "" + 0 + "wxID_STATIC" + 5105 + "" + "" + "lblPedalCode" + "" + "<Any platform>" + 0 + 1 + "" + -1 + -1 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + -1 + -1 + "wxStaticText: wxID_STATIC" + 0 "dialog-control-document" + + + "wbButtonProxy" "" "dialogcontrol" + "itemButton27" 0 - 1 - 0 0 - "wbButtonProxy" + 1 + "Left" + "Centre" + "" + "wxButton" + 5 + "wxButton" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + 0 + 1 + 1 + "" + "" + "" + -1 + "" + 0 "ID_BUTTON" 10002 - "" - "wxButton" - "wxButton" - 1 - 0 "" - "" + "About" "btnAbout" - "A propos" - 0 - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - 0 - 1 + "" "<Any platform>" + 0 + 0 + "" + -1 + 0 + 1 + 0 + 0 0 0 0 - 0 - 0 - 0 - 0 - 0 + 0 0 - "" + 1 + 0 + 0 + 0 + 1 + 0 + 1 + 0 -1 -1 - -1 - -1 - "Left" - "Centre" - 0 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 - "" - "" + "wxButton: ID_BUTTON" + 0 + "dialog-control-document" - "wxBoxSizer H" - "dialog-control-document" + "wbBoxSizerProxy" "" "sizer" + "itemBoxSizer28" 0 - 1 - 0 0 - "wbBoxSizerProxy" - "Horizontal" - "" + 1 "Expand" "Centre" - 0 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 + "" + "Horizontal" "<Any platform>" + 0 + 0 + 1 + 0 + 1 + 0 + 1 + 0 + 1 + "wxBoxSizer H" + 0 + "dialog-control-document" - "wxStaticText: wxID_STATIC" - "dialog-control-document" + "wbStaticTextProxy" "" "statictext" + "itemStaticText29" 0 - 1 - 0 0 - "wbStaticTextProxy" - "wxID_STATIC" - 5105 - "" - "wxStaticText" - "wxStaticText" - 1 - 0 - "" - "" - "" - "Actions" - -1 - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 + 1 "Centre" "Centre" - 0 + "" + "wxStaticText" 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 + "wxStaticText" "" "" + "" + "" + "" + "" + "" + "" + "" + "" + 1 + 1 + "" + "" + "" + -1 + "" + 0 + "wxID_STATIC" + 5105 + "" + "Actions" + "" + "" + "<Any platform>" + 0 + 0 + "" + -1 + -1 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + -1 + -1 + "wxStaticText: wxID_STATIC" + 0 + "dialog-control-document" - "wxComboBox: ID_XCOMBOBOX9" - "dialog-control-document" + "wbComboBoxProxy" "" "combobox" + "itemComboBox30" 0 - 1 - 0 0 - "wbComboBoxProxy" + 1 + "Centre" + "Centre" + "" + "wxComboBox" + 5 + "wxComboBox" + "%PARENT%, %IDENTIFIER%, %Initial value%, %POSITION%, %SIZE%, %Strings%, %STYLE%" + "" + "" + "" + "" + "" + "" + "" + "" + "" + 1 + 1 + "" + "" + "" + -1 + "" + 0 "ID_XCOMBOBOX9" 10075 - "" - "wxComboBox" - "wxComboBox" - 1 - 0 "" - "" - "cmbPedalActionLeft" - "" "" - "" - "Pédale de gauche" - "" - "" - "" - 0 - 1 + "cmbPedalActionLeft" + "" "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 + 0 + 0 + "" + "Left pedal" + -1 + 0 + 1 0 1 + 0 0 - 0 - 0 - 0 + 0 0 - "" + 1 + 0 + 0 + 1 + 0 + 0 + 1 + 0 -1 -1 - -1 - -1 - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 - "%PARENT%, %IDENTIFIER%, %Initial value%, %POSITION%, %SIZE%, %Strings%, %STYLE%" - "" + "wxComboBox: ID_XCOMBOBOX9" + 0 + "dialog-control-document" - "wxComboBox: ID_XCOMBOBOX7" - "dialog-control-document" + "wbComboBoxProxy" "" "combobox" + "itemComboBox31" 0 - 1 - 0 0 - "wbComboBoxProxy" + 1 + "Centre" + "Centre" + "" + "wxComboBox" + 5 + "wxComboBox" + "%PARENT%, %IDENTIFIER%, %Initial value%, %POSITION%, %SIZE%, %Strings%, %STYLE%" + "" + "" + "" + "" + "" + "" + "" + "" + "" + 1 + 1 + "" + "" + "" + -1 + "" + 0 "ID_XCOMBOBOX7" 10073 - "" - "wxComboBox" - "wxComboBox" - 1 - 0 "" - "" - "cmbPedalActionMiddle" - "" "" - "" - "Pédale du milieu." - "" - "" - "" - 0 - 1 + "cmbPedalActionMiddle" + "" "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 + 0 + 0 + "" + "Middle pedal" + -1 + 0 + 1 0 1 + 0 0 - 0 - 0 - 0 + 0 0 - "" + 1 + 0 + 0 + 1 + 0 + 0 + 1 + 0 -1 -1 - -1 - -1 - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 - "%PARENT%, %IDENTIFIER%, %Initial value%, %POSITION%, %SIZE%, %Strings%, %STYLE%" - "" + "wxComboBox: ID_XCOMBOBOX7" + 0 + "dialog-control-document" - "wxComboBox: ID_XCOMBOBOX8" - "dialog-control-document" + "wbComboBoxProxy" "" "combobox" + "itemComboBox32" 0 - 1 - 0 0 - "wbComboBoxProxy" - "ID_XCOMBOBOX8" - 10074 - "" - "wxComboBox" - "wxComboBox" - 1 - 0 - "" - "" - "cmbPedalActionRight" - "" - "" - "" - "Pédale de droite." - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 - 0 - 1 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 + 1 "Centre" "Centre" - 0 + "" + "wxComboBox" 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 + "wxComboBox" "%PARENT%, %IDENTIFIER%, %Initial value%, %POSITION%, %SIZE%, %Strings%, %STYLE%" "" + "" + "" + "" + "" + "" + "" + "" + "" + 1 + 1 + "" + "" + "" + -1 + "" + 0 + "ID_XCOMBOBOX8" + 10074 + "" + "" + "cmbPedalActionRight" + "" + "<Any platform>" + 0 + 0 + "" + "Right pedal" + -1 + 0 + 1 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 1 + 0 + 0 + 1 + 0 + -1 + -1 + "wxComboBox: ID_XCOMBOBOX8" + 0 + "dialog-control-document" - "wxBoxSizer H" - "dialog-control-document" + "wbBoxSizerProxy" "" "sizer" + "itemBoxSizer33" 0 - 1 - 0 0 - "wbBoxSizerProxy" - "Horizontal" - "" + 1 "Expand" "Centre" - 0 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 + "" + "Horizontal" "<Any platform>" + 0 + 0 + 1 + 0 + 1 + 0 + 1 + 0 + 1 + "wxBoxSizer H" + 0 + "dialog-control-document" - "wxStaticText: wxID_STATIC" - "dialog-control-document" + "wbStaticTextProxy" "" "statictext" + "itemStaticText34" 0 - 1 - 0 0 - "wbStaticTextProxy" - "wxID_STATIC" - 5105 - "" - "wxStaticText" - "wxStaticText" - 1 - 0 - "" - "" - "" - "Revenir en arrière à la fin de la lecture" - -1 - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 + 1 "Centre" "Centre" - 0 + "" + "wxStaticText" 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 + "wxStaticText" "" "" + "" + "" + "" + "" + "" + "" + "" + "" + 1 + 1 + "" + "" + "" + -1 + "" + 0 + "wxID_STATIC" + 5105 + "" + "Auto-rewind on playback suspend" + "" + "" + "<Any platform>" + 0 + 0 + "" + -1 + -1 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + -1 + -1 + "wxStaticText: wxID_STATIC" + 0 + "dialog-control-document" - "wxTextCtrl: ID_XTEXTCTRL7" - "dialog-control-document" + "wbTextCtrlProxy" "" "textctrl" + "itemTextCtrl35" 0 - 1 - 0 0 - "wbTextCtrlProxy" + 1 + "Centre" + "Centre" + "" + "wxTextCtrl" + 5 + "wxTextCtrl" + "%PARENT%, %IDENTIFIER%, %Initial value%, %POSITION%, %SIZE%, %STYLE%" + "" + "" + "" + "" + "" + "" + "" + "" + "" + 1 + 1 + "" + "" + "" + -1 + "" + 0 "ID_XTEXTCTRL7" 10071 - "" - "wxTextCtrl" - "wxTextCtrl" - 1 - 0 "" - "" - "txtMediaAutoRewind" "1000" 6 - "" - "En millisecondes. Appuyez sur ENTRÉE pour enregistrer après modification." - "" - "" - "" - 0 - 1 + "txtMediaAutoRewind" + "" "<Any platform>" - "" - "" - "" - "" - "" - "" - "" + 0 + 0 + "Milliseconds; press Enter to save." + -1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 0 + 0 + 0 1 0 - 0 0 0 0 - 0 - 0 - 0 - 0 1 - 0 - 0 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + 1 0 - 0 - 0 - "" -1 -1 - -1 - -1 - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - 0 - "%PARENT%, %IDENTIFIER%, %Initial value%, %POSITION%, %SIZE%, %STYLE%" - "" + "wxTextCtrl: ID_XTEXTCTRL7" + 0 + "dialog-control-document" diff --git a/UI/t7app.cpp b/UI/t7app.cpp index 31d8d8c..5700a25 100644 --- a/UI/t7app.cpp +++ b/UI/t7app.cpp @@ -102,7 +102,7 @@ bool T7App::OnInit() #endif ////@end T7App initialisation - wxSetlocale(LC_ALL, wxLocale::GetLanguageCanonicalName(wxLocale::GetSystemLanguage()) + _T(".") + wxLocale::GetSystemEncodingName()); + wxSetlocale(LC_ALL, ""); SetAppName(_APPNAME_T7_); SetExitOnFrameDelete(true); XT7Main * main = new XT7Main( NULL); diff --git a/UI/t7main.cpp b/UI/t7main.cpp index f5b715c..27201a2 100644 --- a/UI/t7main.cpp +++ b/UI/t7main.cpp @@ -165,29 +165,31 @@ void T7Main::CreateControls() wxBoxSizer* itemBoxSizer13 = new wxBoxSizer(wxHORIZONTAL); szMediaTop->Add(itemBoxSizer13, 0, wxGROW|wxALL, 5); - btnMediaRootRefresh = new wxButton( panPedals, ID_BUTTON1, wxGetTranslation(wxString(wxT("Rafra")) + (wxChar) 0x00EE + wxT("chir")), wxDefaultPosition, wxDefaultSize, 0 ); + btnMediaRootRefresh = new wxButton( panPedals, ID_BUTTON1, _("Refresh"), wxDefaultPosition, wxDefaultSize, 0 ); + if (T7Main::ShowToolTips()) + btnMediaRootRefresh->SetToolTip(_("Update file list.")); itemBoxSizer13->Add(btnMediaRootRefresh, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); dpkMediaRoot = new wxDirPickerCtrl( panPedals, ID_DIRPICKERCTRL1, wxEmptyString, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxDIRP_DEFAULT_STYLE|wxDIRP_USE_TEXTCTRL|wxDIRP_DIR_MUST_EXIST|wxDIRP_CHANGE_DIR ); if (T7Main::ShowToolTips()) - dpkMediaRoot->SetToolTip(wxGetTranslation(wxString(wxT("Dossier racine des m")) + (wxChar) 0x00E9 + wxT("dias."))); + dpkMediaRoot->SetToolTip(_("Media source directory.")); itemBoxSizer13->Add(dpkMediaRoot, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5); - panePedalIDs = new wxCollapsiblePane( panPedals, ID_COLLAPSIBLEPANE6, wxGetTranslation(wxString(wxT("Configuration du p")) + (wxChar) 0x00E9 + wxT("dalier")), wxDefaultPosition, wxDefaultSize, wxCP_DEFAULT_STYLE ); + panePedalIDs = new wxCollapsiblePane( panPedals, ID_COLLAPSIBLEPANE6, _("Device configuration"), wxDefaultPosition, wxDefaultSize, wxCP_DEFAULT_STYLE ); szMediaMain->Add(panePedalIDs, 0, wxGROW|wxALL, 5); szPedalMain = new wxBoxSizer(wxVERTICAL); panePedalIDs->GetPane()->SetSizer(szPedalMain); - panePedalHardware = new wxCollapsiblePane( panePedalIDs->GetPane(), ID_COLLAPSIBLEPANE7, wxGetTranslation(wxString(wxT("Mat")) + (wxChar) 0x00E9 + wxT("riel")), wxDefaultPosition, wxDefaultSize, wxCP_DEFAULT_STYLE ); + panePedalHardware = new wxCollapsiblePane( panePedalIDs->GetPane(), ID_COLLAPSIBLEPANE7, _("Device"), wxDefaultPosition, wxDefaultSize, wxCP_DEFAULT_STYLE ); if (T7Main::ShowToolTips()) - panePedalHardware->SetToolTip(wxGetTranslation(wxString(wxT("Vous ne devez pas jouer avec ces valeurs une fois param")) + (wxChar) 0x00E9 + wxT("tr") + (wxChar) 0x00E9 + wxT("es."))); + panePedalHardware->SetToolTip(_("You should not play with these parameters once rightly set.")); szPedalMain->Add(panePedalHardware, 0, wxGROW|wxALL, 5); szPedalHardware = new wxBoxSizer(wxVERTICAL); panePedalHardware->GetPane()->SetSizer(szPedalHardware); wxBoxSizer* itemBoxSizer20 = new wxBoxSizer(wxHORIZONTAL); szPedalHardware->Add(itemBoxSizer20, 0, wxGROW|wxALL, 5); - wxStaticText* itemStaticText21 = new wxStaticText( panePedalHardware->GetPane(), wxID_STATIC, wxGetTranslation(wxString(wxT("1. P")) + (wxChar) 0x00E9 + wxT("riph") + (wxChar) 0x00E9 + wxT("rique")), wxDefaultPosition, wxDefaultSize, 0 ); + wxStaticText* itemStaticText21 = new wxStaticText( panePedalHardware->GetPane(), wxID_STATIC, _("1. Select a device"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer20->Add(itemStaticText21, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxArrayString cmbHIDDevicesStrings; @@ -196,19 +198,19 @@ void T7Main::CreateControls() wxBoxSizer* itemBoxSizer23 = new wxBoxSizer(wxHORIZONTAL); szPedalHardware->Add(itemBoxSizer23, 0, wxGROW|wxALL, 5); - wxStaticText* itemStaticText24 = new wxStaticText( panePedalHardware->GetPane(), wxID_STATIC, wxGetTranslation(wxString(wxT("2. Appuyez sur la p")) + (wxChar) 0x00E9 + wxT("dale")), wxDefaultPosition, wxDefaultSize, 0 ); + wxStaticText* itemStaticText24 = new wxStaticText( panePedalHardware->GetPane(), wxID_STATIC, _("2. Press pedal"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer23->Add(itemStaticText24, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxArrayString cmbPedalsStrings; cmbPedals = new wxComboBox( panePedalHardware->GetPane(), ID_XCOMBOBOX6, wxEmptyString, wxDefaultPosition, wxDefaultSize, cmbPedalsStrings, wxCB_READONLY ); if (T7Main::ShowToolTips()) - cmbPedals->SetToolTip(wxGetTranslation(wxString(wxT("Vous ne devriez pas jouer avec cette valeur une fois bien param")) + (wxChar) 0x00E9 + wxT("tr") + (wxChar) 0x00E9 + wxT("e."))); + cmbPedals->SetToolTip(_("You should not play with this once rightly configured.")); itemBoxSizer23->Add(cmbPedals, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); lblPedalCode = new wxStaticText( panePedalHardware->GetPane(), wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer23->Add(lblPedalCode, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5); - btnAbout = new wxButton( panePedalHardware->GetPane(), ID_BUTTON, _("A propos"), wxDefaultPosition, wxDefaultSize, 0 ); + btnAbout = new wxButton( panePedalHardware->GetPane(), ID_BUTTON, _("About"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer23->Add(btnAbout, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxBoxSizer* itemBoxSizer28 = new wxBoxSizer(wxHORIZONTAL); @@ -219,30 +221,30 @@ void T7Main::CreateControls() wxArrayString cmbPedalActionLeftStrings; cmbPedalActionLeft = new wxComboBox( panePedalIDs->GetPane(), ID_XCOMBOBOX9, wxEmptyString, wxDefaultPosition, wxDefaultSize, cmbPedalActionLeftStrings, wxCB_READONLY ); if (T7Main::ShowToolTips()) - cmbPedalActionLeft->SetToolTip(wxGetTranslation(wxString(wxT("P")) + (wxChar) 0x00E9 + wxT("dale de gauche"))); + cmbPedalActionLeft->SetToolTip(_("Left pedal")); itemBoxSizer28->Add(cmbPedalActionLeft, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxArrayString cmbPedalActionMiddleStrings; cmbPedalActionMiddle = new wxComboBox( panePedalIDs->GetPane(), ID_XCOMBOBOX7, wxEmptyString, wxDefaultPosition, wxDefaultSize, cmbPedalActionMiddleStrings, wxCB_READONLY ); if (T7Main::ShowToolTips()) - cmbPedalActionMiddle->SetToolTip(wxGetTranslation(wxString(wxT("P")) + (wxChar) 0x00E9 + wxT("dale du milieu."))); + cmbPedalActionMiddle->SetToolTip(_("Middle pedal")); itemBoxSizer28->Add(cmbPedalActionMiddle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxArrayString cmbPedalActionRightStrings; cmbPedalActionRight = new wxComboBox( panePedalIDs->GetPane(), ID_XCOMBOBOX8, wxEmptyString, wxDefaultPosition, wxDefaultSize, cmbPedalActionRightStrings, wxCB_READONLY ); if (T7Main::ShowToolTips()) - cmbPedalActionRight->SetToolTip(wxGetTranslation(wxString(wxT("P")) + (wxChar) 0x00E9 + wxT("dale de droite."))); + cmbPedalActionRight->SetToolTip(_("Right pedal")); itemBoxSizer28->Add(cmbPedalActionRight, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxBoxSizer* itemBoxSizer33 = new wxBoxSizer(wxHORIZONTAL); szPedalMain->Add(itemBoxSizer33, 0, wxGROW|wxALL, 5); - wxStaticText* itemStaticText34 = new wxStaticText( panePedalIDs->GetPane(), wxID_STATIC, wxGetTranslation(wxString(wxT("Revenir en arri")) + (wxChar) 0x00E8 + wxT("re ") + (wxChar) 0x00E0 + wxT(" la fin de la lecture")), wxDefaultPosition, wxDefaultSize, 0 ); + wxStaticText* itemStaticText34 = new wxStaticText( panePedalIDs->GetPane(), wxID_STATIC, _("Auto-rewind on playback suspend"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer33->Add(itemStaticText34, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); txtMediaAutoRewind = new wxTextCtrl( panePedalIDs->GetPane(), ID_XTEXTCTRL7, _("1000"), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER|wxTE_RIGHT ); txtMediaAutoRewind->SetMaxLength(6); if (T7Main::ShowToolTips()) - txtMediaAutoRewind->SetToolTip(wxGetTranslation(wxString(wxT("En millisecondes. Appuyez sur ENTR")) + (wxChar) 0x00C9 + wxT("E pour enregistrer apr") + (wxChar) 0x00E8 + wxT("s modification."))); + txtMediaAutoRewind->SetToolTip(_("Milliseconds; press Enter to save.")); itemBoxSizer33->Add(txtMediaAutoRewind, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); scrlMain->FitInside(); diff --git a/XT7Main.cpp b/XT7Main.cpp index 42cb7ea..b345cdf 100644 --- a/XT7Main.cpp +++ b/XT7Main.cpp @@ -44,7 +44,7 @@ XT7Main::XT7Main( wxWindow* parent, wxWindowID id, const wxString& caption, cons Bind(wxEVT_IDLE, &XT7Main::OnIdle, this); m_keyHandler = new KeyboardSimulation(pedalEVH); } else { - MessageBox(_(L"Configuration du pédalier incomplète."), true); + MessageBox(_("Incomplete device configuration."), true); } UpdateTitle(); } @@ -105,25 +105,25 @@ void XT7Main::Init() { medMain->Show(false); // cmb = wxComboBox HIDTool::GetHIDDevices(cmbHIDDevices, hidPaths); - wxString device = config->Read(_T("/PEDALES/Dispositif")); + wxString device = config->Read(_T("/PEDALS/Device")); cmbHIDDevices->SetSelection(cmbHIDDevices->FindString(device, true)); - cmbPedals->Append(_(L"de gauche")); - cmbPedals->Append(_(L"du milieu")); - cmbPedals->Append(_(L"de droite")); - cmbPedalActionLeft->Append(_(L"Retour rapide")); - cmbPedalActionLeft->Append(_(L"Avance rapide")); - cmbPedalActionLeft->Append(_(L"Lecture")); - cmbPedalActionMiddle->Append(_(L"Retour rapide")); - cmbPedalActionMiddle->Append(_(L"Avance rapide")); - cmbPedalActionMiddle->Append(_(L"Lecture")); - cmbPedalActionRight->Append(_(L"Retour rapide")); - cmbPedalActionRight->Append(_(L"Avance rapide")); - cmbPedalActionRight->Append(_(L"Lecture")); + cmbPedals->Append(_("Left")); + cmbPedals->Append(_("Middle")); + cmbPedals->Append(_("Right")); + cmbPedalActionLeft->Append(_("Rewind")); + cmbPedalActionLeft->Append(_("Fast forward")); + cmbPedalActionLeft->Append(_("Play")); + cmbPedalActionMiddle->Append(_("Rewind")); + cmbPedalActionMiddle->Append(_("Fast forward")); + cmbPedalActionMiddle->Append(_("Play")); + cmbPedalActionRight->Append(_("Rewind")); + cmbPedalActionRight->Append(_("Fast forward")); + cmbPedalActionRight->Append(_("Play")); // Automatic rewind on pause // txt = wxTextCtrl txtMediaAutoRewind->SetValidator(wxTextValidator(wxFILTER_DIGITS)); long autoRw = 1500; - config->Read(_T("/PEDALES/DIVERS/RetourAuto"), &autoRw); + config->Read(_T("/PEDALS/MISC/AutoRewind"), &autoRw); txtMediaAutoRewind->SetValue(wxVariant(autoRw).GetString()); /* * We provide default usual pedal actions : @@ -132,22 +132,22 @@ void XT7Main::Init() { * Right pedal : play */ long actionIndex = wxNOT_FOUND; - if (!config->Read(_T("/PEDALES/ACTIONS/Gauche"), &actionIndex) - && !config->Read(_T("/PEDALES/ACTIONS/Milieu"), &actionIndex) - && !config->Read(_T("/PEDALES/ACTIONS/Droit"), &actionIndex)) { - config->Write(_T("/PEDALES/ACTIONS/Gauche"), 0); - config->Write(_T("/PEDALES/ACTIONS/Milieu"), 1); - config->Write(_T("/PEDALES/ACTIONS/Droit"), 2); + if (!config->Read(_T("/PEDALS/ACTIONS/Left"), &actionIndex) + && !config->Read(_T("/PEDALS/ACTIONS/Middle"), &actionIndex) + && !config->Read(_T("/PEDALS/ACTIONS/Right"), &actionIndex)) { + config->Write(_T("/PEDALS/ACTIONS/Left"), 0); + config->Write(_T("/PEDALS/ACTIONS/Middle"), 1); + config->Write(_T("/PEDALS/ACTIONS/Right"), 2); config->Flush(); } actionIndex = wxNOT_FOUND; - config->Read(_T("/PEDALES/ACTIONS/Gauche"), &actionIndex); + config->Read(_T("/PEDALS/ACTIONS/Left"), &actionIndex); cmbPedalActionLeft->SetSelection(actionIndex); actionIndex = wxNOT_FOUND; - config->Read(_T("/PEDALES/ACTIONS/Milieu"), &actionIndex); + config->Read(_T("/PEDALS/ACTIONS/Middle"), &actionIndex); cmbPedalActionMiddle->SetSelection(actionIndex); actionIndex = wxNOT_FOUND; - config->Read(_T("/PEDALES/ACTIONS/Droit"), &actionIndex); + config->Read(_T("/PEDALS/ACTIONS/Right"), &actionIndex); cmbPedalActionRight->SetSelection(actionIndex); // lbl = wxStaticText lblMediaCurrent->SetLabel(wxEmptyString); @@ -157,7 +157,7 @@ void XT7Main::Init() { lvMediaList->Bind(wxEVT_LIST_ITEM_ACTIVATED, &XT7Main::LoadMedia, this); // dpk = wxDirPicker dpkMediaRoot->GetTextCtrl()->SetEditable(false); - dpkMediaRoot->SetPath(config->Read(_T("/Medias/Racine"))); + dpkMediaRoot->SetPath(config->Read(_T("/Medias/Root"))); dpkMediaRoot->Bind(wxEVT_DIRPICKER_CHANGED, &XT7Main::MediaRootChanged, this); // btn = wxButton btnMediaRootRefresh->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &XT7Main::ListMedia, this); @@ -171,26 +171,23 @@ void XT7Main::Init() { panePedalIDs->Bind(wxEVT_COLLAPSIBLEPANE_CHANGED, &XT7Main::CollapsiblePaneChanged, this); panePedalHardware->Bind(wxEVT_COLLAPSIBLEPANE_CHANGED, &XT7Main::CollapsiblePaneChanged, this); txtMediaAutoRewind->Bind(wxEVT_COMMAND_TEXT_ENTER, &XT7Main::SavePedalAutoRewind, this); - // For display on Android handhelds where PPI may be set high for readable display - wxDouble scaleFactor = 1.0; - const wxDouble ppi = wxGetDisplayPPI().GetY(); - if (ppi > 96.0) scaleFactor = (ppi / 96.0); - SetSize((int) (600.0 * scaleFactor), (int) (450.0 * scaleFactor)); + + SetSize(600, 450); } bool XT7Main::ListenToPedal() { // Create a pedal monitor and an event handler. wxString device; - if (!config->Read(_T("/PEDALES/Dispositif"), &device)) return false; + if (!config->Read(_T("/PEDALS/Device"), &device)) return false; if (!AreAllPedalsIdentified()) return false; wxString devicePath = wxEmptyString; if (cmbHIDDevices->GetSelection() != wxNOT_FOUND) devicePath = hidPaths.Item(cmbHIDDevices->GetSelection()); long leftCode, middleCode, rightCode; - config->Read(_T("/PEDALES/ID/Gauche"), &leftCode); - config->Read(_T("/PEDALES/ID/Milieu"), &middleCode); - config->Read(_T("/PEDALES/ID/Droit"), &rightCode); + config->Read(_T("/PEDALS/ID/Left"), &leftCode); + config->Read(_T("/PEDALS/ID/Middle"), &middleCode); + config->Read(_T("/PEDALS/ID/Right"), &rightCode); long autoRewind = 1500; - config->Read(_T("/PEDALES/DIVERS/RetourAuto"), &autoRewind); + config->Read(_T("/PEDALS/MISC/AutoRewind"), &autoRewind); pedalEVH = new PedalEVH(this, (wxFileOffset) autoRewind); pedMonitor = new PedalMonitor_OnOff(devicePath, pedalEVH, leftCode, middleCode, rightCode); //pedMonitor = new PedalMonitor_Override(devicePath, pedalEVH, leftCode, middleCode, rightCode); @@ -205,14 +202,13 @@ bool XT7Main::ListenToPedal() { return true; } void XT7Main::SavePedalDevice(wxCommandEvent& evt) { - if (config->Write(_T("/PEDALES/Dispositif"), cmbHIDDevices->GetValue())) { - MessageBox(_(L"Enregistré. Vous ne devriez pas jouer avec cette valeur une fois bien paramétrée."), true); + if (config->Write(_T("/PEDALS/Device"), cmbHIDDevices->GetValue())) { + MessageBox(_("Device saved. Proceed to pedal identification."), true); // Individual pedals must be identified again. - config->DeleteGroup(_T("/PEDALES/ID")); + config->DeleteGroup(_T("/PEDALS/ID")); config->Flush(); - //MessageBox(_T("Vous devez compléter l'identification de toutes les pédales."), true); } else { - MessageBox(_(L"Echec de sauvegarde."), true); + MessageBox(_("Can't save selected device in configuration."), true); } } void XT7Main::SavePedalAction(wxCommandEvent& evt) { @@ -230,19 +226,19 @@ void XT7Main::SavePedalAction(wxCommandEvent& evt) { inconsistent = (actionIndex == cmbPedalActionLeft->GetSelection() || actionIndex == cmbPedalActionMiddle->GetSelection()); } if (inconsistent) { - MessageBox(_(L"Choix inconsistants."), true); + MessageBox(_("Choices are not consistent."), true); return; } - config->Write(_T("/PEDALES/ACTIONS/Gauche"), cmbPedalActionLeft->GetSelection()); - config->Write(_T("/PEDALES/ACTIONS/Milieu"), cmbPedalActionMiddle->GetSelection()); - config->Write(_T("/PEDALES/ACTIONS/Droit"), cmbPedalActionRight->GetSelection()); + config->Write(_T("/PEDALS/ACTIONS/Left"), cmbPedalActionLeft->GetSelection()); + config->Write(_T("/PEDALS/ACTIONS/Middle"), cmbPedalActionMiddle->GetSelection()); + config->Write(_T("/PEDALS/ACTIONS/Right"), cmbPedalActionRight->GetSelection()); config->Flush(); } void XT7Main::SavePedalAutoRewind(wxCommandEvent& evt) { - config->Write(_T("/PEDALES/DIVERS/RetourAuto"), wxVariant(txtMediaAutoRewind->GetValue()).GetLong()); + config->Write(_T("/PEDALS/MISC/AutoRewind"), wxVariant(txtMediaAutoRewind->GetValue()).GetLong()); config->Flush(); long newAutoRewind; - config->Read(_T("/PEDALES/DIVERS/RetourAuto"), &newAutoRewind); + config->Read(_T("/PEDALS/MISC/AutoRewind"), &newAutoRewind); if (pedalEVH) pedalEVH->UpdateAutoRewind((wxFileOffset) newAutoRewind); } bool XT7Main::ArePedalActionsConsistent() { @@ -262,9 +258,9 @@ void XT7Main::StartPedalCodeIdentification(wxCommandEvent& evt) { if (!pedalEVH) pedalEVH = new PedalEVH(this); if (!pedCodeIdentifier) { wxString device = wxEmptyString; - config->Read(_T("/PEDALES/Dispositif"), &device); + config->Read(_T("/PEDALS/Device"), &device); if (device.IsEmpty()) { - MessageBox(_T("Périphérique non déclaré."), true); + MessageBox(_T("No declared device."), true); return; } wxString devicePath = wxEmptyString; @@ -283,41 +279,41 @@ void XT7Main::UpdatePedalCode(const unsigned short code) { */ static bool started = false; if (!started) { - config->DeleteGroup(_T("/PEDALES/ID")); + config->DeleteGroup(_T("/PEDALS/ID")); config->Flush(); started = true; - MessageBox(_T("Vous devez compléter l'identification de toutes les pédales."), true); + MessageBox(_T("Please identify each pedal."), true); } switch (cmbPedals->GetSelection()) { case 0: - config->Write(_T("/PEDALES/ID/Gauche"), (long) code); + config->Write(_T("/PEDALS/ID/Left"), (long) code); break; case 1: - config->Write(_T("/PEDALES/ID/Milieu"), (long) code); + config->Write(_T("/PEDALS/ID/Middle"), (long) code); break; case 2: - config->Write(_T("/PEDALES/ID/Droit"), (long) code); + config->Write(_T("/PEDALS/ID/Right"), (long) code); break; default: return; } config->Flush(); - lblPedalCode->SetLabel(_(L"Enregistré. Vous pouvez identifier une autre pédale.")); + lblPedalCode->SetLabel(_("Saved. You may identify another pedal.")); configError = !ArePedalsFullyConfigured(); if (!configError) { - MessageBox(_T("Cette fenêtre va se fermer. Veuillez recommencer.")); + MessageBox(_("This window will close. Please start again.")); Close(); } } bool XT7Main::AreAllPedalsIdentified() { long left, middle, right; - return (config->Read(_T("/PEDALES/ID/Gauche"), &left) - && config->Read(_T("/PEDALES/ID/Milieu"), &middle) - && config->Read(_T("/PEDALES/ID/Droit"), &right)); + return (config->Read(_T("/PEDALS/ID/Left"), &left) + && config->Read(_T("/PEDALS/ID/Middle"), &middle) + && config->Read(_T("/PEDALS/ID/Right"), &right)); } bool XT7Main::ArePedalsFullyConfigured() { wxString device = wxEmptyString; - return (config->Read(_T("/PEDALES/Dispositif"), &device) && AreAllPedalsIdentified()); + return (config->Read(_T("/PEDALS/Device"), &device) && AreAllPedalsIdentified()); } void XT7Main::SliderChanged(wxCommandEvent& evt) { // Manual media positioning @@ -364,7 +360,7 @@ void XT7Main::LoadMedia(wxListEvent& evt) { it.SetColumn(2); it.SetMask(wxLIST_MASK_TEXT); if (lvMediaList->GetItem(it)) { - wxString mediaRoot = config->Read(_T("/Medias/Racine")); + wxString mediaRoot = config->Read(_T("/Medias/Root")); if (mediaRoot.IsEmpty()) return; wxFileName media(mediaRoot + wxFileName::GetPathSeparator() + it.GetText()); if (media.Exists()) { @@ -407,7 +403,7 @@ void XT7Main::OnIdle(wxIdleEvent& evt) { itFileName.SetMask(wxLIST_MASK_TEXT); if (lvMediaList->GetItem(itFileName)) { - wxString mediaRoot = config->Read(_T("/Medias/Racine")); + wxString mediaRoot = config->Read(_T("/Medias/Root")); if (mediaRoot.IsEmpty()) return; wxFileName media(mediaRoot + wxFileName::GetPathSeparator() + itFileName.GetText()); if (media.GetFullPath() != loadedMediaPath) @@ -433,20 +429,20 @@ void XT7Main::OnIdle(wxIdleEvent& evt) { } void XT7Main::MediaRootChanged(wxFileDirPickerEvent& evt) { // A directory where we look for media files. - config->Write(_T("/Medias/Racine"), dpkMediaRoot->GetPath()); + config->Write(_T("/Medias/Root"), dpkMediaRoot->GetPath()); config->Flush(); loadedMediaPath = wxString(); } void XT7Main::ListMedia(wxCommandEvent& evt) { // We don't recurse in sub directories. - wxString mediaRoot = config->Read(_T("/Medias/Racine")); + wxString mediaRoot = config->Read(_T("/Medias/Root")); if (mediaRoot.IsEmpty()) return; lvMediaList->ClearAll(); wxArrayString files; wxDir::GetAllFiles(mediaRoot, &files, wxEmptyString, wxDIR_FILES); - lvMediaList->AppendColumn(_T("Date")); - lvMediaList->AppendColumn(_T("Durée")); - lvMediaList->AppendColumn(_T("Dictée")); + lvMediaList->AppendColumn(_("Date")); + lvMediaList->AppendColumn(_("Length")); + lvMediaList->AppendColumn(_("File")); for (int i = 0; i < files.GetCount(); i++) { wxListItem it; @@ -472,9 +468,9 @@ void XT7Main::SetStreamError() { streamError = true; // We request application restart when stream is established again. // We don't try to detect if the problem is resolved. Restart is cheap. - MessageBox(_(L"Erreur de communication avec le pédalier. Après avoir réglé le problème," - " veuillez redémarrer l'application." - "\n\n Au clavier : F5, F6, F7, ESC."), true); + MessageBox(_("Can't communication with the pedal device. After resolving the problem," + " please restart the application." + "\n\n Keyboard control : F5, F6, F7, ESC."), true); medMain->Stop(); UpdateMediaProgressPosition(); if (mediaProgress && mediaProgress->GetThread()->IsRunning()) mediaProgress->GetThread()->Pause(); @@ -482,10 +478,10 @@ void XT7Main::SetStreamError() { } void XT7Main::ShowAbout(wxCommandEvent& evt) { wxString msg = _APPNAME_T7_ + _T(" - ") + _APPVERSION_T7_ + _T("\n\n"); - msg += _(L"Auteur et copyright :") + _T("\n"); + msg += _("Author and copyright :") + _T("\n"); msg += wxString(_T("SET, M.D.")) + _T("\n"); msg += wxString(_T("nmset@yandex.com")) + _T("\n\n"); - msg += wxString(_(L"Sous license LGPL")); + msg += wxString(_("LGPL license")); MessageBox(msg); } //////////////////////////////////////////////////////////////////////////////////////// @@ -542,7 +538,7 @@ void PedalEVH::Left(PedalEvent::PedalStatus status) { Play(status); break; default : - m_owner->MessageBox(_(L"Action mal déclarée."), true); + m_owner->MessageBox(_("Action is not rightly declared."), true); } } @@ -559,7 +555,7 @@ void PedalEVH::Middle(PedalEvent::PedalStatus status) { Play(status); break; default : - m_owner->MessageBox(_(L"Action mal déclarée."), true); + m_owner->MessageBox(_("Action is not rightly declared."), true); } } void PedalEVH::Right(PedalEvent::PedalStatus status) { @@ -575,7 +571,7 @@ void PedalEVH::Right(PedalEvent::PedalStatus status) { Play(status); break; default : - m_owner->MessageBox(_(L"Action mal déclarée."), true); + m_owner->MessageBox(_("Action is not rightly declared."), true); } } void PedalEVH::Rewind(PedalEvent::PedalStatus status) {