Revision: 3318
http://geany.svn.sourceforge.net/geany/?rev=3318&view=rev
Author: ntrel
Date: 2008-12-04 18:12:09 +0000 (Thu, 04 Dec 2008)
Log Message:
-----------
Make whitespace setting not override background colour by default,
otherwise e.g. unterminated strings in C can have inconsistent
background colour when Show Whitespace is enabled.
Modified Paths:
--------------
trunk/ChangeLog
trunk/data/filetypes.common
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-12-04 17:05:36 UTC (rev 3317)
+++ trunk/ChangeLog 2008-12-04 18:12:09 UTC (rev 3318)
@@ -26,6 +26,10 @@
plugins/filebrowser.c, plugins/splitwindow.c, plugins/htmlchars.c,
plugins/classbuilder.c:
Update to use geanyfunctions.h.
+ * data/filetypes.common:
+ Make whitespace setting not override background colour by default,
+ otherwise e.g. unterminated strings in C can have inconsistent
+ background colour when Show Whitespace is enabled.
2008-12-03 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/data/filetypes.common
===================================================================
--- trunk/data/filetypes.common 2008-12-04 17:05:36 UTC (rev 3317)
+++ trunk/data/filetypes.common 2008-12-04 18:12:09 UTC (rev 3318)
@@ -51,7 +51,7 @@
# third argument: if true, use this foreground color. If false, use the default value defined by the filetypes.
# fourth argument: if true, use this background color. If false, use the default value defined by the filetypes.
-white_space=0xc0c0c0;0xffffff;true;true
+white_space=0xc0c0c0;0xffffff;true;false
# style of folding icons, only first and second arguments are used, valid values are:
# first argument: 1 for boxes, 2 for circles
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 3316
http://geany.svn.sourceforge.net/geany/?rev=3316&view=rev
Author: eht16
Date: 2008-12-04 16:17:04 +0000 (Thu, 04 Dec 2008)
Log Message:
-----------
Add command line option to suppress status output.
Modified Paths:
--------------
trunk/ChangeLog
trunk/plugins/geanyfunctions.h
trunk/plugins/genapi.py
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-12-04 15:56:54 UTC (rev 3315)
+++ trunk/ChangeLog 2008-12-04 16:17:04 UTC (rev 3316)
@@ -5,6 +5,9 @@
* src/main.c, src/document.c, src/symbols.c:
Don't mark console messages as translatable.
Add two comments for translators.
+ * plugins/genapi.py:
+ Beatify the header comments of the generated API file.
+ Add command line option to suppress status output.
2008-12-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/plugins/geanyfunctions.h
===================================================================
--- trunk/plugins/geanyfunctions.h 2008-12-04 15:56:54 UTC (rev 3315)
+++ trunk/plugins/geanyfunctions.h 2008-12-04 16:17:04 UTC (rev 3316)
@@ -1,6 +1,9 @@
-/* @file geanyfunctions.h @ref geany_functions wrappers.
-This allows the use of normal API function names in plugins.
-You need to declare the @ref geany_functions symbol yourself. */
+/* This file is generated automatically by genapi.py - do not edit.
+ *
+ * @file geanyfunctions.h @ref geany_functions wrappers.
+ * This allows the use of normal API function names in plugins.
+ * You need to declare the @ref geany_functions symbol yourself.
+ */
#ifndef GEANY_FUNCTIONS_H
#define GEANY_FUNCTIONS_H
Modified: trunk/plugins/genapi.py
===================================================================
--- trunk/plugins/genapi.py 2008-12-04 15:56:54 UTC (rev 3315)
+++ trunk/plugins/genapi.py 2008-12-04 16:17:04 UTC (rev 3316)
@@ -63,9 +63,10 @@
sys.exit("No function names read!")
f = open(outfile, 'w')
- print >>f, '/* @file %s @ref geany_functions wrappers. \n' % (outfile) +\
- 'This allows the use of normal API function names in plugins.\n' +\
- 'You need to declare the @ref geany_functions symbol yourself. */\n'
+ print >>f, '/* This file is generated automatically by genapi.py - do not edit.\n *\n' +\
+ ' * @file %s @ref geany_functions wrappers.\n' % (outfile) +\
+ ' * This allows the use of normal API function names in plugins.\n' +\
+ ' * You need to declare the @ref geany_functions symbol yourself.\n */\n'
print >>f, '#ifndef GEANY_FUNCTIONS_H'
print >>f, '#define GEANY_FUNCTIONS_H\n'
for fname in fnames:
@@ -74,4 +75,5 @@
print >>f, '\n#endif'
f.close
- print 'Generated ' + outfile
+ if not '-q' in sys.argv:
+ print 'Generated ' + outfile
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 3315
http://geany.svn.sourceforge.net/geany/?rev=3315&view=rev
Author: eht16
Date: 2008-12-04 15:56:54 +0000 (Thu, 04 Dec 2008)
Log Message:
-----------
Don't mark console messages as translatable.
Add two comments for translators.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/document.c
trunk/src/main.c
trunk/src/symbols.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-12-04 15:56:33 UTC (rev 3314)
+++ trunk/ChangeLog 2008-12-04 15:56:54 UTC (rev 3315)
@@ -2,6 +2,9 @@
* src/support.c, src/support.h:
Removed unused code.
+ * src/main.c, src/document.c, src/symbols.c:
+ Don't mark console messages as translatable.
+ Add two comments for translators.
2008-12-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c 2008-12-04 15:56:33 UTC (rev 3314)
+++ trunk/src/document.c 2008-12-04 15:56:54 UTC (rev 3315)
@@ -823,6 +823,8 @@
}
else if (! handle_forced_encoding(filedata, forced_enc))
{
+ /* For translators: the second wildcard is an encoding name, e.g.
+ * The file \"test.txt\" is not valid UTF-8. */
ui_set_statusbar(TRUE, _("The file \"%s\" is not valid %s."),
utf8_filename, forced_enc);
utils_beep();
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2008-12-04 15:56:33 UTC (rev 3314)
+++ trunk/src/main.c 2008-12-04 15:56:54 UTC (rev 3315)
@@ -832,7 +832,7 @@
/* ATM when opening a project file any other filenames are ignored */
load_project_from_cl = (argc > 1) && g_str_has_suffix(argv[1], ".geany");
if (load_project_from_cl && argc > 2)
- g_print(_("Ignoring extra filenames after %s"), argv[1]);
+ g_print("Ignoring extra filenames after %s", argv[1]);
if (load_project_from_cl || ! open_cl_files(argc, argv))
{
Modified: trunk/src/symbols.c
===================================================================
--- trunk/src/symbols.c 2008-12-04 15:56:33 UTC (rev 3314)
+++ trunk/src/symbols.c 2008-12-04 15:56:54 UTC (rev 3315)
@@ -1337,6 +1337,7 @@
ft = detect_global_tags_filetype(utf8_fname);
if (ft != NULL && tm_workspace_load_global_tags(fname, ft->lang))
+ /* For translators: the first wildcard is the filetype, the second the filename */
ui_set_statusbar(TRUE, _("Loaded %s tags file '%s'."), ft->name, utf8_fname);
else
ui_set_statusbar(TRUE, _("Could not load tags file '%s'."), utf8_fname);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.