Fix minor aesthetic issues in dialogs (these minor issues (overlapping... (2a4d0bad) · Commits · Elphel / kicad-source-mirror

eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -73,7 +73,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
	chipnameTextCtrl->SetMaxLength( 32 );		chipnameTextCtrl->SetMaxLength( 32 );
	chipnameTextCtrl->SetToolTip( _("The name of the symbol in the library from which this component came") );		chipnameTextCtrl->SetToolTip( _("The name of the symbol in the library from which this component came") );

	sbSizerChipName->Add( chipnameTextCtrl, 0, wxEXPAND\|wxBOTTOM, 5 );		sbSizerChipName->Add( chipnameTextCtrl, 0, wxEXPAND\|wxTOP\|wxBOTTOM, 5 );

	wxBoxSizer* bSizerChpinameButt;		wxBoxSizer* bSizerChpinameButt;
	bSizerChpinameButt = new wxBoxSizer( wxHORIZONTAL );		bSizerChpinameButt = new wxBoxSizer( wxHORIZONTAL );
	@@ -211,7 +211,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
	fieldValueTextCtrl->SetMaxLength( 0 );		fieldValueTextCtrl->SetMaxLength( 0 );
	fieldValueTextCtrl->SetToolTip( _("The name of the currently selected field\nSome fixed fields names are not editable") );		fieldValueTextCtrl->SetToolTip( _("The name of the currently selected field\nSome fixed fields names are not editable") );

	fieldNameBoxSizer->Add( fieldValueTextCtrl, 0, wxEXPAND, 5 );		fieldNameBoxSizer->Add( fieldValueTextCtrl, 0, wxEXPAND\|wxBOTTOM, 5 );

	m_show_datasheet_button = new wxButton( this, wxID_ANY, _("Show in Browser"), wxDefaultPosition, wxDefaultSize, 0 );		m_show_datasheet_button = new wxButton( this, wxID_ANY, _("Show in Browser"), wxDefaultPosition, wxDefaultSize, 0 );
	m_show_datasheet_button->SetToolTip( _("If your datasheet is an http:// link or a complete file path, then it may show in your browser by pressing this button.") );		m_show_datasheet_button->SetToolTip( _("If your datasheet is an http:// link or a complete file path, then it may show in your browser by pressing this button.") );

eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp

+3 −3

eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -100,7 +100,7 @@ class DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP : public DIALOG_SHIM

	public:		public:

	DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Component Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 677,586 ), long style = wxCAPTION\|wxCLOSE_BOX\|wxDEFAULT_DIALOG_STYLE\|wxMAXIMIZE_BOX\|wxMINIMIZE_BOX\|wxRESIZE_BORDER\|wxSYSTEM_MENU );		DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Component Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 688,586 ), long style = wxCAPTION\|wxCLOSE_BOX\|wxDEFAULT_DIALOG_STYLE\|wxMAXIMIZE_BOX\|wxMINIMIZE_BOX\|wxRESIZE_BORDER\|wxSYSTEM_MENU );
	~DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP();		~DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP();

	};		};

