Merge pull request #40 from PerryWerneck/develop

Updating master with latest changes.

Merge pull request #40 from PerryWerneck/develop
Updating master with latest changes.
Perry Werneck · GitHub
2 parents 9c59f578 66950f3d
Showing 11 changed files with 85 additions and 40 deletions Show diff stats
arch/PKGBUILD
rpm/_service
src/include/pw3270/application.h
src/main/builder.c
src/objects/application/application.c
src/objects/window/actions/sessionproperties.c
src/objects/window/keyfile.c
ui/linux.ui.xml
ui/macos.ui.xml
ui/windows.ui.xml
win/pack.sh
@@ -34,5 +34,9 @@ build() {
 package() {
   cd $pkgname-$pkgver
   DESTDIR="$pkgdir" make install
+  
+  # Remove compiled schema.
+  rm -f $pkgdir/usr/share/glib-2.0/schemas/gschemas.compiled
+  
 }
@@ -53,11 +53,11 @@
 		<param name="outfilename">debian.shlibs</param>
 	</service -->
-  	<service name="extract_file">
+  	<!-- service name="extract_file">
 		<param name="archive">*.tar</param>
 		<param name="files">*/arch/PKGBUILD</param>
 		<param name="outfilename">PKGBUILD</param>
-	</service>
+	</service -->
 	<service name="recompress">
 		<param name="file">*.tar</param>
@@ -72,6 +72,10 @@ void			  pw3270_application_open_file(GtkApplication *application, GtkWindow **w
 /// @return The internal settings object (Do not unref it).
 GSettings		* pw3270_application_settings_new();
 GSettings		* pw3270_application_get_settings(GApplication *app);
+
+/// @brief Get boolean from gsettings.
+gboolean		  pw3270_application_get_boolean(GApplication *app, const gchar *option_name, gboolean def);
+
 GList			* pw3270_application_get_keypad_models(GApplication *app);
 void			  pw3270_application_set_ui_style(GApplication *app, PW3270_UI_STYLE type);
@@ -21,7 +21,8 @@
  #include <pw3270/application.h>
  #include <pw3270/keypad.h>
- static GMenu * get_keypad_menu(GApplication *application) {
+ /*
+ static GMenu * keypad_menu_new(GApplication *application) {
 	GList * keypads = pw3270_application_get_keypad_models(application);
@@ -41,6 +42,7 @@
 	return menu;
  }
+ */
  GtkBuilder * pw3270_application_builder_new(GApplication *application) {
@@ -100,11 +102,13 @@
 	//
 	// View options
 	//
-	GMenu * keypad_menu = get_keypad_menu(application);
+	GList * keypads = pw3270_application_get_keypad_models(application);
-	if(keypad_menu) {
+	if(keypads) {
 		static const gchar * placeholders[] = {
+			"app-menu-view-placeholder",
+			"top-menu-view-placeholder",
 			"view-menu-placeholder",
 			"view-when-offline-placeholder",
 			"view-when-online-placeholder"
@@ -114,13 +118,33 @@
 			placeholder = gtk_builder_get_object(builder, placeholders[ix]);
-			if(placeholder && G_IS_MENU(placeholder)) {
-				g_menu_append_item(G_MENU(placeholder), g_menu_item_new_submenu(_("Keypads"),G_MENU_MODEL(keypad_menu)));
+			if(placeholder) {
+
+				if(G_IS_MENU(placeholder)) {
+
+					GMenu * menu = g_menu_new();
+
+					// Create keypad items.
+					GList *item;
+					for(item = keypads; item; item = g_list_next(item)) {
+						GObject * model = G_OBJECT(item->data);
+						g_autofree gchar * action_name = g_strconcat("win.keypad.",pw3270_keypad_model_get_name(model),NULL);
+						g_menu_append(menu,pw3270_keypad_model_get_label(model),action_name);
+					}
+
+					g_menu_append_item(G_MENU(placeholder), g_menu_item_new_submenu(_("Keypads"),G_MENU_MODEL(menu)));
+
+					g_object_unref(menu);
+
+				} else {
+
+					g_message("Placeholder '%s' is invalid",placeholders[ix]);
+
+				}
 			}
 		}
-		g_object_unref(keypad_menu);
 	}
 	return builder;
@@ -427,7 +427,7 @@ void startup(GApplication *application) {
 	G_APPLICATION_CLASS(pw3270Application_parent_class)->startup(application);
-	GSettings *settings = pw3270_application_get_settings(application);
+//	GSettings *settings = pw3270_application_get_settings(application);
 	//
 	// Common actions
@@ -445,14 +445,14 @@ void startup(GApplication *application) {
 	//
 	// Open session actions.
 	//
-	if(g_settings_get_boolean(settings,"allow-open-session-actions")) {
+	if(pw3270_application_get_boolean(application,"allow-open-session-actions",TRUE)) {
 		g_action_map_add_action(G_ACTION_MAP(application),pw3270_open_session_action_new());
 	}
 	//
 	// New tab actions
 	//
-	if(g_settings_get_boolean(settings,"allow-new-tab-actions")) {
+	if(pw3270_application_get_boolean(application,"allow-new-tab-actions",TRUE)) {
 		GAction * new_tab_actions[] = {
 			pw3270_open_tab_action_new(),
@@ -468,7 +468,7 @@ void startup(GApplication *application) {
 	//
 	// New window actions
 	//
-	if(g_settings_get_boolean(settings,"allow-new-window-actions")) {
+	if(pw3270_application_get_boolean(application,"allow-new-window-actions",TRUE)) {
 		GAction * new_window_actions[] = {
 			pw3270_open_window_action_new(),
@@ -482,11 +482,6 @@ void startup(GApplication *application) {
 	}
 	//
-	// Setup application menus
-	//
-	g_autoptr(GtkBuilder) builder = pw3270_application_builder_new(application);
-
-	//
 	// Load keypad models
 	//
 	{
@@ -511,6 +506,11 @@ void startup(GApplication *application) {
 		}
 	}
+	//
+	// Setup application menus
+	//
+	g_autoptr(GtkBuilder) builder = pw3270_application_builder_new(application);
+
 	if(gtk_application_prefers_app_menu(GTK_APPLICATION(application)))
 		gtk_application_set_app_menu(GTK_APPLICATION (application), G_MENU_MODEL(gtk_builder_get_object (builder, "app-menu")));
@@ -557,10 +557,13 @@ PW3270_UI_STYLE pw3270_application_get_ui_style(GApplication *app) {
 }
 GSettings * pw3270_application_get_settings(GApplication *app) {
-
 	g_return_val_if_fail(PW3270_IS_APPLICATION(app),NULL);
 	return PW3270_APPLICATION(app)->settings;
+}
+gboolean pw3270_application_get_boolean(GApplication *app, const gchar *option_name, gboolean def) {
+	g_return_val_if_fail(PW3270_IS_APPLICATION(app),def);
+	return g_settings_get_boolean(PW3270_APPLICATION(app)->settings,option_name);
 }
 GSList * pw3270_application_get_plugins(GApplication *app) {
@@ -43,29 +43,35 @@ GtkWidget * factory(V3270SimpleAction *action, GtkWidget *terminal) {
 	size_t ix;
-	GSettings *settings = pw3270_application_get_settings(g_application_get_default());
+	GApplication *application = g_application_get_default();
+//	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_color_settings_new(),
-		v3270_font_settings_new(),
-		v3270_accelerator_settings_new(),
-		v3270_clipboard_settings_new()
-	};
-
-	if(g_settings_get_boolean(settings,"allow-host-settings")) {
+	// Host settings is conditional.
+	if(pw3270_application_get_boolean(application,"allow-host-settings",TRUE)) {
 		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]);
+	// Add commom settings.
+	{
+
+		GtkWidget * elements[] = {
+			v3270_color_settings_new(),
+			v3270_font_settings_new(),
+			v3270_accelerator_settings_new(),
+			v3270_clipboard_settings_new()
+		};
+
+		for(ix = 0; ix < G_N_ELEMENTS(elements); ix++) {
+			gtk_container_add(GTK_CONTAINER(dialog), elements[ix]);
+		}
+
 	}
 	pw3270_application_plugin_call(
-	    g_application_get_default(),
+	    application,
 	    "pw3270_plugin_set_session_properties",
 	    dialog
 	);
@@ -216,16 +216,20 @@ V3270KeyFile * v3270_key_file_open(GtkWidget *terminal, const gchar *filename, G
 	if(!*error) {
-		GSettings * settings = pw3270_application_get_settings(g_application_get_default());
+		GApplication *application = g_application_get_default();
-		if(settings && g_settings_get_boolean(settings,"update-default-session-file")) {
+		if(pw3270_application_get_boolean(application,"update-default-session-file",TRUE)) {
-			g_message("Updating default session file to '%s'",filename);
-			g_settings_set_string(settings,"default-session-file",filename);
+			GSettings * settings = pw3270_application_get_settings(application);
+
+			if(settings) {
+				g_message("Updating default session file to '%s'",filename);
+				g_settings_set_string(settings,"default-session-file",filename);
+			}
 		}
-		if(settings && g_settings_get_boolean(settings,"add-session-to-recent-manager")) {
+		if(pw3270_application_get_boolean(application,"add-session-to-recent-manager",TRUE)) {
 			// new_session->key_file
 			g_autofree gchar * display_name = g_key_file_get_string(new_session->key_file,"terminal","session-name",NULL);
@@ -330,7 +330,7 @@
 		</submenu>
-		<submenu id="view-menu-placeholder">
+		<submenu id="top-menu-view-placeholder">
 			<attribute name='label' translatable='yes'>_View</attribute>
@@ -330,7 +330,7 @@
 		</submenu>
-		<submenu id="view-menu-placeholder">
+		<submenu id="top-menu-view-placeholder">
 			<attribute name='label' translatable='yes'>_View</attribute>
@@ -330,7 +330,7 @@
 		</submenu>
-		<submenu id="view-menu-placeholder">
+		<submenu id="top-menu-view-placeholder">
 			<attribute name='label' translatable='yes'>_View</attribute>
@@ -170,7 +170,7 @@ configure()
 		if [ -x ./autogen.sh ]; then
 			NOCONFIGURE=1 ./autogen.sh
 			if [ "$?" != "0" ]; then
-				failed "Erro em autogen.sh"
+				failed "autogen.sh has failed"
 			fi
 		fi
 	done
	@@ -53,11 +53,11 @@		@@ -53,11 +53,11 @@
53	<param name="outfilename">debian.shlibs</param>	53	<param name="outfilename">debian.shlibs</param>
54	</service -->	54	</service -->
55		55
56	- <service name="extract_file">	56	+ <!-- service name="extract_file">
57	<param name="archive">*.tar</param>	57	<param name="archive">*.tar</param>
58	<param name="files">*/arch/PKGBUILD</param>	58	<param name="files">*/arch/PKGBUILD</param>
59	<param name="outfilename">PKGBUILD</param>	59	<param name="outfilename">PKGBUILD</param>
60	- </service>	60	+ </service -->
61		61
62	<service name="recompress">	62	<service name="recompress">
63	<param name="file">*.tar</param>	63	<param name="file">*.tar</param>
	@@ -330,7 +330,7 @@		@@ -330,7 +330,7 @@
330		330
331	</submenu>	331	</submenu>
332		332
333	- <submenu id="view-menu-placeholder">	333	+ <submenu id="top-menu-view-placeholder">
334		334
335	<attribute name='label' translatable='yes'>_View</attribute>	335	<attribute name='label' translatable='yes'>_View</attribute>
336		336
	@@ -170,7 +170,7 @@ configure()		@@ -170,7 +170,7 @@ configure()
170	if [ -x ./autogen.sh ]; then	170	if [ -x ./autogen.sh ]; then
171	NOCONFIGURE=1 ./autogen.sh	171	NOCONFIGURE=1 ./autogen.sh
172	if [ "$?" != "0" ]; then	172	if [ "$?" != "0" ]; then
173	- failed "Erro em autogen.sh"	173	+ failed "autogen.sh has failed"
174	fi	174	fi
175	fi	175	fi
176	done	176	done