Commits January 2007

commits@lists.geany.org

3 participants
87 discussions

SF.net SVN: geany: [1168] trunk/src/document.c
by eht16＠users.sourceforge.net 07 Jan '07

07 Jan '07

Revision: 1168 http://svn.sourceforge.net/geany/?rev=1168&view=rev Author: eht16 Date: 2007-01-07 10:48:56 -0800 (Sun, 07 Jan 2007) Log Message: ----------- Added a little comment for writing Unicode BOMs. Fixed a compiler warning. Modified Paths: -------------- trunk/src/document.c Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2007-01-07 16:22:41 UTC (rev 1167) +++ trunk/src/document.c 2007-01-07 18:48:56 UTC (rev 1168) @@ -1,7 +1,8 @@ /* * document.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -548,7 +549,7 @@ 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); - g_realloc(filedata->data, filedata->len + 1); + filedata->data = g_realloc(filedata->data, filedata->len + 1); } @@ -878,7 +879,9 @@ len = sci_get_length(doc_list[idx].sci) + 1; if (doc_list[idx].has_bom && encodings_is_unicode_charset(doc_list[idx].encoding)) - { + { // always write a UTF-8 BOM because in this moment the text itself is still in UTF-8 + // encoding, it will be converted to doc_list[idx].encoding below and this conversion + // also changes the BOM data = (gchar*) g_malloc(len + 3); // 3 chars for BOM data[0] = 0xef; data[1] = 0xbb; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1167] trunk
by ntrel＠users.sourceforge.net 07 Jan '07

07 Jan '07

Revision: 1167 http://svn.sourceforge.net/geany/?rev=1167&view=rev Author: ntrel Date: 2007-01-07 08:22:41 -0800 (Sun, 07 Jan 2007) Log Message: ----------- Fix memory leak when using utils_scan_unicode_bom(). Prevent invalid memory read in utils_scan_unicode_bom() when text length is < 4. Move utils_scan_unicode_bom(), utils_is_unicode_charset() to encodings.c. Read the BOM length in handle_bom(). Modified Paths: -------------- trunk/ChangeLog trunk/src/dialogs.c trunk/src/document.c trunk/src/encodings.c trunk/src/encodings.h trunk/src/ui_utils.c trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-07 14:04:13 UTC (rev 1166) +++ trunk/ChangeLog 2007-01-07 16:22:41 UTC (rev 1167) @@ -1,3 +1,15 @@ +2007-01-07 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/utils.c, src/utils.h, src/encodings.c, src/document.c, + src/encodings.h, src/dialogs.c, src/ui_utils.c: + Fix memory leak when using utils_scan_unicode_bom(). + Prevent invalid memory read in utils_scan_unicode_bom() when text + length is < 4. + Move utils_scan_unicode_bom(), utils_is_unicode_charset() to + encodings.c. + Read the BOM length in handle_bom(). + + 2007-01-07 Enrico Tröger <enrico.troeger(a)uvena.de> * geany.glade, src/interface.c: Fixed typo. Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2007-01-07 14:04:13 UTC (rev 1166) +++ trunk/src/dialogs.c 2007-01-07 16:22:41 UTC (rev 1167) @@ -1013,8 +1013,9 @@ gtk_misc_set_alignment(GTK_MISC(label), 1, 0); enctext = g_strdup_printf("%s %s", - doc_list[idx].encoding, - (utils_is_unicode_charset(doc_list[idx].encoding)) ? ((doc_list[idx].has_bom) ? _("(with BOM)") : _("(without BOM)")) : ""); + doc_list[idx].encoding, + (encodings_is_unicode_charset(doc_list[idx].encoding)) ? + ((doc_list[idx].has_bom) ? _("(with BOM)") : _("(without BOM)")) : ""); label = gtk_label_new(enctext); g_free(enctext); Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2007-01-07 14:04:13 UTC (rev 1166) +++ trunk/src/document.c 2007-01-07 16:22:41 UTC (rev 1167) @@ -436,17 +436,14 @@ 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 - { - filedata->bom = utils_str_equal(utils_scan_unicode_bom(filedata->data), "UTF-8"); - filedata->enc = g_strdup(forced_enc); - } } else { @@ -461,53 +458,68 @@ g_free(filedata->data); filedata->data = converted_text; filedata->len = strlen(converted_text); - filedata->bom = utils_str_equal(utils_scan_unicode_bom(filedata->data), "UTF-8"); - filedata->enc = g_strdup(forced_enc); } } + enc_idx = encodings_scan_unicode_bom(filedata->data, filedata->len, 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) { - if (filedata->len > 0) - { // the usual way to detect encoding and convert to UTF-8 - if (filedata->len >= 4) + g_return_val_if_fail(filedata->enc == NULL, FALSE); + g_return_val_if_fail(filedata->bom == FALSE, FALSE); + + if (filedata->len == 0) + { + // we have no data so assume UTF-8 + filedata->enc = g_strdup("UTF-8"); + } + else + { + // first check for a BOM + GeanyEncodingIndex enc_idx = + encodings_scan_unicode_bom(filedata->data, filedata->len, NULL); + + if (enc_idx != GEANY_ENCODING_NONE) { - filedata->enc = utils_scan_unicode_bom(filedata->data); - } - if (filedata->enc != NULL) - { + filedata->enc = g_strdup(encodings[enc_idx].charset); filedata->bom = TRUE; - if ((filedata->enc)[4] != '8') // the BOM indicated something else than UTF-8 + + 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->len, filedata->enc, FALSE); - if (converted_text == NULL) + filedata->data, filedata->len, 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; } - else - { - g_free(filedata->data); - filedata->data = converted_text; - filedata->len = strlen(converted_text); - } } } - // this if is important, else doesn't work because enc can be altered in the above block - if (filedata->enc == NULL) + + if (filedata->enc == NULL) // either there was no BOM or the BOM encoding failed { + // try UTF-8 first if (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->len, &filedata->enc); @@ -515,19 +527,12 @@ { return FALSE; } - else - { - g_free(filedata->data); - filedata->data = converted_text; - filedata->len = strlen(converted_text); - } + g_free(filedata->data); + filedata->data = converted_text; + filedata->len = strlen(converted_text); } } } - else - { - filedata->enc = g_strdup("UTF-8"); - } return TRUE; } @@ -535,14 +540,15 @@ static void handle_bom(FileData *filedata) { - gchar *data_without_bom; + guint bom_len; - g_return_if_fail(filedata->len >= 3); + encodings_scan_unicode_bom(filedata->data, filedata->len, &bom_len); + g_return_if_fail(bom_len != 0); - data_without_bom = g_strdup(filedata->data + 3); - g_free(filedata->data); - filedata->data = data_without_bom; - filedata->len -= 3; + 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); + g_realloc(filedata->data, filedata->len + 1); } @@ -871,7 +877,7 @@ sci_convert_eols(doc_list[idx].sci, sci_get_eol_mode(doc_list[idx].sci)); len = sci_get_length(doc_list[idx].sci) + 1; - if (doc_list[idx].has_bom && utils_is_unicode_charset(doc_list[idx].encoding)) + if (doc_list[idx].has_bom && encodings_is_unicode_charset(doc_list[idx].encoding)) { data = (gchar*) g_malloc(len + 3); // 3 chars for BOM data[0] = 0xef; @@ -1642,7 +1648,7 @@ ui_update_statusbar(idx, -1); gtk_widget_set_sensitive(lookup_widget(app->window, "menu_write_unicode_bom1"), - utils_is_unicode_charset(doc_list[idx].encoding)); + encodings_is_unicode_charset(doc_list[idx].encoding)); } Modified: trunk/src/encodings.c =================================================================== --- trunk/src/encodings.c 2007-01-07 14:04:13 UTC (rev 1166) +++ trunk/src/encodings.c 2007-01-07 16:22:41 UTC (rev 1167) @@ -39,12 +39,12 @@ -#define fill(v, w, x, y, z) \ - encodings[x].idx = x; \ - encodings[x].order = v; \ - encodings[x].group = w; \ - encodings[x].charset = y; \ - encodings[x].name = z; +#define fill(Order, Group, Idx, Charset, Name) \ + encodings[Idx].idx = Idx; \ + encodings[Idx].order = Order; \ + encodings[Idx].group = Group; \ + encodings[Idx].charset = Charset; \ + encodings[Idx].name = Name; static void init_encodings(void) { @@ -377,3 +377,72 @@ return NULL; } + + +/* If there's a BOM, return a corresponding GEANY_ENCODING_UTF_* index, + * otherwise GEANY_ENCODING_NONE. + * */ +GeanyEncodingIndex encodings_scan_unicode_bom(const gchar *string, gsize len, guint *bom_len) +{ + if (len >= 3) + { + if (bom_len) + *bom_len = 3; + + if ((guchar)string[0] == 0xef && (guchar)string[1] == 0xbb && + (guchar)string[2] == 0xbf) + { + return GEANY_ENCODING_UTF_8; + } + } + if (len >= 4) + { + if (bom_len) + *bom_len = 4; + + if ((guchar)string[0] == 0x00 && (guchar)string[1] == 0x00 && + (guchar)string[2] == 0xfe && (guchar)string[3] == 0xff) + { + return GEANY_ENCODING_UTF_32BE; // Big endian + } + if ((guchar)string[0] == 0xff && (guchar)string[1] == 0xfe && + (guchar)string[2] == 0x00 && (guchar)string[3] == 0x00) + { + return GEANY_ENCODING_UTF_32LE; // Little endian + } + if ((string[0] == 0x2b && string[1] == 0x2f && string[2] == 0x76) && + (string[3] == 0x38 || string[3] == 0x39 || string[3] == 0x2b || string[3] == 0x2f)) + { + return GEANY_ENCODING_UTF_7; + } + } + if (len >= 2) + { + if (bom_len) + *bom_len = 2; + + if ((guchar)string[0]==0xfe && (guchar)string[1] == 0xff) + { + return GEANY_ENCODING_UTF_16BE; // Big endian + } + if ((guchar)string[0] == 0xff && (guchar)string[1] == 0xfe) + { + return GEANY_ENCODING_UTF_16LE; // Little endian + } + } + if (bom_len) + *bom_len = 0; + return GEANY_ENCODING_NONE; +} + + +gboolean encodings_is_unicode_charset(const gchar *string) +{ + if (string != NULL && (strncmp(string, "UTF", 3) == 0 || strncmp(string, "UCS", 3) == 0)) + { + return TRUE; + } + return FALSE; +} + + Modified: trunk/src/encodings.h =================================================================== --- trunk/src/encodings.h 2007-01-07 14:04:13 UTC (rev 1166) +++ trunk/src/encodings.h 2007-01-07 16:22:41 UTC (rev 1167) @@ -74,7 +74,9 @@ gchar *encodings_convert_to_utf8_from_charset(const gchar *buffer, gsize size, const gchar *charset, gboolean fast); +gboolean encodings_is_unicode_charset(const gchar *string); + /* * The original versions of the following tables are taken from profterm * @@ -152,7 +154,7 @@ GEANY_ENCODING_WINDOWS_1256, GEANY_ENCODING_WINDOWS_1257, GEANY_ENCODING_WINDOWS_1258, - + GEANY_ENCODING_NONE, GEANY_ENCODINGS_MAX @@ -161,4 +163,7 @@ GeanyEncoding encodings[GEANY_ENCODINGS_MAX]; + +GeanyEncodingIndex encodings_scan_unicode_bom(const gchar *string, gsize len, guint *bom_len); + #endif Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2007-01-07 14:04:13 UTC (rev 1166) +++ trunk/src/ui_utils.c 2007-01-07 16:22:41 UTC (rev 1167) @@ -120,7 +120,8 @@ (doc_list[idx].readonly) ? ", read only" : "", cur_tag, (doc_list[idx].encoding) ? doc_list[idx].encoding : _("unknown"), - (utils_is_unicode_charset(doc_list[idx].encoding)) ? ((doc_list[idx].has_bom) ? _("(with BOM)") : _("(without BOM)")) : "", + (encodings_is_unicode_charset(doc_list[idx].encoding)) ? + ((doc_list[idx].has_bom) ? _("(with BOM)") : _("(without BOM)")) : "", (doc_list[idx].file_type) ? doc_list[idx].file_type->title : _("unknown")); set_statusbar(text, TRUE); // can be overridden by status messages g_free(text); @@ -706,7 +707,7 @@ TRUE); gtk_widget_set_sensitive(lookup_widget(app->window, "menu_write_unicode_bom1"), - utils_is_unicode_charset(doc_list[idx].encoding)); + encodings_is_unicode_charset(doc_list[idx].encoding)); encodings_select_radio_item(doc_list[idx].encoding); filetypes_select_radio_item(doc_list[idx].file_type); Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2007-01-07 14:04:13 UTC (rev 1166) +++ trunk/src/utils.c 2007-01-07 16:22:41 UTC (rev 1167) @@ -1403,50 +1403,6 @@ } -gchar *utils_scan_unicode_bom(const gchar *string) -{ - if ((unsigned char)string[0] == 0xef && (unsigned char)string[1] == 0xbb && - (unsigned char)string[2] == 0xbf) - { - return g_strdup("UTF-8"); - } - else if ((unsigned char)string[0] == 0x00 && (unsigned char)string[1] == 0x00 && - (unsigned char)string[2] == 0xfe && (unsigned char)string[3] == 0xff) - { - return g_strdup("UTF-32BE"); // Big endian - } - else if ((unsigned char)string[0] == 0xff && (unsigned char)string[1] == 0xfe && - (unsigned char)string[2] == 0x00 && (unsigned char)string[3] == 0x00) - { - return g_strdup("UTF-32LE"); // Little endian - } - else if ((unsigned char)string[0]==0xfe && (unsigned char)string[1] == 0xff) - { - return g_strdup("UTF-16BE"); // Big endian - } - else if ((unsigned char)string[0] == 0xff && (unsigned char)string[1] == 0xfe) - { - return g_strdup("UTF-16LE"); // Little endian - } - else if ((string[0] == 0x2b && string[1] == 0x2f && string[2] == 0x76) && - (string[3] == 0x38 || string[3] == 0x39 || string[3] == 0x2b || string[3] == 0x2f)) - { - return g_strdup("UTF-7"); - } - return NULL; -} - - -gboolean utils_is_unicode_charset(const gchar *string) -{ - if (string != NULL && (strncmp(string, "UTF", 3) == 0 || strncmp(string, "UCS", 3) == 0)) - { - return TRUE; - } - return FALSE; -} - - /* Wraps a string in place, replacing a space with a newline character. * wrapstart is the minimum position to start wrapping or -1 for default */ gboolean utils_wrap_string(gchar *string, gint wrapstart) Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2007-01-07 14:04:13 UTC (rev 1166) +++ trunk/src/utils.h 2007-01-07 16:22:41 UTC (rev 1167) @@ -135,10 +135,6 @@ * Replaces \\, \r, \n, \t and \uXXX by their real counterparts */ gboolean utils_str_replace_escape(gchar *string); -gchar *utils_scan_unicode_bom(const gchar *string); - -gboolean utils_is_unicode_charset(const gchar *string); - /* Wraps a string in place, replacing a space with a newline character. * wrapstart is the minimum position to start wrapping or -1 for default */ gboolean utils_wrap_string(gchar *string, gint wrapstart); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1166] trunk
by eht16＠users.sourceforge.net 07 Jan '07

07 Jan '07

Revision: 1166 http://svn.sourceforge.net/geany/?rev=1166&view=rev Author: eht16 Date: 2007-01-07 06:04:13 -0800 (Sun, 07 Jan 2007) Log Message: ----------- Fixed typo. Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/interface.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-07 13:07:09 UTC (rev 1165) +++ trunk/ChangeLog 2007-01-07 14:04:13 UTC (rev 1166) @@ -1,3 +1,8 @@ +2007-01-07 Enrico Tröger <enrico.troeger(a)uvena.de> + + * geany.glade, src/interface.c: Fixed typo. + + 2007-01-06 Enrico Tröger <enrico.troeger(a)uvena.de> * src/callbacks.c, src/sci_cb.c, src/sci_cb.h, src/templates.c, Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2007-01-07 13:07:09 UTC (rev 1165) +++ trunk/geany.glade 2007-01-07 14:04:13 UTC (rev 1166) @@ -57,7 +57,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1362"> + <widget class="GtkImage" id="image1381"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -138,7 +138,7 @@ <signal name="activate" handler="on_save_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1363"> + <widget class="GtkImage" id="image1382"> <property name="visible">True</property> <property name="stock">gtk-save</property> <property name="icon_size">1</property> @@ -159,7 +159,7 @@ <signal name="activate" handler="on_toolbutton23_clicked" last_modification_time="Mon, 24 Jul 2006 19:26:04 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1364"> + <widget class="GtkImage" id="image1383"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -179,7 +179,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1365"> + <widget class="GtkImage" id="image1384"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -259,7 +259,7 @@ <signal name="activate" handler="on_close_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1366"> + <widget class="GtkImage" id="image1385"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -467,7 +467,7 @@ <signal name="activate" handler="on_menu_increase_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1367"> + <widget class="GtkImage" id="image1386"> <property name="visible">True</property> <property name="stock">gtk-indent</property> <property name="icon_size">1</property> @@ -488,7 +488,7 @@ <signal name="activate" handler="on_menu_decrease_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1368"> + <widget class="GtkImage" id="image1387"> <property name="visible">True</property> <property name="stock">gtk-unindent</property> <property name="icon_size">1</property> @@ -518,7 +518,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1369"> + <widget class="GtkImage" id="image1388"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -550,7 +550,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1370"> + <widget class="GtkImage" id="image1389"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -617,7 +617,7 @@ <child> <widget class="GtkMenuItem" id="insert_bsd_license_notice2"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Inserts a BSD llicence notice (should be done at the beginning of the file)</property> + <property name="tooltip" translatable="yes">Inserts a BSD licence notice (should be done at the beginning of the file)</property> <property name="label" translatable="yes">Insert BSD license Notice</property> <property name="use_underline">True</property> <signal name="activate" handler="on_menu_comments_bsd_activate" last_modification_time="Fri, 05 Jan 2007 13:29:27 GMT"/> @@ -720,7 +720,7 @@ <signal name="activate" handler="on_replace1_activate" last_modification_time="Sun, 23 Oct 2005 13:22:36 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1371"> + <widget class="GtkImage" id="image1390"> <property name="visible">True</property> <property name="stock">gtk-find-and-replace</property> <property name="icon_size">1</property> @@ -762,7 +762,7 @@ <signal name="activate" handler="on_go_to_line1_activate" last_modification_time="Tue, 23 May 2006 17:10:49 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1372"> + <widget class="GtkImage" id="image1391"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> @@ -797,7 +797,7 @@ <signal name="activate" handler="on_change_font1_activate" last_modification_time="Fri, 22 Apr 2005 18:58:45 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1373"> + <widget class="GtkImage" id="image1392"> <property name="visible">True</property> <property name="stock">gtk-select-font</property> <property name="icon_size">1</property> @@ -1147,7 +1147,7 @@ <signal name="activate" handler="on_show_color_chooser1_activate" last_modification_time="Wed, 22 Jun 2005 18:10:21 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1374"> + <widget class="GtkImage" id="image1393"> <property name="visible">True</property> <property name="stock">gtk-select-color</property> <property name="icon_size">1</property> @@ -2415,7 +2415,7 @@ <signal name="activate" handler="on_menu_increase_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:31:38 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1375"> + <widget class="GtkImage" id="image1394"> <property name="visible">True</property> <property name="stock">gtk-indent</property> <property name="icon_size">1</property> @@ -2436,7 +2436,7 @@ <signal name="activate" handler="on_menu_decrease_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:31:38 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1376"> + <widget class="GtkImage" id="image1395"> <property name="visible">True</property> <property name="stock">gtk-unindent</property> <property name="icon_size">1</property> @@ -2466,7 +2466,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1377"> + <widget class="GtkImage" id="image1396"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -2498,7 +2498,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1378"> + <widget class="GtkImage" id="image1397"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -2565,7 +2565,7 @@ <child> <widget class="GtkMenuItem" id="insert_bsd_license_notice1"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Inserts a BSD llicence notice (should be done at the beginning of the file)</property> + <property name="tooltip" translatable="yes">Inserts a BSD licence notice (should be done at the beginning of the file)</property> <property name="label" translatable="yes">Insert BSD license Notice</property> <property name="use_underline">True</property> <signal name="activate" handler="on_comments_bsd_activate" last_modification_time="Fri, 05 Jan 2007 13:32:16 GMT"/> @@ -2610,7 +2610,7 @@ <signal name="activate" handler="on_find_usage1_activate" last_modification_time="Fri, 27 May 2005 21:55:12 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1379"> + <widget class="GtkImage" id="image1398"> <property name="visible">True</property> <property name="stock">gtk-find</property> <property name="icon_size">1</property> @@ -2656,7 +2656,7 @@ <signal name="activate" handler="on_go_to_line_activate" last_modification_time="Sat, 16 Jul 2005 11:20:32 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1380"> + <widget class="GtkImage" id="image1399"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2007-01-07 13:07:09 UTC (rev 1165) +++ trunk/src/interface.c 2007-01-07 14:04:13 UTC (rev 1166) @@ -37,7 +37,7 @@ GtkWidget *menuitem1_menu; GtkWidget *menu_new1; GtkWidget *menu_new_with_template1; - GtkWidget *image1362; + GtkWidget *image1381; GtkWidget *menu_new_with_template1_menu; GtkWidget *invisible2; GtkWidget *separator12; @@ -47,11 +47,11 @@ GtkWidget *menu_save1; GtkWidget *menu_save_as1; GtkWidget *menu_save_all1; - GtkWidget *image1363; + GtkWidget *image1382; GtkWidget *menu_reload1; - GtkWidget *image1364; + GtkWidget *image1383; GtkWidget *menu_reload_as1; - GtkWidget *image1365; + GtkWidget *image1384; GtkWidget *menu_reload_as1_menu; GtkWidget *invisible7; GtkWidget *separator21; @@ -61,7 +61,7 @@ GtkWidget *separator14; GtkWidget *menu_close1; GtkWidget *menu_close_all1; - GtkWidget *image1366; + GtkWidget *image1385; GtkWidget *menu_separatormenuitem1; GtkWidget *menu_quit1; GtkWidget *edit1; @@ -87,16 +87,16 @@ GtkWidget *menu_duplicate_line1; GtkWidget *separator29; GtkWidget *menu_increase_indent1; - GtkWidget *image1367; + GtkWidget *image1386; GtkWidget *menu_decrease_indent1; - GtkWidget *image1368; + GtkWidget *image1387; GtkWidget *separator18; GtkWidget *insert_include2; - GtkWidget *image1369; + GtkWidget *image1388; GtkWidget *insert_include2_menu; GtkWidget *invisible4; GtkWidget *add_comments1; - GtkWidget *image1370; + GtkWidget *image1389; GtkWidget *add_comments1_menu; GtkWidget *menu_add_changelog_entry1; GtkWidget *insert_file_header1; @@ -116,16 +116,16 @@ GtkWidget *find_previous1; GtkWidget *find_in_files1; GtkWidget *replace1; - GtkWidget *image1371; + GtkWidget *image1390; GtkWidget *separator33; GtkWidget *next_message1; GtkWidget *separator32; GtkWidget *go_to_line1; - GtkWidget *image1372; + GtkWidget *image1391; GtkWidget *menuitem3; GtkWidget *menuitem3_menu; GtkWidget *menu_change_font1; - GtkWidget *image1373; + GtkWidget *image1392; GtkWidget *menu_separator4; GtkWidget *menu_fullscreen1; GtkWidget *menu_show_messages_window1; @@ -167,7 +167,7 @@ GtkWidget *tools1; GtkWidget *tools1_menu; GtkWidget *menu_choose_color1; - GtkWidget *image1374; + GtkWidget *image1393; GtkWidget *menu_count_words1; GtkWidget *menu_insert_special_chars1; GtkWidget *menu_item5; @@ -268,9 +268,9 @@ gtk_widget_show (menu_new_with_template1); gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_new_with_template1); - image1362 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1362); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image1362); + image1381 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1381); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image1381); menu_new_with_template1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_new_with_template1), menu_new_with_template1_menu); @@ -309,25 +309,25 @@ gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_save_all1); gtk_tooltips_set_tip (tooltips, menu_save_all1, _("Saves all open files"), NULL); - image1363 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1363); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image1363); + image1382 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1382); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image1382); menu_reload1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload")); gtk_widget_show (menu_reload1); gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_reload1); - image1364 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1364); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image1364); + image1383 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1383); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image1383); menu_reload_as1 = gtk_image_menu_item_new_with_mnemonic (_("R_eload As")); gtk_widget_show (menu_reload_as1); gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_reload_as1); - image1365 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1365); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image1365); + image1384 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1384); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image1384); menu_reload_as1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_reload_as1), menu_reload_as1_menu); @@ -368,9 +368,9 @@ gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_close_all1); gtk_tooltips_set_tip (tooltips, menu_close_all1, _("Closes all open files"), NULL); - image1366 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1366); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image1366); + image1385 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1385); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image1385); menu_separatormenuitem1 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separatormenuitem1); @@ -478,17 +478,17 @@ gtk_widget_show (menu_increase_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_increase_indent1); - image1367 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1367); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image1367); + image1386 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1386); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image1386); menu_decrease_indent1 = gtk_image_menu_item_new_with_mnemonic (_("_Decrease Indent")); gtk_widget_show (menu_decrease_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_decrease_indent1); - image1368 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1368); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image1368); + image1387 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1387); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image1387); separator18 = gtk_separator_menu_item_new (); gtk_widget_show (separator18); @@ -499,9 +499,9 @@ gtk_widget_show (insert_include2); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2); - image1369 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1369); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image1369); + image1388 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1388); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image1388); insert_include2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu); @@ -513,9 +513,9 @@ gtk_widget_show (add_comments1); gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1); - image1370 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1370); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image1370); + image1389 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1389); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image1389); add_comments1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu); @@ -548,7 +548,7 @@ insert_bsd_license_notice2 = gtk_menu_item_new_with_mnemonic (_("Insert BSD license Notice")); gtk_widget_show (insert_bsd_license_notice2); gtk_container_add (GTK_CONTAINER (add_comments1_menu), insert_bsd_license_notice2); - gtk_tooltips_set_tip (tooltips, insert_bsd_license_notice2, _("Inserts a BSD llicence notice (should be done at the beginning of the file)"), NULL); + gtk_tooltips_set_tip (tooltips, insert_bsd_license_notice2, _("Inserts a BSD licence notice (should be done at the beginning of the file)"), NULL); insert_date1 = gtk_menu_item_new_with_mnemonic (_("Insert Dat_e")); gtk_widget_show (insert_date1); @@ -596,9 +596,9 @@ gtk_widget_show (replace1); gtk_container_add (GTK_CONTAINER (search1_menu), replace1); - image1371 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1371); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image1371); + image1390 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1390); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image1390); separator33 = gtk_separator_menu_item_new (); gtk_widget_show (separator33); @@ -618,9 +618,9 @@ gtk_widget_show (go_to_line1); gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1); - image1372 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1372); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image1372); + image1391 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1391); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image1391); menuitem3 = gtk_menu_item_new_with_mnemonic (_("_View")); gtk_widget_show (menuitem3); @@ -634,9 +634,9 @@ gtk_container_add (GTK_CONTAINER (menuitem3_menu), menu_change_font1); gtk_tooltips_set_tip (tooltips, menu_change_font1, _("Change the default font"), NULL); - image1373 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1373); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image1373); + image1392 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1392); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image1392); menu_separator4 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separator4); @@ -821,9 +821,9 @@ gtk_container_add (GTK_CONTAINER (tools1_menu), menu_choose_color1); gtk_tooltips_set_tip (tooltips, menu_choose_color1, _("Open a color chooser dialog, to interactively pick colors from a palette."), NULL); - image1374 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1374); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image1374); + image1393 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1393); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image1393); menu_count_words1 = gtk_menu_item_new_with_mnemonic (_("_Word Count")); gtk_widget_show (menu_count_words1); @@ -1421,7 +1421,7 @@ GLADE_HOOKUP_OBJECT (window1, menuitem1_menu, "menuitem1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_new1, "menu_new1"); GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1, "menu_new_with_template1"); - GLADE_HOOKUP_OBJECT (window1, image1362, "image1362"); + GLADE_HOOKUP_OBJECT (window1, image1381, "image1381"); GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1_menu, "menu_new_with_template1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible2, "invisible2"); GLADE_HOOKUP_OBJECT (window1, separator12, "separator12"); @@ -1431,11 +1431,11 @@ GLADE_HOOKUP_OBJECT (window1, menu_save1, "menu_save1"); GLADE_HOOKUP_OBJECT (window1, menu_save_as1, "menu_save_as1"); GLADE_HOOKUP_OBJECT (window1, menu_save_all1, "menu_save_all1"); - GLADE_HOOKUP_OBJECT (window1, image1363, "image1363"); + GLADE_HOOKUP_OBJECT (window1, image1382, "image1382"); GLADE_HOOKUP_OBJECT (window1, menu_reload1, "menu_reload1"); - GLADE_HOOKUP_OBJECT (window1, image1364, "image1364"); + GLADE_HOOKUP_OBJECT (window1, image1383, "image1383"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1, "menu_reload_as1"); - GLADE_HOOKUP_OBJECT (window1, image1365, "image1365"); + GLADE_HOOKUP_OBJECT (window1, image1384, "image1384"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1_menu, "menu_reload_as1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible7, "invisible7"); GLADE_HOOKUP_OBJECT (window1, separator21, "separator21"); @@ -1445,7 +1445,7 @@ GLADE_HOOKUP_OBJECT (window1, separator14, "separator14"); GLADE_HOOKUP_OBJECT (window1, menu_close1, "menu_close1"); GLADE_HOOKUP_OBJECT (window1, menu_close_all1, "menu_close_all1"); - GLADE_HOOKUP_OBJECT (window1, image1366, "image1366"); + GLADE_HOOKUP_OBJECT (window1, image1385, "image1385"); GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1"); GLADE_HOOKUP_OBJECT (window1, menu_quit1, "menu_quit1"); GLADE_HOOKUP_OBJECT (window1, edit1, "edit1"); @@ -1471,16 +1471,16 @@ GLADE_HOOKUP_OBJECT (window1, menu_duplicate_line1, "menu_duplicate_line1"); GLADE_HOOKUP_OBJECT (window1, separator29, "separator29"); GLADE_HOOKUP_OBJECT (window1, menu_increase_indent1, "menu_increase_indent1"); - GLADE_HOOKUP_OBJECT (window1, image1367, "image1367"); + GLADE_HOOKUP_OBJECT (window1, image1386, "image1386"); GLADE_HOOKUP_OBJECT (window1, menu_decrease_indent1, "menu_decrease_indent1"); - GLADE_HOOKUP_OBJECT (window1, image1368, "image1368"); + GLADE_HOOKUP_OBJECT (window1, image1387, "image1387"); GLADE_HOOKUP_OBJECT (window1, separator18, "separator18"); GLADE_HOOKUP_OBJECT (window1, insert_include2, "insert_include2"); - GLADE_HOOKUP_OBJECT (window1, image1369, "image1369"); + GLADE_HOOKUP_OBJECT (window1, image1388, "image1388"); GLADE_HOOKUP_OBJECT (window1, insert_include2_menu, "insert_include2_menu"); GLADE_HOOKUP_OBJECT (window1, invisible4, "invisible4"); GLADE_HOOKUP_OBJECT (window1, add_comments1, "add_comments1"); - GLADE_HOOKUP_OBJECT (window1, image1370, "image1370"); + GLADE_HOOKUP_OBJECT (window1, image1389, "image1389"); GLADE_HOOKUP_OBJECT (window1, add_comments1_menu, "add_comments1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_add_changelog_entry1, "menu_add_changelog_entry1"); GLADE_HOOKUP_OBJECT (window1, insert_file_header1, "insert_file_header1"); @@ -1500,16 +1500,16 @@ GLADE_HOOKUP_OBJECT (window1, find_previous1, "find_previous1"); GLADE_HOOKUP_OBJECT (window1, find_in_files1, "find_in_files1"); GLADE_HOOKUP_OBJECT (window1, replace1, "replace1"); - GLADE_HOOKUP_OBJECT (window1, image1371, "image1371"); + GLADE_HOOKUP_OBJECT (window1, image1390, "image1390"); GLADE_HOOKUP_OBJECT (window1, separator33, "separator33"); GLADE_HOOKUP_OBJECT (window1, next_message1, "next_message1"); GLADE_HOOKUP_OBJECT (window1, separator32, "separator32"); GLADE_HOOKUP_OBJECT (window1, go_to_line1, "go_to_line1"); - GLADE_HOOKUP_OBJECT (window1, image1372, "image1372"); + GLADE_HOOKUP_OBJECT (window1, image1391, "image1391"); GLADE_HOOKUP_OBJECT (window1, menuitem3, "menuitem3"); GLADE_HOOKUP_OBJECT (window1, menuitem3_menu, "menuitem3_menu"); GLADE_HOOKUP_OBJECT (window1, menu_change_font1, "menu_change_font1"); - GLADE_HOOKUP_OBJECT (window1, image1373, "image1373"); + GLADE_HOOKUP_OBJECT (window1, image1392, "image1392"); GLADE_HOOKUP_OBJECT (window1, menu_separator4, "menu_separator4"); GLADE_HOOKUP_OBJECT (window1, menu_fullscreen1, "menu_fullscreen1"); GLADE_HOOKUP_OBJECT (window1, menu_show_messages_window1, "menu_show_messages_window1"); @@ -1550,7 +1550,7 @@ GLADE_HOOKUP_OBJECT (window1, tools1, "tools1"); GLADE_HOOKUP_OBJECT (window1, tools1_menu, "tools1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_choose_color1, "menu_choose_color1"); - GLADE_HOOKUP_OBJECT (window1, image1374, "image1374"); + GLADE_HOOKUP_OBJECT (window1, image1393, "image1393"); GLADE_HOOKUP_OBJECT (window1, menu_count_words1, "menu_count_words1"); GLADE_HOOKUP_OBJECT (window1, menu_insert_special_chars1, "menu_insert_special_chars1"); GLADE_HOOKUP_OBJECT (window1, menu_item5, "menu_item5"); @@ -1750,16 +1750,16 @@ GtkWidget *menu_duplicate_line2; GtkWidget *separator31; GtkWidget *menu_increase_indent2; - GtkWidget *image1375; + GtkWidget *image1394; GtkWidget *menu_decrease_indent2; - GtkWidget *image1376; + GtkWidget *image1395; GtkWidget *separator17; GtkWidget *insert_include1; - GtkWidget *image1377; + GtkWidget *image1396; GtkWidget *insert_include1_menu; GtkWidget *invisible3; GtkWidget *comments; - GtkWidget *image1378; + GtkWidget *image1397; GtkWidget *comments_menu; GtkWidget *add_changelog_entry2; GtkWidget *insert_file_header2; @@ -1772,12 +1772,12 @@ GtkWidget *invisible10; GtkWidget *separator7; GtkWidget *find_usage1; - GtkWidget *image1379; + GtkWidget *image1398; GtkWidget *goto_tag_definition1; GtkWidget *goto_tag_declaration1; GtkWidget *separator15; GtkWidget *go_to_line; - GtkWidget *image1380; + GtkWidget *image1399; GtkAccelGroup *accel_group; GtkTooltips *tooltips; @@ -1892,17 +1892,17 @@ gtk_widget_show (menu_increase_indent2); gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_increase_indent2); - image1375 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1375); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent2), image1375); + image1394 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1394); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent2), image1394); menu_decrease_indent2 = gtk_image_menu_item_new_with_mnemonic (_("_Decrease Indent")); gtk_widget_show (menu_decrease_indent2); gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_decrease_indent2); - image1376 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1376); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent2), image1376); + image1395 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1395); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent2), image1395); separator17 = gtk_separator_menu_item_new (); gtk_widget_show (separator17); @@ -1913,9 +1913,9 @@ gtk_widget_show (insert_include1); gtk_container_add (GTK_CONTAINER (edit_menu1), insert_include1); - image1377 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1377); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image1377); + image1396 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1396); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image1396); insert_include1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include1), insert_include1_menu); @@ -1927,9 +1927,9 @@ gtk_widget_show (comments); gtk_container_add (GTK_CONTAINER (edit_menu1), comments); - image1378 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1378); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image1378); + image1397 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1397); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image1397); comments_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (comments), comments_menu); @@ -1962,7 +1962,7 @@ insert_bsd_license_notice1 = gtk_menu_item_new_with_mnemonic (_("Insert BSD license Notice")); gtk_widget_show (insert_bsd_license_notice1); gtk_container_add (GTK_CONTAINER (comments_menu), insert_bsd_license_notice1); - gtk_tooltips_set_tip (tooltips, insert_bsd_license_notice1, _("Inserts a BSD llicence notice (should be done at the beginning of the file)"), NULL); + gtk_tooltips_set_tip (tooltips, insert_bsd_license_notice1, _("Inserts a BSD licence notice (should be done at the beginning of the file)"), NULL); insert_date2 = gtk_menu_item_new_with_mnemonic (_("Insert Dat_e")); gtk_widget_show (insert_date2); @@ -1983,9 +1983,9 @@ gtk_widget_show (find_usage1); gtk_container_add (GTK_CONTAINER (edit_menu1), find_usage1); - image1379 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1379); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image1379); + image1398 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1398); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image1398); goto_tag_definition1 = gtk_menu_item_new_with_mnemonic (_("Go to Tag Definition")); gtk_widget_show (goto_tag_definition1); @@ -2005,9 +2005,9 @@ gtk_container_add (GTK_CONTAINER (edit_menu1), go_to_line); gtk_tooltips_set_tip (tooltips, go_to_line, _("Goto to the entered line"), NULL); - image1380 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1380); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line), image1380); + image1399 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1399); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line), image1399); g_signal_connect ((gpointer) undo1, "activate", G_CALLBACK (on_undo1_activate), @@ -2121,16 +2121,16 @@ GLADE_HOOKUP_OBJECT (edit_menu1, menu_duplicate_line2, "menu_duplicate_line2"); GLADE_HOOKUP_OBJECT (edit_menu1, separator31, "separator31"); GLADE_HOOKUP_OBJECT (edit_menu1, menu_increase_indent2, "menu_increase_indent2"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1375, "image1375"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1394, "image1394"); GLADE_HOOKUP_OBJECT (edit_menu1, menu_decrease_indent2, "menu_decrease_indent2"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1376, "image1376"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1395, "image1395"); GLADE_HOOKUP_OBJECT (edit_menu1, separator17, "separator17"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1, "insert_include1"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1377, "image1377"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1396, "image1396"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1_menu, "insert_include1_menu"); GLADE_HOOKUP_OBJECT (edit_menu1, invisible3, "invisible3"); GLADE_HOOKUP_OBJECT (edit_menu1, comments, "comments"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1378, "image1378"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1397, "image1397"); GLADE_HOOKUP_OBJECT (edit_menu1, comments_menu, "comments_menu"); GLADE_HOOKUP_OBJECT (edit_menu1, add_changelog_entry2, "add_changelog_entry2"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_file_header2, "insert_file_header2"); @@ -2143,12 +2143,12 @@ GLADE_HOOKUP_OBJECT (edit_menu1, invisible10, "invisible10"); GLADE_HOOKUP_OBJECT (edit_menu1, separator7, "separator7"); GLADE_HOOKUP_OBJECT (edit_menu1, find_usage1, "find_usage1"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1379, "image1379"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1398, "image1398"); GLADE_HOOKUP_OBJECT (edit_menu1, goto_tag_definition1, "goto_tag_definition1"); GLADE_HOOKUP_OBJECT (edit_menu1, goto_tag_declaration1, "goto_tag_declaration1"); GLADE_HOOKUP_OBJECT (edit_menu1, separator15, "separator15"); GLADE_HOOKUP_OBJECT (edit_menu1, go_to_line, "go_to_line"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1380, "image1380"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1399, "image1399"); GLADE_HOOKUP_OBJECT_NO_REF (edit_menu1, tooltips, "tooltips"); gtk_menu_set_accel_group (GTK_MENU (edit_menu1), accel_group); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1165] trunk/src/templates.c
by ntrel＠users.sourceforge.net 07 Jan '07

