Loading/saving dialog responses from session file.

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