Commit 83de3177 authored by Andy Hertzfeld's avatar Andy Hertzfeld

made the title in the index panel be above the additional info, which


       made the title in the index panel be above the additional info, which
       Elliot inadvertently changed with his recent check-in.
parent 5f6fa73e
2000-02-16 Andy Hertzfeld <andy@eazel.com>
* src/nautilus-index-title.c:
made the title be about the additional info again; Elliot broke this
when he added the checks for null file objects. Fixed by putting
the checks in the subroutines that do that real work. Also, made
the label center justified.
2000-02-16 Elliot Lee <sopwith@redhat.com> 2000-02-16 Elliot Lee <sopwith@redhat.com>
* components/help/hyperbola-nav-tree.c: Show the stinking view. :) * components/help/hyperbola-nav-tree.c: Show the stinking view. :)
......
...@@ -116,7 +116,8 @@ nautilus_index_title_set_up_icon (NautilusIndexTitle *index_title, NautilusFile ...@@ -116,7 +116,8 @@ nautilus_index_title_set_up_icon (NautilusIndexTitle *index_title, NautilusFile
GdkPixmap *pixmap; GdkPixmap *pixmap;
GdkBitmap *mask; GdkBitmap *mask;
g_return_if_fail(file_object); if (file_object == NULL)
return;
nautilus_icon_factory_get_pixmap_and_mask_for_file nautilus_icon_factory_get_pixmap_and_mask_for_file
(file_object, NAUTILUS_ICON_SIZE_STANDARD, (file_object, NAUTILUS_ICON_SIZE_STANDARD,
...@@ -252,6 +253,7 @@ nautilus_index_title_set_up_label (NautilusIndexTitle *index_title, const char * ...@@ -252,6 +253,7 @@ nautilus_index_title_set_up_label (NautilusIndexTitle *index_title, const char *
else { else {
index_title->details->title = GTK_WIDGET (gtk_label_new (file_name)); index_title->details->title = GTK_WIDGET (gtk_label_new (file_name));
gtk_label_set_line_wrap (GTK_LABEL (index_title->details->title), TRUE); gtk_label_set_line_wrap (GTK_LABEL (index_title->details->title), TRUE);
gtk_label_set_justify(GTK_LABEL(index_title->details->title), GTK_JUSTIFY_CENTER);
gtk_widget_show (index_title->details->title); gtk_widget_show (index_title->details->title);
gtk_box_pack_start (GTK_BOX (index_title), index_title->details->title, 0, 0, 0); gtk_box_pack_start (GTK_BOX (index_title), index_title->details->title, 0, 0, 0);
} }
...@@ -347,15 +349,14 @@ nautilus_index_title_set_uri(NautilusIndexTitle *index_title, const char* new_ur ...@@ -347,15 +349,14 @@ nautilus_index_title_set_uri(NautilusIndexTitle *index_title, const char* new_ur
file_object = nautilus_file_get(new_uri); file_object = nautilus_file_get(new_uri);
if(file_object) { /* add the icon */
nautilus_index_title_set_up_icon (index_title, file_object); nautilus_index_title_set_up_icon (index_title, file_object);
/* add various info */
nautilus_index_title_set_up_info(index_title, file_object);
}
/* add the name, in a variable-sized label */ /* add the name, in a variable-sized label */
nautilus_index_title_set_up_label (index_title, new_uri); nautilus_index_title_set_up_label (index_title, new_uri);
/* add various info */
nautilus_index_title_set_up_info(index_title, file_object);
/* FIXME: file_object can be NULL if this is a bad url, or one that /* FIXME: file_object can be NULL if this is a bad url, or one that
* NautilusFile can't handle (e.g. http). The UI here needs to * NautilusFile can't handle (e.g. http). The UI here needs to
......
...@@ -116,7 +116,8 @@ nautilus_index_title_set_up_icon (NautilusIndexTitle *index_title, NautilusFile ...@@ -116,7 +116,8 @@ nautilus_index_title_set_up_icon (NautilusIndexTitle *index_title, NautilusFile
GdkPixmap *pixmap; GdkPixmap *pixmap;
GdkBitmap *mask; GdkBitmap *mask;
g_return_if_fail(file_object); if (file_object == NULL)
return;
nautilus_icon_factory_get_pixmap_and_mask_for_file nautilus_icon_factory_get_pixmap_and_mask_for_file
(file_object, NAUTILUS_ICON_SIZE_STANDARD, (file_object, NAUTILUS_ICON_SIZE_STANDARD,
...@@ -252,6 +253,7 @@ nautilus_index_title_set_up_label (NautilusIndexTitle *index_title, const char * ...@@ -252,6 +253,7 @@ nautilus_index_title_set_up_label (NautilusIndexTitle *index_title, const char *
else { else {
index_title->details->title = GTK_WIDGET (gtk_label_new (file_name)); index_title->details->title = GTK_WIDGET (gtk_label_new (file_name));
gtk_label_set_line_wrap (GTK_LABEL (index_title->details->title), TRUE); gtk_label_set_line_wrap (GTK_LABEL (index_title->details->title), TRUE);
gtk_label_set_justify(GTK_LABEL(index_title->details->title), GTK_JUSTIFY_CENTER);
gtk_widget_show (index_title->details->title); gtk_widget_show (index_title->details->title);
gtk_box_pack_start (GTK_BOX (index_title), index_title->details->title, 0, 0, 0); gtk_box_pack_start (GTK_BOX (index_title), index_title->details->title, 0, 0, 0);
} }
...@@ -347,15 +349,14 @@ nautilus_index_title_set_uri(NautilusIndexTitle *index_title, const char* new_ur ...@@ -347,15 +349,14 @@ nautilus_index_title_set_uri(NautilusIndexTitle *index_title, const char* new_ur
file_object = nautilus_file_get(new_uri); file_object = nautilus_file_get(new_uri);
if(file_object) { /* add the icon */
nautilus_index_title_set_up_icon (index_title, file_object); nautilus_index_title_set_up_icon (index_title, file_object);
/* add various info */
nautilus_index_title_set_up_info(index_title, file_object);
}
/* add the name, in a variable-sized label */ /* add the name, in a variable-sized label */
nautilus_index_title_set_up_label (index_title, new_uri); nautilus_index_title_set_up_label (index_title, new_uri);
/* add various info */
nautilus_index_title_set_up_info(index_title, file_object);
/* FIXME: file_object can be NULL if this is a bad url, or one that /* FIXME: file_object can be NULL if this is a bad url, or one that
* NautilusFile can't handle (e.g. http). The UI here needs to * NautilusFile can't handle (e.g. http). The UI here needs to
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment