Commit 2ba87b4a authored by g_harland's avatar g_harland
Browse files

pcbnew: "Postscript A4" radiobutton now restored in "Plot" dialog box (if it... 

pcbnew: "Postscript A4" radiobutton now restored in "Plot" dialog box (if it had been selected previously)
Also fine-tuned spaces within strings specified within share/infospgm.cpp
parent eda39ae8

pcbnew/pcbplot.cpp

+23 −13
Original line number Original line Diff line number Diff line
@@ -139,7 +139,7 @@ int ii; 
	wxBoxSizer * LayersBoxSizer = new wxBoxSizer(wxHORIZONTAL);

	wxBoxSizer * LayersBoxSizer = new wxBoxSizer(wxHORIZONTAL);

	LeftBoxSizer->Add(LayersBoxSizer, 0, wxGROW|wxALL, 5);

	LeftBoxSizer->Add(LayersBoxSizer, 0, wxGROW|wxALL, 5);





wxString fmtmsg[4] = { wxT("HPGL"), wxT("GERBER"), wxT("Postscript"), wxT("Postscript A4") };

wxString fmtmsg[4] = { wxT("HPGL"), wxT("Gerber"), wxT("Postscript"), wxT("Postscript A4") };

	m_PlotFormatOpt = new wxRadioBox(this, ID_SEL_PLOT_FORMAT,

	m_PlotFormatOpt = new wxRadioBox(this, ID_SEL_PLOT_FORMAT,

			_("Plot Format"), wxDefaultPosition, wxSize(-1,-1),

			_("Plot Format"), wxDefaultPosition, wxSize(-1,-1),

			4, fmtmsg, 1, wxRA_SPECIFY_COLS);

			4, fmtmsg, 1, wxRA_SPECIFY_COLS);
@@ -147,13 +147,23 @@ wxString fmtmsg[4] = { wxT("HPGL"), wxT("GERBER"), wxT("Postscript"), wxT("Posts 
	switch ( m_PlotFormat )

	switch ( m_PlotFormat )

	{

	{

		case PLOT_FORMAT_HPGL:

		case PLOT_FORMAT_HPGL:

			m_PlotFormatOpt->SetSelection(0); break;

			m_PlotFormatOpt->SetSelection(0);

		case PLOT_FORMAT_POST:

			break;

			m_PlotFormatOpt->SetSelection(2); break;



		case PLOT_FORMAT_GERBER:

		case PLOT_FORMAT_GERBER:

			m_PlotFormatOpt->SetSelection(1); break;

			m_PlotFormatOpt->SetSelection(1);

		case PLOT_FORMAT_POST_A4:

			break;

			m_PlotFormatOpt->SetSelection(3); break;



		default: // ( PLOT_FORMAT_POST or PLOT_FORMAT_POST_A4 )

			// As m_PlotFormat is never set to a value of PLOT_FORMAT_POST_A4,

			// use the value of g_ForcePlotPS_On_A4 to determine whether the

			// "Postscript" or "Postscipt A4" radiobutton had been selected

			// previously (and thus which button should be reselected now).

			if ( g_ForcePlotPS_On_A4 )

				m_PlotFormatOpt->SetSelection(3);

			else

				m_PlotFormatOpt->SetSelection(2);

			break;

	}

	}





	/* Creation des menus d'option du format GERBER */

	/* Creation des menus d'option du format GERBER */
@@ -179,9 +189,9 @@ wxString fmtmsg[4] = { wxT("HPGL"), wxT("GERBER"), wxT("Postscript"), wxT("Posts 




	/* Create the right column commands */

	/* Create the right column commands */

wxString choice_plot_offset_msg[] =

wxString choice_plot_offset_msg[] =

	{_("absolute"), _("auxiliary axis")};

	{_("Absolute"), _("Auxiliary axis")};

	m_Choice_Plot_Offset = new wxRadioBox(this, ID_SEL_PLOT_OFFSET_OPTION,

	m_Choice_Plot_Offset = new wxRadioBox(this, ID_SEL_PLOT_OFFSET_OPTION,

						_("plot Origine:"),

						_("Plot Origin"),

						wxDefaultPosition,wxSize(-1,-1),

						wxDefaultPosition,wxSize(-1,-1),

						2,choice_plot_offset_msg,1,wxRA_SPECIFY_COLS);

						2,choice_plot_offset_msg,1,wxRA_SPECIFY_COLS);

	if ( s_PlotOriginIsAuxAxis ) m_Choice_Plot_Offset->SetSelection(1);

	if ( s_PlotOriginIsAuxAxis ) m_Choice_Plot_Offset->SetSelection(1);
@@ -278,7 +288,7 @@ wxString choice_plot_offset_msg[] = 
	LeftBoxSizer->Add(m_Plot_Text_Ref, 0, wxGROW|wxALL, 1);

	LeftBoxSizer->Add(m_Plot_Text_Ref, 0, wxGROW|wxALL, 1);





	m_Plot_Text_Div = new wxCheckBox(this, ID_PRINT_MODULE_TEXTS,

	m_Plot_Text_Div = new wxCheckBox(this, ID_PRINT_MODULE_TEXTS,

			_("Print other module texts") );

			_("Print other Module texts") );

	m_Plot_Text_Div->SetValue(Sel_Texte_Divers);

	m_Plot_Text_Div->SetValue(Sel_Texte_Divers);

	m_Plot_Text_Div->SetToolTip(

	m_Plot_Text_Div->SetToolTip(

		_("Enable/disable print/plot module field texts on Silkscreen layers") );

		_("Enable/disable print/plot module field texts on Silkscreen layers") );
@@ -308,7 +318,7 @@ wxString scalemsg[5] = 
	MidLeftBoxSizer->Add(m_Scale_Opt, 0, wxGROW|wxALL, 5);

	MidLeftBoxSizer->Add(m_Scale_Opt, 0, wxGROW|wxALL, 5);





wxString list_opt3[3] = {_("Line"), _("Filled"), _("Sketch") };

wxString list_opt3[3] = {_("Line"), _("Filled"), _("Sketch") };

	m_PlotModeOpt = new wxRadioBox(this, ID_PLOT_MODE_OPT, _("Plot mode"),

	m_PlotModeOpt = new wxRadioBox(this, ID_PLOT_MODE_OPT, _("Plot Mode"),

				wxDefaultPosition, wxDefaultSize,

				wxDefaultPosition, wxDefaultSize,

				3, list_opt3, 1);

				3, list_opt3, 1);

	m_PlotModeOpt->SetSelection(Plot_Mode);

	m_PlotModeOpt->SetSelection(Plot_Mode);
@@ -329,7 +339,7 @@ wxString list_opt3[3] = {_("Line"), _("Filled"), _("Sketch") }; 
	m_HPGL_PlotCenter_Opt = new wxCheckBox(this, ID_PLOT_CENTRE_OPT,

	m_HPGL_PlotCenter_Opt = new wxCheckBox(this, ID_PLOT_CENTRE_OPT,

						_("Org = Centre"));

						_("Org = Centre"));

	m_HPGL_PlotCenter_Opt->SetValue(HPGL_Org_Centre);

	m_HPGL_PlotCenter_Opt->SetValue(HPGL_Org_Centre);

	m_HPGL_PlotCenter_Opt->SetToolTip(_("Draw origin ( 0,0 )in on sheet center") );

	m_HPGL_PlotCenter_Opt->SetToolTip(_("Draw origin ( 0,0 ) in sheet center") );

	MidLeftBoxSizer->Add(m_HPGL_PlotCenter_Opt, 0, wxGROW|wxALL, 5);

	MidLeftBoxSizer->Add(m_HPGL_PlotCenter_Opt, 0, wxGROW|wxALL, 5);

	// Mise a jour des activations des menus:

	// Mise a jour des activations des menus:

wxCommandEvent event;

wxCommandEvent event;

share/infospgm.cpp

+3 −3

File changed.

Contains only whitespace changes.