applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove annoying debugging output.

Browse source 
2001-07-18  Richard Hestilow  <hestilow@ximian.com>

	* capplet-dir.c (capplet_new): Remove annoying debugging output.

	* capplet-dir-view-html.c: Rewritten to use jimmac's new interface.

	* bcg_top.png, title.png, blank.png, active.png: Added.

	* Makefile.am (splash_DATA): Add new pixmap files.

	* gnomecc.glade: Remove ugly toolbar.

	* capplet-dir-view.[ch]: Remove toolbar-related code.
This commit is contained in:
Richard Hestilow 2001-07-19 03:16:35 +00:00 • committed by Rachel Hestilow
parent bf60a18254
commit 042c40c8da
7 changed files with 183 additions and 400 deletions
Download patch file Download diff file Expand all files Collapse all files

14
control-center/ChangeLog
View file

@ -1,3 +1,17 @@
2001-07-18 Richard Hestilow <hestilow@ximian.com>
* capplet-dir.c (capplet_new): Remove annoying debugging output.
* capplet-dir-view-html.c: Rewritten to use jimmac's new interface.
* bcg_top.png, title.png, blank.png, active.png: Added.
* Makefile.am (splash_DATA): Add new pixmap files.
* gnomecc.glade: Remove ugly toolbar.
* capplet-dir-view.[ch]: Remove toolbar-related code.
2001-07-18 Chema Celorio <chema@celorio.com> 2001-07-18 Chema Celorio <chema@celorio.com>
* capplet-dir.c (get_root_capplet_dir): if the directory is not found, warn * capplet-dir.c (get_root_capplet_dir): if the directory is not found, warn

11
control-center/Makefile.am
View file

@ -3,13 +3,10 @@ appicon_DATA = control-center.png
splashdir = $(datadir)/pixmaps/gnomecc splashdir = $(datadir)/pixmaps/gnomecc
splash_DATA = \ splash_DATA = \
ccsplash.png \ bcg_top.png \
bgtop.png \ title.png \
bg.png \ blank.png \
empty.png \ active.png
foot.png \
left_top.png \
left.png
sysdir = $(datadir)/gnome/apps/Settings sysdir = $(datadir)/gnome/apps/Settings
sys_in_files = gnomecc.desktop.in sys_in_files = gnomecc.desktop.in

238
control-center/capplet-dir-view-html.c
View file

