Download as
Browse Code »

Commit ef5f41f73eb47d9e902046a7c44d413a44dcd898

Authored by Perry Werneck
1 parent abae3751
Exists in master and in 3 other branches develop, edit-header-bar, script-support

Loading/saving dialog responses from session file.

Showing 3 changed files with 55 additions and 20 deletions   Show diff stats
locale/pt_BR.po
  Diff comments   View file @ef5f41f
@@ -5,7 +5,7 @@ msgid "" @@ -5,7 +5,7 @@ msgid ""
5 msgstr "" 5 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: 2020-07-08 17:55-0300\n" 8 +"POT-Creation-Date: 2020-07-27 18:43-0300\n"
9 "PO-Revision-Date: 2020-06-06 11:11-0300\n" 9 "PO-Revision-Date: 2020-06-06 11:11-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: Português <>\n" 11 "Language-Team: Português <>\n"
@@ -143,6 +143,10 @@ msgstr &quot;Fechar janela&quot; @@ -143,6 +143,10 @@ msgstr &quot;Fechar janela&quot;
143 msgid "Colors" 143 msgid "Colors"
144 msgstr "Cores" 144 msgstr "Cores"
145 145
  146 +#: src/objects/linux/savedesktopicon.c:93
  147 +msgid "Comment"
  148 +msgstr "Comentário"
  149 +
146 #: src/objects/window/actions/connect.c:59 150 #: src/objects/window/actions/connect.c:59
147 msgid "Connect" 151 msgid "Connect"
148 msgstr "Conectar" 152 msgstr "Conectar"
@@ -175,7 +179,7 @@ msgstr &quot;Copiar como tabela&quot; @@ -175,7 +179,7 @@ msgstr &quot;Copiar como tabela&quot;
175 msgid "Copy as text" 179 msgid "Copy as text"
176 msgstr "Copiar como texto" 180 msgstr "Copiar como texto"
177 181
178 -#: src/objects/windows/savedesktopicon.c:79 182 +#: src/objects/linux/savedesktopicon.c:106
179 msgid "Create a desktop icon for the current session" 183 msgid "Create a desktop icon for the current session"
180 msgstr "Criar ícone da área de trabalho para a sessão atual." 184 msgstr "Criar ícone da área de trabalho para a sessão atual."
181 185
@@ -256,7 +260,7 @@ msgstr &quot;Apagar até o final da linha&quot; @@ -256,7 +260,7 @@ msgstr &quot;Apagar até o final da linha&quot;
256 msgid "Field attributes" 260 msgid "Field attributes"
257 msgstr "Mostra atributos de campo" 261 msgstr "Mostra atributos de campo"
258 262
259 -#: src/objects/windows/savedesktopicon.c:62 263 +#: src/objects/linux/savedesktopicon.c:72
260 msgid "File name" 264 msgid "File name"
261 msgstr "Nome do arquivo" 265 msgstr "Nome do arquivo"
262 266
@@ -272,6 +276,10 @@ msgstr &quot;Tela cheia&quot; @@ -272,6 +276,10 @@ msgstr &quot;Tela cheia&quot;
272 msgid "Function bar" 276 msgid "Function bar"
273 msgstr "Barra de funções" 277 msgstr "Barra de funções"
274 278
  279 +#: src/objects/linux/savedesktopicon.c:86
  280 +msgid "Generic name"
  281 +msgstr "Nome genérico"
  282 +
