Mercurial > gftp.yaz

diff lib/config_file.c @ 37:5a178bd04ca5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2002-10-13 Brian Masney <masneyb@gftp.org> * lib/gftp.h (struct gftp_config_vars_tag) - remove shown flag and added ports_shown flag. Added GFTP_PORTS_TEXT, GFTP_PORTS_GTK, and GFTP_PORTS_ALL flags * lib/config_file.c - update to use new fields. * lib/config_file.c, lib/options.h, lib/gftp.h - added new global options: local_sortcol, local_sortasds, remote_sortcol, remote_sortasds * src/gtk/gftp-gtk.c - sort based on parameters above. Also, if a url was given on the command line, don't connect to it until the local side has been setup * src/gtk/options_dialog.c - only show variables that have GFTP_PORT_GTK set * src/text/gftp-text.c - add help screen for set command. Added command clear cache. Sort the filelist based on the configuration options. * configure.in - update to version 2.0.14 * cvsclean - clean up the Makefile.am file better
author masneyb
date Mon, 14 Oct 2002 02:46:14 +0000
parents c8ec7877432e
children 474d562c7268
line wrap: on
line diff
--- a/lib/config_file.c	Tue Oct 08 02:19:46 2002 +0000
+++ b/lib/config_file.c	Mon Oct 14 02:46:14 2002 +0000
@@ -30,174 +30,174 @@
 
 gftp_config_vars config_file_vars[] = 
 {
-  {"", N_("General"), (void *) 0x1, CONFIG_NOTEBOOK, 1, ""},
-  {"", "", (void *) 0x1, CONFIG_TABLE, 1, ""},
-  {"email", N_("Email address:"), &emailaddr, CONFIG_CHARTEXT, 1, 
-	N_("Enter your email address here")},
-  {"view_program", N_("View program:"), &view_program, CONFIG_CHARTEXT, 1,
-	N_("The default program used to view files. If this is blank, the internal file viewer will be used")},
-  {"edit_program", N_("Edit program:"), &edit_program, CONFIG_CHARTEXT, 1,
-	N_("The default program used to edit files.")},
-  {"startup_directory", N_("Startup Directory:"), &startup_directory,
-        CONFIG_CHARTEXT, 1,
-        N_("The default directory gFTP will go to on startup")},
+  {"", N_("General"), (void *) 0x1, CONFIG_NOTEBOOK, "", NULL, GFTP_PORT_GTK},
+  {"", "", (void *) 0x1, CONFIG_TABLE, "", NULL, GFTP_PORT_GTK},
+  {"email", N_("Email address:"), &emailaddr, CONFIG_CHARTEXT, 
+	N_("Enter your email address here"), NULL, GFTP_PORT_ALL},
+  {"view_program", N_("View program:"), &view_program, CONFIG_CHARTEXT,
+	N_("The default program used to view files. If this is blank, the internal file viewer will be used"), NULL, GFTP_PORT_ALL},
+  {"edit_program", N_("Edit program:"), &edit_program, CONFIG_CHARTEXT,
+	N_("The default program used to edit files."), NULL, GFTP_PORT_GTK},
+  {"startup_directory", N_("Startup Directory:"), &startup_directory, CONFIG_CHARTEXT,
+        N_("The default directory gFTP will go to on startup"), NULL, GFTP_PORT_ALL},
   {"max_log_window_size", N_("Max Log Window Size:"), &max_log_window_size, CONFIG_UINTTEXT,
-        1, N_("The maximum size of the log window in bytes for the GTK+ port")},
-  {"", "", (void *) 0x1, CONFIG_TABLE, 1, ""},
+        N_("The maximum size of the log window in bytes for the GTK+ port"), NULL, GFTP_PORT_GTK},
+  {"", "", (void *) 0x1, CONFIG_TABLE, "", NULL, GFTP_PORT_GTK},
   {"append_transfers", N_("Append file transfers"), &append_file_transfers,
-        CONFIG_CHECKBOX, 1,
-        N_("Append new file transfers onto existing ones")},
-  {"one_transfer", N_("Do one transfer at a time"),  &do_one_transfer_at_a_time, CONFIG_CHECKBOX, 1, N_("Do only one transfer at a time?")}, 
-  {"overwrite_default", N_("Overwrite by Default"), &overwrite_by_default,
-        CONFIG_CHECKBOX, 1,
-        N_("Overwrite files by default or set to resume file transfers")},
-  {"refresh_files", N_("Refresh after each file transfer"), &refresh_files,
-	CONFIG_CHECKBOX, 1,
-	N_("Refresh the listbox after each file is transfered")},
-  {"sort_dirs_first", N_("Sort directories first"), &sort_dirs_first, 
-	CONFIG_CHECKBOX, 1, N_("Put the directories first then the files")},
-  {"start_transfers", N_("Start file transfers"), &start_file_transfers, 
-	CONFIG_CHECKBOX, 1,
-	N_("Automatically start the file transfers when they get queued?")},
-  {"show_hidden_files", N_("Show hidden files"), &show_hidden_files, 
-	CONFIG_CHECKBOX, 1, N_("Show hidden files in the listboxes")},
+        CONFIG_CHECKBOX,
+        N_("Append new file transfers onto existing ones"), NULL, GFTP_PORT_GTK},
+  {"one_transfer", N_("Do one transfer at a time"),  &do_one_transfer_at_a_time, CONFIG_CHECKBOX, 
+	N_("Do only one transfer at a time?"), NULL, GFTP_PORT_GTK}, 
+  {"overwrite_default", N_("Overwrite by Default"), &overwrite_by_default, CONFIG_CHECKBOX,
+        N_("Overwrite files by default or set to resume file transfers"), NULL, GFTP_PORT_GTK},
+  {"refresh_files", N_("Refresh after each file transfer"), &refresh_files, CONFIG_CHECKBOX, 
+	N_("Refresh the listbox after each file is transfered"), NULL, GFTP_PORT_GTK},
+  {"sort_dirs_first", N_("Sort directories first"), &sort_dirs_first, CONFIG_CHECKBOX, 
+	N_("Put the directories first then the files"), NULL, GFTP_PORT_ALL},
+  {"start_transfers", N_("Start file transfers"), &start_file_transfers, CONFIG_CHECKBOX, 
+	N_("Automatically start the file transfers when they get queued?"), NULL, GFTP_PORT_GTK},
+  {"show_hidden_files", N_("Show hidden files"), &show_hidden_files, CONFIG_CHECKBOX, 
+	N_("Show hidden files in the listboxes"), NULL, GFTP_PORT_ALL},
   
