Commits July 2006

commits@lists.geany.org

2 participants
142 discussions

SF.net SVN: geany: [583] trunk
by eht16＠users.sourceforge.net 19 Jul '06

19 Jul '06

Revision: 583 Author: eht16 Date: 2006-07-18 15:01:24 -0700 (Tue, 18 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=583&view=rev Log Message: ----------- Compile notebook_motion_notify_event_cb() only with GTK 2.6 (again). Made "built on" string translatable. Modified Paths: -------------- trunk/ChangeLog trunk/src/about.c trunk/src/notebook.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-18 17:43:22 UTC (rev 582) +++ trunk/ChangeLog 2006-07-18 22:01:24 UTC (rev 583) @@ -1,3 +1,10 @@ +2006-07-18 Enrico Troeger <enrico.troeger(a)uvena.de> + + * src/notebook.c: + Compile notebook_motion_notify_event_cb() only with GTK 2.6 (again). + * src/about.c: Made "built on" string translatable. + + 2006-07-18 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/sciwrappers.c, src/sciwrappers.h, src/document.c: Modified: trunk/src/about.c =================================================================== --- trunk/src/about.c 2006-07-18 17:43:22 UTC (rev 582) +++ trunk/src/about.c 2006-07-18 22:01:24 UTC (rev 583) @@ -32,7 +32,7 @@ #define HEADER "<span size=\"larger\" weight=\"bold\">Geany " VERSION "%s</span>" #define INFO "<span size=\"larger\" weight=\"bold\">%s</span>" #define CODENAME "<span weight=\"bold\">\"" GEANY_CODENAME "\"</span>" -#define BUILDDATE "<span size=\"smaller\">(built on " __DATE__ ")</span>" +#define BUILDDATE "<span size=\"smaller\">%s</span>" #define COPYRIGHT "Copyright (c) 2005-2006 \n Enrico Tröger \nAll rights reserved." #define CREDITS \ "<span size=\"larger\" weight=\"bold\">%s</span>\n\t\ @@ -89,6 +89,7 @@ GtkTextBuffer* tb; gchar *license_text = NULL; gchar buffer[512]; + gchar buffer2[128]; gchar *credits; dialog = gtk_dialog_new(); @@ -165,7 +166,9 @@ gtk_label_set_justify(GTK_LABEL(builddate_label), GTK_JUSTIFY_CENTER); gtk_label_set_selectable(GTK_LABEL(builddate_label), TRUE); gtk_label_set_use_markup(GTK_LABEL(builddate_label), TRUE); - gtk_label_set_markup(GTK_LABEL(builddate_label), BUILDDATE); + g_snprintf(buffer2, sizeof(buffer2), _("(built on %s)"), __DATE__); + g_snprintf(buffer, sizeof(buffer), BUILDDATE, buffer2); + gtk_label_set_markup(GTK_LABEL(builddate_label), buffer); gtk_misc_set_padding(GTK_MISC(builddate_label), 2, 2); gtk_widget_show(builddate_label); gtk_box_pack_start(GTK_BOX(info_box), builddate_label, FALSE, FALSE, 0); Modified: trunk/src/notebook.c =================================================================== --- trunk/src/notebook.c 2006-07-18 17:43:22 UTC (rev 582) +++ trunk/src/notebook.c 2006-07-18 22:01:24 UTC (rev 583) @@ -37,9 +37,11 @@ notebook_drag_motion_cb(GtkWidget *widget, GdkDragContext *dc, gint x, gint y, guint time, gpointer user_data); +#if ! GTK_CHECK_VERSION(2, 8, 0) static gboolean notebook_motion_notify_event_cb(GtkWidget *widget, GdkEventMotion *event, gpointer user_data); +#endif static gint notebook_find_tab_num_at_pos(GtkNotebook *notebook, gint x, gint y); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [582] trunk
by ntrel＠users.sourceforge.net 18 Jul '06

18 Jul '06

Revision: 582 Author: ntrel Date: 2006-07-18 10:43:22 -0700 (Tue, 18 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=582&view=rev Log Message: ----------- Use more POSIX-like syntax for regular expression bracket matching; Prevent searching backwards with a regex (unsupported); Scroll in view after the last replacement for replace all/selection. Also move hiding the replace dialog out of document.c Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.docbook trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/dialogs.c trunk/src/document.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-18 14:09:01 UTC (rev 581) +++ trunk/ChangeLog 2006-07-18 17:43:22 UTC (rev 582) @@ -5,6 +5,12 @@ Add support for back references when replacing with regex. Improve the speed of replace all/replace in selection. Don't lose the selection range after replacing in selection. + * src/callbacks.c, src/callbacks.h, src/document.c, src/dialogs.c, + doc/geany.docbook: + Use more POSIX-like syntax for regular expression bracket matching. + Prevent searching backwards with a regex (unsupported). + Scroll in view after the last replacement for replace all/selection. + 2006-07-18 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/doc/geany.docbook =================================================================== --- trunk/doc/geany.docbook 2006-07-18 14:09:01 UTC (rev 581) +++ trunk/doc/geany.docbook 2006-07-18 17:43:22 UTC (rev 582) @@ -414,12 +414,15 @@ </para> </section> --> - <section> + <section id="searchreplace"> <title>Search and Replace</title> <para> - You can use regular expressions in the search dialog, just by activating the check box (see - the image below). Detailed information about special characters can be found in the - <xref linkend="regexp"/>. + You can use regular expressions in the search and replace dialogs, just by + activating the check box (see the image below). + The syntax is POSIX-like, as described in <xref linkend="regexp"/>. + <note><para> + Searching backwards with regular expressions is not supported. + </para></note> <figure> <title>Search dialog</title> <graphic fileref="images/find_dialog.jpg"></graphic> @@ -448,17 +451,17 @@ <entry>Matches any character.</entry> </row> <row> - <entry>$</entry> + <entry>(</entry> <entry>This marks the start of a region for tagging a match.</entry> </row> <row> - <entry>$</entry> + <entry>)</entry> <entry>This marks the end of a tagged region.</entry> </row> <row> <entry>\n</entry> <entry>Where n is 1 through 9 refers to the first through ninth tagged region - when replacing. For example, if the search string was Fred$[1-9]$XXX + when replacing. For example, if the search string was Fred([1-9])XXX and the replace string was Sam\1YYY, when applied to Fred2XXX this would generate Sam2YYY. </entry> @@ -475,7 +478,7 @@ <entry>\x</entry> <entry>This allows you to use a character x that would otherwise have a special meaning. For example, \[ would be interpreted as [ and not as the start - of a character set. + of a character set. Use \\ for a literal backslash. </entry> </row> <row> @@ -492,6 +495,10 @@ </entry> </row> <row> + <entry>^</entry> + <entry>This matches the start of a line (unless used inside a set, see above).</entry> + </row> + <row> <entry>$</entry> <entry>This matches the end of a line.</entry> </row> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-07-18 14:09:01 UTC (rev 581) +++ trunk/src/callbacks.c 2006-07-18 17:43:22 UTC (rev 582) @@ -1810,6 +1810,37 @@ void +on_find_previous1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + gint idx = document_get_cur_idx(); + + if (app->search_text == NULL) return; + + if (search_flags & SCFIND_REGEXP) + utils_beep(); //Can't reverse search order for a regex (find next ignores search backwards) + else + { + document_find_text(idx, app->search_text, search_flags, + !search_backwards); + } +} + + +void on_find_checkbutton_toggled (GtkToggleButton *togglebutton, + gpointer user_data) +{ + GtkToggleButton *chk_regexp = GTK_TOGGLE_BUTTON( + lookup_widget(GTK_WIDGET(app->find_dialog), "check_regexp")); + GtkWidget *chk_back = + lookup_widget(GTK_WIDGET(app->find_dialog), "check_back"); + + if (togglebutton == chk_regexp) + gtk_widget_set_sensitive(chk_back, ! gtk_toggle_button_get_active(chk_regexp)); +} + + +void on_find_dialog_response (GtkDialog *dialog, gint response, gpointer user_data) @@ -1850,7 +1881,7 @@ gtk_combo_box_prepend_text(GTK_COMBO_BOX(user_data), app->search_text); search_flags = (fl1 ? SCFIND_MATCHCASE : 0) | (fl2 ? SCFIND_WHOLEWORD : 0) | - (fl3 ? SCFIND_REGEXP : 0) | + (fl3 ? SCFIND_REGEXP | SCFIND_POSIX: 0) | (fl4 ? SCFIND_WORDSTART : 0); document_find_text(idx, app->search_text, search_flags, search_backwards); } @@ -1867,6 +1898,19 @@ } +void on_replace_checkbutton_toggled (GtkToggleButton *togglebutton, + gpointer user_data) +{ + GtkToggleButton *chk_regexp = GTK_TOGGLE_BUTTON( + lookup_widget(GTK_WIDGET(app->replace_dialog), "check_regexp")); + GtkWidget *chk_back = + lookup_widget(GTK_WIDGET(app->replace_dialog), "check_back"); + + if (togglebutton == chk_regexp) + gtk_widget_set_sensitive(chk_back, ! gtk_toggle_button_get_active(chk_regexp)); +} + + void on_replace_dialog_response (GtkDialog *dialog, gint response, @@ -1924,7 +1968,7 @@ search_flags_re = (fl1 ? SCFIND_MATCHCASE : 0) | (fl2 ? SCFIND_WHOLEWORD : 0) | - (fl3 ? SCFIND_REGEXP : 0) | + (fl3 ? SCFIND_REGEXP | SCFIND_POSIX : 0) | (fl4 ? SCFIND_WORDSTART : 0); if (search_in_all_buffers_re && response == GEANY_RESPONSE_REPLACE_ALL) @@ -1936,6 +1980,7 @@ document_replace_all(i, find, replace, search_flags_re); } + gtk_widget_hide(app->replace_dialog); } else { @@ -1943,17 +1988,20 @@ { case GEANY_RESPONSE_REPLACE: { - document_replace_text(idx, find, replace, search_flags_re, search_backwards_re); + document_replace_text(idx, find, replace, search_flags_re, + search_backwards_re); break; } case GEANY_RESPONSE_REPLACE_ALL: { document_replace_all(idx, find, replace, search_flags_re); + gtk_widget_hide(app->replace_dialog); break; } case GEANY_RESPONSE_REPLACE_SEL: { document_replace_sel(idx, find, replace, search_flags_re); + gtk_widget_hide(app->replace_dialog); break; } } @@ -2497,20 +2545,6 @@ void -on_find_previous1_activate (GtkMenuItem *menuitem, - gpointer user_data) -{ - gint idx = document_get_cur_idx(); - - if (app->search_text) - { - document_find_text(idx, app->search_text, search_flags, - !search_backwards); - } -} - - -void on_go_to_line1_activate (GtkMenuItem *menuitem, gpointer user_data) { Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2006-07-18 14:09:01 UTC (rev 581) +++ trunk/src/callbacks.h 2006-07-18 17:43:22 UTC (rev 582) @@ -376,6 +376,13 @@ gpointer user_data); void +on_find_previous1_activate (GtkMenuItem *menuitem, + gpointer user_data); + +void on_find_checkbutton_toggled (GtkToggleButton *togglebutton, + gpointer user_data); + +void on_find_dialog_response (GtkDialog *dialog, gint response, gpointer user_data); @@ -384,6 +391,9 @@ on_find_entry_activate (GtkEntry *entry, gpointer user_data); +void on_replace_checkbutton_toggled (GtkToggleButton *togglebutton, + gpointer user_data); + void on_replace_dialog_response (GtkDialog *dialog, gint response, @@ -570,10 +580,6 @@ gpointer user_data); void -on_find_previous1_activate (GtkMenuItem *menuitem, - gpointer user_data); - -void on_go_to_line1_activate (GtkMenuItem *menuitem, gpointer user_data); Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-07-18 14:09:01 UTC (rev 581) +++ trunk/src/dialogs.c 2006-07-18 17:43:22 UTC (rev 582) @@ -855,8 +855,10 @@ g_object_set_data_full(G_OBJECT(app->find_dialog), "check_regexp", gtk_widget_ref(checkbox3), (GDestroyNotify)gtk_widget_unref); gtk_button_set_focus_on_click(GTK_BUTTON(checkbox3), FALSE); - gtk_tooltips_set_tip(tooltips, checkbox3, - _("For detailed information about using regular expressions, please read the documentation."), NULL); + gtk_tooltips_set_tip(tooltips, checkbox3, _("Use POSIX-like regular expressions. " + "For detailed information about using regular expressions, please read the documentation."), NULL); + g_signal_connect(G_OBJECT(checkbox3), "toggled", + G_CALLBACK(on_find_checkbutton_toggled), NULL); checkbox6 = gtk_check_button_new_with_mnemonic(_("_Replace control characters")); g_object_set_data_full(G_OBJECT(app->find_dialog), "check_escape", @@ -984,8 +986,10 @@ g_object_set_data_full(G_OBJECT(app->replace_dialog), "check_regexp", gtk_widget_ref(checkbox3), (GDestroyNotify)gtk_widget_unref); gtk_button_set_focus_on_click(GTK_BUTTON(checkbox3), FALSE); - gtk_tooltips_set_tip(tooltips, checkbox3, - _("For detailed information about using regular expressions, please read the documentation."), NULL); + gtk_tooltips_set_tip(tooltips, checkbox3, _("Use POSIX-like regular expressions. " + "For detailed information about using regular expressions, please read the documentation."), NULL); + g_signal_connect(G_OBJECT(checkbox3), "toggled", + G_CALLBACK(on_replace_checkbutton_toggled), NULL); checkbox7 = gtk_check_button_new_with_mnemonic(_("_Replace control characters")); g_object_set_data_full(G_OBJECT(app->replace_dialog), "check_escape", Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-07-18 14:09:01 UTC (rev 581) +++ trunk/src/document.c 2006-07-18 17:43:22 UTC (rev 582) @@ -58,11 +58,10 @@ #include "notebook.h" -/* Returns -1 if no text found or the new range endpoint after replacing. - * show_last is whether to select and scroll the last replacement in view. */ +/* Returns -1 if no text found or the new range endpoint after replacing. */ static gint -document_replace_range(gint idx, const gchar *find_text, const gchar *replace_text, gint flags, - gint start, gint end, gboolean show_last); +document_replace_range(gint idx, const gchar *find_text, const gchar *replace_text, + gint flags, gint start, gint end); /* returns the index of the notebook page which has the given filename @@ -697,7 +696,8 @@ { gint selection_end, search_pos; - if (idx == -1 || ! strlen(text)) return; + g_return_if_fail(text != NULL); + if (idx == -1 || ! *text) return; selection_end = sci_get_selection_end(doc_list[idx].sci); if (!inc && sci_can_copy(doc_list[idx].sci)) @@ -735,7 +735,10 @@ { gint selection_end, selection_start, search_pos; - if (idx == -1 || ! strlen(text)) return; + g_return_if_fail(text != NULL); + if (idx == -1 || ! *text) return; + // Sci doesn't support searching backwards with a regex + if (flags & SCFIND_REGEXP) search_backwards = FALSE; selection_start = sci_get_selection_start(doc_list[idx].sci); selection_end = sci_get_selection_end(doc_list[idx].sci); @@ -768,12 +771,15 @@ } -void document_replace_text(gint idx, const gchar *find_text, const gchar *replace_text, gint flags, gboolean search_backwards) +void document_replace_text(gint idx, const gchar *find_text, const gchar *replace_text, + gint flags, gboolean search_backwards) { gint selection_end, selection_start, search_pos; g_return_if_fail(find_text != NULL && replace_text != NULL); if (idx == -1 || ! *find_text) return; + // Sci doesn't support searching backwards with a regex + if (flags & SCFIND_REGEXP) search_backwards = FALSE; selection_start = sci_get_selection_start(doc_list[idx].sci); selection_end = sci_get_selection_end(doc_list[idx].sci); @@ -809,11 +815,10 @@ } -/* Returns -1 if no text found or the new range endpoint after replacing. - * show_last is whether to select and scroll the last replacement in view. */ +/* Returns -1 if no text found or the new range endpoint after replacing. */ static gint -document_replace_range(gint idx, const gchar *find_text, const gchar *replace_text, gint flags, - gint start, gint end, gboolean show_last) +document_replace_range(gint idx, const gchar *find_text, const gchar *replace_text, + gint flags, gint start, gint end) { gint search_pos; gint find_len = 0, replace_len = 0; @@ -850,16 +855,12 @@ } sci_end_undo_action(doc_list[idx].sci); - if (match_found && show_last) - { - // select the last replacement - gint sel_start = ttf.chrg.cpMin - replace_len; - sci_set_selection_start(doc_list[idx].sci, sel_start); - sci_set_selection_end(doc_list[idx].sci, sel_start + replace_len); - sci_scroll_caret(doc_list[idx].sci); - } if (match_found) + { + // scroll last match in view. + sci_goto_pos(doc_list[idx].sci, ttf.chrg.cpMin, TRUE); return end; + } else return -1; //no text was found } @@ -881,7 +882,7 @@ } selection_end = document_replace_range(idx, find_text, replace_text, flags, - selection_start, selection_end, FALSE); + selection_start, selection_end); if (selection_end == -1) utils_beep(); else @@ -890,22 +891,19 @@ sci_set_selection_start(doc_list[idx].sci, selection_start); sci_set_selection_end(doc_list[idx].sci, selection_end); } - - gtk_widget_hide(app->replace_dialog); } -void document_replace_all(gint idx, const gchar *find_text, const gchar *replace_text, gint flags) +void document_replace_all(gint idx, const gchar *find_text, const gchar *replace_text, + gint flags) { gint len; g_return_if_fail(find_text != NULL && replace_text != NULL); if (idx == -1 || ! *find_text) return; len = sci_get_length(doc_list[idx].sci); - if (document_replace_range(idx, find_text, replace_text, flags, 0, len, TRUE) == -1) + if (document_replace_range(idx, find_text, replace_text, flags, 0, len) == -1) utils_beep(); - - gtk_widget_hide(app->replace_dialog); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [581] trunk
by ntrel＠users.sourceforge.net 18 Jul '06

18 Jul '06

Revision: 581 Author: ntrel Date: 2006-07-18 07:09:01 -0700 (Tue, 18 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=581&view=rev Log Message: ----------- Fix replacing the right length of text matched from a regex; Add support for back references when replacing with regex; Improve the speed of replace all/replace in selection; Don't lose the selection range after replacing in selection Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c trunk/src/sciwrappers.c trunk/src/sciwrappers.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-18 12:28:04 UTC (rev 580) +++ trunk/ChangeLog 2006-07-18 14:09:01 UTC (rev 581) @@ -1,3 +1,12 @@ +2006-07-18 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/sciwrappers.c, src/sciwrappers.h, src/document.c: + Fix replacing the right length of text matched from a regex. + Add support for back references when replacing with regex. + Improve the speed of replace all/replace in selection. + Don't lose the selection range after replacing in selection. + + 2006-07-18 Enrico Tröger <enrico.troeger(a)uvena.de> * src/dialogs.c, src/callbacks.c: Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-07-18 12:28:04 UTC (rev 580) +++ trunk/src/document.c 2006-07-18 14:09:01 UTC (rev 581) @@ -58,7 +58,13 @@ #include "notebook.h" +/* Returns -1 if no text found or the new range endpoint after replacing. + * show_last is whether to select and scroll the last replacement in view. */ +static gint +document_replace_range(gint idx, const gchar *find_text, const gchar *replace_text, gint flags, + gint start, gint end, gboolean show_last); + /* returns the index of the notebook page which has the given filename * is_tm_filename is needed when passing TagManager filenames because they are * dereferenced, and would not match the link filename. */ @@ -765,9 +771,9 @@ void document_replace_text(gint idx, const gchar *find_text, const gchar *replace_text, gint flags, gboolean search_backwards) { gint selection_end, selection_start, search_pos; - gint find_text_len = strlen(find_text); - if (idx == -1 || ! find_text_len) return; + g_return_if_fail(find_text != NULL && replace_text != NULL); + if (idx == -1 || ! *find_text) return; selection_start = sci_get_selection_start(doc_list[idx].sci); selection_end = sci_get_selection_end(doc_list[idx].sci); @@ -787,12 +793,14 @@ if (search_pos != -1) { - sci_target_start(doc_list[idx].sci, search_pos); - sci_target_end(doc_list[idx].sci, search_pos + find_text_len); - sci_target_replace(doc_list[idx].sci, replace_text); + gint replace_len; + // search next/prev will select matching text, which we use to set the replace target + sci_target_from_selection(doc_list[idx].sci); + replace_len = sci_target_replace(doc_list[idx].sci, replace_text, flags & SCFIND_REGEXP); + // select the replacement and scroll in view + sci_set_selection_start(doc_list[idx].sci, search_pos); + sci_set_selection_end(doc_list[idx].sci, search_pos + replace_len); sci_scroll_caret(doc_list[idx].sci); - sci_set_selection_start(doc_list[idx].sci, search_pos); - sci_set_selection_end(doc_list[idx].sci, search_pos + strlen(replace_text)); } else { @@ -801,83 +809,106 @@ } -void document_replace_sel(gint idx, const gchar *find_text, const gchar *replace_text, gint flags) +/* Returns -1 if no text found or the new range endpoint after replacing. + * show_last is whether to select and scroll the last replacement in view. */ +static gint +document_replace_range(gint idx, const gchar *find_text, const gchar *replace_text, gint flags, + gint start, gint end, gboolean show_last) { - gint selection_end, selection_start, search_pos; - gint anchor_pos; - gint find_text_len = strlen(find_text); - gint replace_text_len = strlen(replace_text); + gint search_pos; + gint find_len = 0, replace_len = 0; + gboolean match_found = FALSE; + struct TextToFind ttf; - if (idx == -1 || ! find_text_len) return; + g_return_val_if_fail(find_text != NULL && replace_text != NULL, FALSE); + if (idx == -1 || ! *find_text) return FALSE; - selection_start = sci_get_selection_start(doc_list[idx].sci); - selection_end = sci_get_selection_end(doc_list[idx].sci); - if ((selection_end - selection_start) == 0) - { - utils_beep(); - return; - } + sci_start_undo_action(doc_list[idx].sci); + ttf.chrg.cpMin = start; + ttf.chrg.cpMax = end; + ttf.lpstrText = (gchar*)find_text; - sci_start_undo_action(doc_list[idx].sci); - anchor_pos = selection_start; while (TRUE) { - sci_goto_pos(doc_list[idx].sci, anchor_pos, TRUE); - sci_set_search_anchor(doc_list[idx].sci); - search_pos = sci_search_next(doc_list[idx].sci, flags, find_text); + search_pos = sci_find_text(doc_list[idx].sci, flags, &ttf); + if (search_pos == -1) break; + find_len = ttf.chrgText.cpMax - ttf.chrgText.cpMin; - if (search_pos == -1 || - search_pos < selection_start || - search_pos + find_text_len > selection_end) break; + if (search_pos + find_len > end) + break; //found text is partly out of range else { + match_found = TRUE; sci_target_start(doc_list[idx].sci, search_pos); - sci_target_end(doc_list[idx].sci, search_pos + find_text_len); - sci_target_replace(doc_list[idx].sci, replace_text); - anchor_pos = search_pos + replace_text_len; //avoid rematch - // update selection end point for each replacement - selection_end += replace_text_len - find_text_len; + sci_target_end(doc_list[idx].sci, search_pos + find_len); + replace_len = sci_target_replace(doc_list[idx].sci, replace_text, + flags & SCFIND_REGEXP); + ttf.chrg.cpMin = search_pos + replace_len; //next search starts after replacement + end += replace_len - find_len; //update end of range now text has changed + ttf.chrg.cpMax = end; } } sci_end_undo_action(doc_list[idx].sci); - // set selection again, because it got lost and end may be moved - sci_set_selection_start(doc_list[idx].sci, selection_start); - sci_set_selection_end(doc_list[idx].sci, selection_end); - sci_scroll_caret(doc_list[idx].sci); - gtk_widget_hide(app->replace_dialog); + if (match_found && show_last) + { + // select the last replacement + gint sel_start = ttf.chrg.cpMin - replace_len; + sci_set_selection_start(doc_list[idx].sci, sel_start); + sci_set_selection_end(doc_list[idx].sci, sel_start + replace_len); + sci_scroll_caret(doc_list[idx].sci); + } + if (match_found) + return end; + else + return -1; //no text was found } -void document_replace_all(gint idx, const gchar *find_text, const gchar *replace_text, gint flags) +void document_replace_sel(gint idx, const gchar *find_text, const gchar *replace_text, gint flags) { - gint search_pos; - gint find_text_len = strlen(find_text); - gint replace_text_len = strlen(replace_text); + gint selection_end, selection_start; - if (idx == -1 || ! find_text_len) return; + g_return_if_fail(find_text != NULL && replace_text != NULL); + if (idx == -1 || ! *find_text) return; - sci_start_undo_action(doc_list[idx].sci); - sci_goto_pos(doc_list[idx].sci, 0, FALSE); - sci_set_search_anchor(doc_list[idx].sci); + selection_start = sci_get_selection_start(doc_list[idx].sci); + selection_end = sci_get_selection_end(doc_list[idx].sci); + if ((selection_end - selection_start) == 0) + { + utils_beep(); + return; + } - search_pos = sci_search_next(doc_list[idx].sci, flags, find_text); - while (search_pos != -1) + selection_end = document_replace_range(idx, find_text, replace_text, flags, + selection_start, selection_end, FALSE); + if (selection_end == -1) + utils_beep(); + else { - sci_target_start(doc_list[idx].sci, search_pos); - sci_target_end(doc_list[idx].sci, search_pos + find_text_len); - sci_target_replace(doc_list[idx].sci, replace_text); - // next search starts after replaced text (avoids rematching): - sci_goto_pos(doc_list[idx].sci, search_pos + replace_text_len, TRUE); - sci_set_search_anchor(doc_list[idx].sci); - search_pos = sci_search_next(doc_list[idx].sci, flags, find_text); + //update the selection for the new endpoint + sci_set_selection_start(doc_list[idx].sci, selection_start); + sci_set_selection_end(doc_list[idx].sci, selection_end); } - sci_end_undo_action(doc_list[idx].sci); - sci_scroll_caret(doc_list[idx].sci); + gtk_widget_hide(app->replace_dialog); } +void document_replace_all(gint idx, const gchar *find_text, const gchar *replace_text, gint flags) +{ + gint len; + g_return_if_fail(find_text != NULL && replace_text != NULL); + if (idx == -1 || ! *find_text) return; + + len = sci_get_length(doc_list[idx].sci); + if (document_replace_range(idx, find_text, replace_text, flags, 0, len, TRUE) == -1) + utils_beep(); + + gtk_widget_hide(app->replace_dialog); +} + + void document_set_font(gint idx, const gchar *font_name, gint size) { gint style; @@ -1240,7 +1271,7 @@ { sci_target_start(doc_list[idx].sci, i + 1); sci_target_end(doc_list[idx].sci, line_end); - sci_target_replace(doc_list[idx].sci, ""); + sci_target_replace(doc_list[idx].sci, "", FALSE); } } } Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2006-07-18 12:28:04 UTC (rev 580) +++ trunk/src/sciwrappers.c 2006-07-18 14:09:01 UTC (rev 581) @@ -772,9 +772,9 @@ } -void sci_target_replace(ScintillaObject *sci, const gchar *text) +gint sci_target_replace(ScintillaObject *sci, const gchar *text, gboolean regex) { - SSM(sci, SCI_REPLACETARGET, -1, (sptr_t) text); + return SSM(sci, (regex) ? SCI_REPLACETARGETRE : SCI_REPLACETARGET, -1, (sptr_t) text); } Modified: trunk/src/sciwrappers.h =================================================================== --- trunk/src/sciwrappers.h 2006-07-18 12:28:04 UTC (rev 580) +++ trunk/src/sciwrappers.h 2006-07-18 14:09:01 UTC (rev 581) @@ -138,7 +138,7 @@ void sci_target_from_selection (ScintillaObject * sci); void sci_target_start (ScintillaObject * sci, gint start); void sci_target_end (ScintillaObject * sci, gint end); -void sci_target_replace (ScintillaObject * sci, const gchar *text); +gint sci_target_replace (ScintillaObject *sci, const gchar *text, gboolean regex); void sci_set_keywords (ScintillaObject * sci, gint k, gchar *text); void sci_scroll_lines (ScintillaObject * sci, gint lines); gint sci_get_lexer (ScintillaObject * sci); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [580] trunk/doc/Makefile.am
by eht16＠users.sourceforge.net 18 Jul '06

18 Jul '06

Revision: 580 Author: eht16 Date: 2006-07-18 05:28:04 -0700 (Tue, 18 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=580&view=rev Log Message: ----------- Reverted last change, we want to use xmlto. Modified Paths: -------------- trunk/doc/Makefile.am Modified: trunk/doc/Makefile.am =================================================================== --- trunk/doc/Makefile.am 2006-07-18 12:27:36 UTC (rev 579) +++ trunk/doc/Makefile.am 2006-07-18 12:28:04 UTC (rev 580) @@ -15,7 +15,7 @@ htmldoc: geany.docbook if [ geany.docbook -nt "./html/index.html" ]; then \ $(mkinstalldirs) html; \ - xsltproc --nonet --xinclude -o html/ geany.xsl geany.docbook; \ + xmlto -m geany.xsl -o html/ xhtml geany.docbook; \ test -f html/geany.css || cp geany.css html/; \ fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [579] trunk
by eht16＠users.sourceforge.net 18 Jul '06

18 Jul '06

Revision: 579 Author: eht16 Date: 2006-07-18 05:27:36 -0700 (Tue, 18 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=579&view=rev Log Message: ----------- Restored original order of the encodings, kept the sorted order in the document menu. Modified Paths: -------------- trunk/ChangeLog trunk/src/encodings.c trunk/src/encodings.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-18 10:48:51 UTC (rev 578) +++ trunk/ChangeLog 2006-07-18 12:27:36 UTC (rev 579) @@ -2,6 +2,9 @@ * src/dialogs.c, src/callbacks.c: Added option to replace escape sequences in Find and Replace dialog. + * doc/Makefile.am: Reverted last change, we want to use xmlto. + * src/encodings.c: Restored original order of the encodings, kept the + sorted order in the document menu. 2006-07-17 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/encodings.c =================================================================== --- trunk/src/encodings.c 2006-07-18 10:48:51 UTC (rev 578) +++ trunk/src/encodings.c 2006-07-18 12:27:36 UTC (rev 579) @@ -39,110 +39,84 @@ -#define fill(w, x, y, z) \ +#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; static void init_encodings(void) { - fill(WESTEUROPEAN, GEANY_ENCODING_ISO_8859_14, "ISO-8859-14", _("Celtic")); - fill(WESTEUROPEAN, GEANY_ENCODING_ISO_8859_7, "ISO-8859-7", _("Greek")); - fill(WESTEUROPEAN, GEANY_ENCODING_WINDOWS_1253, "WINDOWS-1253", _("Greek")); - fill(WESTEUROPEAN, GEANY_ENCODING_ISO_8859_10, "ISO-8859-10", _("Nordic")); - fill(WESTEUROPEAN, GEANY_ENCODING_ISO_8859_3, "ISO-8859-3", _("South European")); - fill(WESTEUROPEAN, GEANY_ENCODING_IBM_850, "IBM850", _("Western")); - fill(WESTEUROPEAN, GEANY_ENCODING_ISO_8859_1, "ISO-8859-1", _("Western")); - fill(WESTEUROPEAN, GEANY_ENCODING_ISO_8859_15, "ISO-8859-15", _("Western")); - fill(WESTEUROPEAN, GEANY_ENCODING_WINDOWS_1252, "WINDOWS-1252", _("Western")); + fill(0, WESTEUROPEAN, GEANY_ENCODING_ISO_8859_14, "ISO-8859-14", _("Celtic")); + fill(1, WESTEUROPEAN, GEANY_ENCODING_ISO_8859_7, "ISO-8859-7", _("Greek")); + fill(2, WESTEUROPEAN, GEANY_ENCODING_WINDOWS_1253, "WINDOWS-1253", _("Greek")); + fill(3, WESTEUROPEAN, GEANY_ENCODING_ISO_8859_10, "ISO-8859-10", _("Nordic")); + fill(4, WESTEUROPEAN, GEANY_ENCODING_ISO_8859_3, "ISO-8859-3", _("South European")); + fill(5, WESTEUROPEAN, GEANY_ENCODING_IBM_850, "IBM850", _("Western")); + fill(6, WESTEUROPEAN, GEANY_ENCODING_ISO_8859_1, "ISO-8859-1", _("Western")); + fill(7, WESTEUROPEAN, GEANY_ENCODING_ISO_8859_15, "ISO-8859-15", _("Western")); + fill(8, WESTEUROPEAN, GEANY_ENCODING_WINDOWS_1252, "WINDOWS-1252", _("Western")); - fill(EASTEUROPEAN, GEANY_ENCODING_ISO_8859_4, "ISO-8859-4", _("Baltic")); - fill(EASTEUROPEAN, GEANY_ENCODING_ISO_8859_13, "ISO-8859-13", _("Baltic")); - fill(EASTEUROPEAN, GEANY_ENCODING_WINDOWS_1257, "WINDOWS-1257", _("Baltic")); - fill(EASTEUROPEAN, GEANY_ENCODING_IBM_852, "IBM852", _("Central European")); - fill(EASTEUROPEAN, GEANY_ENCODING_ISO_8859_2, "ISO-8859-2", _("Central European")); - fill(EASTEUROPEAN, GEANY_ENCODING_WINDOWS_1250, "WINDOWS-1250", _("Central European")); - fill(EASTEUROPEAN, GEANY_ENCODING_IBM_855, "IBM855", _("Cyrillic")); - fill(EASTEUROPEAN, GEANY_ENCODING_ISO_8859_5, "ISO-8859-5", _("Cyrillic")); - fill(EASTEUROPEAN, GEANY_ENCODING_ISO_IR_111, "ISO-IR-111", _("Cyrillic")); - fill(EASTEUROPEAN, GEANY_ENCODING_KOI8_R, "KOI8R", _("Cyrillic")); - fill(EASTEUROPEAN, GEANY_ENCODING_WINDOWS_1251, "WINDOWS-1251", _("Cyrillic")); - fill(EASTEUROPEAN, GEANY_ENCODING_CP_866, "CP866", _("Cyrillic/Russian")); - fill(EASTEUROPEAN, GEANY_ENCODING_KOI8_U, "KOI8U", _("Cyrillic/Ukrainian")); - fill(EASTEUROPEAN, GEANY_ENCODING_ISO_8859_16, "ISO-8859-16", _("Romanian")); + fill(0, EASTEUROPEAN, GEANY_ENCODING_ISO_8859_4, "ISO-8859-4", _("Baltic")); + fill(1, EASTEUROPEAN, GEANY_ENCODING_ISO_8859_13, "ISO-8859-13", _("Baltic")); + fill(2, EASTEUROPEAN, GEANY_ENCODING_WINDOWS_1257, "WINDOWS-1257", _("Baltic")); + fill(3, EASTEUROPEAN, GEANY_ENCODING_IBM_852, "IBM852", _("Central European")); + fill(4, EASTEUROPEAN, GEANY_ENCODING_ISO_8859_2, "ISO-8859-2", _("Central European")); + fill(5, EASTEUROPEAN, GEANY_ENCODING_WINDOWS_1250, "WINDOWS-1250", _("Central European")); + fill(6, EASTEUROPEAN, GEANY_ENCODING_IBM_855, "IBM855", _("Cyrillic")); + fill(7, EASTEUROPEAN, GEANY_ENCODING_ISO_8859_5, "ISO-8859-5", _("Cyrillic")); + fill(8, EASTEUROPEAN, GEANY_ENCODING_ISO_IR_111, "ISO-IR-111", _("Cyrillic")); + fill(9, EASTEUROPEAN, GEANY_ENCODING_KOI8_R, "KOI8R", _("Cyrillic")); + fill(10, EASTEUROPEAN, GEANY_ENCODING_WINDOWS_1251, "WINDOWS-1251", _("Cyrillic")); + fill(11, EASTEUROPEAN, GEANY_ENCODING_CP_866, "CP866", _("Cyrillic/Russian")); + fill(12, EASTEUROPEAN, GEANY_ENCODING_KOI8_U, "KOI8U", _("Cyrillic/Ukrainian")); + fill(13, EASTEUROPEAN, GEANY_ENCODING_ISO_8859_16, "ISO-8859-16", _("Romanian")); - fill(MIDDLEEASTERN, GEANY_ENCODING_IBM_864, "IBM864", _("Arabic")); - fill(MIDDLEEASTERN, GEANY_ENCODING_ISO_8859_6, "ISO-8859-6", _("Arabic")); - fill(MIDDLEEASTERN, GEANY_ENCODING_WINDOWS_1256, "WINDOWS-1256", _("Arabic")); - fill(MIDDLEEASTERN, GEANY_ENCODING_IBM_862, "IBM862", _("Hebrew")); - fill(MIDDLEEASTERN, GEANY_ENCODING_ISO_8859_8_I, "ISO-8859-8-I", _("Hebrew")); - fill(MIDDLEEASTERN, GEANY_ENCODING_WINDOWS_1255, "WINDOWS-1255", _("Hebrew")); - fill(MIDDLEEASTERN, GEANY_ENCODING_ISO_8859_8, "ISO-8859-8", _("Hebrew Visual")); + fill(0, MIDDLEEASTERN, GEANY_ENCODING_IBM_864, "IBM864", _("Arabic")); + fill(1, MIDDLEEASTERN, GEANY_ENCODING_ISO_8859_6, "ISO-8859-6", _("Arabic")); + fill(2, MIDDLEEASTERN, GEANY_ENCODING_WINDOWS_1256, "WINDOWS-1256", _("Arabic")); + fill(3, MIDDLEEASTERN, GEANY_ENCODING_IBM_862, "IBM862", _("Hebrew")); + fill(4, MIDDLEEASTERN, GEANY_ENCODING_ISO_8859_8_I, "ISO-8859-8-I", _("Hebrew")); + fill(5, MIDDLEEASTERN, GEANY_ENCODING_WINDOWS_1255, "WINDOWS-1255", _("Hebrew")); + fill(6, MIDDLEEASTERN, GEANY_ENCODING_ISO_8859_8, "ISO-8859-8", _("Hebrew Visual")); - fill(ASIAN, GEANY_ENCODING_ARMSCII_8, "ARMSCII-8", _("Armenian")); - fill(ASIAN, GEANY_ENCODING_GEOSTD8, "GEORGIAN-ACADEMY", _("Georgian")); - fill(ASIAN, GEANY_ENCODING_TIS_620, "TIS-620", _("Thai")); - fill(ASIAN, GEANY_ENCODING_IBM_857, "IBM857", _("Turkish")); - fill(ASIAN, GEANY_ENCODING_WINDOWS_1254, "WINDOWS-1254", _("Turkish")); - fill(ASIAN, GEANY_ENCODING_ISO_8859_9, "ISO-8859-9", _("Turkish")); - fill(ASIAN, GEANY_ENCODING_TCVN, "TCVN", _("Vietnamese")); - fill(ASIAN, GEANY_ENCODING_VISCII, "VISCII", _("Vietnamese")); - fill(ASIAN, GEANY_ENCODING_WINDOWS_1258, "WINDOWS-1258", _("Vietnamese")); + fill(0, ASIAN, GEANY_ENCODING_ARMSCII_8, "ARMSCII-8", _("Armenian")); + fill(1, ASIAN, GEANY_ENCODING_GEOSTD8, "GEORGIAN-ACADEMY", _("Georgian")); + fill(2, ASIAN, GEANY_ENCODING_TIS_620, "TIS-620", _("Thai")); + fill(3, ASIAN, GEANY_ENCODING_IBM_857, "IBM857", _("Turkish")); + fill(4, ASIAN, GEANY_ENCODING_WINDOWS_1254, "WINDOWS-1254", _("Turkish")); + fill(5, ASIAN, GEANY_ENCODING_ISO_8859_9, "ISO-8859-9", _("Turkish")); + fill(6, ASIAN, GEANY_ENCODING_TCVN, "TCVN", _("Vietnamese")); + fill(7, ASIAN, GEANY_ENCODING_VISCII, "VISCII", _("Vietnamese")); + fill(8, ASIAN, GEANY_ENCODING_WINDOWS_1258, "WINDOWS-1258", _("Vietnamese")); - fill(UNICODE, GEANY_ENCODING_UTF_8, "UTF-8", _("Unicode")); - fill(UNICODE, GEANY_ENCODING_UTF_16, "UTF-16", _("Unicode")); - fill(UNICODE, GEANY_ENCODING_UCS_2, "UCS-2", _("Unicode")); - fill(UNICODE, GEANY_ENCODING_UCS_4, "UCS-4", _("Unicode")); + fill(0, UNICODE, GEANY_ENCODING_UTF_8, "UTF-8", _("Unicode")); + fill(1, UNICODE, GEANY_ENCODING_UTF_16, "UTF-16", _("Unicode")); + fill(2, UNICODE, GEANY_ENCODING_UCS_2, "UCS-2", _("Unicode")); + fill(3, UNICODE, GEANY_ENCODING_UCS_4, "UCS-4", _("Unicode")); - fill(EASTASIAN, GEANY_ENCODING_GB18030, "GB18030", _("Chinese Simplified")); - fill(EASTASIAN, GEANY_ENCODING_GB2312, "GB2312", _("Chinese Simplified")); - fill(EASTASIAN, GEANY_ENCODING_GBK, "GBK", _("Chinese Simplified")); - fill(EASTASIAN, GEANY_ENCODING_HZ, "HZ", _("Chinese Simplified")); - fill(EASTASIAN, GEANY_ENCODING_BIG5, "BIG5", _("Chinese Traditional")); - fill(EASTASIAN, GEANY_ENCODING_BIG5_HKSCS, "BIG5-HKSCS", _("Chinese Traditional")); - fill(EASTASIAN, GEANY_ENCODING_EUC_TW, "EUC-TW", _("Chinese Traditional")); - fill(EASTASIAN, GEANY_ENCODING_EUC_JP, "EUC-JP", _("Japanese")); - fill(EASTASIAN, GEANY_ENCODING_ISO_2022_JP, "ISO-2022-JP", _("Japanese")); - fill(EASTASIAN, GEANY_ENCODING_SHIFT_JIS, "SHIFT_JIS", _("Japanese")); - fill(EASTASIAN, GEANY_ENCODING_EUC_KR, "EUC-KR", _("Korean")); - fill(EASTASIAN, GEANY_ENCODING_ISO_2022_KR, "ISO-2022-KR", _("Korean")); - fill(EASTASIAN, GEANY_ENCODING_JOHAB, "JOHAB", _("Korean")); - fill(EASTASIAN, GEANY_ENCODING_UHC, "UHC", _("Korean")); + fill(0, EASTASIAN, GEANY_ENCODING_GB18030, "GB18030", _("Chinese Simplified")); + fill(1, EASTASIAN, GEANY_ENCODING_GB2312, "GB2312", _("Chinese Simplified")); + fill(2, EASTASIAN, GEANY_ENCODING_GBK, "GBK", _("Chinese Simplified")); + fill(3, EASTASIAN, GEANY_ENCODING_HZ, "HZ", _("Chinese Simplified")); + fill(4, EASTASIAN, GEANY_ENCODING_BIG5, "BIG5", _("Chinese Traditional")); + fill(5, EASTASIAN, GEANY_ENCODING_BIG5_HKSCS, "BIG5-HKSCS", _("Chinese Traditional")); + fill(6, EASTASIAN, GEANY_ENCODING_EUC_TW, "EUC-TW", _("Chinese Traditional")); + fill(7, EASTASIAN, GEANY_ENCODING_EUC_JP, "EUC-JP", _("Japanese")); + fill(8, EASTASIAN, GEANY_ENCODING_ISO_2022_JP, "ISO-2022-JP", _("Japanese")); + fill(9, EASTASIAN, GEANY_ENCODING_SHIFT_JIS, "SHIFT_JIS", _("Japanese")); + fill(10, EASTASIAN, GEANY_ENCODING_EUC_KR, "EUC-KR", _("Korean")); + fill(11, EASTASIAN, GEANY_ENCODING_ISO_2022_KR, "ISO-2022-KR", _("Korean")); + fill(12, EASTASIAN, GEANY_ENCODING_JOHAB, "JOHAB", _("Korean")); + fill(13, EASTASIAN, GEANY_ENCODING_UHC, "UHC", _("Korean")); } -static void encodings_lazy_init(void) -{ - static gboolean initialized = FALSE; - gint i; - - if (initialized) - return; - - g_return_if_fail(G_N_ELEMENTS(encodings) == GEANY_ENCODINGS_MAX); - - i = 0; - while (i < GEANY_ENCODINGS_MAX) - { - g_return_if_fail(encodings[i].idx == i); - - /* Translate the names */ - encodings[i].name = _(encodings[i].name); - - ++i; - } - - initialized = TRUE; -} - - const GeanyEncoding *encodings_get_from_charset(const gchar *charset) { gint i; - encodings_lazy_init (); - i = 0; while (i < GEANY_ENCODINGS_MAX) { @@ -159,12 +133,8 @@ const GeanyEncoding *encodings_get_from_index(gint index) { g_return_val_if_fail(index >= 0, NULL); + g_return_val_if_fail(index < GEANY_ENCODINGS_MAX, NULL); - if (index >= GEANY_ENCODINGS_MAX) - return NULL; - - encodings_lazy_init(); - return &encodings[index]; } @@ -175,21 +145,15 @@ g_return_val_if_fail(enc->name != NULL, NULL); g_return_val_if_fail(enc->charset != NULL, NULL); - encodings_lazy_init(); - return g_strdup_printf("%s (%s)", enc->name, enc->charset); } const gchar *encodings_get_charset(const GeanyEncoding* enc) { -/* g_return_val_if_fail(enc != NULL, NULL); + g_return_val_if_fail(enc != NULL, NULL); g_return_val_if_fail(enc->charset != NULL, NULL); -*/ - if (enc == NULL) return NULL; - encodings_lazy_init(); - return enc->charset; } @@ -200,10 +164,9 @@ *menu_utf8, *menu_middleeast, *item_westeuro, *item_easteuro, *item_eastasian, *item_asian, *item_utf8, *item_middleeast; gchar *label; - guint i = 0; + guint i, j, order, group_size; init_encodings(); - encodings_lazy_init(); // create encodings submenu in document menu menu = lookup_widget(app->window, "set_encoding1_menu"); @@ -244,30 +207,38 @@ gtk_container_add(GTK_CONTAINER(menu), item_utf8); gtk_widget_show_all(item_utf8); - - while (i < GEANY_ENCODINGS_MAX) + /// TODO can it be optimized? ATM 1583 runs at line 233 + for (i = 0; i < GEANY_ENCODING_GROUPS_MAX - 1; i++) { - if (encodings[i].idx != i) break; - - switch (encodings[i].group) + order = 0; + switch (i) { - case WESTEUROPEAN: submenu = menu_westeuro; break; - case EASTEUROPEAN: submenu = menu_easteuro; break; - case EASTASIAN: submenu = menu_eastasian; break; - case ASIAN: submenu = menu_asian; break; - case MIDDLEEASTERN: submenu = menu_middleeast; break; - case UNICODE: submenu = menu_utf8; break; - default: submenu = menu; + case WESTEUROPEAN: submenu = menu_westeuro; group_size = 9; break; + case EASTEUROPEAN: submenu = menu_easteuro; group_size = 14; break; + case EASTASIAN: submenu = menu_eastasian; group_size = 14; break; + case ASIAN: submenu = menu_asian; group_size = 9; break; + case MIDDLEEASTERN: submenu = menu_middleeast; group_size = 7; break; + case UNICODE: submenu = menu_utf8; group_size = 4; break; + default: submenu = menu; group_size = 0; } - label = encodings_to_string(&encodings[i]); - item = gtk_menu_item_new_with_label(label); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(submenu), item); - g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_encoding_change), - GINT_TO_POINTER(encodings[i].idx)); - g_free(label); - i++; - } - + while (order < group_size) // the biggest group has 13 elements + { + for (j = 0; j < GEANY_ENCODINGS_MAX; j++) + { + if (encodings[j].group == i && encodings[j].order == order) + { + label = encodings_to_string(&encodings[j]); + item = gtk_menu_item_new_with_label(label); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(submenu), item); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_encoding_change), + GINT_TO_POINTER(encodings[j].idx)); + g_free(label); + break; + } + } + order++; + } + } } Modified: trunk/src/encodings.h =================================================================== --- trunk/src/encodings.h 2006-07-18 10:48:51 UTC (rev 578) +++ trunk/src/encodings.h 2006-07-18 12:27:36 UTC (rev 579) @@ -49,6 +49,7 @@ typedef struct { gint idx; + gint order; GeanyEncodingGroup group; gchar *charset; gchar *name; @@ -73,69 +74,72 @@ typedef enum { - GEANY_ENCODING_ISO_8859_14, - GEANY_ENCODING_ISO_8859_7, - GEANY_ENCODING_WINDOWS_1253, - GEANY_ENCODING_ISO_8859_10, + GEANY_ENCODING_ISO_8859_1, + GEANY_ENCODING_ISO_8859_2, GEANY_ENCODING_ISO_8859_3, - GEANY_ENCODING_IBM_850, - GEANY_ENCODING_ISO_8859_1, - GEANY_ENCODING_ISO_8859_15, - GEANY_ENCODING_WINDOWS_1252, - GEANY_ENCODING_ISO_8859_4, - GEANY_ENCODING_ISO_8859_13, - GEANY_ENCODING_WINDOWS_1257, - GEANY_ENCODING_IBM_852, - GEANY_ENCODING_ISO_8859_2, - GEANY_ENCODING_WINDOWS_1250, - GEANY_ENCODING_IBM_855, GEANY_ENCODING_ISO_8859_5, - GEANY_ENCODING_ISO_IR_111, - GEANY_ENCODING_KOI8_R, - GEANY_ENCODING_WINDOWS_1251, - GEANY_ENCODING_CP_866, - GEANY_ENCODING_KOI8_U, - GEANY_ENCODING_ISO_8859_16, - - GEANY_ENCODING_IBM_864, GEANY_ENCODING_ISO_8859_6, - GEANY_ENCODING_WINDOWS_1256, - GEANY_ENCODING_IBM_862, + GEANY_ENCODING_ISO_8859_7, + GEANY_ENCODING_ISO_8859_8, GEANY_ENCODING_ISO_8859_8_I, - GEANY_ENCODING_WINDOWS_1255, - GEANY_ENCODING_ISO_8859_8, - - GEANY_ENCODING_ARMSCII_8, - GEANY_ENCODING_GEOSTD8, - GEANY_ENCODING_TIS_620, - GEANY_ENCODING_IBM_857, - GEANY_ENCODING_WINDOWS_1254, GEANY_ENCODING_ISO_8859_9, - GEANY_ENCODING_TCVN, - GEANY_ENCODING_VISCII, - GEANY_ENCODING_WINDOWS_1258, + GEANY_ENCODING_ISO_8859_10, + GEANY_ENCODING_ISO_8859_13, + GEANY_ENCODING_ISO_8859_14, + GEANY_ENCODING_ISO_8859_15, + GEANY_ENCODING_ISO_8859_16, GEANY_ENCODING_UTF_8, GEANY_ENCODING_UTF_16, GEANY_ENCODING_UCS_2, GEANY_ENCODING_UCS_4, + GEANY_ENCODING_ARMSCII_8, + GEANY_ENCODING_BIG5, + GEANY_ENCODING_BIG5_HKSCS, + GEANY_ENCODING_CP_866, + + GEANY_ENCODING_EUC_JP, + GEANY_ENCODING_EUC_KR, + GEANY_ENCODING_EUC_TW, + GEANY_ENCODING_GB18030, GEANY_ENCODING_GB2312, GEANY_ENCODING_GBK, + GEANY_ENCODING_GEOSTD8, GEANY_ENCODING_HZ, - GEANY_ENCODING_BIG5, - GEANY_ENCODING_BIG5_HKSCS, - GEANY_ENCODING_EUC_TW, - GEANY_ENCODING_EUC_JP, + + GEANY_ENCODING_IBM_850, + GEANY_ENCODING_IBM_852, + GEANY_ENCODING_IBM_855, + GEANY_ENCODING_IBM_857, + GEANY_ENCODING_IBM_862, + GEANY_ENCODING_IBM_864, + GEANY_ENCODING_ISO_2022_JP, - GEANY_ENCODING_SHIFT_JIS, - GEANY_ENCODING_EUC_KR, GEANY_ENCODING_ISO_2022_KR, + GEANY_ENCODING_ISO_IR_111, GEANY_ENCODING_JOHAB, + GEANY_ENCODING_KOI8_R, + GEANY_ENCODING_KOI8_U, + + GEANY_ENCODING_SHIFT_JIS, + GEANY_ENCODING_TCVN, + GEANY_ENCODING_TIS_620, GEANY_ENCODING_UHC, + GEANY_ENCODING_VISCII, + GEANY_ENCODING_WINDOWS_1250, + GEANY_ENCODING_WINDOWS_1251, + GEANY_ENCODING_WINDOWS_1252, + GEANY_ENCODING_WINDOWS_1253, + GEANY_ENCODING_WINDOWS_1254, + GEANY_ENCODING_WINDOWS_1255, + GEANY_ENCODING_WINDOWS_1256, + GEANY_ENCODING_WINDOWS_1257, + GEANY_ENCODING_WINDOWS_1258, + GEANY_ENCODINGS_MAX } GeanyEncodingIndex; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [578] trunk
by eht16＠users.sourceforge.net 18 Jul '06

18 Jul '06

Revision: 578 Author: eht16 Date: 2006-07-18 03:48:51 -0700 (Tue, 18 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=578&view=rev Log Message: ----------- Added option to replace escape sequences in Find and Replace dialog. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/dialogs.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-17 19:48:42 UTC (rev 577) +++ trunk/ChangeLog 2006-07-18 10:48:51 UTC (rev 578) @@ -1,3 +1,9 @@ +2006-07-18 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/dialogs.c, src/callbacks.c: + Added option to replace escape sequences in Find and Replace dialog. + + 2006-07-17 Nick Treleaven <nick.treleaven(a)btinternet.com> * doc/scikeybinding.docbook, doc/geany.docbook, doc/geany_gpl.docbook: Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-07-17 19:48:42 UTC (rev 577) +++ trunk/src/callbacks.c 2006-07-18 10:48:51 UTC (rev 578) @@ -80,8 +80,10 @@ // the flags given in the search dialog(stored statically for "find next" and "replace") static gint search_flags; static gboolean search_backwards; +static gboolean search_replace_escape; static gint search_flags_re; static gboolean search_backwards_re; +static gboolean search_replace_escape_re; static gboolean search_in_all_buffers_re; // holds the current position where the mouse pointer is when the popup menu for the scintilla @@ -1824,6 +1826,8 @@ lookup_widget(GTK_WIDGET(app->find_dialog), "check_regexp"))), fl4 = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( lookup_widget(GTK_WIDGET(app->find_dialog), "check_wordstart"))); + search_replace_escape = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( + lookup_widget(GTK_WIDGET(app->find_dialog), "check_escape"))); search_backwards = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( lookup_widget(GTK_WIDGET(app->find_dialog), "check_back"))); @@ -1835,6 +1839,12 @@ gtk_widget_grab_focus(GTK_WIDGET(GTK_BIN(lookup_widget(app->find_dialog, "entry"))->child)); return; } + else if (search_replace_escape) + { + app->search_text = utils_str_replace(app->search_text, "\\n", "\n"); + app->search_text = utils_str_replace(app->search_text, "\\r", "\r"); + app->search_text = utils_str_replace(app->search_text, "\\t", "\t"); + } gtk_widget_hide(app->find_dialog); gtk_combo_box_prepend_text(GTK_COMBO_BOX(user_data), app->search_text); @@ -1866,7 +1876,7 @@ GtkWidget *entry_find = lookup_widget(GTK_WIDGET(app->replace_dialog), "entry_find"); GtkWidget *entry_replace = lookup_widget(GTK_WIDGET(app->replace_dialog), "entry_replace"); gboolean fl1, fl2, fl3, fl4; - const gchar *find, *replace; + gchar *find, *replace; if (response == GTK_RESPONSE_CANCEL) { @@ -1884,10 +1894,12 @@ lookup_widget(GTK_WIDGET(app->replace_dialog), "check_wordstart"))); search_backwards_re = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( lookup_widget(GTK_WIDGET(app->replace_dialog), "check_back"))); + search_replace_escape_re = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( + lookup_widget(GTK_WIDGET(app->replace_dialog), "check_escape"))); search_in_all_buffers_re = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( lookup_widget(GTK_WIDGET(app->replace_dialog), "check_all_buffers"))); - find = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_find)))); - replace = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_replace)))); + find = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_find))))); + replace = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_replace))))); if ((! fl1) && (strcasecmp(find, replace) == 0)) { @@ -1896,9 +1908,20 @@ return; } + gtk_combo_box_prepend_text(GTK_COMBO_BOX(entry_find), find); gtk_combo_box_prepend_text(GTK_COMBO_BOX(entry_replace), replace); + if (search_replace_escape_re) + { + find = utils_str_replace(find, "\\n", "\n"); + find = utils_str_replace(find, "\\r", "\r"); + find = utils_str_replace(find, "\\t", "\t"); + replace = utils_str_replace(replace, "\\n", "\n"); + replace = utils_str_replace(replace, "\\r", "\r"); + replace = utils_str_replace(replace, "\\t", "\t"); + } + search_flags_re = (fl1 ? SCFIND_MATCHCASE : 0) | (fl2 ? SCFIND_WHOLEWORD : 0) | (fl3 ? SCFIND_REGEXP : 0) | @@ -1935,6 +1958,8 @@ } } } + g_free(find); + g_free(replace); } Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-07-17 19:48:42 UTC (rev 577) +++ trunk/src/dialogs.c 2006-07-18 10:48:51 UTC (rev 578) @@ -811,7 +811,8 @@ if (app->find_dialog == NULL) { - GtkWidget *label, *entry, *checkbox1, *checkbox2, *checkbox3, *checkbox4, *checkbox5; + GtkWidget *label, *entry, *checkbox1, *checkbox2, *checkbox3, *checkbox4, *checkbox5, + *checkbox6; GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(app->window, "tooltips")); app->find_dialog = gtk_dialog_new_with_buttons(_("Find"), GTK_WINDOW(app->window), @@ -857,6 +858,13 @@ gtk_tooltips_set_tip(tooltips, checkbox3, _("For detailed information about using regular expressions, please read the documentation."), NULL); + checkbox6 = gtk_check_button_new_with_mnemonic(_("_Replace control characters")); + g_object_set_data_full(G_OBJECT(app->find_dialog), "check_escape", + gtk_widget_ref(checkbox6), (GDestroyNotify)gtk_widget_unref); + gtk_button_set_focus_on_click(GTK_BUTTON(checkbox6), FALSE); + gtk_tooltips_set_tip(tooltips, checkbox6, + _("Replace \\t, \\n and \\r with the corresponding control characters."), NULL); + checkbox4 = gtk_check_button_new_with_mnemonic(_("_Search backwards")); g_object_set_data_full(G_OBJECT(app->find_dialog), "check_back", gtk_widget_ref(checkbox4), (GDestroyNotify)gtk_widget_unref); @@ -871,6 +879,7 @@ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(app->find_dialog)->vbox), checkbox2); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(app->find_dialog)->vbox), checkbox5); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(app->find_dialog)->vbox), checkbox3); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(app->find_dialog)->vbox), checkbox6); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(app->find_dialog)->vbox), checkbox4); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(app->find_dialog)->vbox), gtk_label_new("")); @@ -905,7 +914,8 @@ if (app->replace_dialog == NULL) { GtkWidget *label_find, *label_replace, *entry_find, *entry_replace; - GtkWidget *checkbox1, *checkbox2, *checkbox3, *checkbox4, *checkbox5, *checkbox6; + GtkWidget *checkbox1, *checkbox2, *checkbox3, *checkbox4, *checkbox5, *checkbox6, + *checkbox7; GtkWidget *button; GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(app->window, "tooltips")); @@ -977,6 +987,13 @@ gtk_tooltips_set_tip(tooltips, checkbox3, _("For detailed information about using regular expressions, please read the documentation."), NULL); + checkbox7 = gtk_check_button_new_with_mnemonic(_("_Replace control characters")); + g_object_set_data_full(G_OBJECT(app->replace_dialog), "check_escape", + gtk_widget_ref(checkbox7), (GDestroyNotify)gtk_widget_unref); + gtk_button_set_focus_on_click(GTK_BUTTON(checkbox7), FALSE); + gtk_tooltips_set_tip(tooltips, checkbox7, + _("Replace \\t, \\n and \\r with the corresponding control characters."), NULL); + checkbox4 = gtk_check_button_new_with_mnemonic(_("_Search backwards")); g_object_set_data_full(G_OBJECT(app->replace_dialog), "check_back", gtk_widget_ref(checkbox4), (GDestroyNotify)gtk_widget_unref); @@ -998,6 +1015,7 @@ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(app->replace_dialog)->vbox), checkbox2); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(app->replace_dialog)->vbox), checkbox5); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(app->replace_dialog)->vbox), checkbox3); + gtk_container_add(GTK_CONTAINER(GTK_DIALOG(app->replace_dialog)->vbox), checkbox7); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(app->replace_dialog)->vbox), checkbox4); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(app->replace_dialog)->vbox), checkbox6); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(app->replace_dialog)->vbox), gtk_label_new("")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [577] trunk/src/utils.c
by eht16＠users.sourceforge.net 17 Jul '06

17 Jul '06

Revision: 577 Author: eht16 Date: 2006-07-17 12:48:42 -0700 (Mon, 17 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=577&view=rev Log Message: ----------- Fixed endless loop. Modified Paths: -------------- trunk/src/utils.c Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-07-17 19:24:35 UTC (rev 576) +++ trunk/src/utils.c 2006-07-17 19:48:42 UTC (rev 577) @@ -865,13 +865,14 @@ gboolean check_current = FALSE; guint i; - if (g_get_charset((const gchar**)&locale_charset) == FALSE) - check_current = TRUE; // current locale is not UTF-8, we have to check this charset + // current locale is not UTF-8, we have to check this charset + check_current = ! g_get_charset((const gchar**)&locale_charset); for (i = 0; i < GEANY_ENCODINGS_MAX; i++) { if (check_current) { + check_current = FALSE; charset = locale_charset; i = -1; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [576] trunk/src/document.c
by eht16＠users.sourceforge.net 17 Jul '06

17 Jul '06

Revision: 576 Author: eht16 Date: 2006-07-17 12:24:35 -0700 (Mon, 17 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=576&view=rev Log Message: ----------- Use real length of data instead of -1. Modified Paths: -------------- trunk/src/document.c Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-07-17 14:17:37 UTC (rev 575) +++ trunk/src/document.c 2006-07-17 19:24:35 UTC (rev 576) @@ -611,7 +611,7 @@ gchar* conv_file_contents = NULL; // try to convert it from UTF-8 to original encoding - conv_file_contents = g_convert(data, -1, doc_list[idx].encoding, "UTF-8", + conv_file_contents = g_convert(data, len-1, doc_list[idx].encoding, "UTF-8", NULL, NULL, &conv_error); if (conv_error != NULL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [575] trunk
by ntrel＠users.sourceforge.net 17 Jul '06

17 Jul '06

Revision: 575 Author: ntrel Date: 2006-07-17 07:17:37 -0700 (Mon, 17 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=575&view=rev Log Message: ----------- Moved external appendix elements to geany.docbook to validate ok Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.docbook trunk/doc/geany_gpl.docbook trunk/doc/scikeybinding.docbook Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-17 12:33:10 UTC (rev 574) +++ trunk/ChangeLog 2006-07-17 14:17:37 UTC (rev 575) @@ -1,3 +1,9 @@ +2006-07-17 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * doc/scikeybinding.docbook, doc/geany.docbook, doc/geany_gpl.docbook: + Moved external appendix elements to geany.docbook to validate ok. + + 2006-07-17 Enrico Tröger <enrico.troeger(a)uvena.de> * src/utils.c, src/document.c, src/callbacks.c: Modified: trunk/doc/geany.docbook =================================================================== --- trunk/doc/geany.docbook 2006-07-17 12:33:10 UTC (rev 574) +++ trunk/doc/geany.docbook 2006-07-17 14:17:37 UTC (rev 575) @@ -1557,10 +1557,14 @@ </chapter>  + <appendix id="scikeybinding"> &scikeybinding; + </appendix>  + <appendix id="geany-gpl"> &legal; + </appendix> <appendix id="scintilla-license"> <title>License for Scintilla and SciTE</title> Modified: trunk/doc/geany_gpl.docbook =================================================================== --- trunk/doc/geany_gpl.docbook 2006-07-17 12:33:10 UTC (rev 574) +++ trunk/doc/geany_gpl.docbook 2006-07-17 14:17:37 UTC (rev 575) @@ -1,4 +1,3 @@ -<appendix id="geany-gpl"> <appendixinfo> <title>GNU General Public License</title> <pubdate>Version 2, June 1991</pubdate> @@ -416,4 +415,3 @@ Public License instead of this License. </para> </sect1> - </appendix> Modified: trunk/doc/scikeybinding.docbook =================================================================== --- trunk/doc/scikeybinding.docbook 2006-07-17 12:33:10 UTC (rev 574) +++ trunk/doc/scikeybinding.docbook 2006-07-17 14:17:37 UTC (rev 575) @@ -1,4 +1,3 @@ -<appendix id="scikeybinding"> <appendixinfo> <title>Scintilla keyboard commands</title> <pubdate>20 June 2006</pubdate> @@ -12,9 +11,9 @@ Scintilla and SciTE. A copy of this license can be found in the file scintilla/License.txt included with the source code of this - program and in the "License for Scintilla and SciTE" + program and in the appendix of this document. -  + See <xref linkend="scintilla-license"/>. </para> </legalnotice> </appendixinfo> @@ -184,4 +183,3 @@ </table> </para> </sect1> -</appendix> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [574] trunk
by eht16＠users.sourceforge.net 17 Jul '06

17 Jul '06

Revision: 574 Author: eht16 Date: 2006-07-17 05:33:10 -0700 (Mon, 17 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=574&view=rev Log Message: ----------- Added UTF-8 as default encoding. Replaced xmlto command by xsltproc. Added reference for the GPL appendix. Modified Paths: -------------- trunk/ChangeLog trunk/doc/Makefile.am trunk/doc/geany.docbook trunk/doc/geany.xsl Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-17 11:23:13 UTC (rev 573) +++ trunk/ChangeLog 2006-07-17 12:33:10 UTC (rev 574) @@ -3,6 +3,9 @@ * src/utils.c, src/document.c, src/callbacks.c: Moved document related functions from utils.c to document.c. Keep cursor position when replacing tabs by spaces. + * doc/geany.xsl: Added UTF-8 as default encoding. + * doc/Makefile.am: Replaced xmlto command by xsltproc. + * doc/geany.docbook: Added reference for the GPL appendix. 2006-07-16 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/doc/Makefile.am =================================================================== --- trunk/doc/Makefile.am 2006-07-17 11:23:13 UTC (rev 573) +++ trunk/doc/Makefile.am 2006-07-17 12:33:10 UTC (rev 574) @@ -15,12 +15,7 @@ htmldoc: geany.docbook if [ geany.docbook -nt "./html/index.html" ]; then \ $(mkinstalldirs) html; \ - # hack for my local system to generate documentation in UTF-8 charset \ - if [ `hostname` = "ukio" ]; then \ - LC_CTYPE=de_DE.utf8@euro xmlto -x geany.xsl -o html/ xhtml geany.docbook; \ - else \ - xmlto -x geany.xsl -o html/ xhtml geany.docbook; \ - fi; \ + xsltproc --nonet --xinclude -o html/ geany.xsl geany.docbook; \ test -f html/geany.css || cp geany.css html/; \ fi Modified: trunk/doc/geany.docbook =================================================================== --- trunk/doc/geany.docbook 2006-07-17 11:23:13 UTC (rev 573) +++ trunk/doc/geany.docbook 2006-07-17 12:33:10 UTC (rev 574) @@ -7,7 +7,7 @@ <!ENTITY appurl "http://geany.uvena.de"> <!ENTITY deburl "http://debian.uvena.de"> <!ENTITY author_mail "enrico.troeger(a)uvena.de"> -<!ENTITY date "July 01, 2006"> +<!ENTITY date "July 17, 2006"> <!ENTITY legal SYSTEM "geany_gpl.docbook"> <!ENTITY scikeybinding SYSTEM "scikeybinding.docbook"> ]> @@ -16,7 +16,7 @@ <bookinfo> <author> <firstname>Enrico</firstname> - <surname>Troeger</surname> + <surname>Tröger</surname> <address><email>&author_mail;</email></address> </author> <author> @@ -37,7 +37,7 @@ This document is distributed under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. A copy of this license can be found in the file COPYING included with the source code of this - program and in the appendix of this document. + program and see <xref linkend="geany-gpl"/>. </para> </legalnotice> <title> @@ -91,7 +91,7 @@ <application>&app;</application> is distributed under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. A copy of this license can be found in the file COPYING included with the source code of this - program and in the appendix A of this document. + program or see <xref linkend="geany-gpl"/>. </para> <para> The included Scintilla library (found in the subdirectory scintilla/) has its own @@ -846,10 +846,9 @@ <para> <application>&app;</application> supports the default keyboard shortcuts for the Scintilla editing widget. For a list of these commands, see -  - the "Scintilla keyboard commands" appendix. - The Scintilla keyboard shortcuts will be - overridden by any custom keybindings with the same keyboard shortcut. + <xref linkend="scikeybinding"/>. + The Scintilla keyboard shortcuts will be overridden by any custom keybindings + with the same keyboard shortcut. </para> <para> For all actions listed below you can define your own keybindings. Open the Preferences @@ -1488,7 +1487,7 @@ <row> <entry>initial</entry> <entry>The developer's initials, e.g. "ET" for - Enrico Troeger or "JFD" for John Foobar Doe.</entry> + Enrico Tröger or "JFD" for John Foobar Doe.</entry> <entry>filetypes, file header, function description, ChangeLog entry</entry> </row> <row> Modified: trunk/doc/geany.xsl =================================================================== --- trunk/doc/geany.xsl 2006-07-17 11:23:13 UTC (rev 573) +++ trunk/doc/geany.xsl 2006-07-17 12:33:10 UTC (rev 574) @@ -8,6 +8,7 @@  <xsl:param name="html.stylesheet" select="'geany.css'"/> +<xsl:param name="chunker.output.encoding" select="'UTF-8'"/> </xsl:stylesheet> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2006