Download as
Browse Code »

Commit f9aaba9dac43a6f4f95dee75a26c2edc84d7178c

Authored by Perry Werneck
1 parent b9f8510e
Exists in v5.2

Loading terminal settings using the new standard methods when the 

application starts. (Linux version).
Showing 5 changed files with 326 additions and 225 deletions   Show diff stats
locale/pw3270.pot
  Diff comments   View file @f9aaba9
... ... @@ -7,98 +7,9 @@
7 7 msgid ""
8 8 msgstr ""
9 9 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
10   -"#-#-#-#-# window.pot (PACKAGE VERSION) #-#-#-#-#\n"
11 10 "Project-Id-Version: PACKAGE VERSION\n"
12 11 "Report-Msgid-Bugs-To: \n"
13   -"POT-Creation-Date: 2019-11-25 15:14-0300\n"
14   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
15   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
16   -"Language-Team: LANGUAGE <LL@li.org>\n"
17   -"Language: \n"
18   -"MIME-Version: 1.0\n"
19   -"Content-Type: text/plain; charset=CHARSET\n"
20   -"Content-Transfer-Encoding: 8bit\n"
21   -"#-#-#-#-# actions.pot (PACKAGE VERSION) #-#-#-#-#\n"
22   -"Project-Id-Version: PACKAGE VERSION\n"
23   -"Report-Msgid-Bugs-To: \n"
24   -"POT-Creation-Date: 2019-11-22 14:15-0300\n"
25   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
26   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
27   -"Language-Team: LANGUAGE <LL@li.org>\n"
28   -"Language: \n"
29   -"MIME-Version: 1.0\n"
30   -"Content-Type: text/plain; charset=CHARSET\n"
31   -"Content-Transfer-Encoding: 8bit\n"
32   -"#-#-#-#-# dialog.pot (PACKAGE VERSION) #-#-#-#-#\n"
33   -"Project-Id-Version: PACKAGE VERSION\n"
34   -"Report-Msgid-Bugs-To: \n"
35   -"POT-Creation-Date: 2019-11-22 14:15-0300\n"
36   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
37   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
38   -"Language-Team: LANGUAGE <LL@li.org>\n"
39   -"Language: \n"
40   -"MIME-Version: 1.0\n"
41   -"Content-Type: text/plain; charset=CHARSET\n"
42   -"Content-Transfer-Encoding: 8bit\n"
43   -"#-#-#-#-# print.pot (PACKAGE VERSION) #-#-#-#-#\n"
44   -"Project-Id-Version: PACKAGE VERSION\n"
45   -"Report-Msgid-Bugs-To: \n"
46   -"POT-Creation-Date: 2019-11-22 14:15-0300\n"
47   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
48   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
49   -"Language-Team: LANGUAGE <LL@li.org>\n"
50   -"Language: \n"
51   -"MIME-Version: 1.0\n"
52   -"Content-Type: text/plain; charset=CHARSET\n"
53   -"Content-Transfer-Encoding: 8bit\n"
54   -"#-#-#-#-# tools.pot (PACKAGE VERSION) #-#-#-#-#\n"
55   -"Project-Id-Version: PACKAGE VERSION\n"
56   -"Report-Msgid-Bugs-To: \n"
57   -"POT-Creation-Date: 2019-11-22 14:15-0300\n"
58   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
59   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
60   -"Language-Team: LANGUAGE <LL@li.org>\n"
61   -"Language: \n"
62   -"MIME-Version: 1.0\n"
63   -"Content-Type: text/plain; charset=CHARSET\n"
64   -"Content-Transfer-Encoding: 8bit\n"
65   -"#-#-#-#-# plugin.pot (PACKAGE VERSION) #-#-#-#-#\n"
66   -"Project-Id-Version: PACKAGE VERSION\n"
67   -"Report-Msgid-Bugs-To: \n"
68   -"POT-Creation-Date: 2019-11-22 14:15-0300\n"
69   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
70   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
71   -"Language-Team: LANGUAGE <LL@li.org>\n"
72   -"Language: \n"
73   -"MIME-Version: 1.0\n"
74   -"Content-Type: text/plain; charset=CHARSET\n"
75   -"Content-Transfer-Encoding: 8bit\n"
76   -"#-#-#-#-# main.pot (PACKAGE VERSION) #-#-#-#-#\n"
77   -"Project-Id-Version: PACKAGE VERSION\n"
78   -"Report-Msgid-Bugs-To: \n"
79   -"POT-Creation-Date: 2019-11-22 14:15-0300\n"
80   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
81   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
82   -"Language-Team: LANGUAGE <LL@li.org>\n"
83   -"Language: \n"
84   -"MIME-Version: 1.0\n"
85   -"Content-Type: text/plain; charset=CHARSET\n"
86   -"Content-Transfer-Encoding: 8bit\n"
87   -"#-#-#-#-# uiparser.pot (PACKAGE VERSION) #-#-#-#-#\n"
88   -"Project-Id-Version: PACKAGE VERSION\n"
89   -"Report-Msgid-Bugs-To: \n"
90   -"POT-Creation-Date: 2019-11-22 14:15-0300\n"
91   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
92   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
93   -"Language-Team: LANGUAGE <LL@li.org>\n"
94   -"Language: \n"
95   -"MIME-Version: 1.0\n"
96   -"Content-Type: text/plain; charset=CHARSET\n"
97   -"Content-Transfer-Encoding: 8bit\n"
98   -"#-#-#-#-# common.pot (PACKAGE VERSION) #-#-#-#-#\n"
99   -"Project-Id-Version: PACKAGE VERSION\n"
100   -"Report-Msgid-Bugs-To: \n"
101   -"POT-Creation-Date: 2019-11-22 14:15-0300\n"
  12 +"POT-Creation-Date: 2019-11-26 10:16-0300\n"
102 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
103 14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
104 15 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -109,7 +20,7 @@ msgstr &quot;&quot;
109 20 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
110 21 "Project-Id-Version: PACKAGE VERSION\n"
111 22 "Report-Msgid-Bugs-To: \n"
112   -"POT-Creation-Date: 2019-11-21 19:12+0000\n"
  23 +"POT-Creation-Date: 2019-11-26 13:05+0000\n"
113 24 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
114 25 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
115 26 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -120,7 +31,7 @@ msgstr &quot;&quot;
120 31 "#-#-#-#-# libv3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
121 32 "Project-Id-Version: PACKAGE VERSION\n"
122 33 "Report-Msgid-Bugs-To: \n"
123   -"POT-Creation-Date: 2019-11-25 18:01+0000\n"
  34 +"POT-Creation-Date: 2019-11-26 13:08+0000\n"
