From 2daaf084beb54cc4bb16fa2c98b50e78de3adbb3 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Fri, 12 Jun 2015 16:30:36 +0200 Subject: [PATCH] Cvpcb: minro fixes: fix an outdated help message, and remove dead code. --- cvpcb/common_help_msg.h | 5 ++--- cvpcb/cvpcb_id.h | 1 - cvpcb/tool_cvpcb.cpp | 8 -------- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/cvpcb/common_help_msg.h b/cvpcb/common_help_msg.h index 89d546e381..f9e3bc0466 100644 --- a/cvpcb/common_help_msg.h +++ b/cvpcb/common_help_msg.h @@ -1,7 +1,7 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2012 Jean-Pierre Charras, jp.charras at wanadoo.fr + * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2014-2015 KiCad Developers, see CHANGELOG.TXT for contributors. * * This program is free software; you can redistribute it and/or @@ -25,7 +25,6 @@ #ifndef HELP_MESSAGE_FILE_H #define HELP_MESSAGE_FILE_H -#define LOAD_FILE_HELP _( "Open netlist file" ) -#define SAVE_HLP_MSG _( "Save footprint association changes to netlist" ) +#define SAVE_HLP_MSG _( "Save footprint association in schematic component footprint fields" ) #endif // HELP_MESSAGE_FILE_H diff --git a/cvpcb/cvpcb_id.h b/cvpcb/cvpcb_id.h index 6c7cc6a159..57a2fee849 100644 --- a/cvpcb/cvpcb_id.h +++ b/cvpcb/cvpcb_id.h @@ -40,7 +40,6 @@ enum id_cvpcb_frm { ID_CVPCB_QUIT = ID_END_LIST, - ID_CVPCB_READ_INPUT_NETLIST, ID_CVPCB_SAVEQUITCVPCB, ID_CVPCB_CREATE_SCREENCMP, ID_CVPCB_GOTO_FIRSTNA, diff --git a/cvpcb/tool_cvpcb.cpp b/cvpcb/tool_cvpcb.cpp index e1a8f34ad9..b53f9c9bd2 100644 --- a/cvpcb/tool_cvpcb.cpp +++ b/cvpcb/tool_cvpcb.cpp @@ -49,14 +49,6 @@ void CVPCB_MAINFRAME::ReCreateHToolbar() m_mainToolBar = new wxAuiToolBar( this, ID_H_TOOLBAR, wxDefaultPosition, wxDefaultSize, wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_HORZ_LAYOUT ); - // Open files can be used only outside a project, because opening a netlist - // which is not the project netlist is a non sense. - if( Kiface().IsSingle() ) - { - m_mainToolBar->AddTool( ID_CVPCB_READ_INPUT_NETLIST, wxEmptyString, - KiBitmap( open_document_xpm ), LOAD_FILE_HELP ); - } - m_mainToolBar->AddTool( wxID_SAVE, wxEmptyString, KiBitmap( save_xpm ), SAVE_HLP_MSG ); m_mainToolBar->AddSeparator();