work on libedit continued. (44132214) · Commits · Elphel / kicad-source-mirror

common/base_screen.cpp

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -65,7 +65,7 @@ void BASE_SCREEN::InitDatas()
	m_Curseur.y = ReturnPageSize().y / 2;		m_Curseur.y = ReturnPageSize().y / 2;
	}		}

	m_O_Curseur = m_Curseur;		m_O_Curseur.x = m_O_Curseur.y = 0;

	SetCurItem( NULL );		SetCurItem( NULL );

	@@ -451,13 +451,13 @@ void BASE_SCREEN::AddGrid( const wxRealPoint& size, int units, int id )

	if( units == MILLIMETRE )		if( units == MILLIMETRE )
	{		{
	x = size.x / 25.4000508001016;		x = size.x / 25.4;
	y = size.y / 25.4000508001016;		y = size.y / 25.4;
	}		}
	else if( units == CENTIMETRE )		else if( units == CENTIMETRE )
	{		{
	x = size.x / 2.54000508001016;		x = size.x / 2.54;
	y = size.y / 2.54000508001016;		y = size.y / 2.54;
	}		}
	else		else
	{		{

common/basicframe.cpp

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -88,7 +88,6 @@ void WinEDA_BasicFrame::SetLanguage( wxCommandEvent& event )
	wxGetApp().SetLanguageIdentifier( id );		wxGetApp().SetLanguageIdentifier( id );
	if ( wxGetApp().SetLanguage() )		if ( wxGetApp().SetLanguage() )
	{		{
	wxLogDebug( wxT( "Recreating menu bar due to language change." ) );
	ReCreateMenuBar();		ReCreateMenuBar();
	Refresh();		Refresh();
	}		}

common/zoom.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -247,10 +247,10 @@ void WinEDA_DrawFrame::AddMenuZoomAndGrid( wxMenu* MasterMenu )
	else		else
	{		{
	if( g_UnitMetric == 0 ) // inches		if( g_UnitMetric == 0 ) // inches
	msg.Printf( wxT( "%.1f mils, (%.3f mm)" ),		msg.Printf( wxT( "%.1f mils\t(%.3f mm)" ),
	gridValueInch * 1000, gridValue_mm );		gridValueInch * 1000, gridValue_mm );
	else		else
	msg.Printf( wxT( "%.3f mm, (%.1f mils)" ),		msg.Printf( wxT( "%.3f mm\t(%.1f mils)" ),
	gridValue_mm, gridValueInch * 1000 );		gridValue_mm, gridValueInch * 1000 );
	}		}
	gridMenu->Append( tmp.m_Id, msg, wxEmptyString, true );		gridMenu->Append( tmp.m_Id, msg, wxEmptyString, true );

eeschema/CMakeLists.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -56,6 +56,8 @@ set(EESCHEMA_SRCS
	dialog_eeschema_options.cpp		dialog_eeschema_options.cpp
	dialog_erc.cpp		dialog_erc.cpp
	dialog_erc_base.cpp		dialog_erc_base.cpp
			dialog_libedit_dimensions.cpp
			dialog_libedit_dimensions_base.cpp
	dialog_lib_edit_draw_item.cpp		dialog_lib_edit_draw_item.cpp
	dialog_lib_edit_draw_item_base.cpp		dialog_lib_edit_draw_item_base.cpp
	dialog_lib_edit_pin.cpp		dialog_lib_edit_pin.cpp

eeschema/dialog_eeschema_config.cpp

+15 −5

Original line number	Original line	Diff line number	Diff line
	@@ -46,24 +46,34 @@ private:


	public:		public:
	DIALOG_EESCHEMA_CONFIG( WinEDA_SchematicFrame * parent );		DIALOG_EESCHEMA_CONFIG( WinEDA_SchematicFrame * parent, WinEDA_DrawFrame * activeWindow );
	~DIALOG_EESCHEMA_CONFIG() {};		~DIALOG_EESCHEMA_CONFIG() {};
	};		};


	/******************************************************************/		/******************************************************************/
	void WinEDA_SchematicFrame::InstallConfigFrame( const wxPoint& pos )		void WinEDA_SchematicFrame::InstallConfigFrame( wxCommandEvent& event )
	/******************************************************************/		/******************************************************************/
	{		{
	DIALOG_EESCHEMA_CONFIG CfgFrame( this );		DIALOG_EESCHEMA_CONFIG CfgFrame( this, this );

	CfgFrame.ShowModal();		CfgFrame.ShowModal();
	}		}


			/******************************************************************/
			void WinEDA_LibeditFrame::InstallConfigFrame( wxCommandEvent& event )
			/******************************************************************/
			{
			DIALOG_EESCHEMA_CONFIG CfgFrame( (WinEDA_SchematicFrame *)GetParent(), this );

			CfgFrame.ShowModal();
			}

	/*******************************************************************************/		/*******************************************************************************/
	DIALOG_EESCHEMA_CONFIG::DIALOG_EESCHEMA_CONFIG( WinEDA_SchematicFrame* parent )		DIALOG_EESCHEMA_CONFIG::DIALOG_EESCHEMA_CONFIG( WinEDA_SchematicFrame* parent,
	: DIALOG_EESCHEMA_CONFIG_FBP( parent )		WinEDA_DrawFrame * activeWindow )
			: DIALOG_EESCHEMA_CONFIG_FBP( activeWindow )
	/*******************************************************************************/		/*******************************************************************************/
	{		{
	wxString msg;		wxString msg;

Admin message