Delaying 'gsettings' change on application preferences dialog.

Perry Werneck
1 parent 60bd7fdd
Showing 7 changed files with 53 additions and 48 deletions Show diff stats
src/include/pw3270/settings.h
src/objects/actions/view.c
src/objects/application/application.c
src/objects/settings/dialog.c
src/objects/settings/widget.c
src/objects/toolbar/settings.c
src/objects/window/header-settings.c
@@ -51,19 +51,19 @@
  GType PW3270Settings_get_type(void);
- typedef struct _PW3270SettingsPrivate PW3270SettingsPrivate;
+ typedef struct _PW3270SettingsPage PW3270SettingsPage;
  typedef struct _PW3270Settings {
 	GtkGrid parent;
-	PW3270SettingsPrivate	* settings;											///< @brief Private Data.
-	const gchar				* label;											///< @brief Page lagel.
-	const gchar				* title;											///< @brief Page title.
+	PW3270SettingsPage	* settings;										///< @brief Page Data.
+	const gchar			* label;										///< @brief Page lagel.
+	const gchar			* title;										///< @brief Page title.
- 	void (*load)(GtkWidget *widget, PW3270SettingsPrivate *settings);			///< @brief Method to load the properties from terminal widget
- 	void (*apply)(GtkWidget *widget, PW3270SettingsPrivate *settings);			///< @brief Method for GTK_RESPONSE_APPLY
- 	void (*revert)(GtkWidget *widget, PW3270SettingsPrivate *settings);			///< @brief Method for GTK_RESPONSE_CANCEL
+ 	void (*load)(GtkWidget *widget, GSettings *settings, PW3270SettingsPage *page);			///< @brief Method to load the properties from terminal widget
+ 	void (*apply)(GtkWidget *widget, GSettings *settings, PW3270SettingsPage *page);		///< @brief Method for GTK_RESPONSE_APPLY
+ 	void (*revert)(GtkWidget *widget, GSettings *settings, PW3270SettingsPage *page);		///< @brief Method for GTK_RESPONSE_CANCEL
  } PW3270Settings;
@@ -73,8 +73,10 @@
  } PW3270SettingsClass;
+ /// @brief Create a new pw3270 settings.
  PW3270Settings * pw3270_settings_new();
+
 /*--[ PW3270 Settings Dialog ]-----------------------------------------------------------------------*/
  #define GTK_TYPE_PW3270_SETTINGS_DIALOG				(PW3270SettingsDialog_get_type())
@@ -409,7 +409,7 @@
 	return g_string_free(str,FALSE);
  }
