diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am index de3337b78..a68c8e404 100644 --- a/capplets/default-applications/Makefile.am +++ b/capplets/default-applications/Makefile.am @@ -13,8 +13,8 @@ gnome_default_applications_properties_SOURCES = \ @INTLTOOL_DESKTOP_RULE@ -gladedir = $(pkgdatadir)/glade -dist_glade_DATA = gnome-default-applications-properties.glade +uidir = $(pkgdatadir)/ui +dist_ui_DATA = gnome-default-applications-properties.ui gnome-at-visual: gnome-at-commandline.in cp $< $@ @@ -42,7 +42,7 @@ INCLUDES = \ $(GNOMECC_CAPPLETS_CFLAGS) \ $(DEFAULT_APPLICATIONS_CAPPLET_CFLAGS) \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\"\ - -DGNOMECC_GLADE_DIR=\""$(gladedir)"\" \ + -DGNOMECC_UI_DIR=\""$(uidir)"\" \ -DGNOMECC_APPS_DIR=\""$(xmldatadir)"\" icons16dir = $(datadir)/icons/hicolor/16x16/apps diff --git a/capplets/default-applications/gnome-da-capplet.c b/capplets/default-applications/gnome-da-capplet.c index 2b2d99f62..2f3c3a864 100644 --- a/capplets/default-applications/gnome-da-capplet.c +++ b/capplets/default-applications/gnome-da-capplet.c @@ -259,11 +259,11 @@ static struct { static void theme_changed_cb (GtkIconTheme *theme, GnomeDACapplet *capplet) { - GtkWidget *icon; + GObject *icon; gint i; for (i = 0; i < G_N_ELEMENTS (icons); i++) { - icon = glade_xml_get_widget (capplet->xml, icons[i].name); + icon = gtk_builder_get_object (capplet->builder, icons[i].name); set_icon (GTK_IMAGE (icon), theme, icons[i].icon); } @@ -649,19 +649,30 @@ fill_combo_box (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list) -1); } +static GtkWidget* +_gtk_builder_get_widget (GtkBuilder *builder, const gchar *name) +{ + return GTK_WIDGET (gtk_builder_get_object (builder, name)); +} + + static void show_dialog (GnomeDACapplet *capplet, const gchar *start_page) { GObject *obj; + GtkBuilder *builder; + guint builder_result; - if (g_file_test (GNOMECC_GLADE_DIR "/gnome-default-applications-properties.glade", G_FILE_TEST_EXISTS) != FALSE) { - capplet->xml = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-default-applications-properties.glade", NULL, NULL); + capplet->builder = builder = gtk_builder_new (); + + if (g_file_test (GNOMECC_UI_DIR "/gnome-default-applications-properties.ui", G_FILE_TEST_EXISTS) != FALSE) { + builder_result = gtk_builder_add_from_file (builder, GNOMECC_UI_DIR "/gnome-default-applications-properties.ui", NULL); } else { - capplet->xml = glade_xml_new ("./gnome-default-applications-properties.glade", NULL, NULL); + builder_result = gtk_builder_add_from_file (builder, "./gnome-default-applications-properties.ui", NULL); } - if (capplet->xml == NULL) { + if (builder_result == 0) { GtkWidget *dialog; dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, @@ -675,43 +686,43 @@ show_dialog (GnomeDACapplet *capplet, const gchar *start_page) exit (EXIT_FAILURE); } - capplet->window = glade_xml_get_widget (capplet->xml, "preferred_apps_dialog"); + capplet->window = _gtk_builder_get_widget (builder,"preferred_apps_dialog"); g_signal_connect (capplet->window, "response", G_CALLBACK (close_cb), NULL); - capplet->web_browser_command_entry = glade_xml_get_widget (capplet->xml, "web_browser_command_entry"); - capplet->web_browser_command_label = glade_xml_get_widget (capplet->xml, "web_browser_command_label"); - capplet->web_browser_terminal_checkbutton = glade_xml_get_widget (capplet->xml, "web_browser_terminal_checkbutton"); - capplet->default_radiobutton = glade_xml_get_widget (capplet->xml, "web_browser_default_radiobutton"); - capplet->new_win_radiobutton = glade_xml_get_widget (capplet->xml, "web_browser_new_win_radiobutton"); - capplet->new_tab_radiobutton = glade_xml_get_widget (capplet->xml, "web_browser_new_tab_radiobutton"); + capplet->web_browser_command_entry = _gtk_builder_get_widget (builder, "web_browser_command_entry"); + capplet->web_browser_command_label = _gtk_builder_get_widget (builder, "web_browser_command_label"); + capplet->web_browser_terminal_checkbutton = _gtk_builder_get_widget(builder, "web_browser_terminal_checkbutton"); + capplet->default_radiobutton = _gtk_builder_get_widget (builder, "web_browser_default_radiobutton"); + capplet->new_win_radiobutton = _gtk_builder_get_widget (builder, "web_browser_new_win_radiobutton"); + capplet->new_tab_radiobutton = _gtk_builder_get_widget (builder, "web_browser_new_tab_radiobutton"); - capplet->mail_reader_command_entry = glade_xml_get_widget (capplet->xml, "mail_reader_command_entry"); - capplet->mail_reader_command_label = glade_xml_get_widget (capplet->xml, "mail_reader_command_label"); - capplet->mail_reader_terminal_checkbutton = glade_xml_get_widget (capplet->xml, "mail_reader_terminal_checkbutton"); + capplet->mail_reader_command_entry = _gtk_builder_get_widget (builder, "mail_reader_command_entry"); + capplet->mail_reader_command_label = _gtk_builder_get_widget (builder, "mail_reader_command_label"); + capplet->mail_reader_terminal_checkbutton = _gtk_builder_get_widget (builder, "mail_reader_terminal_checkbutton"); - capplet->terminal_command_entry = glade_xml_get_widget (capplet->xml, "terminal_command_entry"); - capplet->terminal_command_label = glade_xml_get_widget (capplet->xml, "terminal_command_label"); - capplet->terminal_exec_flag_entry = glade_xml_get_widget (capplet->xml, "terminal_exec_flag_entry"); - capplet->terminal_exec_flag_label = glade_xml_get_widget (capplet->xml, "terminal_exec_flag_label"); + capplet->terminal_command_entry = _gtk_builder_get_widget (builder, "terminal_command_entry"); + capplet->terminal_command_label = _gtk_builder_get_widget (builder, "terminal_command_label"); + capplet->terminal_exec_flag_entry = _gtk_builder_get_widget (builder, "terminal_exec_flag_entry"); + capplet->terminal_exec_flag_label = _gtk_builder_get_widget (builder, "terminal_exec_flag_label"); - capplet->media_player_command_entry = glade_xml_get_widget (capplet->xml, "media_player_command_entry"); - capplet->media_player_command_label = glade_xml_get_widget (capplet->xml, "media_player_command_label"); - capplet->media_player_terminal_checkbutton = glade_xml_get_widget (capplet->xml, "media_player_terminal_checkbutton"); + capplet->media_player_command_entry = _gtk_builder_get_widget (builder, "media_player_command_entry"); + capplet->media_player_command_label = _gtk_builder_get_widget (builder, "media_player_command_label"); + capplet->media_player_terminal_checkbutton = _gtk_builder_get_widget (builder, "media_player_terminal_checkbutton"); - capplet->visual_command_entry = glade_xml_get_widget (capplet->xml, "visual_command_entry"); - capplet->visual_command_label = glade_xml_get_widget (capplet->xml, "visual_command_label"); - capplet->visual_startup_checkbutton = glade_xml_get_widget (capplet->xml, "visual_start_checkbutton"); + capplet->visual_command_entry = _gtk_builder_get_widget (builder, "visual_command_entry"); + capplet->visual_command_label = _gtk_builder_get_widget (builder, "visual_command_label"); + capplet->visual_startup_checkbutton = _gtk_builder_get_widget (builder, "visual_start_checkbutton"); - capplet->mobility_command_entry = glade_xml_get_widget (capplet->xml, "mobility_command_entry"); - capplet->mobility_command_label = glade_xml_get_widget (capplet->xml, "mobility_command_label"); - capplet->mobility_startup_checkbutton = glade_xml_get_widget (capplet->xml, "mobility_start_checkbutton"); + capplet->mobility_command_entry = _gtk_builder_get_widget (builder, "mobility_command_entry"); + capplet->mobility_command_label = _gtk_builder_get_widget (builder, "mobility_command_label"); + capplet->mobility_startup_checkbutton = _gtk_builder_get_widget (builder, "mobility_start_checkbutton"); - capplet->web_combo_box = glade_xml_get_widget (capplet->xml, "web_browser_combobox"); - capplet->mail_combo_box = glade_xml_get_widget (capplet->xml, "mail_reader_combobox"); - capplet->term_combo_box = glade_xml_get_widget (capplet->xml, "terminal_combobox"); - capplet->media_combo_box = glade_xml_get_widget (capplet->xml, "media_player_combobox"); - capplet->visual_combo_box = glade_xml_get_widget (capplet->xml, "visual_combobox"); - capplet->mobility_combo_box = glade_xml_get_widget (capplet->xml, "mobility_combobox"); + capplet->web_combo_box = _gtk_builder_get_widget (builder, "web_browser_combobox"); + capplet->mail_combo_box = _gtk_builder_get_widget (builder, "mail_reader_combobox"); + capplet->term_combo_box = _gtk_builder_get_widget (builder, "terminal_combobox"); + capplet->media_combo_box = _gtk_builder_get_widget (builder, "media_player_combobox"); + capplet->visual_combo_box = _gtk_builder_get_widget (builder, "visual_combobox"); + capplet->mobility_combo_box = _gtk_builder_get_widget (builder, "mobility_combobox"); g_signal_connect (capplet->window, "screen-changed", G_CALLBACK (screen_changed_cb), capplet); screen_changed_cb (capplet->window, gdk_screen_get_default (), capplet); @@ -863,12 +874,13 @@ show_dialog (GnomeDACapplet *capplet, const gchar *start_page) page_name = g_strconcat (start_page, "_vbox", NULL); - w = glade_xml_get_widget (capplet->xml, page_name); + w = _gtk_builder_get_widget (builder, page_name); if (w != NULL) { GtkNotebook *nb; gint pindex; - nb = GTK_NOTEBOOK (glade_xml_get_widget (capplet->xml, "preferred_apps_notebook")); + nb = GTK_NOTEBOOK (_gtk_builder_get_widget (builder, + "preferred_apps_notebook")); pindex = gtk_notebook_page_num (nb, w); if (pindex != -1) gtk_notebook_set_current_page (nb, pindex); @@ -903,8 +915,6 @@ main (int argc, char **argv) capplet_init (context, &argc, &argv); - glade_init (); - capplet = g_new0 (GnomeDACapplet, 1); capplet->gconf = gconf_client_get_default (); gnome_da_xml_load_list (capplet); diff --git a/capplets/default-applications/gnome-da-capplet.h b/capplets/default-applications/gnome-da-capplet.h index 3d6cbfdf3..2f55f5677 100644 --- a/capplets/default-applications/gnome-da-capplet.h +++ b/capplets/default-applications/gnome-da-capplet.h @@ -22,7 +22,6 @@ #define _GNOME_DA_CAPPLET_H_ #include -#include #include // Set http, https, about, and unknown keys to the chosen web browser. @@ -73,7 +72,7 @@ typedef struct _GnomeDACapplet GnomeDACapplet; struct _GnomeDACapplet { - GladeXML *xml; + GtkBuilder *builder; GtkIconTheme *icon_theme; diff --git a/capplets/default-applications/gnome-da-xml.c b/capplets/default-applications/gnome-da-xml.c index 7dbc2f268..68f8c97dc 100644 --- a/capplets/default-applications/gnome-da-xml.c +++ b/capplets/default-applications/gnome-da-xml.c @@ -318,6 +318,6 @@ gnome_da_xml_free (GnomeDACapplet *capplet) g_list_free (capplet->visual_ats); g_list_free (capplet->mobility_ats); - g_object_unref (capplet->xml); + g_object_unref (capplet->builder); g_free (capplet); } diff --git a/capplets/default-applications/gnome-default-applications-properties.glade b/capplets/default-applications/gnome-default-applications-properties.glade deleted file mode 100644 index 40dc5879f..000000000 --- a/capplets/default-applications/gnome-default-applications-properties.glade +++ /dev/null @@ -1,2146 +0,0 @@ - - - - - - 5 - Preferred Applications - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - False - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-help - True - GTK_RELIEF_NORMAL - True - -11 - - - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - -7 - - - - - 0 - False - True - GTK_PACK_END - - - - - - 5 - True - True - True - True - GTK_POS_TOP - False - False - - - - 12 - True - False - 18 - - - - True - False - 6 - - - - True - <b>Web Browser</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - 0.5 - 0 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - False - True - - - 0 - False - True - - - - - - True - 4 - 3 - False - 6 - 12 - - - - True - All %s occurrences will be replaced with actual link - True - True - True - 0 - - True - False - - - 1 - 2 - 3 - 4 - - - - - - - True - False - True - Run in t_erminal - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 2 - 3 - 3 - 4 - fill - - - - - - - True - False - True - Open link with web browser _default - True - GTK_RELIEF_NORMAL - True - True - False - True - - - 0 - 3 - 0 - 1 - fill - - - - - - - True - False - True - Open link in new _tab - True - GTK_RELIEF_NORMAL - True - False - False - True - web_browser_default_radiobutton - - - 0 - 3 - 2 - 3 - fill - - - - - - - True - False - True - Open link in new _window - True - GTK_RELIEF_NORMAL - True - False - False - True - web_browser_default_radiobutton - - - 0 - 3 - 1 - 2 - fill - - - - - - - True - False - C_ommand: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - web_browser_command_entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - - - - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - True - False - 6 - - - - True - <b>Mail Reader</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - 0.5 - 0 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - False - True - - - 0 - False - True - - - - - - True - 1 - 3 - False - 6 - 12 - - - - True - False - Co_mmand: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - mail_reader_command_entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - All %s occurrences will be replaced with actual link - True - True - True - 0 - - True - False - - - 1 - 2 - 0 - 1 - - - - - - - True - False - True - Run in t_erminal - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 2 - 3 - 0 - 1 - fill - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - - False - False - 6 - - - - True - <b>Instant Messenger</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - 0.5 - 0 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - False - True - - - 0 - False - True - - - - - - True - 1 - 3 - False - 6 - 12 - - - - True - False - Co_mmand: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - messenger_command_entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - All %s occurrences will be replaced with actual link - True - True - True - 0 - - True - False - - - 1 - 2 - 0 - 1 - - - - - - - True - False - True - Run in t_erminal - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 2 - 3 - 0 - 1 - fill - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - True - - - - - False - True - - - - - - True - Internet - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - True - 12 - False - 18 - - - - - False - False - 6 - - - - True - <b>Image Viewer</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - 0.5 - 0 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - False - True - - - 0 - False - True - - - - - - True - 1 - 3 - False - 6 - 12 - - - - True - False - Co_mmand: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - image_command_entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - All %s occurrences will be replaced with actual link - True - True - True - 0 - - True - False - - - 1 - 2 - 0 - 1 - - - - - - - True - False - True - Run in t_erminal - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 2 - 3 - 0 - 1 - fill - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - True - False - 6 - - - - True - <b>Multimedia Player</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - 0.5 - 0 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - False - True - - - 0 - False - True - - - - - - True - 1 - 3 - False - 6 - 12 - - - - True - False - Co_mmand: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - media_player_command_entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - All %s occurrences will be replaced with actual link - True - True - True - 0 - - True - False - - - 1 - 2 - 0 - 1 - - - - - - - True - False - True - Run in t_erminal - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 2 - 3 - 0 - 1 - fill - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - - False - False - 6 - - - - True - <b>Video Player</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - 0.5 - 0 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - False - True - - - 0 - False - True - - - - - - True - 1 - 3 - False - 6 - 12 - - - - True - False - Co_mmand: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - video_command_entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - All %s occurrences will be replaced with actual link - True - True - True - 0 - - True - False - - - 1 - 2 - 0 - 1 - - - - - - - True - False - True - Run in t_erminal - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 2 - 3 - 0 - 1 - fill - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - True - - - - - False - True - - - - - - True - Multimedia - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 12 - True - False - 18 - - - - False - 6 - - - - True - <b>Text Editor</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - 0.5 - 0 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - False - True - - - 0 - False - True - - - - - - True - 1 - 3 - False - 6 - 12 - - - - True - False - Co_mmand: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - text_command_entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - All %s occurrences will be replaced with actual link - True - True - True - 0 - - True - False - - - 1 - 2 - 0 - 1 - - - - - - - True - False - True - Run in t_erminal - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 2 - 3 - 0 - 1 - fill - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - True - False - 6 - - - - True - <b>Terminal Emulator</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - 0.5 - 0 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - False - True - - - 0 - False - True - - - - - - True - 2 - 2 - False - 6 - 12 - - - - True - False - Co_mmand: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - terminal_command_entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - All %s occurrences will be replaced with actual link - True - True - True - 0 - - True - False - - - 1 - 2 - 0 - 1 - - - - - - - True - False - E_xecute flag: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - terminal_exec_flag_entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - True - True - True - 0 - - True - False - - - 1 - 2 - 1 - 2 - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - True - - - - - False - True - - - - - - True - System - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 12 - True - False - 18 - - - - True - False - 6 - - - - True - <b>Visual</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - 0.5 - 0 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - False - True - - - 0 - False - True - - - - - - True - True - _Run at start - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - True - True - - - - - - True - 1 - 2 - False - 6 - 12 - - - - True - False - C_ommand: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - image_command_entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - All %s occurrences will be replaced with actual link - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - True - False - 6 - - - - True - <b>Mobility</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - 0.5 - 0 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - False - True - - - 0 - False - True - - - - - - True - True - Run at st_art - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - True - True - - - - - - True - 1 - 2 - False - 6 - 12 - - - - True - False - Co_mmand: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - sound_command_entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - All %s occurrences will be replaced with actual link - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - True - - - - - False - True - - - - - - True - Accessibility - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - 0 - False - True - - - - - - - diff --git a/capplets/default-applications/gnome-default-applications-properties.ui b/capplets/default-applications/gnome-default-applications-properties.ui new file mode 100644 index 000000000..15e37ebf9 --- /dev/null +++ b/capplets/default-applications/gnome-default-applications-properties.ui @@ -0,0 +1,1363 @@ + + + + + + 5 + Preferred Applications + False + dialog + False + + + True + + + True + True + 5 + + + True + 12 + 18 + + + True + 6 + + + True + 0 + <b>Web Browser</b> + True + + + False + False + 0 + + + + + True + 12 + + + True + 0 + + + False + False + 0 + + + + + True + 6 + + + True + + + False + 0 + + + + + True + 4 + 3 + 12 + 6 + + + True + True + All %s occurrences will be replaced with actual link + + + 1 + 2 + 3 + 4 + + + + + + Run in t_erminal + True + False + True + False + True + True + + + 2 + 3 + 3 + 4 + GTK_FILL + + + + + + Open link with web browser _default + True + False + True + False + True + True + True + + + 3 + GTK_FILL + + + + + + Open link in new _tab + True + False + True + False + True + True + web_browser_default_radiobutton + + + 3 + 2 + 3 + GTK_FILL + + + + + + Open link in new _window + True + False + True + False + True + True + web_browser_default_radiobutton + + + 3 + 1 + 2 + GTK_FILL + + + + + + True + False + 0 + C_ommand: + True + web_browser_command_entry + + + 3 + 4 + GTK_FILL + + + + + + False + False + 1 + + + + + 1 + + + + + 1 + + + + + False + 0 + + + + + True + 6 + + + True + 0 + <b>Mail Reader</b> + True + + + False + False + 0 + + + + + True + 12 + + + True + 0 + + + False + False + 0 + + + + + True + 6 + + + True + + + False + 0 + + + + + True + 3 + 12 + 6 + + + True + False + 0 + Co_mmand: + True + mail_reader_command_entry + + + GTK_FILL + + + + + + True + True + All %s occurrences will be replaced with actual link + + + 1 + 2 + + + + + + Run in t_erminal + True + False + True + False + True + True + + + 2 + 3 + GTK_FILL + + + + + + 1 + + + + + 1 + + + + + 1 + + + + + False + 1 + + + + + 6 + + + True + 0 + <b>Instant Messenger</b> + True + + + False + False + 0 + + + + + True + 12 + + + True + 0 + + + False + False + 0 + + + + + True + 6 + + + True + + + False + 0 + + + + + True + 3 + 12 + 6 + + + True + False + 0 + Co_mmand: + True + messenger_command_entry + + + GTK_FILL + + + + + + True + True + All %s occurrences will be replaced with actual link + + + 1 + 2 + + + + + + Run in t_erminal + True + False + True + False + True + True + + + 2 + 3 + GTK_FILL + + + + + + 1 + + + + + 1 + + + + + 1 + + + + + False + 2 + + + + + + + True + Internet + + + False + + + + + True + 12 + 18 + + + 6 + + + True + 0 + <b>Image Viewer</b> + True + + + False + False + 0 + + + + + True + 12 + + + True + 0 + + + False + False + 0 + + + + + True + 6 + + + True + + + False + 0 + + + + + True + 3 + 12 + 6 + + + True + False + 0 + Co_mmand: + True + image_command_entry + + + GTK_FILL + + + + + + True + True + All %s occurrences will be replaced with actual link + + + 1 + 2 + + + + + + Run in t_erminal + True + False + True + False + True + True + + + 2 + 3 + GTK_FILL + + + + + + 1 + + + + + 1 + + + + + 1 + + + + + False + 0 + + + + + True + 6 + + + True + 0 + <b>Multimedia Player</b> + True + + + False + False + 0 + + + + + True + 12 + + + True + 0 + + + False + False + 0 + + + + + True + 6 + + + True + + + False + 0 + + + + + True + 3 + 12 + 6 + + + True + False + 0 + Co_mmand: + True + media_player_command_entry + + + GTK_FILL + + + + + + True + True + All %s occurrences will be replaced with actual link + + + 1 + 2 + + + + + + Run in t_erminal + True + False + True + False + True + True + + + 2 + 3 + GTK_FILL + + + + + + 1 + + + + + 1 + + + + + 1 + + + + + False + 1 + + + + + 6 + + + True + 0 + <b>Video Player</b> + True + + + False + False + 0 + + + + + True + 12 + + + True + 0 + + + False + False + 0 + + + + + True + 6 + + + True + + + False + 0 + + + + + True + 3 + 12 + 6 + + + True + False + 0 + Co_mmand: + True + video_command_entry + + + GTK_FILL + + + + + + True + True + All %s occurrences will be replaced with actual link + + + 1 + 2 + + + + + + Run in t_erminal + True + False + True + False + True + True + + + 2 + 3 + GTK_FILL + + + + + + 1 + + + + + 1 + + + + + 1 + + + + + False + 2 + + + + + 1 + + + + + True + Multimedia + + + 1 + False + + + + + True + 12 + 18 + + + 6 + + + True + 0 + <b>Text Editor</b> + True + + + False + False + 0 + + + + + True + 12 + + + True + 0 + + + False + False + 0 + + + + + True + 6 + + + True + + + False + 0 + + + + + True + 3 + 12 + 6 + + + True + False + 0 + Co_mmand: + True + text_command_entry + + + GTK_FILL + + + + + + True + True + All %s occurrences will be replaced with actual link + + + 1 + 2 + + + + + + Run in t_erminal + True + False + True + False + True + True + + + 2 + 3 + GTK_FILL + + + + + + 1 + + + + + 1 + + + + + 1 + + + + + False + 0 + + + + + True + 6 + + + True + 0 + <b>Terminal Emulator</b> + True + + + False + False + 0 + + + + + True + 12 + + + True + 0 + + + False + False + 0 + + + + + True + 6 + + + True + + + False + 0 + + + + + True + 2 + 2 + 12 + 6 + + + True + False + 0 + Co_mmand: + True + terminal_command_entry + + + GTK_FILL + + + + + + True + True + All %s occurrences will be replaced with actual link + + + 1 + 2 + + + + + + True + False + 0 + E_xecute flag: + True + terminal_exec_flag_entry + + + 1 + 2 + GTK_FILL + + + + + + True + True + + + 1 + 2 + 1 + 2 + + + + + + 1 + + + + + 1 + + + + + 1 + + + + + False + 1 + + + + + 2 + + + + + True + System + + + 2 + False + + + + + True + 12 + 18 + + + True + 6 + + + True + 0 + <b>Visual</b> + True + + + False + False + 0 + + + + + True + 12 + + + True + 0 + + + False + False + 0 + + + + + True + 6 + + + True + + + False + 0 + + + + + _Run at start + True + True + False + True + True + + + 1 + + + + + True + 2 + 12 + 6 + + + True + False + 0 + C_ommand: + True + image_command_entry + + + GTK_FILL + + + + + + True + True + All %s occurrences will be replaced with actual link + + + 1 + 2 + + + + + + 2 + + + + + 1 + + + + + 1 + + + + + False + 0 + + + + + True + 6 + + + True + 0 + <b>Mobility</b> + True + + + False + False + 0 + + + + + True + 12 + + + True + 0 + + + False + False + 0 + + + + + True + 6 + + + True + + + False + 0 + + + + + Run at st_art + True + True + False + True + True + + + 1 + + + + + True + 2 + 12 + 6 + + + True + False + 0 + Co_mmand: + True + + + GTK_FILL + + + + + + True + True + All %s occurrences will be replaced with actual link + + + 1 + 2 + + + + + + 2 + + + + + 1 + + + + + 1 + + + + + False + 1 + + + + + 3 + + + + + True + Accessibility + + + 3 + False + + + + + False + 1 + + + + + True + end + + + gtk-help + True + True + True + False + True + + + False + False + 0 + + + + + gtk-close + True + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + helpbutton1 + closebutton1 + + + diff --git a/po/POTFILES.in b/po/POTFILES.in index 9a8aa52ff..cb2a5f178 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -36,7 +36,7 @@ capplets/common/gnome-theme-info.c capplets/default-applications/default-applications.desktop.in.in capplets/default-applications/gnome-at-session.desktop.in.in capplets/default-applications/gnome-da-capplet.c -capplets/default-applications/gnome-default-applications-properties.glade +[type: gettext/glade]capplets/default-applications/gnome-default-applications-properties.ui capplets/default-applications/gnome-default-applications.xml.in [type: gettext/glade]capplets/display/display-capplet.ui capplets/display/display-properties.desktop.in.in