Commit 6083f3b0 authored by Maciej Suminski's avatar Maciej Suminski
Browse files

Internationalization of GAL dialogs & menus.

parent be839aca

common/tool/context_menu.cpp

+1 −2
Original line number Diff line number Diff line
@@ -156,8 +156,7 @@ void CONTEXT_MENU::Add( const TOOL_ACTION& aAction ) 
    int id = m_actionId + aAction.GetId();



    wxMenuItem* item = new wxMenuItem( this, id,

        wxString( aAction.GetMenuItem().c_str(), wxConvUTF8 ),

        wxString( aAction.GetDescription().c_str(), wxConvUTF8 ), wxITEM_NORMAL );

        aAction.GetMenuItem(), aAction.GetDescription(), wxITEM_NORMAL );



    if( aAction.HasHotKey() )

    {

include/tool/tool_action.h

+8 −8
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ class TOOL_ACTION 
{

public:

    TOOL_ACTION( const std::string& aName, TOOL_ACTION_SCOPE aScope = AS_CONTEXT,

            int aDefaultHotKey = 0, const std::string& aMenuItem = std::string( "" ),

            const std::string& aMenuDesc = std::string( "" ), TOOL_ACTION_FLAGS aFlags = AF_NONE ) :

            int aDefaultHotKey = 0, const wxString aMenuItem = wxEmptyString,

            const wxString& aMenuDesc = wxEmptyString, TOOL_ACTION_FLAGS aFlags = AF_NONE ) :

        m_name( aName ), m_scope( aScope ), m_defaultHotKey( aDefaultHotKey ),

        m_currentHotKey( aDefaultHotKey ), m_menuItem( aMenuItem ),

        m_menuDescription( aMenuDesc ), m_id( -1 ), m_flags( aFlags )
@@ -154,22 +154,22 @@ public: 
            return TOOL_EVENT( TC_COMMAND, TA_ACTION, m_name, m_scope );

    }



    const std::string& GetMenuItem() const

    const wxString& GetMenuItem() const

    {

        return m_menuItem;

    }



    void SetMenuItem( const std::string& aItem )

    void SetMenuItem( const wxString& aItem )

    {

        m_menuItem = aItem;

    }



    const std::string& GetDescription() const

    const wxString& GetDescription() const

    {

        return m_menuDescription;

    }



    void SetDescription( const std::string& aDescription )

    void SetDescription( const wxString& aDescription )

    {

        m_menuDescription = aDescription;

    }
@@ -218,10 +218,10 @@ private: 
    int m_currentHotKey;



    /// Menu entry text

    std::string m_menuItem;

    wxString m_menuItem;



    /// Pop-up help

    std::string m_menuDescription;

    wxString m_menuDescription;



    // Icon for menu entry

    // KiBitmap m_bitmap;

pcbnew/dialogs/dialog_target_properties_base.cpp

+7 −7
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Oct  8 2012)

// C++ code generated with wxFormBuilder (version Mar  9 2015)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -25,33 +25,33 @@ TARGET_PROPERTIES_DIALOG_EDITOR_BASE::TARGET_PROPERTIES_DIALOG_EDITOR_BASE( wxWi 
	fgSizer->SetFlexibleDirection( wxBOTH );

	fgSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );

	

	m_staticTextSize = new wxStaticText( this, wxID_ANY, wxT("Size"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticTextSize = new wxStaticText( this, wxID_ANY, _("Size"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticTextSize->Wrap( -1 );

	fgSizer->Add( m_staticTextSize, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );

	

	m_TargetSizeCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	fgSizer->Add( m_TargetSizeCtrl, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );

	

	m_staticTextSizeUnits = new wxStaticText( this, wxID_ANY, wxT("unit"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticTextSizeUnits = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticTextSizeUnits->Wrap( -1 );

	fgSizer->Add( m_staticTextSizeUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );

	

	m_staticTextThickness = new wxStaticText( this, wxID_ANY, wxT("Thickness"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticTextThickness = new wxStaticText( this, wxID_ANY, _("Thickness"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticTextThickness->Wrap( -1 );

	fgSizer->Add( m_staticTextThickness, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );

	

	m_TargetThicknessCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	fgSizer->Add( m_TargetThicknessCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL, 5 );

	

	m_staticTextThicknessUnits = new wxStaticText( this, wxID_ANY, wxT("unit"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticTextThicknessUnits = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticTextThicknessUnits->Wrap( -1 );

	fgSizer->Add( m_staticTextThicknessUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );

	

	m_staticTextShape = new wxStaticText( this, wxID_ANY, wxT("Shape"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticTextShape = new wxStaticText( this, wxID_ANY, _("Shape"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticTextShape->Wrap( -1 );

	fgSizer->Add( m_staticTextShape, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );

	

	wxString m_TargetShapeChoices[] = { wxT("+"), wxT("X") };

	wxString m_TargetShapeChoices[] = { _("+"), _("X") };

	int m_TargetShapeNChoices = sizeof( m_TargetShapeChoices ) / sizeof( wxString );

	m_TargetShape = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_TargetShapeNChoices, m_TargetShapeChoices, 0 );

	m_TargetShape->SetSelection( 0 );

pcbnew/dialogs/dialog_target_properties_base.fbp

+4 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>

<wxFormBuilder_Project>

    <FileVersion major="1" minor="11" />

    <FileVersion major="1" minor="13" />

    <object class="Project" expanded="1">

        <property name="class_decoration"></property>

        <property name="code_generation">C++</property>
@@ -14,14 +14,16 @@ 
        <property name="file">dialog_target_properties_base</property>

        <property name="first_id">1000</property>

        <property name="help_provider">none</property>

        <property name="internationalize">0</property>

        <property name="internationalize">1</property>

        <property name="name">dialog_target_properties_base</property>

        <property name="namespace"></property>

        <property name="path">.</property>

        <property name="precompiled_header"></property>

        <property name="relative_path">1</property>

        <property name="skip_lua_events">1</property>

        <property name="skip_php_events">1</property>

        <property name="skip_python_events">1</property>

        <property name="ui_table">UI</property>

        <property name="use_enum">0</property>

        <property name="use_microsoft_bom">0</property>

        <object class="Dialog" expanded="1">

pcbnew/dialogs/dialog_target_properties_base.h

+3 −2
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Oct  8 2012)

// C++ code generated with wxFormBuilder (version Mar  9 2015)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -10,6 +10,7 @@ 


#include <wx/artprov.h>

#include <wx/xrc/xmlres.h>

#include <wx/intl.h>

class DIALOG_SHIM;



#include "dialog_shim.h"
@@ -57,7 +58,7 @@ class TARGET_PROPERTIES_DIALOG_EDITOR_BASE : public DIALOG_SHIM 
	

	public:

		

		TARGET_PROPERTIES_DIALOG_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Target Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 

		TARGET_PROPERTIES_DIALOG_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Target Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 

		~TARGET_PROPERTIES_DIALOG_EDITOR_BASE();

	

};