Commit 0a635873 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

added " pcbnew module editor toolbar items now in menubar" patch from Jerry Jacobs. Fixed TODO. 

minor code cleaning. fixed minor warnings in debug mode.
parent 1794a2ae

eeschema/dialog_edit_component_in_lib_base.cpp

+269 −269
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx 
	m_PanelBasic->SetSizer( bSizerBasicPanel );

	m_PanelBasic->Layout();

	bSizerBasicPanel->Fit( m_PanelBasic );

	m_NoteBook->AddPage( m_PanelBasic, _("Options"), true );

	m_NoteBook->AddPage( m_PanelBasic, _("Options"), false );

	m_PanelDoc = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );

	wxBoxSizer* m_PanelDocBoxSizer;

	m_PanelDocBoxSizer = new wxBoxSizer( wxVERTICAL );
@@ -123,7 +123,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx 
	

	m_staticTextKeywords = new wxStaticText( m_PanelDoc, wxID_ANY, _("Keywords:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticTextKeywords->Wrap( -1 );

	m_staticTextKeywords->SetToolTip( _("Enter keys words that can be used to select this composant\nkeys words cannot have spaces and are separated by a space") );

	m_staticTextKeywords->SetToolTip( _("Enter keys words that can be used to select this composant.\nKey words cannot have spaces and are separated by a space.") );

	

	m_PanelDocBoxSizer->Add( m_staticTextKeywords, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
@@ -153,7 +153,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx 
	m_PanelDoc->SetSizer( m_PanelDocBoxSizer );

	m_PanelDoc->Layout();

	m_PanelDocBoxSizer->Fit( m_PanelDoc );

	m_NoteBook->AddPage( m_PanelDoc, _("Description"), false );

	m_NoteBook->AddPage( m_PanelDoc, _("Description"), true );

	m_PanelAlias = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );

	wxBoxSizer* bSizerMainPanelAlias;

	bSizerMainPanelAlias = new wxBoxSizer( wxHORIZONTAL );

eeschema/dialog_edit_component_in_lib_base.fbp

+3 −3
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ 
                        <object class="notebookpage" expanded="1">

                            <property name="bitmap"></property>

                            <property name="label">Options</property>

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

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

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

                                <property name="bg"></property>

                                <property name="context_help"></property>
@@ -851,7 +851,7 @@ 
                        <object class="notebookpage" expanded="1">

                            <property name="bitmap"></property>

                            <property name="label">Description</property>

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

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

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

                                <property name="bg"></property>

                                <property name="context_help"></property>
@@ -1026,7 +1026,7 @@ 
                                            <property name="size"></property>

                                            <property name="style"></property>

                                            <property name="subclass"></property>

                                            <property name="tooltip">Enter keys words that can be used to select this composant&#x0A;keys words cannot have spaces and are separated by a space</property>

                                            <property name="tooltip">Enter keys words that can be used to select this composant.&#x0A;Key words cannot have spaces and are separated by a space.</property>

                                            <property name="window_extra_style"></property>

                                            <property name="window_name"></property>

                                            <property name="window_style"></property>

eeschema/hotkeys.cpp

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ void WinEDA_SchematicFrame::OnHotKey( wxDC* DC, int hotkey, 
        {

            if( m_ID_current_state != ID_NOCONN_BUTT )

                SetToolID( ID_NOCONN_BUTT, wxCURSOR_PENCIL,

                          _( "Add a no connected flag" ) );

                          _( "Add \"NoNonnect\" Flags" ) );

            OnLeftClick( DC, MousePos );

        }

        break;

eeschema/menubar.cpp

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar() 
    filesMenu->AppendSeparator();

    item = new wxMenuItem( filesMenu, wxID_EXIT, _( "&Quit" ),

                          _( "Quit EESchema" ) );

    item->SetBitmap( exit_xpm );

    filesMenu->Append( item );



#endif /* !defined( __WXMAC__) */

eeschema/menubar_libedit.cpp

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ void WinEDA_LibeditFrame::ReCreateMenuBar() 
    filesMenu->AppendSeparator();

    item = new wxMenuItem( filesMenu, wxID_EXIT, _( "&Quit" ),

                           _( "Quit Library Editor" ) );

    item->SetBitmap( exit_xpm );

    filesMenu->Append( item );

#endif