Author: tlsa Date: Thu Sep 23 11:04:01 2010 New Revision: 10827 URL: http://source.netsurf-browser.org?rev=10827&view=rev Log: Replace stubs for old treeviews with minimum needed to build with new treeview code. Removed: branches/jmb/treeview-redux/framebuffer/history.c branches/jmb/treeview-redux/framebuffer/hotlist.c Modified: branches/jmb/treeview-redux/Makefile.sources branches/jmb/treeview-redux/framebuffer/tree.c Modified: branches/jmb/treeview-redux/Makefile.sources URL: http://source.netsurf-browser.org/branches/jmb/treeview-redux/Makefile.so... ============================================================================== --- branches/jmb/treeview-redux/Makefile.sources (original) +++ branches/jmb/treeview-redux/Makefile.sources Thu Sep 23 11:04:01 2010 @@ -103,9 +103,9 @@ # S_FRAMEBUFFER are sources purely for the framebuffer build -S_FRAMEBUFFER := gui.c framebuffer.c tree.c history.c hotlist.c \ - save.c schedule.c thumbnail.c misc.c bitmap.c filetype.c \ - login.c findfile.c localhistory.c +S_FRAMEBUFFER := gui.c framebuffer.c tree.c save.c schedule.c \ + thumbnail.c misc.c bitmap.c filetype.c login.c findfile.c \ + localhistory.c S_FRAMEBUFFER_FBTK := fbtk.c event.c fill.c bitmap.c user.c window.c \ text.c scroll.c osk.c Removed: branches/jmb/treeview-redux/framebuffer/history.c URL: http://source.netsurf-browser.org/branches/jmb/treeview-redux/framebuffer... ============================================================================== --- branches/jmb/treeview-redux/framebuffer/history.c (original) +++ branches/jmb/treeview-redux/framebuffer/history.c (removed) @@ -1,41 +1,0 @@ -/* - * Copyright 2008 Vincent Sanders <vince(a)simtec.co.uk&gt; - * - * This file is part of NetSurf, http://www.netsurf-browser.org/ - * - * NetSurf is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * NetSurf is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>;. - */ - -#include "content/urldb.h" -#include "desktop/browser.h" - -void global_history_add(const char *url) -{ - const struct url_data *data; - - data = urldb_get_url_data(url); - if (!data) - return; - - -} - -void global_history_add_recent(const char *url) -{ -} - -char **global_history_get_recent(int *count) -{ - return NULL; -} - Removed: branches/jmb/treeview-redux/framebuffer/hotlist.c URL: http://source.netsurf-browser.org/branches/jmb/treeview-redux/framebuffer... ============================================================================== --- branches/jmb/treeview-redux/framebuffer/hotlist.c (original) +++ branches/jmb/treeview-redux/framebuffer/hotlist.c (removed) @@ -1,23 +1,0 @@ -/* - * Copyright 2008 Vincent Sanders <vince(a)simtec.co.uk&gt; - * - * This file is part of NetSurf, http://www.netsurf-browser.org/ - * - * NetSurf is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * NetSurf is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>;. - */ - -#include "desktop/browser.h" - -void hotlist_visited(struct hlcache_handle *content) -{ -} Modified: branches/jmb/treeview-redux/framebuffer/tree.c URL: http://source.netsurf-browser.org/branches/jmb/treeview-redux/framebuffer... ============================================================================== --- branches/jmb/treeview-redux/framebuffer/tree.c (original) +++ branches/jmb/treeview-redux/framebuffer/tree.c Thu Sep 23 11:04:01 2010 @@ -18,45 +18,56 @@ #include "desktop/tree.h" -void tree_initialise_redraw(struct tree *tree) +const char tree_directory_icon_name[] = "directory.png"; +const char tree_content_icon_name[] = "content.png"; + + + + +/** + * Translates a content_type to the name of a respective icon + * + * \param content_type content type + * \param buffer buffer for the icon name + */ +void tree_icon_name_from_content_type(char *buffer, content_type type) { + // TODO: design/acquire icons + switch (type) { + case CONTENT_HTML: + case CONTENT_TEXTPLAIN: + case CONTENT_CSS: +#if defined(WITH_MNG) || defined(WITH_PNG) + case CONTENT_PNG: +#endif +#ifdef WITH_MNG + case CONTENT_JNG: + case CONTENT_MNG: +#endif +#ifdef WITH_JPEG + case CONTENT_JPEG: +#endif +#ifdef WITH_GIF + case CONTENT_GIF: +#endif +#ifdef WITH_BMP + case CONTENT_BMP: + case CONTENT_ICO: +#endif +#ifdef WITH_SPRITE + case CONTENT_SPRITE: +#endif +#ifdef WITH_DRAW + case CONTENT_DRAW: +#endif +#ifdef WITH_ARTWORKS + case CONTENT_ARTWORKS: +#endif +#ifdef WITH_NS_SVG + case CONTENT_SVG: +#endif + default: + sprintf(buffer, tree_content_icon_name); + break; + } } - -void tree_redraw_area(struct tree *tree, int x, int y, int width, int height) -{ -} - -void tree_draw_line(int x, int y, int width, int height) -{ -} - -void tree_draw_node_element(struct tree *tree, struct node_element *element) -{ -} - -void tree_draw_node_expansion(struct tree *tree, struct node *node) -{ -} - -void tree_recalculate_node_element(struct node_element *element) -{ -} - -void tree_update_URL_node(struct node *node, const char *url, - const struct url_data *data) -{ -} - -void tree_resized(struct tree *tree) -{ -} - -void tree_set_node_sprite_folder(struct node *node) -{ -} - -void tree_set_node_sprite(struct node *node, const char *sprite, - const char *expanded) -{ -} -