diff options
| -rw-r--r-- | .hgignore | 1 | ||||
| -rw-r--r-- | dillorc | 42 | ||||
| -rw-r--r-- | doc/user_help.html | 15 | ||||
| -rw-r--r-- | src/IO/about.c | 24 |
4 files changed, 77 insertions, 5 deletions
@@ -21,6 +21,7 @@ ^dpid/dpid$ ^dpid/dpidc$ ^dpid/dpidrc$ +^test/containers$ ^test/cookies$ ^test/dw-anchors-test$ ^test/dw-border-test$ @@ -253,6 +253,48 @@ search_url="Google http://www.google.com/search?ie=UTF-8&oe=UTF-8&q=%s" #ui_tab_bg_color=(by default, the main background color) #ui_tab_fg_color=(by default, the main foreground color) + +# Note to packagers: leaving these variables for the system to guess +# gives different results in different environments, so we played it safe +# by defining the traditional colors. Please choose the color theme that +# better fits your distro. + +# +# Gray theme (traditional) +# +ui_fg_color=black +ui_main_bg_color=#c6c6c6 +ui_text_bg_color=bfdabf +ui_selection_color=#191970 +ui_button_highlight_color=#a9a9a9 +ui_tab_active_bg_color=#87aca7 +ui_tab_active_fg_color=black +ui_tab_bg_color=#b7beb7 + +# +# Earthly theme: +# +#ui_fg_color=#100404 +#ui_main_bg_color=#c2a47b +#ui_text_bg_color=#cdc9a5 +#ui_selection_color=#763024 +#ui_tab_active_bg_color=#af4b3f +#ui_tab_active_fg_color=white +#ui_tab_bg_color=#d2b48c + +# +# Greenish theme: +# +#ui_fg_color=#100404 +#ui_main_bg_color=#c8d394 +#ui_text_bg_color=#bdd8b6 +#ui_selection_color=#7c5f42 +#ui_button_highlight_color=#adad70 +#ui_tab_active_bg_color=#b5b679 +#ui_tab_active_fg_color=#b60907 +#ui_tab_bg_color=#cac682 + + # Size of dillo panel # tiny : buttons, location, and progress boxes in one row # small : location in one row, buttons + progress boxes in another diff --git a/doc/user_help.html b/doc/user_help.html index d65170d9..1824c8ae 100644 --- a/doc/user_help.html +++ b/doc/user_help.html @@ -202,6 +202,21 @@ <table WIDTH="100%" BORDER=1 CELLSPACING=0 CELLPADDING=3> <tr ALIGN=LEFT VALIGN=TOP><td bgcolor="wheat"> + <h4><font color="green">Ad blocking:</font></h4> + </td></tr> + + <tr><td bgcolor="#70a0c0"> + <p> + With a + <code>~/.dillo/<a href="http://www.dillo.org/domainrc">domainrc</a></code> + file, you can control how dillo handles automatic requests for resources + (like images and style sheets) that aren't at the same domain as the + original page. + </td></tr> + </table> + + <table WIDTH="100%" BORDER=1 CELLSPACING=0 CELLPADDING=3> + <tr ALIGN=LEFT VALIGN=TOP><td bgcolor="wheat"> <h4><font color="green">Tabs:</font></h4> </td></tr> diff --git a/src/IO/about.c b/src/IO/about.c index 6734e704..d8721c03 100644 --- a/src/IO/about.c +++ b/src/IO/about.c @@ -230,7 +230,7 @@ const char *const AboutSplash= "<tr>\n" " <td bgcolor='#CCCCCC'>\n" " <h4>Release overview</h4>\n" -" March 31, 2013\n" +" April 07, 2013\n" "<tr>\n" " <td bgcolor='#FFFFFF'>\n" " <table border='0' cellspacing='0' cellpadding='5'>\n" @@ -239,9 +239,23 @@ const char *const AboutSplash= "<p>\n" "dillo-3.0.3 adds some nice new features, as listed below.\n" "<p>\n" -"Dillo3 uses the FLTK GUI toolkit's 1.3.x series. In June, fltk-1.3.0 was\n" -"<a href='http://fltk.org/articles.php?L1086'>released</a>,\n" -"clearing the way for Dillo to return to those distributions\n" +"This release comes with <b>configurable UI colors</b> in\n" +"<a href='http://www.dillo.org/dillorc'>dillorc</a>.\n" +"Packagers should set the theme that better fits the distro, and\n" +"end users may tweak freely if they like!\n" +"<p>\n" +"In order to use the <b>hyphenation</b> feature, pattern files from CTAN\n" +"need to be installed. Most probably your packager did it for you. If not\n" +"enabled, just follow directions from the README file.\n" +"<p>\n" +"A new <a href='http://www.dillo.org/domainrc'>domainrc</a> mechanism has\n" +"been introduced to provide finer-grained control over automatic requests\n" +"for third-party resources, and the old filter_auto_requests dillorc option\n" +"has been removed. This makes it easier to block ads and trackers but permit\n" +"legitimate use such as wikipedia pulling images from wikimedia.org.\n" +"<p>\n" +"Dillo3 uses the FLTK GUI toolkit's 1.3.x series, whose release\n" +"cleared the way for Dillo to return to those distributions\n" "which had excluded Dillo2 due to FLTK2 never being officially released.\n" "<p>\n" "The core team welcomes developers willing to join our workforce.\n" @@ -267,7 +281,7 @@ const char *const AboutSplash= " <td>\n" "<ul>\n" "<li>Automatic hyphenation (includes penalty_* preferences that control line-breaking).\n" -"<li>Introduced the domainrc mechanism for finer-grained control than filter_auto_requests had provided.\n" +"<li>Added the domainrc mechanism.\n" "<li>Added user interface color preferences (ui_*).\n" "<li>Support for CSS display property.\n" "</ul>\n" |