Revision: 5070 http://geany.svn.sourceforge.net/geany/?rev=5070&view=rev Author: ntrel Date: 2010-06-29 15:44:41 +0000 (Tue, 29 Jun 2010)
Log Message: ----------- Add spaces after RO when using %r in statusbar_template setting. Add space between encoding and BOM. Note \t means tab for default text.
Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt trunk/src/ui_utils.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-06-29 12:11:21 UTC (rev 5069) +++ trunk/ChangeLog 2010-06-29 15:44:41 UTC (rev 5070) @@ -3,6 +3,10 @@ * src/ui_utils.c, THANKS, doc/geany.txt, doc/geany.html: Add statusbar_template hidden pref (based on patch by Dimitar Zhekov, thanks). + * src/ui_utils.c, doc/geany.txt, doc/geany.html: + Add spaces after RO when using %r in statusbar_template setting. + Add space between encoding and BOM. + Note \t means tab for default text.
2010-06-28 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2010-06-29 12:11:21 UTC (rev 5069) +++ trunk/doc/geany.html 2010-06-29 15:44:41 UTC (rev 5070) @@ -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-23" /> +<meta name="date" content="2010-06-29" /> <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-23</td></tr> +<td>2010-06-29</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.20</td></tr> </tbody> @@ -4714,7 +4714,7 @@ </tr> </tbody> </table> -<p>statusbar_template default:</p> +<p>statusbar_template default (where <tt class="docutils literal"><span class="pre">\t</span></tt> = tab):</p> <p><tt class="docutils literal"><span class="pre">line:</span> <span class="pre">%l</span> <span class="pre">/</span> <span class="pre">%L\t</span> <span class="pre">col:</span> <span class="pre">%c\t</span> <span class="pre">sel:</span> <span class="pre">%s\t</span> <span class="pre">%w</span> <span class="pre">%t</span> <span class="pre">%mmode:</span> <span class="pre">%M</span> <span class="pre">encoding:</span> <span class="pre">%e</span> <span class="pre">filetype:</span> <span class="pre">%f</span> <span class="pre">scope:</span> <span class="pre">%S</span></tt></p> <table border="1" class="docutils"> <colgroup> @@ -6140,7 +6140,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2010-06-29 12:05 UTC. +Generated on: 2010-06-29 15:37 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: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2010-06-29 12:11:21 UTC (rev 5069) +++ trunk/doc/geany.txt 2010-06-29 15:44:41 UTC (rev 5070) @@ -4048,7 +4048,7 @@ (Search in src/ui_utils.c for details). ================================ =========================================== ==================
-statusbar_template default: +statusbar_template default (where ``\t`` = tab):
``line: %l / %L\t col: %c\t sel: %s\t %w %t %mmode: %M encoding: %e filetype: %f scope: %S``
Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2010-06-29 12:11:21 UTC (rev 5069) +++ trunk/src/ui_utils.c 2010-06-29 15:44:41 UTC (rev 5070) @@ -207,8 +207,11 @@ (sci_get_overtype(doc->editor->sci) ? _("OVR") : _("INS"))); break; case 'r': - if (doc->readonly) /* RO = read-only */ - g_string_append(stats_str, _("RO ")); + if (doc->readonly) + { + g_string_append(stats_str, _("RO ")); /* RO = read-only */ + g_string_append(stats_str, sp + 1); + } break; case 't': { @@ -229,8 +232,7 @@ case 'm': if (doc->changed) { - /* MOD = modified */ - g_string_append(stats_str, _("MOD")); + g_string_append(stats_str, _("MOD")); /* MOD = modified */ g_string_append(stats_str, sp); } break; @@ -241,7 +243,10 @@ g_string_append(stats_str, doc->encoding ? doc->encoding : _("unknown")); if (encodings_is_unicode_charset(doc->encoding) && (doc->has_bom)) + { + g_string_append_c(stats_str, ' '); g_string_append(stats_str, _("(with BOM)")); /* BOM = byte order mark */ + } break; case 'f': g_string_append(stats_str, doc->file_type->name);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.