Commit 7beb0f22 authored by dickelbeck's avatar dickelbeck
Browse files

partial move back towards UIpolicy.txt

parent 53b0165b

eeschema/dialog_edit_component_in_schematic.h

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ class wxNotebook; 
#define ID_CHECKBOX_FILED_ORIENT 10011

#define ID_RESTORE_CMP_DEFAULTS 10006

#define SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_STYLE wxDEFAULT_DIALOG_STYLE|MAYBE_RESIZE_BORDER

#define SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_TITLE _("Component properties")

#define SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_TITLE _("Component Properties")

#define SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_IDNAME ID_DIALOG

#define SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_SIZE wxSize(400, 300)

#define SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_POSITION wxDefaultPosition

eeschema/edit_component_in_lib.cpp

+7 −5
Original line number Diff line number Diff line
@@ -472,10 +472,12 @@ void WinEDA_PartPropertiesFrame::BuildPanelEditField() 
 *  of the component

 */

{

    wxString Hjustify_list[] =

    static const wxString Hjustify_list[] =

    { _( "Align left" ), _( "Align center" ), _( "Align right" ) };

    wxString Vjustify_list[] =



    static const wxString Vjustify_list[] =

    { _( "Align bottom" ), _( "Align center" ), _( "Align top" ) };



    int      FieldId = m_CurrentFieldId;



    m_PanelField = new                      wxPanel( m_NoteBook, ID_PANEL_FIELD );

eeschema/libedit_onrightclick.cpp

+195 −195
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ bool BlockActive = (GetScreen()->BlockLocate.m_Command != BLOCK_IDLE); 
        case COMPONENT_FIELD_DRAW_TYPE:

            if( DrawEntry->m_Flags == 0 )

            {

				msg = AddHotkeyName( _( "Move field " ), s_Libedit_Hokeys_Descr, HK_MOVE_PIN );

                msg = AddHotkeyName( _( "Move Field " ), s_Libedit_Hokeys_Descr, HK_MOVE_PIN );

                ADD_MENUITEM(PopMenu, ID_POPUP_LIBEDIT_MOVE_ITEM_REQUEST, msg, move_field_xpm);

            }

            ADD_MENUITEM(PopMenu, ID_POPUP_LIBEDIT_FIELD_ROTATE_ITEM,
@@ -211,13 +211,13 @@ bool not_in_move = (Pin->m_Flags == 0); 
    ADD_MENUITEM_WITH_SUBMENU(PopMenu, global_pin_change, ID_POPUP_LIBEDIT_PIN_GLOBAL_CHANGE_ITEM,

                _("Global"), pin_to_xpm);

    ADD_MENUITEM(global_pin_change, ID_POPUP_LIBEDIT_PIN_GLOBAL_CHANGE_PINSIZE_ITEM,

				selected ? _("Pin Size to selected pins"): _("Pin Size to others"),

                selected ? _("Pin Size to selected pins"): _("Pin Size to Others"),

                pin_size_to_xpm);

    ADD_MENUITEM(global_pin_change, ID_POPUP_LIBEDIT_PIN_GLOBAL_CHANGE_PINNAMESIZE_ITEM,

				selected ? _("Pin Name Size to selected pin") :  _("Pin Name Size to others"),

                selected ? _("Pin Name Size to selected pin") :  _("Pin Name Size to Others"),

                pin_name_to_xpm);

    ADD_MENUITEM(global_pin_change, ID_POPUP_LIBEDIT_PIN_GLOBAL_CHANGE_PINNUMSIZE_ITEM,

				selected ?_("Pin Num Size to selected pin") :  _("Pin Num Size to others"),

                selected ?_("Pin Num Size to selected pin") :  _("Pin Num Size to Others"),

                pin_number_to_xpm);

}
@@ -239,12 +239,12 @@ void AddMenusForBlock(wxMenu * PopMenu, WinEDA_LibeditFrame * frame) 


    if( frame->GetScreen()->BlockLocate.m_Command == BLOCK_MOVE )

    {

		ADD_MENUITEM(PopMenu, ID_POPUP_SELECT_ITEMS_BLOCK, _("Select items"), green_xpm);

        ADD_MENUITEM(PopMenu, ID_POPUP_SELECT_ITEMS_BLOCK, _("Select Items"), green_xpm);

        ADD_MENUITEM(PopMenu, ID_POPUP_COPY_BLOCK,

			_("Copy block"), copyblock_xpm);

		ADD_MENUITEM(PopMenu, ID_POPUP_INVERT_BLOCK, _("Mirror block"), mirror_H_xpm );

            _("Copy Block"), copyblock_xpm);

        ADD_MENUITEM(PopMenu, ID_POPUP_INVERT_BLOCK, _("Mirror Block"), mirror_H_xpm );

        ADD_MENUITEM(PopMenu, ID_POPUP_DELETE_BLOCK,

			_("Delete block"), delete_xpm );

            _("Delete Block"), delete_xpm );

    }

}

