Revisão | 3267544fe5d4934104e606f97c42007991043bf7 (tree) |
---|---|
Hora | 2019-03-01 13:45:09 |
Autor | Tim Worthington |
Commiter | Tim Worthington |
Add letter and ledger paper size
@@ -79,9 +79,9 @@ | ||
79 | 79 | PAPERSIZE_B5, |
80 | 80 | PAPERSIZE_B4_JIS, |
81 | 81 | PAPERSIZE_B5_JIS, |
82 | - PAPERSIZE_LEGAL, | |
83 | - PAPERSIZE_LETTER, | |
84 | - PAPERSIZE_LEDGER | |
82 | + PAPERSIZE_LEDGER, | |
83 | + PAPERSIZE_LEGAL, | |
84 | + PAPERSIZE_LETTER | |
85 | 85 | }; |
86 | 86 | |
87 | 87 |
@@ -2376,8 +2376,8 @@ | ||
2376 | 2376 | SetDialogItemTextUTF8(Dialog, IDOK, SC(36, "OK")); |
2377 | 2377 | |
2378 | 2378 | SelectionEsc = 0; |
2379 | - sprintf(str, SC(65, "Build version %i.%i.%i [ %s ]"), VER_VERSION / 100, VER_VERSION % 100, | |
2380 | - VER_BUILD, VER_DATE_STR); | |
2379 | + sprintf(str, SC(309, "Build version %s [ %s ]"), VER_VERSION_STR, VER_DATE_STR); | |
2380 | + | |
2381 | 2381 | #ifdef GCC_COMP |
2382 | 2382 | strcat(str, "\r\n\r\nCompiled with mingw (gcc 4.9.2)"); |
2383 | 2383 | #endif |
@@ -2803,9 +2803,9 @@ | ||
2803 | 2803 | SendDlgItemMessage(Dialog, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM) "B5"); |
2804 | 2804 | SendDlgItemMessage(Dialog, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM) "B4_JIS"); |
2805 | 2805 | SendDlgItemMessage(Dialog, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM) "B5_JIS"); |
2806 | + SendDlgItemMessage(Dialog, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM) "LEDGER"); | |
2806 | 2807 | SendDlgItemMessage(Dialog, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM) "LEGAL"); |
2807 | 2808 | SendDlgItemMessage(Dialog, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM) "LETTER"); |
2808 | - SendDlgItemMessage(Dialog, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM) "LEDGER"); | |
2809 | 2809 | |
2810 | 2810 | for (cnt = 0; cnt < NrPageOutputIds; cnt++) |
2811 | 2811 | { |
@@ -475,7 +475,7 @@ | ||
475 | 475 | 472 "Unused one pin net marking(s)" |
476 | 476 | 473 "Invalid wire file %s -> Run the netlist generator" |
477 | 477 | 474 "Can not open temporary print file" |
478 | -475 "Can not create pdf file" | |
478 | +475 "Can not create pdf file %s" | |
479 | 479 | 476 "Component(s) not connected properly (%.1f,%.1f)" |
480 | 480 | 477 "Component with unconnected pin(s) (%.1f,%.1f)" |
481 | 481 | 478 "Out of property space" |
@@ -1,7 +1,7 @@ | ||
1 | 1 | // PCB Elegance release version |
2 | 2 | #define VER_VERSION 352 |
3 | -#define VER_VERSION_STR "3.52 bugfix 2" | |
4 | -#define VER_DATE_STR "6 September, 2018" | |
3 | +#define VER_VERSION_STR "3.52 bugfix 3" | |
4 | +#define VER_DATE_STR "22 December 2018" | |
5 | 5 | // for .rc files |
6 | 6 | #define VER_FILEVERSION 3,52,0,0 |
7 | 7 | #define VER_FILEVERSION_STR "3,52,0,0" |
@@ -3338,8 +3338,8 @@ | ||
3338 | 3338 | SetDialogItemText(Dialog, IDC_STATIC1, SC(460, "Geometrie editor PCB Elegance")); |
3339 | 3339 | SetDialogItemText(Dialog, IDOK, SC(45, "OK")); |
3340 | 3340 | SetDialogItemText(Dialog, IDCANCEL, SC(46, "Cancel")); |
3341 | - sprintf(str, SC(133, "Build version %i.%i.%i [ %s ]"), VER_VERSION / 100, VER_VERSION % 100, | |
3342 | - VER_BUILD, VER_DATE_STR); | |
3341 | + sprintf(str, SC(309, "Build version %s [ %s ]"), VER_VERSION_STR, VER_DATE_STR); | |
3342 | + | |
3343 | 3343 | #ifdef GCC_COMP |
3344 | 3344 | strcat(str, "\r\n\r\nCompiled with mingw (gcc 4.9.2)"); |
3345 | 3345 | #endif |
@@ -244,8 +244,8 @@ | ||
244 | 244 | SetWindowText(Dialog, SC(55, "About library manager PCB elegance")); |
245 | 245 | SetDialogItemText(Dialog, IDC_STATIC1, SC(56, "library manager PCB Elegance")); |
246 | 246 | SetDialogItemText(Dialog, IDOK, SC(3, "OK")); |
247 | - sprintf(str, SC(57, "Build version %i.%i.%i [ %s ]"), VER_VERSION / 100, VER_VERSION % 100, | |
248 | - VER_BUILD, VER_DATE_STR); | |
247 | + sprintf(str, SC(309, "Build version %s [ %s ]"), VER_VERSION_STR, VER_DATE_STR); | |
248 | + | |
249 | 249 | #ifdef GCC_COMP |
250 | 250 | strcat(str, "\r\n\r\nCompiled with mingw (gcc 4.6.1)"); |
251 | 251 | #endif |
@@ -69,9 +69,9 @@ | ||
69 | 69 | PAPERSIZE_B5, |
70 | 70 | PAPERSIZE_B4_JIS, |
71 | 71 | PAPERSIZE_B5_JIS, |
72 | + PAPERSIZE_LEDGER, | |
72 | 73 | PAPERSIZE_LEGAL, |
73 | - PAPERSIZE_LETTER, | |
74 | - PAPERSIZE_LEDGER | |
74 | + PAPERSIZE_LETTER | |
75 | 75 | }; |
76 | 76 | |
77 | 77 | int32 BitmapExportResolutions[20] = { 300, 400, 508, 600, 1000, 1016, 1200, 2000, 2400, 4000, 4800 }; |
@@ -4304,9 +4304,9 @@ | ||
4304 | 4304 | SendDlgItemMessageOwn(Dialog, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM) "B5"); |
4305 | 4305 | SendDlgItemMessageOwn(Dialog, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM) "B4_JIS"); |
4306 | 4306 | SendDlgItemMessageOwn(Dialog, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM) "B5_JIS"); |
4307 | + SendDlgItemMessageOwn(Dialog, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM) "LEDGER"); | |
4307 | 4308 | SendDlgItemMessageOwn(Dialog, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM) "LEGAL"); |
4308 | 4309 | SendDlgItemMessageOwn(Dialog, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM) "LETTER"); |
4309 | - SendDlgItemMessageOwn(Dialog, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM) "LEDGER"); | |
4310 | 4310 | |
4311 | 4311 | for (cnt = 0; cnt < NrPageOutputIds; cnt++) |
4312 | 4312 | { |
@@ -4353,8 +4353,8 @@ | ||
4353 | 4353 | SetDialogItemText(Dialog, IDOK, SC(1, "OK")); |
4354 | 4354 | SetDialogItemText(Dialog, IDCANCEL, SC(2, "Cancel")); |
4355 | 4355 | |
4356 | - sprintf(str, "Build version %i.%i.%i [ %s ]", VER_VERSION / 100, VER_VERSION % 100, | |
4357 | - VER_BUILD, VER_DATE_STR); | |
4356 | + sprintf(str, SC(309, "Build version %s [ %s ]"), VER_VERSION_STR, VER_DATE_STR); | |
4357 | + | |
4358 | 4358 | #ifdef GCC_COMP |
4359 | 4359 | strcat(str, "\r\n\r\nCompiled with mingw (gcc 4.9.2)"); |
4360 | 4360 | #endif |
@@ -119,9 +119,9 @@ | ||
119 | 119 | PAPERSIZE_B5, |
120 | 120 | PAPERSIZE_B4_JIS, |
121 | 121 | PAPERSIZE_B5_JIS, |
122 | + PAPERSIZE_LEDGER, | |
122 | 123 | PAPERSIZE_LEGAL, |
123 | - PAPERSIZE_LETTER, | |
124 | - PAPERSIZE_LEDGER | |
124 | + PAPERSIZE_LETTER | |
125 | 125 | }; |
126 | 126 | |
127 | 127 | int32 DialogMode, ok, pos, PDFReverse, PDFCurrentColor, Font90; |
@@ -1796,9 +1796,9 @@ | ||
1796 | 1796 | SendDlgItemMessage(Dialog, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM) "B5"); |
1797 | 1797 | SendDlgItemMessage(Dialog, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM) "B4_JIS"); |
1798 | 1798 | SendDlgItemMessage(Dialog, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM) "B5_JIS"); |
1799 | + SendDlgItemMessage(Dialog, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM) "LEDGER"); | |
1799 | 1800 | SendDlgItemMessage(Dialog, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM) "LEGAL"); |
1800 | 1801 | SendDlgItemMessage(Dialog, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM) "LETTER"); |
1801 | - SendDlgItemMessage(Dialog, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM) "LEDGER"); | |
1802 | 1802 | |
1803 | 1803 | for (cnt = 0; cnt < NrPageOutputIds; cnt++) |
1804 | 1804 | { |