Minor fixes (typo in messages) (de8ae428) · Commits · Elphel / kicad-source-mirror

Documentation/compiling/COMPILING.txt

+11 −4

Original line number	Diff line number	Diff line
		Compiling KiCad from Source
		===========================
		KiCad Documentation Team
		Last revised on 12-mars-2012 by jp Charras
		Last revised on 2014-december-24 by JP Charras

		Introduction
		------------
		@@ -32,7 +32,7 @@ KiCad from source.
		* CMake - Cross-platform make
		* GLUT - The OpenGL Utility Library
		* GLEW
		* wxGTK or wxWidgets - The wxWidgets GUI toolkit with GTK+ bindings
		* wxWidgets - The wxWidgets GUI toolkit with GTK+ bindings version 3.0 or more
		* libbz2 (dev)
		* libcairo (dev)

		@@ -57,7 +57,7 @@ Compiler and basic development tools
		Make sure g++, make and other tools are in your path.
		If windows, then try running g++ and make from within your msys bash shell.

		PLEASE NOTE: g++ 4.7.1 at least (possibly the 4.7.x series) is known to
		PLEASE NOTE: g++ 4.7.1 and 4.7.2 are known to
		miscompile pcbnew (it get zones wrong) with -O2; using -O1 is a suitable
		workaround until they fix the compiler.

		@@ -68,7 +68,7 @@ WARNING:
		see wxWidgets_patch_notes.txt for patches and issues in wxWidgets.

		On Windows, download
		http://sourceforge.net/projects/wxwindows/files/3.0.0/wxWidgets-3.0.0.zip/download
		http://sourceforge.net/projects/wxwindows/files/3.0.2/wxWidgets-3.0.2.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.
		@@ -95,6 +95,10 @@ 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.

		Note also wxWidgets must be compiled with the wxWebView support.
		This is the default when building wxWidgets, but only if the libwebkitgtk-dev is installed
		before building wxWidgets (sudo apt-get install libwebkitgtk-dev)

		Install CMake
		-------------
		On windows, download the installation binary for windows from cmake.org.
		@@ -167,9 +171,12 @@ Linux and windows users both then make two "out of source" build directories:

		On either cmake command line shown below, you can optionally include
		-DCMAKE_INSTALL_PREFIX=<finallInstallDir>
		For instance on Linux: <finallInstallDir>=/usr/local/kicad or ~/kicad

		On windows, run the following command:
		cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DwxWidgets_ROOT_DIR=<wxInstallDir> ../../
		Avoid installing Kicad on C: disk, which is protected by Windows.
		Use D: or E: ...

		On linux, run instead the following command:
		cmake -DCMAKE_BUILD_TYPE=Release ../../

Documentation/compiling/build-config.txt

+19 −2

Original line number	Diff line number	Diff line
		@@ -100,9 +100,12 @@ USE_IMAGES_IN_MENUS (ON/OFF)
		----------------------------
		Default: OFF for OSX, ON for other platforms.

		This option is used to enable or disable building KiCad with images in menu
		This option is used to enable or disable building KiCad with images (icons) in menu
		items. If this is not defined when CMake is used to create the build files,
		images will be included in menu items on all platforms except OSX.
		Note also, on Linux, some window managers do not show icons in menu, or
		show them only if the current option is activated.
		Therefore, even if you have icons in menus, they will be not always displayed


		DOWNLOAD_DIR (PATH)
		@@ -138,6 +141,7 @@ Default: OFF
		This option enables or disables building Python scripting support within KiCad.
		Currently only Pcbnew is supported. This option requires SWIG and Python to be
		installed on the system.
		It allows using footprint wizards in footprint editor to create new footprints


		KICAD_SCRIPTING_MODULES (ON/OFF)
		@@ -147,6 +151,8 @@ Default: OFF
		This option enables or disables building KiCad Python modules that can be used
		externally by Python. Currently only Pcbnew is supported. This option
		requires SWIG and Python to be installed on the system.
		This python module is used to edit board files (.kicad_pcb files) from a
		python script, outside kicad.


		KICAD_SCRIPTING_WXPYTHON (ON/OFF)
		@@ -156,6 +162,7 @@ Default: OFF
		This option enables or disables building wxPython support into the KiCad
		scripting support. Currently only Pcbnew has scripting support. This option requires
		SWIG, Python, and wxPython to be installed on the system.
		It allows execution of python scripts insided Pcbnew, during a session.


		PYTHON_SITE_PACKAGE_PATH (PATH)
		@@ -169,11 +176,21 @@ different path, set this variable to the desired path.

		BUILD_GITHUB_PLUGIN (ON/OFF)
		----------------------------
		Default: OFF
		Default: ON

		This option enables or disables building KiCad with a pcbnew plugin for loading
		footprints from a GitHub repository.

		KICAD_USE_WEBKIT (ON/OFF)
		----------------------------
		Default: ON (and OFF when BUILD_GITHUB_PLUGIN is OFF)

		This option enables or disables building a web viewer used if the
		footprint library table wizard to easily add footprints library entries
		to this tables when libraries are on a GitHub repository.
		This option need the full support of wxWebview/WebKit in wxWidgets, which is not
		always the case on Linux.


		KICAD_REPO_NAME (STRING)
		------------------------

