Commit 4bb46b9d15aa71776724de7d77b2f191b151eb6e

Authored by Perry Werneck
1 parent 4d263a5a

Adding icon style in the toolbar dialog.

locale/pt_BR.po
... ... @@ -5,8 +5,8 @@ msgid ""
5 5 msgstr ""
6 6 "Project-Id-Version: pw3270 5.0\n"
7 7 "Report-Msgid-Bugs-To: \n"
8   -"POT-Creation-Date: 2020-09-29 09:45-0300\n"
9   -"PO-Revision-Date: 2020-09-29 09:47-0300\n"
  8 +"POT-Creation-Date: 2020-10-15 13:43-0300\n"
  9 +"PO-Revision-Date: 2020-10-15 13:45-0300\n"
10 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 11 "Language-Team: Português <>\n"
12 12 "Language: pt_BR\n"
... ... @@ -63,7 +63,7 @@ msgstr &quot;Nome da ação&quot;
63 63 msgid "Action Names"
64 64 msgstr "Nome das ações"
65 65  
66   -#: ui/window.xml:369 ui/window.xml:484 ui/application.xml:509
  66 +#: ui/window.xml:379 ui/window.xml:494 ui/application.xml:509
67 67 msgid "Alert sound"
68 68 msgstr "Aviso sonoro"
69 69  
... ... @@ -71,7 +71,7 @@ msgstr &quot;Aviso sonoro&quot;
71 71 msgid "All files"
72 72 msgstr "Todos os arquivos"
73 73  
74   -#: ui/window.xml:168 ui/application.xml:251
  74 +#: ui/window.xml:178 ui/application.xml:251
75 75 msgid "Append to copy"
76 76 msgstr "Adicionar à cópia"
77 77  
... ... @@ -99,7 +99,7 @@ msgstr &quot;Aplicar&quot;
99 99 msgid "Auto-Reconnect"
100 100 msgstr "Reconectar automaticamente"
101 101  
102   -#: src/objects/toolbar/settings.c:100 src/objects/settings/actionview.c:73
  102 +#: src/objects/toolbar/settings.c:112 src/objects/settings/actionview.c:73
103 103 msgid "Available"
104 104 msgstr "Disponível"
105 105  
... ... @@ -107,7 +107,7 @@ msgstr &quot;Disponível&quot;
107 107 msgid "Based on X3270 from"
108 108 msgstr "Baseado no X3270 por"
109 109  
110   -#: ui/window.xml:398 ui/application.xml:474
  110 +#: ui/window.xml:408 ui/application.xml:474
111 111 msgid "Blank Fill"
112 112 msgstr "Completar com espaços"
113 113  
... ... @@ -149,7 +149,7 @@ msgstr &quot;Modificar posição dos ícones da barra de título&quot;
149 149 msgid "Change the preferences for the active session"
150 150 msgstr "Modificar preferências da sessão ativa"
151 151  
152   -#: ui/window.xml:182 ui/window.xml:324 ui/application.xml:304
  152 +#: ui/window.xml:192 ui/window.xml:334 ui/application.xml:304
153 153 msgid "Clear"
154 154 msgstr "Limpar"
155 155  
... ... @@ -166,8 +166,8 @@ msgstr &quot;Fecha todas as janelas e encerra a aplicação&quot;
166 166 msgid "Close the window"
167 167 msgstr "Fechar a janela"
168 168  
169   -#: src/objects/window/actions/close.c:60 ui/window.xml:270 ui/window.xml:463
170   -#: ui/window.xml:570 ui/application.xml:216
  169 +#: src/objects/window/actions/close.c:60 ui/window.xml:280 ui/window.xml:473
  170 +#: ui/window.xml:580 ui/application.xml:216
171 171 msgid "Close window"
172 172 msgstr "Fechar janela"
173 173  
... ... @@ -207,6 +207,14 @@ msgstr &quot;Contribuidores&quot;
207 207 msgid "Copy"
208 208 msgstr "Copiar"
209 209  
  210 +#: ui/window.xml:168
  211 +msgid "Copy as HTML"
  212 +msgstr "Copiar como HTML"
  213 +
  214 +#: ui/window.xml:173
  215 +msgid "Copy as image"
  216 +msgstr "Copiar como imagem"
  217 +
210 218 #: ui/window.xml:163 ui/application.xml:246
211 219 msgid "Copy as table"
212 220 msgstr "Copiar como tabela"
... ... @@ -219,7 +227,7 @@ msgstr &quot;Copiar como texto&quot;
219 227 msgid "Create shortcut for the current session"
220 228 msgstr "Criar atalho para a sessão atual."
221 229  
222   -#: ui/window.xml:359 ui/application.xml:459
  230 +#: ui/window.xml:369 ui/application.xml:459
223 231 msgid "Cross hair cursor"
224 232 msgstr "Cursor mira"
225 233  
... ... @@ -235,15 +243,15 @@ msgstr &quot;Tela atual&quot;
235 243 msgid "Current session"
236 244 msgstr "Sessão atual"
237 245  
238   -#: ui/window.xml:173 ui/application.xml:256
  246 +#: ui/window.xml:183 ui/application.xml:256
239 247 msgid "Cut"
240 248 msgstr "Recortar"
241 249  
242   -#: ui/window.xml:192 ui/window.xml:334 ui/application.xml:314
  250 +#: ui/window.xml:202 ui/window.xml:344 ui/application.xml:314
243 251 msgid "Delete Field"
244 252 msgstr "Apagar campo"
245 253  
246   -#: ui/window.xml:265 ui/window.xml:458
  254 +#: ui/window.xml:275 ui/window.xml:468
247 255 msgid "Disconnect"
248 256 msgstr "Desconectar"
249 257  
... ... @@ -252,7 +260,7 @@ msgstr &quot;Desconectar&quot;
252 260 msgid "Disconnected from host"
253 261 msgstr "Desconectado do servidor"
254 262  
255   -#: ui/window.xml:381 ui/window.xml:497 ui/application.xml:524
  263 +#: ui/window.xml:391 ui/window.xml:507 ui/application.xml:524
256 264 msgid "Dynamic font spacing"
257 265 msgstr "Espaçamento dinâmico"
258 266  
... ... @@ -280,15 +288,15 @@ msgstr &quot;Habilitado&quot;
280 288 msgid "End"
281 289 msgstr "Final"
282 290  
283   -#: ui/window.xml:187 ui/window.xml:329 ui/application.xml:309
  291 +#: ui/window.xml:197 ui/window.xml:339 ui/application.xml:309
284 292 msgid "Erase input"
285 293 msgstr "Apagar campos"
286 294  
287   -#: ui/window.xml:197 ui/window.xml:339 ui/application.xml:319
  295 +#: ui/window.xml:207 ui/window.xml:349 ui/application.xml:319
288 296 msgid "Erase to end of field"
289 297 msgstr "Apagar até o final do campo"
290 298  
291   -#: ui/window.xml:202 ui/window.xml:344 ui/application.xml:324
  299 +#: ui/window.xml:212 ui/window.xml:354 ui/application.xml:324
292 300 msgid "Erase to end of line"
293 301 msgstr "Apagar até o final da linha"
294 302  
... ... @@ -300,7 +308,7 @@ msgstr &quot;Mostra atributos de campo&quot;
300 308 msgid "Full Screen"
301 309 msgstr "Tela cheia"
302 310  
303   -#: ui/window.xml:236 ui/window.xml:407 ui/window.xml:502
  311 +#: ui/window.xml:246 ui/window.xml:417 ui/window.xml:512
304 312 msgid "Full screen"
305 313 msgstr "Tela cheia"
306 314  
... ... @@ -332,19 +340,27 @@ msgstr &quot;Ícone&quot;
332 340 msgid "Icon Name"
333 341 msgstr "Nome do ícone"
334 342  
335   -#: src/objects/toolbar/settings.c:50
  343 +#: src/objects/toolbar/settings.c:54
336 344 msgid "Icon Size"
337 345 msgstr "Tamanho do ícone"
338 346  
339   -#: src/objects/toolbar/toolbar.c:286
  347 +#: src/objects/toolbar/settings.c:61
  348 +msgid "Icon Style"
  349 +msgstr "Estilo do ícone"
  350 +
  351 +#: src/objects/toolbar/models.c:52
340 352 msgid "Icon _size"
341 353 msgstr "_Tamanho do ícone"
342 354  
343   -#: src/objects/toolbar/toolbar.c:84
  355 +#: src/objects/toolbar/models.c:108
  356 +msgid "Icon type"
  357 +msgstr "Tipo do ícone"
  358 +
  359 +#: src/objects/toolbar/models.c:97
344 360 msgid "Icons & text"
345 361 msgstr "Ícones e texto"
346 362  
347   -#: src/objects/toolbar/toolbar.c:74
  363 +#: src/objects/toolbar/models.c:87
348 364 msgid "Icons only"
349 365 msgstr "Apenas ícones"
350 366  
... ... @@ -352,7 +368,7 @@ msgstr &quot;Apenas ícones&quot;
352 368 msgid "If the action can be activated"
353 369 msgstr "Se a ação pode ser ativada"
354 370  
355   -#: ui/window.xml:474
  371 +#: ui/window.xml:484
356 372 msgid "Insert"
357 373 msgstr "Inserção"
358 374  
... ... @@ -368,7 +384,7 @@ msgstr &quot;Itens empacotados do final para o início&quot;
368 384 msgid "Items packed from the start to the end"
369 385 msgstr "Itens empacotados do início para o final"
370 386  
371   -#: src/objects/toolbar/settings.c:94
  387 +#: src/objects/toolbar/settings.c:106
372 388 msgid "Itens"
373 389 msgstr "Itens"
374 390  
... ... @@ -404,11 +420,11 @@ msgstr &quot;LICENCA&quot;
404 420 msgid "Label"
405 421 msgstr "Etiqueta"
406 422  
407   -#: src/objects/toolbar/toolbar.c:58
  423 +#: src/objects/toolbar/models.c:66
408 424 msgid "Large"
409 425 msgstr "Grande"
410 426  
411   -#: src/objects/toolbar/settings.c:164
  427 +#: src/objects/toolbar/settings.c:176
412 428 msgid "Layout"
413 429 msgstr "Formato"
414 430  
... ... @@ -424,7 +440,7 @@ msgstr &quot;Menu principal&quot;
424 440 msgid "Main Toolbar"
425 441 msgstr "Barra de ferramentas"
426 442  
427   -#: ui/window.xml:545
  443 +#: ui/window.xml:555
428 444 msgid "Main menu"
429 445 msgstr "Menu principal"
430 446  
... ... @@ -436,23 +452,23 @@ msgstr &quot;Mantenedores&quot;
436 452 msgid "Menu"
437 453 msgstr "Menu"
438 454  
439   -#: ui/window.xml:511 ui/application.xml:403
  455 +#: ui/window.xml:521 ui/application.xml:403
440 456 msgid "Model 2 - 80x24"
441 457 msgstr "Modelo 2 - 80x24"
442 458  
443   -#: ui/window.xml:516 ui/application.xml:408
  459 +#: ui/window.xml:526 ui/application.xml:408
444 460 msgid "Model 3 - 80x32"
445 461 msgstr "Modelo 3 - 80x32"
446 462  
447   -#: ui/window.xml:521 ui/application.xml:413
  463 +#: ui/window.xml:531 ui/application.xml:413
448 464 msgid "Model 4 - 80x43"
449 465 msgstr "Modelo 4 - 80x43"
450 466  
451   -#: ui/window.xml:526 ui/application.xml:418
  467 +#: ui/window.xml:536 ui/application.xml:418
452 468 msgid "Model 5 - 132x27"
453 469 msgstr "Modelo 5 - 132x27"
454 470  
455   -#: ui/window.xml:376 ui/application.xml:444
  471 +#: ui/window.xml:386 ui/application.xml:444
456 472 msgid "Monocase"
457 473 msgstr "Só Maiúsculas"
458 474  
... ... @@ -508,7 +524,7 @@ msgstr &quot;Abrir sessão em nova aba&quot;
508 524 msgid "Open session in New window"
509 525 msgstr "Abrir sessão em nova janela"
510 526  
511   -#: ui/window.xml:212 ui/window.xml:354 ui/window.xml:494 ui/application.xml:431
  527 +#: ui/window.xml:222 ui/window.xml:364 ui/window.xml:504 ui/application.xml:431
512 528 msgid "Options"
513 529 msgstr "Opções"
514 530  
... ... @@ -516,19 +532,19 @@ msgstr &quot;Opções&quot;
516 532 msgid "Parameter Type"
517 533 msgstr "Tipo de parâmetro"
518 534  
519   -#: ui/window.xml:286 ui/application.xml:261
  535 +#: ui/window.xml:296 ui/application.xml:261
520 536 msgid "Paste from clipboard"
521 537 msgstr "Colar da área de transferência"
522 538  
523   -#: ui/window.xml:296 ui/application.xml:271
  539 +#: ui/window.xml:306 ui/application.xml:271
524 540 msgid "Paste from text file"
525 541 msgstr "Colar de um arquivo texto"
526 542  
527   -#: ui/window.xml:291 ui/application.xml:266
  543 +#: ui/window.xml:301 ui/application.xml:266
528 544 msgid "Paste next"
529 545 msgstr "Colar próximo"
530 546  
531   -#: ui/window.xml:393 ui/application.xml:469
  547 +#: ui/window.xml:403 ui/application.xml:469
532 548 msgid "Paste with left margin"
533 549 msgstr "Colar com margem esquerda"
534 550  
... ... @@ -544,11 +560,11 @@ msgstr &quot;Preferências&quot;
544 560 msgid "Print"
545 561 msgstr "Imprimir"
546 562  
547   -#: ui/window.xml:444
  563 +#: ui/window.xml:454
548 564 msgid "Print screen"
549 565 msgstr "Imrpimir o conteúdo da tela"
550 566  
551   -#: ui/window.xml:252
  567 +#: ui/window.xml:262
552 568 msgid "Print selected"
553 569 msgstr "Imprimir seleção"
554 570  
... ... @@ -565,11 +581,11 @@ msgstr &quot;Sair&quot;
565 581 msgid "Rename Session"
566 582 msgstr "Renomear sessão"
567 583  
568   -#: ui/window.xml:315 ui/application.xml:295
  584 +#: ui/window.xml:325 ui/application.xml:295
569 585 msgid "Reselect"
570 586 msgstr "Reselecionar"
571 587  
572   -#: ui/window.xml:364 ui/application.xml:464
  588 +#: ui/window.xml:374 ui/application.xml:464
573 589 msgid "Resize on alternate screen"
574 590 msgstr "Mudar tamanho do terminal em tela alternativa"
575 591  
... ... @@ -577,10 +593,6 @@ msgstr &quot;Mudar tamanho do terminal em tela alternativa&quot;
577 593 msgid "Right keypad"
578 594 msgstr "Painel direito"
579 595  
580   -#: src/objects/toolbar/toolbar.c:310
581   -msgid "S_tyle"
582   -msgstr "E_stilo"
583   -
584 596 #: ui/window.xml:69 ui/application.xml:134
585 597 msgid "Save"
586 598 msgstr "Salvar"
... ... @@ -589,11 +601,11 @@ msgstr &quot;Salvar&quot;
589 601 msgid "Save current session preferences to file"
590 602 msgstr "Salvar preferências da sessão para arquivo"
591 603  
592   -#: ui/window.xml:439
  604 +#: ui/window.xml:449
593 605 msgid "Save screen"
594 606 msgstr "Salvar tela"
595 607  
596   -#: ui/window.xml:247
  608 +#: ui/window.xml:257
597 609 msgid "Save selected"
598 610 msgstr "Salvar seleção"
599 611  
... ... @@ -613,27 +625,27 @@ msgstr &quot;Salvar para arquivo de sessão&quot;
613 625 msgid "Save to shortcut file"
614 626 msgstr "Salvar para atalho"
615 627  
616   -#: ui/window.xml:508 ui/application.xml:400
  628 +#: ui/window.xml:518 ui/application.xml:400
617 629 msgid "Screen size"
618 630 msgstr "Tamanho da tela"
619 631  
620   -#: ui/window.xml:310 ui/application.xml:285
  632 +#: ui/window.xml:320 ui/application.xml:285
621 633 msgid "Select Field"
622 634 msgstr "Selecionar campo"
623 635  
624   -#: ui/window.xml:305 ui/application.xml:280
  636 +#: ui/window.xml:315 ui/application.xml:280
625 637 msgid "Select all"
626 638 msgstr "Selecionar tudo"
627 639  
628   -#: ui/window.xml:217 ui/application.xml:479
  640 +#: ui/window.xml:227 ui/application.xml:479
629 641 msgid "Select by rectangles"
630 642 msgstr "Seleção retangular"
631 643  
632   -#: src/objects/toolbar/settings.c:94
  644 +#: src/objects/toolbar/settings.c:106
633 645 msgid "Select the toolbar itens"
634 646 msgstr "Selecione itens da barra de ferramentas"
635 647  
636   -#: src/objects/toolbar/settings.c:99
  648 +#: src/objects/toolbar/settings.c:111
637 649 msgid "Selected"
638 650 msgstr "Selecionado"
639 651  
... ... @@ -646,12 +658,12 @@ msgstr &quot;Área selecionada&quot;
646 658 msgid "Send/Receive"
647 659 msgstr "Enviar/Receber"
648 660  
649   -#: src/objects/window/actions/filetransfer.c:46 ui/window.xml:449
  661 +#: src/objects/window/actions/filetransfer.c:46 ui/window.xml:459
650 662 #: ui/application.xml:195
651 663 msgid "Send/Receive files"
652 664 msgstr "Enviar/Receber arquivos"
653 665  
654   -#: src/objects/toolbar/settings.c:223 src/objects/toolbar/settings.c:233
  666 +#: src/objects/toolbar/settings.c:234 src/objects/toolbar/settings.c:244
655 667 msgid "Separator"
656 668 msgstr "Separador"
657 669  
... ... @@ -659,7 +671,7 @@ msgstr &quot;Separador&quot;
659 671 msgid "Session"
660 672 msgstr "Sessão"
661 673  
662   -#: ui/window.xml:430 ui/window.xml:550 ui/application.xml:76
  674 +#: ui/window.xml:440 ui/window.xml:560 ui/application.xml:76
663 675 msgid "Session Trace"
664 676 msgstr "Trace da sessão"
665 677  
... ... @@ -680,7 +692,7 @@ msgid &quot;Session name&quot;
680 692 msgstr "Nome da sessão"
681 693  
682 694 #: src/objects/window/actions/sessionproperties.c:46 ui/window.xml:98
683   -#: ui/window.xml:564 ui/application.xml:163
  695 +#: ui/window.xml:574 ui/application.xml:163
684 696 msgid "Session preferences"
685 697 msgstr "Preferências da sessão"
686 698  
... ... @@ -692,7 +704,7 @@ msgstr &quot;Define o tipo de interface do usuário&quot;
692 704 msgid "Settings"
693 705 msgstr "Configurações"
694 706  
695   -#: src/objects/toolbar/settings.c:164
  707 +#: src/objects/toolbar/settings.c:176
696 708 msgid "Setup the toolbar layout"
697 709 msgstr "Configura formato da barra de ferramentas"
698 710  
... ... @@ -700,7 +712,7 @@ msgstr &quot;Configura formato da barra de ferramentas&quot;
700 712 msgid "Setup title bar"
701 713 msgstr "Configurar barra de título"
702 714  
703   -#: src/objects/toolbar/toolbar.c:272 src/objects/toolbar/settings.c:76
  715 +#: src/objects/toolbar/toolbar.c:214 src/objects/toolbar/settings.c:88
704 716 msgid "Setup toolbar"
705 717 msgstr "Configurar barra de ferramentas"
706 718  
... ... @@ -720,19 +732,19 @@ msgstr &quot;Nome do atalho&quot;
720 732 msgid "Show Underline"
721 733 msgstr "Mostrar sublinhado"
722 734  
723   -#: ui/window.xml:231
  735 +#: ui/window.xml:241
724 736 msgid "Show menu"
725 737 msgstr "Mostrar menu"
726 738  
727   -#: ui/window.xml:226
  739 +#: ui/window.xml:236
728 740 msgid "Show toolbar"
729 741 msgstr "Mostrar barra de ferramentas"
730 742  
731   -#: src/objects/toolbar/toolbar.c:53
  743 +#: src/objects/toolbar/models.c:61
732 744 msgid "Small"
733 745 msgstr "Pequeno"
734 746  
735   -#: ui/window.xml:388 ui/application.xml:504
  747 +#: ui/window.xml:398 ui/application.xml:504
736 748 msgid "Smart paste"
737 749 msgstr "Colar inteligente"
738 750  
... ... @@ -752,11 +764,12 @@ msgstr &quot;Estado&quot;
752 764 msgid "State Type"
753 765 msgstr "Tipo do estado"
754 766  
755   -#: src/objects/toolbar/settings.c:55
756   -msgid "Style"
757   -msgstr "Estilo"
  767 +#: src/objects/toolbar/models.c:115
  768 +msgid "Symbolic"
  769 +msgstr "Simbólico"
758 770  
759   -#: src/objects/toolbar/toolbar.c:47 src/objects/toolbar/toolbar.c:69
  771 +#: src/objects/toolbar/models.c:55 src/objects/toolbar/models.c:82
  772 +#: src/objects/toolbar/models.c:111
760 773 msgid "System default"
761 774 msgstr "Padrão do sistema"
762 775  
... ... @@ -772,7 +785,7 @@ msgstr &quot;Aba com a sessão padrão&quot;
772 785 msgid "Terminal font"
773 786 msgstr "Fonte do terminal"
774 787  
775   -#: src/objects/toolbar/toolbar.c:79
  788 +#: src/objects/toolbar/models.c:92
776 789 msgid "Text only"
777 790 msgstr "Apenas texto"
778 791  
... ... @@ -812,7 +825,7 @@ msgstr &quot;Nome da ação associada&quot;
812 825 msgid "The name of the actions in the header bar"
813 826 msgstr "O nome das ações na barra de título"
814 827  
815   -#: src/objects/toolbar/toolbar.c:138
  828 +#: src/objects/toolbar/toolbar.c:98
816 829 msgid "The name of the actions in the toolbar"
817 830 msgstr "O nome das ações na barra de ferramentas"
818 831  
... ... @@ -846,15 +859,15 @@ msgstr &quot;&quot;
846 859 msgid "The state the action is in"
847 860 msgstr "O estado em que a ação está"
848 861  
849   -#: src/objects/toolbar/toolbar.c:149
  862 +#: src/objects/toolbar/toolbar.c:109
850 863 msgid "The toolbar icon size"
851 864 msgstr "Tamanho dos ícones na barra de ferramentas"
852 865  
853   -#: src/objects/toolbar/toolbar.c:175
  866 +#: src/objects/toolbar/toolbar.c:135
854 867 msgid "The toolbar icon type"
855 868 msgstr "Tipo dos ícones na barra de ferramentas"
856 869  
857   -#: src/objects/toolbar/toolbar.c:162
  870 +#: src/objects/toolbar/toolbar.c:122
858 871 msgid "The toolbar style"
859 872 msgstr "Estilo da barra de ferramentas"
860 873  
... ... @@ -878,12 +891,20 @@ msgstr &quot;Barra de título&quot;
878 891 msgid "Title bar actions"
879 892 msgstr "Ações da barra de título"
880 893  
881   -#: src/objects/toolbar/settings.c:75 ui/window.xml:420 ui/window.xml:540
  894 +#: src/objects/toolbar/settings.c:87 ui/window.xml:430 ui/window.xml:550
882 895 #: ui/application.xml:342
883 896 msgid "Toolbar"
884 897 msgstr "Barra de ferramentas"
885 898  
886   -#: ui/window.xml:425
  899 +#: src/objects/toolbar/settings.c:68
  900 +msgid "Toolbar Style"
  901 +msgstr "Estilo da barra de ferramentas"
  902 +
  903 +#: src/objects/toolbar/models.c:79
  904 +msgid "Toolbar s_tyle"
  905 +msgstr "Est_ilo da barra de ferramentas"
  906 +
  907 +#: ui/window.xml:435
887 908 msgid "Top menu"
888 909 msgstr "Menu principal"
889 910  
... ... @@ -891,7 +912,7 @@ msgstr &quot;Menu principal&quot;
891 912 msgid "Trace"
892 913 msgstr "Trace"
893 914  
894   -#: ui/window.xml:479 ui/application.xml:449
  915 +#: ui/window.xml:489 ui/application.xml:449
895 916 msgid "Track Cursor"
896 917 msgstr "Mostrar posição do cursor"
897 918  
... ... @@ -899,7 +920,7 @@ msgstr &quot;Mostrar posição do cursor&quot;
899 920 msgid "UI Type"
900 921 msgstr "Interface de usuário"
901 922  
902   -#: ui/window.xml:257 ui/application.xml:290
  923 +#: ui/window.xml:267 ui/application.xml:290
903 924 msgid "Unselect"
904 925 msgstr "Remover seleção"
905 926  
... ... @@ -912,7 +933,7 @@ msgstr &quot;Usar teclas +/- para navegar por campos&quot;
912 933 msgid "Version %s-%s"
913 934 msgstr "Versão %s-%s"
914 935  
915   -#: src/objects/window/header.c:66 ui/window.xml:417 ui/window.xml:537
  936 +#: src/objects/window/header.c:66 ui/window.xml:427 ui/window.xml:547
916 937 #: ui/application.xml:63
917 938 msgid "View"
918 939 msgstr "Exibir"
... ... @@ -938,7 +959,7 @@ msgstr &quot;_Cancelar&quot;
938 959 msgid "_Close session"
939 960 msgstr "_Fechar sessão"
940 961  
941   -#: ui/window.xml:559 ui/application.xml:368
  962 +#: ui/window.xml:569 ui/application.xml:368
942 963 msgid "_Connect"
943 964 msgstr "_Conectar"
944 965  
... ... @@ -946,7 +967,7 @@ msgstr &quot;_Conectar&quot;
946 967 msgid "_Disconnect"
947 968 msgstr "_Desconectar"
948 969  
949   -#: ui/window.xml:148 ui/window.xml:281 ui/application.xml:231
  970 +#: ui/window.xml:148 ui/window.xml:291 ui/application.xml:231
950 971 msgid "_Edit"
951 972 msgstr "_Editar"
952 973  
... ... @@ -966,7 +987,7 @@ msgstr &quot;_Nova&quot;
966 987 msgid "_Open"
967 988 msgstr "_Abrir"
968 989  
969   -#: src/objects/toolbar/toolbar.c:332
  990 +#: src/objects/toolbar/toolbar.c:236
970 991 msgid "_Preferences"
971 992 msgstr "_Preferências"
972 993  
... ... @@ -1663,9 +1684,6 @@ msgstr &quot;translator-credits&quot;
1663 1684 #~ msgid "Copiar tudo"
1664 1685 #~ msgstr "Copiar tudo"
1665 1686  
1666   -#~ msgid "Copy as HTML"
1667   -#~ msgstr "Copiar como HTML"
1668   -
1669 1687 #~ msgid "Creates a file with fixed-length records."
1670 1688 #~ msgstr "Cria arquivo com registros de tamanho fixo."
1671 1689  
... ... @@ -2923,6 +2941,9 @@ msgstr &quot;translator-credits&quot;
2923 2941 #~ msgid "SSLv2/v3 read server hello A"
2924 2942 #~ msgstr "SSLv2/v3 read server hello A"
2925 2943  
  2944 +#~ msgid "S_tyle"
  2945 +#~ msgstr "E_stilo"
  2946 +
2926 2947 #~ msgid "Save As"
2927 2948 #~ msgstr "Salvar Como"
2928 2949  
... ... @@ -3210,6 +3231,9 @@ msgstr &quot;translator-credits&quot;
3210 3231 #~ msgid "State is 3270, TN3270e or SSCP"
3211 3232 #~ msgstr "Estado do terminal é 3270, TN3270e or SSCP"
3212 3233  
  3234 +#~ msgid "Style"
  3235 +#~ msgstr "Estilo"
  3236 +
3213 3237 #~ msgid "Subject issuer mismatch"
3214 3238 #~ msgstr "Divergência na identidade do emissor"
3215 3239  
... ...
locale/pw3270.pot
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2020-09-29 09:45-0300\n"
  11 +"POT-Creation-Date: 2020-10-15 13:43-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -60,7 +60,7 @@ msgstr &quot;&quot;
60 60 msgid "Action Names"
61 61 msgstr ""
62 62  
63   -#: ui/window.xml:369 ui/window.xml:484 ui/application.xml:509
  63 +#: ui/window.xml:379 ui/window.xml:494 ui/application.xml:509
64 64 msgid "Alert sound"
65 65 msgstr ""
66 66  
... ... @@ -68,7 +68,7 @@ msgstr &quot;&quot;
68 68 msgid "All files"
69 69 msgstr ""
70 70  
71   -#: ui/window.xml:168 ui/application.xml:251
  71 +#: ui/window.xml:178 ui/application.xml:251
72 72 msgid "Append to copy"
73 73 msgstr ""
74 74  
... ... @@ -96,7 +96,7 @@ msgstr &quot;&quot;
96 96 msgid "Auto-Reconnect"
97 97 msgstr ""
98 98  
99   -#: src/objects/toolbar/settings.c:100 src/objects/settings/actionview.c:73
  99 +#: src/objects/toolbar/settings.c:112 src/objects/settings/actionview.c:73
100 100 msgid "Available"
101 101 msgstr ""
102 102  
... ... @@ -104,7 +104,7 @@ msgstr &quot;&quot;
104 104 msgid "Based on X3270 from"
105 105 msgstr ""
106 106  
107   -#: ui/window.xml:398 ui/application.xml:474
  107 +#: ui/window.xml:408 ui/application.xml:474
108 108 msgid "Blank Fill"
109 109 msgstr ""
110 110  
... ... @@ -146,7 +146,7 @@ msgstr &quot;&quot;
146 146 msgid "Change the preferences for the active session"
147 147 msgstr ""
148 148  
149   -#: ui/window.xml:182 ui/window.xml:324 ui/application.xml:304
  149 +#: ui/window.xml:192 ui/window.xml:334 ui/application.xml:304
150 150 msgid "Clear"
151 151 msgstr ""
152 152  
... ... @@ -163,8 +163,8 @@ msgstr &quot;&quot;
163 163 msgid "Close the window"
164 164 msgstr ""
165 165  
166   -#: src/objects/window/actions/close.c:60 ui/window.xml:270 ui/window.xml:463
167   -#: ui/window.xml:570 ui/application.xml:216
  166 +#: src/objects/window/actions/close.c:60 ui/window.xml:280 ui/window.xml:473
  167 +#: ui/window.xml:580 ui/application.xml:216
168 168 msgid "Close window"
169 169 msgstr ""
170 170  
... ... @@ -204,6 +204,14 @@ msgstr &quot;&quot;
204 204 msgid "Copy"
205 205 msgstr ""
206 206  
  207 +#: ui/window.xml:168
  208 +msgid "Copy as HTML"
  209 +msgstr ""
  210 +
  211 +#: ui/window.xml:173
  212 +msgid "Copy as image"
  213 +msgstr ""
  214 +
207 215 #: ui/window.xml:163 ui/application.xml:246
208 216 msgid "Copy as table"
209 217 msgstr ""
... ... @@ -216,7 +224,7 @@ msgstr &quot;&quot;
216 224 msgid "Create shortcut for the current session"
217 225 msgstr ""
218 226  
219   -#: ui/window.xml:359 ui/application.xml:459
  227 +#: ui/window.xml:369 ui/application.xml:459
220 228 msgid "Cross hair cursor"
221 229 msgstr ""
222 230  
... ... @@ -232,15 +240,15 @@ msgstr &quot;&quot;
232 240 msgid "Current session"
233 241 msgstr ""
234 242  
235   -#: ui/window.xml:173 ui/application.xml:256
  243 +#: ui/window.xml:183 ui/application.xml:256
236 244 msgid "Cut"
237 245 msgstr ""
238 246  
239   -#: ui/window.xml:192 ui/window.xml:334 ui/application.xml:314
  247 +#: ui/window.xml:202 ui/window.xml:344 ui/application.xml:314
240 248 msgid "Delete Field"
241 249 msgstr ""
242 250  
243   -#: ui/window.xml:265 ui/window.xml:458
  251 +#: ui/window.xml:275 ui/window.xml:468
244 252 msgid "Disconnect"
245 253 msgstr ""
246 254  
... ... @@ -249,7 +257,7 @@ msgstr &quot;&quot;
249 257 msgid "Disconnected from host"
250 258 msgstr ""
251 259  
252   -#: ui/window.xml:381 ui/window.xml:497 ui/application.xml:524
  260 +#: ui/window.xml:391 ui/window.xml:507 ui/application.xml:524
253 261 msgid "Dynamic font spacing"
254 262 msgstr ""
255 263  
... ... @@ -277,15 +285,15 @@ msgstr &quot;&quot;
277 285 msgid "End"
278 286 msgstr ""
279 287  
280   -#: ui/window.xml:187 ui/window.xml:329 ui/application.xml:309
  288 +#: ui/window.xml:197 ui/window.xml:339 ui/application.xml:309
281 289 msgid "Erase input"
282 290 msgstr ""
283 291  
284   -#: ui/window.xml:197 ui/window.xml:339 ui/application.xml:319
  292 +#: ui/window.xml:207 ui/window.xml:349 ui/application.xml:319
285 293 msgid "Erase to end of field"
286 294 msgstr ""
287 295  
288   -#: ui/window.xml:202 ui/window.xml:344 ui/application.xml:324
  296 +#: ui/window.xml:212 ui/window.xml:354 ui/application.xml:324
289 297 msgid "Erase to end of line"
290 298 msgstr ""
291 299  
... ... @@ -297,7 +305,7 @@ msgstr &quot;&quot;
297 305 msgid "Full Screen"
298 306 msgstr ""
299 307  
300   -#: ui/window.xml:236 ui/window.xml:407 ui/window.xml:502
  308 +#: ui/window.xml:246 ui/window.xml:417 ui/window.xml:512
301 309 msgid "Full screen"
302 310 msgstr ""
303 311  
... ... @@ -329,19 +337,27 @@ msgstr &quot;&quot;
329 337 msgid "Icon Name"
330 338 msgstr ""
331 339  
332   -#: src/objects/toolbar/settings.c:50
  340 +#: src/objects/toolbar/settings.c:54
333 341 msgid "Icon Size"
334 342 msgstr ""
335 343  
336   -#: src/objects/toolbar/toolbar.c:286
  344 +#: src/objects/toolbar/settings.c:61
  345 +msgid "Icon Style"
  346 +msgstr ""
  347 +
  348 +#: src/objects/toolbar/models.c:52
337 349 msgid "Icon _size"
338 350 msgstr ""
339 351  
340   -#: src/objects/toolbar/toolbar.c:84
  352 +#: src/objects/toolbar/models.c:108
  353 +msgid "Icon type"
  354 +msgstr ""
  355 +
  356 +#: src/objects/toolbar/models.c:97
341 357 msgid "Icons & text"
342 358 msgstr ""
343 359  
344   -#: src/objects/toolbar/toolbar.c:74
  360 +#: src/objects/toolbar/models.c:87
345 361 msgid "Icons only"
346 362 msgstr ""
347 363  
... ... @@ -349,7 +365,7 @@ msgstr &quot;&quot;
349 365 msgid "If the action can be activated"
350 366 msgstr ""
351 367  
352   -#: ui/window.xml:474
  368 +#: ui/window.xml:484
353 369 msgid "Insert"
354 370 msgstr ""
355 371  
... ... @@ -365,7 +381,7 @@ msgstr &quot;&quot;
365 381 msgid "Items packed from the start to the end"
366 382 msgstr ""
367 383  
368   -#: src/objects/toolbar/settings.c:94
  384 +#: src/objects/toolbar/settings.c:106
369 385 msgid "Itens"
370 386 msgstr ""
371 387  
... ... @@ -401,11 +417,11 @@ msgstr &quot;&quot;
401 417 msgid "Label"
402 418 msgstr ""
403 419  
404   -#: src/objects/toolbar/toolbar.c:58
  420 +#: src/objects/toolbar/models.c:66
405 421 msgid "Large"
406 422 msgstr ""
407 423  
408   -#: src/objects/toolbar/settings.c:164
  424 +#: src/objects/toolbar/settings.c:176
409 425 msgid "Layout"
410 426 msgstr ""
411 427  
... ... @@ -421,7 +437,7 @@ msgstr &quot;&quot;
421 437 msgid "Main Toolbar"
422 438 msgstr ""
423 439  
424   -#: ui/window.xml:545
  440 +#: ui/window.xml:555
425 441 msgid "Main menu"
426 442 msgstr ""
427 443  
... ... @@ -433,23 +449,23 @@ msgstr &quot;&quot;
433 449 msgid "Menu"
434 450 msgstr ""
435 451  
436   -#: ui/window.xml:511 ui/application.xml:403
  452 +#: ui/window.xml:521 ui/application.xml:403
437 453 msgid "Model 2 - 80x24"
438 454 msgstr ""
439 455  
440   -#: ui/window.xml:516 ui/application.xml:408
  456 +#: ui/window.xml:526 ui/application.xml:408
441 457 msgid "Model 3 - 80x32"
442 458 msgstr ""
443 459  
444   -#: ui/window.xml:521 ui/application.xml:413
  460 +#: ui/window.xml:531 ui/application.xml:413
445 461 msgid "Model 4 - 80x43"
446 462 msgstr ""
447 463  
448   -#: ui/window.xml:526 ui/application.xml:418
  464 +#: ui/window.xml:536 ui/application.xml:418
449 465 msgid "Model 5 - 132x27"
450 466 msgstr ""
451 467  
452   -#: ui/window.xml:376 ui/application.xml:444
  468 +#: ui/window.xml:386 ui/application.xml:444
453 469 msgid "Monocase"
454 470 msgstr ""
455 471  
... ... @@ -505,7 +521,7 @@ msgstr &quot;&quot;
505 521 msgid "Open session in New window"
506 522 msgstr ""
507 523  
508   -#: ui/window.xml:212 ui/window.xml:354 ui/window.xml:494 ui/application.xml:431
  524 +#: ui/window.xml:222 ui/window.xml:364 ui/window.xml:504 ui/application.xml:431
509 525 msgid "Options"
510 526 msgstr ""
511 527  
... ... @@ -513,19 +529,19 @@ msgstr &quot;&quot;
513 529 msgid "Parameter Type"
514 530 msgstr ""
515 531  
516   -#: ui/window.xml:286 ui/application.xml:261
  532 +#: ui/window.xml:296 ui/application.xml:261
517 533 msgid "Paste from clipboard"
518 534 msgstr ""
519 535  
520   -#: ui/window.xml:296 ui/application.xml:271
  536 +#: ui/window.xml:306 ui/application.xml:271
521 537 msgid "Paste from text file"
522 538 msgstr ""
523 539  
524   -#: ui/window.xml:291 ui/application.xml:266
  540 +#: ui/window.xml:301 ui/application.xml:266
525 541 msgid "Paste next"
526 542 msgstr ""
527 543  
528   -#: ui/window.xml:393 ui/application.xml:469
  544 +#: ui/window.xml:403 ui/application.xml:469
529 545 msgid "Paste with left margin"
530 546 msgstr ""
531 547  
... ... @@ -541,11 +557,11 @@ msgstr &quot;&quot;
541 557 msgid "Print"
542 558 msgstr ""
543 559  
544   -#: ui/window.xml:444
  560 +#: ui/window.xml:454
545 561 msgid "Print screen"
546 562 msgstr ""
547 563  
548   -#: ui/window.xml:252
  564 +#: ui/window.xml:262
549 565 msgid "Print selected"
550 566 msgstr ""
551 567  
... ... @@ -562,11 +578,11 @@ msgstr &quot;&quot;
562 578 msgid "Rename Session"
563 579 msgstr ""
564 580  
565   -#: ui/window.xml:315 ui/application.xml:295
  581 +#: ui/window.xml:325 ui/application.xml:295
566 582 msgid "Reselect"
567 583 msgstr ""
568 584  
569   -#: ui/window.xml:364 ui/application.xml:464
  585 +#: ui/window.xml:374 ui/application.xml:464
570 586 msgid "Resize on alternate screen"
571 587 msgstr ""
572 588  
... ... @@ -574,10 +590,6 @@ msgstr &quot;&quot;
574 590 msgid "Right keypad"
575 591 msgstr ""
576 592  
577   -#: src/objects/toolbar/toolbar.c:310
578   -msgid "S_tyle"
579   -msgstr ""
580   -
581 593 #: ui/window.xml:69 ui/application.xml:134
582 594 msgid "Save"
583 595 msgstr ""
... ... @@ -586,11 +598,11 @@ msgstr &quot;&quot;
586 598 msgid "Save current session preferences to file"
587 599 msgstr ""
588 600  
589   -#: ui/window.xml:439
  601 +#: ui/window.xml:449
590 602 msgid "Save screen"
591 603 msgstr ""
592 604  
593   -#: ui/window.xml:247
  605 +#: ui/window.xml:257
594 606 msgid "Save selected"
595 607 msgstr ""
596 608  
... ... @@ -610,27 +622,27 @@ msgstr &quot;&quot;
610 622 msgid "Save to shortcut file"
611 623 msgstr ""
612 624  
613   -#: ui/window.xml:508 ui/application.xml:400
  625 +#: ui/window.xml:518 ui/application.xml:400
614 626 msgid "Screen size"
615 627 msgstr ""
616 628  
617   -#: ui/window.xml:310 ui/application.xml:285
  629 +#: ui/window.xml:320 ui/application.xml:285
618 630 msgid "Select Field"
619 631 msgstr ""
620 632  
621   -#: ui/window.xml:305 ui/application.xml:280
  633 +#: ui/window.xml:315 ui/application.xml:280
622 634 msgid "Select all"
623 635 msgstr ""
624 636  
625   -#: ui/window.xml:217 ui/application.xml:479
  637 +#: ui/window.xml:227 ui/application.xml:479
626 638 msgid "Select by rectangles"
627 639 msgstr ""
628 640  
629   -#: src/objects/toolbar/settings.c:94
  641 +#: src/objects/toolbar/settings.c:106
630 642 msgid "Select the toolbar itens"
631 643 msgstr ""
632 644  
633   -#: src/objects/toolbar/settings.c:99
  645 +#: src/objects/toolbar/settings.c:111
634 646 msgid "Selected"
635 647 msgstr ""
636 648  
... ... @@ -643,12 +655,12 @@ msgstr &quot;&quot;
643 655 msgid "Send/Receive"
644 656 msgstr ""
645 657  
646   -#: src/objects/window/actions/filetransfer.c:46 ui/window.xml:449
  658 +#: src/objects/window/actions/filetransfer.c:46 ui/window.xml:459
647 659 #: ui/application.xml:195
648 660 msgid "Send/Receive files"
649 661 msgstr ""
650 662  
651   -#: src/objects/toolbar/settings.c:223 src/objects/toolbar/settings.c:233
  663 +#: src/objects/toolbar/settings.c:234 src/objects/toolbar/settings.c:244
652 664 msgid "Separator"
653 665 msgstr ""
654 666  
... ... @@ -656,7 +668,7 @@ msgstr &quot;&quot;
656 668 msgid "Session"
657 669 msgstr ""
658 670  
659   -#: ui/window.xml:430 ui/window.xml:550 ui/application.xml:76
  671 +#: ui/window.xml:440 ui/window.xml:560 ui/application.xml:76
660 672 msgid "Session Trace"
661 673 msgstr ""
662 674  
... ... @@ -677,7 +689,7 @@ msgid &quot;Session name&quot;
677 689 msgstr ""
678 690  
679 691 #: src/objects/window/actions/sessionproperties.c:46 ui/window.xml:98
680   -#: ui/window.xml:564 ui/application.xml:163
  692 +#: ui/window.xml:574 ui/application.xml:163
681 693 msgid "Session preferences"
682 694 msgstr ""
683 695  
... ... @@ -689,7 +701,7 @@ msgstr &quot;&quot;
689 701 msgid "Settings"
690 702 msgstr ""
691 703  
692   -#: src/objects/toolbar/settings.c:164
  704 +#: src/objects/toolbar/settings.c:176
693 705 msgid "Setup the toolbar layout"
694 706 msgstr ""
695 707  
... ... @@ -697,7 +709,7 @@ msgstr &quot;&quot;
697 709 msgid "Setup title bar"
698 710 msgstr ""
699 711  
700   -#: src/objects/toolbar/toolbar.c:272 src/objects/toolbar/settings.c:76
  712 +#: src/objects/toolbar/toolbar.c:214 src/objects/toolbar/settings.c:88
701 713 msgid "Setup toolbar"
702 714 msgstr ""
703 715  
... ... @@ -717,19 +729,19 @@ msgstr &quot;&quot;
717 729 msgid "Show Underline"
718 730 msgstr ""
719 731  
720   -#: ui/window.xml:231
  732 +#: ui/window.xml:241
721 733 msgid "Show menu"
722 734 msgstr ""
723 735  
724   -#: ui/window.xml:226
  736 +#: ui/window.xml:236
725 737 msgid "Show toolbar"
726 738 msgstr ""
727 739  
728   -#: src/objects/toolbar/toolbar.c:53
  740 +#: src/objects/toolbar/models.c:61
729 741 msgid "Small"
730 742 msgstr ""
731 743  
732   -#: ui/window.xml:388 ui/application.xml:504
  744 +#: ui/window.xml:398 ui/application.xml:504
733 745 msgid "Smart paste"
734 746 msgstr ""
735 747  
... ... @@ -749,11 +761,12 @@ msgstr &quot;&quot;
749 761 msgid "State Type"
750 762 msgstr ""
751 763  
752   -#: src/objects/toolbar/settings.c:55
753   -msgid "Style"
  764 +#: src/objects/toolbar/models.c:115
  765 +msgid "Symbolic"
754 766 msgstr ""
755 767  
756   -#: src/objects/toolbar/toolbar.c:47 src/objects/toolbar/toolbar.c:69
  768 +#: src/objects/toolbar/models.c:55 src/objects/toolbar/models.c:82
  769 +#: src/objects/toolbar/models.c:111
757 770 msgid "System default"
758 771 msgstr ""
759 772  
... ... @@ -769,7 +782,7 @@ msgstr &quot;&quot;
769 782 msgid "Terminal font"
770 783 msgstr ""
771 784  
772   -#: src/objects/toolbar/toolbar.c:79
  785 +#: src/objects/toolbar/models.c:92
773 786 msgid "Text only"
774 787 msgstr ""
775 788  
... ... @@ -809,7 +822,7 @@ msgstr &quot;&quot;
809 822 msgid "The name of the actions in the header bar"
810 823 msgstr ""
811 824  
812   -#: src/objects/toolbar/toolbar.c:138
  825 +#: src/objects/toolbar/toolbar.c:98
813 826 msgid "The name of the actions in the toolbar"
814 827 msgstr ""
815 828  
... ... @@ -841,15 +854,15 @@ msgstr &quot;&quot;
841 854 msgid "The state the action is in"
842 855 msgstr ""
843 856  
844   -#: src/objects/toolbar/toolbar.c:149
  857 +#: src/objects/toolbar/toolbar.c:109
845 858 msgid "The toolbar icon size"
846 859 msgstr ""
847 860  
848   -#: src/objects/toolbar/toolbar.c:175
  861 +#: src/objects/toolbar/toolbar.c:135
849 862 msgid "The toolbar icon type"
850 863 msgstr ""
851 864  
852   -#: src/objects/toolbar/toolbar.c:162
  865 +#: src/objects/toolbar/toolbar.c:122
853 866 msgid "The toolbar style"
854 867 msgstr ""
855 868  
... ... @@ -873,12 +886,20 @@ msgstr &quot;&quot;
873 886 msgid "Title bar actions"
874 887 msgstr ""
875 888  
876   -#: src/objects/toolbar/settings.c:75 ui/window.xml:420 ui/window.xml:540
  889 +#: src/objects/toolbar/settings.c:87 ui/window.xml:430 ui/window.xml:550
877 890 #: ui/application.xml:342
878 891 msgid "Toolbar"
879 892 msgstr ""
880 893  
881   -#: ui/window.xml:425
  894 +#: src/objects/toolbar/settings.c:68
  895 +msgid "Toolbar Style"
  896 +msgstr ""
  897 +
  898 +#: src/objects/toolbar/models.c:79
  899 +msgid "Toolbar s_tyle"
  900 +msgstr ""
  901 +
  902 +#: ui/window.xml:435
882 903 msgid "Top menu"
883 904 msgstr ""
884 905  
... ... @@ -886,7 +907,7 @@ msgstr &quot;&quot;
886 907 msgid "Trace"
887 908 msgstr ""
888 909  
889   -#: ui/window.xml:479 ui/application.xml:449
  910 +#: ui/window.xml:489 ui/application.xml:449
890 911 msgid "Track Cursor"
891 912 msgstr ""
892 913  
... ... @@ -894,7 +915,7 @@ msgstr &quot;&quot;
894 915 msgid "UI Type"
895 916 msgstr ""
896 917  
897   -#: ui/window.xml:257 ui/application.xml:290
  918 +#: ui/window.xml:267 ui/application.xml:290
898 919 msgid "Unselect"
899 920 msgstr ""
900 921  
... ... @@ -907,7 +928,7 @@ msgstr &quot;&quot;
907 928 msgid "Version %s-%s"
908 929 msgstr ""
909 930  
910   -#: src/objects/window/header.c:66 ui/window.xml:417 ui/window.xml:537
  931 +#: src/objects/window/header.c:66 ui/window.xml:427 ui/window.xml:547
911 932 #: ui/application.xml:63
912 933 msgid "View"
913 934 msgstr ""
... ... @@ -933,7 +954,7 @@ msgstr &quot;&quot;
933 954 msgid "_Close session"
934 955 msgstr ""
935 956  
936   -#: ui/window.xml:559 ui/application.xml:368
  957 +#: ui/window.xml:569 ui/application.xml:368
937 958 msgid "_Connect"
938 959 msgstr ""
939 960  
... ... @@ -941,7 +962,7 @@ msgstr &quot;&quot;
941 962 msgid "_Disconnect"
942 963 msgstr ""
943 964  
944   -#: ui/window.xml:148 ui/window.xml:281 ui/application.xml:231
  965 +#: ui/window.xml:148 ui/window.xml:291 ui/application.xml:231
945 966 msgid "_Edit"
946 967 msgstr ""
947 968  
... ... @@ -961,7 +982,7 @@ msgstr &quot;&quot;
961 982 msgid "_Open"
962 983 msgstr ""
963 984  
964   -#: src/objects/toolbar/toolbar.c:332
  985 +#: src/objects/toolbar/toolbar.c:236
965 986 msgid "_Preferences"
966 987 msgstr ""
967 988  
... ...
src/objects/toolbar/models.c
... ... @@ -150,6 +150,7 @@
150 150  
151 151 }
152 152  
  153 + g_warning("Can't create combobox '%s'",name);
153 154 return NULL;
154 155 }
155 156  
... ... @@ -203,15 +204,15 @@
203 204 }
204 205 }
205 206  
206   - static void property_changed(GObject *widget, GParamSpec *pspec, GtkContainer *menu) {
  207 + static void property_changed(GObject *widget, GParamSpec G_GNUC_UNUSED(*pspec), GtkContainer *menu) {
207 208  
208 209 gint value = -1;
209   - const gchar * name = g_object_get_data(menu, I_("pw3270_property_name"));
  210 + const gchar * name = g_object_get_data(G_OBJECT(menu), I_("pw3270_property_name"));
210 211 g_object_get(widget,name,&value,NULL);
211 212  
212 213 debug("%s(%p,%s)=%d",__FUNCTION__,widget,name,value);
213 214  
214   - gtk_container_foreach(menu,set_toggle_menu_item,&value);
  215 + gtk_container_foreach(menu,(GtkCallback) set_toggle_menu_item,&value);
215 216  
216 217  
217 218 }
... ... @@ -235,9 +236,9 @@
235 236 g_object_set_data(G_OBJECT(submenu),I_("pw3270_property_name"),(gpointer) models[model].property);
236 237 gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu),submenu);
237 238  
238   - guint selected = (guint) -1;
  239 + gint selected = -1;
239 240 if(widget) {
240   - g_object_get(G_OBJECT(widget),models[model].property,&selected);
  241 + g_object_get(G_OBJECT(widget),models[model].property,&selected,NULL);
241 242 g_autofree gchar * signame = g_strconcat("notify::",models[model].property,NULL);
242 243 g_signal_connect(G_OBJECT(widget),signame,G_CALLBACK(property_changed),submenu);
243 244 }
... ...
src/objects/toolbar/settings.c
... ... @@ -57,16 +57,22 @@
57 57 {
58 58 .left = 3,
59 59 .top = 0,
  60 + .name = "toolbar-icon-type",
  61 + .label = N_("Icon Style")
  62 + },
  63 +
  64 + {
  65 + .left = 0,
  66 + .top = 1,
60 67 .name = "toolbar-style",
61   - .label = N_("Style")
  68 + .label = N_("Toolbar Style")
62 69 }
63 70  
64 71 };
65 72  
66 73 struct _PW3270SettingsPrivate {
67 74 GtkWidget * views[2];
68   -// GtkWidget * buttons[2];
69   - GtkTreeModel * models[2];
  75 +// GtkTreeModel * models[G_N_ELEMENTS(comboboxes)];
70 76 GtkWidget * combos[G_N_ELEMENTS(comboboxes)];
71 77 };
72 78  
... ... @@ -160,7 +166,7 @@
160 166 }
161 167  
162 168 //
163   - // Create style & icon size settings.
  169 + // Create Combos.
164 170 //
165 171 {
166 172 GtkGrid * grid = GTK_GRID(gtk_grid_new());
... ... @@ -178,17 +184,17 @@
178 184  
179 185 GtkCellRenderer * renderer = gtk_cell_renderer_text_new();
180 186  
181   - for(ix = 0; ix < G_N_ELEMENTS(page->models); ix++) {
  187 + for(ix = 0; ix < G_N_ELEMENTS(page->combos); ix++) {
182 188  
183   - page->models[ix] = pw3270_model_from_name(comboboxes[ix].name);
  189 + GtkTreeModel *model = pw3270_model_from_name(comboboxes[ix].name);
184 190  
185 191 GtkWidget * label = gtk_label_new(gettext(comboboxes[ix].label));
186 192 gtk_label_set_xalign(GTK_LABEL(label),1);
187 193  
188 194 gtk_grid_attach(grid,label,comboboxes[ix].left,comboboxes[ix].top,1,1);
189 195  
190   - page->combos[ix] = gtk_combo_box_new_with_model(page->models[ix]);
191   - gtk_widget_set_hexpand(page->combos[ix],TRUE);
  196 + page->combos[ix] = gtk_combo_box_new_with_model(model);
  197 + gtk_widget_set_hexpand(page->combos[ix],FALSE);
192 198  
193 199 gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(page->combos[ix]), renderer, TRUE);
194 200 gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(page->combos[ix]), renderer, "text", 0, NULL);
... ... @@ -240,7 +246,6 @@
240 246 pw3270_action_list_free(action_list);
241 247  
242 248 GtkTreeIter iter;
243   -
244 249 for(ix = 0; ix < G_N_ELEMENTS(page->combos); ix++) {
245 250  
246 251 pw3270_model_get_iter_from_value(
... ... @@ -260,13 +265,9 @@
260 265 size_t ix;
261 266 g_autoptr(GSettings) settings = pw3270_application_window_settings_new();
262 267  
263   - debug("%s",__FUNCTION__);
264   -
265 268 g_autofree gchar * action_names = pw3270_action_view_get_action_names(page->views[0]);
266 269 g_settings_set_string(settings,"toolbar-action-names",action_names);
267 270  
268   - debug("[%s]",action_names);
269   -
270 271 GtkTreeIter iter;
271 272 for(ix = 0; ix < G_N_ELEMENTS(page->combos); ix++) {
272 273  
... ...