-  {"", N_("Network"), (void *) 0x1, CONFIG_NOTEBOOK, 1, ""},
-  {"", "", (void *) 0x1, CONFIG_TABLE, 1, ""},
+  {"", N_("Network"), (void *) 0x1, CONFIG_NOTEBOOK, "", NULL, GFTP_PORT_GTK},
+  {"", "", (void *) 0x1, CONFIG_TABLE, "", NULL, GFTP_PORT_GTK},
   {"network_timeout", N_("Network timeout:"), &network_timeout, CONFIG_INTTEXT, 
-	1, N_("The timeout waiting for network input/output. This is NOT an idle timeout.")},
-  {"retries", N_("Connect retries:"), &retries, CONFIG_INTTEXT, 1,
-	N_("The number of auto-retries to do. Set this to 0 to retry indefinately")},
-  {"sleep_time", N_("Retry sleep time:"), &sleep_time, CONFIG_INTTEXT, 1,
-	N_("The number of seconds to wait between retries")},
-  {"maxkbs", N_("Max KB/S:"), &maxkbs, CONFIG_FLOATTEXT, 1,
-	N_("The maximum KB/s a file transfer can get. (Set to 0 to disable)")},
-  {"", N_("Default Protocol"), (void *) 0x1, CONFIG_COMBO, 1, "DP"},
+	N_("The timeout waiting for network input/output. This is NOT an idle timeout."), NULL, GFTP_PORT_ALL},
+  {"retries", N_("Connect retries:"), &retries, CONFIG_INTTEXT, 
+	N_("The number of auto-retries to do. Set this to 0 to retry indefinately"), NULL, GFTP_PORT_ALL},
+  {"sleep_time", N_("Retry sleep time:"), &sleep_time, CONFIG_INTTEXT, 
+	N_("The number of seconds to wait between retries"), NULL, GFTP_PORT_ALL},
+  {"maxkbs", N_("Max KB/S:"), &maxkbs, CONFIG_FLOATTEXT, 
+	N_("The maximum KB/s a file transfer can get. (Set to 0 to disable)"), NULL, GFTP_PORT_ALL},
+  {"", N_("Default Protocol"), (void *) 0x1, CONFIG_COMBO, "DP", NULL, GFTP_PORT_GTK},
   {"default_protocol", N_("Default Protocol"), &default_protocol, 
-        CONFIG_CHARTEXT, 0, N_("This specifies the default protocol to use")},
-
-  {"", N_("FTP"), (void *) 0x1, CONFIG_NOTEBOOK, 1, ""},
-  {"", "", (void *) 0x1, CONFIG_TABLE, 1, ""},
-  {"firewall_host", N_("Proxy hostname:"), &firewall_host, CONFIG_CHARTEXT, 1,
-	N_("Firewall hostname")},
-  {"firewall_port", N_("Proxy port:"), &firewall_port, CONFIG_INTTEXT, 1,
-	N_("Port to connect to on the firewall")},
-  {"firewall_username", N_("Proxy username:"), &firewall_username,
-	CONFIG_CHARTEXT, 1, N_("Your firewall username")},
-  {"firewall_password", N_("Proxy password:"), &firewall_password, 
-	CONFIG_CHARPASS, 1, N_("Your firewall password")},
-  {"firewall_account", N_("Proxy account:"), &firewall_account, CONFIG_CHARTEXT, 1, N_("Your firewall account (optional)")},
-  {"", "", (void *) 0x1, CONFIG_TABLE, 1, ""},
+        CONFIG_CHARTEXT, N_("This specifies the default protocol to use"), NULL, 0},
 
