From 3557e3cb8cf8e80b120a809dca38047a33cf96f8 Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Tue, 10 Dec 2013 17:15:40 +0000 Subject: [PATCH] Implementando novo diálogo para seleção de servidor --- src/lib3270/connect.c | 7 +++++-- src/pw3270/v3270/hostselect.c | 36 ++++++++++++++++++++++++++++++------ 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/src/lib3270/connect.c b/src/lib3270/connect.c index 5b441a8..55be483 100644 --- a/src/lib3270/connect.c +++ b/src/lib3270/connect.c @@ -95,11 +95,14 @@ static void net_connected(H3270 *hSession) } else if(err) { + char buffer[4096]; + snprintf(buffer,4095,_( "Can't connect to %s" ), hSession->host.current ); + lib3270_disconnect(hSession); lib3270_popup_dialog( hSession, LIB3270_NOTIFY_ERROR, - _( "Network error" ), - _( "Unable to connect to host." ), + _( "Connection failed" ), + buffer, #ifdef _WIN32 _( "%s"), lib3270_win32_strerror(err) #else diff --git a/src/pw3270/v3270/hostselect.c b/src/pw3270/v3270/hostselect.c index f53994a..3514823 100644 --- a/src/pw3270/v3270/hostselect.c +++ b/src/pw3270/v3270/hostselect.c @@ -34,15 +34,14 @@ static const struct _host_type { - const gchar * name; const gchar * description; LIB3270_OPTION option; } host_type[] = { - { "S390", N_( "IBM S/390" ), LIB3270_OPTION_S390 }, - { "AS400", N_( "IBM AS/400" ), LIB3270_OPTION_AS400 }, - { "TSO", N_( "Other (TSO)" ), LIB3270_OPTION_TSO }, - { "VM/CMS", N_( "Other (VM/CMS)" ), 0 } + { N_( "IBM S/390" ), LIB3270_OPTION_S390 }, + { N_( "IBM AS/400" ), LIB3270_OPTION_AS400 }, + { N_( "Other (TSO)" ), LIB3270_OPTION_TSO }, + { N_( "Other (VM/CMS)" ), 0 } }; static const struct _colortable @@ -276,7 +275,32 @@ static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget) gtk_table_set_row_spacings(grid,5); gtk_table_set_col_spacings(grid,5); - #error Implementar + gtk_table_attach(grid,label[ENTRY_HOSTNAME],0,1,0,1,GTK_FILL,GTK_FILL,0,0); + gtk_table_attach(grid,GTK_WIDGET(widget->entry[ENTRY_HOSTNAME]),1,2,0,1,GTK_EXPAND|GTK_FILL,GTK_EXPAND|GTK_FILL,0,0); + + gtk_table_attach(grid,label[ENTRY_SRVCNAME],2,3,0,1,GTK_FILL,GTK_FILL,0,0); + gtk_table_attach(grid,GTK_WIDGET(widget->entry[ENTRY_SRVCNAME]),3,4,0,1,GTK_FILL,GTK_FILL,0,0); + + gtk_table_attach(grid,GTK_WIDGET(widget->ssl),1,2,1,2,GTK_FILL,GTK_FILL,0,0); + + { + GtkTable * opt = GTK_TABLE(gtk_table_new(G_N_ELEMENTS(comboLabel),2,FALSE)); + gtk_table_set_row_spacings(opt,5); + gtk_table_set_col_spacings(opt,5); + + for(f=0;fcombo[f]),1,2,f,f+1,GTK_FILL,GTK_FILL,0,0); + } + + gtk_container_add(GTK_CONTAINER(expander),GTK_WIDGET(opt)); + } + gtk_table_attach(grid,GTK_WIDGET(expander),1,2,2,3,GTK_FILL,GTK_FILL,0,0); + #endif // GTK_CHECK_VERSION -- libgit2 0.21.2