Skip to content

K
kicad-source-mirror
Commit 5cf5bbce authored by charras's avatar charras
Browse files
Options

Dialog track options redesigned with wxFormBuilder Alt via drill renamed... 

Dialog track options redesigned with wxFormBuilder Alt via drill renamed Specific via drill. Added tips in dialog.
parent 69756df3
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1665 additions and 2607 deletions
CHANGELOG.txt
View file @ 5cf5bbce
......@@ -5,6 +5,14 @@ Started 2007-June-11
Please add newer entries at the top, list the date and your name with
email address.
2009-Feb-17 Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
================================================================================
++pcbnew:
Dialog track options redesigned with wxFormBuilder
Alt via drill renamed Specific via drill in dialog and popup menu.
Added tips in dialog.
2009-Feb-09 UPDATE Dick Hollenbeck <dick@softplc.com>
================================================================================
++eeschema
......
common/makefile.gtk
View file @ 5cf5bbce
......@@ -4,11 +4,6 @@ CC = gcc
include ../libs.linux
# Compiler flags.
CPPFLAGS += -I./ -I../include
EDACPPFLAGS = $(CPPFLAGS)
all: common.a
deps:
......@@ -17,7 +12,8 @@ deps:
include makefile.include
-include *.d
CPPFLAGS += $(EXTRACPPFLAGS) -fno-strict-aliasing
# specfic Compiler flags and options
CPPFLAGS += $(EXTRACPPFLAGS) -I./ -I../include -I$(BOOST)
EDACPPFLAGS = $(CPPFLAGS)
......
cvpcb/makefile.gtk
View file @ 5cf5bbce
......@@ -5,17 +5,8 @@ FINAL = 1
include ../libs.linux
# Compiler flags.
CPPFLAGS +=
EDACPPFLAGS = $(CPPFLAGS)
TARGET = cvpcb
all: $(TARGET)
deps:
$(CXX) $(CPPFLAGS) -E -MMD -MG *.cpp >/dev/null
include makefile.include
-include *.d
......@@ -23,6 +14,10 @@ include makefile.include
CPPFLAGS += $(EXTRACPPFLAGS)
EDACPPFLAGS = $(CPPFLAGS)
all: $(TARGET)
deps:
$(CXX) $(CPPFLAGS) -E -MMD -MG *.cpp >/dev/null
$(TARGET): $(OBJECTS) makefile.gtk makefile.include $(EXTRALIBS) ../libs.linux $(LIBVIEWER3D)
$(LD) $(OBJECTS) $(LDFLAGS) $(LIBVIEWER3D) $(LIBS_WITH_GL) -o $(TARGET)
......
internat/fr/kicad.mo
View file @ 5cf5bbce
No preview for this file type
internat/fr/kicad.po
View file @ 5cf5bbce
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: kicad\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-02-15 19:36+0100\n"
"PO-Revision-Date: 2009-02-15 19:39+0100\n"
"POT-Creation-Date: 2009-02-17 09:24+0100\n"
"PO-Revision-Date: 2009-02-17 09:34+0100\n"
"Last-Translator: \n"
"Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
"MIME-Version: 1.0\n"
......@@ -2014,67 +2014,6 @@ msgstr "Le fichier Session a une 'reference' a un composant non existant \"%s\""
msgid "A wire_via references a missing padstack \"%s\""
msgstr "Une piste ou via a une référence vers un pad \"%s\" manquant"
#: pcbnew/dialog_track_options.cpp:151
msgid "Vias:"
msgstr "Vias:"
#: pcbnew/dialog_track_options.cpp:160
msgid "Via size"
msgstr "Diamètre via"
#: pcbnew/dialog_track_options.cpp:176
msgid "Default Via Drill"
msgstr "Perçage vias par défaut"
#: pcbnew/dialog_track_options.cpp:192
msgid "Alternate Via Drill"
msgstr "Perçage vias alternatif"
#: pcbnew/dialog_track_options.cpp:208
msgid "Through Via"
msgstr "Via Traversante"
#: pcbnew/dialog_track_options.cpp:209
msgid "Blind or Buried Via "
msgstr "Via enterrée ou Aveugle"
#: pcbnew/dialog_track_options.cpp:212
msgid "Default Via Type"
msgstr "Via par Défaut"
#: pcbnew/dialog_track_options.cpp:223
msgid "Micro Vias:"
msgstr "Micro Vias:"
#: pcbnew/dialog_track_options.cpp:232
msgid "Micro Via Size"
msgstr "Diamètre Micro Via"
#: pcbnew/dialog_track_options.cpp:245
msgid "Micro Via Drill"
msgstr "Perçage Micro Via"
#: pcbnew/dialog_track_options.cpp:260
msgid "Allows Micro Vias"
msgstr "Autorise Micro Vias"
#: pcbnew/dialog_track_options.cpp:265
#: pcbnew/dialog_track_options.cpp:268
msgid ""
"Allows use of micro vias\n"
"They are very small vias only from an external copper layer to its near neightbour\n"
msgstr ""
"Autorise l'utilisation de micro vias\n"
"Ce sont de petites vias allant d'une couche externe a la plus proche couche interne uniquement\n"
#: pcbnew/dialog_track_options.cpp:276
msgid "Track Width"
msgstr "Epais. Piste"
#: pcbnew/dialog_track_options.cpp:304
msgid "Mask clearance"
msgstr "Retrait Masque"
#: pcbnew/class_pad.cpp:381
msgid "Unknown Pad shape"
msgstr "Forme Pad inconnue"
......@@ -2519,6 +2458,110 @@ msgstr "Le composant avec valeur \"%s\" a une référence vide."
msgid "Multiple components have identical reference IDs of \"%s\"."
msgstr "Multiple composants ont une reference identique \"%s\"."
#: pcbnew/dialog_track_options_base.cpp:20
msgid "Vias:"
msgstr "Vias:"
#: pcbnew/dialog_track_options_base.cpp:22
msgid "Via size"
msgstr "Diamètre via"
#: pcbnew/dialog_track_options_base.cpp:27
msgid "Enter the current via diameter."
msgstr "Entrer la valeur courante du diamètre de via"
#: pcbnew/dialog_track_options_base.cpp:31
msgid "Default Via Drill"
msgstr "Perçage vias par défaut"
#: pcbnew/dialog_track_options_base.cpp:36
msgid ""
"Enter the default via drill diameter\n"
"All vias drills not set to a specific drill value will have this drill value."
msgstr ""
"Entrer le preçage des vias par défault\n"
"Tous les perçages de vias non ajusté à une valeur spécifique auront cette valeur de perçage."
#: pcbnew/dialog_track_options_base.cpp:40
msgid "Specific Via Drill"
msgstr "Perçage Spécifique"
#: pcbnew/dialog_track_options_base.cpp:45
msgid ""
"Use a specific drill value for all vias that must have a given drill value,\n"
"and set the via hole to this specific drill value using the pop up menu."
msgstr ""
"Utiliser une valeur de perçage spécifique pour toutes les vias qui doivent avoir un perçage donné,\n"
"et mettre le trou de la via à cette valeur spécifique en utilisant le menu popup."
#: pcbnew/dialog_track_options_base.cpp:49
msgid "Through Via"
msgstr "Via Traversante"
#: pcbnew/dialog_track_options_base.cpp:49
msgid "Blind or Buried Via"
msgstr "Via enterrée ou Aveugle"
#: pcbnew/dialog_track_options_base.cpp:51
msgid "Default Via Type"
msgstr "Via par Défaut"
#: pcbnew/dialog_track_options_base.cpp:53
msgid ""
"Select the current via type.\n"
"Trough via is the usual selection"
msgstr ""
"Selection du type de via courant.\n"
"Via traversante est la sélection usuelle."
#: pcbnew/dialog_track_options_base.cpp:60
msgid "Micro Vias:"
msgstr "Micro Vias:"
#: pcbnew/dialog_track_options_base.cpp:62
msgid "Micro Via Size"
msgstr "Diamètre Micro Via"
#: pcbnew/dialog_track_options_base.cpp:69
msgid "Micro Via Drill"
msgstr "Perçage Micro Via"
#: pcbnew/dialog_track_options_base.cpp:79
msgid "Allows Micro Vias"
msgstr "Autorise Micro Vias"
#: pcbnew/dialog_track_options_base.cpp:81
msgid ""
"Allows use of micro vias\n"
"They are very small vias only from an external copper layer to its near neightbour\n"
msgstr ""
"Autorise l'utilisation de micro vias\n"
"Ce sont de petites vias allant d'une couche externe a la plus proche couche interne uniquement\n"
#: pcbnew/dialog_track_options_base.cpp:88
msgid "Dimensions:"
msgstr "Dimensions:"
#: pcbnew/dialog_track_options_base.cpp:90
msgid "Track Width"
msgstr "Epais. Piste"
#: pcbnew/dialog_track_options_base.cpp:95
msgid "Enter the current track width"
msgstr "Entrer la largeur de piste courante"
#: pcbnew/dialog_track_options_base.cpp:104
msgid "This is the clearance between tracks, vias and pads for DRC."
msgstr "Ceci est l'isolation entre pistes, vias et pads pour le calcul DRC."
#: pcbnew/dialog_track_options_base.cpp:111
msgid "Mask clearance"
msgstr "Retrait Masque"
#: pcbnew/dialog_track_options_base.cpp:116
msgid "This is the clearance between pads and the mask"
msgstr "Ceci est l'espace entre pads et le masque"
#: pcbnew/pcbcfg.cpp:72
msgid "Read config file"
msgstr "Lire config"
......@@ -2789,24 +2832,24 @@ msgid "Set via hole to a specific value. This specific value is currently"
msgstr "Ajuster diamètre perçage via a une valeur sécifique. Cette valeur spécifique est actuellement"
#: pcbnew/onrightclick.cpp:493
msgid "Set Via Hole to Alt Value"
msgstr "Ajuste Perçage Via à Valeur Alternative"
msgid "Set Via Hole to Specific Value"
msgstr "Ajuste Perçage Via à Valeur Spécifique"
#: pcbnew/onrightclick.cpp:495
msgid "Set a specific via hole value. This value is currently"
msgstr "Ajuste une valeur spécifique de perçage de la via. Cette valeur est actuellement"
#: pcbnew/onrightclick.cpp:498
msgid "Set the Via Hole Alt Value"
msgstr "Ajuste la Valeur Alt. Perçage Via"
msgid "Change the Current Specific Drill Value"
msgstr "Changer la Valeur du Perçage Spécifique Courant"
#: pcbnew/onrightclick.cpp:500
msgid "Export Via Hole to Alt Value"
msgstr "Exporte Perçage Via à Valeur Alt."
msgid "Export this Via Hole to Alt Value"
msgstr "Exporte ce Perçage Via comme Valeur Alt."
#: pcbnew/onrightclick.cpp:502
msgid "Export Via Hole to Others id Vias"
msgstr "Exporte Perçage Via aux Autres Semblables."
msgid "Export this Via Hole to Others id Vias"
msgstr "Exporte ce Perçage Via aux Autres Semblables."
#: pcbnew/onrightclick.cpp:504
msgid "Set ALL Via Holes to Default"
......@@ -4181,7 +4224,6 @@ msgid "Export this zone setup to all others copper zones"
msgstr "Exporter ces options vers les autres zones de cuivre"
#: pcbnew/dialog_copper_zones_base.cpp:156
#: pcbnew/dialog_pad_properties_base.cpp:91
msgid "Ok"
msgstr "Ok"
......@@ -4294,7 +4336,6 @@ msgid "Copper"
msgstr "Cuivre"
#: pcbnew/dialog_edit_module.cpp:271
#: pcbnew/dialog_pad_properties_base.cpp:64
msgid "User"
msgstr "User"
......@@ -4400,7 +4441,6 @@ msgid "Delete [%s]"
msgstr "Supprimer [%s]"
#: pcbnew/dialog_SVG_print_base.cpp:23
#: pcbnew/dialog_pad_properties_base.cpp:106
msgid "Layers:"
msgstr "Couches:"
......@@ -5721,10 +5761,12 @@ msgid "Schematic"
msgstr "Schématique"
#: eeschema/hotkeys.cpp:253
#: eeschema/schedit.cpp:244
msgid "Add Component"
msgstr "Ajout Composant"
#: eeschema/hotkeys.cpp:275
#: eeschema/schedit.cpp:192
msgid "Add Wire"
msgstr "Ajouter Fils"
......@@ -6845,22 +6887,18 @@ msgid "No Draw"
msgstr "Invisible"
#: eeschema/pinedit-dialog.cpp:213
#: eeschema/affiche.cpp:112
msgid "Right"
msgstr "Droite"
#: eeschema/pinedit-dialog.cpp:214
#: eeschema/affiche.cpp:109
msgid "Left"
msgstr "Gauche"
#: eeschema/pinedit-dialog.cpp:215
#: eeschema/affiche.cpp:103
msgid "Up"
msgstr "Haut"
#: eeschema/pinedit-dialog.cpp:216
#: eeschema/affiche.cpp:106
msgid "Down"
msgstr "Bas"
......@@ -7130,10 +7168,12 @@ msgid "All"
msgstr "Tout"
#: eeschema/affiche.cpp:180
#: eeschema/onrightclick.cpp:330
msgid "Unit"
msgstr "Unité"
#: eeschema/affiche.cpp:190
#: eeschema/onrightclick.cpp:317
msgid "Convert"
msgstr "Convert"
......@@ -10582,10 +10622,6 @@ msgstr "Orientation des Modules"
msgid "Dialog"
msgstr "Dialog"
#: pcbnew/dialog_track_options.h:53
msgid "Tracks and Vias Sizes"
msgstr "Dims Pistes et Vias"
#: pcbnew/pcbnew.h:285
msgid "??? Via"
msgstr "??? Via"
......@@ -10594,6 +10630,10 @@ msgstr "??? Via"
msgid "Blind/Buried Via"
msgstr "Via Aveugle/Enterrée"
#: pcbnew/dialog_track_options_base.h:68
msgid "Tracks and Vias Sizes"
msgstr "Dims Pistes et Vias"
#: pcbnew/dialog_SVG_print_base.h:68
msgid "Create SVG file"
msgstr "Créer Fichier SVG"
......@@ -10992,6 +11032,10 @@ msgstr "DCodes id."
msgid "Page Settings"
msgstr "Ajustage opt Page"
#~ msgid "Alternate Via Drill"
#~ msgstr "Perçage vias alternatif"
#~ msgid "Set the Via Hole Alt Value"
#~ msgstr "Ajuste la Valeur Alt. Perçage Via"
#~ msgid "Zoom %d"
#~ msgstr "Zoom %d"
libs.linux
View file @ 5cf5bbce
......@@ -99,6 +99,9 @@ endif
# mesa (free opengl library) libs
MESALIBSPATH = /usr/local/lib
# Boost headers (location of boost/)
BOOST = ../
#for static link: add wx gl lib
LIBVERSION=`wx-config --release`
WXPATH = `wx-config --prefix`/lib
......
pcbnew/CMakeLists.txt
View file @ 5cf5bbce
......@@ -54,7 +54,8 @@ set(PCBNEW_SRCS
dialog_print_using_printer.cpp
dialog_setup_libs.cpp
dialog_orient_footprints.cpp
# dialog_track_options.cpp
dialog_track_options.cpp
dialog_track_options_base.cpp
dialog_SVG_print.cpp
dialog_SVG_print_base.cpp
dist.cpp
......
pcbnew/dialog_general_options.cpp
View file @ 5cf5bbce
......@@ -17,6 +17,7 @@
#include "dialog_general_options_BoardEditor_base.h"
#include "dialog_display_options_base.h"
#include "dialog_general_options.h"
#include "dialog_track_options.h"
/***********************************************************************************/
Dialog_GeneralOptions::Dialog_GeneralOptions( WinEDA_PcbFrame* parent, wxDC* DC ) :
......@@ -228,7 +229,6 @@ void Dialog_Display_Options::OnOkClick(wxCommandEvent& event)
}
#include "dialog_track_options.cpp"
#include "dialog_graphic_items_options.cpp"
/*****************************************************************/
......@@ -240,8 +240,8 @@ void WinEDA_PcbFrame::InstallPcbOptionsFrame( const wxPoint& pos,
{
case ID_PCB_TRACK_SIZE_SETUP:
{
WinEDA_PcbTracksDialog* OptionsFrame =
new WinEDA_PcbTracksDialog( this );
DIALOG_TRACKS_OPTIONS* OptionsFrame =
new DIALOG_TRACKS_OPTIONS( this );
OptionsFrame->ShowModal();
OptionsFrame->Destroy();
......
pcbnew/dialog_track_options.cpp
View file @ 5cf5bbce
This diff is collapsed.
pcbnew/dialog_track_options.h
View file @ 5cf5bbce
/////////////////////////////////////////////////////////////////////////////
// Name: dialog_track_options.h
// Purpose:
// Author: jean-pierre Charras
// Modified by:
// Created: 24/02/2006 20:58:54
// RCS-ID:
// Copyright: License GNU
// Licence:
// Created: 17 feb 2009
// Licence: GPL
/////////////////////////////////////////////////////////////////////////////
// Generated by DialogBlocks (unregistered), 24/02/2006 20:58:54
#ifndef _DIALOG_TRACK_OPTIONS_H_
#define _DIALOG_TRACK_OPTIONS_H_
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "dialog_track_options.h"
#endif
/*!
* Includes
*/
////@begin includes
#include "wx/valgen.h"
////@end includes
#include "dialog_track_options_base.h"
/*!
* Forward declarations
/**
* DIALOG_TRACKS_OPTIONS, derived from DIALOG_TRACKS_OPTIONS_BASE
* @see dialog_track_options_base.h and dialog_track_options_base.cpp,
* automatically created by wxFormBuilder
*/
////@begin forward declarations
////@end forward declarations
/*!
* Control identifiers
*/
////@begin control identifiers
#define ID_DIALOG 10000
#define ID_TEXTCTRL 10001
#define ID_TEXTCTRL1 10002
#define ID_TEXTCTRL2 10003
#define ID_VIA_TYPE_SELECTION 10004
#define ID_TEXTCTRL7 10008
#define ID_TEXTCTRL6 10010
#define ID_CHECKBOX_ALLOWS_MICROVIA 10009
#define ID_TEXTCTRL3 10005
#define ID_TEXTCTRL4 10006
#define ID_TEXTCTRL5 10007
#define SYMBOL_WINEDA_PCBTRACKSDIALOG_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER
#define SYMBOL_WINEDA_PCBTRACKSDIALOG_TITLE _("Tracks and Vias Sizes")
#define SYMBOL_WINEDA_PCBTRACKSDIALOG_IDNAME ID_DIALOG
#define SYMBOL_WINEDA_PCBTRACKSDIALOG_SIZE wxSize(400, 300)
#define SYMBOL_WINEDA_PCBTRACKSDIALOG_POSITION wxDefaultPosition
////@end control identifiers
/*!
* Compatibility
*/
#ifndef wxCLOSE_BOX
#define wxCLOSE_BOX 0x1000
#endif
/*!
* WinEDA_PcbTracksDialog class declaration
*/
class WinEDA_PcbTracksDialog: public wxDialog
class DIALOG_TRACKS_OPTIONS : public DIALOG_TRACKS_OPTIONS_BASE
{
DECLARE_DYNAMIC_CLASS( WinEDA_PcbTracksDialog )
DECLARE_EVENT_TABLE()
public:
/// Constructors
WinEDA_PcbTracksDialog( );
WinEDA_PcbTracksDialog( WinEDA_PcbFrame* parent, wxWindowID id = SYMBOL_WINEDA_PCBTRACKSDIALOG_IDNAME, const wxString& caption = SYMBOL_WINEDA_PCBTRACKSDIALOG_TITLE, const wxPoint& pos = SYMBOL_WINEDA_PCBTRACKSDIALOG_POSITION, const wxSize& size = SYMBOL_WINEDA_PCBTRACKSDIALOG_SIZE, long style = SYMBOL_WINEDA_PCBTRACKSDIALOG_STYLE );
WinEDA_PcbFrame* m_Parent;
/// Creation
bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WINEDA_PCBTRACKSDIALOG_IDNAME, const wxString& caption = SYMBOL_WINEDA_PCBTRACKSDIALOG_TITLE, const wxPoint& pos = SYMBOL_WINEDA_PCBTRACKSDIALOG_POSITION, const wxSize& size = SYMBOL_WINEDA_PCBTRACKSDIALOG_SIZE, long style = SYMBOL_WINEDA_PCBTRACKSDIALOG_STYLE );
/// Creates the controls and sizers
void CreateControls();
////@begin WinEDA_PcbTracksDialog event handler declarations
/// wxEVT_INIT_DIALOG event handler for ID_DIALOG
void OnInitDialog( wxInitDialogEvent& event );
/// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_CHECKBOX_ALLOWS_MICROVIA
void OnCheckboxAllowsMicroviaClick( wxCommandEvent& event );
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
void OnOkClick( wxCommandEvent& event );
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL
void OnCancelClick( wxCommandEvent& event );
////@end WinEDA_PcbTracksDialog event handler declarations
////@begin WinEDA_PcbTracksDialog member function declarations
/// Retrieves bitmap resources
wxBitmap GetBitmapResource( const wxString& name );
/// Retrieves icon resources
wxIcon GetIconResource( const wxString& name );
////@end WinEDA_PcbTracksDialog member function declarations
/// Should we show tooltips?
static bool ShowToolTips();
void AcceptPcbOptions(wxCommandEvent& event);
public:
DIALOG_TRACKS_OPTIONS( WinEDA_PcbFrame* parent );
~DIALOG_TRACKS_OPTIONS() {};
private:
void SetDisplayValue();
////@begin WinEDA_PcbTracksDialog member variables
wxStaticText* m_ViaSizeTitle;
wxTextCtrl* m_OptViaSize;
wxStaticText* m_ViaDefaultDrillValueTitle;
wxTextCtrl* m_OptViaDrill;
wxStaticText* m_ViaAltDrillValueTitle;
wxTextCtrl* m_OptCustomViaDrill;
wxRadioBox* m_OptViaType;
wxStaticText* m_MicroViaSizeTitle;
wxTextCtrl* m_MicroViaSizeCtrl;
wxStaticText* m_MicroViaDrillTitle;
wxTextCtrl* m_MicroViaDrillCtrl;
wxCheckBox* m_AllowMicroViaCtrl;
wxStaticText* m_TrackWidthTitle;
wxTextCtrl* m_OptTrackWidth;
wxStaticText* m_TrackClearanceTitle;
wxTextCtrl* m_OptTrackClearance;
wxStaticText* m_MaskClearanceTitle;
wxTextCtrl* m_OptMaskMargin;
////@end WinEDA_PcbTracksDialog member variables
WinEDA_PcbFrame * m_Parent;
virtual void OnInitDialog( wxInitDialogEvent& event );
virtual void OnCheckboxAllowsMicroviaClick( wxCommandEvent& event );
virtual void OnButtonOkClick( wxCommandEvent& event );
virtual void OnButtonCancelClick( wxCommandEvent& event );
};
#endif
// _DIALOG_TRACK_OPTIONS_H_
#endif // _DIALOG_TRACK_OPTIONS_H_
pcbnew/dialog_track_options.pjd deleted 100644 → 0
View file @ 69756df3
This source diff could not be displayed because it is too large. You can view the blob instead.
pcbnew/dialog_track_options_base.cpp 0 → 100644
View file @ 5cf5bbce
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Apr 16 2008)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#include "dialog_track_options_base.h"
///////////////////////////////////////////////////////////////////////////
BEGIN_EVENT_TABLE( DIALOG_TRACKS_OPTIONS_BASE, wxDialog )
EVT_INIT_DIALOG( DIALOG_TRACKS_OPTIONS_BASE::_wxFB_OnInitDialog )
EVT_CHECKBOX( wxID_ANY, DIALOG_TRACKS_OPTIONS_BASE::_wxFB_OnCheckboxAllowsMicroviaClick )
EVT_BUTTON( wxID_OK, DIALOG_TRACKS_OPTIONS_BASE::_wxFB_OnButtonOkClick )
EVT_BUTTON( wxID_CANCEL, DIALOG_TRACKS_OPTIONS_BASE::_wxFB_OnButtonCancelClick )
END_EVENT_TABLE()
DIALOG_TRACKS_OPTIONS_BASE::DIALOG_TRACKS_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
wxBoxSizer* bMainSizer;
bMainSizer = new wxBoxSizer( wxHORIZONTAL );
wxStaticBoxSizer* sbLeftSizer;
sbLeftSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Vias:") ), wxVERTICAL );
m_ViaSizeTitle = new wxStaticText( this, wxID_ANY, _("Via size"), wxDefaultPosition, wxDefaultSize, 0 );
m_ViaSizeTitle->Wrap( -1 );
sbLeftSizer->Add( m_ViaSizeTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_OptViaSize = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_OptViaSize->SetToolTip( _("Enter the current via diameter.") );
sbLeftSizer->Add( m_OptViaSize, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_ViaDefaultDrillValueTitle = new wxStaticText( this, wxID_ANY, _("Default Via Drill"), wxDefaultPosition, wxDefaultSize, 0 );
m_ViaDefaultDrillValueTitle->Wrap( -1 );
sbLeftSizer->Add( m_ViaDefaultDrillValueTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_OptViaDrill = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_OptViaDrill->SetToolTip( _("Enter the default via drill diameter\nAll vias drills not set to a specific drill value will have this drill value.") );
sbLeftSizer->Add( m_OptViaDrill, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_ViaAltDrillValueTitle = new wxStaticText( this, wxID_ANY, _("Specific Via Drill"), wxDefaultPosition, wxDefaultSize, 0 );
m_ViaAltDrillValueTitle->Wrap( -1 );
sbLeftSizer->Add( m_ViaAltDrillValueTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_OptCustomViaDrill = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_OptCustomViaDrill->SetToolTip( _("Use a specific drill value for all vias that must have a given drill value,\nand set the via hole to this specific drill value using the pop up menu.") );
sbLeftSizer->Add( m_OptCustomViaDrill, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
wxString m_OptViaTypeChoices[] = { _("Through Via"), _("Blind or Buried Via") };
int m_OptViaTypeNChoices = sizeof( m_OptViaTypeChoices ) / sizeof( wxString );
m_OptViaType = new wxRadioBox( this, wxID_ANY, _("Default Via Type"), wxDefaultPosition, wxDefaultSize, m_OptViaTypeNChoices, m_OptViaTypeChoices, 1, wxRA_SPECIFY_COLS );
m_OptViaType->SetSelection( 0 );
m_OptViaType->SetToolTip( _("Select the current via type.\nTrough via is the usual selection") );
sbLeftSizer->Add( m_OptViaType, 0, wxALL, 5 );
bMainSizer->Add( sbLeftSizer, 1, wxEXPAND, 5 );
wxStaticBoxSizer* sbMiddleLeftSizer;
sbMiddleLeftSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Micro Vias:") ), wxVERTICAL );
m_MicroViaSizeTitle = new wxStaticText( this, wxID_ANY, _("Micro Via Size"), wxDefaultPosition, wxDefaultSize, 0 );
m_MicroViaSizeTitle->Wrap( -1 );
sbMiddleLeftSizer->Add( m_MicroViaSizeTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_MicroViaSizeCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
sbMiddleLeftSizer->Add( m_MicroViaSizeCtrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_MicroViaDrillTitle = new wxStaticText( this, wxID_ANY, _("Micro Via Drill"), wxDefaultPosition, wxDefaultSize, 0 );
m_MicroViaDrillTitle->Wrap( -1 );
sbMiddleLeftSizer->Add( m_MicroViaDrillTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_MicroViaDrillCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
sbMiddleLeftSizer->Add( m_MicroViaDrillCtrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
sbMiddleLeftSizer->Add( 10, 10, 0, 0, 5 );
m_AllowMicroViaCtrl = new wxCheckBox( this, wxID_ANY, _("Allows Micro Vias"), wxDefaultPosition, wxDefaultSize, 0 );
m_AllowMicroViaCtrl->SetToolTip( _("Allows use of micro vias\nThey are very small vias only from an external copper layer to its near neightbour\n") );
sbMiddleLeftSizer->Add( m_AllowMicroViaCtrl, 0, wxALL, 5 );
bMainSizer->Add( sbMiddleLeftSizer, 1, wxEXPAND, 5 );
wxStaticBoxSizer* sbMiddleRightSizer;
sbMiddleRightSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Dimensions:") ), wxVERTICAL );
m_TrackWidthTitle = new wxStaticText( this, wxID_ANY, _("Track Width"), wxDefaultPosition, wxDefaultSize, 0 );
m_TrackWidthTitle->Wrap( -1 );
sbMiddleRightSizer->Add( m_TrackWidthTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_OptTrackWidth = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_OptTrackWidth->SetToolTip( _("Enter the current track width") );
sbMiddleRightSizer->Add( m_OptTrackWidth, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_TrackClearanceTitle = new wxStaticText( this, wxID_ANY, _("Clearance"), wxDefaultPosition, wxDefaultSize, 0 );
m_TrackClearanceTitle->Wrap( -1 );
sbMiddleRightSizer->Add( m_TrackClearanceTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_OptTrackClearance = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_OptTrackClearance->SetToolTip( _("This is the clearance between tracks, vias and pads for DRC.") );
sbMiddleRightSizer->Add( m_OptTrackClearance, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
sbMiddleRightSizer->Add( 10, 10, 0, 0, 5 );
m_MaskClearanceTitle = new wxStaticText( this, wxID_ANY, _("Mask clearance"), wxDefaultPosition, wxDefaultSize, 0 );
m_MaskClearanceTitle->Wrap( -1 );
sbMiddleRightSizer->Add( m_MaskClearanceTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_OptMaskMargin = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_OptMaskMargin->SetToolTip( _("This is the clearance between pads and the mask") );
sbMiddleRightSizer->Add( m_OptMaskMargin, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
bMainSizer->Add( sbMiddleRightSizer, 1, wxEXPAND, 5 );
wxBoxSizer* bRightSizer;
bRightSizer = new wxBoxSizer( wxVERTICAL );
m_buttonOK = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonOK->SetDefault();
m_buttonOK->SetForegroundColour( wxColour( 194, 0, 0 ) );
bRightSizer->Add( m_buttonOK, 0, wxALL, 5 );
m_buttonCANCEL = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonCANCEL->SetForegroundColour( wxColour( 2, 2, 196 ) );
bRightSizer->Add( m_buttonCANCEL, 0, wxALL, 5 );
bMainSizer->Add( bRightSizer, 0, wxALIGN_CENTER_VERTICAL, 5 );
this->SetSizer( bMainSizer );
this->Layout();
bMainSizer->Fit( this );
}
DIALOG_TRACKS_OPTIONS_BASE::~DIALOG_TRACKS_OPTIONS_BASE()
{
}
pcbnew/dialog_track_options_base.fbp 0 → 100644
View file @ 5cf5bbce
This diff is collapsed.
pcbnew/dialog_track_options_base.h 0 → 100644
View file @ 5cf5bbce
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Apr 16 2008)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#ifndef __dialog_track_options_base__
#define __dialog_track_options_base__
#include <wx/intl.h>
#include <wx/string.h>
#include <wx/stattext.h>
#include <wx/gdicmn.h>
#include <wx/font.h>
#include <wx/colour.h>
#include <wx/settings.h>
#include <wx/textctrl.h>
#include <wx/radiobox.h>
#include <wx/sizer.h>
#include <wx/statbox.h>
#include <wx/checkbox.h>
#include <wx/button.h>
#include <wx/dialog.h>
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_TRACKS_OPTIONS_BASE
///////////////////////////////////////////////////////////////////////////////
class DIALOG_TRACKS_OPTIONS_BASE : public wxDialog
{
DECLARE_EVENT_TABLE()
private:
// Private event handlers
void _wxFB_OnInitDialog( wxInitDialogEvent& event ){ OnInitDialog( event ); }
void _wxFB_OnCheckboxAllowsMicroviaClick( wxCommandEvent& event ){ OnCheckboxAllowsMicroviaClick( event ); }
void _wxFB_OnButtonOkClick( wxCommandEvent& event ){ OnButtonOkClick( event ); }
void _wxFB_OnButtonCancelClick( wxCommandEvent& event ){ OnButtonCancelClick( event ); }
protected:
wxStaticText* m_ViaSizeTitle;
wxTextCtrl* m_OptViaSize;
wxStaticText* m_ViaDefaultDrillValueTitle;
wxTextCtrl* m_OptViaDrill;
wxStaticText* m_ViaAltDrillValueTitle;
wxTextCtrl* m_OptCustomViaDrill;
wxRadioBox* m_OptViaType;
wxStaticText* m_MicroViaSizeTitle;
wxTextCtrl* m_MicroViaSizeCtrl;
wxStaticText* m_MicroViaDrillTitle;
wxTextCtrl* m_MicroViaDrillCtrl;
wxCheckBox* m_AllowMicroViaCtrl;
wxStaticText* m_TrackWidthTitle;
wxTextCtrl* m_OptTrackWidth;
wxStaticText* m_TrackClearanceTitle;
wxTextCtrl* m_OptTrackClearance;
wxStaticText* m_MaskClearanceTitle;
wxTextCtrl* m_OptMaskMargin;
wxButton* m_buttonOK;
wxButton* m_buttonCANCEL;
// Virtual event handlers, overide them in your derived class
virtual void OnInitDialog( wxInitDialogEvent& event ){ event.Skip(); }
virtual void OnCheckboxAllowsMicroviaClick( wxCommandEvent& event ){ event.Skip(); }
virtual void OnButtonOkClick( wxCommandEvent& event ){ event.Skip(); }
virtual void OnButtonCancelClick( wxCommandEvent& event ){ event.Skip(); }
public:
DIALOG_TRACKS_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Tracks and Vias Sizes"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_TRACKS_OPTIONS_BASE();
};
#endif //__dialog_track_options_base__
pcbnew/makefile.gtk
View file @ 5cf5bbce
......@@ -3,11 +3,6 @@
include ../libs.linux
BOOST_LIB = ../
# Additional compiler flags
CPPFLAGS += -I $(BOOST_LIB)
TARGET = pcbnew
all: $(TARGET)
......@@ -18,7 +13,8 @@ deps:
include makefile.include
-include *.d
CPPFLAGS += $(EXTRACPPFLAGS)
# Additional compiler flags
CPPFLAGS += $(EXTRACPPFLAGS) -I$(BOOST_LIB)
EDACPPFLAGS = $(CPPFLAGS) $(BOOST_LIB)
......
pcbnew/makefile.include
View file @ 5cf5bbce
......@@ -76,6 +76,8 @@ OBJECTS= $(TARGET).o\
dialog_general_options_BoardEditor_base.o\
dialog_display_options_base.o\
dialog_orient_footprints.o\
dialog_track_options.o\
dialog_track_options_base.o\
muwave_command.o \
initpcb.o\
editrack.o \
......@@ -132,7 +134,7 @@ setpage.o: ../share/setpage.cpp
menubarpcb.o: menubarpcb.cpp
dialog_general_options.o: dialog_general_options.cpp dialog_track_options.cpp\
dialog_general_options.o: dialog_general_options.cpp\
dialog_graphic_items_options.cpp dialog_general_options_BoardEditor_base.h dialog_general_options.h
dialog_generaloptions_BoardEditor_base.o: dialog_general_options_BoardEditor_base.cpp dialog_generaloptions_BoardEditor_base.h
......
pcbnew/onrightclick.cpp
View file @ 5cf5bbce
......@@ -490,19 +490,19 @@ void WinEDA_PcbFrame::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu )
msg = _( "Set via hole to a specific value. This specific value is currently" );
msg << wxT(" ") << ReturnStringFromValue( g_UnitMetric, g_DesignSettings.m_ViaDrillCustomValue, m_InternalUnits );
ADD_MENUITEM_WITH_HELP( via_mnu, ID_POPUP_PCB_VIA_HOLE_TO_VALUE,
_( "Set Via Hole to Alt Value" ), msg,
_( "Set Via Hole to Specific Value" ), msg,
options_new_pad_xpm );
msg = _( "Set a specific via hole value. This value is currently" );
msg << wxT(" ") << ReturnStringFromValue( g_UnitMetric, g_DesignSettings.m_ViaDrillCustomValue, m_InternalUnits );
ADD_MENUITEM_WITH_HELP( via_mnu, ID_POPUP_PCB_VIA_HOLE_ENTER_VALUE,
_( "Set the Via Hole Alt Value" ), msg, edit_xpm );
_( "Change the Current Specific Drill Value" ), msg, edit_xpm );
ADD_MENUITEM( via_mnu, ID_POPUP_PCB_VIA_HOLE_EXPORT, _(
"Export Via Hole to Alt Value" ), export_options_pad_xpm );
"Use this Via Hole as Specific Value" ), export_options_pad_xpm );
ADD_MENUITEM( via_mnu, ID_POPUP_PCB_VIA_HOLE_EXPORT_TO_OTHERS,
_( "Export Via Hole to Others id Vias" ), global_options_pad_xpm );
_( "Export this Via Hole to Others id Vias" ), global_options_pad_xpm );
ADD_MENUITEM( via_mnu, ID_POPUP_PCB_VIA_HOLE_RESET_TO_DEFAULT,
_( "Set ALL Via Holes to Default" ), apply_xpm );
if( Track->IsDrillDefault() ) // Can't export the drill value, because this value is 0
if( Track->IsDrillDefault() ) // Can't export the drill value, because this value is 0 (default)
{
via_mnu->Enable( ID_POPUP_PCB_VIA_HOLE_EXPORT, FALSE );
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment