Commits June 2006

commits@lists.geany.org

3 participants
126 discussions

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

22 Jun '06

Revision: 471 Author: eht16 Date: 2006-06-21 16:15:54 -0700 (Wed, 21 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=471&view=rev Log Message: ----------- Updated Scintilla to version 1.70. Modified Paths: -------------- trunk/ChangeLog trunk/scintilla/Converter.h trunk/scintilla/Editor.cxx trunk/scintilla/Editor.h trunk/scintilla/LexBash.cxx trunk/scintilla/LexHTML.cxx trunk/scintilla/LexSQL.cxx trunk/scintilla/LexTCL.cxx trunk/scintilla/LineMarker.h trunk/scintilla/PlatGTK.cxx trunk/scintilla/ScintillaBase.cxx trunk/scintilla/ScintillaGTK.cxx trunk/scintilla/ViewStyle.cxx trunk/scintilla/ViewStyle.h trunk/scintilla/include/HFacer.py trunk/scintilla/include/SciLexer.h trunk/scintilla/include/Scintilla.h trunk/scintilla/include/ScintillaWidget.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/ChangeLog 2006-06-21 23:15:54 UTC (rev 471) @@ -6,6 +6,7 @@ Added option in the preferences dialog to replace tabs by spaces when saving a file. Added option for default encoding for new files. + * scintilla/*: Updated Scintilla to version 1.70. 2006-06-20 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/scintilla/Converter.h =================================================================== --- trunk/scintilla/Converter.h 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/Converter.h 2006-06-21 23:15:54 UTC (rev 471) @@ -27,9 +27,9 @@ Converter() { iconvh = iconvhBad; } - Converter(const char *charSetDestination, const char *charSetSource) { + Converter(const char *charSetDestination, const char *charSetSource, bool transliterations) { iconvh = iconvhBad; - Open(charSetDestination, charSetSource); + Open(charSetDestination, charSetSource, transliterations); } ~Converter() { Close(); @@ -37,13 +37,18 @@ operator bool() const { return iconvh != iconvhBad; } - void Open(const char *charSetDestination, const char *charSetSource) { + void Open(const char *charSetDestination, const char *charSetSource, bool transliterations=true) { Close(); if (*charSetSource) { + char fullDest[200]; + strcpy(fullDest, charSetDestination); + if (transliterations) { + strcat(fullDest, "//TRANSLIT"); + } #if GTK_MAJOR_VERSION >= 2 - iconvh = g_iconv_open(charSetDestination, charSetSource); + iconvh = g_iconv_open(fullDest, charSetSource); #else - iconvh = iconv_open(charSetDestination, charSetSource); + iconvh = iconv_open(fullDest, charSetSource); #endif } } Modified: trunk/scintilla/Editor.cxx =================================================================== --- trunk/scintilla/Editor.cxx 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/Editor.cxx 2006-06-21 23:15:54 UTC (rev 471) @@ -285,7 +285,7 @@ } else if (level == llcPage) { if (lineNumber == lineCaret) { pos = 0; - } else { + } else if (length > 1) { pos = 1 + (lineNumber % (length - 1)); } } else if (level == llcDocument) { @@ -328,7 +328,7 @@ delete ll; } else { useCount--; - } + } } } @@ -429,9 +429,8 @@ wrapState = eWrapNone; wrapWidth = LineLayout::wrapWidthInfinite; - docLineLastWrapped = -1; - docLastLineToWrap = -1; - backgroundWrapEnabled = true; + wrapStart = wrapLineLarge; + wrapEnd = wrapLineLarge; wrapVisualFlags = 0; wrapVisualFlagsLocation = 0; wrapVisualStartIndent = 0; @@ -1487,29 +1486,18 @@ void Editor::UpdateSystemCaret() { } -void Editor::NeedWrapping(int docLineStartWrapping, int docLineEndWrapping) { - docLineStartWrapping = Platform::Minimum(docLineStartWrapping, pdoc->LinesTotal()-1); - docLineEndWrapping = Platform::Minimum(docLineEndWrapping, pdoc->LinesTotal()-1); - bool noWrap = (docLastLineToWrap == docLineLastWrapped); - if (docLineLastWrapped > (docLineStartWrapping - 1)) { - docLineLastWrapped = docLineStartWrapping - 1; - if (docLineLastWrapped < -1) - docLineLastWrapped = -1; +void Editor::NeedWrapping(int docLineStart, int docLineEnd) { + docLineStart = Platform::Clamp(docLineStart, 0, pdoc->LinesTotal()); + if (wrapStart > docLineStart) { + wrapStart = docLineStart; llc.Invalidate(LineLayout::llPositions); } - if (noWrap) { - docLastLineToWrap = docLineEndWrapping; - } else if (docLastLineToWrap < docLineEndWrapping) { - docLastLineToWrap = docLineEndWrapping + 1; + if (wrapEnd < docLineEnd) { + wrapEnd = docLineEnd; } - if (docLastLineToWrap < -1) - docLastLineToWrap = -1; - if (docLastLineToWrap >= pdoc->LinesTotal()) - docLastLineToWrap = pdoc->LinesTotal()-1; + wrapEnd = Platform::Clamp(wrapEnd, 0, pdoc->LinesTotal()); // Wrap lines during idle. - if ((wrapState != eWrapNone) && - backgroundWrapEnabled && - (docLastLineToWrap != docLineLastWrapped)) { + if ((wrapState != eWrapNone) && (wrapEnd != wrapStart)) { SetIdle(true); } } @@ -1518,33 +1506,33 @@ // fullwrap: if true, all lines which need wrapping will be done, // in this single call. // priorityWrapLineStart: If greater than zero, all lines starting from -// here to 100 lines past will be wrapped (even if there are +// here to 1 page + 100 lines past will be wrapped (even if there are // more lines under wrapping process in idle). -// If it is neither fullwrap, nor priorityWrap, then 100 lines will be +// If it is neither fullwrap, nor priorityWrap, then 1 page + 100 lines will be // wrapped, if there are any wrapping going on in idle. (Generally this // condition is called only from idler). // Return true if wrapping occurred. bool Editor::WrapLines(bool fullWrap, int priorityWrapLineStart) { // If there are any pending wraps, do them during idle if possible. + int linesInOneCall = LinesOnScreen() + 100; if (wrapState != eWrapNone) { - if (docLineLastWrapped < docLastLineToWrap) { - if (!(backgroundWrapEnabled && SetIdle(true))) { - // Background wrapping is disabled, or idle processing - // not supported. A full wrap is required. + if (wrapStart < wrapEnd) { + if (!SetIdle(true)) { + // Idle processing not supported so full wrap required. fullWrap = true; } } if (!fullWrap && priorityWrapLineStart >= 0 && // .. and if the paint window is outside pending wraps - (((priorityWrapLineStart + 100) < docLineLastWrapped) || - (priorityWrapLineStart > docLastLineToWrap))) { + (((priorityWrapLineStart + linesInOneCall) < wrapStart) || + (priorityWrapLineStart > wrapEnd))) { // No priority wrap pending return false; } } int goodTopLine = topLine; bool wrapOccurred = false; - if (docLineLastWrapped < pdoc->LinesTotal()) { + if (wrapStart <= pdoc->LinesTotal()) { if (wrapState == eWrapNone) { if (wrapWidth != LineLayout::wrapWidthInfinite) { wrapWidth = LineLayout::wrapWidthInfinite; @@ -1553,8 +1541,11 @@ } wrapOccurred = true; } - docLineLastWrapped = 0x7ffffff; + wrapStart = wrapLineLarge; + wrapEnd = wrapLineLarge; } else { + if (wrapEnd >= pdoc->LinesTotal()) + wrapEnd = pdoc->LinesTotal(); //ElapsedTime et; int lineDocTop = cs.DocFromDisplay(topLine); int subLineTop = topLine - cs.DisplayFromDoc(lineDocTop); @@ -1568,44 +1559,42 @@ AutoSurface surface(this); if (surface) { bool priorityWrap = false; - int lastLineToWrap = docLastLineToWrap; - int firstLineToWrap = docLineLastWrapped; + int lastLineToWrap = wrapEnd; + int lineToWrap = wrapStart; if (!fullWrap) { if (priorityWrapLineStart >= 0) { // This is a priority wrap. - firstLineToWrap = priorityWrapLineStart; - lastLineToWrap = firstLineToWrap + 100; + lineToWrap = priorityWrapLineStart; + lastLineToWrap = priorityWrapLineStart + linesInOneCall; priorityWrap = true; } else { // This is idle wrap. - lastLineToWrap = docLineLastWrapped + 100; + lastLineToWrap = wrapStart + linesInOneCall; } - if (lastLineToWrap >= docLastLineToWrap) - lastLineToWrap = docLastLineToWrap; + if (lastLineToWrap >= wrapEnd) + lastLineToWrap = wrapEnd; } // else do a fullWrap. - // printf("Wraplines: full = %d, priorityStart = %d (wrapping: %d to %d)\n", fullWrap, priorityWrapLineStart, firstLineToWrap, lastLineToWrap); - // printf("Pending wraps: %d to %d\n", docLineLastWrapped, docLastLineToWrap); - while (firstLineToWrap < lastLineToWrap) { - firstLineToWrap++; - if (!priorityWrap) - docLineLastWrapped++; - if (firstLineToWrap < pdoc->LinesTotal()) { - AutoLineLayout ll(llc, RetrieveLineLayout(firstLineToWrap)); + // Platform::DebugPrintf("Wraplines: full = %d, priorityStart = %d (wrapping: %d to %d)\n", fullWrap, priorityWrapLineStart, lineToWrap, lastLineToWrap); + // Platform::DebugPrintf("Pending wraps: %d to %d\n", wrapStart, wrapEnd); + while (lineToWrap < lastLineToWrap) { + AutoLineLayout ll(llc, RetrieveLineLayout(lineToWrap)); int linesWrapped = 1; if (ll) { - LayoutLine(firstLineToWrap, surface, vs, ll, wrapWidth); + LayoutLine(lineToWrap, surface, vs, ll, wrapWidth); linesWrapped = ll->lines; } - if (cs.SetHeight(firstLineToWrap, linesWrapped)) { + if (cs.SetHeight(lineToWrap, linesWrapped)) { wrapOccurred = true; - } } + lineToWrap++; } + if (!priorityWrap) + wrapStart = lineToWrap; // If wrapping is done, bring it to resting position - if (docLineLastWrapped > docLastLineToWrap) { - docLineLastWrapped = -1; - docLastLineToWrap = -1; + if (wrapStart >= wrapEnd) { + wrapStart = wrapLineLarge; + wrapEnd = wrapLineLarge; } } goodTopLine = cs.DisplayFromDoc(lineDocTop); @@ -1721,7 +1710,7 @@ rcSelMargin.left = rcSelMargin.right; rcSelMargin.right = rcSelMargin.left + vs.ms[margin].width; - if (vs.ms[margin].symbol) { + if (vs.ms[margin].style != SC_MARGIN_NUMBER) { /* alternate scheme: if (vs.ms[margin].mask & SC_MASK_FOLDERS) surface->FillRectangle(rcSelMargin, vs.styles[STYLE_DEFAULT].back.allocated); @@ -1732,8 +1721,21 @@ if (vs.ms[margin].mask & SC_MASK_FOLDERS) // Required because of special way brush is created for selection margin surface->FillRectangle(rcSelMargin, *pixmapSelPattern); - else - surface->FillRectangle(rcSelMargin, vs.styles[STYLE_LINENUMBER].back.allocated); + else { + ColourAllocated colour; + switch (vs.ms[margin].style) { + case SC_MARGIN_BACK: + colour = vs.styles[STYLE_DEFAULT].back.allocated; + break; + case SC_MARGIN_FORE: + colour = vs.styles[STYLE_DEFAULT].fore.allocated; + break; + default: + colour = vs.styles[STYLE_LINENUMBER].back.allocated; + break; + } + surface->FillRectangle(rcSelMargin, colour); + } } else { surface->FillRectangle(rcSelMargin, vs.styles[STYLE_LINENUMBER].back.allocated); } @@ -1840,7 +1842,7 @@ PRectangle rcMarker = rcSelMargin; rcMarker.top = yposScreen; rcMarker.bottom = yposScreen + vs.lineHeight; - if (!vs.ms[margin].symbol) { + if (vs.ms[margin].style == SC_MARGIN_NUMBER) { char number[100]; number[0] = '\0'; if (firstSubLine) @@ -2131,7 +2133,7 @@ continue; } if (p > 0) { - if (wrapState == eWrapChar){ + if (wrapState == eWrapChar) { lastGoodBreak = pdoc->MovePositionOutsideChar(p + posLineStart, -1) - posLineStart; p = pdoc->MovePositionOutsideChar(p + 1 + posLineStart, 1) - posLineStart; @@ -2150,14 +2152,15 @@ } } +ColourAllocated Editor::SelectionBackground(ViewStyle &vsDraw) { + return primarySelection ? vsDraw.selbackground.allocated : vsDraw.selbackground2.allocated; +} + ColourAllocated Editor::TextBackground(ViewStyle &vsDraw, bool overrideBackground, ColourAllocated background, bool inSelection, bool inHotspot, int styleMain, int i, LineLayout *ll) { if (inSelection) { - if (vsDraw.selbackset) { - if (primarySelection) - return vsDraw.selbackground.allocated; - else - return vsDraw.selbackground2.allocated; + if (vsDraw.selbackset && (vsDraw.selAlpha == SC_ALPHA_NOALPHA)) { + return SelectionBackground(vsDraw); } } else { if ((vsDraw.edgeState == EDGE_BACKGROUND) && @@ -2209,7 +2212,7 @@ surface->LineTo(xBase + xDir * xRelative, yBase + yDir * yRelative); } }; - Relative rel = {surface, x0, xStraight?1:-1, y0, yStraight?1:-1}; + Relative rel = {surface, x0, xStraight ? 1 : -1, y0, yStraight ? 1 : -1}; // arrow head rel.MoveTo(xa, y); @@ -2225,6 +2228,12 @@ y - 2 * dy); } +static void SimpleAlphaRectangle(Surface *surface, PRectangle rc, ColourAllocated fill, int alpha) { + if (alpha != SC_ALPHA_NOALPHA) { + surface->AlphaRectangle(rc, 0, fill, alpha, fill, alpha, 0); + } +} + void Editor::DrawEOL(Surface *surface, ViewStyle &vsDraw, PRectangle rcLine, LineLayout *ll, int line, int lineEnd, int xStart, int subLine, int subLineStart, bool overrideBackground, ColourAllocated background, @@ -2241,15 +2250,17 @@ bool eolInSelection = (subLine == (ll->lines - 1)) && (posLineEnd > ll->selStart) && (posLineEnd <= ll->selEnd) && (ll->selStart != ll->selEnd); - if (eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1)) { - if (primarySelection) - surface->FillRectangle(rcSegment, vsDraw.selbackground.allocated); - else - surface->FillRectangle(rcSegment, vsDraw.selbackground2.allocated); - } else if (overrideBackground) { - surface->FillRectangle(rcSegment, background); + if (eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1) && (vsDraw.selAlpha == SC_ALPHA_NOALPHA)) { + surface->FillRectangle(rcSegment, SelectionBackground(vsDraw)); } else { - surface->FillRectangle(rcSegment, vsDraw.styles[ll->styles[ll->numCharsInLine] & styleMask].back.allocated); + if (overrideBackground) { + surface->FillRectangle(rcSegment, background); + } else { + surface->FillRectangle(rcSegment, vsDraw.styles[ll->styles[ll->numCharsInLine] & styleMask].back.allocated); + } + if (eolInSelection && vsDraw.selbackset && (line < pdoc->LinesTotal() - 1) && (vsDraw.selAlpha != SC_ALPHA_NOALPHA)) { + SimpleAlphaRectangle(surface, rcSegment, SelectionBackground(vsDraw), vsDraw.selAlpha); + } } rcSegment.left = xEol + vsDraw.aveCharWidth + xStart; @@ -2302,7 +2313,8 @@ if (!overrideBackground) { int marks = pdoc->GetMark(line); for (int markBit = 0; (markBit < 32) && marks; markBit++) { - if ((marks & 1) && vsDraw.markers[markBit].markType == SC_MARK_BACKGROUND) { + if ((marks & 1) && (vsDraw.markers[markBit].markType == SC_MARK_BACKGROUND) && + (vsDraw.markers[markBit].alpha == SC_ALPHA_NOALPHA)) { background = vsDraw.markers[markBit].back.allocated; overrideBackground = true; } @@ -2311,14 +2323,15 @@ } if (!overrideBackground) { if (vsDraw.maskInLine) { - int marks = pdoc->GetMark(line) & vsDraw.maskInLine; - if (marks) { - for (int markBit = 0; (markBit < 32) && marks; markBit++) { - if ((marks & 1) && (vsDraw.markers[markBit].markType != SC_MARK_EMPTY)) { + int marksMasked = pdoc->GetMark(line) & vsDraw.maskInLine; + if (marksMasked) { + for (int markBit = 0; (markBit < 32) && marksMasked; markBit++) { + if ((marksMasked & 1) && (vsDraw.markers[markBit].markType != SC_MARK_EMPTY) && + (vsDraw.markers[markBit].alpha == SC_ALPHA_NOALPHA)) { overrideBackground = true; background = vsDraw.markers[markBit].back.allocated; } - marks >>= 1; + marksMasked >>= 1; } } } @@ -2646,6 +2659,15 @@ xStart, subLine, subLineStart, overrideBackground, background, drawWrapMarkEnd, vsDraw.whitespaceForeground.allocated); } + if ((vsDraw.selAlpha != SC_ALPHA_NOALPHA) && (ll->selStart >= 0) && (ll->selEnd >= 0)) { + int startPosSel = (ll->selStart < posLineStart) ? posLineStart : ll->selStart; + int endPosSel = (ll->selEnd < (lineEnd + posLineStart)) ? ll->selEnd : (lineEnd + posLineStart); + if (startPosSel < endPosSel) { + rcSegment.left = xStart + ll->positions[startPosSel - posLineStart] - subLineStart; + rcSegment.right = xStart + ll->positions[endPosSel - posLineStart] - subLineStart; + SimpleAlphaRectangle(surface, rcSegment, SelectionBackground(vsDraw), vsDraw.selAlpha); + } + } if (vsDraw.edgeState == EDGE_LINE) { int edgeX = theEdge * vsDraw.spaceWidth; @@ -2654,12 +2676,30 @@ surface->FillRectangle(rcSegment, vsDraw.edgecolour.allocated); } - if (caret.active && vsDraw.showCaretLineBackground && (vsDraw.caretLineAlpha != SC_ALPHA_NOALPHA) && ll->containsCaret) { - rcSegment.left = xStart; - rcSegment.right = rcLine.right - 1; - surface->AlphaRectangle(rcSegment, 0, vsDraw.caretLineBackground.allocated, vsDraw.caretLineAlpha, - vsDraw.caretLineBackground.allocated, vsDraw.caretLineAlpha, 0); + // Draw any translucent whole line states + rcSegment.left = xStart; + rcSegment.right = rcLine.right - 1; + if (caret.active && vsDraw.showCaretLineBackground && ll->containsCaret) { + SimpleAlphaRectangle(surface, rcSegment, vsDraw.caretLineBackground.allocated, vsDraw.caretLineAlpha); } + int marks = pdoc->GetMark(line); + for (int markBit = 0; (markBit < 32) && marks; markBit++) { + if ((marks & 1) && (vsDraw.markers[markBit].markType == SC_MARK_BACKGROUND)) { + SimpleAlphaRectangle(surface, rcSegment, vsDraw.markers[markBit].back.allocated, vsDraw.markers[markBit].alpha); + } + marks >>= 1; + } + if (vsDraw.maskInLine) { + int marksMasked = pdoc->GetMark(line) & vsDraw.maskInLine; + if (marksMasked) { + for (int markBit = 0; (markBit < 32) && marksMasked; markBit++) { + if ((marksMasked & 1) && (vsDraw.markers[markBit].markType != SC_MARK_EMPTY)) { + SimpleAlphaRectangle(surface, rcSegment, vsDraw.markers[markBit].back.allocated, vsDraw.markers[markBit].alpha); + } + marksMasked >>= 1; + } + } + } } void Editor::RefreshPixMaps(Surface *surfaceWindow) { @@ -3076,7 +3116,7 @@ // Printing supports only the line number margin. int lineNumberIndex = -1; for (int margin = 0; margin < ViewStyle::margins; margin++) { - if ((!vsPrint.ms[margin].symbol) && (vsPrint.ms[margin].width > 0)) { + if ((vsPrint.ms[margin].style == SC_MARGIN_NUMBER) && (vsPrint.ms[margin].width > 0)) { lineNumberIndex = margin; } else { vsPrint.ms[margin].width = 0; @@ -3089,6 +3129,7 @@ // Don't show the selection when printing vsPrint.selbackset = false; vsPrint.selforeset = false; + vsPrint.selAlpha = SC_ALPHA_NOALPHA; vsPrint.whitespaceBackgroundSet = false; vsPrint.whitespaceForegroundSet = false; vsPrint.showCaretLineBackground = false; @@ -3675,19 +3716,8 @@ llc.Invalidate(LineLayout::llCheckTextAndStyle); if (wrapState != eWrapNone) { int lineDoc = pdoc->LineFromPosition(mh.position); - if (mh.linesAdded <= 0) { - AutoSurface surface(this); - AutoLineLayout ll(llc, RetrieveLineLayout(lineDoc)); - if (surface && ll) { - LayoutLine(lineDoc, surface, vs, ll, wrapWidth); - if (cs.GetHeight(lineDoc) != ll->lines) { - NeedWrapping(lineDoc - 1, lineDoc + 1); - Redraw(); - } - } - } else { - NeedWrapping(lineDoc, lineDoc + 1 + mh.linesAdded); - } + int lines = Platform::Maximum(0, mh.linesAdded); + NeedWrapping(lineDoc, lineDoc + lines + 1); } } } @@ -3730,6 +3760,7 @@ InvalidateRange(mh.position, mh.position + mh.length); } } + llc.Invalidate(LineLayout::llCheckTextAndStyle); } else { // Move selection and brace highlights if (mh.modificationType & SC_MOD_INSERTTEXT) { @@ -4846,7 +4877,7 @@ text[size] = '\0'; } } - ss->Set(text, size + 1, pdoc->dbcsCodePage, + ss->Set(text, size + 1, pdoc->dbcsCodePage, vs.styles[STYLE_DEFAULT].characterSet, selType == selRectangle); } } @@ -5390,13 +5421,13 @@ bool idleDone; - bool wrappingDone = (wrapState == eWrapNone) || (!backgroundWrapEnabled); + bool wrappingDone = wrapState == eWrapNone; if (!wrappingDone) { // Wrap lines during idle. WrapLines(false, -1); // No more wrapping - if (docLineLastWrapped == docLastLineToWrap) + if (wrapStart == wrapEnd) wrappingDone = true; } @@ -6318,16 +6349,16 @@ return pdoc->ExtendWordSelect(wParam, 1, lParam != 0); case SCI_SETWRAPMODE: - switch(wParam){ - case SC_WRAP_WORD: - wrapState = eWrapWord; - break; - case SC_WRAP_CHAR: - wrapState = eWrapChar; - break; - default: - wrapState = eWrapNone; - break; + switch (wParam) { + case SC_WRAP_WORD: + wrapState = eWrapWord; + break; + case SC_WRAP_CHAR: + wrapState = eWrapChar; + break; + default: + wrapState = eWrapNone; + break; } xOffset = 0; InvalidateStyleRedraw(); @@ -6478,8 +6509,10 @@ return pdoc->LineEnd(wParam); case SCI_SETCODEPAGE: - pdoc->dbcsCodePage = wParam; - InvalidateStyleRedraw(); + if (ValidCodePage(wParam)) { + pdoc->dbcsCodePage = wParam; + InvalidateStyleRedraw(); + } break; case SCI_GETCODEPAGE: @@ -6512,6 +6545,11 @@ InvalidateStyleData(); RedrawSelMargin(); break; + case SCI_MARKERSETALPHA: + if (wParam <= MARKER_MAX) + vs.markers[wParam].alpha = lParam; + InvalidateStyleRedraw(); + break; case SCI_MARKERADD: { int markerID = pdoc->AddMark(wParam, lParam); return markerID; @@ -6559,14 +6597,14 @@ case SCI_SETMARGINTYPEN: if (ValidMargin(wParam)) { - vs.ms[wParam].symbol = (lParam == SC_MARGIN_SYMBOL); + vs.ms[wParam].style = lParam; InvalidateStyleRedraw(); } break; case SCI_GETMARGINTYPEN: if (ValidMargin(wParam)) - return vs.ms[wParam].symbol ? SC_MARGIN_SYMBOL : SC_MARGIN_NUMBER; + return vs.ms[wParam].style; else return 0; @@ -6850,6 +6888,14 @@ InvalidateStyleRedraw(); break; + case SCI_SETSELALPHA: + vs.selAlpha = wParam; + InvalidateStyleRedraw(); + break; + + case SCI_GETSELALPHA: + return vs.selAlpha; + case SCI_SETWHITESPACEFORE: vs.whitespaceForegroundSet = wParam != 0; vs.whitespaceForeground.desired = ColourDesired(lParam); Modified: trunk/scintilla/Editor.h =================================================================== --- trunk/scintilla/Editor.h 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/Editor.h 2006-06-21 23:15:54 UTC (rev 471) @@ -305,10 +305,10 @@ // Wrapping support enum { eWrapNone, eWrapWord, eWrapChar } wrapState; - bool backgroundWrapEnabled; + enum { wrapLineLarge = 0x7ffffff }; int wrapWidth; - int docLineLastWrapped; - int docLastLineToWrap; + int wrapStart; + int wrapEnd; int wrapVisualFlags; int wrapVisualFlagsLocation; int wrapVisualStartIndent; @@ -377,7 +377,7 @@ void InvalidateCaret(); virtual void UpdateSystemCaret(); - void NeedWrapping(int docLineStartWrapping = 0, int docLineEndWrapping = 0x7ffffff); + void NeedWrapping(int docLineStart = 0, int docLineEnd = wrapLineLarge); bool WrapLines(bool fullWrap, int priorityWrapLineStart); void LinesJoin(); void LinesSplit(int pixelWidth); @@ -387,6 +387,7 @@ LineLayout *RetrieveLineLayout(int lineNumber); void LayoutLine(int line, Surface *surface, ViewStyle &vstyle, LineLayout *ll, int width=LineLayout::wrapWidthInfinite); + ColourAllocated SelectionBackground(ViewStyle &vsDraw); ColourAllocated TextBackground(ViewStyle &vsDraw, bool overrideBackground, ColourAllocated background, bool inSelection, bool inHotspot, int styleMain, int i, LineLayout *ll); void DrawIndentGuide(Surface *surface, int lineVisible, int lineHeight, int start, PRectangle rcSegment, bool highlight); void DrawWrapMarker(Surface *surface, PRectangle rcPlace, bool isEndMarker, ColourAllocated wrapColour); @@ -524,6 +525,7 @@ void GetHotSpotRange(int& hsStart, int& hsEnd); int CodePage() const; + virtual bool ValidCodePage(int /* codePage */) const { return true; } int WrapCount(int line); virtual sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) = 0; Modified: trunk/scintilla/LexBash.cxx =================================================================== --- trunk/scintilla/LexBash.cxx 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/LexBash.cxx 2006-06-21 23:15:54 UTC (rev 471) @@ -259,7 +259,7 @@ if (state == SCE_SH_DEFAULT) { if (ch == '\\') { // escaped character if (i < lengthDoc - 1) - i++; + i++; ch = chNext; chNext = chNext2; styler.ColourTo(i, SCE_SH_IDENTIFIER); Modified: trunk/scintilla/LexHTML.cxx =================================================================== --- trunk/scintilla/LexHTML.cxx 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/LexHTML.cxx 2006-06-21 23:15:54 UTC (rev 471) @@ -687,7 +687,7 @@ (ch == '<') && (chNext == '?') && !IsScriptCommentState(state) ) { - scriptLanguage = segIsScriptingIndicator(styler, styler.GetStartSegment() + 2, i + 10, eScriptPHP); + scriptLanguage = segIsScriptingIndicator(styler, i + 2, i + 10, eScriptPHP); if (scriptLanguage != eScriptPHP && isStringState(state)) continue; styler.ColourTo(i - 1, StateToPrint); beforePreProc = state; Modified: trunk/scintilla/LexSQL.cxx =================================================================== --- trunk/scintilla/LexSQL.cxx 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/LexSQL.cxx 2006-06-21 23:15:54 UTC (rev 471) @@ -60,27 +60,7 @@ bool sqlBackslashEscapes = styler.GetPropertyInt("sql.backslash.escapes", 0) != 0; bool sqlBackticksIdentifier = styler.GetPropertyInt("lexer.sql.backticks.identifier", 0) != 0; int styleBeforeDCKeyword = SCE_SQL_DEFAULT; - bool fold = styler.GetPropertyInt("fold") != 0; - int lineCurrent = styler.GetLine(startPos); - for (; sc.More(); sc.Forward()) { - // Fold based on indentation - if (sc.atLineStart) { - int spaceFlags = 0; - int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags); - int level = indentCurrent; - if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) { - // Only non whitespace lines can be headers - int indentNext = styler.IndentAmount(lineCurrent + 1, &spaceFlags); - if (indentCurrent < (indentNext & ~SC_FOLDLEVELWHITEFLAG)) { - level |= SC_FOLDLEVELHEADERFLAG; - } - } - if (fold) { - styler.SetLevel(lineCurrent, level); - } - } - // Determine if the current state should terminate. switch (sc.state) { case SCE_SQL_OPERATOR: @@ -242,6 +222,8 @@ WordList *[], Accessor &styler) { bool foldComment = styler.GetPropertyInt("fold.comment") != 0; bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; + bool foldOnlyBegin = styler.GetPropertyInt("fold.sql.only.begin", 0) != 0; + unsigned int endPos = startPos + length; int visibleChars = 0; int lineCurrent = styler.GetLine(startPos); @@ -305,7 +287,7 @@ } else { s[j] = '\0'; } - if (strcmp(s, "if") == 0 || strcmp(s, "loop") == 0) { + if ((!foldOnlyBegin) && (strcmp(s, "if") == 0 || strcmp(s, "loop") == 0)) { if (endFound) { // ignore endFound = false; Modified: trunk/scintilla/LexTCL.cxx =================================================================== --- trunk/scintilla/LexTCL.cxx 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/LexTCL.cxx 2006-06-21 23:15:54 UTC (rev 471) @@ -23,34 +23,36 @@ // Extended to accept accented characters static inline bool IsAWordChar(int ch) { return ch >= 0x80 || - (isalnum(ch) || ch == '_' || ch ==':'); // : name space separator + (isalnum(ch) || ch == '_' || ch ==':' || ch=='.'); // : name space separator } static inline bool IsAWordStart(int ch) { - return ch >= 0x80 || - (isalpha(ch) || ch == '_'); + return ch >= 0x80 || (ch ==':' || isalpha(ch) || ch == '_'); } static inline bool IsANumberChar(int ch) { // Not exactly following number definition (several dots are seen as OK, etc.) // but probably enough in most cases. return (ch < 0x80) && - (isdigit(ch) || toupper(ch) == 'E' || + (IsADigit(ch, 0x10) || toupper(ch) == 'E' || ch == '.' || ch == '-' || ch == '+'); } -static void ColouriseTCLDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], Accessor &styler) { +static void ColouriseTCLDoc(unsigned int startPos, int length, int , WordList *keywordlists[], Accessor &styler) { +#define isComment(s) (s==SCE_TCL_COMMENT || s==SCE_TCL_COMMENTLINE || s==SCE_TCL_COMMENT_BOX || s==SCE_TCL_BLOCK_COMMENT) bool foldComment = styler.GetPropertyInt("fold.comment") != 0; bool commentLevel = false; bool subBrace = false; // substitution begin with a brace ${.....} - enum tLineState {LS_DEFAULT, LS_OPEN_COMMENT, LS_OPEN_DOUBLE_QUOTE, LS_MASK_STATE = 0xf, + enum tLineState {LS_DEFAULT, LS_OPEN_COMMENT, LS_OPEN_DOUBLE_QUOTE, LS_COMMENT_BOX, LS_MASK_STATE = 0xf, LS_COMMAND_EXPECTED = 16, LS_BRACE_ONLY = 32 } lineState = LS_DEFAULT; bool prevSlash = false; int currentLevel = 0; bool expected = 0; - int subParen = 0; + bool subParen = 0; int currentLine = styler.GetLine(startPos); + if (currentLine > 0) + currentLine--; length += startPos - styler.LineStart(currentLine); // make sure lines overlap startPos = styler.LineStart(currentLine); @@ -77,77 +79,107 @@ bool visibleChars = false; int previousLevel = currentLevel; - StyleContext sc(startPos, length, initStyle, styler); + StyleContext sc(startPos, length, SCE_TCL_DEFAULT, styler); for (; ; sc.Forward()) { - bool atEnd = !sc.More(); // make sure we process last word at end of file next: - if (subBrace) { + if (sc.ch=='\r' && sc.chNext == '\n') // only ignore \r on PC process on the mac + continue; + bool atEnd = !sc.More(); // make sure we coloured the last word + if (lineState != LS_DEFAULT) { + sc.SetState(SCE_TCL_DEFAULT); + if (lineState == LS_OPEN_COMMENT) + sc.SetState(SCE_TCL_COMMENTLINE); + else if (lineState == LS_OPEN_DOUBLE_QUOTE) + sc.SetState(SCE_TCL_IN_QUOTE); + else if (lineState == LS_COMMENT_BOX && (sc.ch == '#' || (sc.ch == ' ' && sc.chNext=='#'))) + sc.SetState(SCE_TCL_COMMENT_BOX); + lineState = LS_DEFAULT; + } + if (subBrace) { // ${ overrides every thing even \ except } if (sc.ch == '}') { subBrace = false; - sc.SetState(SCE_TCL_OPERATOR); // } + sc.SetState(SCE_TCL_OPERATOR); sc.ForwardSetState(SCE_TCL_DEFAULT); + goto next; } else sc.SetState(SCE_TCL_SUB_BRACE); if (!sc.atLineEnd) continue; } else if (sc.state == SCE_TCL_DEFAULT || sc.state ==SCE_TCL_OPERATOR) { - expected &= isspacechar(static_cast<unsigned char>(sc.ch)) || IsAWordStart(sc.ch); + expected &= isspacechar(static_cast<unsigned char>(sc.ch)) || IsAWordStart(sc.ch) || sc.ch =='#'; } else if (sc.state == SCE_TCL_SUBSTITUTION) { - if (sc.ch == '(') - subParen++; - else if (sc.ch == ')') { + switch(sc.ch) { + case '(': + subParen=true; + sc.SetState(SCE_TCL_OPERATOR); + sc.ForwardSetState(SCE_TCL_SUBSTITUTION); + continue; + case ')': + sc.SetState(SCE_TCL_OPERATOR); + subParen=false; + continue; + case '$': + continue; + case ',': + sc.SetState(SCE_TCL_OPERATOR); if (subParen) - subParen--; - else - sc.SetState(SCE_TCL_DEFAULT); // lets the code below fix it - } else if (!IsAWordChar(sc.ch)) { - sc.SetState(SCE_TCL_DEFAULT); - subParen = 0; + sc.ForwardSetState(SCE_TCL_SUBSTITUTION); + continue; + default : + // maybe spaces should be allowed ??? + if (!IsAWordChar(sc.ch)) { // probably the code is wrong + sc.SetState(SCE_TCL_DEFAULT); + subParen = 0; + } + break; } - } - else - { - if (!IsAWordChar(sc.ch)) { - if (sc.state == SCE_TCL_IDENTIFIER || sc.state == SCE_TCL_MODIFIER || expected) { - char s[100]; - sc.GetCurrent(s, sizeof(s)); - bool quote = sc.state == SCE_TCL_IN_QUOTE; - if (commentLevel || expected) { - if (keywords.InList(s)) { - sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD); - } else if (keywords2.InList(s)) { - sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD2); - } else if (keywords3.InList(s)) { - sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD3); - } else if (keywords4.InList(s)) { - sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD4); - } else if (sc.GetRelative(-static_cast<int>(strlen(s))-1) == '{' && - keywords5.InList(s) && sc.ch == '}') { // {keyword} exactly no spaces - sc.ChangeState(SCE_TCL_EXPAND); - } - if (keywords6.InList(s)) { - sc.ChangeState(SCE_TCL_WORD5); - } else if (keywords7.InList(s)) { - sc.ChangeState(SCE_TCL_WORD6); - } else if (keywords8.InList(s)) { - sc.ChangeState(SCE_TCL_WORD7); - } else if (keywords9.InList(s)) { - sc.ChangeState(SCE_TCL_WORD8); - } + } else if (isComment(sc.state)) { + } else if (!IsAWordChar(sc.ch)) { + if ((sc.state == SCE_TCL_IDENTIFIER && expected) || sc.state == SCE_TCL_MODIFIER) { + char w[100]; + char *s=w; + sc.GetCurrent(w, sizeof(w)); + if (w[strlen(w)-1]=='\r') + w[strlen(w)-1]=0; + while(*s == ':') // ignore leading : like in ::set a 10 + ++s; + bool quote = sc.state == SCE_TCL_IN_QUOTE; + if (commentLevel || expected) { + if (keywords.InList(s)) { + sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD); + } else if (keywords2.InList(s)) { + sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD2); + } else if (keywords3.InList(s)) { + sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD3); + } else if (keywords4.InList(s)) { + sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD4); + } else if (sc.GetRelative(-static_cast<int>(strlen(s))-1) == '{' && + keywords5.InList(s) && sc.ch == '}') { // {keyword} exactly no spaces + sc.ChangeState(SCE_TCL_EXPAND); } - expected = false; - sc.SetState(quote ? SCE_TCL_IN_QUOTE : SCE_TCL_DEFAULT); - } else if (sc.state == SCE_TCL_MODIFIER || sc.state == SCE_TCL_SUBSTITUTION) { - sc.SetState(SCE_TCL_DEFAULT); + if (keywords6.InList(s)) { + sc.ChangeState(SCE_TCL_WORD5); + } else if (keywords7.InList(s)) { + sc.ChangeState(SCE_TCL_WORD6); + } else if (keywords8.InList(s)) { + sc.ChangeState(SCE_TCL_WORD7); + } else if (keywords9.InList(s)) { + sc.ChangeState(SCE_TCL_WORD8); + } } + expected = false; + sc.SetState(quote ? SCE_TCL_IN_QUOTE : SCE_TCL_DEFAULT); + } else if (sc.state == SCE_TCL_MODIFIER || sc.state == SCE_TCL_IDENTIFIER) { + sc.SetState(SCE_TCL_DEFAULT); } } if (atEnd) break; - if (sc.atLineEnd) { + if (sc.atLineEnd) { + lineState = LS_DEFAULT; currentLine = styler.GetLine(sc.currentPos); - if (foldComment && sc.state == SCE_TCL_COMMENTLINE) { + if (foldComment && sc.state!=SCE_TCL_COMMENT && isComment(sc.state)) { if (currentLevel == 0) { ++currentLevel; commentLevel = true; @@ -169,35 +201,39 @@ // Update the line state, so it can be seen by next line if (sc.state == SCE_TCL_IN_QUOTE) lineState = LS_OPEN_DOUBLE_QUOTE; - else if (prevSlash) { - if (sc.state == SCE_TCL_COMMENT || sc.state == SCE_TCL_COMMENTLINE) - lineState = LS_OPEN_COMMENT; + else { + if (prevSlash) { + if (isComment(sc.state)) + lineState = LS_OPEN_COMMENT; + } else if (sc.state == SCE_TCL_COMMENT_BOX) + lineState = LS_COMMENT_BOX; } styler.SetLineState(currentLine, (subBrace ? LS_BRACE_ONLY : 0) | (expected ? LS_COMMAND_EXPECTED : 0) | lineState); - sc.SetState(SCE_TCL_DEFAULT); + if (lineState == LS_COMMENT_BOX) + sc.ForwardSetState(SCE_TCL_COMMENT_BOX); + else if (lineState == LS_OPEN_DOUBLE_QUOTE) + sc.ForwardSetState(SCE_TCL_IN_QUOTE); + else + sc.ForwardSetState(SCE_TCL_DEFAULT); prevSlash = false; previousLevel = currentLevel; - lineState = LS_DEFAULT; - continue; + goto next; } if (prevSlash) { - prevSlash = (sc.state == SCE_TCL_COMMENT || sc.state == SCE_TCL_COMMENTLINE) && isspacechar(static_cast<unsigned char>(sc.ch)); - continue; + prevSlash = false; + if (sc.ch == '#' && IsANumberChar(sc.chNext)) + sc.ForwardSetState(SCE_TCL_NUMBER); + continue; } - + prevSlash = sc.ch == '\\'; + if (isComment(sc.state)) + continue; if (sc.atLineStart) { visibleChars = false; - if (lineState == LS_OPEN_COMMENT) { - sc.SetState(SCE_TCL_COMMENT); - lineState = LS_DEFAULT; - continue; - } - if (lineState == LS_OPEN_DOUBLE_QUOTE) - sc.SetState(SCE_TCL_IN_QUOTE); - else + if (sc.state!=SCE_TCL_IN_QUOTE && !isComment(sc.state)) { sc.SetState(SCE_TCL_DEFAULT); expected = IsAWordStart(sc.ch)|| isspacechar(static_cast<unsigned char>(sc.ch)); @@ -212,30 +248,32 @@ case SCE_TCL_IN_QUOTE: if (sc.ch == '"') { sc.ForwardSetState(SCE_TCL_DEFAULT); - visibleChars = true; // necessary for a " as the first and only character on a line + visibleChars = true; // necessary if a " is the first and only character on a line goto next; } else if (sc.ch == '[' || sc.ch == ']' || sc.ch == '$') { sc.SetState(SCE_TCL_OPERATOR); expected = sc.ch == '['; sc.ForwardSetState(SCE_TCL_IN_QUOTE); goto next; - } - prevSlash = sc.ch == '\\'; - continue; - case SCE_TCL_OPERATOR: + } + continue; + case SCE_TCL_OPERATOR: sc.SetState(SCE_TCL_DEFAULT); break; } if (sc.ch == '#') { if (visibleChars) { - if (sc.state != SCE_TCL_IN_QUOTE && expected) { + if (sc.state != SCE_TCL_IN_QUOTE && expected) sc.SetState(SCE_TCL_COMMENT); - expected = false; - } - } else - sc.SetState(SCE_TCL_COMMENTLINE); - } + } else { + sc.SetState(SCE_TCL_COMMENTLINE); + if (sc.chNext == '~') + sc.SetState(SCE_TCL_BLOCK_COMMENT); + if (sc.atLineStart && (sc.chNext == '#' || sc.chNext == '-')) + sc.SetState(SCE_TCL_COMMENT_BOX); + } + } if (!isspacechar(static_cast<unsigned char>(sc.ch))) { visibleChars = true; @@ -243,15 +281,15 @@ if (sc.ch == '\\') { prevSlash = true; - continue; + continue; } // Determine if a new state should be entered. if (sc.state == SCE_TCL_DEFAULT) { - if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) { + if (IsAWordStart(sc.ch)) { + sc.SetState(SCE_TCL_IDENTIFIER); + } else if (IsADigit(sc.ch) && !IsAWordChar(sc.chPrev)) { sc.SetState(SCE_TCL_NUMBER); - } else if (IsAWordStart(sc.ch) & expected) { - sc.SetState(SCE_TCL_IDENTIFIER); } else { switch (sc.ch) { case '\"': @@ -267,10 +305,8 @@ --currentLevel; break; case '[': + expected = true; case ']': - sc.SetState(SCE_TCL_OPERATOR); - expected = true; - break; case '(': case ')': sc.SetState(SCE_TCL_OPERATOR); @@ -284,15 +320,24 @@ sc.SetState(SCE_TCL_SUBSTITUTION); } else { - sc.ForwardSetState(SCE_TCL_OPERATOR); // { - sc.ForwardSetState(SCE_TCL_SUB_BRACE); + sc.SetState(SCE_TCL_OPERATOR); // $ + sc.Forward(); // { + sc.ForwardSetState(SCE_TCL_SUB_BRACE); subBrace = true; } break; + case '#': + if ((isspacechar(static_cast<unsigned char>(sc.chPrev))|| + isoperator(static_cast<char>(sc.chPrev))) && IsADigit(sc.chNext,0x10)) + sc.SetState(SCE_TCL_NUMBER); + break; case '-': - if (!IsADigit(sc.chNext)) - sc.SetState(SCE_TCL_MODIFIER); + sc.SetState(IsADigit(sc.chNext)? SCE_TCL_NUMBER: SCE_TCL_MODIFIER); break; + default: + if (isoperator(static_cast<char>(sc.ch))) { + sc.SetState(SCE_TCL_OPERATOR); + } } } } Modified: trunk/scintilla/LineMarker.h =================================================================== --- trunk/scintilla/LineMarker.h 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/LineMarker.h 2006-06-21 23:15:54 UTC (rev 471) @@ -15,11 +15,13 @@ int markType; ColourPair fore; ColourPair back; + int alpha; XPM *pxpm; LineMarker() { markType = SC_MARK_CIRCLE; fore = ColourDesired(0,0,0); back = ColourDesired(0xff,0xff,0xff); + alpha = SC_ALPHA_NOALPHA; pxpm = NULL; } LineMarker(const LineMarker &) { @@ -27,6 +29,7 @@ markType = SC_MARK_CIRCLE; fore = ColourDesired(0,0,0); back = ColourDesired(0xff,0xff,0xff); + alpha = SC_ALPHA_NOALPHA; pxpm = NULL; } ~LineMarker() { @@ -37,6 +40,7 @@ markType = SC_MARK_CIRCLE; fore = ColourDesired(0,0,0); back = ColourDesired(0xff,0xff,0xff); + alpha = SC_ALPHA_NOALPHA; delete pxpm; pxpm = NULL; return *this; Modified: trunk/scintilla/PlatGTK.cxx =================================================================== --- trunk/scintilla/PlatGTK.cxx 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/PlatGTK.cxx 2006-06-21 23:15:54 UTC (rev 471) @@ -794,7 +794,7 @@ void SurfaceImpl::SetConverter(int characterSet_) { if (characterSet != characterSet_) { characterSet = characterSet_; - conv.Open("UTF-8", CharacterSetID(characterSet)); + conv.Open("UTF-8", CharacterSetID(characterSet), false); } } #endif @@ -1016,6 +1016,8 @@ } } +#if GTK_MAJOR_VERSION >= 2 + // Plot a point into a guint32 buffer symetrically to all 4 qudrants static void AllFour(guint32 *pixels, int stride, int width, int height, int x, int y, guint32 val) { pixels[y*stride+x] = val; @@ -1036,6 +1038,8 @@ return co & 0xff; } +#endif + #if GTK_MAJOR_VERSION < 2 void SurfaceImpl::AlphaRectangle(PRectangle rc, int , ColourAllocated , int , ColourAllocated outline, int , int ) { if (gc && drawable) { @@ -1290,7 +1294,7 @@ int wclen; if (et == UTF8) { wclen = UCS2FromUTF8(s, len, - reinterpret_cast<wchar_t *>(wctext), maxLengthTextRun - 1); + static_cast<wchar_t *>(static_cast<void *>(wctext)), maxLengthTextRun - 1); } else { // dbcs, so convert using current locale char sMeasure[maxLengthTextRun]; memcpy(sMeasure, s, len); @@ -1396,7 +1400,7 @@ // Convert to UTF-8 so can ask Pango for widths, then // Loop through UTF-8 and DBCS forms, taking account of different // character byte lengths. - Converter convMeasure("UCS-2", CharacterSetID(characterSet)); + Converter convMeasure("UCS-2", CharacterSetID(characterSet), false); pango_layout_set_text(layout, utfForm, strlen(utfForm)); int i = 0; int utfIndex = 0; @@ -1465,7 +1469,7 @@ int wclen; if (et == UTF8) { wclen = UCS2FromUTF8(s, len, - reinterpret_cast<wchar_t *>(wctext), maxLengthTextRun - 1); + static_cast<wchar_t *>(static_cast<void *>(wctext)), maxLengthTextRun - 1); } else { // dbcsMode, so convert using current locale char sDraw[maxLengthTextRun]; memcpy(sDraw, s, len); @@ -1550,7 +1554,8 @@ #endif if (et == UTF8) { GdkWChar wctext[maxLengthTextRun]; - size_t wclen = UCS2FromUTF8(s, len, (wchar_t *)wctext, sizeof(wctext) / sizeof(GdkWChar) - 1); + size_t wclen = UCS2FromUTF8(s, len, static_cast<wchar_t *>(static_cast<void *>(wctext)), + sizeof(wctext) / sizeof(GdkWChar) - 1); wctext[wclen] = L'\0'; return gdk_text_width_wc(PFont(font_)->pfont, wctext, wclen); } else { @@ -1972,12 +1977,12 @@ scheme that it would use if it had the focus. */ static void StyleSet(GtkWidget *w, GtkStyle*, void*) { GtkStyle* style; - + g_return_if_fail(w != NULL); - + /* Copy the selected color to active. Note that the modify calls will cause recursive calls to this function after the value is updated and w->style to - be set to a new object */ + be set to a new object */ style = gtk_widget_get_style(w); if (style == NULL) return; @@ -2010,17 +2015,18 @@ #if GTK_MAJOR_VERSION < 2 list = gtk_clist_new(1); - gtk_widget_show(PWidget(list)); - gtk_container_add(GTK_CONTAINER(PWidget(scroller)), PWidget(list)); - gtk_clist_set_column_auto_resize(GTK_CLIST(PWidget(list)), 0, TRUE); - gtk_clist_set_selection_mode(GTK_CLIST(PWidget(list)), GTK_SELECTION_BROWSE); - gtk_signal_connect(GTK_OBJECT(PWidget(list)), "unselect_row", + GtkWidget *wid = PWidget(list); // No code inside the GTK_OBJECT macro + gtk_widget_show(wid); + gtk_container_add(GTK_CONTAINER(PWidget(scroller)), wid); + gtk_clist_set_column_auto_resize(GTK_CLIST(wid), 0, TRUE); + gtk_clist_set_selection_mode(GTK_CLIST(wid), GTK_SELECTION_BROWSE); + gtk_signal_connect(GTK_OBJECT(wid), "unselect_row", GTK_SIGNAL_FUNC(UnselectionAC), &current); - gtk_signal_connect(GTK_OBJECT(PWidget(list)), "select_row", + gtk_signal_connect(GTK_OBJECT(wid), "select_row", GTK_SIGNAL_FUNC(SelectionAC), &current); - gtk_signal_connect(GTK_OBJECT(PWidget(list)), "button_press_event", + gtk_signal_connect(GTK_OBJECT(wid), "button_press_event", GTK_SIGNAL_FUNC(ButtonPress), this); - gtk_clist_set_shadow_type(GTK_CLIST(PWidget(list)), GTK_SHADOW_NONE); + gtk_clist_set_shadow_type(GTK_CLIST(wid), GTK_SHADOW_NONE); #else /* Tree and its model */ GtkListStore *store = @@ -2054,11 +2060,12 @@ gtk_tree_view_append_column(GTK_TREE_VIEW(list), column); if (g_object_class_find_property(G_OBJECT_GET_CLASS(list), "fixed-height-mode")) g_object_set(G_OBJECT(list), "fixed-height-mode", TRUE, NULL); - gtk_container_add(GTK_CONTAINER(PWidget(scroller)), PWidget(list)); - gtk_widget_show(PWidget(list)); - gtk_signal_connect(GTK_OBJECT(PWidget(list)), "button_press_event", - GTK_SIGNAL_FUNC(ButtonPress), this); + GtkWidget *wid = PWidget(list); // No code inside the G_OBJECT macro + gtk_container_add(GTK_CONTAINER(PWidget(scroller)), wid); + gtk_widget_show(wid); + g_signal_connect(G_OBJECT(wid), "button_press_event", + G_CALLBACK(ButtonPress), this); #endif gtk_widget_realize(PWidget(id)); } @@ -2478,7 +2485,11 @@ void Menu::Destroy() { if (id) +#if GTK_MAJOR_VERSION < 2 gtk_object_unref(GTK_OBJECT(id)); +#else + g_object_unref(G_OBJECT(id)); +#endif id = 0; } @@ -2573,16 +2584,18 @@ #ifdef G_OS_WIN32 return "Lucida Console"; #else - - return "!Sans"; //fix for GTK2.8 until updating to sci 1.69 +#ifdef USE_PANGO + return "!Sans"; +#else + return "lucidatypewriter"; #endif +#endif } int Platform::DefaultFontSize() { #ifdef G_OS_WIN32 return 10; #else - return 12; #endif } @@ -2619,7 +2632,6 @@ return false; } -#if GTK_MAJOR_VERSION < 2 int Platform::DBCSCharLength(int, const char *s) { int bytes = mblen(s, MB_CUR_MAX); if (bytes >= 1) @@ -2627,24 +2639,6 @@ else return 1; } -#else -int Platform::DBCSCharLength(int codePage, const char *s) { - if (codePage == 999932) { - // Experimental and disabled code - change 999932 to 932 above to - // enable locale avoiding but expensive character length determination. - // Avoid locale with explicit use of iconv - Converter convMeasure("UCS-2", CharacterSetID(SC_CHARSET_SHIFTJIS)); - size_t lenChar = MultiByteLenFromIconv(convMeasure, s, strlen(s)); - return lenChar; - } else { - int bytes = mblen(s, MB_CUR_MAX); - if (bytes >= 1) - return bytes; - else - return 1; - } -} -#endif int Platform::DBCSCharMaxLength() { return MB_CUR_MAX; Modified: trunk/scintilla/ScintillaBase.cxx =================================================================== --- trunk/scintilla/ScintillaBase.cxx 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/ScintillaBase.cxx 2006-06-21 23:15:54 UTC (rev 471) @@ -469,7 +469,7 @@ int styleStart = 0; if (start > 0) - styleStart = styler.StyleAt(start - 1); + styleStart = styler.StyleAt(start - 1) & pdoc->stylingBitsMask; styler.SetCodePage(pdoc->dbcsCodePage); if (lexCurrent && (len > 0)) { // Should always succeed as null lexer should always be available Modified: trunk/scintilla/ScintillaGTK.cxx =================================================================== --- trunk/scintilla/ScintillaGTK.cxx 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/ScintillaGTK.cxx 2006-06-21 23:15:54 UTC (rev 471) @@ -46,7 +46,7 @@ #include "gtk/gtksignal.h" #include "gtk/gtkmarshal.h" -#if GTK_MAJOR_VERSION >= 2 +#if GLIB_MAJOR_VERSION >= 2 #include "scintilla-marshal.h" #endif @@ -73,10 +73,16 @@ #pragma warning(disable: 4505) #endif -#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 2 +#if GTK_CHECK_VERSION(2,2,0) #define USE_GTK_CLIPBOARD #endif +#if GLIB_MAJOR_VERSION < 2 +#define OBJECT_CLASS GtkObjectClass +#else +#define OBJECT_CLASS GObjectClass +#endif + extern char *UTF8FromLatin1(const char *s, int &len); class ScintillaGTK : public ScintillaBase { @@ -107,6 +113,7 @@ static GdkAtom atomUTF8; static GdkAtom atomString; static GdkAtom atomUriList; + static GdkAtom atomDROPFILES_DND; GdkAtom atomSought; #if PLAT_GTK_WIN32 @@ -140,8 +147,7 @@ public: ScintillaGTK(_ScintillaObject *sci_); virtual ~ScintillaGTK(); - static void ClassInit(GtkObjectClass* object_class, GtkWidgetClass *widget_class, GtkContainerClass *container_class); - + static void ClassInit(OBJECT_CLASS* object_class, GtkWidgetClass *widget_class, GtkContainerClass *container_class); private: virtual void Initialise(); virtual void Finalise(); @@ -149,6 +155,7 @@ virtual void StartDrag(); int TargetAsUTF8(char *text); int EncodedFromUTF8(char *utf8, char *encoded); + virtual bool ValidCodePage(int codePage) const; public: // Public for scintilla_send_message virtual sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam); private: @@ -171,7 +178,6 @@ virtual void NotifyParent(SCNotification scn); void NotifyKey(int key, int modifiers); void NotifyURIDropped(const char *list); - bool UseInputMethod() const; const char *CharacterSetID() const; virtual int KeyDefault(int key, int modifiers); virtual void CopyToClipboard(const SelectionText &selectedText); @@ -222,12 +228,12 @@ static gint ScrollEvent(GtkWidget *widget, GdkEventScroll *event); #endif static gint Motion(GtkWidget *widget, GdkEventMotion *event); - gint KeyThis(GdkEventKey *event); - static gint KeyPress(GtkWidget *widget, GdkEventKey *event); - static gint KeyRelease(GtkWidget *widget, GdkEventKey *event); + gboolean KeyThis(GdkEventKey *event); + static gboolean KeyPress(GtkWidget *widget, GdkEventKey *event); + static gboolean KeyRelease(GtkWidget *widget, GdkEventKey *event); #if GTK_MAJOR_VERSION >= 2 - static gint ExposePreedit(GtkWidget *widget, GdkEventExpose *ose, ScintillaGTK *sciThis); - gint ExposePreeditThis(GtkWidget *widget, GdkEventExpose *ose); + static gboolean ExposePreedit(GtkWidget *widget, GdkEventExpose *ose, ScintillaGTK *sciThis); + gboolean ExposePreeditThis(GtkWidget *widget, GdkEventExpose *ose); static void Commit(GtkIMContext *context, char *str, ScintillaGTK *sciThis); void CommitThis(char *str); static void PreeditChanged(GtkIMContext *context, ScintillaGTK *sciThis); @@ -235,7 +241,11 @@ #endif static gint StyleSetText(GtkWidget *widget, GtkStyle *previous, void*); static gint RealizeText(GtkWidget *widget, void*); +#if GLIB_MAJOR_VERSION < 2 static void Destroy(GtkObject *object); +#else + static void Destroy(GObject *object); +#endif static void SelectionReceived(GtkWidget *widget, GtkSelectionData *selection_data, guint time); static void SelectionGet(GtkWidget *widget, GtkSelectionData *selection_data, @@ -277,7 +287,9 @@ }; static gint scintilla_signals[LAST_SIGNAL] = { 0 }; -static GtkWidgetClass* parent_class = NULL; +#if GLIB_MAJOR_VERSION < 2 +static GtkWidgetClass *parent_class = NULL; +#endif enum { TARGET_STRING, @@ -291,6 +303,7 @@ GdkAtom ScintillaGTK::atomUTF8 = 0; GdkAtom ScintillaGTK::atomString = 0; GdkAtom ScintillaGTK::atomUriList = 0; +GdkAtom ScintillaGTK::atomDROPFILES_DND = 0; static const GtkTargetEntry clipboardTargets[] = { { "text/uri-list", 0, TARGET_URI }, @@ -434,26 +447,35 @@ #else wPreedit = gtk_window_new(GTK_WINDOW_POPUP); wPreeditDraw = gtk_drawing_area_new(); - gtk_signal_connect(GTK_OBJECT(PWidget(wPreeditDraw)), "expose_event", - GtkSignalFunc(ExposePreedit), this); - gtk_container_add(GTK_CONTAINER(PWidget(wPreedit)), PWidget(wPreeditDraw)); + GtkWidget *predrw = PWidget(wPreeditDraw); // No code inside the G_OBJECT macro + g_signal_connect(G_OBJECT(predrw), "expose_event", + G_CALLBACK(ExposePreedit), this); + gtk_container_add(GTK_CONTAINER(PWidget(wPreedit)), predrw); gtk_widget_realize(PWidget(wPreedit)); - gtk_widget_realize(PWidget(wPreeditDraw)); - gtk_widget_show(PWidget(wPreeditDraw)); + gtk_widget_realize(predrw); + gtk_widget_show(predrw); im_context = gtk_im_multicontext_new(); - g_signal_connect(im_context, "commit", + g_signal_connect(G_OBJECT(im_context), "commit", G_CALLBACK(Commit), this); - g_signal_connect(im_context, "preedit_changed", + g_signal_connect(G_OBJECT(im_context), "preedit_changed", G_CALLBACK(PreeditChanged), this); gtk_im_context_set_client_window(im_context, widget->window); #endif #endif - gtk_signal_connect_after(GTK_OBJECT(PWidget(wText)), "style_set", + GtkWidget *widtxt = PWidget(wText); // // No code inside the G_OBJECT macro +#if GLIB_MAJOR_VERSION < 2 + gtk_signal_connect_after(GTK_OBJECT(widtxt), "style_set", GtkSignalFunc(ScintillaGTK::StyleSetText), NULL); - gtk_signal_connect_after(GTK_OBJECT(PWidget(wText)), "realize", + gtk_signal_connect_after(GTK_OBJECT(widtxt), "realize", GtkSignalFunc(ScintillaGTK::RealizeText), NULL); - gtk_widget_realize(PWidget(wText)); +#else + g_signal_connect_after(G_OBJECT(widtxt), "style_set", + G_CALLBACK(ScintillaGTK::StyleSetText), NULL); + g_signal_connect_after(G_OBJECT(widtxt), "realize", + G_CALLBACK(ScintillaGTK::RealizeText), NULL); +#endif + gtk_widget_realize(widtxt); gtk_widget_realize(PWidget(scrollbarv)); gtk_widget_realize(PWidget(scrollbarh)); } @@ -691,30 +713,45 @@ wText = gtk_drawing_area_new(); gtk_widget_set_parent(PWidget(wText), PWidget(wMain)); - gtk_widget_show(PWidget(wText)); - gtk_signal_connect(GTK_OBJECT(PWidget(wText)), "expose_event", + GtkWidget *widtxt = PWidget(wText); // No code inside the G_OBJECT macro + gtk_widget_show(widtxt); +#if GLIB_MAJOR_VERSION < 2 + gtk_signal_connect(GTK_OBJECT(widtxt), "expose_event", GtkSignalFunc(ScintillaGTK::ExposeText), this); - gtk_widget_set_events(PWidget(wText), GDK_EXPOSURE_MASK); +#else + g_signal_connect(G_OBJECT(widtxt), "expose_event", + G_CALLBACK(ScintillaGTK::ExposeText), this); +#endif + gtk_widget_set_events(widtxt, GDK_EXPOSURE_MASK); #if GTK_MAJOR_VERSION >= 2 // Avoid background drawing flash - gtk_widget_set_double_buffered(PWidget(wText), FALSE); + gtk_widget_set_double_buffered(widtxt, FALSE); #endif - gtk_drawing_area_size(GTK_DRAWING_AREA(PWidget(wText)), + gtk_drawing_area_size(GTK_DRAWING_AREA(widtxt), 100,100); - adjustmentv = gtk_adjustment_new(0.0, 0.0, 201.0, 1.0, 20.0, 20.0); scrollbarv = gtk_vscrollbar_new(GTK_ADJUSTMENT(adjustmentv)); GTK_WIDGET_UNSET_FLAGS(PWidget(scrollbarv), GTK_CAN_FOCUS); - gtk_signal_connect(GTK_OBJECT(adjustmentv), "value_changed", - GTK_SIGNAL_FUNC(ScrollSignal), this); +#if GLIB_MAJOR_VERSION < 2 + gtk_signal_connect(adjustmentv, "value_changed", + GtkSignalFunc(ScrollSignal), this); +#else + g_signal_connect(G_OBJECT(adjustmentv), "value_changed", + G_CALLBACK(ScrollSignal), this); +#endif gtk_widget_set_parent(PWidget(scrollbarv), PWidget(wMain)); gtk_widget_show(PWidget(scrollbarv)); adjustmenth = gtk_adjustment_new(0.0, 0.0, 101.0, 1.0, 20.0, 20.0); scrollbarh = gtk_hscrollbar_new(GTK_ADJUSTMENT(adjustmenth)); GTK_WIDGET_UNSET_FLAGS(PWidget(scrollbarh), GTK_CAN_FOCUS); - gtk_signal_connect(GTK_OBJECT(adjustmenth), "value_changed", - GTK_SIGNAL_FUNC(ScrollHSignal), this); +#if GLIB_MAJOR_VERSION < 2 + gtk_signal_connect(adjustmenth, "value_changed", + GtkSignalFunc(ScrollHSignal), this); +#else + g_signal_connect(G_OBJECT(adjustmenth), "value_changed", + G_CALLBACK(ScrollHSignal), this); +#endif gtk_widget_set_parent(PWidget(scrollbarh), PWidget(wMain)); gtk_widget_show(PWidget(scrollbarh)); @@ -752,8 +789,6 @@ static const GtkTargetEntry targets[] = { { "UTF8_STRING", 0, TARGET_UTF8_STRING }, { "STRING", 0, TARGET_STRING }, - // { "TEXT", 0, TARGET_TEXT }, - // { "COMPOUND_TEXT", 0, TARGET_COMPOUND_TEXT }, }; static const gint n_targets = sizeof(targets) / sizeof(targets[0]); GtkTargetList *tl = gtk_target_list_new(targets, n_targets); @@ -765,10 +800,11 @@ } #ifdef USE_CONVERTER -static char *ConvertText(int *lenResult, char *s, size_t len, const char *charSetDest, const char *charSetSource) { +static char *ConvertText(int *lenResult, char *s, size_t len, const char *charSetDest, + const char *charSetSource, bool transliterations) { *lenResult = 0; char *destForm = 0; - Converter conv(charSetDest, charSetSource); + Converter conv(charSetDest, charSetSource, transliterations); if (conv) { destForm = new char[len*3+1]; char *pin = s; @@ -816,7 +852,7 @@ pdoc->GetCharRange(s, targetStart, targetLength); //~ fprintf(stderr, " \"%s\"\n", s); if (text) { - char *tmputf = ConvertText(&targetLength, s, targetLength, "UTF-8", charSetBuffer); + char *tmputf = ConvertText(&targetLength, s, targetLength, "UTF-8", charSetBuffer, false); memcpy(text, tmputf, targetLength); delete []tmputf; //~ fprintf(stderr, " \"%s\"\n", text); @@ -853,7 +889,7 @@ if (*charSetBuffer) { //~ fprintf(stderr, "Encode %s %d\n", charSetBuffer, inputLength); int outLength = 0; - char *tmpEncoded = ConvertText(&outLength, utf8, inputLength, charSetBuffer, "UTF-8"); + char *tmpEncoded = ConvertText(&outLength, utf8, inputLength, charSetBuffer, "UTF-8", true); if (tmpEncoded) { //~ fprintf(stderr, " \"%s\"\n", tmpEncoded); if (encoded) { @@ -874,6 +910,10 @@ return 0; } +bool ScintillaGTK::ValidCodePage(int codePage) const { + return codePage == 0 || codePage == SC_CP_UTF8 || codePage == SC_CP_DBCS; +} + sptr_t ScintillaGTK::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { switch (iMessage) { @@ -1126,20 +1166,37 @@ } void ScintillaGTK::NotifyChange() { +#if GLIB_MAJOR_VERSION < 2 gtk_signal_emit(GTK_OBJECT(sci), scintilla_signals[COMMAND_SIGNAL], Platform::LongFromTwoShorts(GetCtrlID(), SCEN_CHANGE), PWidget(wMain)); +#else + g_signal_emit(G_OBJECT(sci), scintilla_signals[COMMAND_SIGNAL], 0, + Platform::LongFromTwoShorts(GetCtrlID(), SCEN_CHANGE), PWidget(wMain)); +#endif } void ScintillaGTK::NotifyFocus(bool focus) { +#if GLIB_MAJOR_VERSION < 2 gtk_signal_emit(GTK_OBJECT(sci), scintilla_signals[COMMAND_SIGNAL], - Platform::LongFromTwoShorts(GetCtrlID(), focus ? SCEN_SETFOCUS : SCEN_KILLFOCUS), PWidget(wMain)); + Platform::LongFromTwoShorts + (GetCtrlID(), focus ? SCEN_SETFOCUS : SCEN_KILLFOCUS), PWidget(wMain)); +#else + g_signal_emit(G_OBJECT(sci), scintilla_signals[COMMAND_SIGNAL], 0, + Platform::LongFromTwoShorts + (GetCtrlID(), focus ? SCEN_SETFOCUS : SCEN_KILLFOCUS), PWidget(wMain)); +#endif } void ScintillaGTK::NotifyParent(SCNotification scn) { scn.nmhdr.hwndFrom = PWidget(wMain); scn.nmhdr.idFrom = GetCtrlID(); +#if GLIB_MAJOR_VERSION < 2 gtk_signal_emit(GTK_OBJECT(sci), scintilla_signals[NOTIFY_SIGNAL], GetCtrlID(), &scn); +#else + g_signal_emit(G_OBJECT(sci), scintilla_signals[NOTIFY_SIGNAL], 0, + GetCtrlID(), &scn); +#endif } void ScintillaGTK::NotifyKey(int key, int modifiers) { @@ -1159,117 +1216,19 @@ NotifyParent(scn); } -bool ScintillaGTK::UseInputMethod() const { - switch (vs.styles[STYLE_DEFAULT].characterSet) { - case SC_CHARSET_CHINESEBIG5: - case SC_CHARSET_GB2312: - case SC_CHARSET_HANGUL: - case SC_CHARSET_SHIFTJIS: - case SC_CHARSET_JOHAB: - case SC_CHARSET_HEBREW: - case SC_CHARSET_ARABIC: - case SC_CHARSET_VIETNAMESE: - case SC_CHARSET_THAI: - return true; - default: - return false; - } -} - const char *CharacterSetID(int characterSet); const char *ScintillaGTK::CharacterSetID() const { return ::CharacterSetID(vs.styles[STYLE_DEFAULT].characterSet); } -#if GTK_MAJOR_VERSION >= 2 -#define IS_ACC(x) \ - ((x) >= 65103 && (x) <= 65111) -#define IS_CHAR(x) \ - ((x) >= 0 && (x) <= 128) - -#define IS_ACC_OR_CHAR(x) \ - (IS_CHAR(x) || IS_ACC(x)) - -static int MakeAccent(int key, int acc) { - const char *conv[] = { - "aeiounc AEIOUNC", - "\xE3ei\xF5u\xF1c~\xC3EI\xD5U\xD1C", - "\xE1\xE9\xED\xF3\xFAn\xE7'\xC1\xC9\xCD\xD3\xDAN\xC7", - "\xE0\xE8\xEC\xF2\xF9nc`\xC0\xC8\xCC\xD2\xD9NC", - "\xE2\xEA\xEE\xF4\xFBnc^\xC2\xCA\xCE\xD4\xDBNC", - "\xE4\xEB\xEF\xF6\xFCnc\xA8\xC4\xCB\xCF\xD6\xDCNC" - }; - int idx; - for (idx = 0; idx < 15; ++idx) { - if (char(key) == conv[0][idx]) { - break; - } - } - if (idx == 15) { - return key; - } - if (acc == GDK_dead_tilde) { // ~ - return int((unsigned char)(conv[1][idx])); - } else if (acc == GDK_dead_acute) { // ' - return int((unsigned char)(conv[2][idx])); - } else if (acc == GDK_dead_grave) { // ` - return int((unsigned char)(conv[3][idx])); - } else if (acc == GDK_dead_circumflex) { // ^ - return int((unsigned char)(conv[4][idx])); - } else if (acc == GDK_dead_diaeresis) { // " - return int((unsigned char)(conv[5][idx])); - } - return key; -} -#endif - int ScintillaGTK::KeyDefault(int key, int modifiers) { if (!(modifiers & SCI_CTRL) && !(modifiers & SCI_ALT)) { -#if GTK_MAJOR_VERSION >= 2 - if (!UseInputMethod()) { - char utfVal[4]="\0\0\0"; - wchar_t wcs[2]; - if (IS_CHAR(key) && IS_ACC(lastKey)) { - lastKey = key = MakeAccent(key, lastKey); - } - if (IS_ACC_OR_CHAR(key)) { - lastKey = key; - } - wcs[0] = gdk_keyval_to_unicode(key); - wcs[1] = 0; - UTF8FromUCS2(wcs, 1, utfVal, 3); - if (key <= 0xFE00) { - if (IsUnicodeMode()) { - AddCharUTF(utfVal,strlen(utfVal)); - return 1; - } else { - const char *source = CharacterSetID(); - if (*source) { - Converter conv(source, "UTF-8"); - if (conv) { - char localeVal[4]="\0\0\0"; - char *pin = utfVal; - size_t inLeft = strlen(utfVal); - char *pout = localeVal; - size_t outLeft = sizeof(localeVal); - size_t conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft); - if (conversions != ((size_t)(-1))) { - *pout = '\0'; - for (int i=0; localeVal[i]; i++) { - AddChar(localeVal[i]); - } - return 1; - } - } - } - } - } - } -#endif if (key < 256) { - AddChar(key); - return 1; + NotifyKey(key, modifiers); + return 0; + //~ AddChar(key); + //~ return 1; } else { // Pass up to container in case it is an accelerator NotifyKey(key, modifiers); @@ -1344,12 +1303,20 @@ if (!ct.wCallTip.Created()) { ct.wCallTip = gtk_window_new(GTK_WINDOW_POPUP); ct.wDraw = gtk_drawing_area_new(); - gtk_container_add(GTK_CONTAINER(PWidget(ct.wCallTip)), PWidget(ct.wDraw)); - gtk_signal_connect(GTK_OBJECT(PWidget(ct.wDraw)), "expose_event", + GtkWidget *widcdrw = PWidget(ct.wDraw); // // No code inside the G_OBJECT macro + gtk_container_add(GTK_CONTAINER(PWidget(ct.wCallTip)), widcdrw); +#if GLIB_MAJOR_VERSION < 2 + gtk_signal_connect(GTK_OBJECT(widcdrw), "expose_event", GtkSignalFunc(ScintillaGTK::ExposeCT), &ct); - gtk_signal_connect(GTK_OBJECT(PWidget(ct.wDraw)), "button_press_event", + gtk_signal_connect(GTK_OBJECT(widcdrw), "button_press_event", GtkSignalFunc(ScintillaGTK::PressCT), static_cast<void *>(this)); - gtk_widget_set_events(PWidget(ct.wDraw), +#else + g_signal_connect(G_OBJECT(widcdrw), "expose_event", + G_CALLBACK(ScintillaGTK::ExposeCT), &ct); + g_signal_connect(G_OBJECT(widcdrw), "button_press_event", + G_CALLBACK(ScintillaGTK::PressCT), static_cast<void *>(this)); +#endif + gtk_widget_set_events(widcdrw, GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK); } gtk_drawing_area_size(GTK_DRAWING_AREA(PWidget(ct.wDraw)), @@ -1452,7 +1419,7 @@ if (!IsUnicodeMode() && *charSetBuffer) { //fprintf(stderr, "Convert to locale %s\n", CharacterSetID()); // Convert to locale - dest = ConvertText(&len, selText.s, selText.len, charSetBuffer, "UTF-8"); + dest = ConvertText(&len, selText.s, selText.len, charSetBuffer, "UTF-8", true); selText.Set(dest, len, pdoc->dbcsCodePage, vs.styles[STYLE_DEFAULT].characterSet, selText.rectangular); } @@ -1485,7 +1452,7 @@ SetEmptySelection(currentPos + selText.len); } pdoc->EndUndoAction(); - EnsureCaretVisible(); + EnsureCaretVisible(); } } // else fprintf(stderr, "Target non string %d %d\n", (int)(selection_data->type), @@ -1495,7 +1462,7 @@ void ScintillaGTK::ReceivedDrop(GtkSelectionData *selection_data) { dragWasDropped = true; - if (selection_data->type == atomUriList) { + if (selection_data->type == atomUriList || selection_data->type == atomDROPFILES_DND) { char *ptr = new char[selection_data->length + 1]; ptr[selection_data->length] = '\0'; memcpy(ptr, selection_data->data, selection_data->length); @@ -1508,7 +1475,7 @@ DropAt(posDrop, selText.s, false, selText.rectangular); } } else if (selection_data->length > 0) { - fprintf(stderr, "ReceivedDrop other %p\n", static_cast<void *>(selection_data->type)); + //~ fprintf(stderr, "ReceivedDrop other %p\n", static_cast<void *>(selection_data->type)); } Redraw(); } @@ -1516,6 +1483,20 @@ void ScintillaGTK::GetSelection(GtkSelectionData *selection_data, guint info, SelectionText *text) { +#if PLAT_GTK_WIN32 + // Many native win32 programs require \n line endings, so make a copy of + // the clip text now with newlines converted. Use { } to hide symbols + // from code below + SelectionText *newline_normalized = NULL; + { + int tmpstr_len; + char *tmpstr = Document::TransformLineEnds(&tmpstr_len, text->s, text->len, SC_EOL_LF); + newline_normalized = new SelectionText(); + newline_normalized->Set(tmpstr, tmpstr_len, SC_CP_UTF8, 0, text->rectangular); + text = newline_normalized; + } +#endif + #if GTK_MAJOR_VERSION >= 2 // Convert text to utf8 if it isn't already SelectionText *converted = 0; @@ -1523,7 +1504,7 @@ const char *charSet = ::CharacterSetID(text->characterSet); if (*charSet) { int new_len; - char* tmputf = ConvertText(&new_len, text->s, text->len, "UTF-8", charSet); + char* tmputf = ConvertText(&new_len, text->s, text->len, "UTF-8", charSet, false); converted = new SelectionText(); converted->Set(tmputf, new_len, SC_CP_UTF8, 0, text->rectangular); text = converted; @@ -1555,15 +1536,6 @@ #else /* Gtk 1 */ char *selBuffer = text->s; -#if PLAT_GTK_WIN32 - - // Many native win32 programs require \n line endings, - // so make a copy of the clip text now with newlines converted - - int new_len; - char *tmpstr = Document::TransformLineEnds(&new_len, selBuffer, text->len, SC_EOL_LF); - selBuffer = tmpstr; -#endif char *tmputf = 0; if ((info == TARGET_UTF8_STRING) || (info == TARGET_STRING)) { int len = strlen(selBuffer); @@ -1575,14 +1547,14 @@ if (text->codePage != SC_CP_UTF8) { // Convert to UTF-8 //fprintf(stderr, "Convert to UTF-8 from %s\n", charSetBuffer); - tmputf = ConvertText(&len, selBuffer, len, "UTF-8", charSetBuffer); + tmputf = ConvertText(&len, selBuffer, len, "UTF-8", charSetBuffer, false); selBuffer = tmputf; } } else if (info == TARGET_STRING) { if (text->codePage == SC_CP_UTF8) { //fprintf(stderr, "Convert to locale %s\n", charSetBuffer); // Convert to locale - tmputf = ConvertText(&len, selBuffer, len, charSetBuffer, "UTF-8"); + tmputf = ConvertText(&len, selBuffer, len, charSetBuffer, "UTF-8", true); selBuffer = tmputf; } } @@ -1617,10 +1589,11 @@ } delete []tmputf; +#endif /* Gtk >= 2 */ + #if PLAT_GTK_WIN32 - delete []tmpstr; + delete newline_normalized; #endif -#endif /* Gtk >= 2 */ } #ifdef USE_GTK_CLIPBOARD @@ -1971,14 +1944,12 @@ } } -gint ScintillaGTK::KeyThis(GdkEventKey *event) { - //Platform::DebugPrintf("SC-key: %d %x [%s]\n", +gboolean ScintillaGTK::KeyThis(GdkEventKey *event) { + //fprintf(stderr, "SC-key: %d %x [%s]\n", // event->keyval, event->state, (event->length > 0) ? event->string : "empty"); #if GTK_MAJOR_VERSION >= 2 - if (UseInputMethod()) { - if (gtk_im_context_filter_keypress(im_context, event)) { - return 1; - } + if (gtk_im_context_filter_keypress(im_context, event)) { + return 1; } #endif if (!event->keyval) { @@ -1988,7 +1959,7 @@ bool shift = (event->state & GDK_SHIFT_MASK) != 0; bool ctrl = (event->state & GDK_CONTROL_MASK) != 0; bool alt = (event->state & GDK_MOD1_MASK) != 0; - int key = event->keyval; + guint key = event->keyval; if (ctrl && (key < 128)) key = toupper(key); else if (!ctrl && (key >= GDK_KP_Multiply && key <= GDK_KP_9)) @@ -2008,7 +1979,7 @@ bool added = KeyDown(key, shift, ctrl, alt, &consumed) != 0; if (!consumed) consumed = added; - //Platform::DebugPrintf("SK-key: %d %x %x\n",event->keyval, event->state, consumed); + //fprintf(stderr, "SK-key: %d %x %x\n",event->keyval, event->state, consumed); if (event->keyval == 0xffffff && event->length > 0) { ClearSelection(); if (pdoc->InsertString(CurrentPosition(), event->string)) { @@ -2018,22 +1989,22 @@ return consumed; } -gint ScintillaGTK::KeyPress(GtkWidget *widget, GdkEventKey *event) { +gboolean ScintillaGTK::KeyPress(GtkWidget *widget, GdkEventKey *event) { ScintillaGTK *sciThis = ScintillaFromWidget(widget); return sciThis->KeyThis(event); } -gint ScintillaGTK::KeyRelease(GtkWidget *, GdkEventKey * /*event*/) { +gboolean ScintillaGTK::KeyRelease(GtkWidget *, GdkEventKey * /*event*/) { //Platform::DebugPrintf("SC-keyrel: %d %x %3s\n",event->keyval, event->state, event->string); return FALSE; } #if GTK_MAJOR_VERSION >= 2 -gint ScintillaGTK::ExposePreedit(GtkWidget *widget, GdkEventExpose *ose, ScintillaGTK *sciThis) { +gboolean ScintillaGTK::ExposePreedit(GtkWidget *widget, GdkEventExpose *ose, ScintillaGTK *sciThis) { return sciThis->ExposePreeditThis(widget, ose); } -gint ScintillaGTK::ExposePreeditThis(GtkWidget *widget, GdkEventExpose *ose) { +gboolean ScintillaGTK::ExposePreeditThis(GtkWidget *widget, GdkEventExpose *ose) { gchar *str; gint cursor_pos; PangoAttrList *attrs; @@ -2067,8 +2038,32 @@ sciThis->CommitThis(str); } -void ScintillaGTK::CommitThis(char *str) { - AddCharUTF(str, strlen(str)); +void ScintillaGTK::CommitThis(char *utfVal) { + //~ fprintf(stderr, "Commit '%s'\n", utfVal); + if (IsUnicodeMode()) { + AddCharUTF(utfVal,strlen(utfVal)); + } else { + const char *source = CharacterSetID(); + if (*source) { + Converter conv(source, "UTF-8", true); + if (conv) { + char localeVal[4]="\0\0\0"; + char *pin = utfVal; + size_t inLeft = strlen(utfVal); + char *pout = localeVal; + size_t outLeft = sizeof(localeVal); + size_t conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft); + if (conversions != ((size_t)(-1))) { + *pout = '\0'; + for (int i=0; localeVal[i]; i++) { + AddChar(localeVal[i]); + } + } else { + fprintf(stderr, "Conversion failed '%s'\n", utfVal); + } + } + } + } } void ScintillaGTK::PreeditChanged(GtkIMContext *, ScintillaGTK *sciThis) { @@ -2121,7 +2116,12 @@ return FALSE; } -void ScintillaGTK::Destroy(GtkObject* object) { +#if GLIB_MAJOR_VERSION < 2 +void ScintillaGTK::Destroy(GtkObject *object) +#else +void ScintillaGTK::Destroy(GObject *object) +#endif +{ ScintillaObject *scio = reinterpret_cast<ScintillaObject *>(object); // This avoids a double destruction if (!scio->pscin) @@ -2130,8 +2130,12 @@ //Platform::DebugPrintf("Destroying %x %x\n", sciThis, object); sciThis->Finalise(); +#if GLIB_MAJOR_VERSION < 2 if (GTK_OBJECT_CLASS(parent_class)->destroy) (* GTK_OBJECT_CLASS(parent_class)->destroy)(object); +#else + // IS ANYTHING NEEDED ? +#endif delete sciThis; scio->pscin = 0; @@ -2193,7 +2197,7 @@ paintState = notPainting; if (rgnUpdate) { - g_free(rgnUpdate); + gdk_region_destroy(rgnUpdate); } rgnUpdate = 0; @@ -2446,6 +2450,7 @@ extern void Platform_Initialise(); extern void Platform_Finalise(); +#if GLIB_MAJOR_VERSION < 2 GtkType scintilla_get_type() { static GtkType scintilla_type = 0; @@ -2467,26 +2472,60 @@ return scintilla_type; } +#else +GType scintilla_get_type() { + static GType scintilla_type = 0; -void ScintillaGTK::ClassInit(GtkObjectClass* object_class, GtkWidgetClass *widget_class, GtkContainerClass *container_class) { + if (!scintilla_type) { + scintilla_type = g_type_from_name("Scintilla"); + if (!scintilla_type) { + static GTypeInfo scintilla_info = { + (guint16) sizeof (ScintillaClass), + NULL, //(GBaseInitFunc) + NULL, //(GBaseFinalizeFunc) + (GClassInitFunc) scintilla_class_init, + NULL, //(GClassFinalizeFunc) + NULL, //gconstpointer data + (guint16) sizeof (ScintillaObject), + 0, //n_preallocs + (GInstanceInitFunc) scintilla_init, + NULL //(GTypeValueTable*) + }; + + scintilla_type = g_type_register_static( + GTK_TYPE_CONTAINER, "Scintilla", &scintilla_info, (GTypeFlags) 0); + } + } + + return scintilla_type; +} +#endif + +void ScintillaGTK::ClassInit(OBJECT_CLASS* object_class, GtkWidgetClass *widget_class, GtkContainerClass *container_class) { +#if GLIB_MAJOR_VERSION >= 2 + Platform_Initialise(); +#endif atomClipboard = gdk_atom_intern("CLIPBOARD", FALSE); atomUTF8 = gdk_atom_intern("UTF8_STRING", FALSE); atomString = GDK_SELECTION_TYPE_STRING; atomUriList = gdk_atom_intern("text/uri-list", FALSE); + atomDROPFILES_DND = gdk_atom_intern("DROPFILES_DND", FALSE); // Define default signal handlers for the class: Could move more // of the signal handlers here (those that currently attached to wDraw // in Initialise() may require coordinate translation?) +#if GLIB_MAJOR_VERSION < 2 object_class->destroy = Destroy; - +#else + object_class->finalize = Destroy; +#endif widget_class->size_request = SizeRequest; widget_class->size_allocate = SizeAllocate; widget_class->expose_event = ExposeMain; #if GTK_MAJOR_VERSION < 2 widget_class->draw = Draw; #endif - widget_class->motion_notify_event = Motion; widget_class->button_press_event = Press; widget_class->button_release_event = MouseRelease; @@ -2519,19 +2558,21 @@ container_class->forall = MainForAll; } -#if GTK_MAJOR_VERSION < 2 +#if GLIB_MAJOR_VERSION < 2 #define GTK_CLASS_TYPE(c) (c->type) #define SIG_MARSHAL gtk_marshal_NONE__INT_POINTER +#define MARSHAL_ARGUMENTS GTK_TYPE_INT, GTK_TYPE_POINTER #else #define SIG_MARSHAL scintilla_marshal_NONE__INT_POINTER +#define MARSHAL_ARGUMENTS G_TYPE_INT, G_TYPE_POINTER #endif -#define MARSHAL_ARGUMENTS GTK_TYPE_INT, GTK_TYPE_POINTER static void scintilla_class_init(ScintillaClass *klass) { - GtkObjectClass *object_class = (GtkObjectClass*) klass; + OBJECT_CLASS *object_class = (OBJECT_CLASS*) klass; GtkWidgetClass *widget_class = (GtkWidgetClass*) klass; GtkContainerClass *container_class = (GtkContainerClass*) klass; +#if GLIB_MAJOR_VERSION < 2 parent_class = (GtkWidgetClass*) gtk_type_class(gtk_container_get_type()); scintilla_signals[COMMAND_SIGNAL] = gtk_signal_new( @@ -2551,9 +2592,31 @@ SIG_MARSHAL, GTK_TYPE_NONE, 2, MARSHAL_ARGUMENTS); -#if GTK_MAJOR_VERSION < 2 gtk_object_class_add_signals(object_class, reinterpret_cast<unsigned int *>(scintilla_signals), LAST_SIGNAL); +#else + GSignalFlags sigflags = GSignalFlags(G_SIGNAL_ACTION | G_SIGNAL_RUN_LAST); + scintilla_signals[COMMAND_SIGNAL] = g_signal_new( + "command", + G_TYPE_FROM_CLASS(object_class), + sigflags, + G_STRUCT_OFFSET(ScintillaClass, command), + NULL, //(GSignalAccumulator) + NULL, //(gpointer) + SIG_MARSHAL, + G_TYPE_NONE, + 2, MARSHAL_ARGUMENTS); + + scintilla_signals[NOTIFY_SIGNAL] = g_signal_new( + SCINTILLA_NOTIFY, + G_TYPE_FROM_CLASS(object_class), + sigflags, + G_STRUCT_OFFSET(ScintillaClass, notify), + NULL, + NULL, + SIG_MARSHAL, + G_TYPE_NONE, + 2, MARSHAL_ARGUMENTS); #endif klass->command = NULL; klass->notify = NULL; @@ -2567,7 +2630,11 @@ } GtkWidget* scintilla_new() { +#if GLIB_MAJOR_VERSION < 2 return GTK_WIDGET(gtk_type_new(scintilla_get_type())); +#else + return GTK_WIDGET(g_object_new(scintilla_get_type(), NULL)); +#endif } void scintilla_set_id(ScintillaObject *sci, uptr_t id) { Modified: trunk/scintilla/ViewStyle.cxx =================================================================== --- trunk/scintilla/ViewStyle.cxx 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/ViewStyle.cxx 2006-06-21 23:15:54 UTC (rev 471) @@ -17,7 +17,7 @@ #include "ViewStyle.h" MarginStyle::MarginStyle() : - symbol(false), width(16), mask(0xffffffff), sensitive(false) { + style(SC_MARGIN_SYMBOL), width(0), mask(0), sensitive(false) { } // A list of the fontnames - avoids wasting space in each style @@ -73,6 +73,7 @@ selbackset = source.selbackset; selbackground.desired = source.selbackground.desired; selbackground2.desired = source.selbackground2.desired; + selAlpha = source.selAlpha; foldmarginColourSet = source.foldmarginColourSet; foldmarginColour.desired = source.foldmarginColour.desired; @@ -141,6 +142,7 @@ selbackset = true; selbackground.desired = ColourDesired(0xc0, 0xc0, 0xc0); selbackground2.desired = ColourDesired(0xb0, 0xb0, 0xb0); + selAlpha = SC_ALPHA_NOALPHA; foldmarginColourSet = false; foldmarginColour.desired = ColourDesired(0xff, 0, 0); @@ -173,13 +175,13 @@ leftMarginWidth = 1; rightMarginWidth = 1; - ms[0].symbol = false; + ms[0].style = SC_MARGIN_NUMBER; ms[0].width = 0; ms[0].mask = 0; - ms[1].symbol = true; + ms[1].style = SC_MARGIN_SYMBOL; ms[1].width = 16; ms[1].mask = ~SC_MASK_FOLDERS; - ms[2].symbol = true; + ms[2].style = SC_MARGIN_SYMBOL; ms[2].width = 0; ms[2].mask = 0; fixedColumnWidth = leftMarginWidth; @@ -187,7 +189,7 @@ maskInLine = 0xffffffff; for (int margin=0; margin < margins; margin++) { fixedColumnWidth += ms[margin].width; - symbolMargin = symbolMargin || ms[margin].symbol; + symbolMargin = symbolMargin || (ms[margin].style != SC_MARGIN_NUMBER); if (ms[margin].width > 0) maskInLine &= ~ms[margin].mask; } @@ -258,7 +260,7 @@ maskInLine = 0xffffffff; for (int margin=0; margin < margins; margin++) { fixedColumnWidth += ms[margin].width; - symbolMargin = symbolMargin || ms[margin].symbol; + symbolMargin = symbolMargin || (ms[margin].style != SC_MARGIN_NUMBER); if (ms[margin].width > 0) maskInLine &= ~ms[margin].mask; } Modified: trunk/scintilla/ViewStyle.h =================================================================== --- trunk/scintilla/ViewStyle.h 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/ViewStyle.h 2006-06-21 23:15:54 UTC (rev 471) @@ -12,7 +12,7 @@ */ class MarginStyle { public: - bool symbol; + int style; int width; int mask; bool sensitive; @@ -53,6 +53,7 @@ bool selbackset; ColourPair selbackground; ColourPair selbackground2; + int selAlpha; bool whitespaceForegroundSet; ColourPair whitespaceForeground; bool whitespaceBackgroundSet; @@ -70,7 +71,7 @@ bool hotspotUnderline; bool hotspotSingleLine; /// Margins are ordered: Line Numbers, Selection Margin, Spacing Margin - enum { margins=3 }; + enum { margins=5 }; int leftMarginWidth; ///< Spacing margin on left of text int rightMarginWidth; ///< Spacing margin on left of text bool symbolMargin; Modified: trunk/scintilla/include/HFacer.py =================================================================== --- trunk/scintilla/include/HFacer.py 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/include/HFacer.py 2006-06-21 23:15:54 UTC (rev 471) @@ -67,6 +67,10 @@ os.rename(tempname, filename) f = Face.Face() -f.ReadFromFile("Scintilla.iface") -Regenerate("Scintilla.h", printHFile, f) -Regenerate("SciLexer.h", printLexHFile, f) +try: + f.ReadFromFile("Scintilla.iface") + Regenerate("Scintilla.h", printHFile, f) + Regenerate("SciLexer.h", printLexHFile, f) + print "Maximum ID is", max(x for x in f.values if int(x) < 3000) +except: + raise Modified: trunk/scintilla/include/SciLexer.h =================================================================== --- trunk/scintilla/include/SciLexer.h 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/include/SciLexer.h 2006-06-21 23:15:54 UTC (rev 471) @@ -90,7 +90,8 @@ #define SCLEX_FREEBASIC 75 #define SCLEX_INNOSETUP 76 #define SCLEX_OPAL 77 -#define SCLEX_OMS 78 +#define SCLEX_SPICE 78 +#define SCLEX_OMS 79 #define SCLEX_AUTOMATIC 1000 #define SCE_P_DEFAULT 0 #define SCE_P_COMMENTLINE 1 @@ -148,6 +149,8 @@ #define SCE_TCL_WORD6 17 #define SCE_TCL_WORD7 18 #define SCE_TCL_WORD8 19 +#define SCE_TCL_COMMENT_BOX 20 +#define SCE_TCL_BLOCK_COMMENT 21 #define SCE_H_DEFAULT 0 #define SCE_H_TAG 1 #define SCE_H_TAGUNKNOWN 2 @@ -819,6 +822,7 @@ #define SCE_AU3_SPECIAL 12 #define SCE_AU3_EXPAND 13 #define SCE_AU3_COMOBJ 14 +#define SCE_AU3_UDF 15 #define SCE_APDL_DEFAULT 0 #define SCE_APDL_COMMENT 1 #define SCE_APDL_COMMENTBLOCK 2 @@ -1055,6 +1059,15 @@ #define SCE_OPAL_PAR 7 #define SCE_OPAL_BOOL_CONST 8 #define SCE_OPAL_DEFAULT 32 +#define SCE_SPICE_DEFAULT 0 +#define SCE_SPICE_IDENTIFIER 1 +#define SCE_SPICE_KEYWORD 2 +#define SCE_SPICE_KEYWORD2 3 +#define SCE_SPICE_KEYWORD3 4 +#define SCE_SPICE_NUMBER 5 +#define SCE_SPICE_DELIMITER 6 +#define SCE_SPICE_VALUE 7 +#define SCE_SPICE_COMMENTLINE 8 #define SCLEX_ASP 29 #define SCLEX_PHP 30 //--Autogenerated -- end of section automatically generated from Scintilla.iface Modified: trunk/scintilla/include/Scintilla.h =================================================================== --- trunk/scintilla/include/Scintilla.h 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/include/Scintilla.h 2006-06-21 23:15:54 UTC (rev 471) @@ -138,8 +138,11 @@ #define SCI_MARKERPREVIOUS 2048 #define SCI_MARKERDEFINEPIXMAP 2049 #define SCI_MARKERADDSET 2466 +#define SCI_MARKERSETALPHA 2476 #define SC_MARGIN_SYMBOL 0 #define SC_MARGIN_NUMBER 1 +#define SC_MARGIN_BACK 2 +#define SC_MARGIN_FORE 3 #define SCI_SETMARGINTYPEN 2240 #define SCI_GETMARGINTYPEN 2241 #define SCI_SETMARGINWIDTHN 2242 @@ -196,6 +199,8 @@ #define SCI_STYLESETHOTSPOT 2409 #define SCI_SETSELFORE 2067 #define SCI_SETSELBACK 2068 +#define SCI_GETSELALPHA 2477 +#define SCI_SETSELALPHA 2478 #define SCI_SETCARETFORE 2069 #define SCI_ASSIGNCMDKEY 2070 #define SCI_CLEARCMDKEY 2071 Modified: trunk/scintilla/include/ScintillaWidget.h =================================================================== --- trunk/scintilla/include/ScintillaWidget.h 2006-06-21 18:54:07 UTC (rev 470) +++ trunk/scintilla/include/ScintillaWidget.h 2006-06-21 23:15:54 UTC (rev 471) @@ -34,7 +34,11 @@ void (* notify) (ScintillaObject *ttt); }; +#if GLIB_MAJOR_VERSION < 2 GtkType scintilla_get_type (void); +#else +GType scintilla_get_type (void); +#endif GtkWidget* scintilla_new (void); void scintilla_set_id (ScintillaObject *sci, uptr_t id); sptr_t scintilla_send_message (ScintillaObject *sci,unsigned int iMessage, uptr_t wParam, sptr_t lParam); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

21 Jun '06

Revision: 470 Author: eht16 Date: 2006-06-21 11:54:07 -0700 (Wed, 21 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=470&view=rev Log Message: ----------- Added missing shortcut for "Close". Added option in the preferences dialog to replace tabs by spaces when saving a file. Added option for default encoding for new files. Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/dialogs.c trunk/src/document.c trunk/src/encodings.c trunk/src/encodings.h trunk/src/geany.h trunk/src/interface.c trunk/src/keybindings.c trunk/src/keybindings.h trunk/src/keyfile.c trunk/src/prefs.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-20 14:54:09 UTC (rev 469) +++ trunk/ChangeLog 2006-06-21 18:54:07 UTC (rev 470) @@ -1,3 +1,13 @@ +2006-06-21 Enrico Troeger <enrico.troeger(a)uvena.de> + + * src/keybindings.c: Added missing shortcut for "Close". + * geany.glade, src/interface.c, src/prefs.c, src/keyfile.c, + src/document.c, src/dialogs.c, src/encodings.h: + Added option in the preferences dialog to replace tabs by spaces + when saving a file. + Added option for default encoding for new files. + + 2006-06-20 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/utils.c, src/utils.h, src/callbacks.c, src/document.c, Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2006-06-20 14:54:09 UTC (rev 469) +++ trunk/geany.glade 2006-06-21 18:54:07 UTC (rev 470) @@ -3136,14 +3136,66 @@ <widget class="GtkVBox" id="vbox8"> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">0</property> + <property name="spacing">3</property> <child> - <placeholder/> - </child> + <widget class="GtkHBox" id="hbox4"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> - <child> - <placeholder/> + <child> + <widget class="GtkLabel" id="label153"> + <property name="visible">True</property> + <property name="label" translatable="yes">Default encoding:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkEventBox" id="eventbox1"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Sets the default encoding for newly created files.</property> + <property name="visible_window">True</property> + <property name="above_child">False</property> + + <child> + <widget class="GtkComboBox" id="combo_encoding"> + <property name="visible">True</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> </child> <child> @@ -3208,7 +3260,7 @@ </widget> <packing> <property name="padding">0</property> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> </packing> </child> @@ -3309,6 +3361,25 @@ <property name="fill">False</property> </packing> </child> + + <child> + <widget class="GtkCheckButton" id="check_replace_tabs"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Replaces all tabs in document by spaces.</property> + <property name="label" translatable="yes">Replace tabs by space</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> </widget> </child> </widget> Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-06-20 14:54:09 UTC (rev 469) +++ trunk/src/dialogs.c 2006-06-21 18:54:07 UTC (rev 470) @@ -46,6 +46,7 @@ #include "utils.h" #include "prefs.h" #include "keybindings.h" +#include "encodings.h" @@ -1647,10 +1648,23 @@ GtkTooltips *tooltips; GtkObject *spin_scrollback_adj; #endif + GtkWidget *combo; + guint i; + gchar *encoding_string; app->prefs_dialog = create_prefs_dialog(); gtk_window_set_transient_for(GTK_WINDOW(app->prefs_dialog), GTK_WINDOW(app->window)); + // init the default file encoding combo box + combo = lookup_widget(app->prefs_dialog, "combo_encoding"); + gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(combo), 3); + for (i = 0; i < GEANY_ENCODINGS_MAX; i++) + { + encoding_string = encodings_to_string(&encodings[i]); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo), encoding_string); + g_free(encoding_string); + } + #ifdef HAVE_VTE if (app->have_vte) { Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-06-20 14:54:09 UTC (rev 469) +++ trunk/src/document.c 2006-06-21 18:54:07 UTC (rev 470) @@ -52,6 +52,7 @@ #include "templates.h" #include "treeviews.h" #include "utils.h" +#include "encodings.h" @@ -372,7 +373,8 @@ sci_set_text(doc_list[idx].sci, template); g_free(template); - doc_list[idx].encoding = g_strdup("UTF-8"); + doc_list[idx].encoding = g_strdup( + encodings_get_charset(&encodings[app->pref_editor_default_encoding])); document_set_filetype(idx, ft); utils_set_window_title(idx); utils_build_show_hide(idx); @@ -619,6 +621,8 @@ return; } + // replaces tabs by spaces + if (app->pref_editor_replace_tabs) utils_replace_tabs(idx); // strip trailing spaces if (app->pref_editor_trail_space) utils_strip_trailing_spaces(idx); // ensure the file has a newline at the end @@ -642,8 +646,13 @@ if (conv_error != NULL) { + geany_debug("error while converting the file to its orinial encoding"); + geany_debug("encoding: %s error message: %s)", + doc_list[idx].encoding, conv_error->message); + g_free(doc_list[idx].encoding); + doc_list[idx].encoding = g_strdup("UTF-8"); + msgwin_status_add(_("Error while converting file (%s)."), conv_error->message); g_error_free(conv_error); - geany_debug("error while converting the file to its orinial encoding"); } else { Modified: trunk/src/encodings.c =================================================================== --- trunk/src/encodings.c 2006-06-20 14:54:09 UTC (rev 469) +++ trunk/src/encodings.c 2006-06-21 18:54:07 UTC (rev 470) @@ -57,7 +57,6 @@ fill(GEANY_ENCODING_ISO_8859_15, "ISO-8859-15", "Western"); fill(GEANY_ENCODING_ISO_8859_16, "ISO-8859-16", "Romanian"); - fill(GEANY_ENCODING_UTF_7, "UTF-7", "Unicode"); fill(GEANY_ENCODING_UTF_8, "UTF-8", "Unicode"); fill(GEANY_ENCODING_UTF_16, "UTF-16", "Unicode"); fill(GEANY_ENCODING_UCS_2, "UCS-2", "Unicode"); @@ -118,10 +117,10 @@ if (initialized) return; - g_return_if_fail(G_N_ELEMENTS(encodings) == GEANY_ENCODING_LAST); + g_return_if_fail(G_N_ELEMENTS(encodings) == GEANY_ENCODINGS_MAX); i = 0; - while (i < GEANY_ENCODING_LAST) + while (i < GEANY_ENCODINGS_MAX) { g_return_if_fail(encodings[i].idx == i); @@ -142,7 +141,7 @@ encodings_lazy_init (); i = 0; - while (i < GEANY_ENCODING_LAST) + while (i < GEANY_ENCODINGS_MAX) { if (strcmp(charset, encodings[i].charset) == 0) return &encodings[i]; @@ -158,7 +157,7 @@ { g_return_val_if_fail(index >= 0, NULL); - if (index >= GEANY_ENCODING_LAST) + if (index >= GEANY_ENCODINGS_MAX) return NULL; encodings_lazy_init(); @@ -236,7 +235,7 @@ // create encodings submenu in document menu menu = lookup_widget(app->window, "set_encoding1_menu"); - while (i < GEANY_ENCODING_LAST) + while (i < GEANY_ENCODINGS_MAX) { if (encodings[i].idx != i) break; Modified: trunk/src/encodings.h =================================================================== --- trunk/src/encodings.h 2006-06-20 14:54:09 UTC (rev 469) +++ trunk/src/encodings.h 2006-06-21 18:54:07 UTC (rev 470) @@ -78,7 +78,6 @@ GEANY_ENCODING_ISO_8859_15, GEANY_ENCODING_ISO_8859_16, - GEANY_ENCODING_UTF_7, GEANY_ENCODING_UTF_8, GEANY_ENCODING_UTF_16, GEANY_ENCODING_UCS_2, @@ -129,11 +128,11 @@ GEANY_ENCODING_WINDOWS_1257, GEANY_ENCODING_WINDOWS_1258, - GEANY_ENCODING_LAST + GEANY_ENCODINGS_MAX } GeanyEncodingIndex; -GeanyEncoding encodings[GEANY_ENCODING_LAST]; +GeanyEncoding encodings[GEANY_ENCODINGS_MAX]; #endif Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2006-06-20 14:54:09 UTC (rev 469) +++ trunk/src/geany.h 2006-06-21 18:54:07 UTC (rev 470) @@ -147,7 +147,9 @@ gboolean pref_editor_auto_complete_constructs; gboolean pref_editor_folding; gint pref_editor_tab_width; + gint pref_editor_default_encoding; gboolean pref_editor_new_line; + gboolean pref_editor_replace_tabs; gboolean pref_editor_trail_space; gboolean pref_main_load_session; gboolean pref_main_save_winpos; Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2006-06-20 14:54:09 UTC (rev 469) +++ trunk/src/interface.c 2006-06-21 18:54:07 UTC (rev 470) @@ -1830,6 +1830,10 @@ GtkWidget *frame6; GtkWidget *alignment7; GtkWidget *vbox8; + GtkWidget *hbox4; + GtkWidget *label153; + GtkWidget *eventbox1; + GtkWidget *combo_encoding; GtkWidget *table5; GtkWidget *label116; GtkObject *spin_tab_width_adj; @@ -1840,6 +1844,7 @@ GtkWidget *vbox6; GtkWidget *check_trailing_spaces; GtkWidget *check_new_line; + GtkWidget *check_replace_tabs; GtkWidget *label19; GtkWidget *frame5; GtkWidget *alignment6; @@ -2174,13 +2179,30 @@ gtk_container_add (GTK_CONTAINER (frame6), alignment7); gtk_alignment_set_padding (GTK_ALIGNMENT (alignment7), 0, 0, 12, 0); - vbox8 = gtk_vbox_new (FALSE, 0); + vbox8 = gtk_vbox_new (FALSE, 3); gtk_widget_show (vbox8); gtk_container_add (GTK_CONTAINER (alignment7), vbox8); + hbox4 = gtk_hbox_new (FALSE, 12); + gtk_widget_show (hbox4); + gtk_box_pack_start (GTK_BOX (vbox8), hbox4, FALSE, TRUE, 0); + + label153 = gtk_label_new (_("Default encoding:")); + gtk_widget_show (label153); + gtk_box_pack_start (GTK_BOX (hbox4), label153, FALSE, FALSE, 0); + + eventbox1 = gtk_event_box_new (); + gtk_widget_show (eventbox1); + gtk_box_pack_start (GTK_BOX (hbox4), eventbox1, FALSE, FALSE, 0); + gtk_tooltips_set_tip (tooltips, eventbox1, _("Sets the default encoding for newly created files."), NULL); + + combo_encoding = gtk_combo_box_new_text (); + gtk_widget_show (combo_encoding); + gtk_container_add (GTK_CONTAINER (eventbox1), combo_encoding); + table5 = gtk_table_new (1, 2, FALSE); gtk_widget_show (table5); - gtk_box_pack_start (GTK_BOX (vbox8), table5, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox8), table5, TRUE, TRUE, 0); gtk_table_set_row_spacings (GTK_TABLE (table5), 3); gtk_table_set_col_spacings (GTK_TABLE (table5), 25); @@ -2235,6 +2257,13 @@ gtk_tooltips_set_tip (tooltips, check_new_line, _("Ensures that at the end of the file is a new line"), NULL); gtk_button_set_focus_on_click (GTK_BUTTON (check_new_line), FALSE); + check_replace_tabs = gtk_check_button_new_with_mnemonic (_("Replace tabs by space")); + gtk_widget_show (check_replace_tabs); + gtk_box_pack_start (GTK_BOX (vbox6), check_replace_tabs, FALSE, FALSE, 0); + GTK_WIDGET_UNSET_FLAGS (check_replace_tabs, GTK_CAN_FOCUS); + gtk_tooltips_set_tip (tooltips, check_replace_tabs, _("Replaces all tabs in document by spaces."), NULL); + gtk_button_set_focus_on_click (GTK_BUTTON (check_replace_tabs), FALSE); + label19 = gtk_label_new (_("Saving files")); gtk_widget_show (label19); gtk_frame_set_label_widget (GTK_FRAME (frame2), label19); @@ -2645,6 +2674,10 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, frame6, "frame6"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment7, "alignment7"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox8, "vbox8"); + GLADE_HOOKUP_OBJECT (prefs_dialog, hbox4, "hbox4"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label153, "label153"); + GLADE_HOOKUP_OBJECT (prefs_dialog, eventbox1, "eventbox1"); + GLADE_HOOKUP_OBJECT (prefs_dialog, combo_encoding, "combo_encoding"); GLADE_HOOKUP_OBJECT (prefs_dialog, table5, "table5"); GLADE_HOOKUP_OBJECT (prefs_dialog, label116, "label116"); GLADE_HOOKUP_OBJECT (prefs_dialog, spin_tab_width, "spin_tab_width"); @@ -2654,6 +2687,7 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, vbox6, "vbox6"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_trailing_spaces, "check_trailing_spaces"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_new_line, "check_new_line"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_replace_tabs, "check_replace_tabs"); GLADE_HOOKUP_OBJECT (prefs_dialog, label19, "label19"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame5, "frame5"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment6, "alignment6"); Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2006-06-20 14:54:09 UTC (rev 469) +++ trunk/src/keybindings.c 2006-06-21 18:54:07 UTC (rev 470) @@ -47,6 +47,7 @@ static void cb_func_menu_open(void); static void cb_func_menu_save(void); static void cb_func_menu_saveall(void); +static void cb_func_menu_close(void); static void cb_func_menu_closeall(void); static void cb_func_menu_reloadfile(void); static void cb_func_menu_undo(void); @@ -110,6 +111,8 @@ GDK_s, GDK_CONTROL_MASK, "menu_save", _("Save")); keys[GEANY_KEYS_MENU_SAVEALL] = fill(cb_func_menu_saveall, GDK_S, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "menu_saveall", _("Save all")); + keys[GEANY_KEYS_MENU_CLOSE] = fill(cb_func_menu_close, + GDK_w, GDK_CONTROL_MASK, "menu_close", _("Close")); keys[GEANY_KEYS_MENU_CLOSEALL] = fill(cb_func_menu_closeall, GDK_d, GDK_MOD1_MASK, "menu_closeall", _("Close all")); keys[GEANY_KEYS_MENU_RELOADFILE] = fill(cb_func_menu_reloadfile, @@ -234,6 +237,7 @@ // apply the settings GEANY_ADD_ACCEL(GEANY_KEYS_MENU_SAVEALL, menu_save_all1); + GEANY_ADD_ACCEL(GEANY_KEYS_MENU_CLOSE, menu_close1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_CLOSEALL, menu_close_all1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_RELOADFILE, revert1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_UNDO, menu_undo2); @@ -378,6 +382,11 @@ on_save_all1_activate(NULL, NULL); } +static void cb_func_menu_close(void) +{ + on_close1_activate(NULL, NULL); +} + static void cb_func_menu_closeall(void) { on_close_all1_activate(NULL, NULL); Modified: trunk/src/keybindings.h =================================================================== --- trunk/src/keybindings.h 2006-06-20 14:54:09 UTC (rev 469) +++ trunk/src/keybindings.h 2006-06-21 18:54:07 UTC (rev 470) @@ -45,6 +45,7 @@ GEANY_KEYS_MENU_OPEN, GEANY_KEYS_MENU_SAVE, GEANY_KEYS_MENU_SAVEALL, + GEANY_KEYS_MENU_CLOSE, GEANY_KEYS_MENU_CLOSEALL, GEANY_KEYS_MENU_RELOADFILE, GEANY_KEYS_MENU_UNDO, Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2006-06-20 14:54:09 UTC (rev 469) +++ trunk/src/keyfile.c 2006-06-21 18:54:07 UTC (rev 470) @@ -116,12 +116,14 @@ g_key_file_set_integer_list(config, PACKAGE, "geometry", app->geometry, 4); } g_key_file_set_integer(config, PACKAGE, "pref_editor_tab_width", app->pref_editor_tab_width); + g_key_file_set_integer(config, PACKAGE, "pref_editor_default_encoding", app->pref_editor_default_encoding); g_key_file_set_boolean(config, PACKAGE, "pref_main_confirm_exit", app->pref_main_confirm_exit); g_key_file_set_boolean(config, PACKAGE, "pref_main_load_session", app->pref_main_load_session); g_key_file_set_boolean(config, PACKAGE, "pref_main_save_winpos", app->pref_main_save_winpos); g_key_file_set_boolean(config, PACKAGE, "pref_main_show_search", app->pref_main_show_search); g_key_file_set_boolean(config, PACKAGE, "pref_main_show_goto", app->pref_main_show_goto); g_key_file_set_boolean(config, PACKAGE, "pref_editor_new_line", app->pref_editor_new_line); + g_key_file_set_boolean(config, PACKAGE, "pref_editor_replace_tabs", app->pref_editor_replace_tabs); g_key_file_set_boolean(config, PACKAGE, "pref_editor_trail_space", app->pref_editor_trail_space); g_key_file_set_string(config, PACKAGE, "pref_template_developer", app->pref_template_developer); g_key_file_set_string(config, PACKAGE, "pref_template_company", app->pref_template_company); @@ -221,7 +223,7 @@ app->fullscreen = utils_get_setting_boolean(config, PACKAGE, "fullscreen", FALSE); app->tab_order_ltr = utils_get_setting_boolean(config, PACKAGE, "tab_order_ltr", FALSE); app->brace_match_ltgt = utils_get_setting_boolean(config, PACKAGE, "brace_match_ltgt", FALSE); - app->switch_msgwin_pages = utils_get_setting_boolean(config, PACKAGE, "switch_msgwin_pages", TRUE); + app->switch_msgwin_pages = utils_get_setting_boolean(config, PACKAGE, "switch_msgwin_pages", FALSE); app->pref_editor_auto_close_xml_tags = utils_get_setting_boolean(config, PACKAGE, "auto_close_xml_tags", TRUE); app->pref_editor_auto_complete_constructs = utils_get_setting_boolean(config, PACKAGE, "auto_complete_constructs", TRUE); app->editor_font = utils_get_setting_string(config, PACKAGE, "editor_font", "Courier New 9"); @@ -251,6 +253,8 @@ app->pref_editor_tab_width = utils_get_setting_integer(config, PACKAGE, "pref_editor_tab_width", 4); + // set default encoding to UTF8 (Unicode) - index 15 + app->pref_editor_default_encoding = utils_get_setting_integer(config, PACKAGE, "pref_editor_default_encoding", 15); app->pref_main_confirm_exit = utils_get_setting_boolean(config, PACKAGE, "pref_main_confirm_exit", TRUE); app->pref_main_load_session = utils_get_setting_boolean(config, PACKAGE, "pref_main_load_session", TRUE); app->pref_main_save_winpos = utils_get_setting_boolean(config, PACKAGE, "pref_main_save_winpos", TRUE); @@ -274,6 +278,7 @@ g_free(tmp_string); g_free(tmp_string2); + app->pref_editor_replace_tabs = utils_get_setting_boolean(config, PACKAGE, "pref_editor_replace_tabs", FALSE); app->pref_editor_new_line = utils_get_setting_boolean(config, PACKAGE, "pref_editor_new_line", TRUE); app->pref_editor_trail_space = utils_get_setting_boolean(config, PACKAGE, "pref_editor_trail_space", TRUE); Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2006-06-20 14:54:09 UTC (rev 469) +++ trunk/src/prefs.c 2006-06-21 18:54:07 UTC (rev 470) @@ -115,12 +115,19 @@ gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), app->pref_editor_tab_width); old_tab_width = app->pref_editor_tab_width; + widget = lookup_widget(app->prefs_dialog, "combo_encoding"); + // luckily the index of the combo box items match the index of the encodings array + gtk_combo_box_set_active(GTK_COMBO_BOX(widget), app->pref_editor_default_encoding); + widget = lookup_widget(app->prefs_dialog, "check_trailing_spaces"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_trail_space); widget = lookup_widget(app->prefs_dialog, "check_new_line"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_new_line); + widget = lookup_widget(app->prefs_dialog, "check_replace_tabs"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_replace_tabs); + widget = lookup_widget(app->prefs_dialog, "check_indent"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_show_indent_guide); @@ -323,12 +330,18 @@ widget = lookup_widget(app->prefs_dialog, "spin_tab_width"); app->pref_editor_tab_width = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); + widget = lookup_widget(app->prefs_dialog, "combo_encoding"); + app->pref_editor_default_encoding = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); + widget = lookup_widget(app->prefs_dialog, "check_trailing_spaces"); app->pref_editor_trail_space = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); widget = lookup_widget(app->prefs_dialog, "check_new_line"); app->pref_editor_new_line = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + widget = lookup_widget(app->prefs_dialog, "check_replace_tabs"); + app->pref_editor_replace_tabs = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + widget = lookup_widget(app->prefs_dialog, "spin_long_line"); app->long_line_column = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

20 Jun '06

Revision: 469 Author: ntrel Date: 2006-06-20 07:54:09 -0700 (Tue, 20 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=469&view=rev Log Message: ----------- Also show status messages on the status bar Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c trunk/src/msgwindow.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-20 11:55:34 UTC (rev 468) +++ trunk/ChangeLog 2006-06-20 14:54:09 UTC (rev 469) @@ -4,6 +4,8 @@ src/document.h: Go back to the same line when reloading. Fix start selection bug when clicking in the current file if it has changed. + * src/msgwindow.c, src/document.c: + Also show status messages on the status bar. 2006-06-19 Enrico Troeger <enrico.troeger(a)uvena.de> Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-06-20 11:55:34 UTC (rev 468) +++ trunk/src/document.c 2006-06-20 14:54:09 UTC (rev 469) @@ -529,12 +529,8 @@ sci_goto_pos(doc_list[idx].sci, pos, TRUE); - if (reload) + if (! reload) { - msgwin_status_add(_("File %s reloaded."), utf8_filename); - } - else - { filetype *use_ft = (ft != NULL) ? ft : filetypes_get_from_filename(utf8_filename); if (readonly) gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM( @@ -555,10 +551,18 @@ document_set_filetype(idx, use_ft); utils_build_show_hide(idx); + } + + // update sci to send SCN_UPDATEUI before we set status messages + while (gtk_events_pending()) + gtk_main_iteration(); + if (reload) + msgwin_status_add(_("File %s reloaded."), utf8_filename); + else msgwin_status_add(_("File %s opened(%d%s)."), utf8_filename, gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)), (readonly) ? _(", read-only") : ""); - } + document_set_text_changed(idx); g_free(data); Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2006-06-20 11:55:34 UTC (rev 468) +++ trunk/src/msgwindow.c 2006-06-20 14:54:09 UTC (rev 469) @@ -174,6 +174,10 @@ g_vsnprintf(string, 511, format, args); va_end(args); + // display status message in status bar + gtk_statusbar_pop(GTK_STATUSBAR(app->statusbar), 1); + gtk_statusbar_push(GTK_STATUSBAR(app->statusbar), 1, string); + gtk_list_store_append(msgwindow.store_status, &iter); //gtk_list_store_insert(msgwindow.store_status, &iter, 0); //gtk_list_store_set(msgwindow.store_status, &iter, 0, (state > 0) ? &white : &dark, 1, string, -1); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

20 Jun '06

Revision: 468 Author: ntrel Date: 2006-06-20 04:55:34 -0700 (Tue, 20 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=468&view=rev Log Message: ----------- Go back to the same line when reloading. Fix start selection bug when clicking in the current file if it has changed Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/document.c trunk/src/document.h trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-19 18:31:17 UTC (rev 467) +++ trunk/ChangeLog 2006-06-20 11:55:34 UTC (rev 468) @@ -1,3 +1,11 @@ +2006-06-20 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/utils.c, src/utils.h, src/callbacks.c, src/document.c, + src/document.h: Go back to the same line when reloading. + Fix start selection bug when clicking in the + current file if it has changed. + + 2006-06-19 Enrico Troeger <enrico.troeger(a)uvena.de> * THANKS, src/about.c: Added translator credits. Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-06-19 18:31:17 UTC (rev 467) +++ trunk/src/callbacks.c 2006-06-20 11:55:34 UTC (rev 468) @@ -457,7 +457,7 @@ ("Are you sure you want to reload '%s'?\nAny unsaved changes will be lost."), basename)) { - document_open_file(idx, NULL, 0, doc_list[idx].readonly, doc_list[idx].file_type); + document_reload_file(idx); } g_free(basename); @@ -973,7 +973,7 @@ #ifndef GEANY_WIN32 if (event->button == 1) { - utils_check_disk_status(idx); + return utils_check_disk_status(idx); } #endif Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-06-19 18:31:17 UTC (rev 467) +++ trunk/src/document.c 2006-06-20 11:55:34 UTC (rev 468) @@ -526,17 +526,17 @@ doc_list[idx].changed = FALSE; doc_list[idx].file_name = g_strdup(utf8_filename); doc_list[idx].encoding = enc; + + sci_goto_pos(doc_list[idx].sci, pos, TRUE); + if (reload) { - sci_goto_pos(doc_list[idx].sci, 0, FALSE); msgwin_status_add(_("File %s reloaded."), utf8_filename); } else { filetype *use_ft = (ft != NULL) ? ft : filetypes_get_from_filename(utf8_filename); - sci_goto_pos(doc_list[idx].sci, pos, TRUE); - if (readonly) gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM( lookup_widget(app->window, "set_file_readonly1")), TRUE); /* This is so ugly, but the checkbox in the file menu can be still checked from a previous @@ -585,6 +585,19 @@ } +int document_reload_file(gint idx) +{ + gint pos = 0; + if (idx < 0 || ! doc_list[idx].is_valid) + return -1; + + // try to set the cursor to the position before reloading + pos = sci_get_current_position(doc_list[idx].sci); + return document_open_file(idx, NULL, pos, doc_list[idx].readonly, + doc_list[idx].file_type); +} + + /* This saves the file */ void document_save_file(gint idx) { Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2006-06-19 18:31:17 UTC (rev 467) +++ trunk/src/document.h 2006-06-20 11:55:34 UTC (rev 468) @@ -81,7 +81,9 @@ */ int document_open_file(gint, const gchar*, gint, gboolean, filetype*); +int document_reload_file(gint idx); + /* This saves the file, which is in on-disk encoding (which may not be UTF-8). */ void document_save_file (gint); Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-06-19 18:31:17 UTC (rev 467) +++ trunk/src/utils.c 2006-06-20 11:55:34 UTC (rev 468) @@ -911,26 +911,26 @@ } -void utils_check_disk_status(gint idx) +gboolean utils_check_disk_status(gint idx) { #ifndef GEANY_WIN32 struct stat st; time_t t; gchar *locale_filename; - if (idx == -1 || doc_list[idx].file_name == NULL) return; + if (idx == -1 || doc_list[idx].file_name == NULL) return FALSE; t = time(NULL); - if (doc_list[idx].last_check > (t - GEANY_CHECK_FILE_DELAY)) return; + if (doc_list[idx].last_check > (t - GEANY_CHECK_FILE_DELAY)) return FALSE; locale_filename = g_locale_from_utf8(doc_list[idx].file_name, -1, NULL, NULL, NULL); - if (stat(locale_filename, &st) != 0) return; + if (stat(locale_filename, &st) != 0) return FALSE; if (doc_list[idx].mtime > t || st.st_mtime > t) { geany_debug("Strange: Something is wrong with the time stamps."); - return; + return FALSE; } if (doc_list[idx].mtime < st.st_mtime) @@ -941,17 +941,17 @@ ("The file '%s' on the disk is more recent than\n" "the current buffer.\nDo you want to reload it?"), basename)) { - document_open_file(idx, NULL, 0, doc_list[idx].readonly, doc_list[idx].file_type); + document_reload_file(idx); doc_list[idx].last_check = t; } else doc_list[idx].mtime = st.st_mtime; g_free(basename); - return; + return TRUE; //file has changed } #endif - return; + return FALSE; } Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2006-06-19 18:31:17 UTC (rev 467) +++ trunk/src/utils.h 2006-06-20 11:55:34 UTC (rev 468) @@ -96,7 +96,7 @@ */ gchar *utils_find_open_xml_tag(const gchar sel[], gint size, gboolean check_tag); -void utils_check_disk_status(gint idx); +gboolean utils_check_disk_status(gint idx); //gchar *utils_get_current_tag(gint idx, gint direction); gint utils_get_current_function(gint idx, const gchar **tagname); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

19 Jun '06

Revision: 467 Author: eht16 Date: 2006-06-19 11:31:17 -0700 (Mon, 19 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=467&view=rev Log Message: ----------- Implemented encoding support to switch between different encodings. Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/document.c trunk/src/encodings.c trunk/src/encodings.h trunk/src/interface.c trunk/src/utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-19 16:21:52 UTC (rev 466) +++ trunk/ChangeLog 2006-06-19 18:31:17 UTC (rev 467) @@ -1,6 +1,9 @@ 2006-06-19 Enrico Troeger <enrico.troeger(a)uvena.de> * THANKS, src/about.c: Added translator credits. + * src/callbacks.c, src/encodings.c, src/utils.c, src/document.c, + geany.glade, src/interface.c: + Implemented encoding support to switch between different encodings. 2006-06-19 Frank Lanitz <frank(a)frank.uvena.de> Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2006-06-19 16:21:52 UTC (rev 466) +++ trunk/geany.glade 2006-06-19 18:31:17 UTC (rev 467) @@ -57,7 +57,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image722"> + <widget class="GtkImage" id="image738"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -150,7 +150,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="image723"> + <widget class="GtkImage" id="image739"> <property name="visible">True</property> <property name="stock">gtk-save</property> <property name="icon_size">1</property> @@ -211,7 +211,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="image724"> + <widget class="GtkImage" id="image740"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -327,7 +327,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image725"> + <widget class="GtkImage" id="image741"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -359,7 +359,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image726"> + <widget class="GtkImage" id="image742"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -537,7 +537,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="image727"> + <widget class="GtkImage" id="image743"> <property name="visible">True</property> <property name="stock">gtk-find-and-replace</property> <property name="icon_size">1</property> @@ -564,7 +564,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="image728"> + <widget class="GtkImage" id="image744"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> @@ -599,7 +599,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="image729"> + <widget class="GtkImage" id="image745"> <property name="visible">True</property> <property name="stock">gtk-select-font</property> <property name="icon_size">1</property> @@ -621,7 +621,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="image730"> + <widget class="GtkImage" id="image746"> <property name="visible">True</property> <property name="stock">gtk-select-color</property> <property name="icon_size">1</property> @@ -799,6 +799,26 @@ </child> <child> + <widget class="GtkMenuItem" id="set_encoding1"> + <property name="visible">True</property> + <property name="label" translatable="yes">Set encoding</property> + <property name="use_underline">True</property> + + <child> + <widget class="GtkMenu" id="set_encoding1_menu"> + + <child> + <widget class="GtkMenuItem" id="invisible6"> + <property name="label" translatable="yes">invisible</property> + <property name="use_underline">True</property> + </widget> + </child> + </widget> + </child> + </widget> + </child> + + <child> <widget class="GtkMenuItem" id="menu_line_endings1"> <property name="visible">True</property> <property name="label" translatable="yes">Line endings</property> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-06-19 16:21:52 UTC (rev 466) +++ trunk/src/callbacks.c 2006-06-19 18:31:17 UTC (rev 467) @@ -47,21 +47,18 @@ #include "templates.h" #include "treeviews.h" #include "keybindings.h" +#include "encodings.h" #ifdef GEANY_WIN32 # include "win32.h" #endif -// include vte.h on non-Win32 systems, else define fake vte_init -#if defined(GEANY_WIN32) || ! defined(HAVE_VTE) -# define vte_close() ; -#else +#ifdef HAVE_VTE # include "vte.h" #endif - // represents the word under the mouse pointer when right button(no. 3) is pressed gchar current_word[GEANY_MAX_WORD_LENGTH]; @@ -2381,3 +2378,21 @@ document_clear_indicators(idx); } + +void +on_encoding_change (GtkMenuItem *menuitem, + gpointer user_data) +{ + gint idx = document_get_cur_idx(); + guint i = GPOINTER_TO_INT(user_data); + + if (idx < 0 || encodings[i].charset == NULL) return; + + g_free(doc_list[idx].encoding); + doc_list[idx].encoding = g_strdup(encodings[i].charset); + doc_list[idx].changed = TRUE; + document_set_text_changed(idx); + utils_update_statusbar(idx, -1); +} + + Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2006-06-19 16:21:52 UTC (rev 466) +++ trunk/src/callbacks.h 2006-06-19 18:31:17 UTC (rev 467) @@ -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$ */ @@ -582,3 +582,7 @@ void on_menu_remove_indicators1_activate (GtkMenuItem *menuitem, gpointer user_data); + +void +on_encoding_change (GtkMenuItem *menuitem, + gpointer user_data); Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-06-19 16:21:52 UTC (rev 466) +++ trunk/src/document.c 2006-06-19 18:31:17 UTC (rev 467) @@ -613,6 +613,29 @@ data = (gchar*) g_malloc(len); sci_get_text(doc_list[idx].sci, len, data); + // save in original encoding + if (doc_list[idx].encoding != NULL) + { + GError *conv_error = NULL; + gchar* conv_file_contents = NULL; + + // try to convert it from UTF-8 to original encoding + conv_file_contents = g_convert(data, -1, doc_list[idx].encoding, "UTF-8", + NULL, NULL, &conv_error); + + if (conv_error != NULL) + { + g_error_free(conv_error); + geany_debug("error while converting the file to its orinial encoding"); + } + else + { + g_free(data); + data = conv_file_contents; + len = strlen(conv_file_contents); + } + } + locale_filename = g_locale_from_utf8(doc_list[idx].file_name, -1, NULL, NULL, NULL); fp = fopen(locale_filename, "w"); if (fp == NULL) Modified: trunk/src/encodings.c =================================================================== --- trunk/src/encodings.c 2006-06-19 16:21:52 UTC (rev 466) +++ trunk/src/encodings.c 2006-06-19 18:31:17 UTC (rev 467) @@ -1,7 +1,7 @@ /* * encodings.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> * * 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 @@ -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. * */ @@ -34,224 +34,83 @@ #include "support.h" #include "msgwindow.h" #include "encodings.h" +#include "callbacks.h" -struct _GeanyEncoding -{ - gint idx; - gchar *charset; - gchar *name; -}; -/* - * The original versions of the following tables are taken from profterm - * - * Copyright (C) 2002 Red Hat, Inc. - */ - -typedef enum +#define fill(x, y, z) encodings[x].idx = x;encodings[x].charset = y;encodings[x].name = z; +static void init_encodings(void) { + fill(GEANY_ENCODING_ISO_8859_1, "ISO-8859-1", "Western"); + fill(GEANY_ENCODING_ISO_8859_2, "ISO-8859-2", "Central European"); + fill(GEANY_ENCODING_ISO_8859_3, "ISO-8859-3", "South European"); + fill(GEANY_ENCODING_ISO_8859_4, "ISO-8859-4", "Baltic"); + fill(GEANY_ENCODING_ISO_8859_5, "ISO-8859-5", "Cyrillic"); + fill(GEANY_ENCODING_ISO_8859_6, "ISO-8859-6", "Arabic"); + fill(GEANY_ENCODING_ISO_8859_7, "ISO-8859-7", "Greek"); + fill(GEANY_ENCODING_ISO_8859_8, "ISO-8859-8", "Hebrew Visual"); + fill(GEANY_ENCODING_ISO_8859_8_I, "ISO-8859-8-I", "Hebrew"); + fill(GEANY_ENCODING_ISO_8859_9, "ISO-8859-9", "Turkish"); + fill(GEANY_ENCODING_ISO_8859_10, "ISO-8859-10", "Nordic"); + fill(GEANY_ENCODING_ISO_8859_13, "ISO-8859-13", "Baltic"); + fill(GEANY_ENCODING_ISO_8859_14, "ISO-8859-14", "Celtic"); + fill(GEANY_ENCODING_ISO_8859_15, "ISO-8859-15", "Western"); + fill(GEANY_ENCODING_ISO_8859_16, "ISO-8859-16", "Romanian"); - GEANY_ENCODING_ISO_8859_1, - GEANY_ENCODING_ISO_8859_2, - GEANY_ENCODING_ISO_8859_3, - GEANY_ENCODING_ISO_8859_4, - GEANY_ENCODING_ISO_8859_5, - GEANY_ENCODING_ISO_8859_6, - GEANY_ENCODING_ISO_8859_7, - GEANY_ENCODING_ISO_8859_8, - GEANY_ENCODING_ISO_8859_8_I, - GEANY_ENCODING_ISO_8859_9, - GEANY_ENCODING_ISO_8859_10, - GEANY_ENCODING_ISO_8859_13, - GEANY_ENCODING_ISO_8859_14, - GEANY_ENCODING_ISO_8859_15, - GEANY_ENCODING_ISO_8859_16, + fill(GEANY_ENCODING_UTF_7, "UTF-7", "Unicode"); + fill(GEANY_ENCODING_UTF_8, "UTF-8", "Unicode"); + fill(GEANY_ENCODING_UTF_16, "UTF-16", "Unicode"); + fill(GEANY_ENCODING_UCS_2, "UCS-2", "Unicode"); + fill(GEANY_ENCODING_UCS_4, "UCS-4", "Unicode"); + + fill(GEANY_ENCODING_ARMSCII_8, "ARMSCII-8", "Armenian"); + fill(GEANY_ENCODING_BIG5, "BIG5", "Chinese Traditional"); + fill(GEANY_ENCODING_BIG5_HKSCS, "BIG5-HKSCS", "Chinese Traditional"); + fill(GEANY_ENCODING_CP_866, "CP866", "Cyrillic/Russian"); + + fill(GEANY_ENCODING_EUC_JP, "EUC-JP", "Japanese"); + fill(GEANY_ENCODING_EUC_KR, "EUC-KR", "Korean"); + fill(GEANY_ENCODING_EUC_TW, "EUC-TW", "Chinese Traditional"); - GEANY_ENCODING_UTF_7, - GEANY_ENCODING_UTF_16, - GEANY_ENCODING_UCS_2, - GEANY_ENCODING_UCS_4, + fill(GEANY_ENCODING_GB18030, "GB18030", "Chinese Simplified"); + fill(GEANY_ENCODING_GB2312, "GB2312", "Chinese Simplified"); + fill(GEANY_ENCODING_GBK, "GBK", "Chinese Simplified"); + fill(GEANY_ENCODING_GEOSTD8, "GEORGIAN-ACADEMY", "Georgian"); + fill(GEANY_ENCODING_HZ, "HZ", "Chinese Simplified"); + + fill(GEANY_ENCODING_IBM_850, "IBM850", "Western"); + fill(GEANY_ENCODING_IBM_852, "IBM852", "Central European"); + fill(GEANY_ENCODING_IBM_855, "IBM855", "Cyrillic"); + fill(GEANY_ENCODING_IBM_857, "IBM857", "Turkish"); + fill(GEANY_ENCODING_IBM_862, "IBM862", "Hebrew"); + fill(GEANY_ENCODING_IBM_864, "IBM864", "Arabic"); + + fill(GEANY_ENCODING_ISO_2022_JP, "ISO-2022-JP", "Japanese"); + fill(GEANY_ENCODING_ISO_2022_KR, "ISO-2022-KR", "Korean"); + fill(GEANY_ENCODING_ISO_IR_111, "ISO-IR-111", "Cyrillic"); + fill(GEANY_ENCODING_JOHAB, "JOHAB", "Korean"); + fill(GEANY_ENCODING_KOI8_R, "KOI8R", "Cyrillic"); + fill(GEANY_ENCODING_KOI8_U, "KOI8U", "Cyrillic/Ukrainian"); + + fill(GEANY_ENCODING_SHIFT_JIS, "SHIFT_JIS", "Japanese"); + fill(GEANY_ENCODING_TCVN, "TCVN", "Vietnamese"); + fill(GEANY_ENCODING_TIS_620, "TIS-620", "Thai"); + fill(GEANY_ENCODING_UHC, "UHC", "Korean"); + fill(GEANY_ENCODING_VISCII, "VISCII", "Vietnamese"); - GEANY_ENCODING_ARMSCII_8, - GEANY_ENCODING_BIG5, - GEANY_ENCODING_BIG5_HKSCS, - GEANY_ENCODING_CP_866, + fill(GEANY_ENCODING_WINDOWS_1250, "WINDOWS-1250", "Central European"); + fill(GEANY_ENCODING_WINDOWS_1251, "WINDOWS-1251", "Cyrillic"); + fill(GEANY_ENCODING_WINDOWS_1252, "WINDOWS-1252", "Western"); + fill(GEANY_ENCODING_WINDOWS_1253, "WINDOWS-1253", "Greek"); + fill(GEANY_ENCODING_WINDOWS_1254, "WINDOWS-1254", "Turkish"); + fill(GEANY_ENCODING_WINDOWS_1255, "WINDOWS-1255", "Hebrew"); + fill(GEANY_ENCODING_WINDOWS_1256, "WINDOWS-1256", "Arabic"); + fill(GEANY_ENCODING_WINDOWS_1257, "WINDOWS-1257", "Baltic"); + fill(GEANY_ENCODING_WINDOWS_1258, "WINDOWS-1258", "Vietnamese"); +} - GEANY_ENCODING_EUC_JP, - GEANY_ENCODING_EUC_KR, - GEANY_ENCODING_EUC_TW, - GEANY_ENCODING_GB18030, - GEANY_ENCODING_GB2312, - GEANY_ENCODING_GBK, - GEANY_ENCODING_GEOSTD8, - GEANY_ENCODING_HZ, - - GEANY_ENCODING_IBM_850, - GEANY_ENCODING_IBM_852, - GEANY_ENCODING_IBM_855, - GEANY_ENCODING_IBM_857, - GEANY_ENCODING_IBM_862, - GEANY_ENCODING_IBM_864, - - GEANY_ENCODING_ISO_2022_JP, - GEANY_ENCODING_ISO_2022_KR, - GEANY_ENCODING_ISO_IR_111, - GEANY_ENCODING_JOHAB, - GEANY_ENCODING_KOI8_R, - GEANY_ENCODING_KOI8_U, - - GEANY_ENCODING_SHIFT_JIS, - GEANY_ENCODING_TCVN, - GEANY_ENCODING_TIS_620, - GEANY_ENCODING_UHC, - GEANY_ENCODING_VISCII, - - GEANY_ENCODING_WINDOWS_1250, - GEANY_ENCODING_WINDOWS_1251, - GEANY_ENCODING_WINDOWS_1252, - GEANY_ENCODING_WINDOWS_1253, - GEANY_ENCODING_WINDOWS_1254, - GEANY_ENCODING_WINDOWS_1255, - GEANY_ENCODING_WINDOWS_1256, - GEANY_ENCODING_WINDOWS_1257, - GEANY_ENCODING_WINDOWS_1258, - - GEANY_ENCODING_LAST - -} GeanyEncodingIndex; - -#undef _ -#define _(String) String -static GeanyEncoding encodings [] = { - - { GEANY_ENCODING_ISO_8859_1, - "ISO-8859-1", "Western" }, - { GEANY_ENCODING_ISO_8859_2, - "ISO-8859-2", "Central European" }, - { GEANY_ENCODING_ISO_8859_3, - "ISO-8859-3", "South European" }, - { GEANY_ENCODING_ISO_8859_4, - "ISO-8859-4", "Baltic" }, - { GEANY_ENCODING_ISO_8859_5, - "ISO-8859-5", "Cyrillic" }, - { GEANY_ENCODING_ISO_8859_6, - "ISO-8859-6", "Arabic" }, - { GEANY_ENCODING_ISO_8859_7, - "ISO-8859-7", "Greek" }, - { GEANY_ENCODING_ISO_8859_8, - "ISO-8859-8", "Hebrew Visual" }, - { GEANY_ENCODING_ISO_8859_8_I, - "ISO-8859-8-I", "Hebrew" }, - { GEANY_ENCODING_ISO_8859_9, - "ISO-8859-9", "Turkish" }, - { GEANY_ENCODING_ISO_8859_10, - "ISO-8859-10", "Nordic" }, - { GEANY_ENCODING_ISO_8859_13, - "ISO-8859-13", "Baltic" }, - { GEANY_ENCODING_ISO_8859_14, - "ISO-8859-14", "Celtic" }, - { GEANY_ENCODING_ISO_8859_15, - "ISO-8859-15", "Western" }, - { GEANY_ENCODING_ISO_8859_16, - "ISO-8859-16", "Romanian" }, - - { GEANY_ENCODING_UTF_7, - "UTF-7", "Unicode" }, - { GEANY_ENCODING_UTF_16, - "UTF-16", "Unicode" }, - { GEANY_ENCODING_UCS_2, - "UCS-2", "Unicode" }, - { GEANY_ENCODING_UCS_4, - "UCS-4", "Unicode" }, - - { GEANY_ENCODING_ARMSCII_8, - "ARMSCII-8", "Armenian" }, - { GEANY_ENCODING_BIG5, - "BIG5", "Chinese Traditional" }, - { GEANY_ENCODING_BIG5_HKSCS, - "BIG5-HKSCS", "Chinese Traditional" }, - { GEANY_ENCODING_CP_866, - "CP866", "Cyrillic/Russian" }, - - { GEANY_ENCODING_EUC_JP, - "EUC-JP", "Japanese" }, - { GEANY_ENCODING_EUC_KR, - "EUC-KR", "Korean" }, - { GEANY_ENCODING_EUC_TW, - "EUC-TW", "Chinese Traditional" }, - - { GEANY_ENCODING_GB18030, - "GB18030", "Chinese Simplified" }, - { GEANY_ENCODING_GB2312, - "GB2312", "Chinese Simplified" }, - { GEANY_ENCODING_GBK, - "GBK", "Chinese Simplified" }, - { GEANY_ENCODING_GEOSTD8, - "GEORGIAN-ACADEMY", "Georgian" }, /* FIXME GEOSTD8 ? */ - { GEANY_ENCODING_HZ, - "HZ", "Chinese Simplified" }, - - { GEANY_ENCODING_IBM_850, - "IBM850", "Western" }, - { GEANY_ENCODING_IBM_852, - "IBM852", "Central European" }, - { GEANY_ENCODING_IBM_855, - "IBM855", "Cyrillic" }, - { GEANY_ENCODING_IBM_857, - "IBM857", "Turkish" }, - { GEANY_ENCODING_IBM_862, - "IBM862", "Hebrew" }, - { GEANY_ENCODING_IBM_864, - "IBM864", "Arabic" }, - - { GEANY_ENCODING_ISO_2022_JP, - "ISO-2022-JP", "Japanese" }, - { GEANY_ENCODING_ISO_2022_KR, - "ISO-2022-KR", "Korean" }, - { GEANY_ENCODING_ISO_IR_111, - "ISO-IR-111", "Cyrillic" }, - { GEANY_ENCODING_JOHAB, - "JOHAB", "Korean" }, - { GEANY_ENCODING_KOI8_R, - "KOI8R", "Cyrillic" }, - { GEANY_ENCODING_KOI8_U, - "KOI8U", "Cyrillic/Ukrainian" }, - - { GEANY_ENCODING_SHIFT_JIS, - "SHIFT_JIS", "Japanese" }, - { GEANY_ENCODING_TCVN, - "TCVN", "Vietnamese" }, - { GEANY_ENCODING_TIS_620, - "TIS-620", "Thai" }, - { GEANY_ENCODING_UHC, - "UHC", "Korean" }, - { GEANY_ENCODING_VISCII, - "VISCII", "Vietnamese" }, - - { GEANY_ENCODING_WINDOWS_1250, - "WINDOWS-1250", "Central European" }, - { GEANY_ENCODING_WINDOWS_1251, - "WINDOWS-1251", "Cyrillic" }, - { GEANY_ENCODING_WINDOWS_1252, - "WINDOWS-1252", "Western" }, - { GEANY_ENCODING_WINDOWS_1253, - "WINDOWS-1253", "Greek" }, - { GEANY_ENCODING_WINDOWS_1254, - "WINDOWS-1254", "Turkish" }, - { GEANY_ENCODING_WINDOWS_1255, - "WINDOWS-1255", "Hebrew" }, - { GEANY_ENCODING_WINDOWS_1256, - "WINDOWS-1256", "Arabic" }, - { GEANY_ENCODING_WINDOWS_1257, - "WINDOWS-1257", "Baltic" }, - { GEANY_ENCODING_WINDOWS_1258, - "WINDOWS-1258", "Vietnamese" } -}; - - -static void encoding_lazy_init(void) +static void encodings_lazy_init(void) { static gboolean initialized = FALSE; gint i; @@ -276,11 +135,11 @@ } -const GeanyEncoding *encoding_get_from_charset(const gchar *charset) +const GeanyEncoding *encodings_get_from_charset(const gchar *charset) { gint i; - encoding_lazy_init (); + encodings_lazy_init (); i = 0; while (i < GEANY_ENCODING_LAST) @@ -295,46 +154,46 @@ } -const GeanyEncoding *encoding_get_from_index(gint index) +const GeanyEncoding *encodings_get_from_index(gint index) { g_return_val_if_fail(index >= 0, NULL); if (index >= GEANY_ENCODING_LAST) return NULL; - encoding_lazy_init(); + encodings_lazy_init(); return &encodings[index]; } -gchar *encoding_to_string(const GeanyEncoding* enc) +gchar *encodings_to_string(const GeanyEncoding* enc) { g_return_val_if_fail(enc != NULL, NULL); g_return_val_if_fail(enc->name != NULL, NULL); g_return_val_if_fail(enc->charset != NULL, NULL); - encoding_lazy_init(); + encodings_lazy_init(); return g_strdup_printf("%s (%s)", enc->name, enc->charset); } -const gchar *encoding_get_charset(const GeanyEncoding* enc) +const gchar *encodings_get_charset(const GeanyEncoding* enc) { /* g_return_val_if_fail(enc != NULL, NULL); g_return_val_if_fail(enc->charset != NULL, NULL); */ if (enc == NULL) return NULL; - encoding_lazy_init(); + encodings_lazy_init(); return enc->charset; } /* Encodings */ -GList *encoding_get_encodings(GList *encoding_strings) +GList *encodings_get_encodings(GList *encoding_strings) { GList *res = NULL; @@ -353,7 +212,7 @@ g_get_charset(&charset); g_return_val_if_fail(charset != NULL, NULL); - enc = encoding_get_from_charset(charset); + enc = encodings_get_from_charset(charset); if (enc != NULL) res = g_list_append(res, (gpointer)enc); @@ -365,394 +224,29 @@ } -typedef struct +void encodings_init(void) { - GtkWidget *add_button; - GtkWidget *remove_button; - GtkWidget *up_button; - GtkWidget *down_button; - GtkWidget *supported_treeview; - GtkWidget *stock_treeview; -} GeanyEncodingsDialog; + GtkWidget *item; + GtkWidget *menu; + gchar *label; + guint i = 0; + + init_encodings(); + encodings_lazy_init(); - -//static GeanyEncodingsDialog *encodings_dialog = NULL; - - -enum -{ - COLUMN_ENCODING_NAME = 0, - COLUMN_ENCODING_INDEX, - ENCODING_NUM_COLS -}; - - -enum -{ - COLUMN_SUPPORTED_ENCODING_NAME = 0, - COLUMN_SUPPORTED_ENCODING, - SUPPORTED_ENCODING_NUM_COLS -}; - - -/* -static GtkTreeModel *create_encodings_treeview_model(void) -{ - GtkListStore *store; - GtkTreeIter iter; - gint i; - const GeanyEncoding* enc; - - // create list store - store = gtk_list_store_new(ENCODING_NUM_COLS, G_TYPE_STRING, G_TYPE_INT); - - i = 0; - while ((enc = encoding_get_from_index(i)) != NULL) + // create encodings submenu in document menu + menu = lookup_widget(app->window, "set_encoding1_menu"); + while (i < GEANY_ENCODING_LAST) { - gchar *name; - enc = encoding_get_from_index(i); - name = encoding_to_string(enc); - gtk_list_store_append(store, &iter); - gtk_list_store_set(store, &iter, COLUMN_ENCODING_NAME, name, - COLUMN_ENCODING_INDEX, i, -1); - g_free(name); - ++i; - } - return GTK_TREE_MODEL(store); -} + if (encodings[i].idx != i) break; -static void on_add_encodings(GtkButton *button) -{ - GValue value = {0, }; - const GeanyEncoding* enc; - GSList *encs = NULL; - - GtkTreeIter iter; - GtkTreeSelection *selection; - GtkTreeModel *model; - - selection = - gtk_tree_view_get_selection(GTK_TREE_VIEW - (encodings_dialog->stock_treeview)); - g_return_if_fail(selection != NULL); - - model = gtk_tree_view_get_model(GTK_TREE_VIEW - (encodings_dialog->stock_treeview)); - if (!gtk_tree_model_get_iter_first(model, &iter)) - return; - - if (gtk_tree_selection_iter_is_selected(selection, &iter)) - { - gtk_tree_model_get_value(model, &iter, - COLUMN_ENCODING_INDEX, &value); - enc = encoding_get_from_index(g_value_get_int(&value)); - g_return_if_fail(enc != NULL); - encs = g_slist_prepend(encs, (gpointer)enc); - - g_value_unset(&value); - } - - while (gtk_tree_model_iter_next(model, &iter)) - { - if (gtk_tree_selection_iter_is_selected(selection, &iter)) - { - gtk_tree_model_get_value(model, &iter, - COLUMN_ENCODING_INDEX, &value); - - enc = encoding_get_from_index(g_value_get_int (&value)); - g_return_if_fail (enc != NULL); - - encs = g_slist_prepend(encs, (gpointer)enc); - - g_value_unset(&value); - } - } - - if (encs != NULL) - { - GSList *node; - model = gtk_tree_view_get_model(GTK_TREE_VIEW - (encodings_dialog->supported_treeview)); - encs = g_slist_reverse(encs); - node = encs; - while (node) - { - const GeanyEncoding *enc; - gchar *name; - GtkTreeIter iter; - enc = (const GeanyEncoding *) node->data; - - name = encoding_to_string(enc); - - gtk_list_store_append(GTK_LIST_STORE(model), &iter); - gtk_list_store_set(GTK_LIST_STORE(model), &iter, - COLUMN_SUPPORTED_ENCODING_NAME, name, - COLUMN_SUPPORTED_ENCODING, enc, - -1); - g_free(name); - - node = g_slist_next(node); - } - g_slist_free(encs); - } + label = encodings_to_string(&encodings[i]); + item = gtk_menu_item_new_with_label(label); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_encoding_change), + GINT_TO_POINTER(encodings[i].idx)); + g_free(label); + i++; + } } - -static void on_remove_encodings(GtkButton *button) -{ - GtkTreeSelection *selection; - GtkTreeModel *model; - GtkTreeIter iter; - GtkTreeView *treeview; - - treeview = GTK_TREE_VIEW(encodings_dialog->supported_treeview); - selection = gtk_tree_view_get_selection(treeview); - if (selection && - gtk_tree_selection_get_selected(selection, &model, &iter)) - { - gtk_list_store_remove(GTK_LIST_STORE(model), &iter); - } -} - -static void on_up_encoding(GtkButton *button) -{ - GtkTreeSelection *selection; - GtkTreeModel *model; - GtkTreeIter iter; - GtkTreeView *treeview; - - treeview = GTK_TREE_VIEW(encodings_dialog->supported_treeview); - selection = gtk_tree_view_get_selection(treeview); - if (selection && - gtk_tree_selection_get_selected(selection, &model, &iter)) - { - GtkTreePath *path; - - path = gtk_tree_model_get_path(model, &iter); - if (gtk_tree_path_prev(path)) - { - GtkTreeIter prev_iter; - gtk_tree_model_get_iter(model, &prev_iter, path); - gtk_list_store_swap(GTK_LIST_STORE(model), &prev_iter, &iter); - } - gtk_tree_path_free(path); - } -} - -static void on_down_encoding(GtkButton *button) -{ - GtkTreeSelection *selection; - GtkTreeModel *model; - GtkTreeIter iter; - GtkTreeView *treeview; - - treeview = GTK_TREE_VIEW(encodings_dialog->supported_treeview); - selection = gtk_tree_view_get_selection(treeview); - if (selection && - gtk_tree_selection_get_selected(selection, &model, &iter)) - { - GtkTreeIter next_iter = iter; - if (gtk_tree_model_iter_next(model, &next_iter)) - { - gtk_list_store_swap(GTK_LIST_STORE(model), &iter, &next_iter); - } - } -} - -static void on_stock_selection_changed(GtkTreeSelection *selection) -{ - if (gtk_tree_selection_count_selected_rows(selection) > 0) - gtk_widget_set_sensitive(encodings_dialog->add_button, TRUE); - else - gtk_widget_set_sensitive(encodings_dialog->add_button, FALSE); -} - -static void on_supported_selection_changed(GtkTreeSelection *selection) -{ - GtkTreeModel *model; - GtkTreeIter iter; - - if (gtk_tree_selection_get_selected(selection, &model, &iter) > 0) - { - GtkTreePath *path; - gtk_widget_set_sensitive(encodings_dialog->remove_button, TRUE); - path = gtk_tree_model_get_path(model, &iter); - if (gtk_tree_path_prev(path)) - gtk_widget_set_sensitive(encodings_dialog->up_button, TRUE); - else - gtk_widget_set_sensitive(encodings_dialog->up_button, FALSE); - gtk_tree_path_free(path); - - if (gtk_tree_model_iter_next(model, &iter)) - gtk_widget_set_sensitive(encodings_dialog->down_button, TRUE); - else - gtk_widget_set_sensitive(encodings_dialog->down_button, FALSE); - } - else - { - gtk_widget_set_sensitive(encodings_dialog->remove_button, FALSE); - gtk_widget_set_sensitive(encodings_dialog->up_button, FALSE); - gtk_widget_set_sensitive(encodings_dialog->down_button, FALSE); - } -} - - -static gchar *get_property(void) -{ - GtkTreeView *treeview; - GString *str; - GtkTreeIter iter; - GtkTreeModel *model; - gboolean valid; - gchar *value; - - treeview = GTK_TREE_VIEW(app->tagbar); - - str = g_string_new(""); - - model = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview)); - valid = gtk_tree_model_get_iter_first(model, &iter); - while (valid) - { - GeanyEncoding *enc; - gtk_tree_model_get(model, &iter, COLUMN_SUPPORTED_ENCODING, &enc, -1); - g_assert(enc != NULL); - g_assert(enc->charset != NULL); - str = g_string_append(str, enc->charset); - str = g_string_append(str, " "); - valid = gtk_tree_model_iter_next(model, &iter); - } - value = g_string_free(str, FALSE); - return value; -} - - -static void set_property(const gchar *value) -{ - GtkTreeView *treeview; - GtkTreeModel *model; - GList *list, *node; - - treeview = GTK_TREE_VIEW(app->tagbar); - model = gtk_tree_view_get_model(treeview); - gtk_list_store_clear(GTK_LIST_STORE(model)); - - if (!value || strlen(value) <= 0) - return; - - // Fill the model - list = utils_glist_from_string(value); - node = list; - while (node) - { - const GeanyEncoding *enc; - gchar *name; - GtkTreeIter iter; - - enc = encoding_get_from_charset((gchar *) node->data); - name = encoding_to_string(enc); - - gtk_list_store_append(GTK_LIST_STORE(model), &iter); - gtk_list_store_set(GTK_LIST_STORE(model), &iter, - COLUMN_SUPPORTED_ENCODING_NAME, name, - COLUMN_SUPPORTED_ENCODING, enc, - -1); - g_free(name); - - node = g_list_next(node); - } - utils_glist_strings_free(list); -} -*/ - - -void encodings_init(void) -{ - encoding_lazy_init(); -/* GtkWidget *add_button; - GtkWidget *remove_button; - GtkWidget *up_button; - GtkWidget *down_button; - GtkWidget *supported_treeview; - GtkWidget *stock_treeview = msgwindow.tree_msg; - GtkTreeModel *model; - GtkCellRenderer *cell; - GtkTreeViewColumn *column; - GtkTreeSelection *selection; - - g_return_if_fail(encodings_dialog == NULL); - - // Create the Encodings preferences page - gxml = glade_xml_new(PACKAGE_DATA_DIR"/glade/anjuta.glade", - "preferences_dialog_encodings", - NULL); - anjuta_preferences_add_page(pref, gxml, - "Encodings", - "preferences-encodings.png"); - supported_treeview = glade_xml_get_widget(gxml, "supported_treeview"); - stock_treeview = glade_xml_get_widget(gxml, "stock_treeview"); - add_button = glade_xml_get_widget(gxml, "add_button"); - remove_button = glade_xml_get_widget(gxml, "remove_button"); - up_button = glade_xml_get_widget(gxml, "up_button"); - down_button = glade_xml_get_widget(gxml, "down_button"); - - // Add the encoding column for stock treeview - cell = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes(_("Stock Encodings"), - cell, "text", - COLUMN_ENCODING_NAME, - NULL); - gtk_tree_view_append_column(GTK_TREE_VIEW(msgwindow.tree_msg), column); - gtk_tree_view_set_search_column(GTK_TREE_VIEW(stock_treeview), - COLUMN_ENCODING_NAME); - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(stock_treeview)); - g_return_if_fail(selection != NULL); - gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE); - g_signal_connect(G_OBJECT(selection), "changed", - G_CALLBACK(on_stock_selection_changed), NULL); - - model = create_encodings_treeview_model(); - gtk_tree_view_set_model(GTK_TREE_VIEW(stock_treeview), model); - g_object_unref(model); - - // Add the encoding column for supported treeview - cell = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes(_("Supported Encodings"), - cell, "text", COLUMN_ENCODING_NAME, NULL); - gtk_tree_view_append_column(GTK_TREE_VIEW(supported_treeview), column); - gtk_tree_view_set_search_column(GTK_TREE_VIEW(supported_treeview), - COLUMN_ENCODING_NAME); - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(supported_treeview)); - g_return_if_fail(selection != NULL); - gtk_tree_selection_set_mode(selection, GTK_SELECTION_BROWSE); - g_signal_connect(G_OBJECT(selection), "changed", - G_CALLBACK(on_supported_selection_changed), NULL); - - // create list store - model = GTK_TREE_MODEL(gtk_list_store_new(SUPPORTED_ENCODING_NUM_COLS, - G_TYPE_STRING, G_TYPE_POINTER)); - gtk_tree_view_set_model(GTK_TREE_VIEW(supported_treeview), model); - g_object_unref(model); - - g_signal_connect(G_OBJECT(add_button), "clicked", - G_CALLBACK(on_add_encodings), NULL); - g_signal_connect(G_OBJECT(remove_button), "clicked", - G_CALLBACK(on_remove_encodings), NULL); - g_signal_connect(G_OBJECT(up_button), "clicked", - G_CALLBACK(on_up_encoding), NULL); - g_signal_connect(G_OBJECT(down_button), "clicked", - G_CALLBACK(on_down_encoding), NULL); - - gtk_widget_set_sensitive(add_button, FALSE); - gtk_widget_set_sensitive(remove_button, FALSE); - gtk_widget_set_sensitive(up_button, FALSE); - gtk_widget_set_sensitive(down_button, FALSE); - - encodings_dialog = g_new0(GeanyEncodingsDialog, 1); - encodings_dialog->add_button = add_button; - encodings_dialog->remove_button = remove_button; - encodings_dialog->up_button = up_button; - encodings_dialog->down_button = down_button; - encodings_dialog->supported_treeview = supported_treeview; - encodings_dialog->stock_treeview = stock_treeview; -*/ -} Modified: trunk/src/encodings.h =================================================================== --- trunk/src/encodings.h 2006-06-19 16:21:52 UTC (rev 466) +++ trunk/src/encodings.h 2006-06-19 18:31:17 UTC (rev 467) @@ -1,7 +1,7 @@ /* * encodings.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2005 Enrico Troeger <enrico.troeger(a)uvena.de> + * Copyright 2006 Enrico Troeger <enrico.troeger(a)uvena.de> * * 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 @@ -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$ */ @@ -32,16 +32,108 @@ #ifndef GEANY_ENCODINGS_H #define GEANY_ENCODINGS_H -typedef struct _GeanyEncoding GeanyEncoding; -const GeanyEncoding* encoding_get_from_charset(const gchar *charset); -const GeanyEncoding* encoding_get_from_index(gint index); +typedef struct +{ + gint idx; + gchar *charset; + gchar *name; +} GeanyEncoding; -gchar* encoding_to_string(const GeanyEncoding* enc); -const gchar* encoding_get_charset(const GeanyEncoding* enc); -GList* encoding_get_encodings(GList *encoding_strings); +const GeanyEncoding* encodings_get_from_charset(const gchar *charset); +const GeanyEncoding* encodings_get_from_index(gint index); + +gchar* encodings_to_string(const GeanyEncoding* enc); +const gchar* encodings_get_charset(const GeanyEncoding* enc); + +GList* encodings_get_encodings(GList *encoding_strings); + void encodings_init(void); + +/* + * The original versions of the following tables are taken from profterm + * + * Copyright (C) 2002 Red Hat, Inc. + */ + +typedef enum +{ + + GEANY_ENCODING_ISO_8859_1, + GEANY_ENCODING_ISO_8859_2, + GEANY_ENCODING_ISO_8859_3, + GEANY_ENCODING_ISO_8859_4, + GEANY_ENCODING_ISO_8859_5, + GEANY_ENCODING_ISO_8859_6, + GEANY_ENCODING_ISO_8859_7, + GEANY_ENCODING_ISO_8859_8, + GEANY_ENCODING_ISO_8859_8_I, + GEANY_ENCODING_ISO_8859_9, + GEANY_ENCODING_ISO_8859_10, + GEANY_ENCODING_ISO_8859_13, + GEANY_ENCODING_ISO_8859_14, + GEANY_ENCODING_ISO_8859_15, + GEANY_ENCODING_ISO_8859_16, + + GEANY_ENCODING_UTF_7, + GEANY_ENCODING_UTF_8, + GEANY_ENCODING_UTF_16, + GEANY_ENCODING_UCS_2, + GEANY_ENCODING_UCS_4, + + GEANY_ENCODING_ARMSCII_8, + GEANY_ENCODING_BIG5, + GEANY_ENCODING_BIG5_HKSCS, + GEANY_ENCODING_CP_866, + + GEANY_ENCODING_EUC_JP, + GEANY_ENCODING_EUC_KR, + GEANY_ENCODING_EUC_TW, + + GEANY_ENCODING_GB18030, + GEANY_ENCODING_GB2312, + GEANY_ENCODING_GBK, + GEANY_ENCODING_GEOSTD8, + GEANY_ENCODING_HZ, + + GEANY_ENCODING_IBM_850, + GEANY_ENCODING_IBM_852, + GEANY_ENCODING_IBM_855, + GEANY_ENCODING_IBM_857, + GEANY_ENCODING_IBM_862, + GEANY_ENCODING_IBM_864, + + GEANY_ENCODING_ISO_2022_JP, + GEANY_ENCODING_ISO_2022_KR, + GEANY_ENCODING_ISO_IR_111, + GEANY_ENCODING_JOHAB, + GEANY_ENCODING_KOI8_R, + GEANY_ENCODING_KOI8_U, + + GEANY_ENCODING_SHIFT_JIS, + GEANY_ENCODING_TCVN, + GEANY_ENCODING_TIS_620, + GEANY_ENCODING_UHC, + GEANY_ENCODING_VISCII, + + GEANY_ENCODING_WINDOWS_1250, + GEANY_ENCODING_WINDOWS_1251, + GEANY_ENCODING_WINDOWS_1252, + GEANY_ENCODING_WINDOWS_1253, + GEANY_ENCODING_WINDOWS_1254, + GEANY_ENCODING_WINDOWS_1255, + GEANY_ENCODING_WINDOWS_1256, + GEANY_ENCODING_WINDOWS_1257, + GEANY_ENCODING_WINDOWS_1258, + + GEANY_ENCODING_LAST + +} GeanyEncodingIndex; + + +GeanyEncoding encodings[GEANY_ENCODING_LAST]; + #endif Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2006-06-19 16:21:52 UTC (rev 466) +++ trunk/src/interface.c 2006-06-19 18:31:17 UTC (rev 467) @@ -37,7 +37,7 @@ GtkWidget *menuitem1_menu; GtkWidget *menu_new1; GtkWidget *menu_new_with_template1; - GtkWidget *image722; + GtkWidget *image738; GtkWidget *menu_new_with_template1_menu; GtkWidget *invisible2; GtkWidget *separator12; @@ -49,14 +49,14 @@ GtkWidget *menu_save1; GtkWidget *menu_save_as1; GtkWidget *menu_save_all1; - GtkWidget *image723; + GtkWidget *image739; GtkWidget *revert1; GtkWidget *separator21; GtkWidget *preferences2; GtkWidget *separator14; GtkWidget *menu_close1; GtkWidget *menu_close_all1; - GtkWidget *image724; + GtkWidget *image740; GtkWidget *menu_separatormenuitem1; GtkWidget *menu_quit1; GtkWidget *edit1; @@ -70,11 +70,11 @@ GtkWidget *menu_delete1; GtkWidget *menu_seperator2; GtkWidget *insert_include2; - GtkWidget *image725; + GtkWidget *image741; GtkWidget *insert_include2_menu; GtkWidget *invisible4; GtkWidget *add_comments1; - GtkWidget *image726; + GtkWidget *image742; GtkWidget *add_comments1_menu; GtkWidget *menu_add_changelog_entry1; GtkWidget *insert_file_header1; @@ -95,16 +95,16 @@ GtkWidget *find_next1; GtkWidget *find_previous1; GtkWidget *replace1; - GtkWidget *image727; + GtkWidget *image743; GtkWidget *separator11; GtkWidget *go_to_line1; - GtkWidget *image728; + GtkWidget *image744; GtkWidget *menuitem3; GtkWidget *menuitem3_menu; GtkWidget *menu_change_font1; - GtkWidget *image729; + GtkWidget *image745; GtkWidget *menu_choose_color1; - GtkWidget *image730; + GtkWidget *image746; GtkWidget *menu_separator4; GtkWidget *menu_fullscreen1; GtkWidget *menu_show_messages_window1; @@ -124,6 +124,9 @@ GtkWidget *set_filetype1; GtkWidget *set_filetype1_menu; GtkWidget *invisible1; + GtkWidget *set_encoding1; + GtkWidget *set_encoding1_menu; + GtkWidget *invisible6; GtkWidget *menu_line_endings1; GtkWidget *menu_line_endings1_menu; GtkWidget *crlf; @@ -232,9 +235,9 @@ gtk_widget_show (menu_new_with_template1); gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_new_with_template1); - image722 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image722); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image722); + image738 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image738); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image738); 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); @@ -279,9 +282,9 @@ gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_save_all1); gtk_tooltips_set_tip (tooltips, menu_save_all1, _("Saves all open files"), NULL); - image723 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); - gtk_widget_show (image723); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image723); + image739 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); + gtk_widget_show (image739); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image739); revert1 = gtk_image_menu_item_new_from_stock ("gtk-revert-to-saved", accel_group); gtk_widget_show (revert1); @@ -310,9 +313,9 @@ gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_close_all1); gtk_tooltips_set_tip (tooltips, menu_close_all1, _("Closes all open files"), NULL); - image724 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image724); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image724); + image740 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image740); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image740); menu_separatormenuitem1 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separatormenuitem1); @@ -369,9 +372,9 @@ gtk_widget_show (insert_include2); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2); - image725 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image725); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image725); + image741 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image741); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image741); insert_include2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu); @@ -383,9 +386,9 @@ gtk_widget_show (add_comments1); gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1); - image726 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image726); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image726); + image742 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image742); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image742); add_comments1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu); @@ -472,9 +475,9 @@ gtk_widget_show (replace1); gtk_container_add (GTK_CONTAINER (search1_menu), replace1); - image727 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); - gtk_widget_show (image727); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image727); + image743 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); + gtk_widget_show (image743); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image743); separator11 = gtk_separator_menu_item_new (); gtk_widget_show (separator11); @@ -485,9 +488,9 @@ gtk_widget_show (go_to_line1); gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1); - image728 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image728); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image728); + image744 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image744); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image744); menuitem3 = gtk_menu_item_new_with_mnemonic (_("_View")); gtk_widget_show (menuitem3); @@ -501,18 +504,18 @@ gtk_container_add (GTK_CONTAINER (menuitem3_menu), menu_change_font1); gtk_tooltips_set_tip (tooltips, menu_change_font1, _("Change the default font"), NULL); - image729 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); - gtk_widget_show (image729); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image729); + image745 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); + gtk_widget_show (image745); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image745); 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); - image730 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); - gtk_widget_show (image730); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image730); + image746 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); + gtk_widget_show (image746); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image746); menu_separator4 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separator4); @@ -602,6 +605,16 @@ invisible1 = gtk_menu_item_new_with_mnemonic (_("invisible")); gtk_container_add (GTK_CONTAINER (set_filetype1_menu), invisible1); + set_encoding1 = gtk_menu_item_new_with_mnemonic (_("Set encoding")); + gtk_widget_show (set_encoding1); + gtk_container_add (GTK_CONTAINER (menu_item4_menu), set_encoding1); + + set_encoding1_menu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (set_encoding1), set_encoding1_menu); + + invisible6 = gtk_menu_item_new_with_mnemonic (_("invisible")); + gtk_container_add (GTK_CONTAINER (set_encoding1_menu), invisible6); + menu_line_endings1 = gtk_menu_item_new_with_mnemonic (_("Line endings")); gtk_widget_show (menu_line_endings1); gtk_container_add (GTK_CONTAINER (menu_item4_menu), menu_line_endings1); @@ -1184,7 +1197,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, image722, "image722"); + GLADE_HOOKUP_OBJECT (window1, image738, "image738"); 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"); @@ -1196,14 +1209,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, image723, "image723"); + GLADE_HOOKUP_OBJECT (window1, image739, "image739"); 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, image724, "image724"); + GLADE_HOOKUP_OBJECT (window1, image740, "image740"); GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1"); GLADE_HOOKUP_OBJECT (window1, menu_quit1, "menu_quit1"); GLADE_HOOKUP_OBJECT (window1, edit1, "edit1"); @@ -1217,11 +1230,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, image725, "image725"); + GLADE_HOOKUP_OBJECT (window1, image741, "image741"); 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, image726, "image726"); + GLADE_HOOKUP_OBJECT (window1, image742, "image742"); 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"); @@ -1242,16 +1255,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, image727, "image727"); + GLADE_HOOKUP_OBJECT (window1, image743, "image743"); GLADE_HOOKUP_OBJECT (window1, separator11, "separator11"); GLADE_HOOKUP_OBJECT (window1, go_to_line1, "go_to_line1"); - GLADE_HOOKUP_OBJECT (window1, image728, "image728"); + GLADE_HOOKUP_OBJECT (window1, image744, "image744"); 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, image729, "image729"); + GLADE_HOOKUP_OBJECT (window1, image745, "image745"); GLADE_HOOKUP_OBJECT (window1, menu_choose_color1, "menu_choose_color1"); - GLADE_HOOKUP_OBJECT (window1, image730, "image730"); + GLADE_HOOKUP_OBJECT (window1, image746, "image746"); 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"); @@ -1271,6 +1284,9 @@ GLADE_HOOKUP_OBJECT (window1, set_filetype1, "set_filetype1"); GLADE_HOOKUP_OBJECT (window1, set_filetype1_menu, "set_filetype1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible1, "invisible1"); + GLADE_HOOKUP_OBJECT (window1, set_encoding1, "set_encoding1"); + GLADE_HOOKUP_OBJECT (window1, set_encoding1_menu, "set_encoding1_menu"); + GLADE_HOOKUP_OBJECT (window1, invisible6, "invisible6"); GLADE_HOOKUP_OBJECT (window1, menu_line_endings1, "menu_line_endings1"); GLADE_HOOKUP_OBJECT (window1, menu_line_endings1_menu, "menu_line_endings1_menu"); GLADE_HOOKUP_OBJECT (window1, crlf, "crlf"); Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-06-19 16:21:52 UTC (rev 466) +++ trunk/src/utils.c 2006-06-19 18:31:17 UTC (rev 467) @@ -810,10 +810,10 @@ gchar *locale_charset = NULL; GList *encoding_strings; - encoding_strings = utils_glist_from_string("UTF-8 ISO-8859-1 ISO-8859-15"); - encodings = encoding_get_encodings(encoding_strings); + encoding_strings = utils_glist_from_string("UTF-8"); + encodings = encodings_get_encodings(encoding_strings); utils_glist_strings_free(encoding_strings); - + if (g_get_charset((const gchar**)&locale_charset) == FALSE) { const GeanyEncoding *locale_encoding; @@ -821,12 +821,11 @@ // not using an UTF-8 locale, so try converting from that first if (locale_charset != NULL) { - locale_encoding = encoding_get_from_charset(locale_charset); + locale_encoding = encodings_get_from_charset(locale_charset); encodings = g_list_prepend(encodings, (gpointer) locale_encoding); geany_debug("Current charset = %s", locale_charset); - //geany_debug("Current encoding = %s", locale_encoding->name); } } @@ -840,7 +839,7 @@ enc = (GeanyEncoding*)encodings->data; - charset = encoding_get_charset(enc); + charset = encodings_get_charset(enc); geany_debug("Trying to convert %d bytes of data into UTF-8.", size); utf8_content = utils_convert_to_utf8_from_charset(buffer, size, charset); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [466] trunk/doc
by ntrel＠users.sourceforge.net 19 Jun '06

19 Jun '06

Revision: 466 Author: ntrel Date: 2006-06-19 09:21:52 -0700 (Mon, 19 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=466&view=rev Log Message: ----------- Set svn:ignore for geany.1, libtagmanager.a, libscintilla.a Property Changed: ---------------- trunk/doc/ trunk/scintilla/ trunk/tagmanager/ Property changes on: trunk/doc ___________________________________________________________________ Name: svn:ignore - Makefile Makefile.in *.pdf + Makefile Makefile.in *.pdf geany.1 Property changes on: trunk/scintilla ___________________________________________________________________ Name: svn:ignore - Makefile Makefile.in .deps + Makefile Makefile.in .deps libscintilla.a Property changes on: trunk/tagmanager ___________________________________________________________________ Name: svn:ignore - Makefile Makefile.in .deps *orig* + Makefile Makefile.in .deps *orig* libtagmanager.a This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

19 Jun '06

Revision: 465 Author: eht16 Date: 2006-06-19 08:00:29 -0700 (Mon, 19 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=465&view=rev Log Message: ----------- Removed uneeded .cvsignore files Removed Paths: ------------- trunk/.cvsignore trunk/doc/.cvsignore trunk/po/.cvsignore trunk/scintilla/.cvsignore trunk/scintilla/include/.cvsignore trunk/src/.cvsignore trunk/tagmanager/.cvsignore trunk/tagmanager/include/.cvsignore Deleted: trunk/.cvsignore =================================================================== --- trunk/.cvsignore 2006-06-19 14:50:10 UTC (rev 464) +++ trunk/.cvsignore 2006-06-19 15:00:29 UTC (rev 465) @@ -1,33 +0,0 @@ -Makefile -Makefile.in -aclocal.m4 -config.h -config.h.in -config.log -config.status -configure -libtool -stamp-h -stamp-h1 -stamp-h.in -global.tags.old -autom4te.cache -config.guess -config.sub -depcomp -install-sh -ltmain.sh -missing -mkinstalldirs -codenames -geany.glade.bak -geany.gladep.bak -TODO.* -RUN -make_deb.sh -build-stamp -geany.1 -geany.spec -geany.desktop -*.tar.* -debian Deleted: trunk/doc/.cvsignore =================================================================== --- trunk/doc/.cvsignore 2006-06-19 14:50:10 UTC (rev 464) +++ trunk/doc/.cvsignore 2006-06-19 15:00:29 UTC (rev 465) @@ -1,3 +0,0 @@ -Makefile -Makefile.in -*.pdf Deleted: trunk/po/.cvsignore =================================================================== --- trunk/po/.cvsignore 2006-06-19 14:50:10 UTC (rev 464) +++ trunk/po/.cvsignore 2006-06-19 15:00:29 UTC (rev 465) @@ -1,15 +0,0 @@ -Makefile -Makefile.in -Makefile.in.in -POTFILES -POTFILES.in.missing -POTFILES.in.noi18n -POTFILES.ignore -Rules-quot -*.gmo -*.mo -Makevars -*.sed -*.header -*.sin -ChangeLog.save Deleted: trunk/scintilla/.cvsignore =================================================================== --- trunk/scintilla/.cvsignore 2006-06-19 14:50:10 UTC (rev 464) +++ trunk/scintilla/.cvsignore 2006-06-19 15:00:29 UTC (rev 465) @@ -1,3 +0,0 @@ -Makefile -Makefile.in -.deps Deleted: trunk/scintilla/include/.cvsignore =================================================================== --- trunk/scintilla/include/.cvsignore 2006-06-19 14:50:10 UTC (rev 464) +++ trunk/scintilla/include/.cvsignore 2006-06-19 15:00:29 UTC (rev 465) @@ -1,2 +0,0 @@ -Makefile -Makefile.in Deleted: trunk/src/.cvsignore =================================================================== --- trunk/src/.cvsignore 2006-06-19 14:50:10 UTC (rev 464) +++ trunk/src/.cvsignore 2006-06-19 15:00:29 UTC (rev 465) @@ -1,4 +0,0 @@ -Makefile -Makefile.in -geany -.deps Deleted: trunk/tagmanager/.cvsignore =================================================================== --- trunk/tagmanager/.cvsignore 2006-06-19 14:50:10 UTC (rev 464) +++ trunk/tagmanager/.cvsignore 2006-06-19 15:00:29 UTC (rev 465) @@ -1,4 +0,0 @@ -Makefile -Makefile.in -.deps -*orig* Deleted: trunk/tagmanager/include/.cvsignore =================================================================== --- trunk/tagmanager/include/.cvsignore 2006-06-19 14:50:10 UTC (rev 464) +++ trunk/tagmanager/include/.cvsignore 2006-06-19 15:00:29 UTC (rev 465) @@ -1,2 +0,0 @@ -Makefile -Makefile.in This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

19 Jun '06

Revision: 464 Author: eht16 Date: 2006-06-19 07:50:10 -0700 (Mon, 19 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=464&view=rev Log Message: ----------- Added translator credits. Modified Paths: -------------- trunk/ChangeLog trunk/THANKS trunk/src/about.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-19 13:41:05 UTC (rev 463) +++ trunk/ChangeLog 2006-06-19 14:50:10 UTC (rev 464) @@ -1,14 +1,21 @@ +2006-06-19 Enrico Troeger <enrico.troeger(a)uvena.de> + + * THANKS, src/about.c: Added translator credits. + + 2006-06-19 Frank Lanitz <frank(a)frank.uvena.de> * configure.in: Added Spanish translation. More info at - po/ChangeLog + po/ChangeLog. + 2006-06-19 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/build.c, src/utils.c, src/utils.h, src/callbacks.c: Don't open files or go to errors automatically whilst compiling. Rename utils_goto_workspace_tag to utils_goto_file_line. + 2006-06-18 Enrico Troeger <enrico.troeger(a)uvena.de> * src/keybindings.c: Fixed a segfault when pressing shortcut for Modified: trunk/THANKS =================================================================== --- trunk/THANKS 2006-06-19 13:41:05 UTC (rev 463) +++ trunk/THANKS 2006-06-19 14:50:10 UTC (rev 464) @@ -25,5 +25,6 @@ Yura Semashko <yurand2(a)gmail.com> - be_BY Topi <topi(a)phreaker.net> - ca_ES Frank Lanitz <frank(a)frank.uvena.de> - de_DE +Damián Viano <debian(a)damianv.com.ar> - es Jacek Wolszczak <shutdownrunner(a)o2.pl> - pl_PL brahmann_ <brahmann(a)mthr.net.ru> - ru_RU Modified: trunk/src/about.c =================================================================== --- trunk/src/about.c 2006-06-19 13:41:05 UTC (rev 463) +++ trunk/src/about.c 2006-06-19 14:50:10 UTC (rev 464) @@ -50,6 +50,8 @@ <topi(a)phreaker.net>\n\n\t\ Frank Lanitz - <language> de_DE\n\t\ <frank(a)frank.uvena.de>\n\n\t\ +Damián Viano - <language> es\n\t\ +<debian(a)damianv.com.ar>\n\n\t\ Jacek Wolszczak - <language> pl_PL\n\t\ <shutdownrunner(a)o2.pl>\n\n\t\ brahmann_ - <language> ru_RU\n\t\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [463] trunk
by kretek＠users.sourceforge.net 19 Jun '06

19 Jun '06

Revision: 463 Author: kretek Date: 2006-06-19 06:41:05 -0700 (Mon, 19 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=463&view=rev Log Message: ----------- Added Spanish translation; Minor updates Modified Paths: -------------- trunk/ChangeLog trunk/configure.in trunk/po/ChangeLog trunk/po/de.po trunk/po/geany.pot trunk/po/ru.po Added Paths: ----------- trunk/po/es.po Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-19 13:27:09 UTC (rev 462) +++ trunk/ChangeLog 2006-06-19 13:41:05 UTC (rev 463) @@ -1,3 +1,8 @@ +2006-06-19 Frank Lanitz <frank(a)frank.uvena.de> + + * configure.in: Added Spanish translation. More info at + po/ChangeLog + 2006-06-19 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/build.c, src/utils.c, src/utils.h, src/callbacks.c: @@ -4,7 +9,6 @@ Don't open files or go to errors automatically whilst compiling. Rename utils_goto_workspace_tag to utils_goto_file_line. - 2006-06-18 Enrico Troeger <enrico.troeger(a)uvena.de> * src/keybindings.c: Fixed a segfault when pressing shortcut for Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2006-06-19 13:27:09 UTC (rev 462) +++ trunk/configure.in 2006-06-19 13:41:05 UTC (rev 463) @@ -121,7 +121,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) # Add the languages which your application supports here. -ALL_LINGUAS="be ca de pl ru" +ALL_LINGUAS="be ca de es pl ru" AM_GLIB_GNU_GETTEXT Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2006-06-19 13:27:09 UTC (rev 462) +++ trunk/po/ChangeLog 2006-06-19 13:41:05 UTC (rev 463) @@ -1,3 +1,12 @@ +2006-06-19 Frank Lanitz <frank(a)frank.uvena.de> + + * geany.pot: Update of catalog + * de.po: Update of German translation + * es.po: Adding Spanish trasnalting contributed by + Damián Viano <dviano(a)fi.uba.ar> + * ru.po: Update of Russian translation by brahmann + <brahmann(a)lifelogs.org.ru> + 2006-06-13 Frank Lanitz <frank(a)frank.uvena.de> * be.po: Updated fuzzy entries, fixed a lot of errors, added Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2006-06-19 13:27:09 UTC (rev 462) +++ trunk/po/de.po 2006-06-19 13:41:05 UTC (rev 463) @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: geany 0.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-06-13 10:35+0200\n" -"PO-Revision-Date: 2006-06-13 11:03+0100\n" +"POT-Creation-Date: 2006-06-19 13:09+0200\n" +"PO-Revision-Date: 2006-06-19 15:09+0100\n" "Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <frank(a)frank.uvena.de>\n" "MIME-Version: 1.0\n" @@ -20,72 +20,67 @@ "X-Poedit-SourceCharset: utf-8\n" "X-Poedit-Basepath: /home/frank/svn/geany/\n" -#: src/main.c:70 +#: src/main.c:73 msgid "runs in debug mode (means being verbose)" msgstr "Im Debug-Modus ausführen (sehr gesprächig)" -#: src/main.c:71 +#: src/main.c:74 msgid "don't load auto completion data (see documentation)" msgstr "Daten für Autvervollständigung nicht laden (siehe Dokumentation)" -#: src/main.c:73 +#: src/main.c:76 msgid "don't open files in a running instance, force opening a new instance" -msgstr "" -"Dateien nicht in einer laufenden Instanz öffnen, sondern eine neue Instanz " -"dafür starten" +msgstr "Dateien nicht in einer laufenden Instanz öffnen, sondern eine neue Instanz dafür starten" -#: src/main.c:75 +#: src/main.c:78 msgid "use an alternate configuration directory" msgstr "Ein alternatives Konfigurationsverzeichnis benutzen" -#: src/main.c:76 +#: src/main.c:79 msgid "don't show message window at startup" msgstr "Meldungsfenster beim Start nicht anzeigen" -#: src/main.c:78 +#: src/main.c:81 msgid "don't load terminal support" msgstr "Geany ohne Terminalsupport starten" -#: src/main.c:79 +#: src/main.c:82 msgid "filename of libvte.so" msgstr "Name der libvte.so" -#: src/main.c:81 +#: src/main.c:84 msgid "show version and exit" msgstr "Versionsinformation anzeigen und Programm beenden" -#: src/main.c:394 +#: src/main.c:397 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 wird beendet, da ein FIFO (named pipe) gefunden wurde. Das bedeutet " -"meistens, dass Geany bereits läuft. Wenn Sie genau wissen, dass Geany nicht " -"läuft, können Sie die Datei löschen und Geany trotzdem starten.\n" +"Geany wird beendet, da ein FIFO (named pipe) gefunden wurde. Das bedeutet meistens, dass Geany bereits läuft. Wenn Sie genau wissen, dass Geany nicht läuft, können Sie die Datei löschen und Geany trotzdem starten.\n" "Die Datei löschen und Geany starten?" -#: src/main.c:436 +#: src/main.c:439 msgid " - A fast and lightweight IDE" msgstr " - Eine kleine und schnelle Entwicklungsumgebung" -#: src/main.c:446 +#: src/main.c:449 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(kompiliert am %s mit GTK %d.%d.%d, GLib %d.%d.%d)" -#: src/main.c:518 +#: src/main.c:522 #, c-format msgid "This is Geany %s." msgstr "Willkommen zu Geany %s." -#: src/main.c:520 +#: src/main.c:524 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Konfigurationsverzeichnis konnte nicht erstellt werden (%s)." -#: src/interface.c:210 src/interface.c:1171 +#: src/interface.c:210 +#: src/interface.c:1176 msgid "Geany" msgstr "Geany" @@ -97,700 +92,721 @@ msgid "New (with _template)" msgstr "Neu (aus _Vorlage)" -#: 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:261 +#: src/interface.c:379 +#: src/interface.c:602 +#: src/interface.c:1561 msgid "invisible" msgstr "invisible" -#: src/interface.c:267 src/interface.c:709 src/keybindings.c:104 +#: src/interface.c:254 +msgid "Recent _files" +msgstr "Zuletzt geöffnet" + +#: src/interface.c:277 +#: src/interface.c:714 +#: src/keybindings.c:112 msgid "Save all" msgstr "Alle speichern" -#: src/interface.c:270 +#: src/interface.c:280 msgid "Saves all open files" msgstr "Speichert alle offenen Dateien" -#: src/interface.c:298 +#: src/interface.c:308 msgid "C_lose all" msgstr "_Alle schließen" -#: src/interface.c:301 +#: src/interface.c:311 msgid "Closes all open files" msgstr "Schließt alle offenen Dateien" -#: src/interface.c:312 -msgid "Recent _files" -msgstr "Zuletzt geöffnet" - -#: src/interface.c:330 src/interface.c:819 +#: src/interface.c:325 +#: src/interface.c:821 msgid "Quit Geany" msgstr "Geany beenden" -#: src/interface.c:332 +#: src/interface.c:327 msgid "_Edit" msgstr "_Bearbeiten" -#: src/interface.c:373 src/interface.c:1545 +#: src/interface.c:368 +#: src/interface.c:1550 msgid "Insert \"include <...>\"" msgstr "\"include <...>\" einfügen" -#: src/interface.c:387 src/interface.c:1559 +#: src/interface.c:382 +#: src/interface.c:1564 msgid "Insert Comments" msgstr "Kommentare einfügen" -#: src/interface.c:398 src/interface.c:1570 +#: src/interface.c:393 +#: src/interface.c:1575 msgid "Insert ChangeLog entry" msgstr "ChangeLog-Eintrag hinzufügen" -#: src/interface.c:401 +#: src/interface.c:396 msgid "Inserts a typical ChangeLog entry in the current file" msgstr "Fügt einen typischen ChangeLog-Eintrag an den Anfang der Datei ein" -#: src/interface.c:403 src/interface.c:1575 +#: src/interface.c:398 +#: src/interface.c:1580 msgid "Insert file header" msgstr "Dateikopf einfügen" -#: src/interface.c:406 src/interface.c:1578 +#: src/interface.c:401 +#: src/interface.c:1583 msgid "Inserts a few information at the beginning of the file" msgstr "Fügt einen Dateiopf am Anfang einer neu erzeugten Datei ein" -#: src/interface.c:408 src/interface.c:1580 +#: src/interface.c:403 +#: src/interface.c:1585 msgid "Insert function description" msgstr "Funktionsbeschreibung einfügen" -#: src/interface.c:411 src/interface.c:1583 +#: src/interface.c:406 +#: src/interface.c:1588 msgid "Inserts a description before the current function" msgstr "Fügt eine Funktionsbeschreibung vor der Funktion ein." -#: src/interface.c:413 src/interface.c:1585 +#: src/interface.c:408 +#: src/interface.c:1590 msgid "Insert multiline comment" msgstr "Mehrzeiligen Kommentar einfügen" -#: src/interface.c:416 src/interface.c:1588 +#: src/interface.c:411 +#: src/interface.c:1593 msgid "Inserts a multiline comment" msgstr "Fügt einen mehrzeiligen Kommentar ein." -#: src/interface.c:418 src/interface.c:1590 +#: src/interface.c:413 +#: src/interface.c:1595 msgid "Insert GPL notice" msgstr "GPL-Hinweis am Dateianfang einfügen" -#: src/interface.c:421 src/interface.c:1593 +#: src/interface.c:416 +#: src/interface.c:1598 msgid "Inserts a GPL notice (should be done at the beginning of the file)" -msgstr "" -"Fügt einen kurzen Lizenz-Hinweis auf die GPL am Anfang einer neu erzeugten " -"Datei ein" +msgstr "Fügt einen kurzen Lizenz-Hinweis auf die GPL am Anfang einer neu erzeugten Datei ein" -#: src/interface.c:428 src/interface.c:1600 +#: src/interface.c:423 +#: src/interface.c:1605 msgid "Change Selection" msgstr "Auswahl verändern" -#: src/interface.c:435 src/interface.c:1607 +#: src/interface.c:430 +#: src/interface.c:1612 msgid "To lower-case" msgstr "In Kleinbuchstaben" -#: src/interface.c:439 src/interface.c:1611 +#: src/interface.c:434 +#: src/interface.c:1616 msgid "To upper-case" msgstr "In Großbuchstaben" -#: src/interface.c:443 +#: src/interface.c:438 msgid "_Count words" msgstr "Wörter _zählen" -#: src/interface.c:446 -msgid "" -"Counts the words and characters in the current selection or the whole " -"document" -msgstr "" -"Zählt die Wörter und Zeichen in der aktuellen Auswahl bzw. dem aktuellen " -"Dokument." +#: src/interface.c:441 +msgid "Counts the words and characters in the current selection or the whole document" +msgstr "Zählt die Wörter und Zeichen in der aktuellen Auswahl bzw. dem aktuellen Dokument." -#: src/interface.c:457 +#: src/interface.c:452 msgid "_Search" msgstr "_Suchen" -#: src/interface.c:468 +#: src/interface.c:463 msgid "Find _Next" msgstr "_Nächstes" -#: src/interface.c:472 +#: src/interface.c:467 msgid "Find _Previous" msgstr "_Vorheriges" -#: src/interface.c:476 src/dialogs.c:906 +#: src/interface.c:471 +#: src/dialogs.c:907 msgid "_Replace" msgstr "_Ersetzen" -#: src/interface.c:489 +#: src/interface.c:484 msgid "_Go to line" msgstr "Gehe zu _Zeile" -#: src/interface.c:497 src/dialogs.c:72 +#: src/interface.c:492 +#: src/dialogs.c:73 msgid "_View" msgstr "_Ansicht" -#: src/interface.c:504 +#: src/interface.c:499 msgid "Change _Font" msgstr "Schriftart _ändern" -#: src/interface.c:507 +#: src/interface.c:502 msgid "Change the default font" msgstr "Ändert die Standardschriftart für das Editor-Fenster" -#: src/interface.c:513 +#: src/interface.c:508 msgid "Show _Colour Chooser" msgstr "_Farbwähler öffnen" -#: src/interface.c:516 src/interface.c:749 -msgid "" -"Open a color chooser dialog, to interactively pick colors from a palette." -msgstr "" -"Öffnet einen Farbauswahl-Dialog zum Auswählen einer Farbe von einer Palette." +#: src/interface.c:511 +#: src/interface.c:760 +msgid "Open a color chooser dialog, to interactively pick colors from a palette." +msgstr "Öffnet einen Farbauswahl-Dialog zum Auswählen einer Farbe von einer Palette." -#: src/interface.c:527 +#: src/interface.c:522 msgid "Full_screen" msgstr "_Vollbild" -#: src/interface.c:531 +#: src/interface.c:526 msgid "Show Messages _Window" msgstr "_Meldungsfenster anzeigen" -#: src/interface.c:534 +#: src/interface.c:529 msgid "Toggle the window with status and compiler messages on and off" -msgstr "" -"Schaltet das Meldungsfenster(beinhaltet auch Compiler-Ausgaben) ein und aus." +msgstr "Schaltet das Meldungsfenster(beinhaltet auch Compiler-Ausgaben) ein und aus." -#: src/interface.c:537 +#: src/interface.c:532 msgid "Show _Toolbar" msgstr "_Werkzeugleiste anzeigen" -#: src/interface.c:540 +#: src/interface.c:535 msgid "Toggle the toolbar on and off" msgstr "Schaltet die Anzeige der Werkzeugleiste an und aus." -#: src/interface.c:543 +#: src/interface.c:538 msgid "Show _Markers Margin" msgstr "Markierungsrand anzeigen" -#: src/interface.c:546 -msgid "" -"Shows or hides the small margin right of the line numbers, which is used to " -"mark lines." -msgstr "" -"Zeigt oder versteckt den kleinen Rand rechts von den Zeilennummern, der zum " -"Anzeigen von Markierungen genutzt wird." +#: src/interface.c:541 +msgid "Shows or hides the small margin right of the line numbers, which is used to mark lines." +msgstr "Zeigt oder versteckt den kleinen Rand rechts von den Zeilennummern, der zum Anzeigen von Markierungen genutzt wird." -#: src/interface.c:549 +#: src/interface.c:544 msgid "Show _Line Numbers" msgstr "_Zeilennummern anzeigen" -#: src/interface.c:552 +#: src/interface.c:547 msgid "Shows or hides the Line Number margin." msgstr "Zeigt oder versteckt den Zeilennummernrand." -#: src/interface.c:572 +#: src/interface.c:567 msgid "_Document" msgstr "D_okument" -#: src/interface.c:579 +#: src/interface.c:574 msgid "_Line breaking" msgstr "Zeilen_umbruch" -#: src/interface.c:582 +#: src/interface.c:577 msgid "Break the line at the window border and continue it on the next line" msgstr "Zeilen am Fensterrand umbrechen und auf der nächsten Zeile fortsetzen." -#: src/interface.c:585 -msgid "_Use auto indention" +#: src/interface.c:580 +msgid "_Use auto indentation" msgstr "_Auto-Einrückung benutzen" -#: src/interface.c:590 +#: src/interface.c:585 msgid "Read _only" msgstr "Schreibgeschützt" -#: src/interface.c:593 +#: src/interface.c:588 msgid "Treat this file as read-only. No changes can be made." msgstr "Datei als schreibgeschützt behandeln. Keine Änderungen möglich." -#: src/interface.c:600 +#: src/interface.c:595 msgid "Set filetype" msgstr "Dateityp festlegen" -#: src/interface.c:610 +#: src/interface.c:605 msgid "Line endings" msgstr "Zeilenenden" -#: src/interface.c:617 +#: src/interface.c:612 msgid "Convert and set to CR/LF (Win)" msgstr "Auf CR/LF setzen umwandeln (Win)" -#: src/interface.c:621 +#: src/interface.c:616 msgid "Convert and set to LF (Unix)" msgstr "Auf LF setzen und umwandeln (Unix)" -#: src/interface.c:625 +#: src/interface.c:620 msgid "Convert and set to CR (Mac)" msgstr "Auf CR setzen umwandeln (Mac)" -#: src/interface.c:634 +#: src/interface.c:629 msgid "_Replace tabs by space" msgstr "_Tabulatoren durch Leerzeichen ersetzen" -#: src/interface.c:637 +#: src/interface.c:632 msgid "Replaces all tabs in document by spaces." msgstr "Ersetzt alle Tabulatoren im Dokument durch Leerzeichen" -#: src/interface.c:644 +#: src/interface.c:639 msgid "_Fold all" msgstr "Alle _einklappen" -#: src/interface.c:647 +#: src/interface.c:642 msgid "Folds all contractible code blocks" msgstr "Klappt alle ausblendbaren Codeblöcke ein" -#: src/interface.c:649 +#: src/interface.c:644 msgid "_Unfold all" msgstr "Alle _ausklappen" -#: src/interface.c:652 +#: src/interface.c:647 msgid "Unfolds all contracted code blocks" msgstr "Klappt alle ausgeblendeten Codeblöcke wieder aus" +#: src/interface.c:654 +msgid "Remove all _indicators" +msgstr "Alle Markierungen löschen" + +#: src/interface.c:657 +msgid "Removes all set indicators in the current document." +msgstr "Entfernt alle gesetzten Markierungen innerhalb des Dokumentes." + #. build the code -#: src/interface.c:654 src/dialogs.c:521 +#: src/interface.c:659 +#: src/dialogs.c:522 msgid "_Build" msgstr "_Erstellen" -#: src/interface.c:658 +#: src/interface.c:663 msgid "_Help" msgstr "_Hilfe" -#: src/interface.c:669 +#: src/interface.c:674 msgid "_Keyboard shortcuts" msgstr "_Tastenkürzel" -#: src/interface.c:672 +#: src/interface.c:677 msgid "Shows a list of all keyboard shortcuts for Geany." msgstr "Zeige eine Übersicht mit allen Tastenkürzeln für Geany." -#: src/interface.c:674 +#: src/interface.c:679 msgid "_Website" msgstr "_Webseite" -#: src/interface.c:697 +#: src/interface.c:702 msgid "Create a new file" msgstr "Neue Datei anlegen" -#: src/interface.c:702 +#: src/interface.c:707 msgid "Open an existing file" msgstr "Öffnet eine existierende Datei" -#: src/interface.c:707 +#: src/interface.c:712 msgid "Save the current file" msgstr "Speichert die aktuelle Datei" -#: src/interface.c:712 +#: src/interface.c:717 msgid "Save all open files" msgstr "Speichere alle offenen Dateien" -#: src/interface.c:717 +#: src/interface.c:726 msgid "Reload the current file from disk" msgstr "Liest die aktuelle Datei neu ein." -#: src/interface.c:722 +#: src/interface.c:731 msgid "Close the current file" msgstr "Schließt die aktuelle Datei" -#: src/interface.c:731 +#: src/interface.c:739 +#: src/keybindings.c:150 +msgid "Compile" +msgstr "Kompilieren" + +#: src/interface.c:742 msgid "Compile the current file" msgstr "Kompiliert die aktuelle Datei" -#: src/interface.c:735 src/keybindings.c:126 +#: src/interface.c:746 +#: src/keybindings.c:158 msgid "Run" msgstr "Ausführen" -#: src/interface.c:738 src/dialogs.c:560 +#: src/interface.c:749 +#: src/dialogs.c:561 msgid "Run or view the current file" msgstr "Aktuelle Datei anzeigen oder ausführen" -#: src/interface.c:746 +#: src/interface.c:757 msgid "Color" msgstr "Farbwähler" -#: src/interface.c:758 +#: src/interface.c:769 msgid "Zoom in the text" msgstr "Text vergrößern" -#: src/interface.c:763 +#: src/interface.c:774 msgid "Zoom out the text" msgstr "Text verkleinern" -#: src/interface.c:776 src/interface.c:781 +#: src/interface.c:787 +#: src/interface.c:792 msgid "Find the entered text in the current file" msgstr "Findet den eingegebenen Text im aktuellen Dokument" -#: src/interface.c:794 +#: src/interface.c:805 msgid "Enter a line number and jump to it." msgstr "Geben Sie die Zeile an, zu der Sie springen möchten." -#: src/interface.c:801 +#: src/interface.c:812 msgid "Jump to the entered line number." msgstr "Springe zu angegebener Zeile" -#: src/interface.c:846 src/treeviews.c:40 +#: src/interface.c:848 +#: src/treeviews.c:40 msgid "Symbols" msgstr "Symbole" -#: src/interface.c:859 src/treeviews.c:180 +#: src/interface.c:861 +#: src/treeviews.c:180 msgid "Open files" msgstr "Geöffnete Dateien" -#: src/interface.c:894 +#: src/interface.c:896 msgid "Status" msgstr "Status" -#: src/interface.c:908 +#: src/interface.c:910 msgid "Compiler" msgstr "Compiler" -#: src/interface.c:922 +#: src/interface.c:924 msgid "Messages" msgstr "Meldungen" -#: src/interface.c:935 +#: src/interface.c:937 msgid "Scribble" msgstr "Notizen" -#: src/interface.c:1366 +#: src/interface.c:1371 msgid "Images and text" msgstr "Icons und Text" -#: src/interface.c:1372 +#: src/interface.c:1377 msgid "Images only" msgstr "Nur Icons" -#: src/interface.c:1378 +#: src/interface.c:1383 msgid "Text only" msgstr "Nur Text" -#: src/interface.c:1389 +#: src/interface.c:1394 msgid "Large icons" msgstr "Große Symbole" -#: src/interface.c:1393 +#: src/interface.c:1398 msgid "Small icons" msgstr "Kleine Symbole" -#: src/interface.c:1402 +#: src/interface.c:1407 msgid "Hide toolbar" msgstr "Toolbar verbergen" -#: src/interface.c:1573 +#: src/interface.c:1578 msgid "Inserts a typical ChangeLog entry in the current " msgstr "ChangeLog-Eintrag hinzufügen" -#: src/interface.c:1620 +#: src/interface.c:1625 msgid "Find usage" msgstr "Auftreten finden" -#: src/interface.c:1628 -msgid "Go to tag declaration" -msgstr "Gehe zu Tag Deklaration" - -#: src/interface.c:1632 +#: src/interface.c:1633 +#: src/keybindings.c:190 msgid "Go to tag definition" msgstr "Gehe zu Tag Definition" -#: src/interface.c:1641 src/dialogs.c:763 src/keybindings.c:113 +#: src/interface.c:1637 +#: src/keybindings.c:192 +msgid "Go to tag declaration" +msgstr "Gehe zu Tag Deklaration" + +#: src/interface.c:1646 +#: src/dialogs.c:764 +#: src/keybindings.c:130 msgid "Go to line" msgstr "Gehe zu Zeile" -#: src/interface.c:1644 +#: src/interface.c:1649 msgid "Goto to the entered line" msgstr "Springe zu angegebener Zeile" -#: src/interface.c:1889 src/keybindings.c:109 +#: src/interface.c:1895 +#: src/keybindings.c:122 msgid "Preferences" msgstr "Einstellungen" -#: src/interface.c:1925 -msgid "MRU list length:" +#: src/interface.c:1931 +msgid "Recent files list length:" msgstr "Anzahl der \"Zuletzt geöffneten\" Dateien" -#: src/interface.c:1933 -msgid "" -"Specifies the number of files which are stored in the Recent files list." +#: src/interface.c:1939 +msgid "Specifies the number of files which are stored in the Recent files list." msgstr "Gibt die Länge der Liste von Dateien an, die zuletzt geöffnet wurden." -#: src/interface.c:1937 +#: src/interface.c:1943 msgid "Load files from the last session" msgstr "Dateien aus der letzten Sitzung laden" -#: src/interface.c:1941 +#: src/interface.c:1947 msgid "Opens at startup the files from the last session" msgstr "Lädt die geöffneten Dateien aus der letzten Sitzung" -#: src/interface.c:1944 +#: src/interface.c:1950 msgid "Save window position and geometry" msgstr "Fensterposition und -größe speichern" -#: src/interface.c:1948 +#: src/interface.c:1954 msgid "Saves the window position and geometry and restores it at the start" msgstr "Speichert die Fensterposition und -größe" -#: src/interface.c:1951 +#: src/interface.c:1957 msgid "Beep on errors or when compilation has finished" msgstr "Bei Fehlern oder beendeter Kompilierung Piepton ausgeben" -#: src/interface.c:1954 -msgid "" -"Whether to beep if an error occured or when the compilation process has " -"finished." -msgstr "" -"Soll bei Fehlern oder beendeter Kompilierung ein Piepton ausgegeben werden?" +#: src/interface.c:1960 +msgid "Whether to beep if an error occured or when the compilation process has finished." +msgstr "Soll bei Fehlern oder beendeter Kompilierung ein Piepton ausgegeben werden?" -#: src/interface.c:1957 +#: src/interface.c:1963 msgid "Switch to status message list at new message" msgstr "Wechsele zum Statusmeldungsfenster bei neuer Meldung" -#: 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 "" -"Automatisch zu dem Statusmeldungs-Reiter im unteren Fenster wechseln, wenn " -"eine neue Statusmeldung vorliegt." +#: src/interface.c:1966 +msgid "Switch to the status message tab(in the notebook window at the bottom) if a new status message arrive." +msgstr "Automatisch zu dem Statusmeldungs-Reiter im unteren Fenster wechseln, wenn eine neue Statusmeldung vorliegt." -#: src/interface.c:1963 +#: src/interface.c:1969 msgid "Load virtual terminal emulation at startup" msgstr "Starte die Virtual Terminal Emulation beim Starten" -#: 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 "" -"Stellt ein, ob die Virtual Terminal Emulation beim Starten geladen werden " -"soll oder nicht. Wenn sie nicht benötigt wird, sollte dieser Punkt " -"deaktiviert werden" +#: src/interface.c:1971 +msgid "Whether the virtual terminal emulation(VTE) should be loaded at startup. Disable it if you do not need it." +msgstr "Stellt ein, ob die Virtual Terminal Emulation beim Starten geladen werden soll oder nicht. Wenn sie nicht benötigt wird, sollte dieser Punkt deaktiviert werden" -#: src/interface.c:1968 +#: src/interface.c:1974 msgid "Confirm exit" msgstr "Beenden bestätigen" -#: src/interface.c:1972 +#: src/interface.c:1978 msgid "Shows a confirmation dialog on exit." msgstr "Zeigt einen Bestätigungsdialog vor dem Beenden." -#: src/interface.c:1979 +#: src/interface.c:1985 msgid "Placement of new file tabs: " msgstr "Platzierung neuer Dateien:" -#: src/interface.c:1983 +#: src/interface.c:1989 msgid "Left" msgstr "Links" -#: src/interface.c:1986 +#: src/interface.c:1992 msgid "New file tabs will be placed to the left of the tab list" msgstr "Neue Dateien werden links von der Datei-Liste platziert." -#: src/interface.c:1995 +#: src/interface.c:2001 msgid "Right" msgstr "Rechts" -#: src/interface.c:1998 +#: src/interface.c:2004 msgid "New file tabs will be placed to the right of the tab list" msgstr "Neue Dateien werden rechts von der Datei-Liste platziert." -#: src/interface.c:2002 src/interface.c:2327 +#: src/interface.c:2008 +#: src/interface.c:2339 msgid "Miscellaneous" msgstr "Verschiedenes" -#: src/interface.c:2026 +#: src/interface.c:2032 msgid "Show search field" msgstr "Zeige Such-Feld" -#: src/interface.c:2030 +#: src/interface.c:2036 msgid "Display the search field and button in the toolbar" msgstr "Zeige das Suchfeld in der Werkzeugleiste" -#: src/interface.c:2033 +#: src/interface.c:2039 msgid "Show goto line field" msgstr "Zeilennummereingabefeld anzeigen" -#: src/interface.c:2037 +#: src/interface.c:2043 msgid "Display the line number field and button in the toolbar" msgstr "Zeige das Zeilennummereingabefeld in der Werkzeugleiste" -#: src/interface.c:2040 +#: src/interface.c:2046 msgid "Toolbar" msgstr "Werkzeugleiste" -#: src/interface.c:2064 +#: src/interface.c:2070 msgid "Show symbol list" msgstr "Symbol-Ansicht anzeigen" -#: src/interface.c:2067 src/interface.c:2073 +#: src/interface.c:2073 +#: src/interface.c:2079 msgid "Toggle the symbol list on and off" msgstr "Schaltet die Symbol-Ansicht ein und aus." -#: src/interface.c:2070 +#: src/interface.c:2076 msgid "Show open files list" msgstr "Zeige Liste mit geöffneten Dateien" -#: src/interface.c:2076 +#: src/interface.c:2082 msgid "Sidebar" msgstr "Seitenleiste" -#: src/interface.c:2102 +#: src/interface.c:2108 msgid "Symbol list font" msgstr "Schriftart der Symbol-Liste" -#: src/interface.c:2109 +#: src/interface.c:2115 msgid "Message window font" msgstr "Schriftart des Meldungsfenster" -#: src/interface.c:2121 +#: src/interface.c:2127 msgid "Sets the font for the message window" msgstr "Ändert die Schriftart für das Meldungsfenster" -#: src/interface.c:2129 +#: src/interface.c:2135 msgid "Sets the font for symbol list window" msgstr "Ändert die Schriftart für die Symbol-Ansicht" -#: src/interface.c:2132 +#: src/interface.c:2138 msgid "Fonts" msgstr "Schriftarten" -#: src/interface.c:2137 +#: src/interface.c:2143 msgid "General" msgstr "Allgemein" -#: src/interface.c:2165 +#: src/interface.c:2171 msgid "Tab Width" msgstr "Tabulator-Breite" -#: src/interface.c:2178 +#: src/interface.c:2184 msgid "The width in chars, which one tab character will take" msgstr "Die Breite in Zeichen, die ein Tabalutar-Zeichen einnimmt" -#: src/interface.c:2183 +#: src/interface.c:2189 msgid "New files" msgstr "Neue Dateien" -#: src/interface.c:2202 +#: src/interface.c:2208 msgid "Strip trailing spaces" msgstr "Leerzeichen am Zeilenende entfernen" -#: src/interface.c:2206 +#: src/interface.c:2212 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Entfernt Leerzeichen an Zeilenenden" -#: src/interface.c:2209 +#: src/interface.c:2215 msgid "Ensure new line at file end" msgstr "Neue Zeile am Dateiende" -#: src/interface.c:2213 +#: src/interface.c:2219 msgid "Ensures that at the end of the file is a new line" msgstr "Fügt am Dateiende eine neue Zeile an (wenn keine vorhanden ist)" -#: src/interface.c:2216 +#: src/interface.c:2222 msgid "Saving files" msgstr "Speichern" -#: src/interface.c:2235 -msgid "Show indention guides" +#: src/interface.c:2241 +msgid "Show indentation guides" msgstr "Zeige Einrückungshinweise" -#: src/interface.c:2238 -msgid "Shows small dotted lines to help you to use the right indention." -msgstr "" -"Blendet kleine punktierte Linien ein, um die Einrückung zu erleichtern." +#: src/interface.c:2244 +msgid "Shows small dotted lines to help you to use the right indentation." +msgstr "Blendet punktierte Linien ein, um die Einrückung zu erleichtern." -#: src/interface.c:2241 +#: src/interface.c:2247 msgid "Show white space" msgstr "Zeige Leerzeichen" -#: src/interface.c:2244 +#: src/interface.c:2250 msgid "Marks spaces with dots and tabs with arrows." msgstr "Markiert Leerzeichen mit Punkten und Tabulatoren mit kleinen Pfeilen." -#: src/interface.c:2247 +#: src/interface.c:2253 msgid "Show line endings" msgstr "Zeilenenden anzeigen" -#: src/interface.c:2250 +#: src/interface.c:2256 msgid "Show the line ending character" msgstr "Zeilenende-Zeichen anzeigen" -#: src/interface.c:2253 +#: src/interface.c:2259 msgid "XML tag auto completion" msgstr "XML-Tag Autovervollständigung" -#: src/interface.c:2256 +#: src/interface.c:2262 msgid "Automatic completion of open XML tags(includes HTML tags)" -msgstr "" -"Autovervollständigung von offenen XML-Tags, das schließt auch HTML-Tags ein." +msgstr "Autovervollständigung von offenen XML-Tags, das schließt auch HTML-Tags ein." -#: src/interface.c:2259 +#: src/interface.c:2265 msgid "Construct auto completion" msgstr "Autovervollständigung von Konstrukten" -#: src/interface.c:2262 +#: src/interface.c:2268 msgid "Automatic completion of often used constructs like if and for" -msgstr "" -"Autovervollständigung von häufig benutzten Konstrukten wie if, for und " -"switch." +msgstr "Autovervollständigung von häufig benutzten Konstrukten wie if, for und switch." -#: src/interface.c:2265 +#: src/interface.c:2271 msgid "Enable folding" msgstr "Code-Ausblendung aktivieren" -#: src/interface.c:2268 +#: src/interface.c:2274 msgid "Whether to enable folding the code" msgstr "Soll Code-Ausblendung aktiviert werden?" -#: src/interface.c:2281 +#: src/interface.c:2277 +msgid "Use indicators to show compile errors" +msgstr "Benutzt Markierungen, um Probleme beim Kompilieren anzuzeigen. " + +#: src/interface.c:2280 +msgid "Whether to use indicators(a squiggly underline) to highlight the lines, where the compiler found a warning or an error." +msgstr "Benutzt Markierungen (wellige Unterstreichungen) um die Zeilen zu markieren, in denen Fehler beim Kompilieren aufgetreten sind. " + +#: src/interface.c:2293 msgid "Editor font" msgstr "Editor-Schriftart" -#: src/interface.c:2288 +#: src/interface.c:2300 msgid "Long line marker" msgstr "Long line marker" -#: src/interface.c:2295 +#: src/interface.c:2307 msgid "Long line marker color" msgstr "Long line marker color" -#: src/interface.c:2307 +#: src/interface.c:2319 msgid "Sets the font for the editors windows" msgstr "Ändert die Schriftart des Editors" -#: 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 "" -"Der \"long line marker\" ist eine dünne Linie im Editorfenster. Sie hilft " -"dabei, lange Zeilen zu markieren und dabei auf einen eventuell notwendigen " -"Zeilenumbruch hinzuweißen. Um sie zu deaktivieren, setzen Sie den Wert auf " -"0. Werte größer als 0 geben hingegen die Spalte an, in der die Linie " -"angezeigt werden soll. " +#: src/interface.c:2327 +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 "Der \"long line marker\" ist eine dünne Linie im Editorfenster. Sie hilft dabei, lange Zeilen zu markieren und dabei auf einen eventuell notwendigen Zeilenumbruch hinzuweißen. Um sie zu deaktivieren, setzen Sie den Wert auf 0. Werte größer als 0 geben hingegen die Spalte an, in der die Linie angezeigt werden soll. " -#: src/interface.c:2324 +#: src/interface.c:2336 msgid "Sets the color of the long line marker" msgstr "Stellt die Farbe des \"long line markers\" ein." -#: src/interface.c:2325 src/dialogs.c:477 src/dialogs.c:1706 -#: src/dialogs.c:1713 +#: src/interface.c:2337 +#: src/dialogs.c:478 +#: src/dialogs.c:1707 +#: src/dialogs.c:1714 msgid "Color Chooser" msgstr "Farb-Wähler" -#: src/interface.c:2332 +#: src/interface.c:2344 msgid "Editor" msgstr "Editor" -#: src/interface.c:2340 +#: src/interface.c:2352 msgid "" "Enter here the paths to the make tool and the compiler\n" "(tools you do not need can be let blank)" @@ -798,39 +814,37 @@ "Geben Sie hier die Pfade für make und die Compiler an\n" "(Programme, die nicht benötigt werden, können Sie frei lassen)" -#: src/interface.c:2351 +#: src/interface.c:2363 msgid "Make" msgstr "Make" -#: src/interface.c:2358 src/dialogs.c:1756 src/vte.c:163 +#: src/interface.c:2370 +#: src/dialogs.c:1757 +#: src/vte.c:163 msgid "Terminal" msgstr "Terminal" -#: src/interface.c:2365 +#: src/interface.c:2377 msgid "Browser" msgstr "Browser" -#: src/interface.c:2377 +#: src/interface.c:2389 msgid "Path and options for the make tool" msgstr "Pfad und spezielle Optionen und / oder Targets für \"make\" angeben." -#: src/interface.c:2384 -msgid "" -"A terminal emulator like xterm, gnome-terminal or konsole (should accept the " -"-e argument)" -msgstr "" -"Ein Terminal-Emulator wie z.B. xterm, gnome-terminal oder konsole (es sollte " -"die Option -e akzeptieren)" +#: src/interface.c:2396 +msgid "A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)" +msgstr "Ein Terminal-Emulator wie z.B. xterm, gnome-terminal oder konsole (es sollte die Option -e akzeptieren)" -#: src/interface.c:2391 +#: src/interface.c:2403 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Pfad und evtl. Argumente zu Ihrem Lieblingsbrowser" -#: src/interface.c:2423 +#: src/interface.c:2435 msgid "Tools" msgstr "Werkzeuge" -#: src/interface.c:2431 +#: src/interface.c:2443 msgid "" "Specify here information you want to use in templates.\n" "See documentation if you don't know, how templates work." @@ -838,47 +852,47 @@ "Geben Sie hier die Informationen an, die in Vorlagen benutzt werden sollen.\n" "Konsultieren Sie die Dokumentation, um mehr über Vorlagen zu erfahren." -#: src/interface.c:2447 +#: src/interface.c:2459 msgid "email address of the developer" msgstr "eMail-Adresse des Entwicklers" -#: src/interface.c:2454 +#: src/interface.c:2466 msgid "Initials of the developer name" msgstr "Initialen des Entwicklernames" -#: src/interface.c:2456 +#: src/interface.c:2468 msgid "Initial Version" msgstr "Anfangsversion" -#: src/interface.c:2468 +#: src/interface.c:2480 msgid "Version number, which a new file initially has" msgstr "Versionsnummer, die eine neue Datei zu Beginn hat" -#: src/interface.c:2475 +#: src/interface.c:2487 msgid "Company name" msgstr "Firmenname" -#: src/interface.c:2477 +#: src/interface.c:2489 msgid "Developer" msgstr "Entwickler" -#: src/interface.c:2484 +#: src/interface.c:2496 msgid "Company" msgstr "Firma" -#: src/interface.c:2491 +#: src/interface.c:2503 msgid "Mail address" msgstr "Mail-Adresse" -#: src/interface.c:2498 +#: src/interface.c:2510 msgid "Initials" msgstr "Initialen" -#: src/interface.c:2510 +#: src/interface.c:2522 msgid "The name of the developer" msgstr "Der Name des Entwicklers" -#: src/interface.c:2512 +#: src/interface.c:2524 msgid "" "Notice: For all changes you make here,\n" "you need to restart Geany to take effect." @@ -886,35 +900,28 @@ "Hinweis: Sie müssen Geany neustarten,\n" "wenn Sie hier Änderungen vornehmen." -#: src/interface.c:2516 +#: src/interface.c:2528 msgid "Templates" msgstr "Vorlagen" -#: 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 "" -"Hier können die Tastenkominationen für verschiedene Aktionen innerhalb " -"Geanys festgelegt bzw. verändert werden. Um die Tastenkombinationen zu " -"ändern, einfach Doppelklicken oder markieren und auf Ändern klicken. Zudem " -"können die Tastenkombinationen auch direkt eingegeben werden. " +#: src/interface.c:2536 +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 "Hier können die Tastenkominationen für verschiedene Aktionen innerhalb Geanys festgelegt bzw. verändert werden. Um die Tastenkombinationen zu ändern, einfach Doppelklicken oder markieren und auf Ändern klicken. Zudem können die Tastenkombinationen auch direkt eingegeben werden. " -#: src/interface.c:2547 +#: src/interface.c:2559 msgid "Change" msgstr "Ändern" -#: src/interface.c:2551 +#: src/interface.c:2563 msgid "Keybindings" msgstr "Tastenkürzel" -#: src/callbacks.c:209 src/callbacks.c:224 +#: src/callbacks.c:210 +#: src/callbacks.c:225 msgid "Do you really want to quit?" msgstr "Möchten Sie wirklich beenden?" -#: src/callbacks.c:459 +#: src/callbacks.c:460 #, c-format msgid "" "Are you sure you want to reload '%s'?\n" @@ -923,84 +930,88 @@ "Sind Sie sicher, dass Sie '%s' neuladen möchten?\n" "Alle ungespeicherten Änderungen gehen verloren." -#: src/callbacks.c:849 +#: src/callbacks.c:850 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Die Datei '%s' existiert bereits. Möchten Sie sie überschreiben?" -#: src/callbacks.c:1330 src/callbacks.c:1339 +#: src/callbacks.c:1313 +#: src/callbacks.c:1322 #, c-format msgid "Declaration or definition of \"%s()\" not found" msgstr "Deklaration oder Definition von '%s' nicht gefunden." -#: src/callbacks.c:1648 +#: src/callbacks.c:1634 msgid "Failed to execute the view program" msgstr "Konnte das Anzeigeprogramm nicht ausführen" -#: src/callbacks.c:1656 +#: src/callbacks.c:1645 msgid "Failed to execute the terminal program" msgstr "Konnte das Terminal-Programm nicht ausführen" #. initialize the dialog -#: src/callbacks.c:1979 src/dialogs.c:69 +#: src/callbacks.c:1968 +#: src/dialogs.c:70 msgid "Open File" msgstr "Datei öffnen" -#: 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." +#: src/callbacks.c:2017 +#: src/callbacks.c:2062 +#: src/callbacks.c:2102 +#: src/callbacks.c:2162 +msgid "Please set the filetype for the current file before using this function." msgstr "Bitte legen Sie den Dateityp fest, bevor Sie diese Funktion benutzen. " -#: src/support.c:90 src/support.c:114 +#: src/support.c:90 +#: src/support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "Konnte PixMap %s nicht finden." -#: 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 "" -"Öffnet die Datei als schreibgeschützt. Wenn Sie mehrere Dateien wählen, " -"werden alle schreibgeschützt geöffnet." +#: src/dialogs.c:75 +msgid "Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only." +msgstr "Öffnet die Datei als schreibgeschützt. Wenn Sie mehrere Dateien wählen, werden alle schreibgeschützt geöffnet." -#: src/dialogs.c:110 +#: src/dialogs.c:111 msgid "Detect by file extension " msgstr "Durch Dateiendung erkennen" -#: src/dialogs.c:163 +#: src/dialogs.c:164 msgid "Save File" msgstr "Datei speichern" -#: src/dialogs.c:215 +#: src/dialogs.c:216 #, c-format msgid "There is a limit of %d concurrent open tabs." msgstr "Es dürfen maximal %d Datei gleichzeitg geöffnet sein." -#: src/dialogs.c:216 +#: src/dialogs.c:217 msgid "error: too many open files" msgstr "Fehler: zu viele offene Dateien" -#: src/dialogs.c:239 +#: src/dialogs.c:240 #, c-format msgid "The match \"%s\" was not found. Wrap search around the document?" msgstr "\"%s\" wurde nicht gefunden. Am Anfang des Dokumentes beginnen?" -#: src/dialogs.c:242 src/dialogs.c:1824 +#: src/dialogs.c:243 +#: src/dialogs.c:1825 msgid "Question" msgstr "Frage" -#: src/dialogs.c:271 +#: src/dialogs.c:272 msgid "Information" msgstr "Information" -#: src/dialogs.c:296 src/dialogs.c:328 src/dialogs.c:1267 src/win32.c:217 +#: src/dialogs.c:297 +#: src/dialogs.c:329 +#: src/dialogs.c:1268 +#: src/win32.c:217 #: src/win32.c:378 msgid "Error" msgstr "Fehler" -#: src/dialogs.c:320 +#: src/dialogs.c:321 #, c-format msgid "" "The file '%s' is not saved.\n" @@ -1009,7 +1020,7 @@ "%s ist nicht gespeichert.\n" "Möchten Sie die Datei vor dem Beenden speichern?" -#: src/dialogs.c:325 +#: src/dialogs.c:326 msgid "" "The file is not saved.\n" "Do you want to save it before closing?" @@ -1017,27 +1028,27 @@ "Die Datei ist nicht gespeichert.\n" "Möchten Sie die Datei vor dem Beenden speichern?" -#: src/dialogs.c:342 +#: src/dialogs.c:343 msgid "Don't save" msgstr "Nicht speichern" -#: src/dialogs.c:394 +#: src/dialogs.c:395 msgid "Choose font" msgstr "Schriftart auswählen" -#: src/dialogs.c:433 +#: src/dialogs.c:434 msgid "Word Count" msgstr "Wörter zählen" -#: src/dialogs.c:442 +#: src/dialogs.c:443 msgid "selection" msgstr "Auswahl" -#: src/dialogs.c:450 +#: src/dialogs.c:451 msgid "whole document" msgstr "Ganzes Dokument" -#: src/dialogs.c:452 +#: src/dialogs.c:453 #, c-format msgid "" "Range:\t\t%s\n" @@ -1053,163 +1064,170 @@ "Zeichen:\t\t%d\n" #. compile the code -#: src/dialogs.c:505 +#: src/dialogs.c:506 msgid "_Compile" msgstr "_Kompilieren" -#: src/dialogs.c:508 +#: src/dialogs.c:509 msgid "Compiles the current file" msgstr "Kompiliert die aktuelle Datei" -#: src/dialogs.c:525 +#: src/dialogs.c:526 msgid "Builds the current file (generate an executable file)" msgstr "Erstellt die aktuelle Datei(erzeugt eine ausführbare Datei)" #. build the code with make all -#: src/dialogs.c:534 src/dialogs.c:631 src/keybindings.c:124 +#: src/dialogs.c:535 +#: src/dialogs.c:632 +#: src/keybindings.c:154 msgid "Build with \"make\"" msgstr "Mit \"make\" erstellen" -#: src/dialogs.c:537 src/dialogs.c:634 +#: src/dialogs.c:538 +#: src/dialogs.c:635 msgid "Builds the current file with the make tool and the default target" msgstr "Erstellt die aktuelle Datei mit \"make\" und dem Default-Target" #. build the code with make -#: src/dialogs.c:545 +#: src/dialogs.c:546 msgid "Build with \"_make\" (custom _target)" msgstr "Mit \"make\" erstellen (eigenes Target angeben)" -#: src/dialogs.c:551 src/dialogs.c:648 +#: src/dialogs.c:552 +#: src/dialogs.c:649 msgid "Builds the current file with the make tool and the specified target" msgstr "Erstellt die aktuelle Datei mit \"make\" und dem angegebenem Target" -#: src/dialogs.c:577 src/dialogs.c:1105 +#: src/dialogs.c:578 +#: src/dialogs.c:1106 msgid "Set Includes and Arguments" msgstr "Programm-Parameter angeben" -#: src/dialogs.c:584 -msgid "" -"Sets the includes and library paths for the compiler and the program " -"arguments for execution" -msgstr "" -"Include-Dateien und Bibliotheken-Pfade sowie Programmparameter festlegen" +#: src/dialogs.c:585 +msgid "Sets the includes and library paths for the compiler and the program arguments for execution" +msgstr "Include-Dateien und Bibliotheken-Pfade sowie Programmparameter festlegen" #. DVI -#: src/dialogs.c:605 +#: src/dialogs.c:606 msgid "LaTeX -> DVI" msgstr "LaTeX -> DVI" -#: src/dialogs.c:608 +#: src/dialogs.c:609 msgid "Compiles the current file into a DVI file" msgstr "Kompiliert die aktuelle Datei als DVI-Datei" #. PDF -#: src/dialogs.c:618 +#: src/dialogs.c:619 msgid "LaTeX -> PDF" msgstr "LaTeX -> PDF" -#: src/dialogs.c:621 +#: src/dialogs.c:622 msgid "Compiles the current file into a PDF file" msgstr "Kompiliert die aktuelle Datei als PDF-Datei" #. build the code with make -#: src/dialogs.c:642 +#: src/dialogs.c:643 msgid "Build with make (custom target)" msgstr "Mit \"make\" erstellen (eigenes Target angeben)" #. DVI view -#: src/dialogs.c:653 +#: src/dialogs.c:654 msgid "View DVI file" msgstr "DVI-Datei anzeigen" -#: src/dialogs.c:659 src/dialogs.c:672 +#: src/dialogs.c:660 +#: src/dialogs.c:673 msgid "Compiles and view the current file" msgstr "Kompiliert und zeigt die aktuelle Datei an" #. PDF view -#: src/dialogs.c:666 +#: src/dialogs.c:667 msgid "View PDF file" msgstr "PDF-Datei anzeigen" #. arguments -#: src/dialogs.c:685 src/dialogs.c:998 +#: src/dialogs.c:686 +#: src/dialogs.c:999 msgid "Set Arguments" msgstr "Programm-Parameter angeben" -#: src/dialogs.c:692 +#: src/dialogs.c:693 msgid "Sets the program paths and arguments" msgstr "Programm-Parameter angeben" -#: src/dialogs.c:733 +#: src/dialogs.c:734 msgid "Enter custom options for the make tool" msgstr "Spezielle Optionen / Targets für \"make\" angeben." -#: src/dialogs.c:738 -msgid "" -"Enter custom options here, all entered text is passed to the make command." +#: src/dialogs.c:739 +msgid "Enter custom options here, all entered text is passed to the make command." msgstr "Alles was Sie hier angeben, wird direkt an \"make\" übergeben." -#: src/dialogs.c:768 +#: src/dialogs.c:769 msgid "Enter the line you want to go to" msgstr "Geben Sie die Zeile an, zu der Sie springen möchten" -#: src/dialogs.c:800 +#: src/dialogs.c:801 msgid "Find" msgstr "Suchen" -#: src/dialogs.c:805 src/dialogs.c:911 +#: src/dialogs.c:806 +#: src/dialogs.c:912 msgid "Enter the search text here" msgstr "Geben Sie hier den Suchbegriff ein" -#: src/dialogs.c:826 src/dialogs.c:944 +#: src/dialogs.c:827 +#: src/dialogs.c:945 msgid "_Case sensitive" msgstr "Groß- / Kleinschreibung beachten" -#: src/dialogs.c:831 src/dialogs.c:949 +#: src/dialogs.c:832 +#: src/dialogs.c:950 msgid "Match only a _whole word" msgstr "Nur ganze Wörter finden" -#: src/dialogs.c:836 src/dialogs.c:954 +#: src/dialogs.c:837 +#: src/dialogs.c:955 msgid "_Use regular expressions" msgstr "Reguläre Ausdrücke benutzen" -#: src/dialogs.c:841 src/dialogs.c:959 -msgid "" -"For detailed information about using regular expressions, please read the " -"documentation." -msgstr "" -"Für weitere Informationen über reguläre Ausdrücke lesen Sie bitte die " -"Dokumentation." +#: src/dialogs.c:842 +#: src/dialogs.c:960 +msgid "For detailed information about using regular expressions, please read the documentation." +msgstr "Für weitere Informationen über reguläre Ausdrücke lesen Sie bitte die Dokumentation." -#: src/dialogs.c:843 src/dialogs.c:961 +#: src/dialogs.c:844 +#: src/dialogs.c:962 msgid "_Search backwards" msgstr "Rückwärts suchen" -#: src/dialogs.c:848 src/dialogs.c:966 +#: src/dialogs.c:849 +#: src/dialogs.c:967 msgid "Match only word s_tart" msgstr "Nur Wort_anfänge finden" -#: src/dialogs.c:893 src/keybindings.c:112 +#: src/dialogs.c:894 +#: src/keybindings.c:128 msgid "Replace" msgstr "Ersetzen" -#: src/dialogs.c:896 +#: src/dialogs.c:897 msgid "_In Selection" msgstr "_Auswahl ersetzen" -#: src/dialogs.c:898 +#: src/dialogs.c:899 msgid "Replace all matches found in the currently selected text" msgstr "Ersetze alle Treffer im aktuell markierten Text" -#: src/dialogs.c:902 +#: src/dialogs.c:903 msgid "Replace _All" msgstr "_Alle ersetzen" -#: src/dialogs.c:915 +#: src/dialogs.c:916 msgid "Enter the replace text here" msgstr "Geben Sie hier den Ersetzungstext ein" -#: src/dialogs.c:1003 +#: src/dialogs.c:1004 msgid "" "Set programs and options for compilation and viewing (La)TeX files.\n" "The filename is appended automatically at the end.\n" @@ -1217,42 +1235,33 @@ "Set programs and options for compilation and viewing (La)TeX files.\n" "The filename is appended automatically at the end.\n" -#: src/dialogs.c:1011 -msgid "" -"Enter here the (La)TeX command (for DVI creation) and some useful options." -msgstr "" -"Geben Sie hier den Befehl und dessen Optionen, für die DVI-Erzeugung, an." +#: src/dialogs.c:1012 +msgid "Enter here the (La)TeX command (for DVI creation) and some useful options." +msgstr "Geben Sie hier den Befehl und dessen Optionen, für die DVI-Erzeugung, an." -#: src/dialogs.c:1032 -msgid "" -"Enter here the (La)TeX command (for PDF creation) and some useful options." -msgstr "" -"Geben Sie hier den Befehl und dessen Optionen, für die PDF-Erzeugung, an." +#: src/dialogs.c:1033 +msgid "Enter here the (La)TeX command (for PDF creation) and some useful options." +msgstr "Geben Sie hier den Befehl und dessen Optionen, für die PDF-Erzeugung, an." -#: src/dialogs.c:1053 -msgid "" -"Enter here the (La)TeX command (for DVI preview) and some useful options." -msgstr "" -"Geben Sie hier den Befehl und dessen Optionen, für die DVI-Anzeige, an." +#: src/dialogs.c:1054 +msgid "Enter here the (La)TeX command (for DVI preview) and some useful options." +msgstr "Geben Sie hier den Befehl und dessen Optionen, für die DVI-Anzeige, an." -#: src/dialogs.c:1074 -msgid "" -"Enter here the (La)TeX command (for PDF preview) and some useful options." -msgstr "" -"Geben Sie hier den Befehl und dessen Optionen, für die PDF-Anzeige, an." +#: src/dialogs.c:1075 +msgid "Enter here the (La)TeX command (for PDF preview) and some useful options." +msgstr "Geben Sie hier den Befehl und dessen Optionen, für die PDF-Anzeige, an." -#: src/dialogs.c:1110 -msgid "" -"Sets the includes and library paths for the compiler and the program " -"arguments for execution\n" -msgstr "" -"Include-Dateien und Bibliotheken-Pfade sowie Programmparameter festlegen.\n" +#: src/dialogs.c:1111 +msgid "Sets the includes and library paths for the compiler and the program arguments for execution\n" +msgstr "Include-Dateien und Bibliotheken-Pfade sowie Programmparameter festlegen.\n" -#: src/dialogs.c:1119 +#: src/dialogs.c:1120 msgid "Enter here arguments to your compiler." msgstr "Geben Sie hier Paramter für den Compiler an." -#: src/dialogs.c:1125 src/dialogs.c:1148 src/dialogs.c:1172 +#: src/dialogs.c:1126 +#: src/dialogs.c:1149 +#: src/dialogs.c:1173 #, c-format msgid "" "%f will be replaced by the complete filename\n" @@ -1267,36 +1276,32 @@ "%f -> test_datei.c\n" "%e -> test_datei" -#: src/dialogs.c:1142 +#: src/dialogs.c:1143 msgid "Enter here arguments to your linker." msgstr "Geben Sie hier Parameter für den Linker an." #. program-args -#: src/dialogs.c:1166 +#: src/dialogs.c:1167 msgid "Enter here arguments to your program." msgstr "Geben Sie hier Parameter für Ihr Programm an." -#: src/dialogs.c:1211 +#: src/dialogs.c:1212 msgid "Show _hidden files" msgstr "_Versteckte Dateien anzeigen" -#: src/dialogs.c:1228 +#: src/dialogs.c:1229 msgid "Set filetype:" msgstr "Dateityp festlegen:" -#: src/dialogs.c:1231 +#: src/dialogs.c:1232 msgid "" -"Explicitly defines a filetype for the file, if it would not be detected by " -"filename extension.\n" -"Note if you choose multiple files, they will all be opened with the chosen " -"filetype." +"Explicitly defines a filetype for the file, if it would not be detected by filename extension.\n" +"Note if you choose multiple files, they will all be opened with the chosen filetype." msgstr "" -"Definiert explizit einen bestimmten Dateityp, wenn er nicht durch die " -"Dateiendung erkannt wird.\n" -"Beachten Sie, wenn Sie mehrere Dateien auswählen, werden alle mit dem " -"gewählten Dateityp geöffnet." +"Definiert explizit einen bestimmten Dateityp, wenn er nicht durch die Dateiendung erkannt wird.\n" +"Beachten Sie, wenn Sie mehrere Dateien auswählen, werden alle mit dem gewählten Dateityp geöffnet." -#: src/dialogs.c:1263 +#: src/dialogs.c:1264 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -1304,273 +1309,262 @@ "Start %s anyway?" msgstr "" "Konfigurationsverzeichnis konnte nicht erstellt werden (%s).\n" -"Es können einige Probleme in %s ohne ein Konfigurationsverzeichnis " -"auftreten.\n" +"Es können einige Probleme in %s ohne ein Konfigurationsverzeichnis auftreten.\n" "%s trotzdem starten?" -#: src/dialogs.c:1312 -msgid "" -"An error occurred or file information could not be retrieved(e.g. from a new " -"file)." -msgstr "" -"Es ist ein Fehler aufgetreten oder Datei-Informationen konnten nicht gelesen " -"werden(z.B. bei einer neuen Datei)." +#: src/dialogs.c:1313 +msgid "An error occurred or file information could not be retrieved(e.g. from a new file)." +msgstr "Es ist ein Fehler aufgetreten oder Datei-Informationen konnten nicht gelesen werden(z.B. bei einer neuen Datei)." -#: 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:1333 +#: src/dialogs.c:1334 +#: src/dialogs.c:1335 +#: src/dialogs.c:1341 +#: src/dialogs.c:1342 +#: src/dialogs.c:1343 +#: src/utils.c:119 +#: src/utils.c:120 +#: src/utils.c:1041 msgid "unknown" msgstr "unbekannt" -#: src/dialogs.c:1346 +#: src/dialogs.c:1347 msgid "Properties" msgstr "Eigenschaften" -#: src/dialogs.c:1374 +#: src/dialogs.c:1375 msgid "Type:" msgstr "Dateityp:" -#: src/dialogs.c:1387 +#: src/dialogs.c:1388 msgid "Size:" msgstr "Größe:" -#: src/dialogs.c:1402 +#: src/dialogs.c:1403 msgid "Location:" msgstr "Ort:" -#: src/dialogs.c:1415 +#: src/dialogs.c:1416 msgid "Read-only:" msgstr "Schreibgeschützt:" -#: src/dialogs.c:1422 +#: src/dialogs.c:1423 msgid "(only inside Geany)" msgstr "(nur innerhalb von Geany)" -#: src/dialogs.c:1431 +#: src/dialogs.c:1432 msgid "Encoding:" msgstr "Kodierung:" -#: src/dialogs.c:1444 +#: src/dialogs.c:1445 msgid "Modified:" msgstr "Modifiziert:" -#: src/dialogs.c:1457 +#: src/dialogs.c:1458 msgid "Changed:" msgstr "Geändert:" -#: src/dialogs.c:1470 +#: src/dialogs.c:1471 msgid "Accessed:" msgstr "Zugriff:" #. Header -#: src/dialogs.c:1499 +#: src/dialogs.c:1500 msgid "Read:" msgstr "Lesen" -#: src/dialogs.c:1506 +#: src/dialogs.c:1507 msgid "Write:" msgstr "Schreiben:" -#: src/dialogs.c:1513 +#: src/dialogs.c:1514 msgid "Execute:" msgstr "Ausführen:" #. Owner -#: src/dialogs.c:1521 +#: src/dialogs.c:1522 msgid "Owner:" msgstr "Eigentümer:" #. Group -#: src/dialogs.c:1557 +#: src/dialogs.c:1558 msgid "Group:" msgstr "Gruppe:" #. Other -#: src/dialogs.c:1593 +#: src/dialogs.c:1594 msgid "Other:" msgstr "Andere:" -#: 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 "" -"Hier sehen Sie Einstellungen für die Terminalemulation (VTE). Änderungen " -"werden nur wirksam, wenn die VTE-Bibliothek geladen werden konnte." +#: src/dialogs.c:1662 +msgid "These are settings for the virtual terminal emulator widget (VTE). They only apply, if the VTE library could be loaded." +msgstr "Hier sehen Sie Einstellungen für die Terminalemulation (VTE). Änderungen werden nur wirksam, wenn die VTE-Bibliothek geladen werden konnte." -#: src/dialogs.c:1677 +#: src/dialogs.c:1678 msgid "Terminal font" msgstr "Terminal Schriftart" -#: src/dialogs.c:1687 +#: src/dialogs.c:1688 msgid "Sets the font for the terminal widget." msgstr "Ändert die Schriftart für das Terminal" -#: src/dialogs.c:1689 +#: src/dialogs.c:1690 msgid "Foreground color" msgstr "Vordergrundfarbe" -#: src/dialogs.c:1695 +#: src/dialogs.c:1696 msgid "Background color" msgstr "Hintergrundfarbe" -#: src/dialogs.c:1705 +#: src/dialogs.c:1706 msgid "Sets the foreground color of the text in the terminal widget." msgstr "Setzt die Vordergrundfarbe für Text im Terminal." -#: src/dialogs.c:1712 +#: src/dialogs.c:1713 msgid "Sets the background color of the text in the terminal widget." msgstr "Setzt die Hintergrundfarbe für Text im Terminal." -#: src/dialogs.c:1715 +#: src/dialogs.c:1716 msgid "Scrollback lines" msgstr "Zeilen zum Zurückrollen" -#: src/dialogs.c:1726 -msgid "" -"Specifies the history in lines, which you can scroll back in the terminal " -"widget." +#: src/dialogs.c:1727 +msgid "Specifies the history in lines, which you can scroll back in the terminal widget." msgstr "Gibt die Zeilen an, die man im Terminal zurückscrollen kann." -#: src/dialogs.c:1730 +#: src/dialogs.c:1731 msgid "Terminal emulation" msgstr "Terminalemulation" -#: src/dialogs.c:1740 -msgid "" -"Controls how the terminal emulator should behave. xterm is a good start." -msgstr "" -"Steuert wie sich das Terminal verhalten soll. xterm ist ein guter Startwert." +#: src/dialogs.c:1741 +msgid "Controls how the terminal emulator should behave. xterm is a good start." +msgstr "Steuert wie sich das Terminal verhalten soll. xterm ist ein guter Startwert." -#: src/dialogs.c:1742 +#: src/dialogs.c:1743 msgid "Scroll on keystroke" msgstr "Bei Tastendruck scrollen" -#: src/dialogs.c:1746 +#: src/dialogs.c:1747 msgid "Whether to scroll to the bottom if a key was pressed." msgstr "Ob das Fenster bei Tastendruck bis zum Ende gescrollt werden soll" -#: src/dialogs.c:1749 +#: src/dialogs.c:1750 msgid "Scroll on output" msgstr "Bei Ausgabe scrollen" -#: src/dialogs.c:1753 +#: src/dialogs.c:1754 msgid "Whether to scroll to the bottom if an output was generated." msgstr "Ob das Fenster bei Ausgabe bis zum Ende gescrollt werden soll" -#: src/dialogs.c:1847 +#: src/dialogs.c:1849 msgid "Keyboard shortcuts" msgstr "Tastenkürzel" -#: src/dialogs.c:1852 +#: src/dialogs.c:1856 msgid "The following keyboard shortcuts are defined:" msgstr "Folgende Tastenkürzel sind definiert: " -#: src/document.c:336 +#: src/document.c:335 #, c-format msgid "File %s closed." msgstr "Datei %s wurde geschlossen." -#: src/document.c:389 +#: src/document.c:388 msgid "New file opened." msgstr "Neue Datei geöffnet." -#: src/document.c:430 src/document.c:439 src/document.c:440 +#: src/document.c:429 +#: src/document.c:438 +#: src/document.c:439 msgid "Invalid filename" msgstr "Ungültiger Dateiname" -#: src/document.c:462 +#: src/document.c:461 #, c-format msgid "Could not open file %s (%s)" msgstr "Konnte Datei '%s' nicht öffnen(%s)." -#: src/document.c:495 -msgid "" -"The file does not look like a text file or the file encoding is not " -"supported." -msgstr "" -"Diese Datei scheint keine Textdatei zu sein, oder das Format wird nicht " -"unterstützt." +#: src/document.c:494 +msgid "The file does not look like a text file or the file encoding is not supported." +msgstr "Diese Datei scheint keine Textdatei zu sein, oder das Format wird nicht unterstützt." -#: src/document.c:533 +#: src/document.c:532 #, c-format msgid "File %s reloaded." msgstr "Datei %s neu geladen." -#: src/document.c:559 +#: src/document.c:558 #, c-format msgid "File %s opened(%d%s)." msgstr "Datei %s geöffnet(%d%s)." -#: src/document.c:561 +#: src/document.c:560 msgid ", read-only" msgstr ", schreibgeschützt" -#: src/document.c:601 src/document.c:640 +#: src/document.c:600 +#: src/document.c:639 msgid "Error saving file." msgstr "Fehler beim Speichern der Datei." -#: src/document.c:621 +#: src/document.c:620 #, c-format msgid "Error saving file (%s)." msgstr "Fehler beim Speichern der Datei (%s)." -#: src/document.c:662 +#: src/document.c:661 #, c-format msgid "File %s saved." msgstr "Datei %s wurde gespeichert." -#: src/document.c:913 +#: src/document.c:911 msgid "tag list updating failed" msgstr "Neuladen der Symbol-Liste ist fehlgeschlagen." -#: src/document.c:980 +#: src/document.c:978 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: src/document.c:981 +#: src/document.c:979 msgid "Max (CR)" msgstr "Max (CR)" -#: src/document.c:983 +#: src/document.c:981 msgid "Unix (LF)" msgstr "Unix (LF)" -#: src/utils.c:120 +#: src/utils.c:111 #, c-format -msgid "" -"%c line: % 4d column: % 3d selection: % 4d %s mode: %s%s cur. " -"function: %s encoding: %s filetype: %s" -msgstr "" -"%c Zeile: % 4d Spalte: % 3d Auswahl: % 4d %s Modus: %s%s akt. " -"Funktion: %s Kodierung: %s Dateityp: %s" +msgid "%c line: % 4d column: % 3d selection: % 4d %s mode: %s%s cur. function: %s encoding: %s filetype: %s" +msgstr "%c Zeile: % 4d Spalte: % 3d Auswahl: % 4d %s Modus: %s%s akt. Funktion: %s Kodierung: %s Dateityp: %s" -#: src/utils.c:124 +#: src/utils.c:115 msgid "OVR" msgstr "ÜBER" -#: src/utils.c:124 +#: src/utils.c:115 msgid "INS" msgstr "EINF" -#: src/utils.c:360 +#: src/utils.c:350 #, c-format msgid "Font updated (%s)." msgstr "Schriftart gewechselt (%s)." -#: src/utils.c:374 src/geany.h:71 +#: src/utils.c:364 +#: src/geany.h:71 msgid "untitled" msgstr "unbenannt" -#: src/utils.c:375 +#: src/utils.c:365 msgid "(Unsaved)" msgstr "(Ungespeichert)" -#: src/utils.c:649 +#: src/utils.c:639 msgid "No tags found" msgstr "Keine Symbole gefunden." -#: src/utils.c:952 +#: src/utils.c:942 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" @@ -1677,94 +1671,84 @@ msgid "%s configuration file, edit as you need" msgstr "%s configuration file, edit as you need" -#: src/keyfile.c:104 -msgid "" -" VTE settings: FONT;FOREGROUND;BACKGROUND;scrollback;type;scroll on " -"keystroke;scroll on output" -msgstr "" -"VTE settings: FONT;FOREGROUND;BACKGROUND;scrollback;type;scroll on keystroke;" -"scroll on output" +#: src/keyfile.c:105 +msgid " VTE settings: FONT;FOREGROUND;BACKGROUND;scrollback;type;scroll on keystroke;scroll on output" +msgstr "VTE settings: FONT;FOREGROUND;BACKGROUND;scrollback;type;scroll on keystroke;scroll on output" -#: src/keyfile.c:229 +#: src/keyfile.c:231 msgid "Type here what you want, use it as a notice/scratch board" -msgstr "" -"Schreiben Sie hier rein, was sie möchten. Sie können es als Notizbuch nutzen." +msgstr "Schreiben Sie hier rein, was sie möchten. Sie können es als Notizbuch nutzen." #: src/msgwindow.c:44 msgid "Status messages" msgstr "Meldungen" -#: src/build.c:89 +#: src/build.c:90 #, c-format msgid "Failed to view %s (make sure it is already compiled)" msgstr "Konnte %s nicht anzeigen (die Datei muss bereits erzeugt worden sein)" -#: src/build.c:116 src/build.c:277 src/build.c:414 +#: src/build.c:117 +#: src/build.c:280 +#: src/build.c:417 #, c-format msgid "Process failed (%s)" msgstr "Prozess fehlgeschlagen (%s)" -#: src/build.c:270 +#: src/build.c:273 #, c-format msgid "%s (in directory: %s)" msgstr "%s (im Verzeichnis: %s)" -#: src/build.c:350 +#: src/build.c:353 #, c-format msgid "Failed to execute %s (make sure it is already built)" msgstr "Konnte %s nicht ausführen (die Datei muss bereits erzeugt worden sein)" -#: src/build.c:362 +#: src/build.c:365 #, c-format -msgid "" -"Could not find terminal '%s' (check path for Terminal tool setting in " -"Preferences)" -msgstr "" -"Konnte das Terminalprogramm '%s' nicht finden (Pfad zum Terminalprogramm in " -"den Einstellungen überprüfen)" +msgid "Could not find terminal '%s' (check path for Terminal tool setting in Preferences)" +msgstr "Konnte das Terminalprogramm '%s' nicht finden (Pfad zum Terminalprogramm in den Einstellungen überprüfen)" -#: src/build.c:377 +#: src/build.c:380 #, c-format msgid "Failed to change the working directory to %s" msgstr "Konnte Arbeitsverzeichnis(%s) nicht wechseln" -#: src/build.c:395 +#: src/build.c:398 #, c-format msgid "Failed to execute %s (start-script could not be created)" msgstr "Konnte %s nicht ausführen (Start-Script konnte nicht erzeugt werden)" -#: src/build.c:521 +#: src/build.c:532 msgid "compilation finished unsuccessful" msgstr "Kompilierung beendet - nicht erfolgreich." -#: src/build.c:525 +#: src/build.c:536 msgid "compilation finished successful" msgstr "Kompilierung beendet - erfolgreich." -#: src/prefs.c:207 +#: src/prefs.c:212 msgid "Action" msgstr "Aktion" -#: src/prefs.c:212 +#: src/prefs.c:217 msgid "Shortcut" msgstr "Tastenkürzel" -#: src/prefs.c:576 +#: src/prefs.c:584 msgid "Grab key" msgstr "Tasten festlegen" -#: src/prefs.c:580 +#: src/prefs.c:588 #, c-format msgid "Type the combination of the keys you want to use for \"%s\"" msgstr "Welche Tastenkomination soll für \"%s\" benutzt werden? " -#: src/prefs.c:704 +#: src/prefs.c:712 #, c-format -msgid "" -"The combination '%s' is already used for \"%s\". Please choose another one." -msgstr "" -"Die Tastenkombination '%s' wird bereits für \"%s\" verwendet. Bitte wählen " -"Sie eine andere Tastenkombination. " +msgid "The combination '%s' is already used for \"%s\". Please choose another one." +msgstr "Die Tastenkombination '%s' wird bereits für \"%s\" verwendet. Bitte wählen Sie eine andere Tastenkombination. " #: src/about.c:96 msgid "About Geany" @@ -1815,7 +1799,8 @@ msgid "Chapter" msgstr "Kapitel" -#: src/treeviews.c:67 src/treeviews.c:89 +#: src/treeviews.c:67 +#: src/treeviews.c:89 msgid "Section" msgstr "Section" @@ -1835,7 +1820,9 @@ msgid "Appendix" msgstr "Anhang" -#: 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 "Sonstiges" @@ -1863,7 +1850,8 @@ msgid "Begin" msgstr "Begin" -#: src/treeviews.c:105 src/treeviews.c:147 +#: src/treeviews.c:105 +#: src/treeviews.c:147 msgid "Function" msgstr "Funktion" @@ -1883,11 +1871,13 @@ msgid "Our" msgstr "Our" -#: src/treeviews.c:126 src/treeviews.c:151 +#: src/treeviews.c:126 +#: src/treeviews.c:151 msgid "Methods" msgstr "Methoden" -#: src/treeviews.c:128 src/treeviews.c:149 +#: src/treeviews.c:128 +#: src/treeviews.c:149 msgid "Class" msgstr "Klassen" @@ -1899,7 +1889,8 @@ msgid "Mixin" msgstr "Mixin" -#: src/treeviews.c:134 src/treeviews.c:155 +#: src/treeviews.c:134 +#: src/treeviews.c:155 msgid "Variables" msgstr "Variablen" @@ -1919,11 +1910,13 @@ msgid "Struct / Typedef" msgstr "Strukt / Typedef" -#: src/treeviews.c:227 src/treeviews.c:279 +#: src/treeviews.c:227 +#: src/treeviews.c:279 msgid "Hide" msgstr "Verbergen" -#: src/treeviews.c:235 src/treeviews.c:287 +#: src/treeviews.c:235 +#: src/treeviews.c:287 msgid "Hide sidebar" msgstr "Sidebar verbergen" @@ -1931,143 +1924,143 @@ msgid "Reload" msgstr "Neu laden" -#. init all fields of keys with default values -#: src/keybindings.c:101 +#: src/keybindings.c:106 msgid "New" msgstr "Neu" -#: src/keybindings.c:102 +#: src/keybindings.c:108 msgid "Open" msgstr "Öffnen" -#: src/keybindings.c:103 +#: src/keybindings.c:110 msgid "Save" msgstr "Speichern" -#: src/keybindings.c:105 +#: src/keybindings.c:114 msgid "Close all" msgstr "Alle schließen" -#: src/keybindings.c:106 +#: src/keybindings.c:116 msgid "Reload file" msgstr "Neu laden" -#: src/keybindings.c:107 +#: src/keybindings.c:118 msgid "Undo" msgstr "Rückgängig" -#: src/keybindings.c:108 +#: src/keybindings.c:120 msgid "Redo" msgstr "Wiederholen" -#: src/keybindings.c:110 +#: src/keybindings.c:124 msgid "Find Next" msgstr "Weitersuchen" -#: src/keybindings.c:111 +#: src/keybindings.c:126 msgid "Find Previous" msgstr "Vorheriges" -#: src/keybindings.c:114 +#: src/keybindings.c:132 msgid "Show Colour Chooser" msgstr "Farbwähler öffnen" -#: src/keybindings.c:115 +#: src/keybindings.c:134 msgid "Fullscreen" msgstr "Vollbild" -#: src/keybindings.c:116 +#: src/keybindings.c:136 msgid "Toggle Messages Window" msgstr "Meldungsfenster verstecken" -#: src/keybindings.c:117 +#: src/keybindings.c:138 +msgid "Toggle Sidebar" +msgstr "Seitenleiste ausblenden" + +#: src/keybindings.c:140 msgid "Zoom In" msgstr "Hineinzoomen" -#: src/keybindings.c:118 +#: src/keybindings.c:142 msgid "Zoom Out" msgstr "Herauszoomen" -#: src/keybindings.c:119 +#: src/keybindings.c:144 msgid "Replace tabs by space" msgstr "Tabulatoren durch Leerzeichen ersetzen" -#: src/keybindings.c:120 +#: src/keybindings.c:146 msgid "Fold all" msgstr "Alle einklappen" -#: src/keybindings.c:121 +#: src/keybindings.c:148 msgid "Unfold all" msgstr "Alle ausklappen" -#: src/keybindings.c:122 -msgid "Compile" -msgstr "Kompilieren" - -#: src/keybindings.c:123 +#: src/keybindings.c:152 msgid "Build" msgstr "Erstellen" -#: src/keybindings.c:125 +#: src/keybindings.c:156 msgid "Build with \"make\" (custom target)" msgstr "Mit \"make\" erstellen (eigenes Target angeben)" -#: src/keybindings.c:127 +#: src/keybindings.c:160 msgid "Run (alternative command)" msgstr "Ausführen (alternativer Befehl)" -#: src/keybindings.c:128 +#: src/keybindings.c:162 msgid "Build options" msgstr "Optionen bei der Erzeugung" -#: src/keybindings.c:129 +#: src/keybindings.c:164 msgid "Reload symbol list" msgstr "Symbol-Ansicht neuladen" -#: src/keybindings.c:130 +#: src/keybindings.c:166 msgid "Switch to Editor" msgstr "Wechsle zum Editor" -#: src/keybindings.c:131 +#: src/keybindings.c:168 msgid "Switch to Scribble" msgstr "Wechsle " -#: src/keybindings.c:132 +#: src/keybindings.c:170 msgid "Switch to VTE" msgstr "Wechsel zur VTE" -#: src/keybindings.c:133 +#: src/keybindings.c:172 msgid "Switch to left document" msgstr "Zum linken Dokument umschalten" -#: src/keybindings.c:134 +#: src/keybindings.c:174 msgid "Switch to right document" msgstr "Zum rechten Dokument umschalten" -#: src/keybindings.c:135 -msgid "Toggle sidebar" -msgstr "&Seitenleiste ausblenden" +#: src/keybindings.c:176 +msgid "Duplicate line or selection" +msgstr "Zeile oder Auswahl kopieren" -#: src/keybindings.c:136 -msgid "Duplicate line" -msgstr "Zeile kopieren" - -#: src/keybindings.c:137 +#: src/keybindings.c:178 msgid "Comment line" msgstr "Zeile auskommentieren" -#: src/keybindings.c:138 +#: src/keybindings.c:180 msgid "Complete word" msgstr "Vervollständige Wort" -#: src/keybindings.c:139 +#: src/keybindings.c:182 msgid "Show calltip" msgstr "Calltip anzeigen" -#: src/keybindings.c:140 +#: src/keybindings.c:184 msgid "Show macro list" msgstr "Zeige Makroliste" -#: src/keybindings.c:141 +#: src/keybindings.c:186 msgid "Suppress auto completion" msgstr "Autovervollständigung abstellen" + +#: src/keybindings.c:188 +msgid "Find Usage" +msgstr "Auftreten finden" + Added: trunk/po/es.po =================================================================== --- trunk/po/es.po (rev 0) +++ trunk/po/es.po 2006-06-19 13:41:05 UTC (rev 463) @@ -0,0 +1,2142 @@ +# Spanish translation file for geany +# Copyright (C) 2006 Damián Viano <dviano(a)fi.uba.ar> +# This file is distributed under the same license as the geany package. +# Damián Viano <dviano(a)fi.uba.ar>, 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: geany 0.7\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-06-18 18:31-0300\n" +"PO-Revision-Date: 2006-06-10 19:30-0300\n" +"Last-Translator: Damián Viano <dviano(a)fi.uba.ar>\n" +"Language-Team: Spanish <dviano(a)fi.uba.ar>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/main.c:73 +msgid "runs in debug mode (means being verbose)" +msgstr "corre en modo de depuración (significa ser verborrajico)" + +#: src/main.c:74 +msgid "don't load auto completion data (see documentation)" +msgstr "no cargar el auto completado (ver la documentación)" + +#: src/main.c:76 +msgid "don't open files in a running instance, force opening a new instance" +msgstr "" +"no abrir archivos en instancias corriendo, forzar la apertura de una nueva " +"instancia" + +#: src/main.c:78 +msgid "use an alternate configuration directory" +msgstr "usar un directorio de configuración alternativo" + +#: src/main.c:79 +msgid "don't show message window at startup" +msgstr "no mostrar ventana de mensajes al inicio" + +#: src/main.c:81 +msgid "don't load terminal support" +msgstr "no cargar el soporte de terminal" + +#: src/main.c:82 +msgid "filename of libvte.so" +msgstr "nombre de archivo de libvte.so" + +#: src/main.c:84 +msgid "show version and exit" +msgstr "mostrar versión y salir" + +#: src/main.c:397 +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" +"Delete the named pipe and start Geany?" +msgstr "" +"Geaby saldrá porque se enconto una tubería con nombre (named pipe). Esto " +"probablemente significa que Geany ya está corriendo. Si está seguro que " +"Geany no está corriendo puede borrar esa tubería e iniciar Geany de todas " +"formas.\n" +"Borrar la tubería nombrada e iniciar Geany?" + +#: src/main.c:439 +msgid " - A fast and lightweight IDE" +msgstr " - Un IDE rápido y liviano" + +#: src/main.c:449 +#, c-format +msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" +msgstr "(compilado en %s con GTK %d.%d.%d, GLib %d.%d.%d)" + +#: src/main.c:522 +#, c-format +msgid "This is Geany %s." +msgstr "Este es Geany %s." + +#: src/main.c:524 +#, c-format +msgid "Configuration directory could not be created (%s)." +msgstr "La carpeta de configuración no pudo ser creada (%s)." + +#: src/interface.c:210 src/interface.c:1176 +msgid "Geany" +msgstr "Geany" + +#: src/interface.c:220 +msgid "_File" +msgstr "_Archivo" + +#: src/interface.c:231 +msgid "New (with _template)" +msgstr "Nuevo (desde _plantilla)" + +#: src/interface.c:242 src/interface.c:261 src/interface.c:379 +#: src/interface.c:602 src/interface.c:1561 +msgid "invisible" +msgstr "invisible" + +#: src/interface.c:254 +msgid "Recent _files" +msgstr "_Archivos recientes" + +#: src/interface.c:277 src/interface.c:714 src/keybindings.c:112 +msgid "Save all" +msgstr "Guardar todo" + +#: src/interface.c:280 +msgid "Saves all open files" +msgstr "Guarda todos los archivos abiertos" + +#: src/interface.c:308 +msgid "C_lose all" +msgstr "Cerrar _todo" + +#: src/interface.c:311 +msgid "Closes all open files" +msgstr "Cierra todos los archivos abiertos" + +#: src/interface.c:325 src/interface.c:821 +msgid "Quit Geany" +msgstr "Salir de Geany" + +#: src/interface.c:327 +msgid "_Edit" +msgstr "_Editar" + +#: src/interface.c:368 src/interface.c:1550 +msgid "Insert \"include <...>\"" +msgstr "Insertar \"include <...>\"" + +#: src/interface.c:382 src/interface.c:1564 +msgid "Insert Comments" +msgstr "Insertar Comentarios" + +#: src/interface.c:393 src/interface.c:1575 +msgid "Insert ChangeLog entry" +msgstr "Insterar entrada en el ChangeLog" + +#: src/interface.c:396 +msgid "Inserts a typical ChangeLog entry in the current file" +msgstr "Insterta una entrada típica de ChangeLog en el archivo actual" + +#: src/interface.c:398 src/interface.c:1580 +msgid "Insert file header" +msgstr "Insertar encabezado de archivo" + +#: src/interface.c:401 src/interface.c:1583 +msgid "Inserts a few information at the beginning of the file" +msgstr "Inserta un poco de información al principio del archivo" + +#: src/interface.c:403 src/interface.c:1585 +msgid "Insert function description" +msgstr "Insertar descripción de función" + +#: src/interface.c:406 src/interface.c:1588 +msgid "Inserts a description before the current function" +msgstr "Insterta una descripción antes de la función actual" + +#: src/interface.c:408 src/interface.c:1590 +msgid "Insert multiline comment" +msgstr "Instertar comentario multilinea" + +#: src/interface.c:411 src/interface.c:1593 +msgid "Inserts a multiline comment" +msgstr "Insterta un comentario multilinea" + +#: src/interface.c:413 src/interface.c:1595 +msgid "Insert GPL notice" +msgstr "Instertar notación GPL" + +#: src/interface.c:416 src/interface.c:1598 +msgid "Inserts a GPL notice (should be done at the beginning of the file)" +msgstr "Inserta una notación GPL (debería agregarse al principio del archivo)" + +#: src/interface.c:423 src/interface.c:1605 +msgid "Change Selection" +msgstr "Cambiar selección" + +#: src/interface.c:430 src/interface.c:1612 +msgid "To lower-case" +msgstr "A minúsculas" + +#: src/interface.c:434 src/interface.c:1616 +msgid "To upper-case" +msgstr "A mayúsculas" + +#: src/interface.c:438 +msgid "_Count words" +msgstr "_Contar palabras" + +#: src/interface.c:441 +msgid "" +"Counts the words and characters in the current selection or the whole " +"document" +msgstr "" +"Cuenta las palabras y carácteres en la selección actual o en todo el " +"documento" + +#: src/interface.c:452 +msgid "_Search" +msgstr "_Buscar" + +#: src/interface.c:463 +msgid "Find _Next" +msgstr "Buscar _Siguente" + +#: src/interface.c:467 +msgid "Find _Previous" +msgstr "Buscar _Anterior" + +#: src/interface.c:471 src/dialogs.c:907 +msgid "_Replace" +msgstr "_Remplazar" + +#: src/interface.c:484 +msgid "_Go to line" +msgstr "_Ir a la linea" + +#: src/interface.c:492 src/dialogs.c:73 +msgid "_View" +msgstr "_Ver" + +#: src/interface.c:499 +msgid "Change _Font" +msgstr "Cambiar _Fuente" + +#: src/interface.c:502 +msgid "Change the default font" +msgstr "Cambiar la fuente predeterminada" + +#: src/interface.c:508 +msgid "Show _Colour Chooser" +msgstr "Mostrar Selector de _Colores" + +#: src/interface.c:511 src/interface.c:760 +msgid "" +"Open a color chooser dialog, to interactively pick colors from a palette." +msgstr "" +"Abrir un diálogo selector de colores para elegir colores interactivamente de " +"una paleta" + +#: src/interface.c:522 +msgid "Full_screen" +msgstr "Pantalla _completa" + +#: src/interface.c:526 +msgid "Show Messages _Window" +msgstr "Mostrar _ventana de mensajes" + +#: src/interface.c:529 +msgid "Toggle the window with status and compiler messages on and off" +msgstr "Ocultar/mostrar la ventana con mensajes de estado y de compilador" + +#: src/interface.c:532 +msgid "Show _Toolbar" +msgstr "Mostrar Barra de _Herramientas" + +#: src/interface.c:535 +msgid "Toggle the toolbar on and off" +msgstr "Ocultar/mostrar la barra de herramientas" + +#: src/interface.c:538 +msgid "Show _Markers Margin" +msgstr "Muestra los _Marcadores de Margenes" + +#: src/interface.c:541 +msgid "" +"Shows or hides the small margin right of the line numbers, which is used to " +"mark lines." +msgstr "" +"Muestra u oculta el pequeño margen a la derecha de los numeros de lines que " +"se usa para marcar lineas" + +#: src/interface.c:544 +msgid "Show _Line Numbers" +msgstr "Mostrar Numeros de _Linea" + +#: src/interface.c:547 +msgid "Shows or hides the Line Number margin." +msgstr "Muestra u oculta el margen con numeros de linea" + +#: src/interface.c:567 +msgid "_Document" +msgstr "_Documento" + +#: src/interface.c:574 +msgid "_Line breaking" +msgstr "_Cortado de lineas" + +#: src/interface.c:577 +msgid "Break the line at the window border and continue it on the next line" +msgstr "" +"Cortar la linea en el borde de la ventana y continuarla en la siguiente linea" + +#: src/interface.c:580 +msgid "_Use auto indentation" +msgstr "_Usar formateo de código automático" + +#: src/interface.c:585 +msgid "Read _only" +msgstr "S_olo lectura" + +#: src/interface.c:588 +msgid "Treat this file as read-only. No changes can be made." +msgstr "" +"Tratar este archivo como de solo lectura. Ningún cambio puede ser hecho" + +#: src/interface.c:595 +msgid "Set filetype" +msgstr "Cambiar tipo de archivo" + +#: src/interface.c:605 +msgid "Line endings" +msgstr "Terminación de lineas" + +#: src/interface.c:612 +msgid "Convert and set to CR/LF (Win)" +msgstr "Convertir a, y elegir CR/LF (Win)" + +#: src/interface.c:616 +msgid "Convert and set to LF (Unix)" +msgstr "Convertir a, y elegir LF (Unix)" + +#: src/interface.c:620 +msgid "Convert and set to CR (Mac)" +msgstr "Convertir a, y elegir CR (Mac)" + +#: src/interface.c:629 +msgid "_Replace tabs by space" +msgstr "_Remplazar tabulaciones por espacios" + +#: src/interface.c:632 +msgid "Replaces all tabs in document by spaces." +msgstr "Remplaza todas las tabulaciónes en el documento por espacios" + +#: src/interface.c:639 +msgid "_Fold all" +msgstr "_Plegar todo" + +#: src/interface.c:642 +msgid "Folds all contractible code blocks" +msgstr "Pliega todos los bloques de código contraibles" + +#: src/interface.c:644 +msgid "_Unfold all" +msgstr "_Desplegar todo" + +#: src/interface.c:647 +msgid "Unfolds all contracted code blocks" +msgstr "Depliega todos los bloques de código plegados" + +#: src/interface.c:654 +msgid "Remove all _indicators" +msgstr "Borrar todos los _indicadores" + +#: src/interface.c:657 +msgid "Removes all set indicators in the current document." +msgstr "Borra todos los indicadortes dispuestos en el documento actual." + +#. build the code +#: src/interface.c:659 src/dialogs.c:522 +msgid "_Build" +msgstr "_Construir" + +#: src/interface.c:663 +msgid "_Help" +msgstr "_Ayuda" + +#: src/interface.c:674 +msgid "_Keyboard shortcuts" +msgstr "_Atajos de teclado" + +#: src/interface.c:677 +msgid "Shows a list of all keyboard shortcuts for Geany." +msgstr "Muestra una lista de todos los atajos de teclado para Geany" + +#: src/interface.c:679 +msgid "_Website" +msgstr "Sitio _Web" + +#: src/interface.c:702 +msgid "Create a new file" +msgstr "Crear un archivo nuevo" + +#: src/interface.c:707 +msgid "Open an existing file" +msgstr "Abrir un archivo existente" + +#: src/interface.c:712 +msgid "Save the current file" +msgstr "Grabar el archivo actual" + +#: src/interface.c:717 +msgid "Save all open files" +msgstr "Grabar todos los archivos abiertos" + +#: src/interface.c:726 +msgid "Reload the current file from disk" +msgstr "Recargar el archivo actual desde el disco" + +#: src/interface.c:731 +msgid "Close the current file" +msgstr "Cerrar el archivo actual" + +#: src/interface.c:739 src/keybindings.c:150 +msgid "Compile" +msgstr "Compilar" + +#: src/interface.c:742 +msgid "Compile the current file" +msgstr "Compilar el archivo actual" + +#: src/interface.c:746 src/keybindings.c:158 +msgid "Run" +msgstr "Ejecutar" + +#: src/interface.c:749 src/dialogs.c:561 +msgid "Run or view the current file" +msgstr "Ejecutar o ver el archivo actual" + +#: src/interface.c:757 +msgid "Color" +msgstr "Color" + +#: src/interface.c:769 +msgid "Zoom in the text" +msgstr "Acercar el texto" + +#: src/interface.c:774 +msgid "Zoom out the text" +msgstr "Alejar el texto" + +#: src/interface.c:787 src/interface.c:792 +msgid "Find the entered text in the current file" +msgstr "Buscar el texto ingresado en el archivo actual" + +#: src/interface.c:805 +msgid "Enter a line number and jump to it." +msgstr "Ingresar un numero de linea y saltar allí" + +#: src/interface.c:812 +msgid "Jump to the entered line number." +msgstr "Saltar al número de linea ingresado" + +#: src/interface.c:848 src/treeviews.c:40 +msgid "Symbols" +msgstr "Símbolos" + +#: src/interface.c:861 src/treeviews.c:180 +msgid "Open files" +msgstr "Archivos" + +#: src/interface.c:896 +msgid "Status" +msgstr "Estado" + +#: src/interface.c:910 +msgid "Compiler" +msgstr "Compilador" + +#: src/interface.c:924 +msgid "Messages" +msgstr "Mensajes" + +#: src/interface.c:937 +msgid "Scribble" +msgstr "Borrador" + +#: src/interface.c:1371 +msgid "Images and text" +msgstr "Imagenes y texto" + +#: src/interface.c:1377 +msgid "Images only" +msgstr "Sólo imagenes" + +#: src/interface.c:1383 +msgid "Text only" +msgstr "Sólo texto" + +#: src/interface.c:1394 +msgid "Large icons" +msgstr "Iconos grandes" + +#: src/interface.c:1398 +msgid "Small icons" +msgstr "Iconos pequeños" + +#: src/interface.c:1407 +msgid "Hide toolbar" +msgstr "Esconder barra de herramientas" + +#: src/interface.c:1578 +msgid "Inserts a typical ChangeLog entry in the current " +msgstr "Insterta una entrada típica de ChangeLog en el archivo actual " + +#: src/interface.c:1625 +msgid "Find usage" +msgstr "Encontrar uso" + +#: src/interface.c:1633 src/keybindings.c:190 +msgid "Go to tag definition" +msgstr "Ir a la definición del tag" + +#: src/interface.c:1637 src/keybindings.c:192 +msgid "Go to tag declaration" +msgstr "Ir a la declaración del tag" + +#: src/interface.c:1646 src/dialogs.c:764 src/keybindings.c:130 +msgid "Go to line" +msgstr "Ir a la linea" + +#: src/interface.c:1649 +msgid "Goto to the entered line" +msgstr "Ir a la linea ingresada" + +#: src/interface.c:1895 src/keybindings.c:122 +msgid "Preferences" +msgstr "Preferencias" + +#: src/interface.c:1931 +msgid "Recent files list length:" +msgstr "Longitud de la lista de archivos recientes:" + +#: src/interface.c:1939 +msgid "" +"Specifies the number of files which are stored in the Recent files list." +msgstr "" +"Especifica el numero de archivos que se guardan en la lista Archivos " +"recientes." + +#: src/interface.c:1943 +msgid "Load files from the last session" +msgstr "Cargar archivos de la última sesión" + +#: src/interface.c:1947 +msgid "Opens at startup the files from the last session" +msgstr "Abre en el inicio los arhcivos de la última sesion" + +#: src/interface.c:1950 +msgid "Save window position and geometry" +msgstr "Guardar la posición de la ventana y su geometría" + +#: src/interface.c:1954 +msgid "Saves the window position and geometry and restores it at the start" +msgstr "" +"Guarda la posición de la ventana y su geometría y las restablece al inicio" + +#: src/interface.c:1957 +msgid "Beep on errors or when compilation has finished" +msgstr "Alerta sonora para errores o la finalización de la compilación" + +#: src/interface.c:1960 +msgid "" +"Whether to beep if an error occured or when the compilation process has " +"finished." +msgstr "" +"Si dar una advertencia sonora de los errores o la finalización de la " +"compilación." + +#: src/interface.c:1963 +msgid "Switch to status message list at new message" +msgstr "Cambiar a la lista de mensajes de estado cuando haya un nuevo mensaje" + +#: src/interface.c:1966 +msgid "" +"Switch to the status message tab(in the notebook window at the bottom) if a " +"new status message arrive." +msgstr "" +"Cambia a la pestaña de mensajes de estado(en la ventana de pestañas de " +"abajo) cuando llega un nuevo mensaje." + +#: src/interface.c:1969 +msgid "Load virtual terminal emulation at startup" +msgstr "Cargar emulación de terminal virtual al inicio" + +#: src/interface.c:1971 +msgid "" +"Whether the virtual terminal emulation(VTE) should be loaded at startup. " +"Disable it if you do not need it." +msgstr "" +"Si cargar o no al inicio la emulación de terminal virtual(VTE). Desactivar " +"si no se necesita." + +#: src/interface.c:1974 +msgid "Confirm exit" +msgstr "Confirmar salida" + +#: src/interface.c:1978 +msgid "Shows a confirmation dialog on exit." +msgstr "Muestra un dialogo de confirmación al momento de salir" + +#: src/interface.c:1985 +msgid "Placement of new file tabs: " +msgstr "Ubicación de las pestañas de archivos nuevos: " + +#: src/interface.c:1989 +msgid "Left" +msgstr "Izquierda" + +#: src/interface.c:1992 +msgid "New file tabs will be placed to the left of the tab list" +msgstr "" +"Las pestañas de archivos nuevos serán ubicadas a la izquierda de la lista de " +"pestañas" + +#: src/interface.c:2001 +msgid "Right" +msgstr "Derecha" + +#: src/interface.c:2004 +msgid "New file tabs will be placed to the right of the tab list" +msgstr "" +"Las pestañas de archivos nuevos serán ubicadas a la derecha de la lista de " +"pestañas" + +#: src/interface.c:2008 src/interface.c:2339 +msgid "Miscellaneous" +msgstr "Miscelaneas" + +#: src/interface.c:2032 +msgid "Show search field" +msgstr "Mostrar campo de búsqueda" + +#: src/interface.c:2036 +msgid "Display the search field and button in the toolbar" +msgstr "Mostrar el campo y botón de búsqueda en la barra de herramientas" + +#: src/interface.c:2039 +msgid "Show goto line field" +msgstr "Mostrar el campo para saltar de linea" + +#: src/interface.c:2043 +msgid "Display the line number field and button in the toolbar" +msgstr "" +"Mostrar el campo y botón de numero de linea en la barra de herramientas" + +#: src/interface.c:2046 +msgid "Toolbar" +msgstr "Barra de Herramientas" + +#: src/interface.c:2070 +msgid "Show symbol list" +msgstr "Mostrar la lista de símbolos" + +#: src/interface.c:2073 src/interface.c:2079 +msgid "Toggle the symbol list on and off" +msgstr "Mostrar/ocultar la lista de símbolos" + +#: src/interface.c:2076 +msgid "Show open files list" +msgstr "Mostrar la lista de archivos abiertos" + +#: src/interface.c:2082 +msgid "Sidebar" +msgstr "Barra lateral" + +#: src/interface.c:2108 +msgid "Symbol list font" +msgstr "Funte de la lista de símbolos" + +#: src/interface.c:2115 +msgid "Message window font" +msgstr "Fuente de la ventana de mensajes" + +#: src/interface.c:2127 +msgid "Sets the font for the message window" +msgstr "Selecciona la fuente para la ventana de mensajes" + +#: src/interface.c:2135 +msgid "Sets the font for symbol list window" +msgstr "Selecciona la fuente para la ventana de la lista de símbolos" + +#: src/interface.c:2138 +msgid "Fonts" +msgstr "Fuentes" + +#: src/interface.c:2143 +msgid "General" +msgstr "General" + +#: src/interface.c:2171 +msgid "Tab Width" +msgstr "Ancho de Pestaña" + +#: src/interface.c:2184 +msgid "The width in chars, which one tab character will take" +msgstr "El ancho, en carácteres, que ocupará una pestaña" + +#: src/interface.c:2189 +msgid "New files" +msgstr "Archivos nuevos" + +#: src/interface.c:2208 +msgid "Strip trailing spaces" +msgstr "Borrar espacios al final" + +#: src/interface.c:2212 +msgid "Removes trailing spaces and tabs and the end of lines" +msgstr "Borra los espacios y tabulaciones al final de las lineas" + +#: src/interface.c:2215 +msgid "Ensure new line at file end" +msgstr "Asegurar terminación de linea al final del archivo" + +#: src/interface.c:2219 +msgid "Ensures that at the end of the file is a new line" +msgstr "Asegura que haya una terminación de linea al final del archivo" + +#: src/interface.c:2222 +msgid "Saving files" +msgstr "Grabando archivos" + +#: src/interface.c:2241 +msgid "Show indentation guides" +msgstr "Mostrar guías de formateo automático de código" + +#: src/interface.c:2244 +msgid "Shows small dotted lines to help you to use the right indentation." +msgstr "" +"Muestra pequeñas lineas punteadas para ayudar a usar el formato de código " +"adecuado." + +#: src/interface.c:2247 +msgid "Show white space" +msgstr "Mostrar espacios en blanco" + +#: src/interface.c:2250 +msgid "Marks spaces with dots and tabs with arrows." +msgstr "Marca los espacios con puntos y las tabulaciones con flechas" + +#: src/interface.c:2253 +msgid "Show line endings" +msgstr "Mostrar terminaciones de linea" + +#: src/interface.c:2256 +msgid "Show the line ending character" +msgstr "Muestra los carácteres de terminación de linea" + +#: src/interface.c:2259 +msgid "XML tag auto completion" +msgstr "Compleción automática de etiquetas XML" + +#: src/interface.c:2262 +msgid "Automatic completion of open XML tags(includes HTML tags)" +msgstr "" +"Compleción automática de etiquetas XML abiertas(incluye etiquetas HTML)" + +#: src/interface.c:2265 +msgid "Construct auto completion" +msgstr "Compleción automática de construcciones" + +#: src/interface.c:2268 +msgid "Automatic completion of often used constructs like if and for" +msgstr "" +"Compleción automática de construcciones usadas comunmente como if y for" + +#: src/interface.c:2271 +msgid "Enable folding" +msgstr "Activar plegado" + +#: src/interface.c:2274 +msgid "Whether to enable folding the code" +msgstr "Si activar el plegado de código" + +#: src/interface.c:2277 +msgid "Use indicators to show compile errors" +msgstr "Usar indicadores para mostrar los errores de compilación" + +#: src/interface.c:2280 +msgid "" +"Whether to use indicators(a squiggly underline) to highlight the lines, " +"where the compiler found a warning or an error." +msgstr "" +"Si usar indicadores(subrayado ondulado) para resaltar las lineas, donde el " +"compilador encontró un error, o advertencia." + +#: src/interface.c:2293 +msgid "Editor font" +msgstr "Fuente del editor" + +#: src/interface.c:2300 +msgid "Long line marker" +msgstr "Marcador de lineas largas" + +#: src/interface.c:2307 +msgid "Long line marker color" +msgstr "Color del marcador de lineas largas" + +#: src/interface.c:2319 +msgid "Sets the font for the editors windows" +msgstr "Selecciona la fuente para las ventanas de edición" + +#: src/interface.c:2327 +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 "" +"El marcador de lineas largas es una fina linea vertical en el editor. Ayuda " +"a marcar las lineas largas, o como sugerencia para cortarlas. Para " +"desactivarlo poner el valor en 0, o mayor a 0 para especificar la columna " +"donde debe aparecer." + +#: src/interface.c:2336 +msgid "Sets the color of the long line marker" +msgstr "Selecciona el color del marcador de lineas largas" + +#: src/interface.c:2337 src/dialogs.c:478 src/dialogs.c:1707 +#: src/dialogs.c:1714 +msgid "Color Chooser" +msgstr "Selector de color" + +#: src/interface.c:2344 +msgid "Editor" +msgstr "Editor" + +#: src/interface.c:2352 +msgid "" +"Enter here the paths to the make tool and the compiler\n" +"(tools you do not need can be let blank)" +msgstr "" +"Ingrese aquí las rutas a la utilidad make y al compilador\n" +"(las herramientas que no necesite pueden quedar en blanco)" + +#: src/interface.c:2363 +msgid "Make" +msgstr "Make" + +#: src/interface.c:2370 src/dialogs.c:1757 src/vte.c:163 +msgid "Terminal" +msgstr "Terminal" + +#: src/interface.c:2377 +msgid "Browser" +msgstr "Navegador" + +#: src/interface.c:2389 +msgid "Path and options for the make tool" +msgstr "Ruta y opciones para la herramienta make" + +#: src/interface.c:2396 +msgid "" +"A terminal emulator like xterm, gnome-terminal or konsole (should accept the " +"-e argument)" +msgstr "" +"Un emulador de terminal como xterm, gnome-terminal o konsole (debe aceptar " +"el argumento -e)" + +#: src/interface.c:2403 +msgid "Path (and possibly additional arguments) to your favorite browser" +msgstr "Ruta (y posiblemente argumentos adicionales) a su navegador favorito" + +#: src/interface.c:2435 +msgid "Tools" +msgstr "Herramientas" + +#: src/interface.c:2443 +msgid "" +"Specify here information you want to use in templates.\n" +"See documentation if you don't know, how templates work." +msgstr "" +"Especificar aquí información que quira usar en las plantillas.\n" +"Ver la documentación si no sabe cómo funcionan las plantillas." + +#: src/interface.c:2459 +msgid "email address of the developer" +msgstr "dirección de correo electrónico del desarrollador" + +#: src/interface.c:2466 +msgid "Initials of the developer name" +msgstr "Iniciales del nombre del desarrollador" + +#: src/interface.c:2468 +msgid "Initial Version" +msgstr "Version inicial" + +#: src/interface.c:2480 +msgid "Version number, which a new file initially has" +msgstr "Numero de version que tiene un archivo nuevo" + +#: src/interface.c:2487 +msgid "Company name" +msgstr "Nombre de la compañia" + +#: src/interface.c:2489 +msgid "Developer" +msgstr "Desarrollador" + +#: src/interface.c:2496 +msgid "Company" +msgstr "Compañia" + +#: src/interface.c:2503 +msgid "Mail address" +msgstr "Dirección de correo electrónico" + +#: src/interface.c:2510 +msgid "Initials" +msgstr "Iniciales" + +#: src/interface.c:2522 +msgid "The name of the developer" +msgstr "El nombre del desarrollador" + +#: src/interface.c:2524 +msgid "" +"Notice: For all changes you make here,\n" +"you need to restart Geany to take effect." +msgstr "" +"Nota: Para que surta efecto cualquier\n" +"cambio que realize aquí deberá reiniciar Geany." + +#: src/interface.c:2528 +msgid "Templates" +msgstr "Plantillas" + +#: src/interface.c:2536 +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 "" +"Aquí puede cambiar los atajos de teclado para varias acciones. Solo haga " +"doble click en una acción o seleccionela y presione el botón de Cambiar para " +"ingresar un nuevo atajo. Puede también editar el texto que representa el " +"atajo directamente" + +#: src/interface.c:2559 +msgid "Change" +msgstr "Cambiar" + +#: src/interface.c:2563 +msgid "Keybindings" +msgstr "Atajos" + +#: src/callbacks.c:210 src/callbacks.c:225 +msgid "Do you really want to quit?" +msgstr "¿Realmente desea salir?" + +#: src/callbacks.c:460 +#, c-format +msgid "" +"Are you sure you want to reload '%s'?\n" +"Any unsaved changes will be lost." +msgstr "" +"¿Está seguro que quiere recargar '%s'?\n" +"Cualquier cambio no grabado será perdido." + +#: src/callbacks.c:850 +#, c-format +msgid "The file '%s' already exists. Do you want to overwrite it?" +msgstr "El archivo '%s' ya existe. ¿Quiere sobreescribirlo?" + +#: src/callbacks.c:1313 src/callbacks.c:1322 +#, c-format +msgid "Declaration or definition of \"%s()\" not found" +msgstr "Declaración o definición de \"%s()\" no encontrada" + +#: src/callbacks.c:1634 +msgid "Failed to execute the view program" +msgstr "Fallo al ejecutar el programa visualizador" + +#: src/callbacks.c:1645 +msgid "Failed to execute the terminal program" +msgstr "Fallo al ejecutar el programa de terminal" + +#. initialize the dialog +#: src/callbacks.c:1968 src/dialogs.c:70 +msgid "Open File" +msgstr "Abrir archivo" + +#: src/callbacks.c:2017 src/callbacks.c:2062 src/callbacks.c:2102 +#: src/callbacks.c:2162 +msgid "" +"Please set the filetype for the current file before using this function." +msgstr "" +"Por favor seleccione el tipo de archivo para el archivo actual antes de " +"utilizar esta función." + +#: src/support.c:90 src/support.c:114 +#, c-format +msgid "Couldn't find pixmap file: %s" +msgstr "No se pudo encontrar la imagen: %s" + +#: src/dialogs.c:75 +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 "" +"Abre el archivo en modo sólo lectura. Si elige más de un archivo todos serán " +"abiertos como sólo lectura." + +#: src/dialogs.c:111 +msgid "Detect by file extension " +msgstr "Detectar por extención de archivo " + +#: src/dialogs.c:164 +msgid "Save File" +msgstr "Grabar Archivo" + +#: src/dialogs.c:216 +#, c-format +msgid "There is a limit of %d concurrent open tabs." +msgstr "Hay un límite de %d pestañas concurrentes" + +#: src/dialogs.c:217 +msgid "error: too many open files" +msgstr "error: demasiados archivos abiertos" + +#: src/dialogs.c:240 +#, c-format +msgid "The match \"%s\" was not found. Wrap search around the document?" +msgstr "El patrón \"%s\" no fue encontrado. ¿Buscar dando vuelta al documento?" + +#: src/dialogs.c:243 src/dialogs.c:1825 +msgid "Question" +msgstr "Pregunta" + +#: src/dialogs.c:272 +msgid "Information" +msgstr "Información" + +#: src/dialogs.c:297 src/dialogs.c:329 src/dialogs.c:1268 src/win32.c:217 +#: src/win32.c:378 +msgid "Error" +msgstr "Error" + +#: src/dialogs.c:321 +#, c-format +msgid "" +"The file '%s' is not saved.\n" +"Do you want to save it before closing?" +msgstr "" +"El archivo '%s' no fue guardado.\n" +"¿Quiere guardarlo antes de cerrar?" + +#: src/dialogs.c:326 +msgid "" +"The file is not saved.\n" +"Do you want to save it before closing?" +msgstr "" +"El archivo no fue guardado.\n" +"¿Quiere guardarlo antes de cerrar?" + +#: src/dialogs.c:343 +msgid "Don't save" +msgstr "No grabar" + +#: src/dialogs.c:395 +msgid "Choose font" +msgstr "Elegir fuente" + +#: src/dialogs.c:434 +msgid "Word Count" +msgstr "Contar Palabras" + +#: src/dialogs.c:443 +msgid "selection" +msgstr "selección" + +#: src/dialogs.c:451 +msgid "whole document" +msgstr "todo el documento" + +#: src/dialogs.c:453 +#, c-format +msgid "" +"Range:\t\t%s\n" +"\n" +"Lines:\t\t%d\n" +"Words:\t\t%d\n" +"Characters:\t%d\n" +msgstr "" +"Rango:\t\t%s\n" +"\n" +"Lineas:\t\t%d\n" +"Palabras:\t\t%d\n" +"Carácteres:\t%d\n" + +#. compile the code +#: src/dialogs.c:506 +msgid "_Compile" +msgstr "_Compilar" + +#: src/dialogs.c:509 +msgid "Compiles the current file" +msgstr "Compila el archivo actual" + +#: src/dialogs.c:526 +msgid "Builds the current file (generate an executable file)" +msgstr "Construye el archivo actual (genera un archivo ejecutable)" + +#. build the code with make all +#: src/dialogs.c:535 src/dialogs.c:632 src/keybindings.c:154 +msgid "Build with \"make\"" +msgstr "Contruir con \"make\"" + +#: src/dialogs.c:538 src/dialogs.c:635 +msgid "Builds the current file with the make tool and the default target" +msgstr "" +"Construye el archivo actual con la herramienta make y el objetivo " +"predeterminado" + +#. build the code with make +#: src/dialogs.c:546 +msgid "Build with \"_make\" (custom _target)" +msgstr "Construye con \"make\" (objetivo _personalizado)" + +#: src/dialogs.c:552 src/dialogs.c:649 +msgid "Builds the current file with the make tool and the specified target" +msgstr "" +"Construye el archivo actual con la herramienta make y el objetivo " +"especificado" + +#: src/dialogs.c:578 src/dialogs.c:1106 +msgid "Set Includes and Arguments" +msgstr "Selecciona Incluciones y Argumentos" + +#: src/dialogs.c:585 +msgid "" +"Sets the includes and library paths for the compiler and the program " +"arguments for execution" +msgstr "" +"Selecciona las rutas de inclución y librerías para el compilador y los " +"argumentos del programa para su ejecución" + +#. DVI +#: src/dialogs.c:606 +msgid "LaTeX -> DVI" +msgstr "LaTeX -> DVI" + +#: src/dialogs.c:609 +msgid "Compiles the current file into a DVI file" +msgstr "Compila el archivo actual a un archivo DVI" + +#. PDF +#: src/dialogs.c:619 +msgid "LaTeX -> PDF" +msgstr "LaTeX -> PDF" + +#: src/dialogs.c:622 +msgid "Compiles the current file into a PDF file" +msgstr "Compila el archivo actual a un archivo PDF" + +#. build the code with make +#: src/dialogs.c:643 +msgid "Build with make (custom target)" +msgstr "Construye con make (objetivo personalizado)" + +#. DVI view +#: src/dialogs.c:654 +msgid "View DVI file" +msgstr "Ver archivo DVI" + +#: src/dialogs.c:660 src/dialogs.c:673 +msgid "Compiles and view the current file" +msgstr "Compila y muestr el archivo actual" + +#. PDF view +#: src/dialogs.c:667 +msgid "View PDF file" +msgstr "Ver archivo PDF" + +#. arguments +#: src/dialogs.c:686 src/dialogs.c:999 +msgid "Set Arguments" +msgstr "Seleccionar argumentos" + +#: src/dialogs.c:693 +msgid "Sets the program paths and arguments" +msgstr "Selecciona las rutas y argumentos del programa" + +#: src/dialogs.c:734 +msgid "Enter custom options for the make tool" +msgstr "Ingresar opciones personalizadas para la herramienta make" + +#: src/dialogs.c:739 +msgid "" +"Enter custom options here, all entered text is passed to the make command." +msgstr "" +"Ingresar opciones personalizadas aquí, todo el texto ingresado es pasado a " +"la herramienta make" + +#: src/dialogs.c:769 +msgid "Enter the line you want to go to" +msgstr "Ingrese la linea a la que quiere ir" + +#: src/dialogs.c:801 +msgid "Find" @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

19 Jun '06

Revision: 462 Author: ntrel Date: 2006-06-19 06:27:09 -0700 (Mon, 19 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=462&view=rev Log Message: ----------- Don't open files or go to errors automatically whilst compiling. Rename utils_goto_workspace_tag to utils_goto_file_line Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/callbacks.c trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-18 20:21:19 UTC (rev 461) +++ trunk/ChangeLog 2006-06-19 13:27:09 UTC (rev 462) @@ -1,3 +1,10 @@ +2006-06-19 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/build.c, src/utils.c, src/utils.h, src/callbacks.c: + Don't open files or go to errors automatically whilst compiling. + Rename utils_goto_workspace_tag to utils_goto_file_line. + + 2006-06-18 Enrico Troeger <enrico.troeger(a)uvena.de> * src/keybindings.c: Fixed a segfault when pressing shortcut for Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2006-06-18 20:21:19 UTC (rev 461) +++ trunk/src/build.c 2006-06-19 13:27:09 UTC (rev 462) @@ -449,7 +449,6 @@ //GIOStatus s; gchar *msg; guint x = 1; - gint line, idx; while (g_io_channel_read_line(ioc, &msg, NULL, NULL, NULL) && msg) { @@ -459,8 +458,16 @@ 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); + gchar *filename; + gint line; + utils_parse_compiler_error_line(g_strstrip(msg), &filename, &line); + if (line != -1) + { + gint idx = document_find_by_filename(filename, FALSE); + // document_set_indicator will check valid idx + document_set_indicator(idx, line - 1); + } + g_free(filename); } } else Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-06-18 20:21:19 UTC (rev 461) +++ trunk/src/callbacks.c 2006-06-19 13:27:09 UTC (rev 462) @@ -1304,7 +1304,7 @@ { if (utils_strcmp(TM_TAG(tags->pdata[i])->name, current_word)) { - if (! utils_goto_workspace_tag( + if (! utils_goto_file_line( TM_TAG(tags->pdata[i])->atts.entry.file->work_object.file_name, TRUE, TM_TAG(tags->pdata[i])->atts.entry.line)) @@ -1361,7 +1361,7 @@ gtk_tree_model_get(model, &iter, 0, &line, 1, &file, -1); if (file && strlen (file) > 0) { - utils_goto_workspace_tag(file, FALSE, line); + utils_goto_file_line(file, FALSE, line); } g_free(file); } @@ -1383,8 +1383,18 @@ { gint line; gint idx; - utils_parse_compiler_error_line(string, &idx, &line); - if (idx != -1 && line != -1) utils_goto_line(idx, line); + gchar *filename; + utils_parse_compiler_error_line(string, &filename, &line); + if (filename != NULL && line > -1) + { + // use document_open_file to find an already open file, or open it in place + idx = document_open_file(-1, filename, 0, FALSE, NULL); + // document_set_indicator will check valid idx + document_set_indicator(idx, line - 1); + // utils_goto_file_line will check valid filename. + utils_goto_file_line(filename, FALSE, line); + } + g_free(filename); } g_free(string); } Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-06-18 20:21:19 UTC (rev 461) +++ trunk/src/utils.c 2006-06-19 13:27:09 UTC (rev 462) @@ -447,7 +447,7 @@ } -gboolean utils_goto_workspace_tag(const gchar *file, gboolean is_tm_filename, gint line) +gboolean utils_goto_file_line(const gchar *file, gboolean is_tm_filename, gint line) { gint page_num; gint file_idx = document_find_by_filename(file, is_tm_filename); @@ -2299,22 +2299,22 @@ /* 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) + * and when something useful is found, it stores the line number in *line and the + * relevant file with the error in *filename. + * *line will be -1 if no error was found in string. + * *filename must be freed unless it is NULL. */ +void utils_parse_compiler_error_line(const gchar *string, gchar **filename, gint *line) { - gint idx = document_get_cur_idx(); gchar *end = NULL; gchar *path; - gchar *filename; gchar **fields; gchar *pattern; // pattern to split the error message into some fields guint field_min_len; // used to detect errors after parsing guint field_idx_line; // idx of the field where the line is guint field_idx_file; // idx of the field where the filename is + *filename = NULL; *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) @@ -2399,20 +2399,8 @@ // get the basename of the built file to get the path to look for other files path = g_path_get_dirname(doc_list[app->cur_idx].file_name); - 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); - + *filename = g_strconcat(path, G_DIR_SEPARATOR_S, fields[field_idx_file], NULL); g_free(path); - g_free(filename); - if (*idx_of_error_file != -1 && doc_list[*idx_of_error_file].is_valid && - *line == -1 && 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))); - } g_strfreev(fields); } Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2006-06-18 20:21:19 UTC (rev 461) +++ trunk/src/utils.h 2006-06-19 13:27:09 UTC (rev 462) @@ -59,7 +59,7 @@ gint utils_get_local_tag(gint idx, const gchar *qual_name); -gboolean utils_goto_workspace_tag(const gchar *file, gboolean is_tm_filename, gint line); +gboolean utils_goto_file_line(const gchar *file, gboolean is_tm_filename, gint line); gboolean utils_goto_line(gint idx, gint line); @@ -207,8 +207,10 @@ 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 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); + * and when something useful is found, it stores the line number in *line and the + * relevant file with the error in filename. + * *line will be -1 if no error was found in string. + * filename must be freed unless it is NULL. */ +void utils_parse_compiler_error_line(const gchar *string, gchar **filename, gint *line); #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2006