Commit 2b453357 authored by Andrey Fedorushkov's avatar Andrey Fedorushkov
Browse files

bitmap2component: fix localize GUI, fix *nix native string

parent 6f33e6da

bitmap2component/CMakeLists.txt

+51 −50
Original line number Original line Diff line number Diff line 
include_directories(${CMAKE_CURRENT_SOURCE_DIR}

include_directories(${CMAKE_CURRENT_SOURCE_DIR}

                    ../potrace

                    ../potrace

                    ../polygon/kbool/include

                    ../polygon/kbool/include

                    ${CMAKE_SOURCE_DIR}/common

                    )

                    )





set(BITMAP2COMPONENT_SRCS

set(BITMAP2COMPONENT_SRCS
@@ -39,7 +40,7 @@ if(APPLE) 
        ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)

        ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)

endif(APPLE)

endif(APPLE)





target_link_libraries( bitmap2component

target_link_libraries( bitmap2component common polygon bitmaps

                        ${wxWidgets_LIBRARIES}

                        ${wxWidgets_LIBRARIES}

                        potrace

                        potrace

                        kbool )

                        kbool )

bitmap2component/bitmap2cmp_gui.cpp

+16 −8
Original line number Original line Diff line number Diff line
@@ -21,6 +21,13 @@ 
 * or you may write to the Free Software Foundation, Inc.,

 * or you may write to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA

 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA

 */

 */

#include "fctsys.h"

#include "appl_wxstruct.h"

#include "wxstruct.h"

#include "common.h"

#include "confirm.h"

#include "gestfich.h"



#include "wx/wx.h"

#include "wx/wx.h"

#include "wx/config.h"

#include "wx/config.h"

#include "wx/filename.h"

#include "wx/filename.h"
@@ -32,6 +39,9 @@ 




#include "bitmap2component.xpm"

#include "bitmap2component.xpm"





#include "bitmaps.h"

#include "colors_selection.h"

#include "build_version.h"





#define KEYWORD_FRAME_POSX wxT( "Bmconverter_Pos_x" )

#define KEYWORD_FRAME_POSX wxT( "Bmconverter_Pos_x" )

#define KEYWORD_FRAME_POSY wxT( "Bmconverter_Pos_y" )

#define KEYWORD_FRAME_POSY wxT( "Bmconverter_Pos_y" )
@@ -367,27 +377,25 @@ void BM2CMP_FRAME::ExportFile( FILE* aOutfile, int aFormat ) 




// BM_TO_CMP_APP

// BM_TO_CMP_APP





class BM_TO_CMP_APP : public wxApp

void WinEDA_App::MacOpenFile(const wxString &fileName)

{

{

public:

}

    virtual bool OnInit();

};







IMPLEMENT_APP( BM_TO_CMP_APP )

IMPLEMENT_APP( WinEDA_App )





///-----------------------------------------------------------------------------

///-----------------------------------------------------------------------------

// BM_TO_CMP_APP

// BM_TO_CMP_APP

// main program

// main program

//-----------------------------------------------------------------------------

//-----------------------------------------------------------------------------





bool BM_TO_CMP_APP::OnInit()

bool WinEDA_App::OnInit()

{

{

    wxInitAllImageHandlers();

    wxInitAllImageHandlers();





    SetVendorName( wxT( "kicad" ) );

    InitEDA_Appl( wxT( "BMP2CMP" ) );





    wxFrame* frame = new BM2CMP_FRAME();

    wxFrame* frame = new BM2CMP_FRAME();

    SetTopWindow( frame );

    frame->Show( true );

    frame->Show( true );





    return true;

    return true;