Download as
Browse Code »

Commit 7443b5e655b83bcf8710f3d2109584a27a3b3e38

Authored by perry.werneck@gmail.com
1 parent 8c109bbc
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Restaurando dialogo de transferencia de arquivo

Showing 1 changed file with 13 additions and 104 deletions   Show diff stats
src/pw3270/filetransfer.c
  Diff comments   View file @7443b5e
... ... @@ -177,11 +177,7 @@ static void check_entry(GtkEditable *editable, struct ftdialog *dlg)
177 177 gtk_widget_set_sensitive(dlg->ready,is_dialog_ok(editable,dlg));
178 178 }
179 179  
180   -#if GTK_CHECK_VERSION(3,0,0)
181   -static GtkEntry * add_filename_entry(GObject *action, int ix, int row, struct ftdialog *dlg, GtkGrid *grid)
182   -#else
183 180 static GtkEntry * add_filename_entry(GObject *action, int ix, int row, struct ftdialog *dlg, GtkTable *table)
184   -#endif // GTK_CHECK_VERSION
185 181 {
186 182 static const gchar * label_text[] = { N_( "_Local file name:" ), N_( "_Host file name:" ) };
187 183 static const gchar * attr[] = { "local", "remote" };
... ... @@ -191,93 +187,52 @@ static GtkEntry * add_filename_entry(GObject *action, int ix, int row, struct ft
191 187 gchar * val;
192 188  
193 189 gtk_misc_set_alignment(GTK_MISC(label),0,.5);
194   -
195   -#if GTK_CHECK_VERSION(3,0,0)
196   - gtk_grid_attach(grid,label,0,row,1,1);
197   -#else
198 190 gtk_table_attach(GTK_TABLE(table),label,0,1,row,row+1,GTK_FILL,GTK_FILL,2,2);
199   -#endif // GTK_CHECK_VERSION
200 191  
201 192 gtk_widget_set_name(entry,attr[ix]);
202 193  
203 194 val = get_attribute(action,dlg,attr[ix]);
204   - gtk_entry_set_text(GTK_ENTRY(entry),val);
  195 + gtk_entry_set_text(dlg->file[ix],val);
205 196 g_free(val);
206 197  
207 198 gtk_entry_set_width_chars(GTK_ENTRY(entry),40);
208 199  
209 200 gtk_label_set_mnemonic_widget(GTK_LABEL(label),entry);
210 201  
211   -#if GTK_CHECK_VERSION(3,0,0)
212   - gtk_grid_attach(grid,entry,1,row,1,1);
213   -#else
214 202 gtk_table_attach(GTK_TABLE(table),entry,1,3,row,row+1,GTK_EXPAND|GTK_SHRINK|GTK_FILL,GTK_EXPAND|GTK_SHRINK|GTK_FILL,2,2);
215   -#endif // GTK_CHECK_VERSION
216 203  
217 204 return GTK_ENTRY(entry);
218 205 }
219 206  
220 207 static void add_file_fields(GObject *action, struct ftdialog *dlg)
221 208 {
222   - GtkWidget * widget;
223   -
224   -#if GTK_CHECK_VERSION(3,0,0)
225   - GtkGrid * grid = GTK_GRID(gtk_grid_new());
226   -
227   - gtk_container_set_border_width(GTK_CONTAINER(grid),2);
228   - gtk_grid_set_column_spacing(grid,5);
229   - gtk_grid_set_row_spacing(grid,3);
230   -
231   -#else
232   -
233 209 GtkTable * table = GTK_TABLE(gtk_table_new(2,3,FALSE));
  210 + GtkWidget * widget;
234 211  
235 212 gtk_container_set_border_width(GTK_CONTAINER(table),2);
236 213  
237   -#endif // GTK_CHECK_VERSION
238   -
239   -
240 214 if(dlg->option&LIB3270_FT_OPTION_RECEIVE)
241 215 {
242 216 // Receiving file, first the remote filename
243   - widget = gtk_button_new_with_mnemonic( _( "_Browse" ) );
244   -
245   -#if GTK_CHECK_VERSION(3,0,0)
246   - dlg->file[1] = add_filename_entry(action,1,0,dlg,grid);
247   - dlg->file[0] = add_filename_entry(action,0,1,dlg,grid);
248   - gtk_grid_attach(grid,widget,2,1,1,1);
249   -#else
250 217 dlg->file[1] = add_filename_entry(action,1,0,dlg,table);
251   - dlg->file[0] = add_filename_entry(action,0,1,dlg,table);
252   - gtk_table_attach(GTK_TABLE(table),widget,3,4,1,2,0,0,2,2);
253   -#endif // GTK_CHECK_VERSION
254 218  
  219 + dlg->file[0] = add_filename_entry(action,0,1,dlg,table);
  220 + widget = gtk_button_new_with_mnemonic( _( "_Browse" ) );
255 221 g_signal_connect(G_OBJECT(widget),"clicked",G_CALLBACK(browse_file),dlg);
  222 + gtk_table_attach(GTK_TABLE(table),widget,3,4,1,2,0,0,2,2);
256 223 }
257 224 else
258 225 {
259 226 // Sending file, first the local filename
260   - widget = gtk_button_new_with_mnemonic( _( "_Browse" ) );
261   -
262   -#if GTK_CHECK_VERSION(3,0,0)
263   - dlg->file[0] = add_filename_entry(action,0,0,dlg,grid);
264   - dlg->file[1] = add_filename_entry(action,1,1,dlg,grid);
265   - gtk_grid_attach(grid,widget,2,0,1,1);
266   -#else
267 227 dlg->file[0] = add_filename_entry(action,0,0,dlg,table);
268   - dlg->file[1] = add_filename_entry(action,1,1,dlg,table);
  228 + widget = gtk_button_new_with_mnemonic( _( "_Browse" ) );
  229 + g_signal_connect(G_OBJECT(widget),"clicked",G_CALLBACK(browse_file),dlg);
269 230 gtk_table_attach(GTK_TABLE(table),widget,3,4,0,1,0,0,2,2);
270 231  
271   -#endif // GTK_CHECK_VERSION
272   -
273   - g_signal_connect(G_OBJECT(widget),"clicked",G_CALLBACK(browse_file),dlg);
  232 + dlg->file[1] = add_filename_entry(action,1,1,dlg,table);
274 233 }
275 234  
276   -#if GTK_CHECK_VERSION(3,0,0)
277   - gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dlg->dialog))),GTK_WIDGET(grid),TRUE,TRUE,2);
278   -#else
279 235 gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dlg->dialog))),GTK_WIDGET(table),FALSE,FALSE,2);
280   -#endif // GTK_CHECK_VERSION
281 236  
282 237 }
283 238  
... ... @@ -305,22 +260,10 @@ static void add_transfer_options(GObject *action, struct ftdialog *dlg)
305 260 { LIB3270_FT_OPTION_REMAP_ASCII, "remap", N_( "_Remap ASCII Characters" ) }
306 261 };
307 262  
  263 + GtkTable * table = GTK_TABLE(gtk_table_new(3,2,TRUE));
