Revision: 1528
http://svn.sourceforge.net/geany/?rev=1528&view=rev
Author: ntrel
Date: 2007-05-11 10:31:06 -0700 (Fri, 11 May 2007)
Log Message:
-----------
Fix bug when directory doesn't exist in utils_get_file_list().
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/utils.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-05-11 16:43:13 UTC (rev 1527)
+++ trunk/ChangeLog 2007-05-11 17:31:06 UTC (rev 1528)
@@ -23,6 +23,8 @@
Use Windows folder dialog in ui_path_box_open_clicked().
* src/utils.c:
Wrap notebook pages when switching tabs.
+ * src/utils.c:
+ Fix bug when directory doesn't exist in utils_get_file_list().
2007-05-10 Nick Treleaven <nick.treleaven(a)btinternet.com>
Modified: trunk/src/utils.c
===================================================================
--- trunk/src/utils.c 2007-05-11 16:43:13 UTC (rev 1527)
+++ trunk/src/utils.c 2007-05-11 17:31:06 UTC (rev 1528)
@@ -1666,7 +1666,7 @@
g_return_val_if_fail(path != NULL, NULL);
dir = g_dir_open(path, 0, error);
- if (NZV(error))
+ if (dir == NULL)
return NULL;
while (1)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1525
http://svn.sourceforge.net/geany/?rev=1525&view=rev
Author: ntrel
Date: 2007-05-11 06:01:50 -0700 (Fri, 11 May 2007)
Log Message:
-----------
Prevent double loading of common styles when filetype none is used
before other filetypes.
Replace init_styles() with direct initialization of style_sets.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/highlighting.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-05-11 12:41:01 UTC (rev 1524)
+++ trunk/ChangeLog 2007-05-11 13:01:50 UTC (rev 1525)
@@ -10,6 +10,10 @@
Rename 'confdialog' to 'prefs'.
Move compile time options section into an appendix (most users
shouldn't change these options).
+ * src/highlighting.c:
+ Prevent double loading of common styles when filetype none is used
+ before other filetypes.
+ Replace init_styles() with direct initialization of style_sets.
2007-05-10 Nick Treleaven <nick.treleaven(a)btinternet.com>
Modified: trunk/src/highlighting.c
===================================================================
--- trunk/src/highlighting.c 2007-05-11 12:41:01 UTC (rev 1524)
+++ trunk/src/highlighting.c 2007-05-11 13:01:50 UTC (rev 1525)
@@ -48,14 +48,13 @@
typedef struct
{
- Style *styling; // array of styles, NULL if not used
+ Style *styling; // array of styles, NULL if not used or uninitialised
gchar **keywords;
- gchar *wordchars;
+ gchar *wordchars; // NULL used for style sets with no styles
} StyleSet;
-// After styleset_common_init, each style_sets[...].* is set to NULL in styleset_init_styles.
// each filetype has a styleset except GEANY_FILETYPE_ALL
-static StyleSet style_sets[GEANY_MAX_FILE_TYPES - 1];
+static StyleSet style_sets[GEANY_MAX_FILE_TYPES - 1] = {{NULL, NULL, NULL}};
enum // Geany common styling
@@ -323,20 +322,6 @@
}
-// called from styleset_common
-static void init_styles()
-{
- gint i;
-
- for (i = 0; i < GEANY_MAX_FILE_TYPES - 1; i++)
- {
- style_sets[i].styling = NULL; // styling == NULL used to check init was run for most style sets
- style_sets[i].keywords = NULL;
- style_sets[i].wordchars = NULL; // wordchars == NULL used for style sets with no styles
- }
-}
-
-
void styleset_free_styles()
{
gint i;
@@ -370,6 +355,7 @@
}
+/* This should only be called from styleset_common(). */
static void styleset_common_init(void)
{
GKeyFile *config = g_key_file_new();
@@ -430,9 +416,6 @@
if (! common_style_set_valid)
{
styleset_common_init();
- // As styleset_common is called first for all file types before they are used,
- // we can init their pointers to NULL here.
- init_styles();
common_style_set_valid = TRUE;
}
@@ -1999,13 +1982,10 @@
SSM(sci, SCI_SETLEXER, SCLEX_NULL, 0);
- if (style_sets[GEANY_FILETYPES_ALL].styling == NULL)
- styleset_common_init();
+ styleset_common(sci, 5, ft_id);
set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_ALL, GCS_DEFAULT);
- styleset_common(sci, 5, ft_id);
-
SSM(sci, SCI_SETWORDCHARS, 0, (sptr_t) common_style_set.wordchars);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1524
http://svn.sourceforge.net/geany/?rev=1524&view=rev
Author: ntrel
Date: 2007-05-11 05:41:01 -0700 (Fri, 11 May 2007)
Log Message:
-----------
Rename 'confdialog' to 'prefs'.
Move compile time options section into an appendix (most users
shouldn't change these options).
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/geany.docbook
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-05-11 12:21:52 UTC (rev 1523)
+++ trunk/ChangeLog 2007-05-11 12:41:01 UTC (rev 1524)
@@ -6,6 +6,10 @@
Load global tag files stored in ~/.geany/tags when needed.
* doc/geany.docbook:
Update docs for loading user tags at startup.
+ * doc/geany.docbook:
+ Rename 'confdialog' to 'prefs'.
+ Move compile time options section into an appendix (most users
+ shouldn't change these options).
2007-05-10 Nick Treleaven <nick.treleaven(a)btinternet.com>
Modified: trunk/doc/geany.docbook
===================================================================
--- trunk/doc/geany.docbook 2007-05-11 12:21:52 UTC (rev 1523)
+++ trunk/doc/geany.docbook 2007-05-11 12:41:01 UTC (rev 1524)
@@ -344,7 +344,7 @@
<para>
At startup, <application>Geany</application> loads all files from the last time
<application>Geany</application> was launched. You can disable this feature in the
- preferences dialog(see <xref linkend="confdialog_gen"/>). If you specify some files on
+ preferences dialog(see <xref linkend="prefs_gen"/>). If you specify some files on
the command line, only these files will be opened, but you can find the files from the
last session in the file menu under the "Recent files" item. By default this contains
the last 10 recently opened files. You can change the amount of recently opened
@@ -1115,7 +1115,7 @@
</section><!-- Generating -->
</section><!-- Tags -->
</section>
- <section id="confdialog">
+ <section id="prefs">
<title>Preferences</title>
<para>
You may adjust Geany's settings using the Edit --> Preferences dialog. Any
@@ -1139,7 +1139,7 @@
<!-- I know that <mediaobject> is better than <graphic> but <mediaobject> does not work with PDF -->
</para>
<para>
- <figure id="confdialog_gen">
+ <figure id="prefs_gen">
<title>General tab in preferences dialog</title>
<graphic fileref="images/pref_dialog_gen.png"></graphic>
</figure>
@@ -1184,13 +1184,13 @@
</figure>
</para>
<para>
- <figure id="confdialog_templ">
+ <figure id="prefs_templ">
<title>Template tab in preferences dialog</title>
<graphic fileref="images/pref_dialog_templ.png"></graphic>
</figure>
</para>
<para>
- <figure id="confdialog_keys">
+ <figure id="prefs_keys">
<title>Keybinding tab in preferences dialog</title>
<graphic fileref="images/pref_dialog_keys.png"></graphic>
</figure>
@@ -1202,166 +1202,11 @@
<note>
<para>For more information see <xref linkend="keybindings"/>.</para>
</note>
- <figure id="confdialog_vte">
+ <figure id="prefs_vte">
<title>VTE tab in preferences dialog</title>
<graphic fileref="images/pref_dialog_vte.png"></graphic>
</figure>
</para>
- <section id="cto">
- <title>Compile time options</title>
- <para>
- There are some options which can only be changed at compile time. To change these
- options, edit the file <filename>src/geany.h</filename>.
- Look for a block of lines starting with <quote>#define GEANY_*</quote>.
- Any definitions which are not listed here should not be changed.
- <table frame="all">
- <title>Compile time options</title>
- <tgroup cols="3">
- <?dbhtml cellpadding="4" ?>
- <?dbhtml cellspacing="0" ?>
- <colspec colnum="1" colname="col1"/>
- <colspec colnum="2" colname="col2"/>
- <colspec colnum="3" colname="col3"/>
- <spanspec spanname="hspan" namest="col1" nameend="col3" align="left"/>
- <thead>
- <row>
- <entry>Option</entry>
- <entry>Description</entry>
- <entry>Default</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>GEANY_WORDCHARS</entry>
- <entry>
- These characters define word boundaries when
- making selections and searching using word matching
- options.
- </entry>
- <entry>(look at sourcecode)</entry>
- </row>
- <row>
- <entry>GEANY_MAX_AUTOCOMPLETE_WORDS</entry>
- <entry>How many auto completion suggestions should
- <application>Geany</application> provide.
- </entry>
- <entry>30</entry>
- </row>
- <row>
- <entry>GEANY_MAX_AUTOCOMPLETE_HEIGHT</entry>
- <entry>How many suggestions should be visible in the auto completion list.</entry>
- <entry>10</entry>
- </row>
- <row>
- <entry>GEANY_PROJECT_EXT</entry>
- <entry>The default filename extension for Geany project files.
- It is used when creating new projects and as filter mask
- for the project open dialog.</entry>
- <entry>geany</entry>
- </row>
- <row>
- <entry>GEANY_STRING_UNTITLED</entry>
- <entry>A string used as the default name for new files. Be aware
- that the string can be translated,
- so change it only if you know what you are doing.</entry>
- <entry>untitled</entry>
- </row>
- <row>
- <entry>GEANY_CHECK_FILE_DELAY</entry>
- <entry>Time in seconds between checking a file for external
- changes.</entry>
- <entry>30</entry>
- </row>
- <row>
- <entry>GEANY_WINDOW_MINIMAL_WIDTH</entry>
- <entry>The minimal width of the main window.</entry>
- <entry>620</entry>
- </row>
- <row>
- <entry>GEANY_WINDOW_MINIMAL_HEIGHT</entry>
- <entry>The minimal height of the main window.</entry>
- <entry>440</entry>
- </row>
- <row>
- <entry>GEANY_WINDOW_DEFAULT_WIDTH</entry>
- <entry>The default width of the main window at the first start.</entry>
- <entry>900</entry>
- </row>
- <row>
- <entry>GEANY_WINDOW_DEFAULT_HEIGHT</entry>
- <entry>The default height of the main window at the first start.</entry>
- <entry>600</entry>
- </row>
- <row>
- <entry align="left" spanname="hspan">Default values</entry>
- </row>
- <row>
- <entry>GEANY_DEFAULT_TOOLS_MAKE</entry>
- <entry>The make tool. This can also include a path.</entry>
- <entry>"make"</entry>
- </row>
- <row>
- <entry>GEANY_DEFAULT_TOOLS_TERMINAL</entry>
- <entry>A terminal emulator. It has to accept the command line
- option "-e". This can also include a path.</entry>
- <entry>"xterm"</entry>
- </row>
- <row>
- <entry>GEANY_DEFAULT_TOOLS_BROWSER</entry>
- <entry>A web browser. This can also include a path.</entry>
- <entry>"mozilla"</entry>
- </row>
- <row>
- <entry>GEANY_DEFAULT_TOOLS_PRINTCMD</entry>
- <entry>A printing tool. It should be able to accept and process
- plain text files. This can also include a path.</entry>
- <entry>"lpr"</entry>
- </row>
- <row>
- <entry>GEANY_DEFAULT_TOOLS_GREP</entry>
- <entry>A grep tool. It should be compatible with GNU grep.
- This can also include a path.</entry>
- <entry>"grep"</entry>
- </row>
- <row>
- <entry>GEANY_DEFAULT_MRU_LENGHTH</entry>
- <entry>The length of the "Recent files" list.</entry>
- <entry>"10"</entry>
- </row>
- <row>
- <entry>GEANY_DEFAULT_FONT_SYMBOL_LIST</entry>
- <entry>The font used in sidebar to show symbols and open files.
- </entry>
- <entry>"Sans 9"</entry>
- </row>
- <row>
- <entry>GEANY_DEFAULT_FONT_MSG_WINDOW</entry>
- <entry>The font used in the messages window.</entry>
- <entry>"Sans 9"</entry>
- </row>
- <row>
- <entry>GEANY_DEFAULT_FONT_EDITOR</entry>
- <entry>The font used in the editor window.</entry>
- <entry>"Monospace 10"</entry>
- </row>
- <row>
- <entry align="left" spanname="hspan">Windows specific</entry>
- </row>
- <row>
- <entry>GEANY_USE_WIN32_DIALOG</entry>
- <entry>Set this to 1 if you want to use the default Windows
- file open dialog instead GTK's file open dialog. The default
- Windows file open dialog is missing some nice features like
- choosing a filetype or an encoding. Do not touch this
- setting when building on a non-Win32 system.</entry>
- <entry>0</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- </para>
- </section>
</section>
<section id="project_management">
<title>Project Management</title>
@@ -2481,7 +2326,7 @@
</para>
<para>
In the configuration dialog you can find a tab "Templates"
- (see <xref linkend="confdialog_templ"/>). You can define the default values which
+ (see <xref linkend="prefs_templ"/>). You can define the default values which
will be inserted in the templates. You should restart <application>Geany</application>
after making changes, because they are only read at startup.
</para>
@@ -2680,6 +2525,164 @@
&scikeybinding;
</appendix>
+ <appendix id="cto">
+ <title>Compile time options</title>
+ <para>
+ There are some options which can only be changed at compile time. To change these
+ options, edit the file <filename>src/geany.h</filename>.
+ Look for a block of lines starting with <quote>#define GEANY_*</quote>.
+ Any definitions which are not listed here should not be changed.
+ <note>
+ <para>Most users should not need to change these options.</para>
+ </note>
+ <table frame="all">
+ <title>Compile time options</title>
+ <tgroup cols="3">
+ <?dbhtml cellpadding="4" ?>
+ <?dbhtml cellspacing="0" ?>
+ <colspec colnum="1" colname="col1"/>
+ <colspec colnum="2" colname="col2"/>
+ <colspec colnum="3" colname="col3"/>
+ <spanspec spanname="hspan" namest="col1" nameend="col3" align="left"/>
+ <thead>
+ <row>
+ <entry>Option</entry>
+ <entry>Description</entry>
+ <entry>Default</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>GEANY_WORDCHARS</entry>
+ <entry>
+ These characters define word boundaries when
+ making selections and searching using word matching
+ options.
+ </entry>
+ <entry>(look at sourcecode)</entry>
+ </row>
+ <row>
+ <entry>GEANY_MAX_AUTOCOMPLETE_WORDS</entry>
+ <entry>How many auto completion suggestions should
+ <application>Geany</application> provide.
+ </entry>
+ <entry>30</entry>
+ </row>
+ <row>
+ <entry>GEANY_MAX_AUTOCOMPLETE_HEIGHT</entry>
+ <entry>How many suggestions should be visible in the auto completion list.</entry>
+ <entry>10</entry>
+ </row>
+ <row>
+ <entry>GEANY_PROJECT_EXT</entry>
+ <entry>The default filename extension for Geany project files.
+ It is used when creating new projects and as filter mask
+ for the project open dialog.</entry>
+ <entry>geany</entry>
+ </row>
+ <row>
+ <entry>GEANY_STRING_UNTITLED</entry>
+ <entry>A string used as the default name for new files. Be aware
+ that the string can be translated,
+ so change it only if you know what you are doing.</entry>
+ <entry>untitled</entry>
+ </row>
+ <row>
+ <entry>GEANY_CHECK_FILE_DELAY</entry>
+ <entry>Time in seconds between checking a file for external
+ changes.</entry>
+ <entry>30</entry>
+ </row>
+ <row>
+ <entry>GEANY_WINDOW_MINIMAL_WIDTH</entry>
+ <entry>The minimal width of the main window.</entry>
+ <entry>620</entry>
+ </row>
+ <row>
+ <entry>GEANY_WINDOW_MINIMAL_HEIGHT</entry>
+ <entry>The minimal height of the main window.</entry>
+ <entry>440</entry>
+ </row>
+ <row>
+ <entry>GEANY_WINDOW_DEFAULT_WIDTH</entry>
+ <entry>The default width of the main window at the first start.</entry>
+ <entry>900</entry>
+ </row>
+ <row>
+ <entry>GEANY_WINDOW_DEFAULT_HEIGHT</entry>
+ <entry>The default height of the main window at the first start.</entry>
+ <entry>600</entry>
+ </row>
+ <row>
+ <entry align="left" spanname="hspan">Default values</entry>
+ </row>
+ <row>
+ <entry>GEANY_DEFAULT_TOOLS_MAKE</entry>
+ <entry>The make tool. This can also include a path.</entry>
+ <entry>"make"</entry>
+ </row>
+ <row>
+ <entry>GEANY_DEFAULT_TOOLS_TERMINAL</entry>
+ <entry>A terminal emulator. It has to accept the command line
+ option "-e". This can also include a path.</entry>
+ <entry>"xterm"</entry>
+ </row>
+ <row>
+ <entry>GEANY_DEFAULT_TOOLS_BROWSER</entry>
+ <entry>A web browser. This can also include a path.</entry>
+ <entry>"mozilla"</entry>
+ </row>
+ <row>
+ <entry>GEANY_DEFAULT_TOOLS_PRINTCMD</entry>
+ <entry>A printing tool. It should be able to accept and process
+ plain text files. This can also include a path.</entry>
+ <entry>"lpr"</entry>
+ </row>
+ <row>
+ <entry>GEANY_DEFAULT_TOOLS_GREP</entry>
+ <entry>A grep tool. It should be compatible with GNU grep.
+ This can also include a path.</entry>
+ <entry>"grep"</entry>
+ </row>
+ <row>
+ <entry>GEANY_DEFAULT_MRU_LENGHTH</entry>
+ <entry>The length of the "Recent files" list.</entry>
+ <entry>"10"</entry>
+ </row>
+ <row>
+ <entry>GEANY_DEFAULT_FONT_SYMBOL_LIST</entry>
+ <entry>The font used in sidebar to show symbols and open files.
+ </entry>
+ <entry>"Sans 9"</entry>
+ </row>
+ <row>
+ <entry>GEANY_DEFAULT_FONT_MSG_WINDOW</entry>
+ <entry>The font used in the messages window.</entry>
+ <entry>"Sans 9"</entry>
+ </row>
+ <row>
+ <entry>GEANY_DEFAULT_FONT_EDITOR</entry>
+ <entry>The font used in the editor window.</entry>
+ <entry>"Monospace 10"</entry>
+ </row>
+ <row>
+ <entry align="left" spanname="hspan">Windows specific</entry>
+ </row>
+ <row>
+ <entry>GEANY_USE_WIN32_DIALOG</entry>
+ <entry>Set this to 1 if you want to use the default Windows
+ file open dialog instead GTK's file open dialog. The default
+ Windows file open dialog is missing some nice features like
+ choosing a filetype or an encoding. Do not touch this
+ setting when building on a non-Win32 system.</entry>
+ <entry>0</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </para>
+ </appendix>
+
<!-- GPL appendix -->
<appendix id="geany-gpl">
&legal;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1523
http://svn.sourceforge.net/geany/?rev=1523&view=rev
Author: ntrel
Date: 2007-05-11 05:21:52 -0700 (Fri, 11 May 2007)
Log Message:
-----------
Update docs for loading user tags at startup.
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/geany.docbook
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-05-11 12:09:22 UTC (rev 1522)
+++ trunk/ChangeLog 2007-05-11 12:21:52 UTC (rev 1523)
@@ -4,6 +4,8 @@
Move search_get_file_list() to utils.c.
* src/highlighting.c, src/highlighting.h, src/symbols.c:
Load global tag files stored in ~/.geany/tags when needed.
+ * doc/geany.docbook:
+ Update docs for loading user tags at startup.
2007-05-10 Nick Treleaven <nick.treleaven(a)btinternet.com>
Modified: trunk/doc/geany.docbook
===================================================================
--- trunk/doc/geany.docbook 2007-05-11 12:09:22 UTC (rev 1522)
+++ trunk/doc/geany.docbook 2007-05-11 12:21:52 UTC (rev 1523)
@@ -5,7 +5,7 @@
<!ENTITY appversion "0.11">
<!ENTITY appurl "http://geany.uvena.de">
<!ENTITY author_mail "enrico.troeger(a)uvena.de">
-<!ENTITY date "April 15, 2007">
+<!ENTITY date "May 11, 2007">
<!ENTITY legal SYSTEM "geany_gpl.docbook">
<!ENTITY scikeybinding SYSTEM "scikeybinding.docbook">
]>
@@ -1012,11 +1012,21 @@
only has to be updated when you upgrade the library.
</para>
<para>
- You can load a global tags file with the <emphasis>Load Tags</emphasis> command,
- in the File menu. You can either download these files or generate your own.
- These tags files have the filename:
+ You can load a custom global tags file in two ways:
+ <itemizedlist>
+ <listitem><para>Using the <emphasis>Load Tags</emphasis> command in the File menu.
+ </para></listitem>
+ <listitem><para>By creating a directory <filename>~/.geany/tags</filename>,
+ and moving or symlinking the tags files there before starting
+ <application>Geany</application>.
+ </para></listitem>
+ </itemizedlist>
</para>
<para>
+ You can either download these files or generate your own.
+ They have the format:
+ </para>
+ <para>
<filename>libraryname.lang_ext.tags</filename>
</para>
<para>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1522
http://svn.sourceforge.net/geany/?rev=1522&view=rev
Author: ntrel
Date: 2007-05-11 05:09:22 -0700 (Fri, 11 May 2007)
Log Message:
-----------
Remove completed items.
Modified Paths:
--------------
trunk/TODO
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2007-05-11 11:58:56 UTC (rev 1521)
+++ trunk/TODO 2007-05-11 12:09:22 UTC (rev 1522)
@@ -12,9 +12,7 @@
o documentation: list and explain filetype modes
o documentation: preferences
o user-definable construct completion
- o allow use of custom global tags files
- o project management
- o word wrapping mode to limit chars on a line for e.g. XML content.
+ o line breaking mode to limit words on a line for e.g. XML content.
o common default highlighting for all programming languages
o fix parsing command line args after given filenames
o (DBUS)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.