275 #: ui/application.xml:36 ui/application.xml:534 283 #: ui/application.xml:36 ui/application.xml:534
276 msgid "Help" 284 msgid "Help"
277 msgstr "Ajuda" 285 msgstr "Ajuda"
@@ -356,7 +364,7 @@ msgstr &quot;Etiqueta&quot; @@ -356,7 +364,7 @@ msgstr &quot;Etiqueta&quot;
356 msgid "Large" 364 msgid "Large"
357 msgstr "Grande" 365 msgstr "Grande"
358 366
359 -#: src/objects/windows/savedesktopicon.c:67 367 +#: src/objects/linux/savedesktopicon.c:79
360 msgid "Launcher name" 368 msgid "Launcher name"
361 msgstr "Nome do lançador" 369 msgstr "Nome do lançador"
362 370
@@ -533,7 +541,7 @@ msgstr &quot;Salvar&quot; @@ -533,7 +541,7 @@ msgstr &quot;Salvar&quot;
533 msgid "Save As" 541 msgid "Save As"
534 msgstr "Salvar Como" 542 msgstr "Salvar Como"
535 543
536 -#: src/objects/windows/savedesktopicon.c:78 544 +#: src/objects/linux/savedesktopicon.c:105
537 msgid "Save desktop icon" 545 msgid "Save desktop icon"
538 msgstr "Salvar ícone da área de trabalho" 546 msgstr "Salvar ícone da área de trabalho"
539 547
@@ -804,7 +812,7 @@ msgstr &quot;Janela com sessão padrão&quot; @@ -804,7 +812,7 @@ msgstr &quot;Janela com sessão padrão&quot;
804 msgid "_Apply" 812 msgid "_Apply"
805 msgstr "_Aplicar" 813 msgstr "_Aplicar"
806 814
807 -#: src/objects/settings/dialog.c:83 src/objects/windows/savedesktopicon.c:104 815 +#: src/objects/settings/dialog.c:83 src/objects/linux/savedesktopicon.c:132
808 msgid "_Cancel" 816 msgid "_Cancel"
809 msgstr "_Cancelar" 817 msgstr "_Cancelar"
810 818
@@ -848,7 +856,7 @@ msgstr &quot;_Propriedades&quot; @@ -848,7 +856,7 @@ msgstr &quot;_Propriedades&quot;
848 msgid "_Rename session" 856 msgid "_Rename session"
849 msgstr "Renomear sessão" 857 msgstr "Renomear sessão"
850 858
851 -#: src/objects/windows/savedesktopicon.c:105 859 +#: src/objects/linux/savedesktopicon.c:133
852 msgid "_Save" 860 msgid "_Save"
853 msgstr "_Salvar" 861 msgstr "_Salvar"
854 862
@@ -1508,9 +1516,6 @@ msgstr &quot;translator-credits&quot; @@ -1508,9 +1516,6 @@ msgstr &quot;translator-credits&quot;
1508 #~ msgid "Command to execute" 1516 #~ msgid "Command to execute"
1509 #~ msgstr "Comando a executar" 1517 #~ msgstr "Comando a executar"
1510 1518
1511 -#~ msgid "Comment"  
1512 -#~ msgstr "Comentário"  
1513 -  
1514 #~ msgid "Complete" 1519 #~ msgid "Complete"
1515 #~ msgstr "Completo" 1520 #~ msgstr "Completo"
1516 1521
@@ -1836,9 +1841,6 @@ msgstr &quot;translator-credits&quot; @@ -1836,9 +1841,6 @@ msgstr &quot;translator-credits&quot;
1836 #~ msgid "GTK Version mismatch" 1841 #~ msgid "GTK Version mismatch"
1837 #~ msgstr "Divergência de versão GTK" 1842 #~ msgstr "Divergência de versão GTK"
1838 1843
1839 -#~ msgid "Generic name"  
1840 -#~ msgstr "Nome genérico"  
1841 -  
1842 #~ msgid "Get transfer queue from an external XML file" 1844 #~ msgid "Get transfer queue from an external XML file"
1843 #~ msgstr "Obtém a fila de transferência de um arquivo XML externo" 1845 #~ msgstr "Obtém a fila de transferência de um arquivo XML externo"
1844 1846
locale/pw3270.pot
  Diff comments   View file @ef5f41f
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2020-07-08 18:05-0300\n" 11 +"POT-Creation-Date: 2020-07-27 18:43-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -140,6 +140,10 @@ msgstr &quot;&quot; @@ -140,6 +140,10 @@ msgstr &quot;&quot;
140 msgid "Colors" 140 msgid "Colors"
141 msgstr "" 141 msgstr ""
142 142
  143 +#: src/objects/linux/savedesktopicon.c:93
  144 +msgid "Comment"
  145 +msgstr ""
  146 +
143 #: src/objects/window/actions/connect.c:59 147 #: src/objects/window/actions/connect.c:59
144 msgid "Connect" 148 msgid "Connect"
145 msgstr "" 149 msgstr ""
@@ -172,7 +176,7 @@ msgstr &quot;&quot; @@ -172,7 +176,7 @@ msgstr &quot;&quot;
172 msgid "Copy as text" 176 msgid "Copy as text"
173 msgstr "" 177 msgstr ""
174 178
175 -#: src/objects/windows/savedesktopicon.c:79 179 +#: src/objects/linux/savedesktopicon.c:106
176 msgid "Create a desktop icon for the current session" 180 msgid "Create a desktop icon for the current session"
177 msgstr "" 181 msgstr ""
178 182
@@ -253,7 +257,7 @@ msgstr &quot;&quot; @@ -253,7 +257,7 @@ msgstr &quot;&quot;
253 msgid "Field attributes" 257 msgid "Field attributes"
254 msgstr "" 258 msgstr ""
255 259
256 -#: src/objects/windows/savedesktopicon.c:62 260 +#: src/objects/linux/savedesktopicon.c:72
257 msgid "File name" 261 msgid "File name"
258 msgstr "" 262 msgstr ""
259 263
@@ -269,6 +273,10 @@ msgstr &quot;&quot; @@ -269,6 +273,10 @@ msgstr &quot;&quot;
269 msgid "Function bar" 273 msgid "Function bar"
270 msgstr "" 274 msgstr ""
271 275
  276 +#: src/objects/linux/savedesktopicon.c:86
  277 +msgid "Generic name"
  278 +msgstr ""
  279 +
272 #: ui/application.xml:36 ui/application.xml:534 280 #: ui/application.xml:36 ui/application.xml:534
273 msgid "Help" 281 msgid "Help"
274 msgstr "" 282 msgstr ""
@@ -353,7 +361,7 @@ msgstr &quot;&quot; @@ -353,7 +361,7 @@ msgstr &quot;&quot;
353 msgid "Large" 361 msgid "Large"
354 msgstr "" 362 msgstr ""
355 363
356 -#: src/objects/windows/savedesktopicon.c:67 364 +#: src/objects/linux/savedesktopicon.c:79
357 msgid "Launcher name" 365 msgid "Launcher name"
358 msgstr "" 366 msgstr ""
359 367
@@ -530,7 +538,7 @@ msgstr &quot;&quot; @@ -530,7 +538,7 @@ msgstr &quot;&quot;
530 msgid "Save As" 538 msgid "Save As"
531 msgstr "" 539 msgstr ""
532 540
533 -#: src/objects/windows/savedesktopicon.c:78 541 +#: src/objects/linux/savedesktopicon.c:105
534 msgid "Save desktop icon" 542 msgid "Save desktop icon"
535 msgstr "" 543 msgstr ""
536 544
@@ -801,7 +809,7 @@ msgstr &quot;&quot; @@ -801,7 +809,7 @@ msgstr &quot;&quot;
801 msgid "_Apply" 809 msgid "_Apply"
802 msgstr "" 810 msgstr ""
803 811
804 -#: src/objects/settings/dialog.c:83 src/objects/windows/savedesktopicon.c:104 812 +#: src/objects/settings/dialog.c:83 src/objects/linux/savedesktopicon.c:132
805 msgid "_Cancel" 813 msgid "_Cancel"
806 msgstr "" 814 msgstr ""
807 815
@@ -845,7 +853,7 @@ msgstr &quot;&quot; @@ -845,7 +853,7 @@ msgstr &quot;&quot;
845 msgid "_Rename session" 853 msgid "_Rename session"
846 msgstr "" 854 msgstr ""
847 855
848 -#: src/objects/windows/savedesktopicon.c:105 856 +#: src/objects/linux/savedesktopicon.c:133
849 msgid "_Save" 857 msgid "_Save"
850 msgstr "" 858 msgstr ""
851 859
src/objects/window/terminal.c
  Diff comments   View file @ef5f41f
@@ -232,6 +232,29 @@ @@ -232,6 +232,29 @@
232 return NULL; 232 return NULL;
233 } 233 }
234 234
  235 + static GtkResponseType load_popup_response(v3270 G_GNUC_UNUSED(*widget), const gchar *popup_name, struct SessionDescriptor * session) {
  236 +
  237 + if(!session->key_file)
  238 + return 0;
  239 +
  240 + if(g_key_file_has_key(session->key_file,"dialogs",popup_name,NULL))
  241 + return (GtkResponseType) g_key_file_get_integer(session->key_file,"dialogs",popup_name,NULL);
  242 +
  243 + return GTK_RESPONSE_NONE;
  244 + }
  245 +
  246 + static gboolean save_popup_response(v3270 G_GNUC_UNUSED(*widget), const gchar *popup_name, GtkResponseType response, struct SessionDescriptor * session) {
  247 + debug("%s(%s)",__FUNCTION__,popup_name);
  248 +
  249 + if(!session->key_file)
  250 + return FALSE;
  251 +
  252 + g_key_file_set_integer(session->key_file,"dialogs",popup_name,(gint) response);
  253 + v3270_emit_save_settings(widget);
  254 +
  255 + return TRUE;
  256 + }
  257 +
235 GtkWidget * pw3270_terminal_new(const gchar *session_file) { 258 GtkWidget * pw3270_terminal_new(const gchar *session_file) {
236 259
237 GtkWidget * terminal = v3270_new(); 260 GtkWidget * terminal = v3270_new();
@@ -341,6 +364,8 @@ @@ -341,6 +364,8 @@
341 g_signal_connect(G_OBJECT(terminal),"print-done",G_CALLBACK(print_done),descriptor); 364 g_signal_connect(G_OBJECT(terminal),"print-done",G_CALLBACK(print_done),descriptor);
342 g_signal_connect(G_OBJECT(terminal),"print-setup",G_CALLBACK(print_setup),descriptor); 365 g_signal_connect(G_OBJECT(terminal),"print-setup",G_CALLBACK(print_setup),descriptor);
343 g_signal_connect(G_OBJECT(terminal),"destroy", G_CALLBACK(destroy),descriptor); 366 g_signal_connect(G_OBJECT(terminal),"destroy", G_CALLBACK(destroy),descriptor);
  367 + g_signal_connect(G_OBJECT(terminal),"load-popup-response",G_CALLBACK(load_popup_response),descriptor);
  368 + g_signal_connect(G_OBJECT(terminal),"save-popup-response",G_CALLBACK(save_popup_response),descriptor);
344 369
345 return terminal; 370 return terminal;
346 } 371 }