Revision: 1938
http://geany.svn.sourceforge.net/geany/?rev=1938&view=rev
Author: eht16
Date: 2007-10-10 07:19:09 -0700 (Wed, 10 Oct 2007)
Log Message:
-----------
Tagging the 0.12 release.
Added Paths:
-----------
tags/Geany-0_12/
Copied: tags/Geany-0_12 (from rev 1937, trunk)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1937
http://geany.svn.sourceforge.net/geany/?rev=1937&view=rev
Author: eht16
Date: 2007-10-10 07:17:13 -0700 (Wed, 10 Oct 2007)
Log Message:
-----------
Update for 0.12.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
trunk/doc/geany.1.in
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-10-09 12:26:44 UTC (rev 1936)
+++ trunk/ChangeLog 2007-10-10 14:17:13 UTC (rev 1937)
@@ -1,3 +1,8 @@
+2007-10-10 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * NEWS, doc/geany.1.in: Update for 0.12.
+
+
2007-10-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* src/document.c, src/highlighting.c, src/symbols.c, src/symbols.h:
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2007-10-09 12:26:44 UTC (rev 1936)
+++ trunk/NEWS 2007-10-10 14:17:13 UTC (rev 1937)
@@ -1,4 +1,4 @@
-Geany 0.12 (TBA)
+Geany 0.12 (October 10, 2007)
Bugs fixed:
* Fixed opening the same file twice from the message window/command-line.
@@ -11,6 +11,11 @@
* Fixed displaying error indicators with Make after entering a
subdirectory.
* Fixed a possible segfault when parsing tags (a vString bug).
+ * Fixed clipboard problems with some applications.
+ * Fixed crash when trying to open the Save As dialog on Windows.
+ * Fixed crash when saving a file after setting encoding "None".
+ * Fixed scrolling bugs when searching text and the cursor is outside of
+ the current visible area.
Filetypes:
* Added reStructuredText filetype and parser.
@@ -19,11 +24,14 @@
* Parse Python global variables and class variables.
* Added support for Java Apache Ant compiler error messages (thanks to
Jon Senior).
+ * Added new filetypes CSharp and FreeBasic.
+ * Added filetype Haxe (patch by blackdog, thank you).
Plugins:
* Added basic plugin support (developers: see the HACKING file).
* Added 'Enable plugin support' preference and -p, --no-plugins options.
* Added Class Builder plugin (thanks to Alexander Rodin).
+ * Added Export plugin to export current file as HTML or LaTeX.
Keyboard shorcuts:
* Common bash Ctrl-[a-z] keyboard shortcuts now work when the VTE is
@@ -38,6 +46,10 @@
Alt-{Up,Down}).
* Made pressing escape focus the editor when using incremental search
or Goto Line toolbar fields.
+ * Added keybinding for select current paragraph.
+ * Added keybindings for smart indent and indent/deindent by one space.
+ * Removed convert to lower-/upper-case keybindings.
+ * Added toggle case keybinding and change shortcut to Ctrl-Alt-U.
General:
* Added preference for 'smart' home key behaviour (thanks to Jeff
@@ -55,9 +67,26 @@
* Don't show file opened/saved/closed messages on the status bar.
* Added --no-preprocessing, -P option when generating tags files to
disable preprocessing of C/C++ source files.
+ * Added default startup directory option (closes #1704988).
+ * Use current locale as default encoding for new files.
+ * Added simple code navigation (thanks to Dave Moore).
+ * Re-maximize the main window on startup when closed in maximized state
+ (closes #1730369).
+ * Added auto focus (to auto focus widgets below mouse cursor).
+ * Complete rewrite of auto completion to make it user-definable and
+ much more flexible (please read documentation).
+ * Added option to set a default encoding when opening files and disable
+ auto detection of the file encoding.
+ * Improved comment toggling by adding an additional character to mark.
+ * Changed the background colour of the search bar in the toolbar
+ according to the search result.
+ * Use intltool to make geany.desktop translatable
+ * Replace Geany's icon by a new one by Sebastian Kraft (thanks).
(Thanks also to Christoph Berg for updating the icon code).
Docs:
+ * Changed documentation generation tools from DocBook to reST
+ (thanks to John Gabriele for his great work on this).
* Added Plugins section.
* Added 'Inserting unicode characters' Editing section (thanks to
John Gabriele).
@@ -69,7 +98,7 @@
Internationalisation:
* New translations: en_GB.
- * Updated translations: ca, de, es, fi, fr, hu, it, pl, pt_BR, zh_CN.
+ * Updated translations: ca, cs, de, es, fi, fr, hu, it, pl, pt_BR, zh_CN.
Geany 0.11 (May 21, 2007)
Modified: trunk/doc/geany.1.in
===================================================================
--- trunk/doc/geany.1.in 2007-10-09 12:26:44 UTC (rev 1936)
+++ trunk/doc/geany.1.in 2007-10-10 14:17:13 UTC (rev 1937)
@@ -1,4 +1,4 @@
-.TH "GEANY" "1" "June 17, 2007" "@PACKAGE@ @VERSION@" ""
+.TH "GEANY" "1" "October 10, 2007" "@PACKAGE@ @VERSION@" ""
.SH "NAME"
Geany \(em a small and lightweight IDE
.SH "SYNOPSIS"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1934
http://geany.svn.sourceforge.net/geany/?rev=1934&view=rev
Author: eht16
Date: 2007-10-09 05:04:15 -0700 (Tue, 09 Oct 2007)
Log Message:
-----------
Fix wrong colouring of type keywords of tags from different filetypes.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/document.c
trunk/src/highlighting.c
trunk/src/symbols.c
trunk/src/symbols.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-10-09 11:49:42 UTC (rev 1933)
+++ trunk/ChangeLog 2007-10-09 12:04:15 UTC (rev 1934)
@@ -1,3 +1,10 @@
+2007-10-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/document.c, src/highlighting.c, src/symbols.c, src/symbols.h:
+ Fix wrong colouring of type keywords of tags from different
+ filetypes.
+
+
2007-10-09 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/keybindings.c:
Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c 2007-10-09 11:49:42 UTC (rev 1933)
+++ trunk/src/document.c 2007-10-09 12:04:15 UTC (rev 1934)
@@ -85,7 +85,7 @@
static void document_undo_clear(gint idx);
static void document_redo_add(gint idx, guint type, gpointer data);
-static gboolean update_type_keywords(ScintillaObject *sci);
+static gboolean update_type_keywords(ScintillaObject *sci, gint lang);
// ignore the case of filenames and paths under WIN32, causes errors if not
@@ -1271,10 +1271,10 @@
// unfold maybe folded results
sci_ensure_line_is_visible(doc_list[idx].sci,
sci_get_line_from_position(doc_list[idx].sci, ttf.chrgText.cpMin));
-
+
sci_set_selection_start(doc_list[idx].sci, ttf.chrgText.cpMin);
sci_set_selection_end(doc_list[idx].sci, ttf.chrgText.cpMax);
-
+
// we need to force scrolling in case the cursor is outside of the current visible area
// doc_list[].scroll_percent doesn't work because sci isn't always updated while searching
editor_scroll_to_line(doc_list[idx].sci, -1, 0.3F);
@@ -1710,7 +1710,7 @@
/* Caches the list of project typenames, as a space separated GString.
* Returns: TRUE if typenames have changed.
* (*types) is set to the list of typenames, or NULL if there are none. */
-static gboolean get_project_typenames(const GString **types)
+static gboolean get_project_typenames(const GString **types, gint lang)
{
static GString *last_typenames = NULL;
GString *s = NULL;
@@ -1721,7 +1721,7 @@
if (tags_array)
{
- s = symbols_find_tags_as_string(tags_array, TM_GLOBAL_TYPE_MASK);
+ s = symbols_find_tags_as_string(tags_array, TM_GLOBAL_TYPE_MASK, lang);
}
}
@@ -1747,7 +1747,7 @@
* If sci is not NULL, then if sci supports typenames, project typenames are updated
* if necessary, and typename keywords are set for sci.
* Returns: TRUE if any scintilla type keywords were updated. */
-static gboolean update_type_keywords(ScintillaObject *sci)
+static gboolean update_type_keywords(ScintillaObject *sci, gint lang)
{
gboolean ret = FALSE;
guint n;
@@ -1756,7 +1756,7 @@
if (sci != NULL && editor_lexer_get_type_keyword_idx(sci_get_lexer(sci)) == -1)
return FALSE;
- if (! get_project_typenames(&s))
+ if (! get_project_typenames(&s, lang))
{ // typenames have not changed
if (s != NULL && sci != NULL)
{
@@ -1827,7 +1827,7 @@
{
/* Check if project typename keywords have changed.
* If they haven't, we may need to colourise the document. */
- if (! update_type_keywords(doc_list[idx].sci) && colourise)
+ if (! update_type_keywords(doc_list[idx].sci, type->lang) && colourise)
sci_colourise(doc_list[idx].sci, 0, -1);
}
if (ft_changed)
@@ -2393,7 +2393,7 @@
memset(doc_set, TRUE, doc_array->len * sizeof(gint8));
// remove existing docs from the set if they don't use typenames or typenames haven't changed
- recolour = update_type_keywords(NULL);
+ recolour = update_type_keywords(NULL, -2);
for (i = 0; i < doc_indexes->len; i++)
{
ScintillaObject *sci;
Modified: trunk/src/highlighting.c
===================================================================
--- trunk/src/highlighting.c 2007-10-09 11:49:42 UTC (rev 1933)
+++ trunk/src/highlighting.c 2007-10-09 12:04:15 UTC (rev 1934)
@@ -344,7 +344,7 @@
}
-static GString *get_global_typenames()
+static GString *get_global_typenames(gint lang)
{
GString *s = NULL;
@@ -354,7 +354,7 @@
if (tags_array)
{
- s = symbols_find_tags_as_string(tags_array, TM_GLOBAL_TYPE_MASK);
+ s = symbols_find_tags_as_string(tags_array, TM_GLOBAL_TYPE_MASK, lang);
}
}
return s;
@@ -592,11 +592,12 @@
/* Assign global typedefs and user secondary keywords */
-static void assign_global_and_user_keywords(ScintillaObject *sci, const gchar *user_words)
+static void assign_global_and_user_keywords(ScintillaObject *sci,
+ const gchar *user_words, gint lang)
{
GString *s;
- s = get_global_typenames();
+ s = get_global_typenames(lang);
if (s == NULL)
s = g_string_sized_new(200);
else
@@ -749,7 +750,8 @@
SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_C].keywords[2]);
// assign global types, merge them with user defined keywords and set them
- assign_global_and_user_keywords(sci, style_sets[GEANY_FILETYPES_C].keywords[1]);
+ assign_global_and_user_keywords(sci, style_sets[GEANY_FILETYPES_C].keywords[1],
+ filetypes[ft_id]->lang);
styleset_c_like(sci, GEANY_FILETYPES_C);
@@ -805,7 +807,8 @@
SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[GEANY_FILETYPES_CPP].keywords[2]);
// assign global types, merge them with user defined keywords and set them
- assign_global_and_user_keywords(sci, style_sets[GEANY_FILETYPES_CPP].keywords[1]);
+ assign_global_and_user_keywords(sci, style_sets[GEANY_FILETYPES_CPP].keywords[1],
+ filetypes[ft_id]->lang);
styleset_c_like(sci, GEANY_FILETYPES_CPP);
@@ -868,7 +871,7 @@
SSM(sci, SCI_SETKEYWORDS, 2, (sptr_t) style_sets[ft_id].keywords[2]);
// assign global types, merge them with user defined keywords and set them
- assign_global_and_user_keywords(sci, style_sets[ft_id].keywords[1]);
+ assign_global_and_user_keywords(sci, style_sets[ft_id].keywords[1], filetypes[ft_id]->lang);
styleset_c_like(sci, ft_id);
Modified: trunk/src/symbols.c
===================================================================
--- trunk/src/symbols.c 2007-10-09 11:49:42 UTC (rev 1933)
+++ trunk/src/symbols.c 2007-10-09 12:04:15 UTC (rev 1934)
@@ -149,9 +149,10 @@
}
-GString *symbols_find_tags_as_string(GPtrArray *tags_array, guint tag_types)
+GString *symbols_find_tags_as_string(GPtrArray *tags_array, guint tag_types, gint lang)
{
guint j;
+ TMTag *tag;
GString *s = NULL;
GPtrArray *typedefs;
@@ -164,13 +165,22 @@
s = g_string_sized_new(typedefs->len * 10);
for (j = 0; j < typedefs->len; ++j)
{
- if (!(TM_TAG(typedefs->pdata[j])->atts.entry.scope))
+ tag = TM_TAG(typedefs->pdata[j]);
+ if (!(tag->atts.entry.scope))
{
- if (TM_TAG(typedefs->pdata[j])->name)
+ // tag->atts.file.lang contains (for some reason) the line of the tag if
+ // tag->atts.entry.file is not NULL
+ gint tag_lang =
+ (tag->atts.entry.file) ? tag->atts.entry.file->lang : tag->atts.file.lang;
+
+ // the check for tag_lang == lang is necessary to avoid wrong type colouring of
+ // e.g. PHP classes in C++ files
+ // lang = -2 disables the check
+ if (tag->name && (tag_lang == lang || lang == -2))
{
if (j != 0)
g_string_append_c(s, ' ');
- g_string_append(s, TM_TAG(typedefs->pdata[j])->name);
+ g_string_append(s, tag->name);
}
}
}
Modified: trunk/src/symbols.h
===================================================================
--- trunk/src/symbols.h 2007-10-09 11:49:42 UTC (rev 1933)
+++ trunk/src/symbols.h 2007-10-09 12:04:15 UTC (rev 1934)
@@ -30,7 +30,7 @@
void symbols_global_tags_loaded(gint file_type_idx);
-GString *symbols_find_tags_as_string(GPtrArray *tags_array, guint tag_types);
+GString *symbols_find_tags_as_string(GPtrArray *tags_array, guint tag_types, gint lang);
const gchar *symbols_get_context_separator(gint ft_id);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1933
http://geany.svn.sourceforge.net/geany/?rev=1933&view=rev
Author: ntrel
Date: 2007-10-09 04:49:42 -0700 (Tue, 09 Oct 2007)
Log Message:
-----------
Fix inserting spaces instead of tab when using 'Suppress construct
completion' and spaces are used for indentation.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/keybindings.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-10-08 12:10:03 UTC (rev 1932)
+++ trunk/ChangeLog 2007-10-09 11:49:42 UTC (rev 1933)
@@ -1,3 +1,10 @@
+2007-10-09 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/keybindings.c:
+ Fix inserting spaces instead of tab when using 'Suppress construct
+ completion' and spaces are used for indentation.
+
+
2007-10-08 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* src/callbacks.c, src/keybindings.c:
Modified: trunk/src/keybindings.c
===================================================================
--- trunk/src/keybindings.c 2007-10-08 12:10:03 UTC (rev 1932)
+++ trunk/src/keybindings.c 2007-10-09 11:49:42 UTC (rev 1933)
@@ -1266,7 +1266,7 @@
sci_add_text(doc_list[idx].sci, " ");
break;
case GDK_Tab:
- sci_add_text(doc_list[idx].sci, "\t");
+ sci_cmd(doc_list[idx].sci, SCI_TAB);
break;
default:
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1931
http://geany.svn.sourceforge.net/geany/?rev=1931&view=rev
Author: frlan
Date: 2007-10-05 05:07:42 -0700 (Fri, 05 Oct 2007)
Log Message:
-----------
Adding a hint to intl_stats.sh and small changes in lenght of lines
Modified Paths:
--------------
trunk/README.I18N
Modified: trunk/README.I18N
===================================================================
--- trunk/README.I18N 2007-10-05 06:50:43 UTC (rev 1930)
+++ trunk/README.I18N 2007-10-05 12:07:42 UTC (rev 1931)
@@ -1,48 +1,56 @@
Quick Guide for new translations
--------------------------------
-If you want to translate Geany into another language, please go to the language statistics page
-(see below) to see whether your desired language already exists. If it already exists, please
-read the next section. Otherwise, get the SVN version of Geany, change to the po directory and
-start the new translation with:
+If you want to translate Geany into another language, please go to the
+language statistics page (see below) to see whether your desired
+language already exists. If it already exists, please read the next
+section. Otherwise, get the SVN version of Geany, change to the po
+directory and start the new translation with:
msginit -l ll_CC -o ll.po -i geany.pot
-Fill in ll with the language code and CC with the country code. For example, to translate Geany
-into Italian you would type:
+Fill in ll with the language code and CC with the country code. For
+example, to translate Geany into Italian you would type:
msginit -l it_IT -o it.po -i geany.pot
-This will create a file it.po. This file can be opened with a text editor (like Geany ;-)) or
-you can also use a graphical interface. I can suggest PoEdit(http://www.poedit.org/), but there
-are several other GUIs.
+This will create a file it.po. This file can be opened with a text
+editor (like Geany ;-)) or you can also use a graphical interface. I
+can suggest PoEdit(http://www.poedit.org/), but there are several
+other GUIs.
-When you have finished editing the file, check the file with:
+When you have finished editing the file, check the file with:
msgfmt -c --check-accelerators=_ it.po
+or by using the intl_stats.sh script inside the po-directory with
+./intl_stats.sh -a it
-Please take care of menu accelerators(strings containing a "_").
-The "_" character should also be in your translation. Additionally, it would be nice if these
-accelerators are not twice for two strings inside on dialog or sub menu.
+Please take care of menu accelerators(strings containing a "_"). The
+"_" character should also be in your translation. Additionally, it
+would be nice if these accelerators are not twice for two strings
+inside on dialog or sub menu.
Then send the file to Frank Lanitz and he will add the translation.
-It is a good idea to write to Frank before you start or while translating, because he can give
-you some hints on translating and ensure that the translation is not already in progress.
+It is a good idea to write to Frank before you start or while
+translating, because he can give you some hints on translating and
+ensure that the translation is not already in progress.
Notes for updating translations
-------------------------------
-If you want to update an existing translation, please contact Frank Lanitz.
-He is supervising all translation issues and will contact the maintainer of the translation you
-want to update to avoid any conflicts.
+If you want to update an existing translation, please contact Frank
+Lanitz. He is supervising all translation issues and will contact the
+maintainer of the translation you want to update to avoid any
+conflicts.
-Some translation statistics can be found at: http://geany.uvena.de/i18n/
+Some translation statistics can be found at:
+http://geany.uvena.de/i18n/
I18n mailing list
-----------------
-There is also a mailing list dedicated to translation issues. Please visit
-http://geany.uvena.de/Support/MailingList for more information.
+There is also a mailing list dedicated to translation issues. Please
+visit http://geany.uvena.de/Support/MailingList for more information.
Contact: Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.