-  {"passive_transfer", N_("Passive file transfers"), &passive_transfer, 
-	CONFIG_CHECKBOX, 1,
-	N_("Send PASV command or PORT command for data transfers")},
-  {"resolve_symlinks", N_("Resolve Remote Symlinks (LIST -L)"), &resolve_symlinks, 
-	CONFIG_CHECKBOX, 1,
-	N_("If you disable this feature, then gFTP will only send LIST to the remote server instead of LIST -L")},
+  {"", N_("FTP"), (void *) 0x1, CONFIG_NOTEBOOK, "", NULL, GFTP_PORT_GTK},
+  {"", "", (void *) 0x1, CONFIG_TABLE, "", NULL, GFTP_PORT_GTK},
+  {"firewall_host", N_("Proxy hostname:"), &firewall_host, CONFIG_CHARTEXT,
+	N_("Firewall hostname"), NULL, GFTP_PORT_ALL},
+  {"firewall_port", N_("Proxy port:"), &firewall_port, CONFIG_INTTEXT,
+	N_("Port to connect to on the firewall"), NULL, GFTP_PORT_ALL},
+  {"firewall_username", N_("Proxy username:"), &firewall_username,
+	CONFIG_CHARTEXT, N_("Your firewall username"), NULL, GFTP_PORT_ALL},
+  {"firewall_password", N_("Proxy password:"), &firewall_password, 
+	CONFIG_CHARPASS, N_("Your firewall password"), NULL, GFTP_PORT_ALL},
+  {"firewall_account", N_("Proxy account:"), &firewall_account, CONFIG_CHARTEXT, 
+	N_("Your firewall account (optional)"), NULL, GFTP_PORT_ALL},
+  {"", "", (void *) 0x1, CONFIG_TABLE, "", NULL, GFTP_PORT_GTK},
 