eeschema/onrightclick.cpp

+70 −70
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ bool WinEDA_SchematicFrame::OnRightClick( const wxPoint& MousePos, 
    {

    case DRAW_NOCONNECT_STRUCT_TYPE:



//			if( !flags ) PopMenu->Append(ID_POPUP_SCH_MOVE_ITEM_REQUEST, "Move noconnect");

//			if( !flags ) PopMenu->Append(ID_POPUP_SCH_MOVE_ITEM_REQUEST, "Move Noconnect");

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE, _( "Delete Noconn" ), delete_xpm );

        break;
@@ -270,12 +270,12 @@ void AddMenusForComponent( wxMenu* PopMenu, SCH_COMPONENT* Component ) 


    if( !Component->m_Flags )

    {

        msg = _( "Move component" );

        msg = _( "Move Component" );

        msg << wxT(" ") << Component->GetField( REFERENCE )->m_Text;

        msg = AddHotkeyName( msg, s_Schematic_Hokeys_Descr, HK_MOVE_COMPONENT );

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_MOVE_CMP_REQUEST,

                      msg, move_xpm );

        msg = AddHotkeyName( _( "Drag component" ), s_Schematic_Hokeys_Descr, HK_DRAG_COMPONENT );

        msg = AddHotkeyName( _( "Drag Component" ), s_Schematic_Hokeys_Descr, HK_DRAG_COMPONENT );

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DRAG_CMP_REQUEST,

                      msg, move_xpm );

    }
@@ -294,7 +294,7 @@ void AddMenusForComponent( wxMenu* PopMenu, SCH_COMPONENT* Component ) 
    ADD_MENUITEM( orientmenu, ID_POPUP_SCH_ORIENT_NORMAL_CMP, msg, normal_xpm );

    ADD_MENUITEM_WITH_SUBMENU( PopMenu, orientmenu,

                               ID_POPUP_SCH_GENERIC_ORIENT_CMP, _(

                                   "Orient component" ), orient_xpm );

                                   "Orient Component" ), orient_xpm );



    wxMenu* editmenu = new wxMenu;

    ADD_MENUITEM( editmenu, ID_POPUP_SCH_EDIT_CMP, _( "Edit" ), edit_component_xpm );
@@ -330,12 +330,12 @@ void AddMenusForComponent( wxMenu* PopMenu, SCH_COMPONENT* Component ) 


    ADD_MENUITEM_WITH_SUBMENU( PopMenu, editmenu,

                               ID_POPUP_SCH_GENERIC_EDIT_CMP, _(

                                   "Edit component" ), edit_component_xpm );

                                   "Edit Component" ), edit_component_xpm );



    if( !Component->m_Flags )

    {

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_COPY_COMPONENT_CMP, _( "Copy component" ), import_xpm );

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE_CMP, _( "Delete component" ), delete_xpm );

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_COPY_COMPONENT_CMP, _( "Copy Component" ), import_xpm );

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE_CMP, _( "Delete Component" ), delete_xpm );

    }



    LibEntry = FindLibPart( Component->m_ChipName.GetData(), wxEmptyString, FIND_ALIAS );