07 Jan '07

Revision: 1165 http://svn.sourceforge.net/geany/?rev=1165&view=rev Author: ntrel Date: 2007-01-07 05:07:09 -0800 (Sun, 07 Jan 2007) Log Message: ----------- Fix sign comparison warning. Modified Paths: -------------- trunk/src/templates.c Modified: trunk/src/templates.c =================================================================== --- trunk/src/templates.c 2007-01-06 21:45:13 UTC (rev 1164) +++ trunk/src/templates.c 2007-01-07 13:07:09 UTC (rev 1165) @@ -321,7 +321,7 @@ * e.g. indent = 8 prints " * here comes the text of the line" * indent is meant to be the whole amount of characters before the real line content follows, i.e. * 6 characters are filled with whitespace when the comment characters include " *" */ -static gchar *make_comment_block(const gchar *comment_text, gint filetype_idx, gint indent) +static gchar *make_comment_block(const gchar *comment_text, gint filetype_idx, guint indent) { gchar *frame_start = ""; // to add before comment_text gchar *frame_end = ""; // to add after comment_text @@ -330,7 +330,7 @@ gchar *tmp; gchar *prefix; gchar **lines; - gint i; + guint i; /// TODO the following switch could be replaced by some intelligent code which reads /// frame_start, frame_end and line_prefix from the filetype definition files This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1164] trunk/po
by kretek＠users.sourceforge.net 06 Jan '07

06 Jan '07