124 35 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
125 36 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
126 37 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -140,7 +51,7 @@ msgstr &quot;&quot;
140 51 "Content-Type: text/plain; charset=CHARSET\n"
141 52 "Content-Transfer-Encoding: 8bit\n"
142 53  
143   -#: window.c:470
  54 +#: window.c:480
144 55 #, c-format
145 56 msgid " and <b>%s</b> for %s."
146 57 msgstr ""
... ... @@ -156,7 +67,6 @@ msgid &quot;%dx%d screen size is bigger than the maximum size&quot;
156 67 msgstr ""
157 68  
158 69 #: src/core/telnet.c:711 src/core/iocalls.c:554 src/core/iocalls.c:571
159   -#: src/core/linux/connect.c:84 src/core/linux/connect.c:100
160 70 #, c-format
161 71 msgid "%s"
162 72 msgstr ""
... ... @@ -166,6 +76,11 @@ msgstr &quot;&quot;
166 76 msgid "%s (SSL error %d)"
167 77 msgstr ""
168 78  
  79 +#: src/core/windows/connect.c:94
  80 +#, c-format
  81 +msgid "%s (rc=%d)"
  82 +msgstr ""
  83 +
169 84 #: actions.c:868 actions.c:880
170 85 #, c-format
171 86 msgid "%s action needs a valid id attribute"
... ... @@ -221,7 +136,7 @@ msgstr &quot;&quot;
221 136 msgid "%s: Vertical tab not supported"
222 137 msgstr ""
223 138  
224   -#: window.c:465
  139 +#: window.c:475
225 140 #, c-format
226 141 msgid "%s<b>%s</b> for %s"
227 142 msgstr ""
... ... @@ -472,6 +387,10 @@ msgstr &quot;&quot;
472 387 msgid "Backspaces the cursor until it hits the front of a word."
473 388 msgstr ""
474 389  
  390 +#: src/core/windows/connect.c:145
  391 +msgid "Bad winsock version"
  392 +msgstr ""
  393 +
475 394 #: src/core/toggles/table.c:264
476 395 msgid "Beep on errors"
477 396 msgstr ""
... ... @@ -541,7 +460,7 @@ msgstr &quot;&quot;
541 460 msgid "C_olor scheme:"
542 461 msgstr ""
543 462  
544   -#: src/core/toggles/init.c:89 src/core/linux/connect.c:234
  463 +#: src/core/toggles/init.c:89 src/core/windows/connect.c:332
545 464 #, c-format
546 465 msgid "Can't %s network keep-alive"
547 466 msgstr ""
... ... @@ -555,30 +474,34 @@ msgstr &quot;&quot;
555 474 msgid "Can't add activity"
556 475 msgstr ""
557 476  
558   -#: src/ssl/linux/ldap.c:157
  477 +#: src/ssl/windows/ldap.c:181
559 478 msgid "Can't bind to LDAP server"
560 479 msgstr ""
561 480  
562   -#: src/core/linux/connect.c:92
  481 +#: src/core/windows/connect.c:87 src/core/windows/connect.c:227
563 482 #, c-format
564 483 msgid "Can't connect to %s"
565 484 msgstr ""
566 485  
567   -#: src/core/linux/connect.c:184
568   -#, c-format
569   -msgid "Can't connect to %s:%s"
  486 +#: src/core/windows/http.c:108
  487 +msgid "Can't connect to HTTP server."
  488 +msgstr ""
  489 +
  490 +#: src/core/windows/http.c:120
  491 +msgid "Can't create HTTP request."
570 492 msgstr ""
571 493  
572   -#: src/ssl/linux/getcrl.c:85
  494 +#: src/ssl/windows/getcrl.c:87
573 495 msgid "Can't decode CRL"
574 496 msgstr ""
575 497  
576   -#: src/ssl/linux/url.c:116 src/ssl/linux/ldap.c:229
  498 +#: src/ssl/windows/ldap.c:259 src/ssl/windows/http.c:69
  499 +#: src/ssl/windows/curl.c:264
577 500 msgid "Can't decode certificate revocation list"
578 501 msgstr ""
579 502  
580   -#: src/ssl/linux/url.c:99
581   -msgid "Can't decode certificate revocation list got from LDAP server"
  503 +#: src/ssl/windows/curl.c:370
  504 +msgid "Can't decode certificate revocation list got from LDAP Search"
582 505 msgstr ""
583 506  
584 507 #: src/terminal/font/properties.c:40
... ... @@ -586,7 +509,11 @@ msgstr &quot;&quot;
586 509 msgid "Can't find a valid font with the name \"%s\""
587 510 msgstr ""
588 511  
589   -#: src/ssl/linux/ldap.c:193 src/ssl/linux/ldap.c:205
  512 +#: src/ssl/windows/curl.c:334
  513 +msgid "Can't find certificate revocation list in LDAP response"
  514 +msgstr ""
  515 +
  516 +#: src/ssl/windows/ldap.c:223 src/ssl/windows/ldap.c:235
590 517 msgid "Can't get LDAP attribute"
591 518 msgstr ""
592 519  
... ... @@ -594,11 +521,11 @@ msgstr &quot;&quot;
594 521 msgid "Can't get file size"
595 522 msgstr ""
596 523  
597   -#: src/ssl/linux/ldap.c:135
  524 +#: src/ssl/windows/ldap.c:152
598 525 msgid "Can't initialize LDAP"
599 526 msgstr ""
600 527  
601   -#: src/core/linux/curl.c:181
  528 +#: src/ssl/windows/curl.c:190
602 529 msgid "Can't initialize curl operation"
603 530 msgstr ""
604 531  
... ... @@ -606,6 +533,11 @@ msgstr &quot;&quot;
606 533 msgid "Can't load"
607 534 msgstr ""
608 535  
  536 +#: src/ssl/windows/init.c:152
  537 +#, c-format
  538 +msgid "Can't load \"%s\": %s"
  539 +msgstr ""
  540 +
609 541 #: parsefile.c:328 src/filetransfer/load.c:271
610 542 #, c-format
611 543 msgid "Can't load %s"
... ... @@ -620,15 +552,29 @@ msgstr &quot;&quot;
620 552 msgid "Can't load plugin %s"
621 553 msgstr ""
622 554  
  555 +#: src/ssl/windows/init.c:115
  556 +#, c-format
  557 +msgid "Can't open \"%s\" (The Windows error code was %ld)"
  558 +msgstr ""
  559 +
  560 +#: src/ssl/windows/init.c:128
  561 +#, c-format
  562 +msgid "Can't open \"%s\": %s"
  563 +msgstr ""
  564 +
623 565 #: src/dialogs/load.c:321
624 566 #, c-format
625 567 msgid "Can't open %s"
626 568 msgstr ""
627 569  
628   -#: src/ssl/linux/getcrl.c:56 src/ssl/linux/getcrl.c:73
  570 +#: src/ssl/windows/getcrl.c:58 src/ssl/windows/getcrl.c:75
