Commit 5454f9f526b92fdea785b6e5fcfeb5e0eb9bd8f1
1 parent
bb4db7b6
Exists in
master
and in
1 other branch
Updating old (V5.1) transfer dialogs to follow gnome visual layout.
Showing
2 changed files
with
17 additions
and
11 deletions
Show diff stats
src/filetransfer/tables.c
| ... | ... | @@ -154,7 +154,7 @@ const struct v3270ft_value ft_value[] = { |
| 154 | 154 | // LIB3270_FT_VALUE_LRECL |
| 155 | 155 | "lrecl", |
| 156 | 156 | 0, 32760, |
| 157 | - N_( "Record Length:" ), | |
| 157 | + N_( "Record Length" ), | |
| 158 | 158 | N_( "Specifies the logical record length (n) for a data set consisting of fixed length records or the maximum logical record length for a data set consisting of variable length records." ) |
| 159 | 159 | }, |
| 160 | 160 | |
| ... | ... | @@ -163,7 +163,7 @@ const struct v3270ft_value ft_value[] = { |
| 163 | 163 | // LIB3270_FT_VALUE_BLKSIZE |
| 164 | 164 | "blksize", |
| 165 | 165 | 0,32760, |
| 166 | - N_( "Block size:" ), | |
| 166 | + N_( "Block size" ), | |
| 167 | 167 | N_( "Specifies the block size (n) for a new data set. For data sets containing fixed " \ |
| 168 | 168 | "length records, the block size must be a multiple of the record length. " \ |
| 169 | 169 | "For data sets containing variable length records, the block size must be " \ |
| ... | ... | @@ -175,7 +175,7 @@ const struct v3270ft_value ft_value[] = { |
| 175 | 175 | // LIB3270_FT_VALUE_PRIMSPACE |
| 176 | 176 | "primary", |
| 177 | 177 | 0,99999, |
| 178 | - N_( "Primary space:" ), | |
| 178 | + N_( "Primary space" ), | |
| 179 | 179 | N_( "Primary allocation for a file created on a TSO host.\nThe units are given by the space allocation units option." ) |
| 180 | 180 | }, |
| 181 | 181 | |
| ... | ... | @@ -183,7 +183,7 @@ const struct v3270ft_value ft_value[] = { |
| 183 | 183 | // LIB3270_FT_VALUE_SECSPACE |
| 184 | 184 | "secondary", |
| 185 | 185 | 0,99999, |
| 186 | - N_( "Secondary space:" ), | |
| 186 | + N_( "Secondary space" ), | |
| 187 | 187 | N_( "Secondary allocation for a file created on a TSO host.\nThe units are given by the space allocation units option." ) |
| 188 | 188 | }, |
| 189 | 189 | |
| ... | ... | @@ -191,7 +191,7 @@ const struct v3270ft_value ft_value[] = { |
| 191 | 191 | // LIB3270_FT_VALUE_DFT |
| 192 | 192 | "dft", |
| 193 | 193 | 0,99999, |
| 194 | - N_( "DFT B_uffer size:" ), | |
| 194 | + N_( "DFT B_uffer size" ), | |
| 195 | 195 | N_("Specifies the default buffer size for DFT IND$FILE file transfers.") |
| 196 | 196 | }, |
| 197 | 197 | ... | ... |
src/filetransfer/v3270ft.c
| ... | ... | @@ -335,9 +335,9 @@ static void drag_data_received(GtkWidget *widget, GdkDragContext *context, G_GNU |
| 335 | 335 | static void v3270ft_init(v3270ft *dialog) { |
| 336 | 336 | |
| 337 | 337 | static const gchar * label[] = { |
| 338 | - N_( "_Operation:" ), | |
| 339 | - N_( "_Local file:"), | |
| 340 | - N_( "_Remote file:") | |
| 338 | + N_( "_Operation" ), | |
| 339 | + N_( "_Local file"), | |
| 340 | + N_( "_Remote file") | |
| 341 | 341 | }; |
| 342 | 342 | |
| 343 | 343 | static const gchar * frame[] = { |
| ... | ... | @@ -531,6 +531,7 @@ static void v3270ft_init(v3270ft *dialog) { |
| 531 | 531 | |
| 532 | 532 | // Top level |
| 533 | 533 | grid = v3270ft_new_grid(); |
| 534 | + | |
| 534 | 535 | gtk_box_pack_start(box,GTK_WIDGET(grid),TRUE,TRUE,2); |
| 535 | 536 | |
| 536 | 537 | // Transfer type combo |
| ... | ... | @@ -595,7 +596,7 @@ static void v3270ft_init(v3270ft *dialog) { |
| 595 | 596 | |
| 596 | 597 | for(f=0;f< (int) G_N_ELEMENTS(label);f++) { |
| 597 | 598 | GtkWidget * widget = gtk_label_new_with_mnemonic(gettext(label[f])); |
| 598 | - gtk_widget_set_halign(widget,GTK_ALIGN_START); | |
| 599 | + gtk_widget_set_halign(widget,GTK_ALIGN_END); | |
| 599 | 600 | gtk_widget_set_valign(widget,GTK_ALIGN_CENTER); |
| 600 | 601 | gtk_grid_attach(grid,GTK_WIDGET(widget),0,f,1,1); |
| 601 | 602 | gtk_label_set_mnemonic_widget(GTK_LABEL(widget),entry[f]); |
| ... | ... | @@ -603,6 +604,8 @@ static void v3270ft_init(v3270ft *dialog) { |
| 603 | 604 | |
| 604 | 605 | // Transfer options |
| 605 | 606 | widget = gtk_frame_new(gettext(frame[0])); |
| 607 | + g_object_set(G_OBJECT(widget),"margin-top",18,NULL); | |
| 608 | + | |
| 606 | 609 | grid = v3270ft_new_grid(); |
| 607 | 610 | gtk_grid_set_column_homogeneous(grid,TRUE); |
| 608 | 611 | gtk_container_add(GTK_CONTAINER(widget),GTK_WIDGET(grid)); |
| ... | ... | @@ -619,8 +622,9 @@ static void v3270ft_init(v3270ft *dialog) { |
| 619 | 622 | |
| 620 | 623 | // Formats |
| 621 | 624 | grid = v3270ft_new_grid(); |
| 625 | + g_object_set(G_OBJECT(grid),"margin-top",18,NULL); | |
| 622 | 626 | gtk_grid_set_column_homogeneous(grid,TRUE); |
| 623 | - gtk_box_pack_start(box,GTK_WIDGET(grid),FALSE,TRUE,2); | |
| 627 | + gtk_box_pack_start(box,GTK_WIDGET(grid),FALSE,TRUE,0); | |
| 624 | 628 | |
| 625 | 629 | // Record & Space allocation |
| 626 | 630 | for(f=0;f<2;f++) { |
| ... | ... | @@ -629,6 +633,7 @@ static void v3270ft_init(v3270ft *dialog) { |
| 629 | 633 | GSList * group = NULL; |
| 630 | 634 | |
| 631 | 635 | dialog->radio[f] = gtk_frame_new(gettext(frame[f+1])); |
| 636 | + | |
| 632 | 637 | gtk_container_add(GTK_CONTAINER(dialog->radio[f]),GTK_WIDGET(box)); |
| 633 | 638 | gtk_container_add(GTK_CONTAINER(grid),dialog->radio[f]); |
| 634 | 639 | |
| ... | ... | @@ -649,13 +654,14 @@ static void v3270ft_init(v3270ft *dialog) { |
| 649 | 654 | |
| 650 | 655 | // Values |
| 651 | 656 | grid = v3270ft_new_grid(); |
| 657 | + g_object_set(G_OBJECT(grid),"margin-top",18,NULL); | |
| 652 | 658 | gtk_grid_set_column_homogeneous(grid,TRUE); |
| 653 | 659 | gtk_box_pack_start(box,GTK_WIDGET(grid),FALSE,TRUE,2); |
| 654 | 660 | |
| 655 | 661 | for(f=0;f < LIB3270_FT_VALUE_COUNT;f++) { |
| 656 | 662 | |
| 657 | 663 | GtkWidget * label = gtk_label_new_with_mnemonic(gettext(ft_value[f].label)); |
| 658 | - gtk_widget_set_halign(label,GTK_ALIGN_START); | |
| 664 | + gtk_widget_set_halign(label,GTK_ALIGN_END); | |
| 659 | 665 | gtk_widget_set_valign(label,GTK_ALIGN_CENTER); |
| 660 | 666 | |
| 661 | 667 | widget = gtk_spin_button_new_with_range(ft_value[f].minval,ft_value[f].maxval,1); | ... | ... |