Commits July 2006

commits@lists.geany.org

2 participants
142 discussions

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

31 Jul '06

Revision: 653 Author: eht16 Date: 2006-07-31 02:39:33 -0700 (Mon, 31 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=653&view=rev Log Message: ----------- Added functionality to uncomment code and added keyboard shortcut Ctrl+Shift+D for this (closes #1521714). Modified Paths: -------------- trunk/ChangeLog trunk/src/keybindings.c trunk/src/keybindings.h trunk/src/sci_cb.c trunk/src/sci_cb.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-30 16:02:21 UTC (rev 652) +++ trunk/ChangeLog 2006-07-31 09:39:33 UTC (rev 653) @@ -1,3 +1,10 @@ +2006-07-31 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/keybindings.c, src/sci_cb.c: + Added functionality to uncomment code and added keyboard shortcut + Ctrl+Shift+D for this (closes #1521714). + + 2006-07-30 Enrico Tröger <enrico.troeger(a)uvena.de> * doc/geany.docbook, data/filetypes.common, src/.c: Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2006-07-30 16:02:21 UTC (rev 652) +++ trunk/src/keybindings.c 2006-07-31 09:39:33 UTC (rev 653) @@ -86,6 +86,7 @@ static void cb_func_toggle_sidebar(void); static void cb_func_edit_duplicateline(void); static void cb_func_edit_commentline(void); +static void cb_func_edit_uncommentline(void); static void cb_func_edit_autocomplete(void); static void cb_func_edit_calltip(void); static void cb_func_edit_macrolist(void); @@ -193,6 +194,8 @@ GDK_g, GDK_CONTROL_MASK, "edit_duplicateline", _("Duplicate line or selection")); keys[GEANY_KEYS_EDIT_COMMENTLINE] = fill(cb_func_edit_commentline, GDK_d, GDK_CONTROL_MASK, "edit_commentline", _("Comment line")); + keys[GEANY_KEYS_EDIT_UNCOMMENTLINE] = fill(cb_func_edit_uncommentline, + GDK_d, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "edit_uncommentline", _("Uncomment line")); keys[GEANY_KEYS_EDIT_AUTOCOMPLETE] = fill(cb_func_edit_autocomplete, GDK_space, GDK_CONTROL_MASK, "edit_autocomplete", _("Complete word")); #ifdef G_OS_WIN32 @@ -704,6 +707,13 @@ sci_cb_do_comment(idx); } +static void cb_func_edit_uncommentline(void) +{ + gint idx = document_get_cur_idx(); + if (idx == -1 || ! doc_list[idx].is_valid) return; + sci_cb_do_uncomment(idx); +} + static void cb_func_edit_autocomplete(void) { gint idx = document_get_cur_idx(); Modified: trunk/src/keybindings.h =================================================================== --- trunk/src/keybindings.h 2006-07-30 16:02:21 UTC (rev 652) +++ trunk/src/keybindings.h 2006-07-31 09:39:33 UTC (rev 653) @@ -83,6 +83,7 @@ GEANY_KEYS_SWITCH_TABRIGHT, GEANY_KEYS_EDIT_DUPLICATELINE, GEANY_KEYS_EDIT_COMMENTLINE, + GEANY_KEYS_EDIT_UNCOMMENTLINE, GEANY_KEYS_EDIT_AUTOCOMPLETE, GEANY_KEYS_EDIT_CALLTIP, GEANY_KEYS_EDIT_MACROLIST, Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2006-07-30 16:02:21 UTC (rev 652) +++ trunk/src/sci_cb.c 2006-07-31 09:39:33 UTC (rev 653) @@ -320,7 +320,8 @@ gint lexer = SSM(sci, SCI_GETLEXER, 0, 0); gchar *text, *line_buf; - if (lexer != SCLEX_CPP && lexer != SCLEX_HTML && lexer != SCLEX_PASCAL) return; + if (lexer != SCLEX_CPP && lexer != SCLEX_HTML && lexer != SCLEX_PASCAL && lexer != SCLEX_BASH) + return; // check that the line is empty, to not kill text in the line line_buf = g_malloc(line_len + 1); @@ -844,6 +845,147 @@ } +void sci_cb_do_uncomment(gint idx) +{ + gint first_line; + gint last_line; + gint x, i, line_start, line_len; + gchar sel[64], *co, *cc; + gboolean break_loop = FALSE; + filetype *ft; + + if (idx == -1 || ! doc_list[idx].is_valid) return; + + ft = doc_list[idx].file_type; + + first_line = sci_get_line_from_position(doc_list[idx].sci, + sci_get_selection_start(doc_list[idx].sci)); + // Find the last line with chars selected (not EOL char) + last_line = sci_get_line_from_position(doc_list[idx].sci, + sci_get_selection_end(doc_list[idx].sci) - 1); + last_line = MAX(first_line, last_line); + + // hack for detection of HTML vs PHP code, if non-PHP set filetype to XML + line_start = sci_get_position_from_line(doc_list[idx].sci, first_line); + if (ft->id == GEANY_FILETYPES_PHP) + { + if (sci_get_style_at(doc_list[idx].sci, line_start) < 118 || + sci_get_style_at(doc_list[idx].sci, line_start) > 127) + ft = filetypes[GEANY_FILETYPES_XML]; + } + + co = ft->comment_open; + cc = ft->comment_close; + if (co == NULL) return; + + SSM(doc_list[idx].sci, SCI_BEGINUNDOACTION, 0, 0); + + for (i = first_line; (i <= last_line) && (! break_loop); i++) + { + line_start = sci_get_position_from_line(doc_list[idx].sci, i); + line_len = sci_get_line_length(doc_list[idx].sci, i); + x = 0; + + //geany_debug("line: %d line_start: %d len: %d (%d)", i, line_start, MIN(63, (line_len - 1)), line_len); + sci_get_text_range(doc_list[idx].sci, line_start, MIN((line_start + 63), (line_start + line_len - 1)), sel); + sel[MIN(63, (line_len - 1))] = '\0'; + + while (isspace(sel[x])) x++; + + // to skip blank lines + if (x < line_len && sel[x] != '\0') + { + // use single line comment + if (cc == NULL || strlen(cc) == 0) + { + guint i; + guint len = strlen(co); + + switch (len) + { + case 1: if (sel[x] != co[0]) continue; break; + case 2: if (sel[x] != co[0] || sel[x+1] != co[1]) continue; break; + case 3: if (sel[x] != co[0] || sel[x+1] != co[1] || sel[x+2] != co[2]) + continue; break; + default: continue; + } + + SSM(doc_list[idx].sci, SCI_GOTOPOS, line_start + x + len, 0); + for (i = 0; i < len; i++) SSM(doc_list[idx].sci, SCI_DELETEBACK, 0, 0); + } + // use multi line comment + else + { + gint style_comment; + gint lexer = SSM(doc_list[idx].sci, SCI_GETLEXER, 0, 0); + + // process only lines which are already comments + switch (lexer) + { // I will list only those lexers which support multi line comments + case SCLEX_XML: + case SCLEX_HTML: + { + if (sci_get_style_at(doc_list[idx].sci, line_start) >= 118 && + sci_get_style_at(doc_list[idx].sci, line_start) <= 127) + style_comment = SCE_HPHP_COMMENT; + else style_comment = SCE_H_COMMENT; + break; + } + case SCLEX_CSS: style_comment = SCE_CSS_COMMENT; break; + case SCLEX_SQL: style_comment = SCE_SQL_COMMENT; break; + case SCLEX_CAML: style_comment = SCE_CAML_COMMENT; break; + case SCLEX_CPP: + case SCLEX_PASCAL: + default: style_comment = SCE_C_COMMENT; + } + if (sci_get_style_at(doc_list[idx].sci, line_start + x) == style_comment) + { + // find the beginning of the multi line comment + gint pos, line, len, x; + gchar *linebuf; + + // remove comment open chars + pos = document_find_text(idx, co, 0, TRUE); + SSM(doc_list[idx].sci, SCI_DELETEBACK, 0, 0); + + // check whether the line is empty and can be deleted + line = sci_get_line_from_position(doc_list[idx].sci, pos); + len = sci_get_line_length(doc_list[idx].sci, line); + linebuf = g_malloc(len + 1); + sci_get_line(doc_list[idx].sci, line, linebuf); + linebuf[len] = '\0'; + x = 0; + while (linebuf[x] != '\0' && isspace(linebuf[x])) x++; + if (x == len) SSM(doc_list[idx].sci, SCI_LINEDELETE, 0, 0); + g_free(linebuf); + + // remove comment close chars + pos = document_find_text(idx, cc, 0, FALSE); + SSM(doc_list[idx].sci, SCI_DELETEBACK, 0, 0); + + // check whether the line is empty and can be deleted + line = sci_get_line_from_position(doc_list[idx].sci, pos); + len = sci_get_line_length(doc_list[idx].sci, line); + linebuf = g_malloc(len + 1); + sci_get_line(doc_list[idx].sci, line, linebuf); + geany_debug("%d", line); + linebuf[len] = '\0'; + x = 0; + while (linebuf[x] != '\0' && isspace(linebuf[x])) x++; + if (x == len) SSM(doc_list[idx].sci, SCI_LINEDELETE, 0, 0); + g_free(linebuf); + } + + // break because we are already on the last line + break_loop = TRUE; + break; + } + } + } + SSM(doc_list[idx].sci, SCI_ENDUNDOACTION, 0, 0); +} + + void sci_cb_do_comment(gint idx) { gint first_line; Modified: trunk/src/sci_cb.h =================================================================== --- trunk/src/sci_cb.h 2006-07-30 16:02:21 UTC (rev 652) +++ trunk/src/sci_cb.h 2006-07-31 09:39:33 UTC (rev 653) @@ -47,6 +47,8 @@ void sci_cb_do_comment(gint idx); +void sci_cb_do_uncomment(gint idx); + void sci_cb_highlight_braces(ScintillaObject *sci, gint cur_pos); void sci_cb_auto_multiline(ScintillaObject *sci, gint pos); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

30 Jul '06

Revision: 652 Author: eht16 Date: 2006-07-30 09:02:21 -0700 (Sun, 30 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=652&view=rev Log Message: ----------- Added style to change the colour of the caret(closes #1530486). Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.common trunk/doc/geany.docbook trunk/src/highlighting.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-29 12:17:30 UTC (rev 651) +++ trunk/ChangeLog 2006-07-30 16:02:21 UTC (rev 652) @@ -1,3 +1,9 @@ +2006-07-30 Enrico Tröger <enrico.troeger(a)uvena.de> + + * doc/geany.docbook, data/filetypes.common, src/.c: + Added style to change the colour of the caret(closes #1530486). + + 2006-07-29 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/msgwindow.c, src/msgwindow.h, src/callbacks.c, src/search.c: Modified: trunk/data/filetypes.common =================================================================== --- trunk/data/filetypes.common 2006-07-29 12:17:30 UTC (rev 651) +++ trunk/data/filetypes.common 2006-07-30 16:02:21 UTC (rev 652) @@ -11,7 +11,9 @@ margin_folding=0x000000;0xdfdfdf;false;false # background colour of the current line, only the second and third argument is interpreted # use the third argument to enable or disable the highlighting of the current line (has to be true/false) -current_line=0;0xe5e5e5;true;false +current_line=0x0;0xe5e5e5;true;false +# colour of the caret(the blinking cursor), only first argument is interpreted +caret=0x000000;0x0;false;false # style of folding icons, only first and second arguments are used, valid values are: # first argument: 1 for boxes, 2 for circles # second argument: 1 for straight lines, 2 for curved lines Modified: trunk/doc/geany.docbook =================================================================== --- trunk/doc/geany.docbook 2006-07-29 12:17:30 UTC (rev 651) +++ trunk/doc/geany.docbook 2006-07-30 16:02:21 UTC (rev 652) @@ -1373,6 +1373,13 @@ <entry>brace_bad=0x0000ff;0xFFFFFF;true;false</entry> </row> <row> + <entry>caret</entry> + <entry>The style for colouring the caret(the blinking cursor). + Only the first argument is interpreted. + </entry> + <entry>caret=0x000000;0x0;false;false</entry> + </row> + <row> <entry>current_line</entry> <entry>The style for colouring the background of the current line. Only the second argument is interpreted. Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2006-07-29 12:17:30 UTC (rev 651) +++ trunk/src/highlighting.c 2006-07-30 16:02:21 UTC (rev 652) @@ -147,7 +147,7 @@ static guint invert(guint icolour) { - if (types[GEANY_FILETYPES_ALL]->styling[8][0]) + if (types[GEANY_FILETYPES_ALL]->styling[9][0]) { guint r, g, b; @@ -203,8 +203,9 @@ styleset_get_hex(config, config_home, "styling", "margin_linenumber", "0x000000", "0xd0d0d0", "false", types[GEANY_FILETYPES_ALL]->styling[4]); styleset_get_hex(config, config_home, "styling", "margin_folding", "0x000000", "0xdfdfdf", "false", types[GEANY_FILETYPES_ALL]->styling[5]); styleset_get_hex(config, config_home, "styling", "current_line", "0x000000", "0xe5e5e5", "true", types[GEANY_FILETYPES_ALL]->styling[6]); - styleset_get_int(config, config_home, "styling", "folding_style", 1, 1, types[GEANY_FILETYPES_ALL]->styling[7]); - styleset_get_int(config, config_home, "styling", "invert_all", 0, 0, types[GEANY_FILETYPES_ALL]->styling[8]); + styleset_get_hex(config, config_home, "styling", "caret", "0x000000", "0x000000", "false", types[GEANY_FILETYPES_ALL]->styling[7]); + styleset_get_int(config, config_home, "styling", "folding_style", 1, 1, types[GEANY_FILETYPES_ALL]->styling[8]); + styleset_get_int(config, config_home, "styling", "invert_all", 0, 0, types[GEANY_FILETYPES_ALL]->styling[9]); types[GEANY_FILETYPES_ALL]->keywords = NULL; styleset_get_wordchars(config, config_home, GEANY_FILETYPES_ALL, GEANY_WORDCHARS); @@ -230,6 +231,9 @@ SSM(sci, SCI_SETUSETABS, TRUE, 0); SSM(sci, SCI_SETTABWIDTH, app->pref_editor_tab_width, 0); + // caret colour + SSM(sci, SCI_SETCARETFORE, invert(types[GEANY_FILETYPES_ALL]->styling[7][0]), 0); + // colourize the current line SSM(sci, SCI_SETCARETLINEBACK, invert(types[GEANY_FILETYPES_ALL]->styling[6][1]), 0); SSM(sci, SCI_SETCARETLINEVISIBLE, types[GEANY_FILETYPES_ALL]->styling[6][2], 0); @@ -257,7 +261,7 @@ SSM(sci, SCI_SETFOLDFLAGS, 0, 0); // choose the folding style - boxes or circles, I prefer boxes, so it is default ;-) - switch (types[GEANY_FILETYPES_ALL]->styling[7][0]) + switch (types[GEANY_FILETYPES_ALL]->styling[8][0]) { case 2: { @@ -278,7 +282,7 @@ } // choose the folding style - straight or curved, I prefer straight, so it is default ;-) - switch (types[GEANY_FILETYPES_ALL]->styling[7][1]) + switch (types[GEANY_FILETYPES_ALL]->styling[8][1]) { case 2: { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

29 Jul '06

Revision: 651 Author: ntrel Date: 2006-07-29 05:17:30 -0700 (Sat, 29 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=651&view=rev Log Message: ----------- Add win32 build files to EXTRA_DIST Modified Paths: -------------- trunk/ChangeLog trunk/Makefile.am Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-29 12:06:00 UTC (rev 650) +++ trunk/ChangeLog 2006-07-29 12:17:30 UTC (rev 651) @@ -2,6 +2,7 @@ * src/msgwindow.c, src/msgwindow.h, src/callbacks.c, src/search.c: Remember Find in files directory for opening grep results. + * Makefile.am: Add win32 build files to EXTRA_DIST. 2006-07-28 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2006-07-29 12:06:00 UTC (rev 650) +++ trunk/Makefile.am 2006-07-29 12:17:30 UTC (rev 651) @@ -2,18 +2,26 @@ SUBDIRS = tagmanager scintilla src po doc +WIN32_BUILD_FILES = \ + geany_private.rc \ + win32-config.h \ + makefile.win32 \ + scintilla/makefile.win32 \ + tagmanager/makefile.win32 \ + src/makefile.win32 + EXTRA_DIST = \ autogen.sh \ geany.desktop.in \ geany.spec \ geany.glade \ - geany_private.rc \ geany.gladep \ data/global.tags \ data/php.tags \ data/latex.tags \ data/html_entities.tags \ - data/filetypes.* + data/filetypes.* \ + $(WIN32_BUILD_FILES) uninstall-local: rm -rf $(DESTDIR)$(pkgdatadir); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

29 Jul '06

Revision: 650 Author: ntrel Date: 2006-07-29 05:06:00 -0700 (Sat, 29 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=650&view=rev Log Message: ----------- Remember Find in files directory for opening grep results Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/msgwindow.c trunk/src/msgwindow.h trunk/src/search.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-29 08:45:37 UTC (rev 649) +++ trunk/ChangeLog 2006-07-29 12:06:00 UTC (rev 650) @@ -1,3 +1,9 @@ +2006-07-29 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/msgwindow.c, src/msgwindow.h, src/callbacks.c, src/search.c: + Remember Find in files directory for opening grep results. + + 2006-07-28 Enrico Tröger <enrico.troeger(a)uvena.de> * src/search.c, src/callbacks.c, src/dialogs.c: Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-07-29 08:45:37 UTC (rev 649) +++ trunk/src/callbacks.c 2006-07-29 12:06:00 UTC (rev 650) @@ -2086,14 +2086,15 @@ locale_dir = g_locale_from_utf8(utf8_dir, -1, NULL, NULL, NULL); if (locale_dir == NULL) locale_dir = g_strdup(utf8_dir); - gtk_combo_box_prepend_text(GTK_COMBO_BOX(user_data), search_text); - search_find_in_files(search_text, locale_dir, opts); + if (search_find_in_files(search_text, locale_dir, opts)) + { + gtk_combo_box_prepend_text(GTK_COMBO_BOX(user_data), search_text); + gtk_widget_hide(app->find_in_files_dialog); + } g_free(locale_dir); - gtk_widget_hide(app->find_in_files_dialog); } else msgwin_status_add(_("No text to find.")); - } else gtk_widget_hide(app->find_in_files_dialog); Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2006-07-29 08:45:37 UTC (rev 649) +++ trunk/src/msgwindow.c 2006-07-29 12:06:00 UTC (rev 650) @@ -29,7 +29,6 @@ #include "callbacks.h" #include "msgwindow.h" #include "utils.h" -#include "search.h" #include "document.h" #include <string.h> @@ -39,6 +38,9 @@ static GdkColor dark = {0, 58832, 58832, 58832}; static GdkColor white = {0, 65535, 65535, 65535}; +gchar *find_in_files_dir = NULL; + + static void msgwin_parse_grep_line(const gchar *string, gchar **filename, gint *line); @@ -323,7 +325,6 @@ static void msgwin_parse_grep_line(const gchar *string, gchar **filename, gint *line) { gchar *end = NULL; - gchar *path; gchar **fields; gchar *pattern; // pattern to split the error message into some fields guint field_min_len; // used to detect errors after parsing @@ -369,10 +370,8 @@ cur_idx = document_get_cur_idx(); if (cur_idx >= 0 && doc_list[cur_idx].is_valid) { - path = g_path_get_dirname(doc_list[cur_idx].file_name); - *filename = g_strconcat(path, G_DIR_SEPARATOR_S, + *filename = g_strconcat(find_in_files_dir, G_DIR_SEPARATOR_S, fields[field_idx_file] + skip_dot_slash, NULL); - g_free(path); } g_strfreev(fields); Modified: trunk/src/msgwindow.h =================================================================== --- trunk/src/msgwindow.h 2006-07-29 08:45:37 UTC (rev 649) +++ trunk/src/msgwindow.h 2006-07-29 12:06:00 UTC (rev 650) @@ -58,7 +58,9 @@ msgwin msgwindow; +extern gchar *find_in_files_dir; + void msgwin_prepare_msg_tree_view(void); void msgwin_prepare_status_tree_view(void); Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2006-07-29 08:45:37 UTC (rev 649) +++ trunk/src/search.c 2006-07-29 12:06:00 UTC (rev 650) @@ -110,6 +110,8 @@ } else { + g_free(find_in_files_dir); + find_in_files_dir = g_strdup(dir); utils_set_up_io_channel(stdout_fd, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL, search_read_io, NULL); g_child_watch_add(child_pid, search_close_pid, NULL); @@ -167,7 +169,7 @@ dir = g_dir_open(path, 0, &error); if (error) { - geany_debug("Could not open directory (%s)", error->message); + msgwin_status_add(_("Could not open directory (%s)"), error->message); g_error_free(error); *length = 0; return NULL; @@ -197,12 +199,10 @@ { if (condition & (G_IO_IN | G_IO_PRI)) { - //GIOStatus s; gchar *msg; while (g_io_channel_read_line(source, &msg, NULL, NULL, NULL) && msg) { - //if (s != G_IO_STATUS_NORMAL && s != G_IO_STATUS_EOF) break; msgwin_msg_add(-1, -1, g_strstrip(msg)); g_free(msg); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

29 Jul '06

Revision: 649 Author: eht16 Date: 2006-07-29 01:45:37 -0700 (Sat, 29 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=649&view=rev Log Message: ----------- Removed geany_windres.rc.in, use geany_private.rc instead. Modified Paths: -------------- trunk/Makefile.am trunk/configure.in trunk/src/Makefile.am Removed Paths: ------------- trunk/geany_windres.rc.in Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2006-07-29 08:35:38 UTC (rev 648) +++ trunk/Makefile.am 2006-07-29 08:45:37 UTC (rev 649) @@ -7,7 +7,7 @@ geany.desktop.in \ geany.spec \ geany.glade \ - geany_windres.rc \ + geany_private.rc \ geany.gladep \ data/global.tags \ data/php.tags \ @@ -51,19 +51,6 @@ done \ fi -if MINGW -install-win32: - GEANY_INSTALL_DIR=geany; \ - mkdir $(GEANY_INSTALL_DIR); \ - cp ChangeLog $(GEANY_INSTALL_DIR)/ChangeLog.txt; \ - cp TODO $(GEANY_INSTALL_DIR)/ToDo.txt; \ - cp COPYING $(GEANY_INSTALL_DIR)/ChangeLog.txt; \ - cp AUTHORS $(GEANY_INSTALL_DIR)/Authors.txt; \ - cp README $(GEANY_INSTALL_DIR)/ReadMe.txt; \ - cp THANKS $(GEANY_INSTALL_DIR)/Thanks.txt; \ - @# to be finished -endif - BZIP2_ENV =--best dist-bzip2: distdir Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2006-07-29 08:35:38 UTC (rev 648) +++ trunk/configure.in 2006-07-29 08:45:37 UTC (rev 649) @@ -169,7 +169,6 @@ doc/geany.1 geany.spec geany.desktop -geany_windres.rc ]) echo "----------------------------------------" Deleted: trunk/geany_windres.rc.in =================================================================== --- trunk/geany_windres.rc.in 2006-07-29 08:35:38 UTC (rev 648) +++ trunk/geany_windres.rc.in 2006-07-29 08:45:37 UTC (rev 649) @@ -1,32 +0,0 @@ - -#include <windows.h> // include for version info constants - - -A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../pixmaps/geany.ico" - -1 VERSIONINFO -FILEVERSION @MAJOR_VERSION@,@MINOR_VERSION@,0,0 -PRODUCTVERSION @MAJOR_VERSION@,@MINOR_VERSION@,0,0 -FILETYPE VFT_APP -{ - BLOCK "StringFileInfo" - { - BLOCK "040704E4" - { - VALUE "CompanyName", "" - VALUE "FileVersion", "@VERSION_STRING@" - VALUE "FileDescription", "Small and lightweight IDE (built using mingw gcc)" - VALUE "InternalName", "geany" - VALUE "LegalCopyright", "Copyright 2005-2006 by Enrico Troeger" - VALUE "LegalTrademarks", "" - VALUE "OriginalFilename", "geany" - VALUE "ProductName", "geany" - VALUE "ProductVersion", "@VERSION_STRING@" - } - } - BLOCK "VarFileInfo" - { - VALUE "Translation", 0x0407, 1252 - } -} - Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2006-07-29 08:35:38 UTC (rev 648) +++ trunk/src/Makefile.am 2006-07-29 08:45:37 UTC (rev 649) @@ -39,7 +39,7 @@ geany_SOURCES = $(SRCS) win32.c win32.h geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a -lstdc++ @PACKAGE_LIBS@ \ $(INTLLIBS) -lgdi32 -limm32 -lshell32 -lole32 -luuid -liberty -lcomdlg32 -lcomctl32 \ - geany_windres.res + geany_private.res AM_CFLAGS = -DGEANY_DEBUG -Wall -pipe -mms-bitfields #AM_CFLAGS = -DGEANY_DEBUG -Wall -pipe -mms-bitfields -g -O0 geany_LDFLAGS = -mwindows @@ -48,10 +48,10 @@ -I/usr/local/cross-tools/include @PACKAGE_CFLAGS@ geany_windres.res: - $(WINDRES) -i ../geany_windres.rc --input-format=rc -o geany_windres.res -O coff; + $(WINDRES) -i ../geany_private.rc --input-format=rc -o geany_private.res -O coff; clean-local: - rm -f geany_windres.res + rm -f geany_private.res else # build Geany for all other platforms This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [648] trunk/po
by eht16＠users.sourceforge.net 29 Jul '06

29 Jul '06

Revision: 648 Author: eht16 Date: 2006-07-29 01:35:38 -0700 (Sat, 29 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=648&view=rev Log Message: ----------- Update of catalog, added search.c and notebook.c to POTFILES.in. Modified Paths: -------------- trunk/po/ChangeLog trunk/po/POTFILES.in trunk/po/geany.pot Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2006-07-28 18:37:32 UTC (rev 647) +++ trunk/po/ChangeLog 2006-07-29 08:35:38 UTC (rev 648) @@ -1,3 +1,9 @@ +2006-07-29 Enrico Tröger <enrico.troeger(a)uvena.de> + + * geany.pot: Update of catalog + * POTFILES.in: Added search.c and notebook.c + + 2006-07-22 Enrico Tröger <enrico.troeger(a)uvena.de> * es.po: Update of Spanish translation Modified: trunk/po/POTFILES.in =================================================================== --- trunk/po/POTFILES.in 2006-07-28 18:37:32 UTC (rev 647) +++ trunk/po/POTFILES.in 2006-07-29 08:35:38 UTC (rev 648) @@ -24,3 +24,5 @@ src/treeviews.c src/vte.c src/keybindings.c +src/search.c +src/notebook.c Modified: trunk/po/geany.pot =================================================================== --- trunk/po/geany.pot 2006-07-28 18:37:32 UTC (rev 647) +++ trunk/po/geany.pot 2006-07-29 08:35:38 UTC (rev 648) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-07-19 13:36+0200\n" +"POT-Creation-Date: 2006-07-29 00:56+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -48,7 +48,7 @@ msgid "show version and exit" msgstr "" -#: src/main.c:411 +#: src/main.c:423 msgid "" "Geany is exiting because a named pipe was found. Mostly this means, Geany is " "already running. If you know Geany is not running, you can delete the file " @@ -56,1001 +56,1037 @@ "Delete the named pipe and start Geany?" msgstr "" -#: src/main.c:453 +#: src/main.c:486 msgid " - A fast and lightweight IDE" msgstr "" -#: src/main.c:463 +#: src/main.c:496 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "" -#: src/main.c:540 +#: src/main.c:519 #, c-format +msgid "" +"Configuration directory could not be created (%s).\n" +"There could be some problems using Geany without a configuration directory.\n" +"Start Geany anyway?" +msgstr "" + +#: src/main.c:581 +#, c-format msgid "This is Geany %s." msgstr "" -#: src/main.c:542 +#: src/main.c:583 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "" -#: src/interface.c:222 src/interface.c:1255 +#: src/main.c:607 src/callbacks.c:854 src/dialogs.c:150 src/document.c:354 +#: src/document.c:386 src/win32.c:150 +#, c-format +msgid "" +"You have opened too many files. There is a limit of %d concurrent open files." +msgstr "" + +#: src/interface.c:229 src/interface.c:1295 msgid "Geany" msgstr "" -#: src/interface.c:232 +#: src/interface.c:239 msgid "_File" msgstr "" -#: src/interface.c:243 +#: src/interface.c:250 msgid "New (with _template)" msgstr "" -#: src/interface.c:254 src/interface.c:273 src/interface.c:410 -#: src/interface.c:642 src/interface.c:652 src/interface.c:1666 +#: src/interface.c:261 src/interface.c:280 src/interface.c:324 +#: src/interface.c:435 src/interface.c:676 src/interface.c:686 +#: src/interface.c:1713 msgid "invisible" msgstr "" -#: src/interface.c:266 +#: src/interface.c:273 msgid "Recent _files" msgstr "" -#: src/interface.c:289 src/interface.c:764 src/keybindings.c:118 -msgid "Save all" +#: src/interface.c:296 +msgid "Save a_ll" msgstr "" -#: src/interface.c:292 +#: src/interface.c:299 msgid "Saves all open files" msgstr "" -#: src/interface.c:319 +#: src/interface.c:305 +msgid "_Reload" +msgstr "" + +#: src/interface.c:313 +msgid "R_eload as" +msgstr "" + +#: src/interface.c:344 msgid "Prints the current file" msgstr "" -#: src/interface.c:330 +#: src/interface.c:355 msgid "C_lose all" msgstr "" -#: src/interface.c:333 +#: src/interface.c:358 msgid "Closes all open files" msgstr "" -#: src/interface.c:347 src/interface.c:885 +#: src/interface.c:372 src/interface.c:919 msgid "Quit Geany" msgstr "" -#: src/interface.c:349 +#: src/interface.c:374 msgid "_Edit" msgstr "" -#: src/interface.c:390 src/interface.c:1629 +#: src/interface.c:415 src/interface.c:1676 msgid "Select _All" msgstr "" -#: src/interface.c:399 +#: src/interface.c:424 msgid "_Insert \"include <...>\"" msgstr "" -#: src/interface.c:413 +#: src/interface.c:438 msgid "I_nsert Comments" msgstr "" -#: src/interface.c:424 src/interface.c:1680 +#: src/interface.c:449 src/interface.c:1727 msgid "Insert ChangeLog entry" msgstr "" -#: src/interface.c:427 +#: src/interface.c:452 msgid "Inserts a typical ChangeLog entry in the current file" msgstr "" -#: src/interface.c:429 src/interface.c:1685 +#: src/interface.c:454 src/interface.c:1732 msgid "Insert file header" msgstr "" -#: src/interface.c:432 src/interface.c:1688 +#: src/interface.c:457 src/interface.c:1735 msgid "Inserts a few information at the beginning of the file" msgstr "" -#: src/interface.c:434 src/interface.c:1690 +#: src/interface.c:459 src/interface.c:1737 msgid "Insert function description" msgstr "" -#: src/interface.c:437 src/interface.c:1693 +#: src/interface.c:462 src/interface.c:1740 msgid "Inserts a description before the current function" msgstr "" -#: src/interface.c:439 src/interface.c:1695 +#: src/interface.c:464 src/interface.c:1742 msgid "Insert multiline comment" msgstr "" -#: src/interface.c:442 src/interface.c:1698 +#: src/interface.c:467 src/interface.c:1745 msgid "Inserts a multiline comment" msgstr "" -#: src/interface.c:444 src/interface.c:1700 +#: src/interface.c:469 src/interface.c:1747 msgid "Insert GPL notice" msgstr "" -#: src/interface.c:447 src/interface.c:1703 +#: src/interface.c:472 src/interface.c:1750 msgid "Inserts a GPL notice (should be done at the beginning of the file)" msgstr "" -#: src/interface.c:454 +#: src/interface.c:479 msgid "Change _Selection" msgstr "" -#: src/interface.c:461 src/interface.c:1717 +#: src/interface.c:486 src/interface.c:1764 msgid "To lower-case" msgstr "" -#: src/interface.c:465 src/interface.c:1721 +#: src/interface.c:490 src/interface.c:1768 msgid "To upper-case" msgstr "" -#: src/interface.c:469 +#: src/interface.c:494 msgid "Count _words" msgstr "" -#: src/interface.c:472 +#: src/interface.c:497 msgid "" "Counts the words and characters in the current selection or the whole " "document" msgstr "" -#: src/interface.c:483 +#: src/interface.c:508 msgid "_Search" msgstr "" -#: src/interface.c:494 +#: src/interface.c:519 msgid "Find _Next" msgstr "" -#: src/interface.c:498 +#: src/interface.c:523 msgid "Find _Previous" msgstr "" -#: src/interface.c:502 src/dialogs.c:938 +#: src/interface.c:527 src/dialogs.c:926 msgid "_Replace" msgstr "" -#: src/interface.c:515 +#: src/interface.c:540 msgid "Find in f_iles" msgstr "" -#: src/interface.c:524 +#: src/interface.c:549 msgid "_Go to line" msgstr "" -#: src/interface.c:532 src/dialogs.c:73 +#: src/interface.c:557 src/dialogs.c:73 msgid "_View" msgstr "" -#: src/interface.c:539 +#: src/interface.c:564 msgid "Change _Font" msgstr "" -#: src/interface.c:542 +#: src/interface.c:567 msgid "Change the default font" msgstr "" -#: src/interface.c:548 +#: src/interface.c:573 msgid "Show _Colour Chooser" msgstr "" -#: src/interface.c:551 src/interface.c:824 +#: src/interface.c:576 src/interface.c:858 msgid "" "Open a color chooser dialog, to interactively pick colors from a palette." msgstr "" -#: src/interface.c:562 +#: src/interface.c:587 msgid "Full_screen" msgstr "" -#: src/interface.c:566 +#: src/interface.c:591 msgid "Show Messages _Window" msgstr "" -#: src/interface.c:569 +#: src/interface.c:594 msgid "Toggle the window with status and compiler messages on and off" msgstr "" -#: src/interface.c:572 +#: src/interface.c:597 msgid "Show _Toolbar" msgstr "" -#: src/interface.c:575 +#: src/interface.c:600 msgid "Toggle the toolbar on and off" msgstr "" -#: src/interface.c:578 +#: src/interface.c:603 +msgid "Show Side_bar" +msgstr "" + +#: src/interface.c:608 msgid "Show _Markers Margin" msgstr "" -#: src/interface.c:581 +#: src/interface.c:611 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines." msgstr "" -#: src/interface.c:584 +#: src/interface.c:614 msgid "Show _Line Numbers" msgstr "" -#: src/interface.c:587 +#: src/interface.c:617 msgid "Shows or hides the Line Number margin." msgstr "" -#: src/interface.c:607 +#: src/interface.c:637 msgid "_Document" msgstr "" -#: src/interface.c:614 +#: src/interface.c:644 msgid "_Line breaking" msgstr "" -#: src/interface.c:617 +#: src/interface.c:647 msgid "Break the line at the window border and continue it on the next line" msgstr "" -#: src/interface.c:620 +#: src/interface.c:650 msgid "_Use auto indentation" msgstr "" -#: src/interface.c:625 +#: src/interface.c:655 msgid "Read _only" msgstr "" -#: src/interface.c:628 +#: src/interface.c:658 msgid "Treat this file as read-only. No changes can be made." msgstr "" -#: src/interface.c:635 +#: src/interface.c:660 +msgid "_Write Unicode BOM" +msgstr "" + +#: src/interface.c:669 msgid "Set file_type" msgstr "" -#: src/interface.c:645 +#: src/interface.c:679 msgid "Set _encoding" msgstr "" -#: src/interface.c:655 +#: src/interface.c:689 msgid "Set line e_ndings" msgstr "" -#: src/interface.c:662 +#: src/interface.c:696 msgid "Convert and set to _CR/LF (Win)" msgstr "" -#: src/interface.c:666 +#: src/interface.c:700 msgid "Convert and set to _LF (Unix)" msgstr "" -#: src/interface.c:670 +#: src/interface.c:704 msgid "Convert and set to CR (_Mac)" msgstr "" -#: src/interface.c:679 +#: src/interface.c:713 msgid "_Replace tabs by spaces" msgstr "" -#: src/interface.c:682 src/interface.c:2713 +#: src/interface.c:716 src/interface.c:2760 msgid "Replaces all tabs in document by spaces." msgstr "" -#: src/interface.c:689 +#: src/interface.c:723 msgid "_Fold all" msgstr "" -#: src/interface.c:692 +#: src/interface.c:726 msgid "Folds all contractible code blocks" msgstr "" -#: src/interface.c:694 +#: src/interface.c:728 msgid "_Unfold all" msgstr "" -#: src/interface.c:697 +#: src/interface.c:731 msgid "Unfolds all contracted code blocks" msgstr "" -#: src/interface.c:704 +#: src/interface.c:738 msgid "Remove all _indicators" msgstr "" -#: src/interface.c:707 +#: src/interface.c:741 msgid "Removes all set indicators in the current document." msgstr "" #. build the code -#: src/interface.c:709 src/dialogs.c:525 +#: src/interface.c:743 src/dialogs.c:490 msgid "_Build" msgstr "" -#: src/interface.c:713 +#: src/interface.c:747 msgid "_Help" msgstr "" -#: src/interface.c:724 +#: src/interface.c:758 msgid "_Keyboard shortcuts" msgstr "" -#: src/interface.c:727 +#: src/interface.c:761 msgid "Shows a list of all keyboard shortcuts for Geany." msgstr "" -#: src/interface.c:729 +#: src/interface.c:763 msgid "_Website" msgstr "" -#: src/interface.c:752 +#: src/interface.c:786 msgid "Create a new file" msgstr "" -#: src/interface.c:757 +#: src/interface.c:791 msgid "Open an existing file" msgstr "" -#: src/interface.c:762 +#: src/interface.c:796 msgid "Save the current file" msgstr "" -#: src/interface.c:767 +#: src/interface.c:798 src/keybindings.c:118 +msgid "Save all" +msgstr "" + +#: src/interface.c:801 msgid "Save all open files" msgstr "" -#: src/interface.c:776 +#: src/interface.c:810 msgid "Reload the current file from disk" msgstr "" -#: src/interface.c:781 +#: src/interface.c:815 msgid "Close the current file" msgstr "" -#: src/interface.c:790 +#: src/interface.c:824 msgid "Undo the last modification" msgstr "" -#: src/interface.c:795 +#: src/interface.c:829 msgid "Redo the last modification" msgstr "" -#: src/interface.c:803 src/keybindings.c:164 +#: src/interface.c:837 src/keybindings.c:164 msgid "Compile" msgstr "" -#: src/interface.c:806 +#: src/interface.c:840 msgid "Compile the current file" msgstr "" -#: src/interface.c:810 src/keybindings.c:175 +#: src/interface.c:844 src/keybindings.c:175 msgid "Run" msgstr "" -#: src/interface.c:813 src/dialogs.c:578 +#: src/interface.c:847 src/dialogs.c:543 msgid "Run or view the current file" msgstr "" -#: src/interface.c:821 +#: src/interface.c:855 msgid "Color" msgstr "" -#: src/interface.c:833 +#: src/interface.c:867 msgid "Zoom in the text" msgstr "" -#: src/interface.c:838 +#: src/interface.c:872 msgid "Zoom out the text" msgstr "" -#: src/interface.c:851 src/interface.c:856 +#: src/interface.c:885 src/interface.c:890 msgid "Find the entered text in the current file" msgstr "" -#: src/interface.c:869 +#: src/interface.c:903 msgid "Enter a line number and jump to it." msgstr "" -#: src/interface.c:876 +#: src/interface.c:910 msgid "Jump to the entered line number." msgstr "" -#: src/interface.c:912 src/treeviews.c:40 +#: src/interface.c:946 src/treeviews.c:41 msgid "Symbols" msgstr "" -#: src/interface.c:925 src/treeviews.c:207 +#: src/interface.c:959 src/treeviews.c:208 msgid "Open files" msgstr "" -#: src/interface.c:960 +#: src/interface.c:994 msgid "Status" msgstr "" -#: src/interface.c:974 +#: src/interface.c:1008 msgid "Compiler" msgstr "" -#: src/interface.c:988 +#: src/interface.c:1022 msgid "Messages" msgstr "" -#: src/interface.c:1001 +#: src/interface.c:1035 msgid "Scribble" msgstr "" -#: src/interface.c:1463 src/interface.c:2554 +#: src/interface.c:1510 src/interface.c:2601 msgid "Images and text" msgstr "" -#: src/interface.c:1469 src/interface.c:2562 +#: src/interface.c:1516 src/interface.c:2609 msgid "Images only" msgstr "" -#: src/interface.c:1475 src/interface.c:2570 +#: src/interface.c:1522 src/interface.c:2617 msgid "Text only" msgstr "" -#: src/interface.c:1486 src/interface.c:2578 +#: src/interface.c:1533 src/interface.c:2625 msgid "Large icons" msgstr "" -#: src/interface.c:1491 src/interface.c:2586 +#: src/interface.c:1538 src/interface.c:2633 msgid "Small icons" msgstr "" -#: src/interface.c:1501 +#: src/interface.c:1548 msgid "Hide toolbar" msgstr "" -#: src/interface.c:1655 +#: src/interface.c:1702 msgid "Insert \"include <...>\"" msgstr "" -#: src/interface.c:1669 +#: src/interface.c:1716 msgid "Insert Comments" msgstr "" -#: src/interface.c:1683 +#: src/interface.c:1730 msgid "Inserts a typical ChangeLog entry in the current " msgstr "" -#: src/interface.c:1710 +#: src/interface.c:1757 msgid "Change Selection" msgstr "" -#: src/interface.c:1730 +#: src/interface.c:1777 msgid "Find usage" msgstr "" -#: src/interface.c:1738 src/keybindings.c:207 +#: src/interface.c:1785 src/keybindings.c:213 msgid "Go to tag definition" msgstr "" -#: src/interface.c:1742 src/keybindings.c:209 +#: src/interface.c:1789 src/keybindings.c:215 msgid "Go to tag declaration" msgstr "" -#: src/interface.c:1751 src/dialogs.c:778 src/keybindings.c:144 +#: src/interface.c:1798 src/dialogs.c:743 src/keybindings.c:144 msgid "Go to line" msgstr "" -#: src/interface.c:1754 +#: src/interface.c:1801 msgid "Goto to the entered line" msgstr "" -#: src/interface.c:2059 src/keybindings.c:134 +#: src/interface.c:2106 src/keybindings.c:134 msgid "Preferences" msgstr "" -#: src/interface.c:2088 +#: src/interface.c:2135 msgid "Load files from the last session" msgstr "" -#: src/interface.c:2092 +#: src/interface.c:2139 msgid "Opens at startup the files from the last session" msgstr "" -#: src/interface.c:2095 +#: src/interface.c:2142 msgid "Save window position and geometry" msgstr "" -#: src/interface.c:2099 +#: src/interface.c:2146 msgid "Saves the window position and geometry and restores it at the start" msgstr "" -#: src/interface.c:2102 +#: src/interface.c:2149 msgid "Beep on errors or when compilation has finished" msgstr "" -#: src/interface.c:2105 +#: src/interface.c:2152 msgid "" "Whether to beep if an error occured or when the compilation process has " "finished." msgstr "" -#: src/interface.c:2108 +#: src/interface.c:2155 msgid "Switch to status message list at new message" msgstr "" -#: src/interface.c:2111 +#: src/interface.c:2158 msgid "" "Switch to the status message tab(in the notebook window at the bottom) if a " "new status message arrive." msgstr "" -#: src/interface.c:2114 +#: src/interface.c:2161 msgid "Load virtual terminal emulation at startup" msgstr "" -#: src/interface.c:2116 +#: src/interface.c:2163 msgid "" "Whether the virtual terminal emulation(VTE) should be loaded at startup. " "Disable it if you do not need it." msgstr "" -#: src/interface.c:2119 +#: src/interface.c:2166 msgid "Confirm exit" msgstr "" -#: src/interface.c:2123 +#: src/interface.c:2170 msgid "Shows a confirmation dialog on exit." msgstr "" -#: src/interface.c:2134 +#: src/interface.c:2181 msgid "Recent files list length:" msgstr "" -#: src/interface.c:2142 +#: src/interface.c:2189 msgid "" "Specifies the number of files which are stored in the Recent files list." msgstr "" -#: src/interface.c:2150 +#: src/interface.c:2197 msgid "Placement of new file tabs: " msgstr "" -#: src/interface.c:2154 src/interface.c:2410 src/interface.c:2420 -#: src/interface.c:2430 +#: src/interface.c:2201 src/interface.c:2457 src/interface.c:2467 +#: src/interface.c:2477 msgid "Left" msgstr "" -#: src/interface.c:2157 +#: src/interface.c:2204 msgid "New file tabs will be placed to the left of the tab list" msgstr "" -#: src/interface.c:2166 src/interface.c:2411 src/interface.c:2421 -#: src/interface.c:2431 +#: src/interface.c:2213 src/interface.c:2458 src/interface.c:2468 +#: src/interface.c:2478 msgid "Right" msgstr "" -#: src/interface.c:2169 +#: src/interface.c:2216 msgid "New file tabs will be placed to the right of the tab list" msgstr "" -#: src/interface.c:2178 +#: src/interface.c:2225 msgid "General" msgstr "" -#: src/interface.c:2200 +#: src/interface.c:2247 msgid "Show symbol list" msgstr "" -#: src/interface.c:2203 src/interface.c:2209 +#: src/interface.c:2250 src/interface.c:2256 msgid "Toggle the symbol list on and off" msgstr "" -#: src/interface.c:2206 +#: src/interface.c:2253 msgid "Show open files list" msgstr "" -#: src/interface.c:2212 +#: src/interface.c:2259 msgid "Sidebar" msgstr "" -#: src/interface.c:2233 +#: src/interface.c:2280 msgid "Symbol list font" msgstr "" -#: src/interface.c:2240 +#: src/interface.c:2287 msgid "Message window font" msgstr "" -#: src/interface.c:2252 +#: src/interface.c:2299 msgid "Sets the font for the message window" msgstr "" -#: src/interface.c:2260 +#: src/interface.c:2307 msgid "Sets the font for symbol list window" msgstr "" -#: src/interface.c:2263 +#: src/interface.c:2310 msgid "Editor font" msgstr "" -#: src/interface.c:2275 +#: src/interface.c:2322 msgid "Sets the font for the editors windows" msgstr "" -#: src/interface.c:2277 +#: src/interface.c:2324 msgid "Fonts" msgstr "" -#: src/interface.c:2298 +#: src/interface.c:2345 msgid "Long line marker" msgstr "" -#: src/interface.c:2305 +#: src/interface.c:2352 msgid "Long line marker color" msgstr "" -#: src/interface.c:2318 +#: src/interface.c:2365 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 "" -#: src/interface.c:2322 +#: src/interface.c:2369 msgid "Type" msgstr "" -#: src/interface.c:2335 +#: src/interface.c:2382 msgid "Line" msgstr "" -#: src/interface.c:2338 +#: src/interface.c:2385 msgid "" "Prints a vertical line in the editor window at the given cursor position(see " "below)." msgstr "" -#: src/interface.c:2342 +#: src/interface.c:2389 msgid "Background" msgstr "" -#: src/interface.c:2345 +#: src/interface.c:2392 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 "" -#: src/interface.c:2349 +#: src/interface.c:2396 msgid "Disabled" msgstr "" -#: src/interface.c:2360 +#: src/interface.c:2407 msgid "Sets the color of the long line marker" msgstr "" -#: src/interface.c:2361 src/dialogs.c:478 src/prefs.c:979 src/prefs.c:986 +#: src/interface.c:2408 src/dialogs.c:428 src/prefs.c:987 src/prefs.c:994 msgid "Color Chooser" msgstr "" -#: src/interface.c:2363 +#: src/interface.c:2410 msgid "Long line marker" msgstr "" -#: src/interface.c:2384 src/interface.c:2786 +#: src/interface.c:2431 src/interface.c:2833 msgid "Editor" msgstr "" -#: src/interface.c:2391 +#: src/interface.c:2438 msgid "Message window" msgstr "" -#: src/interface.c:2398 +#: src/interface.c:2445 msgid "Sidebar" msgstr "" -#: src/interface.c:2412 src/interface.c:2422 src/interface.c:2432 +#: src/interface.c:2459 src/interface.c:2469 src/interface.c:2479 msgid "Top" msgstr "" -#: src/interface.c:2413 src/interface.c:2423 src/interface.c:2433 +#: src/interface.c:2460 src/interface.c:2470 src/interface.c:2480 msgid "Bottom" msgstr "" -#: src/interface.c:2435 +#: src/interface.c:2482 msgid "Tab placement" msgstr "" -#: src/interface.c:2440 +#: src/interface.c:2487 msgid "Interface" msgstr "" -#: src/interface.c:2459 +#: src/interface.c:2506 msgid "Show Toolbar" msgstr "" -#: src/interface.c:2484 +#: src/interface.c:2531 msgid "Show file operation buttons" msgstr "" -#: src/interface.c:2488 +#: src/interface.c:2535 msgid "Display the New, Open, Close, Save and Reload buttons in the toolbar" msgstr "" -#: src/interface.c:2491 +#: src/interface.c:2538 msgid "Show Compile and Run" msgstr "" -#: src/interface.c:2495 +#: src/interface.c:2542 msgid "Display the Compile and Run buttons in the toolbar" msgstr "" -#: src/interface.c:2498 +#: src/interface.c:2545 msgid "Show Colour Chooser button" msgstr "" -#: src/interface.c:2502 +#: src/interface.c:2549 msgid "Display the Colour Chooser button in the toolbar" msgstr "" -#: src/interface.c:2505 +#: src/interface.c:2552 msgid "Show Zoom In and Zoom Out" msgstr "" -#: src/interface.c:2509 +#: src/interface.c:2556 msgid "Display the Zoom In and Zoom Out buttons in the toolbar" msgstr "" -#: src/interface.c:2512 +#: src/interface.c:2559 msgid "Show Redo and Undo buttons" msgstr "" -#: src/interface.c:2516 +#: src/interface.c:2563 msgid "Display the Redo and Undo buttons in the toolbar" msgstr "" -#: src/interface.c:2519 +#: src/interface.c:2566 msgid "Show Search field" msgstr "" -#: src/interface.c:2523 +#: src/interface.c:2570 msgid "Display the search field and button in the toolbar" msgstr "" -#: src/interface.c:2526 +#: src/interface.c:2573 msgid "Show Goto line field" msgstr "" -#: src/interface.c:2530 +#: src/interface.c:2577 msgid "Display the line number field and button in the toolbar" msgstr "" -#: src/interface.c:2533 +#: src/interface.c:2580 msgid "Items" msgstr "" -#: src/interface.c:2594 +#: src/interface.c:2641 msgid "Icon style" msgstr "" -#: src/interface.c:2601 +#: src/interface.c:2648 msgid "Icon size" msgstr "" -#: src/interface.c:2608 +#: src/interface.c:2655 msgid "Appearance" msgstr "" -#: src/interface.c:2613 +#: src/interface.c:2660 msgid "Toolbar" msgstr "" -#: src/interface.c:2641 +#: src/interface.c:2688 msgid "Tab Width" msgstr "" -#: src/interface.c:2648 +#: src/interface.c:2695 msgid "Default encoding:" msgstr "" -#: src/interface.c:2659 +#: src/interface.c:2706 msgid "Sets the default encoding for newly created files." msgstr "" -#: src/interface.c:2671 +#: src/interface.c:2718 msgid "The width in chars, which one tab character will take" msgstr "" -#: src/interface.c:2676 +#: src/interface.c:2723 msgid "New files" msgstr "" -#: src/interface.c:2695 +#: src/interface.c:2742 msgid "Strip trailing spaces" msgstr "" -#: src/interface.c:2699 +#: src/interface.c:2746 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "" -#: src/interface.c:2702 +#: src/interface.c:2749 msgid "Ensure new line at file end" msgstr "" -#: src/interface.c:2706 +#: src/interface.c:2753 msgid "Ensures that at the end of the file is a new line" msgstr "" -#: src/interface.c:2709 src/keybindings.c:158 +#: src/interface.c:2756 src/keybindings.c:158 msgid "Replace tabs by space" msgstr "" -#: src/interface.c:2716 +#: src/interface.c:2763 msgid "Saving files" msgstr "" -#: src/interface.c:2735 +#: src/interface.c:2782 msgid "Show indentation guides" msgstr "" -#: src/interface.c:2738 +#: src/interface.c:2785 msgid "Shows small dotted lines to help you to use the right indentation." msgstr "" -#: src/interface.c:2741 +#: src/interface.c:2788 msgid "Show white space" msgstr "" -#: src/interface.c:2744 +#: src/interface.c:2791 msgid "Marks spaces with dots and tabs with arrows." msgstr "" -#: src/interface.c:2747 +#: src/interface.c:2794 msgid "Show line endings" msgstr "" -#: src/interface.c:2750 +#: src/interface.c:2797 msgid "Show the line ending character" msgstr "" -#: src/interface.c:2753 +#: src/interface.c:2800 msgid "XML tag auto completion" msgstr "" -#: src/interface.c:2756 +#: src/interface.c:2803 msgid "Automatic completion of open XML tags(includes HTML tags)" msgstr "" -#: src/interface.c:2759 +#: src/interface.c:2806 msgid "Construct auto completion" msgstr "" -#: src/interface.c:2762 +#: src/interface.c:2809 msgid "Automatic completion of often used constructs like if and for" msgstr "" -#: src/interface.c:2765 +#: src/interface.c:2812 msgid "Enable folding" msgstr "" -#: src/interface.c:2768 +#: src/interface.c:2815 msgid "Whether to enable folding the code" msgstr "" -#: src/interface.c:2771 +#: src/interface.c:2818 msgid "Use indicators to show compile errors" msgstr "" -#: src/interface.c:2774 +#: src/interface.c:2821 msgid "" "Whether to use indicators(a squiggly underline) to highlight the lines, " "where the compiler found a warning or an error." msgstr "" -#: src/interface.c:2781 +#: src/interface.c:2828 msgid "Miscellaneous" msgstr "" -#: src/interface.c:2794 +#: src/interface.c:2841 msgid "" "Enter here the paths to the make tool and the compiler\n" "(tools you do not need can be let blank)" msgstr "" -#: src/interface.c:2805 +#: src/interface.c:2852 msgid "Make" msgstr "" -#: src/interface.c:2812 src/prefs.c:1036 src/vte.c:167 +#: src/interface.c:2859 src/prefs.c:1044 src/vte.c:167 msgid "Terminal" msgstr "" -#: src/interface.c:2819 +#: src/interface.c:2866 msgid "Browser" msgstr "" -#: src/interface.c:2831 +#: src/interface.c:2878 msgid "Path and options for the make tool" msgstr "" -#: src/interface.c:2838 +#: src/interface.c:2885 msgid "" "A terminal emulator like xterm, gnome-terminal or konsole (should accept the " "-e argument)" msgstr "" -#: src/interface.c:2845 +#: src/interface.c:2892 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "" -#: src/interface.c:2877 +#: src/interface.c:2924 msgid "Print command" msgstr "" -#: src/interface.c:2889 +#: src/interface.c:2936 #, c-format msgid "Path to the command for printing files(use %f for the filename)." msgstr "" -#: src/interface.c:2901 +#: src/interface.c:2948 msgid "Grep" msgstr "" -#: src/interface.c:2924 +#: src/interface.c:2971 msgid "Tools" msgstr "" -#: src/interface.c:2932 +#: src/interface.c:2979 msgid "" "Specify here information you want to use in templates.\n" "See documentation if you don't know, how templates work." msgstr "" -#: src/interface.c:2948 +#: src/interface.c:2995 msgid "email address of the developer" msgstr "" -#: src/interface.c:2955 +#: src/interface.c:3002 msgid "Initials of the developer name" msgstr "" -#: src/interface.c:2957 +#: src/interface.c:3004 msgid "Initial Version" msgstr "" -#: src/interface.c:2969 +#: src/interface.c:3016 msgid "Version number, which a new file initially has" msgstr "" -#: src/interface.c:2976 +#: src/interface.c:3023 msgid "Company name" msgstr "" -#: src/interface.c:2978 +#: src/interface.c:3025 msgid "Developer" msgstr "" -#: src/interface.c:2985 +#: src/interface.c:3032 msgid "Company" msgstr "" -#: src/interface.c:2992 +#: src/interface.c:3039 msgid "Mail address" msgstr "" -#: src/interface.c:2999 +#: src/interface.c:3046 msgid "Initials" msgstr "" -#: src/interface.c:3011 +#: src/interface.c:3058 msgid "The name of the developer" msgstr "" -#: src/interface.c:3013 +#: src/interface.c:3060 msgid "" "Notice: For all changes you make here,\n" "you need to restart Geany to take effect." msgstr "" -#: src/interface.c:3017 +#: src/interface.c:3064 msgid "Templates" msgstr "" -#: src/interface.c:3025 +#: src/interface.c:3072 msgid "" "Here you can change keyboard shortcuts for various actions. Just double " "click on a action or select one and press the Change button to enter a new " @@ -1058,69 +1094,68 @@ "directly." msgstr "" -#: src/interface.c:3048 +#: src/interface.c:3095 msgid "Change" msgstr "" -#: src/interface.c:3052 +#: src/interface.c:3099 msgid "Keybindings" msgstr "" -#: src/callbacks.c:219 src/callbacks.c:234 +#: src/callbacks.c:218 src/callbacks.c:233 msgid "Do you really want to quit?" msgstr "" -#: src/callbacks.c:519 +#: src/callbacks.c:518 src/callbacks.c:2634 #, c-format msgid "" "Are you sure you want to reload '%s'?\n" "Any unsaved changes will be lost." msgstr "" -#: src/callbacks.c:923 +#: src/callbacks.c:930 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "" -#. no matches were found (searching from unnamed file) -#: src/callbacks.c:1371 +#: src/callbacks.c:1389 #, c-format msgid "No matches found for '%s'." msgstr "" -#: src/callbacks.c:1411 +#: src/callbacks.c:1435 #, c-format msgid "Declaration of \"%s()\" not found" msgstr "" -#: src/callbacks.c:1413 +#: src/callbacks.c:1437 #, c-format msgid "Definition of \"%s()\" not found" msgstr "" -#: src/callbacks.c:1716 +#: src/callbacks.c:1748 msgid "Failed to execute the view program" msgstr "" -#: src/callbacks.c:1727 +#: src/callbacks.c:1759 msgid "Failed to execute the terminal program" msgstr "" -#: src/callbacks.c:2034 +#: src/callbacks.c:2072 msgid "Invalid directory for find in files." msgstr "" -#: src/callbacks.c:2048 +#: src/callbacks.c:2095 msgid "No text to find." msgstr "" #. initialize the dialog -#: src/callbacks.c:2172 src/dialogs.c:70 +#: src/callbacks.c:2216 src/dialogs.c:70 msgid "Open File" msgstr "" -#: src/callbacks.c:2221 src/callbacks.c:2266 src/callbacks.c:2306 -#: src/callbacks.c:2364 +#: src/callbacks.c:2265 src/callbacks.c:2310 src/callbacks.c:2350 +#: src/callbacks.c:2408 msgid "" "Please set the filetype for the current file before using this function." msgstr "" @@ -1140,71 +1175,44 @@ msgid "Detect by file extension " msgstr "" -#: src/dialogs.c:164 +#: src/dialogs.c:166 msgid "Save File" msgstr "" -#: src/dialogs.c:216 +#: src/dialogs.c:277 #, c-format -msgid "There is a limit of %d concurrent open tabs." -msgstr "" - -#: src/dialogs.c:217 -msgid "error: too many open files" -msgstr "" - -#: src/dialogs.c:240 -#, c-format -msgid "The match \"%s\" was not found. Wrap search around the document?" -msgstr "" - -#: src/dialogs.c:243 src/dialogs.c:1778 -msgid "Question" -msgstr "" - -#: src/dialogs.c:272 -msgid "Information" -msgstr "" - -#: src/dialogs.c:297 src/dialogs.c:329 src/dialogs.c:1393 src/win32.c:217 -#: src/win32.c:379 -msgid "Error" -msgstr "" - -#: src/dialogs.c:321 -#, c-format msgid "" "The file '%s' is not saved.\n" "Do you want to save it before closing?" msgstr "" -#: src/dialogs.c:326 +#: src/dialogs.c:282 msgid "" "The file is not saved.\n" "Do you want to save it before closing?" msgstr "" -#: src/dialogs.c:343 +#: src/dialogs.c:293 msgid "Don't save" msgstr "" -#: src/dialogs.c:395 +#: src/dialogs.c:345 msgid "Choose font" msgstr "" -#: src/dialogs.c:434 +#: src/dialogs.c:384 msgid "Word Count" msgstr "" -#: src/dialogs.c:443 +#: src/dialogs.c:393 msgid "selection" msgstr "" -#: src/dialogs.c:451 +#: src/dialogs.c:401 msgid "whole document" msgstr "" -#: src/dialogs.c:453 +#: src/dialogs.c:403 #, c-format msgid "" "Range:\t\t%s\n" @@ -1215,243 +1223,254 @@ msgstr "" #. compile the code -#: src/dialogs.c:511 +#: src/dialogs.c:476 msgid "_Compile" msgstr "" -#: src/dialogs.c:514 +#: src/dialogs.c:479 msgid "Compiles the current file" msgstr "" -#: src/dialogs.c:529 +#: src/dialogs.c:494 msgid "Builds the current file (generate an executable file)" msgstr "" #. build the code with make all -#: src/dialogs.c:543 +#: src/dialogs.c:508 msgid "_Make all" msgstr "" -#: src/dialogs.c:546 src/dialogs.c:648 +#: src/dialogs.c:511 src/dialogs.c:613 msgid "Builds the current file with the make tool and the default target" msgstr "" #. build the code with make -#: src/dialogs.c:552 +#: src/dialogs.c:517 msgid "Make custom _target" msgstr "" -#: src/dialogs.c:556 src/dialogs.c:662 +#: src/dialogs.c:521 src/dialogs.c:627 msgid "Builds the current file with the make tool and the specified target" msgstr "" #. build the code with make object -#: src/dialogs.c:561 +#: src/dialogs.c:526 msgid "Make _object" msgstr "" -#: src/dialogs.c:565 +#: src/dialogs.c:530 msgid "Compiles the current file using the make tool" msgstr "" -#: src/dialogs.c:593 +#: src/dialogs.c:558 msgid "_Set Includes and Arguments" msgstr "" -#: src/dialogs.c:598 +#: src/dialogs.c:563 msgid "" "Sets the includes and library paths for the compiler and the program " "arguments for execution" msgstr "" #. DVI -#: src/dialogs.c:619 +#: src/dialogs.c:584 msgid "LaTeX -> DVI" msgstr "" -#: src/dialogs.c:622 +#: src/dialogs.c:587 msgid "Compiles the current file into a DVI file" msgstr "" #. PDF -#: src/dialogs.c:632 +#: src/dialogs.c:597 msgid "LaTeX -> PDF" msgstr "" -#: src/dialogs.c:635 +#: src/dialogs.c:600 msgid "Compiles the current file into a PDF file" msgstr "" #. build the code with make all -#: src/dialogs.c:645 +#: src/dialogs.c:610 msgid "Build with \"make\"" msgstr "" #. build the code with make -#: src/dialogs.c:656 +#: src/dialogs.c:621 msgid "Build with make (custom target)" msgstr "" #. DVI view -#: src/dialogs.c:667 +#: src/dialogs.c:632 msgid "View DVI file" msgstr "" -#: src/dialogs.c:673 src/dialogs.c:686 +#: src/dialogs.c:638 src/dialogs.c:651 msgid "Compiles and view the current file" msgstr "" #. PDF view -#: src/dialogs.c:680 +#: src/dialogs.c:645 msgid "View PDF file" msgstr "" #. arguments -#: src/dialogs.c:699 src/dialogs.c:1124 +#: src/dialogs.c:664 src/dialogs.c:1125 msgid "Set Arguments" msgstr "" -#: src/dialogs.c:706 +#: src/dialogs.c:671 msgid "Sets the program paths and arguments" msgstr "" -#: src/dialogs.c:748 +#: src/dialogs.c:713 msgid "Enter custom options for the make tool" msgstr "" -#: src/dialogs.c:753 +#: src/dialogs.c:718 msgid "" "Enter custom options here, all entered text is passed to the make command." msgstr "" -#: src/dialogs.c:783 +#: src/dialogs.c:748 msgid "Enter the line you want to go to" msgstr "" -#: src/dialogs.c:818 -msgid "Find" +#: src/dialogs.c:770 src/dialogs.c:1053 +msgid "_Case sensitive" msgstr "" -#: src/dialogs.c:823 src/dialogs.c:943 src/dialogs.c:1069 -msgid "Enter the search text here:" +#: src/dialogs.c:775 +msgid "Match only a _whole word" msgstr "" -#: src/dialogs.c:844 src/dialogs.c:976 -msgid "_Case sensitive" +#: src/dialogs.c:780 +msgid "Match only word s_tart" msgstr "" -#: src/dialogs.c:849 src/dialogs.c:981 -msgid "Match only a _whole word" -msgstr "" - -#: src/dialogs.c:854 src/dialogs.c:986 +#: src/dialogs.c:790 msgid "_Use regular expressions" msgstr "" -#: src/dialogs.c:858 src/dialogs.c:990 +#: src/dialogs.c:794 msgid "" "Use POSIX-like regular expressions. For detailed information about using " "regular expressions, please read the documentation." msgstr "" -#: src/dialogs.c:863 src/dialogs.c:995 +#: src/dialogs.c:797 +msgid "_Search backwards" +msgstr "" + +#: src/dialogs.c:802 msgid "_Replace control characters" msgstr "" -#: src/dialogs.c:868 src/dialogs.c:1000 +#: src/dialogs.c:807 msgid "" "Replace \\\\, \\t, \\n, \\r and \\uXXXX (Unicode chararacters) with the " "corresponding control characters." msgstr "" -#: src/dialogs.c:871 src/dialogs.c:1003 -msgid "_Search backwards" +#: src/dialogs.c:839 +msgid "Find" msgstr "" -#: src/dialogs.c:876 src/dialogs.c:1008 -msgid "Match only word s_tart" +#: src/dialogs.c:844 src/dialogs.c:931 src/dialogs.c:1044 +msgid "Enter the search text here:" msgstr "" -#: src/dialogs.c:925 src/keybindings.c:140 +#: src/dialogs.c:909 src/keybindings.c:140 msgid "Replace" msgstr "" -#: src/dialogs.c:928 +#: src/dialogs.c:912 msgid "_In Selection" msgstr "" -#: src/dialogs.c:930 +#: src/dialogs.c:914 msgid "Replace all matches found in the currently selected text" msgstr "" -#: src/dialogs.c:934 +#: src/dialogs.c:918 msgid "Replace _All" msgstr "" -#: src/dialogs.c:947 +#: src/dialogs.c:934 msgid "Enter the replace text here:" msgstr "" -#: src/dialogs.c:1013 -msgid "Replace in all open files" +#: src/dialogs.c:980 +msgid "Replace in all _open files" msgstr "" -#: src/dialogs.c:1017 +#: src/dialogs.c:984 msgid "" "Replaces the search text in all opened files. This option is only useful(and " "used) if you click on \"Replace All\"." msgstr "" -#: src/dialogs.c:1059 src/keybindings.c:142 +#: src/dialogs.c:1024 src/keybindings.c:142 msgid "Find in files" msgstr "" -#: src/dialogs.c:1109 -#, c-format -msgid "Current directory: %s" +#: src/dialogs.c:1058 +msgid "Invert search results" msgstr "" -#: src/dialogs.c:1129 +#: src/dialogs.c:1063 +msgid "Invert the sense of matching, to select non-matching lines." +msgstr "" + +#: src/dialogs.c:1065 +msgid "_Use extended regular expressions" +msgstr "" + +#: src/dialogs.c:1070 +msgid "See grep's manual page for more information." +msgstr "" + +#: src/dialogs.c:1130 msgid "" "Set programs and options for compilation and viewing (La)TeX files.\n" "The filename is appended automatically at the end.\n" msgstr "" -#: src/dialogs.c:1137 +#: src/dialogs.c:1138 msgid "" "Enter here the (La)TeX command (for DVI creation) and some useful options." msgstr "" -#: src/dialogs.c:1158 +#: src/dialogs.c:1159 msgid "" "Enter here the (La)TeX command (for PDF creation) and some useful options." msgstr "" -#: src/dialogs.c:1179 +#: src/dialogs.c:1180 msgid "" "Enter here the (La)TeX command (for DVI preview) and some useful options." msgstr "" -#: src/dialogs.c:1200 +#: src/dialogs.c:1201 msgid "" "Enter here the (La)TeX command (for PDF preview) and some useful options." msgstr "" -#: src/dialogs.c:1231 +#: src/dialogs.c:1232 msgid "Set Includes and Arguments" msgstr "" -#: src/dialogs.c:1236 +#: src/dialogs.c:1237 msgid "" "Sets the includes and library paths for the compiler and the program " "arguments for execution\n" msgstr "" -#: src/dialogs.c:1245 +#: src/dialogs.c:1246 msgid "Enter here arguments to your compiler." msgstr "" -#: src/dialogs.c:1251 src/dialogs.c:1274 src/dialogs.c:1298 +#: src/dialogs.c:1252 src/dialogs.c:1275 src/dialogs.c:1299 #, c-format msgid "" "%f will be replaced by the complete filename\n" @@ -1461,24 +1480,24 @@ "%e -> test_file" msgstr "" -#: src/dialogs.c:1268 +#: src/dialogs.c:1269 msgid "Enter here arguments to your linker." msgstr "" #. program-args -#: src/dialogs.c:1292 +#: src/dialogs.c:1293 msgid "Enter here arguments to your program." msgstr "" -#: src/dialogs.c:1337 +#: src/dialogs.c:1338 msgid "Show _hidden files" msgstr "" -#: src/dialogs.c:1354 +#: src/dialogs.c:1355 msgid "Set filetype:" msgstr "" -#: src/dialogs.c:1357 +#: src/dialogs.c:1358 msgid "" "Explicitly defines a filetype for the file, if it would not be detected by " "filename extension.\n" @@ -1486,146 +1505,151 @@ "filetype." msgstr "" -#: src/dialogs.c:1389 -#, c-format +#: src/dialogs.c:1414 msgid "" -"Configuration directory could not be created (%s).\n" -"There could be some problems using %s without a configuration directory.\n" -"Start %s anyway?" -msgstr "" - -#: src/dialogs.c:1438 -msgid "" "An error occurred or file information could not be retrieved(e.g. from a new " "file)." msgstr "" -#: src/dialogs.c:1458 src/dialogs.c:1459 src/dialogs.c:1460 src/dialogs.c:1466 -#: src/dialogs.c:1467 src/dialogs.c:1468 src/utils.c:143 src/utils.c:144 -#: src/utils.c:1076 +#: src/dialogs.c:1434 src/dialogs.c:1435 src/dialogs.c:1436 src/dialogs.c:1442 +#: src/dialogs.c:1443 src/dialogs.c:1444 src/utils.c:144 src/utils.c:146 +#: src/utils.c:1078 msgid "unknown" msgstr "" -#: src/dialogs.c:1472 +#: src/dialogs.c:1448 msgid "Properties" msgstr "" -#: src/dialogs.c:1500 +#: src/dialogs.c:1476 msgid "Type:" msgstr "" -#: src/dialogs.c:1513 +#: src/dialogs.c:1489 msgid "Size:" msgstr "" -#: src/dialogs.c:1528 +#: src/dialogs.c:1504 msgid "Location:" msgstr "" -#: src/dialogs.c:1541 +#: src/dialogs.c:1517 msgid "Read-only:" msgstr "" -#: src/dialogs.c:1548 +#: src/dialogs.c:1524 msgid "(only inside Geany)" msgstr "" -#: src/dialogs.c:1557 +#: src/dialogs.c:1533 msgid "Encoding:" msgstr "" -#: src/dialogs.c:1570 +#: src/dialogs.c:1542 src/utils.c:145 +msgid "(with BOM)" +msgstr "" + +#: src/dialogs.c:1542 src/utils.c:145 +msgid "(without BOM)" +msgstr "" + +#: src/dialogs.c:1552 msgid "Modified:" msgstr "" -#: src/dialogs.c:1583 +#: src/dialogs.c:1565 msgid "Changed:" msgstr "" -#: src/dialogs.c:1596 +#: src/dialogs.c:1578 msgid "Accessed:" msgstr "" #. Header -#: src/dialogs.c:1625 +#: src/dialogs.c:1607 msgid "Read:" msgstr "" -#: src/dialogs.c:1632 +#: src/dialogs.c:1614 msgid "Write:" msgstr "" -#: src/dialogs.c:1639 +#: src/dialogs.c:1621 msgid "Execute:" msgstr "" #. Owner -#: src/dialogs.c:1647 +#: src/dialogs.c:1629 msgid "Owner:" msgstr "" #. Group -#: src/dialogs.c:1683 +#: src/dialogs.c:1665 msgid "Group:" msgstr "" #. Other -#: src/dialogs.c:1719 +#: src/dialogs.c:1701 msgid "Other:" msgstr "" -#: src/dialogs.c:1802 +#: src/dialogs.c:1783 msgid "Keyboard shortcuts" msgstr "" -#: src/dialogs.c:1809 +#: src/dialogs.c:1790 msgid "The following keyboard shortcuts are defined:" msgstr "" -#: src/document.c:308 +#: src/document.c:314 #, c-format msgid "File %s closed." msgstr "" -#: src/document.c:362 +#: src/document.c:381 msgid "New file opened." msgstr "" -#: src/document.c:403 src/document.c:412 src/document.c:413 +#: src/document.c:426 src/document.c:435 src/document.c:436 msgid "Invalid filename" msgstr "" -#: src/document.c:435 +#: src/document.c:458 #, c-format msgid "Could not open file %s (%s)" msgstr "" -#: src/document.c:469 +#: src/document.c:485 src/document.c:503 #, c-format +msgid "The file \"%s\" is not valid %s." +msgstr "" + +#: src/document.c:560 +#, c-format msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " "supported." msgstr "" -#: src/document.c:554 +#: src/document.c:659 #, c-format msgid "File %s reloaded." msgstr "" -#: src/document.c:556 +#: src/document.c:661 #, c-format msgid "File %s opened(%d%s)." msgstr "" -#: src/document.c:558 +#: src/document.c:663 msgid ", read-only" msgstr "" -#: src/document.c:594 src/document.c:664 +#: src/document.c:700 src/document.c:779 msgid "Error saving file." msgstr "" -#: src/document.c:625 +#: src/document.c:744 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -1633,29 +1657,34 @@ "Error message: %s\n" msgstr "" -#: src/document.c:645 +#: src/document.c:767 #, c-format msgid "Error saving file (%s)." msgstr "" -#: src/document.c:686 +#: src/document.c:801 #, c-format msgid "File %s saved." msgstr "" -#: src/document.c:1017 +#: src/document.c:809 +#, c-format +msgid "The match \"%s\" was not found. Wrap search around the document?" +msgstr "" + +#: src/document.c:1142 msgid "Win (CRLF)" msgstr "" -#: src/document.c:1018 +#: src/document.c:1143 msgid "Mac (CR)" msgstr "" -#: src/document.c:1020 +#: src/document.c:1145 msgid "Unix (LF)" msgstr "" -#: src/document.c:1171 +#: src/document.c:1296 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -1663,49 +1692,49 @@ "%s" msgstr "" -#: src/document.c:1180 +#: src/document.c:1305 #, c-format msgid "Printing of \"%s\" failed(return code: %d)." msgstr "" -#: src/document.c:1185 +#: src/document.c:1310 #, c-format msgid "File %s printed." msgstr "" -#: src/utils.c:135 +#: src/utils.c:136 #, c-format msgid "" "%c line: % 4d column: % 3d selection: % 4d %s mode: %s%s cur. " -"function: %s encoding: %s filetype: %s" +"function: %s encoding: %s %s filetype: %s" msgstr "" -#: src/utils.c:139 +#: src/utils.c:140 msgid "OVR" msgstr "" -#: src/utils.c:139 +#: src/utils.c:140 msgid "INS" msgstr "" -#: src/utils.c:412 +#: src/utils.c:414 #, c-format msgid "Font updated (%s)." msgstr "" -#: src/utils.c:426 src/geany.h:70 +#: src/utils.c:428 src/geany.h:60 msgid "untitled" msgstr "" -#: src/utils.c:427 +#: src/utils.c:429 msgid "(Unsaved)" msgstr "" -#: src/utils.c:696 +#: src/utils.c:698 msgid "No tags found" msgstr "" -#: src/utils.c:977 +#: src/utils.c:979 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -1713,23 +1742,23 @@ "Do you want to reload it?" msgstr "" -#: src/utils.c:1715 +#: src/utils.c:1727 msgid "C Standard Library" msgstr "" -#: src/utils.c:1716 +#: src/utils.c:1728 msgid "ISO C99" msgstr "" -#: src/utils.c:1717 +#: src/utils.c:1729 msgid "C++ (C Standard Library)" msgstr "" -#: src/utils.c:1718 +#: src/utils.c:1730 msgid "C++ Standard Library" msgstr "" -#: src/utils.c:1719 +#: src/utils.c:1731 msgid "C++ STL" msgstr "" @@ -1742,105 +1771,117 @@ msgstr "" #: src/filetypes.c:100 -msgid "Java source file" +msgid "D source file" msgstr "" -#: src/filetypes.c:118 -msgid "Perl source file" +#: src/filetypes.c:119 +msgid "Java source file" msgstr "" #: src/filetypes.c:137 -msgid "PHP / HTML source file" +msgid "Pascal source file" msgstr "" -#: src/filetypes.c:160 -msgid "XML source file" +#: src/filetypes.c:159 +msgid "Assembler source file" msgstr "" -#: src/filetypes.c:178 -msgid "Docbook source file" +#: src/filetypes.c:176 +msgid "(O)Caml source file" msgstr "" -#: src/filetypes.c:195 -msgid "Python source file" +#: src/filetypes.c:194 +msgid "Perl source file" msgstr "" #: src/filetypes.c:213 -msgid "LaTeX source file" +msgid "PHP / HTML source file" msgstr "" -#: src/filetypes.c:232 -msgid "Pascal source file" +#: src/filetypes.c:236 +msgid "Python source file" msgstr "" #: src/filetypes.c:254 +msgid "Ruby source file" +msgstr "" + +#: src/filetypes.c:273 +msgid "Tcl source file" +msgstr "" + +#: src/filetypes.c:292 msgid "Shell script file" msgstr "" -#: src/filetypes.c:277 +#: src/filetypes.c:315 msgid "Makefile" msgstr "" -#: src/filetypes.c:296 -msgid "Cascading StyleSheet" +#: src/filetypes.c:334 +msgid "XML source file" msgstr "" -#: src/filetypes.c:313 -msgid "Config file" +#: src/filetypes.c:352 +msgid "Docbook source file" msgstr "" -#: src/filetypes.c:333 -msgid "Assembler source file" +#: src/filetypes.c:369 +msgid "Cascading StyleSheet" msgstr "" -#: src/filetypes.c:350 +#: src/filetypes.c:386 msgid "SQL Dump file" msgstr "" -#: src/filetypes.c:367 -msgid "(O)Caml source file" +#: src/filetypes.c:403 +msgid "LaTeX source file" msgstr "" -#: src/filetypes.c:385 +#: src/filetypes.c:422 msgid "O-Matrix source file" msgstr "" -#: src/filetypes.c:402 -msgid "Ruby source file" +#: src/filetypes.c:439 +msgid "Config file" msgstr "" -#: src/filetypes.c:421 -msgid "Tcl source file" +#: src/filetypes.c:460 +msgid "All files" msgstr "" -#: src/filetypes.c:440 -msgid "D source file" +#: src/filetypes.c:469 +msgid "None" msgstr "" -#: src/filetypes.c:459 -msgid "All files" +#: src/win32.c:59 +msgid "Executables" msgstr "" -#: src/filetypes.c:468 -msgid "None" +#: src/win32.c:341 +msgid "Error" msgstr "" -#: src/win32.c:143 -msgid "Executables" +#: src/win32.c:347 src/win32.c:382 +msgid "Question" msgstr "" -#: src/keyfile.c:58 +#: src/win32.c:353 +msgid "Information" +msgstr "" + +#: src/keyfile.c:59 #, c-format msgid "%s configuration file, edit as you need" msgstr "" -#: src/keyfile.c:107 +#: src/keyfile.c:108 msgid "" " VTE settings: FONT;FOREGROUND;BACKGROUND;scrollback;type;scroll on " "keystroke;scroll on output;follow path of file" msgstr "" -#: src/keyfile.c:268 +#: src/keyfile.c:269 msgid "Type here what you want, use it as a notice/scratch board" msgstr "" @@ -1848,48 +1889,48 @@ msgid "Status messages" msgstr "" -#: src/build.c:89 +#: src/build.c:90 #, c-format msgid "Failed to view %s (make sure it is already compiled)" msgstr "" -#: src/build.c:116 src/build.c:293 src/build.c:432 +#: src/build.c:117 src/build.c:294 src/build.c:436 src/search.c:107 #, c-format msgid "Process failed (%s)" msgstr "" -#: src/build.c:286 +#: src/build.c:287 #, c-format msgid "%s (in directory: %s)" msgstr "" -#: src/build.c:368 +#: src/build.c:369 #, c-format msgid "Failed to execute %s (make sure it is already built)" msgstr "" -#: src/build.c:380 +#: src/build.c:384 #, c-format msgid "" "Could not find terminal '%s' (check path for Terminal tool setting in " "Preferences)" msgstr "" -#: src/build.c:395 +#: src/build.c:399 #, c-format msgid "Failed to change the working directory to %s" msgstr "" -#: src/build.c:413 +#: src/build.c:417 #, c-format msgid "Failed to execute %s (start-script could not be created)" msgstr "" -#: src/build.c:524 +#: src/build.c:528 msgid "compilation finished unsuccessful" msgstr "" -#: src/build.c:528 +#: src/build.c:532 msgid "compilation finished successful" msgstr "" @@ -1901,91 +1942,91 @@ msgid "Shortcut" msgstr "" -#: src/prefs.c:752 +#: src/prefs.c:756 msgid "Grab key" msgstr "" -#: src/prefs.c:756 +#: src/prefs.c:760 #, c-format msgid "Type the combination of the keys you want to use for \"%s\"" msgstr "" -#: src/prefs.c:880 +#: src/prefs.c:884 #, c-format msgid "" "The combination '%s' is already used for \"%s\". Please choose another one." msgstr "" -#: src/prefs.c:934 +#: src/prefs.c:942 msgid "" "These are settings for the virtual terminal emulator widget (VTE). They only " "apply, if the VTE library could be loaded." msgstr "" -#: src/prefs.c:950 +#: src/prefs.c:958 msgid "Terminal font" msgstr "" -#: src/prefs.c:960 +#: src/prefs.c:968 msgid "Sets the font for the terminal widget." msgstr "" -#: src/prefs.c:962 +#: src/prefs.c:970 msgid "Foreground color" msgstr "" -#: src/prefs.c:968 +#: src/prefs.c:976 msgid "Background color" msgstr "" -#: src/prefs.c:978 +#: src/prefs.c:986 msgid "Sets the foreground color of the text in the terminal widget." msgstr "" -#: src/prefs.c:985 +#: src/prefs.c:993 msgid "Sets the background color of the text in the terminal widget." msgstr "" -#: src/prefs.c:988 +#: src/prefs.c:996 msgid "Scrollback lines" msgstr "" -#: src/prefs.c:999 +#: src/prefs.c:1007 msgid "" "Specifies the history in lines, which you can scroll back in the terminal " "widget." msgstr "" -#: src/prefs.c:1003 +#: src/prefs.c:1011 msgid "Terminal emulation" msgstr "" -#: src/prefs.c:1013 +#: src/prefs.c:1021 msgid "" "Controls how the terminal emulator should behave. xterm is a good start." msgstr "" -#: src/prefs.c:1015 +#: src/prefs.c:1023 msgid "Scroll on keystroke" msgstr "" -#: src/prefs.c:1019 +#: src/prefs.c:1027 msgid "Whether to scroll to the bottom if a key was pressed." msgstr "" -#: src/prefs.c:1022 +#: src/prefs.c:1030 msgid "Scroll on output" msgstr "" -#: src/prefs.c:1026 +#: src/prefs.c:1034 msgid "Whether to scroll to the bottom if an output was generated." msgstr "" -#: src/prefs.c:1029 +#: src/prefs.c:1037 msgid "Follow the path of the current file" msgstr "" -#: src/prefs.c:1033 +#: src/prefs.c:1041 msgid "Whether to execute \"cd $path\" when you switch between opened files." msgstr "" @@ -2117,172 +2158,174 @@ msgstr "" #: 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 "" -#: src/encodings.c:99 src/encodings.c:100 src/encodings.c:101 -#: src/encodings.c:102 +#: src/encodings.c:103 src/encodings.c:104 src/encodings.c:105 +#: src/encodings.c:106 msgid "Chinese Simplified" msgstr "" -#: src/encodings.c:103 src/encodings.c:104 src/encodings.c:105 +#: src/encodings.c:107 src/encodings.c:108 src/encodings.c:109 msgid "Chinese Traditional" msgstr "" -#: src/encodings.c:106 src/encodings.c:107 src/encodings.c:108 +#: src/encodings.c:110 src/encodings.c:111 src/encodings.c:112 msgid "Japanese" msgstr "" -#: src/encodings.c:109 src/encodings.c:110 src/encodings.c:111 -#: src/encodings.c:112 +#: src/encodings.c:113 src/encodings.c:114 src/encodings.c:115 +#: src/encodings.c:116 msgid "Korean" msgstr "" -#: src/encodings.c:175 +#: src/encodings.c:187 msgid "_West European" msgstr "" -#: src/encodings.c:181 +#: src/encodings.c:193 msgid "_East European" msgstr "" -#: src/encodings.c:187 +#: src/encodings.c:199 msgid "East _Asian" msgstr "" -#: src/encodings.c:193 +#: src/encodings.c:205 msgid "_SE & SW Asian" msgstr "" -#: src/encodings.c:199 +#: src/encodings.c:211 msgid "_Middle Eastern" msgstr "" -#: src/encodings.c:205 +#: src/encodings.c:217 msgid "_Unicode" msgstr "" -#: src/treeviews.c:65 +#: src/treeviews.c:66 msgid "Chapter" msgstr "" -#: src/treeviews.c:67 src/treeviews.c:89 +#: src/treeviews.c:68 src/treeviews.c:90 msgid "Section" msgstr "" -#: src/treeviews.c:69 +#: src/treeviews.c:70 msgid "Sect1" msgstr "" -#: src/treeviews.c:71 +#: src/treeviews.c:72 msgid "Sect2" msgstr "" -#: src/treeviews.c:73 +#: src/treeviews.c:74 msgid "Sect3" msgstr "" -#: src/treeviews.c:75 +#: src/treeviews.c:76 msgid "Appendix" msgstr "" -#: src/treeviews.c:77 src/treeviews.c:99 src/treeviews.c:182 +#: src/treeviews.c:78 src/treeviews.c:100 src/treeviews.c:183 msgid "Other" msgstr "" -#: src/treeviews.c:85 +#: src/treeviews.c:86 msgid "Command" msgstr "" -#: src/treeviews.c:87 +#: src/treeviews.c:88 msgid "Environment" msgstr "" -#: src/treeviews.c:91 +#: src/treeviews.c:92 msgid "Subsection" msgstr "" -#: src/treeviews.c:93 +#: src/treeviews.c:94 msgid "Subsubsection" msgstr "" -#: src/treeviews.c:95 +#: src/treeviews.c:96 msgid "Label" msgstr "" -#: src/treeviews.c:97 +#: src/treeviews.c:98 msgid "Begin" msgstr "" -#: src/treeviews.c:105 +#: src/treeviews.c:106 msgid "Function" msgstr "" -#: src/treeviews.c:107 +#: src/treeviews.c:108 msgid "Package" msgstr "" -#: src/treeviews.c:109 +#: src/treeviews.c:110 msgid "My" msgstr "" -#: src/treeviews.c:111 +#: src/treeviews.c:112 msgid "Local" msgstr "" -#: src/treeviews.c:113 +#: src/treeviews.c:114 msgid "Our" msgstr "" -#: src/treeviews.c:126 src/treeviews.c:151 +#: src/treeviews.c:127 src/treeviews.c:152 msgid "Methods" msgstr "" -#: src/treeviews.c:128 src/treeviews.c:149 src/treeviews.c:170 +#: src/treeviews.c:129 src/treeviews.c:150 src/treeviews.c:171 msgid "Classes" msgstr "" -#: src/treeviews.c:130 +#: src/treeviews.c:131 msgid "Singletons" msgstr "" -#: src/treeviews.c:132 +#: src/treeviews.c:133 msgid "Mixins" msgstr "" -#: src/treeviews.c:134 src/treeviews.c:176 +#: src/treeviews.c:135 src/treeviews.c:177 msgid "Variables" msgstr "" -#: src/treeviews.c:136 src/treeviews.c:172 +#: src/treeviews.c:137 src/treeviews.c:173 msgid "Members" msgstr "" -#: src/treeviews.c:147 src/treeviews.c:168 +#: src/treeviews.c:148 src/treeviews.c:169 msgid "Functions" msgstr "" -#: src/treeviews.c:174 +#: src/treeviews.c:175 msgid "Macros" msgstr "" -#: src/treeviews.c:178 +#: src/treeviews.c:179 msgid "Namespaces" msgstr "" -#: src/treeviews.c:180 +#: src/treeviews.c:181 msgid "Structs / Typedefs" msgstr "" -#: src/treeviews.c:254 src/treeviews.c:306 +#: src/treeviews.c:279 src/treeviews.c:331 msgid "Hide" msgstr "" -#: src/treeviews.c:262 src/treeviews.c:314 +#: src/treeviews.c:287 src/treeviews.c:339 msgid "Hide sidebar" msgstr "" -#: src/treeviews.c:294 +#: src/treeviews.c:319 msgid "Reload" msgstr "" @@ -2426,18 +2469,35 @@ msgid "Complete word" msgstr "" -#: src/keybindings.c:199 +#: src/keybindings.c:201 src/keybindings.c:204 msgid "Show calltip" msgstr "" -#: src/keybindings.c:201 +#: src/keybindings.c:207 msgid "Show macro list" msgstr "" -#: src/keybindings.c:203 +#: src/keybindings.c:209 msgid "Suppress auto completion" msgstr "" -#: src/keybindings.c:205 +#: src/keybindings.c:211 msgid "Find Usage" msgstr "" + +#: src/search.c:67 +#, c-format +msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." +msgstr "" + +#: src/search.c:220 +msgid "Search failed." +msgstr "" + +#: src/search.c:226 +msgid "Search completed." +msgstr "" + +#: src/search.c:227 +msgid "No matches found." +msgstr "" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

28 Jul '06

Revision: 647 Author: eht16 Date: 2006-07-28 11:37:32 -0700 (Fri, 28 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=647&view=rev Log Message: ----------- Added some options to the Find in files dialog, made search directory editable. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/dialogs.c trunk/src/search.c trunk/src/search.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-28 12:29:10 UTC (rev 646) +++ trunk/ChangeLog 2006-07-28 18:37:32 UTC (rev 647) @@ -1,3 +1,10 @@ +2006-07-28 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/search.c, src/callbacks.c, src/dialogs.c: + Added some options to the Find in files dialog, made search + directory editable. + + 2006-07-28 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/sciwrappers.h: Set PLAT_GTK before including ScintillaWidget.h. @@ -18,7 +25,7 @@ styles to keep the syntax highlighting consistent. * src/main.c: Removed startup warning. * src/geany.h, src/main.c: Added Select All item to sensitive buttons. - * src/win32.c, src/dialogs.c, src/callbacks.c: + * src/win32.c, src/dialogs.c, src/callbacks.c: Let the colour chooser pick the colour under the cursor(Win32 code). Added some sanity checks. Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-07-28 12:29:10 UTC (rev 646) +++ trunk/src/callbacks.c 2006-07-28 18:37:32 UTC (rev 647) @@ -2065,26 +2065,35 @@ { const gchar *search_text = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(user_data)))); - gchar *utf8_dir = utils_get_current_file_dir(); + const gchar *utf8_dir = + gtk_entry_get_text(GTK_ENTRY(lookup_widget(app->find_in_files_dialog, "entry_dir"))); - if (utf8_dir == NULL) + if (utf8_dir == NULL || utils_strcmp(utf8_dir, "")) msgwin_status_add(_("Invalid directory for find in files.")); else if (search_text && *search_text) { gchar *locale_dir; + gboolean eregexp = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( + lookup_widget(app->find_in_files_dialog, "check_eregexp"))); + gboolean invert = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( + lookup_widget(app->find_in_files_dialog, "check_invert"))); + gboolean case_sens = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( + lookup_widget(app->find_in_files_dialog, "check_case"))); + gint opts = (eregexp ? FIF_USE_EREGEXP : 0) | + (invert ? FIF_INVERT_MATCH : 0) | + (case_sens ? FIF_CASE_SENSITIVE : 0); locale_dir = g_locale_from_utf8(utf8_dir, -1, NULL, NULL, NULL); if (locale_dir == NULL) locale_dir = g_strdup(utf8_dir); gtk_combo_box_prepend_text(GTK_COMBO_BOX(user_data), search_text); - search_find_in_files(search_text, locale_dir); + search_find_in_files(search_text, locale_dir, opts); g_free(locale_dir); gtk_widget_hide(app->find_in_files_dialog); } else msgwin_status_add(_("No text to find.")); - g_free(utf8_dir); } else gtk_widget_hide(app->find_in_files_dialog); Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-07-28 12:29:10 UTC (rev 646) +++ trunk/src/dialogs.c 2006-07-28 18:37:32 UTC (rev 647) @@ -1004,24 +1004,21 @@ void dialogs_show_find_in_files(void) { - static GtkWidget *dirlabel = NULL, *combo = NULL; - GtkWidget *entry; //the child GtkEntry of combo + static GtkWidget *combo = NULL; + static GtkWidget *entry1; + GtkWidget *entry2; // the child GtkEntry of combo gint idx = document_get_cur_idx(); gchar *sel = NULL; - gchar *cur_dir, *dirtext; + gchar *cur_dir; if (idx == -1 || ! doc_list[idx].is_valid) return; cur_dir = utils_get_current_file_dir(); - if (cur_dir == NULL) - { - utils_set_statusbar(_("Invalid directory for find in files."), FALSE); - return; - } if (app->find_in_files_dialog == NULL) { - GtkWidget *label; + GtkWidget *label, *label1, *checkbox1, *checkbox2, *checkbox3, *vbox2, *vbox1; + GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(app->window, "tooltips")); app->find_in_files_dialog = gtk_dialog_new_with_buttons( _("Find in files"), GTK_WINDOW(app->window), GTK_DIALOG_DESTROY_WITH_PARENT, @@ -1031,31 +1028,65 @@ gtk_dialog_set_default_response(GTK_DIALOG(app->find_in_files_dialog), GTK_RESPONSE_ACCEPT); - dirlabel = gtk_label_new(""); - gtk_misc_set_alignment(GTK_MISC(dirlabel), 0, 0); + label1 = gtk_label_new("Directory to be searched:"); + gtk_misc_set_alignment(GTK_MISC(label1), 0, 0); + entry1 = gtk_entry_new(); + gtk_entry_set_max_length(GTK_ENTRY(entry1), 248); + gtk_entry_set_width_chars(GTK_ENTRY(entry1), 50); + g_object_set_data_full(G_OBJECT(app->find_in_files_dialog), "entry_dir", + gtk_widget_ref(entry1), (GDestroyNotify)gtk_widget_unref); + + vbox1 = gtk_vbox_new(FALSE, 5); + gtk_box_pack_start(GTK_BOX(vbox1), label1, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox1), entry1, FALSE, FALSE, 0); + label = gtk_label_new(_("Enter the search text here:")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0); combo = gtk_combo_box_entry_new_text(); - entry = gtk_bin_get_child(GTK_BIN(combo)); - gtk_entry_set_max_length(GTK_ENTRY(entry), 248); - gtk_entry_set_width_chars(GTK_ENTRY(entry), 50); - gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE); + entry2 = gtk_bin_get_child(GTK_BIN(combo)); + gtk_entry_set_max_length(GTK_ENTRY(entry2), 248); + gtk_entry_set_width_chars(GTK_ENTRY(entry2), 50); + gtk_entry_set_activates_default(GTK_ENTRY(entry2), TRUE); + checkbox1 = gtk_check_button_new_with_mnemonic(_("_Case sensitive")); + g_object_set_data_full(G_OBJECT(app->find_in_files_dialog), "check_case", + gtk_widget_ref(checkbox1), (GDestroyNotify)gtk_widget_unref); + gtk_button_set_focus_on_click(GTK_BUTTON(checkbox1), FALSE); + + checkbox2 = gtk_check_button_new_with_mnemonic(_("Invert search results")); + g_object_set_data_full(G_OBJECT(app->find_in_files_dialog), "check_invert", + gtk_widget_ref(checkbox2), (GDestroyNotify)gtk_widget_unref); + gtk_button_set_focus_on_click(GTK_BUTTON(checkbox2), FALSE); + gtk_tooltips_set_tip(tooltips, checkbox2, + _("Invert the sense of matching, to select non-matching lines."), NULL); + + checkbox3 = gtk_check_button_new_with_mnemonic(_("_Use extended regular expressions")); + g_object_set_data_full(G_OBJECT(app->find_in_files_dialog), "check_eregexp", + gtk_widget_ref(checkbox3), (GDestroyNotify)gtk_widget_unref); + gtk_button_set_focus_on_click(GTK_BUTTON(checkbox3), FALSE); + gtk_tooltips_set_tip(tooltips, checkbox3, + _("See grep's manual page for more information."), NULL); + + vbox2 = gtk_vbox_new(FALSE, 0); + gtk_container_add(GTK_CONTAINER(vbox2), checkbox1); + gtk_container_add(GTK_CONTAINER(vbox2), checkbox2); + gtk_container_add(GTK_CONTAINER(vbox2), checkbox3); + g_signal_connect((gpointer) app->find_in_files_dialog, "response", G_CALLBACK(on_find_in_files_dialog_response), combo); g_signal_connect((gpointer) app->find_in_files_dialog, "delete_event", G_CALLBACK(gtk_widget_hide), NULL); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(app->find_in_files_dialog)->vbox), - dirlabel, TRUE, TRUE, 6); + vbox1, TRUE, TRUE, 6); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(app->find_in_files_dialog)->vbox), label, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(app->find_in_files_dialog)->vbox), combo, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(app->find_in_files_dialog)->vbox), - gtk_label_new(""), TRUE, TRUE, 0); + vbox2, TRUE, TRUE, 6); gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(app->find_in_files_dialog)->vbox), 6); @@ -1068,16 +1099,19 @@ sci_get_selected_text(doc_list[idx].sci, sel); } - entry = GTK_BIN(combo)->child; - if (sel) gtk_entry_set_text(GTK_ENTRY(entry), sel); + entry2 = GTK_BIN(combo)->child; + if (sel) gtk_entry_set_text(GTK_ENTRY(entry2), sel); g_free(sel); - gtk_widget_grab_focus(entry); - dirtext = g_strdup_printf(_("Current directory: %s"), cur_dir); - gtk_label_set_text(GTK_LABEL(dirlabel), dirtext); + if (cur_dir) gtk_entry_set_text(GTK_ENTRY(entry1), cur_dir); g_free(cur_dir); - g_free(dirtext); + // put the focus to the directory entry if it is empty + if (utils_strcmp(gtk_entry_get_text(GTK_ENTRY(entry1)), "")) + gtk_widget_grab_focus(entry1); + else + gtk_widget_grab_focus(entry2); + gtk_widget_show(app->find_in_files_dialog); } Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2006-07-28 12:29:10 UTC (rev 646) +++ trunk/src/search.c 2006-07-28 18:37:32 UTC (rev 647) @@ -45,27 +45,57 @@ static GSList *search_get_file_list(const gchar *path, gint *length); -gboolean search_find_in_files(const gchar *search_text, const gchar *dir) +gboolean search_find_in_files(const gchar *search_text, const gchar *dir, fif_options opts) { - const gchar *argv_prefix[] = {app->tools_grep_cmd, "-nHI", "--", search_text, NULL}; + gchar **argv_prefix; + gchar **grep_cmd_argv; gchar **argv; + gchar grep_opts[] = "-nHI "; GPid child_pid; - gint stdout_fd, stdin_fd; + gint stdout_fd, stdin_fd, grep_cmd_argv_len, i, grep_opts_len = 4; GError *error = NULL; gboolean ret = FALSE; if (! search_text || ! *search_text || ! dir) return TRUE; - if (! g_file_test(app->tools_grep_cmd, G_FILE_TEST_IS_EXECUTABLE)) + + // first process the grep command (need to split it in a argv because it can be "grep -I") + grep_cmd_argv = g_strsplit(app->tools_grep_cmd, " ", -1); + grep_cmd_argv_len = g_strv_length(grep_cmd_argv); + + if (! g_file_test(grep_cmd_argv[0], G_FILE_TEST_IS_EXECUTABLE)) { msgwin_status_add(_("Cannot execute grep tool '%s';" - " check the path setting in Preferences."), argv_prefix[0]); + " check the path setting in Preferences."), app->tools_grep_cmd); return FALSE; } gtk_list_store_clear(msgwindow.store_msg); gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_MESSAGE); - argv = search_get_argv(argv_prefix, dir); + if (! (opts & FIF_CASE_SENSITIVE)) + grep_opts[grep_opts_len++] = 'i'; + if (opts & FIF_USE_EREGEXP) + grep_opts[grep_opts_len++] = 'E'; + if (opts & FIF_INVERT_MATCH) + grep_opts[grep_opts_len++] = 'v'; + grep_opts[grep_opts_len] = '\0'; + + // set grep command and options + argv_prefix = g_new0(gchar*, grep_cmd_argv_len + 4); + for (i = 0; i < grep_cmd_argv_len; i++) + { + argv_prefix[i] = g_strdup(grep_cmd_argv[i]); + } + argv_prefix[grep_cmd_argv_len ] = g_strdup(grep_opts); + argv_prefix[grep_cmd_argv_len + 1] = g_strdup("--"); + argv_prefix[grep_cmd_argv_len + 2] = g_strdup(search_text); + argv_prefix[grep_cmd_argv_len + 3] = NULL; + g_strfreev(grep_cmd_argv); + + // finally add the arguments(files to be searched) + argv = search_get_argv((const gchar**)argv_prefix, dir); + g_strfreev(argv_prefix); + //geany_debug(g_strjoinv(" ", argv)); if (argv == NULL) return FALSE; if (! g_spawn_async_with_pipes(dir, (gchar**)argv, NULL, @@ -80,9 +110,9 @@ } else { - g_child_watch_add(child_pid, search_close_pid, NULL); utils_set_up_io_channel(stdout_fd, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL, search_read_io, NULL); + g_child_watch_add(child_pid, search_close_pid, NULL); ret = TRUE; } g_strfreev(argv); Modified: trunk/src/search.h =================================================================== --- trunk/src/search.h 2006-07-28 12:29:10 UTC (rev 646) +++ trunk/src/search.h 2006-07-28 18:37:32 UTC (rev 647) @@ -21,5 +21,13 @@ */ -gboolean search_find_in_files(const gchar *search_text, const gchar *dir); +typedef enum +{ + FIF_CASE_SENSITIVE = 1 << 0, + FIF_USE_EREGEXP = 1 << 1, + FIF_INVERT_MATCH = 1 << 2 +} fif_options; + +gboolean search_find_in_files(const gchar *search_text, const gchar *dir, fif_options opts); + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

28 Jul '06

Revision: 646 Author: ntrel Date: 2006-07-28 05:29:10 -0700 (Fri, 28 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=646&view=rev Log Message: ----------- Add makefiles for building on win32 Modified Paths: -------------- trunk/ChangeLog Added Paths: ----------- trunk/geany_private.rc trunk/makefile.win32 trunk/scintilla/makefile.win32 trunk/src/makefile.win32 trunk/tagmanager/makefile.win32 trunk/win32-config.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-28 12:26:36 UTC (rev 645) +++ trunk/ChangeLog 2006-07-28 12:29:10 UTC (rev 646) @@ -1,3 +1,12 @@ +2006-07-28 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/sciwrappers.h: Set PLAT_GTK before including ScintillaWidget.h. + * src/Makefile.am, geany_windres.rc.in: Correct a typo. + * scintilla/makefile.win32, src/makefile.win32, makefile.win32, + tagmanager/makefile.win32, win32-config.h, geany_private.rc: + Add makefiles for building on win32. + + 2006-07-27 Enrico Tröger <enrico.troeger(a)uvena.de> * src/sciwrappers.c, src/callbacks.c, src/utils.c, src/dialogs.c, Added: trunk/geany_private.rc =================================================================== --- trunk/geany_private.rc (rev 0) +++ trunk/geany_private.rc 2006-07-28 12:29:10 UTC (rev 646) @@ -0,0 +1,32 @@ + +#include <windows.h> // include for version info constants + + +A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../pixmaps/geany.ico" + +1 VERSIONINFO +FILEVERSION 0,7,9,0 +PRODUCTVERSION 0,7,9,0 +FILETYPE VFT_APP +{ + BLOCK "StringFileInfo" + { + BLOCK "040704E4" + { + VALUE "CompanyName", "" + VALUE "FileVersion", "0.8svn" + VALUE "FileDescription", "Small and lightweight IDE (built using mingw gcc)" + VALUE "InternalName", "geany" + VALUE "LegalCopyright", "Copyright 2005-2006 by Enrico Troeger" + VALUE "LegalTrademarks", "" + VALUE "OriginalFilename", "geany" + VALUE "ProductName", "geany" + VALUE "ProductVersion", "0.8svn" + } + } + BLOCK "VarFileInfo" + { + VALUE "Translation", 0x0407, 1252 + } +} + Property changes on: trunk/geany_private.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Added: trunk/makefile.win32 =================================================================== --- trunk/makefile.win32 (rev 0) +++ trunk/makefile.win32 2006-07-28 12:29:10 UTC (rev 646) @@ -0,0 +1,47 @@ +# Running make creates config.h then calls the sub makefiles. +# +# Other targets are: +# deps: delete the dependencies so they are regenerated on next make +# clean: clean all generated files +# +# localwin32.mk is an optional file to override make variables. +# Use localwin32.mk instead of editing variables as it is included in sub +# makefiles. +# localwin32.mk to set PREFIX instead of the default C:\libs +# For MSYS use localwin32.mk to set CP and RM. +# By default this will work in a Windows command prompt. + +WINDRES = windres.exe +CC = gcc +CXX = g++ +CP = copy +RM = del +-include localwin32.mk + +# Note: && is needed after cd because each line is executed in a different +# shell. (cd .. is just for clarity). +all: check-tools config.h + cd tagmanager && make -f makefile.win32 && cd .. + cd scintilla && make -f makefile.win32 && cd .. + cd src && make -f makefile.win32 && cd .. + +# first check the required tools are installed +check-tools: + $(WINDRES) --version + $(CC) --version + $(CXX) --version + +config.h: win32-config.h + $(CP) $< $@ + +deps: + $(RM) tagmanager\deps.mak scintilla\deps.mak src\deps.mak + +# used by src/makefile.win32 to avoid del ../file which is an error +clean-local: + $(RM) geany_private.res geany.exe + +clean: + cd tagmanager && make -f makefile.win32 clean && cd .. + cd scintilla && make -f makefile.win32 clean && cd .. + cd src && make -f makefile.win32 clean && cd .. Property changes on: trunk/makefile.win32 ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Added: trunk/scintilla/makefile.win32 =================================================================== --- trunk/scintilla/makefile.win32 (rev 0) +++ trunk/scintilla/makefile.win32 2006-07-28 12:29:10 UTC (rev 646) @@ -0,0 +1,84 @@ +# Make file for Scintilla on Linux or compatible OS +# Copyright 1998-2001 by Neil Hodgson <neilh(a)scintilla.org> +# The License.txt file describes the conditions under which this software may be distributed. +# This makefile assumes GCC 3.1 is used and changes will be needed to use other compilers. +# GNU make does not like \r\n line endings so should be saved to CVS in binary form. +# Builds for GTK+ 2 if available else GTK+ 1. +# To force GTK+ 2 build, define GTK2 on the make command line. +# To force GTK+ 1 build, define GTK1 on the make command line. + +.SUFFIXES: .cxx .c .o .h .a +CC = g++ +CCOMP = gcc +AR = ar +RANLIB = ranlib +PREFIX = C:\libs +RM = del +-include ../localwin32.mk + + +COMPLIB=scintilla.a + +GTK_INCLUDES= \ + -I$(PREFIX)/include/gtk-2.0 \ + -I$(PREFIX)/lib/gtk-2.0/include \ + -I$(PREFIX)/include/atk-1.0 \ + -I$(PREFIX)/include/pango-1.0 \ + -I$(PREFIX)/include/cairo \ + -I$(PREFIX)/include/glib-2.0 \ + -I$(PREFIX)/lib/glib-2.0/include \ + -I$(PREFIX)/include/gettext \ + -I$(PREFIX)/include + + +vpath %.h . include +vpath %.cxx . + +INCLUDEDIRS=-I include -I . $(GTK_INCLUDES) +CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -DGTK -DGTK2 -DSCI_LEXER $(INCLUDEDIRS) -mms-bitfields + +ifdef NOTHREADS +THREADFLAGS=-DG_THREADS_IMPL_NONE +else +THREADFLAGS= +endif + +ifdef DEBUG +CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS) +else +CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS) +endif + +CONFIGFLAGS=$(GTK_INCLUDES) +MARSHALLER=scintilla-marshal.o + +.cxx.o: + $(CC) $(CXXFLAGS) -c $< +.c.o: + $(CCOMP) $(CXXFLAGS) -w -c $< + +#++Autogenerated -- run src/LexGen.py to regenerate +#**LEXOBJS=\\\n$\*.o $ +LEXOBJS=\ +LexBash.o LexAsm.o LexCSS.o LexConf.o LexCPP.o LexCrontab.o LexHTML.o LexOthers.o LexPascal.o \ +LexPerl.o LexPython.o LexSQL.o LexCaml.o LexOMS.o LexTCL.o LexRuby.o +#--Autogenerated -- end of automatically generated section + +all: $(COMPLIB) + +clean: + $(RM) deps.mak *.o $(COMPLIB) + +$(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o Document.o CallTip.o \ + ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.o \ + KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \ + RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o CharClassify.o XPM.o \ + $(MARSHALLER) $(LEXOBJS) + $(AR) rc $@ $^ + $(RANLIB) $@ + +deps.mak: + $(CC) -MM $(CXXFLAGS) *.cxx >deps.mak + +# Generate header dependencies with "make deps.mak" +include deps.mak Property changes on: trunk/scintilla/makefile.win32 ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Added: trunk/src/makefile.win32 =================================================================== --- trunk/src/makefile.win32 (rev 0) +++ trunk/src/makefile.win32 2006-07-28 12:29:10 UTC (rev 646) @@ -0,0 +1,84 @@ +# per hand geschrieben, nicht hauen! +# Note: PACKAGE_DATA_DIR and PACKAGE_LOCALE_DIR are no longer used on Windows. + +DEFINES = -DPACKAGE_DATA_DIR=\"data\" \ + -DHAVE_CONFIG_H \ + -DPACKAGE_LOCALE_DIR=\"data\" \ + -DENABLE_NLS + +.SUFFIXES: .c .o .h .a +WINDRES = windres.exe +CC = gcc +CXX = g++ +RES = ../geany_private.res +TARGET = ../geany.exe +EXECDIR = c:\distrib +PREFIX = C:\libs +RM = del +-include ../localwin32.mk + +GTK_INCLUDES= \ + -I$(PREFIX)/include/gtk-2.0 \ + -I$(PREFIX)/lib/gtk-2.0/include \ + -I$(PREFIX)/include/atk-1.0 \ + -I$(PREFIX)/include/pango-1.0 \ + -I$(PREFIX)/include/cairo \ + -I$(PREFIX)/include/glib-2.0 \ + -I$(PREFIX)/lib/glib-2.0/include \ + -I$(PREFIX)/include/gettext \ + -I$(PREFIX)/include + +INCLUDEDIRS= -I.. \ + -I../scintilla/include \ + -I../tagmanager/include \ + $(GTK_INCLUDES) + +ALL_GTK_LIBS= \ + -L"$(PREFIX)/lib" \ + -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 \ + -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl -liconv + # these things are for GTK >= 2.8 + # (should be same as with MSYS: pkg-config --libs gtk+-2.0 gthread-2.0) + #"$(PREFIX)/lib/libcairo.dll.a" \ + #"$(PREFIX)/lib/asprintf.lib" \ + #"$(PREFIX)/lib/charset.lib" \ + +CCFLAGS=-Wall -O2 -g -mms-bitfields $(DEFINES) $(INCLUDEDIRS) + +OBJS = treeviews.o templates.o encodings.o about.o prefs.o win32.o build.o msgwindow.o dialogs.o \ + filetypes.o interface.o main.o support.o callbacks.o utils.o \ + highlighting.o sci_cb.o document.o sciwrappers.o keyfile.o keybindings.o search.o notebook.o + +.c.o: + $(CC) $(CCFLAGS) -c $< + +# all: binclean $(TARGET) #exec +all: $(TARGET) + +$(RES): ../geany_private.rc ../pixmaps/geany.ico + $(WINDRES) -i $< --input-format=rc -o $@ -O coff + +# this calls parent clean-local target because del ../file won't work +clean: + $(RM) deps.mak *.o + cd .. && make -f makefile.win32 clean-local && cd src + +exec: + $(EXECDIR)\geany.exe + +binclean: + $(RM) $(TARGET) + +$(TARGET): $(OBJS) $(RES) ../scintilla/scintilla.a ../tagmanager/tagmanager.a + $(CXX) $(OBJS) $(RES) -o $(TARGET) \ + ../scintilla/scintilla.a ../tagmanager/tagmanager.a $(ALL_GTK_LIBS) \ + -mwindows -limm32 -lshell32 -lole32 -luuid -lcomdlg32 -lcomctl32 -liberty + +deps.mak: + $(CC) -MM $(CCFLAGS) *.c >deps.mak + +# Generate header dependencies with "make deps.mak" +include deps.mak + +..\localwin32.mk: + echo # Set local variables here >$@ Property changes on: trunk/src/makefile.win32 ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Added: trunk/tagmanager/makefile.win32 =================================================================== --- trunk/tagmanager/makefile.win32 (rev 0) +++ trunk/tagmanager/makefile.win32 2006-07-28 12:29:10 UTC (rev 646) @@ -0,0 +1,47 @@ + +.SUFFIXES: .cxx .c .o .h .a +CC = gcc +AR = ar +RANLIB = ranlib +PREFIX = C:\libs +RM = del +-include ../localwin32.mk + +COMPLIB=tagmanager.a + +GTK_INCLUDES= \ + -I$(PREFIX)/include/gtk-2.0 \ + -I$(PREFIX)/lib/gtk-2.0/include \ + -I$(PREFIX)/include/atk-1.0 \ + -I$(PREFIX)/include/pango-1.0 \ + -I$(PREFIX)/include/cairo \ + -I$(PREFIX)/include/glib-2.0 \ + -I$(PREFIX)/lib/glib-2.0/include \ + -I$(PREFIX)/include/gettext \ + -I$(PREFIX)/include + +INCLUDEDIRS=-I include $(GTK_INCLUDES) + +CCFLAGS=-g -Wall -DPACKAGE=\"geany\" -DG_OS_WIN32 -Wno-missing-braces -Wno-char-subscripts $(INCLUDEDIRS) -mms-bitfields + +.c.o: + $(CC) $(CCFLAGS) -w -c $< + +all: $(COMPLIB) + +clean: + $(RM) deps.mak *.o $(COMPLIB) + +$(COMPLIB): args.o c.o d.o make.o conf.o pascal.o perl.o php.o \ +python.o regex.o sh.o ctags.o entry.o get.o keyword.o options.o parse.o \ +read.o sort.o strlist.o latex.o docbook.o tcl.o ruby.o asm.o sql.o css.o vstring.o tm_workspace.o tm_work_object.o \ +tm_source_file.o tm_project.o tm_tag.o tm_symbol.o tm_file_entry.o \ +tm_tagmanager.o + $(AR) rc $@ $^ + $(RANLIB) $@ + +deps.mak: + $(CC) -MM $(CCFLAGS) *.c >deps.mak + +# Generate header dependencies with "make deps.mak" +include deps.mak Property changes on: trunk/tagmanager/makefile.win32 ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Added: trunk/win32-config.h =================================================================== --- trunk/win32-config.h (rev 0) +++ trunk/win32-config.h 2006-07-28 12:29:10 UTC (rev 646) @@ -0,0 +1,322 @@ +/* config.h. Generated by configure. */ +/* config.h.in. Generated from configure.in by autoheader. */ + +/* Define to 1 if the `closedir' function returns void instead of `int'. */ +/* #undef CLOSEDIR_VOID */ + +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +/* #undef CRAY_STACKSEG_END */ + +/* Define to 1 if using `alloca.c'. */ +/* #undef C_ALLOCA */ + +/* always defined to indicate that i18n is enabled */ +#define ENABLE_NLS 1 + +/* Gettext package. */ +#define GETTEXT_PACKAGE "geany" + +/* Define to 1 if you have `alloca', as a function or macro. */ +#define HAVE_ALLOCA 1 + +/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix). + */ +#define HAVE_ALLOCA_H 1 + +/* Define to 1 if you have the `bind_textdomain_codeset' function. */ +#define HAVE_BIND_TEXTDOMAIN_CODESET 1 + +/* Define to 1 if you have the `btowc' function. */ +/* #undef HAVE_BTOWC */ + +/* Define to 1 if you have the `dcgettext' function. */ +#define HAVE_DCGETTEXT 1 + +/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. + */ +/* #undef HAVE_DECL_GETENV */ + +/* Define that you found /dev/random */ +//#define HAVE_DEVRANDOM 1 + +/* Define that you found /dev/urandom */ +//#define HAVE_DEVURANDOM 1 + +/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. + */ +#define HAVE_DIRENT_H 1 + +/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ +/* #undef HAVE_DOPRNT */ + +/* Define to 1 if you have the <fcntl.h> header file. */ +//#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `fgetpos' function. */ +#define HAVE_FGETPOS 1 + +/* Define if you want to detect a running instance */ +//#define HAVE_FIFO 1 + +/* Define to 1 if you have the <fnmatch.h> header file. */ +#define HAVE_FNMATCH_H 1 + +/* Define to 1 if you have the `ftruncate' function. */ +#define HAVE_FTRUNCATE 1 + +/* Define to 1 if you have the `getcwd' function. */ +#define HAVE_GETCWD 1 + +/* Define to 1 if you have the `gethostname' function. */ +//#define HAVE_GETHOSTNAME 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define if the GNU gettext() function is already present or preinstalled. */ +#define HAVE_GETTEXT 1 + +/* Define to 1 if you have the `gettimeofday' function. */ +#define HAVE_GETTIMEOFDAY 1 + +/* Define to 1 if you have the <glob.h> header file. */ +#define HAVE_GLOB_H 1 + +/* Define to 1 if you have the <inttypes.h> header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `isascii' function. */ +#define HAVE_ISASCII 1 + +/* Define if your <locale.h> file defines LC_MESSAGES. */ +#define HAVE_LC_MESSAGES 1 + +/* Define to 1 if you have the <libintl.h> header file. */ +#define HAVE_LIBINTL_H 1 + +/* Define to 1 if you have the <limits.h> header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if you have the <locale.h> header file. */ +#define HAVE_LOCALE_H 1 + +/* Define to 1 if `lstat' has the bug that it succeeds when given the + zero-length file name argument. */ +/* #undef HAVE_LSTAT_EMPTY_STRING_BUG */ + +/* Define to 1 if your system has a GNU libc compatible `malloc' function, and + to 0 otherwise. */ +#define HAVE_MALLOC 1 + +/* Define to 1 if you have the `mblen' function. */ +#define HAVE_MBLEN 1 + +/* Define to 1 if you have the `mbsrtowcs' function. */ +/* #undef HAVE_MBSRTOWCS */ + +/* Define to 1 if <wchar.h> declares mbstate_t. */ +#define HAVE_MBSTATE_T 1 + +/* Define to 1 if you have the <memory.h> header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `mempcpy' function. */ +/* #undef HAVE_MEMPCPY */ + +/* Define to 1 if you have the `memset' function. */ +#define HAVE_MEMSET 1 + +/* Define to 1 if you have a working `mmap' system call. */ +//#define HAVE_MMAP 1 + +/* Define to 1 if you have the `munmap' function. */ +//#define HAVE_MUNMAP 1 + +/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ +/* #undef HAVE_NDIR_H */ + +/* Define to 1 if you have the `putenv' function. */ +#define HAVE_PUTENV 1 + +/* Define to 1 if your system has a GNU libc compatible `realloc' function, + and to 0 otherwise. */ +#define HAVE_REALLOC 1 + +/* Define to 1 if you have the `realpath' function. */ +#define HAVE_REALPATH 1 + +/* Define to 1 if you have the `regcomp' function. */ +#define HAVE_REGCOMP 1 + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if `stat' has the bug that it succeeds when given the + zero-length file name argument. */ +/* #undef HAVE_STAT_EMPTY_STRING_BUG */ + +/* Define to 1 if stdbool.h conforms to C99. */ +#define HAVE_STDBOOL_H 1 + +/* Define to 1 if you have the <stddef.h> header file. */ +#define HAVE_STDDEF_H 1 + +/* Define to 1 if you have the <stdint.h> header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the <stdlib.h> header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strcasecmp' function. */ +#define HAVE_STRCASECMP 1 + +/* Define to 1 if you have the `strchr' function. */ +#define HAVE_STRCHR 1 + +/* Define to 1 if you have the `strdup' function. */ +#define HAVE_STRDUP 1 + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the <strings.h> header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the <string.h> header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strrchr' function. */ +#define HAVE_STRRCHR 1 + +/* Define to 1 if you have the `strspn' function. */ +#define HAVE_STRSPN 1 + +/* Define to 1 if you have the `strstr' function. */ +#define HAVE_STRSTR 1 + +/* Define to 1 if you have the `strtol' function. */ +#define HAVE_STRTOL 1 + +/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. + */ +/* #undef HAVE_SYS_DIR_H */ + +/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. + */ +/* #undef HAVE_SYS_NDIR_H */ + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the <sys/time.h> header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the <sys/types.h> header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */ +#define HAVE_SYS_WAIT_H 1 + +/* Define to 1 if you have the <unistd.h> header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the `vprintf' function. */ +#define HAVE_VPRINTF 1 + +/* Define if you want VTE support */ +//#define HAVE_VTE 1 + +/* Define to 1 if you have the <wchar.h> header file. */ +/* #undef HAVE_WCHAR_H */ + +/* Define to 1 if you have the <wctype.h> header file. */ +/* #undef HAVE_WCTYPE_H */ + +/* Define to 1 if you have the `wmempcpy' function. */ +/* #undef HAVE_WMEMPCPY */ + +/* Define to 1 if the system has the type `_Bool'. */ +#define HAVE__BOOL 1 + +/* Define to 1 if `lstat' dereferences a symlink specified with a trailing + slash. */ +#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 + +/* Name of package */ +#define PACKAGE "geany" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "" + +/* Define as the return type of signal handlers (`int' or `void'). */ +#define RETSIGTYPE void + +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at run-time. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ +/* #undef STACK_DIRECTION */ + +/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */ +/* #undef STAT_MACROS_BROKEN */ + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ +#define TIME_WITH_SYS_TIME 1 + +/* Define to 1 if your <sys/time.h> declares `struct tm'. */ +/* #undef TM_IN_SYS_TIME */ + +/* Version number of package */ +#define VERSION "0.8" + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to rpl_fnmatch if the replacement function should be used. */ +/* #undef fnmatch */ + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif + +/* Define to rpl_malloc if the replacement function should be used. */ +/* #undef malloc */ + +/* Define to a type if <wchar.h> does not define. */ +/* #undef mbstate_t */ + +/* Define to `long' if <sys/types.h> does not define. */ +/* #undef off_t */ + +/* Define to rpl_realloc if the replacement function should be used. */ +/* #undef realloc */ + +/* Define to `unsigned' if <sys/types.h> does not define. */ +/* #undef size_t */ + +/* Define to empty if the keyword `volatile' does not work. Warning: valid + code using `volatile' can become incorrect without. Disable with care. */ +/* #undef volatile */ + +#define REVISION "SVN" Property changes on: trunk/win32-config.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

28 Jul '06

Revision: 645 Author: ntrel Date: 2006-07-28 05:26:36 -0700 (Fri, 28 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=645&view=rev Log Message: ----------- Correct a typo Modified Paths: -------------- trunk/geany_windres.rc.in trunk/src/Makefile.am Modified: trunk/geany_windres.rc.in =================================================================== --- trunk/geany_windres.rc.in 2006-07-28 12:24:16 UTC (rev 644) +++ trunk/geany_windres.rc.in 2006-07-28 12:26:36 UTC (rev 645) @@ -15,7 +15,7 @@ { VALUE "CompanyName", "" VALUE "FileVersion", "@VERSION_STRING@" - VALUE "FileDescription", "Small and lighweight IDE (built using mingw gcc)" + VALUE "FileDescription", "Small and lightweight IDE (built using mingw gcc)" VALUE "InternalName", "geany" VALUE "LegalCopyright", "Copyright 2005-2006 by Enrico Troeger" VALUE "LegalTrademarks", "" Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2006-07-28 12:24:16 UTC (rev 644) +++ trunk/src/Makefile.am 2006-07-28 12:26:36 UTC (rev 645) @@ -51,7 +51,7 @@ $(WINDRES) -i ../geany_windres.rc --input-format=rc -o geany_windres.res -O coff; clean-local: - rm -f windres.res + rm -f geany_windres.res else # build Geany for all other platforms This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [644] trunk/src/sciwrappers.h
by ntrel＠users.sourceforge.net 28 Jul '06

28 Jul '06

Revision: 644 Author: ntrel Date: 2006-07-28 05:24:16 -0700 (Fri, 28 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=644&view=rev Log Message: ----------- Set PLAT_GTK before including ScintillaWidget.h Modified Paths: -------------- trunk/src/sciwrappers.h Modified: trunk/src/sciwrappers.h =================================================================== --- trunk/src/sciwrappers.h 2006-07-27 23:17:31 UTC (rev 643) +++ trunk/src/sciwrappers.h 2006-07-28 12:24:16 UTC (rev 644) @@ -24,6 +24,9 @@ #define GEANY_SCIWRAPPERS_H 1 #include "Scintilla.h" +#ifndef PLAT_GTK +# define PLAT_GTK 1 +#endif #include "ScintillaWidget.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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