Commit 148ba430 authored by Chris Pavlina's avatar Chris Pavlina Committed by Wayne Stambaugh
Browse files

Make tab order more sensible for DIALOG_PCB_TEXT_PROPERTIES.

parent 5a387ce5

pcbnew/dialogs/dialog_pcb_text_properties.cpp

+15 −3
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * This program source code file is part of KiCad, a free EDA CAD application.

 * This program source code file is part of KiCad, a free EDA CAD application.

 *

 *

 * Copyright (C) 2004-2010 Jean-Pierre Charras <jean-pierre.charras@gpisa-lab.inpg.fr>

 * Copyright (C) 2004-2010 Jean-Pierre Charras <jean-pierre.charras@gpisa-lab.inpg.fr>

 * Copyright (C) 2010 KiCad Developers, see change_log.txt for contributors.

 * Copyright (C) 2010-2015 KiCad Developers, see change_log.txt for contributors.

 *

 *

 * This program is free software; you can redistribute it and/or

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * modify it under the terms of the GNU General Public License
@@ -153,6 +153,18 @@ void DIALOG_PCB_TEXT_PROPERTIES::MyInit() 
    EDA_TEXT_HJUSTIFY_T hJustify = m_SelectedPCBText->GetHorizJustify();

    EDA_TEXT_HJUSTIFY_T hJustify = m_SelectedPCBText->GetHorizJustify();

    m_justifyChoice->SetSelection( (int) hJustify + 1 );

    m_justifyChoice->SetSelection( (int) hJustify + 1 );





    // Manually set tab order

    m_SizeXCtrl->MoveAfterInTabOrder( m_TextContentCtrl );

    m_SizeYCtrl->MoveAfterInTabOrder( m_SizeXCtrl );

    m_ThicknessCtrl->MoveAfterInTabOrder( m_SizeYCtrl );

    m_PositionXCtrl->MoveAfterInTabOrder( m_ThicknessCtrl );

    m_PositionYCtrl->MoveAfterInTabOrder( m_PositionXCtrl );

    m_OrientationCtrl->MoveAfterInTabOrder( m_PositionYCtrl );

    m_LayerSelectionCtrl->MoveAfterInTabOrder( m_OrientationCtrl );

    m_StyleCtrl->MoveAfterInTabOrder( m_LayerSelectionCtrl );

    m_DisplayCtrl->MoveAfterInTabOrder( m_StyleCtrl );

    m_justifyChoice->MoveAfterInTabOrder( m_DisplayCtrl );



    // Set focus on most important control

    // Set focus on most important control

    m_TextContentCtrl->SetFocus();

    m_TextContentCtrl->SetFocus();

    m_TextContentCtrl->SetSelection( -1, -1 );

    m_TextContentCtrl->SetSelection( -1, -1 );
@@ -178,7 +190,7 @@ void DIALOG_PCB_TEXT_PROPERTIES::OnOkClick( wxCommandEvent& event ) 
    // having texts on edge cut layer for instance

    // having texts on edge cut layer for instance

    if( m_LayerSelectionCtrl->GetLayerSelection() < 0 )

    if( m_LayerSelectionCtrl->GetLayerSelection() < 0 )

    {

    {

        wxMessageBox( wxT("No layer selected, Please select the text layer") );

        wxMessageBox( _( "No layer selected, Please select the text layer" ) );

        return;

        return;

    }

    }

pcbnew/dialogs/dialog_pcb_text_properties_base.cpp

+1 −1
Original line number Original line Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

///////////////////////////////////////////////////////////////////////////

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

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

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

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

//

//

// PLEASE DO "NOT" EDIT THIS FILE!

// PLEASE DO "NOT" EDIT THIS FILE!

pcbnew/dialogs/dialog_pcb_text_properties_base.fbp

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

<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>

<wxFormBuilder_Project>

<wxFormBuilder_Project>

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

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

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

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

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

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

        <property name="code_generation">C++</property>

        <property name="code_generation">C++</property>
@@ -20,8 +20,10 @@ 
        <property name="path">.</property>

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

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

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

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

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

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

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

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

        <property name="skip_python_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_enum">0</property>

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

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

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

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

pcbnew/dialogs/dialog_pcb_text_properties_base.h

+1 −1
Original line number Original line Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

///////////////////////////////////////////////////////////////////////////

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

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

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

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

//

//

// PLEASE DO "NOT" EDIT THIS FILE!

// PLEASE DO "NOT" EDIT THIS FILE!