308 264 GtkWidget * frame = gtk_frame_new( _( "Transfer options" ) );
309 265 int row, col, f;
310 266  
311   -#if GTK_CHECK_VERSION(3,0,0)
312   - GtkGrid * grid = GTK_GRID(gtk_grid_new());
313   -
314   - gtk_grid_set_column_spacing(grid,5);
315   - gtk_grid_set_row_spacing(grid,3);
316   - gtk_container_set_border_width(GTK_CONTAINER(grid),2);
317   -
318   - gtk_grid_set_column_homogeneous(grid,TRUE);
319   -
320   -#else
321   - GtkTable * table = GTK_TABLE(gtk_table_new(3,2,TRUE));
322   -#endif // GTK_CHECK_VERSION
323   -
324 267 row=0;
325 268 col=0;
326 269 for(f=0;f < G_N_ELEMENTS(option);f++)
... ... @@ -345,12 +288,7 @@ static void add_transfer_options(GObject *action, struct ftdialog *dlg)
345 288 g_object_set_data(G_OBJECT(widget),"dlg",(gpointer) dlg);
346 289 g_signal_connect(G_OBJECT(widget),"toggled", G_CALLBACK(toggle_option),(gpointer) &option[f]);
347 290  
348   -#if GTK_CHECK_VERSION(3,0,0)
349   - gtk_grid_attach(grid,widget,col,row,1,1);
350   -#else
351 291 gtk_table_attach(table,widget,col,col+1,row,row+1,GTK_EXPAND|GTK_SHRINK|GTK_FILL,GTK_EXPAND|GTK_SHRINK|GTK_FILL,2,2);
352   -#endif // GTK_CHECK_VERSION
353   -
354 292 if(col++ > 0)
355 293 {
356 294 row++;
... ... @@ -358,12 +296,7 @@ static void add_transfer_options(GObject *action, struct ftdialog *dlg)
358 296 }
359 297 }
360 298  
361   -#if GTK_CHECK_VERSION(3,0,0)
362   - gtk_container_add(GTK_CONTAINER(frame),GTK_WIDGET(grid));
363   -#else
364 299 gtk_container_add(GTK_CONTAINER(frame),GTK_WIDGET(table));
365   -#endif // GTK_CHECK_VERSION
366   -
367 300 gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dlg->dialog))),GTK_WIDGET(frame),FALSE,FALSE,2);
368 301  
369 302 }
... ... @@ -470,6 +403,8 @@ static void run_ft_dialog(GObject *action, GtkWidget *widget, struct ftdialog *d
470 403 for(f=0;f<2;f++)
471 404 gtk_widget_set_sensitive(dlg->ready,is_dialog_ok(GTK_EDITABLE(dlg->file[f]),dlg));
472 405  
  406 + gtk_widget_show_all(dlg->dialog);
  407 +
473 408 for(f=0;f<G_N_ELEMENTS(dlg->parm);f++)
474 409 {
475 410 if(dlg->parm[f])
... ... @@ -486,8 +421,6 @@ static void run_ft_dialog(GObject *action, GtkWidget *widget, struct ftdialog *d
486 421 }
487 422 }
488 423  
489   - gtk_widget_show_all(dlg->dialog);
490   -
491 424 if(gtk_dialog_run(GTK_DIALOG(dlg->dialog)) != GTK_RESPONSE_ACCEPT)
492 425 {
493 426 gtk_widget_destroy(dlg->dialog);
... ... @@ -916,25 +849,12 @@ void upload_action(GtkAction *action, GtkWidget *widget)
916 849 { "dftsize", N_( "DFT B_uffer size:" ) }
917 850 };
918 851  
919   - int row, col, f;
920   - gchar * dft = g_object_get_data(action,"dft");
921   -
922   -#if GTK_CHECK_VERSION(3,0,0)
923   -
924   - GtkGrid * grid = GTK_GRID(gtk_grid_new());
925   -
926   - gtk_grid_set_column_spacing(grid,5);
927   - gtk_grid_set_row_spacing(grid,3);
928   - gtk_grid_set_column_homogeneous(grid,TRUE);
929   - gtk_container_set_border_width(GTK_CONTAINER(grid),2);
  852 + GtkTable * table = GTK_TABLE(gtk_table_new(2,2,FALSE));
930 853  
931   -#else
932   - GtkTable * table = GTK_TABLE(gtk_table_new(2,2,FALSE));
  854 + int row, col, f;
933 855  
934 856 gtk_container_set_border_width(GTK_CONTAINER(table),2);
935 857  
936   -#endif // GTK_CHECK_VERSION
937   -
938 858 row=0;
939 859 col=0;
940 860 for(f=0;f < 5;f++)
... ... @@ -948,13 +868,8 @@ void upload_action(GtkAction *action, GtkWidget *widget)
948 868  
949 869 gtk_label_set_mnemonic_widget(GTK_LABEL(label),GTK_WIDGET(dlg.parm[f]));
950 870  
951   -#if GTK_CHECK_VERSION(3,0,0)
952   - gtk_grid_attach(grid,label,col,row,1,1);
953   - gtk_grid_attach(grid,GTK_WIDGET(dlg.parm[f]),col+1,row,1,1);
954   -#else
955 871 gtk_table_attach(table,label,col,col+1,row,row+1,GTK_EXPAND|GTK_SHRINK|GTK_FILL,GTK_EXPAND|GTK_SHRINK|GTK_FILL,2,2);
956 872 gtk_table_attach(table,GTK_WIDGET(dlg.parm[f]),col+1,col+2,row,row+1,GTK_EXPAND|GTK_SHRINK|GTK_FILL,GTK_EXPAND|GTK_SHRINK|GTK_FILL,2,2);
957   -#endif // GTK_CHECK_VERSION
958 873  
959 874 col += 2;
960 875 if(col++ > 3)
... ... @@ -965,13 +880,7 @@ void upload_action(GtkAction *action, GtkWidget *widget)
965 880  
966 881 }
967 882  
968   - gtk_entry_set_text(GTK_ENTRY(dlg.parm[4]),dft ? dft : "4096");
969   -
970   -#if GTK_CHECK_VERSION(3,0,0)
971   - gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dlg.dialog))),GTK_WIDGET(grid),TRUE,TRUE,2);
972   -#else
973 883 gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dlg.dialog))),GTK_WIDGET(table),TRUE,TRUE,2);
974   -#endif // GTK_CHECK_VERSION
975 884  
976 885  
977 886 }
... ...