-  {"", "", (void *) 0x1, CONFIG_TABLE, 1, ""},
-  {"", N_("Proxy server type"), (void *) 0x1, CONFIG_COMBO, 1, "PS"},
-  {"proxy_config", N_("Proxy config"), &proxy_config, CONFIG_TEXT, 1,
-	N_("This specifies how your proxy server expects us to log in")},
-  {"", N_("%pu = proxy user"), (void *) 0x1, CONFIG_LABEL, 1, ""},
-  {"", N_("%hu = host user"), (void *) 0x1, CONFIG_LABEL, 1, ""},
-  {"", N_("%pp = proxy pass"), (void *) 0x1, CONFIG_LABEL, 1, ""},
-  {"", N_("%hp = host pass"), (void *) 0x1, CONFIG_LABEL, 1, ""},
-  {"", N_("%ph = proxy host"), (void *) 0x1, CONFIG_LABEL, 1, ""},
-  {"", N_("%hh = host"), (void *) 0x1, CONFIG_LABEL, 1, ""},
-  {"", N_("%po = proxy port"), (void *) 0x1, CONFIG_LABEL, 1, ""},
-  {"", N_("%ho = host port"), (void *) 0x1, CONFIG_LABEL, 1, ""},
-  {"", N_("%pa = proxy account"), (void *) 0x1, CONFIG_LABEL, 1, ""},
-  {"", N_("%ha = host account"), (void *) 0x1, CONFIG_LABEL, 1, ""},
+  {"passive_transfer", N_("Passive file transfers"), &passive_transfer, CONFIG_CHECKBOX, 
+	N_("Send PASV command or PORT command for data transfers"), NULL, GFTP_PORT_ALL},
+  {"resolve_symlinks", N_("Resolve Remote Symlinks (LIST -L)"), &resolve_symlinks, CONFIG_CHECKBOX, 
+	N_("If you disable this feature, then gFTP will only send LIST to the remote server instead of LIST -L"), NULL, GFTP_PORT_ALL},
 
-  {"", N_("HTTP"), (void *) 0x1, CONFIG_NOTEBOOK, 1, ""},
-  {"", "", (void *) 0x1, CONFIG_TABLE, 1, ""},
+  {"", "", (void *) 0x1, CONFIG_TABLE, "", NULL, GFTP_PORT_GTK},
+  {"", N_("Proxy server type"), (void *) 0x1, CONFIG_COMBO, "PS", NULL, 0},
+  {"proxy_config", N_("Proxy config"), &proxy_config, CONFIG_TEXT,
+	N_("This specifies how your proxy server expects us to log in"), NULL, GFTP_PORT_GTK},
+  {"", N_("%pu = proxy user"), (void *) 0x1, CONFIG_LABEL, "", NULL, 0},
+  {"", N_("%hu = host user"), (void *) 0x1, CONFIG_LABEL, "", NULL, 0},
+  {"", N_("%pp = proxy pass"), (void *) 0x1, CONFIG_LABEL, "", NULL, 0},
+  {"", N_("%hp = host pass"), (void *) 0x1, CONFIG_LABEL, "", NULL, 0},
+  {"", N_("%ph = proxy host"), (void *) 0x1, CONFIG_LABEL, "", NULL, 0},
+  {"", N_("%hh = host"), (void *) 0x1, CONFIG_LABEL, "", NULL, 0},
+  {"", N_("%po = proxy port"), (void *) 0x1, CONFIG_LABEL, "", NULL, 0},
+  {"", N_("%ho = host port"), (void *) 0x1, CONFIG_LABEL, "", NULL, 0},
+  {"", N_("%pa = proxy account"), (void *) 0x1, CONFIG_LABEL, "", NULL, 0},
+  {"", N_("%ha = host account"), (void *) 0x1, CONFIG_LABEL, "", NULL, 0},
+
+  {"", N_("HTTP"), (void *) 0x1, CONFIG_NOTEBOOK, "", NULL, GFTP_PORT_GTK},
+  {"", "", (void *) 0x1, CONFIG_TABLE, "", NULL, GFTP_PORT_GTK},
   {"http_proxy_host", N_("Proxy hostname:"), &http_proxy_host, CONFIG_CHARTEXT,
-	1, N_("Firewall hostname")},
-  {"http_proxy_port", N_("Proxy port:"), &http_proxy_port, CONFIG_INTTEXT, 1,
-	N_("Port to connect to on the firewall")},
+	N_("Firewall hostname"), NULL, GFTP_PORT_ALL},
+  {"http_proxy_port", N_("Proxy port:"), &http_proxy_port, CONFIG_INTTEXT, 
+	N_("Port to connect to on the firewall"), NULL, GFTP_PORT_ALL},
   {"http_proxy_username", N_("Proxy username:"), &http_proxy_username, 
-	CONFIG_CHARTEXT, 1, N_("Your firewall username")},
+	CONFIG_CHARTEXT, N_("Your firewall username"), NULL, GFTP_PORT_ALL},
   {"http_proxy_password", N_("Proxy password:"), &http_proxy_password, 
-	CONFIG_CHARPASS, 1, N_("Your firewall password")},
-  {"", "", (void *) 0x1, CONFIG_TABLE, 1, ""},
-  {"use_http11", N_("Use HTTP/1.1"), &use_http11, CONFIG_CHECKBOX, 1,
-	N_("Do you want to use HTTP/1.1 or HTTP/1.0")},
+	CONFIG_CHARPASS, N_("Your firewall password"), NULL, GFTP_PORT_ALL},
+  {"", "", (void *) 0x1, CONFIG_TABLE, "", NULL, GFTP_PORT_GTK},
+  {"use_http11", N_("Use HTTP/1.1"), &use_http11, CONFIG_CHECKBOX,
+	N_("Do you want to use HTTP/1.1 or HTTP/1.0"), NULL, GFTP_PORT_ALL},
 