@ -33,7 +33,9 @@
typedef struct { typedef struct {
GtkHTML *top; GtkHTML *top;
GtkHTML *sidebar;
GtkHTML *main; GtkHTML *main;
CappletDir *root_dir;
} HtmlViewData; } HtmlViewData;
static void static void
@ -121,6 +123,11 @@ write_parent_html (CappletDir *dir, GtkHTML *html, GtkHTMLStream *stream)
g_free (s); g_free (s);
} }
static gboolean save_cb (gpointer engine, gchar *data, guint len, gpointer user_data)
{
fprintf (user_data, data);
}
static void static void
header_populate (CappletDirView *view) header_populate (CappletDirView *view)
{ {
@ -131,26 +138,116 @@ header_populate (CappletDirView *view)
data = view->view_data; data = view->view_data;
stream = gtk_html_begin (data->top); stream = gtk_html_begin (data->top);
#warning this should probably be loaded from a file yo s = g_strdup_printf (
s = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">"
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n" "<html>"
"<html>\n" "<head>"
"<head></head>\n" "</head>"
"<body marginwidth=\"0\" marginheight=\"0\" background=\""ART_DIR"/bgtop.png\">\n" "<body background=\"" ART_DIR "/bcg_top.png\" marginheight=\"0\" marginwidth=\"0\">"
"<img src=\""ART_DIR"/left_top.png\" alt=\"\" width=\"47\" height=\"110\">\n" "<table border=\"0\" width=\"100%%\" cellspacing=\"0\" cellpadding=\"0\"><tr valign=\"center\"><td width=\"48\"><img src=\"" ART_DIR "/title.png\" alt=\"\" width=\"48\" height=\"48\"></td>"
"<img src=\""ART_DIR"/empty.png\" alt=\"\" width=\"5\" height=\"110\">\n" "<td><b><font face=\"Trebuchet MS CE,Trebuchet MS, Verdana CE, Verdana, Sans-Serif CE, Sans-Serif\" color=\"white\" size=\"+2\">%s&nbsp;&nbsp;&nbsp;</font></b><font face=\"Trebuchet MS CE,Trebuchet MS, Verdana CE, Verdana, Sans-Serif CE, Sans-Serif\" color=\"white\" align=\"left\" valign=\"center\">%s</font></td></tr></table>"
"<img src=\""ART_DIR"/foot.png\" alt=\"Gnome\">\n" "</body></html>",
"<img src=\""ART_DIR"/empty.png\" alt=\"\" width=\"5\" height=\"110\">\n" _("GNOME Control Center:"), CAPPLET_DIR_ENTRY (view->capplet_dir)->label);
"<font face=\"Trebuchet MS CE,Trebuchet MS, Verdana CE, Verdana, Sans-Serif CE, Sans-Serif\" size=\"6\" color=\"white\">Your Gnome</font>\n"
#if 0
"<img src=\""ART_DIR"/yourgnome.png\">\n"
#endif
"</body>\n"
"</html>";
gtk_html_write (data->top, stream, s, strlen (s)); gtk_html_write (data->top, stream, s, strlen (s));
g_free (s);
gtk_html_end (data->top, stream, GTK_HTML_STREAM_OK); gtk_html_end (data->top, stream, GTK_HTML_STREAM_OK);
gtk_widget_set_usize (GTK_WIDGET (data->top), 0, 110); }
static void
sidebar_populate (CappletDirView *view)
{
GtkHTMLStream *stream;
HtmlViewData *data;
CappletDirEntry *entry;
GSList *item;
char *s;
data = view->view_data;
stream = gtk_html_begin (data->sidebar);
s = g_strdup_printf (
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">"
"<html>"
"<head>"
"</head>"
"<body bgcolor=\"#d9d9d9\" marginheight=\"0\" marginwidth=\"0\">"
"<table border=\"0\" width=\"100%%\" cellspacing=\"1\" cellpadding=\"4\">"
"<tr><td colspan=\"3\">&nbsp;</td></tr>"
"<tr valign=\"center\"><td width=\"48\"><a href=\"%s\"><img src=\"%s\" alt=\"\" border=\"0\" align=\"center\"/></a></td><td><a href=\"%s\"><b>%s</b></a></td><td width=\"8\"><img src=\"%s\" alt=\"\" border=\"0\" align=\"right\"></tr>", CAPPLET_DIR_ENTRY (data->root_dir)->path, CAPPLET_DIR_ENTRY (data->root_dir)->icon, CAPPLET_DIR_ENTRY (data->root_dir)->path, CAPPLET_DIR_ENTRY (data->root_dir)->label, (data->root_dir == view->capplet_dir) ? ART_DIR "/active.png" : ART_DIR "/blank.png");
gtk_html_write (data->sidebar, stream, s, strlen (s));
g_free (s);
for (item = data->root_dir->entries; item; item = item->next) {
entry = CAPPLET_DIR_ENTRY (item->data);
if (entry->type != TYPE_CAPPLET_DIR)
continue;
s = g_strdup_printf ("<tr valign=\"center\"><td width=\"48\"><a href=\"%s\"><img src=\"%s\" alt=\"\" border=\"0\" align=\"center\"/></a></td><td><a href=\"%s\"><b>%s</b></a></td><td width=\"8\"><img src=\"%s\" alt=\"\" border=\"0\" align=\"center\"></tr>", entry->path, entry->icon, entry->path, entry->label, (CAPPLET_DIR (entry) == view->capplet_dir) ? ART_DIR "/active.png" : ART_DIR "/blank.png");
gtk_html_write (data->sidebar, stream, s, strlen (s));
g_free (s);
}
s =
"</table></html>";
gtk_html_write (data->sidebar, stream, s, strlen (s));
}
/* Write a row of up to 4 items and return a pointer to the next 4 */
static GSList*
html_write_row (GtkHTML *html, GtkHTMLStream *stream, GSList *list)
{
CappletDirEntry *entry;
int i;
char *s;
GSList *item;
int the_max = 3;
s = "<tr><td><img src=\"" ART_DIR "/blank.png\" height=\"1\" width=\"8\"></td>";
gtk_html_write (html, stream, s, strlen (s));
g_return_val_if_fail (list != NULL, NULL);
i = 0;
for (item = list; item; item = item->next) {
entry = CAPPLET_DIR_ENTRY (item->data);
if (entry->type != TYPE_CAPPLET)
continue;
s = g_strdup_printf ("<td><center><a href=\"%s\"><img src=\"%s\" alt=\"\" border=\"0\" align=\"center\"/></a></center></td><td><img src=\"" ART_DIR "/blank.png\" height=\"1\" width=\"8\"></td>", entry->path, entry->icon);
gtk_html_write (html, stream, s, strlen (s));
g_free (s);
/* Control. Can't go in for-decl because it would inc in all
* cases, including the skipped directories. */
i++;
if (!(i < the_max))
break;
}
s = "</tr><tr><td><img src=\"" ART_DIR "/blank.png\" height=\"1\" width=\"8\"></td>";
gtk_html_write (html, stream, s, strlen (s));
i = 0;
for (item = list; item; item = item->next) {
entry = CAPPLET_DIR_ENTRY (item->data);
if (entry->type != TYPE_CAPPLET)
continue;
s = g_strdup_printf ("<td><center><a href=\"%s\">%s</a></center></td><td><img src=\"" ART_DIR "/blank.png\" height=\"1\" width=\"8\"></td>", entry->path, entry->label);
gtk_html_write (html, stream, s, strlen (s));
g_free (s);
i++;
if (!(i < the_max))
{
item = item->next;
break;
}
}
s = g_strdup_printf ("</tr><tr><td colspan=\"%i\"><img src=\"" ART_DIR "/blank.png\" height=\"16\" width=\"100%%\"></td></tr>\n", the_max * 2 + 1);
gtk_html_write (html, stream, s, strlen (s));
g_free (s);
return item;
} }
static void static void
@ -158,75 +255,33 @@ html_populate (CappletDirView *view)
{ {
HtmlViewData *data; HtmlViewData *data;
GtkHTMLStream *stream; GtkHTMLStream *stream;
CappletDirEntry *entry;
GSList *item; GSList *item;
int i;
char *s; char *s;
header_populate (view);
data = view->view_data; data = view->view_data;
if (!data->root_dir)
data->root_dir = view->capplet_dir;
header_populate (view);
sidebar_populate (view);
stream = gtk_html_begin (data->main); stream = gtk_html_begin (data->main);
s = s =
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n" "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">"
"<html>\n" "<html>"
" <head>\n" "<head>"
" <title>GNOME Control Center</title>\n" "</head>"
" </head>\n" "<body marginheight=\"0\" marginwidth=\"0\">"
" <body marginheight=\"0\" marginwidth=\"0\" background=\""ART_DIR"/bg.png\">\n" "<table border=\"0\" width=\"100%%\" cellspacing=\"0\" cellpadding=\"0\">";
" <img src=\""ART_DIR"/left.png\" align=\"left\">\n"
#if 0
" <img src=\""ART_DIR"/empty.png\" width=\"600\" height=\"30\">\n"
" <table bgcolor=\"#292928\" width=\"100%%\" cellpadding=\"0\" cellspacing=\"0\" border=\"0\" columns=\"2\">\n"
" <tr>\n"
" <td>\n"
" <img src=\"%s\" height=\"24\" width=\"24\"></td>\n"
" <td align=\"right\">\n"
" <font size=\"+3\" color=\"#757575\"><b>%s</b></font>\n"
" </td>\n"
" </tr>\n"
" </table>\n"
#endif
" <table width=\"100%%\" columns=\"4\" cellpadding=\"4\" cellspacing=\"0\" border=\"0\">\n"
#if 0
" <tr height=\"64\">\n"
" <td colspan=\"4\">\n"
" Select something you want to customize.\n"
" </td>\n"
" <\tr>\n"
#endif
" <tr>\n"
" <td colspan=\"4\">\n"
" &nbsp;\n";
gtk_html_write (data->main, stream, s, strlen (s)); gtk_html_write (data->main, stream, s, strlen (s));
/* write_parent_html (view->capplet_dir->entry.dir, data->main, stream); */ /* write_parent_html (view->capplet_dir->entry.dir, data->main, stream); */
for (i = 0, item = view->capplet_dir->entries; item; item = item->next, i++) { for (item = view->capplet_dir->entries; item; )
if (!(i%2)) { {
s = " <tr>\n"; item = html_write_row (data->main, stream, item);
gtk_html_write (data->main, stream, s, strlen (s));
}
entry = CAPPLET_DIR_ENTRY (item->data);
s = g_strdup_printf (
" <td width=\"36\">\n"
" <a href=\"%s\"><img src=\"%s\" border=\"0\" height=\"36\" width=\"36\"></a></td>\n"
" <td width=\"%%50\">\n"
" <font size=\"+1\"><b><a href=\"%s\">%s</a></b></font><br>\n"
" <font size=\"-1\">%s</font>\n"
" </td>\n"
, entry->path, entry->icon, entry->path, entry->label, entry->entry->comment);
gtk_html_write (data->main, stream, s, strlen (s));
g_free (s);
if (i%2 || !item->next) {
s = " </tr>\n";
gtk_html_write (data->main, stream, s, strlen (s));
}
} }
s = s =
@ -236,45 +291,68 @@ html_populate (CappletDirView *view)
gtk_html_write (data->main, stream, s, strlen (s)); gtk_html_write (data->main, stream, s, strlen (s));
gtk_html_end (data->main, stream, GTK_HTML_STREAM_OK); gtk_html_end (data->main, stream, GTK_HTML_STREAM_OK);
// gtk_widget_set_usize (GTK_WIDGET (data->main), html_engine_calc_min_width (data->main->engine), 0);
// g_print ("%i\n", html_engine_calc_min_width (data->main->engine));
} }
static GtkWidget * static GtkWidget *
html_create (CappletDirView *view) html_create (CappletDirView *view)
{ {
GtkWidget *vbox; GtkWidget *vbox;
GtkWidget *hbox;
HtmlViewData *data; HtmlViewData *data;
GtkWidget *sw; GtkWidget *sw;
data = g_new (HtmlViewData, 1); data = g_new (HtmlViewData, 1);
view->view_data = data; view->view_data = data;
vbox = gtk_vbox_new (FALSE, 0); data->root_dir = NULL;
vbox = gtk_vbox_new (FALSE, 0);
/* top widget */ /* top widget */
data->top = GTK_HTML (gtk_html_new ()); data->top = GTK_HTML (gtk_html_new ());
sw = gtk_scrolled_window_new (NULL, NULL); sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_NEVER, GTK_POLICY_NEVER,
GTK_POLICY_NEVER); GTK_POLICY_NEVER);
gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (data->top)); gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (data->top));
gtk_widget_set_usize (GTK_WIDGET (data->top), 0, 48);
gtk_box_pack_start (GTK_BOX (vbox), sw, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), sw, FALSE, FALSE, 0);
hbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
/* sidebar */
data->sidebar = GTK_HTML (gtk_html_new ());
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (data->sidebar));
gtk_widget_set_usize (GTK_WIDGET (data->sidebar), 200, 0);
gtk_box_pack_start (GTK_BOX (hbox), sw, FALSE, FALSE, 0);
/* main widget */ /* main widget */
data->main = GTK_HTML (gtk_html_new ()); data->main = GTK_HTML (gtk_html_new ());
sw = gtk_scrolled_window_new (NULL, NULL); sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_NEVER, GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC); GTK_POLICY_ALWAYS);
gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (data->main)); gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (data->main));
gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), sw, TRUE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (data->top), "url_requested", gtk_signal_connect (GTK_OBJECT (data->top), "url_requested",
GTK_SIGNAL_FUNC (handle_url_cb), view); GTK_SIGNAL_FUNC (handle_url_cb), view);
gtk_signal_connect (GTK_OBJECT (data->sidebar), "url_requested",
GTK_SIGNAL_FUNC (handle_url_cb), view);
gtk_signal_connect (GTK_OBJECT (data->main), "url_requested", gtk_signal_connect (GTK_OBJECT (data->main), "url_requested",
GTK_SIGNAL_FUNC (handle_url_cb), view); GTK_SIGNAL_FUNC (handle_url_cb), view);
gtk_signal_connect (GTK_OBJECT (data->sidebar), "link_clicked",
GTK_SIGNAL_FUNC (handle_link_cb), view);
gtk_signal_connect (GTK_OBJECT (data->main), "link_clicked", gtk_signal_connect (GTK_OBJECT (data->main), "link_clicked",
GTK_SIGNAL_FUNC (handle_link_cb), view); GTK_SIGNAL_FUNC (handle_link_cb), view);