Revision: 1164 http://svn.sourceforge.net/geany/?rev=1164&view=rev Author: kretek Date: 2007-01-06 13:45:13 -0800 (Sat, 06 Jan 2007) Log Message: ----------- Update of German and French translation Modified Paths: -------------- trunk/po/ChangeLog trunk/po/de.po trunk/po/fr.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2007-01-06 18:00:34 UTC (rev 1163) +++ trunk/po/ChangeLog 2007-01-06 21:45:13 UTC (rev 1164) @@ -1,3 +1,9 @@ +2007-01-06 Frank Lanitz <frank(a)frank.uvena.de> + + * de.po: Update of German translation + * fr.po: Update of French translation (Thnaks to Jean-Philippe Moal) + + 2007-01-05 Enrico Tröger <enrico.troeger(a)uvena.de> * de.po: Fixed a wrong translated string Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2007-01-06 18:00:34 UTC (rev 1163) +++ trunk/po/de.po 2007-01-06 21:45:13 UTC (rev 1164) @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: geany 0.10svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-12-17 13:26+0100\n" -"PO-Revision-Date: 2007-01-05 16:41+0100\n" -"Last-Translator: Enrico Tröger <enrico.troeger(a)uvena.de>\n" +"POT-Creation-Date: 2007-01-06 22:37+0100\n" +"PO-Revision-Date: 2007-01-06 22:43+0100\n" +"Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <frank(a)frank.uvena.de>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -29,7 +29,9 @@ #: src/main.c:91 msgid "don't open files in a running instance, force opening a new instance" -msgstr "Dateien nicht in einer bereits laufenden Instanz, sondern in einer neuen Instanz öffnen." +msgstr "" +"Dateien nicht in einer bereits laufenden Instanz, sondern in einer neuen " +"Instanz öffnen." #: src/main.c:93 msgid "set initial line number for the first opened file" @@ -89,1271 +91,1307 @@ msgid "Configuration directory could not be created (%s)." msgstr "Konfigurationsverzeichnis konnte nicht erstellt werden (%s)." -#: src/interface.c:245 -#: src/interface.c:1403 +#: src/interface.c:246 src/interface.c:1413 msgid "Geany" msgstr "Geany" -#: src/interface.c:255 +#: src/interface.c:256 msgid "_File" msgstr "_Datei" -#: src/interface.c:266 +#: src/interface.c:267 msgid "New (with _Template)" msgstr "Neu (aus _Vorlage)" -#: src/interface.c:277 -#: src/interface.c:334 -#: src/interface.c:508 -#: src/interface.c:554 -#: src/interface.c:729 -#: src/interface.c:739 -#: src/interface.c:1911 -#: src/interface.c:1957 +#: src/interface.c:278 src/interface.c:335 src/interface.c:509 +#: src/interface.c:560 src/interface.c:735 src/interface.c:745 +#: src/interface.c:1923 src/interface.c:1974 msgid "invisible" msgstr "unsichtbar" -#: src/interface.c:289 +#: src/interface.c:290 msgid "Recent _Files" msgstr "Z_uletzt geöffnet" -#: src/interface.c:306 +#: src/interface.c:307 msgid "Save A_ll" msgstr "A_lle speichern" -#: src/interface.c:309 +#: src/interface.c:310 msgid "Saves all open files" msgstr "Speichert alle offenen Dateien" -#: src/interface.c:315 -#: src/callbacks.c:457 -#: src/utils.c:353 +#: src/interface.c:316 src/callbacks.c:491 src/utils.c:346 msgid "_Reload" msgstr "_Neu laden" -#: src/interface.c:323 +#: src/interface.c:324 msgid "R_eload As" msgstr "N_eu laden als" -#: src/interface.c:354 +#: src/interface.c:355 msgid "Prints the current file" msgstr "Druckt die aktuelle Datei" -#: src/interface.c:365 +#: src/interface.c:366 msgid "C_lose All" msgstr "_Alle schließen" -#: src/interface.c:368 +#: src/interface.c:369 msgid "Closes all open files" msgstr "Schließt alle offenen Dateien" -#: src/interface.c:382 -#: src/interface.c:1003 +#: src/interface.c:383 src/interface.c:1009 msgid "Quit Geany" msgstr "Geany beenden" -#: src/interface.c:384 +#: src/interface.c:385 msgid "_Edit" msgstr "_Bearbeiten" -#: src/interface.c:425 -#: src/interface.c:1812 +#: src/interface.c:426 src/interface.c:1824 msgid "Select _All" msgstr "A_lles auswählen" -#: src/interface.c:434 -#: src/interface.c:1838 +#: src/interface.c:435 src/interface.c:1850 msgid "_Format" msgstr "_Format" -#: src/interface.c:437 +#: src/interface.c:438 msgid "Convert the case of the current selection" msgstr "Ändert die Großschreibung der aktuellen Auswahl" -#: src/interface.c:442 -#: src/interface.c:1845 +#: src/interface.c:443 src/interface.c:1857 msgid "Convert Selection to _Lower-case" msgstr "Auswahl in _Kleinbuchstaben umwandeln" -#: src/interface.c:446 -#: src/interface.c:1849 +#: src/interface.c:447 src/interface.c:1861 msgid "Convert Selection to _Upper-case" msgstr "Auswahl in _Großbuchstaben umwandeln" -#: src/interface.c:455 -#: src/interface.c:1858 +#: src/interface.c:456 src/interface.c:1870 msgid "_Comment Line(s)" msgstr "Zeile(n) _auskommentieren" -#: src/interface.c:459 -#: src/interface.c:1862 +#: src/interface.c:460 src/interface.c:1874 msgid "U_ncomment Line(s)" msgstr "Zeile(n) _einkommentieren" -#: src/interface.c:463 -#: src/interface.c:1866 +#: src/interface.c:464 src/interface.c:1878 msgid "_Toggle Line Commentation" msgstr "Kommentierung _umschalten" -#: src/interface.c:467 -#: src/interface.c:1870 +#: src/interface.c:468 src/interface.c:1882 msgid "Du_plicate Line or Selection" msgstr "Zeile oder Auswahl kopieren" -#: src/interface.c:476 -#: src/interface.c:1879 +#: src/interface.c:477 src/interface.c:1891 msgid "_Increase Indent" msgstr "Einzug _erhöhen" -#: src/interface.c:484 -#: src/interface.c:1887 +#: src/interface.c:485 src/interface.c:1899 msgid "_Decrease Indent" msgstr "Einzug _verringern" -#: src/interface.c:497 +#: src/interface.c:498 msgid "_Insert \"include <...>\"" msgstr "\"include <...>\" ei_nfügen" -#: src/interface.c:511 +#: src/interface.c:512 msgid "I_nsert Comments" msgstr "K_ommentare einfügen" -#: src/interface.c:522 -#: src/interface.c:1925 +#: src/interface.c:523 src/interface.c:1937 msgid "Insert ChangeLog Entry" msgstr "ChangeLog-Eintrag hinzufügen" -#: src/interface.c:525 -#: src/interface.c:1928 +#: src/interface.c:526 src/interface.c:1940 msgid "Inserts a typical ChangeLog entry in the current file" msgstr "Fügt einen typischen ChangeLog-Eintrag an den Anfang der Datei ein." -#: src/interface.c:527 -#: src/interface.c:1930 +#: src/interface.c:528 src/interface.c:1942 msgid "Insert File Header" msgstr "Dateikopf einfügen" -#: src/interface.c:530 -#: src/interface.c:1933 +#: src/interface.c:531 src/interface.c:1945 msgid "Inserts a file header at the beginning of the file" msgstr "Fügt einen Dateikopf am Anfang einer neu erzeugten Datei ein." -#: src/interface.c:532 -#: src/interface.c:1935 +#: src/interface.c:533 src/interface.c:1947 msgid "Insert Function Description" msgstr "Funktionsbeschreibung einfügen" -#: src/interface.c:535 -#: src/interface.c:1938 +#: src/interface.c:536 src/interface.c:1950 msgid "Inserts a description before the current function" msgstr "Fügt eine Funktionsbeschreibung vor der Funktion ein." -#: src/interface.c:537 -#: src/interface.c:1940 +#: src/interface.c:538 src/interface.c:1952 msgid "Insert Multiline Comment" msgstr "Mehrzeiligen Kommentar einfügen" -#: src/interface.c:540 -#: src/interface.c:1943 +#: src/interface.c:541 src/interface.c:1955 msgid "Inserts a multiline comment" msgstr "Fügt einen mehrzeiligen Kommentar ein." -#: src/interface.c:542 -#: src/interface.c:1945 +#: src/interface.c:543 src/interface.c:1957 msgid "Insert GPL Notice" msgstr "GPL-Hinweis einfügen" -#: src/interface.c:545 -#: src/interface.c:1948 +#: src/interface.c:546 src/interface.c:1960 msgid "Inserts a GPL notice (should be done at the beginning of the file)" -msgstr "Fügt einen kurzen Lizenz-Hinweis auf die GPL ein (sollte am Anfang einer Datei sein)." +msgstr "" +"Fügt einen kurzen Lizenz-Hinweis auf die GPL ein (sollte am Anfang einer " +"Datei sein)." -#: src/interface.c:547 -#: src/interface.c:1950 +#: src/interface.c:548 src/interface.c:1962 +msgid "Insert BSD license Notice" +msgstr "BSD-Lizenz-Hinweis einfügen" + +#: src/interface.c:551 src/interface.c:1965 +msgid "" +"Inserts a BSD llicence notice (should be done at the beginning of the file)" +msgstr "" +"Fügt einen kurzen Lizenz-Hinweis auf die Bsd-Lizenz ein (sollte am Anfang " +"einer Datei sein)." + +#: src/interface.c:553 src/interface.c:1967 msgid "Insert Dat_e" msgstr "_Datum einfügen" -#: src/interface.c:566 +#: src/interface.c:572 msgid "_Search" msgstr "_Suchen" -#: src/interface.c:577 +#: src/interface.c:583 msgid "Find _Next" msgstr "_Nächstes" -#: src/interface.c:581 +#: src/interface.c:587 msgid "Find _Previous" msgstr "_Vorheriges" -#: src/interface.c:585 +#: src/interface.c:591 msgid "Find in F_iles" msgstr "In _Dateien suchen" -#: src/interface.c:589 -#: src/search.c:385 +#: src/interface.c:595 src/search.c:385 msgid "_Replace" msgstr "_Ersetzen" -#: src/interface.c:602 +#: src/interface.c:608 msgid "Next _Message" msgstr "_Nächste Nachricht" -#: src/interface.c:611 +#: src/interface.c:617 msgid "_Go to Line" msgstr "_Gehe zu Zeile" -#: src/interface.c:619 -#: src/dialogs.c:77 +#: src/interface.c:625 src/dialogs.c:77 msgid "_View" msgstr "_Ansicht" -#: src/interface.c:626 +#: src/interface.c:632 msgid "Change _Font" msgstr "_Schriftart ändern" -#: src/interface.c:629 +#: src/interface.c:635 msgid "Change the default font" msgstr "Ändert die Standardschriftart für das Editor-Fenster" -#: src/interface.c:640 +#: src/interface.c:646 msgid "Full_screen" msgstr "_Vollbild" -#: src/interface.c:644 +#: src/interface.c:650 msgid "Show Message _Window" msgstr "Schriftart des Meldungsfenster" -#: src/interface.c:647 +#: src/interface.c:653 msgid "Toggle the window with status and compiler messages on and off" -msgstr "Schaltet das Meldungsfenster (beinhaltet auch Compiler-Ausgaben) ein und aus." +msgstr "" +"Schaltet das Meldungsfenster (beinhaltet auch Compiler-Ausgaben) ein und aus." -#: src/interface.c:650 +#: src/interface.c:656 msgid "Show _Toolbar" msgstr "_Werkzeugleiste anzeigen" -#: src/interface.c:653 +#: src/interface.c:659 msgid "Toggle the toolbar on and off" msgstr "Schaltet die Anzeige der Werkzeugleiste an und aus." -#: src/interface.c:656 +#: src/interface.c:662 msgid "Show Side_bar" msgstr "Seiten_leiste anzeigen" -#: src/interface.c:661 +#: src/interface.c:667 msgid "Show _Markers Margin" msgstr "M_arkierungsrand anzeigen" -#: src/interface.c:664 -msgid "Shows or hides the small margin right of the line numbers, which is used to mark lines." -msgstr "Zeigt oder versteckt den kleinen Rand rechts von den Zeilennummern, der zum Anzeigen von Markierungen genutzt wird." +#: src/interface.c:670 +msgid "" +"Shows or hides the small margin right of the line numbers, which is used to " +"mark lines." +msgstr "" +"Zeigt oder versteckt den kleinen Rand rechts von den Zeilennummern, der zum " +"Anzeigen von Markierungen genutzt wird." -#: src/interface.c:667 +#: src/interface.c:673 msgid "Show _Line Numbers" msgstr "_Zeilennummern anzeigen" -#: src/interface.c:670 +#: src/interface.c:676 msgid "Shows or hides the Line Number margin." msgstr "Zeigt oder versteckt den Zeilennummernrand." -#: src/interface.c:690 +#: src/interface.c:696 msgid "_Document" msgstr "D_okument" -#: src/interface.c:697 +#: src/interface.c:703 msgid "_Line Wrapping" msgstr "_Zeilenumbruch" -#: src/interface.c:700 -#: src/interface.c:3157 -msgid "Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines." -msgstr "Bricht lange Zeilen am Fensterrand um und setzt sie auf der nächsten Zeile fort. Achtung: Bei großen Dokumenten erfordert der Zeilenumbruch viel Rechenleistung und sollte daher auf langsameren Rechnern deaktiviert werden." +#: src/interface.c:706 src/interface.c:3178 +msgid "" +"Wrap the line at the window border and continue it on the next line. Note: " +"line wrapping has a high performance cost for large documents so should be " +"disabled on slow machines." +msgstr "" +"Bricht lange Zeilen am Fensterrand um und setzt sie auf der nächsten Zeile " +"fort. Achtung: Bei großen Dokumenten erfordert der Zeilenumbruch viel " +"Rechenleistung und sollte daher auf langsameren Rechnern deaktiviert werden." -#: src/interface.c:703 +#: src/interface.c:709 msgid "_Use Auto-indentation" msgstr "Automatische _Einrückung benutzen" -#: src/interface.c:708 +#: src/interface.c:714 msgid "Read _Only" msgstr "_Nur Lesen" -#: src/interface.c:711 +#: src/interface.c:717 msgid "Treat this file as read-only. No changes can be made." msgstr "Datei als schreibgeschützt behandeln. Keine Änderungen möglich." -#: src/interface.c:713 +#: src/interface.c:719 msgid "_Write Unicode BOM" msgstr "_Unicode BOM schreiben" -#: src/interface.c:722 +#: src/interface.c:728 msgid "Set File_type" msgstr "Datei_typ festlegen" -#: src/interface.c:732 +#: src/interface.c:738 msgid "Set _Encoding" msgstr "Zeichen_kodierung festlegen" -#: src/interface.c:742 +#: src/interface.c:748 msgid "Set Line E_ndings" msgstr "_Zeilenenden anzeigen" -#: src/interface.c:749 +#: src/interface.c:755 msgid "Convert and Set to _CR/LF (Win)" msgstr "Auf _CR/LF setzen und umwandeln (Win)" -#: src/interface.c:755 +#: src/interface.c:761 msgid "Convert and Set to _LF (Unix)" msgstr "Auf _LF setzen und umwandeln (Unix)" -#: src/interface.c:761 +#: src/interface.c:767 msgid "Convert and Set to CR (_Mac)" msgstr "Auf CR setzen und umwandeln (_Mac)" -#: src/interface.c:772 +#: src/interface.c:778 msgid "_Replace Tabs by Spaces" msgstr "_Tabulatoren durch Leerzeichen ersetzen" -#: src/interface.c:775 -#: src/interface.c:2925 +#: src/interface.c:781 src/interface.c:2946 msgid "Replaces all tabs in document by spaces." msgstr "Ersetzt alle Tabulatoren im Dokument durch Leerzeichen" -#: src/interface.c:782 +#: src/interface.c:788 msgid "_Fold All" msgstr "Alle _einklappen" -#: src/interface.c:785 +#: src/interface.c:791 msgid "Folds all contractible code blocks" msgstr "Klappt alle ausblendbaren Codeblöcke ein" -#: src/interface.c:787 +#: src/interface.c:793 msgid "_Unfold All" msgstr "_Alle ausklappen" -#: src/interface.c:790 +#: src/interface.c:796 msgid "Unfolds all contracted code blocks" msgstr "Klappt alle ausgeblendeten Codeblöcke wieder ausklappen" -#: src/interface.c:797 +#: src/interface.c:803 msgid "Remove Error _Indicators" msgstr "Alle _Markierungen löschen" -#: src/interface.c:800 +#: src/interface.c:806 msgid "Removes all error indicators in the current document." -msgstr "Entfernt alle gesetzten (Fehler)-Markierungen innerhalb des Dokumentes." +msgstr "" +"Entfernt alle gesetzten (Fehler)-Markierungen innerhalb des Dokumentes." #. build the code -#: src/interface.c:802 -#: src/build.c:860 +#: src/interface.c:808 src/build.c:908 msgid "_Build" msgstr "_Erstellen" -#: src/interface.c:806 +#: src/interface.c:812 msgid "_Tools" msgstr "_Werkzeuge" -#: src/interface.c:813 +#: src/interface.c:819 msgid "_Colour Chooser" msgstr "_Farbwähler" -#: src/interface.c:816 -#: src/interface.c:941 -msgid "Open a color chooser dialog, to interactively pick colors from a palette." -msgstr "Öffnet einen Farbauswahl-Dialog zum Auswählen einer Farbe von einer Palette." +#: src/interface.c:822 src/interface.c:947 +msgid "" +"Open a color chooser dialog, to interactively pick colors from a palette." +msgstr "" +"Öffnet einen Farbauswahl-Dialog zum Auswählen einer Farbe von einer Palette." -#: src/interface.c:822 +#: src/interface.c:828 msgid "_Word Count" msgstr "_Wörter zählen" -#: src/interface.c:825 -msgid "Counts the words and characters in the current selection or the whole document" -msgstr "Zählt die Wörter und Zeichen in der aktuellen Auswahl bzw. dem aktuellen Dokument." +#: src/interface.c:831 +msgid "" +"Counts the words and characters in the current selection or the whole " +"document" +msgstr "" +"Zählt die Wörter und Zeichen in der aktuellen Auswahl bzw. dem aktuellen " +"Dokument." -#: src/interface.c:827 +#: src/interface.c:833 msgid "_Insert Special HTML Characters" msgstr "_HTML-Sonderzeichen einfügen" -#: src/interface.c:831 +#: src/interface.c:837 msgid "_Help" msgstr "_Hilfe" -#: src/interface.c:842 +#: src/interface.c:848 msgid "_Keyboard Shortcuts" msgstr "_Tastenkürzel" -#: src/interface.c:845 +#: src/interface.c:851 msgid "Shows a list of all keyboard shortcuts for Geany." msgstr "Zeige eine Übersicht mit allen Tastenkürzeln für Geany." -#: src/interface.c:847 +#: src/interface.c:853 msgid "_Website" msgstr "_Webseite" -#: src/interface.c:870 +#: src/interface.c:876 msgid "Create a new file" msgstr "Neue Datei anlegen" -#: src/interface.c:876 +#: src/interface.c:882 msgid "Open an existing file" msgstr "Öffnet eine existierende Datei" -#: src/interface.c:881 +#: src/interface.c:887 msgid "Save the current file" msgstr "Speichert die aktuelle Datei" -#: src/interface.c:883 -#: src/keybindings.c:114 +#: src/interface.c:889 src/keybindings.c:114 msgid "Save all" msgstr "Alle speichern" -#: src/interface.c:886 +#: src/interface.c:892 msgid "Save all open files" msgstr "Speichere alle offenen Dateien" -#: src/interface.c:895 +#: src/interface.c:901 msgid "Reload the current file from disk" msgstr "Liest die aktuelle Datei neu ein." -#: src/interface.c:900 +#: src/interface.c:906 msgid "Close the current file" msgstr "Schließt die aktuelle Datei" -#: src/interface.c:909 +#: src/interface.c:915 msgid "Undo the last modification" msgstr "Macht die letzte Änderung rückgängig." -#: src/interface.c:914 +#: src/interface.c:920 msgid "Redo the last modification" msgstr "Wiederholt die letzte Änderung." -#: src/interface.c:922 -#: src/keybindings.c:166 +#: src/interface.c:928 src/keybindings.c:166 msgid "Compile" msgstr "Kompilieren" -#: src/interface.c:925 +#: src/interface.c:931 msgid "Compile the current file" msgstr "Kompiliert die aktuelle Datei" -#: src/interface.c:930 -#: src/build.c:927 +#: src/interface.c:936 src/build.c:975 msgid "Run or view the current file" msgstr "Aktuelle Datei anzeigen oder ausführen" -#: src/interface.c:938 +#: src/interface.c:944 msgid "Color" msgstr "Farbwähler" -#: src/interface.c:950 +#: src/interface.c:956 msgid "Zoom in the text" msgstr "Text vergrößern" -#: src/interface.c:955 +#: src/interface.c:961 msgid "Zoom out the text" msgstr "Text verkleinern" -#: src/interface.c:968 -#: src/interface.c:973 +#: src/interface.c:974 src/interface.c:979 msgid "Find the entered text in the current file" msgstr "Findet den eingegebenen Text im aktuellen Dokument" -#: src/interface.c:986 +#: src/interface.c:992 msgid "Enter a line number and jump to it." msgstr "Geben Sie die Zeile an, zu der Sie springen möchten." -#: src/interface.c:993 +#: src/interface.c:999 msgid "Jump to the entered line number." msgstr "Springe zu angegebener Zeile" -#: src/interface.c:1030 -#: src/treeviews.c:71 +#: src/interface.c:1037 src/treeviews.c:71 msgid "Symbols" msgstr "Symbole" -#: src/interface.c:1043 -#: src/treeviews.c:307 +#: src/interface.c:1050 src/treeviews.c:307 msgid "Open files" msgstr "Geöffnete Dateien" -#: src/interface.c:1078 +#: src/interface.c:1085 msgid "Status" msgstr "Status" -#: src/interface.c:1092 +#: src/interface.c:1099 msgid "Compiler" msgstr "Compiler" -#: src/interface.c:1106 +#: src/interface.c:1113 msgid "Messages" msgstr "Meldungen" -#: src/interface.c:1119 +#: src/interface.c:1126 msgid "Scribble" msgstr "Notizen" -#: src/interface.c:1633 -#: src/interface.c:2780 +#: src/interface.c:1644 src/interface.c:2801 msgid "Images and text" msgstr "Icons und Text" -#: src/interface.c:1639 -#: src/interface.c:2812 +#: src/interface.c:1650 src/interface.c:2833 msgid "Images only" msgstr "Nur Icons" -#: src/interface.c:1645 -#: src/interface.c:2804 +#: src/interface.c:1656 src/interface.c:2825 msgid "Text only" msgstr "Nur Text" -#: src/interface.c:1656 -#: src/interface.c:2796 +#: src/interface.c:1667 src/interface.c:2817 msgid "Large icons" msgstr "Große Symbole" -#: src/interface.c:1661 -#: src/interface.c:2788 +#: src/interface.c:1672 src/interface.c:2809 msgid "Small icons" msgstr "Kleine Symbole" -#: src/interface.c:1671 +#: src/interface.c:1682 msgid "Hide toolbar" msgstr "Toolbar verbergen" -#: src/interface.c:1900 +#: src/interface.c:1912 msgid "Insert \"include <...>\"" msgstr "\"include <...>\" einfügen" -#: src/interface.c:1914 +#: src/interface.c:1926 msgid "Insert Comments" msgstr "Kommentare einfügen" -#: src/interface.c:1965 -#: src/keybindings.c:232 +#: src/interface.c:1982 src/keybindings.c:232 msgid "Find Usage" msgstr "Auftreten finden" -#: src/interface.c:1973 +#: src/interface.c:1990 msgid "Go to Tag Definition" msgstr "Gehe zu Tag Definition" -#: src/interface.c:1977 +#: src/interface.c:1994 msgid "Go to Tag Declaration" msgstr "Gehe zu Tag Deklaration" -#: src/interface.c:1986 +#: src/interface.c:2003 msgid "Go to Line" msgstr "Gehe zu Zeile" -#: src/interface.c:1989 +#: src/interface.c:2006 msgid "Goto to the entered line" msgstr "Springe zu angegebener Zeile" -#: src/interface.c:2361 -#: src/keybindings.c:132 +#: src/interface.c:2382 src/keybindings.c:132 msgid "Preferences" msgstr "Einstellungen" -#: src/interface.c:2394 +#: src/interface.c:2415 msgid "Load files from the last session" msgstr "Dateien aus der letzten Sitzung laden" -#: src/interface.c:2398 +#: src/interface.c:2419 msgid "Opens at startup the files from the last session" msgstr "Lädt die geöffneten Dateien aus der letzten Sitzung" -#: src/interface.c:2401 +#: src/interface.c:2422 msgid "Save window position and geometry" msgstr "Fensterposition und -größe speichern" -#: src/interface.c:2405 +#: src/interface.c:2426 msgid "Saves the window position and geometry and restores it at the start" msgstr "Speichert die Fensterposition und -größe" -#: src/interface.c:2408 +#: src/interface.c:2429 msgid "Load virtual terminal emulation at startup" msgstr "Starte die Virtual Terminal Emulation beim Starten" -#: src/interface.c:2410 -msgid "Whether the virtual terminal emulation(VTE) should be loaded at startup. Disable it if you do not need it." -msgstr "Stellt ein, ob die Virtual Terminal Emulation beim Starten geladen werden soll oder nicht. Wenn sie nicht benötigt wird, sollte dieser Punkt deaktiviert werden" +#: src/interface.c:2431 +msgid "" +"Whether the virtual terminal emulation(VTE) should be loaded at startup. " +"Disable it if you do not need it." +msgstr "" +"Stellt ein, ob die Virtual Terminal Emulation beim Starten geladen werden " +"soll oder nicht. Wenn sie nicht benötigt wird, sollte dieser Punkt " +"deaktiviert werden" -#: src/interface.c:2413 +#: src/interface.c:2434 msgid "Confirm exit" msgstr "Beenden bestätigen" -#: src/interface.c:2417 +#: src/interface.c:2438 msgid "Shows a confirmation dialog on exit." msgstr "Zeigt einen Bestätigungsdialog vor dem Beenden." -#: src/interface.c:2420 +#: src/interface.c:2441 msgid "Startup and shutdown" msgstr "Start und Beenden " -#: src/interface.c:2439 +#: src/interface.c:2460 msgid "Beep on errors or when compilation has finished" msgstr "Bei Fehlern oder beendeter Kompilierung Piepton ausgeben" -#: src/interface.c:2442 -msgid "Whether to beep if an error occured or when the compilation process has finished." -msgstr "Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein Piepton ausgegeben werden soll." +#: src/interface.c:2463 +msgid "" +"Whether to beep if an error occured or when the compilation process has " +"finished." +msgstr "" +"Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein Piepton " +"ausgegeben werden soll." -#: src/interface.c:2445 +#: src/interface.c:2466 msgid "Switch to status message list at new message" msgstr "Wechsele zum Statusmeldungsfenster bei neuer Meldung" -#: src/interface.c:2448 -msgid "Switch to the status message tab (in the notebook window at the bottom) if a new status message arrives." -msgstr "Automatisch zu dem Statusmeldungs-Reiter im unteren Fenster wechseln, wenn eine neue Statusmeldung vorliegt." +#: src/interface.c:2469 +msgid "" +"Switch to the status message tab (in the notebook window at the bottom) if a " +"new status message arrives." +msgstr "" +"Automatisch zu dem Statusmeldungs-Reiter im unteren Fenster wechseln, wenn " +"eine neue Statusmeldung vorliegt." -#: src/interface.c:2451 +#: src/interface.c:2472 msgid "Always wrap search and hide the Find dialog" msgstr "Das vollständige Dokument durchsuchen und den Suchen-Dialog schließen" -#: src/interface.c:2455 -msgid "Always wrap search around the document and hide the Find dialog after clicking Find Next/Previous" -msgstr "Immer das vollständige Dokument durchsuchen und den Suchen-Dialog nach Klicken auf Nächstes/Vorheriges schließen." +#: src/interface.c:2476 +msgid "" +"Always wrap search around the document and hide the Find dialog after " +"clicking Find Next/Previous" +msgstr "" +"Immer das vollständige Dokument durchsuchen und den Suchen-Dialog nach " +"Klicken auf Nächstes/Vorheriges schließen." # Denke trifft es besser als »Eigenschaften« -#: src/interface.c:2458 +#: src/interface.c:2479 msgid "Behaviour" msgstr "Funktionen" -#: src/interface.c:2463 +#: src/interface.c:2484 msgid "General" msgstr "Allgemein" -#: src/interface.c:2485 +#: src/interface.c:2506 msgid "Show symbol list" msgstr "Symbol-Ansicht anzeigen" -#: src/interface.c:2488 -#: src/interface.c:2494 +#: src/interface.c:2509 src/interface.c:2515 msgid "Toggle the symbol list on and off" msgstr "Schaltet die Symbol-Ansicht ein und aus." -#: src/interface.c:2491 +#: src/interface.c:2512 msgid "Show open files list" msgstr "Zeige Liste mit geöffneten Dateien" -#: src/interface.c:2497 +#: src/interface.c:2518 msgid "Sidebar" msgstr "Seitenleiste" -#: src/interface.c:2518 +#: src/interface.c:2539 msgid "Symbol list:" msgstr "Symbol-Liste:" -#: src/interface.c:2525 -#: src/interface.c:2590 +#: src/interface.c:2546 src/interface.c:2611 msgid "Message window:" msgstr "Meldungsfenster:" -#: src/interface.c:2532 -#: src/interface.c:2597 +#: src/interface.c:2553 src/interface.c:2618 msgid "Editor:" msgstr "Editor:" -#: src/interface.c:2544 +#: src/interface.c:2565 msgid "Sets the font for the message window" msgstr "Ändert die Schriftart für das Meldungsfenster" -#: src/interface.c:2552 +#: src/interface.c:2573 msgid "Sets the font for the symbol list" msgstr "Legt die Schriftart für die Symbol-Ansicht fest. " -#: src/interface.c:2560 +#: src/interface.c:2581 msgid "Sets the editor font" msgstr "Legt die Schriftart des Editorfensters fest. " -#: src/interface.c:2562 +#: src/interface.c:2583 msgid "Fonts" msgstr "Schriftarten" -#: src/interface.c:2583 +#: src/interface.c:2604 msgid "Sidebar:" msgstr "Seitenleiste:" -#: src/interface.c:2604 +#: src/interface.c:2625 msgid "Show editor tabs" msgstr "Zeige Liste mit geöffneten Dateien" -#: src/interface.c:2615 -#: src/interface.c:2625 -#: src/interface.c:2635 -#: src/interface.c:2972 +#: src/interface.c:2636 src/interface.c:2646 src/interface.c:2656 +#: src/interface.c:2993 msgid "Left" msgstr "Links" -#: src/interface.c:2616 -#: src/interface.c:2626 -#: src/interface.c:2636 -#: src/interface.c:2980 +#: src/interface.c:2637 src/interface.c:2647 src/interface.c:2657 +#: src/interface.c:3001 msgid "Right" msgstr "Rechts" -#: src/interface.c:2617 -#: src/interface.c:2627 -#: src/interface.c:2637 +#: src/interface.c:2638 src/interface.c:2648 src/interface.c:2658 msgid "Top" msgstr "Oben" -#: src/interface.c:2618 -#: src/interface.c:2628 -#: src/interface.c:2638 +#: src/interface.c:2639 src/interface.c:2649 src/interface.c:2659 msgid "Bottom" msgstr "Unten" -#: src/interface.c:2640 +#: src/interface.c:2661 msgid "Tab placement" msgstr "Tab-Platzierung:" -#: src/interface.c:2645 +#: src/interface.c:2666 msgid "Interface" msgstr "Schnittstelle" -#: src/interface.c:2664 +#: src/interface.c:2685 msgid "Show Toolbar" msgstr "Werkzeugleiste anzeigen" -#: src/interface.c:2689 +#: src/interface.c:2710 msgid "Show file operation buttons" msgstr "Dateioperationssymbole anzeigen" -#: src/interface.c:2693 +#: src/interface.c:2714 msgid "Display the New, Open, Close, Save and Reload buttons in the toolbar" -msgstr "Zeigt Symbole für Neu, Öffnen, Schließen und Neuladen in der Werkzeugleiste." +msgstr "" +"Zeigt Symbole für Neu, Öffnen, Schließen und Neuladen in der Werkzeugleiste." -#: src/interface.c:2696 +#: src/interface.c:2717 msgid "Show Compile and Run" msgstr "Kompileren und Ausführen anzeigen" -#: src/interface.c:2700 +#: src/interface.c:2721 msgid "Display the Compile and Run buttons in the toolbar" msgstr "Zeigt die Symbole zum Kompilieren und Ausführen in der Werkzeugleiste." -#: src/interface.c:2703 +#: src/interface.c:2724 msgid "Show Colour Chooser button" msgstr "Farbwähler anzeigen" -#: src/interface.c:2707 +#: src/interface.c:2728 msgid "Display the Colour Chooser button in the toolbar" msgstr "Zeigt das Farbwählersymbol in der Werkzeugleiste." -#: src/interface.c:2710 +#: src/interface.c:2731 msgid "Show Zoom In and Zoom Out" msgstr "Heran- und Wegzoomen anzeigen" -#: src/interface.c:2714 +#: src/interface.c:2735 msgid "Display the Zoom In and Zoom Out buttons in the toolbar" msgstr "Zeigt die Symbole zum Heran- und Herauszoomen in der Werkzeugleiste." -#: src/interface.c:2717 +#: src/interface.c:2738 msgid "Show Redo and Undo buttons" msgstr "Rückgängig und Wiederholen anzeigen" -#: src/interface.c:2721 +#: src/interface.c:2742 msgid "Display the Redo and Undo buttons in the toolbar" -msgstr "Zeigt die Symbole zum Rückgängigmachen und Wiederholen in der Werkzeugleiste." +msgstr "" +"Zeigt die Symbole zum Rückgängigmachen und Wiederholen in der Werkzeugleiste." -#: src/interface.c:2724 +#: src/interface.c:2745 msgid "Show Search field" msgstr "Suchfeld anzeigen" -#: src/interface.c:2728 +#: src/interface.c:2749 msgid "Display the search field and button in the toolbar" msgstr "Zeige das Suchfeld in der Werkzeugleiste" -#: src/interface.c:2731 +#: src/interface.c:2752 msgid "Show Goto line field" msgstr "Zeilennummereingabefeld anzeigen" -#: src/interface.c:2735 +#: src/interface.c:2756 msgid "Display the line number field and button in the toolbar" msgstr "Zeige das Zeilennummereingabefeld in der Werkzeugleiste" -#: src/interface.c:2738 +#: src/interface.c:2759 msgid "Show Quit button" msgstr "Icon zum Beenden anzeigen" -#: src/interface.c:2742 +#: src/interface.c:2763 msgid "Display the quit button in the toolbar" msgstr "Zeigt das Icon zum Beenden von Geany in der Werkzeugleiste an." -#: src/interface.c:2745 +#: src/interface.c:2766 msgid "Items" msgstr "Symbole" -#: src/interface.c:2766 +#: src/interface.c:2787 msgid "Icon style:" msgstr "Symbolstil:" -#: src/interface.c:2773 +#: src/interface.c:2794 msgid "Icon size:" msgstr "Symbolgröße:" -#: src/interface.c:2820 +#: src/interface.c:2841 msgid "Appearance" msgstr "Aussehen" -#: src/interface.c:2825 +#: src/interface.c:2846 msgid "Toolbar" msgstr "Werkzeugleiste" -#: src/interface.c:2853 +#: src/interface.c:2874 msgid "Tab Width:" msgstr "Tabulatorbreite" -#: src/interface.c:2865 +#: src/interface.c:2886 msgid "Sets the default encoding for newly created files." msgstr "Setzt die Zeichenkodierung für neu erstellte Dateien" -#: src/interface.c:2877 +#: src/interface.c:2898 msgid "The width in chars, which one tab character will take" msgstr "Die Breite in Zeichen, die ein Tabalutar-Zeichen einnimmt" -#: src/interface.c:2882 +#: src/interface.c:2903 msgid "Default encoding:" msgstr "Standardkodierung:" -#: src/interface.c:2888 +#: src/interface.c:2909 msgid "New files" msgstr "Neue Dateien" -#: src/interface.c:2907 +#: src/interface.c:2928 msgid "Strip trailing spaces" msgstr "Leerzeichen am Zeilenende entfernen" -#: src/interface.c:2911 +#: src/interface.c:2932 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Entfernt Leerzeichen an Zeilenenden" -#: src/interface.c:2914 +#: src/interface.c:2935 msgid "Ensure new line at file end" msgstr "Neue Zeile am Dateiende" -#: src/interface.c:2918 +#: src/interface.c:2939 msgid "Ensures that at the end of the file is a new line" msgstr "Fügt am Dateiende eine neue Zeile an (wenn keine vorhanden ist)" -#: src/interface.c:2921 -#: src/keybindings.c:158 +#: src/interface.c:2942 src/keybindings.c:158 msgid "Replace tabs by space" msgstr "Tabulatoren durch Leerzeichen ersetzen" -#: src/interface.c:2928 +#: src/interface.c:2949 msgid "Saving files" msgstr "Speichern" -#: src/interface.c:2949 +#: src/interface.c:2970 msgid "Placement of new file tabs:" msgstr "Platzierung neuer Dateien:" -#: src/interface.c:2962 -msgid "Specifies the number of files which are stored in the Recent files list." +#: src/interface.c:2983 +msgid "" +"Specifies the number of files which are stored in the Recent files list." msgstr "Gibt die Länge der Liste von Dateien an, die zuletzt geöffnet wurden." -#: src/interface.c:2975 +#: src/interface.c:2996 msgid "File tabs will be placed on the left of the notebook" msgstr "Neue Dateien werden links von der Datei-Liste platziert." -#: src/interface.c:2983 +#: src/interface.c:3004 msgid "File tabs will be placed on the right of the notebook" msgstr "Neue Dateien werden rechts von der Datei-Liste platziert." -#: src/interface.c:2987 +#: src/interface.c:3008 msgid "Recent files list length:" msgstr "Anzahl der \"Zuletzt geöffneten\" Dateien" -#: src/interface.c:2995 +#: src/interface.c:3016 msgid "Misc." msgstr "Sonstiges" -#: src/interface.c:3000 -#: src/treeviews.c:111 +#: src/interface.c:3021 src/treeviews.c:111 msgid "Files" msgstr "Dateien" -#: src/interface.c:3022 +#: src/interface.c:3043 msgid "Invert syntax highlighting colours" msgstr "Invertiere Syntax-Hervorhebungen " -#: src/interface.c:3024 +#: src/interface.c:3045 msgid "Use white text on a black background." msgstr "Benutze weiße Schrift auf einem schwarzem Hintergrund" -#: src/interface.c:3026 +#: src/interface.c:3047 msgid "Show indentation guides" msgstr "Zeige Einrückungshinweise" -#: src/interface.c:3029 +#: src/interface.c:3050 msgid "Shows small dotted lines to help you to use the right indentation." msgstr "Blendet punktierte Linien ein, um die Einrückung zu erleichtern." -#: src/interface.c:3032 +#: src/interface.c:3053 msgid "Show white space" msgstr "Zeige Leerzeichen" -#: src/interface.c:3035 +#: src/interface.c:3056 msgid "Marks spaces with dots and tabs with arrows." msgstr "Markiert Leerzeichen mit Punkten und Tabulatoren mit kleinen Pfeilen." -#: src/interface.c:3038 +#: src/interface.c:3059 msgid "Show line endings" msgstr "Zeilenenden anzeigen" -#: src/interface.c:3041 +#: src/interface.c:3062 msgid "Show the line ending character" msgstr "Zeilenende-Zeichen anzeigen" -#: src/interface.c:3044 +#: src/interface.c:3065 msgid "Display" msgstr "Anzeige" -#: src/interface.c:3065 +#: src/interface.c:3086 msgid "Long line marker:" msgstr "Markierung für statischen Zeilenumbruch:" -#: src/interface.c:3072 +#: src/interface.c:3093 msgid "Long line marker color:" msgstr "Farbe der Markierung für statischen Zeilenumbruch:" -#: src/interface.c:3079 +#: src/interface.c:3100 msgid "Type:" msgstr "Typ:" -#: src/interface.c:3091 +#: src/interface.c:3112 msgid "Sets the color of the long line marker" msgstr "Stellt die Farbe des \"long line markers\" ein." -#: src/interface.c:3092 -#: src/dialogs.c:536 -#: src/vte.c:546 -#: src/vte.c:553 +#: src/interface.c:3113 src/dialogs.c:540 src/vte.c:546 src/vte.c:553 msgid "Color Chooser" msgstr "Farbwähler" -#: src/interface.c:3100 -msgid "The long line marker is a thin vertical line in the editor. It helps to mark long lines, or as a hint to break the line. Set this value to a value greater than 0 to specify the column where it should appear." -msgstr "Die Markierung für statischen Zeilenumbruch ist eine dünne Linie im Editorfenster. Sie hilft dabei, lange Zeilen zu markieren und dabei auf einen eventuell notwendigen Zeilenumbruch hinzuweisen. Werte größer als 0 geben die Spalte an, in der die Linie angezeigt werden soll." +#: src/interface.c:3121 +msgid "" +"The long line marker is a thin vertical line in the editor. It helps to mark " +"long lines, or as a hint to break the line. Set this value to a value " +"greater than 0 to specify the column where it should appear." +msgstr "" +"Die Markierung für statischen Zeilenumbruch ist eine dünne Linie im " +"Editorfenster. Sie hilft dabei, lange Zeilen zu markieren und dabei auf " +"einen eventuell notwendigen Zeilenumbruch hinzuweisen. Werte größer als 0 " +"geben die Spalte an, in der die Linie angezeigt werden soll." -#: src/interface.c:3110 +#: src/interface.c:3131 msgid "Line" msgstr "Linie" -#: src/interface.c:3113 -msgid "Prints a vertical line in the editor window at the given cursor position (see below)." -msgstr "Zeichnet eine vertikale Linie im Editorfenster an der angegebenen Cursor-Position (nur sinnvoll mit Festbreitenschriften)." +#: src/interface.c:3134 +msgid "" +"Prints a vertical line in the editor window at the given cursor position " +"(see below)." +msgstr "" +"Zeichnet eine vertikale Linie im Editorfenster an der angegebenen Cursor-" +"Position (nur sinnvoll mit Festbreitenschriften)." -#: src/interface.c:3117 +#: src/interface.c:3138 msgid "Background" msgstr "Hintergrund" -#: src/interface.c:3120 -msgid "The background colour of characters after the given cursor position (see below) changed to the colour set below. (This is recommended if you use proportional fonts)" -msgstr "Die Hintergrundfarbe der Zeichen, die hinter der angegebenen Cursor-Position(siehe unten) stehen, wird auf die unten angegebene Farbe geändert (das ist nützlich für proportionale Schriftarten)." +#: src/interface.c:3141 +msgid "" +"The background colour of characters after the given cursor position (see " +"below) changed to the colour set below. (This is recommended if you use " +"proportional fonts)" +msgstr "" +"Die Hintergrundfarbe der Zeichen, die hinter der angegebenen Cursor-Position" +"(siehe unten) stehen, wird auf die unten angegebene Farbe geändert (das ist " +"nützlich für proportionale Schriftarten)." -#: src/interface.c:3124 +#: src/interface.c:3145 msgid "Disabled" msgstr "Deaktiviert" -#: src/interface.c:3130 +#: src/interface.c:3151 msgid "Long line marker" msgstr "Markierung für statischen Zeilenumbruch" -#: src/interface.c:3149 +#: src/interface.c:3170 msgid "Auto indentation" msgstr "Automatische Einrückung benutzen" -#: src/interface.c:3152 +#: src/interface.c:3173 msgid "Add the same indentation as the previous line after pressing enter" -msgstr "Fügt denselben Einzug wie in der vorherigen Zeile nach Drücken von Enter ein." +msgstr "" +"Fügt denselben Einzug wie in der vorherigen Zeile nach Drücken von Enter ein." -#: src/interface.c:3154 +#: src/interface.c:3175 msgid "Line wrapping" msgstr "Zeilenumbruch" -#: src/interface.c:3159 +#: src/interface.c:3180 msgid "Enable folding" msgstr "Quellcode-Ausblendung aktivieren" -#: src/interface.c:3162 +#: src/interface.c:3183 msgid "Whether to enable folding the code" msgstr "Legt fest, ob es möglich sein soll, Teile des Quellcodes auszublenden." -#: src/interface.c:3165 +#: src/interface.c:3186 msgid "Unfold all children of a fold point" msgstr "Alle untergeordneten Codeblöcke ebenfalls ausklappen" -#: src/interface.c:3168 +#: src/interface.c:3189 msgid "Unfold all children of a fold point when unfolding it." -msgstr "Klappt alle ausgeblendeten Codeblöcke einer Stelle im Quellcode mit aus. " +msgstr "" +"Klappt alle ausgeblendeten Codeblöcke einer Stelle im Quellcode mit aus. " -#: src/interface.c:3171 +#: src/interface.c:3192 msgid "Use indicators to show compile errors" msgstr "Benutzt Markierungen, um Probleme beim Kompilieren anzuzeigen." -#: src/interface.c:3174 -msgid "Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error." -msgstr "Legt fest, ob Markierungen (wellige Unterstreichungen) benutzt werden sollen, um Zeilen mit Fehlern beim Kompiliervorgang zu markieren" +#: src/interface.c:3195 +msgid "" +"Whether to use indicators (a squiggly underline) to highlight the lines " +"where the compiler found a warning or an error." +msgstr "" +"Legt fest, ob Markierungen (wellige Unterstreichungen) benutzt werden " +"sollen, um Zeilen mit Fehlern beim Kompiliervorgang zu markieren" -#: src/interface.c:3177 +#: src/interface.c:3198 msgid "Features" msgstr "Funktionen" -#: src/interface.c:3196 +#: src/interface.c:3217 msgid "Construct autocompletion" msgstr "Autovervollständigung von Konstrukten" -#: src/interface.c:3199 +#: src/interface.c:3220 msgid "Automatic completion of often used constructs like if and for" -msgstr "Autovervollständigung von häufig benutzten Konstrukten wie if, for und switch." +msgstr "" +"Autovervollständigung von häufig benutzten Konstrukten wie if, for und " +"switch." -#: src/interface.c:3202 +#: src/interface.c:3223 msgid "XML tag autocompletion" msgstr "XML-Tag Autovervollständigung" -#: src/interface.c:3205 +#: src/interface.c:3226 msgid "Automatic completion of open XML tags (includes HTML tags)" msgstr "Autovervollständigung von offenen XML-Tags, einschließlich HTML-Tags" -#: src/interface.c:3212 +#: src/interface.c:3233 msgid "Rows of autocompletion list:" msgstr "Anzahl der Zeilen der Autovervollständigungsliste: " -#: src/interface.c:3221 +#: src/interface.c:3242 msgid "Number of rows to display in the autocompletion list." -msgstr "Anzahl der Zeilen, die maximal angezeigt werden sollen, wenn die Autovervollständigungsliste angezeigt wird." +msgstr "" +"Anzahl der Zeilen, die maximal angezeigt werden sollen, wenn die " +"Autovervollständigungsliste angezeigt wird." -#: src/interface.c:3224 +#: src/interface.c:3245 msgid "Autocompletion" msgstr "Autovervollständigung" -#: src/interface.c:3229 +#: src/interface.c:3250 msgid "Editor" msgstr "Editor" -#: src/interface.c:3247 +#: src/interface.c:3268 msgid "Enter tool paths below. Tools you do not need can be left blank." -msgstr "Geben Sie hier die Pfade zu den einzelnen Werkzeugen an (Programme, die nicht benötigt werden, können freigelassen werden)" +msgstr "" +"Geben Sie hier die Pfade zu den einzelnen Werkzeugen an (Programme, die " +"nicht benötigt werden, können freigelassen werden)" -#: src/interface.c:3259 +#: src/interface.c:3280 msgid "Make:" msgstr "Make:" -#: src/interface.c:3266 +#: src/interface.c:3287 msgid "Terminal:" msgstr "Terminal:" -#: src/interface.c:3273 +#: src/interface.c:3294 msgid "Browser:" msgstr "Browser:" -#: src/interface.c:3285 +#: src/interface.c:3306 msgid "Path and options for the make tool" msgstr "Pfad und spezielle Optionen und / oder Targets für \"make\" angeben." -#: src/interface.c:3292 -msgid "A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)" -msgstr "Eine Terminal-Emulation wie z.B. xterm, gnome-terminal oder konsole (sie sollte die Option -e akzeptieren)" +#: src/interface.c:3313 +msgid "" +"A terminal emulator like xterm, gnome-terminal or konsole (should accept the " +"-e argument)" +msgstr "" +"Eine Terminal-Emulation wie z.B. xterm, gnome-terminal oder konsole (sie " +"sollte die Option -e akzeptieren)" -#: src/interface.c:3299 +#: src/interface.c:3320 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Pfad und evtl. Argumente zu Ihrem Lieblingsbrowser" -#: src/interface.c:3331 +#: src/interface.c:3352 msgid "Print command:" msgstr "Druckbefehl:" -#: src/interface.c:3343 +#: src/interface.c:3364 #, c-format msgid "Path to the command for printing files (use %f for the filename)." msgstr "Pfad zum Druckbefehl (benutzen Sie %f für den Dateinamen)." -#: src/interface.c:3355 +#: src/interface.c:3376 msgid "Grep:" msgstr "Grep:" -#: src/interface.c:3378 +#: src/interface.c:3399 msgid "Tool paths" msgstr "Pfade zu den Werkzeugen" -#: src/interface.c:3383 +#: src/interface.c:3404 msgid "Tools" msgstr "Werkzeuge" -#: src/interface.c:3401 -msgid "Set the information to be used in templates. See the documentation for details." +#: src/interface.c:3422 +msgid "" +"Set the information to be used in templates. See the documentation for " +"details." msgstr "" -"Geben Sie hier die Informationen an, die in den Vorlagen benutzt werden sollen.\n" -"Konsultieren Sie die Dokumentation, um mehr über die Arbeitsweise der Vorlagen zu erfahren." +"Geben Sie hier die Informationen an, die in den Vorlagen benutzt werden " +"sollen.\n" +"Konsultieren Sie die Dokumentation, um mehr über die Arbeitsweise der " +"Vorlagen zu erfahren." -#: src/interface.c:3419 +#: src/interface.c:3440 msgid "email address of the developer" msgstr "eMail-Adresse des Entwicklers" -#: src/interface.c:3426 +#: src/interface.c:3447 msgid "Initials of the developer name" msgstr "Initialen des Entwicklernames" -#: src/interface.c:3428 +#: src/interface.c:3449 msgid "Initial Version:" msgstr "Anfangsversion:" -#: src/interface.c:3440 +#: src/interface.c:3461 msgid "Version number, which a new file initially has" msgstr "Versionsnummer, die eine neue Datei zu Beginn hat" -#: src/interface.c:3447 +#: src/interface.c:3468 msgid "Company name" msgstr "Firmenname" -#: src/interface.c:3449 +#: src/interface.c:3470 msgid "Developer:" msgstr "Entwickler:" -#: src/interface.c:3456 +#: src/interface.c:3477 msgid "Company:" msgstr "Firma:" -#: src/interface.c:3463 +#: src/interface.c:3484 msgid "Mail address:" msgstr "Mail-Adresse:" -#: src/interface.c:3470 +#: src/interface.c:3491 msgid "Initials:" msgstr "Initialen:" -#: src/interface.c:3482 +#: src/interface.c:3503 msgid "The name of the developer" msgstr "Der Name des Entwicklers" -#: src/interface.c:3484 -msgid "Notice: For all changes you make here to take effect, you need to restart Geany." -msgstr "Damit hier gemachte Eigenschaftsänderungen wirksam werden, muss Geany neu gestartet werden" +#: src/interface.c:3505 +msgid "" +"Notice: For all changes you make here to take effect, you need to restart " +"Geany." +msgstr "" +"Damit hier gemachte Eigenschaftsänderungen wirksam werden, muss Geany neu " +"gestartet werden" -#: src/interface.c:3491 +#: src/interface.c:3512 msgid "Template data" msgstr "Daten für Vorlagen:" -#: src/interface.c:3496 +#: src/interface.c:3517 msgid "Templates" msgstr "Vorlagen" -#: src/interface.c:3514 -msgid "Here you can change keyboard shortcuts for various actions. Select one and press the Change button to enter a new shortcut, or double click on an action to edit the string representation of the shortcut directly." -msgstr "Hier können die Tastenkominationen für verschiedene Aktionen innerhalb von Geany festgelegt bzw. verändert werden. Um eine Tastenkombination zu ändern, einfach Doppelklicken oder markieren und auf Ändern klicken. Zudem können die Tastenkombinationen auch direkt eingegeben werden." +#: src/interface.c:3535 +msgid "" +"Here you can change keyboard shortcuts for various actions. Select one and " +"press the Change button to enter a new shortcut, or double click on an " +"action to edit the string representation of the shortcut directly." +msgstr "" +"Hier können die Tastenkominationen für verschiedene Aktionen innerhalb von " +"Geany festgelegt bzw. verändert werden. Um eine Tastenkombination zu ändern, " +"einfach Doppelklicken oder markieren und auf Ändern klicken. Zudem können " +"die Tastenkombinationen auch direkt eingegeben werden." -#: src/interface.c:3537 +#: src/interface.c:3558 msgid "Change" msgstr "Ändern" -#: src/interface.c:3541 +#: src/interface.c:3562 msgid "Keyboard shortcuts" msgstr "Tastaturkürzel" -#: src/interface.c:3546 +#: src/interface.c:3567 msgid "Keybindings" msgstr "Tastenkürzel" -#: src/callbacks.c:157 +#: src/callbacks.c:174 msgid "Do you really want to quit?" msgstr "Möchten Sie wirklich beenden?" -#: src/callbacks.c:458 +#: src/callbacks.c:492 msgid "Any unsaved changes will be lost." msgstr "Alle ungesicherten Änderungen gehen verloren." -#: src/callbacks.c:459 +#: src/callbacks.c:493 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Wollen Sie %s wirklich neu laden?" -#: src/callbacks.c:844 +#: src/callbacks.c:878 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Die Datei '%s' existiert bereits. Möchten Sie sie überschreiben?" -#: src/callbacks.c:1214 +#: src/callbacks.c:1248 #, c-format msgid "Declaration of \"%s()\" not found" msgstr "Deklaration von \"%s()\" nicht gefunden." -#: src/callbacks.c:1216 +#: src/callbacks.c:1250 #, c-format msgid "Definition of \"%s()\" not found" msgstr "Definition von \"%s()\" nicht gefunden." -#: src/callbacks.c:1421 -#: src/callbacks.c:1466 -msgid "Please set the filetype for the current file before using this function." +#: src/callbacks.c:1455 src/callbacks.c:1479 +msgid "" +"Please set the filetype for the current file before using this function." msgstr "Bitte legen Sie den Dateityp fest, bevor Sie diese Funktion benutzen." -#: src/callbacks.c:1578 -#: src/ui_utils.c:557 +#: src/callbacks.c:1590 src/ui_utils.c:561 msgid "dd.mm.yyyy" msgstr "TT.MM.JJ" -#: src/callbacks.c:1580 -#: src/ui_utils.c:558 +#: src/callbacks.c:1592 src/ui_utils.c:562 msgid "mm.dd.yyyy" msgstr "MM.TT.JJ" -#: src/callbacks.c:1582 -#: src/ui_utils.c:559 +#: src/callbacks.c:1594 src/ui_utils.c:563 msgid "yyyy/mm/dd" msgstr "JJJJ/MM/TT" -#: src/callbacks.c:1584 -#: src/ui_utils.c:568 +#: src/callbacks.c:1596 src/ui_utils.c:572 msgid "dd.mm.yyyy hh:mm:ss" msgstr "TT.MM.JJJJ Stunden:Minuten:Sekunden" -#: src/callbacks.c:1586 -#: src/ui_utils.c:569 +#: src/callbacks.c:1598 src/ui_utils.c:573 msgid "mm.dd.yyyy hh:mm:ss" msgstr "MM.TT.JJJJ Stunden:Minuten:Sekunden" -#: src/callbacks.c:1588 -#: src/ui_utils.c:570 +#: src/callbacks.c:1600 src/ui_utils.c:574 msgid "yyyy/mm/dd hh:mm:ss" msgstr "JJJJ/MM/TT Stunden:Minuten:Sekunden" -#: src/callbacks.c:1590 -#: src/ui_utils.c:579 +#: src/callbacks.c:1602 src/ui_utils.c:583 msgid "Use Custom Date Format" msgstr "Benutze selbst erstelltes Zeitformat" -#: src/callbacks.c:1601 +#: src/callbacks.c:1613 msgid "Custom Date Format" msgstr "Benutzerdefiniertes Datumsformat" -#: src/callbacks.c:1602 -msgid "Enter here a custom date and time format. You can use any conversion specifiers which can be used with the ANSI C strftime function. See \"man strftime\" for more information." -msgstr "Hier kann ein benutzerdefiniertes Datumsformat eingegeben werden. Dabei können alle Platzhalter verwendet werden, die auch in ANSI C strftime zum Einsatz kommen." +#: src/callbacks.c:1614 +msgid "" +"Enter here a custom date and time format. You can use any conversion " +"specifiers which can be used with the ANSI C strftime function. See \"man " +"strftime\" for more information." +msgstr "" +"Hier kann ein benutzerdefiniertes Datumsformat eingegeben werden. Dabei " +"können alle Platzhalter verwendet werden, die auch in ANSI C strftime zum " +"Einsatz kommen." -#: src/callbacks.c:1621 +#: src/callbacks.c:1634 msgid "Date format string could not be converted (possibly too long)." -msgstr "Das Datenformat konnte nicht umgewandelt werden. Eventuell ist es zu lang." +msgstr "" +"Das Datenformat konnte nicht umgewandelt werden. Eventuell ist es zu lang." -#: src/callbacks.c:2004 +#: src/callbacks.c:2022 msgid "No more message items." msgstr "Keine weiteren Nachrichten. " -#: src/support.c:90 -#: src/support.c:114 +#: src/support.c:90 src/support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "Konnte PixMap %s nicht finden." #. initialize the dialog -#: src/dialogs.c:74 -#: src/prefs.c:1023 +#: src/dialogs.c:74 src/prefs.c:1023 msgid "Open File" msgstr "Datei öffnen" #: src/dialogs.c:79 -msgid "Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only." -msgstr "Öffnet die Datei schreibgeschützt. Wenn Sie mehrere Dateien wählen, werden alle schreibgeschützt geöffnet." +msgid "" +"Opens the file in read-only mode. If you choose more than one file to open, " +"all files will be opened read-only." +msgstr "" +"Öffnet die Datei schreibgeschützt. Wenn Sie mehrere Dateien wählen, werden " +"alle schreibgeschützt geöffnet." #: src/dialogs.c:112 msgid "Detect by file extension" @@ -1374,11 +1412,16 @@ #: src/dialogs.c:191 msgid "" -"Explicitly defines an encoding for the file, if it would not be detected. This is useful when you know that the encoding of a file cannot be detected correctly by Geany.\n" -"Note if you choose multiple files, they will all be opened with the chosen encoding." +"Explicitly defines an encoding for the file, if it would not be detected. " +"This is useful when you know that the encoding of a file cannot be detected " +"correctly by Geany.\n" +"Note if you choose multiple files, they will all be opened with the chosen " +"encoding." msgstr "" -"Definiert explizit eine bestimmte Zeichenkodierung, wenn sie nicht automatisch erkannt werden kann.\n" -"Beachten Sie, wenn Sie mehrere Dateien auswählen, werden alle mit der gewählten Zeichenkodierung geöffnet." +"Definiert explizit eine bestimmte Zeichenkodierung, wenn sie nicht " +"automatisch erkannt werden kann.\n" +"Beachten Sie, wenn Sie mehrere Dateien auswählen, werden alle mit der " +"gewählten Zeichenkodierung geöffnet." #: src/dialogs.c:211 msgid "Set filetype:" @@ -1386,233 +1429,232 @@ #: src/dialogs.c:221 msgid "" -"Explicitly defines a filetype for the file, if it would not be detected by filename extension.\n" -"Note if you choose multiple files, they will all be opened with the chosen filetype." +"Explicitly defines a filetype for the file, if it would not be detected by " +"filename extension.\n" +"Note if you choose multiple files, they will all be opened with the chosen " +"filetype." msgstr "" -"Definiert explizit einen bestimmten Dateityp, wenn er nicht durch die Dateiendung erkannt wird.\n" -"Beachten Sie, wenn Sie mehrere Dateien auswählen, werden alle mit dem gewählten Dateityp geöffnet." +"Definiert explizit einen bestimmten Dateityp, wenn er nicht durch die " +"Dateiendung erkannt wird.\n" +"Beachten Sie, wenn Sie mehrere Dateien auswählen, werden alle mit dem " +"gewählten Dateityp geöffnet." #: src/dialogs.c:260 msgid "Save File" msgstr "Datei speichern" -#: src/dialogs.c:346 +#: src/dialogs.c:350 #, c-format msgid "The file '%s' is not saved." msgstr "'%s' wurde nicht gespeichert." -#: src/dialogs.c:356 +#: src/dialogs.c:360 msgid "Do you want to save it before closing?" msgstr "Möchten Sie vor dem Schließen speichern?" -#: src/dialogs.c:359 +#: src/dialogs.c:363 msgid "_Don't save" msgstr "_Nicht speichern" -#: src/dialogs.c:403 +#: src/dialogs.c:407 msgid "Choose font" msgstr "Schriftart auswählen" -#: src/dialogs.c:440 +#: src/dialogs.c:444 msgid "Word Count" msgstr "Wörter zählen" -#: src/dialogs.c:449 +#: src/dialogs.c:453 msgid "selection" msgstr "Auswahl" -#: src/dialogs.c:455 +#: src/dialogs.c:459 msgid "whole document" msgstr "Vollständiges Dokument" -#: src/dialogs.c:464 +#: src/dialogs.c:468 msgid "Range:" msgstr "Bereich:" -#: src/dialogs.c:476 +#: src/dialogs.c:480 msgid "Lines:" msgstr "Zeilen:" -#: src/dialogs.c:490 +#: src/dialogs.c:494 msgid "Words:" msgstr "Wörter: " -#: src/dialogs.c:504 +#: src/dialogs.c:508 msgid "Characters:" msgstr "Buchstaben:" -#: src/dialogs.c:603 -#: src/keybindings.c:144 +#: src/dialogs.c:607 src/keybindings.c:144 msgid "Go to line" msgstr "Gehe zu Zeile" -#: src/dialogs.c:609 +#: src/dialogs.c:613 msgid "Enter the line you want to go to:" msgstr "Geben Sie die Zeile an, zu der Sie springen möchten:" #. arguments -#: src/dialogs.c:634 -#: src/build.c:1068 +#: src/dialogs.c:638 src/build.c:1116 msgid "Set Arguments" msgstr "Programm-Parameter angeben" -#: src/dialogs.c:640 +#: src/dialogs.c:644 msgid "Set programs and options for compiling and viewing (La)TeX files." msgstr "" -"Setzt Programme und deren Optionen zum Kompilieren bzw. Betrachten von (La)TeX-Dateien.\n" -"Der jeweilige Dateiname wird bei einem Aufruf automatisch an das Ende angefügt." +"Setzt Programme und deren Optionen zum Kompilieren bzw. Betrachten von (La)" +"TeX-Dateien.\n" +"Der jeweilige Dateiname wird bei einem Aufruf automatisch an das Ende " +"angefügt." -#: src/dialogs.c:651 +#: src/dialogs.c:655 msgid "DVI creation:" msgstr "DVI-Erstellung:" -#: src/dialogs.c:670 +#: src/dialogs.c:674 msgid "PDF creation:" msgstr "PDF-Erstellung:" -#: src/dialogs.c:689 +#: src/dialogs.c:693 msgid "DVI preview:" msgstr "DVI-Vorschau:" -#: src/dialogs.c:708 +#: src/dialogs.c:712 msgid "PDF preview:" msgstr "PDF-Vorschau:" -#: src/dialogs.c:724 -#: src/dialogs.c:839 +#: src/dialogs.c:728 src/dialogs.c:843 #, c-format msgid "" "%f will be replaced by the current filename, e.g. test_file.c\n" "%e will be replaced by the filename without extension, e.g. test_file" msgstr "" -"%f wird durch den aktuellen Dateinamen ersetzt. Zum Beispiel: meine_Datei.c \n" -"%e wird durch den Dateinamen ohne Dateiendung ersetzt. Zum Beispiel meine_Datei " +"%f wird durch den aktuellen Dateinamen ersetzt. Zum Beispiel: meine_Datei." +"c \n" +"%e wird durch den Dateinamen ohne Dateiendung ersetzt. Zum Beispiel " +"meine_Datei " -#: src/dialogs.c:751 +#: src/dialogs.c:755 msgid "Set Includes and Arguments" msgstr "Programm-Parameter angeben" -#: src/dialogs.c:757 +#: src/dialogs.c:761 msgid "Set the commands for building and running programs." msgstr "Legt die Kommandos zum Erstellen und Ausführen von Programmen fest." -#: src/dialogs.c:764 +#: src/dialogs.c:768 msgid " commands" msgstr "Kommandos" -#: src/dialogs.c:779 +#: src/dialogs.c:783 msgid "Compile:" msgstr "Kompilieren:" -#: src/dialogs.c:800 +#: src/dialogs.c:804 msgid "Build:" msgstr "Erstellen:" -#: src/dialogs.c:821 -#: src/dialogs.c:1092 +#: src/dialogs.c:825 src/dialogs.c:1096 msgid "Execute:" msgstr "Ausführen:" -#: src/dialogs.c:886 -msgid "An error occurred or file information could not be retrieved (e.g. from a new file)." -msgstr "Es ist ein Fehler aufgetreten oder Datei-Informationen konnten nicht gelesen werden(z.B. bei einer neuen, ungespeicherten Datei)." +#: src/dialogs.c:890 +msgid "" +"An error occurred or file information could not be retrieved (e.g. from a " +"new file)." +msgstr "" +"Es ist ein Fehler aufgetreten oder Datei-Informationen konnten nicht gelesen " +"werden(z.B. bei einer neuen, ungespeicherten Datei)." -#: src/dialogs.c:905 -#: src/dialogs.c:906 -#: src/dialogs.c:907 -#: src/dialogs.c:913 -#: src/dialogs.c:914 -#: src/dialogs.c:915 -#: src/utils.c:501 -#: src/utils.c:555 -#: src/ui_utils.c:122 -#: src/ui_utils.c:124 +#: src/dialogs.c:909 src/dialogs.c:910 src/dialogs.c:911 src/dialogs.c:917 +#: src/dialogs.c:918 src/dialogs.c:919 src/utils.c:514 src/utils.c:566 +#: src/ui_utils.c:122 src/ui_utils.c:124 msgid "unknown" msgstr "unbekannt" -#: src/dialogs.c:919 +#: src/dialogs.c:923 msgid "Properties" msgstr "Eigenschaften" -#: src/dialogs.c:947 +#: src/dialogs.c:951 msgid "Type:" msgstr "Dateityp:" -#: src/dialogs.c:960 +#: src/dialogs.c:964 msgid "Size:" msgstr "Größe:" -#: src/dialogs.c:975 +#: src/dialogs.c:979 msgid "Location:" msgstr "Ort:" -#: src/dialogs.c:988 +#: src/dialogs.c:992 msgid "Read-only:" msgstr "Schreibgeschützt:" -#: src/dialogs.c:995 +#: src/dialogs.c:999 msgid "(only inside Geany)" msgstr "(nur innerhalb von Geany)" -#: src/dialogs.c:1004 +#: src/dialogs.c:1008 msgid "Encoding:" msgstr "Kodierung:" -#: src/dialogs.c:1013 -#: src/ui_utils.c:123 +#: src/dialogs.c:1017 src/ui_utils.c:123 msgid "(with BOM)" msgstr "(mit BOM)" -#: src/dialogs.c:1013 -#: src/ui_utils.c:123 +#: src/dialogs.c:1017 src/ui_utils.c:123 msgid "(without BOM)" msgstr "(ohne BOM)" -#: src/dialogs.c:1023 +#: src/dialogs.c:1027 msgid "Modified:" msgstr "Modifiziert:" -#: src/dialogs.c:1036 +#: src/dialogs.c:1040 msgid "Changed:" msgstr "Geändert:" -#: src/dialogs.c:1049 +#: src/dialogs.c:1053 msgid "Accessed:" msgstr "Zugriff:" -#: src/dialogs.c:1070 +#: src/dialogs.c:1074 msgid "Permissions:" msgstr "Berechtigungen:" #. Header -#: src/dialogs.c:1078 +#: src/dialogs.c:1082 msgid "Read:" msgstr "Lesen:" -#: src/dialogs.c:1085 +#: src/dialogs.c:1089 msgid "Write:" msgstr "Schreiben:" #. Owner -#: src/dialogs.c:1100 +#: src/dialogs.c:1104 msgid "Owner:" msgstr "Eigentümer:" #. Group -#: src/dialogs.c:1136 +#: src/dialogs.c:1140 msgid "Group:" msgstr "Gruppe:" #. Other -#: src/dialogs.c:1172 +#: src/dialogs.c:1176 msgid "Other:" msgstr "Andere:" -#: src/dialogs.c:1293 +#: src/dialogs.c:1297 msgid "Keyboard shortcuts" msgstr "Tastaturkürzel" -#: src/dialogs.c:1302 +#: src/dialogs.c:1306 msgid "The following keyboard shortcuts are defined:" msgstr "Folgende Tastenkürzel sind definiert: " @@ -1625,103 +1667,111 @@ msgid "New file opened." msgstr "Neue Datei geöffnet." -#: src/document.c:569 -msgid "Invalid filename" -msgstr "Ungültiger Dateiname" - -#: src/document.c:594 -#: src/document.c:796 +#: src/document.c:564 src/document.c:831 #, c-format msgid "Could not open file %s (%s)" msgstr "Konnte Datei '%s' nicht öffnen(%s)." -#: src/document.c:618 +#: src/document.c:587 #, c-format msgid "" -"The file \"%s\" could not opened properly and probably was truncated. Be aware that saving it can cause data loss.\n" +"The file \"%s\" could not be opened properly and has been truncated. This " +"can occur if the file contains a NULL byte. Be aware that saving it can " +"cause data loss.\n" "The file was set to read-only." msgstr "" -"Die Datei »%s« konnte nicht ordnungsgemäß geladen werden und wurde evtl. nicht vollständig abgeschnitten. Die kann zu Datenvelust beim Speichern führen!\n" +"Die Datei »%s« konnte nicht ordnungsgemäß geladen werden und wurde evtl. " +"abgeschnitten. Die kann zu Datenverlust beim Speichern führen!\n" "Die Datei wird schreibgeschützt geöffnet." -#: src/document.c:641 +#: src/document.c:611 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Die Datei \"%s\" ist kein gültiges %s." -#: src/document.c:652 +#: src/document.c:620 #, c-format -msgid "The file \"%s\" does not look like a text file or the file encoding is not supported." -msgstr "Die Datei \"%s\" scheint keine Textdatei zu sein, oder das Format wird nicht unterstützt." +msgid "" +"The file \"%s\" does not look like a text file or the file encoding is not " +"supported." +msgstr "" +"Die Datei \"%s\" scheint keine Textdatei zu sein, oder das Format wird nicht " +"unterstützt." -#: src/document.c:722 +#: src/document.c:661 +msgid "Invalid filename" +msgstr "Ungültiger Dateiname" + +#: src/document.c:757 #, c-format msgid "File %s reloaded." msgstr "Datei %s neu geladen." -#: src/document.c:724 +#: src/document.c:759 #, c-format msgid "File %s opened(%d%s)." msgstr "Datei %s geöffnet(%d%s)." -#: src/document.c:726 +#: src/document.c:761 msgid ", read-only" msgstr ", schreibgeschützt" -#: src/document.c:824 -#: src/document.c:905 +#: src/document.c:859 src/document.c:940 msgid "Error saving file." msgstr "Fehler beim Speichern der Datei." -#: src/document.c:869 +#: src/document.c:904 #, c-format msgid "" -"An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved.\n" +"An error occurred while converting the file from UTF-8 in \"%s\". The file " +"remains unsaved.\n" "Error message: %s\n" msgstr "" -"Beim Konvertieren der Datei von UTF-8 in \"%s\" ist ein Fehler aufgetreten. Die Datei bleibt ungespeichert.\n" +"Beim Konvertieren der Datei von UTF-8 in \"%s\" ist ein Fehler aufgetreten. " +"Die Datei bleibt ungespeichert.\n" "Fehlermeldung: %s\n" -#: src/document.c:893 +#: src/document.c:928 #, c-format msgid "Error saving file (%s)." msgstr "Fehler beim Speichern der Datei (%s)." -#: src/document.c:936 +#: src/document.c:971 #, c-format msgid "File %s saved." msgstr "Datei %s wurde gespeichert." -#: src/document.c:984 -#: src/document.c:1036 -#: src/document.c:1044 +#: src/document.c:1019 src/document.c:1071 src/document.c:1079 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" wurde nicht gefunden." -#: src/document.c:1044 +#: src/document.c:1079 msgid "Wrap search and find again?" msgstr "Suche vom Dokumentanfang bzw. -ende neu beginnen?" -#: src/document.c:1165 -#: src/document.c:1172 +#: src/document.c:1158 src/search.c:1188 +msgid "No matches found." +msgstr "Keine Treffer gefunden." + +#: src/document.c:1168 src/document.c:1175 #, c-format msgid "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr "%s: Es wurde %d Mal \"%s\" gegen \"%s\" ersetzt." -#: src/document.c:1377 +#: src/document.c:1429 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: src/document.c:1378 +#: src/document.c:1430 msgid "Mac (CR)" msgstr "Mac (CR)" -#: src/document.c:1380 +#: src/document.c:1432 msgid "Unix (LF)" msgstr "Unix (LF)" -#: src/document.c:1476 +#: src/document.c:1528 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -1732,31 +1782,37 @@ "\n" "%s" -#: src/document.c:1485 +#: src/document.c:1537 #, c-format msgid "Printing of \"%s\" failed (return code: %d)." msgstr "Drucken der Datei \"%s\" ist fehlgeschlagen (Rückgabewert: %d)." -#: src/document.c:1490 +#: src/document.c:1542 #, c-format msgid "File %s printed." msgstr "Datei %s wurde gedruckt." -#: src/utils.c:354 +#: src/utils.c:347 msgid "Do you want to reload it?" msgstr "Möchten Sie die Datei neu laden?" -#: src/utils.c:355 +#: src/utils.c:348 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" "the current buffer." -msgstr "Die Datei '%s' auf dem Datenträger ist aktueller als die momentan geöffnete Version." +msgstr "" +"Die Datei '%s' auf dem Datenträger ist aktueller als die momentan geöffnete " +"Version." #: src/ui_utils.c:114 #, c-format -msgid "%c line: % 4d column: % 3d selection: % 4d %s mode: %s%s cur. function: %s encoding: %s %s filetype: %s" -msgstr "%c Zeile: % 4d Spalte: % 3d Auswahl: % 4d %s Modus: %s%s akt. Funktion: %s Kodierung: %s %s Dateityp: %s" +msgid "" +"%c line: % 4d column: % 3d selection: % 4d %s mode: %s%s cur. " +"function: %s encoding: %s %s filetype: %s" +msgstr "" +"%c Zeile: % 4d Spalte: % 3d Auswahl: % 4d %s Modus: %s%s akt. " +"Funktion: %s Kodierung: %s %s Dateityp: %s" #: src/ui_utils.c:118 msgid "OVR" @@ -1775,31 +1831,31 @@ msgid "Font updated (%s)." msgstr "Schriftart gewechselt (%s)." -#: src/ui_utils.c:217 +#: src/ui_utils.c:309 msgid "No tags found" msgstr "Keine Symbole gefunden." -#: src/ui_utils.c:526 +#: src/ui_utils.c:530 msgid "C Standard Library" msgstr "C Standard Bibliothek" -#: src/ui_utils.c:527 +#: src/ui_utils.c:531 msgid "ISO C99" msgstr "ISO C99" -#: src/ui_utils.c:528 +#: src/ui_utils.c:532 msgid "C++ (C Standard Library)" msgstr "C++ (C Standard Bibliothek)" -#: src/ui_utils.c:529 +#: src/ui_utils.c:533 msgid "C++ Standard Library" msgstr "C++ Standard Bibliothek" -#: src/ui_utils.c:530 +#: src/ui_utils.c:534 msgid "C++ STL" msgstr "C++ STL" -#: src/ui_utils.c:596 +#: src/ui_utils.c:600 msgid "Set Custom Date Format" msgstr "Benutzerdefiniertes Datumsformat einstellen " @@ -1923,8 +1979,7 @@ msgid "Error" msgstr "Fehler" -#: src/win32.c:339 -#: src/win32.c:380 +#: src/win32.c:339 src/win32.c:380 msgid "Question" msgstr "Frage" @@ -1943,11 +1998,14 @@ #: src/keyfile.c:333 msgid "Type here what you want, use it as a notice/scratch board" -msgstr "Schreiben Sie hier rein, was sie möchten. Sie können es als Notizbuch nutzen." +msgstr "" +"Schreiben Sie hier rein, was sie möchten. Sie können es als Notizbuch nutzen." -#: src/keyfile.c:557 +#: src/keyfile.c:560 msgid "Failed to load one or more session files." -msgstr "Eine oder mehre Datei(en) aus der letzten Sitzung konnte(n) nicht geladen werden." +msgstr "" +"Eine oder mehre Datei(en) aus der letzten Sitzung konnte(n) nicht geladen " +"werden." #: src/msgwindow.c:107 msgid "Status messages" @@ -1962,22 +2020,21 @@ msgid "Failed to view %s (make sure it is already compiled)" msgstr "Konnte %s nicht anzeigen (die Datei muss bereits erzeugt worden sein)" -#: src/build.c:189 -#: src/build.c:567 +#: src/build.c:189 src/build.c:567 #, c-format -msgid "Could not find terminal '%s' (check path for Terminal tool setting in Preferences)" -msgstr "Konnte das Terminalprogramm '%s' nicht finden (Pfad zum Terminalprogramm in den Einstellungen überprüfen)" +msgid "" +"Could not find terminal '%s' (check path for Terminal tool setting in " +"Preferences)" +msgstr "" +"Konnte das Terminalprogramm '%s' nicht finden (Pfad zum Terminalprogramm in " +"den Einstellungen überprüfen)" -#: src/build.c:203 -#: src/build.c:604 +#: src/build.c:203 src/build.c:604 #, c-format msgid "Failed to execute %s (start-script could not be created)" msgstr "Konnte %s nicht ausführen (Start-Script konnte nicht erzeugt werden)" -#: src/build.c:231 -#: src/build.c:447 -#: src/build.c:649 -#: src/search.c:1070 +#: src/build.c:231 src/build.c:447 src/build.c:649 src/search.c:1069 #, c-format msgid "Process failed (%s)" msgstr "Prozess fehlgeschlagen (%s)" @@ -2002,132 +2059,130 @@ msgid "Failed to change the working directory to %s" msgstr "Konnte nicht in Arbeitsverzeichnis %s wechseln" -#: src/build.c:729 +#: src/build.c:777 msgid "Compilation failed." msgstr "Kompilierung fehlgeschlagen." -#: src/build.c:743 +#: src/build.c:791 msgid "Compilation finished successfully." msgstr "Kompilierung beendet - erfolgreich." #. compile the code -#: src/build.c:848 +#: src/build.c:896 msgid "_Compile" msgstr "_Kompilieren" -#: src/build.c:851 +#: src/build.c:899 msgid "Compiles the current file" msgstr "Kompiliert die aktuelle Datei" -#: src/build.c:864 +#: src/build.c:912 msgid "Builds the current file (generate an executable file)" msgstr "Erstellt die aktuelle Datei (erzeugt eine ausführbare Datei)" #. build the code with make all -#: src/build.c:874 -#: src/build.c:996 +#: src/build.c:922 src/build.c:1044 msgid "_Make All" msgstr "_Make all" -#: src/build.c:877 -#: src/build.c:999 +#: src/build.c:925 src/build.c:1047 msgid "Builds the current file with the make tool and the default target" msgstr "Erstellt die aktuelle Datei mit \"make\" und dem Default-Target" #. build the code with make custom -#: src/build.c:885 -#: src/build.c:1007 +#: src/build.c:933 src/build.c:1055 msgid "Make Custom _Target" msgstr "Make (eigenes _Target)" -#: src/build.c:889 -#: src/build.c:1011 +#: src/build.c:937 src/build.c:1059 msgid "Builds the current file with the make tool and the specified target" msgstr "Erstellt die aktuelle Datei mit \"make\" und dem angegebenem Target" #. build the code with make object -#: src/build.c:896 +#: src/build.c:944 msgid "Make _Object" msgstr "Make _Objekt-Datei" -#: src/build.c:900 +#: src/build.c:948 msgid "Compiles the current file using the make tool" msgstr "Kompiliert die aktuelle Datei mittels make " #. next error -#: src/build.c:912 -#: src/build.c:1023 +#: src/build.c:960 src/build.c:1071 msgid "_Next Error" msgstr "Nächster _Fehler" #. arguments -#: src/build.c:938 +#: src/build.c:986 msgid "_Set Includes and Arguments" msgstr "_Programm-Parameter angeben" -#: src/build.c:943 -msgid "Sets the includes and library paths for the compiler and the program arguments for execution" -msgstr "Include-Dateien und Bibliotheken-Pfade sowie Programmparameter festlegen" +#: src/build.c:991 +msgid "" +"Sets the includes and library paths for the compiler and the program " +"arguments for execution" +msgstr "" +"Include-Dateien und Bibliotheken-Pfade sowie Programmparameter festlegen" #. DVI -#: src/build.c:966 +#: src/build.c:1014 msgid "LaTeX -> DVI" msgstr "LaTeX -> DVI" -#: src/build.c:969 +#: src/build.c:1017 msgid "Compiles the current file into a DVI file" msgstr "Kompiliert die aktuelle Datei als DVI-Datei." #. PDF -#: src/build.c:979 +#: src/build.c:1027 msgid "LaTeX -> PDF" msgstr "LaTeX -> PDF" -#: src/build.c:982 +#: src/build.c:1030 msgid "Compiles the current file into a PDF file" msgstr "Kompiliert die aktuelle Datei als PDF-Datei." #. DVI view -#: src/build.c:1035 +#: src/build.c:1083 msgid "View DVI File" msgstr "DVI-Datei anzeigen" -#: src/build.c:1040 -#: src/build.c:1053 +#: src/build.c:1088 src/build.c:1101 msgid "Compiles and view the current file" msgstr "Kompiliert und zeigt die aktuelle Datei an." #. PDF view -#: src/build.c:1049 +#: src/build.c:1097 msgid "View PDF File" msgstr "PDF-Datei anzeigen" -#: src/build.c:1073 +#: src/build.c:1121 msgid "Sets the program paths and arguments" msgstr "Programm-Parameter angeben" -#: src/build.c:1340 +#: src/build.c:1388 msgid "Make Custom Target" msgstr "Make (eigenes Target)" -#: src/build.c:1341 -msgid "Enter custom options here, all entered text is passed to the make command." +#: src/build.c:1389 +msgid "" +"Enter custom options here, all entered text is passed to the make command." msgstr "Alles was Sie hier angeben, wird direkt an \"make\" übergeben." -#: src/build.c:1380 +#: src/build.c:1428 msgid "Failed to execute the view program" msgstr "Konnte das Anzeigeprogramm nicht ausführen." -#: src/build.c:1399 +#: src/build.c:1447 msgid "Failed to execute the terminal program" msgstr "Konnte das Terminal-Programm nicht ausführen." -#: src/build.c:1458 +#: src/build.c:1506 #, c-format msgid "Process could not be stopped (%s)." msgstr "Der Prozess konnte nicht angehalten werden (%s)." -#: src/build.c:1493 +#: src/build.c:1541 msgid "No more build errors." msgstr "Keine weiteren Fehlermeldungen." @@ -2150,8 +2205,11 @@ #: src/prefs.c:917 #, c-format -msgid "The combination '%s' is already used for \"%s\". Please choose another one." -msgstr "Die Tastenkombination '%s' wird bereits für \"%s\" verwendet. Bitte wählen Sie eine andere Tastenkombination." +msgid "" +"The combination '%s' is already used for \"%s\". Please choose another one." +msgstr "" +"Die Tastenkombination '%s' wird bereits für \"%s\" verwendet. Bitte wählen " +"Sie eine andere Tastenkombination." #: src/about.c:119 msgid "About Geany" @@ -2203,7 +2261,7 @@ msgid "License" msgstr "Lizenz" -#: src/geany.h:47 +#: src/geany.h:49 msgid "untitled" msgstr "unbenannt" @@ -2211,8 +2269,7 @@ msgid "Celtic" msgstr "Keltisch" -#: src/encodings.c:52 -#: src/encodings.c:53 +#: src/encodings.c:52 src/encodings.c:53 msgid "Greek" msgstr "Griechisch" @@ -2224,29 +2281,19 @@ msgid "South European" msgstr "Südeuropäisch" -#: src/encodings.c:56 -#: src/encodings.c:57 -#: src/encodings.c:58 -#: src/encodings.c:59 +#: src/encodings.c:56 src/encodings.c:57 src/encodings.c:58 src/encodings.c:59 msgid "Western" msgstr "Westlich" -#: src/encodings.c:61 -#: src/encodings.c:62 -#: src/encodings.c:63 +#: src/encodings.c:61 src/encodings.c:62 src/encodings.c:63 msgid "Baltic" msgstr "Baltisch" -#: src/encodings.c:64 -#: src/encodings.c:65 -#: src/encodings.c:66 +#: src/encodings.c:64 src/encodings.c:65 src/encodings.c:66 msgid "Central European" msgstr "Mitteleuropäisch" -#: src/encodings.c:67 -#: src/encodings.c:68 -#: src/encodings.c:69 -#: src/encodings.c:70 +#: src/encodings.c:67 src/encodings.c:68 src/encodings.c:69 src/encodings.c:70 #: src/encodings.c:71 msgid "Cyrillic" msgstr "Kyrillisch" @@ -2263,15 +2310,11 @@ msgid "Romanian" msgstr "Rumänisch" -#: src/encodings.c:76 -#: src/encodings.c:77 -#: src/encodings.c:78 +#: src/encodings.c:76 src/encodings.c:77 src/encodings.c:78 msgid "Arabic" msgstr "Arabisch" -#: src/encodings.c:79 -#: src/encodings.c:80 -#: src/encodings.c:81 +#: src/encodings.c:79 src/encodings.c:80 src/encodings.c:81 msgid "Hebrew" msgstr "Hebräisch" @@ -2291,51 +2334,34 @@ msgid "Thai" msgstr "Thai" -#: src/encodings.c:87 -#: src/encodings.c:88 -#: src/encodings.c:89 +#: src/encodings.c:87 src/encodings.c:88 src/encodings.c:89 msgid "Turkish" msgstr "Türkisch" -#: src/encodings.c:90 -#: src/encodings.c:91 -#: src/encodings.c:92 +#: src/encodings.c:90 src/encodings.c:91 src/encodings.c:92 msgid "Vietnamese" msgstr "Vietnamesisch" -#: src/encodings.c:94 -#: src/encodings.c:95 -#: src/encodings.c:96 -#: src/encodings.c:97 -#: src/encodings.c:98 -#: src/encodings.c:99 -#: src/encodings.c:100 +#: src/encodings.c:94 src/encodings.c:95 src/encodings.c:96 src/encodings.c:97 +#: src/encodings.c:98 src/encodings.c:99 src/encodings.c:100 #: src/encodings.c:101 msgid "Unicode" msgstr "Unicode" -#: src/encodings.c:103 -#: src/encodings.c:104 -#: src/encodings.c:105 +#: src/encodings.c:103 src/encodings.c:104 src/encodings.c:105 #: src/encodings.c:106 msgid "Chinese Simplified" msgstr "Chinesisch vereinfacht" -#: src/encodings.c:107 -#: src/encodings.c:108 -#: src/encodings.c:109 +#: src/encodings.c:107 src/encodings.c:108 src/encodings.c:109 msgid "Chinese Traditional" msgstr "Chinesisch traditionell" -#: src/encodings.c:110 -#: src/encodings.c:111 -#: src/encodings.c:112 +#: src/encodings.c:110 src/encodings.c:111 src/encodings.c:112 msgid "Japanese" msgstr "Japanisch" -#: src/encodings.c:113 -#: src/encodings.c:114 -#: src/encodings.c:115 +#: src/encodings.c:113 src/encodings.c:114 src/encodings.c:115 #: src/encodings.c:116 msgid "Korean" msgstr "Koreanisch" @@ -2368,13 +2394,11 @@ msgid "_Unicode" msgstr "_Unicode" -#: src/treeviews.c:117 -#: src/treeviews.c:149 +#: src/treeviews.c:117 src/treeviews.c:149 msgid "Chapter" msgstr "Kapitel" -#: src/treeviews.c:119 -#: src/treeviews.c:141 +#: src/treeviews.c:119 src/treeviews.c:141 msgid "Section" msgstr "Section" @@ -2394,9 +2418,7 @@ msgid "Appendix" msgstr "Anhang" -#: src/treeviews.c:129 -#: src/treeviews.c:151 -#: src/treeviews.c:239 +#: src/treeviews.c:129 src/treeviews.c:151 src/treeviews.c:239 #: src/treeviews.c:280 msgid "Other" msgstr "Sonstiges" @@ -2425,8 +2447,7 @@ msgid "Function" msgstr "Funktion" -#: src/treeviews.c:159 -#: src/treeviews.c:222 +#: src/treeviews.c:159 src/treeviews.c:222 msgid "Package" msgstr "Package" @@ -2442,15 +2463,11 @@ msgid "Our" msgstr "Our" -#: src/treeviews.c:178 -#: src/treeviews.c:203 -#: src/treeviews.c:225 +#: src/treeviews.c:178 src/treeviews.c:203 src/treeviews.c:225 msgid "Methods" msgstr "Methoden" -#: src/treeviews.c:180 -#: src/treeviews.c:201 -#: src/treeviews.c:227 +#: src/treeviews.c:180 src/treeviews.c:201 src/treeviews.c:227 #: src/treeviews.c:268 msgid "Classes" msgstr "Klassen" @@ -2470,21 +2487,15 @@ #. gtk_tree_store_append(doc_list[idx].tag_store, &(tv.tag_macro), NULL); #. gtk_tree_store_set(doc_list[idx].tag_store, &(tv.tag_macro), 0, _("Macros"), -1); #. -#: src/treeviews.c:186 -#: src/treeviews.c:253 -#: src/treeviews.c:274 +#: src/treeviews.c:186 src/treeviews.c:253 src/treeviews.c:274 msgid "Variables" msgstr "Variablen" -#: src/treeviews.c:188 -#: src/treeviews.c:231 -#: src/treeviews.c:270 +#: src/treeviews.c:188 src/treeviews.c:231 src/treeviews.c:270 msgid "Members" msgstr "Instanzvariablen" -#: src/treeviews.c:199 -#: src/treeviews.c:245 -#: src/treeviews.c:266 +#: src/treeviews.c:199 src/treeviews.c:245 src/treeviews.c:266 msgid "Functions" msgstr "Funktionen" @@ -2508,22 +2519,19 @@ msgid "Structs / Typedefs" msgstr "Structs / Typedefs" -#: src/treeviews.c:385 -#: src/treeviews.c:437 +#: src/treeviews.c:396 src/treeviews.c:448 msgid "Hide" msgstr "Verbergen" -#: src/treeviews.c:393 -#: src/treeviews.c:445 +#: src/treeviews.c:404 src/treeviews.c:456 msgid "Hide sidebar" msgstr "Seitenleiste verbergen" -#: src/treeviews.c:425 +#: src/treeviews.c:436 msgid "Reload" msgstr "Neu laden" -#: src/vte.c:186 -#: src/vte.c:503 +#: src/vte.c:186 src/vte.c:503 msgid "Terminal" msgstr "Terminal" @@ -2536,8 +2544,12 @@ msgstr "Terminalplugin" #: src/vte.c:506 -msgid "These settings for the virtual terminal emulator widget (VTE) only apply if the VTE library could be loaded." -msgstr "Die Einstellungen für VTE werden nur wirksam, wenn die VTE-Bibliothek erfolgreich geladen werden konnte." +msgid "" +"These settings for the virtual terminal emulator widget (VTE) only apply if " +"the VTE library could be loaded." +msgstr "" +"Die Einstellungen für VTE werden nur wirksam, wenn die VTE-Bibliothek " +"erfolgreich geladen werden konnte." #: src/vte.c:517 msgid "Terminal font:" @@ -2568,7 +2580,9 @@ msgstr "Zeilen zum Zurückrollen:" #: src/vte.c:566 -msgid "Specifies the history in lines, which you can scroll back in the terminal widget." +msgid "" +"Specifies the history in lines, which you can scroll back in the terminal " +"widget." msgstr "Gibt die Zeilen an, die man im Terminal zurückrollen kann." #: src/vte.c:570 @@ -2576,15 +2590,20 @@ msgstr "Terminalemulation:" #: src/vte.c:580 -msgid "Controls how the terminal emulator should behave. xterm is a good start." -msgstr "Steuert wie sich das Terminal verhalten soll. In der Regel ist »xterm« ein guter Startwert." +msgid "" +"Controls how the terminal emulator should behave. xterm is a good start." +msgstr "" +"Steuert wie sich das Terminal verhalten soll. In der Regel ist »xterm« ein " +"guter Startwert." #: src/vte.c:582 msgid "Shell:" msgstr "Shell:" #: src/vte.c:589 -msgid "Sets the path to the shell which should be started inside the terminal emulation." +msgid "" +"Sets the path to the shell which should be started inside the terminal " +"emulation." msgstr "Setzt den Pfad zu der Shell, die in der VTE benutzt werden soll." #: src/vte.c:606 @@ -2593,7 +2612,9 @@ #: src/vte.c:607 msgid "Whether to scroll to the bottom if a key was pressed." -msgstr "Legt fest, ob das Fenster bei einem Tastendruck bis zum Ende gescrollt werden soll." +msgstr "" +"Legt fest, ob das Fenster bei einem Tastendruck bis zum Ende gescrollt " +"werden soll." #: src/vte.c:611 msgid "Scroll on output" @@ -2608,8 +2629,14 @@ msgstr "Me_nütastenkombination deaktivieren (Vorgabe ist F10)" #: src/vte.c:617 -msgid "This option disables the keybinding to popup the menu bar (default is F10). Disabling it can be useful if you use, for example, Midnight Commander within the VTE." -msgstr "Diese Option deaktiviert bestimmte Tastenkombinationen des Menüs. Eine Deaktivierung kann sinnvoll sein, wenn Sie zum Beispiel den Midnight Commander in der VTE benutzen möchten." +msgid "" +"This option disables the keybinding to popup the menu bar (default is F10). " +"Disabling it can be useful if you use, for example, Midnight Commander " +"within the VTE." +msgstr "" +"Diese Option deaktiviert bestimmte Tastenkombinationen des Menüs. Eine " +"Deaktivierung kann sinnvoll sein, wenn Sie zum Beispiel den Midnight " +"Commander in der VTE benutzen möchten." #: src/vte.c:621 msgid "Follow the path of the current file" @@ -2617,15 +2644,22 @@ #: src/vte.c:622 msgid "Whether to execute \"cd $path\" when you switch between opened files." -msgstr "Legt fest, ob \"cd $path\" in der VTE ausgeführt werden soll, wenn Sie zwischen geöffneten Dateien wechseln." +msgstr "" +"Legt fest, ob \"cd $path\" in der VTE ausgeführt werden soll, wenn Sie " +"zwischen geöffneten Dateien wechseln." #: src/vte.c:626 msgid "Execute programs in VTE" msgstr "Führe Programme in der VTE aus" #: src/vte.c:627 -msgid "Run programs in VTE instead of opening a terminal emulation window. Please note, programs executed in VTE cannot be stopped." -msgstr "Führt Programme in der VTE aus, anstatt ein neues Terminalfenster zu öffnen. Achtung: Programme die in der VTE ausgeführt werden, können nicht gestoppt werden. " +msgid "" +"Run programs in VTE instead of opening a terminal emulation window. Please " +"note, programs executed in VTE cannot be stopped." +msgstr "" +"Führt Programme in der VTE aus, anstatt ein neues Terminalfenster zu öffnen. " +"Achtung: Programme die in der VTE ausgeführt werden, können nicht gestoppt " +"werden. " #: src/keybindings.c:108 msgid "New" @@ -2679,13 +2713,11 @@ msgid "Find Previous" msgstr "Vorheriges" -#: src/keybindings.c:138 -#: src/search.c:376 +#: src/keybindings.c:138 src/search.c:376 msgid "Replace" msgstr "Ersetzen" -#: src/keybindings.c:140 -#: src/search.c:514 +#: src/keybindings.c:140 src/search.c:514 msgid "Find in files" msgstr "In Dateien suchen" @@ -2825,8 +2857,7 @@ msgid "Complete word" msgstr "Vervollständige Wort" -#: src/keybindings.c:221 -#: src/keybindings.c:224 +#: src/keybindings.c:221 src/keybindings.c:224 msgid "Show calltip" msgstr "Calltip anzeigen" @@ -2851,8 +2882,12 @@ msgstr "Reguläre Ausdrücke _benutzen" #: src/search.c:154 -msgid "Use POSIX-like regular expressions. For detailed information about using regular expressions, please read the documentation." -msgstr "Benutze POSIX-ähnliche reguläre Ausdrücke. Für weitere Informationen über reguläre Ausdrücke lesen Sie bitte die Dokumentation." +msgid "" +"Use POSIX-like regular expressions. For detailed information about using " +"regular expressions, please read the documentation." +msgstr "" +"Benutze POSIX-ähnliche reguläre Ausdrücke. Für weitere Informationen über " +"reguläre Ausdrücke lesen Sie bitte die Dokumentation." #: src/search.c:161 msgid "_Search backwards" @@ -2864,19 +2899,17 @@ #: src/search.c:180 msgid "" -"Replace \\\\, \\t, \\n" -", \\r and \\uXXXX (Unicode chararacters) with the corresponding control characters." +"Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " +"corresponding control characters." msgstr "" -"Ersetzt \\\\, \\t, \\n" -", \\r und \\uXXXX (Unicode-Zeichen) mit den entsprechenden Sonderzeichen." +"Ersetzt \\\\, \\t, \\n, \\r und \\uXXXX (Unicode-Zeichen) mit den " +"entsprechenden Sonderzeichen." -#: src/search.c:189 -#: src/search.c:587 +#: src/search.c:189 src/search.c:587 msgid "_Case sensitive" msgstr "_Groß- / Kleinschreibung beachten" -#: src/search.c:194 -#: src/search.c:593 +#: src/search.c:194 src/search.c:593 msgid "Match only a _whole word" msgstr "Nur _ganze Wörter finden" @@ -2896,9 +2929,7 @@ msgid "_Next" msgstr "_Nächstes" -#: src/search.c:274 -#: src/search.c:392 -#: src/search.c:544 +#: src/search.c:274 src/search.c:392 src/search.c:544 msgid "Search for:" msgstr "Suchen nach:" @@ -2911,24 +2942,20 @@ msgid "_Mark" msgstr "_Markieren" -#: src/search.c:310 -#: src/search.c:450 +#: src/search.c:310 src/search.c:450 msgid "In Sessi_on" msgstr "In Sessi_on finden" -#: src/search.c:315 -#: src/search.c:455 +#: src/search.c:315 src/search.c:455 msgid "_In Document" msgstr "_Im Dokument" #. close window checkbox -#: src/search.c:321 -#: src/search.c:461 +#: src/search.c:321 src/search.c:461 msgid "Close _dialog" msgstr "Diesen Dialog _schließen." -#: src/search.c:326 -#: src/search.c:466 +#: src/search.c:326 src/search.c:466 msgid "Disable this option to keep the dialog open." msgstr "Diese Option deaktivieren, um den Dialog nicht zu schließen." @@ -2965,10 +2992,10 @@ msgid "_Grep regular expressions" msgstr "Reguläre Ausdrücke _benutzen (grep)" -#: src/search.c:576 -#: src/search.c:583 +#: src/search.c:576 src/search.c:583 msgid "See grep's manual page for more information." -msgstr "Schlagen Sie in der Dokumentation zu »grep« für mehr Informationen nach." +msgstr "" +"Schlagen Sie in der Dokumentation zu »grep« für mehr Informationen nach." #: src/search.c:581 msgid "_Extended regular expressions" @@ -2982,7 +3009,7 @@ msgid "Invert the sense of matching, to select non-matching lines." msgstr "Invertiert die Trefferliste." -#: src/search.c:658 +#: src/search.c:659 msgid "Select folder" msgstr "Ordner wählen" @@ -2991,52 +3018,55 @@ msgid "Replaced text in %u files." msgstr "Text wurde in %u Dateien ersetzt. " -#: src/search.c:964 +#: src/search.c:963 msgid "Invalid directory for find in files." msgstr "Ungültiges Verzeichnis." -#: src/search.c:994 +#: src/search.c:993 msgid "No text to find." msgstr "Kein Text zum Suchen angegeben." -#: src/search.c:1022 +#: src/search.c:1021 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." -msgstr "Konnte das grep Kommando '%s' nicht finden (Pfad zum Grep Kommando in den Einstellungen überprüfen)." +msgstr "" +"Konnte das grep Kommando '%s' nicht finden (Pfad zum Grep Kommando in den " +"Einstellungen überprüfen)." -#: src/search.c:1137 +#: src/search.c:1136 #, c-format msgid "Could not open directory (%s)" msgstr "Konnte Verzeichnis nicht öffnen (%s)." -#: src/search.c:1182 +#: src/search.c:1181 msgid "Search failed." msgstr "Suche schlug fehl." -#: src/search.c:1188 +#: src/search.c:1187 msgid "Search completed." msgstr "Suche abgeschlossen." -#: src/search.c:1189 -msgid "No matches found." -msgstr "Keine Treffer gefunden." - -#: src/search.c:1264 +#: src/search.c:1263 #, c-format msgid "No matches found for '%s'." msgstr "Keine Treffer für '%s' gefunden." -#: src/tools.c:61 +#: src/tools.c:62 msgid "Special characters" msgstr "Sonderzeichen" -#: src/tools.c:63 +#: src/tools.c:64 msgid "_Insert" msgstr "_Einfügen" -#: src/tools.c:71 -msgid "Choose a special character from the list below and double click on it or use the button to insert it at the current cursor position." -msgstr "Wählen Sie das gesuchte Sonderzeichen aus der Liste aus und fügen Sie es mit einem Doppelklick oder über die Button »Einfügen« in Ihre aktuelles Dokument ein. " +#: src/tools.c:72 +msgid "" +"Choose a special character from the list below and double click on it or use " +"the button to insert it at the current cursor position." +msgstr "" +"Wählen Sie das gesuchte Sonderzeichen aus der Liste aus und fügen Sie es mit " +"einem Doppelklick oder über die Button »Einfügen« in Ihre aktuelles Dokument " +"ein. " #: src/tools.c:85 msgid "Character" @@ -3046,68 +3076,34 @@ msgid "HTML (name)" msgstr "HTML (Name)" -#: src/tools.c:126 +#: src/tools.c:128 msgid "HTML characters" msgstr "Zeichen für HTML" -#: src/tools.c:132 +#: src/tools.c:134 msgid "ISO 8859-1 characters" msgstr "Zeichen nach ISO 8859-1 " -#. / TODO add the symbols from http://de.selfhtml.org/html/referenz/zeichen.htm -#: src/tools.c:230 +#: src/tools.c:232 msgid "Greek characters" msgstr "Griechische Buchstaben" -#: src/tools.c:231 +#: src/tools.c:287 msgid "Mathematical characters" msgstr "Mathematische Symbole" -#: src/tools.c:232 +#: src/tools.c:328 msgid "Technical characters" msgstr "Technische Symbole" -#: src/tools.c:233 +#: src/tools.c:336 msgid "Arrow characters" msgstr "Pfeil-Symbole" -#: src/tools.c:234 +#: src/tools.c:349 msgid "Punctuation characters" msgstr "Zeichen für Interpunktion" -#: src/tools.c:235 +#: src/tools.c:365 msgid "Miscellaneous characters" msgstr "Sonstige Zeichen" - -#~ msgid "Find usage" -#~ msgstr "Auftreten finden" -#~ msgid "" -#~ "Range:\t\t%s\n" -#~ "\n" -#~ "Lines:\t\t%d\n" -#~ "Words:\t\t%d\n" -#~ "Characters:\t%d" -#~ msgstr "" -#~ "Bereich:\t\t%s\n" -#~ "\n" -#~ "Zeilen:\t\t%d\n" -#~ "Wörter:\t\t%d\n" -#~ "Zeichen:\t\t%d" -#~ msgid "Match only word s_tart" -#~ msgstr "Nur Wort_anfänge finden" -#~ msgid "In F_ile" -#~ msgstr "In Datei" -#~ msgid "Symbol list font" -#~ msgstr "Schriftart der Symbol-Liste" -#~ msgid "Message window font" -#~ msgstr "Schriftart des Meldungsfenster" -#~ msgid "Sets the font for the editors windows" -#~ msgstr "Ändert die Schriftart des Editors" -#~ msgid "Du_plicate Line" -#~ msgstr "_Zeile kopieren" -#~ msgid "The dialog window won't be closed when you start the operation." -#~ msgstr "" -#~ "Wenn diese Option aktiv ist. wird das Dialogfenster nicht geschlossen." -#~ msgid "Begin" -#~ msgstr "Begin" - Modified: trunk/po/fr.po =================================================================== --- trunk/po/fr.po 2007-01-06 18:00:34 UTC (rev 1163) +++ trunk/po/fr.po 2007-01-06 21:45:13 UTC (rev 1164) @@ -5,11 +5,11 @@ # msgid "" msgstr "" -"Project-Id-Version: geany 0.10\n" +"Project-Id-Version: geany 0.10svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-12-17 13:26+0100\n" -"PO-Revision-Date: 2006-12-13 23:40+0100\n" -"Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" +"POT-Creation-Date: 2007-01-06 22:37+0100\n" +"PO-Revision-Date: 2007-01-06 17:39+0100\n" +"Last-Translator: Moal Jean-Philippe <skateinmars(a)momo.servegame.org>\n" "Language-Team: French <skateinmars(a)momo.servegame.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -41,7 +41,8 @@ #: src/main.c:95 msgid "don't load auto completion data (see documentation)" -msgstr "ne pas charger les données d'autocomplétion (voir la documentation)" +msgstr "" +"ne pas charger les données de complétion automatique (voir la documentation)" #: src/main.c:96 msgid "don't load the previous session's files" @@ -57,7 +58,7 @@ #: src/main.c:101 msgid "show version and exit" -msgstr "affiche la version et quitter" +msgstr "afficher la version et quitter" #: src/main.c:399 msgid " - A fast and lightweight IDE" @@ -90,230 +91,242 @@ msgid "Configuration directory could not be created (%s)." msgstr "Le répertoire de configuration n'a pas pu être créé (%s)." -#: src/interface.c:245 src/interface.c:1403 +#: src/interface.c:246 src/interface.c:1413 msgid "Geany" msgstr "Geany" -#: src/interface.c:255 +#: src/interface.c:256 msgid "_File" msgstr "_Fichier" -#: src/interface.c:266 +#: src/interface.c:267 msgid "New (with _Template)" msgstr "Nouveau (selon un _modèle)" -#: src/interface.c:277 src/interface.c:334 src/interface.c:508 -#: src/interface.c:554 src/interface.c:729 src/interface.c:739 -#: src/interface.c:1911 src/interface.c:1957 +#: src/interface.c:278 src/interface.c:335 src/interface.c:509 +#: src/interface.c:560 src/interface.c:735 src/interface.c:745 +#: src/interface.c:1923 src/interface.c:1974 msgid "invisible" msgstr "invisible" -#: src/interface.c:289 +#: src/interface.c:290 msgid "Recent _Files" msgstr "_Fichiers récents" -#: src/interface.c:306 +#: src/interface.c:307 msgid "Save A_ll" msgstr "Tout enre_gistrer" -#: src/interface.c:309 +#: src/interface.c:310 msgid "Saves all open files" msgstr "Sauvegarder tous les fichiers ouverts" -#: src/interface.c:315 src/callbacks.c:457 src/utils.c:353 +#: src/interface.c:316 src/callbacks.c:491 src/utils.c:346 msgid "_Reload" msgstr "_Recharger" -#: src/interface.c:323 +#: src/interface.c:324 msgid "R_eload As" msgstr "R_echarger en tant que" -#: src/interface.c:354 +#: src/interface.c:355 msgid "Prints the current file" msgstr "Imprime le fichier courant" -#: src/interface.c:365 +#: src/interface.c:366 msgid "C_lose All" msgstr "To_ut fermer" -#: src/interface.c:368 +#: src/interface.c:369 msgid "Closes all open files" msgstr "Ferme tous les fichiers ouverts" -#: src/interface.c:382 src/interface.c:1003 +#: src/interface.c:383 src/interface.c:1009 msgid "Quit Geany" msgstr "Quitter Geany" -#: src/interface.c:384 +#: src/interface.c:385 msgid "_Edit" msgstr "Édit_er" -#: src/interface.c:425 src/interface.c:1812 +#: src/interface.c:426 src/interface.c:1824 msgid "Select _All" msgstr "Sélectionner _tout" -#: src/interface.c:434 src/interface.c:1838 +#: src/interface.c:435 src/interface.c:1850 msgid "_Format" msgstr "_Format" -#: src/interface.c:437 +#: src/interface.c:438 msgid "Convert the case of the current selection" msgstr "Convertir la casse de la sélection courante" -#: src/interface.c:442 src/interface.c:1845 +#: src/interface.c:443 src/interface.c:1857 msgid "Convert Selection to _Lower-case" msgstr "Convertir la sélection en minuscu_les" -#: src/interface.c:446 src/interface.c:1849 +#: src/interface.c:447 src/interface.c:1861 msgid "Convert Selection to _Upper-case" msgstr "Convertir la sélection en maj_uscules" -#: src/interface.c:455 src/interface.c:1858 +#: src/interface.c:456 src/interface.c:1870 msgid "_Comment Line(s)" -msgstr "_Commenter le(s) ligne(s)" +msgstr "_Commenter la(les) ligne(s)" -#: src/interface.c:459 src/interface.c:1862 +#: src/interface.c:460 src/interface.c:1874 msgid "U_ncomment Line(s)" msgstr "Décomme_nter la(les) ligne(s)" -#: src/interface.c:463 src/interface.c:1866 +#: src/interface.c:464 src/interface.c:1878 msgid "_Toggle Line Commentation" msgstr "Commen_ter/Décommenter la ligne" -#: src/interface.c:467 src/interface.c:1870 +#: src/interface.c:468 src/interface.c:1882 msgid "Du_plicate Line or Selection" msgstr "Du_pliquer la ligne ou la sélection" -#: src/interface.c:476 src/interface.c:1879 +#: src/interface.c:477 src/interface.c:1891 msgid "_Increase Indent" msgstr "Augmenter l'_indentation" -#: src/interface.c:484 src/interface.c:1887 +#: src/interface.c:485 src/interface.c:1899 msgid "_Decrease Indent" msgstr "_Diminuer l'indentation" -#: src/interface.c:497 +#: src/interface.c:498 msgid "_Insert \"include <...>\"" msgstr "_Insérer \"include <...>\"" -#: src/interface.c:511 +#: src/interface.c:512 msgid "I_nsert Comments" -msgstr "I_nsérer des Commentaires" +msgstr "I_nsérer des commentaires" -#: src/interface.c:522 src/interface.c:1925 +#: src/interface.c:523 src/interface.c:1937 msgid "Insert ChangeLog Entry" -msgstr "Insérer une entrée de Changelog" +msgstr "Insérer une entrée de changelog" -#: src/interface.c:525 src/interface.c:1928 +#: src/interface.c:526 src/interface.c:1940 msgid "Inserts a typical ChangeLog entry in the current file" -msgstr "Insère une entrée de Changelog classique dans le fichier courant" +msgstr "Insère une entrée de changelog classique dans le fichier courant" -#: src/interface.c:527 src/interface.c:1930 +#: src/interface.c:528 src/interface.c:1942 msgid "Insert File Header" msgstr "Insérer un en-tête de fichier" -#: src/interface.c:530 src/interface.c:1933 +#: src/interface.c:531 src/interface.c:1945 msgid "Inserts a file header at the beginning of the file" msgstr "Insère un en-tête au début du fichier courant" -#: src/interface.c:532 src/interface.c:1935 +#: src/interface.c:533 src/interface.c:1947 msgid "Insert Function Description" msgstr "Insérer une description de fonction" -#: src/interface.c:535 src/interface.c:1938 +#: src/interface.c:536 src/interface.c:1950 msgid "Inserts a description before the current function" msgstr "Insère une description avant la fonction courante" -#: src/interface.c:537 src/interface.c:1940 +#: src/interface.c:538 src/interface.c:1952 msgid "Insert Multiline Comment" -msgstr "Insérer un commentaire multilignes" +msgstr "Insérer un commentaire multiligne" -#: src/interface.c:540 src/interface.c:1943 +#: src/interface.c:541 src/interface.c:1955 msgid "Inserts a multiline comment" msgstr "Insère un commentaire sur plusieurs lignes" -#: src/interface.c:542 src/interface.c:1945 +#: src/interface.c:543 src/interface.c:1957 msgid "Insert GPL Notice" msgstr "Insérer une note GPL" -#: src/interface.c:545 src/interface.c:1948 +#: src/interface.c:546 src/interface.c:1960 msgid "Inserts a GPL notice (should be done at the beginning of the file)" msgstr "" "Insère une partie de la GPL (cela devrait être fait au début du fichier)" -#: src/interface.c:547 src/interface.c:1950 +#: src/interface.c:548 src/interface.c:1962 +#, fuzzy +msgid "Insert BSD license Notice" +msgstr "Insérer une note GPL" + +#: src/interface.c:551 src/interface.c:1965 +#, fuzzy +msgid "" +"Inserts a BSD llicence notice (should be done at the beginning of the file)" +msgstr "" +"Insère une partie de la GPL (cela devrait être fait au début du fichier)" + +#: src/interface.c:553 src/interface.c:1967 msgid "Insert Dat_e" -msgstr "Insérer la Dat_e" +msgstr "Insérer la dat_e" -#: src/interface.c:566 +#: src/interface.c:572 msgid "_Search" msgstr "_Rechercher" -#: src/interface.c:577 +#: src/interface.c:583 msgid "Find _Next" msgstr "Trouver le prochai_n" -#: src/interface.c:581 +#: src/interface.c:587 msgid "Find _Previous" msgstr "Trouver le _précédent" -#: src/interface.c:585 +#: src/interface.c:591 msgid "Find in F_iles" msgstr "Trouver dans les f_ichiers" -#: src/interface.c:589 src/search.c:385 +#: src/interface.c:595 src/search.c:385 msgid "_Replace" msgstr "_Remplacer" -#: src/interface.c:602 +#: src/interface.c:608 msgid "Next _Message" -msgstr "Prochain _Message" +msgstr "Prochain _message" -#: src/interface.c:611 +#: src/interface.c:617 msgid "_Go to Line" msgstr "Aller à la li_gne" -#: src/interface.c:619 src/dialogs.c:77 +#: src/interface.c:625 src/dialogs.c:77 msgid "_View" msgstr "A_ffichage" -#: src/interface.c:626 +#: src/interface.c:632 msgid "Change _Font" -msgstr "Changer la _Police" +msgstr "Changer la _police" -#: src/interface.c:629 +#: src/interface.c:635 msgid "Change the default font" msgstr "Changer la police par défaut" -#: src/interface.c:640 +#: src/interface.c:646 msgid "Full_screen" msgstr "Plein é_cran" -#: src/interface.c:644 +#: src/interface.c:650 msgid "Show Message _Window" msgstr "Afficher la _fenêtre de messages" -#: src/interface.c:647 +#: src/interface.c:653 msgid "Toggle the window with status and compiler messages on and off" msgstr "Affiche/Masque la fenêtre de statut et des messages du compilateur" -#: src/interface.c:650 +#: src/interface.c:656 msgid "Show _Toolbar" msgstr "Afficher la barre d'ou_tils" -#: src/interface.c:653 +#: src/interface.c:659 msgid "Toggle the toolbar on and off" msgstr "Affiche/Masque la barre d'outils" -#: src/interface.c:656 +#: src/interface.c:662 msgid "Show Side_bar" msgstr "Afficher la _barre latérale" -#: src/interface.c:661 +#: src/interface.c:667 msgid "Show _Markers Margin" msgstr "Afficher la marge des _marqueurs" -#: src/interface.c:664 +#: src/interface.c:670 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines." @@ -321,23 +334,23 @@ "Affiche ou masque la petite marge à droite des numéros des lignes, qui est " "utilisée pour marquer les lignes." -#: src/interface.c:667 +#: src/interface.c:673 msgid "Show _Line Numbers" msgstr "Afficher les numéros de _ligne" -#: src/interface.c:670 +#: src/interface.c:676 msgid "Shows or hides the Line Number margin." msgstr "Affiche ou masque la marge des numéros de ligne." @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1163] trunk
by eht16＠users.sourceforge.net 06 Jan '07

06 Jan '07

Revision: 1163 http://svn.sourceforge.net/geany/?rev=1163&view=rev Author: eht16 Date: 2007-01-06 10:00:34 -0800 (Sat, 06 Jan 2007) Log Message: ----------- Save template files in a subdirectory "templates" inside Geany's configuration directory. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.docbook trunk/src/geany.h trunk/src/templates.c trunk/src/utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-06 17:16:43 UTC (rev 1162) +++ trunk/ChangeLog 2007-01-06 18:00:34 UTC (rev 1163) @@ -12,6 +12,9 @@ src/interface.c, src/templates.c, src/templates.h: Added template for BSD licence. * src/document.c: Fixed missing colouring of tab menu label. + * doc/geany.docbook, src/geany.h, src/utils.c, src/templates.c: + Save template files in a subdirectory "templates" inside Geany's + configuration directory. 2007-01-06 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/doc/geany.docbook =================================================================== --- trunk/doc/geany.docbook 2007-01-06 17:16:43 UTC (rev 1162) +++ trunk/doc/geany.docbook 2007-01-06 18:00:34 UTC (rev 1163) @@ -2,10 +2,10 @@ <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ <!ENTITY app_small "geany"> -<!ENTITY appversion "0.10"> +<!ENTITY appversion "0.11"> <!ENTITY appurl "http://geany.uvena.de"> <!ENTITY author_mail "enrico.troeger(a)uvena.de"> -<!ENTITY date "December 21, 2006"> +<!ENTITY date "January 06, 2007"> <!ENTITY legal SYSTEM "geany_gpl.docbook"> <!ENTITY scikeybinding SYSTEM "scikeybinding.docbook"> ]> @@ -28,7 +28,7 @@ <address><email>frank(a)frank.uvena.de</email></address> </author> <copyright> - <year>2005-2006</year> + <year>2005-2007</year> </copyright> <legalnotice> <para> @@ -1800,7 +1800,7 @@ </para> <para> Each template can be customized to your needs. The templates are in the configuration - directory, which is in <filename>~/.&app_small;/</filename> (see <xref linkend="clo"/> + directory, which is in <filename>~/.geany/templates/</filename> (see <xref linkend="clo"/> for further information about the configuration directory). Just open the desired template with an editor (ideally <application>Geany</application> ;-) ) and edit the template as your needs. There are some wildcards which will be automatically Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2007-01-06 17:16:43 UTC (rev 1162) +++ trunk/src/geany.h 2007-01-06 18:00:34 UTC (rev 1163) @@ -1,7 +1,8 @@ /* * geany.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,6 +37,7 @@ // listed in the documentation should not be changed ;-) #define GEANY_HOME_DIR g_get_home_dir() #define GEANY_FILEDEFS_SUBDIR "filedefs" +#define GEANY_TEMPLATES_SUBDIR "templates" #define GEANY_CODENAME "Bandor" #define GEANY_HOMEPAGE "http://geany.uvena.de/" #define GEANY_USE_WIN32_DIALOG 0 Modified: trunk/src/templates.c =================================================================== --- trunk/src/templates.c 2007-01-06 17:16:43 UTC (rev 1162) +++ trunk/src/templates.c 2007-01-06 18:00:34 UTC (rev 1163) @@ -204,7 +204,8 @@ // some simple macros to reduce code size and make the code readable -#define TEMPLATES_GET_FILENAME(x) g_strconcat(app->configdir, G_DIR_SEPARATOR_S, x, NULL) +#define TEMPLATES_GET_FILENAME(x) g_strconcat(app->configdir, \ + G_DIR_SEPARATOR_S GEANY_TEMPLATES_SUBDIR G_DIR_SEPARATOR_S, x, NULL) #define TEMPLATES_CREATE_FILE(x, y) if (! g_file_test(x, G_FILE_TEST_EXISTS)) utils_write_file(x, y) #define TEMPLATES_READ_FILE(x, y) g_file_get_contents(x, y, NULL, NULL); @@ -215,20 +216,20 @@ void templates_init(void) { - gchar *template_filename_fileheader = TEMPLATES_GET_FILENAME("template.fileheader"); - gchar *template_filename_gpl = TEMPLATES_GET_FILENAME("template.gpl"); - gchar *template_filename_bsd = TEMPLATES_GET_FILENAME("template.bsd"); - gchar *template_filename_function = TEMPLATES_GET_FILENAME("template.function"); - gchar *template_filename_changelog = TEMPLATES_GET_FILENAME("template.changelog"); - gchar *template_filename_filetype_none = TEMPLATES_GET_FILENAME("template.filetype.none"); - gchar *template_filename_filetype_c = TEMPLATES_GET_FILENAME("template.filetype.c"); - gchar *template_filename_filetype_cpp = TEMPLATES_GET_FILENAME("template.filetype.cpp"); - gchar *template_filename_filetype_d = TEMPLATES_GET_FILENAME("template.filetype.d"); - gchar *template_filename_filetype_java = TEMPLATES_GET_FILENAME("template.filetype.java"); - gchar *template_filename_filetype_pascal = TEMPLATES_GET_FILENAME("template.filetype.pascal"); - gchar *template_filename_filetype_php = TEMPLATES_GET_FILENAME("template.filetype.php"); - gchar *template_filename_filetype_html = TEMPLATES_GET_FILENAME("template.filetype.html"); - gchar *template_filename_filetype_ruby = TEMPLATES_GET_FILENAME("template.filetype.ruby"); + gchar *template_filename_fileheader = TEMPLATES_GET_FILENAME("fileheader"); + gchar *template_filename_gpl = TEMPLATES_GET_FILENAME("gpl"); + gchar *template_filename_bsd = TEMPLATES_GET_FILENAME("bsd"); + gchar *template_filename_function = TEMPLATES_GET_FILENAME("function"); + gchar *template_filename_changelog = TEMPLATES_GET_FILENAME("changelog"); + gchar *template_filename_filetype_none = TEMPLATES_GET_FILENAME("filetype.none"); + gchar *template_filename_filetype_c = TEMPLATES_GET_FILENAME("filetype.c"); + gchar *template_filename_filetype_cpp = TEMPLATES_GET_FILENAME("filetype.cpp"); + gchar *template_filename_filetype_d = TEMPLATES_GET_FILENAME("filetype.d"); + gchar *template_filename_filetype_java = TEMPLATES_GET_FILENAME("filetype.java"); + gchar *template_filename_filetype_pascal = TEMPLATES_GET_FILENAME("filetype.pascal"); + gchar *template_filename_filetype_php = TEMPLATES_GET_FILENAME("filetype.php"); + gchar *template_filename_filetype_html = TEMPLATES_GET_FILENAME("filetype.html"); + gchar *template_filename_filetype_ruby = TEMPLATES_GET_FILENAME("filetype.ruby"); time_t tp = time(NULL); const struct tm *tm = localtime(&tp); Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2007-01-06 17:16:43 UTC (rev 1162) +++ trunk/src/utils.c 2007-01-06 18:00:34 UTC (rev 1163) @@ -1,7 +1,8 @@ /* * utils.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -769,13 +770,13 @@ gint utils_make_settings_dir(const gchar *dir, const gchar *data_dir, const gchar *doc_dir) { gint error_nr = 0; - gchar *filetypes_readme = g_strconcat( - dir, G_DIR_SEPARATOR_S, "template.README", NULL); + gchar *conf_file = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "geany.conf", NULL); gchar *filedefs_dir = g_strconcat(dir, G_DIR_SEPARATOR_S, GEANY_FILEDEFS_SUBDIR, G_DIR_SEPARATOR_S, NULL); - gchar *filedefs_readme = g_strconcat(dir, G_DIR_SEPARATOR_S, GEANY_FILEDEFS_SUBDIR, - G_DIR_SEPARATOR_S, "filetypes.README", NULL); + gchar *templates_dir = g_strconcat(dir, G_DIR_SEPARATOR_S, + GEANY_TEMPLATES_SUBDIR, G_DIR_SEPARATOR_S, NULL); + if (! g_file_test(dir, G_FILE_TEST_EXISTS)) { geany_debug("creating config directory %s", dir); @@ -786,17 +787,11 @@ #endif } - if (error_nr == 0 && ! g_file_test(filetypes_readme, G_FILE_TEST_EXISTS)) - { // try to write template.README - gchar *text; - text = g_strconcat( -"There are several template files in this directory. For these templates you can use wildcards.\n\ -For more information read the documentation (in ", doc_dir, "index.html or visit " GEANY_HOMEPAGE ").", - NULL); - error_nr = utils_write_file(filetypes_readme, text); - g_free(text); + if (error_nr == 0 && ! g_file_test(conf_file, G_FILE_TEST_EXISTS)) + { // try to write geany.conf + error_nr = utils_write_file(conf_file, ""); - if (error_nr == 0 && ! g_file_test(filetypes_readme, G_FILE_TEST_EXISTS)) + if (error_nr == 0 && ! g_file_test(conf_file, G_FILE_TEST_EXISTS)) { // check whether write test was successful, otherwise directory is not writable geany_debug("The chosen configuration directory is not writable."); errno = EPERM; @@ -806,6 +801,9 @@ // make subdir for filetype definitions if (error_nr == 0) { + gchar *filedefs_readme = g_strconcat(dir, G_DIR_SEPARATOR_S, GEANY_FILEDEFS_SUBDIR, + G_DIR_SEPARATOR_S, "filetypes.README", NULL); + if (! g_file_test(filedefs_dir, G_FILE_TEST_EXISTS)) { #ifdef G_OS_WIN32 @@ -822,12 +820,39 @@ "the documentation (in ", doc_dir, "index.html or visit " GEANY_HOMEPAGE ").", NULL); utils_write_file(filedefs_readme, text); g_free(text); + g_free(filedefs_readme); } } - g_free(filetypes_readme); + // make subdir for template files + if (error_nr == 0) + { + gchar *templates_readme = g_strconcat(dir, G_DIR_SEPARATOR_S, GEANY_TEMPLATES_SUBDIR, + G_DIR_SEPARATOR_S, "templates.README", NULL); + + if (! g_file_test(templates_dir, G_FILE_TEST_EXISTS)) + { +#ifdef G_OS_WIN32 + if (mkdir(templates_dir) != 0) error_nr = errno; +#else + if (mkdir(templates_dir, 0700) != 0) error_nr = errno; +#endif + } + if (error_nr == 0 && ! g_file_test(templates_readme, G_FILE_TEST_EXISTS)) + { + gchar *text = g_strconcat( +"There are several template files in this directory. For these templates you can use wildcards.\n\ +For more information read the documentation (in ", doc_dir, "index.html or visit " GEANY_HOMEPAGE ").", + NULL); + utils_write_file(templates_readme, text); + g_free(text); + g_free(templates_readme); + } + } + g_free(filedefs_dir); - g_free(filedefs_readme); + g_free(templates_dir); + g_free(conf_file); return error_nr; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1162] trunk
by eht16＠users.sourceforge.net 06 Jan '07

06 Jan '07

Revision: 1162 http://svn.sourceforge.net/geany/?rev=1162&view=rev Author: eht16 Date: 2007-01-06 09:16:43 -0800 (Sat, 06 Jan 2007) Log Message: ----------- Fixed missing colouring of tab menu label. Modified Paths: -------------- trunk/ChangeLog trunk/src/ui_utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-06 15:38:44 UTC (rev 1161) +++ trunk/ChangeLog 2007-01-06 17:16:43 UTC (rev 1162) @@ -11,6 +11,7 @@ * geany.glade, doc/geany.docbook, src/callbacks.c, src/callbacks.h, src/interface.c, src/templates.c, src/templates.h: Added template for BSD licence. + * src/document.c: Fixed missing colouring of tab menu label. 2007-01-06 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2007-01-06 15:38:44 UTC (rev 1161) +++ trunk/src/ui_utils.c 2007-01-06 17:16:43 UTC (rev 1162) @@ -1,8 +1,8 @@ /* * ui_utils.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> - * Copyright 2006 Nick Treleaven <nick.treleaven(a)btinternet.com> + * Copyright 2006-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1183,6 +1183,8 @@ // NULL color will reset to default gtk_widget_modify_fg(doc_list[idx].tab_label, GTK_STATE_NORMAL, color); gtk_widget_modify_fg(doc_list[idx].tab_label, GTK_STATE_ACTIVE, color); + gtk_widget_modify_fg(doc_list[idx].tabmenu_label, GTK_STATE_NORMAL, color); + gtk_widget_modify_fg(doc_list[idx].tabmenu_label, GTK_STATE_ACTIVE, color); treeviews_openfiles_update(idx); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1161] trunk
by eht16＠users.sourceforge.net 06 Jan '07

