Finishing Bug #2631. Arlo titles to all sections of the summary view.

2000-09-01  J Shane Culpepper  <pepper@eazel.com>

	* components/services/nautilus-dependent-shared/shared-service-widg
	ets.c: (create_summary_service_title_top_widget),
	(create_summary_service_title_bottom_widget),
	(create_services_header_widget),
	(create_summary_service_large_grey_header_widget),
	(create_summary_service_small_grey_header_widget):
	* components/services/nautilus-dependent-shared/shared-service-widg
	ets.h:
	* components/services/summary/nautilus-view/nautilus-summary-view.c
	: (generate_summary_form):

	Finishing Bug #2631.  Arlo titles to all sections of the summary view.
This commit is contained in:
J Shane Culpepper 2000-09-01 22:32:37 +00:00 committed by J Shane Culpepper
parent b79cbe1f20
commit 9ebcc6075e
5 changed files with 139 additions and 22 deletions

View file

@ -1,3 +1,18 @@
2000-09-01 J Shane Culpepper <pepper@eazel.com>
* components/services/nautilus-dependent-shared/shared-service-widg
ets.c: (create_summary_service_title_top_widget),
(create_summary_service_title_bottom_widget),
(create_services_header_widget),
(create_summary_service_large_grey_header_widget),
(create_summary_service_small_grey_header_widget):
* components/services/nautilus-dependent-shared/shared-service-widg
ets.h:
* components/services/summary/nautilus-view/nautilus-summary-view.c
: (generate_summary_form):
Finishing Bug #2631. Arlo titles to all sections of the summary view.
2000-09-01 Michael Engber <engber@eazel.com>
Removed our quitting logic from nautilus-application

View file

@ -193,7 +193,7 @@ create_summary_service_title_top_widget (const char *login_status_text)
filler_image = create_image_widget (NULL, "service-summary-large-teal-section.png");
label = create_label_widget (login_status_text, 20, "service-summary-large-teal-section.png", 10, 0, 0, -4);
label = create_label_widget (login_status_text, 20, "service-summary-large-teal-section.png", 10, 0, 0, -1);
nautilus_label_set_font_from_components (NAUTILUS_LABEL (label), "helvetica", "bold", NULL, NULL);
nautilus_label_set_font_size (NAUTILUS_LABEL (label), 18);
@ -228,7 +228,7 @@ create_summary_service_title_bottom_widget (const char *section_title)
filler_image = create_image_widget (NULL, "service-summary-large-grey-section.png");
label = create_label_widget (section_title, 20, "service-summary-large-grey-section.png", 10, 0, 0, -4);
label = create_label_widget (section_title, 20, "service-summary-large-grey-section.png", 10, 0, 0, -1);
nautilus_label_set_font_from_components (NAUTILUS_LABEL (label), "helvetica", "bold", NULL, NULL);
nautilus_label_set_font_size (NAUTILUS_LABEL (label), 18);
@ -281,6 +281,60 @@ create_services_header_widget (const char *left_text,
}
/* utility routine to create a large grey section header */
GtkWidget*
create_summary_service_large_grey_header_widget (const char *right_text)
{
GtkWidget *title_hbox;
GtkWidget *right_label;
GtkWidget *filler_image;
g_assert (right_text != NULL);
title_hbox = gtk_hbox_new (FALSE, 0);
filler_image = create_image_widget (NULL, "service-summary-large-grey-section.png");
right_label = create_label_widget (right_text, 18, "service-summary-large-grey-section.png", 10, 0, 0, -1);
gtk_widget_show (filler_image);
gtk_widget_show (right_label);
gtk_box_pack_start (GTK_BOX (title_hbox), filler_image, TRUE, TRUE, 0);
gtk_box_pack_end (GTK_BOX (title_hbox), right_label, FALSE, FALSE, 0);
return title_hbox;
}
/* utility routine to create a small grey section header */
GtkWidget*
create_summary_service_small_grey_header_widget (const char *left_text)
{
GtkWidget *title_hbox;
GtkWidget *left_label;
GtkWidget *filler_image;
g_assert (left_text != NULL);
title_hbox = gtk_hbox_new (FALSE, 0);
left_label = create_label_widget (left_text, 12, "service-summary-short-grey-section.png", 10, 0, 0, -1);
filler_image = create_image_widget (NULL, "service-summary-short-grey-section.png");
gtk_widget_show (left_label);
gtk_widget_show (filler_image);
gtk_box_pack_start (GTK_BOX (title_hbox), left_label, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (title_hbox), filler_image, TRUE, TRUE, 0);
return title_hbox;
}
/* utility routine to set the text color */
void

View file