629 571 msgid "Can't open CRL File"
630 572 msgstr ""
631 573  
  574 +#: src/core/windows/http.c:96
  575 +msgid "Can't open HTTP session"
  576 +msgstr ""
  577 +
632 578 #: window.c:185
633 579 msgid "Can't open file"
634 580 msgstr ""
... ... @@ -659,7 +605,7 @@ msgstr &quot;&quot;
659 605 msgid "Can't parse unnamed element"
660 606 msgstr ""
661 607  
662   -#: src/selection/linux/paste.c:80 src/selection/linux/paste.c:115
  608 +#: src/selection/windows/paste.c:79 src/selection/windows/paste.c:119
663 609 msgid "Can't paste"
664 610 msgstr ""
665 611  
... ... @@ -671,7 +617,16 @@ msgstr &quot;&quot;
671 617 msgid "Can't print"
672 618 msgstr ""
673 619  
674   -#: window.c:453
  620 +#: src/ssl/windows/init.c:141
  621 +#, c-format
  622 +msgid "Can't read \"%s\": %s"
  623 +msgstr ""
  624 +
  625 +#: src/core/windows/http.c:175
  626 +msgid "Can't read HTTP response size."
  627 +msgstr ""
  628 +
  629 +#: window.c:463
675 630 #, c-format
676 631 msgid "Can't recognize \"%s\" as a valid host type"
677 632 msgstr ""
... ... @@ -696,11 +651,15 @@ msgstr &quot;&quot;
696 651 msgid "Can't save trace data to file %s"
697 652 msgstr ""
698 653  
699   -#: src/ssl/linux/ldap.c:182
  654 +#: src/ssl/windows/ldap.c:211
700 655 msgid "Can't search LDAP server"
701 656 msgstr ""
702 657  
703   -#: src/ssl/linux/ldap.c:146
  658 +#: src/core/windows/http.c:134
  659 +msgid "Can't send HTTP request."
  660 +msgstr ""
  661 +
  662 +#: src/ssl/windows/ldap.c:166
704 663 msgid "Can't set LDAP protocol version"
705 664 msgstr ""
706 665  
... ... @@ -732,6 +691,11 @@ msgstr &quot;&quot;
732 691 msgid "Can't start file transfer."
733 692 msgstr ""
734 693  
  694 +#: src/core/windows/connect.c:146
  695 +#, c-format
  696 +msgid "Can't use winsock version %d.%d"
  697 +msgstr ""
  698 +
735 699 #: src/ssl/negotiate.c:286 src/ssl/crl.c:163
736 700 msgid "Can't verify."
737 701 msgstr ""
... ... @@ -758,10 +722,22 @@ msgstr &quot;&quot;
758 722 msgid "Cant create a new SSL structure for current connection."
759 723 msgstr ""
760 724  
761   -#: src/ssl/linux/init.c:90
  725 +#: src/ssl/windows/init.c:92
762 726 msgid "Cant initialize the SSL context."
763 727 msgstr ""
764 728  
  729 +#: src/ssl/windows/init.c:150
  730 +msgid "Cant load custom certificate file."
  731 +msgstr ""
  732 +
  733 +#: src/ssl/windows/init.c:113
  734 +msgid "Cant open custom certificate directory."
  735 +msgstr ""
  736 +
  737 +#: src/ssl/windows/init.c:139
  738 +msgid "Cant read custom certificate file."
  739 +msgstr ""
  740 +
765 741 #: src/ssl/negotiate.c:159
766 742 msgid ""
767 743 "Cant set the file descriptor for the input/output facility for the TLS/SSL "
... ... @@ -824,7 +800,7 @@ msgstr &quot;&quot;
824 800 msgid "Click to save file"
825 801 msgstr ""
826 802  
827   -#: src/terminal/properties/init.c:136
  803 +#: src/terminal/properties/init.c:138
828 804 msgid "Clipboard name"
829 805 msgstr ""
830 806  
... ... @@ -836,7 +812,7 @@ msgstr &quot;&quot;
836 812 msgid "Colors"
837 813 msgstr ""
838 814  
839   -#: src/terminal/properties/init.c:184
  815 +#: src/terminal/properties/init.c:186
840 816 msgid "Comma separated list of LU names"
841 817 msgstr ""
842 818  
... ... @@ -876,12 +852,13 @@ msgstr &quot;&quot;
876 852 msgid "Connection"
877 853 msgstr ""
878 854  
879   -#: src/core/iocalls.c:538 src/core/linux/connect.c:188
880   -#: src/core/linux/connect.c:220 src/core/linux/connect.c:238
  855 +#: src/core/iocalls.c:538 src/core/windows/connect.c:288
  856 +#: src/core/windows/connect.c:300 src/core/windows/connect.c:336
  857 +#: src/core/windows/connect.c:352
881 858 msgid "Connection error"
882 859 msgstr ""
883 860  
884   -#: src/core/linux/connect.c:98
  861 +#: src/core/windows/connect.c:92
885 862 msgid "Connection failed"
886 863 msgstr ""
887 864  
... ... @@ -939,11 +916,11 @@ msgstr &quot;&quot;
939 916 msgid "Current file"
940 917 msgstr ""
941 918  
942   -#: src/core/properties/unsigned.c:100
  919 +#: src/core/properties/unsigned.c:122
943 920 msgid "Current screen height in rows"
944 921 msgstr ""
945 922  
946   -#: src/core/properties/unsigned.c:93
  923 +#: src/core/properties/unsigned.c:115
947 924 msgid "Current screen width in columns"
948 925 msgstr ""
949 926  
... ... @@ -955,7 +932,7 @@ msgstr &quot;&quot;
955 932 msgid "Current:"
956 933 msgstr ""
957 934  
958   -#: src/core/properties/unsigned.c:86
  935 +#: src/core/properties/unsigned.c:108
959 936 msgid "Cursor address"
960 937 msgstr ""
961 938  
... ... @@ -1039,7 +1016,7 @@ msgstr &quot;&quot;
1039 1016 msgid "Default"
1040 1017 msgstr ""
1041 1018  
1042   -#: src/core/properties/string.c:155
  1019 +#: src/core/properties/string.c:159
1043 1020 msgid "Default host URL"
1044 1021 msgstr ""
1045 1022  
... ... @@ -1047,7 +1024,7 @@ msgstr &quot;&quot;
1047 1024 msgid "Delete field"
1048 1025 msgstr ""
1049 1026  
1050   -#: src/core/properties/string.c:169
  1027 +#: src/core/properties/string.c:173
1051 1028 msgid "Description of the current security state"
1052 1029 msgstr ""
1053 1030  
... ... @@ -1067,7 +1044,7 @@ msgstr &quot;&quot;
1067 1044 msgid "Disconnected from host."
1068 1045 msgstr ""
1069 1046  
1070   -#: src/core/properties/string.c:118
  1047 +#: src/core/properties/string.c:122
1071 1048 msgid "Display charset"
1072 1049 msgstr ""
1073 1050  
... ... @@ -1095,6 +1072,10 @@ msgstr &quot;&quot;
1095 1072 msgid "ETA:"
1096 1073 msgstr ""
1097 1074  
  1075 +#: src/core/windows/http.c:159
  1076 +msgid "Empty response from HTTP server."
  1077 +msgstr ""
  1078 +
1098 1079 #: src/dialogs/hostselect.c:422
1099 1080 msgid "Emulation"
1100 1081 msgstr ""
... ... @@ -1161,14 +1142,15 @@ msgstr &quot;&quot;
1161 1142 msgid "Error \"%s\" writing to local file (rc=%d)"
1162 1143 msgstr ""
1163 1144  
1164   -#: src/ssl/linux/url.c:66
1165   -msgid "Error getting certificate revocation list"
1166   -msgstr ""
1167   -
1168 1145 #: src/core/ft/ftmessages.c:45
1169 1146 msgid "Error in file transfer: file transfer canceled"
1170 1147 msgstr ""
1171 1148  
  1149 +#: src/ssl/windows/curl.c:189 src/ssl/windows/curl.c:227
  1150 +#: src/ssl/windows/curl.c:243
  1151 +msgid "Error loading certificate revocation list"
  1152 +msgstr ""
  1153 +
1172 1154 #: src/dialogs/print/print.c:72
1173 1155 msgid "Error on print operation"
1174 1156 msgstr ""
... ... @@ -1177,6 +1159,10 @@ msgstr &quot;&quot;
1177 1159 msgid "Error reading file from host: file transfer canceled"
1178 1160 msgstr ""
1179 1161  
  1162 +#: src/core/windows/http.c:146
  1163 +msgid "Error receiving HTTP response."
  1164 +msgstr ""
  1165 +
1180 1166 #: src/core/ft/ftmessages.c:145
1181 1167 msgid "Error while reading or writing to host disk: file transfer canceled"
1182 1168 msgstr ""
... ... @@ -1255,7 +1241,7 @@ msgstr &quot;&quot;
1255 1241 msgid "Font \"%s\" is valid"
1256 1242 msgstr ""
1257 1243  
1258   -#: src/terminal/properties/init.c:88
  1244 +#: src/terminal/properties/init.c:90
1259 1245 msgid "Font family for terminal contents"
1260 1246 msgstr ""
1261 1247  
... ... @@ -1315,8 +1301,8 @@ msgstr &quot;&quot;
1315 1301 msgid "Go to fullscreen mode"
1316 1302 msgstr ""
1317 1303  
1318   -#: src/ssl/linux/url.c:81
1319   -msgid "Got a bad formatted certificate revocation list from LDAP server"
  1304 +#: src/ssl/windows/curl.c:273
  1305 +msgid "Got an invalid certificate revocation list from server"
1320 1306 msgstr ""
1321 1307  
1322 1308 #: src/dialogs/colors.c:169
... ... @@ -1339,7 +1325,7 @@ msgstr &quot;&quot;
1339 1325 msgid "Host"
1340 1326 msgstr ""
1341 1327  
1342   -#: src/core/properties/string.c:111
  1328 +#: src/core/properties/string.c:115
1343 1329 msgid "Host charset"
1344 1330 msgstr ""
1345 1331  
... ... @@ -1375,10 +1361,14 @@ msgstr &quot;&quot;
1375 1361 msgid "Host to connect"
1376 1362 msgstr ""
1377 1363  
1378   -#: src/core/properties/string.c:89
  1364 +#: src/core/properties/string.c:92
1379 1365 msgid "Host type name"
1380 1366 msgstr ""
1381 1367  
  1368 +#: src/core/properties/unsigned.c:87
  1369 +msgid "Host type number"
  1370 +msgstr ""
  1371 +
1382 1372 #: src/dialogs/save/save.c:59
1383 1373 msgid "HyperText Markup Language (HTML)"
1384 1374 msgstr ""
... ... @@ -1395,7 +1385,7 @@ msgstr &quot;&quot;
1395 1385 msgid "ID of the session security state"
1396 1386 msgstr ""
1397 1387  
1398   -#: src/terminal/properties/init.c:119 src/dialogs/hostselect.c:492
  1388 +#: src/terminal/properties/init.c:121 src/dialogs/hostselect.c:492
1399 1389 msgid "IDLE minutes for automatic disconnection"
1400 1390 msgstr ""
1401 1391  
... ... @@ -1566,7 +1556,7 @@ msgstr &quot;&quot;
1566 1556 msgid "Keyboard is locked"
1567 1557 msgstr ""
1568 1558  
1569   -#: src/core/properties/unsigned.c:135
  1559 +#: src/core/properties/unsigned.c:162
1570 1560 msgid "Keyboard lock status"
1571 1561 msgstr ""
1572 1562  
... ... @@ -1611,11 +1601,11 @@ msgstr &quot;&quot;
1611 1601 msgid "Makes the screen larger than the default for the chosen model number."
1612 1602 msgstr ""
1613 1603  
1614   -#: src/core/properties/unsigned.c:114
  1604 +#: src/core/properties/unsigned.c:136
1615 1605 msgid "Maximum screen height in rows"
1616 1606 msgstr ""
1617 1607  
1618   -#: src/core/properties/unsigned.c:107
  1608 +#: src/core/properties/unsigned.c:129
1619 1609 msgid "Maximum screen width in columns"
1620 1610 msgstr ""
1621 1611  
... ... @@ -1627,7 +1617,7 @@ msgstr &quot;&quot;
1627 1617 msgid "Misc colors"
1628 1618 msgstr ""
1629 1619  
1630   -#: window.c:577
  1620 +#: window.c:587
1631 1621 #, c-format
1632 1622 msgid "Model %d (%s)"
1633 1623 msgstr ""
... ... @@ -1648,7 +1638,7 @@ msgstr &quot;&quot;
1648 1638 msgid "Model 5 - 132x27"
1649 1639 msgstr ""
1650 1640  
1651   -#: src/core/properties/string.c:81
  1641 +#: src/core/properties/string.c:84
1652 1642 msgid "Model name"
1653 1643 msgstr ""
1654 1644  
... ... @@ -1681,8 +1671,8 @@ msgstr &quot;&quot;
1681 1671 msgid "Network data"
1682 1672 msgstr ""
1683 1673  
1684   -#: src/core/telnet.c:359 src/core/linux/event_dispatcher.c:143
1685   -#: src/core/linux/connect.c:82
  1674 +#: src/core/telnet.c:359 src/core/windows/event_dispatcher.c:149
  1675 +#: src/core/windows/connect.c:78