- static void check_4_sensitive(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gboolean *sensitive) {
+ static void check_4_sensitive(GtkTreeModel *model, GtkTreePath G_GNUC_UNUSED(*path), GtkTreeIter *iter, gboolean *sensitive) {
 	GValue value = { 0, };
 	gtk_tree_model_get_value(model,iter,COLUMN_FLAGS,&value);
@@ -417,20 +417,20 @@
 	// Load keypad models
 	//
 	{
-#ifdef DEBUG
-		const gchar * keypad_path = "keypad";
-#else
 		lib3270_autoptr(char) keypad_path = lib3270_build_data_filename("keypad",NULL);
-#endif // DEBUG
 		g_autoptr(GError) error = NULL;
 		g_autoptr(GDir) dir = g_dir_open(keypad_path,0,&error);
-		const gchar *name = g_dir_read_name(dir);
-		while(!error && name) {
-			g_autofree gchar * path = g_build_filename(keypad_path,name,NULL);
-			app->keypads = pw3270_keypad_model_new_from_xml(app->keypads,path);
-			name = g_dir_read_name(dir);
+		if(dir) {
+
+			const gchar *name = g_dir_read_name(dir);
+			while(!error && name) {
+				g_autofree gchar * path = g_build_filename(keypad_path,name,NULL);
+				app->keypads = pw3270_keypad_model_new_from_xml(app->keypads,path);
+				name = g_dir_read_name(dir);
+			}
+
 		}
 		if(error) {
@@ -35,6 +35,7 @@
  #include <pw3270.h>
  #include <pw3270/settings.h>
  #include <pw3270/actions.h>
+ #include <pw3270/window.h>
  #include <lib3270.h>
  #include <lib3270/log.h>
@@ -144,18 +145,18 @@ void dialog_close(GtkDialog *dialog) {
 	gtk_widget_destroy(GTK_WIDGET(dialog));
 }
-static void apply(GtkWidget *widget, GtkWidget G_GNUC_UNUSED(*dialog)) {
+static void apply(GtkWidget *widget, GSettings *settings) {
 	if(GTK_IS_PW3270_SETTINGS(widget)) {
-		GTK_PW3270_SETTINGS(widget)->apply(widget,GTK_PW3270_SETTINGS(widget)->settings);
+		GTK_PW3270_SETTINGS(widget)->apply(widget,settings,GTK_PW3270_SETTINGS(widget)->settings);
 	}
 }
-static void revert(GtkWidget *widget, GtkWidget G_GNUC_UNUSED(*dialog)) {
+static void revert(GtkWidget *widget, GSettings *settings, GtkWidget G_GNUC_UNUSED(*dialog)) {
 	if(GTK_IS_PW3270_SETTINGS(widget)) {
-		GTK_PW3270_SETTINGS(widget)->revert(widget,GTK_PW3270_SETTINGS(widget)->settings);
+		GTK_PW3270_SETTINGS(widget)->revert(widget,settings,GTK_PW3270_SETTINGS(widget)->settings);
 	}
 }
@@ -164,12 +165,15 @@ void response(GtkDialog *dialog, gint response_id) {
 	debug("%s(%d)",__FUNCTION__,response_id);
+	g_autoptr(GSettings) settings = pw3270_application_window_settings_new();
+	g_settings_delay(settings);
+
 	switch(response_id) {
 	case GTK_RESPONSE_APPLY:
 		gtk_container_foreach(
 			GTK_CONTAINER(GTK_PW3270_SETTINGS_DIALOG(dialog)->tabs),
 			(GtkCallback) apply,
-			dialog
+			settings
 		);
 		break;
@@ -177,13 +181,15 @@ void response(GtkDialog *dialog, gint response_id) {
 		gtk_container_foreach(
 			GTK_CONTAINER(GTK_PW3270_SETTINGS_DIALOG(dialog)->tabs),
 			(GtkCallback) revert,
-			dialog
+			settings
 		);
 		break;
 	}
+	g_settings_apply(settings);
 	gtk_widget_destroy(GTK_WIDGET(dialog));
+
 }
 void add(GtkContainer *container, GtkWidget *widget) {
@@ -196,7 +202,9 @@ void add(GtkContainer *container, GtkWidget *widget) {
 	if(GTK_IS_PW3270_SETTINGS(widget)) {
 		PW3270Settings * settings = GTK_PW3270_SETTINGS(widget);
 		label = gtk_label_new(settings->label);
-		settings->load(widget,settings->settings);
+
+		g_autoptr(GSettings) gs = pw3270_application_window_settings_new();
+		settings->load(widget,gs,settings->settings);
 	}
 	gtk_widget_show(widget);
@@ -212,7 +220,7 @@ void page_changed(GtkNotebook *notebook, GtkWidget G_GNUC_UNUSED(*child), guint 
  	gtk_notebook_set_show_tabs(notebook,gtk_notebook_get_n_pages(notebook) > 1);
 }
-void switch_page(GtkNotebook *notebook, PW3270Settings *page, guint G_GNUC_UNUSED(page_num), PW3270SettingsDialog *dialog) {
+void switch_page(GtkNotebook G_GNUC_UNUSED(*notebook), PW3270Settings *page, guint G_GNUC_UNUSED(page_num), PW3270SettingsDialog *dialog) {
 	GtkWidget * header_bar = gtk_dialog_get_header_bar(GTK_DIALOG(dialog));
@@ -39,9 +39,9 @@
  G_DEFINE_TYPE(PW3270Settings, PW3270Settings, GTK_TYPE_GRID);
- static void load(GtkWidget *widget, PW3270SettingsPrivate *settings);
- static void apply(GtkWidget *widget, PW3270SettingsPrivate *settings);
- static void revert(GtkWidget *widget, PW3270SettingsPrivate *settings);
+ static void load(GtkWidget *widget, GSettings *settings, PW3270SettingsPage *page);
+ static void apply(GtkWidget *widget, GSettings *settings, PW3270SettingsPage *page);
+ static void revert(GtkWidget *widget, GSettings *settings, PW3270SettingsPage *page);
  static void finalize(GObject *object);
 /*--[ Implement ]------------------------------------------------------------------------------------*/
@@ -78,12 +78,12 @@
 }
- void load(GtkWidget G_GNUC_UNUSED(*widget), PW3270SettingsPrivate G_GNUC_UNUSED(*settings)) {
+ void load(GtkWidget G_GNUC_UNUSED(*widget), GSettings G_GNUC_UNUSED(*settings), PW3270SettingsPage G_GNUC_UNUSED(*page)) {
  }
- void apply(GtkWidget G_GNUC_UNUSED(*widget), PW3270SettingsPrivate G_GNUC_UNUSED(*settings)) {
+ void apply(GtkWidget G_GNUC_UNUSED(*widget), GSettings G_GNUC_UNUSED(*settings), PW3270SettingsPage G_GNUC_UNUSED(*page)) {
  }
- void revert(GtkWidget G_GNUC_UNUSED(*widget), PW3270SettingsPrivate G_GNUC_UNUSED(*settings)) {
+ void revert(GtkWidget G_GNUC_UNUSED(*widget), GSettings G_GNUC_UNUSED(*settings), PW3270SettingsPage G_GNUC_UNUSED(*page)) {
  }
@@ -35,8 +35,8 @@
  #include <pw3270/window.h>
  #include <v3270/dialogs.h>
- static void load(GtkWidget *widget, PW3270SettingsPrivate *settings);
- static void apply(GtkWidget *widget, PW3270SettingsPrivate *settings);
+ static void load(GtkWidget *widget, GSettings *settings, PW3270SettingsPage *page);
+ static void apply(GtkWidget *widget, GSettings *settings, PW3270SettingsPage *page);
  /*--[ Constants ]------------------------------------------------------------------------------------*/
@@ -77,7 +77,7 @@
  };
- struct _PW3270SettingsPrivate {
+ struct _PW3270SettingsPage {
 	GtkWidget * views[2];
 //	GtkTreeModel * models[G_N_ELEMENTS(comboboxes)];
 	GtkWidget * combos[G_N_ELEMENTS(comboboxes)];
@@ -97,7 +97,7 @@
 	settings->load = load;
 	// Create private data.
-	PW3270SettingsPrivate * page = settings->settings = g_new0(PW3270SettingsPrivate,1);
+	PW3270SettingsPage * page = settings->settings = g_new0(PW3270SettingsPage,1);
 	//
 	// Create views
@@ -222,10 +222,9 @@
 	return GTK_WIDGET(settings);
  }
- void load(GtkWidget G_GNUC_UNUSED(*widget), PW3270SettingsPrivate *page) {
+ void load(GtkWidget G_GNUC_UNUSED(*widget), GSettings *settings, PW3270SettingsPage *page) {
  	size_t ix;
-	g_autoptr(GSettings) settings = pw3270_application_window_settings_new();
  	// Populate views
 	Pw3270ActionList * action_list = pw3270_action_list_new(GTK_APPLICATION(g_application_get_default()));
@@ -274,10 +273,9 @@
  }
- void apply(GtkWidget G_GNUC_UNUSED(*widget), PW3270SettingsPrivate *page) {
+ void apply(GtkWidget G_GNUC_UNUSED(*widget), GSettings *settings, PW3270SettingsPage *page) {
 	size_t ix;
-	g_autoptr(GSettings) settings = pw3270_application_window_settings_new();
  	g_autofree gchar * action_names = pw3270_action_view_get_action_names(page->views[0]);
 	g_settings_set_string(settings,"toolbar-action-names",action_names);
@@ -34,12 +34,12 @@
  #include <pw3270/application.h>
  #include <v3270/dialogs.h>
- static void load(GtkWidget *widget, PW3270SettingsPrivate *settings);
- static void apply(GtkWidget *widget, PW3270SettingsPrivate *settings);
+ static void load(GtkWidget *widget, GSettings *settings, PW3270SettingsPage *page);
+ static void apply(GtkWidget *widget, GSettings *settings, PW3270SettingsPage *page);
 /*--[ Constants ]------------------------------------------------------------------------------------*/
-  struct _PW3270SettingsPrivate {
+  struct _PW3270SettingsPage {
   	GtkWidget * editor;
   	/*
 	GtkWidget * views[3];
@@ -87,7 +87,7 @@
 	settings->load = load;
 	// Create private data.
-	PW3270SettingsPrivate * page = settings->settings = g_new0(PW3270SettingsPrivate,1);
+	PW3270SettingsPage * page = settings->settings = g_new0(PW3270SettingsPage,1);
 	page->editor = pw3270_settings_actions_new();
@@ -102,9 +102,7 @@
 	return GTK_WIDGET(settings);
  }
- void load(GtkWidget G_GNUC_UNUSED(*widget), PW3270SettingsPrivate *page) {
-
- 	g_autoptr(GSettings) settings = pw3270_application_window_settings_new();
+ void load(GtkWidget G_GNUC_UNUSED(*widget), GSettings *settings, PW3270SettingsPage *page) {
  	// Get avaliable actions.
  	Pw3270ActionList * action_list = pw3270_action_list_new(GTK_APPLICATION(g_application_get_default()));
@@ -162,10 +160,9 @@
 	pw3270_action_list_free(action_list);
  }
- void apply(GtkWidget G_GNUC_UNUSED(*widget), PW3270SettingsPrivate *page) {
+ void apply(GtkWidget G_GNUC_UNUSED(*widget), GSettings *settings, PW3270SettingsPage *page) {
  	g_autofree gchar * action_names = pw3270_settings_action_get(page->editor);
-	g_autoptr(GSettings) settings = pw3270_application_window_settings_new();
 	g_settings_set_string(settings,"header-action-names",action_names);
  }
	@@ -409,7 +409,7 @@		@@ -409,7 +409,7 @@
409	return g_string_free(str,FALSE);	409	return g_string_free(str,FALSE);
410	}	410	}
411		411
412	- static void check_4_sensitive(GtkTreeModel model, GtkTreePath path, GtkTreeIter iter, gboolean sensitive) {	412	+ static void check_4_sensitive(GtkTreeModel model, GtkTreePath G_GNUC_UNUSED(path), GtkTreeIter iter, gboolean sensitive) {
413		413
414	GValue value = { 0, };	414	GValue value = { 0, };
415	gtk_tree_model_get_value(model,iter,COLUMN_FLAGS,&value);	415	gtk_tree_model_get_value(model,iter,COLUMN_FLAGS,&value);