51
control-center/capplet-dir-view.c
View file

@ -57,13 +57,6 @@ static gboolean authed;
static void static void
capplet_dir_view_update_authenticated (CappletDirView *view, gpointer null) capplet_dir_view_update_authenticated (CappletDirView *view, gpointer null)
{ {
if (authed) {
gtk_widget_hide (view->rootm_locked);
gtk_widget_show (view->rootm_unlocked);
} else {
gtk_widget_hide (view->rootm_unlocked);
gtk_widget_show (view->rootm_locked);
}
} }
void void
@ -128,20 +121,6 @@ capplet_dir_view_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
gtk_widget_show (view->view); gtk_widget_show (view->view);
} }
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (view->list_menu),
layout == LAYOUT_ICON_LIST);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (view->tree_menu),
layout == LAYOUT_TREE);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (view->html_menu),
layout == LAYOUT_HTML);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (view->list_toggle),
layout == LAYOUT_ICON_LIST);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (view->tree_toggle),
layout == LAYOUT_TREE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (view->html_toggle),
layout == LAYOUT_HTML);
view->changing_layout = FALSE; view->changing_layout = FALSE;
break; break;
default: default:
@ -362,20 +341,6 @@ capplet_dir_view_new (void)
window_list = g_list_append (window_list, view); window_list = g_list_append (window_list, view);
view->app = GNOME_APP (glade_xml_get_widget (xml, "main_window")); view->app = GNOME_APP (glade_xml_get_widget (xml, "main_window"));
view->up_button = glade_xml_get_widget (xml, "back_button");
view->parents_option = glade_xml_get_widget (xml, "parents_option");
view->html_toggle = glade_xml_get_widget (xml, "html_toggle");
view->list_toggle = glade_xml_get_widget (xml, "list_toggle");
view->tree_toggle = glade_xml_get_widget (xml, "tree_toggle");
view->html_menu = glade_xml_get_widget (xml, "html_menu");
view->list_menu = glade_xml_get_widget (xml, "list_menu");
view->tree_menu = glade_xml_get_widget (xml, "tree_menu");
view->rootm_button = glade_xml_get_widget (xml, "rootm_button");
view->rootm_locked = glade_xml_get_widget (xml, "rootm_locked");
view->rootm_unlocked = glade_xml_get_widget (xml, "rootm_unlocked");
if (!gnome_preferences_get_toolbar_relief_btn ())
gtk_button_set_relief (GTK_BUTTON (view->rootm_button), GTK_RELIEF_NONE);
gtk_signal_connect (GTK_OBJECT (view->app), "destroy", gtk_signal_connect (GTK_OBJECT (view->app), "destroy",
GTK_SIGNAL_FUNC (destroy), view); GTK_SIGNAL_FUNC (destroy), view);
@ -390,14 +355,6 @@ capplet_dir_view_new (void)
glade_xml_signal_connect_data (xml, "close_cb", close_cb, view); glade_xml_signal_connect_data (xml, "close_cb", close_cb, view);
glade_xml_signal_connect_data (xml, "exit_cb", exit_cb, view); glade_xml_signal_connect_data (xml, "exit_cb", exit_cb, view);
glade_xml_signal_connect_data (xml, "html_menu_cb", html_menu_cb, view);
glade_xml_signal_connect_data (xml, "icon_menu_cb", icon_menu_cb, view);
glade_xml_signal_connect_data (xml, "tree_menu_cb", tree_menu_cb, view);
glade_xml_signal_connect_data (xml, "html_toggle_cb", html_toggle_cb, view);
glade_xml_signal_connect_data (xml, "list_toggle_cb", list_toggle_cb, view);
glade_xml_signal_connect_data (xml, "tree_toggle_cb", tree_toggle_cb, view);
glade_xml_signal_connect_data (xml, "prefs_menu_cb", prefs_menu_cb, view); glade_xml_signal_connect_data (xml, "prefs_menu_cb", prefs_menu_cb, view);
glade_xml_signal_connect_data (xml, "about_menu_cb", about_menu_cb, view); glade_xml_signal_connect_data (xml, "about_menu_cb", about_menu_cb, view);
glade_xml_signal_connect_data (xml, "back_button_cb", back_button_cb, view); glade_xml_signal_connect_data (xml, "back_button_cb", back_button_cb, view);
@ -464,11 +421,6 @@ capplet_dir_view_load_dir (CappletDirView *view, CappletDir *dir)
if (view->impl && view->impl->populate) if (view->impl && view->impl->populate)
view->impl->populate (view); view->impl->populate (view);
if (CAPPLET_DIR_ENTRY (dir)->dir == NULL)
gtk_widget_set_sensitive (view->up_button, FALSE);
else
gtk_widget_set_sensitive (view->up_button, TRUE);
menu = gtk_menu_new (); menu = gtk_menu_new ();
for (entry = CAPPLET_DIR_ENTRY (dir); entry; entry = CAPPLET_DIR_ENTRY (entry->dir), parents++) { for (entry = CAPPLET_DIR_ENTRY (dir); entry; entry = CAPPLET_DIR_ENTRY (entry->dir), parents++) {
@ -495,9 +447,6 @@ capplet_dir_view_load_dir (CappletDirView *view, CappletDir *dir)
gtk_menu_prepend (GTK_MENU (menu), menuitem); gtk_menu_prepend (GTK_MENU (menu), menuitem);
} }
gtk_widget_show_all (menu); gtk_widget_show_all (menu);
gtk_option_menu_set_menu (GTK_OPTION_MENU (view->parents_option), menu);
gtk_option_menu_set_history (GTK_OPTION_MENU (view->parents_option), parents-1);
} }

