Commit cdf52b6cba6a914a27669b97373a9aeaa952f30d
1 parent
27bc20aa
Exists in
master
and in
1 other branch
Implementing cut&paste settings dialog.
Showing
1 changed file
with
46 additions
and
4 deletions
Show diff stats
src/dialogs/settings/clipboard.c
@@ -101,9 +101,10 @@ | @@ -101,9 +101,10 @@ | ||
101 | .label = N_("Color theme"), | 101 | .label = N_("Color theme"), |
102 | // .tooltip = | 102 | // .tooltip = |
103 | 103 | ||
104 | - .n_columns = 1, | 104 | + .n_columns = 2, |
105 | .types = (const GType []) { | 105 | .types = (const GType []) { |
106 | - G_TYPE_STRING | 106 | + G_TYPE_STRING, |
107 | + G_TYPE_UINT | ||
107 | } | 108 | } |
108 | 109 | ||
109 | }, | 110 | }, |
@@ -173,8 +174,8 @@ static void V3270ClipboardSettings_init(V3270ClipboardSettings *widget) { | @@ -173,8 +174,8 @@ static void V3270ClipboardSettings_init(V3270ClipboardSettings *widget) { | ||
173 | { | 174 | { |
174 | static const gchar * labels[GRID_COUNT] = { | 175 | static const gchar * labels[GRID_COUNT] = { |
175 | N_("Copy options"), | 176 | N_("Copy options"), |
176 | - N_("Common paste options"), | ||
177 | - N_("HTML Paste options") | 177 | + N_("Paste options"), |
178 | + N_("HTML options") | ||
178 | }; | 179 | }; |
179 | 180 | ||
180 | for(ix = 0; ix < G_N_ELEMENTS(labels); ix++) { | 181 | for(ix = 0; ix < G_N_ELEMENTS(labels); ix++) { |
@@ -208,6 +209,46 @@ static void V3270ClipboardSettings_init(V3270ClipboardSettings *widget) { | @@ -208,6 +209,46 @@ static void V3270ClipboardSettings_init(V3270ClipboardSettings *widget) { | ||
208 | gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(widget->input.combos[ix]), text_renderer, "text", 0, NULL); | 209 | gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(widget->input.combos[ix]), text_renderer, "text", 0, NULL); |
209 | } | 210 | } |
210 | 211 | ||
212 | + // HTML Font combo | ||
213 | + static const gchar * html_font_options[] = { | ||
214 | + N_("None (Don't export font name)"), | ||
215 | + N_("Same of the screen") | ||
216 | + }; | ||
217 | + | ||
218 | + model = GTK_LIST_STORE(gtk_combo_box_get_model(widget->input.combos[0])); | ||
219 | + for(ix = 0;ix < G_N_ELEMENTS(html_font_options); ix++) { | ||
220 | + | ||
221 | + gtk_list_store_append(model, &iter); | ||
222 | + gtk_list_store_set( | ||
223 | + model, | ||
224 | + &iter, | ||
225 | + 0, g_dgettext(PACKAGE_NAME, html_font_options[ix]), | ||
226 | + 1, (guint) ix, | ||
227 | + -1 | ||
228 | + ); | ||
229 | + | ||
230 | + } | ||
231 | + | ||
232 | + // Color scheme combo | ||
233 | + static const gchar * html_color_options[] = { | ||
234 | + N_("None (Don't export color)"), | ||
235 | + N_("Same of the screen") | ||
236 | + }; | ||
237 | + | ||
238 | + model = GTK_LIST_STORE(gtk_combo_box_get_model(widget->input.combos[1])); | ||
239 | + for(ix = 0;ix < G_N_ELEMENTS(html_color_options); ix++) { | ||
240 | + | ||
241 | + gtk_list_store_append(model, &iter); | ||
242 | + gtk_list_store_set( | ||
243 | + model, | ||
244 | + &iter, | ||
245 | + 0, g_dgettext(PACKAGE_NAME, html_color_options[ix]), | ||
246 | + 1, (guint) ix, | ||
247 | + -1 | ||
248 | + ); | ||
249 | + | ||
250 | + } | ||
251 | + | ||
211 | // Copy format combo | 252 | // Copy format combo |
212 | static const gchar * copy_formats[] = { | 253 | static const gchar * copy_formats[] = { |
213 | N_("Plain text only"), | 254 | N_("Plain text only"), |
@@ -229,6 +270,7 @@ static void V3270ClipboardSettings_init(V3270ClipboardSettings *widget) { | @@ -229,6 +270,7 @@ static void V3270ClipboardSettings_init(V3270ClipboardSettings *widget) { | ||
229 | } | 270 | } |
230 | 271 | ||
231 | 272 | ||
273 | + | ||
232 | } | 274 | } |
233 | 275 | ||
234 | } | 276 | } |