Revision: 5143
http://geany.svn.sourceforge.net/geany/?rev=5143&view=rev
Author: ntrel
Date: 2010-08-11 14:44:21 +0000 (Wed, 11 Aug 2010)
Log Message:
-----------
r5098
Modified Paths:
--------------
branches/Geany-0_19_1/ChangeLog
branches/Geany-0_19_1/src/editor.c
Modified: branches/Geany-0_19_1/ChangeLog
===================================================================
--- branches/Geany-0_19_1/ChangeLog 2010-08-11 14:41:15 UTC (rev 5142)
+++ branches/Geany-0_19_1/ChangeLog 2010-08-11 14:44:21 UTC (rev 5143)
@@ -1,3 +1,11 @@
+2010-07-09 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/editor.c:
+ Fix scrolling the editor line in view after loading a session and
+ switching document tabs. Note this causes repainting so needs
+ improvement.
+
+
2010-07-07 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/build.c, src/project.c, src/project.h:
Modified: branches/Geany-0_19_1/src/editor.c
===================================================================
--- branches/Geany-0_19_1/src/editor.c 2010-08-11 14:41:15 UTC (rev 5142)
+++ branches/Geany-0_19_1/src/editor.c 2010-08-11 14:44:21 UTC (rev 5143)
@@ -394,15 +394,6 @@
ui_update_statusbar(editor->document, pos);
- /* Visible lines are only laid out accurately once [SCN_UPDATEUI] is sent,
- * so we need to only call sci_scroll_to_line here, because the document
- * may have line wrapping and folding enabled.
- * http://scintilla.sourceforge.net/ScintillaDoc.html#LineWrapping */
- if (editor->scroll_percent > 0.0F)
- {
- editor_scroll_to_line(editor, -1, editor->scroll_percent);
- editor->scroll_percent = -1.0F; /* disable further scrolling */
- }
#if 0
/** experimental code for inverting selections */
{
@@ -910,6 +901,23 @@
on_update_ui(editor, nt);
break;
+ case SCN_PAINTED:
+ /* Visible lines are only laid out accurately just before painting,
+ * so we need to only call editor_scroll_to_line here, because the document
+ * may have line wrapping and folding enabled.
+ * http://scintilla.sourceforge.net/ScintillaDoc.html#LineWrapping
+ * This is important e.g. when loading a session and switching pages
+ * and having the cursor scroll in view. */
+ /* FIXME: Really we want to do this just before painting, not after it
+ * as it will cause repainting. */
+ if (editor->scroll_percent > 0.0F)
+ {
+ editor_scroll_to_line(editor, -1, editor->scroll_percent);
+ /* disable further scrolling */
+ editor->scroll_percent = -1.0F;
+ }
+ break;
+
case SCN_MODIFIED:
if (editor_prefs.show_linenumber_margin && (nt->modificationType & (SC_MOD_INSERTTEXT | SC_MOD_DELETETEXT)) && nt->linesAdded)
{
@@ -4699,13 +4707,13 @@
}
-/* This is just to catch any uncolourised documents being drawn that didn't receive focus
- * for some reason, maybe it's not necessary but just in case. */
static gboolean on_editor_expose_event(GtkWidget *widget, GdkEventExpose *event,
gpointer user_data)
{
GeanyEditor *editor = user_data;
+ /* This is just to catch any uncolourised documents being drawn that didn't receive focus
+ * for some reason, maybe it's not necessary but just in case. */
editor_check_colourise(editor);
return FALSE;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5141
http://geany.svn.sourceforge.net/geany/?rev=5141&view=rev
Author: ntrel
Date: 2010-08-11 14:39:15 +0000 (Wed, 11 Aug 2010)
Log Message:
-----------
r5089:5092
Modified Paths:
--------------
branches/Geany-0_19_1/ChangeLog
branches/Geany-0_19_1/doc/geany.html
branches/Geany-0_19_1/doc/geany.txt
branches/Geany-0_19_1/src/search.c
Modified: branches/Geany-0_19_1/ChangeLog
===================================================================
--- branches/Geany-0_19_1/ChangeLog 2010-08-11 14:34:37 UTC (rev 5140)
+++ branches/Geany-0_19_1/ChangeLog 2010-08-11 14:39:15 UTC (rev 5141)
@@ -1,3 +1,9 @@
+2010-07-06 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/search.c, doc/geany.txt, doc/geany.html:
+ Fix Grep --exclude-dir example.
+
+
2010-07-02 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* doc/geany.txt, doc/geany.html:
Modified: branches/Geany-0_19_1/doc/geany.html
===================================================================
--- branches/Geany-0_19_1/doc/geany.html 2010-08-11 14:34:37 UTC (rev 5140)
+++ branches/Geany-0_19_1/doc/geany.html 2010-08-11 14:39:15 UTC (rev 5141)
@@ -1596,13 +1596,15 @@
<div class="section">
<h4><a class="toc-backref" href="#id65" id="filtering-out-version-control-files" name="filtering-out-version-control-files">Filtering out version control files</a></h4>
<p>When using the <em>Recurse in subfolders</em> option with a directory that's
-under version control, you can set the <em>Extra options</em> field to use
-grep's <tt class="docutils literal"><span class="pre">--exclude</span></tt> flag to filter out filenames.</p>
+under version control, you can set the <em>Extra options</em> field to filter
+out version control files.</p>
+<p>If you have GNU Grep >= 2.5.2 you can use the <tt class="docutils literal"><span class="pre">--exclude-dir</span></tt>
+argument to filter out CVS and hidden directories like <tt class="docutils literal"><span class="pre">.svn</span></tt>.</p>
+<p>Example: <tt class="docutils literal"><span class="pre">--exclude-dir=.svn</span> <span class="pre">--exclude-dir=CVS</span></tt></p>
+<p>If you have an older Grep, you can try using the <tt class="docutils literal"><span class="pre">--exclude</span></tt> flag
+to filter out filenames.</p>
<p>SVN Example: <tt class="docutils literal"><span class="pre">--exclude=*.svn-base</span></tt></p>
-<p>The --exclude argument only matches the file name part, not the path. If
-you have GNU Grep >= 2.5.2 you can use the <tt class="docutils literal"><span class="pre">--exclude-dir</span></tt> argument to
-filter out CVS and hidden directories like <tt class="docutils literal"><span class="pre">.svn</span></tt>.</p>
-<p>Example: <tt class="docutils literal"><span class="pre">--exclude-dir=.*</span> <span class="pre">--exclude-dir=CVS</span></tt></p>
+<p>The --exclude argument only matches the file name part, not the path.</p>
</div>
</div>
<div class="section">
@@ -6096,7 +6098,7 @@
<div class="footer">
<hr class="footer" />
<a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2010-08-11 14:31 UTC.
+Generated on: 2010-08-11 14:36 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_19_1/doc/geany.txt
===================================================================
--- branches/Geany-0_19_1/doc/geany.txt 2010-08-11 14:34:37 UTC (rev 5140)
+++ branches/Geany-0_19_1/doc/geany.txt 2010-08-11 14:39:15 UTC (rev 5141)
@@ -1229,18 +1229,22 @@
```````````````````````````````````
When using the *Recurse in subfolders* option with a directory that's
-under version control, you can set the *Extra options* field to use
-grep's ``--exclude`` flag to filter out filenames.
+under version control, you can set the *Extra options* field to filter
+out version control files.
+If you have GNU Grep >= 2.5.2 you can use the ``--exclude-dir``
+argument to filter out CVS and hidden directories like ``.svn``.
+
+Example: ``--exclude-dir=.svn --exclude-dir=CVS``
+
+If you have an older Grep, you can try using the ``--exclude`` flag
+to filter out filenames.
+
SVN Example: ``--exclude=*.svn-base``
-The --exclude argument only matches the file name part, not the path. If
-you have GNU Grep >= 2.5.2 you can use the ``--exclude-dir`` argument to
-filter out CVS and hidden directories like ``.svn``.
+The --exclude argument only matches the file name part, not the path.
-Example: ``--exclude-dir=.* --exclude-dir=CVS``
-
Replace
^^^^^^^
Modified: branches/Geany-0_19_1/src/search.c
===================================================================
--- branches/Geany-0_19_1/src/search.c 2010-08-11 14:34:37 UTC (rev 5140)
+++ branches/Geany-0_19_1/src/search.c 2010-08-11 14:39:15 UTC (rev 5141)
@@ -1447,6 +1447,7 @@
/* finally add the arguments(files to be searched) */
if (strstr(argv_prefix[1], "r")) /* recursive option set */
{
+ /* Use '.' so we get relative paths in the output */
argv_prefix[i++] = g_strdup(".");
argv_prefix[i++] = NULL;
argv = argv_prefix;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5139
http://geany.svn.sourceforge.net/geany/?rev=5139&view=rev
Author: ntrel
Date: 2010-08-11 14:32:54 +0000 (Wed, 11 Aug 2010)
Log Message:
-----------
r5082
Modified Paths:
--------------
branches/Geany-0_19_1/ChangeLog
branches/Geany-0_19_1/doc/geany.html
branches/Geany-0_19_1/doc/geany.txt
Modified: branches/Geany-0_19_1/ChangeLog
===================================================================
--- branches/Geany-0_19_1/ChangeLog 2010-08-11 14:30:18 UTC (rev 5138)
+++ branches/Geany-0_19_1/ChangeLog 2010-08-11 14:32:54 UTC (rev 5139)
@@ -1,3 +1,10 @@
+2010-07-02 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * doc/geany.txt, doc/geany.html:
+ Fix wording - restarting is required for hidden prefs.
+ File templates don't need manual reloading anymore.
+
+
2010-07-01 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/printing.c, doc/geany.txt, doc/geany.html:
Modified: branches/Geany-0_19_1/doc/geany.html
===================================================================
--- branches/Geany-0_19_1/doc/geany.html 2010-08-11 14:30:18 UTC (rev 5138)
+++ branches/Geany-0_19_1/doc/geany.html 2010-08-11 14:32:54 UTC (rev 5139)
@@ -4628,8 +4628,7 @@
<h3><a class="toc-backref" href="#id187" id="hidden-preferences" name="hidden-preferences">Hidden preferences</a></h3>
<p>There are some rarely used preferences that are not shown in the Preferences
dialog. These can be set by editing the preferences file, then
-selecting <em>Tools->Reload Configuration</em> or restarting Geany. Search for the
-key name, then edit the value. Example:</p>
+restarting Geany. Search for the key name, then edit the value. Example:</p>
<blockquote>
<tt class="docutils literal"><span class="pre">brace_match_ltgt=true</span></tt></blockquote>
<p>The table below show the key names of hidden preferences in the
@@ -4866,8 +4865,7 @@
use them, choose the <em>New (with Template)</em> menu item from the <em>File</em>
menu.</p>
<p>By default, file templates are installed for some filetypes. Custom
-file templates can be added by creating the appropriate template file
-and then selecting <em>Tools->Reload Configuration</em> or restarting Geany. You can
+file templates can be added by creating the appropriate template file. You can
also edit the default file templates.</p>
<p>The file's contents are just the text to place in the document, with
optional template wildcards like <tt class="docutils literal"><span class="pre">{fileheader}</span></tt>. The fileheader
@@ -6098,7 +6096,7 @@
<div class="footer">
<hr class="footer" />
<a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2010-08-11 14:28 UTC.
+Generated on: 2010-08-11 14:31 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_19_1/doc/geany.txt
===================================================================
--- branches/Geany-0_19_1/doc/geany.txt 2010-08-11 14:30:18 UTC (rev 5138)
+++ branches/Geany-0_19_1/doc/geany.txt 2010-08-11 14:32:54 UTC (rev 5139)
@@ -4000,8 +4000,7 @@
There are some rarely used preferences that are not shown in the Preferences
dialog. These can be set by editing the preferences file, then
-selecting *Tools->Reload Configuration* or restarting Geany. Search for the
-key name, then edit the value. Example:
+restarting Geany. Search for the key name, then edit the value. Example:
``brace_match_ltgt=true``
@@ -4192,8 +4191,7 @@
menu.
By default, file templates are installed for some filetypes. Custom
-file templates can be added by creating the appropriate template file
-and then selecting *Tools->Reload Configuration* or restarting Geany. You can
+file templates can be added by creating the appropriate template file. You can
also edit the default file templates.
The file's contents are just the text to place in the document, with
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5138
http://geany.svn.sourceforge.net/geany/?rev=5138&view=rev
Author: ntrel
Date: 2010-08-11 14:30:18 +0000 (Wed, 11 Aug 2010)
Log Message:
-----------
r5081
Modified Paths:
--------------
branches/Geany-0_19_1/ChangeLog
branches/Geany-0_19_1/doc/geany.html
branches/Geany-0_19_1/doc/geany.txt
branches/Geany-0_19_1/src/build.c
branches/Geany-0_19_1/src/build.h
Modified: branches/Geany-0_19_1/ChangeLog
===================================================================
--- branches/Geany-0_19_1/ChangeLog 2010-08-11 14:26:41 UTC (rev 5137)
+++ branches/Geany-0_19_1/ChangeLog 2010-08-11 14:30:18 UTC (rev 5138)
@@ -3,6 +3,9 @@
* src/printing.c, doc/geany.txt, doc/geany.html:
Always use white background color when printing (except for text
with a white foreground) to save ink (should fix #2968998).
+ * src/build.c, src/build.h, doc/geany.txt, doc/geany.html:
+ Limit build error editor indicators to 50, but parse all errors in
+ the Compiler tab (fixes #3019823).
2010-06-30 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: branches/Geany-0_19_1/doc/geany.html
===================================================================
--- branches/Geany-0_19_1/doc/geany.html 2010-08-11 14:26:41 UTC (rev 5137)
+++ branches/Geany-0_19_1/doc/geany.html 2010-08-11 14:30:18 UTC (rev 5138)
@@ -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-06-04" />
+<meta name="date" content="2010-08-11" />
<style type="text/css">
/*
@@ -139,7 +139,7 @@
<br />Nick Treleaven
<br />Frank Lanitz</td></tr>
<tr><th class="docinfo-name">Date:</th>
-<td>2010-06-04</td></tr>
+<td>2010-08-11</td></tr>
<tr><th class="docinfo-name">Version:</th>
<td>0.19</td></tr>
</tbody>
@@ -474,12 +474,11 @@
<li><a class="reference" href="#project-h" id="id216" name="id216">project.h</a></li>
<li><a class="reference" href="#editor-h" id="id217" name="id217">editor.h</a></li>
<li><a class="reference" href="#keyfile-c" id="id218" name="id218">keyfile.c</a></li>
-<li><a class="reference" href="#build-h" id="id219" name="id219">build.h</a></li>
-<li><a class="reference" href="#build-c" id="id220" name="id220">build.c</a></li>
+<li><a class="reference" href="#build-c" id="id219" name="id219">build.c</a></li>
</ul>
</li>
-<li><a class="reference" href="#gnu-general-public-license" id="id221" name="id221">GNU General Public License</a></li>
-<li><a class="reference" href="#license-for-scintilla-and-scite" id="id222" name="id222">License for Scintilla and SciTE</a></li>
+<li><a class="reference" href="#gnu-general-public-license" id="id220" name="id220">GNU General Public License</a></li>
+<li><a class="reference" href="#license-for-scintilla-and-scite" id="id221" name="id221">License for Scintilla and SciTE</a></li>
</ul>
</div>
<div class="section">
@@ -5689,7 +5688,7 @@
</table>
</div>
<div class="section">
-<h2><a class="toc-backref" href="#id219" id="build-h" name="build-h">build.h</a></h2>
+<h2><a class="toc-backref" href="#id219" id="build-c" name="build-c">build.c</a></h2>
<table border="1" class="docutils">
<colgroup>
<col width="33%" />
@@ -5704,35 +5703,19 @@
</thead>
<tbody valign="top">
<tr><td>GEANY_BUILD_ERR_HIGHLIGHT_MAX</td>
-<td>Amount of build error messages which should
-be highlighted in the Compiler message
-window. This affects the special coloring
+<td>Amount of build error indicators to
+be shown in the editor window.
+This affects the special coloring
when Geany detects a compiler output line as
-an error message and then highlight the
+an error message and then highlights the
corresponding line in the source code.
Usually only the first few messages are
interesting because following errors are
-just aftereffects.</td>
-<td>100</td>
+just after-effects.
+All errors in the Compiler window are parsed
+and unaffected by this value.</td>
+<td>50</td>
</tr>
-</tbody>
-</table>
-</div>
-<div class="section">
-<h2><a class="toc-backref" href="#id220" id="build-c" name="build-c">build.c</a></h2>
-<table border="1" class="docutils">
-<colgroup>
-<col width="33%" />
-<col width="48%" />
-<col width="20%" />
-</colgroup>
-<thead valign="bottom">
-<tr><th class="head">Option</th>
-<th class="head">Description</th>
-<th class="head">Default</th>
-</tr>
-</thead>
-<tbody valign="top">
<tr><td>PRINTBUILDCMDS</td>
<td>Every time a build menu item priority
calculation is run, print the state of the
@@ -5750,7 +5733,7 @@
</div>
</div>
<div class="section">
-<h1><a class="toc-backref" href="#id221" id="gnu-general-public-license" name="gnu-general-public-license">GNU General Public License</a></h1>
+<h1><a class="toc-backref" href="#id220" id="gnu-general-public-license" name="gnu-general-public-license">GNU General Public License</a></h1>
<pre class="literal-block">
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
@@ -6095,7 +6078,7 @@
</pre>
</div>
<div class="section">
-<h1><a class="toc-backref" href="#id222" id="license-for-scintilla-and-scite" name="license-for-scintilla-and-scite">License for Scintilla and SciTE</a></h1>
+<h1><a class="toc-backref" href="#id221" id="license-for-scintilla-and-scite" name="license-for-scintilla-and-scite">License for Scintilla and SciTE</a></h1>
<p>Copyright 1998-2003 by Neil Hodgson <neilh(at)scintilla(dot)org></p>
<p>All Rights Reserved</p>
<p>Permission to use, copy, modify, and distribute this software and
@@ -6115,7 +6098,7 @@
<div class="footer">
<hr class="footer" />
<a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2010-08-11 14:25 UTC.
+Generated on: 2010-08-11 14:28 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_19_1/doc/geany.txt
===================================================================
--- branches/Geany-0_19_1/doc/geany.txt 2010-08-11 14:26:41 UTC (rev 5137)
+++ branches/Geany-0_19_1/doc/geany.txt 2010-08-11 14:30:18 UTC (rev 5138)
@@ -4725,29 +4725,23 @@
Geany provide.
============================== ============================================ ==================
-build.h
+build.c
-------
============================== ============================================ ==================
Option Description Default
============================== ============================================ ==================
-GEANY_BUILD_ERR_HIGHLIGHT_MAX Amount of build error messages which should 100
- be highlighted in the Compiler message
- window. This affects the special coloring
+GEANY_BUILD_ERR_HIGHLIGHT_MAX Amount of build error indicators to 50
+ be shown in the editor window.
+ This affects the special coloring
when Geany detects a compiler output line as
- an error message and then highlight the
+ an error message and then highlights the
corresponding line in the source code.
Usually only the first few messages are
interesting because following errors are
- just aftereffects.
-============================== ============================================ ==================
-
-build.c
--------
-
-============================== ============================================ ==================
-Option Description Default
-============================== ============================================ ==================
+ just after-effects.
+ All errors in the Compiler window are parsed
+ and unaffected by this value.
PRINTBUILDCMDS Every time a build menu item priority FALSE
calculation is run, print the state of the
menu item table in the form of the table
Modified: branches/Geany-0_19_1/src/build.c
===================================================================
--- branches/Geany-0_19_1/src/build.c 2010-08-11 14:26:41 UTC (rev 5137)
+++ branches/Geany-0_19_1/src/build.c 2010-08-11 14:30:18 UTC (rev 5138)
@@ -60,7 +60,10 @@
#include "toolbar.h"
#include "geanymenubuttonaction.h"
+/* Number of editor indicators to draw - limited as this can affect performance */
+#define GEANY_BUILD_ERR_HIGHLIGHT_MAX 50
+
GeanyBuildInfo build_info = {GEANY_GBG_FT, 0, 0, NULL, GEANY_FILETYPES_NONE, NULL, 0};
static gchar *current_dir_entered = NULL;
@@ -968,6 +971,8 @@
static void process_build_output_line(const gchar *str, gint color)
{
gchar *msg, *tmp;
+ gchar *filename;
+ gint line;
msg = g_strdup(str);
@@ -976,34 +981,30 @@
if (! NZV(msg))
return;
- if (build_info.message_count < GEANY_BUILD_ERR_HIGHLIGHT_MAX)
+ if (build_parse_make_dir(msg, &tmp))
{
- gchar *filename;
- gint line;
+ setptr(current_dir_entered, tmp);
+ }
+ msgwin_parse_compiler_error_line(msg, current_dir_entered, &filename, &line);
- build_info.message_count++;
+ if (line != -1 && filename != NULL)
+ {
+ GeanyDocument *doc = document_find_by_filename(filename);
- if (build_parse_make_dir(msg, &tmp))
+ /* limit number of indicators */
+ if (doc && editor_prefs.use_indicators &&
+ build_info.message_count < GEANY_BUILD_ERR_HIGHLIGHT_MAX)
{
- setptr(current_dir_entered, tmp);
+ if (line > 0) /* some compilers, like pdflatex report errors on line 0 */
+ line--; /* so only adjust the line number if it is greater than 0 */
+ editor_indicator_set_on_line(doc->editor, GEANY_INDICATOR_ERROR, line);
}
- msgwin_parse_compiler_error_line(msg, current_dir_entered, &filename, &line);
- if (line != -1 && filename != NULL)
- {
- GeanyDocument *doc = document_find_by_filename(filename);
+ build_info.message_count++;
+ color = COLOR_RED; /* error message parsed on the line */
+ }
+ g_free(filename);
- if (doc && editor_prefs.use_indicators)
- {
- if (line > 0) /* some compilers, like pdflatex report errors on line 0 */
- line--; /* so only adjust the line number if it is greater than 0 */
- editor_indicator_set_on_line(doc->editor, GEANY_INDICATOR_ERROR, line);
- }
- color = COLOR_RED; /* error message parsed on the line */
- }
- g_free(filename);
- }
msgwin_compiler_add_string(color, msg);
-
g_free(msg);
}
Modified: branches/Geany-0_19_1/src/build.h
===================================================================
--- branches/Geany-0_19_1/src/build.h 2010-08-11 14:26:41 UTC (rev 5137)
+++ branches/Geany-0_19_1/src/build.h 2010-08-11 14:30:18 UTC (rev 5138)
@@ -26,8 +26,6 @@
#ifndef GEANY_BUILD_H
#define GEANY_BUILD_H 1
-#define GEANY_BUILD_ERR_HIGHLIGHT_MAX 100
-
/* Order is important (see GBO_TO_GBG, GBO_TO_CMD below) */
/** Geany Known Build Commands.
* These commands are named after their default use.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5137
http://geany.svn.sourceforge.net/geany/?rev=5137&view=rev
Author: ntrel
Date: 2010-08-11 14:26:41 +0000 (Wed, 11 Aug 2010)
Log Message:
-----------
r5079
Modified Paths:
--------------
branches/Geany-0_19_1/ChangeLog
branches/Geany-0_19_1/doc/geany.html
branches/Geany-0_19_1/doc/geany.txt
branches/Geany-0_19_1/src/printing.c
Modified: branches/Geany-0_19_1/ChangeLog
===================================================================
--- branches/Geany-0_19_1/ChangeLog 2010-08-11 14:19:57 UTC (rev 5136)
+++ branches/Geany-0_19_1/ChangeLog 2010-08-11 14:26:41 UTC (rev 5137)
@@ -1,3 +1,10 @@
+2010-07-01 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/printing.c, doc/geany.txt, doc/geany.html:
+ Always use white background color when printing (except for text
+ with a white foreground) to save ink (should fix #2968998).
+
+
2010-06-30 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/highlighting.c:
Modified: branches/Geany-0_19_1/doc/geany.html
===================================================================
--- branches/Geany-0_19_1/doc/geany.html 2010-08-11 14:19:57 UTC (rev 5136)
+++ branches/Geany-0_19_1/doc/geany.html 2010-08-11 14:26:41 UTC (rev 5137)
@@ -3043,6 +3043,12 @@
<p>Since Geany 0.13 there has been printing support using GTK's printing API.
The printed page(s) will look nearly the same as on your screen in Geany.
Additionally, there are some options to modify the printed page(s).</p>
+<div class="note">
+<p class="first admonition-title">Note</p>
+<p class="last">The background text color is set to white, except for text with
+a white foreground. This allows dark color schemes to save ink
+when printing.</p>
+</div>
<p>You can define whether to print line numbers, page numbers at the bottom of
each page and whether to print a page header on each page. This header
contains the filename of the printed document, the current page number and
@@ -6109,7 +6115,7 @@
<div class="footer">
<hr class="footer" />
<a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2010-06-04 16:33 UTC.
+Generated on: 2010-08-11 14:25 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_19_1/doc/geany.txt
===================================================================
--- branches/Geany-0_19_1/doc/geany.txt 2010-08-11 14:19:57 UTC (rev 5136)
+++ branches/Geany-0_19_1/doc/geany.txt 2010-08-11 14:26:41 UTC (rev 5137)
@@ -2775,6 +2775,11 @@
The printed page(s) will look nearly the same as on your screen in Geany.
Additionally, there are some options to modify the printed page(s).
+.. note::
+ The background text color is set to white, except for text with
+ a white foreground. This allows dark color schemes to save ink
+ when printing.
+
You can define whether to print line numbers, page numbers at the bottom of
each page and whether to print a page header on each page. This header
contains the filename of the printed document, the current page number and
Modified: branches/Geany-0_19_1/src/printing.c
===================================================================
--- branches/Geany-0_19_1/src/printing.c 2010-08-11 14:19:57 UTC (rev 5136)
+++ branches/Geany-0_19_1/src/printing.c 2010-08-11 14:26:41 UTC (rev 5137)
@@ -491,6 +491,9 @@
dinfo->styles[i][BACK] = ROTATE_RGB(scintilla_send_message(
dinfo->doc->editor->sci, SCI_STYLEGETBACK, i, 0));
}
+ /* use white background color unless foreground is white to save ink */
+ if (dinfo->styles[i][FORE] != 0xffffff)
+ dinfo->styles[i][BACK] = 0xffffff;
dinfo->styles[i][BOLD] =
scintilla_send_message(dinfo->doc->editor->sci, SCI_STYLEGETBOLD, i, 0);
dinfo->styles[i][ITALIC] =
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5134
http://geany.svn.sourceforge.net/geany/?rev=5134&view=rev
Author: ntrel
Date: 2010-08-11 14:16:42 +0000 (Wed, 11 Aug 2010)
Log Message:
-----------
r5068
Modified Paths:
--------------
branches/Geany-0_19_1/src/keyfile.c
Modified: branches/Geany-0_19_1/src/keyfile.c
===================================================================
--- branches/Geany-0_19_1/src/keyfile.c 2010-08-11 14:13:24 UTC (rev 5133)
+++ branches/Geany-0_19_1/src/keyfile.c 2010-08-11 14:16:42 UTC (rev 5134)
@@ -938,7 +938,7 @@
if (! g_file_test(configfile, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK))
{ /* config file does not (yet) exist, so try to load a global config file which may be */
/* created by distributors */
- geany_debug("No config file found, try to use global configuration.");
+ geany_debug("No user config file found, trying to use global configuration.");
setptr(configfile, g_strconcat(app->datadir, G_DIR_SEPARATOR_S "geany.conf", NULL));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.