1686 1676 msgid "Network error"
1687 1677 msgstr ""
1688 1678  
... ... @@ -1690,15 +1680,19 @@ msgstr &quot;&quot;
1690 1680 msgid "Network keep alive"
1691 1681 msgstr ""
1692 1682  
  1683 +#: src/core/windows/connect.c:133 src/core/windows/connect.c:144
  1684 +msgid "Network startup error"
  1685 +msgstr ""
  1686 +
1693 1687 #: 00default.xml:189
1694 1688 msgid "Next field"
1695 1689 msgstr ""
1696 1690  
1697   -#: src/ssl/linux/ldap.c:101
  1691 +#: src/ssl/windows/ldap.c:109
1698 1692 msgid "No DN of the entry at which to start the search on the URL"
1699 1693 msgstr ""
1700 1694  
1701   -#: src/ssl/linux/ldap.c:114
  1695 +#: src/ssl/windows/ldap.c:123
1702 1696 msgid "No LDAP attribute on the URL"
1703 1697 msgstr ""
1704 1698  
... ... @@ -1706,7 +1700,11 @@ msgstr &quot;&quot;
1706 1700 msgid "No active transfer"
1707 1701 msgstr ""
1708 1702  
1709   -#: src/terminal/properties/get.c:173
  1703 +#: src/ssl/windows/curl.c:301
  1704 +msgid "No attribute in LDAP search URL"
  1705 +msgstr ""
  1706 +
  1707 +#: src/terminal/properties/get.c:189
1710 1708 msgid "No host defined"
1711 1709 msgstr ""
1712 1710  
... ... @@ -1732,10 +1730,6 @@ msgstr &quot;&quot;
1732 1730 msgid "Non zero if the host is TSO."
1733 1731 msgstr ""
1734 1732  
1735   -#: src/selection/linux/paste.c:117
1736   -msgid "None of the screens in the clipboard match with the current one."
1737   -msgstr ""
1738   -
1739 1733 #: src/dialogs/colors.c:173
1740 1734 msgid "Normal/Protected"
1741 1735 msgstr ""
... ... @@ -1748,7 +1742,7 @@ msgstr &quot;&quot;
1748 1742 msgid "Not in 3270 mode, transfer cancelled"
1749 1743 msgstr ""
1750 1744  
1751   -#: src/selection/linux/paste.c:76
  1745 +#: src/selection/windows/paste.c:75
1752 1746 msgid "Not the same terminal type"
1753 1747 msgstr ""
1754 1748  
... ... @@ -1998,8 +1992,8 @@ msgstr &quot;&quot;
1998 1992 msgid "Predefined color theme"
1999 1993 msgstr ""
2000 1994  
2001   -#: src/core/properties/string.c:148
2002   -msgid "Prefered protocol for CRL"
  1995 +#: src/core/properties/string.c:152
  1996 +msgid "Preferred protocol for CRL download"
2003 1997 msgstr ""
2004 1998  
2005 1999 #: src/filetransfer/set.c:176
... ... @@ -2349,11 +2343,11 @@ msgstr &quot;&quot;
2349 2343 msgid "Saving %s"
2350 2344 msgstr ""
2351 2345  
2352   -#: src/core/properties/unsigned.c:121
  2346 +#: src/core/properties/unsigned.c:143
2353 2347 msgid "Screen buffer length in bytes"
2354 2348 msgstr ""
2355 2349  
2356   -#: src/core/properties/string.c:177
  2350 +#: src/core/properties/string.c:181
2357 2351 msgid "Screen oversize if larger than the chosen model"
2358 2352 msgstr ""
2359 2353  
... ... @@ -2369,11 +2363,11 @@ msgstr &quot;&quot;
2369 2363 msgid "Scripts"
2370 2364 msgstr ""
2371 2365  
2372   -#: src/ssl/linux/ldap.c:194
  2366 +#: src/ssl/windows/ldap.c:224
2373 2367 msgid "Search did not produce any attributes."
2374 2368 msgstr ""
2375 2369  
2376   -#: src/ssl/linux/ldap.c:206
  2370 +#: src/ssl/windows/ldap.c:236
2377 2371 msgid "Search did not produce any values."
2378 2372 msgstr ""
2379 2373  
... ... @@ -2393,13 +2387,20 @@ msgstr &quot;&quot;
2393 2387  
2394 2388 #: src/ssl/negotiate.c:107 src/ssl/negotiate.c:157 src/ssl/negotiate.c:191
2395 2389 #: src/ssl/negotiate.c:285 src/ssl/negotiate.c:307 src/ssl/negotiate.c:328
2396   -#: src/ssl/crl.c:162 src/ssl/linux/url.c:65 src/ssl/linux/url.c:80
2397   -#: src/ssl/linux/url.c:98 src/ssl/linux/url.c:115 src/ssl/linux/ldap.c:100
2398   -#: src/ssl/linux/ldap.c:113 src/ssl/linux/ldap.c:134 src/ssl/linux/ldap.c:145
2399   -#: src/ssl/linux/ldap.c:156 src/ssl/linux/ldap.c:181 src/ssl/linux/ldap.c:192
2400   -#: src/ssl/linux/ldap.c:204 src/ssl/linux/ldap.c:228 src/ssl/linux/init.c:89
2401   -#: src/ssl/linux/getcrl.c:55 src/ssl/linux/getcrl.c:72
2402   -#: src/ssl/linux/getcrl.c:84 src/ssl/linux/getcrl.c:110
  2390 +#: src/ssl/crl.c:162 src/ssl/windows/ldap.c:108 src/ssl/windows/ldap.c:122
  2391 +#: src/ssl/windows/ldap.c:151 src/ssl/windows/ldap.c:165
  2392 +#: src/ssl/windows/ldap.c:180 src/ssl/windows/ldap.c:210
  2393 +#: src/ssl/windows/ldap.c:222 src/ssl/windows/ldap.c:234
  2394 +#: src/ssl/windows/ldap.c:258 src/ssl/windows/init.c:91
  2395 +#: src/ssl/windows/init.c:112 src/ssl/windows/init.c:138
  2396 +#: src/ssl/windows/init.c:149 src/ssl/windows/http.c:57
  2397 +#: src/ssl/windows/http.c:68 src/ssl/windows/getcrl.c:57
  2398 +#: src/ssl/windows/getcrl.c:74 src/ssl/windows/getcrl.c:86
  2399 +#: src/ssl/windows/getcrl.c:116 src/ssl/windows/curl.c:188
  2400 +#: src/ssl/windows/curl.c:218 src/ssl/windows/curl.c:242
  2401 +#: src/ssl/windows/curl.c:263 src/ssl/windows/curl.c:272
  2402 +#: src/ssl/windows/curl.c:300 src/ssl/windows/curl.c:333
  2403 +#: src/ssl/windows/curl.c:369
