Implementing clipboard settings dialog.

Perry Werneck
1 parent 6fde193e
Showing 4 changed files with 93 additions and 75 deletions Show diff stats
src/dialogs/settings/clipboard.c
src/dialogs/settings/private.h
src/dialogs/settings/tools.c
src/include/terminal.h
@@ -88,7 +88,7 @@
 		.n_columns = 2,
 		.types = (const GType []) {
 			G_TYPE_STRING,
-			G_TYPE_UINT
+			G_TYPE_STRING
 		}
 	},
@@ -105,7 +105,7 @@
 		.n_columns = 2,
 		.types = (const GType []) {
 			G_TYPE_STRING,
-			G_TYPE_UINT
+			G_TYPE_STRING
 		}
 	},
@@ -122,7 +122,7 @@
 		.n_columns = 2,
 		.types = (const GType []) {
 			G_TYPE_STRING,
-			G_TYPE_UINT
+			G_TYPE_STRING
 		}
 	},
@@ -168,17 +168,8 @@ static void V3270ClipboardSettings_class_init(V3270ClipboardSettingsClass *klass
 static void copy_format_changed(GtkComboBox *widget, GtkWidget *grid) {
-	GtkTreeIter iter;
-
-	if(gtk_combo_box_get_active_iter(widget,&iter)) {
-
-		GValue value = { 0, };
-		gtk_tree_model_get_value(gtk_combo_box_get_model(widget),&iter,1,&value);
-		guint flag = g_value_get_uint(&value);
-		gtk_widget_set_sensitive(grid,flag == 1);
-		g_value_unset(&value);
-
-	}
+	const gchar * active = gtk_combo_box_get_active_id(widget);
+	gtk_widget_set_sensitive(grid,active && *active == '1');
 }
@@ -235,12 +226,14 @@ static void V3270ClipboardSettings_init(V3270ClipboardSettings *widget) {
 		model = GTK_LIST_STORE(gtk_combo_box_get_model(widget->input.combos[1]));
 		for(ix = 0;ix < G_N_ELEMENTS(html_color_options); ix++) {
+			gchar id[] = { '0' + ix, 0 };
+
 			gtk_list_store_append(model, &iter);
 			gtk_list_store_set(
 				model,
 				&iter,
 				0, g_dgettext(PACKAGE_NAME, html_color_options[ix]),
-				1, (guint) ix,
+				1, id,
 				-1
 			);
@@ -276,7 +269,7 @@ static void V3270ClipboardSettings_init(V3270ClipboardSettings *widget) {
 							(GtkListStore *) model,
 							&iter,
 							0, label ? label : group[ix],
-							1, (guint) 99,
+							1, "S",
 							-1
 						);
@@ -296,15 +289,21 @@ static void V3270ClipboardSettings_init(V3270ClipboardSettings *widget) {
 			N_("Complete with terminal attributes")
 		};
+		gtk_combo_box_set_id_column(widget->input.combos[0],1);
+		gtk_combo_box_set_id_column(widget->input.combos[1],1);
+		gtk_combo_box_set_id_column(widget->input.combos[2],1);
+
 		model = GTK_LIST_STORE(gtk_combo_box_get_model(widget->input.combos[2]));
 		for(ix = 0;ix < G_N_ELEMENTS(copy_formats); ix++) {
+			gchar id[] = { '0' + ix, 0 };
+
 			gtk_list_store_append(model, &iter);
 			gtk_list_store_set(
 				model,
 				&iter,
 				0, g_dgettext(PACKAGE_NAME, copy_formats[ix]),
-				1, (guint) ix,
+				1, id,
 				-1
 			);
@@ -347,12 +346,14 @@ static void load(GtkWidget *w, GtkWidget *t) {
 		gtk_list_store_clear(model);
 		for(ix = 0;ix < G_N_ELEMENTS(html_font_options); ix++) {
+			gchar id[] = { '0' + ix, 0 };
+
 			gtk_list_store_append(model, &iter);
 			gtk_list_store_set(
 				model,
 				&iter,
 				0, g_dgettext(PACKAGE_NAME, html_font_options[ix]),
-				1, (guint) ix,
+				1, id,
 				-1
 			);
@@ -371,7 +372,7 @@ static void load(GtkWidget *w, GtkWidget *t) {
 			GtkTreeIter iter;
 			gtk_list_store_append((GtkListStore *) model,&iter);
-			gtk_list_store_set((GtkListStore *) model, &iter,0, name, 1, (guint) 99, -1);
+			gtk_list_store_set((GtkListStore *) model, &iter,0, name, 1, "S", -1);
 		}
@@ -379,15 +380,82 @@ static void load(GtkWidget *w, GtkWidget *t) {
 	}
-	gtk_combo_box_select_column_uint(widget->input.combos[2],1,((terminal->selection.options & V3270_SELECTION_PLAIN_TEXT) ? 0 : 1));
+	debug("Plain text: %s",((terminal->selection.options & V3270_SELECTION_PLAIN_TEXT) ? "0" : "1"));
+	gtk_combo_box_set_active_id(widget->input.combos[2],(terminal->selection.options & (V3270_SELECTION_ENABLE_HTML|V3270_SELECTION_DIALOG_STATE)) == 0 ? "0" : "1");
 }
-static void apply(GtkWidget *w, GtkWidget *terminal) {
+static gchar get_active_id(V3270ClipboardSettings *widget, size_t combo) {
+
+	const gchar * id = gtk_combo_box_get_active_id(widget->input.combos[combo]);
+
+	if(id)
+		return id[0];
+
+	return '?';
+}
+
+static void apply(GtkWidget *w, GtkWidget *t) {
 	V3270ClipboardSettings *widget = (V3270ClipboardSettings *) w;
+	v3270 *terminal = GTK_V3270(t);
+
+	v3270_settings_apply_toggle_buttons(toggles,G_N_ELEMENTS(toggles),t,widget->input.toggles);
+
+	if(gtk_combo_box_get_active_id(widget->input.combos[2])[0] == '0') {
-	v3270_settings_apply_toggle_buttons(toggles,G_N_ELEMENTS(toggles),terminal,widget->input.toggles);
+		terminal->selection.options &= ~(V3270_SELECTION_ENABLE_HTML|V3270_SELECTION_DIALOG_STATE);
+
+	} else {
+
+		terminal->selection.options |= V3270_SELECTION_DIALOG_STATE;
+		terminal->selection.options |= V3270_SELECTION_NON_BREAKABLE_SPACE; // TODO: Use a checkbox to enable-it
+
+		// Get font settings
+		switch(get_active_id(widget,0)) {
+		case '0':
+			// Disable font information
+			debug("%s","Disable font information");
+			terminal->selection.options &= ~V3270_SELECTION_FONT_FAMILY;
+			break;
+
+		case '1':
+			// Use same font of the screen
+			debug("%s","Use same font of the screen");
+			terminal->selection.options |= V3270_SELECTION_FONT_FAMILY;
+			break;
+
+		case 'S':
+			// Use selected font
+			debug("%s","Use selected font");
+			terminal->selection.options |= V3270_SELECTION_FONT_FAMILY;
+			break;
+
+		}
+
+		switch(get_active_id(widget,1)) {
+		case '0':
+
+			// Disable color information
+			debug("%s","Disable color information");
+			terminal->selection.options &= ~V3270_SELECTION_COLORS;
+			break;
+
+		case '1':
+
+			// Use same colors of the screen
+			debug("%s","Use same colors of the screen");
+			terminal->selection.options |= V3270_SELECTION_COLORS;
+			break;
+
+		case 'S':
+			// Use selected color scheme
+			debug("%s","Use selected color scheme");
+			terminal->selection.options |= V3270_SELECTION_COLORS;
+
+		}
+
+	}
 }
@@ -34,8 +34,6 @@
 	#include <lib3270/toggle.h>
 	#include <v3270/settings.h>
-	G_GNUC_INTERNAL void gtk_combo_box_select_column_uint(GtkComboBox * combo_box, gint column, guint value);
-
 	/// @brief Toggle button factory.
 	struct ToggleButtonDefinition {
 		gint left;
@@ -131,54 +131,4 @@
  }
- struct combo_select_uint {
-	GtkComboBox * combo_box;
-	gint column;
-	guint new_value;
- };
-
- static gboolean test_combo_select_uint(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, struct combo_select_uint *arg) {
-
-	// Get value
-	GValue value = { 0, };
-	gtk_tree_model_get_value(model,iter,arg->column,&value);
-	guint row_value = g_value_get_uint(&value);
-	g_value_unset(&value);
-
-	if(row_value == arg->new_value) {
-		gtk_combo_box_set_active_iter(arg->combo_box,iter);
-		return TRUE;
-	}
-
-	return FALSE;
- }
-
- void gtk_combo_box_select_column_uint(GtkComboBox * combo_box, gint column, guint new_value) {
-
-	GtkTreeIter	  iter;
-	GtkListStore * list = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(combo_box)));
-
-	// Is the value already selected?
-	if(gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combo_box),&iter)) {
-
-		GValue value = { 0, };
-		gtk_tree_model_get_value(GTK_TREE_MODEL(list),&iter,column,&value);
-		guint active = g_value_get_uint(&value);
-		g_value_unset(&value);
-
-		if(active == new_value)
-			return;
-
-	}
-
-	// No, it's not, find one.
-	struct combo_select_uint arg = {
-		.combo_box = combo_box,
-		.column = column,
-		.new_value = new_value
-	};
-
-	gtk_tree_model_foreach(GTK_TREE_MODEL(list),(GtkTreeModelForeachFunc) test_combo_select_uint, &arg);
- }
-
@@ -124,10 +124,12 @@ G_BEGIN_DECLS
  	V3270_SELECTION_FONT_FAMILY			= 0x0001,	///< @brief Inform font-family.
  	V3270_SELECTION_COLORS				= 0x0002,	///< @brief Inform terminal colors.
  	V3270_SELECTION_NON_BREAKABLE_SPACE	= 0x0004,	///< @brief Use non breakable spaces.
+ 	V3270_SELECTION_DIALOG_STATE		= 0x0010,	///< @brief Used for settings dialog.
  } V3270SelectionOption;
- #define V3270_SELECTION_DEFAULT (V3270_SELECTION_FONT_FAMILY|V3270_SELECTION_COLORS|V3270_SELECTION_NON_BREAKABLE_SPACE)
+ #define V3270_SELECTION_DEFAULT		(V3270_SELECTION_FONT_FAMILY|V3270_SELECTION_COLORS|V3270_SELECTION_NON_BREAKABLE_SPACE)
+ #define V3270_SELECTION_ENABLE_HTML	(V3270_SELECTION_FONT_FAMILY|V3270_SELECTION_COLORS|V3270_SELECTION_NON_BREAKABLE_SPACE)
 /*--[ Globals ]--------------------------------------------------------------------------------------*/
	@@ -131,54 +131,4 @@		@@ -131,54 +131,4 @@
131		131
132	}	132	}
133		133
134	- struct combo_select_uint {
135	- GtkComboBox * combo_box;
136	- gint column;
137	- guint new_value;
138	- };
139	-
140	- static gboolean test_combo_select_uint(GtkTreeModel model, GtkTreePath path, GtkTreeIter iter, struct combo_select_uint arg) {
141	-
142	- // Get value
143	- GValue value = { 0, };
144	- gtk_tree_model_get_value(model,iter,arg->column,&value);
145	- guint row_value = g_value_get_uint(&value);
146	- g_value_unset(&value);
147	-
148	- if(row_value == arg->new_value) {
149	- gtk_combo_box_set_active_iter(arg->combo_box,iter);
150	- return TRUE;
151	- }
152	-
153	- return FALSE;
154	- }
155	-
156	- void gtk_combo_box_select_column_uint(GtkComboBox * combo_box, gint column, guint new_value) {
157	-
158	- GtkTreeIter iter;
159	- GtkListStore * list = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(combo_box)));
160	-
161	- // Is the value already selected?
162	- if(gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combo_box),&iter)) {
163	-
164	- GValue value = { 0, };
165	- gtk_tree_model_get_value(GTK_TREE_MODEL(list),&iter,column,&value);
166	- guint active = g_value_get_uint(&value);
167	- g_value_unset(&value);
168	-
169	- if(active == new_value)
170	- return;
171	-
172	- }
173	-
174	- // No, it's not, find one.
175	- struct combo_select_uint arg = {
176	- .combo_box = combo_box,
177	- .column = column,
178	- .new_value = new_value
179	- };
180	-
181	- gtk_tree_model_foreach(GTK_TREE_MODEL(list),(GtkTreeModelForeachFunc) test_combo_select_uint, &arg);
182	- }
183	-
184		134