Download as
Browse Code »

Commit 53de1ac6d03d4f752489e8e67f32e2eb9e3fda47

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

Mudando dialogo de hostname para gtkgrid (remove os warnings de "deprecated"

Showing 1 changed file with 52 additions and 3 deletions   Show diff stats
src/pw3270/hostdialog.c
  Diff comments   View file @53de1ac
@@ -124,7 +124,11 @@ @@ -124,7 +124,11 @@
124 gboolean again = TRUE; 124 gboolean again = TRUE;
125 int iHostType = 0; 125 int iHostType = 0;
126 int iColorTable = 0; 126 int iColorTable = 0;
  127 +#if GTK_CHECK_VERSION(3,0,0)
  128 + GtkGrid * grid = gtk_grid_new();
  129 +#else
127 GtkTable * table = GTK_TABLE(gtk_table_new(3,4,FALSE)); 130 GtkTable * table = GTK_TABLE(gtk_table_new(3,4,FALSE));
  131 +#endif // GTK_CHECK_VERSION
128 GtkEntry * host = GTK_ENTRY(gtk_entry_new()); 132 GtkEntry * host = GTK_ENTRY(gtk_entry_new());
129 GtkEntry * port = GTK_ENTRY(gtk_entry_new()); 133 GtkEntry * port = GTK_ENTRY(gtk_entry_new());
130 GtkToggleButton * sslcheck = GTK_TOGGLE_BUTTON(gtk_check_button_new_with_mnemonic( _( "_Secure connection" ) )); 134 GtkToggleButton * sslcheck = GTK_TOGGLE_BUTTON(gtk_check_button_new_with_mnemonic( _( "_Secure connection" ) ));
@@ -144,6 +148,40 @@ @@ -144,6 +148,40 @@
144 gtk_entry_set_width_chars(port,7); 148 gtk_entry_set_width_chars(port,7);
145 149
146 150
  151 +#if GTK_CHECK_VERSION(3,0,0)
  152 +
  153 + gtk_grid_set_column_spacing(grid,5);
  154 + gtk_grid_set_row_spacing(grid,3);
  155 +
  156 + {
  157 + // Host info - GtkGrid version
  158 + struct _line
  159 + {
  160 + const gchar * label;
  161 + GtkWidget * widget;
  162 + } line[] =
  163 + {
  164 + { N_( "_Hostname:" ), GTK_WIDGET(host) },
  165 + { N_( "_Port:" ), GTK_WIDGET(port) }
  166 + };
  167 +
  168 + int f;
  169 + int c = 0;
  170 +
  171 + for(f=0;f<G_N_ELEMENTS(line);f++)
  172 + {
  173 + GtkWidget * label = gtk_label_new_with_mnemonic( gettext(line[f].label) );
  174 + gtk_label_set_mnemonic_widget(GTK_LABEL(label),line[f].widget);
  175 +
  176 + gtk_grid_attach(grid,label,c,0,1,1);
  177 + gtk_grid_attach(grid,line[f].widget,c+1,0,3,1);
  178 + c += 4;
  179 + }
  180 +
  181 + gtk_grid_attach_next_to(grid,GTK_WIDGET(sslcheck),GTK_WIDGET(host),GTK_POS_BOTTOM,1,1);
  182 +
  183 + }
  184 +#else
147 { 185 {
148 // Host info - GtkTable version 186 // Host info - GtkTable version
149 struct _line 187 struct _line
@@ -171,6 +209,7 @@ @@ -171,6 +209,7 @@
171 209
172 gtk_table_attach(table,GTK_WIDGET(sslcheck),1,2,1,2,GTK_EXPAND|GTK_FILL,0,0,0); 210 gtk_table_attach(table,GTK_WIDGET(sslcheck),1,2,1,2,GTK_EXPAND|GTK_FILL,0,0,0);
173 } 211 }
  212 +#endif // GTK_CHECK_VERSION
174 213
175 { 214 {
176 // Host options 215 // Host options
@@ -270,12 +309,24 @@ @@ -270,12 +309,24 @@
270 } 309 }
271 310
272 gtk_container_add(GTK_CONTAINER(expander),GTK_WIDGET(container)); 311 gtk_container_add(GTK_CONTAINER(expander),GTK_WIDGET(container));
  312 +
  313 +#if GTK_CHECK_VERSION(3,0,0)
  314 + gtk_grid_attach_next_to(grid,GTK_WIDGET(expander),GTK_WIDGET(sslcheck),GTK_POS_BOTTOM,1,1);
  315 +#else
273 gtk_table_attach(table,expander,1,2,2,3,GTK_EXPAND|GTK_FILL,0,0,0); 316 gtk_table_attach(table,expander,1,2,2,3,GTK_EXPAND|GTK_FILL,0,0,0);
  317 +#endif // GTK_CHECK_VERSION
  318 +
274 } 319 }
275 320
  321 +#if GTK_CHECK_VERSION(3,0,0)
  322 + gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),GTK_WIDGET(grid),FALSE,FALSE,2);
  323 + gtk_widget_show_all(GTK_WIDGET(grid));
  324 + gtk_container_set_border_width(GTK_CONTAINER(grid),5);
  325 +#else
276 gtk_container_set_border_width(GTK_CONTAINER(table),5); 326 gtk_container_set_border_width(GTK_CONTAINER(table),5);
277 -  
278 gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),GTK_WIDGET(table),FALSE,FALSE,2); 327 gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),GTK_WIDGET(table),FALSE,FALSE,2);
  328 + gtk_widget_show_all(GTK_WIDGET(table));
  329 +#endif
279 330
280 hostname = cfghost; 331 hostname = cfghost;
281 332
@@ -305,8 +356,6 @@ @@ -305,8 +356,6 @@
305 356
306 gtk_entry_set_text(host,hostname); 357 gtk_entry_set_text(host,hostname);
307 358
308 - gtk_widget_show_all(GTK_WIDGET(table));  
309 -  
310 while(again) 359 while(again)
311 { 360 {
312 gtk_widget_set_sensitive(dialog,TRUE); 361 gtk_widget_set_sensitive(dialog,TRUE);