Merge pull request #14 from PerryWerneck/develop

Small fixes and optional lockdown of host settings.

Merge pull request #14 from PerryWerneck/develop
Small fixes and optional lockdown of host settings.
Perry Werneck · GitHub
2 parents f503b3ee 4be428c2
Showing 16 changed files with 162 additions and 96 deletions Show diff stats
branding/appdata.xml.in
branding/launcher.desktop.in
configure.ac
locale/pt_BR.po
locale/pw3270.pot
pw3270.cbp
rpm/_service
schemas/linux/application.gschema.xml.in
schemas/windows/application.gschema.xml.in
src/objects/application/actions/about.c
src/objects/application/application.c
src/objects/toolbar/actions.c
src/objects/toolbar/models.c
src/objects/toolbar/toolbar.c
src/objects/window/actions/sessionproperties.c
src/objects/window/keyfile.c
 <?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
-	<id>br.com.bb.pw3270</id>
-	<name>3270 Terminal</name>
-	<name xml:lang="pt_BR">Terminal 3270</name>
+<application>
+
+	<id type="desktop">@PRODUCT_NAME@.desktop</id>
+
+	<metadata_license>CC0-1.0</metadata_license>
+	<project_license>LGPL-3.0</project_license>
+
 	<summary>IBM 3270 Terminal emulator</summary>
 	<summary xml:lang="pt_BR">Emulador de terminal IBM 3270</summary>
+
 	<developer_name>perry.werneck@gmail.com</developer_name>
-	<description>
-	<p>
-	GTK Based 3270 terminal emulator
-	pw3270 is a modern, GTK-based, completely free tn3270 emulator.
  
-	Created originally for Banco do Brasil, it's now an official Brazilian Government Public Software project, and is used worldwide.
-	</p>
+	<description>
+		<p>GTK Based 3270 terminal emulator</p>
+		<p>pw3270 is a modern, GTK-based, completely free tn3270 emulator.</p>
+		<p>Created originally for Banco do Brasil, it's now an official Brazilian Government Public Software project, and is used worldwide.</p>
 	</description>
  
-	<metadata_license>CC0-1.0</metadata_license>
-	<project_license>LGPL-3.0</project_license>
-
 	<url type="bugtracker">https://github.com/PerryWerneck/pw3270/issues</url>
 	<url type="homepage">https://github.com/PerryWerneck/pw3270</url>
-	<project_group>GNOME</project_group>
-
-	<launchable type="desktop-id">@PRODUCT_NAME@.desktop</launchable>
  
 	<screenshots>
 		<screenshot type="default">
 			<caption>@PRODUCT_NAME@</caption>
-			<image height="600" width="600">https://raw.githubusercontent.com/PerryWerneck/pw3270/master/branding/pw3270-logo.svg</image>
+			<image height="600" width="600">https://raw.githubusercontent.com/PerryWerneck/pw3270/master/branding/pw3270.svg</image>
 		</screenshot>
 	</screenshots>
  
 	<update_contact>perry.werneck@gmail.com</update_contact>
  
 	<provides>
-		<id>@PRODUCT_NAME@pw32.desktop</id>
+		<binary>@PRODUCT_NAME@</binary>
 	</provides>
-</component>
+
+
+</application>
 [Desktop Entry]
 X-SuSE-translate=true
 GenericName=@PRODUCT_NAME@
+GenericName[pt_BR]=@PRODUCT_NAME@
 Name=3270 Terminal
 Name[pt_BR]=Terminal 3270
 Comment=IBM 3270 Terminal emulator
@@ -32,7 +32,7 @@ AC_PREREQ(2.61)
  
 dnl Initialise automake with the package name, version and
 dnl bug-reporting address.
-AC_INIT([pw3270], [5.3], [perry.werneck@gmail.com])
+AC_INIT([pw3270], [5.4], [perry.werneck@gmail.com])
  
 dnl Place auxilliary scripts here.
 AC_CONFIG_AUX_DIR([scripts])
@@ -5,7 +5,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: pw3270 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-29 19:50-0300\n"
+"POT-Creation-Date: 2020-11-03 15:48-0300\n"
 "PO-Revision-Date: 2020-10-15 13:45-0300\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Português <>\n"
@@ -25,11 +25,11 @@ msgstr &quot;&quot;
 msgid "\"%s\" is not a valid user interface name"
 msgstr "\"%s\" não é um nome válido para interface de usuário"
  
-#: src/objects/application/actions/about.c:93
+#: src/objects/application/actions/about.c:136
 msgid "32 bits Linux"
 msgstr "Linux 32 bits"
  
-#: src/objects/application/actions/about.c:91
+#: src/objects/application/actions/about.c:134
 msgid "32 bits Windows"
 msgstr "Windows 32 bits"
  
@@ -37,20 +37,20 @@ msgstr &quot;Windows 32 bits&quot;
 msgid "3270 session files"
 msgstr "Arquivos de sessão TN3270"
  
-#: src/objects/application/actions/about.c:87
+#: src/objects/application/actions/about.c:130
 #, c-format
 msgid "3270 terminal emulator for %s."
 msgstr "Emulador 3270 para %s"
  
