New patch for kicad about dialog (44269729) · Commits · Elphel / kicad-source-mirror

common/dialog_about/AboutDialog_main.cpp

+316 −316

Original line number	Diff line number	Diff line
		@@ -5,9 +5,11 @@
		* Created: 2010-08-06
		* Copyright: Rafael Sokolowski ()
		* License:
		**************************************************************/# include "dialog_about.h"
		**************************************************************/
		#include "dialog_about.h"
		#include "aboutinfo.h"
		#include <wx/aboutdlg.h>
		#include <wx/textctrl.h>


		/* Used icons:
		@@ -17,8 +19,9 @@
		* kicad_icon_xpm[]; // Icon of the application
		*/
		#include "bitmaps.h"


		#include "wxstruct.h"
		#include "common.h"
		#include "appl_wxstruct.h"
		#include "build_version.h"


		@@ -37,21 +40,18 @@ static wxString HtmlNewline( const unsigned int amount = 1 );
		*/
		static void InitKiCadAboutNew( AboutAppInfo& info )
		{
		/* set application specific icon */
		/* Set application specific icon */

		// COULD BE: use another function call to get appropriate icon; its hardcoded because there is no top level window existing here
		// do something like:
		// wxTheApp->GetTopWindow()->GetIcon() ??? or...
		// const wxTopLevelWindow * const tlw = wxDynamicCast(::wxGetApp().GetTopWindow(), wxTopLevelWindow); ???
		// if( tlw ) info.SetIcon( tlw->GetIcon() ); ???
		const wxTopLevelWindow * const tlw = wxDynamicCast(::wxGetApp().GetTopWindow(), wxTopLevelWindow);
		if( tlw )
		info.SetIcon( tlw->GetIcon() );
		else
		info.SetIcon( kicad_icon_xpm );

		/* Set title */
		info.SetAppName( wxT( ".: " ) + wxGetApp().GetTitle() + wxT( " :." ) );

		// COULD BE: info.SetAppName( wxT( ".: " ) + wxGetApp().GetTitle() + wxT( " :." ) );
		info.SetAppName( wxT( ".: KiCad :." ) );

		/* copyright information */
		/* Copyright information */
		info.SetCopyright( wxT( "(C) 1992-2010 KiCad Developers Team" ) );

		/* KiCad build version */

common/dialog_about/dialog_about_base.cpp

+16 −10

Original line number	Diff line number	Diff line
		@@ -19,31 +19,37 @@ dialog_about_base::dialog_about_base( wxWindow* parent, wxWindowID id, const wxS
		wxBoxSizer* bSizer3;
		bSizer3 = new wxBoxSizer( wxHORIZONTAL );


		bSizer3->Add( 0, 0, 1, wxEXPAND, 5 );

		m_bitmapApp = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
		bSizer3->Add( m_bitmapApp, 0, wxALIGN_CENTER\|wxALL, 5 );
		bSizer3->Add( m_bitmapApp, 1, wxALIGN_CENTER\|wxALL, 5 );

		wxBoxSizer* b_apptitleSizer;
		b_apptitleSizer = new wxBoxSizer( wxVERTICAL );

		m_staticTextAppTitle = new wxStaticText( this, wxID_ANY, _("App Title"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE\|wxST_NO_AUTORESIZE );
		m_staticTextAppTitle = new wxStaticText( this, wxID_ANY, _("App Title"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
		m_staticTextAppTitle->Wrap( -1 );
		m_staticTextAppTitle->SetFont( wxFont( 14, 70, 90, 92, false, wxEmptyString ) );

		b_apptitleSizer->Add( m_staticTextAppTitle, 0, wxALIGN_CENTER\|wxALL\|wxEXPAND, 5 );
		b_apptitleSizer->Add( m_staticTextAppTitle, 0, wxALIGN_CENTER\|wxALL, 5 );

		m_staticTextCopyright = new wxStaticText( this, wxID_ANY, _("Copyright Info"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE\|wxST_NO_AUTORESIZE );
		m_staticTextCopyright = new wxStaticText( this, wxID_ANY, _("Copyright Info"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
		m_staticTextCopyright->Wrap( -1 );
		b_apptitleSizer->Add( m_staticTextCopyright, 0, wxALIGN_CENTER\|wxALL\|wxEXPAND, 1 );
		b_apptitleSizer->Add( m_staticTextCopyright, 0, wxALIGN_CENTER\|wxALL, 1 );

		m_staticTextBuildVersion = new wxStaticText( this, wxID_ANY, _("Build Version Info"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE\|wxST_NO_AUTORESIZE );
		m_staticTextBuildVersion = new wxStaticText( this, wxID_ANY, _("Build Version Info"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
		m_staticTextBuildVersion->Wrap( -1 );
		b_apptitleSizer->Add( m_staticTextBuildVersion, 0, wxALIGN_CENTER_HORIZONTAL\|wxEXPAND\|wxTOP\|wxRIGHT\|wxLEFT, 5 );
		b_apptitleSizer->Add( m_staticTextBuildVersion, 0, wxALIGN_CENTER\|wxLEFT\|wxRIGHT\|wxTOP, 5 );

		m_staticTextLibVersion = new wxStaticText( this, wxID_ANY, _("Lib Version Info"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE\|wxST_NO_AUTORESIZE );
		m_staticTextLibVersion = new wxStaticText( this, wxID_ANY, _("Lib Version Info"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
		m_staticTextLibVersion->Wrap( -1 );
		b_apptitleSizer->Add( m_staticTextLibVersion, 0, wxALIGN_CENTER_HORIZONTAL\|wxBOTTOM\|wxRIGHT\|wxLEFT\|wxEXPAND, 5 );
		b_apptitleSizer->Add( m_staticTextLibVersion, 0, wxALIGN_CENTER\|wxBOTTOM\|wxLEFT\|wxRIGHT, 5 );

		bSizer3->Add( b_apptitleSizer, 10, wxEXPAND, 5 );


		bSizer3->Add( b_apptitleSizer, 1, wxEXPAND, 5 );
		bSizer3->Add( 0, 0, 2, wxEXPAND, 5 );

		bSizer1->Add( bSizer3, 0, wxEXPAND, 5 );

common/dialog_about/dialog_about_base.fbp

+30 −10

Original line number	Diff line number	Diff line
		@@ -84,10 +84,20 @@
		<property name="name">bSizer3</property>
		<property name="orient">wxHORIZONTAL</property>
		<property name="permission">none</property>
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxEXPAND</property>
		<property name="proportion">1</property>
		<object class="spacer" expanded="1">
		<property name="height">0</property>
		<property name="permission">protected</property>
		<property name="width">0</property>
		</object>
		</object>
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxALIGN_CENTER\|wxALL</property>
		<property name="proportion">0</property>
		<property name="proportion">1</property>
		<object class="wxStaticBitmap" expanded="1">
		<property name="bg"></property>
		<property name="bitmap"></property>
		@@ -136,7 +146,7 @@
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxEXPAND</property>
		<property name="proportion">1</property>
		<property name="proportion">10</property>
		<object class="wxBoxSizer" expanded="1">
		<property name="minimum_size"></property>
		<property name="name">b_apptitleSizer</property>
		@@ -144,7 +154,7 @@
		<property name="permission">none</property>
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxALIGN_CENTER\|wxALL\|wxEXPAND</property>
		<property name="flag">wxALIGN_CENTER\|wxALL</property>
		<property name="proportion">0</property>
		<object class="wxStaticText" expanded="1">
		<property name="bg"></property>
		@@ -161,7 +171,7 @@
		<property name="permission">protected</property>
		<property name="pos"></property>
		<property name="size"></property>
		<property name="style">wxALIGN_CENTRE\|wxST_NO_AUTORESIZE</property>
		<property name="style">wxALIGN_CENTRE</property>
		<property name="subclass"></property>
		<property name="tooltip"></property>
		<property name="window_extra_style"></property>
		@@ -195,7 +205,7 @@
		</object>
		<object class="sizeritem" expanded="1">
		<property name="border">1</property>
		<property name="flag">wxALIGN_CENTER\|wxALL\|wxEXPAND</property>
		<property name="flag">wxALIGN_CENTER\|wxALL</property>
		<property name="proportion">0</property>
		<object class="wxStaticText" expanded="1">
		<property name="bg"></property>
		@@ -212,7 +222,7 @@
		<property name="permission">protected</property>
		<property name="pos"></property>
		<property name="size"></property>
		<property name="style">wxALIGN_CENTRE\|wxST_NO_AUTORESIZE</property>
		<property name="style">wxALIGN_CENTRE</property>
		<property name="subclass"></property>
		<property name="tooltip"></property>
		<property name="window_extra_style"></property>
		@@ -246,7 +256,7 @@
		</object>
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxALIGN_CENTER_HORIZONTAL\|wxEXPAND\|wxTOP\|wxRIGHT\|wxLEFT</property>
		<property name="flag">wxALIGN_CENTER\|wxLEFT\|wxRIGHT\|wxTOP</property>
		<property name="proportion">0</property>
		<object class="wxStaticText" expanded="1">
		<property name="bg"></property>
		@@ -263,7 +273,7 @@
		<property name="permission">protected</property>
		<property name="pos"></property>
		<property name="size"></property>
		<property name="style">wxALIGN_CENTRE\|wxST_NO_AUTORESIZE</property>
		<property name="style">wxALIGN_CENTRE</property>
		<property name="subclass"></property>
		<property name="tooltip"></property>
		<property name="window_extra_style"></property>
		@@ -297,7 +307,7 @@
		</object>
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxALIGN_CENTER_HORIZONTAL\|wxBOTTOM\|wxRIGHT\|wxLEFT\|wxEXPAND</property>
		<property name="flag">wxALIGN_CENTER\|wxBOTTOM\|wxLEFT\|wxRIGHT</property>
		<property name="proportion">0</property>
		<object class="wxStaticText" expanded="1">
		<property name="bg"></property>
		@@ -314,7 +324,7 @@
		<property name="permission">protected</property>
		<property name="pos"></property>
		<property name="size"></property>
		<property name="style">wxALIGN_CENTRE\|wxST_NO_AUTORESIZE</property>
		<property name="style">wxALIGN_CENTRE</property>
		<property name="subclass"></property>
		<property name="tooltip"></property>
		<property name="window_extra_style"></property>
		@@ -348,6 +358,16 @@
		</object>
		</object>
		</object>
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxEXPAND</property>
		<property name="proportion">2</property>
		<object class="spacer" expanded="1">
		<property name="height">0</property>
		<property name="permission">protected</property>
		<property name="width">0</property>
		</object>
		</object>
		</object>
		</object>
		<object class="sizeritem" expanded="1">

common/dialog_about/dialog_about_base.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -37,11 +37,13 @@ class dialog_about_base : public wxDialog
		wxButton* m_buttonOK;

		protected:

		wxStaticBitmap* m_bitmapApp;
		wxStaticText* m_staticTextAppTitle;
		wxStaticText* m_staticTextCopyright;
		wxStaticText* m_staticTextBuildVersion;
		wxStaticText* m_staticTextLibVersion;

		wxAuiNotebook* m_auiNotebook;

		// Virtual event handlers, overide them in your derived class

pcbnew/onrightclick.cpp

+15 −8

Original line number	Diff line number	Diff line
		@@ -421,15 +421,17 @@ void WinEDA_PcbFrame::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu )
		{
		if( Track->IsPointOnEnds( cursorPosition, -1 ) != 0 )
		{
		msg = AddHotkeyName( _( "Move Node" ), s_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM );
		ADD_MENUITEM( PopMenu, ID_POPUP_PCB_MOVE_TRACK_NODE,
		_( "Move Node" ), move_xpm );
		msg, move_xpm );
		}
		else
		{
		ADD_MENUITEM( PopMenu, ID_POPUP_PCB_DRAG_TRACK_SEGMENT_KEEP_SLOPE,
		_( "Drag Segments, Keep Slope" ), drag_segment_withslope_xpm );
		msg = AddHotkeyName( _( "Drag Segment" ), s_Board_Editor_Hokeys_Descr, HK_DRAG_ITEM );
		ADD_MENUITEM( PopMenu, ID_POPUP_PCB_DRAG_TRACK_SEGMENT,
		_( "Drag Segment" ), drag_track_segment_xpm );
		msg, drag_track_segment_xpm );
		ADD_MENUITEM( PopMenu, ID_POPUP_PCB_BREAK_TRACK,
		_( "Break Track" ), break_line_xpm );
		}
		@@ -483,10 +485,6 @@ void WinEDA_PcbFrame::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu )
		ADD_MENUITEM_WITH_SUBMENU( PopMenu, Append_Track_Width_List( GetBoard() ),
		ID_POPUP_PCB_SELECT_WIDTH,
		_( "Select Track Width" ), width_track_xpm );
		PopMenu->AppendSeparator();
		ADD_MENUITEM( PopMenu, ID_POPUP_PCB_EDIT_ALL_VIAS_AND_TRACK_SIZE,
		_( "Global Tracks and Vias Edition" ), width_track_via_xpm );
		PopMenu->AppendSeparator();
		}

		else // Allows switching to an other track/via size when routing
		@@ -494,10 +492,10 @@ void WinEDA_PcbFrame::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu )
		ADD_MENUITEM_WITH_SUBMENU( PopMenu, Append_Track_Width_List( GetBoard() ),
		ID_POPUP_PCB_SELECT_WIDTH,
		_( "Select Track Width" ), width_track_xpm );
		PopMenu->AppendSeparator();
		}

		// Delete control:
		PopMenu->AppendSeparator();
		wxMenu* track_mnu = new wxMenu;
		ADD_MENUITEM_WITH_SUBMENU( PopMenu, track_mnu,
		ID_POPUP_PCB_DELETE_TRACK_MNU, _( "Delete" ), delete_xpm );
		@@ -516,6 +514,16 @@ void WinEDA_PcbFrame::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu )
		ADD_MENUITEM( track_mnu, ID_POPUP_PCB_DELETE_TRACKNET,
		_( "Delete Net" ), delete_net_xpm );
		}

		// Add global edition command
		if( !flags )
		{
		PopMenu->AppendSeparator();
		ADD_MENUITEM( PopMenu, ID_POPUP_PCB_EDIT_ALL_VIAS_AND_TRACK_SIZE,
		_( "Global Tracks and Vias Edition" ), width_track_via_xpm );
		}

		// Add lock/unlock flags menu:
		track_mnu = new wxMenu;

		ADD_MENUITEM_WITH_SUBMENU( PopMenu, track_mnu,
		@@ -530,7 +538,6 @@ void WinEDA_PcbFrame::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu )

		if( !flags )
		{
		track_mnu->AppendSeparator();
		track_mnu->Append( ID_POPUP_PCB_LOCK_ON_TRACK, _( "Track Locked: Yes" ) );
		track_mnu->Append( ID_POPUP_PCB_LOCK_OFF_TRACK, _( "Track Locked: No" ) );
		track_mnu->AppendSeparator();

Admin message