Commit 1d16eae0 authored by CHARRAS's avatar CHARRAS
Browse files

eeschema: problems found. some (not all) solved (see changelog)

parent c759be6f

eeschema/onrightclick.cpp

+6 −6
Original line number Original line Diff line number Diff line
@@ -376,12 +376,12 @@ void AddMenusForGLabel( wxMenu* PopMenu, DrawGlobalLabelStruct* GLabel ) 
    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE, _( "Delete Glabel" ), delete_text_xpm );

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





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

    // 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 );

    ADD_MENUITEM( menu_change_type, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_LABEL,

    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,

    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_HLABEL,

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

    ADD_MENUITEM_WITH_SUBMENU( PopMenu, menu_change_type,

    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 );

}

}
@@ -427,12 +427,12 @@ void AddMenusForLabel( wxMenu* PopMenu, DrawLabelStruct* Label ) 
    ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE, _( "Delete Label" ), delete_text_xpm );

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





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

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

    ADD_MENUITEM( menu_change_type, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_GLABEL,

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

    ADD_MENUITEM( menu_change_type, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_COMMENT,

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

    ADD_MENUITEM( menu_change_type, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_HLABEL,

    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 );

    ADD_MENUITEM( menu_change_type, ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_GLABEL,

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

    ADD_MENUITEM_WITH_SUBMENU( PopMenu, menu_change_type,

    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 );

}

}