Revision: 4636 http://geany.svn.sourceforge.net/geany/?rev=4636&view=rev Author: ntrel Date: 2010-02-01 18:31:57 +0000 (Mon, 01 Feb 2010)
Log Message: ----------- Partial backport: Remove filetypes.common invert_all option - use 'Invert syntax highlighting colors' pref instead (closes #2854525).
Modified Paths: -------------- branches/geany-0.18.1/ChangeLog branches/geany-0.18.1/data/filetypes.common branches/geany-0.18.1/doc/geany.html branches/geany-0.18.1/doc/geany.txt branches/geany-0.18.1/src/highlighting.c
Modified: branches/geany-0.18.1/ChangeLog =================================================================== --- branches/geany-0.18.1/ChangeLog 2010-02-01 18:17:05 UTC (rev 4635) +++ branches/geany-0.18.1/ChangeLog 2010-02-01 18:31:57 UTC (rev 4636) @@ -1,5 +1,7 @@ 2010-02-01 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+ * src/plugins.c: + Fix GLib warning when toggling 'no plugins available' item. * tagmanager/c.c: Backport revisions 4406-4426: Separate DKinds from CKinds. @@ -9,14 +11,13 @@ Parse D functions with contracts (fixes #1885480). Parse D alias statement like typedef. (Ignore some more D keywords). + * src/highlighting.c, doc/geany.txt, doc/geany.html, + data/filetypes.common: + Partial backport: + Remove filetypes.common invert_all option - use 'Invert syntax + highlighting colors' pref instead (closes #2854525).
-2010-02-01 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> - - * src/plugins.c: - Fix GLib warning when toggling 'no plugins available' item. - - 2010-01-31 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* icons/Makefile.am:
Modified: branches/geany-0.18.1/data/filetypes.common =================================================================== --- branches/geany-0.18.1/data/filetypes.common 2010-02-01 18:17:05 UTC (rev 4635) +++ branches/geany-0.18.1/data/filetypes.common 2010-02-01 18:31:57 UTC (rev 4636) @@ -71,9 +71,6 @@ # 2 to draw the line below folded text folding_horiz_line=2;0;false;false
-# only first argument is interpreted, sets whether all defined colours should be inverted -invert_all=0;0;false;false - # only first and second argument is interpreted # first argument: drawing of visual flags to indicate a line is wrapped. This is a bitmask of the # values: 0 - No visual flags, 1 - Visual flag at end of subline of a wrapped line, 2 - Visual flag
Modified: branches/geany-0.18.1/doc/geany.html =================================================================== --- branches/geany-0.18.1/doc/geany.html 2010-02-01 18:17:05 UTC (rev 4635) +++ branches/geany-0.18.1/doc/geany.html 2010-02-01 18:31:57 UTC (rev 4636) @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2010-01-25" /> +<meta name="date" content="2010-01-31" /> <style type="text/css">
/* @@ -23,7 +23,7 @@ background-color: #f2f2f2; color: #404040; margin-left: 0.4em; - width: 60em; + max-width: 60em; font-size: 90%; }
@@ -139,12 +139,12 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2010-01-25</td></tr> +<td>2010-01-31</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.18</td></tr> </tbody> </table> -<p>Copyright © 2005-2009</p> +<p>Copyright © 2005-2010</p> <p>This document is distributed under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. A copy of this @@ -1333,10 +1333,10 @@ </div> <div class="section"> <h3><a class="toc-backref" href="#id56" id="inserting-unicode-characters" name="inserting-unicode-characters">Inserting Unicode characters</a></h3> -<p>With GTK 2.10 and above, you can hit Ctrl-Shift-u, then still holding -Ctrl-Shift, type some hex digits representing the code point for the -character you want, then let go of Ctrl-Shift and hit a key such as -the right arrow.</p> +<p>With GTK 2.10 and above, you can insert Unicode code points by hitting +Ctrl-Shift-u, then still holding Ctrl-Shift, type some hex digits representing +the code point for the character you want, then let go of Ctrl-Shift and +hit Enter or Return.</p> <p>For this to work in Geany, you'll need to first unbind Ctrl-Shift-u in the <a class="reference" href="#keybinding-preferences">keybinding preferences</a>, then restart Geany. Note that it works slightly differently from other GTK applications, @@ -2136,12 +2136,8 @@ <h4><a class="toc-backref" href="#id104" id="display" name="display">Display</a></h4> <dl class="docutils"> <dt>Invert syntax highlighting colors</dt> -<dd><p class="first">Use white text on a black background and invert all colors. -If the <tt class="docutils literal"><span class="pre">invert_all</span></tt> setting in <tt class="docutils literal"><span class="pre">filetypes.common</span></tt> is set, this -option is always enabled. See <a class="reference" href="#special-file-filetypes-common">Special file filetypes.common</a> -for details.</p> -<p class="last">This option requires a restart of Geany. The value of this option</p> -</dd> +<dd>Invert all colors, by default this makes white text on a black +background.</dd> <dt>Show indendation guides</dt> <dd>Show vertical lines to help show how much leading indentation there is on each line.</dd> @@ -3711,15 +3707,6 @@ </ul> <p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">folding_horiz_line=0;0;false;false</span></tt></p> </dd> -<dt>invert_all</dt> -<dd><p class="first">Whether to invert all defined colors. This is useful if you like a -dark background color(e.g. black) and do not want to change every -single line. Please note, at time of writing this was only tested -with the C syntax highlighting.</p> -<p>Only first argument is interpreted. Set it to 1 to invert all -colors.</p> -<p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">invert_all=0;0;false;false</span></tt></p> -</dd> <dt>line_wrap_visuals</dt> <dd><p class="first">First argument: drawing of visual flags to indicate a line is wrapped. This is a bitmask of the values:</p> @@ -5062,7 +5049,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2010-01-28 16:10 UTC. +Generated on: 2010-02-01 18:27 UTC. Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
Modified: branches/geany-0.18.1/doc/geany.txt =================================================================== --- branches/geany-0.18.1/doc/geany.txt 2010-02-01 18:17:05 UTC (rev 4635) +++ branches/geany-0.18.1/doc/geany.txt 2010-02-01 18:31:57 UTC (rev 4636) @@ -1883,13 +1883,9 @@ ```````
Invert syntax highlighting colors - Use white text on a black background and invert all colors. - If the ``invert_all`` setting in ``filetypes.common`` is set, this - option is always enabled. See `Special file filetypes.common`_ - for details. + Invert all colors, by default this makes white text on a black + background.
- This option requires a restart of Geany. The value of this option - Show indendation guides Show vertical lines to help show how much leading indentation there is on each line. @@ -3333,17 +3329,6 @@
*Example:* ``folding_horiz_line=0;0;false;false``
-invert_all - Whether to invert all defined colors. This is useful if you like a - dark background color(e.g. black) and do not want to change every - single line. Please note, at time of writing this was only tested - with the C syntax highlighting. - - Only first argument is interpreted. Set it to 1 to invert all - colors. - - *Example:* ``invert_all=0;0;false;false`` - line_wrap_visuals First argument: drawing of visual flags to indicate a line is wrapped. This is a bitmask of the values:
Modified: branches/geany-0.18.1/src/highlighting.c =================================================================== --- branches/geany-0.18.1/src/highlighting.c 2010-02-01 18:17:05 UTC (rev 4635) +++ branches/geany-0.18.1/src/highlighting.c 2010-02-01 18:31:57 UTC (rev 4636) @@ -100,7 +100,6 @@ { GeanyLexerStyle styling[GCS_MAX]; FoldingStyle folding_style; - gboolean invert_all; gchar *wordchars; } common_style_set;
@@ -393,7 +392,7 @@
static guint invert(guint icolour) { - if (common_style_set.invert_all) + if (interface_prefs.highlighting_invert_all) return utils_invert_color(icolour);
return icolour; @@ -562,9 +561,6 @@ 1, 1, &tmp_style); common_style_set.folding_style.marker = tmp_style.foreground; common_style_set.folding_style.lines = tmp_style.background; - get_keyfile_int(config, config_home, "styling", "invert_all", - 0, 0, &tmp_style); - common_style_set.invert_all = tmp_style.foreground; get_keyfile_int(config, config_home, "styling", "folding_horiz_line", 2, 0, &tmp_style); common_style_set.folding_style.draw_line = tmp_style.foreground; @@ -593,8 +589,6 @@ common_style_set.styling[GCS_LINE_HEIGHT].background = tmp_style.background; }
- common_style_set.invert_all = interface_prefs.highlighting_invert_all = - (common_style_set.invert_all || interface_prefs.highlighting_invert_all); get_keyfile_wordchars(config, config_home, &common_style_set.wordchars); whitespace_chars = get_keyfile_whitespace_chars(config, config_home); }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.