Commits June 2006

commits@lists.geany.org

3 participants
126 discussions

SF.net SVN: geany: [451] trunk
by ntrel＠users.sourceforge.net 16 Jun '06

16 Jun '06

Revision: 451 Author: ntrel Date: 2006-06-16 10:11:09 -0700 (Fri, 16 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=451&view=rev Log Message: ----------- Cache the current function name for efficiency in utils_get_current_function, other related fixes Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/templates.c trunk/src/templates.h trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-16 14:28:53 UTC (rev 450) +++ trunk/ChangeLog 2006-06-16 17:11:09 UTC (rev 451) @@ -11,6 +11,9 @@ * src/notebook.c, src/notebook.h, src/main.c, src/Makefile.am: Added currently disabled drag reordering of notebook tabs. * src/callbacks.c: Execute: only save file if the run command uses it. + * src/templates.c, src/templates.h, src/utils.c, src/utils.h, + src/callbacks.c: Cache the current function name for efficiency in + utils_get_current_function, other related fixes. 2006-06-15 Enrico Troeger <enrico.troeger(a)uvena.de> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-06-16 14:28:53 UTC (rev 450) +++ trunk/src/callbacks.c 2006-06-16 17:11:09 UTC (rev 451) @@ -2008,7 +2008,7 @@ { gint idx = document_get_cur_idx(); gchar *text; - gchar *cur_tag = NULL; + const gchar *cur_tag = NULL; gint line = -1, pos = 0; if (doc_list[idx].file_type == NULL) @@ -2017,14 +2017,10 @@ return; } - if (doc_list[idx].file_type->id != GEANY_FILETYPES_JAVA && - doc_list[idx].file_type->id != GEANY_FILETYPES_ALL) - { - line = utils_get_current_tag(idx, &cur_tag); - // utils_get_current_tag returns -1 on failure, so sci_get_position_from_line - // returns the current position, so it should be safe - pos = sci_get_position_from_line(doc_list[idx].sci, line - 1); - } + // utils_get_current_function returns -1 on failure, so sci_get_position_from_line + // returns the current position, so it should be safe + line = utils_get_current_function(idx, &cur_tag); + pos = sci_get_position_from_line(doc_list[idx].sci, line - 1); switch (doc_list[idx].file_type->id) { @@ -2049,7 +2045,6 @@ } sci_insert_text(doc_list[idx].sci, pos, text); - g_free(cur_tag); g_free(text); } Modified: trunk/src/templates.c =================================================================== --- trunk/src/templates.c 2006-06-16 14:28:53 UTC (rev 450) +++ trunk/src/templates.c 2006-06-16 17:11:09 UTC (rev 451) @@ -229,7 +229,7 @@ } -gchar *templates_get_template_function(gint template, gchar *func_name) +gchar *templates_get_template_function(gint template, const gchar *func_name) { gchar *result = g_strdup(templates[template]); gchar *date = utils_get_date(); Modified: trunk/src/templates.h =================================================================== --- trunk/src/templates.h 2006-06-16 14:28:53 UTC (rev 450) +++ trunk/src/templates.h 2006-06-16 17:11:09 UTC (rev 451) @@ -32,7 +32,7 @@ gchar *templates_get_template_generic(gint template); -gchar *templates_get_template_function(gint template, gchar *func_name); +gchar *templates_get_template_function(gint template, const gchar *func_name); gchar *templates_get_template_gpl(gint template); Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-06-16 14:28:53 UTC (rev 450) +++ trunk/src/utils.c 2006-06-16 17:11:09 UTC (rev 451) @@ -94,23 +94,14 @@ { // currently text need in German and C locale about 150 chars gchar *text = (gchar*) g_malloc0(250); - gchar *cur_tag; + const gchar *cur_tag; guint line, col; if (idx == -1) idx = document_get_cur_idx(); if (idx >= 0 && doc_list[idx].is_valid) { - if (doc_list[idx].file_type == NULL || - doc_list[idx].file_type->id == GEANY_FILETYPES_JAVA || - doc_list[idx].file_type->id == GEANY_FILETYPES_ALL) - { - cur_tag = g_strdup(_("unknown")); - } - else - { - utils_get_current_tag(idx, &cur_tag); - } + utils_get_current_function(idx, &cur_tag); if (pos == -1) pos = sci_get_current_position(doc_list[idx].sci); line = sci_get_line_from_position(doc_list[idx].sci, pos); @@ -129,7 +120,6 @@ (doc_list[idx].file_type) ? doc_list[idx].file_type->title : _("unknown")); gtk_statusbar_pop(GTK_STATUSBAR(app->statusbar), 1); gtk_statusbar_push(GTK_STATUSBAR(app->statusbar), 1, text); - g_free(cur_tag); } else { @@ -966,69 +956,92 @@ } -gint utils_get_current_tag(gint idx, gchar **tagname) +gint utils_get_current_function(gint idx, const gchar **tagname) { - gint tag_line; - gint pos; + static gint tag_line = -1; gint line; + static gint old_line = -1; + static gint old_idx = -1; + static gchar *cur_tag = NULL; gint fold_level; gint start, end, last_pos; gint tmp; const GList *tags; - pos = sci_get_current_position(doc_list[idx].sci); - line = sci_get_line_from_position(doc_list[idx].sci, pos); + line = sci_get_current_line(doc_list[idx].sci, -1); + // check if the cached line and file index have changed since last time: + if (line == old_line && idx == old_idx) + { + // we can assume same current function as before + *tagname = cur_tag; + return tag_line; + } + g_free(cur_tag); // free the old tag, it will be replaced. + //record current line and file index for next time + old_line = line; + old_idx = idx; - fold_level = sci_get_fold_level(doc_list[idx].sci, line); - if ((fold_level & 0xFF) != 0) + // look first in the tag list + tags = utils_get_tag_list(idx, tm_tag_max_t); + for (; tags; tags = g_list_next(tags)) { - while((fold_level & SC_FOLDLEVELNUMBERMASK) != SC_FOLDLEVELBASE && line >= 0) + tag_line = ((GeanySymbol*)tags->data)->line; + if (line + 1 == tag_line) { - fold_level = sci_get_fold_level(doc_list[idx].sci, --line); + cur_tag = g_strdup(strtok(((GeanySymbol*)tags->data)->str, " ")); + *tagname = cur_tag; + return tag_line; } + } - // look first in the tag list - tags = utils_get_tag_list(idx, tm_tag_max_t); - for (; tags; tags = g_list_next(tags)) + if (doc_list[idx].file_type != NULL && + doc_list[idx].file_type->id != GEANY_FILETYPES_JAVA && + doc_list[idx].file_type->id != GEANY_FILETYPES_ALL) + { + fold_level = sci_get_fold_level(doc_list[idx].sci, line); + + if ((fold_level & 0xFF) != 0) { - tag_line = ((GeanySymbol*)tags->data)->line; - if (line == tag_line) + tag_line = line; + while((fold_level & SC_FOLDLEVELNUMBERMASK) != SC_FOLDLEVELBASE && tag_line >= 0) { - *tagname = g_strdup(strtok(((GeanySymbol*)tags->data)->str, " ")); - return tag_line; + fold_level = sci_get_fold_level(doc_list[idx].sci, --tag_line); } - } - start = sci_get_position_from_line(doc_list[idx].sci, line - 2); - last_pos = sci_get_length(doc_list[idx].sci); - tmp = 0; - while (sci_get_style_at(doc_list[idx].sci, start) != SCE_C_IDENTIFIER - && sci_get_style_at(doc_list[idx].sci, start) != SCE_C_GLOBALCLASS - && start < last_pos) start++; - end = start; - // Use tmp to find SCE_C_IDENTIFIER or SCE_C_GLOBALCLASS chars - // this fails on C++ code like 'Vek3 Vek3::mul(double s)' this code returns - // "Vek3" because the return type of the prototype is also a GLOBALCLASS, - // no idea how to fix at the moment - // fails also in C with code like - // typedef void viod; - // viod do_nothing() {} -> return viod instead of do_nothing - // perhaps: get the first colon, read forward the second colon and then method - // name, then go from the first colon backwards and read class name until space - while (((tmp = sci_get_style_at(doc_list[idx].sci, end)) == SCE_C_IDENTIFIER - || tmp == SCE_C_GLOBALCLASS - || sci_get_char_at(doc_list[idx].sci, end) == '~' - || sci_get_char_at(doc_list[idx].sci, end) == ':') - && end < last_pos) end++; + start = sci_get_position_from_line(doc_list[idx].sci, tag_line - 2); + last_pos = sci_get_length(doc_list[idx].sci); + tmp = 0; + while (sci_get_style_at(doc_list[idx].sci, start) != SCE_C_IDENTIFIER + && sci_get_style_at(doc_list[idx].sci, start) != SCE_C_GLOBALCLASS + && start < last_pos) start++; + end = start; + // Use tmp to find SCE_C_IDENTIFIER or SCE_C_GLOBALCLASS chars + // this fails on C++ code like 'Vek3 Vek3::mul(double s)' this code returns + // "Vek3" because the return type of the prototype is also a GLOBALCLASS, + // no idea how to fix at the moment + // fails also in C with code like + // typedef void viod; + // viod do_nothing() {} -> return viod instead of do_nothing + // perhaps: get the first colon, read forward the second colon and then method + // name, then go from the first colon backwards and read class name until space + while (((tmp = sci_get_style_at(doc_list[idx].sci, end)) == SCE_C_IDENTIFIER + || tmp == SCE_C_GLOBALCLASS + || sci_get_char_at(doc_list[idx].sci, end) == '~' + || sci_get_char_at(doc_list[idx].sci, end) == ':') + && end < last_pos) end++; - *tagname = g_malloc(end - start + 1); - sci_get_text_range(doc_list[idx].sci, start, end, *tagname); + cur_tag = g_malloc(end - start + 1); + sci_get_text_range(doc_list[idx].sci, start, end, cur_tag); + *tagname = cur_tag; - return line; + return tag_line; + } } - *tagname = g_strdup(_("unknown")); - return -1; + cur_tag = g_strdup(_("unknown")); + *tagname = cur_tag; + tag_line = -1; + return tag_line; } Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2006-06-16 14:28:53 UTC (rev 450) +++ trunk/src/utils.h 2006-06-16 17:11:09 UTC (rev 451) @@ -99,7 +99,7 @@ void utils_check_disk_status(gint idx); //gchar *utils_get_current_tag(gint idx, gint direction); -gint utils_get_current_tag(gint idx, gchar **tagname); +gint utils_get_current_function(gint idx, const gchar **tagname); void utils_find_current_word(ScintillaObject *sci, gint pos, gchar *word, size_t wordlen); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [450] trunk
by eht16＠users.sourceforge.net 16 Jun '06

16 Jun '06

Revision: 450 Author: eht16 Date: 2006-06-16 07:28:53 -0700 (Fri, 16 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=450&view=rev Log Message: ----------- build.c: Delete all indicators when starting a new compilation. highlighting.c: Added keys for linenumber and folding margin, added key for inverting all colours(if you like dark background). Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.common trunk/src/build.c trunk/src/highlighting.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-16 13:15:28 UTC (rev 449) +++ trunk/ChangeLog 2006-06-16 14:28:53 UTC (rev 450) @@ -1,3 +1,11 @@ +2006-06-16 Enrico Troeger <enrico.troeger(a)uvena.de> + + * src/build.c: Delete all indicators when starting a new compilation. + * src/highlighting.c, data/filetypes.common: + Added keys for linenumber and folding margin, added key for + inverting all colours(if you like dark background). + + 2006-06-16 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/notebook.c, src/notebook.h, src/main.c, src/Makefile.am: Modified: trunk/data/filetypes.common =================================================================== --- trunk/data/filetypes.common 2006-06-16 13:15:28 UTC (rev 449) +++ trunk/data/filetypes.common 2006-06-16 14:28:53 UTC (rev 450) @@ -6,9 +6,14 @@ selection=0xc0c0c0;0x00007F;false;false brace_good=0xff0000;0xFFFFFF;true;false brace_bad=0x0000ff;0xFFFFFF;true;false +# the following settings define the colours of the margins on the left side +margin_linenumber=0x000000;0xd0d0d0;false;false +margin_folding=0x000000;0xdfdfdf;false;false # background colour of the current line, only the second argument is interpreted current_line=0x0;0xE5E5E5;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 folding_style=1;1;false;false +# only first argument is interpreted, sets whether all defined colours should be inverted +invert_all=0;0;false;false Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2006-06-16 13:15:28 UTC (rev 449) +++ trunk/src/build.c 2006-06-16 14:28:53 UTC (rev 450) @@ -239,6 +239,8 @@ gint stderr_fd; app->cur_idx = idx; + document_clear_indicators(idx); + cmd_string = g_strjoinv(" ", cmd); g_strfreev(cmd); Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2006-06-16 13:15:28 UTC (rev 449) +++ trunk/src/highlighting.c 2006-06-16 14:28:53 UTC (rev 450) @@ -31,7 +31,6 @@ static gboolean global_c_tags_loaded = FALSE; - /* simple wrapper function to print file errors in DEBUG mode */ static void styleset_load_file(GKeyFile *key_file, const gchar *file, GKeyFileFlags flags, GError **just_for_compatibility) @@ -141,11 +140,25 @@ g_strfreev(list); } +static guint invert(guint icolour) +{ + if (types[GEANY_FILETYPES_ALL]->styling[8][0]) + { + guint r, g, b; + r = 0xffffff - icolour; + g = 0xffffff - (icolour >> 8); + b = 0xffffff - (icolour >> 16); + return (r | (g << 8) | (b << 16)); + } + return icolour; +} + + static void styleset_set_style(ScintillaObject *sci, gint style, gint filetype, gint styling_index) { - SSM(sci, SCI_STYLESETFORE, style, types[filetype]->styling[styling_index][0]); - SSM(sci, SCI_STYLESETBACK, style, types[filetype]->styling[styling_index][1]); + SSM(sci, SCI_STYLESETFORE, style, invert(types[filetype]->styling[styling_index][0])); + SSM(sci, SCI_STYLESETBACK, style, invert(types[filetype]->styling[styling_index][1])); SSM(sci, SCI_STYLESETBOLD, style, types[filetype]->styling[styling_index][2]); SSM(sci, SCI_STYLESETITALIC, style, types[filetype]->styling[styling_index][3]); } @@ -181,8 +194,11 @@ styleset_get_hex(config, config_home, "styling", "selection", "0xc0c0c0", "0x00007f", "false", types[GEANY_FILETYPES_ALL]->styling[1]); styleset_get_hex(config, config_home, "styling", "brace_good", "0xff0000", "0xffffff", "false", types[GEANY_FILETYPES_ALL]->styling[2]); styleset_get_hex(config, config_home, "styling", "brace_bad", "0x0000ff", "0xffffff", "false", types[GEANY_FILETYPES_ALL]->styling[3]); - styleset_get_hex(config, config_home, "styling", "current_line", "0x000000", "0xE5E5E5", "false", types[GEANY_FILETYPES_ALL]->styling[4]); - styleset_get_int(config, config_home, "styling", "folding_style", 1, 1, types[GEANY_FILETYPES_ALL]->styling[5]); + 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", "false", 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]); types[GEANY_FILETYPES_ALL]->keywords = NULL; styleset_get_wordchars(config, config_home, GEANY_FILETYPES_ALL, GEANY_WORDCHARS); @@ -198,9 +214,9 @@ { if (types[GEANY_FILETYPES_ALL] == NULL) styleset_common_init(); - SSM(sci, SCI_STYLESETFORE, STYLE_DEFAULT, types[GEANY_FILETYPES_ALL]->styling[0][0]); - SSM(sci, SCI_STYLESETBACK, STYLE_DEFAULT, types[GEANY_FILETYPES_ALL]->styling[0][1]); - SSM(sci, SCI_STYLESETBOLD, STYLE_DEFAULT, types[GEANY_FILETYPES_ALL]->styling[0][2]); + SSM(sci, SCI_STYLESETFORE, STYLE_DEFAULT, invert(types[GEANY_FILETYPES_ALL]->styling[0][0])); + SSM(sci, SCI_STYLESETBACK, STYLE_DEFAULT, invert(types[GEANY_FILETYPES_ALL]->styling[0][1])); + SSM(sci, SCI_STYLESETBOLD, STYLE_DEFAULT, invert(types[GEANY_FILETYPES_ALL]->styling[0][2])); SSM(sci, SCI_STYLECLEARALL, 0, 0); @@ -208,28 +224,25 @@ SSM(sci, SCI_SETTABWIDTH, app->pref_editor_tab_width, 0); // colourize the current line - SSM(sci, SCI_SETCARETLINEBACK, types[GEANY_FILETYPES_ALL]->styling[4][1], 0); + SSM(sci, SCI_SETCARETLINEBACK, invert(types[GEANY_FILETYPES_ALL]->styling[6][1]), 0); SSM(sci, SCI_SETCARETLINEVISIBLE, 1, 0); // indicator settings SSM(sci, SCI_INDICSETSTYLE, 2, INDIC_SQUIGGLE); // why? if I let this out, the indicator remains green with PHP - SSM(sci, SCI_INDICSETFORE, 0, 0x0000ff); - SSM(sci, SCI_INDICSETFORE, 2, 0x0000ff); + SSM(sci, SCI_INDICSETFORE, 0, invert(0x0000ff)); + SSM(sci, SCI_INDICSETFORE, 2, invert(0x0000ff)); - // a darker grey for the line number margin - SSM(sci, SCI_STYLESETBACK, STYLE_LINENUMBER, 0xD0D0D0); - // define marker symbols // 0 -> line marker SSM(sci, SCI_MARKERDEFINE, 0, SC_MARK_SHORTARROW); - SSM(sci, SCI_MARKERSETFORE, 0, 0x00007f); - SSM(sci, SCI_MARKERSETBACK, 0, 0x00ffff); + SSM(sci, SCI_MARKERSETFORE, 0, invert(0x00007f)); + SSM(sci, SCI_MARKERSETBACK, 0, invert(0x00ffff)); // 1 -> user marker SSM(sci, SCI_MARKERDEFINE, 1, SC_MARK_PLUS); - SSM(sci, SCI_MARKERSETFORE, 1, 0x000000); - SSM(sci, SCI_MARKERSETBACK, 1, 0xB8F4B8); + SSM(sci, SCI_MARKERSETFORE, 1, invert(0x000000)); + SSM(sci, SCI_MARKERSETBACK, 1, invert(0xB8F4B8)); // 2 -> folding marker, other folding settings SSM(sci, SCI_SETMARGINTYPEN, 2, SC_MARGIN_SYMBOL); @@ -237,7 +250,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[5][0]) + switch (types[GEANY_FILETYPES_ALL]->styling[7][0]) { case 2: { @@ -258,7 +271,7 @@ } // choose the folding style - straight or curved, I prefer straight, so it is default ;-) - switch (types[GEANY_FILETYPES_ALL]->styling[5][1]) + switch (types[GEANY_FILETYPES_ALL]->styling[7][1]) { case 2: { @@ -274,22 +287,22 @@ } } - SSM (sci,SCI_MARKERDEFINE, SC_MARKNUM_FOLDERSUB, SC_MARK_VLINE); + SSM(sci,SCI_MARKERDEFINE, SC_MARKNUM_FOLDERSUB, SC_MARK_VLINE); - SSM (sci,SCI_MARKERSETFORE, SC_MARKNUM_FOLDEROPEN, 0xffffff); - SSM (sci,SCI_MARKERSETBACK, SC_MARKNUM_FOLDEROPEN, 0x000000); - SSM (sci,SCI_MARKERSETFORE, SC_MARKNUM_FOLDER, 0xffffff); - SSM (sci,SCI_MARKERSETBACK, SC_MARKNUM_FOLDER, 0x000000); - SSM (sci,SCI_MARKERSETFORE, SC_MARKNUM_FOLDERSUB, 0xffffff); - SSM (sci,SCI_MARKERSETBACK, SC_MARKNUM_FOLDERSUB, 0x000000); - SSM (sci,SCI_MARKERSETFORE, SC_MARKNUM_FOLDERTAIL, 0xffffff); - SSM (sci,SCI_MARKERSETBACK, SC_MARKNUM_FOLDERTAIL, 0x000000); - SSM (sci,SCI_MARKERSETFORE, SC_MARKNUM_FOLDEREND, 0xffffff); - SSM (sci,SCI_MARKERSETBACK, SC_MARKNUM_FOLDEREND, 0x000000); - SSM (sci,SCI_MARKERSETFORE, SC_MARKNUM_FOLDEROPENMID, 0xffffff); - SSM (sci,SCI_MARKERSETBACK, SC_MARKNUM_FOLDEROPENMID, 0x000000); - SSM (sci,SCI_MARKERSETFORE, SC_MARKNUM_FOLDERMIDTAIL, 0xffffff); - SSM (sci,SCI_MARKERSETBACK, SC_MARKNUM_FOLDERMIDTAIL, 0x000000); + SSM(sci,SCI_MARKERSETFORE, SC_MARKNUM_FOLDEROPEN, 0xffffff); + SSM(sci,SCI_MARKERSETBACK, SC_MARKNUM_FOLDEROPEN, 0x000000); + SSM(sci,SCI_MARKERSETFORE, SC_MARKNUM_FOLDER, 0xffffff); + SSM(sci,SCI_MARKERSETBACK, SC_MARKNUM_FOLDER, 0x000000); + SSM(sci,SCI_MARKERSETFORE, SC_MARKNUM_FOLDERSUB, 0xffffff); + SSM(sci,SCI_MARKERSETBACK, SC_MARKNUM_FOLDERSUB, 0x000000); + SSM(sci,SCI_MARKERSETFORE, SC_MARKNUM_FOLDERTAIL, 0xffffff); + SSM(sci,SCI_MARKERSETBACK, SC_MARKNUM_FOLDERTAIL, 0x000000); + SSM(sci,SCI_MARKERSETFORE, SC_MARKNUM_FOLDEREND, 0xffffff); + SSM(sci,SCI_MARKERSETBACK, SC_MARKNUM_FOLDEREND, 0x000000); + SSM(sci,SCI_MARKERSETFORE, SC_MARKNUM_FOLDEROPENMID, 0xffffff); + SSM(sci,SCI_MARKERSETBACK, SC_MARKNUM_FOLDEROPENMID, 0x000000); + SSM(sci,SCI_MARKERSETFORE, SC_MARKNUM_FOLDERMIDTAIL, 0xffffff); + SSM(sci,SCI_MARKERSETBACK, SC_MARKNUM_FOLDERMIDTAIL, 0x000000); SSM(sci, SCI_SETPROPERTY, (sptr_t) "fold", (sptr_t) "1"); SSM(sci, SCI_SETPROPERTY, (sptr_t) "fold.compact", (sptr_t) "1"); @@ -298,11 +311,15 @@ SSM(sci, SCI_SETPROPERTY, (sptr_t) "fold.at.else", (sptr_t) "1"); - SSM(sci, SCI_SETSELFORE, 1, types[GEANY_FILETYPES_ALL]->styling[1][0]); - SSM(sci, SCI_SETSELBACK, 1, types[GEANY_FILETYPES_ALL]->styling[1][1]); + SSM(sci, SCI_SETSELFORE, 1, invert(types[GEANY_FILETYPES_ALL]->styling[1][0])); + SSM(sci, SCI_SETSELBACK, 1, invert(types[GEANY_FILETYPES_ALL]->styling[1][1])); SSM (sci, SCI_SETSTYLEBITS, style_bits, 0); + + SSM(sci, SCI_SETFOLDMARGINCOLOUR, 1, invert(types[GEANY_FILETYPES_ALL]->styling[5][1])); + //SSM(sci, SCI_SETFOLDMARGINHICOLOUR, 1, invert(types[GEANY_FILETYPES_ALL]->styling[5][1])); + styleset_set_style(sci, STYLE_LINENUMBER, GEANY_FILETYPES_ALL, 4); styleset_set_style(sci, STYLE_BRACELIGHT, GEANY_FILETYPES_ALL, 2); styleset_set_style(sci, STYLE_BRACEBAD, GEANY_FILETYPES_ALL, 2); } @@ -420,14 +437,14 @@ styleset_set_style(sci, SCE_C_COMMENTLINEDOC, GEANY_FILETYPES_C, 16); styleset_set_style(sci, SCE_C_COMMENTDOCKEYWORD, GEANY_FILETYPES_C, 17); - SSM(sci, SCI_STYLESETFORE, SCE_C_COMMENTDOCKEYWORDERROR, 0x0000ff); - SSM(sci, SCI_STYLESETBACK, SCE_C_COMMENTDOCKEYWORDERROR, 0xFFFFFF); + SSM(sci, SCI_STYLESETFORE, SCE_C_COMMENTDOCKEYWORDERROR, invert(0x0000ff)); + SSM(sci, SCI_STYLESETBACK, SCE_C_COMMENTDOCKEYWORDERROR, invert(0xFFFFFF)); SSM(sci, SCI_STYLESETITALIC, SCE_C_COMMENTDOCKEYWORDERROR, TRUE); // is used for local structs and typedefs styleset_set_style(sci, SCE_C_GLOBALCLASS, GEANY_FILETYPES_C, 18); - SSM(sci, SCI_SETWHITESPACEFORE, 1, 0xc0c0c0); + SSM(sci, SCI_SETWHITESPACEFORE, 1, invert(0xc0c0c0)); if (types[GEANY_FILETYPES_C]->styling[19][0] == 1) SSM(sci, SCI_SETPROPERTY, (sptr_t) "styling.within.preprocessor", (sptr_t) "1"); @@ -548,14 +565,14 @@ styleset_set_style(sci, SCE_C_COMMENTLINEDOC, GEANY_FILETYPES_CPP, 16); styleset_set_style(sci, SCE_C_COMMENTDOCKEYWORD, GEANY_FILETYPES_CPP, 17); - SSM(sci, SCI_STYLESETFORE, SCE_C_COMMENTDOCKEYWORDERROR, 0x0000ff); - SSM(sci, SCI_STYLESETBACK, SCE_C_COMMENTDOCKEYWORDERROR, 0xFFFFFF); + SSM(sci, SCI_STYLESETFORE, SCE_C_COMMENTDOCKEYWORDERROR, invert(0x0000ff)); + SSM(sci, SCI_STYLESETBACK, SCE_C_COMMENTDOCKEYWORDERROR, invert(0xffffff)); SSM(sci, SCI_STYLESETITALIC, SCE_C_COMMENTDOCKEYWORDERROR, TRUE); // is used for local structs and typedefs styleset_set_style(sci, SCE_C_GLOBALCLASS, GEANY_FILETYPES_CPP, 18); - SSM(sci, SCI_SETWHITESPACEFORE, 1, 0xc0c0c0); + SSM(sci, SCI_SETWHITESPACEFORE, 1, invert(0xc0c0c0)); if (types[GEANY_FILETYPES_CPP]->styling[19][0] == 1) SSM(sci, SCI_SETPROPERTY, (sptr_t) "styling.within.preprocessor", (sptr_t) "1"); @@ -630,7 +647,7 @@ styleset_set_style(sci, SCE_C_COMMENTLINE, GEANY_FILETYPES_PASCAL, 10); styleset_set_style(sci, SCE_C_COMMENTDOC, GEANY_FILETYPES_PASCAL, 11); - SSM(sci, SCI_SETWHITESPACEFORE, 1, 0xc0c0c0); + SSM(sci, SCI_SETWHITESPACEFORE, 1, invert(0xc0c0c0)); //SSM(sci, SCI_SETPROPERTY, (sptr_t) "styling.within.preprocessor", (sptr_t) "1"); @@ -872,10 +889,10 @@ SSM(sci, SCI_SETKEYWORDS, 4, (sptr_t) types[GEANY_FILETYPES_XML]->keywords[4]); SSM(sci, SCI_SETKEYWORDS, 5, (sptr_t) types[GEANY_FILETYPES_XML]->keywords[5]); - SSM(sci, SCI_SETWHITESPACEFORE, 1, 0xc0c0c0); + SSM(sci, SCI_SETWHITESPACEFORE, 1, invert(0xc0c0c0)); // hotspotting, nice thing - SSM(sci, SCI_SETHOTSPOTACTIVEFORE, 1, 0xff0000); + SSM(sci, SCI_SETHOTSPOTACTIVEFORE, 1, invert(0xff0000)); SSM(sci, SCI_SETHOTSPOTACTIVEUNDERLINE, 1, 0); SSM(sci, SCI_SETHOTSPOTSINGLELINE, 1, 0); SSM(sci, SCI_STYLESETHOTSPOT, SCE_H_QUESTION, 1); @@ -917,24 +934,24 @@ styleset_set_style(sci, SCE_H_SGML_1ST_PARAM_COMMENT, GEANY_FILETYPES_XML, 30); styleset_set_style(sci, SCE_H_SGML_ERROR, GEANY_FILETYPES_XML, 31); - SSM(sci, SCI_STYLESETFORE, SCE_HB_DEFAULT, 0x000000); - SSM(sci, SCI_STYLESETBACK, SCE_HB_DEFAULT, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HB_DEFAULT, invert(0x000000)); + SSM(sci, SCI_STYLESETBACK, SCE_HB_DEFAULT, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HB_COMMENTLINE, 0x808080); - SSM(sci, SCI_STYLESETBACK, SCE_HB_COMMENTLINE, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HB_COMMENTLINE, invert(0x808080)); + SSM(sci, SCI_STYLESETBACK, SCE_HB_COMMENTLINE, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HB_NUMBER, 0x008080); - SSM(sci, SCI_STYLESETBACK, SCE_HB_NUMBER, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HB_NUMBER, invert(0x008080)); + SSM(sci, SCI_STYLESETBACK, SCE_HB_NUMBER, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HB_WORD, 0x008080); - SSM(sci, SCI_STYLESETBACK, SCE_HB_WORD, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HB_WORD, invert(0x008080)); + SSM(sci, SCI_STYLESETBACK, SCE_HB_WORD, invert(0xffffff)); SSM(sci, SCI_STYLESETBOLD, SCE_HB_WORD, 1); - SSM(sci, SCI_STYLESETFORE, SCE_HB_STRING, 0x008000); - SSM(sci, SCI_STYLESETBACK, SCE_HB_STRING, 0x008000); + SSM(sci, SCI_STYLESETFORE, SCE_HB_STRING, invert(0x008000)); + SSM(sci, SCI_STYLESETBACK, SCE_HB_STRING, invert(0x008000)); - SSM(sci, SCI_STYLESETFORE, SCE_HB_IDENTIFIER, 0x103000); - SSM(sci, SCI_STYLESETBACK, SCE_HB_IDENTIFIER, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HB_IDENTIFIER, invert(0x103000)); + SSM(sci, SCI_STYLESETBACK, SCE_HB_IDENTIFIER, invert(0xffffff)); //~ #define SCE_HB_START 70 // Show the whole section of VBScript @@ -944,26 +961,26 @@ SSM(sci, SCI_STYLESETEOLFILLED, bstyle, 1); } */ - SSM(sci,SCI_STYLESETBACK, SCE_HB_STRINGEOL, 0x7F7FFF); + SSM(sci,SCI_STYLESETBACK, SCE_HB_STRINGEOL, invert(0x7F7FFF)); - SSM(sci, SCI_STYLESETFORE, SCE_HBA_DEFAULT, 0x000000); - SSM(sci, SCI_STYLESETBACK, SCE_HBA_DEFAULT, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HBA_DEFAULT, invert(0x000000)); + SSM(sci, SCI_STYLESETBACK, SCE_HBA_DEFAULT, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HBA_COMMENTLINE, 0x808080); - SSM(sci, SCI_STYLESETBACK, SCE_HBA_COMMENTLINE, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HBA_COMMENTLINE, invert(0x808080)); + SSM(sci, SCI_STYLESETBACK, SCE_HBA_COMMENTLINE, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HBA_NUMBER, 0x008080); - SSM(sci, SCI_STYLESETBACK, SCE_HBA_NUMBER, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HBA_NUMBER, invert(0x008080)); + SSM(sci, SCI_STYLESETBACK, SCE_HBA_NUMBER, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HBA_WORD, 0x008080); - SSM(sci, SCI_STYLESETBACK, SCE_HBA_WORD, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HBA_WORD, invert(0x008080)); + SSM(sci, SCI_STYLESETBACK, SCE_HBA_WORD, invert(0xffffff)); SSM(sci, SCI_STYLESETBOLD, SCE_HBA_WORD, 1); - SSM(sci, SCI_STYLESETFORE, SCE_HBA_STRING, 0x008000); - SSM(sci, SCI_STYLESETBACK, SCE_HBA_STRING, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HBA_STRING, invert(0x008000)); + SSM(sci, SCI_STYLESETBACK, SCE_HBA_STRING, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HBA_IDENTIFIER, 0x103000); - SSM(sci, SCI_STYLESETBACK, SCE_HBA_IDENTIFIER, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HBA_IDENTIFIER, invert(0x103000)); + SSM(sci, SCI_STYLESETBACK, SCE_HBA_IDENTIFIER, invert(0xffffff)); styleset_set_style(sci, SCE_HJ_START, GEANY_FILETYPES_XML, 43); styleset_set_style(sci, SCE_HJ_DEFAULT, GEANY_FILETYPES_XML, 44); @@ -979,90 +996,90 @@ styleset_set_style(sci, SCE_HJ_STRINGEOL, GEANY_FILETYPES_XML, 54); - SSM(sci, SCI_STYLESETFORE, SCE_HP_START, 0x808000); - SSM(sci, SCI_STYLESETBACK, SCE_HP_START, 0xf0f0f0); + SSM(sci, SCI_STYLESETFORE, SCE_HP_START, invert(0x808000)); + SSM(sci, SCI_STYLESETBACK, SCE_HP_START, invert(0xf0f0f0)); SSM(sci, SCI_STYLESETEOLFILLED, SCE_HP_START, 1); - SSM(sci, SCI_STYLESETFORE, SCE_HP_DEFAULT, 0x000000); - SSM(sci, SCI_STYLESETBACK, SCE_HP_DEFAULT, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HP_DEFAULT, invert(0x000000)); + SSM(sci, SCI_STYLESETBACK, SCE_HP_DEFAULT, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HP_COMMENTLINE, 0x808080); - SSM(sci, SCI_STYLESETBACK, SCE_HP_COMMENTLINE, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HP_COMMENTLINE, invert(0x808080)); + SSM(sci, SCI_STYLESETBACK, SCE_HP_COMMENTLINE, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HP_NUMBER, 0x008080); - SSM(sci, SCI_STYLESETBACK, SCE_HP_NUMBER, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HP_NUMBER, invert(0x008080)); + SSM(sci, SCI_STYLESETBACK, SCE_HP_NUMBER, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HP_WORD, 0x990000); - SSM(sci, SCI_STYLESETBACK, SCE_HP_WORD, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HP_WORD, invert(0x990000)); + SSM(sci, SCI_STYLESETBACK, SCE_HP_WORD, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HP_STRING, 0x008000); - SSM(sci, SCI_STYLESETBACK, SCE_HP_STRING, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HP_STRING, invert(0x008000)); + SSM(sci, SCI_STYLESETBACK, SCE_HP_STRING, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HP_CHARACTER, 0x006060); - SSM(sci, SCI_STYLESETBACK, SCE_HP_CHARACTER, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HP_CHARACTER, invert(0x006060)); + SSM(sci, SCI_STYLESETBACK, SCE_HP_CHARACTER, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HP_TRIPLE, 0x002060); - SSM(sci, SCI_STYLESETBACK, SCE_HP_TRIPLE, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HP_TRIPLE, invert(0x002060)); + SSM(sci, SCI_STYLESETBACK, SCE_HP_TRIPLE, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HP_TRIPLEDOUBLE, 0x002060); - SSM(sci, SCI_STYLESETBACK, SCE_HP_TRIPLEDOUBLE, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HP_TRIPLEDOUBLE, invert(0x002060)); + SSM(sci, SCI_STYLESETBACK, SCE_HP_TRIPLEDOUBLE, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HP_CLASSNAME, 0x202010); - SSM(sci, SCI_STYLESETBACK, SCE_HP_CLASSNAME, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HP_CLASSNAME, invert(0x202010)); + SSM(sci, SCI_STYLESETBACK, SCE_HP_CLASSNAME, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HP_CLASSNAME, 0x102020); - SSM(sci, SCI_STYLESETBACK, SCE_HP_CLASSNAME, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HP_CLASSNAME, invert(0x102020)); + SSM(sci, SCI_STYLESETBACK, SCE_HP_CLASSNAME, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HP_OPERATOR, 0x602020); - SSM(sci, SCI_STYLESETBACK, SCE_HP_OPERATOR, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HP_OPERATOR, invert(0x602020)); + SSM(sci, SCI_STYLESETBACK, SCE_HP_OPERATOR, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HP_IDENTIFIER, 0x001060); - SSM(sci, SCI_STYLESETBACK, SCE_HP_IDENTIFIER, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HP_IDENTIFIER, invert(0x001060)); + SSM(sci, SCI_STYLESETBACK, SCE_HP_IDENTIFIER, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HPA_START, 0x808000); - SSM(sci, SCI_STYLESETBACK, SCE_HPA_START, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HPA_START, invert(0x808000)); + SSM(sci, SCI_STYLESETBACK, SCE_HPA_START, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HPA_DEFAULT, 0x000000); - SSM(sci, SCI_STYLESETBACK, SCE_HPA_DEFAULT, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HPA_DEFAULT, invert(0x000000)); + SSM(sci, SCI_STYLESETBACK, SCE_HPA_DEFAULT, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HPA_COMMENTLINE, 0x808080); - SSM(sci, SCI_STYLESETBACK, SCE_HPA_COMMENTLINE, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HPA_COMMENTLINE, invert(0x808080)); + SSM(sci, SCI_STYLESETBACK, SCE_HPA_COMMENTLINE, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HPA_NUMBER, 0x408000); - SSM(sci, SCI_STYLESETBACK, SCE_HPA_NUMBER, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HPA_NUMBER, invert(0x408000)); + SSM(sci, SCI_STYLESETBACK, SCE_HPA_NUMBER, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HPA_STRING, 0x008080); - SSM(sci, SCI_STYLESETBACK, SCE_HPA_STRING, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HPA_STRING, invert(0x008080)); + SSM(sci, SCI_STYLESETBACK, SCE_HPA_STRING, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HPA_CHARACTER, 0x505080); - SSM(sci, SCI_STYLESETBACK, SCE_HPA_CHARACTER, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HPA_CHARACTER, invert(0x505080)); + SSM(sci, SCI_STYLESETBACK, SCE_HPA_CHARACTER, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HPA_WORD, 0x990000); - SSM(sci, SCI_STYLESETBACK, SCE_HPA_WORD, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HPA_WORD, invert(0x990000)); + SSM(sci, SCI_STYLESETBACK, SCE_HPA_WORD, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HPA_TRIPLE, 0x002060); - SSM(sci, SCI_STYLESETBACK, SCE_HPA_TRIPLE, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HPA_TRIPLE, invert(0x002060)); + SSM(sci, SCI_STYLESETBACK, SCE_HPA_TRIPLE, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HPA_TRIPLEDOUBLE, 0x002060); - SSM(sci, SCI_STYLESETBACK, SCE_HPA_TRIPLEDOUBLE, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HPA_TRIPLEDOUBLE, invert(0x002060)); + SSM(sci, SCI_STYLESETBACK, SCE_HPA_TRIPLEDOUBLE, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HPA_CLASSNAME, 0x202010); - SSM(sci, SCI_STYLESETBACK, SCE_HPA_CLASSNAME, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HPA_CLASSNAME, invert(0x202010)); + SSM(sci, SCI_STYLESETBACK, SCE_HPA_CLASSNAME, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HPA_DEFNAME, 0x102020); - SSM(sci, SCI_STYLESETBACK, SCE_HPA_DEFNAME, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HPA_DEFNAME, invert(0x102020)); + SSM(sci, SCI_STYLESETBACK, SCE_HPA_DEFNAME, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HPA_OPERATOR, 0x601010); - SSM(sci, SCI_STYLESETBACK, SCE_HPA_OPERATOR, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HPA_OPERATOR, invert(0x601010)); + SSM(sci, SCI_STYLESETBACK, SCE_HPA_OPERATOR, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HPA_IDENTIFIER, 0x105010); - SSM(sci, SCI_STYLESETBACK, SCE_HPA_IDENTIFIER, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HPA_IDENTIFIER, invert(0x105010)); + SSM(sci, SCI_STYLESETBACK, SCE_HPA_IDENTIFIER, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HP_COMMENTLINE, 0x808080); - SSM(sci, SCI_STYLESETBACK, SCE_HP_COMMENTLINE, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HP_COMMENTLINE, invert(0x808080)); + SSM(sci, SCI_STYLESETBACK, SCE_HP_COMMENTLINE, invert(0xffffff)); - SSM(sci, SCI_STYLESETFORE, SCE_HP_NUMBER, 0x408000); - SSM(sci, SCI_STYLESETBACK, SCE_HP_NUMBER, 0xffffff); + SSM(sci, SCI_STYLESETFORE, SCE_HP_NUMBER, invert(0x408000)); + SSM(sci, SCI_STYLESETBACK, SCE_HP_NUMBER, invert(0xffffff)); styleset_set_style(sci, SCE_HPHP_DEFAULT, GEANY_FILETYPES_XML, 32); styleset_set_style(sci, SCE_HPHP_SIMPLESTRING, GEANY_FILETYPES_XML, 33); @@ -1169,13 +1186,13 @@ styleset_set_style(sci, SCE_C_COMMENTLINEDOC, GEANY_FILETYPES_JAVA, 16); styleset_set_style(sci, SCE_C_COMMENTDOCKEYWORD, GEANY_FILETYPES_JAVA, 17); - SSM(sci, SCI_STYLESETFORE, SCE_C_COMMENTDOCKEYWORDERROR, 0x0000ff); - SSM(sci, SCI_STYLESETBACK, SCE_C_COMMENTDOCKEYWORDERROR, 0xFFFFFF); + SSM(sci, SCI_STYLESETFORE, SCE_C_COMMENTDOCKEYWORDERROR, invert(0x0000ff)); + SSM(sci, SCI_STYLESETBACK, SCE_C_COMMENTDOCKEYWORDERROR, invert(0xffffff)); SSM(sci, SCI_STYLESETITALIC, SCE_C_COMMENTDOCKEYWORDERROR, TRUE); styleset_set_style(sci, SCE_C_GLOBALCLASS, GEANY_FILETYPES_JAVA, 18); - SSM(sci, SCI_SETWHITESPACEFORE, 1, 0xc0c0c0); + SSM(sci, SCI_SETWHITESPACEFORE, 1, invert(0xc0c0c0)); } @@ -1279,7 +1296,7 @@ styleset_set_style(sci, SCE_PL_HASH, GEANY_FILETYPES_PERL, 15); styleset_set_style(sci, SCE_PL_SYMBOLTABLE, GEANY_FILETYPES_PERL, 16); - SSM(sci, SCI_SETWHITESPACEFORE, 1, 0xc0c0c0); + SSM(sci, SCI_SETWHITESPACEFORE, 1, invert(0xc0c0c0)); } @@ -1485,7 +1502,7 @@ styleset_set_style(sci, SCE_SH_PARAM, GEANY_FILETYPES_SH, 9); styleset_set_style(sci, SCE_SH_SCALAR, GEANY_FILETYPES_SH, 10); - SSM(sci, SCI_SETWHITESPACEFORE, 1, 0xc0c0c0); + SSM(sci, SCI_SETWHITESPACEFORE, 1, invert(0xc0c0c0)); } @@ -2123,7 +2140,7 @@ styleset_set_style(sci, SCE_SH_PARAM, GEANY_FILETYPES_OMS, 9); styleset_set_style(sci, SCE_SH_SCALAR, GEANY_FILETYPES_OMS, 10); - SSM(sci, SCI_SETWHITESPACEFORE, 1, 0xc0c0c0); + SSM(sci, SCI_SETWHITESPACEFORE, 1, invert(0xc0c0c0)); } @@ -2207,7 +2224,7 @@ styleset_set_style(sci, SCE_TCL_WORD4, GEANY_FILETYPES_TCL, 14); styleset_set_style(sci, SCE_TCL_WORD5, GEANY_FILETYPES_TCL, 15); - SSM(sci, SCI_SETWHITESPACEFORE, 1, 0xc0c0c0); + SSM(sci, SCI_SETWHITESPACEFORE, 1, invert(0xc0c0c0)); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [449] trunk
by ntrel＠users.sourceforge.net 16 Jun '06

16 Jun '06

Revision: 449 Author: ntrel Date: 2006-06-16 06:15:28 -0700 (Fri, 16 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=449&view=rev Log Message: ----------- Execute: only save file if the run command uses it Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-16 11:17:52 UTC (rev 448) +++ trunk/ChangeLog 2006-06-16 13:15:28 UTC (rev 449) @@ -2,6 +2,7 @@ * src/notebook.c, src/notebook.h, src/main.c, src/Makefile.am: Added currently disabled drag reordering of notebook tabs. + * src/callbacks.c: Execute: only save file if the run command uses it. 2006-06-15 Enrico Troeger <enrico.troeger(a)uvena.de> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-06-16 11:17:52 UTC (rev 448) +++ trunk/src/callbacks.c 2006-06-16 13:15:28 UTC (rev 449) @@ -1635,7 +1635,10 @@ } else { - if (doc_list[idx].changed) document_save_file(idx); + // save the file only if the run command uses it + if (doc_list[idx].changed && + strstr(doc_list[idx].file_type->programs->run_cmd, "%f") != NULL) + document_save_file(idx); if (build_run_cmd(idx) == (GPid) 0) { msgwin_status_add(_("Failed to execute the terminal program")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [448] trunk
by ntrel＠users.sourceforge.net 16 Jun '06

16 Jun '06

Revision: 448 Author: ntrel Date: 2006-06-16 04:17:52 -0700 (Fri, 16 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=448&view=rev Log Message: ----------- Added currently disabled drag reordering of notebook tabs Modified Paths: -------------- trunk/ChangeLog trunk/src/Makefile.am trunk/src/main.c Added Paths: ----------- trunk/src/notebook.c trunk/src/notebook.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-15 17:31:54 UTC (rev 447) +++ trunk/ChangeLog 2006-06-16 11:17:52 UTC (rev 448) @@ -1,3 +1,9 @@ +2006-06-16 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/notebook.c, src/notebook.h, src/main.c, src/Makefile.am: + Added currently disabled drag reordering of notebook tabs. + + 2006-06-15 Enrico Troeger <enrico.troeger(a)uvena.de> * src/utils.c: Fixed a bug at opening files when clicking on compiler Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2006-06-15 17:31:54 UTC (rev 447) +++ trunk/src/Makefile.am 2006-06-16 11:17:52 UTC (rev 448) @@ -14,6 +14,7 @@ geany_SOURCES = \ main.c geany.h \ + notebook.c notebook.h \ keybindings.c keybindings.h \ templates.c templates.h \ treeviews.c treeviews.h \ Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2006-06-15 17:31:54 UTC (rev 447) +++ trunk/src/main.c 2006-06-16 11:17:52 UTC (rev 448) @@ -46,6 +46,7 @@ #include "templates.h" #include "encodings.h" #include "treeviews.h" +#include "notebook.h" #ifdef HAVE_VTE # include "vte.h" #endif @@ -478,6 +479,7 @@ gtk_window_set_default_size(GTK_WINDOW(app->window), GEANY_WINDOW_DEFAULT_WIDTH, GEANY_WINDOW_DEFAULT_HEIGHT); configuration_load(); keybindings_init(); + notebook_init(); templates_init(); encodings_init(); document_init_doclist(); Added: trunk/src/notebook.c =================================================================== --- trunk/src/notebook.c (rev 0) +++ trunk/src/notebook.c 2006-06-16 11:17:52 UTC (rev 448) @@ -0,0 +1,148 @@ +/* + * notebook.c - this file is part of Geany, a fast and lightweight IDE + * + * Copyright 2006 Nick Treleaven <nick.treleaven(a)btinternet.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * $Id$ + */ + +#include "geany.h" +#include "notebook.h" + +#define GEANY_DND_NOTEBOOK_TAB_TYPE "geany_dnd_notebook_tab" + +static const GtkTargetEntry drag_targets[] = +{ + {GEANY_DND_NOTEBOOK_TAB_TYPE, GTK_TARGET_SAME_APP | GTK_TARGET_SAME_WIDGET, 0} +}; + + +gboolean +notebook_drag_motion_cb(GtkWidget *notebook, GdkDragContext *dc, + gint x, gint y, guint time, gpointer user_data); + + +void notebook_init() +{ + GtkWidget *notebook = app->notebook; + + g_object_set(G_OBJECT(notebook), "can-focus", FALSE, NULL); + + /* There is a bug with drag reordering notebook tabs. + * Clicking on a notebook tab, then making a selection in the + * Scintilla widget will cause a strange selection bug. + * It seems there is a conflict; the drag cursor is shown, + * and the selection is blocked; however, when releasing the + * mouse button, the selection continues. + * Maybe a bug in Scintilla 1.68? - ntrel */ +#ifndef TEST_TAB_DND + return; +#endif + + // Set up drag movement callback + g_signal_connect(G_OBJECT(notebook), "drag-motion", + G_CALLBACK(notebook_drag_motion_cb), NULL); + + // set up drag motion for moving notebook pages + gtk_drag_source_set(notebook, GDK_BUTTON1_MASK, + drag_targets, G_N_ELEMENTS(drag_targets), GDK_ACTION_MOVE); + gtk_drag_dest_set(notebook, GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP, + drag_targets, G_N_ELEMENTS(drag_targets), GDK_ACTION_MOVE); +} + + +gboolean +notebook_drag_motion_cb(GtkWidget *widget, GdkDragContext *dc, + gint x, gint y, guint time, gpointer user_data) +{ + GtkNotebook *notebook = GTK_NOTEBOOK(widget); + static gint oldx, oldy; // for determining direction of mouse drag + gint ndest = notebook_find_tab_num_at_pos(notebook, x, y); + gint ncurr = gtk_notebook_get_current_page(notebook); + + if (ndest >= 0) + if (ndest != ncurr) + { + gboolean ok = FALSE; + // prevent oscillation between non-homogeneous sized tabs + switch(gtk_notebook_get_tab_pos(notebook)) + { + case GTK_POS_LEFT: + case GTK_POS_RIGHT: + ok = ((ndest > ncurr) && (y > oldy)) || ((ndest < ncurr) && (y < oldy)); + break; + + case GTK_POS_TOP: + case GTK_POS_BOTTOM: + ok = ((ndest > ncurr) && (x > oldx)) || ((ndest < ncurr) && (x < oldx)); + break; + } + + if (ok) gtk_notebook_reorder_child(notebook, + gtk_notebook_get_nth_page(notebook, ncurr), ndest); + } + + oldx = x; oldy = y; + return FALSE; +} + + +/* x,y are co-ordinates local to the notebook, not including border padding + * adapted from Epiphany absolute version in ephy-notebook.c, thanks + * notebook tab label widgets must not be NULL */ +gint notebook_find_tab_num_at_pos(GtkNotebook *notebook, gint x, gint y) +{ + GtkPositionType tab_pos; + int page_num = 0; + GtkWidget *page; + + // deal with less than 2 pages + switch(gtk_notebook_get_n_pages(notebook)) + {case 0: return -1; case 1: return 0;} + + tab_pos = gtk_notebook_get_tab_pos(notebook); //which edge + + while ((page = gtk_notebook_get_nth_page(notebook, page_num))) + { + gint max_x, max_y; + GtkWidget *tab = gtk_notebook_get_tab_label(notebook, page); + + g_return_val_if_fail(tab != NULL, -1); + + if (!GTK_WIDGET_MAPPED(GTK_WIDGET(tab))) + { // skip hidden tabs, e.g. tabs scrolled out of view + page_num++; + continue; + } + + // subtract notebook pos to remove possible border padding + max_x = tab->allocation.x + tab->allocation.width - + GTK_WIDGET(notebook)->allocation.x; + max_y = tab->allocation.y + tab->allocation.height - + GTK_WIDGET(notebook)->allocation.y; + + if (((tab_pos == GTK_POS_TOP) + || (tab_pos == GTK_POS_BOTTOM)) + &&(x<=max_x)) return page_num; + else if (((tab_pos == GTK_POS_LEFT) + || (tab_pos == GTK_POS_RIGHT)) + && (y<=max_y)) return page_num; + + page_num++; + } + return -1; +} Property changes on: trunk/src/notebook.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Added: trunk/src/notebook.h =================================================================== --- trunk/src/notebook.h (rev 0) +++ trunk/src/notebook.h 2006-06-16 11:17:52 UTC (rev 448) @@ -0,0 +1,30 @@ +/* + * notebook.h - this file is part of Geany, a fast and lightweight IDE + * + * Copyright 2006 Nick Treleaven <nick.treleaven(a)btinternet.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * $Id$ + */ + +#ifndef GEANY_NOTEBOOK_H +#define GEANY_NOTEBOOK_H 1 + +void notebook_init(); + +gint notebook_find_tab_num_at_pos(GtkNotebook *notebook, gint x, gint y); + +#endif Property changes on: trunk/src/notebook.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: [447] trunk
by eht16＠users.sourceforge.net 15 Jun '06

15 Jun '06

Revision: 447 Author: eht16 Date: 2006-06-15 10:31:54 -0700 (Thu, 15 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=447&view=rev Log Message: ----------- Fixed a bug which breaks "make install" when xmlto is not installed. Modified Paths: -------------- trunk/ChangeLog trunk/doc/Makefile.am Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-15 12:57:07 UTC (rev 446) +++ trunk/ChangeLog 2006-06-15 17:31:54 UTC (rev 447) @@ -1,7 +1,9 @@ -2006-06-15 Enrico Troeger <enrico@endor> +2006-06-15 Enrico Troeger <enrico.troeger(a)uvena.de> * src/utils.c: Fixed a bug at opening files when clicking on compiler error messages(thanks Yura Semashko). + * doc/Makefile.am: Fixed a bug which breaks "make install" when xmlto + is not installed. 2006-06-13 Enrico Troeger <enrico.troeger(a)uvena.de> Modified: trunk/doc/Makefile.am =================================================================== --- trunk/doc/Makefile.am 2006-06-15 12:57:07 UTC (rev 446) +++ trunk/doc/Makefile.am 2006-06-15 17:31:54 UTC (rev 447) @@ -13,11 +13,11 @@ jw -b txt geany.docbook htmldoc: - $(mkinstalldirs) html - xmlto -x geany.xsl -o html/ xhtml geany.docbook -# xsltproc --stringparam html.stylesheet geany.css -o html/ \ -# /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/chunk.xsl geany.docbook - test -f html/geany.css || cp geany.css html/ + if [ ! -f "./html/index.html" ]; then \ + $(mkinstalldirs) html; \ + xmlto -x geany.xsl -o html/ xhtml geany.docbook; \ + test -f html/geany.css || cp geany.css html/; \ + fi doc: geany.txt htmldoc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [446] trunk
by eht16＠users.sourceforge.net 15 Jun '06

15 Jun '06

Revision: 446 Author: eht16 Date: 2006-06-15 05:57:07 -0700 (Thu, 15 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=446&view=rev Log Message: ----------- Fixed a bug at opening files when clicking on compiler error messages(thanks Yura Semashko). Modified Paths: -------------- trunk/ChangeLog trunk/src/utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-14 10:12:21 UTC (rev 445) +++ trunk/ChangeLog 2006-06-15 12:57:07 UTC (rev 446) @@ -1,3 +1,9 @@ +2006-06-15 Enrico Troeger <enrico@endor> + + * src/utils.c: Fixed a bug at opening files when clicking on compiler + error messages(thanks Yura Semashko). + + 2006-06-13 Enrico Troeger <enrico.troeger(a)uvena.de> * doc/Makefile.am: Renamed target html/index.html in htmldoc, added Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-06-14 10:12:21 UTC (rev 445) +++ trunk/src/utils.c 2006-06-15 12:57:07 UTC (rev 446) @@ -2318,7 +2318,7 @@ // empty.h:4: Warnung: type defaults to `int' in declaration of `foo' // empty.c:21: error: conflicting types for `foo' pattern = ":"; - field_min_len = 3; + field_min_len = 4; field_idx_line = 1; field_idx_file = 0; break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [445] trunk/po/ru.po
by kretek＠users.sourceforge.net 14 Jun '06

14 Jun '06

Revision: 445 Author: kretek Date: 2006-06-14 03:12:21 -0700 (Wed, 14 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=445&view=rev Log Message: ----------- Added new translations; bugfixes Modified Paths: -------------- trunk/po/ru.po Modified: trunk/po/ru.po =================================================================== --- trunk/po/ru.po 2006-06-13 21:35:21 UTC (rev 444) +++ trunk/po/ru.po 2006-06-14 10:12:21 UTC (rev 445) @@ -8,61 +8,57 @@ "Project-Id-Version: geany 0.8\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-06-13 10:35+0200\n" -"PO-Revision-Date: 2006-06-12 13:46+0100\n" -"Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" +"PO-Revision-Date: 2006-06-14 10:22-0000\n" +"Last-Translator: brahmann <brahmann(a)lifec0re.org.ru>\n" "Language-Team: RUSSIAN <ru(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Russian\n" +"X-Poedit-Country: UKRAINE\n" +"X-Poedit-Bookmarks: 76,-1,-1,-1,-1,-1,-1,-1,-1,-1\n" #: src/main.c:70 msgid "runs in debug mode (means being verbose)" -msgstr "" +msgstr "запущено в отладочном режиме (выдает больше сообщений)" #: src/main.c:71 msgid "don't load auto completion data (see documentation)" -msgstr "" +msgstr "не загружать авто завершение в данных (смотрите документацию)" #: src/main.c:73 msgid "don't open files in a running instance, force opening a new instance" -msgstr "" +msgstr "не открывать в запущенном, запустить новое" #: src/main.c:75 msgid "use an alternate configuration directory" -msgstr "" +msgstr "использовать иную конфигурационную директорию" #: src/main.c:76 -#, fuzzy msgid "don't show message window at startup" -msgstr "Отображать окно сообщений" +msgstr "не показывать окно сообщений при запуске" #: src/main.c:78 msgid "don't load terminal support" -msgstr "" +msgstr "не загружать поддержку терминала" #: src/main.c:79 msgid "filename of libvte.so" -msgstr "" +msgstr "имя файла библиотеки libvte.so" #: src/main.c:81 msgid "show version and exit" -msgstr "" +msgstr "Показать версию и выйти" #: src/main.c:394 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 " -"and start Geany anyway.\n" +"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 and start Geany anyway.\n" "Delete the named pipe and start Geany?" -msgstr "" -"Geany завершает работу по причине обнаружения именованной трубы обмена. Это " -"означает что Geany уже запущена. Если Geany не запущена, просто " -"удалитеименованый файл(трубу) обмена и запустить Geany еще раз." +msgstr "Geany завершает работу по причине обнаружения именованной трубы обмена. Это означает что Geany уже запущена. Если Geany не запущена, просто удалите именованный файл(трубу) обмена и запустить Geany еще раз." #: src/main.c:436 -#, fuzzy msgid " - A fast and lightweight IDE" -msgstr "Быстрая и легковесная IDE" +msgstr " - Быстрая и легковесная IDE" #: src/main.c:446 #, c-format @@ -72,14 +68,15 @@ #: src/main.c:518 #, c-format msgid "This is Geany %s." -msgstr "" +msgstr "Это Geany %s" #: src/main.c:520 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Каталог конфигурации не может быть создан (%s)." -#: src/interface.c:210 src/interface.c:1171 +#: src/interface.c:210 +#: src/interface.c:1171 msgid "Geany" msgstr "Geany" @@ -88,38 +85,41 @@ msgstr "_Файл" #: src/interface.c:231 -#, fuzzy msgid "New (with _template)" -msgstr "Создать (из шаблона)" +msgstr "Новый (с шаблоном)" -#: src/interface.c:242 src/interface.c:319 src/interface.c:384 -#: src/interface.c:607 src/interface.c:1556 +#: src/interface.c:242 +#: src/interface.c:319 +#: src/interface.c:384 +#: src/interface.c:607 +#: src/interface.c:1556 msgid "invisible" msgstr "невидимый" -#: src/interface.c:267 src/interface.c:709 src/keybindings.c:104 +#: src/interface.c:267 +#: src/interface.c:709 +#: src/keybindings.c:104 msgid "Save all" -msgstr "Сохранить ВСЁ" +msgstr "Сохранить все" #: src/interface.c:270 msgid "Saves all open files" msgstr "Сохраняет все открытые файлы" #: src/interface.c:298 -#, fuzzy msgid "C_lose all" -msgstr "Закрыть ВСЁ" +msgstr "Закрыть все" #: src/interface.c:301 msgid "Closes all open files" msgstr "Закрывает все открытые файлы" #: src/interface.c:312 -#, fuzzy msgid "Recent _files" -msgstr "Последние файлы" +msgstr "Нед_авние файлы" -#: src/interface.c:330 src/interface.c:819 +#: src/interface.c:330 +#: src/interface.c:819 msgid "Quit Geany" msgstr "Выйти из Geany" @@ -127,15 +127,18 @@ msgid "_Edit" msgstr "_Редактировать" -#: src/interface.c:373 src/interface.c:1545 +#: src/interface.c:373 +#: src/interface.c:1545 msgid "Insert \"include <...>\"" msgstr "Вставить \"include <...>\"" -#: src/interface.c:387 src/interface.c:1559 +#: src/interface.c:387 +#: src/interface.c:1559 msgid "Insert Comments" msgstr "Вставить Комментарии" -#: src/interface.c:398 src/interface.c:1570 +#: src/interface.c:398 +#: src/interface.c:1570 msgid "Insert ChangeLog entry" msgstr "Вставить ChangeLog вход" @@ -143,47 +146,58 @@ msgid "Inserts a typical ChangeLog entry in the current file" msgstr "Вставляет типичный ChangeLog вход в текущий файл" -#: src/interface.c:403 src/interface.c:1575 +#: src/interface.c:403 +#: src/interface.c:1575 msgid "Insert file header" msgstr "Вставить заголовок файла" -#: src/interface.c:406 src/interface.c:1578 +#: src/interface.c:406 +#: src/interface.c:1578 msgid "Inserts a few information at the beginning of the file" msgstr "Вставляет небольшую информацию в начало файла" -#: src/interface.c:408 src/interface.c:1580 +#: src/interface.c:408 +#: src/interface.c:1580 msgid "Insert function description" msgstr "Вставить описание функции" -#: src/interface.c:411 src/interface.c:1583 +#: src/interface.c:411 +#: src/interface.c:1583 msgid "Inserts a description before the current function" msgstr "Вставляет описание перед текущей функцией" -#: src/interface.c:413 src/interface.c:1585 +#: src/interface.c:413 +#: src/interface.c:1585 msgid "Insert multiline comment" -msgstr "Вставить многострочный комментарий" +msgstr "Вставить много-строчный комментарий" -#: src/interface.c:416 src/interface.c:1588 +#: src/interface.c:416 +#: src/interface.c:1588 msgid "Inserts a multiline comment" -msgstr "Вставляет многострочный комментарий" +msgstr "Вставляет много-строчный комментарий" -#: src/interface.c:418 src/interface.c:1590 +#: src/interface.c:418 +#: src/interface.c:1590 msgid "Insert GPL notice" msgstr "Вставить GPL-уведомление" -#: src/interface.c:421 src/interface.c:1593 +#: src/interface.c:421 +#: src/interface.c:1593 msgid "Inserts a GPL notice (should be done at the beginning of the file)" msgstr "Вставляет GPL-уведомление (должно быть вставлено в начале файла)" -#: src/interface.c:428 src/interface.c:1600 +#: src/interface.c:428 +#: src/interface.c:1600 msgid "Change Selection" msgstr "Изменить выделенное" -#: src/interface.c:435 src/interface.c:1607 +#: src/interface.c:435 +#: src/interface.c:1607 msgid "To lower-case" msgstr "В нижний регистр" -#: src/interface.c:439 src/interface.c:1611 +#: src/interface.c:439 +#: src/interface.c:1611 msgid "To upper-case" msgstr "В верхний регистр" @@ -192,12 +206,8 @@ msgstr "Подсчет слов" #: src/interface.c:446 -msgid "" -"Counts the words and characters in the current selection or the whole " -"document" -msgstr "" -"Подсчитывает слова и символы в текущей выделенной области иливо всем " -"документе" +msgid "Counts the words and characters in the current selection or the whole document" +msgstr "Подсчитывает слова и символы в текущей выделенной области или во всем документе" #: src/interface.c:457 msgid "_Search" @@ -205,13 +215,14 @@ #: src/interface.c:468 msgid "Find _Next" -msgstr "" +msgstr "Най_ти далее" #: src/interface.c:472 msgid "Find _Previous" msgstr "Найти следующее" -#: src/interface.c:476 src/dialogs.c:906 +#: src/interface.c:476 +#: src/dialogs.c:906 msgid "_Replace" msgstr "Заменить" @@ -219,71 +230,61 @@ msgid "_Go to line" msgstr "Перейти к строке" -#: src/interface.c:497 src/dialogs.c:72 +#: src/interface.c:497 +#: src/dialogs.c:72 msgid "_View" msgstr "Вид" #: src/interface.c:504 -#, fuzzy msgid "Change _Font" -msgstr "Изменить шрифт" +msgstr "Сменить шрифт" #: src/interface.c:507 msgid "Change the default font" msgstr "Изменить шрифт по умолчанию" #: src/interface.c:513 -#, fuzzy msgid "Show _Colour Chooser" -msgstr "Отображать Выбор цвета" +msgstr "Показать Выбор цвета" -#: src/interface.c:516 src/interface.c:749 -msgid "" -"Open a color chooser dialog, to interactively pick colors from a palette." +#: src/interface.c:516 +#: src/interface.c:749 +msgid "Open a color chooser dialog, to interactively pick colors from a palette." msgstr "" "Открывает диалог выбора цвета, позволяющий интерактивно \n" "выбирать цвет из палитры." #: src/interface.c:527 -#, fuzzy msgid "Full_screen" -msgstr "Во весь экран" +msgstr "Во-весь экран" #: src/interface.c:531 -#, fuzzy msgid "Show Messages _Window" -msgstr "Отображать окно сообщений" +msgstr "Показывать окно сообщений" #: src/interface.c:534 msgid "Toggle the window with status and compiler messages on and off" msgstr "Включает/выключает окно дежурных(статусных) и компиляторных сообщений" #: src/interface.c:537 -#, fuzzy msgid "Show _Toolbar" -msgstr "Отображать панель инструментов" +msgstr "Показывать панель инструментов" #: src/interface.c:540 msgid "Toggle the toolbar on and off" msgstr "Включает/выключает отображение панели инструментов" #: src/interface.c:543 -#, fuzzy msgid "Show _Markers Margin" -msgstr "Отображать Маркер строк" +msgstr "Показывать Маркер строк" #: src/interface.c:546 -msgid "" -"Shows or hides the small margin right of the line numbers, which is used to " -"mark lines." -msgstr "" -"Показывает или прячет маленький маркер строк с права от номеров строк, " -"который используються для отмечания определнных строк." +msgid "Shows or hides the small margin right of the line numbers, which is used to mark lines." +msgstr "Показывает или прячет маленький маркер строк с права от номеров строк, который отмечает определенные строки." #: src/interface.c:549 -#, fuzzy msgid "Show _Line Numbers" -msgstr "Отображать Номера строк" +msgstr "Показывать Номера строк" #: src/interface.c:552 msgid "Shows or hides the Line Number margin." @@ -294,18 +295,16 @@ msgstr "Документ" #: src/interface.c:579 -#, fuzzy msgid "_Line breaking" -msgstr "Прерывание строки" +msgstr "Окончания строк" #: src/interface.c:582 msgid "Break the line at the window border and continue it on the next line" msgstr "Прерывает строку у бордюра окна и продолжает с новой строки" #: src/interface.c:585 -#, fuzzy msgid "_Use auto indention" -msgstr "Использовать автоперенос" +msgstr "Использовать авто-перенос" #: src/interface.c:590 msgid "Read _only" @@ -313,9 +312,7 @@ #: src/interface.c:593 msgid "Treat this file as read-only. No changes can be made." -msgstr "" -"Рассматривает этот файл как только для чтения. Никакие изменения не могут " -"быть зделаны." +msgstr "Рассматривает этот файл как только для чтения. Никакие изменения не могут быть сделаны." #: src/interface.c:600 msgid "Set filetype" @@ -338,37 +335,34 @@ msgstr "Заменить окончания строк на CR (Mac)" #: src/interface.c:634 -#, fuzzy msgid "_Replace tabs by space" -msgstr "Заменить табы пробелами" +msgstr "Заменить табуляции пробелами" #: src/interface.c:637 msgid "Replaces all tabs in document by spaces." -msgstr "Заменяет все табы в документе пробелами." +msgstr "Заменяет все табуляции в документе пробелами." #: src/interface.c:644 -#, fuzzy msgid "_Fold all" -msgstr "Свернуть всё" +msgstr "Свернуть все" #: src/interface.c:647 msgid "Folds all contractible code blocks" -msgstr "Сворачивает все развернутые блоки обьединенного кода" +msgstr "Сворачивает все развернутые блоки объединенного кода" #: src/interface.c:649 -#, fuzzy msgid "_Unfold all" -msgstr "Развернуть всё" +msgstr "Развернуть все" #: src/interface.c:652 msgid "Unfolds all contracted code blocks" -msgstr "Разворачивает все свернутые блоки обьединенного кода" +msgstr "Разворачивает все свернутые блоки объединенного кода" #. build the code -#: src/interface.c:654 src/dialogs.c:521 -#, fuzzy +#: src/interface.c:654 +#: src/dialogs.c:521 msgid "_Build" -msgstr "Построить" +msgstr "Постро_ить" #: src/interface.c:658 msgid "_Help" @@ -414,11 +408,13 @@ msgid "Compile the current file" msgstr "Собрать текущий файл" -#: src/interface.c:735 src/keybindings.c:126 +#: src/interface.c:735 +#: src/keybindings.c:126 msgid "Run" msgstr "Запустить" -#: src/interface.c:738 src/dialogs.c:560 +#: src/interface.c:738 +#: src/dialogs.c:560 msgid "Run or view the current file" msgstr "Запустить или посмотреть текущий файл" @@ -434,23 +430,26 @@ msgid "Zoom out the text" msgstr "Уменьшить текст" -#: src/interface.c:776 src/interface.c:781 +#: src/interface.c:776 +#: src/interface.c:781 msgid "Find the entered text in the current file" msgstr "Найти введенный текст в текущем файле" #: src/interface.c:794 msgid "Enter a line number and jump to it." -msgstr "Ввести номер строки и перейти на неё." +msgstr "Ввести номер строки и перейти на нее." #: src/interface.c:801 msgid "Jump to the entered line number." msgstr "Перейти на строку под введенным номером" -#: src/interface.c:846 src/treeviews.c:40 +#: src/interface.c:846 +#: src/treeviews.c:40 msgid "Symbols" -msgstr "Тэги" +msgstr "Теги" -#: src/interface.c:859 src/treeviews.c:180 +#: src/interface.c:859 +#: src/treeviews.c:180 msgid "Open files" msgstr "Открытые файлы" @@ -504,13 +503,15 @@ #: src/interface.c:1628 msgid "Go to tag declaration" -msgstr "Перейти к декларации тэга" +msgstr "Перейти к декларации тега" #: src/interface.c:1632 msgid "Go to tag definition" -msgstr "Перейти к определению тэга" +msgstr "Перейти к определению тега" -#: src/interface.c:1641 src/dialogs.c:763 src/keybindings.c:113 +#: src/interface.c:1641 +#: src/dialogs.c:763 +#: src/keybindings.c:113 msgid "Go to line" msgstr "Перейти к строке" @@ -518,7 +519,8 @@ msgid "Goto to the entered line" msgstr "Перейти к введенной строке" -#: src/interface.c:1889 src/keybindings.c:109 +#: src/interface.c:1889 +#: src/keybindings.c:109 msgid "Preferences" msgstr "Настройки" @@ -527,11 +529,8 @@ msgstr "Длинна списка" #: src/interface.c:1933 -msgid "" -"Specifies the number of files which are stored in the Recent files list." -msgstr "" -"Определяет количество файлов сохраненных в списке Последних открываемых " -"файлов." +msgid "Specifies the number of files which are stored in the Recent files list." +msgstr "Определяет количество файлов сохраненных в списке Последних открываемых файлов." #: src/interface.c:1937 msgid "Load files from the last session" @@ -547,43 +546,31 @@ #: src/interface.c:1948 msgid "Saves the window position and geometry and restores it at the start" -msgstr "Сохраняет позицию и размеры окна, и востанавливает их при запуске" +msgstr "Сохраняет позицию и размеры окна, и восстанавливает их при запуске" #: src/interface.c:1951 msgid "Beep on errors or when compilation has finished" msgstr "Сигнал при ошибках или по окончании сборки" #: src/interface.c:1954 -msgid "" -"Whether to beep if an error occured or when the compilation process has " -"finished." -msgstr "" -"Подает звуковой сигнал при возникновении ошибки, а так жепри окончании " -"процесса сборки(компиляции) проекта." +msgid "Whether to beep if an error occured or when the compilation process has finished." +msgstr "Подает звуковой сигнал при возникновении ошибки, а так же при окончании процесса сборки(компиляции) проекта." #: src/interface.c:1957 msgid "Switch to status message list at new message" msgstr "Перейти на \"Статус\" при новых сообщениях" #: src/interface.c:1960 -msgid "" -"Switch to the status message tab(in the notebook window at the bottom) if a " -"new status message arrive." -msgstr "" -"Переходит фокусом на \"Статус\" закладку(в служебной области сообщений внизу)" -"когда приходят новые статусные(дежурные) сообщения." +msgid "Switch to the status message tab(in the notebook window at the bottom) if a new status message arrive." +msgstr "Переходит фокусом на \"Статус\" закладку(в служебной области сообщений внизу)когда приходят новые статусные(дежурные) сообщения." #: src/interface.c:1963 msgid "Load virtual terminal emulation at startup" msgstr "Загружать эмуляцию виртуального терминала при загрузке" #: src/interface.c:1965 -msgid "" -"Whether the virtual terminal emulation(VTE) should be loaded at startup. " -"Disable it if you do not need it." -msgstr "" -"Включает эмуляцию виртуального терминала при старте.Отключите если Вам это " -"не надо." +msgid "Whether the virtual terminal emulation(VTE) should be loaded at startup. Disable it if you do not need it." +msgstr "Включает эмуляцию виртуального терминала при старте.Отключите если Вам это не надо." #: src/interface.c:1968 msgid "Confirm exit" @@ -613,7 +600,8 @@ msgid "New file tabs will be placed to the right of the tab list" msgstr "Новые закладки будут располагаться справа в списке закладок" -#: src/interface.c:2002 src/interface.c:2327 +#: src/interface.c:2002 +#: src/interface.c:2327 msgid "Miscellaneous" msgstr "Разное" @@ -639,11 +627,12 @@ #: src/interface.c:2064 msgid "Show symbol list" -msgstr "Отображать список тэгов" +msgstr "Отображать список тегов" -#: src/interface.c:2067 src/interface.c:2073 +#: src/interface.c:2067 +#: src/interface.c:2073 msgid "Toggle the symbol list on and off" -msgstr "Включает отображение списка тэгов" +msgstr "Включает отображение списка тегов" #: src/interface.c:2070 msgid "Show open files list" @@ -655,7 +644,7 @@ #: src/interface.c:2102 msgid "Symbol list font" -msgstr "Шрифт списка тэгов" +msgstr "Шрифт списка тегов" #: src/interface.c:2109 msgid "Message window font" @@ -667,7 +656,7 @@ #: src/interface.c:2129 msgid "Sets the font for symbol list window" -msgstr "Устанавливает шрифт для списка тэгов" +msgstr "Устанавливает шрифт для списка тегов" #: src/interface.c:2132 msgid "Fonts" @@ -695,8 +684,7 @@ #: src/interface.c:2206 msgid "Removes trailing spaces and tabs and the end of lines" -msgstr "" -"Убирает при переносе лишние остаточные пробелы, табуляции и окончания строк" +msgstr "Убирает при переносе лишние остаточные пробелы, табуляции и окончания строк" #: src/interface.c:2209 msgid "Ensure new line at file end" @@ -716,9 +704,7 @@ #: src/interface.c:2238 msgid "Shows small dotted lines to help you to use the right indention." -msgstr "" -"Показывает маленькие точечные линии в помощь для использования правильного " -"переноса." +msgstr "Показывает маленькие точечные линии в помощь для использования правильного переноса." #: src/interface.c:2241 msgid "Show white space" @@ -738,20 +724,19 @@ #: src/interface.c:2253 msgid "XML tag auto completion" -msgstr "Автозавершение XML тэгов" +msgstr "Авто-завершение XML тегов" #: src/interface.c:2256 msgid "Automatic completion of open XML tags(includes HTML tags)" -msgstr "Автоматическое завершение открытых XML тэгов(включая HTML тэги)" +msgstr "Автоматическое завершение открытых XML тегов(включая HTML теги)" #: src/interface.c:2259 msgid "Construct auto completion" -msgstr "Автозавершение конструкций" +msgstr "Авто-завершение конструкций" #: src/interface.c:2262 msgid "Automatic completion of often used constructs like if and for" -msgstr "" -"Автоматическое завершение часто используемых конструкций(к примеру, if и for)" +msgstr "Автоматическое завершение часто используемых конструкций(к примеру, if и for)" #: src/interface.c:2265 msgid "Enable folding" @@ -759,9 +744,7 @@ #: src/interface.c:2268 msgid "Whether to enable folding the code" -msgstr "" -"Включает разделение кода на блоки(сворачивать/разворачивать отдельные " -"функции)" +msgstr "Включает разделение кода на блоки(сворачивать/разворачивать отдельные функции)" #: src/interface.c:2281 msgid "Editor font" @@ -780,21 +763,16 @@ msgstr "Устанавливает шрифт окна редактирования" #: src/interface.c:2315 -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. To disable set the value to 0, " -"or greater than 0 to specify the column where it should appear." -msgstr "" -"Маркер Длинны Строки это вертикальная тонка линии в редакторе, которая " -"помогает отмечать длинные строки или являеться сигналомдля перехода на " -"следующую строку. Что бы отключить установите значение в 0, или больше нуля " -"для указания колонки где оно должно быть." +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. To disable set the value to 0, or greater than 0 to specify the column where it should appear." +msgstr "Маркер Длинны Строки это вертикальная тонка линии в редакторе, которая помогает отмечать длинные строки или является сигналом для перехода на следующую строку. Что бы отключить установите значение в 0, или больше нуля для указания колонки где оно должно быть." #: src/interface.c:2324 msgid "Sets the color of the long line marker" msgstr "Устанавливает цвет Маркера Длинны строки" -#: src/interface.c:2325 src/dialogs.c:477 src/dialogs.c:1706 +#: src/interface.c:2325 +#: src/dialogs.c:477 +#: src/dialogs.c:1706 #: src/dialogs.c:1713 msgid "Color Chooser" msgstr "Выбор цвета" @@ -815,7 +793,9 @@ msgid "Make" msgstr "Make" -#: src/interface.c:2358 src/dialogs.c:1756 src/vte.c:163 +#: src/interface.c:2358 +#: src/dialogs.c:1756 +#: src/vte.c:163 msgid "Terminal" msgstr "Терминал" @@ -828,18 +808,12 @@ msgstr "Путь и опции для make" #: src/interface.c:2384 -msgid "" -"A terminal emulator like xterm, gnome-terminal or konsole (should accept the " -"-e argument)" -msgstr "" -"Эмулятор терминалов таких как xterm, gnome-terminal или konsole(все " -"которыепринимают ключ -e <аргумент>)" +msgid "A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)" +msgstr "Эмулятор терминалов таких как xterm, gnome-terminal или konsole(все которые принимают ключ -e <аргумент>)" #: src/interface.c:2391 msgid "Path (and possibly additional arguments) to your favorite browser" -msgstr "" -"Путь (и возможно дополнительные аргументы) к Вашему предпочитаемому " -"просмотрщику" +msgstr "Путь (и возможно дополнительные аргументы) к Вашему предпочитаемому просмотрщику" #: src/interface.c:2423 msgid "Tools" @@ -898,7 +872,7 @@ "Notice: For all changes you make here,\n" "you need to restart Geany to take effect." msgstr "" -"Внимание: Для вступление всех зделанных тут изменений в силу,\n" +"Внимание: Для вступление всех сделанных тут изменений в силу,\n" "Вам необходимо перезапустить Geany." #: src/interface.c:2516 @@ -906,16 +880,8 @@ msgstr "Шаблоны" #: src/interface.c:2524 -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 " -"shortcut. You can also edit the string representation of the shortcut " -"directly." -msgstr "" -"Тут Вы можете изменять различные сочетания клавиш для различных действий. " -"Достаточно двойного нажатия левой кнопкой мыши на действии или выберите " -"однодействие и нажмите кнопку Изменить что бы создать новое сочетание. Так " -"же Вы можетередактировать строку сочетания напрямую." +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 shortcut. You can also edit the string representation of the shortcut directly." +msgstr "Тут Вы можете изменять различные сочетания клавиш для различных действий. Достаточно двойного нажатия левой кнопкой мыши на действии или выберите одно действие и нажмите кнопку Изменить что бы создать новое сочетание. Так же Вы можете редактировать строку сочетания напрямую." #: src/interface.c:2547 msgid "Change" @@ -925,7 +891,8 @@ msgid "Keybindings" msgstr "Привязки" -#: src/callbacks.c:209 src/callbacks.c:224 +#: src/callbacks.c:209 +#: src/callbacks.c:224 msgid "Do you really want to quit?" msgstr "Вы действительно хотите выйти?" @@ -936,14 +903,15 @@ "Any unsaved changes will be lost." msgstr "" "Вы уверены в перезагрузке '%s'?\n" -"Любые не сохранённые изменения будут потеряны." +"Любые не сохраненные изменения будут потеряны." #: src/callbacks.c:849 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Файл '%s' уже существует. Переписать поверху?" -#: src/callbacks.c:1330 src/callbacks.c:1339 +#: src/callbacks.c:1330 +#: src/callbacks.c:1339 #, c-format msgid "Declaration or definition of \"%s()\" not found" msgstr "Декларирование или определение функции \"%s()\" не найдено" @@ -957,28 +925,27 @@ msgstr "Невозможно запустить терминальную программу" #. initialize the dialog -#: src/callbacks.c:1979 src/dialogs.c:69 +#: src/callbacks.c:1979 +#: src/dialogs.c:69 msgid "Open File" msgstr "Открыть Файл" -#: src/callbacks.c:2028 src/callbacks.c:2078 src/callbacks.c:2118 +#: src/callbacks.c:2028 +#: src/callbacks.c:2078 +#: src/callbacks.c:2118 #: src/callbacks.c:2178 -msgid "" -"Please set the filetype for the current file before using this function." -msgstr "" +msgid "Please set the filetype for the current file before using this function." +msgstr "Пожалуйста, установите тип файла для текущего документа перед использованием этой функции" -#: src/support.c:90 src/support.c:114 +#: src/support.c:90 +#: src/support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "Не могу найти pixmap файл: %s" #: src/dialogs.c:74 -msgid "" -"Opens the file in read-only mode. If you choose more than one file to open, " -"all files will be opened read-only." -msgstr "" -"Открытие файла в режиме \"только чтение\". Если выбрать более чем один файл " -"для открытия, все выбранные файлы будут открыты в режиме \"только чтение\"." +msgid "Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only." +msgstr "Открытие файла в режиме \"только чтение\". Если выбрать более чем один файл для открытия, все выбранные файлы будут открыты в режиме \"только чтение\"." #: src/dialogs.c:110 msgid "Detect by file extension " @@ -1000,10 +967,10 @@ #: src/dialogs.c:239 #, c-format msgid "The match \"%s\" was not found. Wrap search around the document?" -msgstr "" -"Совпадение с фразой \"%s\" не было найдено. Начать поиск с начала документа?" +msgstr "Совпадение с фразой \"%s\" не было найдено. Начать поиск с начала документа?" -#: src/dialogs.c:242 src/dialogs.c:1824 +#: src/dialogs.c:242 +#: src/dialogs.c:1824 msgid "Question" msgstr "Вопрос" @@ -1011,7 +978,10 @@ msgid "Information" msgstr "Информация" -#: src/dialogs.c:296 src/dialogs.c:328 src/dialogs.c:1267 src/win32.c:217 +#: src/dialogs.c:296 +#: src/dialogs.c:328 +#: src/dialogs.c:1267 +#: src/win32.c:217 #: src/win32.c:378 msgid "Error" msgstr "Ошибка" @@ -1070,9 +1040,8 @@ #. compile the code #: src/dialogs.c:505 -#, fuzzy msgid "_Compile" -msgstr "Собрать" +msgstr "_Собрать" #: src/dialogs.c:508 msgid "Compiles the current file" @@ -1083,35 +1052,35 @@ msgstr "Строит текущий файл (генерирует выполняемый файл)" #. build the code with make all -#: src/dialogs.c:534 src/dialogs.c:631 src/keybindings.c:124 +#: src/dialogs.c:534 +#: src/dialogs.c:631 +#: src/keybindings.c:124 msgid "Build with \"make\"" msgstr "Построить используя \"make\"" -#: src/dialogs.c:537 src/dialogs.c:634 +#: src/dialogs.c:537 +#: src/dialogs.c:634 msgid "Builds the current file with the make tool and the default target" msgstr "Сборка данного файлы используя make и объект сборки по умолчанию" #. build the code with make #: src/dialogs.c:545 -#, fuzzy msgid "Build with \"_make\" (custom _target)" -msgstr "Построить используя make (другая цель)" +msgstr "Собрать с \"_make\" (своя цель)" -#: src/dialogs.c:551 src/dialogs.c:648 +#: src/dialogs.c:551 +#: src/dialogs.c:648 msgid "Builds the current file with the make tool and the specified target" msgstr "Строит текущий файл используя make и указанную цель" -#: src/dialogs.c:577 src/dialogs.c:1105 +#: src/dialogs.c:577 +#: src/dialogs.c:1105 msgid "Set Includes and Arguments" msgstr "Установить \"include <...>\" и Аргументы" #: src/dialogs.c:584 -msgid "" -"Sets the includes and library paths for the compiler and the program " -"arguments for execution" -msgstr "" -"Устанавливает включаемые заголовочные файлы и пути библиотекдля компилятора" -"(сборщика) и аргументов для запуска программ" +msgid "Sets the includes and library paths for the compiler and the program arguments for execution" +msgstr "Устанавливает включаемые заголовочные файлы и пути библиотек для компилятора(сборщика) и аргументов для запуска программ" #. DVI #: src/dialogs.c:605 @@ -1141,9 +1110,10 @@ msgid "View DVI file" msgstr "Смотреть DVI файл" -#: src/dialogs.c:659 src/dialogs.c:672 +#: src/dialogs.c:659 +#: src/dialogs.c:672 msgid "Compiles and view the current file" -msgstr "Compiles and view the current file" +msgstr "Собирает и смотрит текущий файл" #. PDF view #: src/dialogs.c:666 @@ -1151,7 +1121,8 @@ msgstr "Смотреть PDF файл" #. arguments -#: src/dialogs.c:685 src/dialogs.c:998 +#: src/dialogs.c:685 +#: src/dialogs.c:998 msgid "Set Arguments" msgstr "Установить аргументы" @@ -1164,10 +1135,8 @@ msgstr "Введите свои опции для make" #: src/dialogs.c:738 -msgid "" -"Enter custom options here, all entered text is passed to the make command." -msgstr "" -"Введите здесь свои опции, весь введенный текст добавляеться к команде make." +msgid "Enter custom options here, all entered text is passed to the make command." +msgstr "Введите здесь свои опции, весь введенный текст добавляется к команде make." #: src/dialogs.c:768 msgid "Enter the line you want to go to" @@ -1177,39 +1146,43 @@ msgid "Find" msgstr "Найти" -#: src/dialogs.c:805 src/dialogs.c:911 +#: src/dialogs.c:805 +#: src/dialogs.c:911 msgid "Enter the search text here" msgstr "Введите текст для поиска" -#: src/dialogs.c:826 src/dialogs.c:944 +#: src/dialogs.c:826 +#: src/dialogs.c:944 msgid "_Case sensitive" msgstr "Регистровая чувствительность" -#: src/dialogs.c:831 src/dialogs.c:949 +#: src/dialogs.c:831 +#: src/dialogs.c:949 msgid "Match only a _whole word" msgstr "Совпадение только всего слова" -#: src/dialogs.c:836 src/dialogs.c:954 +#: src/dialogs.c:836 +#: src/dialogs.c:954 msgid "_Use regular expressions" msgstr "Использовать регулярные выражения" -#: src/dialogs.c:841 src/dialogs.c:959 -msgid "" -"For detailed information about using regular expressions, please read the " -"documentation." -msgstr "" -"Для более подробной информации по использованию регулярных выражений, " -"читайте соответствующую документацию." +#: src/dialogs.c:841 +#: src/dialogs.c:959 +msgid "For detailed information about using regular expressions, please read the documentation." +msgstr "Для более подробной информации по использованию регулярных выражений, читайте соответствующую документацию." -#: src/dialogs.c:843 src/dialogs.c:961 +#: src/dialogs.c:843 +#: src/dialogs.c:961 msgid "_Search backwards" msgstr "Обратный поиск" -#: src/dialogs.c:848 src/dialogs.c:966 +#: src/dialogs.c:848 +#: src/dialogs.c:966 msgid "Match only word s_tart" msgstr "Совпадение только стартового слова" -#: src/dialogs.c:893 src/keybindings.c:112 +#: src/dialogs.c:893 +#: src/keybindings.c:112 msgid "Replace" msgstr "Заменить" @@ -1223,7 +1196,7 @@ #: src/dialogs.c:902 msgid "Replace _All" -msgstr "Заменить ВСЁ" +msgstr "З_аменить Все" #: src/dialogs.c:915 msgid "Enter the replace text here" @@ -1235,47 +1208,35 @@ "The filename is appended automatically at the end.\n" msgstr "" "Программы и опции для сборки и просмотра (La)TeX файлов.\n" -"Имя файла добавляеться в конец документа автоматически.\n" +"Имя файла добавляется в конец документа автоматически.\n" #: src/dialogs.c:1011 -msgid "" -"Enter here the (La)TeX command (for DVI creation) and some useful options." -msgstr "" -"Введите здесь (La)TeX команду (для создания DVI) и некоторые полезные опции." +msgid "Enter here the (La)TeX command (for DVI creation) and some useful options." +msgstr "Введите здесь (La)TeX команду (для создания DVI) и некоторые полезные опции." #: src/dialogs.c:1032 -msgid "" -"Enter here the (La)TeX command (for PDF creation) and some useful options." -msgstr "" -"Введите здесь (La)TeX команду (для создания PDF) и некоторые полезные опции." +msgid "Enter here the (La)TeX command (for PDF creation) and some useful options." +msgstr "Введите здесь (La)TeX команду (для создания PDF) и некоторые полезные опции." #: src/dialogs.c:1053 -msgid "" -"Enter here the (La)TeX command (for DVI preview) and some useful options." -msgstr "" -"Введите здесь (La)TeX команду (для предпросмотра DVI) и некоторые полезные " -"опции." +msgid "Enter here the (La)TeX command (for DVI preview) and some useful options." +msgstr "Введите здесь (La)TeX команду (для пред-просмотра DVI) и некоторые полезные опции." #: src/dialogs.c:1074 -msgid "" -"Enter here the (La)TeX command (for PDF preview) and some useful options." -msgstr "" -"Введите здесь (La)TeX команду (для предпросмотра DVI) и некоторые полезные " -"опции." +msgid "Enter here the (La)TeX command (for PDF preview) and some useful options." +msgstr "Введите здесь (La)TeX команду (для пред-просмотра DVI) и некоторые полезные опции." #: src/dialogs.c:1110 -msgid "" -"Sets the includes and library paths for the compiler and the program " -"arguments for execution\n" -msgstr "" -"Устанавливает включаемые заголовочные файлы и пути библиотекдля компилятора" -"(сборщика) и аргументов для запуска программ \n" +msgid "Sets the includes and library paths for the compiler and the program arguments for execution\n" +msgstr "Устанавливает включаемые заголовочные файлы и пути библиотек для компилятора(сборщика) и аргументов для запуска программ \n" #: src/dialogs.c:1119 msgid "Enter here arguments to your compiler." msgstr "Введите аргументы для Вашего компилятора(сборщика)" -#: src/dialogs.c:1125 src/dialogs.c:1148 src/dialogs.c:1172 +#: src/dialogs.c:1125 +#: src/dialogs.c:1148 +#: src/dialogs.c:1172 #, c-format msgid "" "%f will be replaced by the complete filename\n" @@ -1285,7 +1246,7 @@ "%e -> test_file" msgstr "" "%f будет заменено на полное имя файла\n" -"%e будет заменено на имя файла без разширения\n" +"%e будет заменено на имя файла без расширения\n" "Пример: test_file.c\n" "%f -> test_file.c\n" "%e -> test_file" @@ -1309,15 +1270,11 @@ #: src/dialogs.c:1231 msgid "" -"Explicitly defines a filetype for the file, if it would not be detected by " -"filename extension.\n" -"Note if you choose multiple files, they will all be opened with the chosen " -"filetype." +"Explicitly defines a filetype for the file, if it would not be detected by filename extension.\n" +"Note if you choose multiple files, they will all be opened with the chosen filetype." msgstr "" -"Ручная установка типа открываемого файла, если файл не будет распознан по " -"его разширению.\n" -"Если Вы выбрали не один файл, все они будут открываться с выбраным типом " -"файла." +"Ручная установка типа открываемого файла, если файл не будет распознан по его расширению.\n" +"Если Вы выбрали не один файл, все они будут открываться с выбранным типом файла." #: src/dialogs.c:1263 #, c-format @@ -1327,20 +1284,23 @@ "Start %s anyway?" msgstr "" "Папка конфигурации не может быть создана (%s).\n" -"Могут возникнуть некоторые проблеммы в использовании %s без конфигурационной " -"папки.\n" +"Могут возникнуть некоторые проблемы в использовании %s без конфигурационной папки.\n" "Запустить %s в любом случае?" #: src/dialogs.c:1312 -msgid "" -"An error occurred or file information could not be retrieved(e.g. from a new " -"file)." -msgstr "" -"Произошла ошибка или информация о файле не может быть получена(новый файл?)." +msgid "An error occurred or file information could not be retrieved(e.g. from a new file)." +msgstr "Произошла ошибка или информация о файле не может быть получена(новый файл?)." -#: src/dialogs.c:1332 src/dialogs.c:1333 src/dialogs.c:1334 src/dialogs.c:1340 -#: src/dialogs.c:1341 src/dialogs.c:1342 src/utils.c:108 src/utils.c:128 -#: src/utils.c:129 src/utils.c:1030 +#: src/dialogs.c:1332 +#: src/dialogs.c:1333 +#: src/dialogs.c:1334 +#: src/dialogs.c:1340 +#: src/dialogs.c:1341 +#: src/dialogs.c:1342 +#: src/utils.c:108 +#: src/utils.c:128 +#: src/utils.c:129 +#: src/utils.c:1030 msgid "unknown" msgstr "Неизвестный" @@ -1413,12 +1373,8 @@ msgstr "Прочие:" #: src/dialogs.c:1661 -msgid "" -"These are settings for the virtual terminal emulator widget (VTE). They only " -"apply, if the VTE library could be loaded." -msgstr "" -"Это установки для эмулятора виртуального терминала(VTE). Они только " -"действительны, если VTE-библиотека не была загружена." +msgid "These are settings for the virtual terminal emulator widget (VTE). They only apply, if the VTE library could be loaded." +msgstr "Это установки для эмулятора виртуального терминала(VTE). Они только действительны, если VTE-библиотека не была загружена." #: src/dialogs.c:1677 msgid "Terminal font" @@ -1449,22 +1405,16 @@ msgstr "Прокручиваемые строки" #: src/dialogs.c:1726 -msgid "" -"Specifies the history in lines, which you can scroll back in the terminal " -"widget." -msgstr "" -"Устанавливает историю строк, котрые Вы можете прокрутить назад в " -"терминальном окне." +msgid "Specifies the history in lines, which you can scroll back in the terminal widget." +msgstr "Устанавливает историю строк, которые Вы можете прокрутить назад в терминальном окне." #: src/dialogs.c:1730 msgid "Terminal emulation" msgstr "Эмуляция терминала" #: src/dialogs.c:1740 -msgid "" -"Controls how the terminal emulator should behave. xterm is a good start." -msgstr "" -"Устанавливает то, как эмулятор будет работать. xterm это хорошее начало." +msgid "Controls how the terminal emulator should behave. xterm is a good start." +msgstr "Устанавливает то, как эмулятор будет работать. xterm это хорошее начало." #: src/dialogs.c:1742 msgid "Scroll on keystroke" @@ -1499,21 +1449,20 @@ msgid "New file opened." msgstr "Открыт новый файл." -#: src/document.c:430 src/document.c:439 src/document.c:440 +#: src/document.c:430 +#: src/document.c:439 +#: src/document.c:440 msgid "Invalid filename" msgstr "Неправильное имя файла" #: src/document.c:462 #, c-format msgid "Could not open file %s (%s)" -msgstr "Немогу открыть файл %s (%s)" +msgstr "Не могу открыть файл %s (%s)" #: src/document.c:495 -msgid "" -"The file does not look like a text file or the file encoding is not " -"supported." -msgstr "" -"Этот файл не похож на текстовой или такая кодировка файла не поддерживаеться." +msgid "The file does not look like a text file or the file encoding is not supported." +msgstr "Этот файл не похож на текстовой или такая кодировка файла не поддерживается." #: src/document.c:533 #, c-format @@ -1529,7 +1478,8 @@ msgid ", read-only" msgstr ", только чтение" -#: src/document.c:601 src/document.c:640 +#: src/document.c:601 +#: src/document.c:640 msgid "Error saving file." msgstr "Ошибка записи файла." @@ -1561,10 +1511,8 @@ #: src/utils.c:120 #, c-format -msgid "" -"%c line: % 4d column: % 3d selection: % 4d %s mode: %s%s cur. " -"function: %s encoding: %s filetype: %s" -msgstr "" +msgid "%c line: % 4d column: % 3d selection: % 4d %s mode: %s%s cur. function: %s encoding: %s filetype: %s" +msgstr "%c строка: % 4d столбец: % 3d выделено: % 4d %s режим: %s%s тек.функция: %s кодировка: %s тип: %s" #: src/utils.c:124 msgid "OVR" @@ -1577,19 +1525,20 @@ #: src/utils.c:360 #, c-format msgid "Font updated (%s)." -msgstr "Font updated (%s)." +msgstr "Шрифт обновлен (%s)." -#: src/utils.c:374 src/geany.h:71 +#: src/utils.c:374 +#: src/geany.h:71 msgid "untitled" msgstr "Безимянный" #: src/utils.c:375 msgid "(Unsaved)" -msgstr "(Несохранено)" +msgstr "(Не сохранено)" #: src/utils.c:649 msgid "No tags found" -msgstr "Тэгов не найдено." +msgstr "Тегов не найдено." #: src/utils.c:952 #, c-format @@ -1598,7 +1547,7 @@ "the current buffer.\n" "Do you want to reload it?" msgstr "" -"Файл %s на дике более поздний чем в текущем буфере.\n" +"Файл %s на диске более поздний чем в текущем буфере.\n" "Перезагрузить его?" #: src/filetypes.c:53 @@ -1631,7 +1580,7 @@ #: src/filetypes.c:187 msgid "Python source file" -msgstr "Python исходный фай" +msgstr "Python исходный файл" #: src/filetypes.c:204 msgid "LaTeX source file" @@ -1699,12 +1648,8 @@ msgstr "%s конфигурационный файл, редактируйте по своим нуждам" #: src/keyfile.c:104 -msgid "" -" VTE settings: FONT;FOREGROUND;BACKGROUND;scrollback;type;scroll on " -"keystroke;scroll on output" -msgstr "" -"VTE установки: ШРИФТ;ПЕРЕДНИЙ_ПЛАН;ЗАДНИЙ_ПЛАН;scrollback;тип; scroll on " -"keystroke;scroll on output" +msgid " VTE settings: FONT;FOREGROUND;BACKGROUND;scrollback;type;scroll on keystroke;scroll on output" +msgstr "VTE установки: ШРИФТ;ПЕРЕДНИЙ_ПЛАН;ЗАДНИЙ_ПЛАН;scrollback;тип; scroll on keystroke;scroll on output" #: src/keyfile.c:229 msgid "Type here what you want, use it as a notice/scratch board" @@ -1719,7 +1664,9 @@ msgid "Failed to view %s (make sure it is already compiled)" msgstr "Ошибка при просмотре %s (убедитесь что файл собран(откомпилирован)" -#: src/build.c:116 src/build.c:277 src/build.c:414 +#: src/build.c:116 +#: src/build.c:277 +#: src/build.c:414 #, c-format msgid "Process failed (%s)" msgstr "Процесс остановлен (%s)" @@ -1736,11 +1683,8 @@ #: src/build.c:362 #, c-format -msgid "" -"Could not find terminal '%s' (check path for Terminal tool setting in " -"Preferences)" -msgstr "" -"Не могу найти терминал '%s' (проверьте путь для терминала в Настройках)" +msgid "Could not find terminal '%s' (check path for Terminal tool setting in Preferences)" +msgstr "Не могу найти терминал '%s' (проверьте путь для терминала в Настройках)" #: src/build.c:377 #, c-format @@ -1779,11 +1723,8 @@ #: src/prefs.c:704 #, c-format -msgid "" -"The combination '%s' is already used for \"%s\". Please choose another one." -msgstr "" -"Комбинация клавиш '%s' уже используеться для \"%s\". Пожалуйста выберите " -"другие." +msgid "The combination '%s' is already used for \"%s\". Please choose another one." +msgstr "Комбинация клавиш '%s' уже используется для \"%s\". Пожалуйста выберите другие." #: src/about.c:96 msgid "About Geany" @@ -1834,7 +1775,8 @@ msgid "Chapter" msgstr "Глава" -#: src/treeviews.c:67 src/treeviews.c:89 +#: src/treeviews.c:67 +#: src/treeviews.c:89 msgid "Section" msgstr "Раздел" @@ -1854,7 +1796,9 @@ msgid "Appendix" msgstr "Дополнение" -#: src/treeviews.c:77 src/treeviews.c:99 src/treeviews.c:161 +#: src/treeviews.c:77 +#: src/treeviews.c:99 +#: src/treeviews.c:161 msgid "Other" msgstr "Другое" @@ -1882,7 +1826,8 @@ msgid "Begin" msgstr "Начало" -#: src/treeviews.c:105 src/treeviews.c:147 +#: src/treeviews.c:105 +#: src/treeviews.c:147 msgid "Function" msgstr "Функция" @@ -1902,11 +1847,13 @@ msgid "Our" msgstr "Наш" -#: src/treeviews.c:126 src/treeviews.c:151 +#: src/treeviews.c:126 +#: src/treeviews.c:151 msgid "Methods" -msgstr "Мотоды" +msgstr "Методы" -#: src/treeviews.c:128 src/treeviews.c:149 +#: src/treeviews.c:128 +#: src/treeviews.c:149 msgid "Class" msgstr "Клас" @@ -1916,19 +1863,20 @@ #: src/treeviews.c:132 msgid "Mixin" -msgstr "" +msgstr "Смешать" -#: src/treeviews.c:134 src/treeviews.c:155 +#: src/treeviews.c:134 +#: src/treeviews.c:155 msgid "Variables" msgstr "Переменные" #: src/treeviews.c:136 msgid "Members" -msgstr "Соствляющие" +msgstr "Составляющие" #: src/treeviews.c:153 msgid "Macro" -msgstr "Макро" +msgstr "Макрос" #: src/treeviews.c:157 msgid "Namespace" @@ -1938,11 +1886,13 @@ msgid "Struct / Typedef" msgstr "Struct / Typedef" -#: src/treeviews.c:227 src/treeviews.c:279 +#: src/treeviews.c:227 +#: src/treeviews.c:279 msgid "Hide" msgstr "Скрыть" -#: src/treeviews.c:235 src/treeviews.c:287 +#: src/treeviews.c:235 +#: src/treeviews.c:287 msgid "Hide sidebar" msgstr "Скрыть боковую панель" @@ -1953,79 +1903,71 @@ #. init all fields of keys with default values #: src/keybindings.c:101 msgid "New" -msgstr "" +msgstr "Новый" #: src/keybindings.c:102 -#, fuzzy msgid "Open" -msgstr "Открыть Файл" +msgstr "Открыть" #: src/keybindings.c:103 -#, fuzzy msgid "Save" -msgstr "Сохранить ВСЁ" +msgstr "Сохранить" #: src/keybindings.c:105 msgid "Close all" -msgstr "Закрыть ВСЁ" +msgstr "Закрыть Все" #: src/keybindings.c:106 -#, fuzzy msgid "Reload file" -msgstr "Обновить" +msgstr "Перечитать файл" #: src/keybindings.c:107 msgid "Undo" -msgstr "" +msgstr "Отменить" #: src/keybindings.c:108 -#, fuzzy msgid "Redo" -msgstr "Чтение:" +msgstr "Накатить" #: src/keybindings.c:110 -#, fuzzy msgid "Find Next" -msgstr "Найти использование" +msgstr "Найти далее" #: src/keybindings.c:111 -#, fuzzy msgid "Find Previous" -msgstr "Найти следующее" +msgstr "Найти Предыдущее" #: src/keybindings.c:114 -#, fuzzy msgid "Show Colour Chooser" -msgstr "Отображать Выбор цвета" +msgstr "Показывать Выбор цвета" #: src/keybindings.c:115 msgid "Fullscreen" msgstr "Во весь экран" #: src/keybindings.c:116 -#, fuzzy msgid "Toggle Messages Window" -msgstr "Отображать окно сообщений" +msgstr "Показывать окно сообщений" #: src/keybindings.c:117 msgid "Zoom In" -msgstr "" +msgstr "Увеличить" #: src/keybindings.c:118 msgid "Zoom Out" -msgstr "" +msgstr "Уменьшить" #: src/keybindings.c:119 msgid "Replace tabs by space" -msgstr "Заменить табы пробелами" +msgstr "Заменить табуляции пробелами" #: src/keybindings.c:120 msgid "Fold all" -msgstr "Свернуть всё" +msgstr "Свернуть все" #: src/keybindings.c:121 msgid "Unfold all" -msgstr "Развернуть всё" +msgstr "Развернуть все" #: src/keybindings.c:122 msgid "Compile" @@ -2036,81 +1978,70 @@ msgstr "Построить" #: src/keybindings.c:125 -#, fuzzy msgid "Build with \"make\" (custom target)" -msgstr "Построить используя make (другая цель)" +msgstr "Построить с \"make\" (своя цель)" #: src/keybindings.c:127 msgid "Run (alternative command)" -msgstr "" +msgstr "Запустить (иная команда)" #: src/keybindings.c:128 msgid "Build options" -msgstr "" +msgstr "Опции сборки" #: src/keybindings.c:129 -#, fuzzy msgid "Reload symbol list" -msgstr "Отображать список тэгов" +msgstr "Перечитать список тегов" #: src/keybindings.c:130 -#, fuzzy msgid "Switch to Editor" -msgstr "весь документ" +msgstr "Перейти к редактору" #: src/keybindings.c:131 -#, fuzzy msgid "Switch to Scribble" -msgstr "Заметки" +msgstr "Перейти к заметкам" #: src/keybindings.c:132 -#, fuzzy msgid "Switch to VTE" -msgstr "Заметки" +msgstr "Переключиться в терминал" #: src/keybindings.c:133 -#, fuzzy msgid "Switch to left document" -msgstr "весь документ" +msgstr "Перейти на левый документ" #: src/keybindings.c:134 -#, fuzzy msgid "Switch to right document" -msgstr "весь документ" +msgstr "Перейти на правый документ" #: src/keybindings.c:135 -#, fuzzy msgid "Toggle sidebar" -msgstr "Скрыть боковую панель" +msgstr "Отображение боковой панели" #: src/keybindings.c:136 msgid "Duplicate line" -msgstr "" +msgstr "Дублировать строку" #: src/keybindings.c:137 -#, fuzzy msgid "Comment line" -msgstr "Перейти к строке" +msgstr "Комментировать строку" #: src/keybindings.c:138 -#, fuzzy msgid "Complete word" -msgstr "Компилятор" +msgstr "Полное слово" #: src/keybindings.c:139 msgid "Show calltip" -msgstr "" +msgstr "Показать подсказку" #: src/keybindings.c:140 -#, fuzzy msgid "Show macro list" -msgstr "Отображать список тэгов" +msgstr "Показать список макросов" #: src/keybindings.c:141 -#, fuzzy msgid "Suppress auto completion" -msgstr "Автозавершение конструкций" +msgstr "Авто-завершение конструкций" #, fuzzy #~ msgid "Show Color Chooser" #~ 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: [444] trunk/po
by kretek＠users.sourceforge.net 13 Jun '06

13 Jun '06

Revision: 444 Author: kretek Date: 2006-06-13 14:35:21 -0700 (Tue, 13 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=444&view=rev Log Message: ----------- po/be.po: Updated fuzzy entries, fixed a lot of errors, added missing translations Modified Paths: -------------- trunk/po/ChangeLog trunk/po/be.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2006-06-13 20:03:44 UTC (rev 443) +++ trunk/po/ChangeLog 2006-06-13 21:35:21 UTC (rev 444) @@ -1,8 +1,10 @@ 2006-06-13 Frank Lanitz <frank(a)frank.uvena.de> - * ru.po: Minor update + * be.po: Updated fuzzy entries, fixed a lot of errors, added + missing translations by Yura Semashko <yurand2(a)gmail.com> * de.po: Update, mostly Strings for shortcuts * geany.pot: Update of catalog + * ru.po: Minor update 2006-06-12 Frank Lanitz <frank(a)frank.uvena.de> Modified: trunk/po/be.po =================================================================== --- trunk/po/be.po 2006-06-13 20:03:44 UTC (rev 443) +++ trunk/po/be.po 2006-06-13 21:35:21 UTC (rev 444) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: geany 0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-06-06 17:58+0200\n" +"POT-Creation-Date: 2006-06-13 10:35+0200\n" "PO-Revision-Date: 2006-06-01 10:55+0200\n" "Last-Translator: Yura Semashko <yurand2(a)gmail.com>\n" "Language-Team: Belarusian <yurand2(a)gmail.com>\n" @@ -18,7 +18,39 @@ "X-Poedit-Country: BELARUS\n" "X-Poedit-SourceCharset: utf-8\n" -#: src/main.c:389 +#: src/main.c:70 +msgid "runs in debug mode (means being verbose)" +msgstr "працаваць у рэжыму адладкі (больш паведамленьняў)" + +#: src/main.c:71 +msgid "don't load auto completion data (see documentation)" +msgstr "не загружаць файлы аўта дапаўненьня (глядзі дакумэнтацыю)" + +#: src/main.c:73 +msgid "don't open files in a running instance, force opening a new instance" +msgstr "не адчыняць файлы ў працуючай праграме, запускаць новую" + +#: src/main.c:75 +msgid "use an alternate configuration directory" +msgstr "выкарыстоўваць іншую наладкавую дырэкторыю" + +#: src/main.c:76 +msgid "don't show message window at startup" +msgstr "Не паказаць акно паведамленьняў пры запуску" + +#: src/main.c:78 +msgid "don't load terminal support" +msgstr "не загружаць падтрымку тэрмінала" + +#: src/main.c:79 +msgid "filename of libvte.so" +msgstr "імя файла libvte.so" + +#: src/main.c:81 +msgid "show version and exit" +msgstr "паказаць вэрсію і выйсьці" + +#: src/main.c:394 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 " @@ -30,17 +62,21 @@ "named pipe і запусьціць Geany усё роўна.\n" "Выдаліць named pipe?" -#: src/main.c:429 +#: src/main.c:436 +msgid " - A fast and lightweight IDE" +msgstr " - Хуткае лёгкае IDE" + +#: src/main.c:446 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(збудаваны на %s з GTK %d.%d.%d, GLib %d.%d.%d)" -#: src/main.c:504 +#: src/main.c:518 #, c-format msgid "This is Geany %s." msgstr "Geany %s." -#: src/main.c:506 +#: src/main.c:520 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Немагчыма зрабіць наладкавую дырэкторыю (%s)." @@ -54,7 +90,7 @@ msgstr "_Файл" #: src/interface.c:231 -msgid "New (with template)" +msgid "New (with _template)" msgstr "Новы (з шаблёнам)" #: src/interface.c:242 src/interface.c:319 src/interface.c:384 @@ -62,7 +98,7 @@ msgid "invisible" msgstr "нябачна" -#: src/interface.c:267 src/interface.c:709 +#: src/interface.c:267 src/interface.c:709 src/keybindings.c:104 msgid "Save all" msgstr "Захаваць усе" @@ -71,7 +107,7 @@ msgstr "Захаваць усе адчыненыя файлы" #: src/interface.c:298 -msgid "Close all" +msgid "C_lose all" msgstr "Зачыніць усе" #: src/interface.c:301 @@ -79,7 +115,7 @@ msgstr "Зачыніць усе адкрытыя файлы" #: src/interface.c:312 -msgid "Recent files" +msgid "Recent _files" msgstr "Нядаўнія файлы" #: src/interface.c:330 src/interface.c:819 @@ -140,7 +176,7 @@ #: src/interface.c:428 src/interface.c:1600 msgid "Change Selection" -msgstr "Змянiць вылучэньне" +msgstr "Зьмяніць вылучэньне" #: src/interface.c:435 src/interface.c:1607 msgid "To lower-case" @@ -152,7 +188,7 @@ #: src/interface.c:443 msgid "_Count words" -msgstr "_Лічыць слава" +msgstr "_Лічыць словы" #: src/interface.c:446 msgid "" @@ -185,7 +221,7 @@ msgstr "_Выгляд" #: src/interface.c:504 -msgid "Change Font" +msgid "Change _Font" msgstr "Зьмяніць шрыфт" #: src/interface.c:507 @@ -193,7 +229,7 @@ msgstr "Зьмяніць дэфолтны шрыфт" #: src/interface.c:513 -msgid "Show Color Chooser" +msgid "Show _Colour Chooser" msgstr "Вылучыць колер" #: src/interface.c:516 src/interface.c:749 @@ -202,28 +238,28 @@ msgstr "Адчыніць дыялёг, для вылучэньня колеру з палітры." #: src/interface.c:527 -msgid "Fullscreen" +msgid "Full_screen" msgstr "Увесь экран" #: src/interface.c:531 -msgid "Show messages window" -msgstr "Паказаць акно паведамленьняў" +msgid "Show Messages _Window" +msgstr "Паказваць вакно паведамленьняў" #: src/interface.c:534 msgid "Toggle the window with status and compiler messages on and off" msgstr "Паказаць/Схаваць акно з паведамленьнямі і статусам кампілятара" #: src/interface.c:537 -msgid "Show Toolbar" -msgstr "Паказаць панэль прыладаў" +msgid "Show _Toolbar" +msgstr "Паказваць панэль прыладаў" #: src/interface.c:540 msgid "Toggle the toolbar on and off" msgstr "Паказаць/Схаваць акно прыладаў" #: src/interface.c:543 -msgid "Show Markers Margin" -msgstr "Show Markers Margin" +msgid "Show _Markers Margin" +msgstr "Паказваць _Markers Margin" #: src/interface.c:546 msgid "" @@ -234,7 +270,7 @@ "радкоў, справа ад нумару радка." #: src/interface.c:549 -msgid "Show Line Numbers" +msgid "Show _Line Numbers" msgstr "Паказваць нумар радка" #: src/interface.c:552 @@ -243,10 +279,10 @@ #: src/interface.c:572 msgid "_Document" -msgstr "_Дакумент" +msgstr "_Дакумэнт" #: src/interface.c:579 -msgid "Line breaking" +msgid "_Line breaking" msgstr "Разлучыцель радкоў" #: src/interface.c:582 @@ -254,7 +290,7 @@ msgstr "Разлучыць радкі на рысе вакна і працягваць з наступнага радка" #: src/interface.c:585 -msgid "Use auto indention" +msgid "_Use auto indention" msgstr "Выкарыстоўваць аўтаматычнае фарматаванне" #: src/interface.c:590 @@ -286,15 +322,15 @@ msgstr "Зьмяніць на CR (Mac)" #: src/interface.c:634 -msgid "Replace tabs by space" -msgstr "Зьмяніць табуляцыю на прабелы" +msgid "_Replace tabs by space" +msgstr "Зьмяняць табуляцыю на прабелы" #: src/interface.c:637 msgid "Replaces all tabs in document by spaces." msgstr "Зьмяніць усе табуляцыі ў дакумэнце на прабелы." #: src/interface.c:644 -msgid "Fold all" +msgid "_Fold all" msgstr "Зьвярнуць усе" #: src/interface.c:647 @@ -302,7 +338,7 @@ msgstr "Зьвярнуць усе блёкі кода" #: src/interface.c:649 -msgid "Unfold all" +msgid "_Unfold all" msgstr "Разьвярнуць усе" #: src/interface.c:652 @@ -311,7 +347,7 @@ #. build the code #: src/interface.c:654 src/dialogs.c:521 -msgid "Build" +msgid "_Build" msgstr "Пабудаваць" #: src/interface.c:658 @@ -344,11 +380,11 @@ #: src/interface.c:712 msgid "Save all open files" -msgstr "Захаваць усе адчыненныя файлы" +msgstr "Захаваць усе адчыненыя файлы" #: src/interface.c:717 msgid "Reload the current file from disk" -msgstr "Загрузіць тякучы файл з дыска" +msgstr "Загрузіць цякучы файл з дыска" #: src/interface.c:722 msgid "Close the current file" @@ -356,15 +392,15 @@ #: src/interface.c:731 msgid "Compile the current file" -msgstr "Адкампіліраваць тякучы файл" +msgstr "Адкампіліраваць цякучы файл" -#: src/interface.c:735 +#: src/interface.c:735 src/keybindings.c:126 msgid "Run" -msgstr "Запусціць" +msgstr "Запусьціць" #: src/interface.c:738 src/dialogs.c:560 msgid "Run or view the current file" -msgstr "Выканаць альбо глядзець тякучы файл" +msgstr "Выканаць альбо глядзець цякучы файл" #: src/interface.c:746 msgid "Color" @@ -372,15 +408,15 @@ #: src/interface.c:758 msgid "Zoom in the text" -msgstr "Amplia" +msgstr "Павялічыць тэкст" #: src/interface.c:763 msgid "Zoom out the text" -msgstr "Павялічыць/Зменшыць тэкст" +msgstr "Зьменшыць тэкст" #: src/interface.c:776 src/interface.c:781 msgid "Find the entered text in the current file" -msgstr "Знайсці уведзены тэкст у цякучым файле" +msgstr "Знайсьці уведзены тэкст у цякучым файле" #: src/interface.c:794 msgid "Enter a line number and jump to it." @@ -388,7 +424,7 @@ #: src/interface.c:801 msgid "Jump to the entered line number." -msgstr "Перайсць да ўведзеннага радка." +msgstr "Перайсьці да ўведзенага радка." #: src/interface.c:846 src/treeviews.c:40 msgid "Symbols" @@ -400,7 +436,7 @@ #: src/interface.c:894 msgid "Status" -msgstr "Састаянне" +msgstr "Стан" #: src/interface.c:908 msgid "Compiler" @@ -408,11 +444,11 @@ #: src/interface.c:922 msgid "Messages" -msgstr "Паведамленні" +msgstr "Паведамленьні" #: src/interface.c:935 msgid "Scribble" -msgstr "Падпісацца" +msgstr "Для заметак" #: src/interface.c:1366 msgid "Images and text" @@ -444,27 +480,27 @@ #: src/interface.c:1620 msgid "Find usage" -msgstr "Знайсці выкарыстоўванне" +msgstr "Знайсьці выкарыстоўваньне" #: src/interface.c:1628 msgid "Go to tag declaration" -msgstr "Ісці да аб'явы" +msgstr "Ісьці да аб'явы" #: src/interface.c:1632 msgid "Go to tag definition" -msgstr "Перайcці да рэалізацыі" +msgstr "Перайсьці да рэалізацыі" -#: src/interface.c:1641 src/dialogs.c:763 +#: src/interface.c:1641 src/dialogs.c:763 src/keybindings.c:113 msgid "Go to line" -msgstr "Перайcці да радка" +msgstr "Перайсьці да радка" #: src/interface.c:1644 msgid "Goto to the entered line" -msgstr "Перайсці да ўведзеннага радка" +msgstr "Перайсьці да ўведзенага радка" -#: src/interface.c:1889 +#: src/interface.c:1889 src/keybindings.c:109 msgid "Preferences" -msgstr "Уласцівасці" +msgstr "Уласьцівасьці" #: src/interface.c:1925 msgid "MRU list length:" @@ -473,43 +509,43 @@ #: src/interface.c:1933 msgid "" "Specifies the number of files which are stored in the Recent files list." -msgstr "Указаць колькі файлаў трэба паказваць у спісе нядаўніх файлаў." +msgstr "Указаць колькі файлаў трэба паказваць у сьпісе нядаўніх файлаў." #: src/interface.c:1937 msgid "Load files from the last session" -msgstr "Загрузіць файлы з апошняга сеансу" +msgstr "Загрузіць файлы з апошняга сэансу" #: src/interface.c:1941 msgid "Opens at startup the files from the last session" -msgstr "Адчыняць файлы з апошняга сеансу пры старце" +msgstr "Адчыняць файлы з апошняга сэансу пры старце" #: src/interface.c:1944 msgid "Save window position and geometry" -msgstr "Захаваць пазіцыю вокан і геаметрыю" +msgstr "Захаваць пазыцыю вокан і геамэтрыю" #: src/interface.c:1948 msgid "Saves the window position and geometry and restores it at the start" -msgstr "Захаваць пазіцыю вокан і геаметрыю, і аднаўляць яе пры старце" +msgstr "Захаваць пазыцыю вокан і геамэтрыю, і аднаўляць яе пры старце" #: src/interface.c:1951 msgid "Beep on errors or when compilation has finished" -msgstr "Гудак пры памылках, ці на завяршэнне кампіляцыі" +msgstr "Гудок пры памылках, ці на завяршэньне кампіляцыі" #: src/interface.c:1954 msgid "" "Whether to beep if an error occured or when the compilation process has " "finished." -msgstr "Ці трэба гуддець пры памылкі, ці на завяршэнне кампіляцыі." +msgstr "Ці трэба гудзець пры памылкі, ці на завяршэньне кампіляцыі." #: src/interface.c:1957 msgid "Switch to status message list at new message" -msgstr "Пералючацца ў вакно паведамленняў, пры з'яўленні новага" +msgstr "Пераключацца ў вакно паведамленьняў, пры з'яўленні новага" #: src/interface.c:1960 msgid "" "Switch to the status message tab(in the notebook window at the bottom) if a " "new status message arrive." -msgstr "Пералючацца ў вакно паведамленняў, пры з'яўленні новага." +msgstr "Пераключацца ў вакно паведамленьняў, пры з'яўленні новага." #: src/interface.c:1963 msgid "Load virtual terminal emulation at startup" @@ -525,23 +561,23 @@ #: src/interface.c:1968 msgid "Confirm exit" -msgstr "Падтвярждаць выхад" +msgstr "Пацьвярджаць выхад" #: src/interface.c:1972 msgid "Shows a confirmation dialog on exit." -msgstr "Паказваць падцвярджаючы дыялог пры выхадзе." +msgstr "Паказваць пацьвярджаючы дыялёг пры выхадзе." #: src/interface.c:1979 msgid "Placement of new file tabs: " -msgstr "Пазіцыя новых файлаў ў закладцы файлаў" +msgstr "Пазыцыя новых файлаў ў закладцы файлаў" #: src/interface.c:1983 msgid "Left" -msgstr "Слева" +msgstr "Улева" #: src/interface.c:1986 msgid "New file tabs will be placed to the left of the tab list" -msgstr "Новыя файлы будуць памешчаны злева у закладцы файлаў" +msgstr "Новыя файлы будуць зьмешчаны зьлева у закладцы файлаў" #: src/interface.c:1995 msgid "Right" @@ -549,7 +585,7 @@ #: src/interface.c:1998 msgid "New file tabs will be placed to the right of the tab list" -msgstr "Новыя файлы будуць памешчаны справа у закладцы файлаў" +msgstr "Новыя файлы будуць зьмешчаны справа у закладцы файлаў" #: src/interface.c:2002 src/interface.c:2327 msgid "Miscellaneous" @@ -565,11 +601,11 @@ #: src/interface.c:2033 msgid "Show goto line field" -msgstr "Паказваць поле перайсці да радка" +msgstr "Паказваць поле перайсьці да радка" #: src/interface.c:2037 msgid "Display the line number field and button in the toolbar" -msgstr "Паказваць поле перайсці да радка і кнопку на панэлі прылад" +msgstr "Паказваць поле перайсьці да радка і кнопку на панэлі прылад" #: src/interface.c:2040 msgid "Toolbar" @@ -577,15 +613,15 @@ #: src/interface.c:2064 msgid "Show symbol list" -msgstr "Паказваць спіс сімвалаў" +msgstr "Паказваць сьпіс сімвалаў" #: src/interface.c:2067 src/interface.c:2073 msgid "Toggle the symbol list on and off" -msgstr "Паказаць/Схаваць спіс сімвалаў" +msgstr "Паказаць/Схаваць сьпіс сімвалаў" #: src/interface.c:2070 msgid "Show open files list" -msgstr "Паказаць спіс адчыненных файлаў" +msgstr "Паказаць сьпіс адчыненых файлаў" #: src/interface.c:2076 msgid "Sidebar" @@ -593,15 +629,15 @@ #: src/interface.c:2102 msgid "Symbol list font" -msgstr "Шрыфт спіса сімвалаў" +msgstr "Шрыфт сьпіса сімвалаў" #: src/interface.c:2109 msgid "Message window font" -msgstr "Шрыфт спіса паведамленняў" +msgstr "Шрыфт сьпіса паведамленьняў" #: src/interface.c:2121 msgid "Sets the font for the message window" -msgstr "Усталяваць шрыфт для вакна паведамленняў" +msgstr "Усталяваць шрыфт для вакна паведамленьняў" #: src/interface.c:2129 msgid "Sets the font for symbol list window" @@ -617,11 +653,11 @@ #: src/interface.c:2165 msgid "Tab Width" -msgstr "Шырына зкладкі" +msgstr "Шырыня закладкі" #: src/interface.c:2178 msgid "The width in chars, which one tab character will take" -msgstr "Шырына адной зкладкі ў пікселях" +msgstr "Шырыня адной закладкі ў кропках" #: src/interface.c:2183 msgid "New files" @@ -637,11 +673,11 @@ #: src/interface.c:2209 msgid "Ensure new line at file end" -msgstr "Забяспечыць пусты радок у канцы файла" +msgstr "Забясьпечыць пусты радок у канцы файла" #: src/interface.c:2213 msgid "Ensures that at the end of the file is a new line" -msgstr "Забяспечыць пусты радок у канцы файла" +msgstr "Забясьпечыць пусты радок у канцы файла" #: src/interface.c:2216 msgid "Saving files" @@ -653,7 +689,7 @@ #: src/interface.c:2238 msgid "Shows small dotted lines to help you to use the right indention." -msgstr "Паказваць маленькія лініі з кропкамі дапамагаючыя фарматыраванню." +msgstr "Паказваць маленькія рысы з кропкамі дапамагаючыя фарматыраванню." #: src/interface.c:2241 msgid "Show white space" @@ -665,32 +701,32 @@ #: src/interface.c:2247 msgid "Show line endings" -msgstr "Паказваць завяршэнне радка" +msgstr "Паказваць завяршэньне радка" #: src/interface.c:2250 msgid "Show the line ending character" -msgstr "Паказваць сімвал завяршэнне радка (EOL)" +msgstr "Паказваць сімвал завяршэньне радка (EOL)" #: src/interface.c:2253 msgid "XML tag auto completion" -msgstr "XML таг аўта дапаўненне" +msgstr "XML таг аўтададатку" #: src/interface.c:2256 msgid "Automatic completion of open XML tags(includes HTML tags)" -msgstr "Аўтаматычна закрываць адчыненныя XML тагі (таксама для HTML)" +msgstr "Аўтаматычна закрываць адчыненыя XML тагі (таксама для HTML)" #: src/interface.c:2259 msgid "Construct auto completion" -msgstr "Саздаць аўта дапаўненне" +msgstr "Стварыць аўта дапаўненьне" #: src/interface.c:2262 msgid "Automatic completion of often used constructs like if and for" msgstr "" -"Аўтаматычнае дапаўненне часта выкарыстоўваемых канструкцый 'if' альбо 'for'" +"Аўтаматычнае дапаўненьне часта выкарыстоўваемых канструкцый 'if' альбо 'for'" #: src/interface.c:2265 msgid "Enable folding" -msgstr "Дазвольць фолдінг" +msgstr "Дазволіць фолдінг" #: src/interface.c:2268 msgid "Whether to enable folding the code" @@ -702,11 +738,11 @@ #: src/interface.c:2288 msgid "Long line marker" -msgstr "Маркер доўгага радка" +msgstr "Маркёр доўгага радка" #: src/interface.c:2295 msgid "Long line marker color" -msgstr "Колер маркера доўгага радка" +msgstr "Колер маркёра доўгага радка" #: src/interface.c:2307 msgid "Sets the font for the editors windows" @@ -718,18 +754,18 @@ "long lines, or as a hint to break the line. To disable set the value to 0, " "or greater than 0 to specify the column where it should appear." msgstr "" -"Маркер доўгага радка - тонкая вертыкальная рыса ў рэдактары. Яна дапамагае " +"Маркёр доўгага радка - тонкая вэртыкальная рыса ў рэдактары. Яна дапамагае " "вылучыць доўгія радкі. Каб забараніць пастаўце 0, ці ўкажыце праз колькі " "літар яна павінна паявіцца" #: src/interface.c:2324 msgid "Sets the color of the long line marker" -msgstr "Усталяваць колер маркера доўгага радка" +msgstr "Усталяваць колер маркёра доўгага радка" -#: src/interface.c:2325 src/dialogs.c:477 src/dialogs.c:1705 -#: src/dialogs.c:1712 +#: src/interface.c:2325 src/dialogs.c:477 src/dialogs.c:1706 +#: src/dialogs.c:1713 msgid "Color Chooser" -msgstr "Выбар колера" +msgstr "Выбар колеру" #: src/interface.c:2332 msgid "Editor" @@ -741,19 +777,19 @@ "(tools you do not need can be let blank)" msgstr "" "Увядзіце пуць да прылады make і да кампілятара\n" -"(прылады якія вам не патрэбны можаце аставіць пустымі)" +"(прылады якія вам не патрэбны можаце пакінуць пустымі)" #: src/interface.c:2351 msgid "Make" msgstr "Зрабіць" -#: src/interface.c:2358 src/dialogs.c:1755 src/vte.c:163 +#: src/interface.c:2358 src/dialogs.c:1756 src/vte.c:163 msgid "Terminal" msgstr "Тэрмінал" #: src/interface.c:2365 msgid "Browser" -msgstr "Браўзер" +msgstr "Браўзэр" #: src/interface.c:2377 msgid "Path and options for the make tool" @@ -765,11 +801,11 @@ "-e argument)" msgstr "" "Тэрмінал эмулятар як xterm, gnome-terminal o konsole (павінен прымаць -е " -"аргумент)" +"аргумэнт)" #: src/interface.c:2391 msgid "Path (and possibly additional arguments) to your favorite browser" -msgstr "Пуць і (магчыма) дадатковыя аргументы да браўзера" +msgstr "Пуць і (магчыма) дадатковыя аргумэнты да браўзэра" #: src/interface.c:2423 msgid "Tools" @@ -780,8 +816,8 @@ "Specify here information you want to use in templates.\n" "See documentation if you don't know, how templates work." msgstr "" -"Укажы інфармацыю якую жадаеш выкарыстоўваць у шаблонах.\n" -"Глядзі дакументацыю калі не ведаеш як працуюць шаблоны." +"Укажы інфармацыю якую жадаеш выкарыстоўваць у шаблёнах.\n" +"Глядзі дакумэнтацыю калі не ведаеш як працуюць шаблёны." #: src/interface.c:2447 msgid "email address of the developer" @@ -793,11 +829,11 @@ #: src/interface.c:2456 msgid "Initial Version" -msgstr "Ізначальная версія" +msgstr "Пачатковая вэрсія" #: src/interface.c:2468 msgid "Version number, which a new file initially has" -msgstr "Нумар версіі, які файл мае ізначальна." +msgstr "Нумар вэрсіі, які файл мае пачаткова." #: src/interface.c:2475 msgid "Company name" @@ -817,7 +853,7 @@ #: src/interface.c:2498 msgid "Initials" -msgstr "Ініцыалы" +msgstr "Ініцыялы" #: src/interface.c:2510 msgid "The name of the developer" @@ -828,11 +864,11 @@ "Notice: For all changes you make here,\n" "you need to restart Geany to take effect." msgstr "" -"Заўвага: Усе змяненні тут патрабуюць перазапуск Geany, каб уступіць у сілу." +"Заўвага: Усе зьмяненьні тут патрабуюць перазапуск Geany, каб уступіць у сілу." #: src/interface.c:2516 msgid "Templates" -msgstr "Шаблоны" +msgstr "Шаблёны" #: src/interface.c:2524 msgid "" @@ -841,53 +877,59 @@ "shortcut. You can also edit the string representation of the shortcut " "directly." msgstr "" -"Тут можна змяніць клавішы для розных спраў. Зрабі даблклік на справе. Ці " -"націсні кнопку Змяніць. Вы можаце таксама змяняць строкавае адлюстраванне." +"Тут можна зьмяніць клявішы для розных спраў. Зрабі даблклік на справе. Ці " +"націсьні кнопку Зьмяніць. Вы можаце таксама зьмяніць пісьмовае адлюстраванае." #: src/interface.c:2547 msgid "Change" -msgstr "Змяніць" +msgstr "Зьмяніць" #: src/interface.c:2551 msgid "Keybindings" -msgstr "Пывязкі клавіш" +msgstr "Прывязкі клявіш" -#: src/callbacks.c:204 src/callbacks.c:219 +#: src/callbacks.c:209 src/callbacks.c:224 msgid "Do you really want to quit?" -msgstr "Вы ўпэнены што жадаеце выйсці?" +msgstr "Вы ўпэўнены што жадаеце выйсьці?" -#: src/callbacks.c:454 +#: src/callbacks.c:459 #, c-format msgid "" "Are you sure you want to reload '%s'?\n" "Any unsaved changes will be lost." msgstr "" "Вы упэўнены што жадаеце загрузіць зноў '%s?'\n" -"Усе незахаваныя змяненні зьнікнут." +"Усе незахаваныя зьмяненьні зніктут." -#: src/callbacks.c:844 +#: src/callbacks.c:849 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Файл '%s' ужо існуе. Замяніць яго?" -#: src/callbacks.c:1310 src/callbacks.c:1319 +#: src/callbacks.c:1330 src/callbacks.c:1339 #, c-format msgid "Declaration or definition of \"%s()\" not found" msgstr "Аб'яуленне ці рэалізацыя \"%s() не знойдзена\"" -#: src/callbacks.c:1628 +#: src/callbacks.c:1648 msgid "Failed to execute the view program" msgstr "Немагчыма запусьціць праграму прагляду" -#: src/callbacks.c:1636 +#: src/callbacks.c:1656 msgid "Failed to execute the terminal program" msgstr "Немагчыма запусьціць тэрмінальную праграму" #. initialize the dialog -#: src/callbacks.c:1959 src/dialogs.c:69 +#: src/callbacks.c:1979 src/dialogs.c:69 msgid "Open File" msgstr "Адчыніць файл" +#: src/callbacks.c:2028 src/callbacks.c:2078 src/callbacks.c:2118 +#: src/callbacks.c:2178 +msgid "" +"Please set the filetype for the current file before using this function." +msgstr "Калі ласка вызначыце тып файла перад выкарыстоўваньнем гэтай функцыі" + #: src/support.c:90 src/support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" @@ -923,7 +965,7 @@ msgid "The match \"%s\" was not found. Wrap search around the document?" msgstr "\"%s\" не знойдзены. Шукаць вакол дакумэнта?" -#: src/dialogs.c:242 src/dialogs.c:1823 +#: src/dialogs.c:242 src/dialogs.c:1824 msgid "Question" msgstr "Пытаньне" @@ -963,7 +1005,7 @@ #: src/dialogs.c:433 msgid "Word Count" -msgstr "Лічыць слава" +msgstr "Лічыць словы" #: src/dialogs.c:442 msgid "selection" @@ -990,7 +1032,7 @@ #. compile the code #: src/dialogs.c:505 -msgid "Compile" +msgid "_Compile" msgstr "Кампіліраваць" #: src/dialogs.c:508 @@ -1002,7 +1044,7 @@ msgstr "Будаваць цякучы файл (стварыць запускаемы)" #. build the code with make all -#: src/dialogs.c:534 src/dialogs.c:631 +#: src/dialogs.c:534 src/dialogs.c:631 src/keybindings.c:124 msgid "Build with \"make\"" msgstr "Будаваць з \"make\"" @@ -1011,9 +1053,9 @@ msgstr "Збудаваць цякучы файл выкарыстоўваючы прыладу make." #. build the code with make -#: src/dialogs.c:545 src/dialogs.c:642 -msgid "Build with make (custom target)" -msgstr "Будаваць з make (свая цэль)" +#: src/dialogs.c:545 +msgid "Build with \"_make\" (custom _target)" +msgstr "Будаваць з \"make\" (вызначыць цэль)" #: src/dialogs.c:551 src/dialogs.c:648 msgid "Builds the current file with the make tool and the specified target" @@ -1047,6 +1089,11 @@ msgid "Compiles the current file into a PDF file" msgstr "Адкампіліраваць цякучы файл у PDF" +#. build the code with make +#: src/dialogs.c:642 +msgid "Build with make (custom target)" +msgstr "Будаваць з make (свая цэль)" + #. DVI view #: src/dialogs.c:653 msgid "View DVI file" @@ -1072,16 +1119,16 @@ #: src/dialogs.c:733 msgid "Enter custom options for the make tool" -msgstr "Увядзі свае опцыі тут, тэкст будзе перадан make." +msgstr "Увядзі свае наладкі тут, тэкст будзе пераданы make." #: src/dialogs.c:738 msgid "" "Enter custom options here, all entered text is passed to the make command." -msgstr "Увядзі свае опцыі тут, тэкст будзе перадан make." +msgstr "Увядзі свае наладкі тут, тэкст будзе пераданы make." #: src/dialogs.c:768 msgid "Enter the line you want to go to" -msgstr "Увядзі лінію да пераходу" +msgstr "Увядзі радок да пераходу" #: src/dialogs.c:800 msgid "Find" @@ -1117,7 +1164,7 @@ msgid "Match only word s_tart" msgstr "Падыходзіць толькі пачатак слоў" -#: src/dialogs.c:893 +#: src/dialogs.c:893 src/keybindings.c:112 msgid "Replace" msgstr "Замяніць" @@ -1148,22 +1195,22 @@ #: src/dialogs.c:1011 msgid "" "Enter here the (La)TeX command (for DVI creation) and some useful options." -msgstr "Увядзі (La)TeX каманду (для стварэньня DVI) і карысныя опцыі." +msgstr "Увядзі (La)TeX каманду (для стварэньня DVI) і карысныя наладкі." #: src/dialogs.c:1032 msgid "" "Enter here the (La)TeX command (for PDF creation) and some useful options." -msgstr "Увядзі (La)TeX каманду (для стварэньня PDF) і карысныя опцыі." +msgstr "Увядзі (La)TeX каманду (для стварэньня PDF) і карысныя наладкі." #: src/dialogs.c:1053 msgid "" "Enter here the (La)TeX command (for DVI preview) and some useful options." -msgstr "Увядзі (La)TeX каманду (для прагляду DVI) і карысныя опцыі." +msgstr "Увядзі (La)TeX каманду (для прагляду DVI) і карысныя наладкі." #: src/dialogs.c:1074 msgid "" "Enter here the (La)TeX command (for PDF preview) and some useful options." -msgstr "Увядзі (La)TeX каманду (для прагляду PDF) і карысныя опцыі " +msgstr "Увядзі (La)TeX каманду (для прагляду PDF) і карысныя наладкі " #: src/dialogs.c:1110 msgid "" @@ -1226,7 +1273,7 @@ "Start %s anyway?" msgstr "" "Немагчыма стварыць дырэкторыю наладак (%s).\n" -"Праблемы з выкарыстоўваннем %s як дырэкторыі наладак.\n" +"Праблемы з выкарыстоўваньнем %s як дырэкторыі наладак.\n" "Запусьціць %s усё роўна?" #: src/dialogs.c:1312 @@ -1310,148 +1357,148 @@ msgid "Other:" msgstr "Другі:" -#: src/dialogs.c:1660 +#: src/dialogs.c:1661 msgid "" "These are settings for the virtual terminal emulator widget (VTE). They only " "apply, if the VTE library could be loaded." msgstr "" "Гэтыя наладкі дзеля віртуальнага тэрмінал эмулятара (VTE). Яны нешта " -"вызначаюць толькі калі VTE бібліятэкаўсталёвана." +"вызначаюць толькі калі VTE бібліятэка ўсталёвана." -#: src/dialogs.c:1676 +#: src/dialogs.c:1677 msgid "Terminal font" msgstr "Шрыфт тэрмінала" -#: src/dialogs.c:1686 +#: src/dialogs.c:1687 msgid "Sets the font for the terminal widget." msgstr "Усталяваць шрыфт тэрмінальнага віджэта." -#: src/dialogs.c:1688 +#: src/dialogs.c:1689 msgid "Foreground color" msgstr "Foreground колер" -#: src/dialogs.c:1694 +#: src/dialogs.c:1695 msgid "Background color" msgstr "Background колер" -#: src/dialogs.c:1704 +#: src/dialogs.c:1705 msgid "Sets the foreground color of the text in the terminal widget." msgstr "Усталяваць колер тэксту для тэрмінальнага віджэта." -#: src/dialogs.c:1711 +#: src/dialogs.c:1712 msgid "Sets the background color of the text in the terminal widget." msgstr "Усталяваць колер паперы для тэрмінальнага віджэта." -#: src/dialogs.c:1714 +#: src/dialogs.c:1715 msgid "Scrollback lines" msgstr "Пра лістаць назад радкі" -#: src/dialogs.c:1725 +#: src/dialogs.c:1726 msgid "" "Specifies the history in lines, which you can scroll back in the terminal " "widget." msgstr "" "Указаць колькі радкоў гісторыі можна пра лістаць у тэрмінале тэрмінале." -#: src/dialogs.c:1729 +#: src/dialogs.c:1730 msgid "Terminal emulation" msgstr "Эмуляцыя тэрмінала" -#: src/dialogs.c:1739 +#: src/dialogs.c:1740 msgid "" "Controls how the terminal emulator should behave. xterm is a good start." msgstr "" "Кантраляваць як тэрмінал эмулятар павінен паводзіць, xterm добры пачатак." -#: src/dialogs.c:1741 +#: src/dialogs.c:1742 msgid "Scroll on keystroke" msgstr "Пра лістаць уніз пры нажацці клявішы." -#: src/dialogs.c:1745 +#: src/dialogs.c:1746 msgid "Whether to scroll to the bottom if a key was pressed." msgstr "Пра лістаць уніз калі нажаць клявішу." -#: src/dialogs.c:1748 +#: src/dialogs.c:1749 msgid "Scroll on output" msgstr "Пра лістаць вывад" -#: src/dialogs.c:1752 +#: src/dialogs.c:1753 msgid "Whether to scroll to the bottom if an output was generated." msgstr "Пракручваць у канец." -#: src/dialogs.c:1846 +#: src/dialogs.c:1847 msgid "Keyboard shortcuts" msgstr "Наладка клявіш" -#: src/dialogs.c:1851 +#: src/dialogs.c:1852 msgid "The following keyboard shortcuts are defined:" msgstr "Вызначаны наступныя клявішы." -#: src/document.c:332 +#: src/document.c:336 #, c-format msgid "File %s closed." -msgstr "Файл %s зачынен." +msgstr "Файл %s зачынены." -#: src/document.c:385 +#: src/document.c:389 msgid "New file opened." msgstr "Адчынены новы файл." -#: src/document.c:425 src/document.c:434 src/document.c:435 +#: src/document.c:430 src/document.c:439 src/document.c:440 msgid "Invalid filename" msgstr "Благі файл" -#: src/document.c:456 +#: src/document.c:462 #, c-format msgid "Could not open file %s (%s)" msgstr "Немагчыма адчыніць файл %s (%s)" -#: src/document.c:489 +#: src/document.c:495 msgid "" "The file does not look like a text file or the file encoding is not " "supported." -msgstr "Файл не выглядае як тэкст, альбо непадтрымліваемы знаканабор." +msgstr "Файл не выглядае як тэкст, альбо падтрымлеваемы знаканабор." -#: src/document.c:527 +#: src/document.c:533 #, c-format msgid "File %s reloaded." msgstr "Файл %s загружаны зноў." -#: src/document.c:553 +#: src/document.c:559 #, c-format msgid "File %s opened(%d%s)." msgstr "Файл %s адчынены (%d%s)." -#: src/document.c:555 +#: src/document.c:561 msgid ", read-only" msgstr ", толькі чытаць" -#: src/document.c:593 src/document.c:632 +#: src/document.c:601 src/document.c:640 msgid "Error saving file." msgstr "Памылка пры захаваньні файла." -#: src/document.c:613 +#: src/document.c:621 #, c-format msgid "Error saving file (%s)." msgstr "Памылка пры захаваньні файла (%s)." -#: src/document.c:654 +#: src/document.c:662 #, c-format msgid "File %s saved." msgstr "Файл %s захаваны." -#: src/document.c:905 +#: src/document.c:913 msgid "tag list updating failed" msgstr "Немагчыма аднавіць tag ліст" -#: src/document.c:972 +#: src/document.c:980 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: src/document.c:973 +#: src/document.c:981 msgid "Max (CR)" msgstr "Max (CR)" -#: src/document.c:975 +#: src/document.c:983 msgid "Unix (LF)" msgstr "Unix (LF)" @@ -1477,7 +1524,7 @@ msgid "Font updated (%s)." msgstr "Шрыфт адноўлены (%s)." -#: src/utils.c:374 src/geany.h:72 +#: src/utils.c:374 src/geany.h:71 msgid "untitled" msgstr "без назвы" @@ -1544,47 +1591,47 @@ msgid "Shell script file" msgstr "файл абалонкі" -#: src/filetypes.c:262 +#: src/filetypes.c:265 msgid "Makefile" msgstr "Makefile" -#: src/filetypes.c:279 +#: src/filetypes.c:282 msgid "Cascading StyleSheet" msgstr "CSS" -#: src/filetypes.c:295 +#: src/filetypes.c:298 msgid "Config file" msgstr "наладкі" -#: src/filetypes.c:314 +#: src/filetypes.c:317 msgid "Assembler source file" msgstr "Асэмблер" -#: src/filetypes.c:330 +#: src/filetypes.c:333 msgid "SQL Dump file" msgstr "SQL" -#: src/filetypes.c:346 +#: src/filetypes.c:349 msgid "(O)Caml source file" msgstr "(O)Caml" -#: src/filetypes.c:363 +#: src/filetypes.c:366 msgid "O-Matrix source file" msgstr "O-Matrix" -#: src/filetypes.c:379 +#: src/filetypes.c:382 msgid "Ruby source file" msgstr "Ruby" -#: src/filetypes.c:397 +#: src/filetypes.c:400 msgid "Tcl source file" msgstr "Tcl" -#: src/filetypes.c:415 +#: src/filetypes.c:418 msgid "All files" msgstr "Усе файлы" -#: src/filetypes.c:424 +#: src/filetypes.c:427 msgid "None" msgstr "Нічога" @@ -1659,71 +1706,71 @@ msgid "compilation finished successful" msgstr "кампіляцыя скончылася пасьпяхова" -#: src/prefs.c:195 +#: src/prefs.c:207 msgid "Action" msgstr "Справа" -#: src/prefs.c:200 +#: src/prefs.c:212 msgid "Shortcut" msgstr "Ярлык" -#: src/prefs.c:564 +#: src/prefs.c:576 msgid "Grab key" msgstr "Захапіць клявішу" -#: src/prefs.c:568 +#: src/prefs.c:580 #, c-format msgid "Type the combination of the keys you want to use for \"%s\"" -msgstr "Цісні камбінацыю клявіш, якія ты жадаеш выкарыстоўваць для \"%s\"" +msgstr "Цісьні камбінацыю клявіш, якія ты жадаеш выкарыстоўваць для \"%s\"" -#: src/prefs.c:692 +#: src/prefs.c:704 #, c-format msgid "" "The combination '%s' is already used for \"%s\". Please choose another one." -msgstr "Камбінацыя '%s' ужо выкарыстана для \"%s\" Калiласкавыбяры іншую." +msgstr "Камбінацыя '%s' ужо выкарыстана для \"%s\" Калі ласка выбяры іншую." -#: src/about.c:91 +#: src/about.c:96 msgid "About Geany" msgstr "Пра Geany" -#: src/about.c:138 +#: src/about.c:143 msgid "A fast and lightweight IDE" msgstr "Хуткае лёгкае IDE" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: src/about.c:188 +#: src/about.c:193 msgid "Info" msgstr "Інфармацыя" -#: src/about.c:200 +#: src/about.c:205 msgid "Developers" msgstr "Распрацоўшчыкі" -#: src/about.c:200 +#: src/about.c:205 msgid "Maintainer" msgstr "Падтрымка" -#: src/about.c:200 +#: src/about.c:205 msgid "developer" msgstr "распрацоўшчык" -#: src/about.c:201 +#: src/about.c:206 msgid "translation maintainer" msgstr "падтрымка перакладу" -#: src/about.c:201 +#: src/about.c:206 msgid "Translators" msgstr "Перакладчыкі" -#: src/about.c:202 +#: src/about.c:207 msgid "language" msgstr "мова" -#: src/about.c:208 +#: src/about.c:213 msgid "Credits" msgstr "Аўтары" -#: src/about.c:221 +#: src/about.c:226 msgid "License" msgstr "Ліцэнзія" @@ -1749,7 +1796,7 @@ #: src/treeviews.c:75 msgid "Appendix" -msgstr "Апендыкс" +msgstr "Апэндыкс" #: src/treeviews.c:77 src/treeviews.c:99 src/treeviews.c:161 msgid "Other" @@ -1799,13 +1846,13 @@ msgid "Our" msgstr "Наш" -#: src/treeviews.c:126 +#: src/treeviews.c:126 src/treeviews.c:151 msgid "Methods" -msgstr "Метады" +msgstr "Мэтады" #: src/treeviews.c:128 src/treeviews.c:149 msgid "Class" -msgstr "Класс" +msgstr "Кляс" #: src/treeviews.c:130 msgid "Singleton" @@ -1819,7 +1866,7 @@ msgid "Variables" msgstr "Variables" -#: src/treeviews.c:136 src/treeviews.c:151 +#: src/treeviews.c:136 msgid "Members" msgstr "Membres" @@ -1846,3 +1893,144 @@ #: src/treeviews.c:267 msgid "Reload" msgstr "Загрузіць зноў" + +#. init all fields of keys with default values +#: src/keybindings.c:101 +msgid "New" +msgstr "Новы" + +#: src/keybindings.c:102 +msgid "Open" +msgstr "Адчыніць" + +#: src/keybindings.c:103 +msgid "Save" +msgstr "Захаваць" + +#: src/keybindings.c:105 +msgid "Close all" +msgstr "Зачыніць усе" + +#: src/keybindings.c:106 +msgid "Reload file" +msgstr "Загрузіць зноў" + +#: src/keybindings.c:107 +msgid "Undo" +msgstr "Вярнуць" + +#: src/keybindings.c:108 +msgid "Redo" +msgstr "Паўтарыць" + +#: src/keybindings.c:110 +msgid "Find Next" +msgstr "Шукаць наступны" + +#: src/keybindings.c:111 +msgid "Find Previous" +msgstr "Шукаць былы" + +#: src/keybindings.c:114 +msgid "Show Colour Chooser" +msgstr "Вылучыць колер" + +#: src/keybindings.c:115 +msgid "Fullscreen" +msgstr "Увесь экран" + +#: src/keybindings.c:116 +msgid "Toggle Messages Window" +msgstr "Паказаць акно паведамленьняў" + +#: src/keybindings.c:117 +msgid "Zoom In" +msgstr "Павялічыць" + +#: src/keybindings.c:118 +msgid "Zoom Out" +msgstr "Зьменшыць" + +#: src/keybindings.c:119 +msgid "Replace tabs by space" +msgstr "Зьмяніць табуляцыю на прабелы" + +#: src/keybindings.c:120 +msgid "Fold all" +msgstr "Зьвярнуць усе" + +#: src/keybindings.c:121 +msgid "Unfold all" +msgstr "Разьвярнуць усе" + +#: src/keybindings.c:122 +msgid "Compile" +msgstr "Кампіліраваць" + +#: src/keybindings.c:123 +msgid "Build" +msgstr "Пабудаваць" + +#: src/keybindings.c:125 +msgid "Build with \"make\" (custom target)" +msgstr "Будаваць з \"make\" (вызначыць цэль)" + +#: src/keybindings.c:127 +msgid "Run (alternative command)" +msgstr "Запусьціць (іншы загад)" + +#: src/keybindings.c:128 +msgid "Build options" +msgstr "Наладкі будоўлі" + +#: src/keybindings.c:129 +msgid "Reload symbol list" +msgstr "Загрузіць сьпіс сімвалаў зноў" + +#: src/keybindings.c:130 +msgid "Switch to Editor" +msgstr "Пераключыцца ў рэдактар" + +#: src/keybindings.c:131 +msgid "Switch to Scribble" +msgstr "Пераключыцца ў заметкі" + +#: src/keybindings.c:132 +msgid "Switch to VTE" +msgstr "Пераключыцца ў тэрмінал" + +#: src/keybindings.c:133 +msgid "Switch to left document" +msgstr "Пераключыцца на левы дакумэнт" + +#: src/keybindings.c:134 +msgid "Switch to right document" +msgstr "Пераключыцца на правы дакумэнт" + +#: src/keybindings.c:135 +msgid "Toggle sidebar" +msgstr "Схаваць сайд-бар" + +#: src/keybindings.c:136 +msgid "Duplicate line" +msgstr "Дубліраваць радок" + +#: src/keybindings.c:137 +msgid "Comment line" +msgstr "Камэнтаваць радок" + +#: src/keybindings.c:138 +msgid "Complete word" +msgstr "Скончыць слова" + +#: src/keybindings.c:139 +msgid "Show calltip" +msgstr "Паказваць calltip" + +#: src/keybindings.c:140 +msgid "Show macro list" +msgstr "Паказваць macro list" + +#: src/keybindings.c:141 +msgid "Suppress auto completion" +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: [443] trunk/src
by eht16＠users.sourceforge.net 13 Jun '06

13 Jun '06

Revision: 443 Author: eht16 Date: 2006-06-13 13:03:44 -0700 (Tue, 13 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=443&view=rev Log Message: ----------- Implemented code for setting indicators while compiling. Modified Paths: -------------- trunk/src/callbacks.c trunk/src/utils.h Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-06-13 19:37:21 UTC (rev 442) +++ trunk/src/callbacks.c 2006-06-13 20:03:44 UTC (rev 443) @@ -979,24 +979,6 @@ } #endif - // experimental code to simulate pasting by middle mouse button - if (event->button == 2) - { - GtkClipboard *cp = gtk_clipboard_get(gdk_atom_intern("PRIMARY", FALSE)); - - if (gtk_clipboard_wait_is_text_available(cp)) - { - gchar *text = gtk_clipboard_wait_for_text(cp); - - if (text != NULL) - { - sci_insert_text(doc_list[idx].sci, clickpos, text); - g_free(text); - return TRUE; - } - } - } - if (event->button == 3) { utils_find_current_word(doc_list[idx].sci, clickpos, @@ -1398,7 +1380,10 @@ gtk_tree_model_get(model, &iter, 0, &color, 1, &string, -1); if (string && gdk_color_equal(&red, color)) { - utils_parse_compiler_error_line(string); + gint line; + gint idx; + utils_parse_compiler_error_line(string, &idx, &line); + if (idx != -1 && line != -1) utils_goto_line(idx, line); } g_free(string); } @@ -2378,3 +2363,12 @@ on_go_to_line_activate(menuitem, user_data); } + +void +on_menu_remove_indicators1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + gint idx = document_get_cur_idx(); + document_clear_indicators(idx); +} + Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2006-06-13 19:37:21 UTC (rev 442) +++ trunk/src/utils.h 2006-06-13 20:03:44 UTC (rev 443) @@ -207,7 +207,8 @@ double utils_strtod(const char *source, char **end); /* try to parse the file and line number where the error occured described in line - * and when something useful is found, it jumps to file and scrolls to the line */ -void utils_parse_compiler_error_line(const gchar *line); + * and when something useful is found, it stores the line number in *line and the index of + * the file in *idx_of_error_file. */ +void utils_parse_compiler_error_line(const gchar *string, gint *idx_of_error_file, gint *line); #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [442] trunk
by eht16＠users.sourceforge.net 13 Jun '06

13 Jun '06

Revision: 442 Author: eht16 Date: 2006-06-13 12:37:21 -0700 (Tue, 13 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=442&view=rev Log Message: ----------- Implemented code for setting indicators while compiling. Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/build.c trunk/src/callbacks.h trunk/src/document.c trunk/src/document.h trunk/src/geany.h trunk/src/highlighting.c trunk/src/interface.c trunk/src/keyfile.c trunk/src/prefs.c trunk/src/sciwrappers.c trunk/src/sciwrappers.h trunk/src/utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-13 15:49:19 UTC (rev 441) +++ trunk/ChangeLog 2006-06-13 19:37:21 UTC (rev 442) @@ -6,6 +6,10 @@ keybindings to new action identifiers. * src/utils.c: Improved and finished switching between files when clicking on compiler error messages. + * src/sciwrappers.c, src/document.c, src/highlighting.c, src/build.c, + src/keyfile.c, src/prefs.c, src/interface.c, geany.glade, + src/geany.h: + Implemented code for setting indicators while compiling. 2006-06-12 Enrico Troeger <enrico.troeger(a)uvena.de> Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2006-06-13 15:49:19 UTC (rev 441) +++ trunk/geany.glade 2006-06-13 19:37:21 UTC (rev 442) @@ -57,7 +57,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image650"> + <widget class="GtkImage" id="image674"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -130,7 +130,7 @@ <signal name="activate" handler="on_save_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image651"> + <widget class="GtkImage" id="image675"> <property name="visible">True</property> <property name="stock">gtk-save</property> <property name="icon_size">1</property> @@ -191,7 +191,7 @@ <signal name="activate" handler="on_close_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image652"> + <widget class="GtkImage" id="image676"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -333,7 +333,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image653"> + <widget class="GtkImage" id="image677"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -365,7 +365,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image654"> + <widget class="GtkImage" id="image678"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -543,7 +543,7 @@ <signal name="activate" handler="on_replace1_activate" last_modification_time="Sun, 23 Oct 2005 13:22:36 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image655"> + <widget class="GtkImage" id="image679"> <property name="visible">True</property> <property name="stock">gtk-find-and-replace</property> <property name="icon_size">1</property> @@ -570,7 +570,7 @@ <signal name="activate" handler="on_go_to_line1_activate" last_modification_time="Tue, 23 May 2006 17:10:49 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image656"> + <widget class="GtkImage" id="image680"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> @@ -605,7 +605,7 @@ <signal name="activate" handler="on_change_font1_activate" last_modification_time="Fri, 22 Apr 2005 18:58:45 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image657"> + <widget class="GtkImage" id="image681"> <property name="visible">True</property> <property name="stock">gtk-select-font</property> <property name="icon_size">1</property> @@ -627,7 +627,7 @@ <signal name="activate" handler="on_show_color_chooser1_activate" last_modification_time="Wed, 22 Jun 2005 18:10:21 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image658"> + <widget class="GtkImage" id="image682"> <property name="visible">True</property> <property name="stock">gtk-select-color</property> <property name="icon_size">1</property> @@ -885,6 +885,22 @@ <signal name="activate" handler="on_menu_unfold_all1_activate" last_modification_time="Sun, 26 Feb 2006 15:42:32 GMT"/> </widget> </child> + + <child> + <widget class="GtkSeparatorMenuItem" id="separator23"> + <property name="visible">True</property> + </widget> + </child> + + <child> + <widget class="GtkMenuItem" id="menu_remove_indicators1"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Removes all set indicators in the current document.</property> + <property name="label" translatable="yes">Remove all _indicators</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_menu_remove_indicators1_activate" last_modification_time="Tue, 13 Jun 2006 19:25:23 GMT"/> + </widget> + </child> </widget> </child> </widget> @@ -3479,6 +3495,26 @@ </child> <child> + <widget class="GtkCheckButton" id="check_indicators"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Whether to use indicators(a squiggly underline) to highlight the lines, where the compiler found a warning or an error.</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Use indicators to show compile errors</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">False</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> <widget class="GtkLabel" id="label148"> <property name="visible">True</property> <property name="label" translatable="yes"></property> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2006-06-13 15:49:19 UTC (rev 441) +++ trunk/src/build.c 2006-06-13 19:37:21 UTC (rev 442) @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ @@ -38,6 +38,7 @@ #include "utils.h" #include "dialogs.h" #include "msgwindow.h" +#include "document.h" static GIOChannel *build_set_up_io_channel (gint fd, GIOCondition cond, GIOFunc func, gpointer data); @@ -446,12 +447,20 @@ //GIOStatus s; gchar *msg; guint x = 1; + gint line, idx; while (g_io_channel_read_line(ioc, &msg, NULL, NULL, NULL) && msg) { //if (s != G_IO_STATUS_NORMAL && s != G_IO_STATUS_EOF) break; if (GPOINTER_TO_INT(data)) + { msgwin_compiler_add(COLOR_RED, FALSE, g_strstrip(msg)); + if (app->pref_editor_use_indicators) + { + utils_parse_compiler_error_line(g_strstrip(msg), &idx, &line); + if (line != -1) document_set_indicator(idx, line - 1); + } + } else msgwin_compiler_add(COLOR_BLACK, FALSE, g_strstrip(msg)); Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2006-06-13 15:49:19 UTC (rev 441) +++ trunk/src/callbacks.h 2006-06-13 19:37:21 UTC (rev 442) @@ -576,3 +576,7 @@ GtkNotebookPage *page, guint page_num, gpointer user_data); + +void +on_menu_remove_indicators1_activate (GtkMenuItem *menuitem, + gpointer user_data); Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-06-13 15:49:19 UTC (rev 441) +++ trunk/src/document.c 2006-06-13 19:37:21 UTC (rev 442) @@ -39,6 +39,7 @@ #ifdef HAVE_FCNTL_H # include <fcntl.h> #endif +#include <ctype.h> #include "document.h" #include "callbacks.h" @@ -198,13 +199,12 @@ GtkWidget *align; PangoFontDescription *pfd; gchar *title, *fname; - document this; GtkTreeIter iter; gint new_idx = document_get_new_idx(); - + document *this = &(doc_list[new_idx]); + title = (filename) ? g_path_get_basename(filename) : g_strdup(GEANY_STRING_UNTITLED); - this.tab_label = gtk_label_new(title); - //gtk_widget_show(this.tab_label); + this->tab_label = gtk_label_new(title); hbox = gtk_hbox_new(FALSE, 0); but = gtk_button_new(); @@ -216,7 +216,7 @@ gtk_container_add(GTK_CONTAINER(align), but); gtk_button_set_relief(GTK_BUTTON(but), GTK_RELIEF_NONE); - gtk_box_pack_start(GTK_BOX(hbox), this.tab_label, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), this->tab_label, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), align, TRUE, TRUE, 0); gtk_widget_show_all(hbox); @@ -224,6 +224,7 @@ /* SCI - Code */ sci = SCINTILLA(scintilla_new()); scintilla_set_id(sci, new_idx); + this->sci = sci; gtk_widget_show(GTK_WIDGET(sci)); @@ -247,7 +248,7 @@ sci_set_visible_eols(sci, app->pref_editor_show_line_endings); pfd = pango_font_description_from_string(app->editor_font); fname = g_strdup_printf("!%s", pango_font_description_get_family(pfd)); - document_set_font(sci, fname, pango_font_description_get_size(pfd) / PANGO_SCALE); + document_set_font(new_idx, fname, pango_font_description_get_size(pfd) / PANGO_SCALE); pango_font_description_free(pfd); g_free(fname); @@ -258,26 +259,26 @@ SSM(sci, SCI_SETTWOPHASEDRAW, 0, 0); } - this.tabmenu_label = gtk_label_new(title); - gtk_misc_set_alignment(GTK_MISC(this.tabmenu_label), 0.0, 0); + this->tabmenu_label = gtk_label_new(title); + gtk_misc_set_alignment(GTK_MISC(this->tabmenu_label), 0.0, 0); if (app->tab_order_ltr) { gint npage; npage = gtk_notebook_append_page_menu(GTK_NOTEBOOK(app->notebook), GTK_WIDGET(sci), - hbox, this.tabmenu_label); + hbox, this->tabmenu_label); gtk_notebook_set_current_page(GTK_NOTEBOOK(app->notebook), npage); } else { gtk_notebook_insert_page_menu(GTK_NOTEBOOK(app->notebook), GTK_WIDGET(sci), hbox, - this.tabmenu_label, 0); + this->tabmenu_label, 0); gtk_notebook_set_current_page(GTK_NOTEBOOK(app->notebook), 0); } iter = treeviews_openfiles_add(new_idx, title); g_free(title); - this.tag_store = NULL; - this.tag_tree = NULL; + this->tag_store = NULL; + this->tag_tree = NULL; // "the" SCI signal g_signal_connect((GtkWidget*) sci, "sci-notify", @@ -294,22 +295,20 @@ utils_close_buttons_toggle(); // store important pointers in the tab list - this.file_name = (filename) ? g_strdup(filename) : NULL; - this.sci = sci; - this.encoding = NULL; - this.tm_file = NULL; - this.iter = iter; - this.file_type = NULL; - this.mtime = 0; - this.changed = FALSE; - this.last_check = time(NULL); - this.do_overwrite = FALSE; - this.readonly = FALSE; - this.line_breaking = TRUE; - this.use_auto_indention = TRUE; - this.has_tags = FALSE; - this.is_valid = TRUE; - doc_list[new_idx] = this; + this->file_name = (filename) ? g_strdup(filename) : NULL; + this->encoding = NULL; + this->tm_file = NULL; + this->iter = iter; + this->file_type = NULL; + this->mtime = 0; + this->changed = FALSE; + this->last_check = time(NULL); + this->do_overwrite = FALSE; + this->readonly = FALSE; + this->line_breaking = TRUE; + this->use_auto_indention = TRUE; + this->has_tags = FALSE; + this->is_valid = TRUE; return new_idx; } @@ -859,19 +858,18 @@ } -void document_set_font(ScintillaObject *sci, const gchar *font_name, gint size) +void document_set_font(gint idx, const gchar *font_name, gint size) { gint style; for (style = 0; style <= 127; style++) - sci_set_font(sci, style, font_name, size); + sci_set_font(doc_list[idx].sci, style, font_name, size); // line number and braces - sci_set_font(sci, STYLE_LINENUMBER, font_name, size); - sci_set_font(sci, STYLE_BRACELIGHT, font_name, size); - sci_set_font(sci, STYLE_BRACEBAD, font_name, size); + sci_set_font(doc_list[idx].sci, STYLE_LINENUMBER, font_name, size); + sci_set_font(doc_list[idx].sci, STYLE_BRACELIGHT, font_name, size); + sci_set_font(doc_list[idx].sci, STYLE_BRACEBAD, font_name, size); // zoom to 100% to prevent confusion - sci_zoom_off(sci); - //sci_colourise(sci, 0, sci_get_length(sci)); + sci_zoom_off(doc_list[idx].sci); } @@ -985,6 +983,7 @@ } +/// TODO move me to filetypes.c gchar *document_prepare_template(filetype *ft) { gchar *gpl_notice = NULL; @@ -1073,3 +1072,47 @@ } } } + + +void document_clear_indicators(gint idx) +{ + glong last_pos = sci_get_length(doc_list[idx].sci); + if (last_pos > 0) + { + sci_start_styling(doc_list[idx].sci, 0, INDIC2_MASK); + sci_set_styling(doc_list[idx].sci, last_pos, 0); + } +} + + +void document_set_indicator(gint idx, gint line) +{ + gint start, end, current_mask; + guint i = 0, len; + gchar *linebuf; + + if (idx == -1 || ! doc_list[idx].is_valid) return; + + start = sci_get_position_from_line(doc_list[idx].sci, line); + end = sci_get_position_from_line(doc_list[idx].sci, line + 1); + + // skip blank lines + if ((start + 1) == end) return; + + len = end - start; + linebuf = g_malloc(len); + + // don't set the indicator on whitespace + sci_get_line(doc_list[idx].sci, line, linebuf); + if (linebuf == NULL) return; + + while (isspace(linebuf[i])) i++; + while (isspace(linebuf[len-1])) len--; + g_free(linebuf); + + current_mask = sci_get_style_at(doc_list[idx].sci, start); + current_mask &= INDICS_MASK; + current_mask |= INDIC2_MASK; + sci_start_styling(doc_list[idx].sci, start + i, INDIC2_MASK); + sci_set_styling(doc_list[idx].sci, len - i, current_mask); +} Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2006-06-13 15:49:19 UTC (rev 441) +++ trunk/src/document.h 2006-06-13 19:37:21 UTC (rev 442) @@ -98,7 +98,7 @@ void document_find_next(gint, const gchar*, gint, gboolean, gboolean); -void document_set_font(ScintillaObject*, const gchar*, gint); +void document_set_font(gint, const gchar*, gint); void document_update_tag_list(gint, gboolean); @@ -114,4 +114,8 @@ void document_unfold_all(gint idx); +void document_set_indicator(gint idx, gint line); + +void document_clear_indicators(gint idx); + #endif Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2006-06-13 15:49:19 UTC (rev 441) +++ trunk/src/geany.h 2006-06-13 19:37:21 UTC (rev 442) @@ -139,7 +139,7 @@ // to change the default value at startup, I think gboolean pref_editor_line_breaking; gboolean pref_editor_use_auto_indention; - + gboolean pref_editor_use_indicators; gboolean pref_editor_show_white_space; gboolean pref_editor_show_indent_guide; gboolean pref_editor_show_line_endings; Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2006-06-13 15:49:19 UTC (rev 441) +++ trunk/src/highlighting.c 2006-06-13 19:37:21 UTC (rev 442) @@ -211,9 +211,14 @@ SSM(sci, SCI_SETCARETLINEBACK, types[GEANY_FILETYPES_ALL]->styling[4][1], 0); SSM(sci, SCI_SETCARETLINEVISIBLE, 1, 0); + // indicator settings + SSM(sci, SCI_INDICSETSTYLE, 2, INDIC_SQUIGGLE); + // why? if I let this out, the indicator remains green with PHP + SSM(sci, SCI_INDICSETFORE, 0, 0x0000ff); + SSM(sci, SCI_INDICSETFORE, 2, 0x0000ff); + // a darker grey for the line number margin SSM(sci, SCI_STYLESETBACK, STYLE_LINENUMBER, 0xD0D0D0); - //SSM(sci, SCI_STYLESETBACK, STYLE_LINENUMBER, 0xD0D0D0); // define marker symbols // 0 -> line marker Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2006-06-13 15:49:19 UTC (rev 441) +++ trunk/src/interface.c 2006-06-13 19:37:21 UTC (rev 442) @@ -37,7 +37,7 @@ GtkWidget *menuitem1_menu; GtkWidget *menu_new1; GtkWidget *menu_new_with_template1; - GtkWidget *image650; + GtkWidget *image674; GtkWidget *menu_new_with_template1_menu; GtkWidget *invisible2; GtkWidget *separator12; @@ -46,14 +46,14 @@ GtkWidget *menu_save1; GtkWidget *menu_save_as1; GtkWidget *menu_save_all1; - GtkWidget *image651; + GtkWidget *image675; GtkWidget *revert1; GtkWidget *separator21; GtkWidget *preferences2; GtkWidget *separator14; GtkWidget *menu_close1; GtkWidget *menu_close_all1; - GtkWidget *image652; + GtkWidget *image676; GtkWidget *menu_separatormenuitem1; GtkWidget *recent_files1; GtkWidget *recent_files1_menu; @@ -71,11 +71,11 @@ GtkWidget *menu_delete1; GtkWidget *menu_seperator2; GtkWidget *insert_include2; - GtkWidget *image653; + GtkWidget *image677; GtkWidget *insert_include2_menu; GtkWidget *invisible4; GtkWidget *add_comments1; - GtkWidget *image654; + GtkWidget *image678; GtkWidget *add_comments1_menu; GtkWidget *menu_add_changelog_entry1; GtkWidget *insert_file_header1; @@ -96,16 +96,16 @@ GtkWidget *find_next1; GtkWidget *find_previous1; GtkWidget *replace1; - GtkWidget *image655; + GtkWidget *image679; GtkWidget *separator11; GtkWidget *go_to_line1; - GtkWidget *image656; + GtkWidget *image680; GtkWidget *menuitem3; GtkWidget *menuitem3_menu; GtkWidget *menu_change_font1; - GtkWidget *image657; + GtkWidget *image681; GtkWidget *menu_choose_color1; - GtkWidget *image658; + GtkWidget *image682; GtkWidget *menu_separator4; GtkWidget *menu_fullscreen1; GtkWidget *menu_show_messages_window1; @@ -135,6 +135,8 @@ GtkWidget *separator22; GtkWidget *menu_fold_all1; GtkWidget *menu_unfold_all1; + GtkWidget *separator23; + GtkWidget *menu_remove_indicators1; GtkWidget *menu_build1; GtkWidget *menu_item5; GtkWidget *menu_item5_menu; @@ -232,9 +234,9 @@ gtk_widget_show (menu_new_with_template1); gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_new_with_template1); - image650 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image650); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image650); + image674 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image674); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image674); menu_new_with_template1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_new_with_template1), menu_new_with_template1_menu); @@ -269,9 +271,9 @@ gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_save_all1); gtk_tooltips_set_tip (tooltips, menu_save_all1, _("Saves all open files"), NULL); - image651 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); - gtk_widget_show (image651); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image651); + image675 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); + gtk_widget_show (image675); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image675); revert1 = gtk_image_menu_item_new_from_stock ("gtk-revert-to-saved", accel_group); gtk_widget_show (revert1); @@ -300,9 +302,9 @@ gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_close_all1); gtk_tooltips_set_tip (tooltips, menu_close_all1, _("Closes all open files"), NULL); - image652 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image652); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image652); + image676 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image676); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image676); menu_separatormenuitem1 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separatormenuitem1); @@ -374,9 +376,9 @@ gtk_widget_show (insert_include2); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2); - image653 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image653); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image653); + image677 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image677); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image677); insert_include2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu); @@ -388,9 +390,9 @@ gtk_widget_show (add_comments1); gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1); - image654 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image654); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image654); + image678 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image678); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image678); add_comments1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu); @@ -477,9 +479,9 @@ gtk_widget_show (replace1); gtk_container_add (GTK_CONTAINER (search1_menu), replace1); - image655 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); - gtk_widget_show (image655); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image655); + image679 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); + gtk_widget_show (image679); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image679); separator11 = gtk_separator_menu_item_new (); gtk_widget_show (separator11); @@ -490,9 +492,9 @@ gtk_widget_show (go_to_line1); gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1); - image656 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image656); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image656); + image680 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image680); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image680); menuitem3 = gtk_menu_item_new_with_mnemonic (_("_View")); gtk_widget_show (menuitem3); @@ -506,18 +508,18 @@ gtk_container_add (GTK_CONTAINER (menuitem3_menu), menu_change_font1); gtk_tooltips_set_tip (tooltips, menu_change_font1, _("Change the default font"), NULL); - image657 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); - gtk_widget_show (image657); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image657); + image681 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); + gtk_widget_show (image681); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image681); menu_choose_color1 = gtk_image_menu_item_new_with_mnemonic (_("Show _Colour Chooser")); gtk_widget_show (menu_choose_color1); gtk_container_add (GTK_CONTAINER (menuitem3_menu), menu_choose_color1); gtk_tooltips_set_tip (tooltips, menu_choose_color1, _("Open a color chooser dialog, to interactively pick colors from a palette."), NULL); - image658 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); - gtk_widget_show (image658); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image658); + image682 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); + gtk_widget_show (image682); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image682); menu_separator4 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separator4); @@ -651,6 +653,16 @@ gtk_container_add (GTK_CONTAINER (menu_item4_menu), menu_unfold_all1); gtk_tooltips_set_tip (tooltips, menu_unfold_all1, _("Unfolds all contracted code blocks"), NULL); + separator23 = gtk_separator_menu_item_new (); + gtk_widget_show (separator23); + gtk_container_add (GTK_CONTAINER (menu_item4_menu), separator23); + gtk_widget_set_sensitive (separator23, FALSE); + + menu_remove_indicators1 = gtk_menu_item_new_with_mnemonic (_("Remove all _indicators")); + gtk_widget_show (menu_remove_indicators1); + gtk_container_add (GTK_CONTAINER (menu_item4_menu), menu_remove_indicators1); + gtk_tooltips_set_tip (tooltips, menu_remove_indicators1, _("Removes all set indicators in the current document."), NULL); + menu_build1 = gtk_menu_item_new_with_mnemonic (_("_Build")); gtk_widget_show (menu_build1); gtk_container_add (GTK_CONTAINER (menubar1), menu_build1); @@ -1094,6 +1106,9 @@ g_signal_connect ((gpointer) menu_unfold_all1, "activate", G_CALLBACK (on_menu_unfold_all1_activate), NULL); + g_signal_connect ((gpointer) menu_remove_indicators1, "activate", + G_CALLBACK (on_menu_remove_indicators1_activate), + NULL); g_signal_connect ((gpointer) help1, "activate", G_CALLBACK (on_help1_activate), NULL); @@ -1179,7 +1194,7 @@ GLADE_HOOKUP_OBJECT (window1, menuitem1_menu, "menuitem1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_new1, "menu_new1"); GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1, "menu_new_with_template1"); - GLADE_HOOKUP_OBJECT (window1, image650, "image650"); + GLADE_HOOKUP_OBJECT (window1, image674, "image674"); GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1_menu, "menu_new_with_template1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible2, "invisible2"); GLADE_HOOKUP_OBJECT (window1, separator12, "separator12"); @@ -1188,14 +1203,14 @@ GLADE_HOOKUP_OBJECT (window1, menu_save1, "menu_save1"); GLADE_HOOKUP_OBJECT (window1, menu_save_as1, "menu_save_as1"); GLADE_HOOKUP_OBJECT (window1, menu_save_all1, "menu_save_all1"); - GLADE_HOOKUP_OBJECT (window1, image651, "image651"); + GLADE_HOOKUP_OBJECT (window1, image675, "image675"); GLADE_HOOKUP_OBJECT (window1, revert1, "revert1"); GLADE_HOOKUP_OBJECT (window1, separator21, "separator21"); GLADE_HOOKUP_OBJECT (window1, preferences2, "preferences2"); GLADE_HOOKUP_OBJECT (window1, separator14, "separator14"); GLADE_HOOKUP_OBJECT (window1, menu_close1, "menu_close1"); GLADE_HOOKUP_OBJECT (window1, menu_close_all1, "menu_close_all1"); - GLADE_HOOKUP_OBJECT (window1, image652, "image652"); + GLADE_HOOKUP_OBJECT (window1, image676, "image676"); GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1"); GLADE_HOOKUP_OBJECT (window1, recent_files1, "recent_files1"); GLADE_HOOKUP_OBJECT (window1, recent_files1_menu, "recent_files1_menu"); @@ -1213,11 +1228,11 @@ GLADE_HOOKUP_OBJECT (window1, menu_delete1, "menu_delete1"); GLADE_HOOKUP_OBJECT (window1, menu_seperator2, "menu_seperator2"); GLADE_HOOKUP_OBJECT (window1, insert_include2, "insert_include2"); - GLADE_HOOKUP_OBJECT (window1, image653, "image653"); + GLADE_HOOKUP_OBJECT (window1, image677, "image677"); GLADE_HOOKUP_OBJECT (window1, insert_include2_menu, "insert_include2_menu"); GLADE_HOOKUP_OBJECT (window1, invisible4, "invisible4"); GLADE_HOOKUP_OBJECT (window1, add_comments1, "add_comments1"); - GLADE_HOOKUP_OBJECT (window1, image654, "image654"); + GLADE_HOOKUP_OBJECT (window1, image678, "image678"); GLADE_HOOKUP_OBJECT (window1, add_comments1_menu, "add_comments1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_add_changelog_entry1, "menu_add_changelog_entry1"); GLADE_HOOKUP_OBJECT (window1, insert_file_header1, "insert_file_header1"); @@ -1238,16 +1253,16 @@ GLADE_HOOKUP_OBJECT (window1, find_next1, "find_next1"); GLADE_HOOKUP_OBJECT (window1, find_previous1, "find_previous1"); GLADE_HOOKUP_OBJECT (window1, replace1, "replace1"); - GLADE_HOOKUP_OBJECT (window1, image655, "image655"); + GLADE_HOOKUP_OBJECT (window1, image679, "image679"); GLADE_HOOKUP_OBJECT (window1, separator11, "separator11"); GLADE_HOOKUP_OBJECT (window1, go_to_line1, "go_to_line1"); - GLADE_HOOKUP_OBJECT (window1, image656, "image656"); + GLADE_HOOKUP_OBJECT (window1, image680, "image680"); GLADE_HOOKUP_OBJECT (window1, menuitem3, "menuitem3"); GLADE_HOOKUP_OBJECT (window1, menuitem3_menu, "menuitem3_menu"); GLADE_HOOKUP_OBJECT (window1, menu_change_font1, "menu_change_font1"); - GLADE_HOOKUP_OBJECT (window1, image657, "image657"); + GLADE_HOOKUP_OBJECT (window1, image681, "image681"); GLADE_HOOKUP_OBJECT (window1, menu_choose_color1, "menu_choose_color1"); - GLADE_HOOKUP_OBJECT (window1, image658, "image658"); + GLADE_HOOKUP_OBJECT (window1, image682, "image682"); GLADE_HOOKUP_OBJECT (window1, menu_separator4, "menu_separator4"); GLADE_HOOKUP_OBJECT (window1, menu_fullscreen1, "menu_fullscreen1"); GLADE_HOOKUP_OBJECT (window1, menu_show_messages_window1, "menu_show_messages_window1"); @@ -1277,6 +1292,8 @@ GLADE_HOOKUP_OBJECT (window1, separator22, "separator22"); GLADE_HOOKUP_OBJECT (window1, menu_fold_all1, "menu_fold_all1"); GLADE_HOOKUP_OBJECT (window1, menu_unfold_all1, "menu_unfold_all1"); + GLADE_HOOKUP_OBJECT (window1, separator23, "separator23"); + GLADE_HOOKUP_OBJECT (window1, menu_remove_indicators1, "menu_remove_indicators1"); GLADE_HOOKUP_OBJECT (window1, menu_build1, "menu_build1"); GLADE_HOOKUP_OBJECT (window1, menu_item5, "menu_item5"); GLADE_HOOKUP_OBJECT (window1, menu_item5_menu, "menu_item5_menu"); @@ -1829,6 +1846,7 @@ GtkWidget *check_xmltag; GtkWidget *check_auto_complete; GtkWidget *check_folding; + GtkWidget *check_indicators; GtkWidget *label148; GtkWidget *table3; GtkWidget *label103; @@ -2268,6 +2286,12 @@ gtk_tooltips_set_tip (tooltips, check_folding, _("Whether to enable folding the code"), NULL); gtk_button_set_focus_on_click (GTK_BUTTON (check_folding), FALSE); + check_indicators = gtk_check_button_new_with_mnemonic (_("Use indicators to show compile errors")); + gtk_widget_show (check_indicators); + gtk_box_pack_start (GTK_BOX (vbox12), check_indicators, FALSE, FALSE, 0); + gtk_tooltips_set_tip (tooltips, check_indicators, _("Whether to use indicators(a squiggly underline) to highlight the lines, where the compiler found a warning or an error."), NULL); + gtk_button_set_focus_on_click (GTK_BUTTON (check_indicators), FALSE); + label148 = gtk_label_new (""); gtk_widget_show (label148); gtk_box_pack_start (GTK_BOX (vbox12), label148, FALSE, FALSE, 0); @@ -2636,6 +2660,7 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, check_xmltag, "check_xmltag"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_auto_complete, "check_auto_complete"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_folding, "check_folding"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_indicators, "check_indicators"); GLADE_HOOKUP_OBJECT (prefs_dialog, label148, "label148"); GLADE_HOOKUP_OBJECT (prefs_dialog, table3, "table3"); GLADE_HOOKUP_OBJECT (prefs_dialog, label103, "label103"); Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2006-06-13 15:49:19 UTC (rev 441) +++ trunk/src/keyfile.c 2006-06-13 19:37:21 UTC (rev 442) @@ -86,6 +86,7 @@ g_key_file_set_boolean(config, PACKAGE, "msgwindow_visible", app->msgwindow_visible); g_key_file_set_boolean(config, PACKAGE, "use_folding", app->pref_editor_folding); g_key_file_set_boolean(config, PACKAGE, "use_auto_indention", app->pref_editor_use_auto_indention); + g_key_file_set_boolean(config, PACKAGE, "use_indicators", app->pref_editor_use_indicators); g_key_file_set_boolean(config, PACKAGE, "show_indent_guide", app->pref_editor_show_indent_guide); g_key_file_set_boolean(config, PACKAGE, "show_white_space", app->pref_editor_show_white_space); g_key_file_set_boolean(config, PACKAGE, "show_markers_margin", app->show_markers_margin); @@ -209,6 +210,7 @@ app->treeview_openfiles_visible = utils_get_setting_boolean(config, PACKAGE, "treeview_openfiles_visible", TRUE); app->msgwindow_visible = utils_get_setting_boolean(config, PACKAGE, "msgwindow_visible", TRUE); app->pref_editor_folding = utils_get_setting_boolean(config, PACKAGE, "use_folding", TRUE); + app->pref_editor_use_indicators = utils_get_setting_boolean(config, PACKAGE, "use_indicators", TRUE); app->pref_editor_use_auto_indention = utils_get_setting_boolean(config, PACKAGE, "use_auto_indention", TRUE); app->pref_editor_show_indent_guide = utils_get_setting_boolean(config, PACKAGE, "show_indent_guide", FALSE); app->pref_editor_show_white_space = utils_get_setting_boolean(config, PACKAGE, "show_white_space", FALSE); Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2006-06-13 15:49:19 UTC (rev 441) +++ trunk/src/prefs.c 2006-06-13 19:37:21 UTC (rev 442) @@ -137,6 +137,9 @@ widget = lookup_widget(app->prefs_dialog, "check_folding"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_folding); + widget = lookup_widget(app->prefs_dialog, "check_indicators"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_use_indicators); + widget = lookup_widget(app->prefs_dialog, "editor_font"); gtk_font_button_set_font_name(GTK_FONT_BUTTON(widget), app->editor_font); @@ -346,7 +349,10 @@ widget = lookup_widget(app->prefs_dialog, "check_auto_complete"); app->pref_editor_auto_complete_constructs = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + widget = lookup_widget(app->prefs_dialog, "check_indicators"); + app->pref_editor_use_indicators = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + // Tools Settings widget = lookup_widget(app->prefs_dialog, "entry_com_make"); g_free(app->build_make_cmd); Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2006-06-13 15:49:19 UTC (rev 441) +++ trunk/src/sciwrappers.c 2006-06-13 19:37:21 UTC (rev 442) @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ @@ -795,3 +795,13 @@ return SSM(sci, SCI_LINEFROMPOSITION, end, 0) - SSM(sci, SCI_LINEFROMPOSITION, start, 0) + 1; } + +void sci_set_styling(ScintillaObject *sci, gint len, gint style) +{ + SSM(sci, SCI_SETSTYLING, len, style); +} + +void sci_start_styling(ScintillaObject *sci, gint pos, gint mask) +{ + SSM(sci, SCI_STARTSTYLING, pos, mask); +} Modified: trunk/src/sciwrappers.h =================================================================== --- trunk/src/sciwrappers.h 2006-06-13 15:49:19 UTC (rev 441) +++ trunk/src/sciwrappers.h 2006-06-13 19:37:21 UTC (rev 442) @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ @@ -146,5 +146,8 @@ void sci_cmd (ScintillaObject * sci, gint cmd); gint sci_get_current_line (ScintillaObject * sci, gint pos); gint sci_get_lines_selected (ScintillaObject * sci); +void sci_set_styling (ScintillaObject * sci, gint len, gint style); +void sci_start_styling (ScintillaObject * sci, gint pos, gint mask); + #endif Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-06-13 15:49:19 UTC (rev 441) +++ trunk/src/utils.c 2006-06-13 19:37:21 UTC (rev 442) @@ -352,7 +352,7 @@ { if (doc_list[i].sci) { - document_set_font(doc_list[i].sci, fname, size); + document_set_font(i, fname, size); } } pango_font_description_free(font_desc); @@ -2285,13 +2285,12 @@ */ -/* try to parse the file and line number where the error occured described in string - * and when something useful is found, it jumps to file and scrolls to the line */ -void utils_parse_compiler_error_line(const gchar *string) +/* try to parse the file and line number where the error occured described in line + * and when something useful is found, it stores the line number in *line and the index of + * the file in *idx_of_error_file. */ +void utils_parse_compiler_error_line(const gchar *string, gint *idx_of_error_file, gint *line) { gint idx = document_get_cur_idx(); - gint idx_of_error_file; - gint line = -1; gchar *end = NULL; gchar *path; gchar *filename; @@ -2301,7 +2300,9 @@ guint field_idx_line; // idx of the field where the line is guint field_idx_file; // idx of the field where the filename is - + *line = -1; + *idx_of_error_file = -1; + if (string == NULL || ! doc_list[app->cur_idx].is_valid || doc_list[app->cur_idx].file_type == NULL) return; @@ -2374,7 +2375,7 @@ return; } - line = strtol(fields[field_idx_line], &end, 10); + *line = strtol(fields[field_idx_line], &end, 10); // if the line could not be read, line is 0 and an error occurred, so we leave if (fields[field_idx_line] == end) @@ -2388,23 +2389,17 @@ filename = g_strconcat(path, G_DIR_SEPARATOR_S, fields[field_idx_file], NULL); // use document_open_file to find an already opened file, or to open it in place - idx_of_error_file = document_open_file(-1, filename, 0, FALSE, NULL); + *idx_of_error_file = document_open_file(-1, filename, 0, FALSE, NULL); g_free(path); g_free(filename); - g_strfreev(fields); - if (idx_of_error_file == -1 || ! doc_list[idx_of_error_file].is_valid || line == -1) + if (*idx_of_error_file != -1 && doc_list[*idx_of_error_file].is_valid && + *line == -1 && idx != *idx_of_error_file) { - return; - } - - // finally jump to the line (and file) - if (idx != idx_of_error_file) - { gtk_notebook_set_current_page(GTK_NOTEBOOK(app->notebook), - gtk_notebook_page_num(GTK_NOTEBOOK(app->notebook), - GTK_WIDGET(doc_list[idx_of_error_file].sci))); + gtk_notebook_page_num(GTK_NOTEBOOK(app->notebook), + GTK_WIDGET(doc_list[*idx_of_error_file].sci))); } - utils_goto_line(idx_of_error_file, line); + g_strfreev(fields); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2006