2007-01-09 18:41:02 +01:00
|
|
|
? depcomp
|
|
|
|
|
? nautilus-disable-zoom-control-and-view-as-option-menu.patch
|
|
|
|
|
? nautilus-folder-handler.desktop
|
|
|
|
|
? stamp-h1
|
|
|
|
|
? src/.nautilus-navigation-window.c.swp
|
|
|
|
|
? src/nautilus-navigation-window.c.joe
|
|
|
|
|
Index: src/nautilus-navigation-window.c
|
2007-03-16 10:12:56 +01:00
|
|
|
===================================================================
|
|
|
|
|
--- src/nautilus-navigation-window.c.orig
|
2007-01-09 18:41:02 +01:00
|
|
|
+++ src/nautilus-navigation-window.c
|
2007-08-03 01:55:23 +02:00
|
|
|
@@ -197,7 +197,9 @@ nautilus_navigation_window_init (Nautilu
|
2007-01-09 18:41:02 +01:00
|
|
|
GtkUIManager *ui_manager;
|
|
|
|
|
GtkWidget *toolbar;
|
|
|
|
|
GtkWidget *location_bar;
|
|
|
|
|
+#if 0
|
|
|
|
|
GtkWidget *view_as_menu_vbox;
|
|
|
|
|
+#endif
|
|
|
|
|
GtkToolItem *item;
|
|
|
|
|
GtkWidget *hbox, *vbox, *eventbox, *extras_vbox;
|
2007-08-03 01:55:23 +02:00
|
|
|
|
|
|
|
|
@@ -302,6 +304,7 @@ nautilus_navigation_window_init (Nautilu
|
2007-01-09 18:41:02 +01:00
|
|
|
window->search_bar,
|
|
|
|
|
TRUE, TRUE, 0);
|
|
|
|
|
|
|
|
|
|
+#if 0
|
|
|
|
|
/* Option menu for content view types; it's empty here, filled in when a uri is set.
|
|
|
|
|
* Pack it into vbox so it doesn't grow vertically when location bar does.
|
|
|
|
|
*/
|
2007-08-03 01:55:23 +02:00
|
|
|
@@ -315,12 +318,15 @@ nautilus_navigation_window_init (Nautilu
|
2007-01-09 18:41:02 +01:00
|
|
|
gtk_toolbar_insert (GTK_TOOLBAR (location_bar),
|
|
|
|
|
item, -1);
|
|
|
|
|
|
2007-08-03 01:55:23 +02:00
|
|
|
+#endif
|
2007-01-09 18:41:02 +01:00
|
|
|
window->view_as_combo_box = gtk_combo_box_new_text ();
|
|
|
|
|
+#if 0
|
2007-08-03 01:55:23 +02:00
|
|
|
gtk_combo_box_set_focus_on_click (GTK_COMBO_BOX (window->view_as_combo_box), FALSE);
|
2007-01-09 18:41:02 +01:00
|
|
|
gtk_box_pack_end (GTK_BOX (view_as_menu_vbox), window->view_as_combo_box, TRUE, FALSE, 0);
|
|
|
|
|
gtk_widget_show (window->view_as_combo_box);
|
2007-03-16 10:12:56 +01:00
|
|
|
g_signal_connect_object (window->view_as_combo_box, "changed",
|
|
|
|
|
G_CALLBACK (view_as_menu_switch_views_callback), window, 0);
|
2007-01-09 18:41:02 +01:00
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
|
/* Allocate the zoom control and place on the right next to the menu.
|
|
|
|
|
* It gets shown later, if the view-frame contains something zoomable.
|
2007-08-03 01:55:23 +02:00
|
|
|
@@ -338,13 +344,15 @@ nautilus_navigation_window_init (Nautilu
|
2007-01-09 18:41:02 +01:00
|
|
|
g_signal_connect_object (window->zoom_control, "zoom_to_default",
|
|
|
|
|
G_CALLBACK (nautilus_window_zoom_to_default),
|
|
|
|
|
window, G_CONNECT_SWAPPED);
|
|
|
|
|
-
|
|
|
|
|
+
|
|
|
|
|
+#if 0
|
|
|
|
|
item = gtk_tool_item_new ();
|
|
|
|
|
gtk_container_set_border_width (GTK_CONTAINER (item), GNOME_PAD_SMALL);
|
|
|
|
|
gtk_widget_show (GTK_WIDGET (item));
|
|
|
|
|
gtk_container_add (GTK_CONTAINER (item), window->zoom_control);
|
|
|
|
|
gtk_toolbar_insert (GTK_TOOLBAR (location_bar),
|
|
|
|
|
item, 1);
|
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
|
gtk_widget_show (location_bar);
|
|
|
|
|
|