pcbnew/dialogs/dialog_fp_lib_table.cpp

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -514,7 +514,7 @@ private:
	m_cur_grid = ( m_pageNdx == 0 ) ? m_global_grid : m_project_grid;		m_cur_grid = ( m_pageNdx == 0 ) ? m_global_grid : m_project_grid;
	}		}

	void appendRowHandler( wxMouseEvent& event )		void appendRowHandler( wxCommandEvent& event )
	{		{
	if( m_cur_grid->AppendRows( 1 ) )		if( m_cur_grid->AppendRows( 1 ) )
	{		{
	@@ -527,7 +527,7 @@ private:
	}		}
	}		}

	void deleteRowHandler( wxMouseEvent& event )		void deleteRowHandler( wxCommandEvent& event )
	{		{
	#if 1		#if 1
	int currRow = getCursorRow();		int currRow = getCursorRow();
	@@ -564,7 +564,7 @@ private:
	#endif		#endif
	}		}

	void moveUpHandler( wxMouseEvent& event )		void moveUpHandler( wxCommandEvent& event )
	{		{
	int curRow = getCursorRow();		int curRow = getCursorRow();
	if( curRow >= 1 )		if( curRow >= 1 )
	@@ -596,7 +596,7 @@ private:
	}		}
	}		}

	void moveDownHandler( wxMouseEvent& event )		void moveDownHandler( wxCommandEvent& event )
	{		{
	FP_TBL_MODEL* tbl = cur_model();		FP_TBL_MODEL* tbl = cur_model();

	@@ -628,7 +628,7 @@ private:
	}		}
	}		}

	void optionsEditor( wxMouseEvent& event )		void optionsEditor( wxCommandEvent& event )
	{		{
	FP_TBL_MODEL* tbl = cur_model();		FP_TBL_MODEL* tbl = cur_model();

pcbnew/dialogs/dialog_fp_lib_table_base.cpp

+21 −21

Original line number	Original line	Diff line number	Diff line
	@@ -44,7 +44,7 @@
	<property name="minimum_size"></property>		<property name="minimum_size"></property>
	<property name="name">DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP</property>		<property name="name">DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP</property>
	<property name="pos"></property>		<property name="pos"></property>
	<property name="size">677,586</property>		<property name="size">688,586</property>
	<property name="style">wxCAPTION\|wxCLOSE_BOX\|wxDEFAULT_DIALOG_STYLE\|wxMAXIMIZE_BOX\|wxMINIMIZE_BOX\|wxRESIZE_BORDER\|wxSYSTEM_MENU</property>		<property name="style">wxCAPTION\|wxCLOSE_BOX\|wxDEFAULT_DIALOG_STYLE\|wxMAXIMIZE_BOX\|wxMINIMIZE_BOX\|wxRESIZE_BORDER\|wxSYSTEM_MENU</property>
	<property name="subclass">DIALOG_SHIM; dialog_shim.h</property>		<property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
	<property name="title">Component Properties</property>		<property name="title">Component Properties</property>
	@@ -744,7 +744,7 @@
	<event name="OnUpdateUI"></event>		<event name="OnUpdateUI"></event>
	<object class="sizeritem" expanded="0">		<object class="sizeritem" expanded="0">
	<property name="border">5</property>		<property name="border">5</property>
	<property name="flag">wxEXPAND\|wxBOTTOM</property>		<property name="flag">wxEXPAND\|wxTOP\|wxBOTTOM</property>
	<property name="proportion">0</property>		<property name="proportion">0</property>
	<object class="wxTextCtrl" expanded="0">		<object class="wxTextCtrl" expanded="0">
	<property name="BottomDockable">1</property>		<property name="BottomDockable">1</property>
	@@ -2521,7 +2521,7 @@
	</object>		</object>
	<object class="sizeritem" expanded="0">		<object class="sizeritem" expanded="0">
	<property name="border">5</property>		<property name="border">5</property>
	<property name="flag">wxEXPAND</property>		<property name="flag">wxEXPAND\|wxBOTTOM</property>
	<property name="proportion">0</property>		<property name="proportion">0</property>
	<object class="wxTextCtrl" expanded="0">		<object class="wxTextCtrl" expanded="0">
	<property name="BottomDockable">1</property>		<property name="BottomDockable">1</property>

Original line number	Original line	Diff line number	Diff line
	@@ -206,14 +206,14 @@ DIALOG_FP_LIB_TABLE_BASE::DIALOG_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID
	wxBoxSizer* m_bottom_sizer;		wxBoxSizer* m_bottom_sizer;
	m_bottom_sizer = new wxBoxSizer( wxVERTICAL );		m_bottom_sizer = new wxBoxSizer( wxVERTICAL );

	m_sdbSizer1 = new wxStdDialogButtonSizer();		m_sdbSizer = new wxStdDialogButtonSizer();
	m_sdbSizer1OK = new wxButton( this, wxID_OK );		m_sdbSizerOK = new wxButton( this, wxID_OK );
	m_sdbSizer1->AddButton( m_sdbSizer1OK );		m_sdbSizer->AddButton( m_sdbSizerOK );
	m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL );		m_sdbSizerCancel = new wxButton( this, wxID_CANCEL );
	m_sdbSizer1->AddButton( m_sdbSizer1Cancel );		m_sdbSizer->AddButton( m_sdbSizerCancel );
	m_sdbSizer1->Realize();		m_sdbSizer->Realize();

	m_bottom_sizer->Add( m_sdbSizer1, 0, wxALL\|wxEXPAND, 5 );		m_bottom_sizer->Add( m_sdbSizer, 0, wxALL\|wxEXPAND, 5 );


	bSizer1->Add( m_bottom_sizer, 0, wxEXPAND, 5 );		bSizer1->Add( m_bottom_sizer, 0, wxEXPAND, 5 );
	@@ -228,14 +228,14 @@ DIALOG_FP_LIB_TABLE_BASE::DIALOG_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID
	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_FP_LIB_TABLE_BASE::onCancelCaptionButtonClick ) );		this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_FP_LIB_TABLE_BASE::onCancelCaptionButtonClick ) );
	this->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( DIALOG_FP_LIB_TABLE_BASE::onKeyDown ) );		this->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( DIALOG_FP_LIB_TABLE_BASE::onKeyDown ) );
	m_auinotebook->Connect( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, wxAuiNotebookEventHandler( DIALOG_FP_LIB_TABLE_BASE::pageChangedHandler ), NULL, this );		m_auinotebook->Connect( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, wxAuiNotebookEventHandler( DIALOG_FP_LIB_TABLE_BASE::pageChangedHandler ), NULL, this );
	m_append_button->Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( DIALOG_FP_LIB_TABLE_BASE::appendRowHandler ), NULL, this );		m_append_button->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FP_LIB_TABLE_BASE::appendRowHandler ), NULL, this );
	m_buttonWizard->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FP_LIB_TABLE_BASE::OnClickLibraryWizard ), NULL, this );		m_buttonWizard->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FP_LIB_TABLE_BASE::OnClickLibraryWizard ), NULL, this );
	m_delete_button->Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( DIALOG_FP_LIB_TABLE_BASE::deleteRowHandler ), NULL, this );		m_delete_button->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FP_LIB_TABLE_BASE::deleteRowHandler ), NULL, this );
	m_move_up_button->Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( DIALOG_FP_LIB_TABLE_BASE::moveUpHandler ), NULL, this );		m_move_up_button->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FP_LIB_TABLE_BASE::moveUpHandler ), NULL, this );
	m_move_down_button->Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( DIALOG_FP_LIB_TABLE_BASE::moveDownHandler ), NULL, this );		m_move_down_button->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FP_LIB_TABLE_BASE::moveDownHandler ), NULL, this );
	m_edit_options->Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( DIALOG_FP_LIB_TABLE_BASE::optionsEditor ), NULL, this );		m_edit_options->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FP_LIB_TABLE_BASE::optionsEditor ), NULL, this );
	m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FP_LIB_TABLE_BASE::onCancelButtonClick ), NULL, this );		m_sdbSizerCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FP_LIB_TABLE_BASE::onCancelButtonClick ), NULL, this );
	m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FP_LIB_TABLE_BASE::onOKButtonClick ), NULL, this );		m_sdbSizerOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FP_LIB_TABLE_BASE::onOKButtonClick ), NULL, this );
	}		}

	DIALOG_FP_LIB_TABLE_BASE::~DIALOG_FP_LIB_TABLE_BASE()		DIALOG_FP_LIB_TABLE_BASE::~DIALOG_FP_LIB_TABLE_BASE()
	@@ -244,13 +244,13 @@ DIALOG_FP_LIB_TABLE_BASE::~DIALOG_FP_LIB_TABLE_BASE()
	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_FP_LIB_TABLE_BASE::onCancelCaptionButtonClick ) );		this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_FP_LIB_TABLE_BASE::onCancelCaptionButtonClick ) );
	this->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( DIALOG_FP_LIB_TABLE_BASE::onKeyDown ) );		this->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( DIALOG_FP_LIB_TABLE_BASE::onKeyDown ) );
	m_auinotebook->Disconnect( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, wxAuiNotebookEventHandler( DIALOG_FP_LIB_TABLE_BASE::pageChangedHandler ), NULL, this );		m_auinotebook->Disconnect( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, wxAuiNotebookEventHandler( DIALOG_FP_LIB_TABLE_BASE::pageChangedHandler ), NULL, this );
	m_append_button->Disconnect( wxEVT_LEFT_DOWN, wxMouseEventHandler( DIALOG_FP_LIB_TABLE_BASE::appendRowHandler ), NULL, this );		m_append_button->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FP_LIB_TABLE_BASE::appendRowHandler ), NULL, this );
	m_buttonWizard->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FP_LIB_TABLE_BASE::OnClickLibraryWizard ), NULL, this );		m_buttonWizard->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FP_LIB_TABLE_BASE::OnClickLibraryWizard ), NULL, this );
	m_delete_button->Disconnect( wxEVT_LEFT_DOWN, wxMouseEventHandler( DIALOG_FP_LIB_TABLE_BASE::deleteRowHandler ), NULL, this );		m_delete_button->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FP_LIB_TABLE_BASE::deleteRowHandler ), NULL, this );
	m_move_up_button->Disconnect( wxEVT_LEFT_DOWN, wxMouseEventHandler( DIALOG_FP_LIB_TABLE_BASE::moveUpHandler ), NULL, this );		m_move_up_button->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FP_LIB_TABLE_BASE::moveUpHandler ), NULL, this );
	m_move_down_button->Disconnect( wxEVT_LEFT_DOWN, wxMouseEventHandler( DIALOG_FP_LIB_TABLE_BASE::moveDownHandler ), NULL, this );		m_move_down_button->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FP_LIB_TABLE_BASE::moveDownHandler ), NULL, this );
	m_edit_options->Disconnect( wxEVT_LEFT_DOWN, wxMouseEventHandler( DIALOG_FP_LIB_TABLE_BASE::optionsEditor ), NULL, this );		m_edit_options->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FP_LIB_TABLE_BASE::optionsEditor ), NULL, this );