@@ -354,20 +354,20 @@ void AddMenusForGLabel( wxMenu* PopMenu, SCH_GLOBALLABEL* GLabel ) 
    wxMenu* menu_change_type = new wxMenu;



    if( !GLabel->m_Flags )

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_MOVE_ITEM_REQUEST, _( "Move global label" ), move_text_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ROTATE_TEXT, _( "Rotate global label" ), rotate_glabel_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_EDIT_TEXT, _( "Edit global label" ), edit_text_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE, _( "Delete global label" ), delete_text_xpm );

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_MOVE_ITEM_REQUEST, _( "Move Global Label" ), move_text_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ROTATE_TEXT, _( "Rotate Global Label" ), rotate_glabel_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_EDIT_TEXT, _( "Edit Global Label" ), edit_text_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE, _( "Delete Global Label" ), delete_text_xpm );



    // add menu change type text (to label, glabel, text):

    ADD_MENUITEM( menu_change_type, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_HLABEL,

                  _( "Change to hierarchical label" ), label2glabel_xpm );

                  _( "Change to Hierarchical Label" ), label2glabel_xpm );

    ADD_MENUITEM( menu_change_type, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_LABEL,

                  _( "Change to label" ), glabel2label_xpm );

                  _( "Change to Label" ), glabel2label_xpm );

    ADD_MENUITEM( menu_change_type, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_COMMENT,

                  _( "Change to text" ), glabel2text_xpm );

                  _( "Change to Text" ), glabel2text_xpm );

    ADD_MENUITEM_WITH_SUBMENU( PopMenu, menu_change_type,

                               ID_POPUP_SCH_CHANGE_TYPE_TEXT, _( "Change type" ), gl_change_xpm );

                               ID_POPUP_SCH_CHANGE_TYPE_TEXT, _( "Change Type" ), gl_change_xpm );

}
@@ -381,20 +381,20 @@ void AddMenusForHLabel( wxMenu* PopMenu, SCH_HIERLABEL* HLabel ) 
    wxMenu* menu_change_type = new wxMenu;



    if( !HLabel->m_Flags )

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_MOVE_ITEM_REQUEST, _( "Move hierarchical label" ), move_text_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ROTATE_TEXT, _( "Rotate hierarchical Label" ), rotate_glabel_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_EDIT_TEXT, _( "Edit hierarchical Label" ), edit_text_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE, _( "Delete hierarchical label" ), delete_text_xpm );

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_MOVE_ITEM_REQUEST, _( "Move Hierarchical Label" ), move_text_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ROTATE_TEXT, _( "Rotate Hierarchical Label" ), rotate_glabel_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_EDIT_TEXT, _( "Edit Hierarchical Label" ), edit_text_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE, _( "Delete Hierarchical label" ), delete_text_xpm );



    // add menu change type text (to label, glabel, text):

    ADD_MENUITEM( menu_change_type, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_LABEL,

                  _( "Change to label" ), glabel2label_xpm );

                  _( "Change to Label" ), glabel2label_xpm );

    ADD_MENUITEM( menu_change_type, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_COMMENT,

                  _( "Change to text" ), glabel2text_xpm );

                  _( "Change to Text" ), glabel2text_xpm );

    ADD_MENUITEM( menu_change_type, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_GLABEL,

                  _( "Change to global label" ), label2glabel_xpm );

                  _( "Change to Global Label" ), label2glabel_xpm );

    ADD_MENUITEM_WITH_SUBMENU( PopMenu, menu_change_type,

                               ID_POPUP_SCH_CHANGE_TYPE_TEXT, _( "Change type" ), gl_change_xpm );

                               ID_POPUP_SCH_CHANGE_TYPE_TEXT, _( "Change Type" ), gl_change_xpm );

}
@@ -408,20 +408,20 @@ void AddMenusForLabel( wxMenu* PopMenu, SCH_LABEL* Label ) 
    wxMenu* menu_change_type = new wxMenu;



    if( !Label->m_Flags )

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_MOVE_ITEM_REQUEST, _( "Move label" ), move_text_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ROTATE_TEXT, _( "Rotate label" ), rotate_pos_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_EDIT_TEXT, _( "Edit label" ), edit_text_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE, _( "Delete label" ), delete_text_xpm );

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_MOVE_ITEM_REQUEST, _( "Move Label" ), move_text_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ROTATE_TEXT, _( "Rotate Label" ), rotate_pos_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_EDIT_TEXT, _( "Edit Label" ), edit_text_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE, _( "Delete Label" ), delete_text_xpm );



    // add menu change type text (to label, glabel, text):

    ADD_MENUITEM( menu_change_type, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_HLABEL,

                  _( "Change to hierarchical label" ), label2glabel_xpm );

                  _( "Change to Hierarchical Label" ), label2glabel_xpm );

    ADD_MENUITEM( menu_change_type, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_COMMENT,

                  _( "Change to text" ), label2text_xpm );

                  _( "Change to Text" ), label2text_xpm );

    ADD_MENUITEM( menu_change_type, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_GLABEL,

                  _( "Change to global label" ), label2glabel_xpm );

                  _( "Change to Global Label" ), label2glabel_xpm );

    ADD_MENUITEM_WITH_SUBMENU( PopMenu, menu_change_type,

                               ID_POPUP_SCH_CHANGE_TYPE_TEXT, _( "Change type" ), gl_change_xpm );

                               ID_POPUP_SCH_CHANGE_TYPE_TEXT, _( "Change Type" ), gl_change_xpm );

}
@@ -435,20 +435,20 @@ void AddMenusForText( wxMenu* PopMenu, SCH_TEXT* Text ) 
    wxMenu* menu_change_type = new wxMenu;



    if( !Text->m_Flags )

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_MOVE_ITEM_REQUEST, _( "Move text" ), move_text_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ROTATE_TEXT, _( "Rotate text" ), rotate_pos_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_EDIT_TEXT, _( "Edit text" ), edit_text_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE, _( "Delete text" ), delete_text_xpm );

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_MOVE_ITEM_REQUEST, _( "Move Text" ), move_text_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ROTATE_TEXT, _( "Rotate Text" ), rotate_pos_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_EDIT_TEXT, _( "Edit Text" ), edit_text_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE, _( "Delete Text" ), delete_text_xpm );



    // add menu change type text (to label, glabel, text):

    ADD_MENUITEM( menu_change_type, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_LABEL,

                  _( "Change to label" ), label2text_xpm );

                  _( "Change to Label" ), label2text_xpm );

    ADD_MENUITEM( menu_change_type, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_HLABEL,

                  _( "Change to hierarchical label" ), label2glabel_xpm );

                  _( "Change to Hierarchical Label" ), label2glabel_xpm );

    ADD_MENUITEM( menu_change_type, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_GLABEL,

                  _( "Change to Glabel" ), label2glabel_xpm );

    ADD_MENUITEM_WITH_SUBMENU( PopMenu, menu_change_type,

                               ID_POPUP_SCH_CHANGE_TYPE_TEXT, _( "Change type" ), gl_change_xpm );

                               ID_POPUP_SCH_CHANGE_TYPE_TEXT, _( "Change Type" ), gl_change_xpm );

}
@@ -466,17 +466,17 @@ void AddMenusForJunction( wxMenu* PopMenu, DrawJunctionStruct* Junction, 
    {

        if( PickStruct( frame->GetScreen()->m_Curseur, frame->GetScreen(),

                        WIREITEM | BUSITEM | EXCLUDE_WIRE_BUS_ENDPOINTS ) )

            ADD_MENUITEM( PopMenu, ID_POPUP_SCH_BREAK_WIRE, _( "Break wire" ), break_line_xpm );

            ADD_MENUITEM( PopMenu, ID_POPUP_SCH_BREAK_WIRE, _( "Break Wire" ), break_line_xpm );

    }



    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE, _( "Delete junction" ), delete_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE, _( "Delete Junction" ), delete_xpm );



    if( PickStruct( frame->GetScreen()->m_Curseur, frame->GetScreen(),

                    WIREITEM | BUSITEM ) )

    {

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE_NODE, _( "Delete node" ), delete_node_xpm );

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE_NODE, _( "Delete Node" ), delete_node_xpm );

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE_CONNECTION, _(

                          "Delete connection" ), delete_connection_xpm );

                          "Delete Connection" ), delete_connection_xpm );

    }

}
@@ -493,30 +493,30 @@ void AddMenusForWire( wxMenu* PopMenu, EDA_DrawLineStruct* Wire, 
    wxPoint pos    = frame->GetScreen()->m_Curseur;



    if( is_new )

        ADD_MENUITEM( PopMenu, ID_POPUP_END_LINE, _( "Wire end" ), apply_xpm );

        ADD_MENUITEM( PopMenu, ID_POPUP_END_LINE, _( "Wire End" ), apply_xpm );



    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE, _( "Delete wire" ), delete_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE, _( "Delete Wire" ), delete_xpm );



    if( is_new )

        return;



    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE_NODE, _( "Delete node" ), delete_node_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE_NODE, _( "Delete Node" ), delete_node_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE_CONNECTION, _(

                      "Delete connection" ), delete_connection_xpm );

                      "Delete Connection" ), delete_connection_xpm );



    if( PickStruct( frame->GetScreen()->m_Curseur, frame->GetScreen(),

                    WIREITEM | BUSITEM | EXCLUDE_WIRE_BUS_ENDPOINTS ) )

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_BREAK_WIRE, _( "Break wire" ), break_line_xpm );

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_BREAK_WIRE, _( "Break Wire" ), break_line_xpm );



    PopMenu->AppendSeparator();



    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ADD_JUNCTION, _( "Add junction" ), add_junction_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ADD_LABEL, _( "Add label" ), add_line_label_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ADD_JUNCTION, _( "Add Junction" ), add_junction_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ADD_LABEL, _( "Add Label" ), add_line_label_xpm );



    // Place Global label command only if the cursor is over one end of the Wire:

    if( ( pos.x == Wire->m_Start.x && pos.y == Wire->m_Start.y)

       || ( pos.x == Wire->m_End.x && pos.y == Wire->m_End.y ) )

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ADD_GLABEL, _( "Add global label" ), add_glabel_xpm );

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ADD_GLABEL, _( "Add Global Label" ), add_glabel_xpm );

}
@@ -532,23 +532,23 @@ void AddMenusForBus( wxMenu* PopMenu, EDA_DrawLineStruct* Bus, 
    wxPoint pos    = frame->GetScreen()->m_Curseur;



    if( is_new )

        ADD_MENUITEM( PopMenu, ID_POPUP_END_LINE, _( "Bus end" ), apply_xpm );

        ADD_MENUITEM( PopMenu, ID_POPUP_END_LINE, _( "Bus End" ), apply_xpm );



    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE,

                  _( "Delete bus" ), delete_bus_xpm );

                  _( "Delete Bus" ), delete_bus_xpm );



    if( !is_new )

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_BREAK_WIRE,

                      _( "Break bus" ), break_bus_xpm );

                      _( "Break Bus" ), break_bus_xpm );



    PopMenu->AppendSeparator();

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ADD_JUNCTION, _( "Add junction" ), add_junction_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ADD_LABEL, _( "Add label" ), add_line_label_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ADD_JUNCTION, _( "Add Junction" ), add_junction_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ADD_LABEL, _( "Add Label" ), add_line_label_xpm );



    // Place Global label command only if the cursor is over one end of the Bus:

    if( ( pos.x == Bus->m_Start.x && pos.y == Bus->m_Start.y)

       || ( pos.x == Bus->m_End.x && pos.y == Bus->m_End.y ) )

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ADD_GLABEL, _( "Add global label" ), add_glabel_xpm );

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ADD_GLABEL, _( "Add Global Label" ), add_glabel_xpm );

}
@@ -561,23 +561,23 @@ void AddMenusForHierchicalSheet( wxMenu* PopMenu, DrawSheetStruct* Sheet ) 
{

    if( !Sheet->m_Flags )

    {

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ENTER_SHEET, _( "Enter sheet" ), enter_sheet_xpm );

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ENTER_SHEET, _( "Enter Sheet" ), enter_sheet_xpm );

        PopMenu->AppendSeparator();

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_MOVE_ITEM_REQUEST, _( "Move sheet" ), move_sheet_xpm );

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_MOVE_ITEM_REQUEST, _( "Move Sheet" ), move_sheet_xpm );

    }



    if( Sheet->m_Flags )

    {

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_END_SHEET, _( "Place sheet" ), apply_xpm );

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_END_SHEET, _( "Place Sheet" ), apply_xpm );

    }

    else

    {

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_EDIT_SHEET, _( "Edit sheet" ), edit_sheet_xpm );

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_RESIZE_SHEET, _( "Resize sheet" ), resize_sheet_xpm );

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_EDIT_SHEET, _( "Edit Sheet" ), edit_sheet_xpm );

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_RESIZE_SHEET, _( "Resize Sheet" ), resize_sheet_xpm );

        if( Sheet->m_Label )  // Sheet has pin labels, and can be cleaned

            ADD_MENUITEM( PopMenu, ID_POPUP_SCH_CLEANUP_SHEET,

                          _( "Cleanup PinSheets" ), options_pinsheet_xpm );

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE, _( "Delete sheet" ), delete_sheet_xpm );

        ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE, _( "Delete Sheet" ), delete_sheet_xpm );

    }

}
@@ -606,28 +606,28 @@ void AddMenusForBlock( wxMenu* PopMenu, WinEDA_SchematicFrame* frame ) 
/* Add menu commands for block

 */

