[nautilus] Revert "Add a border around info bars (#621366)."
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] Revert "Add a border around info bars (#621366)."
- Date: Wed, 18 Aug 2010 11:43:53 +0000 (UTC)
commit 3f68e342205f4446a99c1c18d34f23e33e11cae2
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Wed Aug 18 13:42:33 2010 +0200
Revert "Add a border around info bars (#621366)."
This reverts commit 48c0e19e60eee88f38a6e9c7a51211376a4c90f9.
src/file-manager/fm-directory-view.c | 1 +
src/nautilus-window-slot.c | 23 ++++++-----------------
src/nautilus-window-slot.h | 1 -
3 files changed, 7 insertions(+), 18 deletions(-)
---
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 05d8026..45bd820 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -1930,6 +1930,7 @@ fm_directory_view_init (FMDirectoryView *view)
GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_hadjustment (GTK_SCROLLED_WINDOW (view), NULL);
gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (view), NULL);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (view), GTK_SHADOW_IN);
set_up_scripts_directory_global ();
scripts_directory = nautilus_directory_get_by_uri (scripts_directory_uri);
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index df3c164..fbef40d 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -172,35 +172,26 @@ nautilus_window_slot_inactive (NautilusWindowSlot *slot)
static void
nautilus_window_slot_init (NautilusWindowSlot *slot)
{
- GtkWidget *content_box, *eventbox, *extras_vbox, *frame, *hsep;
+ GtkWidget *content_box, *eventbox, *extras_vbox;
content_box = gtk_vbox_new (FALSE, 0);
slot->content_box = content_box;
gtk_widget_show (content_box);
- frame = gtk_frame_new (NULL);
- gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
- gtk_box_pack_start (GTK_BOX (content_box), frame, TRUE, TRUE, 0);
- gtk_widget_show (frame);
-
- slot->view_box = gtk_vbox_new (FALSE, 0);
- gtk_container_add (GTK_CONTAINER (frame), slot->view_box);
- gtk_widget_show (slot->view_box);
-
eventbox = gtk_event_box_new ();
slot->extra_location_event_box = eventbox;
gtk_widget_set_name (eventbox, "nautilus-extra-view-widget");
- gtk_box_pack_start (GTK_BOX (slot->view_box), eventbox, FALSE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (content_box), eventbox, FALSE, FALSE, 0);
+
extras_vbox = gtk_vbox_new (FALSE, 6);
gtk_container_set_border_width (GTK_CONTAINER (extras_vbox), 6);
slot->extra_location_widgets = extras_vbox;
gtk_container_add (GTK_CONTAINER (eventbox), extras_vbox);
gtk_widget_show (extras_vbox);
- hsep = gtk_hseparator_new ();
- gtk_box_pack_start (GTK_BOX (slot->view_box), hsep, FALSE, FALSE, 0);
- slot->extra_location_separator = hsep;
+ slot->view_box = gtk_vbox_new (FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_box), slot->view_box, TRUE, TRUE, 0);
+ gtk_widget_show (slot->view_box);
slot->title = g_strdup (_("Loading..."));
}
@@ -536,7 +527,6 @@ nautilus_window_slot_remove_extra_location_widgets (NautilusWindowSlot *slot)
remove_all,
slot->extra_location_widgets);
gtk_widget_hide (slot->extra_location_event_box);
- gtk_widget_hide (slot->extra_location_separator);
}
void
@@ -546,7 +536,6 @@ nautilus_window_slot_add_extra_location_widget (NautilusWindowSlot *slot,
gtk_box_pack_start (GTK_BOX (slot->extra_location_widgets),
widget, TRUE, TRUE, 0);
gtk_widget_show (slot->extra_location_event_box);
- gtk_widget_show (slot->extra_location_separator);
}
void
diff --git a/src/nautilus-window-slot.h b/src/nautilus-window-slot.h
index 76228ca..ce276d8 100644
--- a/src/nautilus-window-slot.h
+++ b/src/nautilus-window-slot.h
@@ -74,7 +74,6 @@ struct NautilusWindowSlot {
GtkWidget *content_box;
GtkWidget *extra_location_event_box;
GtkWidget *extra_location_widgets;
- GtkWidget *extra_location_separator;
GtkWidget *view_box;
NautilusView *content_view;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]