fixed compil error, and a display problem in eeschema

common/get_component_dialog.cpp

@@ -59,7 +59,7 @@ WinEDA_SelectCmp::WinEDA_SelectCmp( WinEDA_DrawFrame* parent,
     Text = new wxStaticText( this, -1, _( "Name:" ) );
     LeftBoxSizer->Add( Text, 0, wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP, 5 );
 
-    m_TextCtrl = new wxTextCtrl( this, ID_ENTER_NAME, *m_Text );
+    m_TextCtrl = new wxTextCtrl( this, ID_ENTER_NAME, m_Text );
     m_TextCtrl->SetInsertionPoint( 1 );
     LeftBoxSizer->Add( m_TextCtrl,
                        0,

eeschema/class_libentry.h

@@ -194,7 +194,8 @@ public:
      * @param transformMatrix - Cooridinate adjustment settings.
      * @param showPinText - Show pin text if true.
      * @param drawFields - Draw field text if true otherwise just draw
-     *                     body items.
+     *        body items (useful to draw a body in schematic,
+     *        because fields of schematic components replace the lib component fields).
      * @param onlySelected - Draws only the body items that are selected.
      *                       Used for block move redraws.
      */

eeschema/class_sch_component.cpp

@@ -204,7 +204,7 @@ void SCH_COMPONENT::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
 
     Entry->Draw( panel, DC, m_Pos + offset, dummy ? 0 : m_Multi,
                  dummy ? 0 : m_Convert, DrawMode, Color, m_Transform,
-                 DrawPinText );
+                 DrawPinText, false );
 
     SCH_CMP_FIELD* field = GetField( REFERENCE );
 

eeschema/viewlib_frame.cpp

@@ -104,6 +104,11 @@ WinEDA_ViewlibFrame::WinEDA_ViewlibFrame( wxWindow*    father,
     SetBaseScreen( new SCH_SCREEN() );
     GetScreen()->m_Center = true;       // set to true to have the coordinates origine -0,0) centered on screen
     LoadSettings();
+    // Initilialize grid id to a default value if not found in config or bad:
+    if( (m_LastGridSizeId <= 0) ||
+        (m_LastGridSizeId < (ID_POPUP_GRID_USER - ID_POPUP_GRID_LEVEL_1000)) )
+        m_LastGridSizeId = ID_POPUP_GRID_LEVEL_50 - ID_POPUP_GRID_LEVEL_1000;
+
     SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y );
     GetScreen()->SetGrid( ID_POPUP_GRID_LEVEL_1000 + m_LastGridSizeId  );
 

packaging/mac-osx/osx-package.pmdoc/05gerbview-contents.xml → packaging/mac-osx/osx-package.pmdoc/04gerbview-contents.xml

@@ -1 +1 @@
-<pkg-contents spec="1.12"><f n="gerbview.app" o="marco" g="staff" p="16877" pt="/Users/marco/Development/kicad/kicad-sources/gerbview/gerbview.app" m="false" t="file"><f n="Contents" o="marco" g="staff" p="16877"><f n="Info.plist" o="marco" g="staff" p="33204"/><f n="MacOS" o="marco" g="staff" p="16877"><f n="gerbview" o="marco" g="staff" p="33277"/></f><f n="Resources" o="marco" g="staff" p="16877"><f n="gerbview.icns" o="marco" g="staff" p="33204"/><f n="gerbview_doc.icns" o="marco" g="staff" p="33204"/></f></f></f></pkg-contents>
+<pkg-contents spec="1.12"><f n="gerbview.app" o="marco" g="staff" p="16877" pt="/Users/marco/Development/kicad/kicad-sources/gerbview/gerbview.app" m="false" t="file"><f n="Contents" o="marco" g="staff" p="16877"><f n="Info.plist" o="marco" g="staff" p="33188"/><f n="MacOS" o="marco" g="staff" p="16877"><f n="gerbview" o="marco" g="staff" p="33261"/></f><f n="Resources" o="marco" g="staff" p="16877"><f n="gerbview.icns" o="marco" g="staff" p="33188"/><f n="gerbview_doc.icns" o="marco" g="staff" p="33188"/></f></f></f></pkg-contents>

packaging/mac-osx/osx-package.pmdoc/04gerbview.xml

@@ -0,0 +1 @@
+<pkgref spec="1.12" uuid="0D9066DC-1B97-47AB-910B-612A3D447EE8"><config><identifier>net.sourceforge.kicad.gerbview</identifier><version>1</version><description></description><post-install type="none"/><installFrom relative="true" mod="true" includeRoot="true">../../gerbview/gerbview.app</installFrom><installTo mod="true">/Applications/Kicad</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo</mod><mod>relocatable</mod><mod>installTo.isAbsoluteType</mod><mod>installFrom.path</mod><mod>requireAuthorization</mod><mod>parent</mod><mod>version</mod><mod>installTo.path</mod><mod>includeRoot</mod><mod>identifier</mod></config><contents><file-list>04gerbview-contents.xml</file-list><component id="org.kicad-eda.gerbview" path="/Users/marco/Development/kicad/kicad-sources/gerbview/gerbview.app" version="" isRelocatable="true"><locator-info><token title="pkmk-token-40"><search-rule><combo identifier="org.kicad-eda.gerbview" default-path="/Applications/Kicad/gerbview.app"/></search-rule></token></locator-info></component><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>

packaging/mac-osx/osx-package.pmdoc/04kicad-contents.xml

@@ -1 +0,0 @@
-<pkg-contents spec="1.12"><f n="kicad.app" o="marco" g="staff" p="16877" pt="/Users/marco/Development/kicad/kicad-sources/kicad/kicad.app" m="false" t="file"><f n="Contents" o="marco" g="staff" p="16877"><f n="Info.plist" o="marco" g="staff" p="33204"/><f n="MacOS" o="marco" g="staff" p="16877"><f n="kicad" o="marco" g="staff" p="33277"/></f><f n="Resources" o="marco" g="staff" p="16877"><f n="kicad.icns" o="marco" g="staff" p="33204"/><f n="kicad_doc.icns" o="marco" g="staff" p="33204"/></f></f></f></pkg-contents>

packaging/mac-osx/osx-package.pmdoc/04kicad.xml

@@ -1 +0,0 @@
-<pkgref spec="1.12" uuid="16332325-42A3-47AC-AF70-A6501E7A012D"><config><identifier>net.sourceforge.kicad.kicad</identifier><version>1</version><description></description><post-install type="none"/><installFrom relative="true" mod="true" includeRoot="true">../kicad/kicad.app</installFrom><installTo mod="true">/Applications/Kicad</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>installFrom.path</mod><mod>requireAuthorization</mod><mod>installTo.isAbsoluteType</mod><mod>relocatable</mod><mod>installTo.path</mod><mod>includeRoot</mod><mod>installTo</mod><mod>identifier</mod></config><contents><file-list>04kicad-contents.xml</file-list><component id="org.kicad-eda.kicad" path="/Users/marco/Development/kicad/kicad-sources/kicad/kicad.app" version="" isRelocatable="true"><locator-info><token title="pkmk-token-24"><search-rule><combo identifier="org.kicad-eda.kicad" default-path="/Applications/Kicad/kicad.app"/></search-rule></token></locator-info></component><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>

packaging/mac-osx/osx-package.pmdoc/05gerbview.xml

@@ -1 +0,0 @@
-<pkgref spec="1.12" uuid="0D9066DC-1B97-47AB-910B-612A3D447EE8"><config><identifier>net.sourceforge.kicad.gerbview</identifier><version>1</version><description></description><post-install type="none"/><installFrom relative="true" mod="true" includeRoot="true">../gerbview/gerbview.app</installFrom><installTo mod="true">/Applications/Kicad</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>installTo.path</mod><mod>requireAuthorization</mod><mod>installTo.isAbsoluteType</mod><mod>relocatable</mod><mod>version</mod><mod>includeRoot</mod><mod>installFrom.path</mod><mod>installTo</mod><mod>identifier</mod></config><contents><file-list>05gerbview-contents.xml</file-list><component id="org.kicad-eda.gerbview" path="/Users/marco/Development/kicad/kicad-sources/gerbview/gerbview.app" version="" isRelocatable="true"><locator-info><token title="pkmk-token-28"><search-rule><combo identifier="org.kicad-eda.gerbview" default-path="/Applications/Kicad/gerbview.app"/></search-rule></token></locator-info></component><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>

packaging/mac-osx/osx-package.pmdoc/05kicad-contents.xml

@@ -0,0 +1 @@
+<pkg-contents spec="1.12"><f n="kicad.app" o="marco" g="staff" p="16877" pt="/Users/marco/Development/kicad/kicad-sources/kicad/kicad.app" m="false" t="file"><f n="Contents" o="marco" g="staff" p="16877"><f n="Info.plist" o="marco" g="staff" p="33188"/><f n="MacOS" o="marco" g="staff" p="16877"><f n="kicad" o="marco" g="staff" p="33261"/></f><f n="Resources" o="marco" g="staff" p="16877"><f n="kicad.icns" o="marco" g="staff" p="33188"/><f n="kicad_doc.icns" o="marco" g="staff" p="33188"/></f></f></f></pkg-contents>

packaging/mac-osx/osx-package.pmdoc/05kicad.xml

@@ -0,0 +1 @@
+<pkgref spec="1.12" uuid="D5E79B3C-677B-4D51-8625-C41339A85DBB"><config><identifier>net.sourceforge.kicad</identifier><version>1.0</version><description/><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true" includeRoot="true">../../kicad/kicad.app</installFrom><installTo relocatable="true">/Applications</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"/><mod>installFrom.path</mod><mod>identifier</mod><mod>parent</mod></config><contents><file-list>05kicad-contents.xml</file-list><component id="org.kicad-eda.kicad" path="/Users/marco/Development/kicad/kicad-sources/kicad/kicad.app" version="" isRelocatable="true"><locator-info><token title="pkmk-token-52"><search-rule><combo identifier="org.kicad-eda.kicad" default-path="/Applications/kicad.app"/></search-rule></token></locator-info></component><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>

packaging/mac-osx/osx-package.pmdoc/06demos.xml

@@ -1 +0,0 @@
-<pkgref spec="1.12" uuid="29C97DEE-FDAD-474F-BB53-64DD599F7ADB"><config><identifier>net.sourceforge.kicad.demos</identifier><version>1</version><description></description><post-install type="none"/><installFrom relative="true" mod="true" includeRoot="true">../demos</installFrom><installTo mod="true">/Applications/Kicad</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>installTo.path</mod><mod>requireAuthorization</mod><mod>installTo.isAbsoluteType</mod><mod>installTo.isRelativeType</mod><mod>includeRoot</mod><mod>installFrom.path</mod><mod>installTo</mod><mod>identifier</mod></config><contents><file-list>06demos-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter><filter>/CMakeLists.txt</filter></contents></pkgref>