{

    ADD_MENUITEM( PopMenu, ID_POPUP_CANCEL_CURRENT_COMMAND, _( "Cancel block" ), cancel_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_CANCEL_CURRENT_COMMAND, _( "Cancel Block" ), cancel_xpm );



    PopMenu->AppendSeparator();



    if( frame->GetScreen()->BlockLocate.m_Command == BLOCK_MOVE )

        ADD_MENUITEM( PopMenu, ID_POPUP_ZOOM_BLOCK,

                      _( "Zoom block" ), zoom_selected_xpm );

                      _( "Zoom Block" ), zoom_selected_xpm );



    ADD_MENUITEM( PopMenu, ID_POPUP_PLACE_BLOCK, _( "Place block" ), apply_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_PLACE_BLOCK, _( "Place Block" ), apply_xpm );



    if( frame->GetScreen()->BlockLocate.m_Command == BLOCK_MOVE )

    {

        wxMenu* menu_other_block_commands = new wxMenu;

        ADD_MENUITEM_WITH_SUBMENU( PopMenu, menu_other_block_commands,

                                   -1, _( "Other block commands" ), right_xpm );

        ADD_MENUITEM( menu_other_block_commands, wxID_COPY, _( "Save block" ), copy_button );

                                   -1, _( "Other Block Commands" ), right_xpm );

        ADD_MENUITEM( menu_other_block_commands, wxID_COPY, _( "Save Block" ), copy_button );

        ADD_MENUITEM( menu_other_block_commands, ID_POPUP_COPY_BLOCK,

                      _( "Copy block" ), copyblock_xpm );

                      _( "Copy Block" ), copyblock_xpm );

        ADD_MENUITEM( menu_other_block_commands, ID_POPUP_DRAG_BLOCK,

                      _( "Drag block" ), move_xpm );

                      _( "Drag Block" ), move_xpm );

        ADD_MENUITEM( menu_other_block_commands, ID_POPUP_DELETE_BLOCK,

                      _( "Delete block" ), delete_xpm );

                      _( "Delete Block" ), delete_xpm );

        ADD_MENUITEM( menu_other_block_commands, ID_POPUP_MIRROR_Y_BLOCK, _(

                          "Mirror Block ||" ), mirror_H_xpm );

#if 0

eeschema/pinedit-dialog.cpp

+110 −110
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ void WinEDA_PinPropertiesFrame::CreateControls() 
    m_PinSizeIncDecButton->SetValue(0);

    itemBoxSizer10->Add(m_PinSizeIncDecButton, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);



    m_PinSizeText = new wxStaticText( itemDialog1, wxID_STATIC, _("Pin lenght"), wxDefaultPosition, wxDefaultSize, 0 );

    m_PinSizeText = new wxStaticText( itemDialog1, wxID_STATIC, _("Pin length"), wxDefaultPosition, wxDefaultSize, 0 );

    itemStaticBoxSizer9->Add(m_PinSizeText, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);



    m_CommonUnit = new wxCheckBox( itemDialog1, ID_CHECKBOX_COMMON_UNITS, _("Common to units"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );