Commits March 2011

commits@lists.geany.org

4 participants
116 discussions

SF.net SVN: geany:[5607] trunk
by colombanw＠users.sourceforge.net 18 Mar '11

18 Mar '11

Revision: 5607 http://geany.svn.sourceforge.net/geany/?rev=5607&view=rev Author: colombanw Date: 2011-03-18 15:57:15 +0000 (Fri, 18 Mar 2011) Log Message: ----------- Properly convert template files to UTF-8 on loading Modified Paths: -------------- trunk/ChangeLog trunk/src/templates.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-18 15:57:02 UTC (rev 5606) +++ trunk/ChangeLog 2011-03-18 15:57:15 UTC (rev 5607) @@ -3,6 +3,9 @@ * src/document.c, src/encodings.c, src/encodings.h: Move document encoding conversion with BOM support to encodings.[ch] as encodings_convert_to_utf8_auto(). + * src/templates.c: + Properly convert template files to UTF-8 on loading, fixing encoding + issues if templates files are not encoded in UTF-8. 2011-03-18 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/templates.c =================================================================== --- trunk/src/templates.c 2011-03-18 15:57:02 UTC (rev 5606) +++ trunk/src/templates.c 2011-03-18 15:57:15 UTC (rev 5607) @@ -35,6 +35,7 @@ #include "support.h" #include "utils.h" #include "document.h" +#include "encodings.h" #include "editor.h" #include "filetypes.h" #include "ui_utils.h" @@ -73,11 +74,22 @@ static gchar *read_file(const gchar *locale_fname) { gchar *contents; + gsize length; GString *str; - if (!g_file_get_contents(locale_fname, &contents, NULL, NULL)) + if (! g_file_get_contents(locale_fname, &contents, &length, NULL)) return NULL; + if (! encodings_convert_to_utf8_auto(&contents, &length, NULL, NULL, NULL, NULL)) + { + gchar *utf8_fname = utils_get_utf8_from_locale(locale_fname); + + ui_set_statusbar(TRUE, _("Failed to convert template file \"%s\" to UTF-8"), utf8_fname); + g_free(utf8_fname); + g_free(contents); + return FALSE; + } + str = g_string_new(contents); g_free(contents); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5606] trunk
by colombanw＠users.sourceforge.net 18 Mar '11

18 Mar '11

Revision: 5606 http://geany.svn.sourceforge.net/geany/?rev=5606&view=rev Author: colombanw Date: 2011-03-18 15:57:02 +0000 (Fri, 18 Mar 2011) Log Message: ----------- Move document encoding conversion with BOM support to encodings.[ch] Adds the new function encodings_convert_to_utf8_auto(). This makes easy to convert file data to UTF-8 in a high-level fashion, with BOM support and everything. Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c trunk/src/encodings.c trunk/src/encodings.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-18 09:35:31 UTC (rev 5605) +++ trunk/ChangeLog 2011-03-18 15:57:02 UTC (rev 5606) @@ -1,3 +1,10 @@ +2011-03-18 Colomban Wendling <colomban(at)geany(dot)org> + + * src/document.c, src/encodings.c, src/encodings.h: + Move document encoding conversion with BOM support to encodings.[ch] as + encodings_convert_to_utf8_auto(). + + 2011-03-18 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * data/templates/files/main.vala: Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2011-03-18 09:35:31 UTC (rev 5605) +++ trunk/src/document.c 2011-03-18 15:57:02 UTC (rev 5606) @@ -819,7 +819,6 @@ typedef struct { gchar *data; /* null-terminated file data */ - gsize size; /* actual file size on disk */ gsize len; /* string length of data */ gchar *enc; gboolean bom; @@ -828,133 +827,12 @@ } FileData; -/* reload file with specified encoding */ -static gboolean -handle_forced_encoding(FileData *filedata, const gchar *forced_enc) -{ - GeanyEncodingIndex enc_idx; - - if (utils_str_equal(forced_enc, "UTF-8")) - { - if (! g_utf8_validate(filedata->data, filedata->len, NULL)) - { - return FALSE; - } - } - else - { - gchar *converted_text = encodings_convert_to_utf8_from_charset( - filedata->data, filedata->size, forced_enc, FALSE); - if (converted_text == NULL) - { - return FALSE; - } - else - { - g_free(filedata->data); - filedata->data = converted_text; - filedata->len = strlen(converted_text); - } - } - enc_idx = encodings_scan_unicode_bom(filedata->data, filedata->size, NULL); - filedata->bom = (enc_idx == GEANY_ENCODING_UTF_8); - filedata->enc = g_strdup(forced_enc); - return TRUE; -} - - -/* detect encoding and convert to UTF-8 if necessary */ -static gboolean -handle_encoding(FileData *filedata, GeanyEncodingIndex enc_idx) -{ - g_return_val_if_fail(filedata->enc == NULL, FALSE); - g_return_val_if_fail(filedata->bom == FALSE, FALSE); - - if (filedata->size == 0) - { - /* we have no data so assume UTF-8, filedata->len can be 0 even we have an empty - * e.g. UTF32 file with a BOM(so size is 4, len is 0) */ - filedata->enc = g_strdup("UTF-8"); - } - else - { - /* first check for a BOM */ - if (enc_idx != GEANY_ENCODING_NONE) - { - filedata->enc = g_strdup(encodings[enc_idx].charset); - filedata->bom = TRUE; - - if (enc_idx != GEANY_ENCODING_UTF_8) /* the BOM indicated something else than UTF-8 */ - { - gchar *converted_text = encodings_convert_to_utf8_from_charset( - filedata->data, filedata->size, filedata->enc, FALSE); - if (converted_text != NULL) - { - g_free(filedata->data); - filedata->data = converted_text; - filedata->len = strlen(converted_text); - } - else - { - /* there was a problem converting data from BOM encoding type */ - g_free(filedata->enc); - filedata->enc = NULL; - filedata->bom = FALSE; - } - } - } - - if (filedata->enc == NULL) /* either there was no BOM or the BOM encoding failed */ - { - /* try UTF-8 first */ - if ((filedata->size == filedata->len) && - g_utf8_validate(filedata->data, filedata->len, NULL)) - { - filedata->enc = g_strdup("UTF-8"); - } - else - { - /* detect the encoding */ - gchar *converted_text = encodings_convert_to_utf8(filedata->data, - filedata->size, &filedata->enc); - - if (converted_text == NULL) - { - return FALSE; - } - g_free(filedata->data); - filedata->data = converted_text; - filedata->len = strlen(converted_text); - } - } - } - return TRUE; -} - - -static void -handle_bom(FileData *filedata) -{ - guint bom_len; - - encodings_scan_unicode_bom(filedata->data, filedata->size, &bom_len); - g_return_if_fail(bom_len != 0); - - /* use filedata->len here because the contents are already converted into UTF-8 */ - filedata->len -= bom_len; - /* overwrite the BOM with the remainder of the file contents, plus the NULL terminator. */ - g_memmove(filedata->data, filedata->data + bom_len, filedata->len + 1); - filedata->data = g_realloc(filedata->data, filedata->len + 1); -} - - /* loads textfile data, verifies and converts to forced_enc or UTF-8. Also handles BOM. */ static gboolean load_text_file(const gchar *locale_filename, const gchar *display_filename, FileData *filedata, const gchar *forced_enc) { GError *err = NULL; struct stat st; - GeanyEncodingIndex tmp_enc_idx; filedata->data = NULL; filedata->len = 0; @@ -978,20 +856,26 @@ return FALSE; } - /* use strlen to check for null chars */ - filedata->size = (gsize) st.st_size; - filedata->len = strlen(filedata->data); + filedata->len = (gsize) st.st_size; + if (! encodings_convert_to_utf8_auto(&filedata->data, &filedata->len, forced_enc, + &filedata->enc, &filedata->bom, &filedata->readonly)) + { + if (forced_enc) + { + ui_set_statusbar(TRUE, _("The file \"%s\" is not valid %s."), + display_filename, forced_enc); + } + else + { + ui_set_statusbar(TRUE, + _("The file \"%s\" does not look like a text file or the file encoding is not supported."), + display_filename); + } + g_free(filedata->data); + return FALSE; + } - /* temporarily retrieve the encoding idx based on the BOM to suppress the following warning - * if we have a BOM */ - tmp_enc_idx = encodings_scan_unicode_bom(filedata->data, filedata->size, NULL); - - /* check whether the size of the loaded data is equal to the size of the file in the - * filesystem file size may be 0 to allow opening files in /proc/ which have typically a - * file size of 0 bytes */ - if (filedata->len != filedata->size && filedata->size != 0 && ( - tmp_enc_idx == GEANY_ENCODING_UTF_8 || /* tmp_enc_idx can be UTF-7/8/16/32, UCS and None */ - tmp_enc_idx == GEANY_ENCODING_UTF_7)) /* filter UTF-7/8 where no NULL bytes are allowed */ + if (filedata->readonly) { const gchar *warn_msg = _( "The file \"%s\" could not be opened properly and has been truncated. " \ @@ -1002,43 +886,8 @@ dialogs_show_msgbox(GTK_MESSAGE_WARNING, warn_msg, display_filename); ui_set_statusbar(TRUE, warn_msg, display_filename); - - /* set the file to read-only mode because saving it is probably dangerous */ - filedata->readonly = TRUE; } - /* Determine character encoding and convert to UTF-8 */ - if (forced_enc != NULL) - { - /* the encoding should be ignored(requested by user), so open the file "as it is" */ - if (utils_str_equal(forced_enc, encodings[GEANY_ENCODING_NONE].charset)) - { - filedata->bom = FALSE; - filedata->enc = g_strdup(encodings[GEANY_ENCODING_NONE].charset); - } - 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."), - display_filename, forced_enc); - utils_beep(); - g_free(filedata->data); - return FALSE; - } - } - else if (! handle_encoding(filedata, tmp_enc_idx)) - { - ui_set_statusbar(TRUE, - _("The file \"%s\" does not look like a text file or the file encoding is not supported."), - display_filename); - utils_beep(); - g_free(filedata->data); - return FALSE; - } - - if (filedata->bom) - handle_bom(filedata); return TRUE; } Modified: trunk/src/encodings.c =================================================================== --- trunk/src/encodings.c 2011-03-18 09:35:31 UTC (rev 5605) +++ trunk/src/encodings.c 2011-03-18 15:57:02 UTC (rev 5606) @@ -676,3 +676,216 @@ } +typedef struct +{ + gchar *data; /* null-terminated data */ + gsize size; /* actual data size */ + gsize len; /* string length of data */ + gchar *enc; + gboolean bom; + gboolean partial; +} BufferData; + + +/* convert data with the specified encoding */ +static gboolean +handle_forced_encoding(BufferData *buffer, const gchar *forced_enc) +{ + GeanyEncodingIndex enc_idx; + + if (utils_str_equal(forced_enc, "UTF-8")) + { + if (! g_utf8_validate(buffer->data, buffer->len, NULL)) + { + return FALSE; + } + } + else + { + gchar *converted_text = encodings_convert_to_utf8_from_charset( + buffer->data, buffer->size, forced_enc, FALSE); + if (converted_text == NULL) + { + return FALSE; + } + else + { + setptr(buffer->data, converted_text); + buffer->len = strlen(converted_text); + } + } + enc_idx = encodings_scan_unicode_bom(buffer->data, buffer->size, NULL); + buffer->bom = (enc_idx == GEANY_ENCODING_UTF_8); + buffer->enc = g_strdup(forced_enc); + return TRUE; +} + + +/* detect encoding and convert to UTF-8 if necessary */ +static gboolean +handle_encoding(BufferData *buffer, GeanyEncodingIndex enc_idx) +{ + g_return_val_if_fail(buffer->enc == NULL, FALSE); + g_return_val_if_fail(buffer->bom == FALSE, FALSE); + + if (buffer->size == 0) + { + /* we have no data so assume UTF-8, buffer->len can be 0 even we have an empty + * e.g. UTF32 file with a BOM(so size is 4, len is 0) */ + buffer->enc = g_strdup("UTF-8"); + } + else + { + /* first check for a BOM */ + if (enc_idx != GEANY_ENCODING_NONE) + { + buffer->enc = g_strdup(encodings[enc_idx].charset); + buffer->bom = TRUE; + + if (enc_idx != GEANY_ENCODING_UTF_8) /* the BOM indicated something else than UTF-8 */ + { + gchar *converted_text = encodings_convert_to_utf8_from_charset( + buffer->data, buffer->size, buffer->enc, FALSE); + if (converted_text != NULL) + { + setptr(buffer->data, converted_text); + buffer->len = strlen(converted_text); + } + else + { + /* there was a problem converting data from BOM encoding type */ + setptr(buffer->enc, NULL); + buffer->bom = FALSE; + } + } + } + + if (buffer->enc == NULL) /* either there was no BOM or the BOM encoding failed */ + { + /* try UTF-8 first */ + if ((buffer->size == buffer->len) && + g_utf8_validate(buffer->data, buffer->len, NULL)) + { + buffer->enc = g_strdup("UTF-8"); + } + else + { + /* detect the encoding */ + gchar *converted_text = encodings_convert_to_utf8(buffer->data, + buffer->size, &buffer->enc); + + if (converted_text == NULL) + { + return FALSE; + } + setptr(buffer->data, converted_text); + buffer->len = strlen(converted_text); + } + } + } + return TRUE; +} + + +static void +handle_bom(BufferData *buffer) +{ + guint bom_len; + + encodings_scan_unicode_bom(buffer->data, buffer->size, &bom_len); + g_return_if_fail(bom_len != 0); + + /* use filedata->len here because the contents are already converted into UTF-8 */ + buffer->len -= bom_len; + /* overwrite the BOM with the remainder of the file contents, plus the NULL terminator. */ + g_memmove(buffer->data, buffer->data + bom_len, buffer->len + 1); + buffer->data = g_realloc(buffer->data, buffer->len + 1); +} + + +/* loads textfile data, verifies and converts to forced_enc or UTF-8. Also handles BOM. */ +static gboolean handle_buffer(BufferData *buffer, const gchar *forced_enc) +{ + GeanyEncodingIndex tmp_enc_idx; + + /* temporarily retrieve the encoding idx based on the BOM to suppress the following warning + * if we have a BOM */ + tmp_enc_idx = encodings_scan_unicode_bom(buffer->data, buffer->size, NULL); + + /* check whether the size of the loaded data is equal to the size of the file in the + * filesystem file size may be 0 to allow opening files in /proc/ which have typically a + * file size of 0 bytes */ + if (buffer->len != buffer->size && buffer->size != 0 && ( + tmp_enc_idx == GEANY_ENCODING_UTF_8 || /* tmp_enc_idx can be UTF-7/8/16/32, UCS and None */ + tmp_enc_idx == GEANY_ENCODING_UTF_7)) /* filter UTF-7/8 where no NULL bytes are allowed */ + { + buffer->partial = TRUE; + } + + /* Determine character encoding and convert to UTF-8 */ + if (forced_enc != NULL) + { + /* the encoding should be ignored(requested by user), so open the file "as it is" */ + if (utils_str_equal(forced_enc, encodings[GEANY_ENCODING_NONE].charset)) + { + buffer->bom = FALSE; + buffer->enc = g_strdup(encodings[GEANY_ENCODING_NONE].charset); + } + else if (! handle_forced_encoding(buffer, forced_enc)) + { + return FALSE; + } + } + else if (! handle_encoding(buffer, tmp_enc_idx)) + { + return FALSE; + } + + if (buffer->bom) + handle_bom(buffer); + return TRUE; +} + + +/* + * Tries to convert @a buffer into UTF-8 encoding. Unlike encodings_convert_to_utf8() + * and encodings_convert_to_utf8_from_charset() it handles the possible BOM in the data. + * + * @param buf a pointer to modifiable null-terminated buffer to convert. + * It may or may not be modified, and should be freed whatever happens. + * @param size a pointer to the size of the buffer (expected to be e.g. the on-disk + * file size). It will be updated to the new size. + * @param forced_enc forced encoding to use, or @c NULL + * @param used_encoding return location for the actually used encoding, or @c NULL + * @param has_bom return location to store whether the data had a BOM, or @c NULL + * @param partial return location to store whether the conversion may be partial, or @c NULL + * + * @return @C TRUE if the conversion succeeded, @c FALSE otherwise. + */ +gboolean encodings_convert_to_utf8_auto(gchar **buf, gsize *size, const gchar *forced_enc, + gchar **used_encoding, gboolean *has_bom, gboolean *partial) +{ + BufferData buffer; + + buffer.data = *buf; + buffer.size = *size; + /* use strlen to check for null chars */ + buffer.len = strlen(buffer.data); + buffer.enc = NULL; + buffer.bom = FALSE; + buffer.partial = FALSE; + + if (! handle_buffer(&buffer, forced_enc)) + return FALSE; + + *size = buffer.len; + if (used_encoding) + *used_encoding = buffer.enc; + if (has_bom) + *has_bom = buffer.bom; + if (partial) + *partial = buffer.partial; + + *buf = buffer.data; + return TRUE; +} Modified: trunk/src/encodings.h =================================================================== --- trunk/src/encodings.h 2011-03-18 09:35:31 UTC (rev 5605) +++ trunk/src/encodings.h 2011-03-18 15:57:02 UTC (rev 5606) @@ -90,6 +90,8 @@ gboolean encodings_is_unicode_charset(const gchar *string); +gboolean encodings_convert_to_utf8_auto(gchar **buf, gsize *size, const gchar *forced_enc, + gchar **used_encoding, gboolean *has_bom, gboolean *partial); /* * The original versions of the following tables are taken from profterm This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5605] trunk
by eht16＠users.sourceforge.net 18 Mar '11

18 Mar '11

Revision: 5605 http://geany.svn.sourceforge.net/geany/?rev=5605&view=rev Author: eht16 Date: 2011-03-18 09:35:31 +0000 (Fri, 18 Mar 2011) Log Message: ----------- Add file template for Vala (patch by Mark Trompell, thanks). Modified Paths: -------------- trunk/ChangeLog Added Paths: ----------- trunk/data/templates/files/main.vala Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-17 18:00:20 UTC (rev 5604) +++ trunk/ChangeLog 2011-03-18 09:35:31 UTC (rev 5605) @@ -1,3 +1,9 @@ +2011-03-18 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * data/templates/files/main.vala: + Add file template for Vala (patch by Mark Trompell, thanks). + + 2011-03-17 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/utils.c, src/utils.h, src/filetypes.c: @@ -8,23 +14,23 @@ Improve Class Builder plugin dialog UI using a table (patch by Matthew Brush, thanks). * plugins/classbuilder.c: - Fix GLib warning when creating classes and no documents are open + Fix GLib warning when creating classes and no documents are open (patch by Matthew Brush, thanks). * plugins/classbuilder.c: - Undo patch change to cc_option_label_new() to append a ':' colon to - label text because this unnecessarily causes string translations to + Undo patch change to cc_option_label_new() to append a ':' colon to + label text because this unnecessarily causes string translations to be updated. * src/interface.c, geany.glade: - Fix wrong label capitalization for Toolbar Preferences dialog tab + Fix wrong label capitalization for Toolbar Preferences dialog tab and 2 other labels. * data/filetypes.Scala.conf, data/filetype_extensions.conf: Add Scala custom filetype, based on file by werg (thanks). (This uses the newly added [styling=C] syntax). * src/filetypes.c: - Make special case for filetypes.matlab instead of truncating all + Make special case for filetypes.matlab instead of truncating all filetype config filenames at slash. * src/filetypes.c: - Fix generating tag files and --ft-names option by ensuring GTK is + Fix generating tag files and --ft-names option by ensuring GTK is initialized before calling ui_get_mime_icon(). Added: trunk/data/templates/files/main.vala =================================================================== --- trunk/data/templates/files/main.vala (rev 0) +++ trunk/data/templates/files/main.vala 2011-03-18 09:35:31 UTC (rev 5605) @@ -0,0 +1,9 @@ +{fileheader} + +class {untitled} : GLib.Object { + + public static int main(string[] args) { + + return 0; + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5604] trunk
by ntrel＠users.sourceforge.net 17 Mar '11

17 Mar '11

Revision: 5604 http://geany.svn.sourceforge.net/geany/?rev=5604&view=rev Author: ntrel Date: 2011-03-17 18:00:20 +0000 (Thu, 17 Mar 2011) Log Message: ----------- Fix generating tag files and --ft-names option by ensuring GTK is initialized before calling ui_get_mime_icon(). Modified Paths: -------------- trunk/ChangeLog trunk/src/filetypes.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-17 17:03:01 UTC (rev 5603) +++ trunk/ChangeLog 2011-03-17 18:00:20 UTC (rev 5604) @@ -23,6 +23,9 @@ * src/filetypes.c: Make special case for filetypes.matlab instead of truncating all filetype config filenames at slash. + * src/filetypes.c: + Fix generating tag files and --ft-names option by ensuring GTK is + initialized before calling ui_get_mime_icon(). 2011-03-15 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2011-03-17 17:03:01 UTC (rev 5603) +++ trunk/src/filetypes.c 2011-03-17 18:00:20 UTC (rev 5604) @@ -528,8 +528,6 @@ if (!ft->mime_type) ft->mime_type = g_strdup("text/plain"); - - ft->icon = ui_get_mime_icon(ft->mime_type, GTK_ICON_SIZE_MENU); } @@ -581,7 +579,8 @@ } -/* Create the filetypes array and fill it with the known filetypes. */ +/* Create the filetypes array and fill it with the known filetypes. + * Warning: GTK isn't necessarily initialized yet. */ void filetypes_init_types() { filetype_id ft_id; @@ -686,8 +685,15 @@ void filetypes_init() { + GSList *node; + filetypes_init_types(); - + /* this has to be here as GTK isn't initialized in filetypes_init_types(). */ + foreach_slist(node, filetypes_by_title) + { + GeanyFiletype *ft = node->data; + ft->icon = ui_get_mime_icon(ft->mime_type, GTK_ICON_SIZE_MENU); + } create_set_filetype_menu(); setup_config_file_menus(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5603] trunk
by ntrel＠users.sourceforge.net 17 Mar '11

17 Mar '11

Revision: 5603 http://geany.svn.sourceforge.net/geany/?rev=5603&view=rev Author: ntrel Date: 2011-03-17 17:03:01 +0000 (Thu, 17 Mar 2011) Log Message: ----------- Make special case for filetypes.matlab instead of truncating all filetype config filenames at slash. Modified Paths: -------------- trunk/ChangeLog trunk/src/filetypes.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-17 16:51:18 UTC (rev 5602) +++ trunk/ChangeLog 2011-03-17 17:03:01 UTC (rev 5603) @@ -20,6 +20,9 @@ * data/filetypes.Scala.conf, data/filetype_extensions.conf: Add Scala custom filetype, based on file by werg (thanks). (This uses the newly added [styling=C] syntax). + * src/filetypes.c: + Make special case for filetypes.matlab instead of truncating all + filetype config filenames at slash. 2011-03-15 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2011-03-17 16:51:18 UTC (rev 5602) +++ trunk/src/filetypes.c 2011-03-17 17:03:01 UTC (rev 5603) @@ -1290,7 +1290,7 @@ gchar *filetypes_get_conf_extension(gint filetype_idx) { - gchar *result, *ptr; + gchar *result; GeanyFiletype *ft = filetypes[filetype_idx]; if (ft->priv->custom) @@ -1303,12 +1303,10 @@ case GEANY_FILETYPES_CS: result = g_strdup("cs"); break; case GEANY_FILETYPES_MAKE: result = g_strdup("makefile"); break; case GEANY_FILETYPES_NONE: result = g_strdup("common"); break; + /* name is Matlab/Octave */ + case GEANY_FILETYPES_MATLAB: result = g_strdup("matlab"); break; default: result = g_ascii_strdown(ft->name, -1); - /* truncate at slash (e.g. for Matlab/Octave) */ - ptr = strstr(result, "/"); - if (ptr) - *ptr = 0x0; break; } return result; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5602] trunk
by ntrel＠users.sourceforge.net 17 Mar '11

17 Mar '11

Revision: 5602 http://geany.svn.sourceforge.net/geany/?rev=5602&view=rev Author: ntrel Date: 2011-03-17 16:51:18 +0000 (Thu, 17 Mar 2011) Log Message: ----------- Add Scala custom filetype, based on file by werg (thanks). (This uses the newly added [styling=C] syntax). Modified Paths: -------------- trunk/ChangeLog trunk/data/filetype_extensions.conf Added Paths: ----------- trunk/data/filetypes.Scala.conf Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-17 16:41:25 UTC (rev 5601) +++ trunk/ChangeLog 2011-03-17 16:51:18 UTC (rev 5602) @@ -17,6 +17,9 @@ * src/interface.c, geany.glade: Fix wrong label capitalization for Toolbar Preferences dialog tab and 2 other labels. + * data/filetypes.Scala.conf, data/filetype_extensions.conf: + Add Scala custom filetype, based on file by werg (thanks). + (This uses the newly added [styling=C] syntax). 2011-03-15 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: trunk/data/filetype_extensions.conf =================================================================== --- trunk/data/filetype_extensions.conf 2011-03-17 16:41:25 UTC (rev 5601) +++ trunk/data/filetype_extensions.conf 2011-03-17 16:51:18 UTC (rev 5602) @@ -45,6 +45,7 @@ reStructuredText=*.rest;*.reST;*.rst; R=*.R;*.r; Ruby=*.rb;*.rhtml;*.ruby; +Scala=*.scl; Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.zsh;*.ash;*.bash;*.m4; SQL=*.sql; Tcl=*.tcl;*.tk;*.wish; Added: trunk/data/filetypes.Scala.conf =================================================================== --- trunk/data/filetypes.Scala.conf (rev 0) +++ trunk/data/filetypes.Scala.conf 2011-03-17 16:51:18 UTC (rev 5602) @@ -0,0 +1,37 @@ +# Based on file by werg +# For complete documentation of this file, please see Geany's main documentation +[styling=C] + +[keywords] +# all items must be in one line +primary=abstract case catch class def do else extends false final finally for forSome if implicit import lazy match new object override package private protected requires return sealed throw trait true try type val var with while yield @ => + +secondary=null super this AllRef Any AnyRef Array Attribute Elem Iterable List Option Some Stack String Unit Console Nil None Predef +# these are some doxygen keywords (incomplete) +docComment=attention author brief bug class code date def enum example exception file fn namespace note param remarks return see since struct throw todo typedef var version warning union + +[settings] +lexer_filetype=C + +# default extension used when saving files +extension=scl + +# the following characters are these which a "word" can contains, see documentation +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# if only single comment char is supported like # in this file, leave comment_close blank +#comment_open=// +#comment_close= +# this is an alternative way, so multiline comments are used +comment_open=/* +comment_close=*/ + +comment_use_indent=true + +#[build_settings] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +#compiler=g++ -Wall -c "%f" +#linker=g++ -Wall -o "%e" "%f" +#run_cmd="./%e" Property changes on: trunk/data/filetypes.Scala.conf ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5601] trunk
by ntrel＠users.sourceforge.net 17 Mar '11

17 Mar '11

Revision: 5601 http://geany.svn.sourceforge.net/geany/?rev=5601&view=rev Author: ntrel Date: 2011-03-17 16:41:25 +0000 (Thu, 17 Mar 2011) Log Message: ----------- Fix wrong label capitalization for Toolbar Preferences dialog tab and 2 other labels. Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/interface.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-17 16:14:56 UTC (rev 5600) +++ trunk/ChangeLog 2011-03-17 16:41:25 UTC (rev 5601) @@ -14,6 +14,9 @@ Undo patch change to cc_option_label_new() to append a ':' colon to label text because this unnecessarily causes string translations to be updated. + * src/interface.c, geany.glade: + Fix wrong label capitalization for Toolbar Preferences dialog tab + and 2 other labels. 2011-03-15 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2011-03-17 16:14:56 UTC (rev 5600) +++ trunk/geany.glade 2011-03-17 16:41:25 UTC (rev 5601) @@ -5188,7 +5188,7 @@ <widget class="GtkCheckButton" id="check_toolbar_show"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Show T_oolbar</property> + <property name="label" translatable="yes">Show t_oolbar</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5208,7 +5208,7 @@ <property name="visible">True</property> <property name="tooltip" translatable="yes">Pack the toolbar to the main menu to save vertical space</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Append Toolbar to the Menu</property> + <property name="label" translatable="yes">_Append toolbar to the menu</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5365,7 +5365,7 @@ <widget class="GtkRadioButton" id="radio_toolbar_style_default"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">System _Default</property> + <property name="label" translatable="yes">System _default</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5387,7 +5387,7 @@ <widget class="GtkRadioButton" id="radio_toolbar_imagetext"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Images _and Text</property> + <property name="label" translatable="yes">Images _and text</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5410,7 +5410,7 @@ <widget class="GtkRadioButton" id="radio_toolbar_image"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Images Only</property> + <property name="label" translatable="yes">_Images only</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5433,7 +5433,7 @@ <widget class="GtkRadioButton" id="radio_toolbar_text"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Text Only</property> + <property name="label" translatable="yes">_Text only</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5459,7 +5459,7 @@ <child> <widget class="GtkLabel" id="label244"> <property name="visible">True</property> - <property name="label" translatable="yes">Icon Style</property> + <property name="label" translatable="yes">Icon style</property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -5518,7 +5518,7 @@ <widget class="GtkRadioButton" id="radio_toolbar_icon_default"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">S_ystem Default</property> + <property name="label" translatable="yes">S_ystem default</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5540,7 +5540,7 @@ <widget class="GtkRadioButton" id="radio_toolbar_small"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Small Icons</property> + <property name="label" translatable="yes">_Small icons</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5563,7 +5563,7 @@ <widget class="GtkRadioButton" id="radio_toolbar_verysmall"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Very Small Icons</property> + <property name="label" translatable="yes">_Very small icons</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5586,7 +5586,7 @@ <widget class="GtkRadioButton" id="radio_toolbar_large"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Large Icons</property> + <property name="label" translatable="yes">_Large icons</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -5612,7 +5612,7 @@ <child> <widget class="GtkLabel" id="label245"> <property name="visible">True</property> - <property name="label" translatable="yes">Icon Size</property> + <property name="label" translatable="yes">Icon size</property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -6322,7 +6322,7 @@ <property name="visible">True</property> <property name="tooltip" translatable="yes">Use spaces if the total indent is less than the tab width, otherwise use both</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">T_abs and Spaces</property> + <property name="label" translatable="yes">T_abs and spaces</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -9287,7 +9287,7 @@ <child> <widget class="GtkLabel" id="label218"> <property name="visible">True</property> - <property name="label" translatable="yes">Date & Time:</property> + <property name="label" translatable="yes">Date & time:</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -10312,7 +10312,7 @@ <property name="visible">True</property> <property name="tooltip" translatable="yes">Use spaces if the total indent is less than the tab width, otherwise use both</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">T_abs and Spaces</property> + <property name="label" translatable="yes">T_abs and spaces</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2011-03-17 16:14:56 UTC (rev 5600) +++ trunk/src/interface.c 2011-03-17 16:41:25 UTC (rev 5601) @@ -3563,11 +3563,11 @@ gtk_widget_show (vbox52); gtk_box_pack_start (GTK_BOX (hbox18), vbox52, TRUE, TRUE, 0); - check_toolbar_show = gtk_check_button_new_with_mnemonic (_("Show T_oolbar")); + check_toolbar_show = gtk_check_button_new_with_mnemonic (_("Show t_oolbar")); gtk_widget_show (check_toolbar_show); gtk_box_pack_start (GTK_BOX (vbox52), check_toolbar_show, FALSE, FALSE, 0); - check_toolbar_in_menu = gtk_check_button_new_with_mnemonic (_("_Append Toolbar to the Menu")); + check_toolbar_in_menu = gtk_check_button_new_with_mnemonic (_("_Append toolbar to the menu")); gtk_widget_show (check_toolbar_in_menu); gtk_box_pack_start (GTK_BOX (vbox52), check_toolbar_in_menu, FALSE, FALSE, 0); gtk_tooltips_set_tip (tooltips, check_toolbar_in_menu, _("Pack the toolbar to the main menu to save vertical space"), NULL); @@ -3612,7 +3612,7 @@ gtk_table_set_row_spacings (GTK_TABLE (table19), 3); gtk_table_set_col_spacings (GTK_TABLE (table19), 20); - radio_toolbar_style_default = gtk_radio_button_new_with_mnemonic (NULL, _("System _Default")); + radio_toolbar_style_default = gtk_radio_button_new_with_mnemonic (NULL, _("System _default")); gtk_widget_show (radio_toolbar_style_default); gtk_table_attach (GTK_TABLE (table19), radio_toolbar_style_default, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), @@ -3620,7 +3620,7 @@ gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_toolbar_style_default), radio_toolbar_style_default_group); radio_toolbar_style_default_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_toolbar_style_default)); - radio_toolbar_imagetext = gtk_radio_button_new_with_mnemonic (NULL, _("Images _and Text")); + radio_toolbar_imagetext = gtk_radio_button_new_with_mnemonic (NULL, _("Images _and text")); gtk_widget_show (radio_toolbar_imagetext); gtk_table_attach (GTK_TABLE (table19), radio_toolbar_imagetext, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -3628,7 +3628,7 @@ gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_toolbar_imagetext), radio_toolbar_style_default_group); radio_toolbar_style_default_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_toolbar_imagetext)); - radio_toolbar_image = gtk_radio_button_new_with_mnemonic (NULL, _("_Images Only")); + radio_toolbar_image = gtk_radio_button_new_with_mnemonic (NULL, _("_Images only")); gtk_widget_show (radio_toolbar_image); gtk_table_attach (GTK_TABLE (table19), radio_toolbar_image, 1, 2, 0, 1, (GtkAttachOptions) (GTK_FILL), @@ -3636,7 +3636,7 @@ gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_toolbar_image), radio_toolbar_style_default_group); radio_toolbar_style_default_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_toolbar_image)); - radio_toolbar_text = gtk_radio_button_new_with_mnemonic (NULL, _("_Text Only")); + radio_toolbar_text = gtk_radio_button_new_with_mnemonic (NULL, _("_Text only")); gtk_widget_show (radio_toolbar_text); gtk_table_attach (GTK_TABLE (table19), radio_toolbar_text, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -3644,7 +3644,7 @@ gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_toolbar_text), radio_toolbar_style_default_group); radio_toolbar_style_default_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_toolbar_text)); - label244 = gtk_label_new (_("Icon Style")); + label244 = gtk_label_new (_("Icon style")); gtk_widget_show (label244); gtk_frame_set_label_widget (GTK_FRAME (frame_toolbar_style), label244); gtk_label_set_use_markup (GTK_LABEL (label244), TRUE); @@ -3665,7 +3665,7 @@ gtk_table_set_row_spacings (GTK_TABLE (table20), 3); gtk_table_set_col_spacings (GTK_TABLE (table20), 20); - radio_toolbar_icon_default = gtk_radio_button_new_with_mnemonic (NULL, _("S_ystem Default")); + radio_toolbar_icon_default = gtk_radio_button_new_with_mnemonic (NULL, _("S_ystem default")); gtk_widget_show (radio_toolbar_icon_default); gtk_table_attach (GTK_TABLE (table20), radio_toolbar_icon_default, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), @@ -3673,7 +3673,7 @@ gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_toolbar_icon_default), radio_toolbar_icon_default_group); radio_toolbar_icon_default_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_toolbar_icon_default)); - radio_toolbar_small = gtk_radio_button_new_with_mnemonic (NULL, _("_Small Icons")); + radio_toolbar_small = gtk_radio_button_new_with_mnemonic (NULL, _("_Small icons")); gtk_widget_show (radio_toolbar_small); gtk_table_attach (GTK_TABLE (table20), radio_toolbar_small, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -3681,7 +3681,7 @@ gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_toolbar_small), radio_toolbar_icon_default_group); radio_toolbar_icon_default_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_toolbar_small)); - radio_toolbar_verysmall = gtk_radio_button_new_with_mnemonic (NULL, _("_Very Small Icons")); + radio_toolbar_verysmall = gtk_radio_button_new_with_mnemonic (NULL, _("_Very small icons")); gtk_widget_show (radio_toolbar_verysmall); gtk_table_attach (GTK_TABLE (table20), radio_toolbar_verysmall, 1, 2, 0, 1, (GtkAttachOptions) (GTK_FILL), @@ -3689,7 +3689,7 @@ gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_toolbar_verysmall), radio_toolbar_icon_default_group); radio_toolbar_icon_default_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_toolbar_verysmall)); - radio_toolbar_large = gtk_radio_button_new_with_mnemonic (NULL, _("_Large Icons")); + radio_toolbar_large = gtk_radio_button_new_with_mnemonic (NULL, _("_Large icons")); gtk_widget_show (radio_toolbar_large); gtk_table_attach (GTK_TABLE (table20), radio_toolbar_large, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), @@ -3697,7 +3697,7 @@ gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_toolbar_large), radio_toolbar_icon_default_group); radio_toolbar_icon_default_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_toolbar_large)); - label245 = gtk_label_new (_("Icon Size")); + label245 = gtk_label_new (_("Icon size")); gtk_widget_show (label245); gtk_frame_set_label_widget (GTK_FRAME (frame_toolbar_icon), label245); gtk_label_set_use_markup (GTK_LABEL (label245), TRUE); @@ -3900,7 +3900,7 @@ gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_indent_tabs), radio_indent_spaces_group); radio_indent_spaces_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_indent_tabs)); - radio_indent_both = gtk_radio_button_new_with_mnemonic (NULL, _("T_abs and Spaces")); + radio_indent_both = gtk_radio_button_new_with_mnemonic (NULL, _("T_abs and spaces")); gtk_widget_show (radio_indent_both); gtk_table_attach (GTK_TABLE (table13), radio_indent_both, 1, 2, 3, 4, (GtkAttachOptions) (GTK_FILL), @@ -4785,7 +4785,7 @@ (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label217), 0, 0.5); - label218 = gtk_label_new (_("Date & Time:")); + label218 = gtk_label_new (_("Date & time:")); gtk_widget_show (label218); gtk_table_attach (GTK_TABLE (table6), label218, 0, 1, 7, 8, (GtkAttachOptions) (GTK_FILL), @@ -5541,7 +5541,7 @@ gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_indent_tabs), radio_indent_spaces_group); radio_indent_spaces_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_indent_tabs)); - radio_indent_both = gtk_radio_button_new_with_mnemonic (NULL, _("T_abs and Spaces")); + radio_indent_both = gtk_radio_button_new_with_mnemonic (NULL, _("T_abs and spaces")); gtk_widget_show (radio_indent_both); gtk_table_attach (GTK_TABLE (table17), radio_indent_both, 1, 2, 3, 4, (GtkAttachOptions) (GTK_FILL), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5600] trunk/src/build.c
by colombanw＠users.sourceforge.net 17 Mar '11

17 Mar '11

Revision: 5600 http://geany.svn.sourceforge.net/geany/?rev=5600&view=rev Author: colombanw Date: 2011-03-17 16:14:56 +0000 (Thu, 17 Mar 2011) Log Message: ----------- Don't use non-C89 initializers Modified Paths: -------------- trunk/src/build.c Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2011-03-17 13:02:13 UTC (rev 5599) +++ trunk/src/build.c 2011-03-17 16:14:56 UTC (rev 5600) @@ -189,10 +189,10 @@ } -static const gchar *config_keys[] = { - [GEANY_BC_LABEL] = "LB", - [GEANY_BC_COMMAND] = "CM", - [GEANY_BC_WORKING_DIR] = "WD" +static const gchar *config_keys[GEANY_BC_CMDENTRIES_COUNT] = { + "LB", /* label */ + "CM", /* command */ + "WD" /* working directory */ }; /*----------------------------------------------------- @@ -1762,7 +1762,7 @@ for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) gtk_widget_modify_text(r->entries[i], GTK_STATE_NORMAL, color); -}; +} static void set_build_command_entry_text(GtkWidget *wid, const gchar *text) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5599] trunk
by ntrel＠users.sourceforge.net 17 Mar '11

17 Mar '11

Revision: 5599 http://geany.svn.sourceforge.net/geany/?rev=5599&view=rev Author: ntrel Date: 2011-03-17 13:02:13 +0000 (Thu, 17 Mar 2011) Log Message: ----------- Undo patch change to cc_option_label_new() to append a ':' colon to label text because this unnecessarily causes string translations to be updated. Modified Paths: -------------- trunk/ChangeLog trunk/plugins/classbuilder.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-17 12:54:41 UTC (rev 5598) +++ trunk/ChangeLog 2011-03-17 13:02:13 UTC (rev 5599) @@ -10,6 +10,10 @@ * plugins/classbuilder.c: Fix GLib warning when creating classes and no documents are open (patch by Matthew Brush, thanks). + * plugins/classbuilder.c: + Undo patch change to cc_option_label_new() to append a ':' colon to + label text because this unnecessarily causes string translations to + be updated. 2011-03-15 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: trunk/plugins/classbuilder.c =================================================================== --- trunk/plugins/classbuilder.c 2011-03-17 12:54:41 UTC (rev 5598) +++ trunk/plugins/classbuilder.c 2011-03-17 13:02:13 UTC (rev 5599) @@ -355,22 +355,18 @@ return NULL; } -/* Creates a new option label, indented on the left, with a semi-colon - * added on the end */ +/* Creates a new option label, indented on the left */ GtkWidget *cc_option_label_new(const gchar *text) { - gchar *label_text; GtkWidget *align; GtkWidget *label; align = gtk_alignment_new(0.0, 0.5, 1.0, 1.0); gtk_alignment_set_padding(GTK_ALIGNMENT(align), 0, 0, 12, 0); - label_text = g_strdup_printf("%s:", text); - label = gtk_label_new(label_text); + label = gtk_label_new(text); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_container_add(GTK_CONTAINER(align), label); - g_free(label_text); return align; } @@ -480,7 +476,7 @@ if (type == GEANY_CLASS_TYPE_PHP || type == GEANY_CLASS_TYPE_GTK) { cc_table_attach_section_label(table, _("Namespace"), row++, FALSE); - cc_dlg->class_namespace_entry = cc_table_attach_option_entry(table, _("Name"), row++); + cc_dlg->class_namespace_entry = cc_table_attach_option_entry(table, _("Name:"), row++); g_signal_connect(cc_dlg->class_namespace_entry, "changed", G_CALLBACK(cc_dlg_on_class_namespace_entry_changed), cc_dlg); } @@ -490,18 +486,18 @@ else cc_table_attach_section_label(table, _("Class"), row++, FALSE); - cc_dlg->class_name_entry = cc_table_attach_option_entry(table, _("Name"), row++); + cc_dlg->class_name_entry = cc_table_attach_option_entry(table, _("Name:"), row++); g_signal_connect(cc_dlg->class_name_entry, "changed", G_CALLBACK(cc_dlg_on_class_name_entry_changed), cc_dlg); if (type != GEANY_CLASS_TYPE_PHP) - cc_dlg->header_entry = cc_table_attach_option_entry(table, _("Header file"), row++); + cc_dlg->header_entry = cc_table_attach_option_entry(table, _("Header file:"), row++); - cc_dlg->source_entry = cc_table_attach_option_entry(table, _("Source file"), row++); + cc_dlg->source_entry = cc_table_attach_option_entry(table, _("Source file:"), row++); cc_table_attach_section_label(table, _("Inheritance"), row++, TRUE); - cc_dlg->base_name_entry = cc_table_attach_option_entry(table, _("Base class"), row++); + cc_dlg->base_name_entry = cc_table_attach_option_entry(table, _("Base class:"), row++); if (type == GEANY_CLASS_TYPE_GTK) gtk_entry_set_text(GTK_ENTRY(cc_dlg->base_name_entry), "GObject"); @@ -509,12 +505,12 @@ G_CALLBACK(cc_dlg_on_base_name_entry_changed), (gpointer)cc_dlg); if (type == GEANY_CLASS_TYPE_PHP) - cc_dlg->base_header_entry = cc_table_attach_option_entry(table, _("Base source"), row++); + cc_dlg->base_header_entry = cc_table_attach_option_entry(table, _("Base source:"), row++); else { hdr_hbox = gtk_hbox_new(FALSE, 6); - label = cc_table_attach_option_label(table, _("Base header"), row); + label = cc_table_attach_option_label(table, _("Base header:"), row); cc_dlg->base_header_entry = gtk_entry_new(); g_object_set_data(G_OBJECT(cc_dlg->base_header_entry), "label", label); @@ -541,12 +537,12 @@ if (type == GEANY_CLASS_TYPE_GTK) { - cc_dlg->base_gtype_entry = cc_table_attach_option_entry(table, _("Base GType"), row++); + cc_dlg->base_gtype_entry = cc_table_attach_option_entry(table, _("Base GType:"), row++); gtk_entry_set_text(GTK_ENTRY(cc_dlg->base_gtype_entry), "G_TYPE_OBJECT"); } if (type == GEANY_CLASS_TYPE_PHP) - cc_dlg->class_implements_entry = cc_table_attach_option_entry(table, _("Implements"), row++); + cc_dlg->class_implements_entry = cc_table_attach_option_entry(table, _("Implements:"), row++); cc_table_attach_section_label(table, _("Options"), row++, TRUE); @@ -590,7 +586,7 @@ if (type == GEANY_CLASS_TYPE_GTK) { cc_dlg->gtk_constructor_type_entry = cc_table_attach_option_entry(table, - _("Constructor Type"), row++); + _("Constructor type:"), row++); gtk_entry_set_text(GTK_ENTRY(cc_dlg->gtk_constructor_type_entry), "GObject"); g_signal_connect(cc_dlg->create_constructor_box, "toggled", G_CALLBACK(cc_dlg_on_set_sensitive_toggled), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5598] trunk
by ntrel＠users.sourceforge.net 17 Mar '11