2403 2404 msgid "Security error"
2404 2405 msgstr ""
2405 2406  
... ... @@ -2475,7 +2476,7 @@ msgstr &quot;&quot;
2475 2476 msgid "Select terminal colors"
2476 2477 msgstr ""
2477 2478  
2478   -#: src/core/linux/event_dispatcher.c:144
  2479 +#: src/core/windows/event_dispatcher.c:150
2479 2480 msgid "Select() failed when processing for events."
2480 2481 msgstr ""
2481 2482  
... ... @@ -2661,7 +2662,7 @@ msgstr &quot;&quot;
2661 2662 msgid "State is 3270, TN3270e or SSCP"
2662 2663 msgstr ""
2663 2664  
2664   -#: src/terminal/properties/init.c:168
  2665 +#: src/terminal/properties/init.c:170
2665 2666 msgid "State of the dynamic font spacing"
2666 2667 msgstr ""
2667 2668  
... ... @@ -2685,7 +2686,7 @@ msgstr &quot;&quot;
2685 2686 msgid "TN3270 Custom charset"
2686 2687 msgstr ""
2687 2688  
2688   -#: src/terminal/properties/init.c:103
  2689 +#: src/terminal/properties/init.c:105
2689 2690 msgid "TN3270 Session name"
2690 2691 msgstr ""
2691 2692  
... ... @@ -2705,15 +2706,15 @@ msgstr &quot;&quot;
2705 2706 msgid "Terminal font"
2706 2707 msgstr ""
2707 2708  
2708   -#: src/core/properties/unsigned.c:74
  2709 +#: src/core/properties/unsigned.c:96
2709 2710 msgid "Terminal model"
2710 2711 msgstr ""
2711 2712  
2712   -#: src/core/properties/string.c:103
  2713 +#: src/core/properties/string.c:106
2713 2714 msgid "Terminal name"
2714 2715 msgstr ""
2715 2716  
2716   -#: src/core/properties/string.c:96
  2717 +#: src/core/properties/string.c:99
2717 2718 msgid "Terminal type"
2718 2719 msgstr ""
2719 2720  
... ... @@ -2768,15 +2769,15 @@ msgstr &quot;&quot;
2768 2769 msgid "The SSL certificate for this host is not trusted."
2769 2770 msgstr ""
2770 2771  
2771   -#: src/ssl/linux/ldap.c:102 src/ssl/linux/ldap.c:115
  2772 +#: src/ssl/windows/ldap.c:110 src/ssl/windows/ldap.c:124
2772 2773 msgid "The URL argument should be in the format ldap://[HOST]/[DN]?attribute"
2773 2774 msgstr ""
2774 2775  
2775   -#: src/ssl/linux/getcrl.c:57
  2776 +#: src/ssl/windows/getcrl.c:59
2776 2777 msgid "The URL for the CRL is undefined or empty"
2777 2778 msgstr ""
2778 2779  
2779   -#: src/ssl/linux/getcrl.c:112
  2780 +#: src/ssl/windows/getcrl.c:118
2780 2781 msgid "The URL scheme is unknown"
2781 2782 msgstr ""
2782 2783  
... ... @@ -2827,7 +2828,7 @@ msgid &quot;&quot;
2827 2828 "expected value, this is only meaningful for RSA keys."
2828 2829 msgstr ""
2829 2830  
2830   -#: src/core/properties/unsigned.c:65
  2831 +#: src/core/properties/unsigned.c:78
2831 2832 msgid "The color type"
2832 2833 msgstr ""
2833 2834  
... ... @@ -2867,7 +2868,7 @@ msgid &quot;&quot;
2867 2868 "displayed when the -issuer_checks option is set."
2868 2869 msgstr ""
2869 2870  
2870   -#: src/core/properties/unsigned.c:128
  2871 +#: src/core/properties/unsigned.c:155
2871 2872 msgid "The delay between the host unlocking the keyboard and the actual unlock"
2872 2873 msgstr ""
2873 2874  
... ... @@ -2920,12 +2921,12 @@ msgid &quot;&quot;
2920 2921 "normally means the list of trusted certificates is not complete."
2921 2922 msgstr ""
2922 2923  
2923   -#: window.c:472
  2924 +#: window.c:482
2924 2925 #, c-format
2925 2926 msgid "The known types are %s"
2926 2927 msgstr ""
2927 2928  
2928   -#: src/core/properties/unsigned.c:75
  2929 +#: src/core/properties/unsigned.c:97
2929 2930 msgid "The model number"
2930 2931 msgstr ""
2931 2932  
... ... @@ -3000,7 +3001,7 @@ msgid &quot;&quot;
3000 3001 "certificate authority."
3001 3002 msgstr ""
3002 3003  
3003   -#: src/core/properties/string.c:162
  3004 +#: src/core/properties/string.c:166
3004 3005 msgid "The security state"
3005 3006 msgstr ""
3006 3007  
... ... @@ -3012,6 +3013,10 @@ msgstr &quot;&quot;
3012 3013 msgid "The supplied certificate cannot be used for the specified purpose."
3013 3014 msgstr ""
3014 3015  
  3016 +#: src/terminal/properties/init.c:216
  3017 +msgid "The terminal colors"
  3018 +msgstr ""
  3019 +
3015 3020 #: src/core/ctlr.c:216
3016 3021 #, c-format
3017 3022 msgid "The width %d is less than model %d columns (%d)"
... ... @@ -3100,7 +3105,7 @@ msgstr &quot;&quot;
3100 3105 msgid "Trace user interface events"
3101 3106 msgstr ""
3102 3107  
3103   -#: src/terminal/properties/init.c:199
  3108 +#: src/terminal/properties/init.c:201
3104 3109 msgid "Trace window"
3105 3110 msgstr ""
3106 3111  
... ... @@ -3160,11 +3165,11 @@ msgstr &quot;&quot;
3160 3165 msgid "Turquoise"
3161 3166 msgstr ""
3162 3167  
3163   -#: src/core/properties/string.c:140
  3168 +#: src/core/properties/string.c:144
3164 3169 msgid "URL for the certificate revocation list"
3165 3170 msgstr ""
3166 3171  
3167   -#: src/core/properties/string.c:73
  3172 +#: src/core/properties/string.c:76
3168 3173 msgid "URL of the current host"
3169 3174 msgstr ""
3170 3175  
... ... @@ -3196,7 +3201,7 @@ msgstr &quot;&quot;
3196 3201 msgid "Unable to get certificate CRL."
3197 3202 msgstr ""
3198 3203  
3199   -#: src/core/linux/connect.c:83
  3204 +#: src/core/windows/connect.c:79
3200 3205 msgid "Unable to get connection state."
3201 3206 msgstr ""
3202 3207  
... ... @@ -3212,8 +3217,8 @@ msgstr &quot;&quot;
3212 3217 msgid "Unable to load from file"
3213 3218 msgstr ""
3214 3219  
3215   -#: src/selection/linux/paste.c:116
3216   -msgid "Unable to paste formatted data."
  3220 +#: src/selection/windows/paste.c:115
  3221 +msgid "Unable to paste formatted data"
3217 3222 msgstr ""
3218 3223  
3219 3224 #: src/core/paste.c:399
... ... @@ -3273,7 +3278,7 @@ msgstr &quot;&quot;
3273 3278 msgid "Unexpected or invalid %s attribute: \"%s\""
3274 3279 msgstr ""
3275 3280  
3276   -#: src/ssl/linux/getcrl.c:111
  3281 +#: src/ssl/windows/getcrl.c:117
3277 3282 msgid "Unexpected or invalid CRL URL"
3278 3283 msgstr ""
3279 3284  
... ... @@ -3346,7 +3351,7 @@ msgstr &quot;&quot;
3346 3351 msgid "Unsupported certificate purpose"
3347 3352 msgstr ""
3348 3353  
3349   -#: src/dialogs/save/save.c:149
  3354 +#: src/dialogs/windows/select.c:169 src/dialogs/save/save.c:149
3350 3355 msgid "Untitled document"
3351 3356 msgstr ""
3352 3357  
... ... @@ -3375,6 +3380,10 @@ msgstr &quot;&quot;
3375 3380 msgid "Version %s-%s"
3376 3381 msgstr ""
3377 3382  
  3383 +#: src/core/windows/connect.c:134
  3384 +msgid "WSAStartup failed"
  3385 +msgstr ""
  3386 +
3378 3387 #: src/core/ft/ft.c:538
3379 3388 msgid "Waiting for GET response"
3380 3389 msgstr ""
... ... @@ -3399,6 +3408,11 @@ msgstr &quot;&quot;
3399 3408 msgid "Windows Western languages (CP1252)"
3400 3409 msgstr ""
3401 3410  
  3411 +#: src/core/windows/util.c:131 src/core/windows/util.c:180
  3412 +#, c-format
  3413 +msgid "Windows error %d"
  3414 +msgstr ""
  3415 +
3402 3416 #: src/ssl/notify.c:108
3403 3417 #, c-format
3404 3418 msgid "Windows error was \"%s\" (%u)"
... ... @@ -3453,7 +3467,7 @@ msgstr &quot;&quot;
3453 3467 msgid "X Wait"
3454 3468 msgstr ""
3455 3469  
3456   -#: src/terminal/properties/init.c:152
  3470 +#: src/terminal/properties/init.c:154
3457 3471 msgid "XML file with remap table"
3458 3472 msgstr ""
3459 3473  
... ... @@ -3530,9 +3544,9 @@ msgstr &quot;&quot;
3530 3544 msgid "_Apply"
3531 3545 msgstr ""
3532 3546  
3533   -#: src/selection/linux/paste.c:84 src/selection/linux/paste.c:118
3534   -#: src/dialogs/load.c:202 src/dialogs/load.c:221 src/dialogs/linux/select.c:51
3535   -#: src/dialogs/linux/select.c:77 src/dialogs/print/settingsdialog.c:410
  3547 +#: src/selection/windows/paste.c:83 src/selection/windows/paste.c:123
  3548 +#: src/dialogs/load.c:202 src/dialogs/load.c:221
  3549 +#: src/dialogs/windows/select.c:158 src/dialogs/print/settingsdialog.c:410
3536 3550 #: src/dialogs/print/settingsdialog.c:429 src/dialogs/save/save.c:264
3537 3551 #: src/dialogs/save/save.c:283 src/dialogs/settings/dialog.c:182
3538 3552 msgid "_Cancel"
... ... @@ -3603,7 +3617,7 @@ msgstr &quot;&quot;
3603 3617 msgid "_Options"
3604 3618 msgstr ""
3605 3619  
3606   -#: src/selection/linux/paste.c:85 src/selection/linux/paste.c:119
  3620 +#: src/selection/windows/paste.c:84 src/selection/windows/paste.c:124
3607 3621 msgid "_Paste as text"
3608 3622 msgstr ""
3609 3623  
... ... @@ -3653,15 +3667,11 @@ msgstr &quot;&quot;
3653 3667 msgid "an action attribute"
3654 3668 msgstr ""
3655 3669  
3656   -#: src/core/session.c:416
3657   -msgid "bracket"
3658   -msgstr ""
3659   -
3660   -#: src/core/toggles/init.c:89 src/core/linux/connect.c:234
  3670 +#: src/core/toggles/init.c:89 src/core/windows/connect.c:332
3661 3671 msgid "disable"
3662 3672 msgstr ""
3663 3673  
3664   -#: src/core/toggles/init.c:89 src/core/linux/connect.c:234
  3674 +#: src/core/toggles/init.c:89 src/core/windows/connect.c:332
3665 3675 msgid "enable"
3666 3676 msgstr ""
3667 3677  
... ... @@ -3673,11 +3683,11 @@ msgstr &quot;&quot;
3673 3683 msgid "ioctlsocket(FIONBIO) failed."
3674 3684 msgstr ""
3675 3685  
3676   -#: src/core/properties/string.c:132
  3686 +#: src/core/properties/string.c:136
3677 3687 msgid "lib3270 revision"
3678 3688 msgstr ""
3679 3689  
3680   -#: src/core/properties/string.c:125
  3690 +#: src/core/properties/string.c:129
3681 3691 msgid "lib3270 version"
3682 3692 msgstr ""
3683 3693  
... ... @@ -3685,7 +3695,7 @@ msgstr &quot;&quot;
3685 3695 msgid "numeric lock"
3686 3696 msgstr ""
3687 3697  
3688   -#: src/core/linux/connect.c:221
  3698 +#: src/core/windows/connect.c:353
3689 3699 msgid "setsockopt(SO_OOBINLINE) has failed"
3690 3700 msgstr ""
3691 3701  
... ...
pw3270.cbp
  Diff comments   View file @f9aaba9
... ... @@ -156,6 +156,9 @@
156 156 <Unit filename="src/pw3270/linux/print.c">
157 157 <Option compilerVar="CC" />
158 158 </Unit>
  159 + <Unit filename="src/pw3270/linux/settings.c">
  160 + <Option compilerVar="CC" />
  161 + </Unit>
159 162 <Unit filename="src/pw3270/main.c">
160 163 <Option compilerVar="CC" />
161 164 </Unit>
... ...
src/pw3270/linux/settings.c 0 → 100644
  Diff comments   View file @f9aaba9