-#: src/objects/application/actions/about.c:95
+#: src/objects/application/actions/about.c:138
 msgid "64 bits Linux"
 msgstr "Linux 64 bits"
  
-#: src/objects/application/actions/about.c:89
+#: src/objects/application/actions/about.c:132
 msgid "64 bits Windows"
 msgstr "Windows 64 bits"
  
-#: src/objects/application/actions/about.c:188 ui/application.xml:39
+#: src/objects/application/actions/about.c:231 ui/application.xml:39
 #: ui/application.xml:537
 msgid "About PW3270"
 msgstr "Sobre o PW3270"
@@ -75,7 +75,7 @@ msgstr &quot;Todos os arquivos&quot;
 msgid "Append to copy"
 msgstr "Adicionar à cópia"
  
-#: src/objects/application/actions/about.c:129
+#: src/objects/application/actions/about.c:172
 msgid "Apple version"
 msgstr "Versão Apple"
  
@@ -103,7 +103,7 @@ msgstr &quot;Reconectar automaticamente&quot;
 msgid "Available"
 msgstr "Disponível"
  
-#: src/objects/application/actions/about.c:132
+#: src/objects/application/actions/about.c:175
 msgid "Based on X3270 from"
 msgstr "Baseado no X3270 por"
  
@@ -194,7 +194,7 @@ msgstr &quot;Conectar ao servidor&quot;
 msgid "Connected to host"
 msgstr "Conectado no servidor"
  
-#: src/objects/application/actions/about.c:130
+#: src/objects/application/actions/about.c:173
 msgid "Contributors"
 msgstr "Contribuidores"
  
@@ -407,7 +407,7 @@ msgstr &quot;Largura do painel em colunas&quot;
 msgid "Keypads"
 msgstr "Painéis"
  
-#: src/objects/application/actions/about.c:140
+#: src/objects/application/actions/about.c:183
 msgid "LICENSE"
 msgstr "LICENCA"
  
@@ -439,7 +439,7 @@ msgstr &quot;Barra de ferramentas&quot;
 msgid "Main menu"
 msgstr "Menu principal"
  
-#: src/objects/application/actions/about.c:128
+#: src/objects/application/actions/about.c:171
 msgid "Maintainers"
 msgstr "Mantenedores"
  
@@ -923,7 +923,7 @@ msgstr &quot;Remover seleção&quot;
 msgid "Use +/- for field navigation"
 msgstr "Usar teclas +/- para navegar por campos"
  
-#: src/objects/application/actions/about.c:70
+#: src/objects/application/actions/about.c:113
 #, c-format
 msgid "Version %s-%s"
 msgstr "Versão %s-%s"
@@ -933,7 +933,7 @@ msgstr &quot;Versão %s-%s&quot;
 msgid "View"
 msgstr "Exibir"
  
-#: src/objects/application/actions/about.c:163
+#: src/objects/application/actions/about.c:206
 msgid "View this project on github"
 msgstr "Portal do Software Público Brasileiro"
  
@@ -998,11 +998,11 @@ msgstr &quot;_Salvar&quot;
 msgid "_View"
 msgstr "_Exibir"
  
-#: src/objects/application/actions/about.c:162
+#: src/objects/application/actions/about.c:205
 msgid "https://github.com/PerryWerneck/pw3270"
 msgstr "https://portal.softwarepublico.gov.br/social/pw3270/"
  
-#: src/objects/application/actions/about.c:165
+#: src/objects/application/actions/about.c:208
 msgid "translator-credits"
 msgstr "translator-credits"
  
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-29 19:50-0300\n"
+"POT-Creation-Date: 2020-11-03 15:50-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"
@@ -22,11 +22,11 @@ msgstr &quot;&quot;
 msgid "\"%s\" is not a valid user interface name"
 msgstr ""
  
-#: src/objects/application/actions/about.c:93
+#: src/objects/application/actions/about.c:136
 msgid "32 bits Linux"
 msgstr ""
  
-#: src/objects/application/actions/about.c:91
+#: src/objects/application/actions/about.c:134
 msgid "32 bits Windows"
 msgstr ""
  
@@ -34,20 +34,20 @@ msgstr &quot;&quot;
 msgid "3270 session files"
 msgstr ""
  
-#: src/objects/application/actions/about.c:87
+#: src/objects/application/actions/about.c:130
 #, c-format
 msgid "3270 terminal emulator for %s."
 msgstr ""
  
-#: src/objects/application/actions/about.c:95
+#: src/objects/application/actions/about.c:138
 msgid "64 bits Linux"
 msgstr ""
  
-#: src/objects/application/actions/about.c:89
+#: src/objects/application/actions/about.c:132
 msgid "64 bits Windows"
 msgstr ""
  
-#: src/objects/application/actions/about.c:188 ui/application.xml:39
+#: src/objects/application/actions/about.c:231 ui/application.xml:39
 #: ui/application.xml:537
 msgid "About PW3270"
 msgstr ""
