Download as
Browse Code »

Commit 3d1738f196afec00469ff6c3d00da3936e1e4092

Authored by Perry Werneck
1 parent 007c44c5
Exists in master and in 1 other branch develop

Adjusting settings dialogs.

Showing 2 changed files with 7 additions and 4 deletions   Show diff stats
src/dialogs/font/chooser.c
  Diff comments   View file @3d1738f
@@ -228,7 +228,7 @@ @@ -228,7 +228,7 @@
228 228
229 for(ix = 0; ix < G_N_ELEMENTS(colors); ix++) { 229 for(ix = 0; ix < G_N_ELEMENTS(colors); ix++) {
230 230
231 - cairo_move_to(cr,0,row); 231 + cairo_move_to(cr,6,row);
232 gdk_cairo_set_source_rgba(cr,terminal->color+colors[ix]); 232 gdk_cairo_set_source_rgba(cr,terminal->color+colors[ix]);
233 cairo_show_text(cr,pango_language_get_sample_string(NULL)); 233 cairo_show_text(cr,pango_language_get_sample_string(NULL));
234 234
@@ -258,7 +258,6 @@ static void V3270FontChooserWidget_init(V3270FontChooserWidget *widget) @@ -258,7 +258,6 @@ static void V3270FontChooserWidget_init(V3270FontChooserWidget *widget)
258 widget->font.weight = CAIRO_FONT_WEIGHT_NORMAL; 258 widget->font.weight = CAIRO_FONT_WEIGHT_NORMAL;
259 259
260 gtk_widget_set_size_request(GTK_WIDGET(widget),-1,136); 260 gtk_widget_set_size_request(GTK_WIDGET(widget),-1,136);
261 - gtk_grid_set_row_homogeneous(GTK_GRID(widget),FALSE);  
262 261
263 // Create font list view 262 // Create font list view
264 { 263 {
@@ -297,6 +296,8 @@ static void V3270FontChooserWidget_init(V3270FontChooserWidget *widget) @@ -297,6 +296,8 @@ static void V3270FontChooserWidget_init(V3270FontChooserWidget *widget)
297 gtk_widget_set_hexpand(frame,TRUE); 296 gtk_widget_set_hexpand(frame,TRUE);
298 297
299 widget->preview = gtk_drawing_area_new(); 298 widget->preview = gtk_drawing_area_new();
  299 +
  300 + gtk_widget_set_margin_start(widget->preview,8);
300 gtk_widget_set_vexpand(widget->preview,TRUE); 301 gtk_widget_set_vexpand(widget->preview,TRUE);
301 gtk_widget_set_hexpand(widget->preview,TRUE); 302 gtk_widget_set_hexpand(widget->preview,TRUE);
302 303
@@ -312,10 +313,12 @@ static void V3270FontChooserWidget_init(V3270FontChooserWidget *widget) @@ -312,10 +313,12 @@ static void V3270FontChooserWidget_init(V3270FontChooserWidget *widget)
312 // Add font-weight button 313 // Add font-weight button
313 { 314 {
314 widget->bold = GTK_TOGGLE_BUTTON(gtk_check_button_new_with_label(_("Bold"))); 315 widget->bold = GTK_TOGGLE_BUTTON(gtk_check_button_new_with_label(_("Bold")));
315 - gtk_grid_attach(GTK_GRID(widget),GTK_WIDGET(widget->bold),1,3,1,1); 316 + gtk_grid_attach(GTK_GRID(widget),GTK_WIDGET(widget->bold),1,3,5,1);
316 g_signal_connect(G_OBJECT(widget->bold),"toggled",G_CALLBACK(bold_toggled),widget); 317 g_signal_connect(G_OBJECT(widget->bold),"toggled",G_CALLBACK(bold_toggled),widget);
317 } 318 }
318 319
  320 + gtk_widget_show_all(GTK_WIDGET(widget));
  321 +
319 } 322 }
320 323
321 GtkWidget * v3270_font_chooser_widget_new() 324 GtkWidget * v3270_font_chooser_widget_new()
src/dialogs/settings.c
  Diff comments   View file @3d1738f
@@ -194,7 +194,7 @@ LIB3270_EXPORT void v3270_settings_set_terminal_widget(GtkWidget *widget, GtkWid @@ -194,7 +194,7 @@ LIB3270_EXPORT void v3270_settings_set_terminal_widget(GtkWidget *widget, GtkWid
194 18 194 18
195 ); 195 );
196 196
197 - gtk_box_pack_start(GTK_BOX(content_area),settings,FALSE,FALSE,2); 197 + gtk_box_pack_start(GTK_BOX(content_area),settings,TRUE,TRUE,2);
198 v3270_settings_set_terminal_widget(settings,terminal); 198 v3270_settings_set_terminal_widget(settings,terminal);
199 199
200 g_signal_connect(G_OBJECT(dialog),"response",G_CALLBACK(v3270_settings_on_dialog_response),settings); 200 g_signal_connect(G_OBJECT(dialog),"response",G_CALLBACK(v3270_settings_on_dialog_response),settings);