EESchema find dialog improvements. (82879001) · Commits · Elphel / kicad-source-mirror

eeschema/dialogs/dialog_sch_find.fbp

+58 −1

Original line number	Original line	Diff line number	Diff line
	@@ -93,7 +93,7 @@
	<property name="name">leftSizer</property>		<property name="name">leftSizer</property>
	<property name="orient">wxVERTICAL</property>		<property name="orient">wxVERTICAL</property>
	<property name="permission">none</property>		<property name="permission">none</property>
	<object class="sizeritem" expanded="0">		<object class="sizeritem" expanded="1">
	<property name="border">6</property>		<property name="border">6</property>
	<property name="flag">wxALL\|wxEXPAND</property>		<property name="flag">wxALL\|wxEXPAND</property>
	<property name="proportion">0</property>		<property name="proportion">0</property>
	@@ -921,6 +921,63 @@
	<event name="OnUpdateUI"></event>		<event name="OnUpdateUI"></event>
	</object>		</object>
	</object>		</object>
			<object class="sizeritem" expanded="1">
			<property name="border">6</property>
			<property name="flag">wxBOTTOM\|wxLEFT\|wxRIGHT</property>
			<property name="proportion">0</property>
			<object class="wxCheckBox" expanded="1">
			<property name="bg"></property>
			<property name="checked">0</property>
			<property name="context_help"></property>
			<property name="context_menu">1</property>
			<property name="enabled">1</property>
			<property name="fg"></property>
			<property name="font"></property>
			<property name="hidden">0</property>
			<property name="id">wxID_ANY</property>
			<property name="label">Do not warp cursor to found item</property>
			<property name="maximum_size"></property>
			<property name="minimum_size"></property>
			<property name="name">m_checkNoWarpCursor</property>
			<property name="permission">protected</property>
			<property name="pos"></property>
			<property name="size"></property>
			<property name="style"></property>
			<property name="subclass"></property>
			<property name="tooltip"></property>
			<property name="validator_data_type"></property>
			<property name="validator_style">wxFILTER_NONE</property>
			<property name="validator_type">wxDefaultValidator</property>
			<property name="validator_variable"></property>
			<property name="window_extra_style"></property>
			<property name="window_name"></property>
			<property name="window_style"></property>
			<event name="OnChar"></event>
			<event name="OnCheckBox"></event>
			<event name="OnEnterWindow"></event>
			<event name="OnEraseBackground"></event>
			<event name="OnKeyDown"></event>
			<event name="OnKeyUp"></event>
			<event name="OnKillFocus"></event>
			<event name="OnLeaveWindow"></event>
			<event name="OnLeftDClick"></event>
			<event name="OnLeftDown"></event>
			<event name="OnLeftUp"></event>
			<event name="OnMiddleDClick"></event>
			<event name="OnMiddleDown"></event>
			<event name="OnMiddleUp"></event>
			<event name="OnMotion"></event>
			<event name="OnMouseEvents"></event>
			<event name="OnMouseWheel"></event>
			<event name="OnPaint"></event>
			<event name="OnRightDClick"></event>
			<event name="OnRightDown"></event>
			<event name="OnRightUp"></event>
			<event name="OnSetFocus"></event>
			<event name="OnSize"></event>
			<event name="OnUpdateUI"></event>
			</object>
			</object>
	</object>		</object>
	</object>		</object>
	<object class="sizeritem" expanded="1">		<object class="sizeritem" expanded="1">