17 Mar '11

Revision: 5598 http://geany.svn.sourceforge.net/geany/?rev=5598&view=rev Author: ntrel Date: 2011-03-17 12:54:41 +0000 (Thu, 17 Mar 2011) Log Message: ----------- Fix GLib warning when creating classes and no documents are open (patch by Matthew Brush, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/plugins/classbuilder.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-17 12:49:21 UTC (rev 5597) +++ trunk/ChangeLog 2011-03-17 12:54:41 UTC (rev 5598) @@ -7,6 +7,9 @@ * THANKS, plugins/classbuilder.c: Improve Class Builder plugin dialog UI using a table (patch by Matthew Brush, thanks). + * plugins/classbuilder.c: + Fix GLib warning when creating classes and no documents are open + (patch by Matthew Brush, thanks). 2011-03-15 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: trunk/plugins/classbuilder.c =================================================================== --- trunk/plugins/classbuilder.c 2011-03-17 12:49:21 UTC (rev 5597) +++ trunk/plugins/classbuilder.c 2011-03-17 12:54:41 UTC (rev 5598) @@ -1040,16 +1040,16 @@ /* only create the files if the filename is not empty */ if (! utils_str_equal(class_info->source, "")) { + doc = document_new_file(class_info->source, NULL, NULL); text = get_template_class_source(class_info); - doc = document_new_file(class_info->source, NULL, NULL); editor_insert_text_block(doc->editor, text, 0, -1, 0, TRUE); g_free(text); } if (! utils_str_equal(class_info->header, "") && class_info->type != GEANY_CLASS_TYPE_PHP) { + doc = document_new_file(class_info->header, NULL, NULL); text = get_template_class_header(class_info); - doc = document_new_file(class_info->header, NULL, NULL); editor_insert_text_block(doc->editor, text, 0, -1, 0, TRUE); g_free(text); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
...
4
5
6
7
8
9
10
11
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2011