Commit d3c8084a authored by Andrey Fedorushkov's avatar Andrey Fedorushkov

pcbnew: fix translate smoothing set in zone settings dialog

kicad: fix Russian GOST page reference sheet - add field 24-25
parent 03495698
...@@ -825,12 +825,57 @@ Ki_WorkSheetData WS_Segm7_LU = ...@@ -825,12 +825,57 @@ Ki_WorkSheetData WS_Segm7_LU =
Ki_WorkSheetData WS_Segm8_LU = Ki_WorkSheetData WS_Segm8_LU =
{ {
WS_SEGMENT_LU, WS_SEGMENT_LU,
&WS_Podp1_LU, &WS_Segm9_LU,
STAMP_12, 0, STAMP_12, 0,
0, 0, 0, 0,
NULL, NULL NULL, NULL
}; };
Ki_WorkSheetData WS_Segm9_LU =
{
WS_SEGMENT_LU,
&WS_Segm10_LU,
STAMP_12, STAMP_287,
STAMP_12, STAMP_167,
NULL, NULL
};
Ki_WorkSheetData WS_Segm10_LU =
{
WS_SEGMENT_LU,
&WS_Segm11_LU,
STAMP_7, STAMP_287,
STAMP_7, STAMP_167,
NULL, NULL
};
Ki_WorkSheetData WS_Segm11_LU =
{
WS_SEGMENT_LU,
&WS_Segm12_LU,
STAMP_12, STAMP_287,
0, STAMP_287,
NULL, NULL
};
Ki_WorkSheetData WS_Segm12_LU =
{
WS_SEGMENT_LU,
&WS_Segm13_LU,
STAMP_12, STAMP_227,
0, STAMP_227,
NULL, NULL
};
Ki_WorkSheetData WS_Segm13_LU =
{
WS_SEGMENT_LU,
&WS_Podp1_LU,
STAMP_12, STAMP_167,
0, STAMP_167,
NULL, NULL
};
Ki_WorkSheetData WS_Podp1_LU = Ki_WorkSheetData WS_Podp1_LU =
{ {
WS_PODPIS_LU, WS_PODPIS_LU,
...@@ -870,12 +915,30 @@ Ki_WorkSheetData WS_Podp4_LU = ...@@ -870,12 +915,30 @@ Ki_WorkSheetData WS_Podp4_LU =
Ki_WorkSheetData WS_Podp5_LU = Ki_WorkSheetData WS_Podp5_LU =
{ {
WS_PODPIS_LU, WS_PODPIS_LU,
NULL, &WS_Podp6_LU,
STAMP_7 + 90, STAMP_110 + 688, STAMP_7 + 90, STAMP_110 + 688,
0, 0, 0, 0,
wxT( "Подп. и дата" ),NULL wxT( "Подп. и дата" ),NULL
}; };
Ki_WorkSheetData WS_Podp6_LU =
{
WS_PODPIS_LU,
&WS_Podp7_LU,
STAMP_7 + 90, STAMP_167 + 1180,
0, 0,
wxT( "Справ. N" ),NULL
};
Ki_WorkSheetData WS_Podp7_LU =
{
WS_PODPIS_LU,
NULL,
STAMP_7 + 90, STAMP_227 + 1180,
0, 0,
wxT( "Перв. примен." ),NULL
};
Ki_WorkSheetData WS_Segm1_LT = Ki_WorkSheetData WS_Segm1_LT =
{ {
WS_SEGMENT_LT, WS_SEGMENT_LT,
......
...@@ -64,6 +64,10 @@ ...@@ -64,6 +64,10 @@
#define STAMP_85 85 * 10000 / 254 #define STAMP_85 85 * 10000 / 254
#define STAMP_60 60 * 10000 / 254 #define STAMP_60 60 * 10000 / 254
#define STAMP_25 25 * 10000 / 254 #define STAMP_25 25 * 10000 / 254
#define STAMP_287 287 * 10000 / 254
#define STAMP_227 227 * 10000 / 254
#define STAMP_167 167 * 10000 / 254
#endif #endif
/* The coordinates below are relative to the bottom right corner of page and /* The coordinates below are relative to the bottom right corner of page and
...@@ -226,11 +230,18 @@ extern Ki_WorkSheetData WS_Segm5_LU; ...@@ -226,11 +230,18 @@ extern Ki_WorkSheetData WS_Segm5_LU;
extern Ki_WorkSheetData WS_Segm6_LU; extern Ki_WorkSheetData WS_Segm6_LU;
extern Ki_WorkSheetData WS_Segm7_LU; extern Ki_WorkSheetData WS_Segm7_LU;
extern Ki_WorkSheetData WS_Segm8_LU; extern Ki_WorkSheetData WS_Segm8_LU;
extern Ki_WorkSheetData WS_Segm9_LU;
extern Ki_WorkSheetData WS_Segm10_LU;
extern Ki_WorkSheetData WS_Segm11_LU;
extern Ki_WorkSheetData WS_Segm12_LU;
extern Ki_WorkSheetData WS_Segm13_LU;
extern Ki_WorkSheetData WS_Podp1_LU; extern Ki_WorkSheetData WS_Podp1_LU;
extern Ki_WorkSheetData WS_Podp2_LU; extern Ki_WorkSheetData WS_Podp2_LU;
extern Ki_WorkSheetData WS_Podp3_LU; extern Ki_WorkSheetData WS_Podp3_LU;
extern Ki_WorkSheetData WS_Podp4_LU; extern Ki_WorkSheetData WS_Podp4_LU;
extern Ki_WorkSheetData WS_Podp5_LU; extern Ki_WorkSheetData WS_Podp5_LU;
extern Ki_WorkSheetData WS_Podp6_LU;
extern Ki_WorkSheetData WS_Podp7_LU;
extern Ki_WorkSheetData WS_Segm1_LT; extern Ki_WorkSheetData WS_Segm1_LT;
extern Ki_WorkSheetData WS_Segm2_LT; extern Ki_WorkSheetData WS_Segm2_LT;
extern Ki_WorkSheetData WS_Segm3_LT; extern Ki_WorkSheetData WS_Segm3_LT;
......
...@@ -240,13 +240,13 @@ void dialog_copper_zone::OnCornerSmoothingModeChoice( wxCommandEvent& event ) ...@@ -240,13 +240,13 @@ void dialog_copper_zone::OnCornerSmoothingModeChoice( wxCommandEvent& event )
case ZONE_SETTING::SMOOTHING_CHAMFER: case ZONE_SETTING::SMOOTHING_CHAMFER:
m_cornerSmoothingTitle->Enable( true ); m_cornerSmoothingTitle->Enable( true );
m_cornerSmoothingCtrl->Enable( true ); m_cornerSmoothingCtrl->Enable( true );
m_cornerSmoothingTitle->SetLabel( wxT( "Chamfer distance" ) ); m_cornerSmoothingTitle->SetLabel( _( "Chamfer distance" ) );
AddUnitSymbol( *m_cornerSmoothingTitle, g_UserUnit ); AddUnitSymbol( *m_cornerSmoothingTitle, g_UserUnit );
break; break;
case ZONE_SETTING::SMOOTHING_FILLET: case ZONE_SETTING::SMOOTHING_FILLET:
m_cornerSmoothingTitle->Enable( true ); m_cornerSmoothingTitle->Enable( true );
m_cornerSmoothingCtrl->Enable( true ); m_cornerSmoothingCtrl->Enable( true );
m_cornerSmoothingTitle->SetLabel( wxT( "Fillet radius" ) ); m_cornerSmoothingTitle->SetLabel( _( "Fillet radius" ) );
AddUnitSymbol( *m_cornerSmoothingTitle, g_UserUnit ); AddUnitSymbol( *m_cornerSmoothingTitle, g_UserUnit );
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment