Download as
Browse Code »

Commit 4db9d12164a50c398861380980bb905d2cadfe8d

Authored by Perry Werneck
1 parent 4e16876c
Exists in master and in 1 other branch develop

Fixing auto-open URL and adjustments in the host settings popup dialog.

Showing 3 changed files with 21 additions and 12 deletions   Show diff stats
locale/pt_BR.po
  Diff comments   View file @4db9d12
@@ -6,7 +6,7 @@ msgstr "" @@ -6,7 +6,7 @@ msgstr ""
6 "Project-Id-Version: pw3270 5.0\n" 6 "Project-Id-Version: pw3270 5.0\n"
7 "Report-Msgid-Bugs-To: \n" 7 "Report-Msgid-Bugs-To: \n"
8 "POT-Creation-Date: 2021-11-21 06:42-0300\n" 8 "POT-Creation-Date: 2021-11-21 06:42-0300\n"
9 -"PO-Revision-Date: 2021-11-22 19:59-0300\n" 9 +"PO-Revision-Date: 2021-11-22 22:07-0300\n"
10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 "Language-Team: Brazilian Portuguese <perry.werneck@gmail.com>\n" 11 "Language-Team: Brazilian Portuguese <perry.werneck@gmail.com>\n"
12 "Language: pt_BR\n" 12 "Language: pt_BR\n"
@@ -420,8 +420,8 @@ msgid &quot;Edit clipboard settings&quot; @@ -420,8 +420,8 @@ msgid &quot;Edit clipboard settings&quot;
420 msgstr "Altera configurações da area de transferência" 420 msgstr "Altera configurações da area de transferência"
421 421
422 #: src/terminal/actions/table.c:337 422 #: src/terminal/actions/table.c:337
423 -msgid "Edit host settings"  
424 -msgstr "Alterar configuração do servidor" 423 +msgid "Edit host and terminal emulation settings"
  424 +msgstr "Alterar configurações do servidor e emulação"
425 425
426 #: src/terminal/actions/table.c:328 426 #: src/terminal/actions/table.c:328
427 msgid "Edit keyboard accelerators" 427 msgid "Edit keyboard accelerators"
@@ -562,7 +562,11 @@ msgstr &quot;Opções HTML&quot; @@ -562,7 +562,11 @@ msgstr &quot;Opções HTML&quot;
562 msgid "Host" 562 msgid "Host"
563 msgstr "Servidor" 563 msgstr "Servidor"
564 564
565 -#: src/terminal/actions/table.c:336 src/dialogs/settings/host.c:580 565 +#: src/terminal/actions/table.c:336
  566 +msgid "Host and emulation settings"
  567 +msgstr "Configuração de servidor e emulação"
  568 +
  569 +#: src/dialogs/settings/host.c:580
566 msgid "Host settings" 570 msgid "Host settings"
567 msgstr "Configurações do servidor" 571 msgstr "Configurações do servidor"
568 572
@@ -626,7 +630,7 @@ msgstr &quot;Intensificado/Protegido&quot; @@ -626,7 +630,7 @@ msgstr &quot;Intensificado/Protegido&quot;
626 msgid "Intensified/Unprotected" 630 msgid "Intensified/Unprotected"
627 msgstr "Intensificado/Desprotegido" 631 msgstr "Intensificado/Desprotegido"
628 632
629 -#: src/terminal/callbacks.c:484 633 +#: src/terminal/callbacks.c:489
630 #, c-format 634 #, c-format
631 msgid "" 635 msgid ""
632 "Invalid callback table, the release %s of lib%s can't be used (expecting " 636 "Invalid callback table, the release %s of lib%s can't be used (expecting "
@@ -1564,7 +1568,7 @@ msgstr &quot;Incapaz de colar dados formatados.&quot; @@ -1564,7 +1568,7 @@ msgstr &quot;Incapaz de colar dados formatados.&quot;
1564 msgid "Undefined" 1568 msgid "Undefined"
1565 msgstr "Indefinido" 1569 msgstr "Indefinido"
1566 1570
1567 -#: src/terminal/callbacks.c:493 1571 +#: src/terminal/callbacks.c:498
1568 #, c-format 1572 #, c-format
1569 msgid "Unexpected callback table, the release %s of lib%s is invalid" 1573 msgid "Unexpected callback table, the release %s of lib%s is invalid"
1570 msgstr "Tabela de callbacks inesperada, a revisão %s da lib%s é inválida" 1574 msgstr "Tabela de callbacks inesperada, a revisão %s da lib%s é inválida"
src/terminal/actions/table.c
  Diff comments   View file @4db9d12
@@ -333,8 +333,8 @@ @@ -333,8 +333,8 @@
333 .group = LIB3270_ACTION_GROUP_OFFLINE, 333 .group = LIB3270_ACTION_GROUP_OFFLINE,
334 .name = "dialog-host", 334 .name = "dialog-host",
335 .icon = "network-server", 335 .icon = "network-server",
336 - .label = N_("Host settings"),  
337 - .summary = N_("Edit host settings"), 336 + .label = N_("Host and emulation settings"),
  337 + .summary = N_("Edit host and terminal emulation settings"),
338 .activate = fire_host_dialog 338 .activate = fire_host_dialog
339 }, 339 },
340 340
src/terminal/callbacks.c
  Diff comments   View file @4db9d12
@@ -434,7 +434,7 @@ static int load(H3270 *session, const char *filename) @@ -434,7 +434,7 @@ static int load(H3270 *session, const char *filename)
434 434
435 debug("Emitting '%s'", text); 435 debug("Emitting '%s'", text);
436 436
437 - guint response = (guint) -1; 437 + guint response = 0;
438 v3270_signal_emit( 438 v3270_signal_emit(
439 terminal, 439 terminal,
440 V3270_SIGNAL_OPEN_URL, 440 V3270_SIGNAL_OPEN_URL,
@@ -442,14 +442,19 @@ static int load(H3270 *session, const char *filename) @@ -442,14 +442,19 @@ static int load(H3270 *session, const char *filename)
442 &response 442 &response
443 ); 443 );
444 444
445 - if(response == (guint) -1) { 445 + debug("Response was: %d", (int) response);
  446 +
  447 + if(response == 0) {
446 // No one has changed the response, take default action. 448 // No one has changed the response, take default action.
447 - gtk_show_uri_on_window( 449 + g_message("Opening '%s'",text);
  450 + if(gtk_show_uri_on_window(
448 GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(terminal))), 451 GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(terminal))),
449 text, 452 text,
450 GDK_CURRENT_TIME, 453 GDK_CURRENT_TIME,
451 NULL 454 NULL
452 - ); 455 + )) {
  456 + v3270_unselect(GTK_WIDGET(terminal));
  457 + }
453 } 458 }
454 459
455 } 460 }