Commit 0cd108b5 authored by Maciej Suminski's avatar Maciej Suminski
Browse files

Upstream merge.

parents 3ff70dea 61b4f8a9

3d-viewer/3d_draw_basic_functions.cpp

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ void Draw3D_SolidHorizontalPolyPolygons( const std::vector<CPolyPt>& aPolysList, 




/* draw the solid polygon found in aPolysList

 * The first polygonj is the main polygon, others are holes

 * The first polygon is the main polygon, others are holes

 * See Draw3D_SolidHorizontalPolyPolygons for more info

 */

void Draw3D_SolidHorizontalPolygonWithHoles( const std::vector<CPolyPt>& aPolysList,

3d-viewer/modelparsers.h

+2 −1
Original line number Diff line number Diff line
@@ -112,7 +112,8 @@ public: 
     * Function GetNodeProperties

     * Collects all node properties to map.

     *

     * @param aProps contains map of found properties

     * @param aNode is an XML node.

     * @param aProps contains map of found properties.

     */

    static void GetNodeProperties( wxXmlNode* aNode, PROPERTY_MAP& aProps );

TODO.txt

+5 −4
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ WXMAC Platform 
Common

------

* Grep for @TODO or TODO for sourcecode tasks

* Use doxygen compatible comments on member functions (.h files)

* Use Doxygen compatible comments on member functions (.h files)

* Add tooltip text to all non-obvious controls in every dialog window.

  Use wxFormBuilder.

* Component and module search displays in which library the
@@ -113,9 +113,9 @@ const wxString FP_LIB_TABLE::ExpandSubtitutions( const wxString aString ) 






EESchema

Eeschema

--------

* Drag and drop between two EESchema windows.

* Drag and drop between two Eeschema windows.



Wayne:

E3)  Hook up perform last library search hot key to replace search libraries for
@@ -159,5 +159,6 @@ PCBNew 
    of PLUGIN::Footprint*() functions.  At least LEGACY and KICAD are both needed

    concurrently.





*)  Add a hot key to toggle the 45 degree constraint on and off so that it can be

    changed when drawing a trace.

common/CMakeLists.txt

+4 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ set(COMMON_SRCS 
    newstroke_font.cpp

    projet_config.cpp

    ptree.cpp

    reporter.cpp

    richio.cpp

    selcolor.cpp

    string.cpp
@@ -145,6 +146,9 @@ set(PCB_COMMON_SRCS 
    ../pcbnew/class_zone_settings.cpp

    ../pcbnew/classpcb.cpp

    ../pcbnew/collectors.cpp

    ../pcbnew/netlist_reader_common.cpp

    ../pcbnew/netlist_reader_firstformat.cpp

    ../pcbnew/netlist_reader_kicad.cpp

    ../pcbnew/sel_layer.cpp

    ../pcbnew/pcb_plot_params.cpp

    ../pcbnew/io_mgr.cpp

common/dialogs/dialog_page_settings.cpp

+5 −9
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
// the translated and the not translated version.

// when displayed in dialog we should explicitely call wxGetTranslation()

// to show the translated version.

const wxString pageFmts[] =

static const wxString pageFmts[] =

{

    _("A4 210x297mm"),

    _("A3 297x420mm"),
@@ -63,11 +63,10 @@ const wxString pageFmts[] = 
    _("C 17x22in"),

    _("D 22x34in"),

    _("E 34x44in"),

    _("US Letter 8.5x11in"),

    _("US Legal 8.5x14in"),

    _("US Ledger 11x17in"),

    _("USLetter 8.5x11in"),     // USLetter without space is correct

    _("USLegal 8.5x14in"),      // USLegal without space is correct

    _("USLedger 11x17in"),      // USLedger without space is correct

    _("User (Custom)"),

    wxT("")                 // end of list

};



void EDA_DRAW_FRAME::Process_PageSettings( wxCommandEvent& event )
@@ -115,11 +114,8 @@ void DIALOG_PAGES_SETTINGS::initDialog() 
    // The first shows translated strings, the second contains not translated strings

    m_paperSizeComboBox->Clear();



    for( unsigned ii = 0; ; ii++ )

    for( unsigned ii = 0; ii<DIM(pageFmts); ii++ )

    {

        if( pageFmts[ii].IsEmpty() )

            break;



        m_pageFmt.Add( pageFmts[ii] );

        m_paperSizeComboBox->Append( wxGetTranslation( pageFmts[ii] ) );

    }