... ... @@ -0,0 +1,105 @@
  1 +/*
  2 + * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270
  3 + * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
  4 + * aplicativos mainframe. Registro no INPI sob o nome G3270.
  5 + *
  6 + * Copyright (C) <2008> <Banco do Brasil S.A.>
  7 + *
  8 + * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
  9 + * os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela
  10 + * Free Software Foundation.
  11 + *
  12 + * Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER
  13 + * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO
  14 + * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
  15 + * obter mais detalhes.
  16 + *
  17 + * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
  18 + * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
  19 + * St, Fifth Floor, Boston, MA 02110-1301 USA
  20 + *
  21 + * Este programa está nomeado como - e possui - linhas de código.
  22 + *
  23 + * Contatos:
  24 + *
  25 + * perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)
  26 + * erico.mendonca@gmail.com (Erico Mascarenhas Mendonça)
  27 + *
  28 + */
  29 +
  30 + #include <config.h>
  31 + #include "../private.h"
  32 + #include <v3270/settings.h>
  33 + #include <lib3270/log.h>
  34 +
  35 +/*--[ Implement ]------------------------------------------------------------------------------------*/
  36 +
  37 + void load_terminal_settings(GtkWidget *widget)
  38 + {
  39 + GError *error = NULL;
  40 + g_autofree gchar * name = g_strconcat(g_get_application_name(),".conf",NULL);
  41 +
  42 +#ifdef DATADIR
  43 + //
  44 + // Search the application DATADIR
  45 + //
  46 + {
  47 + g_autofree gchar *filename = g_build_filename(DATAROOTDIR,G_STRINGIFY(PRODUCT_NAME),name,NULL);
  48 +
  49 + if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
  50 + {
  51 + GKeyFile *key_file = g_key_file_new();
  52 +
  53 + g_key_file_load_from_file(key_file,filename,G_KEY_FILE_NONE,&error);
  54 +
  55 + if(error)
  56 + {
  57 + g_warning("Can't load \"%s\": %s",filename,error->message);
  58 + g_error_free(error);
  59 + error = NULL;
  60 + }
  61 + else
  62 + {
  63 + g_message("Loading system settings from %s",filename);
  64 + v3270_load_key_file(widget,key_file,"terminal");
  65 + }
  66 +
  67 + g_key_file_free(key_file);
  68 +
  69 + }
  70 +
  71 + }
  72 +#endif // DATADIR
  73 +
  74 + //
  75 + // Get from user datadir
  76 + //
  77 + {
  78 + g_autofree gchar *filename = g_build_filename(g_get_user_config_dir(),name,NULL);
  79 +
  80 + if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
  81 + {
  82 + GKeyFile *key_file = g_key_file_new();
  83 +
  84 + g_key_file_load_from_file(key_file,filename,G_KEY_FILE_NONE,&error);
  85 +
  86 + if(error)
  87 + {
  88 + g_warning("Can't load \"%s\": %s",filename,error->message);
  89 + g_error_free(error);
  90 + error = NULL;
  91 + }
  92 + else
  93 + {
  94 + g_message("Loading user settings from %s",filename);
  95 + v3270_load_key_file(widget,key_file,"terminal");
  96 + }
  97 +
  98 + g_key_file_free(key_file);
  99 +
  100 + }
  101 +
  102 + }
  103 +
  104 + }
  105 +
... ...
src/pw3270/private.h
  Diff comments   View file @f9aaba9
... ... @@ -97,6 +97,10 @@
97 97 G_GNUC_INTERNAL void print_settings_action(GtkAction *action, GtkWidget *widget);
98 98 G_GNUC_INTERNAL gboolean handle_keypress(GtkWidget *terminal, guint keyval, GdkModifierType state, GtkWidget *window);
99 99  
  100 + // Settings
  101 +
  102 + /// @brief Load terminal settings from system and session files.
  103 + G_GNUC_INTERNAL void load_terminal_settings(GtkWidget *widget);
100 104  
101 105 #endif // PRIVATE_H_INCLUDED
102 106  
... ...
src/pw3270/window.c
  Diff comments   View file @f9aaba9
... ... @@ -40,6 +40,7 @@
40 40 #include <v3270/trace.h>
41 41 #include <v3270/toggle.h>
42 42 #include <v3270/settings.h>
  43 +#include "common/common.h"
43 44  
44 45 /*--[ Widget definition ]----------------------------------------------------------------------------*/
45 46  
... ... @@ -751,6 +752,7 @@ static GtkWidget * trace_window = NULL;
751 752 { NULL, NULL }
752 753 };
753 754  
  755 + /*
754 756 static const struct _widget_config
755 757 {
756 758 const gchar *key;
... ... @@ -760,6 +762,7 @@ static GtkWidget * trace_window = NULL;
760 762 { "colors", v3270_set_colors },
761 763 { "font-family", v3270_set_font_family }
762 764 };
  765 + */
763 766  
764 767 int f;
765 768 GtkAction **action = g_new0(GtkAction *,ACTION_COUNT);
... ... @@ -771,32 +774,8 @@ static GtkWidget * trace_window = NULL;
771 774 widget->terminal = v3270_new();
772 775 host = v3270_get_session(widget->terminal);
773 776  
774   - for(f=0;f<G_N_ELEMENTS(widget_config);f++)
775   - {
776   - gchar *str = get_string_from_config("terminal",widget_config[f].key,NULL);
777   -// trace("str=%p strlen=%d",str,strlen(str));
778   - widget_config[f].set(widget->terminal,str);
779   - if(str)
780   - g_free(str);
781   - }
782   -
783   - {
784   - char str[2];
785   - str[0] = get_integer_from_config("terminal","model_number",2)+'0';
786   - str[1] = 0;
787   - lib3270_set_model(host,str);
788   -
789   - unsigned int unlock_delay = (unsigned int) get_integer_from_config("terminal","unlock_delay",(int) lib3270_get_unlock_delay(host));
790   - lib3270_set_unlock_delay(host,unlock_delay);
791   -
792   - }
793   -
794   - for(f=0;f<LIB3270_TOGGLE_COUNT;f++)
795   - {
796   - gchar *nm = g_ascii_strdown(lib3270_get_toggle_name(f),-1);
797   - lib3270_set_toggle(host,f,get_boolean_from_config("toggle",nm,lib3270_get_toggle(host,f)));
798   - g_free(nm);
799   - }
  777 + // Load terminal settings before connecting the signals.
  778 + load_terminal_settings(widget->terminal);
800 779  
801 780 g_object_set_data_full(G_OBJECT(widget->terminal),"toggle_actions",g_new0(GtkAction *,LIB3270_TOGGLE_COUNT),g_free);
802 781 g_object_set_data_full(G_OBJECT(widget->terminal),"named_actions",(gpointer) action, (GDestroyNotify) g_free);
... ...