From cf740f7f9b16c589d817de512671abc71608bb42 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Tue, 7 Oct 2008 19:49:14 +0000 Subject: Require trunk eel. Drop libgnome* and librsvg deps. 2008-10-07 Alexander Larsson * configure.in: Require trunk eel. Drop libgnome* and librsvg deps. * libnautilus-private/nautilus-customization-data.c: (nautilus_customization_data_get_next_element_for_display): * libnautilus-private/nautilus-icon-canvas-item.c: (real_map_pixbuf): * src/nautilus-property-browser.c: (make_drag_image): Use librsvg indirectly via gdk-pixbuf loader. * libnautilus-private/nautilus-thumbnails.c: Use thumbnail factory from gnome-desktop. * libnautilus-private/nautilus-undo.c: (nautilus_undo_get_undo_manager): Kill references to gnome canvas. * libnautilus-private/nautilus-vfs-file.c: Don't include removed eel-mount-operation.h header * src/file-manager/fm-properties-window.c: (update_preview_callback): Use thumbnail utils from gnome-desktop. * src/Makefile.am: * src/nautilus-bookmarks-window.c: * src/nautilus-bookmarks-window.glade: Removed. * src/nautilus-bookmarks-window.ui: Added. * src/nautilus-file-management-properties.c: * src/nautilus-file-management-properties.glade: Removed. * src/nautilus-file-management-properties.ui: Added. Switch from libglade to gtkbuilder. * libnautilus-private/nautilus-file-operations.c: * src/nautilus-emblem-sidebar.c: * src/nautilus-navigation-window.h: * test/test-nautilus-wrap-table.c: * test/test.c: * test/test.h: Drop old unused libgnome/librsvg includes svn path=/trunk/; revision=14704 --- src/Makefile.am | 13 +- src/file-manager/fm-properties-window.c | 6 +- src/nautilus-bookmarks-window.c | 32 +- src/nautilus-bookmarks-window.glade | 400 ---- src/nautilus-bookmarks-window.ui | 370 +++ src/nautilus-emblem-sidebar.c | 1 - src/nautilus-file-management-properties.c | 304 +-- src/nautilus-file-management-properties.glade | 2970 ------------------------ src/nautilus-file-management-properties.ui | 3074 +++++++++++++++++++++++++ src/nautilus-navigation-window.h | 1 - src/nautilus-property-browser.c | 12 +- 11 files changed, 3625 insertions(+), 3558 deletions(-) delete mode 100644 src/nautilus-bookmarks-window.glade create mode 100644 src/nautilus-bookmarks-window.ui delete mode 100644 src/nautilus-file-management-properties.glade create mode 100644 src/nautilus-file-management-properties.ui (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 92ffed941..3e9ace01e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,7 +19,7 @@ INCLUDES = \ -DDATADIR=\""$(datadir)"\" \ -DLIBDIR=\""$(libdir)"\" \ -DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \ - -DGLADEDIR=\""$(datadir)/nautilus/glade"\" \ + -DUIDIR=\""$(datadir)/nautilus/ui"\" \ -DNAUTILUS_PIXMAPDIR=\""$(datadir)/pixmaps/nautilus"\" \ -DPREFIX=\""$(prefix)"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ @@ -158,13 +158,9 @@ uidir = $(datadir)/nautilus/ui ui_DATA = \ nautilus-shell-ui.xml \ nautilus-navigation-window-ui.xml \ - nautilus-spatial-window-ui.xml \ - $(NULL) - -gladedir = $(datadir)/nautilus/glade -glade_DATA = \ - nautilus-bookmarks-window.glade \ - nautilus-file-management-properties.glade \ + nautilus-spatial-window-ui.xml \ + nautilus-file-management-properties.ui \ + nautilus-bookmarks-window.ui \ $(NULL) CLEANFILES = \ @@ -174,7 +170,6 @@ CLEANFILES = \ EXTRA_DIST = \ $(server_in_files) \ - $(glade_DATA) \ $(ui_DATA) \ check-nautilus \ $(desktop_in_files) \ diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c index f015ddfe0..9929920b7 100644 --- a/src/file-manager/fm-properties-window.c +++ b/src/file-manager/fm-properties-window.c @@ -26,6 +26,8 @@ #include "fm-properties-window.h" #include "fm-ditem-page.h" +#define GNOME_DESKTOP_USE_UNSTABLE_API + #include "fm-error-reporting.h" #include "libnautilus-private/nautilus-mime-application-chooser.h" #include @@ -41,7 +43,7 @@ #include #include #include -#include +#include #include #include #include @@ -5649,7 +5651,7 @@ update_preview_callback (GtkFileChooser *icon_chooser, scale = (double)gdk_pixbuf_get_height (pixbuf) / gdk_pixbuf_get_width (pixbuf); - scaled_pixbuf = gnome_thumbnail_scale_down_pixbuf + scaled_pixbuf = gnome_desktop_thumbnail_scale_down_pixbuf (pixbuf, PREVIEW_IMAGE_WIDTH, scale * PREVIEW_IMAGE_WIDTH); diff --git a/src/nautilus-bookmarks-window.c b/src/nautilus-bookmarks-window.c index 1a0672cf3..b2d3757e6 100644 --- a/src/nautilus-bookmarks-window.c +++ b/src/nautilus-bookmarks-window.c @@ -37,7 +37,6 @@ #include #include #include -#include /* Static variables to keep track of window state. If there were * more than one bookmark-editing window, these would be struct or @@ -250,21 +249,22 @@ create_bookmarks_window (NautilusBookmarkList *list, GObject *undo_manager_sourc GtkWidget *window; GtkTreeViewColumn *col; GtkCellRenderer *rend; - GladeXML *gui; + GtkBuilder *builder; bookmarks = list; - gui = eel_glade_get_file (GLADEDIR "/nautilus-bookmarks-window.glade", - NULL, NULL, - "bookmarks_dialog", &window, - "bookmark_tree_view", &bookmark_list_widget, - "bookmark_delete_button", &remove_button, - "bookmark_jump_button", &jump_button, - NULL); - if (!gui) { + builder = gtk_builder_new (); + if (!gtk_builder_add_from_file (builder, + UIDIR "/nautilus-bookmarks-window.ui", + NULL)) { return NULL; } + window = (GtkWidget *)gtk_builder_get_object (builder, "bookmarks_dialog"); + bookmark_list_widget = (GtkTreeView *)gtk_builder_get_object (builder, "bookmark_tree_view"); + remove_button = (GtkWidget *)gtk_builder_get_object (builder, "bookmark_delete_button"); + jump_button = (GtkWidget *)gtk_builder_get_object (builder, "bookmark_jump_button"); + application = NAUTILUS_WINDOW (undo_manager_source)->application; if (NAUTILUS_IS_NAVIGATION_WINDOW (undo_manager_source)) { @@ -282,7 +282,7 @@ create_bookmarks_window (NautilusBookmarkList *list, GObject *undo_manager_sourc g_object_weak_ref (G_OBJECT (undo_manager_source), edit_bookmarks_dialog_reset_signals, undo_manager_source); - bookmark_list_widget = GTK_TREE_VIEW (glade_xml_get_widget (gui, "bookmark_tree_view")); + bookmark_list_widget = GTK_TREE_VIEW (gtk_builder_get_object (builder, "bookmark_tree_view")); rend = gtk_cell_renderer_pixbuf_new (); col = gtk_tree_view_column_new_with_attributes ("Icon", @@ -317,22 +317,22 @@ create_bookmarks_window (NautilusBookmarkList *list, GObject *undo_manager_sourc name_field = nautilus_entry_new (); gtk_widget_show (name_field); - gtk_box_pack_start (GTK_BOX (glade_xml_get_widget (gui, "bookmark_name_placeholder")), + gtk_box_pack_start (GTK_BOX (gtk_builder_get_object (builder, "bookmark_name_placeholder")), name_field, TRUE, TRUE, 0); nautilus_undo_editable_set_undo_key (GTK_EDITABLE (name_field), TRUE); gtk_label_set_mnemonic_widget ( - GTK_LABEL (glade_xml_get_widget (gui, "bookmark_name_label")), + GTK_LABEL (gtk_builder_get_object (builder, "bookmark_name_label")), name_field); uri_field = nautilus_entry_new (); gtk_widget_show (uri_field); - gtk_box_pack_start (GTK_BOX (glade_xml_get_widget (gui, "bookmark_location_placeholder")), + gtk_box_pack_start (GTK_BOX (gtk_builder_get_object (builder, "bookmark_location_placeholder")), uri_field, TRUE, TRUE, 0); nautilus_undo_editable_set_undo_key (GTK_EDITABLE (uri_field), TRUE); gtk_label_set_mnemonic_widget ( - GTK_LABEL (glade_xml_get_widget (gui, "bookmark_location_label")), + GTK_LABEL (gtk_builder_get_object (builder, "bookmark_location_label")), uri_field); bookmark_list_changed_signal_id = @@ -394,7 +394,7 @@ create_bookmarks_window (NautilusBookmarkList *list, GObject *undo_manager_sourc /* Fill in list widget with bookmarks, must be after signals are wired up. */ repopulate(); - g_object_unref (G_OBJECT (gui)); + g_object_unref (builder); return GTK_WINDOW (window); } diff --git a/src/nautilus-bookmarks-window.glade b/src/nautilus-bookmarks-window.glade deleted file mode 100644 index 65c2437fa..000000000 --- a/src/nautilus-bookmarks-window.glade +++ /dev/null @@ -1,400 +0,0 @@ - - - - - - - - 5 - Edit Bookmarks - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER - False - True - False - False - - - - True - False - 2 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-help - True - GTK_RELIEF_NORMAL - -11 - - - - - - True - True - True - gtk-jump-to - True - GTK_RELIEF_NORMAL - -10 - - - - - - True - True - True - gtk-remove - True - GTK_RELIEF_NORMAL - -2 - - - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - -7 - - - - - 0 - False - True - GTK_PACK_END - - - - - - 5 - True - True - 18 - - - - True - 0.5 - 0.5 - 1 - 1 - - - - True - False - 6 - - - - True - <b>_Bookmarks</b> - True - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - bookmark_tree_view - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - False - False - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - 0 - True - True - - - - - - True - 0.5 - 0.5 - 1 - 1 - - - - True - False - 18 - - - - True - False - 6 - - - - True - <b>_Name</b> - True - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - True - False - 6 - - - - True - <b>_Location</b> - True - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 2 - 2 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - diff --git a/src/nautilus-bookmarks-window.ui b/src/nautilus-bookmarks-window.ui new file mode 100644 index 000000000..3c5e47e68 --- /dev/null +++ b/src/nautilus-bookmarks-window.ui @@ -0,0 +1,370 @@ + + + + + 5 + Edit Bookmarks + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER + False + True + False + False + + + True + False + 2 + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-help + True + GTK_RELIEF_NORMAL + + + + + True + True + True + gtk-jump-to + True + GTK_RELIEF_NORMAL + + + + + True + True + True + gtk-remove + True + GTK_RELIEF_NORMAL + + + + + True + True + True + gtk-close + True + GTK_RELIEF_NORMAL + + + + + 0 + False + True + GTK_PACK_END + + + + + 5 + True + True + 18 + + + True + 0.5 + 0.5 + 1 + 1 + + + True + False + 6 + + + True + <b>_Bookmarks</b> + True + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + bookmark_tree_view + + + 0 + False + False + + + + + True + False + 0 + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + True + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + True + True + False + False + True + True + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + 0 + True + True + + + + + True + 0.5 + 0.5 + 1 + 1 + + + True + False + 18 + + + True + False + 6 + + + True + <b>_Name</b> + True + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + False + 0 + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + False + 0 + + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + False + True + + + + + True + False + 6 + + + True + <b>_Location</b> + True + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 2 + 2 + + + 0 + False + False + + + + + True + False + 0 + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True + False + 0 + + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + False + True + + + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + helpbutton1 + bookmark_jump_button + bookmark_delete_button + button2 + + + diff --git a/src/nautilus-emblem-sidebar.c b/src/nautilus-emblem-sidebar.c index 483598573..240a8c1c9 100644 --- a/src/nautilus-emblem-sidebar.c +++ b/src/nautilus-emblem-sidebar.c @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include diff --git a/src/nautilus-file-management-properties.c b/src/nautilus-file-management-properties.c index 596c22cac..a3be3858a 100644 --- a/src/nautilus-file-management-properties.c +++ b/src/nautilus-file-management-properties.c @@ -33,11 +33,9 @@ #include -#include - #include #include -#include +#include #include #include @@ -163,20 +161,21 @@ static const char * const icon_captions_components[] = { }; static void -nautilus_file_management_properties_size_group_create (GladeXML *xml_dialog, +nautilus_file_management_properties_size_group_create (GtkBuilder *builder, char *prefix, int items) { GtkSizeGroup *size_group; int i; char *item_name; + GtkWidget *widget; size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); for (i = 0; i < items; i++) { item_name = g_strdup_printf ("%s_%d", prefix, i); - gtk_size_group_add_widget (size_group, - glade_xml_get_widget (xml_dialog, item_name)); + widget = GTK_WIDGET (gtk_builder_get_object (builder, item_name)); + gtk_size_group_add_widget (size_group, widget); g_free (item_name); } g_object_unref (G_OBJECT (size_group)); @@ -222,12 +221,12 @@ preferences_show_help (GtkWindow *parent, static void nautilus_file_management_properties_dialog_response_cb (GtkDialog *parent, int response_id, - GladeXML *xml_dialog) + GtkBuilder *builder) { char *section; if (response_id == GTK_RESPONSE_HELP) { - switch (gtk_notebook_get_current_page (GTK_NOTEBOOK (glade_xml_get_widget (xml_dialog, "notebook1")))) { + switch (gtk_notebook_get_current_page (GTK_NOTEBOOK (gtk_builder_get_object (builder, "notebook1")))) { default: case 0: section = "gosnautilus-438"; @@ -324,10 +323,10 @@ icon_captions_changed_callback (GtkComboBox *combo_box, gpointer user_data) { GPtrArray *captions; - GladeXML *xml; + GtkBuilder *builder; int i; - xml = GLADE_XML (user_data); + builder = GTK_BUILDER (user_data); captions = g_ptr_array_new (); @@ -337,8 +336,8 @@ icon_captions_changed_callback (GtkComboBox *combo_box, GPtrArray *column_names; char *name; - combo_box = glade_xml_get_widget - (GLADE_XML (xml), icon_captions_components[i]); + combo_box = GTK_WIDGET (gtk_builder_get_object + (builder, icon_captions_components[i])); active = gtk_combo_box_get_active (GTK_COMBO_BOX (combo_box)); column_names = g_object_get_data (G_OBJECT (combo_box), @@ -355,7 +354,7 @@ icon_captions_changed_callback (GtkComboBox *combo_box, } static void -update_caption_combo_box (GladeXML *xml, +update_caption_combo_box (GtkBuilder *builder, const char *combo_box_name, const char *name) { @@ -363,12 +362,12 @@ update_caption_combo_box (GladeXML *xml, int i; GPtrArray *column_names; - combo_box = glade_xml_get_widget (xml, combo_box_name); + combo_box = GTK_WIDGET (gtk_builder_get_object (builder, combo_box_name)); g_signal_handlers_block_by_func (combo_box, G_CALLBACK (icon_captions_changed_callback), - xml); + builder); column_names = g_object_get_data (G_OBJECT (combo_box), "column_names"); @@ -383,11 +382,11 @@ update_caption_combo_box (GladeXML *xml, g_signal_handlers_unblock_by_func (combo_box, G_CALLBACK (icon_captions_changed_callback), - xml); + builder); } static void -update_icon_captions_from_gconf (GladeXML *xml) +update_icon_captions_from_gconf (GtkBuilder *builder) { char **captions; int i, j; @@ -408,7 +407,7 @@ update_icon_captions_from_gconf (GladeXML *xml) data = "none"; } - update_caption_combo_box (xml, + update_caption_combo_box (builder, icon_captions_components[i], data); } @@ -417,7 +416,7 @@ update_icon_captions_from_gconf (GladeXML *xml) } static void -nautilus_file_management_properties_dialog_setup_icon_caption_page (GladeXML *xml_dialog) +nautilus_file_management_properties_dialog_setup_icon_caption_page (GtkBuilder *builder) { GList *columns; int i; @@ -430,31 +429,32 @@ nautilus_file_management_properties_dialog_setup_icon_caption_page (GladeXML *xm for (i = 0; icon_captions_components[i] != NULL; i++) { GtkWidget *combo_box; - combo_box = glade_xml_get_widget (xml_dialog, - icon_captions_components[i]); + combo_box = GTK_WIDGET (gtk_builder_get_object (builder, + icon_captions_components[i])); create_icon_caption_combo_box_items (GTK_COMBO_BOX (combo_box), columns); gtk_widget_set_sensitive (combo_box, writable); g_signal_connect (combo_box, "changed", G_CALLBACK (icon_captions_changed_callback), - xml_dialog); + builder); } nautilus_column_list_free (columns); - update_icon_captions_from_gconf (xml_dialog); + update_icon_captions_from_gconf (builder); } static void -create_date_format_menu (GladeXML *xml_dialog) +create_date_format_menu (GtkBuilder *builder) { GtkWidget *combo_box; gchar *date_string; time_t now_raw; struct tm* now; - combo_box = glade_xml_get_widget (xml_dialog, - NAUTILUS_FILE_MANAGEMENT_PROPERTIES_DATE_FORMAT_WIDGET); + + combo_box = GTK_WIDGET (gtk_builder_get_object (builder, + NAUTILUS_FILE_MANAGEMENT_PROPERTIES_DATE_FORMAT_WIDGET)); now_raw = time (NULL); now = localtime (&now_raw); @@ -499,7 +499,7 @@ use_default_callback (NautilusColumnChooser *chooser, } static void -nautilus_file_management_properties_dialog_setup_list_column_page (GladeXML *xml_dialog) +nautilus_file_management_properties_dialog_setup_list_column_page (GtkBuilder *builder) { GtkWidget *chooser; GtkWidget *box; @@ -513,15 +513,15 @@ nautilus_file_management_properties_dialog_setup_list_column_page (GladeXML *xml set_columns_from_gconf (NAUTILUS_COLUMN_CHOOSER (chooser)); gtk_widget_show (chooser); - box = glade_xml_get_widget (xml_dialog, "list_columns_vbox"); + box = GTK_WIDGET (gtk_builder_get_object (builder, "list_columns_vbox")); gtk_box_pack_start (GTK_BOX (box), chooser, TRUE, TRUE, 0); } static void -nautilus_file_management_properties_dialog_update_media_sensitivity (GladeXML *xml_dialog) +nautilus_file_management_properties_dialog_update_media_sensitivity (GtkBuilder *builder) { - gtk_widget_set_sensitive (glade_xml_get_widget (xml_dialog, "media_handling_vbox"), + gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "media_handling_vbox")), ! eel_preferences_get_boolean (NAUTILUS_PREFERENCES_MEDIA_AUTORUN_NEVER)); } @@ -559,7 +559,7 @@ out: static void -nautilus_file_management_properties_dialog_setup_media_page (GladeXML *xml_dialog) +nautilus_file_management_properties_dialog_setup_media_page (GtkBuilder *builder) { unsigned int n; GList *l; @@ -576,11 +576,11 @@ nautilus_file_management_properties_dialog_setup_media_page (GladeXML *xml_dialo NULL}; for (n = 0; s[n*2] != NULL; n++) { - nautilus_autorun_prepare_combo_box (glade_xml_get_widget (xml_dialog, s[n*2]), s[n*2 + 1], + nautilus_autorun_prepare_combo_box (GTK_WIDGET (gtk_builder_get_object (builder, s[n*2])), s[n*2 + 1], TRUE, TRUE, TRUE, NULL, NULL); } - other_type_combo_box = glade_xml_get_widget (xml_dialog, "media_other_type_combobox"); + other_type_combo_box = GTK_WIDGET (gtk_builder_get_object (builder, "media_other_type_combobox")); other_type_list_store = gtk_list_store_new (3, GDK_TYPE_PIXBUF, @@ -653,15 +653,15 @@ nautilus_file_management_properties_dialog_setup_media_page (GladeXML *xml_dialo g_signal_connect (G_OBJECT (other_type_combo_box), "changed", G_CALLBACK (other_type_combo_box_changed), - glade_xml_get_widget (xml_dialog, "media_other_action_combobox")); + gtk_builder_get_object (builder, "media_other_action_combobox")); gtk_combo_box_set_active (GTK_COMBO_BOX (other_type_combo_box), 0); - nautilus_file_management_properties_dialog_update_media_sensitivity (xml_dialog); + nautilus_file_management_properties_dialog_update_media_sensitivity (builder); } static void -nautilus_file_management_properties_dialog_setup (GladeXML *xml_dialog, GtkWindow *window) +nautilus_file_management_properties_dialog_setup (GtkBuilder *builder, GtkWindow *window) { GtkWidget *dialog; @@ -678,130 +678,129 @@ nautilus_file_management_properties_dialog_setup (GladeXML *xml_dialog, GtkWindo eel_gconf_preload_cache ("/desktop/gnome/file_views", GCONF_CLIENT_PRELOAD_ONELEVEL); /* setup UI */ - nautilus_file_management_properties_size_group_create (xml_dialog, + nautilus_file_management_properties_size_group_create (builder, "views_label", 5); - nautilus_file_management_properties_size_group_create (xml_dialog, + nautilus_file_management_properties_size_group_create (builder, "captions_label", 3); - nautilus_file_management_properties_size_group_create (xml_dialog, + nautilus_file_management_properties_size_group_create (builder, "preview_label", 5); - create_date_format_menu (xml_dialog); + create_date_format_menu (builder); /* setup preferences */ - eel_preferences_glade_connect_bool (xml_dialog, - NAUTILUS_FILE_MANAGEMENT_PROPERTIES_COMPACT_LAYOUT_WIDGET, - NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_TIGHTER_LAYOUT); - eel_preferences_glade_connect_bool (xml_dialog, - NAUTILUS_FILE_MANAGEMENT_PROPERTIES_LABELS_BESIDE_ICONS_WIDGET, - NAUTILUS_PREFERENCES_ICON_VIEW_LABELS_BESIDE_ICONS); - eel_preferences_glade_connect_bool (xml_dialog, - NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ALL_COLUMNS_SAME_WIDTH, - NAUTILUS_PREFERENCES_COMPACT_VIEW_ALL_COLUMNS_SAME_WIDTH); - eel_preferences_glade_connect_bool (xml_dialog, - NAUTILUS_FILE_MANAGEMENT_PROPERTIES_FOLDERS_FIRST_WIDGET, - NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST); - eel_preferences_glade_connect_bool (xml_dialog, - NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ALWAYS_USE_BROWSER_WIDGET, - NAUTILUS_PREFERENCES_ALWAYS_USE_BROWSER); - - eel_preferences_glade_connect_bool (xml_dialog, - NAUTILUS_FILE_MANAGEMENT_PROPERTIES_MEDIA_AUTOMOUNT_OPEN, - NAUTILUS_PREFERENCES_MEDIA_AUTOMOUNT_OPEN); - eel_preferences_glade_connect_bool (xml_dialog, - NAUTILUS_FILE_MANAGEMENT_PROPERTIES_MEDIA_AUTORUN_NEVER, - NAUTILUS_PREFERENCES_MEDIA_AUTORUN_NEVER); - - eel_preferences_glade_connect_bool (xml_dialog, - NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TRASH_CONFIRM_WIDGET, - NAUTILUS_PREFERENCES_CONFIRM_TRASH); - eel_preferences_glade_connect_bool (xml_dialog, - NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TRASH_DELETE_WIDGET, - NAUTILUS_PREFERENCES_ENABLE_DELETE); - eel_preferences_glade_connect_bool (xml_dialog, - NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SHOW_HIDDEN_WIDGET, - NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES); - eel_preferences_glade_connect_bool_slave (xml_dialog, - NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SHOW_HIDDEN_WIDGET, - NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES); - eel_preferences_glade_connect_bool (xml_dialog, - NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TREE_VIEW_FOLDERS_WIDGET, - NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES); - - eel_preferences_glade_connect_string_enum_combo_box (xml_dialog, - NAUTILUS_FILE_MANAGEMENT_PROPERTIES_DEFAULT_VIEW_WIDGET, - NAUTILUS_PREFERENCES_DEFAULT_FOLDER_VIEWER, - (const char **) default_view_values); - eel_preferences_glade_connect_string_enum_combo_box (xml_dialog, - NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ICON_VIEW_ZOOM_WIDGET, - NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL, - (const char **) zoom_values); - eel_preferences_glade_connect_string_enum_combo_box (xml_dialog, - NAUTILUS_FILE_MANAGEMENT_PROPERTIES_COMPACT_VIEW_ZOOM_WIDGET, - NAUTILUS_PREFERENCES_COMPACT_VIEW_DEFAULT_ZOOM_LEVEL, - (const char **) zoom_values); - eel_preferences_glade_connect_string_enum_combo_box (xml_dialog, - NAUTILUS_FILE_MANAGEMENT_PROPERTIES_LIST_VIEW_ZOOM_WIDGET, - NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL, - (const char **) zoom_values); - eel_preferences_glade_connect_string_enum_combo_box (xml_dialog, - NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SORT_ORDER_WIDGET, - NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_ORDER, - (const char **) sort_order_values); - eel_preferences_glade_connect_string_enum_combo_box_slave (xml_dialog, - NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SORT_ORDER_WIDGET, - NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_ORDER); - eel_preferences_glade_connect_string_enum_combo_box (xml_dialog, - NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_TEXT_WIDGET, - NAUTILUS_PREFERENCES_SHOW_TEXT_IN_ICONS, - (const char **) preview_values); - eel_preferences_glade_connect_string_enum_combo_box (xml_dialog, - NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_IMAGE_WIDGET, - NAUTILUS_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS, - (const char **) preview_values); - eel_preferences_glade_connect_string_enum_combo_box (xml_dialog, - NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_SOUND_WIDGET, - NAUTILUS_PREFERENCES_PREVIEW_SOUND, - (const char **) preview_values); - eel_preferences_glade_connect_string_enum_combo_box (xml_dialog, - NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_FOLDER_WIDGET, - NAUTILUS_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS, - (const char **) preview_values); - eel_preferences_glade_connect_string_enum_combo_box (xml_dialog, - NAUTILUS_FILE_MANAGEMENT_PROPERTIES_DATE_FORMAT_WIDGET, - NAUTILUS_PREFERENCES_DATE_FORMAT, - (const char **) date_format_values); - - eel_preferences_glade_connect_string_enum_radio_button (xml_dialog, - (const char **) click_behavior_components, - NAUTILUS_PREFERENCES_CLICK_POLICY, - (const char **) click_behavior_values); - eel_preferences_glade_connect_string_enum_radio_button (xml_dialog, - (const char **) executable_text_components, - NAUTILUS_PREFERENCES_EXECUTABLE_TEXT_ACTIVATION, - (const char **) executable_text_values); - - eel_preferences_glade_connect_int_enum (xml_dialog, - NAUTILUS_FILE_MANAGEMENT_PROPERTIES_THUMBNAIL_LIMIT_WIDGET, - NAUTILUS_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT, - (const int *) thumbnail_limit_values); - - - nautilus_file_management_properties_dialog_setup_icon_caption_page (xml_dialog); - nautilus_file_management_properties_dialog_setup_list_column_page (xml_dialog); - nautilus_file_management_properties_dialog_setup_media_page (xml_dialog); + eel_preferences_builder_connect_bool (builder, + NAUTILUS_FILE_MANAGEMENT_PROPERTIES_COMPACT_LAYOUT_WIDGET, + NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_TIGHTER_LAYOUT); + eel_preferences_builder_connect_bool (builder, + NAUTILUS_FILE_MANAGEMENT_PROPERTIES_LABELS_BESIDE_ICONS_WIDGET, + NAUTILUS_PREFERENCES_ICON_VIEW_LABELS_BESIDE_ICONS); + eel_preferences_builder_connect_bool (builder, + NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ALL_COLUMNS_SAME_WIDTH, + NAUTILUS_PREFERENCES_COMPACT_VIEW_ALL_COLUMNS_SAME_WIDTH); + eel_preferences_builder_connect_bool (builder, + NAUTILUS_FILE_MANAGEMENT_PROPERTIES_FOLDERS_FIRST_WIDGET, + NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST); + eel_preferences_builder_connect_bool (builder, + NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ALWAYS_USE_BROWSER_WIDGET, + NAUTILUS_PREFERENCES_ALWAYS_USE_BROWSER); + + eel_preferences_builder_connect_bool (builder, + NAUTILUS_FILE_MANAGEMENT_PROPERTIES_MEDIA_AUTOMOUNT_OPEN, + NAUTILUS_PREFERENCES_MEDIA_AUTOMOUNT_OPEN); + eel_preferences_builder_connect_bool (builder, + NAUTILUS_FILE_MANAGEMENT_PROPERTIES_MEDIA_AUTORUN_NEVER, + NAUTILUS_PREFERENCES_MEDIA_AUTORUN_NEVER); + + eel_preferences_builder_connect_bool (builder, + NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TRASH_CONFIRM_WIDGET, + NAUTILUS_PREFERENCES_CONFIRM_TRASH); + eel_preferences_builder_connect_bool (builder, + NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TRASH_DELETE_WIDGET, + NAUTILUS_PREFERENCES_ENABLE_DELETE); + eel_preferences_builder_connect_bool (builder, + NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SHOW_HIDDEN_WIDGET, + NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES); + eel_preferences_builder_connect_bool_slave (builder, + NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SHOW_HIDDEN_WIDGET, + NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES); + eel_preferences_builder_connect_bool (builder, + NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TREE_VIEW_FOLDERS_WIDGET, + NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES); + + eel_preferences_builder_connect_string_enum_combo_box (builder, + NAUTILUS_FILE_MANAGEMENT_PROPERTIES_DEFAULT_VIEW_WIDGET, + NAUTILUS_PREFERENCES_DEFAULT_FOLDER_VIEWER, + (const char **) default_view_values); + eel_preferences_builder_connect_string_enum_combo_box (builder, + NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ICON_VIEW_ZOOM_WIDGET, + NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL, + (const char **) zoom_values); + eel_preferences_builder_connect_string_enum_combo_box (builder, + NAUTILUS_FILE_MANAGEMENT_PROPERTIES_COMPACT_VIEW_ZOOM_WIDGET, + NAUTILUS_PREFERENCES_COMPACT_VIEW_DEFAULT_ZOOM_LEVEL, + (const char **) zoom_values); + eel_preferences_builder_connect_string_enum_combo_box (builder, + NAUTILUS_FILE_MANAGEMENT_PROPERTIES_LIST_VIEW_ZOOM_WIDGET, + NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL, + (const char **) zoom_values); + eel_preferences_builder_connect_string_enum_combo_box (builder, + NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SORT_ORDER_WIDGET, + NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_ORDER, + (const char **) sort_order_values); + eel_preferences_builder_connect_string_enum_combo_box_slave (builder, + NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SORT_ORDER_WIDGET, + NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_ORDER); + eel_preferences_builder_connect_string_enum_combo_box (builder, + NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_TEXT_WIDGET, + NAUTILUS_PREFERENCES_SHOW_TEXT_IN_ICONS, + (const char **) preview_values); + eel_preferences_builder_connect_string_enum_combo_box (builder, + NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_IMAGE_WIDGET, + NAUTILUS_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS, + (const char **) preview_values); + eel_preferences_builder_connect_string_enum_combo_box (builder, + NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_SOUND_WIDGET, + NAUTILUS_PREFERENCES_PREVIEW_SOUND, + (const char **) preview_values); + eel_preferences_builder_connect_string_enum_combo_box (builder, + NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_FOLDER_WIDGET, + NAUTILUS_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS, + (const char **) preview_values); + eel_preferences_builder_connect_string_enum_combo_box (builder, + NAUTILUS_FILE_MANAGEMENT_PROPERTIES_DATE_FORMAT_WIDGET, + NAUTILUS_PREFERENCES_DATE_FORMAT, + (const char **) date_format_values); + + eel_preferences_builder_connect_string_enum_radio_button (builder, + (const char **) click_behavior_components, + NAUTILUS_PREFERENCES_CLICK_POLICY, + (const char **) click_behavior_values); + eel_preferences_builder_connect_string_enum_radio_button (builder, + (const char **) executable_text_components, + NAUTILUS_PREFERENCES_EXECUTABLE_TEXT_ACTIVATION, + (const char **) executable_text_values); + + eel_preferences_builder_connect_int_enum (builder, + NAUTILUS_FILE_MANAGEMENT_PROPERTIES_THUMBNAIL_LIMIT_WIDGET, + NAUTILUS_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT, + (const int *) thumbnail_limit_values); + + nautilus_file_management_properties_dialog_setup_icon_caption_page (builder); + nautilus_file_management_properties_dialog_setup_list_column_page (builder); + nautilus_file_management_properties_dialog_setup_media_page (builder); eel_preferences_add_callback (NAUTILUS_PREFERENCES_MEDIA_AUTORUN_NEVER, (EelPreferencesCallback ) nautilus_file_management_properties_dialog_update_media_sensitivity, - g_object_ref (xml_dialog)); + g_object_ref (builder)); /* UI callbacks */ - dialog = glade_xml_get_widget (xml_dialog, "file_management_dialog"); + dialog = GTK_WIDGET (gtk_builder_get_object (builder, "file_management_dialog")); g_signal_connect_data (G_OBJECT (dialog), "response", G_CALLBACK (nautilus_file_management_properties_dialog_response_cb), - g_object_ref (xml_dialog), + g_object_ref (builder), (GClosureNotify)g_object_unref, 0); @@ -832,17 +831,20 @@ delete_event_callback (GtkWidget *widget, void nautilus_file_management_properties_dialog_show (GCallback close_callback, GtkWindow *window) { - GladeXML *xml_dialog; + GtkBuilder *builder; + + builder = gtk_builder_new (); - xml_dialog = glade_xml_new (GLADEDIR "/nautilus-file-management-properties.glade", - NULL, NULL); + gtk_builder_add_from_file (builder, + UIDIR "/nautilus-file-management-properties.ui", + NULL); - g_signal_connect (G_OBJECT (glade_xml_get_widget (xml_dialog, "file_management_dialog")), + g_signal_connect (G_OBJECT (gtk_builder_get_object (builder, "file_management_dialog")), "response", close_callback, NULL); - g_signal_connect (G_OBJECT (glade_xml_get_widget (xml_dialog, "file_management_dialog")), + g_signal_connect (G_OBJECT (gtk_builder_get_object (builder, "file_management_dialog")), "delete_event", G_CALLBACK (delete_event_callback), close_callback); - nautilus_file_management_properties_dialog_setup (xml_dialog, window); + nautilus_file_management_properties_dialog_setup (builder, window); - g_object_unref (xml_dialog); + g_object_unref (builder); } diff --git a/src/nautilus-file-management-properties.glade b/src/nautilus-file-management-properties.glade deleted file mode 100644 index 545935264..000000000 --- a/src/nautilus-file-management-properties.glade +++ /dev/null @@ -1,2970 +0,0 @@ - - - - - - - 5 - File Management Preferences - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - False - - - - True - False - 2 - - - - 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>Default View</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 6 - - - - True - False - 12 - - - - True - View _new folders using: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - default_view_combobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - Icon View -List View -Compact View - False - True - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 12 - - - - True - _Arrange items: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - sort_order_combobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - By Name -By Size -By Type -By Modification Date -By Emblems - False - True - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - True - Sort _folders before files - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - Show hidden and _backup files - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - True - False - 6 - - - - True - <b>Icon View Defaults</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 6 - - - - True - False - 12 - - - - True - Default _zoom level: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - icon_view_zoom_combobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 33% -50% -66% -100% -150% -200% -400% - False - True - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - True - _Use compact layout - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - _Text beside icons - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - True - False - 6 - - - - True - <b>Compact View Defaults</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 6 - - - - True - False - 12 - - - - True - _Default zoom level: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - compact_view_zoom_combobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 33% -50% -66% -100% -150% -200% -400% - False - True - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - True - A_ll columns have the same width - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - True - False - 6 - - - - True - <b>List View Defaults</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 6 - - - - True - False - 12 - - - - True - D_efault zoom level: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - list_view_zoom_combobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 33% -50% -66% -100% -150% -200% -400% - False - True - - - 0 - True - True - - - - - 0 - True - True - - - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - True - False - 6 - - - - True - <b>Tree View Defaults</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 6 - - - - True - True - Show _only folders - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - - 0 - True - True - - - - - 0 - False - True - - - - - False - True - - - - - - True - Views - 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>Behavior</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 0 - - - - True - True - _Single click to open items - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - _Double click to open items - True - GTK_RELIEF_NORMAL - True - False - False - True - single_click_radiobutton - - - 6 - False - False - - - - - - 6 - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - - True - True - Always open in _browser windows - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - True - False - 6 - - - - True - <b>Executable Text Files</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 6 - - - - True - True - _Run executable text files when they are opened - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - _View executable text files when they are opened - True - GTK_RELIEF_NORMAL - True - False - False - True - scripts_execute_radiobutton - - - 0 - False - False - - - - - - True - True - _Ask each time - True - GTK_RELIEF_NORMAL - True - False - False - True - scripts_execute_radiobutton - - - 0 - False - False - - - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - True - False - 6 - - - - True - <b>Trash</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 6 - - - - True - True - Ask before _emptying the Trash or deleting files - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - I_nclude a Delete command that bypasses Trash - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - - 0 - True - True - - - - - 0 - False - True - - - - - False - True - - - - - - True - Behavior - 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>Icon Captions</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 6 - - - - True - Choose the order of information to appear beneath icon names. More information will appear when zooming in closer. - False - False - GTK_JUSTIFY_LEFT - True - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - - False - True - - - 0 - False - True - - - - - 0 - True - True - - - - - - True - False - 0 - - - - True - - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - - False - True - - - 0 - False - True - - - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - - False - True - - - 0 - False - True - - - - - 0 - True - True - - - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - True - False - 6 - - - - True - <b>Date</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 12 - - - - True - _Format: - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - date_format_combobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - - False - True - - - 0 - False - False - - - - - - - 0 - True - True - - - - - 0 - False - True - - - - - False - True - - - - - - True - Display - 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>List Columns</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 6 - - - - True - Choose the order of information to appear in the list view. - False - False - GTK_JUSTIFY_LEFT - True - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - False - True - - - - - - True - List Columns - 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>Text Files</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 6 - - - - True - False - 12 - - - - True - Show te_xt in icons: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - preview_text_combobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - Always -Local Files Only -Never - False - True - - - 0 - True - True - - - - - 0 - True - True - - - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - True - False - 6 - - - - True - <b>Other Previewable Files</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 6 - - - - True - False - 12 - - - - True - Show _thumbnails: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - preview_image_combobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - Always -Local Files Only -Never - False - True - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 12 - - - - True - _Only for files smaller than: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - preview_image_size_combobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 100 KB -500 KB -1 MB -3 MB -5 MB -10 MB -100 MB -1 GB - False - True - - - 0 - True - True - - - - - 0 - True - True - - - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - True - False - 6 - - - - True - <b>Sound Files</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 6 - - - - True - False - 12 - - - - True - Preview _sound files: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - preview_sound_combobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - Always -Local Files Only -Never - False - True - - - 0 - True - True - - - - - 0 - True - True - - - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - True - False - 6 - - - - True - <b>Folders</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 6 - - - - True - False - 12 - - - - True - Count _number of items: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - preview_folder_combobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - Always -Local Files Only -Never - False - True - - - 0 - True - True - - - - - 0 - True - True - - - - - - - 0 - True - True - - - - - 0 - False - True - - - - - False - True - - - - - - True - Preview - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 12 - True - False - 6 - - - - True - False - 6 - - - - True - False - 6 - - - - True - <b>Media Handling</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 6 - - - - True - Choose what happens when inserting media or connecting devices to the system - False - True - GTK_JUSTIFY_LEFT - True - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 5 - 2 - False - 6 - 6 - - - - True - CD _Audio: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - media_audio_cdda_combobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - _DVD Video: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - media_video_dvd_combobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - False - True - - - 1 - 2 - 0 - 1 - fill - - - - - - True - False - True - - - 1 - 2 - 1 - 2 - fill - fill - - - - - - True - _Music Player: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - media_music_player_combobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - False - True - - - 1 - 2 - 2 - 3 - fill - fill - - - - - - True - _Photos: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - media_dcf_combobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - - - - - - - True - False - True - - - 1 - 2 - 3 - 4 - fill - fill - - - - - - True - _Software: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - media_software_combobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 4 - 5 - fill - - - - - - - True - False - True - - - 1 - 2 - 4 - 5 - fill - fill - - - - - 0 - True - True - - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 6 - - - - True - <b>Other Media</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 6 - - - - True - Less common media formats can be configured here - False - True - GTK_JUSTIFY_LEFT - True - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 2 - 2 - False - 6 - 6 - - - - True - False - True - - - 1 - 2 - 0 - 1 - fill - - - - - - True - Acti_on: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - media_other_action_combobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - False - True - - - 1 - 2 - 1 - 2 - fill - fill - - - - - - True - _Type: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - media_other_type_combobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - 0 - True - True - - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - True - _Never prompt or start programs on media insertion - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - B_rowse media when inserted - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - False - True - - - - - - True - Media - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - 0 - True - True - - - - - - - diff --git a/src/nautilus-file-management-properties.ui b/src/nautilus-file-management-properties.ui new file mode 100644 index 000000000..3e1820a7f --- /dev/null +++ b/src/nautilus-file-management-properties.ui @@ -0,0 +1,3074 @@ + + + + + + + + + + Icon View + + + List View + + + Compact View + + + + + + + + + + By Name + + + By Size + + + By Type + + + By Modification Date + + + By Emblems + + + + + + + + + + 33% + + + 50% + + + 66% + + + 100% + + + 150% + + + 200% + + + 400% + + + + + + + + + + 33% + + + 50% + + + 66% + + + 100% + + + 150% + + + 200% + + + 400% + + + + + + + + + + 33% + + + 50% + + + 66% + + + 100% + + + 150% + + + 200% + + + 400% + + + + + + + + + + Always + + + Local Files Only + + + Never + + + + + + + + + + Always + + + Local Files Only + + + Never + + + + + + + + + + 100 KB + + + 500 KB + + + 1 MB + + + 3 MB + + + 5 MB + + + 10 MB + + + 100 MB + + + 1 GB + + + + + + + + + + Always + + + Local Files Only + + + Never + + + + + + + + + + Always + + + Local Files Only + + + Never + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + File Management Preferences + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False + False + + + True + False + 2 + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-help + True + GTK_RELIEF_NORMAL + True + + + + + True + True + True + gtk-close + True + GTK_RELIEF_NORMAL + True + + + + + 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>Default View</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + True + False + 6 + + + True + False + 12 + + + True + View _new folders using: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + default_view_combobox + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + False + True + model1 + + + + 0 + + + + + 0 + True + True + + + + + 0 + True + True + + + + + True + False + 12 + + + True + _Arrange items: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + sort_order_combobox + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + False + True + model2 + + + + 0 + + + + + 0 + True + True + + + + + 0 + True + True + + + + + True + True + Sort _folders before files + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + True + True + Show hidden and _backup files + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + + 0 + True + True + + + + + 0 + False + True + + + + + True + False + 6 + + + True + <b>Icon View Defaults</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + True + False + 6 + + + True + False + 12 + + + True + Default _zoom level: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + icon_view_zoom_combobox + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + False + True + model3 + + + + 0 + + + + + 0 + True + True + + + + + 0 + True + True + + + + + True + True + _Use compact layout + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + True + True + _Text beside icons + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + + 0 + True + True + + + + + 0 + False + True + + + + + True + False + 6 + + + True + <b>Compact View Defaults</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + True + False + 6 + + + True + False + 12 + + + True + _Default zoom level: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + compact_view_zoom_combobox + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + False + True + model4 + + + + 0 + + + + + 0 + True + True + + + + + 0 + True + True + + + + + True + True + A_ll columns have the same width + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + + 0 + True + True + + + + + 0 + False + True + + + + + True + False + 6 + + + True + <b>List View Defaults</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + True + False + 6 + + + True + False + 12 + + + True + D_efault zoom level: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + list_view_zoom_combobox + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + False + True + model5 + + + + 0 + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + 0 + True + True + + + + + 0 + False + True + + + + + True + False + 6 + + + True + <b>Tree View Defaults</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + True + False + 6 + + + True + True + Show _only folders + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + + 0 + True + True + + + + + 0 + False + True + + + + + False + True + + + + + True + Views + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + 12 + True + False + 18 + + + True + False + 6 + + + True + <b>Behavior</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + True + False + 0 + + + True + True + _Single click to open items + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + True + True + _Double click to open items + True + GTK_RELIEF_NORMAL + True + False + False + True + single_click_radiobutton + + + 6 + False + False + + + + + 6 + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + True + True + + + + + True + True + Always open in _browser windows + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + + 0 + True + True + + + + + 0 + False + True + + + + + True + False + 6 + + + True + <b>Executable Text Files</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + True + False + 6 + + + True + True + _Run executable text files when they are opened + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + True + True + _View executable text files when they are opened + True + GTK_RELIEF_NORMAL + True + False + False + True + scripts_execute_radiobutton + + + 0 + False + False + + + + + True + True + _Ask each time + True + GTK_RELIEF_NORMAL + True + False + False + True + scripts_execute_radiobutton + + + 0 + False + False + + + + + + + 0 + True + True + + + + + 0 + False + True + + + + + True + False + 6 + + + True + <b>Trash</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + True + False + 6 + + + True + True + Ask before _emptying the Trash or deleting files + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + True + True + I_nclude a Delete command that bypasses Trash + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + + 0 + True + True + + + + + 0 + False + True + + + + + False + True + + + + + True + Behavior + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + 12 + True + False + 18 + + + True + False + 6 + + + True + <b>Icon Captions</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + True + False + 6 + + + True + Choose the order of information to appear beneath icon names. More information will appear when zooming in closer. + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + False + 0 + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + False + True + model11 + + + + 0 + + + + + 0 + False + True + + + + + 0 + True + True + + + + + True + False + 0 + + + True + + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + False + True + model12 + + + + 0 + + + + + 0 + False + True + + + + + 0 + False + False + + + + + True + False + 0 + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + False + True + model13 + + + + 0 + + + + + 0 + False + True + + + + + 0 + True + True + + + + + + + 0 + True + True + + + + + 0 + False + True + + + + + True + False + 6 + + + True + <b>Date</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + True + False + 12 + + + True + _Format: + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + date_format_combobox + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + False + True + model14 + + + + 0 + + + + + 0 + False + False + + + + + + + 0 + True + True + + + + + 0 + False + True + + + + + False + True + + + + + True + Display + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + 12 + True + False + 18 + + + True + False + 6 + + + True + <b>List Columns</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + True + False + 6 + + + True + Choose the order of information to appear in the list view. + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + + 0 + True + True + + + + + 0 + True + True + + + + + False + True + + + + + True + List Columns + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + 12 + True + False + 18 + + + True + False + 6 + + + True + <b>Text Files</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + True + False + 6 + + + True + False + 12 + + + True + Show te_xt in icons: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + preview_text_combobox + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + False + True + model6 + + + + 0 + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + 0 + True + True + + + + + 0 + False + True + + + + + True + False + 6 + + + True + <b>Other Previewable Files</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + True + False + 6 + + + True + False + 12 + + + True + Show _thumbnails: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + preview_image_combobox + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + False + True + model7 + + + + 0 + + + + + 0 + True + True + + + + + 0 + True + True + + + + + True + False + 12 + + + True + _Only for files smaller than: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + preview_image_size_combobox + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + False + True + model8 + + + + 0 + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + 0 + True + True + + + + + 0 + False + True + + + + + True + False + 6 + + + True + <b>Sound Files</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + True + False + 6 + + + True + False + 12 + + + True + Preview _sound files: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + preview_sound_combobox + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + False + True + model9 + + + + 0 + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + 0 + True + True + + + + + 0 + False + True + + + + + True + False + 6 + + + True + <b>Folders</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + True + False + 6 + + + True + False + 12 + + + True + Count _number of items: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + preview_folder_combobox + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + False + True + model10 + + + + 0 + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + 0 + True + True + + + + + 0 + False + True + + + + + False + True + + + + + True + Preview + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + 12 + True + False + 6 + + + True + False + 6 + + + True + False + 6 + + + True + <b>Media Handling</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + True + False + 6 + + + True + Choose what happens when inserting media or connecting devices to the system + False + True + GTK_JUSTIFY_LEFT + True + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + 5 + 2 + False + 6 + 6 + + + True + CD _Audio: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + media_audio_cdda_combobox + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + True + _DVD Video: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + media_video_dvd_combobox + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + True + False + True + + + 1 + 2 + 0 + 1 + fill + + + + + True + False + True + + + 1 + 2 + 1 + 2 + fill + fill + + + + + True + _Music Player: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + media_music_player_combobox + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + True + False + True + + + 1 + 2 + 2 + 3 + fill + fill + + + + + True + _Photos: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + media_dcf_combobox + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 3 + 4 + fill + + + + + + True + False + True + + + 1 + 2 + 3 + 4 + fill + fill + + + + + True + _Software: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + media_software_combobox + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 4 + 5 + fill + + + + + + True + False + True + + + 1 + 2 + 4 + 5 + fill + fill + + + + + 0 + True + True + + + + + + + 0 + True + True + + + + + 0 + True + True + + + + + True + False + 6 + + + True + <b>Other Media</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + True + False + 6 + + + True + Less common media formats can be configured here + False + True + GTK_JUSTIFY_LEFT + True + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True + 2 + 2 + False + 6 + 6 + + + True + False + True + + + 1 + 2 + 0 + 1 + fill + + + + + True + Acti_on: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + media_other_action_combobox + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + True + False + True + + + 1 + 2 + 1 + 2 + fill + fill + + + + + True + _Type: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + media_other_type_combobox + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + 0 + True + True + + + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + False + False + + + + + True + True + _Never prompt or start programs on media insertion + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + True + True + B_rowse media when inserted + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + False + True + + + + + True + Media + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + 0 + True + True + + + + + + helpbutton1 + closebutton1 + + + diff --git a/src/nautilus-navigation-window.h b/src/nautilus-navigation-window.h index ea7aacb2b..33b44b3cc 100644 --- a/src/nautilus-navigation-window.h +++ b/src/nautilus-navigation-window.h @@ -30,7 +30,6 @@ #ifndef NAUTILUS_NAVIGATION_WINDOW_H #define NAUTILUS_NAVIGATION_WINDOW_H -#include #include #include #include diff --git a/src/nautilus-property-browser.c b/src/nautilus-property-browser.c index 560abde8f..45ce34810 100644 --- a/src/nautilus-property-browser.c +++ b/src/nautilus-property-browser.c @@ -44,7 +44,6 @@ #include #include #include -#include #include #include #include @@ -743,13 +742,10 @@ make_drag_image (NautilusPropertyBrowser *property_browser, const char* file_nam g_free (user_directory); } - orig_pixbuf = gdk_pixbuf_new_from_file (image_file_name, NULL); - - if (orig_pixbuf == NULL) { - orig_pixbuf = rsvg_pixbuf_from_file_at_max_size (image_file_name, - MAX_ICON_WIDTH, MAX_ICON_HEIGHT, - NULL); - } + orig_pixbuf = gdk_pixbuf_new_from_file_at_scale (image_file_name, + MAX_ICON_WIDTH, MAX_ICON_HEIGHT, + TRUE, + NULL); g_free (image_file_name); -- cgit v1.2.1