06 Jan '07

Revision: 1161 http://svn.sourceforge.net/geany/?rev=1161&view=rev Author: eht16 Date: 2007-01-06 07:38:44 -0800 (Sat, 06 Jan 2007) Log Message: ----------- Added template for BSD licence. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.docbook trunk/geany.glade trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/interface.c trunk/src/templates.c trunk/src/templates.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-06 15:03:53 UTC (rev 1160) +++ trunk/ChangeLog 2007-01-06 15:38:44 UTC (rev 1161) @@ -8,6 +8,9 @@ "#" as comment char. The comment characters for fileheader and GPL templates are now added dynamically according to the current filetype. + * geany.glade, doc/geany.docbook, src/callbacks.c, src/callbacks.h, + src/interface.c, src/templates.c, src/templates.h: + Added template for BSD licence. 2007-01-06 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/doc/geany.docbook =================================================================== --- trunk/doc/geany.docbook 2007-01-06 15:03:53 UTC (rev 1160) +++ trunk/doc/geany.docbook 2007-01-06 15:38:44 UTC (rev 1161) @@ -1778,11 +1778,11 @@ </literal></literallayout> </para> </section> - <section> + <section id="templates"> <title>Templates</title> <para> <application>Geany</application> supports several templates for file headers, - multiline comments (frame comments), function descriptions, a typical ChangeLog entry + function descriptions, a typical ChangeLog entry and a short GPL notice. To use these templates, just open the Edit menu or open the popup menu by right-clicking in the editor widget, and choose "Insert Comments" and insert templates as you want. @@ -1843,51 +1843,60 @@ <row> <entry>developer</entry> <entry>The name of the developer.</entry> - <entry>filetypes, file header, function description, ChangeLog entry</entry> + <entry>filetypes, file header, function description, ChangeLog entry, + bsd, gpl</entry> </row> <row> <entry>initial</entry> <entry>The developer's initials, e.g. "ET" for Enrico Tröger or "JFD" for John Foobar Doe.</entry> - <entry>filetypes, file header, function description, ChangeLog entry</entry> + <entry>filetypes, file header, function description, ChangeLog entry, + bsd, gpl</entry> </row> <row> <entry>mail</entry> <entry>The email address of the developer.</entry> - <entry>file header, function description, ChangeLog entry</entry> + <entry>file header, function description, ChangeLog entry, + bsd, gpl</entry> </row> <row> <entry>company</entry> <entry>The company the developer is working for.</entry> - <entry>filetypes, file header, function description, ChangeLog entry</entry> + <entry>filetypes, file header, function description, ChangeLog entry, + bsd, gpl</entry> </row> <row> <entry>year</entry> <entry>The current year in the format: YYYY</entry> - <entry>filetypes, file header, function description, ChangeLog entry</entry> + <entry>filetypes, file header, function description, ChangeLog entry, + bsd, gpl</entry> </row> <row> <entry>version</entry> <entry>The initial version of a new file.</entry> - <entry>filetypes, file header, function description, ChangeLog entry</entry> + <entry>filetypes, file header, function description, ChangeLog entry, + bsd, gpl</entry> </row> <row> <entry>date</entry> <entry>The current date in the format: YYYY-MM-DD</entry> - <entry>filetypes, file header, function description, ChangeLog entry</entry> + <entry>filetypes, file header, function description, ChangeLog entry, + bsd, gpl</entry> </row> <row> <entry>untitled</entry> <entry>The string "untitled" (this will be translated to your locale), used in filetype templates</entry> - <entry>filetypes, file header, function description, ChangeLog entry</entry> + <entry>filetypes, file header, function description, ChangeLog entry, + bsd, gpl</entry> </row> <row> <entry>geanyversion</entry> <entry>The actual <application>Geany</application> version, e.g. "Geany &appversion;" </entry> - <entry>filetypes, file header, function description, ChangeLog entry</entry> + <entry>filetypes, file header, function description, ChangeLog entry, + bsd, gpl</entry> </row> <row> <entry>datetime</entry> @@ -1905,6 +1914,11 @@ <entry>file header</entry> </row> <row> + <entry>bsd</entry> + <entry>This wildcard inserts a short BSD licence notice.</entry> + <entry>file header</entry> + </row> + <row> <entry>functionname</entry> <entry>The function name of the function at the cursor position. This wildcard will only be replaced in the function Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2007-01-06 15:03:53 UTC (rev 1160) +++ trunk/geany.glade 2007-01-06 15:38:44 UTC (rev 1161) @@ -57,7 +57,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1331"> + <widget class="GtkImage" id="image1362"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -138,7 +138,7 @@ <signal name="activate" handler="on_save_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1332"> + <widget class="GtkImage" id="image1363"> <property name="visible">True</property> <property name="stock">gtk-save</property> <property name="icon_size">1</property> @@ -159,7 +159,7 @@ <signal name="activate" handler="on_toolbutton23_clicked" last_modification_time="Mon, 24 Jul 2006 19:26:04 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1333"> + <widget class="GtkImage" id="image1364"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -179,7 +179,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1334"> + <widget class="GtkImage" id="image1365"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -259,7 +259,7 @@ <signal name="activate" handler="on_close_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1335"> + <widget class="GtkImage" id="image1366"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -467,7 +467,7 @@ <signal name="activate" handler="on_menu_increase_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1336"> + <widget class="GtkImage" id="image1367"> <property name="visible">True</property> <property name="stock">gtk-indent</property> <property name="icon_size">1</property> @@ -488,7 +488,7 @@ <signal name="activate" handler="on_menu_decrease_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1337"> + <widget class="GtkImage" id="image1368"> <property name="visible">True</property> <property name="stock">gtk-unindent</property> <property name="icon_size">1</property> @@ -518,7 +518,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1338"> + <widget class="GtkImage" id="image1369"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -550,7 +550,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1339"> + <widget class="GtkImage" id="image1370"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -613,6 +613,16 @@ <signal name="activate" handler="on_menu_comments_gpl_activate" last_modification_time="Sun, 17 Dec 2006 19:01:32 GMT"/> </widget> </child> + + <child> + <widget class="GtkMenuItem" id="insert_bsd_license_notice2"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Inserts a BSD llicence notice (should be done at the beginning of the file)</property> + <property name="label" translatable="yes">Insert BSD license Notice</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_menu_comments_bsd_activate" last_modification_time="Fri, 05 Jan 2007 13:29:27 GMT"/> + </widget> + </child> </widget> </child> </widget> @@ -710,7 +720,7 @@ <signal name="activate" handler="on_replace1_activate" last_modification_time="Sun, 23 Oct 2005 13:22:36 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1340"> + <widget class="GtkImage" id="image1371"> <property name="visible">True</property> <property name="stock">gtk-find-and-replace</property> <property name="icon_size">1</property> @@ -752,7 +762,7 @@ <signal name="activate" handler="on_go_to_line1_activate" last_modification_time="Tue, 23 May 2006 17:10:49 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1341"> + <widget class="GtkImage" id="image1372"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> @@ -787,7 +797,7 @@ <signal name="activate" handler="on_change_font1_activate" last_modification_time="Fri, 22 Apr 2005 18:58:45 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1342"> + <widget class="GtkImage" id="image1373"> <property name="visible">True</property> <property name="stock">gtk-select-font</property> <property name="icon_size">1</property> @@ -1137,7 +1147,7 @@ <signal name="activate" handler="on_show_color_chooser1_activate" last_modification_time="Wed, 22 Jun 2005 18:10:21 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1343"> + <widget class="GtkImage" id="image1374"> <property name="visible">True</property> <property name="stock">gtk-select-color</property> <property name="icon_size">1</property> @@ -2405,7 +2415,7 @@ <signal name="activate" handler="on_menu_increase_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:31:38 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1289"> + <widget class="GtkImage" id="image1375"> <property name="visible">True</property> <property name="stock">gtk-indent</property> <property name="icon_size">1</property> @@ -2426,7 +2436,7 @@ <signal name="activate" handler="on_menu_decrease_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:31:38 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1290"> + <widget class="GtkImage" id="image1376"> <property name="visible">True</property> <property name="stock">gtk-unindent</property> <property name="icon_size">1</property> @@ -2456,7 +2466,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1291"> + <widget class="GtkImage" id="image1377"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -2488,7 +2498,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1292"> + <widget class="GtkImage" id="image1378"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -2551,6 +2561,16 @@ <signal name="activate" handler="on_comments_gpl_activate" last_modification_time="Sun, 02 Oct 2005 17:37:31 GMT"/> </widget> </child> + + <child> + <widget class="GtkMenuItem" id="insert_bsd_license_notice1"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Inserts a BSD llicence notice (should be done at the beginning of the file)</property> + <property name="label" translatable="yes">Insert BSD license Notice</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_comments_bsd_activate" last_modification_time="Fri, 05 Jan 2007 13:32:16 GMT"/> + </widget> + </child> </widget> </child> </widget> @@ -2590,7 +2610,7 @@ <signal name="activate" handler="on_find_usage1_activate" last_modification_time="Fri, 27 May 2005 21:55:12 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1293"> + <widget class="GtkImage" id="image1379"> <property name="visible">True</property> <property name="stock">gtk-find</property> <property name="icon_size">1</property> @@ -2636,7 +2656,7 @@ <signal name="activate" handler="on_go_to_line_activate" last_modification_time="Sat, 16 Jul 2005 11:20:32 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1294"> + <widget class="GtkImage" id="image1380"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2007-01-06 15:03:53 UTC (rev 1160) +++ trunk/src/callbacks.c 2007-01-06 15:38:44 UTC (rev 1161) @@ -1493,7 +1493,7 @@ gint idx = document_get_cur_idx(); gchar *text; - text = templates_get_template_licence(FILETYPE_ID(doc_list[idx].file_type)); + text = templates_get_template_licence(FILETYPE_ID(doc_list[idx].file_type), GEANY_TEMPLATE_GPL); verify_click_pos(idx); // make sure that the click_pos is valid @@ -1506,7 +1506,7 @@ on_comments_bsd_activate (GtkMenuItem *menuitem, gpointer user_data) { -/* + gint idx = document_get_cur_idx(); gchar *text; @@ -1516,7 +1516,7 @@ sci_insert_text(doc_list[idx].sci, editor_info.click_pos, text); g_free(text); -*/ + } Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2007-01-06 15:03:53 UTC (rev 1160) +++ trunk/src/callbacks.h 2007-01-06 15:38:44 UTC (rev 1161) @@ -1,7 +1,8 @@ /* * callbacks.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -562,3 +563,11 @@ void on_menu_insert_date_activate (GtkMenuItem *menuitem, gpointer user_data); + +void +on_menu_comments_bsd_activate (GtkMenuItem *menuitem, + gpointer user_data); + +void +on_comments_bsd_activate (GtkMenuItem *menuitem, + gpointer user_data); Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2007-01-06 15:03:53 UTC (rev 1160) +++ trunk/src/interface.c 2007-01-06 15:38:44 UTC (rev 1161) @@ -37,7 +37,7 @@ GtkWidget *menuitem1_menu; GtkWidget *menu_new1; GtkWidget *menu_new_with_template1; - GtkWidget *image1331; + GtkWidget *image1362; GtkWidget *menu_new_with_template1_menu; GtkWidget *invisible2; GtkWidget *separator12; @@ -47,11 +47,11 @@ GtkWidget *menu_save1; GtkWidget *menu_save_as1; GtkWidget *menu_save_all1; - GtkWidget *image1332; + GtkWidget *image1363; GtkWidget *menu_reload1; - GtkWidget *image1333; + GtkWidget *image1364; GtkWidget *menu_reload_as1; - GtkWidget *image1334; + GtkWidget *image1365; GtkWidget *menu_reload_as1_menu; GtkWidget *invisible7; GtkWidget *separator21; @@ -61,7 +61,7 @@ GtkWidget *separator14; GtkWidget *menu_close1; GtkWidget *menu_close_all1; - GtkWidget *image1335; + GtkWidget *image1366; GtkWidget *menu_separatormenuitem1; GtkWidget *menu_quit1; GtkWidget *edit1; @@ -87,22 +87,23 @@ GtkWidget *menu_duplicate_line1; GtkWidget *separator29; GtkWidget *menu_increase_indent1; - GtkWidget *image1336; + GtkWidget *image1367; GtkWidget *menu_decrease_indent1; - GtkWidget *image1337; + GtkWidget *image1368; GtkWidget *separator18; GtkWidget *insert_include2; - GtkWidget *image1338; + GtkWidget *image1369; GtkWidget *insert_include2_menu; GtkWidget *invisible4; GtkWidget *add_comments1; - GtkWidget *image1339; + GtkWidget *image1370; GtkWidget *add_comments1_menu; GtkWidget *menu_add_changelog_entry1; GtkWidget *insert_file_header1; GtkWidget *insert_function_description2; GtkWidget *insert_multiline_comment2; GtkWidget *insert_gpl_notice2; + GtkWidget *insert_bsd_license_notice2; GtkWidget *insert_date1; GtkWidget *insert_date1_menu; GtkWidget *invisible8; @@ -115,16 +116,16 @@ GtkWidget *find_previous1; GtkWidget *find_in_files1; GtkWidget *replace1; - GtkWidget *image1340; + GtkWidget *image1371; GtkWidget *separator33; GtkWidget *next_message1; GtkWidget *separator32; GtkWidget *go_to_line1; - GtkWidget *image1341; + GtkWidget *image1372; GtkWidget *menuitem3; GtkWidget *menuitem3_menu; GtkWidget *menu_change_font1; - GtkWidget *image1342; + GtkWidget *image1373; GtkWidget *menu_separator4; GtkWidget *menu_fullscreen1; GtkWidget *menu_show_messages_window1; @@ -166,7 +167,7 @@ GtkWidget *tools1; GtkWidget *tools1_menu; GtkWidget *menu_choose_color1; - GtkWidget *image1343; + GtkWidget *image1374; GtkWidget *menu_count_words1; GtkWidget *menu_insert_special_chars1; GtkWidget *menu_item5; @@ -267,9 +268,9 @@ gtk_widget_show (menu_new_with_template1); gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_new_with_template1); - image1331 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1331); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image1331); + image1362 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1362); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image1362); menu_new_with_template1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_new_with_template1), menu_new_with_template1_menu); @@ -308,25 +309,25 @@ gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_save_all1); gtk_tooltips_set_tip (tooltips, menu_save_all1, _("Saves all open files"), NULL); - image1332 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1332); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image1332); + image1363 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1363); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image1363); menu_reload1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload")); gtk_widget_show (menu_reload1); gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_reload1); - image1333 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1333); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image1333); + image1364 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1364); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image1364); menu_reload_as1 = gtk_image_menu_item_new_with_mnemonic (_("R_eload As")); gtk_widget_show (menu_reload_as1); gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_reload_as1); - image1334 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1334); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image1334); + image1365 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1365); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image1365); menu_reload_as1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_reload_as1), menu_reload_as1_menu); @@ -367,9 +368,9 @@ gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_close_all1); gtk_tooltips_set_tip (tooltips, menu_close_all1, _("Closes all open files"), NULL); - image1335 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1335); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image1335); + image1366 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1366); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image1366); menu_separatormenuitem1 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separatormenuitem1); @@ -477,17 +478,17 @@ gtk_widget_show (menu_increase_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_increase_indent1); - image1336 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1336); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image1336); + image1367 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1367); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image1367); menu_decrease_indent1 = gtk_image_menu_item_new_with_mnemonic (_("_Decrease Indent")); gtk_widget_show (menu_decrease_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_decrease_indent1); - image1337 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1337); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image1337); + image1368 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1368); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image1368); separator18 = gtk_separator_menu_item_new (); gtk_widget_show (separator18); @@ -498,9 +499,9 @@ gtk_widget_show (insert_include2); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2); - image1338 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1338); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image1338); + image1369 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1369); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image1369); insert_include2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu); @@ -512,9 +513,9 @@ gtk_widget_show (add_comments1); gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1); - image1339 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1339); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image1339); + image1370 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1370); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image1370); add_comments1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu); @@ -544,6 +545,11 @@ gtk_container_add (GTK_CONTAINER (add_comments1_menu), insert_gpl_notice2); gtk_tooltips_set_tip (tooltips, insert_gpl_notice2, _("Inserts a GPL notice (should be done at the beginning of the file)"), NULL); + insert_bsd_license_notice2 = gtk_menu_item_new_with_mnemonic (_("Insert BSD license Notice")); + gtk_widget_show (insert_bsd_license_notice2); + gtk_container_add (GTK_CONTAINER (add_comments1_menu), insert_bsd_license_notice2); + gtk_tooltips_set_tip (tooltips, insert_bsd_license_notice2, _("Inserts a BSD llicence notice (should be done at the beginning of the file)"), NULL); + insert_date1 = gtk_menu_item_new_with_mnemonic (_("Insert Dat_e")); gtk_widget_show (insert_date1); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_date1); @@ -590,9 +596,9 @@ gtk_widget_show (replace1); gtk_container_add (GTK_CONTAINER (search1_menu), replace1); - image1340 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1340); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image1340); + image1371 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1371); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image1371); separator33 = gtk_separator_menu_item_new (); gtk_widget_show (separator33); @@ -612,9 +618,9 @@ gtk_widget_show (go_to_line1); gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1); - image1341 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1341); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image1341); + image1372 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1372); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image1372); menuitem3 = gtk_menu_item_new_with_mnemonic (_("_View")); gtk_widget_show (menuitem3); @@ -628,9 +634,9 @@ gtk_container_add (GTK_CONTAINER (menuitem3_menu), menu_change_font1); gtk_tooltips_set_tip (tooltips, menu_change_font1, _("Change the default font"), NULL); - image1342 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1342); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image1342); + image1373 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1373); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image1373); menu_separator4 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separator4); @@ -815,9 +821,9 @@ gtk_container_add (GTK_CONTAINER (tools1_menu), menu_choose_color1); gtk_tooltips_set_tip (tooltips, menu_choose_color1, _("Open a color chooser dialog, to interactively pick colors from a palette."), NULL); - image1343 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1343); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image1343); + image1374 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1374); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image1374); menu_count_words1 = gtk_menu_item_new_with_mnemonic (_("_Word Count")); gtk_widget_show (menu_count_words1); @@ -1225,6 +1231,9 @@ g_signal_connect ((gpointer) insert_gpl_notice2, "activate", G_CALLBACK (on_menu_comments_gpl_activate), NULL); + g_signal_connect ((gpointer) insert_bsd_license_notice2, "activate", + G_CALLBACK (on_menu_comments_bsd_activate), + NULL); g_signal_connect ((gpointer) preferences1, "activate", G_CALLBACK (on_preferences1_activate), NULL); @@ -1412,7 +1421,7 @@ GLADE_HOOKUP_OBJECT (window1, menuitem1_menu, "menuitem1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_new1, "menu_new1"); GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1, "menu_new_with_template1"); - GLADE_HOOKUP_OBJECT (window1, image1331, "image1331"); + GLADE_HOOKUP_OBJECT (window1, image1362, "image1362"); GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1_menu, "menu_new_with_template1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible2, "invisible2"); GLADE_HOOKUP_OBJECT (window1, separator12, "separator12"); @@ -1422,11 +1431,11 @@ GLADE_HOOKUP_OBJECT (window1, menu_save1, "menu_save1"); GLADE_HOOKUP_OBJECT (window1, menu_save_as1, "menu_save_as1"); GLADE_HOOKUP_OBJECT (window1, menu_save_all1, "menu_save_all1"); - GLADE_HOOKUP_OBJECT (window1, image1332, "image1332"); + GLADE_HOOKUP_OBJECT (window1, image1363, "image1363"); GLADE_HOOKUP_OBJECT (window1, menu_reload1, "menu_reload1"); - GLADE_HOOKUP_OBJECT (window1, image1333, "image1333"); + GLADE_HOOKUP_OBJECT (window1, image1364, "image1364"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1, "menu_reload_as1"); - GLADE_HOOKUP_OBJECT (window1, image1334, "image1334"); + GLADE_HOOKUP_OBJECT (window1, image1365, "image1365"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1_menu, "menu_reload_as1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible7, "invisible7"); GLADE_HOOKUP_OBJECT (window1, separator21, "separator21"); @@ -1436,7 +1445,7 @@ GLADE_HOOKUP_OBJECT (window1, separator14, "separator14"); GLADE_HOOKUP_OBJECT (window1, menu_close1, "menu_close1"); GLADE_HOOKUP_OBJECT (window1, menu_close_all1, "menu_close_all1"); - GLADE_HOOKUP_OBJECT (window1, image1335, "image1335"); + GLADE_HOOKUP_OBJECT (window1, image1366, "image1366"); GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1"); GLADE_HOOKUP_OBJECT (window1, menu_quit1, "menu_quit1"); GLADE_HOOKUP_OBJECT (window1, edit1, "edit1"); @@ -1462,22 +1471,23 @@ GLADE_HOOKUP_OBJECT (window1, menu_duplicate_line1, "menu_duplicate_line1"); GLADE_HOOKUP_OBJECT (window1, separator29, "separator29"); GLADE_HOOKUP_OBJECT (window1, menu_increase_indent1, "menu_increase_indent1"); - GLADE_HOOKUP_OBJECT (window1, image1336, "image1336"); + GLADE_HOOKUP_OBJECT (window1, image1367, "image1367"); GLADE_HOOKUP_OBJECT (window1, menu_decrease_indent1, "menu_decrease_indent1"); - GLADE_HOOKUP_OBJECT (window1, image1337, "image1337"); + GLADE_HOOKUP_OBJECT (window1, image1368, "image1368"); GLADE_HOOKUP_OBJECT (window1, separator18, "separator18"); GLADE_HOOKUP_OBJECT (window1, insert_include2, "insert_include2"); - GLADE_HOOKUP_OBJECT (window1, image1338, "image1338"); + GLADE_HOOKUP_OBJECT (window1, image1369, "image1369"); GLADE_HOOKUP_OBJECT (window1, insert_include2_menu, "insert_include2_menu"); GLADE_HOOKUP_OBJECT (window1, invisible4, "invisible4"); GLADE_HOOKUP_OBJECT (window1, add_comments1, "add_comments1"); - GLADE_HOOKUP_OBJECT (window1, image1339, "image1339"); + GLADE_HOOKUP_OBJECT (window1, image1370, "image1370"); GLADE_HOOKUP_OBJECT (window1, add_comments1_menu, "add_comments1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_add_changelog_entry1, "menu_add_changelog_entry1"); GLADE_HOOKUP_OBJECT (window1, insert_file_header1, "insert_file_header1"); GLADE_HOOKUP_OBJECT (window1, insert_function_description2, "insert_function_description2"); GLADE_HOOKUP_OBJECT (window1, insert_multiline_comment2, "insert_multiline_comment2"); GLADE_HOOKUP_OBJECT (window1, insert_gpl_notice2, "insert_gpl_notice2"); + GLADE_HOOKUP_OBJECT (window1, insert_bsd_license_notice2, "insert_bsd_license_notice2"); GLADE_HOOKUP_OBJECT (window1, insert_date1, "insert_date1"); GLADE_HOOKUP_OBJECT (window1, insert_date1_menu, "insert_date1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible8, "invisible8"); @@ -1490,16 +1500,16 @@ GLADE_HOOKUP_OBJECT (window1, find_previous1, "find_previous1"); GLADE_HOOKUP_OBJECT (window1, find_in_files1, "find_in_files1"); GLADE_HOOKUP_OBJECT (window1, replace1, "replace1"); - GLADE_HOOKUP_OBJECT (window1, image1340, "image1340"); + GLADE_HOOKUP_OBJECT (window1, image1371, "image1371"); GLADE_HOOKUP_OBJECT (window1, separator33, "separator33"); GLADE_HOOKUP_OBJECT (window1, next_message1, "next_message1"); GLADE_HOOKUP_OBJECT (window1, separator32, "separator32"); GLADE_HOOKUP_OBJECT (window1, go_to_line1, "go_to_line1"); - GLADE_HOOKUP_OBJECT (window1, image1341, "image1341"); + GLADE_HOOKUP_OBJECT (window1, image1372, "image1372"); GLADE_HOOKUP_OBJECT (window1, menuitem3, "menuitem3"); GLADE_HOOKUP_OBJECT (window1, menuitem3_menu, "menuitem3_menu"); GLADE_HOOKUP_OBJECT (window1, menu_change_font1, "menu_change_font1"); - GLADE_HOOKUP_OBJECT (window1, image1342, "image1342"); + GLADE_HOOKUP_OBJECT (window1, image1373, "image1373"); GLADE_HOOKUP_OBJECT (window1, menu_separator4, "menu_separator4"); GLADE_HOOKUP_OBJECT (window1, menu_fullscreen1, "menu_fullscreen1"); GLADE_HOOKUP_OBJECT (window1, menu_show_messages_window1, "menu_show_messages_window1"); @@ -1540,7 +1550,7 @@ GLADE_HOOKUP_OBJECT (window1, tools1, "tools1"); GLADE_HOOKUP_OBJECT (window1, tools1_menu, "tools1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_choose_color1, "menu_choose_color1"); - GLADE_HOOKUP_OBJECT (window1, image1343, "image1343"); + GLADE_HOOKUP_OBJECT (window1, image1374, "image1374"); GLADE_HOOKUP_OBJECT (window1, menu_count_words1, "menu_count_words1"); GLADE_HOOKUP_OBJECT (window1, menu_insert_special_chars1, "menu_insert_special_chars1"); GLADE_HOOKUP_OBJECT (window1, menu_item5, "menu_item5"); @@ -1740,33 +1750,34 @@ GtkWidget *menu_duplicate_line2; GtkWidget *separator31; GtkWidget *menu_increase_indent2; - GtkWidget *image1289; + GtkWidget *image1375; GtkWidget *menu_decrease_indent2; - GtkWidget *image1290; + GtkWidget *image1376; GtkWidget *separator17; GtkWidget *insert_include1; - GtkWidget *image1291; + GtkWidget *image1377; GtkWidget *insert_include1_menu; GtkWidget *invisible3; GtkWidget *comments; - GtkWidget *image1292; + GtkWidget *image1378; GtkWidget *comments_menu; GtkWidget *add_changelog_entry2; GtkWidget *insert_file_header2; GtkWidget *insert_function_description1; GtkWidget *insert_multiline_comment1; GtkWidget *insert_gpl_notice1; + GtkWidget *insert_bsd_license_notice1; GtkWidget *insert_date2; GtkWidget *insert_date2_menu; GtkWidget *invisible10; GtkWidget *separator7; GtkWidget *find_usage1; - GtkWidget *image1293; + GtkWidget *image1379; GtkWidget *goto_tag_definition1; GtkWidget *goto_tag_declaration1; GtkWidget *separator15; GtkWidget *go_to_line; - GtkWidget *image1294; + GtkWidget *image1380; GtkAccelGroup *accel_group; GtkTooltips *tooltips; @@ -1881,17 +1892,17 @@ gtk_widget_show (menu_increase_indent2); gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_increase_indent2); - image1289 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1289); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent2), image1289); + image1375 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1375); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent2), image1375); menu_decrease_indent2 = gtk_image_menu_item_new_with_mnemonic (_("_Decrease Indent")); gtk_widget_show (menu_decrease_indent2); gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_decrease_indent2); - image1290 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1290); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent2), image1290); + image1376 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1376); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent2), image1376); separator17 = gtk_separator_menu_item_new (); gtk_widget_show (separator17); @@ -1902,9 +1913,9 @@ gtk_widget_show (insert_include1); gtk_container_add (GTK_CONTAINER (edit_menu1), insert_include1); - image1291 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1291); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image1291); + image1377 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1377); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image1377); insert_include1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include1), insert_include1_menu); @@ -1916,9 +1927,9 @@ gtk_widget_show (comments); gtk_container_add (GTK_CONTAINER (edit_menu1), comments); - image1292 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1292); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image1292); + image1378 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1378); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image1378); comments_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (comments), comments_menu); @@ -1948,6 +1959,11 @@ gtk_container_add (GTK_CONTAINER (comments_menu), insert_gpl_notice1); gtk_tooltips_set_tip (tooltips, insert_gpl_notice1, _("Inserts a GPL notice (should be done at the beginning of the file)"), NULL); + insert_bsd_license_notice1 = gtk_menu_item_new_with_mnemonic (_("Insert BSD license Notice")); + gtk_widget_show (insert_bsd_license_notice1); + gtk_container_add (GTK_CONTAINER (comments_menu), insert_bsd_license_notice1); + gtk_tooltips_set_tip (tooltips, insert_bsd_license_notice1, _("Inserts a BSD llicence notice (should be done at the beginning of the file)"), NULL); + insert_date2 = gtk_menu_item_new_with_mnemonic (_("Insert Dat_e")); gtk_widget_show (insert_date2); gtk_container_add (GTK_CONTAINER (edit_menu1), insert_date2); @@ -1967,9 +1983,9 @@ gtk_widget_show (find_usage1); gtk_container_add (GTK_CONTAINER (edit_menu1), find_usage1); - image1293 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1293); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image1293); + image1379 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1379); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image1379); goto_tag_definition1 = gtk_menu_item_new_with_mnemonic (_("Go to Tag Definition")); gtk_widget_show (goto_tag_definition1); @@ -1989,9 +2005,9 @@ gtk_container_add (GTK_CONTAINER (edit_menu1), go_to_line); gtk_tooltips_set_tip (tooltips, go_to_line, _("Goto to the entered line"), NULL); - image1294 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1294); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line), image1294); + image1380 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1380); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line), image1380); g_signal_connect ((gpointer) undo1, "activate", G_CALLBACK (on_undo1_activate), @@ -2062,6 +2078,9 @@ g_signal_connect ((gpointer) insert_gpl_notice1, "activate", G_CALLBACK (on_comments_gpl_activate), NULL); + g_signal_connect ((gpointer) insert_bsd_license_notice1, "activate", + G_CALLBACK (on_comments_bsd_activate), + NULL); g_signal_connect ((gpointer) find_usage1, "activate", G_CALLBACK (on_find_usage1_activate), NULL); @@ -2102,33 +2121,34 @@ GLADE_HOOKUP_OBJECT (edit_menu1, menu_duplicate_line2, "menu_duplicate_line2"); GLADE_HOOKUP_OBJECT (edit_menu1, separator31, "separator31"); GLADE_HOOKUP_OBJECT (edit_menu1, menu_increase_indent2, "menu_increase_indent2"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1289, "image1289"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1375, "image1375"); GLADE_HOOKUP_OBJECT (edit_menu1, menu_decrease_indent2, "menu_decrease_indent2"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1290, "image1290"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1376, "image1376"); GLADE_HOOKUP_OBJECT (edit_menu1, separator17, "separator17"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1, "insert_include1"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1291, "image1291"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1377, "image1377"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1_menu, "insert_include1_menu"); GLADE_HOOKUP_OBJECT (edit_menu1, invisible3, "invisible3"); GLADE_HOOKUP_OBJECT (edit_menu1, comments, "comments"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1292, "image1292"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1378, "image1378"); GLADE_HOOKUP_OBJECT (edit_menu1, comments_menu, "comments_menu"); GLADE_HOOKUP_OBJECT (edit_menu1, add_changelog_entry2, "add_changelog_entry2"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_file_header2, "insert_file_header2"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_function_description1, "insert_function_description1"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_multiline_comment1, "insert_multiline_comment1"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_gpl_notice1, "insert_gpl_notice1"); + GLADE_HOOKUP_OBJECT (edit_menu1, insert_bsd_license_notice1, "insert_bsd_license_notice1"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_date2, "insert_date2"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_date2_menu, "insert_date2_menu"); GLADE_HOOKUP_OBJECT (edit_menu1, invisible10, "invisible10"); GLADE_HOOKUP_OBJECT (edit_menu1, separator7, "separator7"); GLADE_HOOKUP_OBJECT (edit_menu1, find_usage1, "find_usage1"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1293, "image1293"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1379, "image1379"); GLADE_HOOKUP_OBJECT (edit_menu1, goto_tag_definition1, "goto_tag_definition1"); GLADE_HOOKUP_OBJECT (edit_menu1, goto_tag_declaration1, "goto_tag_declaration1"); GLADE_HOOKUP_OBJECT (edit_menu1, separator15, "separator15"); GLADE_HOOKUP_OBJECT (edit_menu1, go_to_line, "go_to_line"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1294, "image1294"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1380, "image1380"); GLADE_HOOKUP_OBJECT_NO_REF (edit_menu1, tooltips, "tooltips"); gtk_menu_set_accel_group (GTK_MENU (edit_menu1), accel_group); Modified: trunk/src/templates.c =================================================================== --- trunk/src/templates.c 2007-01-06 15:03:53 UTC (rev 1160) +++ trunk/src/templates.c 2007-01-06 15:38:44 UTC (rev 1161) @@ -49,6 +49,34 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n\ "; +static const gchar templates_bsd_notice[] = "\ +Redistribution and use in source and binary forms, with or without\n\ +modification, are permitted provided that the following conditions are\n\ +met:\n\ +\n\ +* Redistributions of source code must retain the above copyright\n\ + notice, this list of conditions and the following disclaimer.\n\ +* Redistributions in binary form must reproduce the above\n\ + copyright notice, this list of conditions and the following disclaimer\n\ + in the documentation and/or other materials provided with the\n\ + distribution.\n\ +* Neither the name of the {company} nor the names of its\n\ + contributors may be used to endorse or promote products derived from\n\ + this software without specific prior written permission.\n\ +\n\ +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\ +\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n\ +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n\ +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n\ +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n\ +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n\ +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n\ +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n\ +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n\ +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n\ +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n\ +"; + static const gchar templates_function_description[] = "\ \n\ name: {functionname}\n\ @@ -189,6 +217,7 @@ { gchar *template_filename_fileheader = TEMPLATES_GET_FILENAME("template.fileheader"); gchar *template_filename_gpl = TEMPLATES_GET_FILENAME("template.gpl"); + gchar *template_filename_bsd = TEMPLATES_GET_FILENAME("template.bsd"); gchar *template_filename_function = TEMPLATES_GET_FILENAME("template.function"); gchar *template_filename_changelog = TEMPLATES_GET_FILENAME("template.changelog"); gchar *template_filename_filetype_none = TEMPLATES_GET_FILENAME("template.filetype.none"); @@ -210,6 +239,7 @@ // create the template files in the configuration directory, if they don't exist TEMPLATES_CREATE_FILE(template_filename_fileheader, templates_fileheader); TEMPLATES_CREATE_FILE(template_filename_gpl, templates_gpl_notice); + TEMPLATES_CREATE_FILE(template_filename_bsd, templates_bsd_notice); TEMPLATES_CREATE_FILE(template_filename_function, templates_function_description); TEMPLATES_CREATE_FILE(template_filename_changelog, templates_changelog); TEMPLATES_CREATE_FILE(template_filename_filetype_none, templates_filetype_none); @@ -227,8 +257,11 @@ templates[GEANY_TEMPLATE_FILEHEADER] = templates_replace_all(templates[GEANY_TEMPLATE_FILEHEADER], year, date); TEMPLATES_READ_FILE(template_filename_gpl, &templates[GEANY_TEMPLATE_GPL]); - //templates[GEANY_TEMPLATE_GPL] = templates_replace_all(templates[GEANY_TEMPLATE_GPL], year, date); + templates[GEANY_TEMPLATE_GPL] = templates_replace_all(templates[GEANY_TEMPLATE_GPL], year, date); + TEMPLATES_READ_FILE(template_filename_bsd, &templates[GEANY_TEMPLATE_BSD]); + templates[GEANY_TEMPLATE_BSD] = templates_replace_all(templates[GEANY_TEMPLATE_BSD], year, date); + TEMPLATES_READ_FILE(template_filename_function, &templates[GEANY_TEMPLATE_FUNCTION]); templates[GEANY_TEMPLATE_FUNCTION] = templates_replace_all(templates[GEANY_TEMPLATE_FUNCTION], year, date); @@ -268,6 +301,7 @@ g_free(year); g_free(template_filename_fileheader); g_free(template_filename_gpl); + g_free(template_filename_bsd); g_free(template_filename_function); g_free(template_filename_changelog); g_free(template_filename_filetype_none); @@ -414,12 +448,12 @@ } -gchar *templates_get_template_licence(gint filetype_idx) +gchar *templates_get_template_licence(gint filetype_idx, gint licence_type) { - //if (licence_type != GEANY_TEMPLATE_GPL) - //return NULL; + if (licence_type != GEANY_TEMPLATE_GPL && licence_type != GEANY_TEMPLATE_BSD) + return NULL; - return make_comment_block(templates[GEANY_TEMPLATE_GPL], filetype_idx, 8); + return make_comment_block(templates[licence_type], filetype_idx, 8); } @@ -444,6 +478,8 @@ template = utils_str_replace(template, "{gpl}", templates[GEANY_TEMPLATE_GPL]); + template = utils_str_replace(template, "{bsd}", templates[GEANY_TEMPLATE_BSD]); + template = utils_str_replace(template, "{datetime}", date); result = make_comment_block(template, FILETYPE_ID(ft), 8); Modified: trunk/src/templates.h =================================================================== --- trunk/src/templates.h 2007-01-06 15:03:53 UTC (rev 1160) +++ trunk/src/templates.h 2007-01-06 15:38:44 UTC (rev 1161) @@ -38,7 +38,7 @@ gchar *templates_get_template_function(gint filetype_idx, const gchar *func_name); -gchar *templates_get_template_licence(gint filetype_idx); +gchar *templates_get_template_licence(gint filetype_idx, gint licence_type); void templates_free_templates(void); @@ -46,6 +46,7 @@ enum { GEANY_TEMPLATE_GPL = 0, + GEANY_TEMPLATE_BSD, GEANY_TEMPLATE_FILEHEADER, GEANY_TEMPLATE_CHANGELOG, GEANY_TEMPLATE_FUNCTION, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1160] trunk
by eht16＠users.sourceforge.net 06 Jan '07