@@ -72,7 +72,7 @@ msgstr &quot;&quot;
 msgid "Append to copy"
 msgstr ""
  
-#: src/objects/application/actions/about.c:129
+#: src/objects/application/actions/about.c:172
 msgid "Apple version"
 msgstr ""
  
@@ -100,7 +100,7 @@ msgstr &quot;&quot;
 msgid "Available"
 msgstr ""
  
-#: src/objects/application/actions/about.c:132
+#: src/objects/application/actions/about.c:175
 msgid "Based on X3270 from"
 msgstr ""
  
@@ -191,7 +191,7 @@ msgstr &quot;&quot;
 msgid "Connected to host"
 msgstr ""
  
-#: src/objects/application/actions/about.c:130
+#: src/objects/application/actions/about.c:173
 msgid "Contributors"
 msgstr ""
  
@@ -404,7 +404,7 @@ msgstr &quot;&quot;
 msgid "Keypads"
 msgstr ""
  
-#: src/objects/application/actions/about.c:140
+#: src/objects/application/actions/about.c:183
 msgid "LICENSE"
 msgstr ""
  
@@ -436,7 +436,7 @@ msgstr &quot;&quot;
 msgid "Main menu"
 msgstr ""
  
-#: src/objects/application/actions/about.c:128
+#: src/objects/application/actions/about.c:171
 msgid "Maintainers"
 msgstr ""
  
@@ -918,7 +918,7 @@ msgstr &quot;&quot;
 msgid "Use +/- for field navigation"
 msgstr ""
  
-#: src/objects/application/actions/about.c:70
+#: src/objects/application/actions/about.c:113
 #, c-format
 msgid "Version %s-%s"
 msgstr ""
@@ -928,7 +928,7 @@ msgstr &quot;&quot;
 msgid "View"
 msgstr ""
  
-#: src/objects/application/actions/about.c:163
+#: src/objects/application/actions/about.c:206
 msgid "View this project on github"
 msgstr ""
  
@@ -993,10 +993,10 @@ msgstr &quot;&quot;
 msgid "_View"
 msgstr ""
  
-#: src/objects/application/actions/about.c:162
+#: src/objects/application/actions/about.c:205
 msgid "https://github.com/PerryWerneck/pw3270"
 msgstr ""
  
-#: src/objects/application/actions/about.c:165
+#: src/objects/application/actions/about.c:208
 msgid "translator-credits"
 msgstr ""
@@ -199,9 +199,6 @@
 		<Unit filename="src/objects/window/window.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/tools/entry.c">
-			<Option compilerVar="CC" />
-		</Unit>
 		<Unit filename="ui/application.xml" />
 		<Unit filename="ui/window.xml" />
 		<Extensions>
@@ -13,7 +13,6 @@
 	</service>
  
 	<!-- https://github.com/openSUSE/obs-service-extract_file -->
-	<!--
 	<service name="extract_file">
 		<param name="archive">*.tar</param>
 		<param name="files">*/rpm/pw3270.spec</param>
@@ -59,7 +58,6 @@
 		<param name="files">*/arch/PKGBUILD</param>
 		<param name="outfilename">PKGBUILD</param>
 	</service>
-	-->
  
 	<service name="recompress">
 		<param name="file">*.tar</param>
@@ -68,4 +66,4 @@
  
 	<service name="set_version" />
  
-</services>
 \ No newline at end of file
+</services>
@@ -38,6 +38,24 @@
       <description>The ID of the current user interface style</description>
     </key>
  
+    <key name="allow-host-settings" type="b">
+      <default>true</default>
+      <summary>Allow host settings</summary>
+      <description>Allow changing of host session properties</description>
+    </key>
+
+    <key name="allow-new-tab-actions" type="b">
+      <default>true</default>
+      <summary>Enable new tab actions</summary>
+      <description>Enable new tab actions</description>
+    </key>
+
+    <key name="allow-new-window-actions" type="b">
+      <default>true</default>
+      <summary>Enable new window actions</summary>
+      <description>Enable new window actions</description>
+    </key>
+
   </schema>
  
 </schemalist>
@@ -38,6 +38,12 @@
       <description>The ID of the current user interface style</description>
     </key>
  
+    <key name="allow-host-settings" type="b">
+      <default>true</default>
+      <summary>Allow host settings</summary>
+      <description>Allow changing of host session properties</description>
+    </key>
+
     <key name="gtk-csd" type="i">
       <default>0</default>
       <summary>GTK CSD</summary>
@@ -31,10 +31,18 @@
  #include <pw3270/actions.h>
  #include <pw3270/application.h>
  
