Adjustments in the settings dialogs.

Perry Werneck
1 parent 42b4cc3f
Showing 7 changed files with 34 additions and 8 deletions Show diff stats
src/dialogs/settings/clipboard.c
src/dialogs/settings/host.c
src/include/terminal.h
src/selection/selection.c
src/terminal/keyfile.c
src/terminal/widget.c
src/terminal/windows/registry.c
@@ -300,6 +300,7 @@ static void V3270ClipboardSettings_init(V3270ClipboardSettings *widget) {
 		}
 		// Load color schemes
+#ifdef DEBUG
 		{
 			lib3270_autoptr(char) filename = lib3270_build_data_filename("colors.conf",NULL);
 			if(g_file_test(filename,G_FILE_TEST_IS_REGULAR)) {
@@ -342,6 +343,7 @@ static void V3270ClipboardSettings_init(V3270ClipboardSettings *widget) {
 				g_key_file_free(keyfile);
 			}
 		}
+#endif // DEBUG
 		// Copy format combo
 		static const gchar * copy_formats[] = {
@@ -485,10 +487,6 @@ static void load(GtkWidget *w, GtkWidget *t) {
 	}
-#ifndef DEBUG
-	gtk_widget_set_sensitive(GTK_WIDGET(widget->input.combos[1]),FALSE);
-#endif // DEBUG
-
 }
 static gchar get_active_id(V3270ClipboardSettings *widget, size_t combo) {
@@ -75,18 +75,20 @@
  	{
  		.left = 6,
  		.top = 1,
- 		.width = 1,
+ 		.width = 2,
  		.grid = EMULATION,
 		.id = LIB3270_TOGGLE_ALTSCREEN,
  	},
+ 	/*
  	{
- 		.left = 7,
- 		.top = 1,
+ 		.left = 1,
+ 		.top = 3,
  		.width = 1,
  		.grid = EMULATION,
 		.id = LIB3270_TOGGLE_MONOCASE,
  	},
+ 	*/
  };
@@ -174,6 +174,7 @@ G_BEGIN_DECLS
 		struct {
 			gchar * scheme;						///< @brief Name of the selection color scheme
+			gchar * value;						///< @brief List of colors for selection.
 		} color;
 	} selection;
@@ -163,11 +163,16 @@ void v3270_selection_set_color_scheme(GtkWidget *widget, const gchar *name) {
 	v3270 * terminal = GTK_V3270(widget);
-	if(terminal->selection.font_family) {
+	if(terminal->selection.color.scheme) {
 		g_free(terminal->selection.color.scheme);
 		terminal->selection.color.scheme = NULL;
 	}
+	if(terminal->selection.color.scheme) {
+		g_free(terminal->selection.color.value);
+		terminal->selection.color.value = NULL;
+	}
+
 	if(name) {
 		terminal->selection.color.scheme = g_strdup(name);
 	}
@@ -302,6 +302,7 @@
 	// Save internal properties
 	save_string(key_file, group_name, "selection-font-family", terminal->selection.font_family);
+	save_string(key_file, group_name, "selection-color-scheme", terminal->selection.color.scheme);
 	// Save Toggles
 	for(ix = 0; ix < G_N_ELEMENTS(klass->properties.toggle); ix++)
@@ -335,6 +336,12 @@
 	// Load internal properties.
 	load_string(key_file, group_name, "selection-font-family", &terminal->selection.font_family);
+	load_string(key_file, group_name, "selection-color-scheme", &terminal->selection.color.scheme);
+
+	if(terminal->selection.color.value) {
+		g_free(terminal->selection.color.value);
+		terminal->selection.color.value = NULL;
+	}
 	// Load session_name
 	if(g_key_file_has_key(key_file,group_name,"session-name",NULL)) {
@@ -193,6 +193,11 @@ static void finalize(GObject *object) {
 		terminal->selection.color.scheme = NULL;
 	}
+	if(terminal->selection.color.value) {
+		g_free(terminal->selection.color.value);
+		terminal->selection.color.value = NULL;
+	}
+
 	G_OBJECT_CLASS(v3270_parent_class)->finalize(object);
  }
@@ -257,6 +257,7 @@
 	// Save internal properties
 	save_string(hKey, "selection-font-family", terminal->selection.font_family);
+	save_string(hKey, "selection-color-scheme", &terminal->selection.color.scheme);
 	// Save Toggles
 	for(ix = 0; ix < G_N_ELEMENTS(klass->properties.toggle); ix++)
@@ -315,6 +316,13 @@
  	// Load internal properties.
 	load_string(hKey, "selection-font-family", &terminal->selection.font_family);
+	load_string(hKey, "selection-color-scheme", &terminal->selection.color.scheme);
+
+	if(terminal->selection.color.value) {
+		g_free(terminal->selection.color.value);
+		terminal->selection.color.value = NULL;
+	}
+
 	// Load Toggles
 	for(ix = 0; ix < G_N_ELEMENTS(klass->properties.toggle); ix++)
	@@ -174,6 +174,7 @@ G_BEGIN_DECLS		@@ -174,6 +174,7 @@ G_BEGIN_DECLS
174		174
175	struct {	175	struct {
176	gchar * scheme; ///< @brief Name of the selection color scheme	176	gchar * scheme; ///< @brief Name of the selection color scheme
		177	+ gchar * value; ///< @brief List of colors for selection.
177	} color;	178	} color;
178		179
179	} selection;	180	} selection;