Minor fixes (2beeb920) · Commits · Elphel / kicad-source-mirror

eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp

+6 −6

Original line number	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->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;
		bSizerChpinameButt = new wxBoxSizer( wxHORIZONTAL );
		@@ -149,16 +149,16 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
		int m_FieldHJustifyCtrlNChoices = sizeof( m_FieldHJustifyCtrlChoices ) / sizeof( wxString );
		m_FieldHJustifyCtrl = new wxRadioBox( this, wxID_ANY, _("Horiz. Justify"), wxDefaultPosition, wxDefaultSize, m_FieldHJustifyCtrlNChoices, m_FieldHJustifyCtrlChoices, 1, wxRA_SPECIFY_COLS );
		m_FieldHJustifyCtrl->SetSelection( 2 );
		bSizerJustification->Add( m_FieldHJustifyCtrl, 1, wxRIGHT\|wxLEFT, 5 );
		bSizerJustification->Add( m_FieldHJustifyCtrl, 1, wxBOTTOM\|wxRIGHT\|wxLEFT\|wxEXPAND, 5 );

		wxString m_FieldVJustifyCtrlChoices[] = { _("Bottom"), _("Center"), _("Top") };
		int m_FieldVJustifyCtrlNChoices = sizeof( m_FieldVJustifyCtrlChoices ) / sizeof( wxString );
		m_FieldVJustifyCtrl = new wxRadioBox( this, wxID_ANY, _("Vert. Justify"), wxDefaultPosition, wxDefaultSize, m_FieldVJustifyCtrlNChoices, m_FieldVJustifyCtrlChoices, 1, wxRA_SPECIFY_COLS );
		m_FieldVJustifyCtrl->SetSelection( 2 );
		bSizerJustification->Add( m_FieldVJustifyCtrl, 1, wxRIGHT\|wxLEFT, 5 );
		bSizerJustification->Add( m_FieldVJustifyCtrl, 1, wxBOTTOM\|wxRIGHT\|wxLEFT\|wxEXPAND, 5 );


		fieldEditBoxSizer->Add( bSizerJustification, 0, wxEXPAND\|wxBOTTOM, 5 );
		fieldEditBoxSizer->Add( bSizerJustification, 1, wxEXPAND\|wxBOTTOM, 5 );

		wxBoxSizer* bSizerStyle;
		bSizerStyle = new wxBoxSizer( wxHORIZONTAL );
		@@ -188,7 +188,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
		bSizerStyle->Add( m_StyleRadioBox, 1, wxEXPAND\|wxALL, 5 );


		fieldEditBoxSizer->Add( bSizerStyle, 1, wxEXPAND, 5 );
		fieldEditBoxSizer->Add( bSizerStyle, 1, wxEXPAND\|wxBOTTOM, 5 );

		wxBoxSizer* fieldNameBoxSizer;
		fieldNameBoxSizer = new wxBoxSizer( wxVERTICAL );
		@@ -211,7 +211,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
		fieldValueTextCtrl->SetMaxLength( 0 );
		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->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

+7 −7

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@
		<property name="minimum_size"></property>
		<property name="name">DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP</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="subclass">DIALOG_SHIM; dialog_shim.h</property>
		<property name="title">Component Properties</property>
		@@ -744,7 +744,7 @@
		<event name="OnUpdateUI"></event>
		<object class="sizeritem" expanded="0">
		<property name="border">5</property>
		<property name="flag">wxEXPAND\|wxBOTTOM</property>
		<property name="flag">wxEXPAND\|wxTOP\|wxBOTTOM</property>
		<property name="proportion">0</property>
		<object class="wxTextCtrl" expanded="0">
		<property name="BottomDockable">1</property>
		@@ -1774,7 +1774,7 @@
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxEXPAND\|wxBOTTOM</property>
		<property name="proportion">0</property>
		<property name="proportion">1</property>
		<object class="wxBoxSizer" expanded="1">
		<property name="minimum_size"></property>
		<property name="name">bSizerJustification</property>
		@@ -1782,7 +1782,7 @@
		<property name="permission">none</property>
		<object class="sizeritem" expanded="0">
		<property name="border">5</property>
		<property name="flag">wxRIGHT\|wxLEFT</property>
		<property name="flag">wxBOTTOM\|wxRIGHT\|wxLEFT\|wxEXPAND</property>
		<property name="proportion">1</property>
		<object class="wxRadioBox" expanded="0">
		<property name="BottomDockable">1</property>
		@@ -1872,7 +1872,7 @@
		</object>
		<object class="sizeritem" expanded="0">
		<property name="border">5</property>
		<property name="flag">wxRIGHT\|wxLEFT</property>
		<property name="flag">wxBOTTOM\|wxRIGHT\|wxLEFT\|wxEXPAND</property>
		<property name="proportion">1</property>
		<object class="wxRadioBox" expanded="0">
		<property name="BottomDockable">1</property>
		@@ -1964,7 +1964,7 @@
		</object>
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxEXPAND</property>
		<property name="flag">wxEXPAND\|wxBOTTOM</property>
		<property name="proportion">1</property>
		<object class="wxBoxSizer" expanded="1">
		<property name="minimum_size"></property>
		@@ -2521,7 +2521,7 @@
		</object>
		<object class="sizeritem" expanded="0">
		<property name="border">5</property>
		<property name="flag">wxEXPAND</property>
		<property name="flag">wxEXPAND\|wxBOTTOM</property>
		<property name="proportion">0</property>
		<object class="wxTextCtrl" expanded="0">
		<property name="BottomDockable">1</property>

eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h

+1 −1

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

		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();

		};

eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -266,7 +266,7 @@ void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::OnOKButtonClick( wxCommandEvent& event
		/* End unused code */

		// save old cmp in undo list
		m_parent->SaveCopyInUndoList( m_libEntry, IS_CHANGED );
		m_parent->SaveCopyInUndoList( m_libEntry );

		// delete any fields with no name or no value before we copy all of m_FieldsBuf
		// back into the component

eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp

+5 −6

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE
		m_FieldHJustifyCtrl->SetSelection( 1 );
		m_FieldHJustifyCtrl->SetToolTip( _("Select if the component is to be rotated when drawn") );

		bSizerJustify->Add( m_FieldHJustifyCtrl, 1, wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );
		bSizerJustify->Add( m_FieldHJustifyCtrl, 1, wxEXPAND\|wxALL, 5 );

		wxString m_FieldVJustifyCtrlChoices[] = { _("Bottom"), _("Center"), _("Top") };
		int m_FieldVJustifyCtrlNChoices = sizeof( m_FieldVJustifyCtrlChoices ) / sizeof( wxString );
		@@ -65,10 +65,10 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE
		m_FieldVJustifyCtrl->SetSelection( 0 );
		m_FieldVJustifyCtrl->SetToolTip( _("Pick the graphical transformation to be used when displaying the component, if any") );

		bSizerJustify->Add( m_FieldVJustifyCtrl, 1, wxBOTTOM\|wxRIGHT\|wxLEFT\|wxEXPAND, 5 );
		bSizerJustify->Add( m_FieldVJustifyCtrl, 1, wxEXPAND\|wxALL, 5 );


		fieldEditBoxSizer->Add( bSizerJustify, 0, wxEXPAND\|wxBOTTOM, 5 );
		fieldEditBoxSizer->Add( bSizerJustify, 1, wxEXPAND\|wxBOTTOM, 5 );

		wxBoxSizer* bSizerAspect;
		bSizerAspect = new wxBoxSizer( wxHORIZONTAL );
		@@ -93,10 +93,10 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE
		int m_StyleRadioBoxNChoices = sizeof( m_StyleRadioBoxChoices ) / sizeof( wxString );
		m_StyleRadioBox = new wxRadioBox( this, wxID_ANY, _("Style:"), wxDefaultPosition, wxDefaultSize, m_StyleRadioBoxNChoices, m_StyleRadioBoxChoices, 1, wxRA_SPECIFY_COLS );
		m_StyleRadioBox->SetSelection( 0 );
		bSizerAspect->Add( m_StyleRadioBox, 1, wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );
		bSizerAspect->Add( m_StyleRadioBox, 1, wxBOTTOM\|wxRIGHT\|wxLEFT\|wxEXPAND, 5 );


		fieldEditBoxSizer->Add( bSizerAspect, 0, wxEXPAND\|wxTOP, 5 );
		fieldEditBoxSizer->Add( bSizerAspect, 1, wxEXPAND\|wxTOP\|wxBOTTOM, 5 );

		wxBoxSizer* fieldNameBoxSizer;
		fieldNameBoxSizer = new wxBoxSizer( wxVERTICAL );
		@@ -199,7 +199,6 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE

		this->SetSizer( mainSizer );
		this->Layout();
		mainSizer->Fit( this );

		// Connect Events
		this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnCloseDialog ) );

Admin message