06 Jan '07

Revision: 1160 http://svn.sourceforge.net/geany/?rev=1160&view=rev Author: eht16 Date: 2007-01-06 07:03:53 -0800 (Sat, 06 Jan 2007) Log Message: ----------- Removed multiline template because it makes not much sense, instead just comment three lines using the general comment functionality. Removed special templates for Pascal and some other filetypes using "#" as comment char. The comment characters for fileheader and GPL templates are now added dynamically according to the current filetype. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/sci_cb.c trunk/src/sci_cb.h trunk/src/templates.c trunk/src/templates.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-06 12:35:43 UTC (rev 1159) +++ trunk/ChangeLog 2007-01-06 15:03:53 UTC (rev 1160) @@ -1,3 +1,15 @@ +2007-01-06 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/callbacks.c, src/sci_cb.c, src/sci_cb.h, src/templates.c, + src/templates.h: + Removed multiline template because it makes not much sense, instead + just comment three lines using the general comment functionality. + Removed special templates for Pascal and some other filetypes using + "#" as comment char. The comment characters for fileheader and GPL + templates are now added dynamically according to the current + filetype. + + 2007-01-06 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/keybindings.c: Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2007-01-06 12:35:43 UTC (rev 1159) +++ trunk/src/callbacks.c 2007-01-06 15:03:53 UTC (rev 1160) @@ -1,7 +1,8 @@ /* * callbacks.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1460,27 +1461,7 @@ line = utils_get_current_function(idx, &cur_tag); pos = sci_get_position_from_line(doc_list[idx].sci, line - 1); - switch (doc_list[idx].file_type->id) - { - case GEANY_FILETYPES_PASCAL: - { - text = templates_get_template_function(GEANY_TEMPLATE_FUNCTION_PASCAL, cur_tag); - break; - } - case GEANY_FILETYPES_PYTHON: - case GEANY_FILETYPES_RUBY: - case GEANY_FILETYPES_SH: - case GEANY_FILETYPES_MAKE: - case GEANY_FILETYPES_PERL: - { - text = templates_get_template_function(GEANY_TEMPLATE_FUNCTION_ROUTE, cur_tag); - break; - } - default: - { - text = templates_get_template_function(GEANY_TEMPLATE_FUNCTION, cur_tag); - } - } + text = templates_get_template_function(doc_list[idx].file_type->id, cur_tag); sci_insert_text(doc_list[idx].sci, pos, text); g_free(text); @@ -1492,36 +1473,28 @@ gpointer user_data) { gint idx = document_get_cur_idx(); - gchar *text; - if (doc_list[idx].file_type == NULL) + if (! DOC_IDX_VALID(idx) || doc_list[idx].file_type == NULL) { ui_set_statusbar(_("Please set the filetype for the current file before using this function.")); return; } - switch (doc_list[idx].file_type->id) - { - case GEANY_FILETYPES_PASCAL: - { - text = templates_get_template_generic(GEANY_TEMPLATE_MULTILINE_PASCAL); - break; - } - case GEANY_FILETYPES_PYTHON: - case GEANY_FILETYPES_RUBY: - case GEANY_FILETYPES_SH: - case GEANY_FILETYPES_MAKE: - case GEANY_FILETYPES_PERL: - { - text = templates_get_template_generic(GEANY_TEMPLATE_MULTILINE_ROUTE); - break; - } - default: - { - text = templates_get_template_generic(GEANY_TEMPLATE_MULTILINE); - } - } + verify_click_pos(idx); // make sure that the click_pos is valid + sci_cb_insert_multiline_comment(idx); +} + + +void +on_comments_gpl_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + gint idx = document_get_cur_idx(); + gchar *text; + + text = templates_get_template_licence(FILETYPE_ID(doc_list[idx].file_type)); + verify_click_pos(idx); // make sure that the click_pos is valid sci_insert_text(doc_list[idx].sci, editor_info.click_pos, text); @@ -1530,18 +1503,20 @@ void -on_comments_gpl_activate (GtkMenuItem *menuitem, +on_comments_bsd_activate (GtkMenuItem *menuitem, gpointer user_data) { +/* gint idx = document_get_cur_idx(); gchar *text; - text = templates_get_template_gpl(FILETYPE_ID(doc_list[idx].file_type)); + text = templates_get_template_licence(FILETYPE_ID(doc_list[idx].file_type), GEANY_TEMPLATE_BSD); verify_click_pos(idx); // make sure that the click_pos is valid sci_insert_text(doc_list[idx].sci, editor_info.click_pos, text); g_free(text); +*/ } @@ -1944,7 +1919,7 @@ { gint idx = document_get_cur_idx(); if (idx == -1 || ! doc_list[idx].is_valid) return; - sci_cb_do_comment(idx, -1); + sci_cb_do_comment(idx, -1, FALSE); } @@ -2075,6 +2050,15 @@ void +on_menu_comments_bsd_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + insert_callback_from_menu = TRUE; + on_comments_bsd_activate(menuitem, user_data); +} + + +void on_menu_insert_include_activate (GtkMenuItem *menuitem, gpointer user_data) { @@ -2090,3 +2074,6 @@ insert_callback_from_menu = TRUE; on_insert_date_activate(menuitem, user_data); } + + + Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2007-01-06 12:35:43 UTC (rev 1159) +++ trunk/src/sci_cb.c 2007-01-06 15:03:53 UTC (rev 1160) @@ -1,7 +1,8 @@ /* * sci_cb.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1479,7 +1480,7 @@ if (do_continue) continue; // we are still here, so the above lines were not already comments, so comment it - sci_cb_do_comment(idx, i); + sci_cb_do_comment(idx, i, FALSE); count_commented++; } // use multi line comment @@ -1566,7 +1567,7 @@ } -void sci_cb_do_comment(gint idx, gint line) +void sci_cb_do_comment(gint idx, gint line, gboolean allow_empty_lines) { gint first_line, last_line; gint x, i, line_start, line_len; @@ -1622,10 +1623,14 @@ sci_get_text_range(doc_list[idx].sci, line_start, MIN((line_start + 256), (line_start + line_len - 1)), sel); sel[MIN(256, (line_len - 1))] = '\0'; + /// TODO fix the above code to remove the described segfault below + // The following loop causes a segfault when the cursor is on the last line of doc and + // there are no other characters on this line and Geany was compiled with -O2, with -O0 + // all works fine. while (isspace(sel[x])) x++; // to skip blank lines - if (x < line_len && sel[x] != '\0') + if (allow_empty_lines || (x < line_len && sel[x] != '\0')) { // use single line comment if (cc == NULL || strlen(cc) == 0) @@ -1938,3 +1943,59 @@ return -1; } } + + +// inserts a three-line comment at one line above current cursor position +void sci_cb_insert_multiline_comment(gint idx) +{ + gchar *text; + gint text_len; + gint line; + gint pos; + gboolean have_multiline_comment = FALSE; + + if (doc_list[idx].file_type->comment_close != NULL && + strlen(doc_list[idx].file_type->comment_close) > 0) + have_multiline_comment = TRUE; + + // insert three lines one line above of the current position + line = sci_get_line_from_position(doc_list[idx].sci, editor_info.click_pos); + pos = sci_get_position_from_line(doc_list[idx].sci, line); + + // use the indentation on the current line but only when comment indention is used + // and we don't have multi line comment characters + if (doc_list[idx].use_auto_indention && ! have_multiline_comment && + doc_list[idx].file_type->comment_use_indent) + { + get_indent(doc_list[idx].sci, editor_info.click_pos, TRUE); + text = g_strdup_printf("%s\n%s\n%s\n", indent, indent, indent); + text_len = strlen(text); + } + else + { + text = g_strdup("\n\n\n"); + text_len = 3; + } + sci_insert_text(doc_list[idx].sci, pos, text); + g_free(text); + + + // select the inserted lines for commenting + sci_set_selection_start(doc_list[idx].sci, pos); + sci_set_selection_end(doc_list[idx].sci, pos + text_len); + + sci_cb_do_comment(idx, -1, TRUE); + + // set the current position to the start of the first inserted line + pos += strlen(doc_list[idx].file_type->comment_open); + + // on multi line comment jump to the next line, otherwise add the length of added indentation + if (have_multiline_comment) + pos += 1; + else + pos += strlen(indent); + + sci_set_current_position(doc_list[idx].sci, pos); + // reset the selection + sci_set_anchor(doc_list[idx].sci, pos); +} Modified: trunk/src/sci_cb.h =================================================================== --- trunk/src/sci_cb.h 2007-01-06 12:35:43 UTC (rev 1159) +++ trunk/src/sci_cb.h 2007-01-06 15:03:53 UTC (rev 1160) @@ -1,7 +1,8 @@ /* * sci_cb.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -69,7 +70,7 @@ void sci_cb_do_comment_toggle(gint idx); -void sci_cb_do_comment(gint idx, gint line); +void sci_cb_do_comment(gint idx, gint line, gboolean allow_empty_lines); void sci_cb_do_uncomment(gint idx, gint line); @@ -83,4 +84,6 @@ gint sci_cb_lexer_get_type_keyword_idx(gint lexer); +void sci_cb_insert_multiline_comment(gint idx); + #endif Modified: trunk/src/templates.c =================================================================== --- trunk/src/templates.c 2007-01-06 12:35:43 UTC (rev 1159) +++ trunk/src/templates.c 2007-01-06 15:03:53 UTC (rev 1160) @@ -1,7 +1,8 @@ /* * templates.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +22,7 @@ */ #include <time.h> +#include <string.h> #include "geany.h" @@ -32,115 +34,41 @@ // default templates, only for initial tempate file creation on first start of Geany static const gchar templates_gpl_notice[] = "\ - * This program is free software; you can redistribute it and/or modify\n\ - * it under the terms of the GNU General Public License as published by\n\ - * the Free Software Foundation; either version 2 of the License, or\n\ - * (at your option) any later version.\n\ - *\n\ - * This program is distributed in the hope that it will be useful,\n\ - * but WITHOUT ANY WARRANTY; without even the implied warranty of\n\ - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\ - * GNU General Public License for more details.\n\ - *\n\ - * You should have received a copy of the GNU General Public License\n\ - * along with this program; if not, write to the Free Software\n\ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n\ -"; - -static const gchar templates_gpl_notice_pascal[] = "\ - This program is free software; you can redistribute it and/or modify\n\ - it under the terms of the GNU General Public License as published by\n\ - the Free Software Foundation; either version 2 of the License, or\n\ - (at your option) any later version.\n\ +This program is free software; you can redistribute it and/or modify\n\ +it under the terms of the GNU General Public License as published by\n\ +the Free Software Foundation; either version 2 of the License, or\n\ +(at your option) any later version.\n\ \n\ - This program is distributed in the hope that it will be useful,\n\ - but WITHOUT ANY WARRANTY; without even the implied warranty of\n\ - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\ - GNU General Public License for more details.\n\ +This program is distributed in the hope that it will be useful,\n\ +but WITHOUT ANY WARRANTY; without even the implied warranty of\n\ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\ +GNU General Public License for more details.\n\ \n\ - You should have received a copy of the GNU General Public License\n\ - along with this program; if not, write to the Free Software\n\ - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n\ +You should have received a copy of the GNU General Public License\n\ +along with this program; if not, write to the Free Software\n\ +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n\ "; -static const gchar templates_gpl_notice_route[] = "\ -# This program is free software; you can redistribute it and/or modify\n\ -# it under the terms of the GNU General Public License as published by\n\ -# the Free Software Foundation; either version 2 of the License, or\n\ -# (at your option) any later version.\n\ -#\n\ -# This program is distributed in the hope that it will be useful,\n\ -# but WITHOUT ANY WARRANTY; without even the implied warranty of\n\ -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\ -# GNU General Public License for more details.\n\ -#\n\ -# You should have received a copy of the GNU General Public License\n\ -# along with this program; if not, write to the Free Software\n\ -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n\ -"; - static const gchar templates_function_description[] = "\ -/* \n\ - * name: {functionname}\n\ - * @param\n\ - * @return\n\ - */\n"; - -static const gchar templates_function_description_pascal[] = "\ -{\n\ - name: {functionname}\n\ - @param\n\ - @return\n\ -}\n"; - -static const gchar templates_function_description_route[] = "\ -#\n\ -# name: {functionname}\n\ -# @param\n\ -# @return\n\ +\n\ +name: {functionname}\n\ +@param\n\ +@return\n\ "; static const gchar templates_multiline[] = "\ -/* \n\ - * \n\ - */"; - -static const gchar templates_multiline_pascal[] = "\ -{\n\ \n\ -}"; + \n\ +"; -static const gchar templates_multiline_route[] = "\ -#\n\ -#"; - static const gchar templates_fileheader[] = "\ -/*\n\ - * {filename}\n\ - *\n\ - * Copyright {year} {developer} <{mail}>\n\ - *\n\ -{gpl}\ - */\n"; - -static const gchar templates_fileheader_pascal[] = "\ -{\n\ - {filename}\n\ +{filename}\n\ \n\ - Copyright {year} {developer} <{mail}>\n\ +Copyright {year} {developer} <{mail}>\n\ \n\ {gpl}\ -}\n"; +"; -static const gchar templates_fileheader_route[] = "\ -#\n\ -# {filename}\n\ -#\n\ -# Copyright {year} {developer} <{mail}>\n\ -#\n\ -{gpl}\ -#\n"; - static const gchar templates_changelog[] = "\ {date} {developer} <{mail}>\n\ \n\ @@ -210,7 +138,8 @@ </html>\n\ "; -static const gchar templates_filetype_pascal[] = "program {untitled};\n\ +static const gchar templates_filetype_pascal[] = "\n\ +program {untitled};\n\ \n\ uses crt;\n\ var i : byte;\n\ @@ -222,10 +151,9 @@ "; static const gchar templates_filetype_java[] = "\n\ -\n\ public class {untitled} {\n\ \n\ - public static void main (String args[]) {\n\ + public static void main (String args[]) {\ \n\ \n\ }\n\ @@ -248,9 +176,9 @@ // some simple macros to reduce code size and make the code readable -#define templates_get_filename(x) g_strconcat(app->configdir, G_DIR_SEPARATOR_S, x, NULL) -#define templates_create_file(x, y) if (! g_file_test(x, G_FILE_TEST_EXISTS)) utils_write_file(x, y) -#define templates_read_file(x, y) g_file_get_contents(x, y, NULL, NULL); +#define TEMPLATES_GET_FILENAME(x) g_strconcat(app->configdir, G_DIR_SEPARATOR_S, x, NULL) +#define TEMPLATES_CREATE_FILE(x, y) if (! g_file_test(x, G_FILE_TEST_EXISTS)) utils_write_file(x, y) +#define TEMPLATES_READ_FILE(x, y) g_file_get_contents(x, y, NULL, NULL); // prototype, because this function should never be used outside of templates.c @@ -259,28 +187,19 @@ void templates_init(void) { - gchar *template_filename_fileheader = templates_get_filename("template.fileheader"); - gchar *template_filename_fileheader_pascal =templates_get_filename("template.fileheader.pascal"); - gchar *template_filename_fileheader_route =templates_get_filename("template.fileheader.route"); - gchar *template_filename_gpl = templates_get_filename("template.gpl"); - gchar *template_filename_gpl_pascal = templates_get_filename("template.gpl.pascal"); - gchar *template_filename_gpl_route = templates_get_filename("template.gpl.route"); - gchar *template_filename_function = templates_get_filename("template.function"); - gchar *template_filename_function_pascal = templates_get_filename("template.function.pascal"); - gchar *template_filename_function_route = templates_get_filename("template.function.route"); - gchar *template_filename_multiline = templates_get_filename("template.multiline"); - gchar *template_filename_multiline_pascal = templates_get_filename("template.multiline.pascal"); - gchar *template_filename_multiline_route = templates_get_filename("template.multiline.route"); - gchar *template_filename_changelog = templates_get_filename("template.changelog"); - gchar *template_filename_filetype_none = templates_get_filename("template.filetype.none"); - gchar *template_filename_filetype_c = templates_get_filename("template.filetype.c"); - gchar *template_filename_filetype_cpp = templates_get_filename("template.filetype.cpp"); - gchar *template_filename_filetype_d = templates_get_filename("template.filetype.d"); - gchar *template_filename_filetype_java = templates_get_filename("template.filetype.java"); - gchar *template_filename_filetype_pascal = templates_get_filename("template.filetype.pascal"); - gchar *template_filename_filetype_php = templates_get_filename("template.filetype.php"); - gchar *template_filename_filetype_html = templates_get_filename("template.filetype.html"); - gchar *template_filename_filetype_ruby = templates_get_filename("template.filetype.ruby"); + gchar *template_filename_fileheader = TEMPLATES_GET_FILENAME("template.fileheader"); + gchar *template_filename_gpl = TEMPLATES_GET_FILENAME("template.gpl"); + gchar *template_filename_function = TEMPLATES_GET_FILENAME("template.function"); + gchar *template_filename_changelog = TEMPLATES_GET_FILENAME("template.changelog"); + gchar *template_filename_filetype_none = TEMPLATES_GET_FILENAME("template.filetype.none"); + gchar *template_filename_filetype_c = TEMPLATES_GET_FILENAME("template.filetype.c"); + gchar *template_filename_filetype_cpp = TEMPLATES_GET_FILENAME("template.filetype.cpp"); + gchar *template_filename_filetype_d = TEMPLATES_GET_FILENAME("template.filetype.d"); + gchar *template_filename_filetype_java = TEMPLATES_GET_FILENAME("template.filetype.java"); + gchar *template_filename_filetype_pascal = TEMPLATES_GET_FILENAME("template.filetype.pascal"); + gchar *template_filename_filetype_php = TEMPLATES_GET_FILENAME("template.filetype.php"); + gchar *template_filename_filetype_html = TEMPLATES_GET_FILENAME("template.filetype.html"); + gchar *template_filename_filetype_ruby = TEMPLATES_GET_FILENAME("template.filetype.ruby"); time_t tp = time(NULL); const struct tm *tm = localtime(&tp); @@ -289,95 +208,58 @@ strftime(year, 5, "%Y", tm); // create the template files in the configuration directory, if they don't exist - templates_create_file(template_filename_fileheader, templates_fileheader); - templates_create_file(template_filename_fileheader_pascal, templates_fileheader_pascal); - templates_create_file(template_filename_fileheader_route, templates_fileheader_route); - templates_create_file(template_filename_gpl, templates_gpl_notice); - templates_create_file(template_filename_gpl_pascal, templates_gpl_notice_pascal); - templates_create_file(template_filename_gpl_route, templates_gpl_notice_route); - templates_create_file(template_filename_function, templates_function_description); - templates_create_file(template_filename_function_pascal, templates_function_description_pascal); - templates_create_file(template_filename_function_route, templates_function_description_route); - templates_create_file(template_filename_multiline, templates_multiline); - templates_create_file(template_filename_multiline_pascal, templates_multiline_pascal); - templates_create_file(template_filename_multiline_route, templates_multiline_route); - templates_create_file(template_filename_changelog, templates_changelog); - templates_create_file(template_filename_filetype_none, templates_filetype_none); - templates_create_file(template_filename_filetype_c, templates_filetype_c); - templates_create_file(template_filename_filetype_cpp, templates_filetype_cpp); - templates_create_file(template_filename_filetype_d, templates_filetype_d); - templates_create_file(template_filename_filetype_java, templates_filetype_java); - templates_create_file(template_filename_filetype_pascal, templates_filetype_pascal); - templates_create_file(template_filename_filetype_php, templates_filetype_php); - templates_create_file(template_filename_filetype_html, templates_filetype_html); - templates_create_file(template_filename_filetype_ruby, templates_filetype_ruby); + TEMPLATES_CREATE_FILE(template_filename_fileheader, templates_fileheader); + TEMPLATES_CREATE_FILE(template_filename_gpl, templates_gpl_notice); + TEMPLATES_CREATE_FILE(template_filename_function, templates_function_description); + TEMPLATES_CREATE_FILE(template_filename_changelog, templates_changelog); + TEMPLATES_CREATE_FILE(template_filename_filetype_none, templates_filetype_none); + TEMPLATES_CREATE_FILE(template_filename_filetype_c, templates_filetype_c); + TEMPLATES_CREATE_FILE(template_filename_filetype_cpp, templates_filetype_cpp); + TEMPLATES_CREATE_FILE(template_filename_filetype_d, templates_filetype_d); + TEMPLATES_CREATE_FILE(template_filename_filetype_java, templates_filetype_java); + TEMPLATES_CREATE_FILE(template_filename_filetype_pascal, templates_filetype_pascal); + TEMPLATES_CREATE_FILE(template_filename_filetype_php, templates_filetype_php); + TEMPLATES_CREATE_FILE(template_filename_filetype_html, templates_filetype_html); + TEMPLATES_CREATE_FILE(template_filename_filetype_ruby, templates_filetype_ruby); // read the contents - templates_read_file(template_filename_fileheader, &templates[GEANY_TEMPLATE_FILEHEADER]); + TEMPLATES_READ_FILE(template_filename_fileheader, &templates[GEANY_TEMPLATE_FILEHEADER]); templates[GEANY_TEMPLATE_FILEHEADER] = templates_replace_all(templates[GEANY_TEMPLATE_FILEHEADER], year, date); - templates_read_file(template_filename_fileheader_pascal, &templates[GEANY_TEMPLATE_FILEHEADER_PASCAL]); - templates[GEANY_TEMPLATE_FILEHEADER_PASCAL] = templates_replace_all(templates[GEANY_TEMPLATE_FILEHEADER_PASCAL], year, date); - - templates_read_file(template_filename_fileheader_route, &templates[GEANY_TEMPLATE_FILEHEADER_ROUTE]); - templates[GEANY_TEMPLATE_FILEHEADER_ROUTE] = templates_replace_all(templates[GEANY_TEMPLATE_FILEHEADER_ROUTE], year, date); - - templates_read_file(template_filename_gpl, &templates[GEANY_TEMPLATE_GPL]); + TEMPLATES_READ_FILE(template_filename_gpl, &templates[GEANY_TEMPLATE_GPL]); //templates[GEANY_TEMPLATE_GPL] = templates_replace_all(templates[GEANY_TEMPLATE_GPL], year, date); - templates_read_file(template_filename_gpl_pascal, &templates[GEANY_TEMPLATE_GPL_PASCAL]); - //templates[GEANY_TEMPLATE_GPL_PASCAL] = templates_replace_all(templates[GEANY_TEMPLATE_GPL_PASCAL], year, date); - - templates_read_file(template_filename_gpl_route, &templates[GEANY_TEMPLATE_GPL_ROUTE]); - //templates[GEANY_TEMPLATE_GPL_ROUTE] = templates_replace_all(templates[GEANY_TEMPLATE_GPL_ROUTE], year, date); - - templates_read_file(template_filename_function, &templates[GEANY_TEMPLATE_FUNCTION]); + TEMPLATES_READ_FILE(template_filename_function, &templates[GEANY_TEMPLATE_FUNCTION]); templates[GEANY_TEMPLATE_FUNCTION] = templates_replace_all(templates[GEANY_TEMPLATE_FUNCTION], year, date); - templates_read_file(template_filename_function_pascal, &templates[GEANY_TEMPLATE_FUNCTION_PASCAL]); - templates[GEANY_TEMPLATE_FUNCTION_PASCAL] = templates_replace_all(templates[GEANY_TEMPLATE_FUNCTION_PASCAL], year, date); - - templates_read_file(template_filename_function_route, &templates[GEANY_TEMPLATE_FUNCTION_ROUTE]); - templates[GEANY_TEMPLATE_FUNCTION_ROUTE] = templates_replace_all(templates[GEANY_TEMPLATE_FUNCTION_ROUTE], year, date); - - templates_read_file(template_filename_multiline, &templates[GEANY_TEMPLATE_MULTILINE]); - //templates[GEANY_TEMPLATE_MULTILINE] = templates_replace_all(templates[GEANY_TEMPLATE_MULTILINE], year, date); - - templates_read_file(template_filename_multiline_pascal, &templates[GEANY_TEMPLATE_MULTILINE_PASCAL]); - //templates[GEANY_TEMPLATE_MULTILINE_PASCAL] = templates_replace_all(templates[GEANY_TEMPLATE_MULTILINE_PASCAL], year, date); - - templates_read_file(template_filename_multiline_route, &templates[GEANY_TEMPLATE_MULTILINE_ROUTE]); - //templates[GEANY_TEMPLATE_MULTILINE_ROUTE] = templates_replace_all(templates[GEANY_TEMPLATE_MULTILINE_ROUTE], year, date); - - templates_read_file(template_filename_changelog, &templates[GEANY_TEMPLATE_CHANGELOG]); + TEMPLATES_READ_FILE(template_filename_changelog, &templates[GEANY_TEMPLATE_CHANGELOG]); templates[GEANY_TEMPLATE_CHANGELOG] = templates_replace_all(templates[GEANY_TEMPLATE_CHANGELOG], year, date); - - templates_read_file(template_filename_filetype_none, &templates[GEANY_TEMPLATE_FILETYPE_NONE]); + TEMPLATES_READ_FILE(template_filename_filetype_none, &templates[GEANY_TEMPLATE_FILETYPE_NONE]); templates[GEANY_TEMPLATE_FILETYPE_NONE] = templates_replace_all(templates[GEANY_TEMPLATE_FILETYPE_NONE], year, date); - templates_read_file(template_filename_filetype_c, &templates[GEANY_TEMPLATE_FILETYPE_C]); + TEMPLATES_READ_FILE(template_filename_filetype_c, &templates[GEANY_TEMPLATE_FILETYPE_C]); templates[GEANY_TEMPLATE_FILETYPE_C] = templates_replace_all(templates[GEANY_TEMPLATE_FILETYPE_C], year, date); - templates_read_file(template_filename_filetype_d, &templates[GEANY_TEMPLATE_FILETYPE_D]); + TEMPLATES_READ_FILE(template_filename_filetype_d, &templates[GEANY_TEMPLATE_FILETYPE_D]); templates[GEANY_TEMPLATE_FILETYPE_D] = templates_replace_all(templates[GEANY_TEMPLATE_FILETYPE_D], year, date); - templates_read_file(template_filename_filetype_cpp, &templates[GEANY_TEMPLATE_FILETYPE_CPP]); + TEMPLATES_READ_FILE(template_filename_filetype_cpp, &templates[GEANY_TEMPLATE_FILETYPE_CPP]); templates[GEANY_TEMPLATE_FILETYPE_CPP] = templates_replace_all(templates[GEANY_TEMPLATE_FILETYPE_CPP], year, date); - templates_read_file(template_filename_filetype_java, &templates[GEANY_TEMPLATE_FILETYPE_JAVA]); + TEMPLATES_READ_FILE(template_filename_filetype_java, &templates[GEANY_TEMPLATE_FILETYPE_JAVA]); templates[GEANY_TEMPLATE_FILETYPE_JAVA] = templates_replace_all(templates[GEANY_TEMPLATE_FILETYPE_JAVA], year, date); - templates_read_file(template_filename_filetype_pascal, &templates[GEANY_TEMPLATE_FILETYPE_PASCAL]); + TEMPLATES_READ_FILE(template_filename_filetype_pascal, &templates[GEANY_TEMPLATE_FILETYPE_PASCAL]); templates[GEANY_TEMPLATE_FILETYPE_PASCAL] = templates_replace_all(templates[GEANY_TEMPLATE_FILETYPE_PASCAL], year, date); - templates_read_file(template_filename_filetype_php, &templates[GEANY_TEMPLATE_FILETYPE_PHP]); + TEMPLATES_READ_FILE(template_filename_filetype_php, &templates[GEANY_TEMPLATE_FILETYPE_PHP]); templates[GEANY_TEMPLATE_FILETYPE_PHP] = templates_replace_all(templates[GEANY_TEMPLATE_FILETYPE_PHP], year, date); - templates_read_file(template_filename_filetype_html, &templates[GEANY_TEMPLATE_FILETYPE_HTML]); + TEMPLATES_READ_FILE(template_filename_filetype_html, &templates[GEANY_TEMPLATE_FILETYPE_HTML]); templates[GEANY_TEMPLATE_FILETYPE_HTML] = templates_replace_all(templates[GEANY_TEMPLATE_FILETYPE_HTML], year, date); - templates_read_file(template_filename_filetype_ruby, &templates[GEANY_TEMPLATE_FILETYPE_RUBY]); + TEMPLATES_READ_FILE(template_filename_filetype_ruby, &templates[GEANY_TEMPLATE_FILETYPE_RUBY]); templates[GEANY_TEMPLATE_FILETYPE_RUBY] = templates_replace_all(templates[GEANY_TEMPLATE_FILETYPE_RUBY], year, date); @@ -385,17 +267,8 @@ g_free(date); g_free(year); g_free(template_filename_fileheader); - g_free(template_filename_fileheader_pascal); - g_free(template_filename_fileheader_route); g_free(template_filename_gpl); - g_free(template_filename_gpl_pascal); - g_free(template_filename_gpl_route); g_free(template_filename_function); - g_free(template_filename_function_pascal); - g_free(template_filename_function_route); - g_free(template_filename_multiline); - g_free(template_filename_multiline_pascal); - g_free(template_filename_multiline_route); g_free(template_filename_changelog); g_free(template_filename_filetype_none); g_free(template_filename_filetype_c); @@ -409,28 +282,33 @@ } -/* double_comment is a hack for PHP/HTML for whether to first add C style commenting. - * In future we could probably remove the need for this by making most templates - * automatically commented (so template files are not commented) */ -static gchar *make_comment_block(const gchar *comment_text, gint filetype_idx, - gboolean double_comment) +/* indent is used to make some whitespace between comment char and real start of the line + * e.g. indent = 8 prints " * here comes the text of the line" + * indent is meant to be the whole amount of characters before the real line content follows, i.e. + * 6 characters are filled with whitespace when the comment characters include " *" */ +static gchar *make_comment_block(const gchar *comment_text, gint filetype_idx, gint indent) { + gchar *frame_start = ""; // to add before comment_text + gchar *frame_end = ""; // to add after comment_text + gchar *line_prefix; // to add before every line in comment_text + gchar *result; + gchar *tmp; + gchar *prefix; + gchar **lines; + gint i; + + /// TODO the following switch could be replaced by some intelligent code which reads + /// frame_start, frame_end and line_prefix from the filetype definition files switch (filetype_idx) { - case GEANY_FILETYPES_ALL: - return g_strdup(comment_text); // no need to add to the text - - case GEANY_FILETYPES_PHP: case GEANY_FILETYPES_HTML: - { // double comment - gchar *tmp = (double_comment) ? - make_comment_block(comment_text, GEANY_FILETYPES_C, FALSE) : - g_strdup(comment_text); - gchar *block = (filetype_idx == GEANY_FILETYPES_PHP) ? - g_strconcat("<?php\n", tmp, "?>\n", NULL) : - g_strconcat("\n", NULL); - g_free(tmp); - return block; + case GEANY_FILETYPES_XML: + case GEANY_FILETYPES_DOCBOOK: + { + frame_start = "\n"; + line_prefix = ""; + break; } case GEANY_FILETYPES_PYTHON: @@ -438,136 +316,145 @@ case GEANY_FILETYPES_SH: case GEANY_FILETYPES_MAKE: case GEANY_FILETYPES_PERL: - return g_strconcat("#\n", comment_text, "#\n", NULL); + case GEANY_FILETYPES_DIFF: + case GEANY_FILETYPES_TCL: + case GEANY_FILETYPES_OMS: + case GEANY_FILETYPES_CONF: + { + line_prefix = "#"; + break; + } + case GEANY_FILETYPES_LATEX: + { + line_prefix = "%"; + break; + } + + case GEANY_FILETYPES_VHDL: + { + line_prefix = "--"; + break; + } + + case GEANY_FILETYPES_FORTRAN: + { + line_prefix = "c"; + break; + } + + case GEANY_FILETYPES_ASM: + { + line_prefix = ";"; + break; + } + case GEANY_FILETYPES_PASCAL: - return g_strconcat("{\n", comment_text, "}\n", NULL); + { + frame_start = "{\n"; + frame_end = "}\n"; + line_prefix = ""; + break; + } - default: - return g_strconcat("/*\n", comment_text, " */\n", NULL); + case GEANY_FILETYPES_PHP: + { + frame_start = "<?\n/*\n"; + frame_end = " */\n?>\n"; + line_prefix = " *"; + break; + } + + case GEANY_FILETYPES_CAML: + { + frame_start = "(*\n"; + frame_end = " *)\n"; + line_prefix = " *"; + break; + } + + case GEANY_FILETYPES_ALL: + { + line_prefix = ""; + break; + } + + default: // guess /* */ is appropriate + { + frame_start = "/*\n"; + frame_end = " */\n"; + line_prefix = " *"; + } } -} + // construct the real prefix with given amount of whitespace + i = (indent > strlen(line_prefix)) ? (indent - strlen(line_prefix)) : strlen(line_prefix); + tmp = g_strnfill(i, ' '); + prefix = g_strconcat(line_prefix, tmp, NULL); + g_free(tmp); -gchar *templates_get_template_gpl(gint filetype_idx) -{ - const gchar *text; - switch (filetype_idx) + // add line_prefix to every line of comment_text + lines = g_strsplit(comment_text, "\n", -1); + for (i = 0; i < (g_strv_length(lines) - 1); i++) { - case GEANY_FILETYPES_PYTHON: - case GEANY_FILETYPES_RUBY: - case GEANY_FILETYPES_SH: - case GEANY_FILETYPES_MAKE: - case GEANY_FILETYPES_PERL: - text = templates[GEANY_TEMPLATE_GPL_ROUTE]; - break; + tmp = lines[i]; + lines[i] = g_strconcat(prefix, tmp, NULL); + g_free(tmp); + } + tmp = g_strjoinv("\n", lines); - case GEANY_FILETYPES_PASCAL: - case GEANY_FILETYPES_ALL: - text = templates[GEANY_TEMPLATE_GPL_PASCAL]; - break; + // add frame_start and frame_end + result = g_strconcat(frame_start, tmp, frame_end, NULL); - case GEANY_FILETYPES_HTML: - case GEANY_FILETYPES_PHP: - default: - text = templates[GEANY_TEMPLATE_GPL]; - break; - } - return make_comment_block(text, filetype_idx, TRUE); + g_free(prefix); + g_free(tmp); + g_strfreev(lines); + return result; } -/* Returns a template chosen by template with GEANY_STRING_UNTITLED.extension - * as filename if idx is -1, or the real filename if idx is greater than -1. - * The flag gpl decides whether a GPL notice is appended or not */ -static gchar * -prepare_file_header(gint template, const gchar *extension, const gchar *filename) +gchar *templates_get_template_licence(gint filetype_idx) { - gchar *result = g_strdup(templates[template]); + //if (licence_type != GEANY_TEMPLATE_GPL) + //return NULL; + + return make_comment_block(templates[GEANY_TEMPLATE_GPL], filetype_idx, 8); +} + + +static gchar *get_file_header(filetype *ft, const gchar *fname) +{ + gchar *template = g_strdup(templates[GEANY_TEMPLATE_FILEHEADER]); gchar *shortname; + gchar *result; gchar *date = utils_get_date_time(); - if (filename == NULL) + if (fname == NULL) { - if (extension != NULL) - shortname = g_strconcat(GEANY_STRING_UNTITLED, ".", extension, NULL); - else + if (FILETYPE_ID(ft) == GEANY_FILETYPES_ALL) shortname = g_strdup(GEANY_STRING_UNTITLED); + else + shortname = g_strconcat(GEANY_STRING_UNTITLED, ".", ft->extension, NULL); } else - { - shortname = g_path_get_basename(filename); - } - result = utils_str_replace(result, "{filename}", shortname); + shortname = g_path_get_basename(fname); - if (template == GEANY_TEMPLATE_FILEHEADER_PASCAL) - { - result = utils_str_replace(result, "{gpl}", templates[GEANY_TEMPLATE_GPL_PASCAL]); - } - else if (template == GEANY_TEMPLATE_FILEHEADER_ROUTE) - { - result = utils_str_replace(result, "{gpl}", templates[GEANY_TEMPLATE_GPL_ROUTE]); - } - else - { - result = utils_str_replace(result, "{gpl}", templates[GEANY_TEMPLATE_GPL]); - } - result = utils_str_replace(result, "{datetime}", date); + template = utils_str_replace(template, "{filename}", shortname); + template = utils_str_replace(template, "{gpl}", templates[GEANY_TEMPLATE_GPL]); + + template = utils_str_replace(template, "{datetime}", date); + + result = make_comment_block(template, FILETYPE_ID(ft), 8); + + g_free(template); g_free(shortname); g_free(date); return result; } -// ft, fname can be NULL -static gchar *get_file_header(filetype *ft, const gchar *fname) -{ - gchar *text = NULL; - - switch (FILETYPE_ID(ft)) - { - case GEANY_FILETYPES_ALL: // ft may be NULL - { - text = prepare_file_header(GEANY_TEMPLATE_FILEHEADER, NULL, fname); - break; - } - case GEANY_FILETYPES_PHP: - case GEANY_FILETYPES_HTML: - { - gchar *tmp = prepare_file_header( - GEANY_TEMPLATE_FILEHEADER, ft->extension, fname); - text = make_comment_block(tmp, ft->id, FALSE); - g_free(tmp); - break; - } - case GEANY_FILETYPES_PASCAL: - { // Pascal: comments are in { } brackets - text = prepare_file_header( - GEANY_TEMPLATE_FILEHEADER_PASCAL, ft->extension, fname); - break; - } - case GEANY_FILETYPES_PYTHON: - case GEANY_FILETYPES_RUBY: - case GEANY_FILETYPES_SH: - case GEANY_FILETYPES_MAKE: - case GEANY_FILETYPES_PERL: - { - text = prepare_file_header( - GEANY_TEMPLATE_FILEHEADER_ROUTE, ft->extension, fname); - break; - } - default: - { // -> C, C++, Java, ... - text = prepare_file_header( - GEANY_TEMPLATE_FILEHEADER, ft->extension, fname); - } - } - return text; -} - - gchar *templates_get_template_fileheader(gint idx) { gchar *fname; @@ -632,21 +519,26 @@ } -gchar *templates_get_template_function(gint template, const gchar *func_name) +gchar *templates_get_template_function(gint filetype_idx, const gchar *func_name) { - gchar *result = g_strdup(templates[template]); + gchar *template = g_strdup(templates[GEANY_TEMPLATE_FUNCTION]); gchar *date = utils_get_date(); gchar *datetime = utils_get_date_time(); + gchar *result; - result = utils_str_replace(result, "{date}", date); - result = utils_str_replace(result, "{datetime}", datetime); - result = utils_str_replace(result, "{functionname}", (func_name) ? func_name : ""); + template = utils_str_replace(template, "{date}", date); + template = utils_str_replace(template, "{datetime}", datetime); + template = utils_str_replace(template, "{functionname}", (func_name) ? func_name : ""); + result = make_comment_block(template, filetype_idx, 3); + + g_free(template); g_free(date); g_free(datetime); return result; } + gchar *templates_get_template_changelog(void) { gchar *date = utils_get_date_time(); Modified: trunk/src/templates.h =================================================================== --- trunk/src/templates.h 2007-01-06 12:35:43 UTC (rev 1159) +++ trunk/src/templates.h 2007-01-06 15:03:53 UTC (rev 1160) @@ -1,7 +1,8 @@ /* * templates.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2005-2007 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006-2007 Nick Treleaven <nick.treleaven(a)btinternet.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,7 +26,6 @@ #include "filetypes.h" - void templates_init(void); gchar *templates_get_template_fileheader(gint idx); @@ -36,28 +36,19 @@ gchar *templates_get_template_generic(gint template); -gchar *templates_get_template_function(gint template, const gchar *func_name); +gchar *templates_get_template_function(gint filetype_idx, const gchar *func_name); -gchar *templates_get_template_gpl(gint filetype_idx); +gchar *templates_get_template_licence(gint filetype_idx); void templates_free_templates(void); enum { - GEANY_TEMPLATE_GPL_PASCAL = 0, - GEANY_TEMPLATE_GPL_ROUTE, - GEANY_TEMPLATE_GPL, - GEANY_TEMPLATE_FILEHEADER_PASCAL, - GEANY_TEMPLATE_FILEHEADER_ROUTE, + GEANY_TEMPLATE_GPL = 0, GEANY_TEMPLATE_FILEHEADER, GEANY_TEMPLATE_CHANGELOG, GEANY_TEMPLATE_FUNCTION, - GEANY_TEMPLATE_FUNCTION_PASCAL, - GEANY_TEMPLATE_FUNCTION_ROUTE, - GEANY_TEMPLATE_MULTILINE, - GEANY_TEMPLATE_MULTILINE_PASCAL, - GEANY_TEMPLATE_MULTILINE_ROUTE, GEANY_TEMPLATE_FILETYPE_NONE, GEANY_TEMPLATE_FILETYPE_C, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1159] trunk
by ntrel＠users.sourceforge.net 06 Jan '07

