diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog index 190ee5dd6..c7192e919 100644 --- a/capplets/default-applications/ChangeLog +++ b/capplets/default-applications/ChangeLog @@ -1,3 +1,14 @@ +2002-05-16 jacob berkman + + * gnome-default-applications-properties.glade: turn off help tab, + put browser tab first, and fix things for the editor + + * gnome-default-applications-properties.c: make the editor changes + use gnome-vfs, and make the browser use the default key rather + than http + + fixes #78037 + Wed Apr 10 18:05:13 2002 Jonathan Blandford * default-applications.desktop.in (Exec): s/gnome2/gnome diff --git a/capplets/default-applications/gnome-default-applications-properties-structs.c b/capplets/default-applications/gnome-default-applications-properties-structs.c index 3f3607af8..ba98417ef 100644 --- a/capplets/default-applications/gnome-default-applications-properties-structs.c +++ b/capplets/default-applications/gnome-default-applications-properties-structs.c @@ -1,17 +1,8 @@ - -struct _EditorDescription -{ - gchar *name; - gchar *executable_name; - gboolean needs_term; - gboolean accepts_lineno; - gboolean in_path; -}; - struct _BrowserDescription { - gchar *name; + gchar *name; gchar *executable_name; + gchar *command; gboolean needs_term; gboolean nremote; gboolean in_path; @@ -34,34 +25,15 @@ struct _TerminalDesciption gboolean in_path; }; -EditorDescription possible_editors[] = -{ - { "gedit", "gedit", FALSE, FALSE, FALSE }, - { "Emacs", "emacs", FALSE, TRUE, FALSE }, - { "Emacs (terminal)", "emacs", TRUE, TRUE, FALSE }, - { "XEmacs", "xemacs", FALSE, TRUE, FALSE }, - { "vi", "vi", TRUE, TRUE, FALSE }, - { "Go", "go", FALSE, FALSE, FALSE }, - { "GWP", "gwp", FALSE, FALSE, FALSE }, - { "Jed", "jed", TRUE, TRUE, FALSE }, - { "Joe", "joe", TRUE, TRUE, FALSE }, - { "Pico", "pico", TRUE, TRUE, FALSE }, - { "vim", "vim", TRUE, TRUE, FALSE }, - { "gvim", "gvim", FALSE, TRUE, FALSE }, - { "ed", "ed", TRUE, FALSE, FALSE }, - { "GMC/CoolEdit", "gmc -e", FALSE, FALSE, FALSE }, - { "Nedit", "nedit", FALSE, FALSE, FALSE } -}; - BrowserDescription possible_browsers[] = { - { "Lynx Text Browser", "lynx", TRUE, FALSE, FALSE }, - { "Links Text Browser" , "links", TRUE, FALSE, FALSE }, - { "Netscape Communicator", "netscape", FALSE, TRUE, FALSE }, - { "Mozilla/Netscape 6", "mozilla", FALSE, TRUE, FALSE }, - { "Galeon", "galeon", FALSE, FALSE, FALSE }, - { "Encompass", "encompass", FALSE, FALSE, FALSE }, - { "Konqueror", "konqueror", FALSE, FALSE, FALSE } + { "Lynx Text Browser", "lynx", "lynx %s", TRUE, FALSE, FALSE }, + { "Links Text Browser" , "links", "links %s", TRUE, FALSE, FALSE }, + { "Netscape Communicator", "netscape", "netscape %s", FALSE, TRUE, FALSE }, + { "Mozilla/Netscape 6", "mozilla", "mozilla %s", FALSE, TRUE, FALSE }, + { "Galeon", "galeon", "galeon %s", FALSE, FALSE, FALSE }, + { "Encompass", "encompass", "encompass %s", FALSE, FALSE, FALSE }, + { "Konqueror", "konqueror", "konqueror %s", FALSE, FALSE, FALSE } }; HelpViewDescription possible_help_viewers[] = diff --git a/capplets/default-applications/gnome-default-applications-properties.c b/capplets/default-applications/gnome-default-applications-properties.c index 825c78a87..eefba0263 100644 --- a/capplets/default-applications/gnome-default-applications-properties.c +++ b/capplets/default-applications/gnome-default-applications-properties.c @@ -33,31 +33,129 @@ #include #include +#include +#include + #include "capplet-util.h" #include "gconf-property-editor.h" -#define DEFAULT_APPS_KEY_EDITOR_NEEDS_TERM "/desktop/gnome/applications/editor/needs_term" -#define DEFAULT_APPS_KEY_EDITOR_ACCEPTS_LINENO "/desktop/gnome/applications/editor/accepts_lineno" -#define DEFAULT_APPS_KEY_EDITOR_EXEC "/desktop/gnome/applications/editor/exec" -#define DEFAULT_APPS_KEY_BROWSER_NEEDS_TERM "/desktop/gnome/applications/browser/needs_term" -#define DEFAULT_APPS_KEY_BROWSER_NREMOTE "/desktop/gnome/applications/browser/nremote" -#define DEFAULT_APPS_KEY_BROWSER_EXEC "/desktop/gnome/applications/browser/exec" +#define DEFAULT_APPS_KEY_BROWSER_NEEDS_TERM "/desktop/gnome/url-handlers/unknown/need-terminal" +#define DEFAULT_APPS_KEY_BROWSER_EXEC "/desktop/gnome/url-handlers/unknown/command" + #define DEFAULT_APPS_KEY_HELP_VIEWER_NEEDS_TERM "/desktop/gnome/applications/help_viewer/needs_term" #define DEFAULT_APPS_KEY_HELP_VIEWER_ACCEPTS_URLS "/desktop/gnome/applications/help_viewer/accepts_urls" #define DEFAULT_APPS_KEY_HELP_VIEWER_EXEC "/desktop/gnome/applications/help_viewer/exec" + #define DEFAULT_APPS_KEY_TERMINAL_EXEC_ARG "/desktop/gnome/applications/terminal/exec_arg" #define DEFAULT_APPS_KEY_TERMINAL_EXEC "/desktop/gnome/applications/terminal/exec" +#define MIME_APPLICATION_ID "gnome-default-applications-editor" + typedef struct _BrowserDescription BrowserDescription; -typedef struct _EditorDescription EditorDescription; typedef struct _HelpViewDescription HelpViewDescription; typedef struct _TerminalDesciption TerminalDescription; /* All defined below */ #include "gnome-default-applications-properties-structs.c" +static GList *text_editors = NULL; + static GConfClient *client = NULL; +static void +on_text_custom_properties_clicked (GtkWidget *w, GladeXML *dialog) +{ + GtkWidget *d; + int res; + GnomeVFSMimeApplication *mime_app; + const char *command, *name; + + d = WID ("custom_editor_dialog"); + gtk_window_set_transient_for (GTK_WINDOW (d), GTK_WINDOW (WID ("default_applications_dialog"))); + + mime_app = gnome_vfs_application_registry_get_mime_application (MIME_APPLICATION_ID); + + gtk_entry_set_text (GTK_ENTRY (WID ("text_custom_name_entry")), + mime_app ? mime_app->name : ""); + gtk_entry_set_text (GTK_ENTRY (WID ("text_custom_command_entry")), + mime_app ? mime_app->command : ""); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("text_custom_multi_toggle")), + mime_app ? mime_app->can_open_multiple_files : FALSE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("text_custom_terminal_toggle")), + mime_app ? mime_app->requires_terminal : FALSE); + + run_properties_dialog: + res = gtk_dialog_run (GTK_DIALOG (d)); + + if (res != GTK_RESPONSE_OK) { + gtk_widget_hide (d); + gnome_vfs_mime_application_free (mime_app); + return; + } + + name = gtk_entry_get_text (GTK_ENTRY (WID ("text_custom_name_entry"))); + command = gtk_entry_get_text (GTK_ENTRY (WID ("text_custom_command_entry"))); + + if (!*name || !*command) { + GtkWidget *d2; + d2 = gtk_message_dialog_new (GTK_WINDOW (d), + 0, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + _("Please specify a name and a command for this editor.")); + gtk_dialog_run (GTK_DIALOG (d2)); + gtk_widget_destroy (d2); + goto run_properties_dialog; + } + + gtk_widget_hide (d); + + if (mime_app) { + g_free (mime_app->name); + g_free (mime_app->command); + } else { + mime_app = g_new0 (GnomeVFSMimeApplication, 1); + mime_app->id = g_strdup (MIME_APPLICATION_ID); + } + + mime_app->name = g_strdup (name); + mime_app->command = g_strdup (command); + + mime_app->can_open_multiple_files = GTK_TOGGLE_BUTTON (WID ("text_custom_multi_toggle"))->active; + mime_app->requires_terminal = GTK_TOGGLE_BUTTON (WID ("text_custom_terminal_toggle"))->active; + mime_app->expects_uris = GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_PATHS; + +#if 0 + GTK_TOGGLE_BUTTON (WID ("text_custom_uri_toggle"))->active + ? GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_URIS_FOR_NON_FILES + : GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_PATHS; +#endif + + gnome_vfs_application_registry_save_mime_application (mime_app); + + gnome_vfs_mime_set_default_application ("text/plain", mime_app->id); + gnome_vfs_mime_application_free (mime_app); + + gnome_vfs_application_registry_sync (); +} + +static void +on_text_default_viewer_toggle (GtkWidget *toggle, GladeXML *dialog) +{ + GnomeVFSMimeActionType old_action_type, new_action_type; + + old_action_type = gnome_vfs_mime_get_default_action_type ("text/plain"); + new_action_type = GTK_TOGGLE_BUTTON (toggle)->active + ? GNOME_VFS_MIME_ACTION_TYPE_APPLICATION + : GNOME_VFS_MIME_ACTION_TYPE_COMPONENT; + + if (new_action_type == old_action_type) + return; + + gnome_vfs_mime_set_default_action_type ("text/plain", new_action_type); + gnome_vfs_application_registry_sync (); +} + static void generic_guard (GtkWidget *toggle, GtkWidget *widget) { @@ -84,10 +182,8 @@ initialize_default_applications (void) { gint i; - for (i = 0; i < G_N_ELEMENTS (possible_editors); i++ ) { - if (g_find_program_in_path (possible_editors[i].executable_name)) - possible_editors[i].in_path = TRUE; - } + text_editors = gnome_vfs_mime_get_all_applications ("text/plain"); + for (i = 0; i < G_N_ELEMENTS (possible_browsers); i++ ) { if (g_find_program_in_path (possible_browsers[i].executable_name)) possible_browsers[i].in_path = TRUE; @@ -103,67 +199,112 @@ initialize_default_applications (void) } static void -read_editor (GConfClient *client, - GladeXML *dialog) -{ - GError *error = NULL; - gchar *editor; - gboolean needs_term; - gboolean accepts_lineno; - gint i; +update_editor_sensitivity (GladeXML *dialog) +{ + gboolean predefined = GTK_TOGGLE_BUTTON (WID ("text_select_radio"))->active; - needs_term = gconf_client_get_bool (client, DEFAULT_APPS_KEY_EDITOR_NEEDS_TERM, &error); - if (error) { - /* hp will shoot me -- I'll do this later. */ - return; - } - accepts_lineno = gconf_client_get_bool (client, DEFAULT_APPS_KEY_EDITOR_ACCEPTS_LINENO, &error); - if (error) { - return; - } - editor = gconf_client_get_string (client, DEFAULT_APPS_KEY_EDITOR_EXEC, &error); - if (error) { - return; - } - - for (i = 0; i < G_N_ELEMENTS (possible_editors); i++ ) { - if (possible_editors[i].in_path == FALSE) - continue; - - if (editor && strcmp (editor, possible_editors[i].executable_name) == 0 && - needs_term == possible_editors[i].needs_term && - accepts_lineno == possible_editors[i].accepts_lineno) { - gtk_entry_set_text (GTK_ENTRY (WID ("text_select_combo_entry")), - _(possible_editors[i].name)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("text_custom_radio")), TRUE); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("text_select_radio")), TRUE); - g_free (editor); - return; - } - } - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("text_select_radio")), TRUE); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("text_custom_radio")), TRUE); - g_free (editor); + gtk_widget_set_sensitive (WID ("text_select_combo"), predefined); + gtk_widget_set_sensitive (WID ("text_custom_hbox"), !predefined); } static void -text_setup_custom (GtkWidget *entry, +read_editor (GConfClient *client, + GladeXML *dialog) +{ + GnomeVFSMimeApplication *mime_app; + GList *li; + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("text_default_viewer_toggle")), + gnome_vfs_mime_get_default_action_type ("text/plain") == GNOME_VFS_MIME_ACTION_TYPE_APPLICATION); + + mime_app = gnome_vfs_mime_get_default_application ("text/plain"); + if (!strcmp (mime_app->id, MIME_APPLICATION_ID)) + goto read_editor_custom; + + for (li = text_editors; li; li = li->next) { + GnomeVFSMimeApplication *li_app = li->data; + + if (strcmp (mime_app->command, li_app->command) == 0 && + mime_app->requires_terminal == li_app->requires_terminal) { + gtk_entry_set_text (GTK_ENTRY (WID ("text_select_combo_entry")), mime_app->name); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("text_custom_radio")), TRUE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("text_select_radio")), TRUE); + return; + } + } + + /* + * the default editor wasn't set by us, and it wasn't in the + * list. + */ + + g_free (mime_app->id); + mime_app->id = g_strdup (MIME_APPLICATION_ID); + + gnome_vfs_application_registry_save_mime_application (mime_app); + + gnome_vfs_mime_set_default_application ("text/plain", mime_app->id); + gnome_vfs_mime_application_free (mime_app); + + gnome_vfs_application_registry_sync (); + + read_editor_custom: + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("text_select_radio")), TRUE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("text_custom_radio")), TRUE); +} + +static void +text_apply_editor (GtkWidget *entry, GladeXML *dialog) { - gint i; - const gchar *editor = gtk_entry_get_text (GTK_ENTRY (entry)); + GList *li; + GnomeVFSMimeApplication *mime_app; + const gchar *editor; - for (i = 0; i < G_N_ELEMENTS (possible_editors); i++ ) { - if (! strcmp (_(possible_editors[i].name), editor)) { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("text_custom_terminal_toggle")), - possible_editors[i].needs_term); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("text_custom_line_toggle")), - possible_editors[i].accepts_lineno); - gtk_entry_set_text (GTK_ENTRY (WID ("text_custom_command_entry")), - possible_editors[i].executable_name); + if (!GTK_TOGGLE_BUTTON (WID ("text_select_radio"))->active) + return; + + update_editor_sensitivity (dialog); + + editor = gtk_entry_get_text (GTK_ENTRY (WID ("text_select_combo_entry"))); + + for (li = text_editors; li; li = li->next) { + mime_app = li->data; + if (! strcmp (mime_app->name, editor)) { + gnome_vfs_mime_set_default_application ("text/plain", mime_app->id); + gnome_vfs_application_registry_sync (); return; } } + + g_assert_not_reached (); +} + +static void +text_apply_custom (GtkWidget *entry, + GladeXML *dialog) +{ + GnomeVFSMimeApplication *mime_app; + + if (!GTK_TOGGLE_BUTTON (WID ("text_custom_radio"))->active) + return; + + mime_app = gnome_vfs_application_registry_get_mime_application (MIME_APPLICATION_ID); + if (!mime_app) { + on_text_custom_properties_clicked (entry, dialog); + mime_app = gnome_vfs_application_registry_get_mime_application (MIME_APPLICATION_ID); + if (!mime_app) { + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("text_select_radio")), TRUE); + return; + } + } else { + gnome_vfs_mime_set_default_application ("text/plain", mime_app->id); + gnome_vfs_mime_application_free (mime_app); + + gnome_vfs_application_registry_sync (); + } + + update_editor_sensitivity (dialog); } static void @@ -172,17 +313,8 @@ setup_peditors (GConfClient *client, { GConfChangeSet *changeset = NULL; - gconf_peditor_new_boolean (changeset, DEFAULT_APPS_KEY_EDITOR_NEEDS_TERM, - WID ("text_custom_terminal_toggle"), NULL); - gconf_peditor_new_boolean (changeset, DEFAULT_APPS_KEY_EDITOR_ACCEPTS_LINENO, - WID ("text_custom_line_toggle"), NULL); - gconf_peditor_new_string (changeset, DEFAULT_APPS_KEY_EDITOR_EXEC, - WID ("text_custom_command_entry"), NULL); - gconf_peditor_new_boolean (changeset, DEFAULT_APPS_KEY_BROWSER_NEEDS_TERM, WID ("web_custom_terminal_toggle"), NULL); - gconf_peditor_new_boolean (changeset, DEFAULT_APPS_KEY_BROWSER_NREMOTE, - WID ("web_custom_remote_toggle"), NULL); gconf_peditor_new_string (changeset, DEFAULT_APPS_KEY_BROWSER_EXEC, WID ("web_custom_command_entry"), NULL); @@ -206,7 +338,6 @@ read_browser (GConfClient *client, GError *error = NULL; gchar *browser; gboolean needs_term; - gboolean nremote; gint i; needs_term = gconf_client_get_bool (client, DEFAULT_APPS_KEY_BROWSER_NEEDS_TERM, &error); @@ -214,10 +345,6 @@ read_browser (GConfClient *client, /* hp will shoot me -- I'll do this later. */ return; } - nremote = gconf_client_get_bool (client, DEFAULT_APPS_KEY_BROWSER_NREMOTE, &error); - if (error) { - return; - } browser = gconf_client_get_string (client, DEFAULT_APPS_KEY_BROWSER_EXEC, &error); if (error) { return; @@ -227,9 +354,8 @@ read_browser (GConfClient *client, if (possible_browsers[i].in_path == FALSE) continue; - if (browser && strcmp (browser, possible_browsers[i].executable_name) == 0 && - needs_term == possible_browsers[i].needs_term && - nremote == possible_browsers[i].nremote) { + if (browser && strcmp (browser, possible_browsers[i].command) == 0 && + needs_term == possible_browsers[i].needs_term) { gtk_entry_set_text (GTK_ENTRY (WID ("web_select_combo_entry")), _(possible_browsers[i].name)); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("web_custom_radio")), TRUE); @@ -256,10 +382,8 @@ browser_setup_custom (GtkWidget *entry, if (! strcmp (_(possible_browsers[i].name), browser)) { gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("web_custom_terminal_toggle")), possible_browsers[i].needs_term); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("web_custom_remote_toggle")), - possible_browsers[i].nremote); gtk_entry_set_text (GTK_ENTRY (WID ("web_custom_command_entry")), - possible_browsers[i].executable_name); + possible_browsers[i].command); return; } } @@ -411,35 +535,35 @@ dialog_response (GtkDialog *widget, gint response_id, GladeXML *dialog) { + if (response_id == GTK_RESPONSE_HELP) { + GError *error = NULL; - switch (response_id) { - case 1: /* Apply */ - break; - case 2: /* Close */ - case -4: /* keyboard esc or WM close */ + /* TODO : get this written */ + gnome_help_display_desktop (NULL, + "control-center-manual", + "config-default-apps.xml", + "CONFIGURATION", &error); + if (error) { + g_warning ("help error: %s\n", error->message); + g_error_free (error); + } + } else gtk_main_quit (); - break; - default: - g_assert_not_reached (); - }; } static GladeXML * create_dialog (GConfClient *client) { GladeXML *dialog; - GList *strings = NULL; + GList *strings = NULL, *li; gint i; - dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-default-applications-properties.glade", - "default_applications_dialog", - NULL); + dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-default-applications-properties.glade", NULL, NULL); setup_peditors (client, dialog); /* Editors page */ - for (i = 0; i < G_N_ELEMENTS (possible_editors); i++ ) { - if (possible_editors[i].in_path) - strings = g_list_append (strings, _(possible_editors[i].name)); + for (li = text_editors; li; li = li->next) { + strings = g_list_append (strings, ((GnomeVFSMimeApplication *)li->data)->name); } if (strings) { /* We have default editors */ @@ -451,22 +575,22 @@ create_dialog (GConfClient *client) gtk_widget_set_sensitive (WID ("text_select_radio"), FALSE); } - /* Source of command string */ - g_object_set_data (G_OBJECT (WID ("text_select_radio")), "entry", WID ("text_select_combo_entry")); - /* Source of command string */ - g_object_set_data (G_OBJECT (WID ("text_custom_radio")), "entry", WID ("text_custom_command_entry")); + read_editor (client, dialog); + update_editor_sensitivity (dialog); g_signal_connect (G_OBJECT (WID ("text_select_combo_entry")), - "changed", (GCallback) text_setup_custom, + "changed", G_CALLBACK (text_apply_editor), dialog); - g_signal_connect (G_OBJECT (WID ("text_select_radio")), - "toggled", (GCallback) generic_guard, - WID ("text_select_combo")); - g_signal_connect (G_OBJECT (WID ("text_custom_radio")), - "toggled", (GCallback) generic_guard, - WID ("text_custom_vbox")); - - read_editor (client, dialog); + g_signal_connect (WID ("text_custom_properties"), "clicked", + G_CALLBACK (on_text_custom_properties_clicked), + dialog); + g_signal_connect (WID ("text_default_viewer_toggle"), "toggled", + G_CALLBACK (on_text_default_viewer_toggle), + dialog); + g_signal_connect_after (G_OBJECT (WID ("text_select_radio")), "toggled", + G_CALLBACK (text_apply_editor), dialog); + g_signal_connect_after (G_OBJECT (WID ("text_custom_radio")), "toggled", + G_CALLBACK (text_apply_custom), dialog); /* Web browsers page */ for (i = 0; i < G_N_ELEMENTS (possible_browsers); i++ ) { @@ -565,12 +689,11 @@ create_dialog (GConfClient *client) WID ("terminal_custom_table")); read_terminal (client, dialog); - gtk_notebook_remove_page (GTK_NOTEBOOK (WID ("notebook")), 4); - + g_signal_connect (G_OBJECT (client), "value-changed", (GCallback) value_changed_cb, dialog); g_signal_connect (G_OBJECT (WID ("default_applications_dialog")), "response", (GCallback) dialog_response, dialog); - gtk_widget_show_all (WID ("default_applications_dialog")); + gtk_widget_show (WID ("default_applications_dialog")); return dialog; } @@ -604,7 +727,6 @@ main (int argc, char **argv) client = gconf_client_get_default (); - gconf_client_add_dir (client, "/desktop/gnome/applications/editor", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); gconf_client_add_dir (client, "/desktop/gnome/applications/browser", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); gconf_client_add_dir (client, "/desktop/gnome/applications/help_viewer", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); gconf_client_add_dir (client, "/desktop/gnome/applications/terminal", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); diff --git a/capplets/default-applications/gnome-default-applications-properties.glade b/capplets/default-applications/gnome-default-applications-properties.glade index e39ddad12..3648d6d13 100644 --- a/capplets/default-applications/gnome-default-applications-properties.glade +++ b/capplets/default-applications/gnome-default-applications-properties.glade @@ -1,1290 +1,1606 @@ - + - - Preferred Applications - GTK_WINDOW_TOPLEVEL - no - no - yes - no - GTK_WIN_POS_NONE - - - - no - 8 - yes - - - - GTK_BUTTONBOX_END - 8 - yes - - - - yes - yes - yes - gtk-close - yes - 2 - yes - - - - - 0 - no - yes - GTK_PACK_END - - - - - - yes - yes - yes - GTK_POS_TOP - no - 2 - 2 - no - yes - - - - 4 - Default Text Editor - 0 - GTK_SHADOW_ETCHED_IN - yes - - - - 4 - no - 16 - 4 - 2 - 2 - yes - - - - yes - _Select an Editor: - yes - no - yes - yes - - - 0 - 1 - 0 - 1 - 0 - 0 - fill - - - - - - - no - no - no - yes - no - yes - yes - - - - yes - no - - 0 - yes - yes - - - - - - yes - - - - yes - - - - - 0.0 - yes - - - - - - - - - 1 - 2 - 0 - 1 - 0 - 0 - expand|fill - - - - - - - no - 4 - no - yes - - - - no - 4 - yes - - - - Co_mmand: - GTK_JUSTIFY_CENTER - no - 0.5 - 0.5 - 0 - 0 - text_custom_command_entry - yes - yes - - - 0 - no - no - - - - - - yes - yes - - 0 - yes - yes - - - 0 - yes - yes - - - - - 0 - yes - yes - - - - - - yes - Start in T_erminal - no - yes - yes - yes - - - 0 - no - no - - - - - - yes - Accepts Line _Number - no - yes - yes - yes - - - 0 - no - no - - - - - 1 - 2 - 1 - 2 - 0 - 0 - fill - fill - - - - - - 0.5 - 0 - 1 - 0 - yes - - - - yes - C_ustom Editor: - yes - no - yes - yes - text_select_radio - - - - - 0 - 1 - 1 - 2 - 0 - 0 - fill - fill - - - - - - - - - - _Text Editor - GTK_JUSTIFY_CENTER - no - 0.5 - 0.5 - 0 - 0 - yes - yes - - - tab - - - - - - 4 - Default Web Browser - 0 - GTK_SHADOW_ETCHED_IN - yes - - - - 4 - no - 16 - 4 - 2 - 2 - yes - - - - yes - _Select a Web Browser: - yes - no - yes - yes - - - 0 - 1 - 0 - 1 - 0 - 0 - fill - - - - - - - no - no - no - yes - no - yes - yes - - - - yes - no - - 0 - yes - yes - - - - - - yes - - - - yes - - - - - 0.0 - yes - - - - - - - - - 1 - 2 - 0 - 1 - 0 - 0 - expand|fill - - - - - - - no - no - 4 - yes - - - - no - 4 - yes - - - - Co_mmand: - GTK_JUSTIFY_CENTER - no - 0.5 - 0.5 - 0 - 0 - web_custom_command_entry - yes - yes - - - 0 - no - no - - - - - - yes - yes - - 0 - yes - yes - - - 0 - yes - yes - - - - - 0 - yes - yes - - - - - - yes - Start in T_erminal - no - yes - yes - yes - - - 0 - no - no - - - - - - yes - Understands _Netscape Remote Control - no - yes - yes - yes - - - 0 - no - no - - - - - 1 - 2 - 1 - 2 - 0 - 0 - fill - fill - - - - - - 0.5 - 0 - 1 - 0 - yes - - - - yes - C_ustom Web Browser: - yes - no - yes - yes - web_select_radio - - - - - 0 - 1 - 1 - 2 - 0 - 0 - fill - fill - - - - - - - - - - Web _Browser - GTK_JUSTIFY_CENTER - no - 0.5 - 0.5 - 0 - 0 - yes - yes - - - tab - - - - - - 4 - Default Help Browser - 0 - GTK_SHADOW_ETCHED_IN - yes - - - - 4 - no - 16 - 4 - 2 - 2 - yes - - - - yes - _Select a Help Browser: - yes - no - yes - yes - - - 0 - 1 - 0 - 1 - 0 - 0 - fill - - - - - - - no - no - no - yes - no - yes - yes - - - - yes - no - - 0 - yes - yes - - - - - - yes - - - - yes - - - - - 0.0 - yes - - - - - - - - - 1 - 2 - 0 - 1 - 0 - 0 - expand|fill - - - - - - - no - 4 - yes - no - - - - no - 4 - yes - - - - Co_mmand: - GTK_JUSTIFY_CENTER - no - 0.5 - 0.5 - 0 - 0 - help_custom_command_entry - yes - yes - - - 0 - no - no - - - - - - yes - yes - - 0 - yes - yes - - - 0 - yes - yes - - - - - 0 - yes - yes - - - - - - yes - Start in T_erminal - no - yes - yes - yes - - - 0 - no - no - - - - - - yes - Acce_pts URLs - no - yes - yes - yes - - - 0 - no - no - - - - - 1 - 2 - 1 - 2 - 0 - 0 - fill - fill - - - - - - 0.5 - 0 - 1 - 0 - yes - - - - yes - C_ustom Help Browser: - yes - no - yes - yes - help_select_radio - - - - - 0 - 1 - 1 - 2 - 0 - 0 - fill - fill - - - - - - - - - - He_lp Browser - GTK_JUSTIFY_CENTER - no - 0.5 - 0.5 - 0 - 0 - yes - yes - - - tab - - - - - - 4 - Default Terminal - 0 - GTK_SHADOW_ETCHED_IN - yes - - - - 4 - no - 16 - 4 - 2 - 2 - yes - - - - yes - _Select a Terminal: - yes - no - yes - yes - - - 0 - 1 - 0 - 1 - 0 - 0 - fill - - - - - - - no - no - no - yes - no - yes - yes - - - - yes - no - - 0 - yes - yes - - - - - - yes - - - - yes - - - - - 0.0 - yes - - - - - - - - - 1 - 2 - 0 - 1 - 0 - 0 - expand|fill - - - - - - - 0.5 - 0 - 1 - 0 - yes - - - - yes - C_ustom Terminal: - yes - no - yes - yes - terminal_select_radio - - - - - 0 - 1 - 1 - 2 - 0 - 0 - fill - fill - - - - - - no - no - 4 - 4 - 2 - 2 - yes - - - - yes - yes - - 0 - yes - yes - - - 1 - 2 - 0 - 1 - 0 - 0 - expand|fill - - - - - - - yes - yes - - 0 - yes - yes - - - 1 - 2 - 1 - 2 - 0 - 0 - expand|fill - - - - - - - Co_mmand: - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - terminal_custom_command_entry - yes - yes - - - 0 - 1 - 0 - 1 - 0 - 0 - expand|fill - - - - - - - E_xec Flag: - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - terminal_custom_exec_entry - yes - yes - - - 0 - 1 - 1 - 2 - 0 - 0 - expand|fill - - - - - - 1 - 2 - 1 - 2 - 0 - 0 - fill - fill - - - - - - - - - - Te_rminal - GTK_JUSTIFY_CENTER - no - 0.5 - 0.5 - 0 - 0 - yes - yes - - - tab - - - - - - 4 - Default Window Manager - 0 - GTK_SHADOW_ETCHED_IN - yes - - - - 4 - no - 8 - yes - - - - no - 4 - yes - - - - GTK_SHADOW_IN - yes - - - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - yes - - - - yes - - - - - - GTK_UPDATE_CONTINUOUS - yes - - - - - - GTK_UPDATE_CONTINUOUS - yes - - - - - - - 0 - yes - yes - - - - - - no - 4 - yes - - - - yes - GTK_RELIEF_NORMAL - yes - - - - _Add... - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - yes - yes - - - - - 0 - no - no - - - - - - yes - GTK_RELIEF_NORMAL - yes - - - - _Edit... - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - yes - yes - - - - - 0 - no - no - - - - - - yes - GTK_RELIEF_NORMAL - yes - - - - _Delete - GTK_JUSTIFY_CENTER - no - 0 - 0.5 - 0 - 0 - yes - yes - - - - - 0 - no - no - - - - - 0 - no - yes - - - - - 0 - yes - yes - - - - - - yes - - - 0 - no - no - - - - - - no - 4 - yes - - - - Select the window manager you want. You will need to hit apply, wave the magic wand, and do a magic dance for it to work. - GTK_JUSTIFY_LEFT - yes - 0 - 0.5 - 0 - 0 - yes - - - 0 - no - no - - - - - 0 - no - yes - - - - - - - - - - _Window Manager - GTK_JUSTIFY_CENTER - no - 0.5 - 0.5 - 0 - 0 - yes - yes - - - tab - - - - - 0 - yes - yes - - - - - 4 - yes - yes - - - + + + Preferred Applications + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + False + + + + 2 + True + False + 8 + + + + 5 + True + GTK_BUTTONBOX_END + 10 + + + + True + True + True + gtk-close + True + GTK_RELIEF_NORMAL + 2 + + + + + + True + True + True + gtk-help + True + GTK_RELIEF_NORMAL + -11 + + + + + 0 + False + True + GTK_PACK_END + + + + + + True + True + True + True + GTK_POS_TOP + False + 2 + 2 + False + + + + 4 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + 4 + True + 2 + 2 + False + 16 + 4 + + + + True + True + _Select a Web Browser: + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + False + False + True + False + True + False + + + + True + True + False + True + 0 + + True + * + False + + + + + + True + GTK_SELECTION_BROWSE + + + + True + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + + + + + + + 1 + 2 + 0 + 1 + + + + + + + True + False + False + 4 + + + + True + False + 4 + + + + True + Co_mmand: + True + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + web_custom_command_entry + + + 0 + False + False + + + + + + True + True + True + True + 0 + + True + * + False + + + 0 + True + True + + + + + 0 + True + True + + + + + + True + True + Start in T_erminal + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + Understands _Netscape Remote Control + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + 1 + 2 + 1 + 2 + fill + fill + + + + + + True + 0.5 + 0 + 1 + 0 + + + + True + True + C_ustom Web Browser: + True + GTK_RELIEF_NORMAL + False + False + True + web_select_radio + + + + + 0 + 1 + 1 + 2 + fill + fill + + + + + + + + True + Default Web Browser + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + False + True + + + + + + True + Web Browser + True + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + 4 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + 4 + True + 3 + 2 + False + 16 + 4 + + + + True + True + _Select an Editor: + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + False + False + True + False + True + False + + + + True + True + False + True + 0 + + True + * + False + + + + + + True + GTK_SELECTION_BROWSE + + + + True + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + + + + + + + 1 + 2 + 0 + 1 + + + + + + + True + 0.5 + 0 + 1 + 0 + + + + True + True + C_ustom Editor + True + GTK_RELIEF_NORMAL + False + False + True + text_select_radio + + + + + 0 + 1 + 1 + 2 + fill + fill + + + + + + True + False + 8 + + + + True + True + _Properties... + True + GTK_RELIEF_NORMAL + + + 0 + False + False + + + + + 1 + 2 + 1 + 2 + fill + fill + + + + + + True + True + Use this _editor to open text files in the file manager + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + 2 + 2 + 3 + fill + + + + + + + + + True + Default Text Editor + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + False + True + + + + + + True + Text Editor + True + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + 4 + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + 4 + True + 2 + 2 + False + 16 + 4 + + + + True + True + _Select a Help Browser: + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + False + False + True + False + True + False + + + + True + True + False + True + 0 + + True + * + False + + + + + + True + GTK_SELECTION_BROWSE + + + + True + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + + + + + + + 1 + 2 + 0 + 1 + + + + + + + True + False + False + 4 + + + + True + False + 4 + + + + True + Co_mmand: + True + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + help_custom_command_entry + + + 0 + False + False + + + + + + True + True + True + True + 0 + + True + * + False + + + 0 + True + True + + + + + 0 + True + True + + + + + + True + True + Start in T_erminal + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + True + Acce_pts URLs + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + 1 + 2 + 1 + 2 + fill + fill + + + + + + True + 0.5 + 0 + 1 + 0 + + + + True + True + C_ustom Help Browser: + True + GTK_RELIEF_NORMAL + False + False + True + help_select_radio + + + + + 0 + 1 + 1 + 2 + fill + fill + + + + + + + + True + Default Help Browser + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + False + True + + + + + + True + Help Browser + True + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + 4 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + 4 + True + 2 + 2 + False + 16 + 4 + + + + True + True + _Select a Terminal: + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + False + False + True + False + True + False + + + + True + True + False + True + 0 + + True + * + False + + + + + + True + GTK_SELECTION_BROWSE + + + + True + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + + + + + + + 1 + 2 + 0 + 1 + + + + + + + True + 0.5 + 0 + 1 + 0 + + + + True + True + C_ustom Terminal: + True + GTK_RELIEF_NORMAL + False + False + True + terminal_select_radio + + + + + 0 + 1 + 1 + 2 + fill + fill + + + + + + True + False + 2 + 2 + False + 4 + 4 + + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 0 + 1 + + + + + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 1 + 2 + + + + + + + True + Co_mmand: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + terminal_custom_command_entry + + + 0 + 1 + 0 + 1 + + + + + + + True + E_xec Flag: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + terminal_custom_exec_entry + + + 0 + 1 + 1 + 2 + + + + + + 1 + 2 + 1 + 2 + fill + fill + + + + + + + + True + Default Terminal + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + False + True + + + + + + True + Terminal + True + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + 4 + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + 4 + True + False + 8 + + + + True + False + 4 + + + + True + True + GTK_POLICY_ALWAYS + GTK_POLICY_ALWAYS + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + False + True + + + + + 0 + True + True + + + + + + True + False + 4 + + + + True + True + Add... + True + GTK_RELIEF_NORMAL + + + 0 + False + False + + + + + + True + True + Edit... + True + GTK_RELIEF_NORMAL + + + 0 + False + False + + + + + + True + True + Delete + True + GTK_RELIEF_NORMAL + + + 0 + False + False + + + + + 0 + False + True + + + + + 0 + True + True + + + + + + True + + + 0 + False + False + + + + + + True + False + 4 + + + + True + Select the window manager you want. You will need to hit apply, wave the magic wand, and do a magic dance for it to work. + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + 0 + False + True + + + + + + + + True + Default Window Manager + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + False + True + + + + + + True + Window Manager + True + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + 0 + True + True + + + + + + + + Custom Editor Properties + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + False + + + + 2 + True + False + 0 + + + + 5 + True + GTK_BUTTONBOX_END + 10 + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + -6 + + + + + + True + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + -5 + + + + + 0 + False + True + GTK_PACK_END + + + + + + 16 + True + 5 + 2 + False + 6 + 6 + + + + True + _Name: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + text_custom_name_entry + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + Co_mmand: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + text_custom_command_entry + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + True + This application needs to be run in a _shell + True + GTK_RELIEF_NORMAL + False + False + True + + + 1 + 2 + 4 + 5 + fill + + + + + + + True + This application can open _URIs + True + GTK_RELIEF_NORMAL + False + False + True + + + 1 + 2 + 3 + 4 + fill + + + + + + + True + True + This application can open _multiple files + True + GTK_RELIEF_NORMAL + False + False + True + + + 1 + 2 + 2 + 3 + fill + + + + + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 1 + 2 + + + + + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 0 + 1 + + + + + + 0 + True + True + + + + + +