- static GtkWidget * factory(PW3270Action G_GNUC_UNUSED(*action), GtkApplication G_GNUC_UNUSED(*application)) {
+ static GtkWidget * factory(PW3270Action G_GNUC_UNUSED(*action), GtkApplication *application) {
  
 	GtkAboutDialog	* dialog = GTK_ABOUT_DIALOG(gtk_about_dialog_new());
  
+	if(GTK_IS_APPLICATION(application)) {
+
+		gtk_window_set_transient_for(GTK_WINDOW(dialog),gtk_application_get_active_window(GTK_APPLICATION(application)));
+		gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog),TRUE);
+		gtk_window_set_modal(GTK_WINDOW(dialog),TRUE);
+
+	}
+
 	// Get application logo
 	{
 #ifdef DEBUG
@@ -352,14 +352,15 @@
  
 	G_APPLICATION_CLASS(pw3270Application_parent_class)->startup(application);
  
+	g_autoptr(GSettings) settings = pw3270_application_get_settings(application);
+
+	//
+	// Common actions
+	//
 	GAction * actions[] = {
 		pw3270_about_action_new(),
 		pw3270_preferences_action_new(),
-		pw3270_new_tab_action_new(),
-		pw3270_new_window_action_new(),
-		pw3270_quit_action_new(),
-		pw3270_open_window_action_new(),
-		pw3270_open_tab_action_new()
+		pw3270_quit_action_new()
 	};
  
 	for(ix = 0; ix < G_N_ELEMENTS(actions); ix++) {
@@ -367,6 +368,38 @@
 	}
  
 	//
+	// New tab actions
+	//
+	if(g_settings_get_boolean(settings,"allow-new-tab-actions")) {
+
+		GAction * new_tab_actions[] = {
+			pw3270_open_tab_action_new(),
+			pw3270_new_tab_action_new()
+		};
+
+		for(ix = 0; ix < G_N_ELEMENTS(new_tab_actions); ix++) {
+			g_action_map_add_action(G_ACTION_MAP(application),new_tab_actions[ix]);
+		}
+
+	}
+
+	//
+	// New window actions
+	//
+	if(g_settings_get_boolean(settings,"allow-new-window-actions")) {
+
+		GAction * new_window_actions[] = {
+			pw3270_open_window_action_new(),
+			pw3270_new_window_action_new()
+		};
+
+		for(ix = 0; ix < G_N_ELEMENTS(new_window_actions); ix++) {
+			g_action_map_add_action(G_ACTION_MAP(application),new_window_actions[ix]);
+		}
+
+	}
+
+	//
 	// Setup application menus
 	//
 	GtkBuilder * builder;
@@ -58,7 +58,7 @@
  
 	GtkWidget * window = gtk_widget_get_toplevel(toolbar);
  
-	if(window) {
+	if(window && G_IS_ACTION_MAP(window)) {
  
 		GtkToolItem * item = NULL;
 		GAction *action = g_action_map_lookup_action(G_ACTION_MAP(window), name);
@@ -81,7 +81,7 @@
 			}
 		}
  
-		debug("%s(%s)=%p",__FUNCTION__,name,action);
+//		debug("%s(%s)=%p",__FUNCTION__,name,action);
  
 		if(!action) {
 			g_warning("Can't find action \"%s\"",name);
@@ -190,7 +190,7 @@
 		const struct _contents *model = (const struct _contents *) g_object_get_data(menuitem, I_("pw3270_model_data"));
 		const char *name = (const char *) g_object_get_data(menuitem, I_("pw3270_property_name"));
  
-		debug("%s(%s,%d)",__FUNCTION__,name,model->value);
+//		debug("%s(%s,%d)",__FUNCTION__,name,model->value);
 		g_object_set(widget,name,model->value,NULL);
  
 	}
@@ -210,7 +210,7 @@
 	const gchar * name = g_object_get_data(G_OBJECT(menu), I_("pw3270_property_name"));
 	g_object_get(widget,name,&value,NULL);
  
-	debug("%s(%p,%s)=%d",__FUNCTION__,widget,name,value);
+//	debug("%s(%p,%s)=%d",__FUNCTION__,widget,name,value);
  
 	gtk_container_foreach(menu,(GtkCallback) set_toggle_menu_item,&value);
  
@@ -363,6 +363,13 @@
  
  void pw3270_toolbar_set_actions(GtkWidget *toolbar, const gchar *action_names) {
  
+	// The action search requires a toplevel window.
+	if(!gtk_widget_get_parent(toolbar)) {
+		g_warning("Can't set actions on an orphan toolbar");
+		return;
+	}
+
+	// Split action names
 	size_t ix;
 	gint pos = 0;
  
@@ -53,18 +53,23 @@
  
  	size_t ix;
  
+ 	g_autoptr(GSettings) settings = pw3270_application_get_settings(g_application_get_default());
+
  	GtkWidget * dialog = v3270_settings_dialog_new();
 	gtk_window_set_title(GTK_WINDOW(dialog), action->label);
  
 	// Add settings pages.
 	GtkWidget * elements[] = {
-		v3270_host_settings_new(),
 		v3270_color_settings_new(),
 		v3270_font_settings_new(),
 		v3270_accelerator_settings_new(),
 		v3270_clipboard_settings_new()
 	};
  
+	if(g_settings_get_boolean(settings,"allow-host-settings")) {
+		gtk_container_add(GTK_CONTAINER(dialog), v3270_host_settings_new());
+	}
+
 	for(ix = 0; ix < G_N_ELEMENTS(elements); ix++) {
 		gtk_container_add(GTK_CONTAINER(dialog), elements[ix]);
 	}
@@ -90,6 +90,7 @@
  
 	strcpy(new_session->filename,filename);
 	new_session->key_file = g_key_file_new();
+	g_object_set_data_full(G_OBJECT(terminal),"session-descriptor",new_session,(GDestroyNotify) close_keyfile);
  
 	// Load file
 	if(g_file_test(new_session->filename,G_FILE_TEST_IS_REGULAR)) {
@@ -120,46 +121,40 @@
 #endif // DEBUG
 		}
  
-		new_session->changed = TRUE;
-
 	}
  
-	g_object_set_data_full(G_OBJECT(terminal),"session-descriptor",new_session,(GDestroyNotify) close_keyfile);
-	if(new_session->changed) {
-		v3270_key_file_save(terminal,error);
+	if(*error) {
+		g_warning("Error '%s' loading keyfile", (*error)->message);
+		return new_session;
 	}
  
-	if(!*error) {
+	// Got key file, load it.
+	v3270_load_key_file(terminal,new_session->key_file,NULL);
+	v3270_accelerator_map_load_key_file(terminal,new_session->key_file,NULL);
  
-		// Got key file, load it.
-		v3270_load_key_file(terminal,new_session->key_file,NULL);
-		v3270_accelerator_map_load_key_file(terminal,new_session->key_file,NULL);
+	if(g_key_file_has_group(new_session->key_file,"environment")) {
  
-		if(g_key_file_has_group(new_session->key_file,"environment")) {
+		// Has environment group, set values.
+		gchar **keys = g_key_file_get_keys(new_session->key_file,"environment",NULL,NULL);
  
-			// Has environment group, set values.
-			gchar **keys = g_key_file_get_keys(new_session->key_file,"environment",NULL,NULL);
-
-			if(keys) {
-				size_t ix;
-				for(ix=0;keys[ix];ix++) {
-					g_autofree gchar * value = g_key_file_get_string(new_session->key_file,"environment",keys[ix],NULL);
-					if(value) {
+		if(keys) {
+			size_t ix;
+			for(ix=0;keys[ix];ix++) {
+				g_autofree gchar * value = g_key_file_get_string(new_session->key_file,"environment",keys[ix],NULL);
+				if(value) {
 #ifdef _WIN32
-						g_autofree gchar * env = g_strconcat(keys[ix],"=",value,NULL);
-						putenv(env);
+					g_autofree gchar * env = g_strconcat(keys[ix],"=",value,NULL);
+					putenv(env);
 #else
-						if(setenv(keys[ix],value,1)) {
-							g_warning("Can't set \"%s\" to \"%s\"",keys[ix],value);
-						}
-#endif // _WIN32
+					if(setenv(keys[ix],value,1)) {
+						g_warning("Can't set \"%s\" to \"%s\"",keys[ix],value);
 					}
+#endif // _WIN32
 				}
-
-				g_strfreev(keys);
 			}
-		}
  
+			g_strfreev(keys);
+		}
 	}
  
 	return new_session;
1	1	<?xml version="1.0" encoding="UTF-8"?>
2		-<component type="desktop">
3		- <id>br.com.bb.pw3270</id>
4		- <name>3270 Terminal</name>
5		- <name xml:lang="pt_BR">Terminal 3270</name>
	2	+<application>
	3	+
	4	+ <id type="desktop">@PRODUCT_NAME@.desktop</id>
	5	+
	6	+ <metadata_license>CC0-1.0</metadata_license>
	7	+ <project_license>LGPL-3.0</project_license>
	8	+
6	9	<summary>IBM 3270 Terminal emulator</summary>
7	10	<summary xml:lang="pt_BR">Emulador de terminal IBM 3270</summary>
	11	+
8	12	<developer_name>perry.werneck@gmail.com</developer_name>
9		- <description>
10		- <p>
11		- GTK Based 3270 terminal emulator
12		- pw3270 is a modern, GTK-based, completely free tn3270 emulator.
13	13
14		- Created originally for Banco do Brasil, it's now an official Brazilian Government Public Software project, and is used worldwide.
15		- </p>
	14	+ <description>
	15	+ <p>GTK Based 3270 terminal emulator</p>
	16	+ <p>pw3270 is a modern, GTK-based, completely free tn3270 emulator.</p>
	17	+ <p>Created originally for Banco do Brasil, it's now an official Brazilian Government Public Software project, and is used worldwide.</p>
16	18	</description>
17	19
18		- <metadata_license>CC0-1.0</metadata_license>
19		- <project_license>LGPL-3.0</project_license>
20		-
21	20	<url type="bugtracker">https://github.com/PerryWerneck/pw3270/issues</url>
22	21	<url type="homepage">https://github.com/PerryWerneck/pw3270</url>
23		- <project_group>GNOME</project_group>
24		-
25		- <launchable type="desktop-id">@PRODUCT_NAME@.desktop</launchable>
26	22
27	23	<screenshots>
28	24	<screenshot type="default">
29	25	<caption>@PRODUCT_NAME@</caption>
30		- <image height="600" width="600">https://raw.githubusercontent.com/PerryWerneck/pw3270/master/branding/pw3270-logo.svg</image>
	26	+ <image height="600" width="600">https://raw.githubusercontent.com/PerryWerneck/pw3270/master/branding/pw3270.svg</image>
31	27	</screenshot>
32	28	</screenshots>
33	29
34	30	<update_contact>perry.werneck@gmail.com</update_contact>
35	31
36	32	<provides>
37		- <id>@PRODUCT_NAME@pw32.desktop</id>
	33	+ <binary>@PRODUCT_NAME@</binary>
38	34	</provides>
39		-</component>
	35	+
	36	+
	37	+</application>
...	...
1	1	[Desktop Entry]
2	2	X-SuSE-translate=true
3	3	GenericName=@PRODUCT_NAME@
	4	+GenericName[pt_BR]=@PRODUCT_NAME@
4	5	Name=3270 Terminal
5	6	Name[pt_BR]=Terminal 3270
6	7	Comment=IBM 3270 Terminal emulator
...	...
...	...	@@ -32,7 +32,7 @@ AC_PREREQ(2.61)
32	32
33	33	dnl Initialise automake with the package name, version and
34	34	dnl bug-reporting address.
35		-AC_INIT([pw3270], [5.3], [perry.werneck@gmail.com])
	35	+AC_INIT([pw3270], [5.4], [perry.werneck@gmail.com])
36	36
37	37	dnl Place auxilliary scripts here.
38	38	AC_CONFIG_AUX_DIR([scripts])
...	...
...	...	@@ -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-10-29 19:50-0300\n"
	8	+"POT-Creation-Date: 2020-11-03 15:48-0300\n"
9	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"
...	...	@@ -25,11 +25,11 @@ msgstr ""
25	25	msgid "\"%s\" is not a valid user interface name"
26	26	msgstr "\"%s\" não é um nome válido para interface de usuário"
27	27
28		-#: src/objects/application/actions/about.c:93
	28	+#: src/objects/application/actions/about.c:136
29	29	msgid "32 bits Linux"
30	30	msgstr "Linux 32 bits"
31	31
32		-#: src/objects/application/actions/about.c:91
	32	+#: src/objects/application/actions/about.c:134
33	33	msgid "32 bits Windows"
34	34	msgstr "Windows 32 bits"
35	35
...	...	@@ -37,20 +37,20 @@ msgstr "Windows 32 bits"
37	37	msgid "3270 session files"
38	38	msgstr "Arquivos de sessão TN3270"
39	39
40		-#: src/objects/application/actions/about.c:87
	40	+#: src/objects/application/actions/about.c:130
41	41	#, c-format
42	42	msgid "3270 terminal emulator for %s."
43	43	msgstr "Emulador 3270 para %s"
44	44
45		-#: src/objects/application/actions/about.c:95
	45	+#: src/objects/application/actions/about.c:138
46	46	msgid "64 bits Linux"
47	47	msgstr "Linux 64 bits"
48	48
49		-#: src/objects/application/actions/about.c:89
	49	+#: src/objects/application/actions/about.c:132
50	50	msgid "64 bits Windows"
51	51	msgstr "Windows 64 bits"
52	52
53		-#: src/objects/application/actions/about.c:188 ui/application.xml:39
	53	+#: src/objects/application/actions/about.c:231 ui/application.xml:39
54	54	#: ui/application.xml:537
55	55	msgid "About PW3270"
56	56	msgstr "Sobre o PW3270"
...	...	@@ -75,7 +75,7 @@ msgstr "Todos os arquivos"
75	75	msgid "Append to copy"
76	76	msgstr "Adicionar à cópia"
77	77
78		-#: src/objects/application/actions/about.c:129
	78	+#: src/objects/application/actions/about.c:172
79	79	msgid "Apple version"
80	80	msgstr "Versão Apple"
81	81
...	...	@@ -103,7 +103,7 @@ msgstr "Reconectar automaticamente"
103	103	msgid "Available"
104	104	msgstr "Disponível"
105	105
106		-#: src/objects/application/actions/about.c:132
	106	+#: src/objects/application/actions/about.c:175
107	107	msgid "Based on X3270 from"
108	108	msgstr "Baseado no X3270 por"
109	109
...	...	@@ -194,7 +194,7 @@ msgstr "Conectar ao servidor"
194	194	msgid "Connected to host"
195	195	msgstr "Conectado no servidor"
196	196
197		-#: src/objects/application/actions/about.c:130
	197	+#: src/objects/application/actions/about.c:173
198	198	msgid "Contributors"
199	199	msgstr "Contribuidores"
200	200
...	...	@@ -407,7 +407,7 @@ msgstr "Largura do painel em colunas"
407	407	msgid "Keypads"
408	408	msgstr "Painéis"
409	409
410		-#: src/objects/application/actions/about.c:140
	410	+#: src/objects/application/actions/about.c:183
411	411	msgid "LICENSE"
412	412	msgstr "LICENCA"
413	413
...	...	@@ -439,7 +439,7 @@ msgstr "Barra de ferramentas"
439	439	msgid "Main menu"
440	440	msgstr "Menu principal"
441	441
442		-#: src/objects/application/actions/about.c:128
	442	+#: src/objects/application/actions/about.c:171
443	443	msgid "Maintainers"
444	444	msgstr "Mantenedores"
445	445
...	...	@@ -923,7 +923,7 @@ msgstr "Remover seleção"
923	923	msgid "Use +/- for field navigation"
924	924	msgstr "Usar teclas +/- para navegar por campos"
925	925
926		-#: src/objects/application/actions/about.c:70
	926	+#: src/objects/application/actions/about.c:113
927	927	#, c-format
928	928	msgid "Version %s-%s"
929	929	msgstr "Versão %s-%s"
...	...	@@ -933,7 +933,7 @@ msgstr "Versão %s-%s"
933	933	msgid "View"
934	934	msgstr "Exibir"
935	935
936		-#: src/objects/application/actions/about.c:163
	936	+#: src/objects/application/actions/about.c:206
937	937	msgid "View this project on github"
938	938	msgstr "Portal do Software Público Brasileiro"
939	939
...	...	@@ -998,11 +998,11 @@ msgstr "_Salvar"
998	998	msgid "_View"
999	999	msgstr "_Exibir"
1000	1000
1001		-#: src/objects/application/actions/about.c:162
	1001	+#: src/objects/application/actions/about.c:205
1002	1002	msgid "https://github.com/PerryWerneck/pw3270"
1003	1003	msgstr "https://portal.softwarepublico.gov.br/social/pw3270/"
1004	1004
1005		-#: src/objects/application/actions/about.c:165
	1005	+#: src/objects/application/actions/about.c:208
1006	1006	msgid "translator-credits"
1007	1007	msgstr "translator-credits"
1008	1008
...	...
...	...	@@ -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-10-29 19:50-0300\n"
	11	+"POT-Creation-Date: 2020-11-03 15:50-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"
...	...	@@ -22,11 +22,11 @@ msgstr ""
22	22	msgid "\"%s\" is not a valid user interface name"
23	23	msgstr ""
24	24
25		-#: src/objects/application/actions/about.c:93
	25	+#: src/objects/application/actions/about.c:136
26	26	msgid "32 bits Linux"
27	27	msgstr ""
28	28
29		-#: src/objects/application/actions/about.c:91
	29	+#: src/objects/application/actions/about.c:134
30	30	msgid "32 bits Windows"
31	31	msgstr ""
32	32
...	...	@@ -34,20 +34,20 @@ msgstr ""
34	34	msgid "3270 session files"
35	35	msgstr ""
36	36
37		-#: src/objects/application/actions/about.c:87
	37	+#: src/objects/application/actions/about.c:130
38	38	#, c-format
39	39	msgid "3270 terminal emulator for %s."
40	40	msgstr ""
41	41
42		-#: src/objects/application/actions/about.c:95
	42	+#: src/objects/application/actions/about.c:138
43	43	msgid "64 bits Linux"
44	44	msgstr ""
45	45
46		-#: src/objects/application/actions/about.c:89
	46	+#: src/objects/application/actions/about.c:132
47	47	msgid "64 bits Windows"
48	48	msgstr ""
49	49
50		-#: src/objects/application/actions/about.c:188 ui/application.xml:39
	50	+#: src/objects/application/actions/about.c:231 ui/application.xml:39
51	51	#: ui/application.xml:537
52	52	msgid "About PW3270"
53	53	msgstr ""
...	...	@@ -72,7 +72,7 @@ msgstr ""
72	72	msgid "Append to copy"
73	73	msgstr ""
74	74
75		-#: src/objects/application/actions/about.c:129
	75	+#: src/objects/application/actions/about.c:172
76	76	msgid "Apple version"
77	77	msgstr ""
78	78
...	...	@@ -100,7 +100,7 @@ msgstr ""
100	100	msgid "Available"
101	101	msgstr ""
102	102
103		-#: src/objects/application/actions/about.c:132
	103	+#: src/objects/application/actions/about.c:175
104	104	msgid "Based on X3270 from"
105	105	msgstr ""
106	106
...	...	@@ -191,7 +191,7 @@ msgstr ""
191	191	msgid "Connected to host"
192	192	msgstr ""
193	193
194		-#: src/objects/application/actions/about.c:130
	194	+#: src/objects/application/actions/about.c:173
195	195	msgid "Contributors"
196	196	msgstr ""
197	197
...	...	@@ -404,7 +404,7 @@ msgstr ""
404	404	msgid "Keypads"
405	405	msgstr ""
406	406
407		-#: src/objects/application/actions/about.c:140
	407	+#: src/objects/application/actions/about.c:183
408	408	msgid "LICENSE"
409	409	msgstr ""
410	410
...	...	@@ -436,7 +436,7 @@ msgstr ""
436	436	msgid "Main menu"
437	437	msgstr ""
438	438
439		-#: src/objects/application/actions/about.c:128
	439	+#: src/objects/application/actions/about.c:171
440	440	msgid "Maintainers"
441	441	msgstr ""
442	442
...	...	@@ -918,7 +918,7 @@ msgstr ""
918	918	msgid "Use +/- for field navigation"
919	919	msgstr ""
920	920
921		-#: src/objects/application/actions/about.c:70
	921	+#: src/objects/application/actions/about.c:113
922	922	#, c-format
923	923	msgid "Version %s-%s"
924	924	msgstr ""
...	...	@@ -928,7 +928,7 @@ msgstr ""
928	928	msgid "View"
929	929	msgstr ""
930	930
931		-#: src/objects/application/actions/about.c:163
	931	+#: src/objects/application/actions/about.c:206
932	932	msgid "View this project on github"
933	933	msgstr ""
934	934
...	...	@@ -993,10 +993,10 @@ msgstr ""
993	993	msgid "_View"
994	994	msgstr ""
995	995
996		-#: src/objects/application/actions/about.c:162
	996	+#: src/objects/application/actions/about.c:205
997	997	msgid "https://github.com/PerryWerneck/pw3270"
998	998	msgstr ""
999	999
1000		-#: src/objects/application/actions/about.c:165
	1000	+#: src/objects/application/actions/about.c:208
1001	1001	msgid "translator-credits"
1002	1002	msgstr ""
...	...
...	...	@@ -199,9 +199,6 @@
199	199	<Unit filename="src/objects/window/window.c">
200	200	<Option compilerVar="CC" />
201	201	</Unit>
202		- <Unit filename="src/tools/entry.c">
203		- <Option compilerVar="CC" />
204		- </Unit>
205	202	<Unit filename="ui/application.xml" />
206	203	<Unit filename="ui/window.xml" />
207	204	<Extensions>
...	...
...	...	@@ -13,7 +13,6 @@
13	13	</service>
14	14
15	15	<!-- https://github.com/openSUSE/obs-service-extract_file -->
16		- <!--
17	16	<service name="extract_file">
18	17	<param name="archive">*.tar</param>
19	18	<param name="files">*/rpm/pw3270.spec</param>
...	...	@@ -59,7 +58,6 @@
59	58	<param name="files">*/arch/PKGBUILD</param>
60	59	<param name="outfilename">PKGBUILD</param>
61	60	</service>
62		- -->
63	61
64	62	<service name="recompress">
65	63	<param name="file">*.tar</param>
...	...	@@ -68,4 +66,4 @@
68	66
69	67	<service name="set_version" />
70	68
71		-</services>
72	69	\ No newline at end of file
	70	+</services>
...	...
...	...	@@ -38,6 +38,24 @@
38	38	<description>The ID of the current user interface style</description>
39	39	</key>
40	40
	41	+ <key name="allow-host-settings" type="b">
	42	+ <default>true</default>
	43	+ <summary>Allow host settings</summary>
	44	+ <description>Allow changing of host session properties</description>
	45	+ </key>
	46	+
	47	+ <key name="allow-new-tab-actions" type="b">
	48	+ <default>true</default>
	49	+ <summary>Enable new tab actions</summary>
	50	+ <description>Enable new tab actions</description>
	51	+ </key>
	52	+
	53	+ <key name="allow-new-window-actions" type="b">
	54	+ <default>true</default>
	55	+ <summary>Enable new window actions</summary>
	56	+ <description>Enable new window actions</description>
	57	+ </key>
	58	+
41	59	</schema>
42	60
43	61	</schemalist>
...	...
...	...	@@ -38,6 +38,12 @@
38	38	<description>The ID of the current user interface style</description>
39	39	</key>
40	40
	41	+ <key name="allow-host-settings" type="b">
	42	+ <default>true</default>
	43	+ <summary>Allow host settings</summary>
	44	+ <description>Allow changing of host session properties</description>
	45	+ </key>
	46	+
41	47	<key name="gtk-csd" type="i">
42	48	<default>0</default>
43	49	<summary>GTK CSD</summary>
...	...
...	...	@@ -31,10 +31,18 @@
31	31	#include <pw3270/actions.h>
32	32	#include <pw3270/application.h>
33	33
34		- static GtkWidget * factory(PW3270Action G_GNUC_UNUSED(action), GtkApplication G_GNUC_UNUSED(application)) {
	34	+ static GtkWidget * factory(PW3270Action G_GNUC_UNUSED(action), GtkApplication application) {
35	35
36	36	GtkAboutDialog * dialog = GTK_ABOUT_DIALOG(gtk_about_dialog_new());
37	37
	38	+ if(GTK_IS_APPLICATION(application)) {
	39	+
	40	+ gtk_window_set_transient_for(GTK_WINDOW(dialog),gtk_application_get_active_window(GTK_APPLICATION(application)));
	41	+ gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog),TRUE);
	42	+ gtk_window_set_modal(GTK_WINDOW(dialog),TRUE);
	43	+
	44	+ }
	45	+
38	46	// Get application logo
39	47	{
40	48	#ifdef DEBUG
...	...