eeschema/dialogs/dialog_schematic_find.cpp

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25,6 +25,7 @@ DIALOG_SCH_FIND::DIALOG_SCH_FIND( wxWindow* aParent, wxFindReplaceData* aData,
	m_radioBackward->SetValue( ( flags & wxFR_DOWN ) == 0 );		m_radioBackward->SetValue( ( flags & wxFR_DOWN ) == 0 );
	m_checkMatchCase->SetValue( flags & wxFR_MATCHCASE );		m_checkMatchCase->SetValue( flags & wxFR_MATCHCASE );
	m_checkWholeWord->SetValue( flags & wxFR_WHOLEWORD );		m_checkWholeWord->SetValue( flags & wxFR_WHOLEWORD );
			m_checkNoWarpCursor->SetValue( flags & FR_NO_WARP_CURSOR );

	/* Whole word and wild card searches are mutually exclusive. */		/* Whole word and wild card searches are mutually exclusive. */
	if( !( flags & wxFR_WHOLEWORD ) )		if( !( flags & wxFR_WHOLEWORD ) )
	@@ -131,6 +132,9 @@ void DIALOG_SCH_FIND::SendEvent( const wxEventType& aEventType )
	if( m_checkCurrentSheetOnly->GetValue() )		if( m_checkCurrentSheetOnly->GetValue() )
	flags \|= FR_CURRENT_SHEET_ONLY;		flags \|= FR_CURRENT_SHEET_ONLY;

			if( m_checkNoWarpCursor->GetValue() )
			flags \|= FR_NO_WARP_CURSOR;

	m_findReplaceData->SetFindString( event.GetFindString() );		m_findReplaceData->SetFindString( event.GetFindString() );

	if( HasFlag( wxFR_REPLACEDIALOG )		if( HasFlag( wxFR_REPLACEDIALOG )

eeschema/dialogs/dialog_schematic_find.h

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -38,7 +38,10 @@ enum SchematicFindReplaceFlags
	FR_MATCH_WILDCARD = wxFR_MATCHCASE << 4,		FR_MATCH_WILDCARD = wxFR_MATCHCASE << 4,

	/* Wrap around the beginning or end of search list. */		/* Wrap around the beginning or end of search list. */
	FR_SEARCH_WRAP = wxFR_MATCHCASE << 5		FR_SEARCH_WRAP = wxFR_MATCHCASE << 5,

			/* Don't warp cursor to found item until the dialog is closed. */
			FR_NO_WARP_CURSOR = wxFR_MATCHCASE << 6
	};		};

eeschema/dialogs/dialog_schematic_find_base.cpp

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -89,6 +89,9 @@ DIALOG_SCH_FIND_BASE::DIALOG_SCH_FIND_BASE( wxWindow* parent, wxWindowID id, con
	m_checkCurrentSheetOnly = new wxCheckBox( this, wxID_ANY, _("Search the current sheet on&ly"), wxDefaultPosition, wxDefaultSize, 0 );		m_checkCurrentSheetOnly = new wxCheckBox( this, wxID_ANY, _("Search the current sheet on&ly"), wxDefaultPosition, wxDefaultSize, 0 );
	leftSizer->Add( m_checkCurrentSheetOnly, 0, wxBOTTOM\|wxLEFT\|wxRIGHT, 6 );		leftSizer->Add( m_checkCurrentSheetOnly, 0, wxBOTTOM\|wxLEFT\|wxRIGHT, 6 );

			m_checkNoWarpCursor = new wxCheckBox( this, wxID_ANY, _("Do not warp cursor to found item"), wxDefaultPosition, wxDefaultSize, 0 );
			leftSizer->Add( m_checkNoWarpCursor, 0, wxBOTTOM\|wxLEFT\|wxRIGHT, 6 );

	mainSizer->Add( leftSizer, 1, wxALL\|wxEXPAND, 6 );		mainSizer->Add( leftSizer, 1, wxALL\|wxEXPAND, 6 );

	wxBoxSizer* rightSizer;		wxBoxSizer* rightSizer;

eeschema/dialogs/dialog_schematic_find_base.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -48,6 +48,7 @@ class DIALOG_SCH_FIND_BASE : public wxDialog
	wxCheckBox* m_checkAllFields;		wxCheckBox* m_checkAllFields;
	wxCheckBox* m_checkAllPins;		wxCheckBox* m_checkAllPins;
	wxCheckBox* m_checkCurrentSheetOnly;		wxCheckBox* m_checkCurrentSheetOnly;
			wxCheckBox* m_checkNoWarpCursor;
	wxButton* m_buttonFind;		wxButton* m_buttonFind;
	wxButton* m_buttonReplace;		wxButton* m_buttonReplace;
	wxButton* m_buttonReplaceAll;		wxButton* m_buttonReplaceAll;

Admin message