Revision: 2521
http://geany.svn.sourceforge.net/geany/?rev=2521&view=rev
Author: ntrel
Date: 2008-04-23 10:07:52 -0700 (Wed, 23 Apr 2008)
Log Message:
-----------
Add document_close_all() and use it in project.c.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/document.c
trunk/src/document.h
trunk/src/project.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-04-23 16:53:40 UTC (rev 2520)
+++ trunk/ChangeLog 2008-04-23 17:07:52 UTC (rev 2521)
@@ -8,6 +8,8 @@
geany.glade:
Make disk check timeout configurable in the prefs dialog Files tab.
Make a value of zero disable disk checks.
+ * src/project.c, src/document.c, src/document.h:
+ Add document_close_all() and use it in project.c.
2008-04-22 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c 2008-04-23 16:53:40 UTC (rev 2520)
+++ trunk/src/document.c 2008-04-23 17:07:52 UTC (rev 2521)
@@ -516,6 +516,14 @@
}
+void document_close_all()
+{
+ /* the code is in callbacks.c because when quitting, checking for changes
+ * has to be done before saving the session */
+ on_close_all1_activate(NULL, NULL);
+}
+
+
/**
* Remove the given notebook tab at @a page_num and clear all related information
* in the document list.
Modified: trunk/src/document.h
===================================================================
--- trunk/src/document.h 2008-04-23 16:53:40 UTC (rev 2520)
+++ trunk/src/document.h 2008-04-23 17:07:52 UTC (rev 2521)
@@ -148,11 +148,14 @@
void document_set_text_changed(gint idx);
-
void document_apply_update_prefs(gint idx);
+
+void document_close_all();
+
gboolean document_remove(guint page_num);
+
gint document_new_file_if_non_open();
gint document_new_file(const gchar *filename, filetype *ft, const gchar *text);
Modified: trunk/src/project.c
===================================================================
--- trunk/src/project.c 2008-04-23 16:53:40 UTC (rev 2520)
+++ trunk/src/project.c 2008-04-23 17:07:52 UTC (rev 2521)
@@ -44,7 +44,6 @@
#include "build.h"
#include "document.h"
#include "geanyobject.h"
-#include "callbacks.h"
ProjectPrefs project_prefs = { NULL, 0 };
@@ -306,7 +305,6 @@
/* open_default will make function reload default session files on close */
void project_close(gboolean open_default)
{
- gint i, max = gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook));
g_return_if_fail(app->project != NULL);
ui_set_statusbar(TRUE, _("Project \"%s\" closed."), app->project->name);
@@ -326,13 +324,7 @@
if (project_prefs.project_session)
{
/* close all existing tabs first */
- main_status.closing_all = TRUE;
- for (i = 0; i < max; i++)
- {
- if (! document_remove(0))
- break;
- }
- main_status.closing_all = FALSE;
+ document_close_all(NULL, NULL);
/* after closing all tabs let's open the tabs found in the default config */
if (open_default == TRUE && cl_options.load_session)
@@ -348,8 +340,6 @@
{
g_signal_emit_by_name(geany_object, "project-close");
}
-
- tm_workspace_update(TM_WORK_OBJECT(app->tm_workspace), TRUE, TRUE, FALSE);
update_ui();
}
@@ -915,9 +905,7 @@
/* save current (non-project) session (it could has been changed since program startup) */
configuration_save_default_session();
/* now close all open files */
- /** TODO make this a general, non-callback function, use it also in project_close()
- * and remove include of callbacks.h */
- on_close_all1_activate(NULL, NULL);
+ document_close_all(NULL, NULL);
/* read session files so they can be opened with configuration_open_files() */
configuration_load_session_files(config);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2519
http://geany.svn.sourceforge.net/geany/?rev=2519&view=rev
Author: ntrel
Date: 2008-04-23 09:47:42 -0700 (Wed, 23 Apr 2008)
Log Message:
-----------
Move non-general compile-time constants into their relevant source
files.
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/geany.html
trunk/doc/geany.txt
trunk/src/editor.h
trunk/src/geany.h
trunk/src/keyfile.c
trunk/src/project.h
trunk/src/symbols.c
trunk/src/win32.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-04-22 15:14:30 UTC (rev 2518)
+++ trunk/ChangeLog 2008-04-23 16:47:42 UTC (rev 2519)
@@ -1,3 +1,11 @@
+2008-04-23 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/win32.c, src/project.h, src/geany.h, src/keyfile.c,
+ src/symbols.c, src/editor.h, doc/geany.txt, doc/geany.html:
+ Move non-general compile-time constants into their relevant source
+ files.
+
+
2008-04-22 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* src/plugins.c:
Modified: trunk/doc/geany.html
===================================================================
--- trunk/doc/geany.html 2008-04-22 15:14:30 UTC (rev 2518)
+++ trunk/doc/geany.html 2008-04-23 16:47:42 UTC (rev 2519)
@@ -3,10 +3,10 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" />
+<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-04-18" />
+<meta name="date" content="2008-04-19" />
<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-04-18</td></tr>
+<td>2008-04-19</td></tr>
<tr><th class="docinfo-name">Version:</th>
<td>0.15</td></tr>
</tbody>
@@ -355,10 +355,16 @@
</ul>
</li>
<li><a class="reference" href="#hidden-preferences" id="id140" name="id140">Hidden preferences</a></li>
-<li><a class="reference" href="#compile-time-options" id="id141" name="id141">Compile-time options</a></li>
-<li><a class="reference" href="#gnu-general-public-license" id="id142" name="id142">GNU General Public License</a></li>
-<li><a class="reference" href="#license-for-scintilla-and-scite" id="id143" name="id143">License for Scintilla and SciTE</a></li>
+<li><a class="reference" href="#compile-time-options" id="id141" name="id141">Compile-time options</a><ul>
+<li><a class="reference" href="#src-geany-h" id="id142" name="id142">src/geany.h</a></li>
+<li><a class="reference" href="#project-h" id="id143" name="id143">project.h</a></li>
+<li><a class="reference" href="#editor-h" id="id144" name="id144">editor.h</a></li>
+<li><a class="reference" href="#keyfile-c" id="id145" name="id145">keyfile.c</a></li>
</ul>
+</li>
+<li><a class="reference" href="#gnu-general-public-license" id="id146" name="id146">GNU General Public License</a></li>
+<li><a class="reference" href="#license-for-scintilla-and-scite" id="id147" name="id147">License for Scintilla and SciTE</a></li>
+</ul>
</div>
<div class="section">
<h1><a class="toc-backref" href="#id5" id="introduction" name="introduction">Introduction</a></h1>
@@ -3485,19 +3491,23 @@
</div>
<div class="section">
<h1><a class="toc-backref" href="#id141" id="compile-time-options" name="compile-time-options">Compile-time options</a></h1>
-<p>There are some options which can only be changed at compile time. To
-change these options, edit the file src/geany.h. Look for a block of
-lines starting with <tt class="docutils literal"><span class="pre">#define</span> <span class="pre">GEANY_*</span></tt>. Any definitions which are
-not listed here should not be changed.</p>
+<p>There are some options which can only be changed at compile time,
+and some options which are used as the default for configurable
+options. To change these options, edit the appropriate source file
+in the <tt class="docutils literal"><span class="pre">src</span></tt> subdirectory. Look for a block of lines starting with
+<tt class="docutils literal"><span class="pre">#define</span> <span class="pre">GEANY_*</span></tt>. Any definitions which are not listed here should
+not be changed.</p>
<div class="note">
<p class="first admonition-title">Note</p>
<p class="last">Most users should not need to change these options.</p>
</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id142" id="src-geany-h" name="src-geany-h">src/geany.h</a></h2>
<table border="1" class="docutils">
<colgroup>
-<col width="32%" />
-<col width="47%" />
-<col width="21%" />
+<col width="33%" />
+<col width="48%" />
+<col width="20%" />
</colgroup>
<thead valign="bottom">
<tr><th class="head">Option</th>
@@ -3506,34 +3516,6 @@
</tr>
</thead>
<tbody valign="top">
-<tr><td>GEANY_WORDCHARS</td>
-<td>These characters define word boundaries when
-making selections and searching using word
-matching options.</td>
-<td><em>look at sourcecode</em></td>
-</tr>
-<tr><td>GEANY_MAX_AUTOCOMPLETE_WORDS</td>
-<td>How many auto completion suggestions should
-Geany provide.</td>
-<td>30</td>
-</tr>
-<tr><td>GEANY_MAX_AUTOCOMPLETE_HEIGHT</td>
-<td>How many suggestions should be visible in
-the auto completion list.</td>
-<td>10</td>
-</tr>
-<tr><td>GEANY_MIN_SYMBOLLIST_CHARS</td>
-<td>How many characters you need to type to
-trigger the auto completion list.</td>
-<td>4</td>
-</tr>
-<tr><td>GEANY_PROJECT_EXT</td>
-<td>The default filename extension for Geany
-project files. It is used when creating new
-projects and as filter mask for the project
-open dialog.</td>
-<td>geany</td>
-</tr>
<tr><td>GEANY_STRING_UNTITLED</td>
<td>A string used as the default name for new
files. Be aware that the string can be
@@ -3541,17 +3523,6 @@
what you are doing.</td>
<td>untitled</td>
</tr>
-<tr><td>GEANY_CHECK_FILE_DELAY</td>
-<td>Time in seconds between checking a file for
-external changes.</td>
-<td>30</td>
-</tr>
-<tr><td>GEANY_TOGGLE_MARK</td>
-<td>A string which is used to mark a toggled
-comment.
-external changes.</td>
-<td>"~ "</td>
-</tr>
<tr><td>GEANY_WINDOW_MINIMAL_WIDTH</td>
<td>The minimal width of the main window.</td>
<td>620</td>
@@ -3570,10 +3541,111 @@
first start.</td>
<td>600</td>
</tr>
-<tr><td><strong>Default values</strong></td>
+<tr><td><strong>Windows specific</strong></td>
<td> </td>
<td> </td>
</tr>
+<tr><td>GEANY_USE_WIN32_DIALOG</td>
+<td>Set this to 1 if you want to use the default
+Windows file open and save dialogs instead
+GTK's file open and save dialogs. The
+default Windows file dialogs are missing
+some nice features like choosing a filetype
+or an encoding. <em>Do not touch this setting
+when building on a non-Win32 system.</em></td>
+<td>0</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id143" id="project-h" name="project-h">project.h</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>GEANY_PROJECT_EXT</td>
+<td>The default filename extension for Geany
+project files. It is used when creating new
+projects and as filter mask for the project
+open dialog.</td>
+<td>geany</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id144" id="editor-h" name="editor-h">editor.h</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>GEANY_WORDCHARS</td>
+<td>These characters define word boundaries when
+making selections and searching using word
+matching options.</td>
+<td>a string with:
+a-z, A-Z, 0-9 and
+underscore.</td>
+</tr>
+<tr><td>GEANY_TOGGLE_MARK</td>
+<td>A string which is used to mark a toggled
+comment.
+external changes.</td>
+<td>"~ "</td>
+</tr>
+<tr><td>GEANY_MAX_AUTOCOMPLETE_WORDS</td>
+<td>How many auto completion suggestions should
+Geany provide.</td>
+<td>30</td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="section">
+<h2><a class="toc-backref" href="#id145" id="keyfile-c" name="keyfile-c">keyfile.c</a></h2>
+<p>These are default settings that can be overridden in the <a class="reference" href="#preferences">Preferences</a> dialog.</p>
+<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>GEANY_MIN_SYMBOLLIST_CHARS</td>
+<td>How many characters you need to type to
+trigger the auto completion list.</td>
+<td>4</td>
+</tr>
+<tr><td>GEANY_DISK_CHECK_TIMEOUT</td>
+<td>Time in seconds between checking a file for
+external changes.</td>
+<td>30</td>
+</tr>
<tr><td>GEANY_DEFAULT_TOOLS_MAKE</td>
<td>The make tool. This can also include a path.</td>
<td>"make"</td>
@@ -3599,7 +3671,7 @@
GNU grep. This can also include a path.</td>
<td>"grep"</td>
</tr>
-<tr><td>GEANY_DEFAULT_MRU_LENGHTH</td>
+<tr><td>GEANY_DEFAULT_MRU_LENGTH</td>
<td>The length of the "Recent files" list.</td>
<td>10</td>
</tr>
@@ -3616,25 +3688,12 @@
<td>The font used in the editor window.</td>
<td>"Monospace 10"</td>
</tr>
-<tr><td><strong>Windows specific</strong></td>
-<td> </td>
-<td> </td>
-</tr>
-<tr><td>GEANY_USE_WIN32_DIALOG</td>
-<td>Set this to 1 if you want to use the default
-Windows file open and save dialogs instead
-GTK's file open and save dialogs. The
-default Windows file dialogs are missing
-some nice features like choosing a filetype
-or an encoding. <em>Do not touch this setting
-when building on a non-Win32 system.</em></td>
-<td>0</td>
-</tr>
</tbody>
</table>
</div>
+</div>
<div class="section">
-<h1><a class="toc-backref" href="#id142" id="gnu-general-public-license" name="gnu-general-public-license">GNU General Public License</a></h1>
+<h1><a class="toc-backref" href="#id146" 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
@@ -3979,7 +4038,7 @@
</pre>
</div>
<div class="section">
-<h1><a class="toc-backref" href="#id143" 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="#id147" 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
@@ -3999,7 +4058,7 @@
<div class="footer">
<hr class="footer" />
<a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2008-04-19 10:38 UTC.
+Generated on: 2008-04-23 16: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: trunk/doc/geany.txt
===================================================================
--- trunk/doc/geany.txt 2008-04-22 15:14:30 UTC (rev 2518)
+++ trunk/doc/geany.txt 2008-04-23 16:47:42 UTC (rev 2519)
@@ -3104,46 +3104,82 @@
Compile-time options
====================
-There are some options which can only be changed at compile time. To
-change these options, edit the file src/geany.h. Look for a block of
-lines starting with ``#define GEANY_*``. Any definitions which are
-not listed here should not be changed.
+There are some options which can only be changed at compile time,
+and some options which are used as the default for configurable
+options. To change these options, edit the appropriate source file
+in the ``src`` subdirectory. Look for a block of lines starting with
+``#define GEANY_*``. Any definitions which are not listed here should
+not be changed.
.. note::
Most users should not need to change these options.
+src/geany.h
+-----------
+
============================== ============================================ ==================
Option Description Default
============================== ============================================ ==================
-GEANY_WORDCHARS These characters define word boundaries when *look at sourcecode*
- making selections and searching using word
- matching options.
-GEANY_MAX_AUTOCOMPLETE_WORDS How many auto completion suggestions should 30
- Geany provide.
-GEANY_MAX_AUTOCOMPLETE_HEIGHT How many suggestions should be visible in 10
- the auto completion list.
-GEANY_MIN_SYMBOLLIST_CHARS How many characters you need to type to 4
- trigger the auto completion list.
-GEANY_PROJECT_EXT The default filename extension for Geany geany
- project files. It is used when creating new
- projects and as filter mask for the project
- open dialog.
GEANY_STRING_UNTITLED A string used as the default name for new untitled
files. Be aware that the string can be
translated, so change it only if you know
what you are doing.
-GEANY_CHECK_FILE_DELAY Time in seconds between checking a file for 30
- external changes.
-GEANY_TOGGLE_MARK A string which is used to mark a toggled "~ "
- comment.
- external changes.
GEANY_WINDOW_MINIMAL_WIDTH The minimal width of the main window. 620
GEANY_WINDOW_MINIMAL_HEIGHT The minimal height of the main window. 440
GEANY_WINDOW_DEFAULT_WIDTH The default width of the main window at the 900
first start.
GEANY_WINDOW_DEFAULT_HEIGHT The default height of the main window at the 600
first start.
- **Default values**
+ **Windows specific**
+GEANY_USE_WIN32_DIALOG Set this to 1 if you want to use the default 0
+ Windows file open and save dialogs instead
+ GTK's file open and save dialogs. The
+ default Windows file dialogs are missing
+ some nice features like choosing a filetype
+ or an encoding. *Do not touch this setting
+ when building on a non-Win32 system.*
+============================== ============================================ ==================
+
+project.h
+---------
+
+============================== ============================================ ==================
+Option Description Default
+============================== ============================================ ==================
+GEANY_PROJECT_EXT The default filename extension for Geany geany
+ project files. It is used when creating new
+ projects and as filter mask for the project
+ open dialog.
+============================== ============================================ ==================
+
+editor.h
+--------
+
+============================== ============================================ ==================
+Option Description Default
+============================== ============================================ ==================
+GEANY_WORDCHARS These characters define word boundaries when a string with:
+ making selections and searching using word a-z, A-Z, 0-9 and
+ matching options. underscore.
+GEANY_TOGGLE_MARK A string which is used to mark a toggled "~ "
+ comment.
+ external changes.
+GEANY_MAX_AUTOCOMPLETE_WORDS How many auto completion suggestions should 30
+ Geany provide.
+============================== ============================================ ==================
+
+keyfile.c
+---------
+
+These are default settings that can be overridden in the `Preferences`_ dialog.
+
+============================== ============================================ ==================
+Option Description Default
+============================== ============================================ ==================
+GEANY_MIN_SYMBOLLIST_CHARS How many characters you need to type to 4
+ trigger the auto completion list.
+GEANY_DISK_CHECK_TIMEOUT Time in seconds between checking a file for 30
+ external changes.
GEANY_DEFAULT_TOOLS_MAKE The make tool. This can also include a path. "make"
GEANY_DEFAULT_TOOLS_TERMINAL A terminal emulator. It has to accept the "xterm"
command line option "-e". This can also
@@ -3154,24 +3190,15 @@
include a path.
GEANY_DEFAULT_TOOLS_GREP A grep tool. It should be compatible with "grep"
GNU grep. This can also include a path.
-GEANY_DEFAULT_MRU_LENGHTH The length of the "Recent files" list. 10
+GEANY_DEFAULT_MRU_LENGTH The length of the "Recent files" list. 10
GEANY_DEFAULT_FONT_SYMBOL_LIST The font used in sidebar to show symbols and "Sans 9"
open files.
GEANY_DEFAULT_FONT_MSG_WINDOW The font used in the messages window. "Sans 9"
GEANY_DEFAULT_FONT_EDITOR The font used in the editor window. "Monospace 10"
- **Windows specific**
-GEANY_USE_WIN32_DIALOG Set this to 1 if you want to use the default 0
- Windows file open and save dialogs instead
- GTK's file open and save dialogs. The
- default Windows file dialogs are missing
- some nice features like choosing a filetype
- or an encoding. *Do not touch this setting
- when building on a non-Win32 system.*
============================== ============================================ ==================
-
GNU General Public License
==========================
Modified: trunk/src/editor.h
===================================================================
--- trunk/src/editor.h 2008-04-22 15:14:30 UTC (rev 2518)
+++ trunk/src/editor.h 2008-04-23 16:47:42 UTC (rev 2519)
@@ -27,6 +27,11 @@
#include "Scintilla.h"
#include "ScintillaWidget.h"
+#define GEANY_WORDCHARS "_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+#define GEANY_TOGGLE_MARK "~ "
+#define GEANY_MAX_WORD_LENGTH 192
+#define GEANY_MAX_AUTOCOMPLETE_WORDS 30
+
/* Note: Avoid using SSM in files not related to scintilla, use sciwrappers.h instead. */
#define SSM(s, m, w, l) scintilla_send_message(s, m, w, l)
Modified: trunk/src/geany.h
===================================================================
--- trunk/src/geany.h 2008-04-22 15:14:30 UTC (rev 2518)
+++ trunk/src/geany.h 2008-04-23 16:47:42 UTC (rev 2519)
@@ -46,39 +46,14 @@
#define GEANY_TEMPLATES_SUBDIR "templates"
#define GEANY_CODENAME "Quillan"
#define GEANY_HOMEPAGE "http://geany.uvena.de/"
-#define GEANY_PROJECT_EXT "geany"
#define GEANY_USE_WIN32_DIALOG 0
-#define GEANY_CHECK_FILE_DELAY 30
-#define GEANY_WORDCHARS "_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-#define GEANY_TOGGLE_MARK "~ "
-#define GEANY_MAX_WORD_LENGTH 192
-#define GEANY_MAX_AUTOCOMPLETE_WORDS 30
-#define GEANY_MAX_SYMBOLLIST_HEIGHT 10
-#define GEANY_MIN_SYMBOLLIST_CHARS 4
#define GEANY_STRING_UNTITLED _("untitled")
-#define GEANY_MSGWIN_HEIGHT 208
#define GEANY_WINDOW_MINIMAL_WIDTH 550
#define GEANY_WINDOW_MINIMAL_HEIGHT 350
#define GEANY_WINDOW_DEFAULT_WIDTH 900
#define GEANY_WINDOW_DEFAULT_HEIGHT 600
-/* some default settings which are used at the very first start of Geany to fill
- * the configuration file */
-#define GEANY_DEFAULT_TOOLS_MAKE "make"
-#ifdef G_OS_WIN32
-#define GEANY_DEFAULT_TOOLS_TERMINAL "cmd.exe"
-#else
-#define GEANY_DEFAULT_TOOLS_TERMINAL "xterm"
-#endif
-#define GEANY_DEFAULT_TOOLS_BROWSER "firefox"
-#define GEANY_DEFAULT_TOOLS_PRINTCMD "lpr"
-#define GEANY_DEFAULT_TOOLS_GREP "grep"
-#define GEANY_DEFAULT_MRU_LENGTH 10
-#define GEANY_DEFAULT_FONT_SYMBOL_LIST "Sans 9"
-#define GEANY_DEFAULT_FONT_MSG_WINDOW "Sans 9"
-#define GEANY_DEFAULT_FONT_EDITOR "Monospace 10"
-
/* useful forward declarations */
typedef struct filetype filetype;
typedef struct _GeanyProject GeanyProject;
Modified: trunk/src/keyfile.c
===================================================================
--- trunk/src/keyfile.c 2008-04-22 15:14:30 UTC (rev 2518)
+++ trunk/src/keyfile.c 2008-04-23 16:47:42 UTC (rev 2519)
@@ -60,6 +60,27 @@
#include "plugins.h"
+/* some default settings which are used at the very first start of Geany to fill
+ * the configuration file */
+#define GEANY_MAX_SYMBOLLIST_HEIGHT 10
+#define GEANY_MIN_SYMBOLLIST_CHARS 4
+#define GEANY_MSGWIN_HEIGHT 208
+#define GEANY_DISK_CHECK_TIMEOUT 30
+#define GEANY_DEFAULT_TOOLS_MAKE "make"
+#ifdef G_OS_WIN32
+#define GEANY_DEFAULT_TOOLS_TERMINAL "cmd.exe"
+#else
+#define GEANY_DEFAULT_TOOLS_TERMINAL "xterm"
+#endif
+#define GEANY_DEFAULT_TOOLS_BROWSER "firefox"
+#define GEANY_DEFAULT_TOOLS_PRINTCMD "lpr"
+#define GEANY_DEFAULT_TOOLS_GREP "grep"
+#define GEANY_DEFAULT_MRU_LENGTH 10
+#define GEANY_DEFAULT_FONT_SYMBOL_LIST "Sans 9"
+#define GEANY_DEFAULT_FONT_MSG_WINDOW "Sans 9"
+#define GEANY_DEFAULT_FONT_EDITOR "Monospace 10"
+
+
static gchar *scribble_text = NULL;
static GPtrArray *session_files = NULL;
static gint session_notebook_page;
Modified: trunk/src/project.h
===================================================================
--- trunk/src/project.h 2008-04-22 15:14:30 UTC (rev 2518)
+++ trunk/src/project.h 2008-04-23 16:47:42 UTC (rev 2519)
@@ -25,6 +25,9 @@
#ifndef GEANY_PROJECT_H
#define GEANY_PROJECT_H 1
+#define GEANY_PROJECT_EXT "geany"
+
+
/* structure for representing a project. */
struct _GeanyProject
{
Modified: trunk/src/symbols.c
===================================================================
--- trunk/src/symbols.c 2008-04-22 15:14:30 UTC (rev 2518)
+++ trunk/src/symbols.c 2008-04-23 16:47:42 UTC (rev 2519)
@@ -46,6 +46,7 @@
#include "main.h"
#include "navqueue.h"
#include "ui_utils.h"
+#include "editor.h"
const guint TM_GLOBAL_TYPE_MASK =
Modified: trunk/src/win32.c
===================================================================
--- trunk/src/win32.c 2008-04-22 15:14:30 UTC (rev 2518)
+++ trunk/src/win32.c 2008-04-23 16:47:42 UTC (rev 2519)
@@ -53,6 +53,7 @@
#include "sciwrappers.h"
#include "dialogs.h"
#include "filetypes.h"
+#include "project.h"
#define BUFSIZE 4096
@@ -1170,7 +1171,7 @@
* Get an interface pointer to it. */
pslW = (IShellLinkW*) pslWV;
hres = pslW->lpVtbl->QueryInterface(pslW, &IID_IPersistFile, &ppfV);
- }
+ }
if (SUCCEEDED(hres))
{
@@ -1214,7 +1215,7 @@
resolve_link(GDK_WINDOW_HWND(app->window->window), wfilename, &path);
g_free(wfilename);
-
+
if (path == NULL)
return g_strdup(file_name);
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2514
http://geany.svn.sourceforge.net/geany/?rev=2514&view=rev
Author: eht16
Date: 2008-04-22 06:36:20 -0700 (Tue, 22 Apr 2008)
Log Message:
-----------
Fix wrong regular expression.
Modified Paths:
--------------
trunk/tagmanager/html.c
Modified: trunk/tagmanager/html.c
===================================================================
--- trunk/tagmanager/html.c 2008-04-22 13:15:54 UTC (rev 2513)
+++ trunk/tagmanager/html.c 2008-04-22 13:36:20 UTC (rev 2514)
@@ -27,11 +27,11 @@
* <h1><a href="#id109">Some Text</a></h1>
* but it fails matching simple headings like
* <h1>Some Text</h1> */
-/*#define INNER_HEADING "[ \t]*(<.*>(.*+)<.*>[ \t]*"*/
+/*#define INNER_HEADING "[ \t]*<.*>(.+)<.*>[ \t]*"*/
/* this matches simple heading without nested tags */
/** TODO combine both pattern to be able to match both heading styles */
-#define INNER_HEADING "[ \t]*(.*+)[ \t]*"
+#define INNER_HEADING "[ \t]*(.+)[ \t]*"
addTagRegex (language,
"<a"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.