-  {"", N_("SSH"), (void *) 0x1, CONFIG_NOTEBOOK, 1, ""},
-  {"", "", (void *) 0x1, CONFIG_TABLE, 1, ""},
-  {"ssh_prog_name", N_("SSH Prog Name:"), &ssh_prog_name, CONFIG_CHARTEXT, 1,
-	N_("The path to the SSH executable")},
+  {"", N_("SSH"), (void *) 0x1, CONFIG_NOTEBOOK, "", NULL, GFTP_PORT_GTK},
+  {"", "", (void *) 0x1, CONFIG_TABLE, "", NULL, GFTP_PORT_GTK},
+  {"ssh_prog_name", N_("SSH Prog Name:"), &ssh_prog_name, CONFIG_CHARTEXT,
+	N_("The path to the SSH executable"), NULL, GFTP_PORT_ALL},
   {"ssh_extra_params", N_("SSH Extra Params:"), &ssh_extra_params, 
-        CONFIG_CHARTEXT, 1, N_("Extra parameters to pass to the SSH program")},
+        CONFIG_CHARTEXT, N_("Extra parameters to pass to the SSH program"), NULL, GFTP_PORT_ALL},
   {"ssh1_sftp_path", N_("SSH sftpserv path:"), &ssh1_sftp_path,
-	CONFIG_CHARTEXT, 1, N_("Default remote SSH sftpserv path")},
+	CONFIG_CHARTEXT, N_("Default remote SSH sftpserv path"), NULL, GFTP_PORT_ALL},
   {"ssh2_sftp_path", N_("SSH2 sftp-server path:"), &ssh2_sftp_path,
-	CONFIG_CHARTEXT, 1, N_("Default remote SSH2 sftp-server path")},
-  {"", "", (void *) 0x1, CONFIG_TABLE, 1, ""},
-  {"ssh_need_userpass", N_("Need SSH User/Pass"), &ssh_need_userpass,
-        CONFIG_CHECKBOX, 1,
-        N_("Require a username/password for SSH connections")},
-  {"ssh_use_askpass", N_("Use ssh-askpass util"), &ssh_use_askpass,
-        CONFIG_CHECKBOX, 1,
-        N_("Use the ssh-askpass utility to grab the users password")},
-  {"sshv2_use_sftp_subsys", N_("Use SSH2 SFTP subsys"), 
-        &sshv2_use_sftp_subsys, CONFIG_CHECKBOX, 1,
-        N_("Call ssh with the -s sftp flag. This is helpful because you won't have to know the remote path to the remote sftp-server")},
-  {"enable_old_ssh", N_("Enable old SSH protocol"), &enable_old_ssh,
-        CONFIG_CHECKBOX, 0,
-        N_("Enable the old SSH protocol. You will need to download the sftp server from http:///www.xbill.org/sftp")},
+	CONFIG_CHARTEXT, N_("Default remote SSH2 sftp-server path"), NULL, GFTP_PORT_ALL},
+  {"", "", (void *) 0x1, CONFIG_TABLE, "", NULL, GFTP_PORT_GTK},
+  {"ssh_need_userpass", N_("Need SSH User/Pass"), &ssh_need_userpass, CONFIG_CHECKBOX, 
+        N_("Require a username/password for SSH connections"), NULL, GFTP_PORT_ALL},
+  {"ssh_use_askpass", N_("Use ssh-askpass util"), &ssh_use_askpass, CONFIG_CHECKBOX, 
+        N_("Use the ssh-askpass utility to grab the users password"), NULL, GFTP_PORT_GTK},
+  {"sshv2_use_sftp_subsys", N_("Use SSH2 SFTP subsys"), &sshv2_use_sftp_subsys, CONFIG_CHECKBOX, 
+        N_("Call ssh with the -s sftp flag. This is helpful because you won't have to know the remote path to the remote sftp-server"), NULL, GFTP_PORT_GTK},
+  {"enable_old_ssh", N_("Enable old SSH protocol"), &enable_old_ssh, CONFIG_CHECKBOX, 
+        N_("Enable the old SSH protocol. You will need to download the sftp server from http:///www.xbill.org/sftp"), NULL, GFTP_PORT_ALL},
 