@ -33,24 +33,26 @@
#define SERVICE_VIEW_DEFAULT_BACKGROUND_COLOR "rgb:FFFF/FFFF/FFFF"
GtkWidget* create_image_widget (const char *icon_name,
const char *tile_icon_name);
GtkWidget* create_label_widget (const char *text,
guint font_size,
const char *tile_icon_name,
guint xpad,
guint ypad,
gint horizontal_offset,
gint vertical_offset);
GtkWidget* create_services_title_widget (const char *title_text);
GtkWidget* create_summary_service_title_top_widget (const char *login_status_text);
GtkWidget* create_summary_service_title_bottom_widget (const char *section_title);
GtkWidget* create_services_header_widget (const char *left_text,
const char *right_text);
void show_feedback (GtkWidget *widget,
char *error_text);
void set_widget_foreground_color (GtkWidget *widget,
const char *color_spec);
GtkWidget* create_image_widget (const char *icon_name,
const char *tile_icon_name);
GtkWidget* create_label_widget (const char *text,
guint font_size,
const char *tile_icon_name,
guint xpad,
guint ypad,
gint horizontal_offset,
gint vertical_offset);
GtkWidget* create_services_title_widget (const char *title_text);
GtkWidget* create_summary_service_title_top_widget (const char *login_status_text);
GtkWidget* create_summary_service_title_bottom_widget (const char *section_title);
GtkWidget* create_services_header_widget (const char *left_text,
const char *right_text);
GtkWidget* create_summary_service_large_grey_header_widget (const char *right_text);
GtkWidget* create_summary_service_small_grey_header_widget (const char *left_text);
void show_feedback (GtkWidget *widget,
char *error_text);
void set_widget_foreground_color (GtkWidget *widget,
const char *color_spec);
#endif /* SHARED_SERVICE_WIDGETS_H */

View file

@ -109,6 +109,7 @@ generate_summary_form (NautilusSummaryView *view)
GtkWidget *frame;
GtkTable *parent;
GtkWidget *title;
GtkWidget *small_title;
GtkWidget *temp_box;
GtkWidget *temp_hbox;
GtkWidget *temp_icon;
@ -202,8 +203,14 @@ generate_summary_form (NautilusSummaryView *view)
GTK_FILL | GTK_EXPAND,
0, 0);
/* create the parent login box and a table to hold the labels and text entries */
/* create the parent login box */
temp_box = gtk_vbox_new (FALSE, 0);
/* setup the title */
title = create_summary_service_large_grey_header_widget ("Options");
gtk_box_pack_start (GTK_BOX (temp_box), title, FALSE, FALSE, 0);
gtk_widget_show (title);
login_table = GTK_TABLE (gtk_table_new (4, 2, TRUE));
/* username label */
@ -295,6 +302,16 @@ generate_summary_form (NautilusSummaryView *view)
/* create the parent service news box and a table to hold the data */
temp_box = gtk_vbox_new (FALSE, 0);
/* setup the large grey header */
title = create_summary_service_large_grey_header_widget ("Eazel News and Updates");
gtk_box_pack_start (GTK_BOX (temp_box), title, FALSE, FALSE, 0);
gtk_widget_show (title);
/* setup the small grey header */
small_title = create_summary_service_small_grey_header_widget ("Service News");
gtk_box_pack_start (GTK_BOX (temp_box), small_title, FALSE, FALSE, 0);
gtk_widget_show (small_title);
service_news_table = GTK_TABLE (gtk_table_new (4, 2, FALSE));
/* Generate first column with fake icon */
@ -333,6 +350,12 @@ generate_summary_form (NautilusSummaryView *view)
/* create the parent login box and a table to hold the labels and text entries */
temp_box = gtk_vbox_new (FALSE, 0);
/* setup the small grey header */
small_title = create_summary_service_small_grey_header_widget ("Software Updates");
gtk_box_pack_start (GTK_BOX (temp_box), small_title, FALSE, FALSE, 0);
gtk_widget_show (small_title);
updates_table = GTK_TABLE (gtk_table_new (4, 3, FALSE));
/* Generate first column with fake icon */

View file

@ -109,6 +109,7 @@ generate_summary_form (NautilusSummaryView *view)
GtkWidget *frame;
GtkTable *parent;
GtkWidget *title;
GtkWidget *small_title;
GtkWidget *temp_box;
GtkWidget *temp_hbox;
GtkWidget *temp_icon;
@ -202,8 +203,14 @@ generate_summary_form (NautilusSummaryView *view)
GTK_FILL | GTK_EXPAND,
0, 0);
/* create the parent login box and a table to hold the labels and text entries */
/* create the parent login box */
temp_box = gtk_vbox_new (FALSE, 0);
/* setup the title */
title = create_summary_service_large_grey_header_widget ("Options");
gtk_box_pack_start (GTK_BOX (temp_box), title, FALSE, FALSE, 0);
gtk_widget_show (title);
login_table = GTK_TABLE (gtk_table_new (4, 2, TRUE));
/* username label */
@ -295,6 +302,16 @@ generate_summary_form (NautilusSummaryView *view)
/* create the parent service news box and a table to hold the data */
temp_box = gtk_vbox_new (FALSE, 0);
/* setup the large grey header */
title = create_summary_service_large_grey_header_widget ("Eazel News and Updates");
gtk_box_pack_start (GTK_BOX (temp_box), title, FALSE, FALSE, 0);
gtk_widget_show (title);
/* setup the small grey header */
small_title = create_summary_service_small_grey_header_widget ("Service News");
gtk_box_pack_start (GTK_BOX (temp_box), small_title, FALSE, FALSE, 0);
gtk_widget_show (small_title);
service_news_table = GTK_TABLE (gtk_table_new (4, 2, FALSE));
/* Generate first column with fake icon */
@ -333,6 +350,12 @@ generate_summary_form (NautilusSummaryView *view)
/* create the parent login box and a table to hold the labels and text entries */
temp_box = gtk_vbox_new (FALSE, 0);
/* setup the small grey header */
small_title = create_summary_service_small_grey_header_widget ("Software Updates");
gtk_box_pack_start (GTK_BOX (temp_box), small_title, FALSE, FALSE, 0);
gtk_widget_show (small_title);
updates_table = GTK_TABLE (gtk_table_new (4, 3, FALSE));
/* Generate first column with fake icon */