15
control-center/capplet-dir-view.h
View file

@ -71,21 +71,6 @@ struct _CappletDirView
gboolean destroyed; gboolean destroyed;
CappletDirViewLayout layout; CappletDirViewLayout layout;
GtkWidget *up_button;
GtkWidget *parents_option;
GtkWidget *html_toggle;
GtkWidget *list_toggle;
GtkWidget *tree_toggle;
GtkWidget *html_menu;
GtkWidget *list_menu;
GtkWidget *tree_menu;
GtkWidget *rootm_button;
GtkWidget *rootm_locked;
GtkWidget *rootm_unlocked;
gboolean changing_layout; gboolean changing_layout;
}; };

2
control-center/capplet-dir.c
View file

@ -61,8 +61,6 @@ capplet_new (CappletDir *dir, gchar *desktop_path)
g_return_val_if_fail (desktop_path != NULL, NULL); g_return_val_if_fail (desktop_path != NULL, NULL);
g_print ("reading %s\n", desktop_path);
entry = g_hash_table_lookup (capplet_hash, desktop_path); entry = g_hash_table_lookup (capplet_hash, desktop_path);
if (entry) { if (entry) {
g_print ("hash hit!!\n"); g_print ("hash hit!!\n");

248
control-center/gnomecc.glade
View file

@ -257,7 +257,8 @@
<type>GTK_WINDOW_TOPLEVEL</type> <type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_NONE</position> <position>GTK_WIN_POS_NONE</position>
<modal>False</modal> <modal>False</modal>
<default_height>300</default_height> <default_width>500</default_width>
<default_height>400</default_height>
<allow_shrink>True</allow_shrink> <allow_shrink>True</allow_shrink>
<allow_grow>True</allow_grow> <allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink> <auto_shrink>False</auto_shrink>
@ -346,7 +347,7 @@
</signal> </signal>
<label>HTML</label> <label>HTML</label>
<active>False</active> <active>False</active>
<always_show_toggle>False</always_show_toggle> <always_show_toggle>True</always_show_toggle>
<group>view_group</group> <group>view_group</group>
</widget> </widget>
@ -360,7 +361,7 @@
</signal> </signal>
<label>Icon List</label> <label>Icon List</label>
<active>False</active> <active>False</active>
<always_show_toggle>False</always_show_toggle> <always_show_toggle>True</always_show_toggle>
<group>view_group</group> <group>view_group</group>
</widget> </widget>
@ -374,7 +375,7 @@
</signal> </signal>
<label>Tree</label> <label>Tree</label>
<active>True</active> <active>True</active>
<always_show_toggle>False</always_show_toggle> <always_show_toggle>True</always_show_toggle>
<group>view_group</group> <group>view_group</group>
</widget> </widget>
</widget> </widget>
@ -426,245 +427,6 @@
</widget> </widget>
</widget> </widget>
<widget>
<class>GnomeDockItem</class>
<name>dockitem3</name>
<placement>GNOME_DOCK_TOP</placement>
<band>1</band>
<position>0</position>
<offset>0</offset>
<locked>False</locked>
<exclusive>True</exclusive>
<never_floating>False</never_floating>
<never_vertical>False</never_vertical>
<never_horizontal>False</never_horizontal>
<shadow_type>GTK_SHADOW_OUT</shadow_type>
<widget>
<class>GtkHBox</class>
<name>hbox1</name>
<homogeneous>True</homogeneous>
<spacing>0</spacing>
<widget>
<class>GtkHBox</class>
<name>hbox3</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkToolbar</class>
<name>toolbar4</name>
<orientation>GTK_ORIENTATION_HORIZONTAL</orientation>
<type>GTK_TOOLBAR_ICONS</type>
<space_size>5</space_size>
<space_style>GTK_TOOLBAR_SPACE_EMPTY</space_style>
<relief>GTK_RELIEF_NORMAL</relief>
<tooltips>True</tooltips>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkButton</class>
<name>rootm_button</name>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>rootm_button_cb</handler>
<last_modification_time>Thu, 07 Dec 2000 22:22:55 GMT</last_modification_time>
</signal>
<relief>GTK_RELIEF_NONE</relief>
<widget>
<class>GtkHBox</class>
<name>hbox3</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<widget>
<class>GnomePixmap</class>
<name>rootm_locked</name>
<width>24</width>
<height>24</height>
<filename>gnome-lockscreen.png</filename>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
</widget>
<widget>
<class>GnomePixmap</class>
<name>rootm_unlocked</name>
<width>24</width>
<height>24</height>
<visible>False</visible>
<filename>gnome-unlockscreen.png</filename>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
</widget>
</widget>
</widget>
</widget>
<widget>
<class>GtkLabel</class>
<name>label3</name>
<label></label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
</widget>
</widget>
<widget>
<class>GtkToolbar</class>
<name>toolbar1</name>
<border_width>1</border_width>
<orientation>GTK_ORIENTATION_HORIZONTAL</orientation>
<type>GTK_TOOLBAR_ICONS</type>
<space_size>8</space_size>
<space_style>GTK_TOOLBAR_SPACE_EMPTY</space_style>
<relief>GTK_RELIEF_NONE</relief>
<tooltips>True</tooltips>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkButton</class>
<child_name>Toolbar:button</child_name>
<name>back_button</name>
<signal>
<name>clicked</name>
<handler>back_button_cb</handler>
<last_modification_time>Tue, 05 Dec 2000 02:56:16 GMT</last_modification_time>
</signal>
<label></label>
<stock_pixmap>GNOME_STOCK_PIXMAP_BACK</stock_pixmap>
</widget>
<widget>
<class>GtkOptionMenu</class>
<name>parents_option</name>
<can_focus>True</can_focus>
<items></items>
<initial_choice>0</initial_choice>
</widget>
</widget>
<widget>
<class>GtkHBox</class>
<name>hbox2</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>4</padding>
<expand>True</expand>
<fill>True</fill>
<pack>GTK_PACK_END</pack>
</child>
<widget>
<class>GtkLabel</class>
<name>label2</name>
<label></label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
</widget>
<widget>
<class>GtkToolbar</class>
<name>toolbar3</name>
<orientation>GTK_ORIENTATION_HORIZONTAL</orientation>
<type>GTK_TOOLBAR_ICONS</type>
<space_size>5</space_size>
<space_style>GTK_TOOLBAR_SPACE_EMPTY</space_style>
<relief>GTK_RELIEF_NORMAL</relief>
<tooltips>True</tooltips>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
<widget>
<class>GtkToggleButton</class>
<child_name>Toolbar:button</child_name>
<name>html_toggle</name>
<signal>
<name>toggled</name>
<handler>html_toggle_cb</handler>
<last_modification_time>Tue, 05 Dec 2000 02:56:32 GMT</last_modification_time>
</signal>
<label></label>
<icon>html-view.xpm</icon>
<active>True</active>
</widget>
<widget>
<class>GtkToggleButton</class>
<child_name>Toolbar:button</child_name>
<name>list_toggle</name>
<signal>
<name>toggled</name>
<handler>list_toggle_cb</handler>
<last_modification_time>Tue, 05 Dec 2000 02:56:48 GMT</last_modification_time>
</signal>
<label></label>
<icon>icon-view.xpm</icon>
<active>False</active>
</widget>
<widget>
<class>GtkToggleButton</class>
<child_name>Toolbar:button</child_name>
<name>tree_toggle</name>
<signal>
<name>toggled</name>
<handler>tree_toggle_cb</handler>
<last_modification_time>Tue, 05 Dec 2000 02:56:59 GMT</last_modification_time>
</signal>
<label></label>
<icon>tree-view.xpm</icon>
<active>False</active>
</widget>
</widget>
</widget>
</widget>
</widget>
<widget> <widget>
<class>Placeholder</class> <class>Placeholder</class>
<child_name>GnomeDock:contents</child_name> <child_name>GnomeDock:contents</child_name>