Revision: 2566
http://geany.svn.sourceforge.net/geany/?rev=2566&view=rev
Author: ntrel
Date: 2008-05-09 08:03:24 -0700 (Fri, 09 May 2008)
Log Message:
-----------
Update api_version for new line breaking struct fields.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/plugindata.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-05-09 14:37:30 UTC (rev 2565)
+++ trunk/ChangeLog 2008-05-09 15:03:24 UTC (rev 2566)
@@ -16,6 +16,8 @@
Update Code Navigation section for build errors and message items.
Correct Load Tags menu item being in the Tools menu now.
Document 'Disk check timeout' pref.
+ * src/plugindata.h:
+ Update api_version for new line breaking struct fields.
2008-05-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/plugindata.h
===================================================================
--- trunk/src/plugindata.h 2008-05-09 14:37:30 UTC (rev 2565)
+++ trunk/src/plugindata.h 2008-05-09 15:03:24 UTC (rev 2566)
@@ -35,7 +35,7 @@
/* The API version should be incremented whenever any plugin data types below are
* modified or appended to. */
-static const gint api_version = 56;
+static const gint api_version = 57;
/* The ABI version should be incremented whenever existing fields in the plugin
* data types below have to be changed or reordered. It should stay the same if fields
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2565
http://geany.svn.sourceforge.net/geany/?rev=2565&view=rev
Author: ntrel
Date: 2008-05-09 07:37:30 -0700 (Fri, 09 May 2008)
Log Message:
-----------
Update Code Navigation section for build errors and message items.
Correct Load Tags menu item being in the Tools menu now.
Document 'Disk check timeout' pref.
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/geany.html
trunk/doc/geany.txt
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-05-09 14:19:01 UTC (rev 2564)
+++ trunk/ChangeLog 2008-05-09 14:37:30 UTC (rev 2565)
@@ -12,6 +12,10 @@
src/main.c, src/ui_utils.c, geany.glade:
Rename old uses of line breaking -> line wrapping. This includes the
keyfile pref, so any users with this enabled will have to reset it.
+ * doc/geany.txt, doc/geany.html:
+ Update Code Navigation section for build errors and message items.
+ Correct Load Tags menu item being in the Tools menu now.
+ Document 'Disk check timeout' pref.
2008-05-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/doc/geany.html
===================================================================
--- trunk/doc/geany.html 2008-05-09 14:19:01 UTC (rev 2564)
+++ trunk/doc/geany.html 2008-05-09 14:37:30 UTC (rev 2565)
@@ -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="2008-05-06" />
+<meta name="date" content="2008-05-09" />
<style type="text/css">
/*
@@ -133,7 +133,7 @@
<br />Nick Treleaven
<br />Frank Lanitz</td></tr>
<tr><th class="docinfo-name">Date:</th>
-<td>2008-05-06</td></tr>
+<td>2008-05-09</td></tr>
<tr><th class="docinfo-name">Version:</th>
<td>0.15</td></tr>
</tbody>
@@ -939,9 +939,14 @@
<h3><a class="toc-backref" href="#id36" id="code-navigation-history" name="code-navigation-history">Code Navigation History</a></h3>
<p>To ease navigation in source files and especially between
different files, Geany lets you jump between different navigation
-points. Currently, this works when using the <a class="reference" href="#go-to-tag-declaration">Go to tag declaration</a>,
-<a class="reference" href="#go-to-tag-definition">Go to tag definition</a> commands and when clicking on symbol list
-items.</p>
+points. Currently, this works for the following:</p>
+<ul class="simple">
+<li><a class="reference" href="#go-to-tag-declaration">Go to tag declaration</a></li>
+<li><a class="reference" href="#go-to-tag-definition">Go to tag definition</a></li>
+<li>Symbol list items</li>
+<li>Build errors</li>
+<li>Message items</li>
+</ul>
<p>When using one of these actions, Geany remembers your current position
and jumps to the new one. If you decide to go back to your previous
position in the file, just use "Navigate back a location". To
@@ -1323,7 +1328,7 @@
"workspace tags") for supported filetypes when you open a file. You
can also have Geany automatically load external tag files (aka "global
tags files") from its <tt class="docutils literal"><span class="pre">~/.geany/tags</span></tt> directory upon startup, or
-manually using <em>File --> Load Tags</em>.</p>
+manually using <em>Tools --> Load Tags</em>.</p>
<p>Geany uses its own tag file format, similar to what <tt class="docutils literal"><span class="pre">ctags</span></tt> uses
(but is incompatible with ctags). You use Geany to generate global
tags files, as described below.</p>
@@ -1344,7 +1349,7 @@
the library.</p>
<p>You can load a custom global tags file in two ways:</p>
<ul class="simple">
-<li>Using the <em>Load Tags</em> command in the File menu.</li>
+<li>Using the <em>Load Tags</em> command in the Tools menu.</li>
<li>By creating a directory <tt class="docutils literal"><span class="pre">~/.geany/tags</span></tt>, and moving or symlinking
the tags files there before starting Geany.</li>
</ul>
@@ -1788,6 +1793,9 @@
<dl class="docutils">
<dt>Recent files list length</dt>
<dd>The number of files to remember in the recently used files list.</dd>
+<dt>Disk check timeout</dt>
+<dd>The number of seconds to periodically check the current document's
+file on disk in case it has changed.</dd>
</dl>
</div>
</div>
@@ -4059,7 +4067,7 @@
<div class="footer">
<hr class="footer" />
<a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2008-05-09 12:12 UTC.
+Generated on: 2008-05-09 14:39 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 2008-05-09 14:19:01 UTC (rev 2564)
+++ trunk/doc/geany.txt 2008-05-09 14:37:30 UTC (rev 2565)
@@ -637,10 +637,14 @@
To ease navigation in source files and especially between
different files, Geany lets you jump between different navigation
-points. Currently, this works when using the `Go to tag declaration`_,
-`Go to tag definition`_ commands and when clicking on symbol list
-items.
+points. Currently, this works for the following:
+* `Go to tag declaration`_
+* `Go to tag definition`_
+* Symbol list items
+* Build errors
+* Message items
+
When using one of these actions, Geany remembers your current position
and jumps to the new one. If you decide to go back to your previous
position in the file, just use "Navigate back a location". To
@@ -1059,7 +1063,7 @@
"workspace tags") for supported filetypes when you open a file. You
can also have Geany automatically load external tag files (aka "global
tags files") from its ``~/.geany/tags`` directory upon startup, or
-manually using *File --> Load Tags*.
+manually using *Tools --> Load Tags*.
Geany uses its own tag file format, similar to what ``ctags`` uses
(but is incompatible with ctags). You use Geany to generate global
@@ -1088,7 +1092,7 @@
You can load a custom global tags file in two ways:
-* Using the *Load Tags* command in the File menu.
+* Using the *Load Tags* command in the Tools menu.
* By creating a directory ``~/.geany/tags``, and moving or symlinking
the tags files there before starting Geany.
@@ -1585,7 +1589,11 @@
Recent files list length
The number of files to remember in the recently used files list.
+Disk check timeout
+ The number of seconds to periodically check the current document's
+ file on disk in case it has changed.
+
Tools tab in preferences dialog
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2564
http://geany.svn.sourceforge.net/geany/?rev=2564&view=rev
Author: ntrel
Date: 2008-05-09 07:19:01 -0700 (Fri, 09 May 2008)
Log Message:
-----------
Rename old uses of line breaking -> line wrapping. This includes the
keyfile pref, so any users with this enabled will have to reset it.
Modified Paths:
--------------
trunk/ChangeLog
trunk/geany.glade
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-05-09 14:17:25 UTC (rev 2563)
+++ trunk/ChangeLog 2008-05-09 14:19:01 UTC (rev 2564)
@@ -8,6 +8,10 @@
only works when typing characters past the line breaking column
number.
Add 'Line breaking column' editor pref.
+ * src/callbacks.c, src/callbacks.h, src/interface.c, src/keyfile.c,
+ src/main.c, src/ui_utils.c, geany.glade:
+ Rename old uses of line breaking -> line wrapping. This includes the
+ keyfile pref, so any users with this enabled will have to reset it.
2008-05-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/geany.glade
===================================================================
--- trunk/geany.glade 2008-05-09 14:17:25 UTC (rev 2563)
+++ trunk/geany.glade 2008-05-09 14:19:01 UTC (rev 2564)
@@ -1008,13 +1008,13 @@
<widget class="GtkMenu" id="menu_document1_menu">
<child>
- <widget class="GtkCheckMenuItem" id="menu_line_breaking1">
+ <widget class="GtkCheckMenuItem" id="menu_line_wrapping1">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines.</property>
<property name="label" translatable="yes">_Line Wrapping</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <signal name="toggled" handler="on_line_breaking1_toggled" last_modification_time="Sun, 04 Sep 2005 11:12:08 GMT"/>
+ <signal name="toggled" handler="on_line_wrapping1_toggled" last_modification_time="Sun, 04 Sep 2005 11:12:08 GMT"/>
</widget>
</child>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2561
http://geany.svn.sourceforge.net/geany/?rev=2561&view=rev
Author: ntrel
Date: 2008-05-08 07:16:35 -0700 (Thu, 08 May 2008)
Log Message:
-----------
Fix C headers getting detected as C++ files (iterate through
filetypes_array, not filetypes_hash as the order is not consistent
with the filetype_id enum).
Add static function filetypes_find_source().
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/filetypes.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-05-07 16:32:23 UTC (rev 2560)
+++ trunk/ChangeLog 2008-05-08 14:16:35 UTC (rev 2561)
@@ -1,3 +1,12 @@
+2008-05-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/filetypes.c:
+ Fix C headers getting detected as C++ files (iterate through
+ filetypes_array, not filetypes_hash as the order is not consistent
+ with the filetype_id enum).
+ Add static function filetypes_find_source().
+
+
2008-05-07 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/templates.c, src/build.c, src/utils.c, src/win32.c,
Modified: trunk/src/filetypes.c
===================================================================
--- trunk/src/filetypes.c 2008-05-07 16:32:23 UTC (rev 2560)
+++ trunk/src/filetypes.c 2008-05-08 14:16:35 UTC (rev 2561)
@@ -537,17 +537,34 @@
}
-static gboolean match_basename(G_GNUC_UNUSED gpointer key, gpointer value, gpointer user_data)
+typedef gboolean FileTypesPredicate(filetype *ft, gpointer user_data);
+
+/* Find a filetype that predicate returns TRUE for, otherwise return NULL.
+ * Only search source file filetypes. */
+static filetype *filetypes_find_source(FileTypesPredicate predicate, gpointer user_data)
{
- filetype *ft = value;
+ guint i;
+
+ for (i = 0; i < filetypes_array->len; i++)
+ {
+ filetype *ft = filetypes[i];
+
+ if (i == GEANY_FILETYPES_NONE)
+ continue; /* None is not for source files */
+
+ if (predicate(ft, user_data))
+ return ft;
+ }
+ return NULL;
+}
+
+
+static gboolean match_basename(filetype *ft, gpointer user_data)
+{
const gchar *base_filename = user_data;
gint j;
gboolean ret = FALSE;
- /* Don't match '*' because it comes before any custom filetypes */
- if (ft->id == GEANY_FILETYPES_NONE)
- return FALSE;
-
for (j = 0; ft->pattern[j] != NULL; j++)
{
GPatternSpec *pattern = g_pattern_spec_new(ft->pattern[j]);
@@ -578,7 +595,7 @@
setptr(base_filename, g_utf8_strdown(base_filename, -1));
#endif
- ft = g_hash_table_find(filetypes_hash, match_basename, base_filename);
+ ft = filetypes_find_source(match_basename, base_filename);
if (ft == NULL)
ft = filetypes[GEANY_FILETYPES_NONE];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.