From c93562477906cf2c914768f705c6e717b311bf14 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Mon, 10 Feb 2014 10:30:08 +0100 Subject: [PATCH] Use environment KISYS3DMOD to know defaut path for 3D shapes in footprint editors dialogs. --- Documentation/compiling/COMPILING.txt | 78 ++-- common/edaappl.cpp | 19 +- pcbnew/dialogs/dialog_SVG_print.cpp | 2 +- .../dialog_edit_module_for_BoardEditor.cpp | 36 +- ...ialog_edit_module_for_BoardEditor_base.cpp | 11 +- ...ialog_edit_module_for_BoardEditor_base.fbp | 188 +++++++- .../dialog_edit_module_for_BoardEditor_base.h | 2 + .../dialog_edit_module_for_Modedit.cpp | 42 +- .../dialog_edit_module_for_Modedit_base.cpp | 15 +- .../dialog_edit_module_for_Modedit_base.fbp | 414 +++++++++++++----- .../dialog_edit_module_for_Modedit_base.h | 4 +- 11 files changed, 625 insertions(+), 186 deletions(-) diff --git a/Documentation/compiling/COMPILING.txt b/Documentation/compiling/COMPILING.txt index f53e7b10dc..fde596fa3a 100644 --- a/Documentation/compiling/COMPILING.txt +++ b/Documentation/compiling/COMPILING.txt @@ -31,15 +31,22 @@ KiCad from source. * bzr - Bazaar version control system * CMake - Cross-platform make * GLUT - The OpenGL Utility Library +* GLEW * wxGTK or wxWidgets - The wxWidgets GUI toolkit with GTK+ bindings +* libbz2 (dev) +* libcairo (dev) * Boost - Collection of portable C++ source libraries -boost will be automagically downloaded and copied in kicad sources tree, +boost will be automagically downloaded, copied in kicad sources tree and patched, the first time you compile kicad. Useful, but not required: * Doxygen - Documentation system for several programming languages +Required to build Kicad with scripting (using python) support: +Python +Swig + KiCad uses the Bazaar version control system to track source code changes, and download the boost libraries needed by Kicad. Be sure you bzr install also includes bzrtools. @@ -60,40 +67,43 @@ Install or Build wxWidgets WARNING: see wxWidgets_patch_notes.txt for patches and issues in wxWidgets. -If on Windows, download -http://sourceforge.net/projects/wxwindows/files/wxAll/2.9.3/wxWidgets-2.9.3.zip/download +On Windows, download +http://sourceforge.net/projects/wxwindows/files/3.0.0/wxWidgets-3.0.0.zip/download or a newer version. Do NOT use previous versions which all have annoying issues for KiCad. Start msys so you have a bash shell. Note also since 2.9 versions no need to build a "debug" version of the wxWidgets library, -the release abd the debug version are same. +the release and the debug version are same. Unzip the wxWidgets zip file into the build directory. Change directories into there, and then: mkdir Release cd Release - ../configure --enable-unicode --enable-monolithic=no --disable-shared --with-opengl + ../configure --with-opengl make and under Linux, but not under Windows: sudo make install that install wxWidgets libs and headers in /usr/local/ -If on linux, you can use your package manager to install the -development versions of the wxWidgets packages which include the C++ headers. An -alternative is to build static libaries from source. Verify that wx-config is in -your path by running it from a command prompt. Linux users then go to next step. +On linux, yo can also download wxWidgets 3.0 (recommandedd) +or you can use your package manager to install the +development versions of the wxWidgets packages which include the C++ headers. +The recommended way is to build wxWidgets from source, and use wxWidgets 3.0 +or more recent (Older versions have a print function which does not work). +Verify that wx-config is in your path by running it from a command prompt. +Linux users then go to next step. Install CMake ------------- -If windows, download the installation binary for windows from cmake.org. +On windows, download the installation binary for windows from cmake.org. Install that and choose to add cmake to your path during installation. You -will have to restart and command shells for the new path to take effect. +will have to restart your command shell for the new path to take effect. Verify that cmake is in your path by trying to run it from a command prompt. -If linux, use your package manager to install cmake. You should get cmake 2.6.4 +On linux, use your package manager to install cmake. You should get cmake 2.8.4 or later. If only an older one is available in your package repository, build cmake from source. Verify that cmake is in your path by trying to run it from a command prompt. @@ -106,25 +116,42 @@ To download files from Launchpad repository, you should install bazaar (bzr) th version control system like subversion, mercurial, git... Launchpad repository handle 2 branches for KiCda sources: -- a testing branch (used by developers) -- a stable branch (a copy of the testing branch, when this testing branch is near a stable state)) +- a product branch (used by developers, which is most of time usable in production) +- a stable branch (a copy of the testing branch, + when the product branch is a stable state)) +Remarks: +- The product branch is actively maintained +- From the product branch, you can go back to any previous version, using bzr features +- The stable branch is poorly or not maintained (and could be removed) -Testing branch: -bzr branch lp:kicad kicad_testing +In order to have a working Kicad installtion, you need +- sources to build binaries +- libraries (they are not included in sources) +- documentation and translations (they are not included in sources) + +product branch: +bzr branch lp:kicad kicad_src Stable branch: -bzr branch lp:kicad/stable kicad_stable +bzr branch lp:kicad/stable kicad_src Components and Footprints libraries -bzr branch lp:~kicad-lib-committers/kicad/library kicad_libraries +all (schematic libs, 3D shapes ...) but new footprints libraries (use Download zip tool) +https://github.com/KiCad/kicad-library/ +New footprints libraries (use Download zip tool for each lib you want) +https://github.com/KiCad/ for footprint libs (*.pretty folders) + +Note also Kicad is able to read on github.com/KiCad/ the *.pretty folders +without download, using github plugin. +(however the time to read them can be long) Documentation and translations: bzr branch lp:~kicad-developers/kicad/doc kicad_doc Create Makefiles with CMake --------------------------- -If windows, go into your msys shell. Linux and windows users both then make -two "out of source" build directories: +On windows, go into your msys shell. +Linux and windows users both then make two "out of source" build directories: cd mkdir -p build/release mkdir build/debug (if you want a debug version of KiCad) @@ -133,10 +160,10 @@ two "out of source" build directories: On either cmake command line shown below, you can optionally include -DCMAKE_INSTALL_PREFIX= -If windows, run the following command: +On windows, run the following command: cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DwxWidgets_ROOT_DIR= ../../ -If linux, run instead the following command: +On linux, run instead the following command: cmake -DCMAKE_BUILD_TYPE=Release ../../ Take a look at CMakeCache.txt, and in particular CMAKE_INSTALL_PREFIX, which @@ -166,18 +193,15 @@ On either cmake command line shown below, you can optionally include Although normally you do not install the Debug binaries, you can debug them where they were built. -If windows, run the following command: +On windows, run the following command: cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Debug -DwxWidgets_ROOT_DIR= ../../ where is /Release -If linux, run instead the following command: +On linux, run instead the following command: cmake -DCMAKE_BUILD_TYPE=Debug -DwxWidgets_USE_DEBUG=ON ../../ Make the Debug binaries: make -Note: that it is easy to build only a specific binary such as pcbnew alone: - make pcbnew - See ./cmake_config.txt for customizing the KiCad build setting. diff --git a/common/edaappl.cpp b/common/edaappl.cpp index c4780b49f3..289abc3b2c 100644 --- a/common/edaappl.cpp +++ b/common/edaappl.cpp @@ -1249,6 +1249,18 @@ bool EDA_APP::Set3DShapesPath( const wxString& aKiSys3Dmod ) } #elif defined(__UNIX__) // Linux and non-Apple Unix + // Try the home directory: + path.Empty(); + wxGetEnv( wxT("${HOME}", &path ) + path += wxT("/kicad/share/") + relpath; + + if( wxFileName::DirExists( path ) ) + { + wxSetEnv( aKiSys3Dmod, path ); + return true; + } + + // Try the standard install path: path = wxT("/usr/local/kicad/share/") + relpath; if( wxFileName::DirExists( path ) ) { @@ -1256,6 +1268,7 @@ bool EDA_APP::Set3DShapesPath( const wxString& aKiSys3Dmod ) return true; } + // Try the official distrib standard install path: path = wxT("/usr/share/kicad/") + relpath; if( wxFileName::DirExists( path ) ) { @@ -1264,7 +1277,11 @@ bool EDA_APP::Set3DShapesPath( const wxString& aKiSys3Dmod ) } #else // Windows - path = m_BinDir + wxT("../share/") + relpath; + // On Windows, the install path is given by the path of executables + wxFileName fn; + fn.AssignDir( m_BinDir ); + fn.RemoveLastDir(); + path = fn.GetPathWithSep() + wxT("share/") + relpath; if( wxFileName::DirExists( path ) ) { diff --git a/pcbnew/dialogs/dialog_SVG_print.cpp b/pcbnew/dialogs/dialog_SVG_print.cpp index f8eec0ad5b..cfd0f4fa3b 100644 --- a/pcbnew/dialogs/dialog_SVG_print.cpp +++ b/pcbnew/dialogs/dialog_SVG_print.cpp @@ -269,7 +269,7 @@ void DIALOG_SVG_PRINT::ExportSVGFile( bool aOnlyOneFile ) if( aOnlyOneFile ) { m_printMaskLayer = printMaskLayer; - suffix = wxT( "-brd" ); + suffix = wxT( "brd" ); } else { diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp index 1a66d7e21b..00c860a3fd 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp +++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp @@ -242,6 +242,13 @@ void DIALOG_MODULE_BOARD_EDITOR::InitModeditProperties() { SetFocus(); + wxString default_path; + wxGetEnv( wxT( KISYS3DMOD ), &default_path ); +#ifdef __WINDOWS__ + default_path.Replace( wxT( "/" ), wxT( "\\" ) ); +#endif + m_textCtrl3DDefaultPath->SetValue( default_path ); + m_LastSelected3DShapeIndex = -1; // Init 3D shape list @@ -449,18 +456,25 @@ void DIALOG_MODULE_BOARD_EDITOR::Browse3DLib( wxCommandEvent& event ) wxFileName fn = fullfilename; wxGetApp().SaveLastVisitedLibraryPath( fn.GetPath() ); - /* If the file path is already in the library search paths - * list, just add the library name to the list. Otherwise, add - * the library name with the full or relative path. + /* If the file path is already in the default search path + * list, just add the name to the list. Otherwise, add + * the name with the full or relative path. * the relative path, when possible is preferable, - * because it preserve use of default libraries paths, when the path is a - * sub path of these default paths + * because it preserve use of default search path, when the path is a + * sub path */ - shortfilename = - wxGetApp().ReturnFilenameWithRelativePathInLibPath( fullfilename ); - wxFileName aux = shortfilename; - if( aux.IsAbsolute() ) + wxString default_path; + wxGetEnv( wxT( KISYS3DMOD ), &default_path ); + fn.MakeRelativeTo( default_path ); + + // Here, we want a path relative only to the default_path + if( fn.GetPathWithSep().StartsWith( wxT("..") ) ) + fn = fullfilename; // keep the full file name + + shortfilename = fn.GetFullPath(); + + if( fn.IsAbsolute() ) { // Absolute path, ask if the user wants a relative one int diag = wxMessageBox( _( "Use a relative path?" ), @@ -469,8 +483,8 @@ void DIALOG_MODULE_BOARD_EDITOR::Browse3DLib( wxCommandEvent& event ) if( diag == wxYES ) { // Make it relative - aux.MakeRelativeTo( wxT(".") ); - shortfilename = aux.GetPathWithSep() + aux.GetFullName(); + fn.MakeRelativeTo( wxT(".") ); + shortfilename = fn.GetFullPath(); } } diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp index 99efb9008e..ee0a156d12 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp +++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp @@ -309,7 +309,14 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare bSizerMain3D->Add( m_staticText3Dname, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_3D_ShapeNameListBox = new wxListBox( m_Panel3D, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE ); - bSizerMain3D->Add( m_3D_ShapeNameListBox, 0, wxALL|wxEXPAND, 5 ); + bSizerMain3D->Add( m_3D_ShapeNameListBox, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + m_staticTextDefault3DPath = new wxStaticText( m_Panel3D, wxID_ANY, _("Default Path (from KISYS3DMOD environment variable)"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextDefault3DPath->Wrap( -1 ); + bSizerMain3D->Add( m_staticTextDefault3DPath, 0, wxRIGHT|wxLEFT, 5 ); + + m_textCtrl3DDefaultPath = new wxTextCtrl( m_Panel3D, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); + bSizerMain3D->Add( m_textCtrl3DDefaultPath, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); wxBoxSizer* bLowerSizer3D; bLowerSizer3D = new wxBoxSizer( wxHORIZONTAL ); @@ -362,7 +369,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare bLowerSizer3D->Add( bSizer3DButtons, 0, wxALIGN_CENTER_VERTICAL, 5 ); - bSizerMain3D->Add( bLowerSizer3D, 1, wxEXPAND, 5 ); + bSizerMain3D->Add( bLowerSizer3D, 0, wxEXPAND, 5 ); m_Panel3D->SetSizer( bSizerMain3D ); diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp index 131c722600..032726aa21 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp +++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp @@ -97,7 +97,7 @@ 5 wxEXPAND | wxALL 1 - + 1 1 1 @@ -4336,11 +4336,11 @@ - + 3D settings 0 - + 1 1 1 @@ -4414,7 +4414,7 @@ - + bSizerMain3D wxVERTICAL @@ -4504,8 +4504,8 @@ 5 - wxALL|wxEXPAND - 0 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 1 1 1 @@ -4590,10 +4590,184 @@ + + 5 + wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Default Path (from KISYS3DMOD environment variable) + + 0 + + + 0 + + 1 + m_staticTextDefault3DPath + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + + 1 + m_textCtrl3DDefaultPath + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_READONLY + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxEXPAND - 1 + 0 bLowerSizer3D diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h index 234f5b09f6..3a12366e63 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h +++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.h @@ -106,6 +106,8 @@ class DIALOG_MODULE_BOARD_EDITOR_BASE : public DIALOG_SHIM wxPanel* m_Panel3D; wxStaticText* m_staticText3Dname; wxListBox* m_3D_ShapeNameListBox; + wxStaticText* m_staticTextDefault3DPath; + wxTextCtrl* m_textCtrl3DDefaultPath; wxBoxSizer* m_bSizerShapeScale; wxStaticText* m_staticTextShapeScale; wxBoxSizer* m_bSizerShapeOffset; diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp b/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp index 0b97c21f0e..169e4e6c9a 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp +++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp @@ -7,10 +7,10 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2013 Jean-Pierre Charras, jp.charras at wanadoo.fr - * Copyright (C) 2013 Dick Hollenbeck, dick@softplc.com - * Copyright (C) 2008-2013 Wayne Stambaugh - * Copyright (C) 2004-2013 KiCad Developers, see change_log.txt for contributors. + * Copyright (C) 2014 Jean-Pierre Charras, jp.charras at wanadoo.fr + * Copyright (C) 2014 Dick Hollenbeck, dick@softplc.com + * Copyright (C) 2008-2014 Wayne Stambaugh + * Copyright (C) 2004-2014 KiCad Developers, see change_log.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -91,6 +91,14 @@ void DIALOG_MODULE_MODULE_EDITOR::initModeditProperties() { SetFocus(); + // Display the default path, given by environment variable KISYS3DMOD + wxString default_path; + wxGetEnv( wxT( KISYS3DMOD ), &default_path ); +#ifdef __WINDOWS__ + default_path.Replace( wxT( "/" ), wxT( "\\" ) ); +#endif + m_textCtrl3DDefaultPath->SetValue( default_path ); + m_lastSelected3DShapeIndex = -1; // Init 3D shape list @@ -313,17 +321,25 @@ void DIALOG_MODULE_MODULE_EDITOR::BrowseAndAdd3DLib( wxCommandEvent& event ) wxFileName fn = fullfilename; wxGetApp().SaveLastVisitedLibraryPath( fn.GetPath() ); - /* If the file path is already in the library search paths - * list, just add the library name to the list. Otherwise, add - * the library name with the full or relative path. + /* If the file path is already in the default search path + * list, just add the name to the list. Otherwise, add + * the name with the full or relative path. * the relative path, when possible is preferable, - * because it preserve use of default libraries paths, when the path is a sub path of these default paths + * because it preserve use of default search path, when the path is a + * sub path */ - shortfilename = wxGetApp().ReturnFilenameWithRelativePathInLibPath( fullfilename ); - wxFileName aux = shortfilename; + wxString default_path; + wxGetEnv( wxT( KISYS3DMOD ), &default_path ); + fn.MakeRelativeTo( default_path ); - if( aux.IsAbsolute() ) + // Here, we want a path relative only to the default_path + if( fn.GetPathWithSep().StartsWith( wxT("..") ) ) + fn = fullfilename; // keep the full file name + + shortfilename = fn.GetFullPath(); + + if( fn.IsAbsolute() ) { // Absolute path, ask if the user wants a relative one int diag = wxMessageBox( _( "Use a relative path?" ), @@ -332,8 +348,8 @@ void DIALOG_MODULE_MODULE_EDITOR::BrowseAndAdd3DLib( wxCommandEvent& event ) if( diag == wxYES ) { // Make it relative - aux.MakeRelativeTo( wxT( "." ) ); - shortfilename = aux.GetPathWithSep() + aux.GetFullName(); + fn.MakeRelativeTo( wxT( "." ) ); + shortfilename = fn.GetFullPath(); } } diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp index fd62e5b8da..093a513828 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp +++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) +// C++ code generated with wxFormBuilder (version Nov 6 2013) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -238,12 +238,19 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa wxBoxSizer* bSizerMain3D; bSizerMain3D = new wxBoxSizer( wxVERTICAL ); - m_staticText3Dname = new wxStaticText( m_Panel3D, wxID_ANY, _("3D Shape Name"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText3Dname = new wxStaticText( m_Panel3D, wxID_ANY, _("3D Shape Names"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText3Dname->Wrap( -1 ); bSizerMain3D->Add( m_staticText3Dname, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_3D_ShapeNameListBox = new wxListBox( m_Panel3D, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE ); - bSizerMain3D->Add( m_3D_ShapeNameListBox, 0, wxALL|wxEXPAND, 5 ); + bSizerMain3D->Add( m_3D_ShapeNameListBox, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + m_staticTextDefault3DPath = new wxStaticText( m_Panel3D, wxID_ANY, _("Default Path (from KISYS3DMOD environment variable)"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextDefault3DPath->Wrap( -1 ); + bSizerMain3D->Add( m_staticTextDefault3DPath, 0, wxRIGHT|wxLEFT, 5 ); + + m_textCtrl3DDefaultPath = new wxTextCtrl( m_Panel3D, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); + bSizerMain3D->Add( m_textCtrl3DDefaultPath, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); wxBoxSizer* bLowerSizer3D; bLowerSizer3D = new wxBoxSizer( wxHORIZONTAL ); @@ -293,7 +300,7 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa bLowerSizer3D->Add( bSizer3DButtons, 0, wxALIGN_CENTER_VERTICAL, 5 ); - bSizerMain3D->Add( bLowerSizer3D, 1, wxALL|wxEXPAND, 5 ); + bSizerMain3D->Add( bLowerSizer3D, 0, wxALL|wxEXPAND, 5 ); m_Panel3D->SetSizer( bSizerMain3D ); diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp index aa3c448b54..f78792055f 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp +++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp @@ -20,8 +20,10 @@ . 1 + 1 1 1 + UI 0 0 @@ -177,7 +179,7 @@ Properties 1 - + 1 1 1 @@ -251,16 +253,16 @@ - + m_PanelPropertiesBoxSizer wxHORIZONTAL none - + 5 wxEXPAND|wxLEFT|wxRIGHT|wxTOP 1 - + wxID_ANY Fields @@ -268,11 +270,11 @@ wxVERTICAL none - + 5 wxTOP|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -351,11 +353,11 @@ - + 5 wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - + 1 1 1 @@ -442,11 +444,11 @@ - + 5 wxTOP|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -525,11 +527,11 @@ - + 5 wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - + 1 1 1 @@ -616,11 +618,11 @@ - + 5 wxTOP|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -699,20 +701,20 @@ - + 5 wxEXPAND 0 - + bSizerRef wxHORIZONTAL none - + 5 wxBOTTOM|wxLEFT|wxRIGHT 1 - + 1 1 1 @@ -799,11 +801,11 @@ - + 5 wxBOTTOM|wxRIGHT 0 - + 1 1 1 @@ -889,11 +891,11 @@ - + 5 wxTOP|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -972,20 +974,20 @@ - + 5 wxEXPAND 0 - + bSizerVal wxHORIZONTAL none - + 5 wxBOTTOM|wxLEFT|wxRIGHT 1 - + 1 1 1 @@ -1072,11 +1074,11 @@ - + 5 wxBOTTOM|wxRIGHT 0 - + 1 1 1 @@ -1162,21 +1164,21 @@ - + 5 0 - + 20 protected 0 - + 5 wxTOP|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -1255,11 +1257,11 @@ - + 5 wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND 0 - + 1 1 1 @@ -1346,11 +1348,11 @@ - + 5 wxEXPAND 0 - + 0 protected 0 @@ -1358,29 +1360,29 @@ - + 5 0 - + m_PropRightSizer wxVERTICAL private - + 5 wxEXPAND 0 - + bSizerAttrib wxHORIZONTAL none - + 5 wxALL|wxEXPAND 1 - + 1 1 1 @@ -1466,11 +1468,11 @@ - + 5 wxALL|wxEXPAND 1 - + 1 1 1 @@ -1558,11 +1560,11 @@ - + 5 wxEXPAND|wxALL 0 - + wxID_ANY Auto Place @@ -1570,20 +1572,20 @@ wxHORIZONTAL none - + 5 1 - + bSizerRot90 wxVERTICAL none - + 5 wxALIGN_CENTER_HORIZONTAL|wxALL 0 - + 1 1 1 @@ -1662,11 +1664,11 @@ - + 5 wxEXPAND|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -1772,20 +1774,20 @@ - + 5 1 - + bSizerRot180 wxVERTICAL none - + 5 wxALIGN_CENTER_HORIZONTAL|wxALL 0 - + 1 1 1 @@ -1864,11 +1866,11 @@ - + 5 wxEXPAND|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -1976,11 +1978,11 @@ - + 5 wxEXPAND|wxALL 0 - + wxID_ANY Local Clearance Values @@ -1988,11 +1990,11 @@ wxVERTICAL none - + 5 wxALL 0 - + 1 1 1 @@ -2071,11 +2073,11 @@ - + 5 wxEXPAND 1 - + 3 wxBOTH 1 @@ -2087,11 +2089,11 @@ none 5 0 - + 5 wxLEFT|wxALIGN_CENTER_VERTICAL 0 - + 1 1 1 @@ -2170,11 +2172,11 @@ - + 5 wxALL|wxEXPAND 0 - + 1 1 1 @@ -2261,11 +2263,11 @@ - + 5 wxRIGHT|wxALIGN_CENTER_VERTICAL 0 - + 1 1 1 @@ -2344,11 +2346,11 @@ - + 5 wxEXPAND 0 - + 1 1 1 @@ -2425,11 +2427,11 @@ - + 5 wxEXPAND 0 - + 1 1 1 @@ -2506,11 +2508,11 @@ - + 5 wxEXPAND 0 - + 1 1 1 @@ -2587,11 +2589,11 @@ - + 5 wxALIGN_CENTER_VERTICAL|wxLEFT 0 - + 1 1 1 @@ -2670,11 +2672,11 @@ - + 5 wxALL|wxEXPAND 0 - + 1 1 1 @@ -2761,11 +2763,11 @@ - + 5 wxALIGN_CENTER_VERTICAL|wxRIGHT 0 - + 1 1 1 @@ -2844,11 +2846,11 @@ - + 5 wxALIGN_CENTER_VERTICAL|wxLEFT 0 - + 1 1 1 @@ -2927,11 +2929,11 @@ - + 5 wxTOP|wxRIGHT|wxLEFT|wxEXPAND 0 - + 1 1 1 @@ -3018,11 +3020,11 @@ - + 5 wxALIGN_CENTER_VERTICAL|wxRIGHT 0 - + 1 1 1 @@ -3101,11 +3103,11 @@ - + 5 wxALIGN_CENTER_VERTICAL|wxLEFT 0 - + 1 1 1 @@ -3184,11 +3186,11 @@ - + 5 wxALL|wxEXPAND 0 - + 1 1 1 @@ -3275,11 +3277,11 @@ - + 5 wxALIGN_CENTER_VERTICAL|wxRIGHT 0 - + 1 1 1 @@ -3482,7 +3484,7 @@ 0 0 wxID_ANY - 3D Shape Name + 3D Shape Names 0 @@ -3535,8 +3537,8 @@ 5 - wxALL|wxEXPAND - 0 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 1 1 1 @@ -3621,20 +3623,194 @@ + + 5 + wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Default Path (from KISYS3DMOD environment variable) + + 0 + + + 0 + + 1 + m_staticTextDefault3DPath + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + + 1 + m_textCtrl3DDefaultPath + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_READONLY + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALL|wxEXPAND - 1 - + 0 + bLowerSizer3D wxHORIZONTAL none - + 5 wxEXPAND 1 - + wxID_ANY 3D Scale and Position @@ -3642,20 +3818,20 @@ wxVERTICAL protected - + 5 wxEXPAND 0 - + m_bSizerShapeScale wxVERTICAL protected - + 5 wxTOP|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -3736,20 +3912,20 @@ - + 5 wxEXPAND 0 - + m_bSizerShapeOffset wxVERTICAL protected - + 5 wxTOP|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -3830,20 +4006,20 @@ - + 5 wxEXPAND 0 - + m_bSizerShapeRotation wxVERTICAL protected - + 5 wxTOP|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -3926,20 +4102,20 @@ - + 5 wxALIGN_CENTER_VERTICAL 0 - + bSizer3DButtons wxVERTICAL none - + 5 wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND 0 - + 1 1 1 @@ -4023,11 +4199,11 @@ - + 5 wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND 0 - + 1 1 1 diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.h b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.h index 9491f0b965..839854b525 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.h +++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) +// C++ code generated with wxFormBuilder (version Nov 6 2013) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -90,6 +90,8 @@ class DIALOG_MODULE_MODULE_EDITOR_BASE : public DIALOG_SHIM wxPanel* m_Panel3D; wxStaticText* m_staticText3Dname; wxListBox* m_3D_ShapeNameListBox; + wxStaticText* m_staticTextDefault3DPath; + wxTextCtrl* m_textCtrl3DDefaultPath; wxStaticBoxSizer* m_Sizer3DValues; wxBoxSizer* m_bSizerShapeScale; wxStaticText* m_staticTextShapeScale;