06 Jan '07

Revision: 1159 http://svn.sourceforge.net/geany/?rev=1159&view=rev Author: ntrel Date: 2007-01-06 04:35:43 -0800 (Sat, 06 Jan 2007) Log Message: ----------- Use load_text_file() in document_open_file() to read, verify and handle encoding using FileData struct. Refactored handle_[forced_]encoding with FileData* argument. Update data length after removing BOM chars in handle_bom(). Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-06 11:55:01 UTC (rev 1158) +++ trunk/ChangeLog 2007-01-06 12:35:43 UTC (rev 1159) @@ -4,6 +4,11 @@ Ensure the VTE visual settings are applied when switching to VTE when the Message Window is hidden. Show the Message Window when switching to Scribble. + * src/document.c: + Use load_text_file() in document_open_file() to read, verify and + handle encoding using FileData struct. + Refactored handle_[forced_]encoding with FileData* argument. + Update data length after removing BOM chars in handle_bom(). 2007-01-04 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2007-01-06 11:55:01 UTC (rev 1158) +++ trunk/src/document.c 2007-01-06 12:35:43 UTC (rev 1159) @@ -421,38 +421,48 @@ } +typedef struct +{ + gchar *data; // null-terminated file data + gsize len; // string length of data + gchar *enc; + gboolean bom; + time_t mtime; // modification time, read by stat::st_mtime + gboolean readonly; +} FileData; + + // reload file with specified encoding static gboolean -handle_forced_encoding(gchar **data, gsize *size, const gchar *forced_enc, gchar **enc, - gboolean *bom) +handle_forced_encoding(FileData *filedata, const gchar *forced_enc) { if (utils_str_equal(forced_enc, "UTF-8")) { - if (! g_utf8_validate(*data, *size, NULL)) + if (! g_utf8_validate(filedata->data, filedata->len, NULL)) { return FALSE; } else { - *bom = utils_str_equal(utils_scan_unicode_bom(*data), "UTF-8"); - *enc = g_strdup(forced_enc); + filedata->bom = utils_str_equal(utils_scan_unicode_bom(filedata->data), "UTF-8"); + filedata->enc = g_strdup(forced_enc); } } else { gchar *converted_text = encodings_convert_to_utf8_from_charset( - *data, *size, forced_enc, FALSE); + filedata->data, filedata->len, forced_enc, FALSE); if (converted_text == NULL) { return FALSE; } else { - g_free(*data); - *data = (void*)converted_text; - *size = strlen(converted_text); - *bom = utils_str_equal(utils_scan_unicode_bom(*data), "UTF-8"); - *enc = g_strdup(forced_enc); + g_free(filedata->data); + filedata->data = converted_text; + filedata->len = strlen(converted_text); + filedata->bom = utils_str_equal(utils_scan_unicode_bom(filedata->data), "UTF-8"); + filedata->enc = g_strdup(forced_enc); } } return TRUE; @@ -460,45 +470,46 @@ static gboolean -handle_encoding(gchar **data, gsize *size, gchar **enc, gboolean *bom) +handle_encoding(FileData *filedata) { - if (*size > 0) + if (filedata->len > 0) { // the usual way to detect encoding and convert to UTF-8 - if (*size >= 4) + if (filedata->len >= 4) { - *enc = utils_scan_unicode_bom(*data); + filedata->enc = utils_scan_unicode_bom(filedata->data); } - if (*enc != NULL) + if (filedata->enc != NULL) { - *bom = TRUE; - if ((*enc)[4] != '8') // the BOM indicated something else than UTF-8 + filedata->bom = TRUE; + if ((filedata->enc)[4] != '8') // the BOM indicated something else than UTF-8 { gchar *converted_text = encodings_convert_to_utf8_from_charset( - *data, *size, *enc, FALSE); + filedata->data, filedata->len, filedata->enc, FALSE); if (converted_text == NULL) { - g_free(*enc); - *enc = NULL; - *bom = FALSE; + g_free(filedata->enc); + filedata->enc = NULL; + filedata->bom = FALSE; } else { - g_free(*data); - *data = (void*)converted_text; - *size = strlen(converted_text); + g_free(filedata->data); + filedata->data = converted_text; + filedata->len = strlen(converted_text); } } } // this if is important, else doesn't work because enc can be altered in the above block - if (*enc == NULL) + if (filedata->enc == NULL) { - if (g_utf8_validate(*data, *size, NULL)) + if (g_utf8_validate(filedata->data, filedata->len, NULL)) { - *enc = g_strdup("UTF-8"); + filedata->enc = g_strdup("UTF-8"); } else { - gchar *converted_text = encodings_convert_to_utf8(*data, *size, enc); + gchar *converted_text = encodings_convert_to_utf8(filedata->data, + filedata->len, &filedata->enc); if (converted_text == NULL) { @@ -506,51 +517,132 @@ } else { - g_free(*data); - *data = (void*)converted_text; - *size = strlen(converted_text); + g_free(filedata->data); + filedata->data = converted_text; + filedata->len = strlen(converted_text); } } } } else { - *enc = g_strdup("UTF-8"); + filedata->enc = g_strdup("UTF-8"); } return TRUE; } static void -handle_bom(gchar **data) +handle_bom(FileData *filedata) { gchar *data_without_bom; - data_without_bom = g_strdup(*data + 3); - g_free(*data); - *data = data_without_bom; + + g_return_if_fail(filedata->len >= 3); + + data_without_bom = g_strdup(filedata->data + 3); + g_free(filedata->data); + filedata->data = data_without_bom; + filedata->len -= 3; } -/* If idx is set to -1, it creates a new tab, opens the file from filename and - * set the cursor to pos. - * If idx is greater than -1, it reloads the file in the tab corresponding to - * idx and set the cursor to position 0. In this case, filename should be NULL - * It returns the idx of the opened file or -1 if an error occurred. +/* 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 *utf8_filename, + FileData *filedata, const gchar *forced_enc) +{ + GError *err = NULL; + struct stat st; + + filedata->data = NULL; + filedata->len = 0; + filedata->enc = NULL; + filedata->bom = FALSE; + filedata->readonly = FALSE; + + if (stat(locale_filename, &st) != 0) + { + msgwin_status_add(_("Could not open file %s (%s)"), utf8_filename, g_strerror(errno)); + return FALSE; + } + + filedata->mtime = st.st_mtime; + +#ifdef G_OS_WIN32 + if (! g_file_get_contents(utf8_filename, &filedata->data, NULL, &err)) +#else + if (! g_file_get_contents(locale_filename, &filedata->data, NULL, &err)) +#endif + { + msgwin_status_add(err->message); + g_error_free(err); + return FALSE; + } + + // use strlen to check for null chars + filedata->len = strlen(filedata->data); + + /* check whether the size of the loaded data is equal to the size of the file in the filesystem */ + if (filedata->len != (gsize) st.st_size) + { + gchar *warn_msg = _("The file \"%s\" could not be opened properly and has been truncated. " + "This can occur if the file contains a NULL byte. " + "Be aware that saving it can cause data loss.\nThe file was set to read-only."); + + if (app->main_window_realized) + dialogs_show_msgbox(GTK_MESSAGE_WARNING, warn_msg, utf8_filename); + + msgwin_status_add(warn_msg, utf8_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)) + { + msgwin_status_add(_("The file \"%s\" is not valid %s."), utf8_filename, forced_enc); + utils_beep(); + g_free(filedata->data); + return FALSE; + } + } + else if (! handle_encoding(filedata)) + { + msgwin_status_add( + _("The file \"%s\" does not look like a text file or the file encoding is not supported."), + utf8_filename); + utils_beep(); + g_free(filedata->data); + return FALSE; + } + + if (filedata->bom) + handle_bom(filedata); + return TRUE; +} + + +/* To open a new file, set idx to -1; filename should be locale encoded. + * To reload a file, set the idx for the document to be reloaded; filename should be NULL. + * Returns: idx of the opened file or -1 if an error occurred. */ int document_open_file(gint idx, const gchar *filename, gint pos, gboolean readonly, filetype *ft, const gchar *forced_enc) { gint editor_mode; - gsize size; gboolean reload = (idx == -1) ? FALSE : TRUE; - struct stat st; - gboolean bom = FALSE; - gchar *enc = NULL; gchar *utf8_filename = NULL; gchar *locale_filename = NULL; - GError *err = NULL; - gchar *data = NULL; filetype *use_ft; + FileData filedata; //struct timeval tv, tv1; //struct timezone tz; @@ -589,98 +681,42 @@ } } - if (stat(locale_filename, &st) != 0) + if (! load_text_file(locale_filename, utf8_filename, &filedata, forced_enc)) { - msgwin_status_add(_("Could not open file %s (%s)"), utf8_filename, g_strerror(errno)); g_free(utf8_filename); g_free(locale_filename); return -1; } -#ifdef G_OS_WIN32 - if (! g_file_get_contents(utf8_filename, &data, NULL, &err)) -#else - if (! g_file_get_contents(locale_filename, &data, NULL, &err)) -#endif - { - msgwin_status_add(err->message); - g_error_free(err); - g_free(utf8_filename); - g_free(locale_filename); - return -1; - } - - /* check whether the size of the loaded data is equal to the size of the file in the filesystem */ - //size = strlen(data); - size = strlen(data); - if (size != (gsize) st.st_size) - { - gchar *warn_msg = _("The file \"%s\" could not opened properly and probably was truncated. " - "Be aware that saving it can cause data loss.\nThe file was set to read-only."); - - if (app->main_window_realized) - dialogs_show_msgbox(GTK_MESSAGE_WARNING, warn_msg, utf8_filename); - - msgwin_status_add(warn_msg, utf8_filename); - - // set the file to read-only mode because saving it is probably dangerous - 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)) - { - bom = FALSE; - enc = g_strdup(encodings[GEANY_ENCODING_NONE].charset); - } - else if (! handle_forced_encoding(&data, &size, forced_enc, &enc, &bom)) - { - msgwin_status_add(_("The file \"%s\" is not valid %s."), utf8_filename, forced_enc); - utils_beep(); - g_free(data); - g_free(utf8_filename); - g_free(locale_filename); - return -1; - } - } - else if (! handle_encoding(&data, &size, &enc, &bom)) - { - msgwin_status_add( - _("The file \"%s\" does not look like a text file or the file encoding is not supported."), - utf8_filename); - utils_beep(); - g_free(data); - g_free(utf8_filename); - g_free(locale_filename); - return -1; - } - - if (bom) handle_bom(&data); - if (! reload) idx = document_create_new_sci(utf8_filename); - if (idx == -1) return -1; // really should not happen + g_return_val_if_fail(idx != -1, -1); // really should not happen - // set editor mode and add the text to the ScintillaObject sci_set_undo_collection(doc_list[idx].sci, FALSE); // avoid creation of an undo action sci_empty_undo_buffer(doc_list[idx].sci); - sci_set_text(doc_list[idx].sci, data); // NULL terminated data - editor_mode = utils_get_line_endings(data, size); + // add the text to the ScintillaObject + sci_set_text(doc_list[idx].sci, filedata.data); // NULL terminated data + + // detect & set line endings + editor_mode = utils_get_line_endings(filedata.data, filedata.len); sci_set_eol_mode(doc_list[idx].sci, editor_mode); - sci_set_line_numbers(doc_list[idx].sci, app->show_linenumber_margin, 0); + g_free(filedata.data); sci_set_undo_collection(doc_list[idx].sci, TRUE); - doc_list[idx].mtime = st.st_mtime; // get the modification time from file and keep it + doc_list[idx].mtime = filedata.mtime; // get the modification time from file and keep it doc_list[idx].changed = FALSE; g_free(doc_list[idx].encoding); // if reloading, free old encoding - doc_list[idx].encoding = enc; - doc_list[idx].has_bom = bom; + doc_list[idx].encoding = filedata.enc; + doc_list[idx].has_bom = filedata.bom; store_saved_encoding(idx); // store the opened encoding for undo/redo + doc_list[idx].readonly = readonly || filedata.readonly; + sci_set_readonly(doc_list[idx].sci, doc_list[idx].readonly); + + // update line number margin width + sci_set_line_numbers(doc_list[idx].sci, app->show_linenumber_margin, 0); + if (cl_options.goto_line >= 0) { // goto line which was specified on command line and then undefine the line sci_goto_line(doc_list[idx].sci, cl_options.goto_line - 1, TRUE); @@ -696,9 +732,6 @@ if (! reload) { - doc_list[idx].readonly = readonly; - sci_set_readonly(doc_list[idx].sci, readonly); - // "the" SCI signal (connect after initial setup(i.e. adding text)) g_signal_connect((GtkWidget*) doc_list[idx].sci, "sci-notify", G_CALLBACK(on_editor_notification), GINT_TO_POINTER(idx)); @@ -716,9 +749,7 @@ document_set_text_changed(idx); // also updates tab state ui_document_show_hide(idx); // update the document menu - g_free(data); - // finally add current file to recent files menu, but not the files from the last session if (! app->opening_session_files) ui_add_recent_file(utf8_filename); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2007