Download as
Browse Code »

Commit 50630fd5b33c1ed63499e68ec3bc6f0518f7fd9c

Authored by Perry Werneck
1 parent 95c70d24
Exists in master and in 1 other branch develop

Fixing RHEL 7 build.

Showing 1 changed file with 31 additions and 2 deletions   Show diff stats
src/dialogs/settingsdialog.c
  Diff comments   View file @50630fd
@@ -328,17 +328,25 @@ static void V3270FTSettingsDialog_init(V3270FTSettingsDialog *widget) @@ -328,17 +328,25 @@ static void V3270FTSettingsDialog_init(V3270FTSettingsDialog *widget)
328 328
329 // Create Transfer queue buttons 329 // Create Transfer queue buttons
330 { 330 {
  331 +#if GTK_CHECK_VERSION(3,10,0)
331 // https://specifications.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html 332 // https://specifications.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
332 widget->queue.load = gtk_button_new_from_icon_name("document-open",GTK_ICON_SIZE_SMALL_TOOLBAR); 333 widget->queue.load = gtk_button_new_from_icon_name("document-open",GTK_ICON_SIZE_SMALL_TOOLBAR);
  334 + widget->queue.save = gtk_button_new_from_icon_name("document-save",GTK_ICON_SIZE_SMALL_TOOLBAR);
  335 + widget->queue.saveAs = gtk_button_new_from_icon_name("document-save-as",GTK_ICON_SIZE_SMALL_TOOLBAR);
  336 +#else
  337 + // https://specifications.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
  338 + widget->queue.load = gtk_button_new_from_stock(GTK_STOCK_OPEN,GTK_ICON_SIZE_SMALL_TOOLBAR);
  339 + widget->queue.save = gtk_button_new_from_stock(GTK_STOCK_SAVE,GTK_ICON_SIZE_SMALL_TOOLBAR);
  340 + widget->queue.saveAs = gtk_button_new_from_stock(GTK_STOCK_SAVE_AS,GTK_ICON_SIZE_SMALL_TOOLBAR);
  341 +#endif // GTK_CHECK_VERSION
  342 +
333 gtk_widget_set_tooltip_markup(widget->queue.load,_("Get transfer queue from file")); 343 gtk_widget_set_tooltip_markup(widget->queue.load,_("Get transfer queue from file"));
334 g_signal_connect(widget->queue.load,"clicked",G_CALLBACK(load_queue_clicked),widget); 344 g_signal_connect(widget->queue.load,"clicked",G_CALLBACK(load_queue_clicked),widget);
335 345
336 - widget->queue.save = gtk_button_new_from_icon_name("document-save",GTK_ICON_SIZE_SMALL_TOOLBAR);  
337 gtk_widget_set_tooltip_markup(widget->queue.save,_("Save transfer queue")); 346 gtk_widget_set_tooltip_markup(widget->queue.save,_("Save transfer queue"));
338 g_signal_connect(widget->queue.save,"clicked",G_CALLBACK(save_queue_clicked),widget); 347 g_signal_connect(widget->queue.save,"clicked",G_CALLBACK(save_queue_clicked),widget);
339 gtk_widget_set_sensitive(widget->queue.save,FALSE); 348 gtk_widget_set_sensitive(widget->queue.save,FALSE);
340 349
341 - widget->queue.saveAs = gtk_button_new_from_icon_name("document-save-as",GTK_ICON_SIZE_SMALL_TOOLBAR);  
342 gtk_widget_set_tooltip_markup(widget->queue.saveAs,_("Save transfer queue to file")); 350 gtk_widget_set_tooltip_markup(widget->queue.saveAs,_("Save transfer queue to file"));
343 g_signal_connect(widget->queue.saveAs,"clicked",G_CALLBACK(save_queue_as_clicked),widget); 351 g_signal_connect(widget->queue.saveAs,"clicked",G_CALLBACK(save_queue_as_clicked),widget);
344 352
@@ -360,6 +368,7 @@ static void V3270FTSettingsDialog_init(V3270FTSettingsDialog *widget) @@ -360,6 +368,7 @@ static void V3270FTSettingsDialog_init(V3270FTSettingsDialog *widget)
360 gtk_widget_set_vexpand(scrolled,TRUE); 368 gtk_widget_set_vexpand(scrolled,TRUE);
361 gtk_widget_set_hexpand(scrolled,TRUE); 369 gtk_widget_set_hexpand(scrolled,TRUE);
362 370
  371 +#if GTK_CHECK_VERSION(3,12,0)
363 if(header) 372 if(header)
364 { 373 {
365 debug("Dialog %s header bar","have"); 374 debug("Dialog %s header bar","have");
@@ -368,6 +377,7 @@ static void V3270FTSettingsDialog_init(V3270FTSettingsDialog *widget) @@ -368,6 +377,7 @@ static void V3270FTSettingsDialog_init(V3270FTSettingsDialog *widget)
368 gtk_box_pack_start(GTK_BOX(container),frame,TRUE,TRUE,0); 377 gtk_box_pack_start(GTK_BOX(container),frame,TRUE,TRUE,0);
369 378
370 widget->button.begin = gtk_button_new_from_icon_name("network-transmit",GTK_ICON_SIZE_SMALL_TOOLBAR); 379 widget->button.begin = gtk_button_new_from_icon_name("network-transmit",GTK_ICON_SIZE_SMALL_TOOLBAR);
  380 +
371 g_object_set(G_OBJECT(widget->button.begin),"margin-end",12,NULL); 381 g_object_set(G_OBJECT(widget->button.begin),"margin-end",12,NULL);
372 g_signal_connect(widget->button.begin,"clicked",G_CALLBACK(begin_clicked),widget); 382 g_signal_connect(widget->button.begin,"clicked",G_CALLBACK(begin_clicked),widget);
373 383
@@ -398,6 +408,25 @@ static void V3270FTSettingsDialog_init(V3270FTSettingsDialog *widget) @@ -398,6 +408,25 @@ static void V3270FTSettingsDialog_init(V3270FTSettingsDialog *widget)
398 widget->button.begin = gtk_dialog_add_button(GTK_DIALOG (widget),_("B_egin transfer"),GTK_RESPONSE_ACCEPT); 408 widget->button.begin = gtk_dialog_add_button(GTK_DIALOG (widget),_("B_egin transfer"),GTK_RESPONSE_ACCEPT);
399 409
400 } 410 }
  411 +#else
  412 +
  413 + GtkWidget * hBox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,6);
  414 + GtkWidget * frame = v3270_dialog_create_frame(hBox,_("Transfer queue"));
  415 + gtk_box_pack_start(GTK_BOX(container),frame,TRUE,TRUE,0);
  416 +
  417 + GtkBox * box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL,6));
  418 + gtk_box_pack_start(GTK_BOX(hBox),GTK_WIDGET(box),FALSE,FALSE,0);
  419 +
  420 + gtk_box_pack_start(box,widget->queue.load,FALSE,FALSE,0);
  421 + gtk_box_pack_start(box,widget->queue.save,FALSE,FALSE,0);
  422 + gtk_box_pack_start(box,widget->queue.saveAs,FALSE,FALSE,0);
  423 +
  424 + gtk_box_pack_start(GTK_BOX(hBox),GTK_WIDGET(scrolled),TRUE,TRUE,0);
  425 +
  426 + gtk_dialog_add_button(GTK_DIALOG (widget),_("_Cancel"),GTK_RESPONSE_CANCEL);
  427 + widget->button.begin = gtk_dialog_add_button(GTK_DIALOG (widget),_("B_egin transfer"),GTK_RESPONSE_ACCEPT);
  428 +
  429 +#endif // GTK_CHECK_VERSION(3,12,0)
401 430
402 // gtk_widget_set_sensitive(widget->button.begin,FALSE); 431 // gtk_widget_set_sensitive(widget->button.begin,FALSE);
403 gtk_widget_set_tooltip_markup(widget->button.begin,_("Start transfer")); 432 gtk_widget_set_tooltip_markup(widget->button.begin,_("Start transfer"));