pcb_calculator/dialogs/pcb_calculator_frame_base.cpp

+3 −3

Original line number	Diff line number	Diff line
		///////////////////////////////////////////////////////////////////////////
		// C++ code generated with wxFormBuilder (version Nov 5 2013)
		// C++ code generated with wxFormBuilder (version Jun 5 2014)
		// http://www.wxformbuilder.org/
		//
		// PLEASE DO "NOT" EDIT THIS FILE!
		@@ -166,7 +166,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow

		m_staticTextRegType = new wxStaticText( m_panelRegulators, wxID_ANY, _("Type"), wxDefaultPosition, wxDefaultSize, 0 );
		m_staticTextRegType->Wrap( -1 );
		m_staticTextRegType->SetToolTip( _("Type of the regulator.\nThere are 2 types:\n- regulators which have a dedicted sense pin for the voltage regulation.\n- 3 terminal pins.") );
		m_staticTextRegType->SetToolTip( _("Type of the regulator.\nThere are 2 types:\n- regulators which have a dedicated sense pin for the voltage regulation.\n- 3 terminal pins.") );

		fgSizerRegParams->Add( m_staticTextRegType, 0, wxALL, 5 );

		@@ -1232,7 +1232,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow

		wxArrayString m_BoardClassesUnitsSelectorChoices;
		m_BoardClassesUnitsSelector = new UNIT_SELECTOR_LEN( m_panelBoardClass, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_BoardClassesUnitsSelectorChoices, 0 );
		m_BoardClassesUnitsSelector->SetSelection( -1 );
		m_BoardClassesUnitsSelector->SetSelection( 0 );
		bSizerBoardClass->Add( m_BoardClassesUnitsSelector, 0, wxALL, 5 );

		wxBoxSizer* brdclsSizerRight;

pcb_calculator/dialogs/pcb_calculator_frame_base.fbp

+4 −4

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
		<wxFormBuilder_Project>
		<FileVersion major="1" minor="11" />
		<FileVersion major="1" minor="13" />
		<object class="Project" expanded="1">
		<property name="class_decoration"></property>
		<property name="code_generation">C++</property>
		@@ -44,7 +44,7 @@
		<property name="minimum_size"></property>
		<property name="name">PCB_CALCULATOR_FRAME_BASE</property>
		<property name="pos"></property>
		<property name="size">670,489</property>
		<property name="size">702,489</property>
		<property name="style">wxDEFAULT_FRAME_STYLE\|wxRESIZE_BORDER</property>
		<property name="subclass">KIWAY_PLAYER; kiway_player.h</property>
		<property name="title">PCB Calculator</property>
		@@ -2308,7 +2308,7 @@
		<property name="style"></property>
		<property name="subclass"></property>
		<property name="toolbar_pane">0</property>
		<property name="tooltip">Type of the regulator. There are 2 types: - regulators which have a dedicted sense pin for the voltage regulation. - 3 terminal pins.</property>
		<property name="tooltip">Type of the regulator. There are 2 types: - regulators which have a dedicated sense pin for the voltage regulation. - 3 terminal pins.</property>
		<property name="window_extra_style"></property>
		<property name="window_name"></property>
		<property name="window_style"></property>
		@@ -18263,7 +18263,7 @@
		<property name="pin_button">1</property>
		<property name="pos"></property>
		<property name="resize">Resizable</property>
		<property name="selection">-1</property>
		<property name="selection">0</property>
		<property name="show">1</property>
		<property name="size"></property>
		<property name="style"></property>

pcb_calculator/dialogs/pcb_calculator_frame_base.h

+2 −2

Original line number	Diff line number	Diff line
		///////////////////////////////////////////////////////////////////////////
		// C++ code generated with wxFormBuilder (version Nov 5 2013)
		// C++ code generated with wxFormBuilder (version Jun 5 2014)
		// http://www.wxformbuilder.org/
		//
		// PLEASE DO "NOT" EDIT THIS FILE!
		@@ -293,7 +293,7 @@ class PCB_CALCULATOR_FRAME_BASE : public KIWAY_PLAYER

		public:

		PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("PCB Calculator"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 670,489 ), long style = wxDEFAULT_FRAME_STYLE\|wxRESIZE_BORDER\|wxFULL_REPAINT_ON_RESIZE\|wxTAB_TRAVERSAL );
		PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("PCB Calculator"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 702,489 ), long style = wxDEFAULT_FRAME_STYLE\|wxRESIZE_BORDER\|wxFULL_REPAINT_ON_RESIZE\|wxTAB_TRAVERSAL );

		~PCB_CALCULATOR_FRAME_BASE();

Admin message