-  {"list_dblclk_action", "", &listbox_dblclick_action, CONFIG_HIDEINT, 0,
-	N_("This defines what will happen when you double click a file in the file listboxes. 0=View file 1=Edit file 2=Transfer file")},
-  {"use_default_dl_types", "", &use_default_dl_types, CONFIG_HIDEINT, 0,
-	N_("(*) If this is set, and there is a ext= line below for the file extension, it will download the file as specified below")},
-  {"listbox_local_width", "", &listbox_local_width, CONFIG_HIDEINT, 0,
-	N_("The default width of the local files listbox")},
-  {"listbox_remote_width", "", &listbox_remote_width, CONFIG_HIDEINT, 0,
-	N_("The default width of the remote files listbox")},
-  {"listbox_file_height", "", &listbox_file_height, CONFIG_HIDEINT, 0,
-	N_("The default height of the local/remote files listboxes")},
-  {"transfer_height", "", &transfer_height, CONFIG_HIDEINT, 0,
-	N_("The default height of the transfer listbox")},
-  {"log_height", "", &log_height, CONFIG_HIDEINT, 0,
-	N_("The default height of the logging window")},
-  {"file_trans_column", "", &file_trans_column, CONFIG_HIDEINT, 0,
-	N_("The width of the filename column in the transfer window. Set this to 0 to have this column automagically resize.")},
-  {"local_file_width", "", &local_columns[0], CONFIG_HIDEINT, 0,
-	N_("The width of the filename column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column")},
-  {"local_size_width", "", &local_columns[1], CONFIG_HIDEINT, 0,
-	N_("The width of the size column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column")},
-  {"local_user_width", "", &local_columns[2], CONFIG_HIDEINT, 0,
-	N_("The width of the user column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column")},
-  {"local_group_width", "", &local_columns[3], CONFIG_HIDEINT, 0,
-	N_("The width of the group column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column")},
-  {"local_date_width", "", &local_columns[4], CONFIG_HIDEINT, 0,
-	N_("The width of the date column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column")},
-  {"local_attribs_width", "", &local_columns[5], CONFIG_HIDEINT, 0,
-	N_("The width of the attribs column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column")},
-  {"remote_file_width", "", &remote_columns[0], CONFIG_HIDEINT, 0,
-	N_("The width of the filename column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column")},
-  {"remote_size_width", "", &remote_columns[1], CONFIG_HIDEINT, 0,
-	N_("The width of the size column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column")},
-  {"remote_user_width", "", &remote_columns[2], CONFIG_HIDEINT, 0,
-	N_("The width of the user column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column")},
-  {"remote_group_width", "", &remote_columns[3], CONFIG_HIDEINT, 0,
-	N_("The width of the group column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column")},
-  {"remote_date_width", "", &remote_columns[4], CONFIG_HIDEINT, 0,
-	N_("The width of the date column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column")},
-  {"remote_attribs_width", "", &remote_columns[5], CONFIG_HIDEINT, 0,
-	N_("The width of the attribs column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column")},
-  {"send_color", "", &send_color, CONFIG_COLOR, 0,
-        N_("The color of the commands that are sent to the server")},
-  {"recv_color", "", &recv_color, CONFIG_COLOR, 0,
-        N_("The color of the commands that are received from the server")},
-  {"error_color", "", &error_color, CONFIG_COLOR, 0,
-        N_("The color of the error messages")},
-  {"misc_color", "", &misc_color, CONFIG_COLOR, 0,
-        N_("The color of the rest of the log messages")},
-  {NULL, NULL, NULL, 0, 0, ""}
+  {"list_dblclk_action", "", &listbox_dblclick_action, CONFIG_HIDEINT, 
+	N_("This defines what will happen when you double click a file in the file listboxes. 0=View file 1=Edit file 2=Transfer file"), NULL, 0},
+  {"use_default_dl_types", "", &use_default_dl_types, CONFIG_HIDEINT, 
+	N_("(*) If this is set, and there is a ext= line below for the file extension, it will download the file as specified below"), NULL, 0},
+  {"listbox_local_width", "", &listbox_local_width, CONFIG_HIDEINT, 
+	N_("The default width of the local files listbox"), NULL, 0},
+  {"listbox_remote_width", "", &listbox_remote_width, CONFIG_HIDEINT,
+	N_("The default width of the remote files listbox"), NULL, 0},
+  {"listbox_file_height", "", &listbox_file_height, CONFIG_HIDEINT,
+	N_("The default height of the local/remote files listboxes"), NULL, 0},
+  {"transfer_height", "", &transfer_height, CONFIG_HIDEINT,
+	N_("The default height of the transfer listbox"), NULL, 0},
+  {"log_height", "", &log_height, CONFIG_HIDEINT,
+	N_("The default height of the logging window"), NULL, 0},
+  {"file_trans_column", "", &file_trans_column, CONFIG_HIDEINT,
+	N_("The width of the filename column in the transfer window. Set this to 0 to have this column automagically resize."), NULL, 0},
+  {"local_sortcol", "", &local_sortcol, CONFIG_INTTEXT, 
+	N_("The default column to sort by"), NULL, GFTP_PORT_TEXT},
+  {"local_sortasds", "", &local_sortasds, CONFIG_INTTEXT,
+	N_("Sort ascending or descending"), NULL, GFTP_PORT_TEXT},
+  {"remote_sortcol", "", &remote_sortcol, CONFIG_INTTEXT,
+	N_("The default column to sort by"), NULL, GFTP_PORT_TEXT},
+  {"remote_sortasds", "", &remote_sortasds, CONFIG_INTTEXT,
+	N_("Sort ascending or descending"), NULL, GFTP_PORT_TEXT},
+  {"local_file_width", "", &local_columns[0], CONFIG_HIDEINT,
+	N_("The width of the filename column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column"), NULL, 0},
+  {"local_size_width", "", &local_columns[1], CONFIG_HIDEINT,
+	N_("The width of the size column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column"), NULL, 0},
+  {"local_user_width", "", &local_columns[2], CONFIG_HIDEINT,
+	N_("The width of the user column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column"), NULL, 0},
+  {"local_group_width", "", &local_columns[3], CONFIG_HIDEINT,
+	N_("The width of the group column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column"), NULL, 0},
+  {"local_date_width", "", &local_columns[4], CONFIG_HIDEINT,
+	N_("The width of the date column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column"), NULL, 0},
+  {"local_attribs_width", "", &local_columns[5], CONFIG_HIDEINT,
+	N_("The width of the attribs column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column"), NULL, 0},
+  {"remote_file_width", "", &remote_columns[0], CONFIG_HIDEINT,
+	N_("The width of the filename column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column"), NULL, 0},
+  {"remote_size_width", "", &remote_columns[1], CONFIG_HIDEINT,
+	N_("The width of the size column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column"), NULL, 0},
+  {"remote_user_width", "", &remote_columns[2], CONFIG_HIDEINT,
+	N_("The width of the user column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column"), NULL, 0},
+  {"remote_group_width", "", &remote_columns[3], CONFIG_HIDEINT,
+	N_("The width of the group column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column"), NULL, 0},
+  {"remote_date_width", "", &remote_columns[4], CONFIG_HIDEINT,
+	N_("The width of the date column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column"), NULL, 0},
+  {"remote_attribs_width", "", &remote_columns[5], CONFIG_HIDEINT,
+	N_("The width of the attribs column in the file listboxes. Set this to 0 to have this column automagically resize. Set this to -1 to disable this column"), NULL, 0},
+  {"send_color", "", &send_color, CONFIG_COLOR,
+        N_("The color of the commands that are sent to the server"), NULL, 0},
+  {"recv_color", "", &recv_color, CONFIG_COLOR,
+        N_("The color of the commands that are received from the server"), NULL, 0},
+  {"error_color", "", &error_color, CONFIG_COLOR,
+        N_("The color of the error messages"), NULL, 0},
+  {"misc_color", "", &misc_color, CONFIG_COLOR,
+        N_("The color of the rest of the log messages"), NULL, 0},
+  {NULL, NULL, NULL, 0, "", NULL, 0}
 };