Commits April 2011

commits@lists.geany.org

4 participants
87 discussions

SF.net SVN: geany:[5684] trunk/src/win32.c
by eht16＠users.sourceforge.net 03 Apr '11

03 Apr '11

Revision: 5684 http://geany.svn.sourceforge.net/geany/?rev=5684&view=rev Author: eht16 Date: 2011-04-03 16:35:27 +0000 (Sun, 03 Apr 2011) Log Message: ----------- Remove unused variables Modified Paths: -------------- trunk/src/win32.c Modified: trunk/src/win32.c =================================================================== --- trunk/src/win32.c 2011-04-03 16:21:50 UTC (rev 5683) +++ trunk/src/win32.c 2011-04-03 16:35:27 UTC (rev 5684) @@ -431,7 +431,6 @@ gchar tmp[MAX_PATH]; wchar_t w_file[MAX_PATH]; wchar_t w_title[512]; - guint x; w_file[0] = '\0'; @@ -488,7 +487,6 @@ gchar tmp[MAX_PATH]; wchar_t w_file[MAX_PATH]; wchar_t w_title[512]; - guint x; w_file[0] = '\0'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5683] trunk
by eht16＠users.sourceforge.net 03 Apr '11

03 Apr '11

Revision: 5683 http://geany.svn.sourceforge.net/geany/?rev=5683&view=rev Author: eht16 Date: 2011-04-03 16:21:50 +0000 (Sun, 03 Apr 2011) Log Message: ----------- Add Scintilla's version.txt file. Modified Paths: -------------- trunk/ChangeLog trunk/scintilla/Makefile.am Added Paths: ----------- trunk/scintilla/version.txt Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-04-03 16:16:52 UTC (rev 5682) +++ trunk/ChangeLog 2011-04-03 16:21:50 UTC (rev 5683) @@ -2,6 +2,8 @@ * scintilla/*: Update Scintilla to version 2.25. + * version.txt, Makefile.am: + Add Scintilla's version.txt file. 2011-04-03 Colomban Wendling <colomban(at)geany(dot)org> Modified: trunk/scintilla/Makefile.am =================================================================== --- trunk/scintilla/Makefile.am 2011-04-03 16:16:52 UTC (rev 5682) +++ trunk/scintilla/Makefile.am 2011-04-03 16:21:50 UTC (rev 5683) @@ -126,4 +126,4 @@ glib-genmarshal --prefix scintilla_marshal gtk/scintilla-marshal.list --header > gtk/scintilla-marshal.h glib-genmarshal --prefix scintilla_marshal gtk/scintilla-marshal.list --body > gtk/scintilla-marshal.c -EXTRA_DIST=gtk/scintilla-marshal.list License.txt README +EXTRA_DIST=gtk/scintilla-marshal.list License.txt README version.txt Added: trunk/scintilla/version.txt =================================================================== --- trunk/scintilla/version.txt (rev 0) +++ trunk/scintilla/version.txt 2011-04-03 16:21:50 UTC (rev 5683) @@ -0,0 +1 @@ +225 Property changes on: trunk/scintilla/version.txt ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5682] trunk
by eht16＠users.sourceforge.net 03 Apr '11

03 Apr '11

Revision: 5682 http://geany.svn.sourceforge.net/geany/?rev=5682&view=rev Author: eht16 Date: 2011-04-03 16:16:52 +0000 (Sun, 03 Apr 2011) Log Message: ----------- Update Scintilla to version 2.25. Modified Paths: -------------- trunk/ChangeLog trunk/scintilla/Makefile.am trunk/scintilla/gtk/PlatGTK.cxx trunk/scintilla/gtk/ScintillaGTK.cxx trunk/scintilla/gtk/scintilla-marshal.c trunk/scintilla/include/Platform.h trunk/scintilla/include/SciLexer.h trunk/scintilla/include/Scintilla.h trunk/scintilla/include/Scintilla.iface trunk/scintilla/lexers/LexAda.cxx trunk/scintilla/lexers/LexAsm.cxx trunk/scintilla/lexers/LexBash.cxx trunk/scintilla/lexers/LexCOBOL.cxx trunk/scintilla/lexers/LexCPP.cxx trunk/scintilla/lexers/LexCSS.cxx trunk/scintilla/lexers/LexCmake.cxx trunk/scintilla/lexers/LexD.cxx trunk/scintilla/lexers/LexErlang.cxx trunk/scintilla/lexers/LexForth.cxx trunk/scintilla/lexers/LexFortran.cxx trunk/scintilla/lexers/LexHTML.cxx trunk/scintilla/lexers/LexLisp.cxx trunk/scintilla/lexers/LexLua.cxx trunk/scintilla/lexers/LexMarkdown.cxx trunk/scintilla/lexers/LexMatlab.cxx trunk/scintilla/lexers/LexNsis.cxx trunk/scintilla/lexers/LexOthers.cxx trunk/scintilla/lexers/LexPascal.cxx trunk/scintilla/lexers/LexPerl.cxx trunk/scintilla/lexers/LexPython.cxx trunk/scintilla/lexers/LexR.cxx trunk/scintilla/lexers/LexSQL.cxx trunk/scintilla/lexers/LexTCL.cxx trunk/scintilla/lexers/LexTxt2tags.cxx trunk/scintilla/lexers/LexVHDL.cxx trunk/scintilla/lexers/LexVerilog.cxx trunk/scintilla/lexers/LexYAML.cxx trunk/scintilla/lexlib/CharacterSet.h trunk/scintilla/lexlib/LexerBase.h trunk/scintilla/lexlib/OptionSet.h trunk/scintilla/lexlib/WordList.cxx trunk/scintilla/scintilla_changes.patch trunk/scintilla/src/AutoComplete.cxx trunk/scintilla/src/CallTip.cxx trunk/scintilla/src/Document.cxx trunk/scintilla/src/Document.h trunk/scintilla/src/Editor.cxx trunk/scintilla/src/Editor.h trunk/scintilla/src/ExternalLexer.cxx trunk/scintilla/src/ExternalLexer.h trunk/scintilla/src/Partitioning.h trunk/scintilla/src/PositionCache.cxx trunk/scintilla/src/RunStyles.cxx trunk/scintilla/src/Selection.cxx trunk/scintilla/src/Selection.h trunk/scintilla/src/SplitVector.h trunk/scintilla/src/ViewStyle.cxx trunk/scintilla/src/ViewStyle.h Added Paths: ----------- trunk/scintilla/lexlib/SparseState.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/ChangeLog 2011-04-03 16:16:52 UTC (rev 5682) @@ -1,3 +1,9 @@ +2011-04-03 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * scintilla/*: + Update Scintilla to version 2.25. + + 2011-04-03 Colomban Wendling <colomban(at)geany(dot)org> * src/main.c, src/prefs.c, src/tools.c: Modified: trunk/scintilla/Makefile.am =================================================================== --- trunk/scintilla/Makefile.am 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/Makefile.am 2011-04-03 16:16:52 UTC (rev 5682) @@ -61,6 +61,7 @@ lexlib/OptionSet.h \ lexlib/PropSetSimple.cxx \ lexlib/PropSetSimple.h \ +lexlib/SparseState.h \ lexlib/StyleContext.cxx \ lexlib/StyleContext.h \ lexlib/WordList.cxx \ Modified: trunk/scintilla/gtk/PlatGTK.cxx =================================================================== --- trunk/scintilla/gtk/PlatGTK.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/gtk/PlatGTK.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -7,6 +7,7 @@ #include <stdio.h> #include <stdlib.h> #include <stddef.h> +#include <math.h> #include <glib.h> #include <gmodule.h> @@ -39,6 +40,14 @@ #define IS_WIDGET_FOCUSSED(w) (GTK_WIDGET_HAS_FOCUS(w)) #endif +#if GTK_CHECK_VERSION(2,22,0) +#define USE_CAIRO 1 +#endif + +#ifdef USE_CAIRO +#define DISABLE_GDK_FONT 1 +#endif + #ifdef _MSC_VER // Ignore unreferenced local functions in GTK+ headers #pragma warning(disable: 4505) @@ -688,9 +697,14 @@ #endif class SurfaceImpl : public Surface { encodingType et; +#ifdef USE_CAIRO + cairo_t *context; + cairo_surface_t *psurf; +#else GdkDrawable *drawable; GdkGC *gc; GdkPixmap *ppixmap; +#endif int x; int y; bool inited; @@ -806,7 +820,15 @@ } } -SurfaceImpl::SurfaceImpl() : et(singleByte), drawable(0), gc(0), ppixmap(0), +SurfaceImpl::SurfaceImpl() : et(singleByte), +#ifdef USE_CAIRO +context(0), +psurf(0), +#else +drawable(0), +gc(0), +ppixmap(0), +#endif x(0), y(0), inited(false), createdGC(false) , pcontext(0), layout(0), characterSet(-1) { } @@ -817,15 +839,28 @@ void SurfaceImpl::Release() { et = singleByte; +#ifndef USE_CAIRO drawable = 0; +#endif if (createdGC) { createdGC = false; +#ifdef USE_CAIRO + cairo_destroy(context); +#else g_object_unref(gc); +#endif } +#ifdef USE_CAIRO + context = 0; + if (psurf) + cairo_surface_destroy(psurf); + psurf = 0; +#else gc = 0; if (ppixmap) g_object_unref(ppixmap); ppixmap = 0; +#endif if (layout) g_object_unref(layout); layout = 0; @@ -847,10 +882,28 @@ void SurfaceImpl::Init(WindowID wid) { Release(); PLATFORM_ASSERT(wid); +#ifdef USE_CAIRO + GdkDrawable *drawable_ = GDK_DRAWABLE(PWidget(wid)->window); + if (drawable_) { + context = gdk_cairo_create(drawable_); + PLATFORM_ASSERT(context); + } else { + // Shouldn't happen with valid window but may when calls made before + // window completely allocated and mapped. + psurf = cairo_image_surface_create(CAIRO_FORMAT_RGB24, 1, 1); + context = cairo_create(psurf); + } + createdGC = true; + pcontext = pango_cairo_create_context(context); + PLATFORM_ASSERT(pcontext); + layout = pango_cairo_create_layout(context); + PLATFORM_ASSERT(layout); +#else pcontext = gtk_widget_create_pango_context(PWidget(wid)); PLATFORM_ASSERT(pcontext); layout = pango_layout_new(pcontext); PLATFORM_ASSERT(layout); +#endif inited = true; } @@ -859,12 +912,27 @@ GdkDrawable *drawable_ = reinterpret_cast<GdkDrawable *>(sid); Release(); PLATFORM_ASSERT(wid); +#ifdef USE_CAIRO + context = gdk_cairo_create(drawable_); +#else + gc = gdk_gc_new(drawable_); +#endif +#ifdef USE_CAIRO + pcontext = pango_cairo_create_context(context); + PLATFORM_ASSERT(pcontext); + layout = pango_cairo_create_layout(context); + PLATFORM_ASSERT(layout); +#else pcontext = gtk_widget_create_pango_context(PWidget(wid)); layout = pango_layout_new(pcontext); drawable = drawable_; - gc = gdk_gc_new(drawable_); +#endif +#ifdef USE_CAIRO + cairo_set_line_width(context, 1); +#else // Ask for lines that do not paint the last pixel so is like Win32 gdk_gc_set_line_attributes(gc, 0, GDK_LINE_SOLID, GDK_CAP_NOT_LAST, GDK_JOIN_MITER); +#endif createdGC = true; inited = true; } @@ -873,8 +941,23 @@ PLATFORM_ASSERT(surface_); Release(); SurfaceImpl *surfImpl = static_cast<SurfaceImpl *>(surface_); + PLATFORM_ASSERT(wid); +#ifdef USE_CAIRO + context = cairo_reference(surfImpl->context); +#else PLATFORM_ASSERT(surfImpl->drawable); - PLATFORM_ASSERT(wid); + gc = gdk_gc_new(surfImpl->drawable); +#endif +#ifdef USE_CAIRO + pcontext = pango_cairo_create_context(context); + PLATFORM_ASSERT(pcontext); + layout = pango_cairo_create_layout(context); + PLATFORM_ASSERT(layout); + if (height > 0 && width > 0) + psurf = gdk_window_create_similar_surface( + gtk_widget_get_window(PWidget(wid)), + CAIRO_CONTENT_COLOR_ALPHA, width, height); +#else pcontext = gtk_widget_create_pango_context(PWidget(wid)); PLATFORM_ASSERT(pcontext); layout = pango_layout_new(pcontext); @@ -882,19 +965,42 @@ if (height > 0 && width > 0) ppixmap = gdk_pixmap_new(surfImpl->drawable, width, height, -1); drawable = ppixmap; - gc = gdk_gc_new(surfImpl->drawable); +#endif +#ifdef USE_CAIRO + cairo_destroy(context); + context = cairo_create(psurf); + cairo_rectangle(context, 0, 0, width, height); + cairo_set_source_rgb(context, 1.0, 0, 0); + cairo_fill(context); + // This produces sharp drawing more similar to GDK: + //cairo_set_antialias(context, CAIRO_ANTIALIAS_NONE); +#endif +#ifdef USE_CAIRO + cairo_set_line_width(context, 1); +#else // Ask for lines that do not paint the last pixel so is like Win32 gdk_gc_set_line_attributes(gc, 0, GDK_LINE_SOLID, GDK_CAP_NOT_LAST, GDK_JOIN_MITER); +#endif createdGC = true; inited = true; } void SurfaceImpl::PenColour(ColourAllocated fore) { +#ifdef USE_CAIRO + if (context) { + ColourDesired cdFore(fore.AsLong()); + cairo_set_source_rgb(context, + cdFore.GetBlue() / 255.0, + cdFore.GetGreen() / 255.0, + cdFore.GetRed() / 255.0); + } +#else if (gc) { GdkColor co; co.pixel = fore.AsLong(); gdk_gc_set_foreground(gc, &co); } +#endif } int SurfaceImpl::LogPixelsY() { @@ -911,18 +1017,71 @@ y = y_; } +#ifdef USE_CAIRO +static int Delta(int difference) { + if (difference < 0) + return -1; + else if (difference > 0) + return 1; + else + return 0; +} +#endif + void SurfaceImpl::LineTo(int x_, int y_) { +#ifdef USE_CAIRO + // cairo_line_to draws the end position, unlike Win32 or GDK with GDK_CAP_NOT_LAST. + // For simple cases, move back one pixel from end. + if (context) { + int xDiff = x_ - x; + int xDelta = Delta(xDiff); + int yDiff = y_ - y; + int yDelta = Delta(yDiff); + if ((xDiff == 0) || (yDiff == 0)) { + // Horizontal or vertical lines can be more precisely drawn as a filled rectangle + int xEnd = x_ - xDelta; + int left = Platform::Minimum(x, xEnd); + int width = abs(x - xEnd) + 1; + int yEnd = y_ - yDelta; + int top = Platform::Minimum(y, yEnd); + int height = abs(y - yEnd) + 1; + cairo_rectangle(context, left, top, width, height); + cairo_fill(context); + } else if ((abs(xDiff) == abs(yDiff))) { + // 45 degree slope + cairo_move_to(context, x + 0.5, y + 0.5); + cairo_line_to(context, x_ + 0.5 - xDelta, y_ + 0.5 - yDelta); + } else { + // Line has a different slope so difficult to avoid last pixel + cairo_move_to(context, x + 0.5, y + 0.5); + cairo_line_to(context, x_ + 0.5, y_ + 0.5); + } + cairo_stroke(context); + } +#else if (drawable && gc) { gdk_draw_line(drawable, gc, x, y, x_, y_); } +#endif x = x_; y = y_; } void SurfaceImpl::Polygon(Point *pts, int npts, ColourAllocated fore, ColourAllocated back) { +#ifdef USE_CAIRO + PenColour(back); + cairo_move_to(context, pts[0].x + 0.5, pts[0].y + 0.5); + for (int i = 1;i < npts;i++) { + cairo_line_to(context, pts[i].x + 0.5, pts[i].y + 0.5); + } + cairo_close_path(context); + cairo_fill_preserve(context); + PenColour(fore); + cairo_stroke(context); +#else GdkPoint gpts[20]; if (npts < static_cast<int>((sizeof(gpts) / sizeof(gpts[0])))) { for (int i = 0;i < npts;i++) { @@ -934,35 +1093,62 @@ PenColour(fore); gdk_draw_polygon(drawable, gc, 0, gpts, npts); } +#endif } void SurfaceImpl::RectangleDraw(PRectangle rc, ColourAllocated fore, ColourAllocated back) { +#ifdef USE_CAIRO + if (context) { +#else if (gc && drawable) { +#endif +#ifdef USE_CAIRO + cairo_rectangle(context, rc.left + 0.5, rc.top + 0.5, + rc.right - rc.left - 1, rc.bottom - rc.top - 1); PenColour(back); + cairo_fill_preserve(context); + PenColour(fore); + cairo_stroke(context); +#else + PenColour(back); gdk_draw_rectangle(drawable, gc, 1, rc.left + 1, rc.top + 1, rc.right - rc.left - 2, rc.bottom - rc.top - 2); - PenColour(fore); // The subtraction of 1 off the width and height here shouldn't be needed but // otherwise a different rectangle is drawn than would be done if the fill parameter == 1 gdk_draw_rectangle(drawable, gc, 0, rc.left, rc.top, rc.right - rc.left - 1, rc.bottom - rc.top - 1); +#endif } } void SurfaceImpl::FillRectangle(PRectangle rc, ColourAllocated back) { PenColour(back); +#ifdef USE_CAIRO + if (context && (rc.left < maxCoordinate)) { // Protect against out of range + cairo_rectangle(context, rc.left, rc.top, + rc.right - rc.left, rc.bottom - rc.top); + cairo_fill(context); + } +#else if (drawable && (rc.left < maxCoordinate)) { // Protect against out of range gdk_draw_rectangle(drawable, gc, 1, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top); } +#endif } void SurfaceImpl::FillRectangle(PRectangle rc, Surface &surfacePattern) { - if (static_cast<SurfaceImpl &>(surfacePattern).drawable) { + SurfaceImpl &surfi = static_cast<SurfaceImpl &>(surfacePattern); +#ifdef USE_CAIRO + bool canDraw = surfi.psurf; +#else + bool canDraw = surfi.drawable; +#endif + if (canDraw) { // Tile pattern over rectangle // Currently assumes 8x8 pattern int widthPat = 8; @@ -971,12 +1157,18 @@ int widthx = (xTile + widthPat > rc.right) ? rc.right - xTile : widthPat; for (int yTile = rc.top; yTile < rc.bottom; yTile += heightPat) { int heighty = (yTile + heightPat > rc.bottom) ? rc.bottom - yTile : heightPat; +#ifdef USE_CAIRO + cairo_set_source_surface(context, surfi.psurf, xTile, yTile); + cairo_rectangle(context, xTile, yTile, widthx, heighty); + cairo_fill(context); +#else gdk_draw_drawable(drawable, gc, static_cast<SurfaceImpl &>(surfacePattern).drawable, 0, 0, xTile, yTile, widthx, heighty); +#endif } } } else { @@ -1005,6 +1197,21 @@ } } +#ifdef USE_CAIRO + +static void PathRoundRectangle(cairo_t *context, double left, double top, double width, double height, int radius) { + double degrees = M_PI / 180.0; + + cairo_new_sub_path(context); + cairo_arc(context, left + width - radius, top + radius, radius, -90 * degrees, 0 * degrees); + cairo_arc(context, left + width - radius, top + height - radius, radius, 0 * degrees, 90 * degrees); + cairo_arc(context, left + radius, top + height - radius, radius, 90 * degrees, 180 * degrees); + cairo_arc(context, left + radius, top + radius, radius, 180 * degrees, 270 * degrees); + cairo_close_path(context); +} + +#else + // 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; @@ -1013,6 +1220,20 @@ pixels[(height-1-y)*stride+width-1-x] = val; } +static guint32 u32FromRGBA(guint8 r, guint8 g, guint8 b, guint8 a) { + union { + guint8 pixVal[4]; + guint32 val; + } converter; + converter.pixVal[0] = r; + converter.pixVal[1] = g; + converter.pixVal[2] = b; + converter.pixVal[3] = a; + return converter.val; +} + +#endif + static unsigned int GetRValue(unsigned int co) { return (co >> 16) & 0xff; } @@ -1025,20 +1246,27 @@ return co & 0xff; } -static guint32 u32FromRGBA(guint8 r, guint8 g, guint8 b, guint8 a) { - union { - guint8 pixVal[4]; - guint32 val; - } converter; - converter.pixVal[0] = r; - converter.pixVal[1] = g; - converter.pixVal[2] = b; - converter.pixVal[3] = a; - return converter.val; -} - void SurfaceImpl::AlphaRectangle(PRectangle rc, int cornerSize, ColourAllocated fill, int alphaFill, ColourAllocated outline, int alphaOutline, int flags) { +#ifdef USE_CAIRO + if (context && rc.Width() > 0) { + cairo_set_source_rgba(context, + GetRValue(fill.AsLong()) / 255.0, + GetGValue(fill.AsLong()) / 255.0, + GetBValue(fill.AsLong()) / 255.0, + alphaFill / 255.0); + PathRoundRectangle(context, rc.left + 1.0, rc.top+1.0, rc.right - rc.left - 2.0, rc.bottom - rc.top - 2.0, cornerSize); + cairo_fill(context); + + cairo_set_source_rgba(context, + GetRValue(outline.AsLong()) / 255.0, + GetGValue(outline.AsLong()) / 255.0, + GetBValue(outline.AsLong()) / 255.0, + alphaOutline / 255.0); + PathRoundRectangle(context, rc.left +0.5, rc.top+0.5, rc.right - rc.left - 1, rc.bottom - rc.top - 1, cornerSize); + cairo_stroke(context); + } +#else if (gc && drawable && rc.Width() > 0) { int width = rc.Width(); int height = rc.Height(); @@ -1078,10 +1306,18 @@ g_object_unref(pixalpha); } +#endif } void SurfaceImpl::Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back) { PenColour(back); +#ifdef USE_CAIRO + cairo_arc(context, (rc.left + rc.right) / 2 + 0.5, (rc.top + rc.bottom) / 2 + 0.5, + Platform::Minimum(rc.Width(), rc.Height()) / 2, 0, 2*M_PI); + cairo_fill_preserve(context); + PenColour(fore); + cairo_stroke(context); +#else gdk_draw_arc(drawable, gc, 1, rc.left + 1, rc.top + 1, rc.right - rc.left - 2, rc.bottom - rc.top - 2, @@ -1093,16 +1329,30 @@ rc.left, rc.top, rc.right - rc.left - 1, rc.bottom - rc.top - 1, 0, 32767); +#endif } void SurfaceImpl::Copy(PRectangle rc, Point from, Surface &surfaceSource) { - if (static_cast<SurfaceImpl &>(surfaceSource).drawable) { + SurfaceImpl &surfi = static_cast<SurfaceImpl &>(surfaceSource); +#ifdef USE_CAIRO + bool canDraw = surfi.psurf; +#else + bool canDraw = surfi.drawable; +#endif + if (canDraw) { +#ifdef USE_CAIRO + cairo_set_source_surface(context, surfi.psurf, + rc.left - from.x, rc.top - from.y); + cairo_rectangle(context, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top); + cairo_fill(context); +#else gdk_draw_drawable(drawable, gc, static_cast<SurfaceImpl &>(surfaceSource).drawable, from.x, from.y, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top); +#endif } } @@ -1232,7 +1482,11 @@ void SurfaceImpl::DrawTextBase(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore) { PenColour(fore); +#ifdef USE_CAIRO + if (context) { +#else if (gc && drawable) { +#endif int xText = rc.left; if (PFont(font_)->pfd) { char *utfForm = 0; @@ -1256,12 +1510,20 @@ pango_layout_set_text(layout, utfForm, len); } pango_layout_set_font_description(layout, PFont(font_)->pfd); +#ifdef USE_CAIRO + pango_cairo_update_layout(context, layout); +#endif #ifdef PANGO_VERSION PangoLayoutLine *pll = pango_layout_get_line_readonly(layout,0); #else PangoLayoutLine *pll = pango_layout_get_line(layout,0); #endif +#ifdef USE_CAIRO + cairo_move_to(context, xText, ybase); + pango_cairo_show_layout_line(context, pll); +#else gdk_draw_layout_line(drawable, gc, xText, ybase, pll); +#endif if (useGFree) { g_free(utfForm); } else { @@ -1717,9 +1979,14 @@ } void SurfaceImpl::SetClip(PRectangle rc) { +#ifdef USE_CAIRO + cairo_rectangle(context, rc.left, rc.top, rc.right, rc.bottom); + cairo_clip(context); +#else GdkRectangle area = {rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top}; gdk_gc_set_clip_rectangle(gc, &area); +#endif } void SurfaceImpl::FlushCachedState() {} @@ -1875,7 +2142,6 @@ gdk window coordinates */ PRectangle Window::GetMonitorRect(Point pt) { gint x_offset, y_offset; - pt = pt; gdk_window_get_origin(PWidget(wid)->window, &x_offset, &y_offset); @@ -1894,6 +2160,7 @@ return PRectangle(rect.x, rect.y, rect.x + rect.width, rect.y + rect.height); } #else + pt = pt; return PRectangle(-x_offset, -y_offset, (-x_offset) + gdk_screen_width(), (-y_offset) + gdk_screen_height()); #endif @@ -1936,7 +2203,7 @@ CallBackAction doubleClickAction; void *doubleClickActionData; - ListBoxX() : list(0), pixhash(NULL), pixbuf_renderer(0), + ListBoxX() : list(0), scroller(0), pixhash(NULL), pixbuf_renderer(0), desiredVisibleRows(5), maxItemCharacters(0), aveCharWidth(1), doubleClickAction(NULL), doubleClickActionData(NULL) { } Modified: trunk/scintilla/gtk/ScintillaGTK.cxx =================================================================== --- trunk/scintilla/gtk/ScintillaGTK.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/gtk/ScintillaGTK.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -75,6 +75,10 @@ #define IS_WIDGET_VISIBLE(w) (GTK_WIDGET_VISIBLE(w)) #endif +#if GTK_CHECK_VERSION(2,22,0) +#define USE_CAIRO 1 +#endif + #ifdef _MSC_VER // Constant conditional expressions are because of GTK+ headers #pragma warning(disable: 4127) @@ -531,7 +535,6 @@ gint ScintillaGTK::FocusInThis(GtkWidget *widget) { try { - GTK_WIDGET_SET_FLAGS(widget, GTK_HAS_FOCUS); SetFocusState(true); if (im_context != NULL) { gchar *str = NULL; @@ -562,7 +565,6 @@ gint ScintillaGTK::FocusOutThis(GtkWidget *widget) { try { - GTK_WIDGET_UNSET_FLAGS(widget, GTK_HAS_FOCUS); SetFocusState(false); if (PWidget(wPreedit) != NULL) @@ -1422,7 +1424,7 @@ UndoGroup ug(pdoc); if (selection_data->selection != GDK_SELECTION_PRIMARY) { - ClearSelection(); + ClearSelection(multiPasteMode == SC_MULTIPASTE_EACH); } SelectionPosition selStart = sel.IsRectangular() ? sel.Rectangular().Start() : @@ -1983,6 +1985,7 @@ PangoLayout *layout = gtk_widget_create_pango_layout(PWidget(wText), str); pango_layout_set_attributes(layout, attrs); +#ifndef USE_CAIRO GdkGC *gc = gdk_gc_new(widget->window); GdkColor color[2] = { {0, 0x0000, 0x0000, 0x0000}, {0, 0xffff, 0xffff, 0xffff} @@ -1997,8 +2000,8 @@ gdk_gc_set_foreground(gc, color); gdk_gc_set_background(gc, color + 1); gdk_draw_layout(widget->window, gc, 0, 0, layout); - g_object_unref(gc); +#endif g_free(str); pango_attr_list_unref(attrs); g_object_unref(layout); Modified: trunk/scintilla/gtk/scintilla-marshal.c =================================================================== --- trunk/scintilla/gtk/scintilla-marshal.c 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/gtk/scintilla-marshal.c 2011-04-03 16:16:52 UTC (rev 5682) @@ -35,8 +35,8 @@ #define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong #define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 #define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 -#define g_marshal_value_peek_enum(v) (v)->data[0].v_int -#define g_marshal_value_peek_flags(v) (v)->data[0].v_uint +#define g_marshal_value_peek_enum(v) (v)->data[0].v_long +#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong #define g_marshal_value_peek_float(v) (v)->data[0].v_float #define g_marshal_value_peek_double(v) (v)->data[0].v_double #define g_marshal_value_peek_string(v) (v)->data[0].v_pointer @@ -50,10 +50,10 @@ /* NONE:INT,POINTER (scintilla-marshal.list:1) */ void scintilla_marshal_VOID__INT_POINTER (GClosure *closure, - GValue *return_value, + GValue *return_value G_GNUC_UNUSED, guint n_param_values, const GValue *param_values, - gpointer invocation_hint, + gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) { typedef void (*GMarshalFunc_VOID__INT_POINTER) (gpointer data1, Modified: trunk/scintilla/include/Platform.h =================================================================== --- trunk/scintilla/include/Platform.h 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/include/Platform.h 2011-04-03 16:16:52 UTC (rev 5682) @@ -255,8 +255,8 @@ int allocatedLen; #endif // Private so Palette objects can not be copied - Palette(const Palette &) {} - Palette &operator=(const Palette &) { return *this; } + Palette(const Palette &); + Palette &operator=(const Palette &); public: #if PLAT_WIN void *hpal; @@ -288,8 +288,8 @@ int ascent; #endif // Private so Font objects can not be copied - Font(const Font &) {} - Font &operator=(const Font &) { fid=0; return *this; } + Font(const Font &); + Font &operator=(const Font &); public: Font(); virtual ~Font(); Modified: trunk/scintilla/include/SciLexer.h =================================================================== --- trunk/scintilla/include/SciLexer.h 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/include/SciLexer.h 2011-04-03 16:16:52 UTC (rev 5682) @@ -112,6 +112,8 @@ #define SCLEX_SML 97 #define SCLEX_MARKDOWN 98 #define SCLEX_TXT2TAGS 99 +#define SCLEX_A68K 100 +#define SCLEX_MODULA 101 #define SCLEX_AUTOMATIC 1000 #define SCE_P_DEFAULT 0 #define SCE_P_COMMENTLINE 1 @@ -149,6 +151,8 @@ #define SCE_C_COMMENTDOCKEYWORD 17 #define SCE_C_COMMENTDOCKEYWORDERROR 18 #define SCE_C_GLOBALCLASS 19 +#define SCE_C_STRINGRAW 20 +#define SCE_C_TRIPLEVERBATIM 21 #define SCE_D_DEFAULT 0 #define SCE_D_COMMENT 1 #define SCE_D_COMMENTLINE 2 @@ -601,6 +605,7 @@ #define SCE_ASM_CHARACTER 12 #define SCE_ASM_STRINGEOL 13 #define SCE_ASM_EXTINSTRUCTION 14 +#define SCE_ASM_COMMENTDIRECTIVE 15 #define SCE_F_DEFAULT 0 #define SCE_F_COMMENT 1 #define SCE_F_NUMBER 2 @@ -1415,6 +1420,43 @@ #define SCE_TXT2TAGS_OPTION 23 #define SCE_TXT2TAGS_PREPROC 24 #define SCE_TXT2TAGS_POSTPROC 25 +#define SCE_A68K_DEFAULT 0 +#define SCE_A68K_COMMENT 1 +#define SCE_A68K_NUMBER_DEC 2 +#define SCE_A68K_NUMBER_BIN 3 +#define SCE_A68K_NUMBER_HEX 4 +#define SCE_A68K_STRING1 5 +#define SCE_A68K_OPERATOR 6 +#define SCE_A68K_CPUINSTRUCTION 7 +#define SCE_A68K_EXTINSTRUCTION 8 +#define SCE_A68K_REGISTER 9 +#define SCE_A68K_DIRECTIVE 10 +#define SCE_A68K_MACRO_ARG 11 +#define SCE_A68K_LABEL 12 +#define SCE_A68K_STRING2 13 +#define SCE_A68K_IDENTIFIER 14 +#define SCE_A68K_MACRO_DECLARATION 15 +#define SCE_A68K_COMMENT_WORD 16 +#define SCE_A68K_COMMENT_SPECIAL 17 +#define SCE_A68K_COMMENT_DOXYGEN 18 +#define SCE_MODULA_DEFAULT 0 +#define SCE_MODULA_COMMENT 1 +#define SCE_MODULA_DOXYCOMM 2 +#define SCE_MODULA_DOXYKEY 3 +#define SCE_MODULA_KEYWORD 4 +#define SCE_MODULA_RESERVED 5 +#define SCE_MODULA_NUMBER 6 +#define SCE_MODULA_BASENUM 7 +#define SCE_MODULA_FLOAT 8 +#define SCE_MODULA_STRING 9 +#define SCE_MODULA_STRSPEC 10 +#define SCE_MODULA_CHAR 11 +#define SCE_MODULA_CHARSPEC 12 +#define SCE_MODULA_PROC 13 +#define SCE_MODULA_PRAGMA 14 +#define SCE_MODULA_PRGKEY 15 +#define SCE_MODULA_OPERATOR 16 +#define SCE_MODULA_BADSTR 17 /* --Autogenerated -- end of section automatically generated from Scintilla.iface */ #endif Modified: trunk/scintilla/include/Scintilla.h =================================================================== --- trunk/scintilla/include/Scintilla.h 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/include/Scintilla.h 2011-04-03 16:16:52 UTC (rev 5682) @@ -159,6 +159,8 @@ #define SCI_GETMARGINMASKN 2245 #define SCI_SETMARGINSENSITIVEN 2246 #define SCI_GETMARGINSENSITIVEN 2247 +#define SCI_SETMARGINCURSORN 2248 +#define SCI_GETMARGINCURSORN 2249 #define STYLE_DEFAULT 32 #define STYLE_LINENUMBER 33 #define STYLE_BRACELIGHT 34 @@ -590,7 +592,9 @@ #define SCI_SETMOUSEDOWNCAPTURES 2384 #define SCI_GETMOUSEDOWNCAPTURES 2385 #define SC_CURSORNORMAL -1 +#define SC_CURSORARROW 2 #define SC_CURSORWAIT 4 +#define SC_CURSORREVERSEARROW 7 #define SCI_SETCURSOR 2386 #define SCI_GETCURSOR 2387 #define SCI_SETCONTROLCHARSYMBOL 2388 @@ -832,6 +836,10 @@ #define SC_MOD_CONTAINER 0x40000 #define SC_MOD_LEXERSTATE 0x80000 #define SC_MODEVENTMASKALL 0xFFFFF +#define SC_UPDATE_CONTENT 0x1 +#define SC_UPDATE_SELECTION 0x2 +#define SC_UPDATE_V_SCROLL 0x4 +#define SC_UPDATE_H_SCROLL 0x8 #define SCEN_CHANGE 768 #define SCEN_SETFOCUS 512 #define SCEN_KILLFOCUS 256 @@ -971,6 +979,7 @@ int y; /* SCN_DWELLSTART, SCN_DWELLEND */ int token; /* SCN_MODIFIED with SC_MOD_CONTAINER */ int annotationLinesAdded; /* SC_MOD_CHANGEANNOTATION */ + int updated; /* SCN_UPDATEUI */ }; #ifdef SCI_NAMESPACE Modified: trunk/scintilla/include/Scintilla.iface =================================================================== --- trunk/scintilla/include/Scintilla.iface 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/include/Scintilla.iface 2011-04-03 16:16:52 UTC (rev 5682) @@ -352,6 +352,12 @@ # Retrieve the mouse click sensitivity of a margin. get bool GetMarginSensitiveN=2247(int margin,) +# Set the cursor shown when the mouse is inside a margin. +set void SetMarginCursorN=2248(int margin, int cursor) + +# Retrieve the cursor shown in a margin. +get int GetMarginCursorN=2249(int margin,) + # Styles in range 32..38 are predefined for parts of the UI and are not used as normal styles. # Style 39 is for future use. enu StylesCommon=STYLE_ @@ -1540,7 +1546,9 @@ enu CursorShape=SC_CURSOR val SC_CURSORNORMAL=-1 +val SC_CURSORARROW=2 val SC_CURSORWAIT=4 +val SC_CURSORREVERSEARROW=7 # Sets the cursor to one of the SC_CURSOR* values. set void SetCursor=2386(int cursorType,) # Get cursor type. @@ -2193,6 +2201,12 @@ val SC_MOD_LEXERSTATE=0x80000 val SC_MODEVENTMASKALL=0xFFFFF +enu Update=SC_UPDATE_ +val SC_UPDATE_CONTENT=0x1 +val SC_UPDATE_SELECTION=0x2 +val SC_UPDATE_V_SCROLL=0x4 +val SC_UPDATE_H_SCROLL=0x8 + # For compatibility, these go through the COMMAND notification rather than NOTIFY # and should have had exactly the same values as the EN_* constants. # Unfortunately the SETFOCUS and KILLFOCUS are flipped over from EN_* @@ -2335,6 +2349,8 @@ val SCLEX_SML=97 val SCLEX_MARKDOWN=98 val SCLEX_TXT2TAGS=99 +val SCLEX_A68K=100 +val SCLEX_MODULA=101 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a # value assigned in sequence from SCLEX_AUTOMATIC+1. @@ -2381,6 +2397,8 @@ val SCE_C_COMMENTDOCKEYWORD=17 val SCE_C_COMMENTDOCKEYWORDERROR=18 val SCE_C_GLOBALCLASS=19 +val SCE_C_STRINGRAW=20 +val SCE_C_TRIPLEVERBATIM=21 # Lexical states for SCLEX_D lex D=SCLEX_D SCE_D_ val SCE_D_DEFAULT=0 @@ -2900,6 +2918,7 @@ val SCE_ASM_CHARACTER=12 val SCE_ASM_STRINGEOL=13 val SCE_ASM_EXTINSTRUCTION=14 +val SCE_ASM_COMMENTDIRECTIVE=15 # Lexical states for SCLEX_FORTRAN lex Fortran=SCLEX_FORTRAN SCE_F_ lex F77=SCLEX_F77 SCE_F_ @@ -3819,6 +3838,47 @@ val SCE_TXT2TAGS_OPTION=23 val SCE_TXT2TAGS_PREPROC=24 val SCE_TXT2TAGS_POSTPROC=25 +# Lexical states for SCLEX_A68K +lex A68k=SCLEX_A68K SCE_A68K_ +val SCE_A68K_DEFAULT=0 +val SCE_A68K_COMMENT=1 +val SCE_A68K_NUMBER_DEC=2 +val SCE_A68K_NUMBER_BIN=3 +val SCE_A68K_NUMBER_HEX=4 +val SCE_A68K_STRING1=5 +val SCE_A68K_OPERATOR=6 +val SCE_A68K_CPUINSTRUCTION=7 +val SCE_A68K_EXTINSTRUCTION=8 +val SCE_A68K_REGISTER=9 +val SCE_A68K_DIRECTIVE=10 +val SCE_A68K_MACRO_ARG=11 +val SCE_A68K_LABEL=12 +val SCE_A68K_STRING2=13 +val SCE_A68K_IDENTIFIER=14 +val SCE_A68K_MACRO_DECLARATION=15 +val SCE_A68K_COMMENT_WORD=16 +val SCE_A68K_COMMENT_SPECIAL=17 +val SCE_A68K_COMMENT_DOXYGEN=18 +# Lexical states for SCLEX_MODULA +lex Modula=SCLEX_MODULA SCE_MODULA_ +val SCE_MODULA_DEFAULT=0 +val SCE_MODULA_COMMENT=1 +val SCE_MODULA_DOXYCOMM=2 +val SCE_MODULA_DOXYKEY=3 +val SCE_MODULA_KEYWORD=4 +val SCE_MODULA_RESERVED=5 +val SCE_MODULA_NUMBER=6 +val SCE_MODULA_BASENUM=7 +val SCE_MODULA_FLOAT=8 +val SCE_MODULA_STRING=9 +val SCE_MODULA_STRSPEC=10 +val SCE_MODULA_CHAR=11 +val SCE_MODULA_CHARSPEC=12 +val SCE_MODULA_PROC=13 +val SCE_MODULA_PRAGMA=14 +val SCE_MODULA_PRGKEY=15 +val SCE_MODULA_OPERATOR=16 +val SCE_MODULA_BADSTR=17 # Events Modified: trunk/scintilla/lexers/LexAda.cxx =================================================================== --- trunk/scintilla/lexers/LexAda.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexAda.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -17,7 +17,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: trunk/scintilla/lexers/LexAsm.cxx =================================================================== --- trunk/scintilla/lexers/LexAsm.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexAsm.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -4,6 +4,7 @@ ** Written by The Black Horus ** Enhancements and NASM stuff by Kein-Hong Man, 2003-10 ** SCE_ASM_COMMENTBLOCK and SCE_ASM_CHARACTER are for future GNU as colouring + ** Converted to lexer object and added further folding features/properties by "Udo Lechner" <dlchnr(at)gmx(dot)net> **/ // Copyright 1998-2003 by Neil Hodgson <neilh(a)scintilla.org> // The License.txt file describes the conditions under which this software may be distributed. @@ -15,17 +16,24 @@ #include <assert.h> #include <ctype.h> +#ifdef _MSC_VER +#pragma warning(disable: 4786) +#endif + +#include <string> +#include <map> +#include <set> + #include "ILexer.h" #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" -#include "Accessor.h" #include "StyleContext.h" #include "CharacterSet.h" #include "LexerModule.h" +#include "OptionSet.h" #ifdef SCI_NAMESPACE using namespace Scintilla; @@ -54,16 +62,185 @@ return false; } -static void ColouriseAsmDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], - Accessor &styler) { +static bool IsStreamCommentStyle(int style) { + return style == SCE_ASM_COMMENTDIRECTIVE || style == SCE_ASM_COMMENTBLOCK; +} - WordList &cpuInstruction = *keywordlists[0]; - WordList &mathInstruction = *keywordlists[1]; - WordList &registers = *keywordlists[2]; - WordList &directive = *keywordlists[3]; - WordList &directiveOperand = *keywordlists[4]; - WordList &extInstruction = *keywordlists[5]; +static inline int LowerCase(int c) { + if (c >= 'A' && c <= 'Z') + return 'a' + c - 'A'; + return c; +} +// An individual named option for use in an OptionSet + +// Options used for LexerAsm +struct OptionsAsm { + std::string delimiter; + bool fold; + bool foldSyntaxBased; + bool foldCommentMultiline; + bool foldCommentExplicit; + std::string foldExplicitStart; + std::string foldExplicitEnd; + bool foldExplicitAnywhere; + bool foldCompact; + OptionsAsm() { + delimiter = ""; + fold = false; + foldSyntaxBased = true; + foldCommentMultiline = false; + foldCommentExplicit = false; + foldExplicitStart = ""; + foldExplicitEnd = ""; + foldExplicitAnywhere = false; + foldCompact = true; + } +}; + +static const char * const asmWordListDesc[] = { + "CPU instructions", + "FPU instructions", + "Registers", + "Directives", + "Directive operands", + "Extended instructions", + "Directives4Foldstart", + "Directives4Foldend", + 0 +}; + +struct OptionSetAsm : public OptionSet<OptionsAsm> { + OptionSetAsm() { + DefineProperty("lexer.asm.comment.delimiter", &OptionsAsm::delimiter, + "Character used for COMMENT directive's delimiter, replacing the standard \"~\"."); + + DefineProperty("fold", &OptionsAsm::fold); + + DefineProperty("fold.asm.syntax.based", &OptionsAsm::foldSyntaxBased, + "Set this property to 0 to disable syntax based folding."); + + DefineProperty("fold.asm.comment.multiline", &OptionsAsm::foldCommentMultiline, + "Set this property to 1 to enable folding multi-line comments."); + + DefineProperty("fold.asm.comment.explicit", &OptionsAsm::foldCommentExplicit, + "This option enables folding explicit fold points when using the Asm lexer. " + "Explicit fold points allows adding extra folding by placing a ;{ comment at the start and a ;} " + "at the end of a section that should fold."); + + DefineProperty("fold.asm.explicit.start", &OptionsAsm::foldExplicitStart, + "The string to use for explicit fold start points, replacing the standard ;{."); + + DefineProperty("fold.asm.explicit.end", &OptionsAsm::foldExplicitEnd, + "The string to use for explicit fold end points, replacing the standard ;}."); + + DefineProperty("fold.asm.explicit.anywhere", &OptionsAsm::foldExplicitAnywhere, + "Set this property to 1 to enable explicit fold points anywhere, not just in line comments."); + + DefineProperty("fold.compact", &OptionsAsm::foldCompact); + + DefineWordListSets(asmWordListDesc); + } +}; + +class LexerAsm : public ILexer { + WordList cpuInstruction; + WordList mathInstruction; + WordList registers; + WordList directive; + WordList directiveOperand; + WordList extInstruction; + WordList directives4foldstart; + WordList directives4foldend; + OptionsAsm options; + OptionSetAsm osAsm; +public: + LexerAsm() { + } + ~LexerAsm() { + } + void SCI_METHOD Release() { + delete this; + } + int SCI_METHOD Version() const { + return lvOriginal; + } + const char * SCI_METHOD PropertyNames() { + return osAsm.PropertyNames(); + } + int SCI_METHOD PropertyType(const char *name) { + return osAsm.PropertyType(name); + } + const char * SCI_METHOD DescribeProperty(const char *name) { + return osAsm.DescribeProperty(name); + } + int SCI_METHOD PropertySet(const char *key, const char *val); + const char * SCI_METHOD DescribeWordListSets() { + return osAsm.DescribeWordListSets(); + } + int SCI_METHOD WordListSet(int n, const char *wl); + void SCI_METHOD Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess); + void SCI_METHOD Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess); + + void * SCI_METHOD PrivateCall(int, void *) { + return 0; + } + + static ILexer *LexerFactoryAsm() { + return new LexerAsm(); + } +}; + +int SCI_METHOD LexerAsm::PropertySet(const char *key, const char *val) { + if (osAsm.PropertySet(&options, key, val)) { + return 0; + } + return -1; +} + +int SCI_METHOD LexerAsm::WordListSet(int n, const char *wl) { + WordList *wordListN = 0; + switch (n) { + case 0: + wordListN = &cpuInstruction; + break; + case 1: + wordListN = &mathInstruction; + break; + case 2: + wordListN = &registers; + break; + case 3: + wordListN = &directive; + break; + case 4: + wordListN = &directiveOperand; + break; + case 5: + wordListN = &extInstruction; + break; + case 6: + wordListN = &directives4foldstart; + break; + case 7: + wordListN = &directives4foldend; + break; + } + int firstModification = -1; + if (wordListN) { + WordList wlNew; + wlNew.Set(wl); + if (*wordListN != wlNew) { + wordListN->Set(wl); + firstModification = 0; + } + } + return firstModification; +} + +void SCI_METHOD LexerAsm::Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { + LexAccessor styler(pAccess); + // Do not leak onto next line if (initStyle == SCE_ASM_STRINGEOL) initStyle = SCE_ASM_DEFAULT; @@ -96,7 +273,7 @@ if (!IsAsmOperator(sc.ch)) { sc.SetState(SCE_ASM_DEFAULT); } - }else if (sc.state == SCE_ASM_NUMBER) { + } else if (sc.state == SCE_ASM_NUMBER) { if (!IsAWordChar(sc.ch)) { sc.SetState(SCE_ASM_DEFAULT); } @@ -104,6 +281,7 @@ if (!IsAWordChar(sc.ch) ) { char s[100]; sc.GetCurrentLowered(s, sizeof(s)); + bool IsDirective = false; if (cpuInstruction.InList(s)) { sc.ChangeState(SCE_ASM_CPUINSTRUCTION); @@ -113,15 +291,32 @@ sc.ChangeState(SCE_ASM_REGISTER); } else if (directive.InList(s)) { sc.ChangeState(SCE_ASM_DIRECTIVE); + IsDirective = true; } else if (directiveOperand.InList(s)) { sc.ChangeState(SCE_ASM_DIRECTIVEOPERAND); } else if (extInstruction.InList(s)) { sc.ChangeState(SCE_ASM_EXTINSTRUCTION); } sc.SetState(SCE_ASM_DEFAULT); + if (IsDirective && !strcmp(s, "comment")) { + char delimiter = options.delimiter.empty() ? '~' : options.delimiter.c_str()[0]; + while (IsASpaceOrTab(sc.ch) && !sc.atLineEnd) { + sc.ForwardSetState(SCE_ASM_DEFAULT); + } + if (sc.ch == delimiter) { + sc.SetState(SCE_ASM_COMMENTDIRECTIVE); + } + } } - } - else if (sc.state == SCE_ASM_COMMENT ) { + } else if (sc.state == SCE_ASM_COMMENTDIRECTIVE) { + char delimiter = options.delimiter.empty() ? '~' : options.delimiter.c_str()[0]; + if (sc.ch == delimiter) { + while (!sc.atLineEnd) { + sc.Forward(); + } + sc.SetState(SCE_ASM_DEFAULT); + } + } else if (sc.state == SCE_ASM_COMMENT ) { if (sc.atLineEnd) { sc.SetState(SCE_ASM_DEFAULT); } @@ -170,15 +365,100 @@ sc.Complete(); } -static const char * const asmWordListDesc[] = { - "CPU instructions", - "FPU instructions", - "Registers", - "Directives", - "Directive operands", - "Extended instructions", - 0 -}; +// Store both the current line's fold level and the next lines in the +// level store to make it easy to pick up with each increment +// and to make it possible to fiddle the current level for "else". -LexerModule lmAsm(SCLEX_ASM, ColouriseAsmDoc, "asm", 0, asmWordListDesc); +void SCI_METHOD LexerAsm::Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { + if (!options.fold) + return; + + LexAccessor styler(pAccess); + + unsigned int endPos = startPos + length; + int visibleChars = 0; + int lineCurrent = styler.GetLine(startPos); + int levelCurrent = SC_FOLDLEVELBASE; + if (lineCurrent > 0) + levelCurrent = styler.LevelAt(lineCurrent-1) >> 16; + int levelNext = levelCurrent; + char chNext = styler[startPos]; + int styleNext = styler.StyleAt(startPos); + int style = initStyle; + char word[100]; + int wordlen = 0; + const bool userDefinedFoldMarkers = !options.foldExplicitStart.empty() && !options.foldExplicitEnd.empty(); + for (unsigned int i = startPos; i < endPos; i++) { + char ch = chNext; + chNext = styler.SafeGetCharAt(i + 1); + int stylePrev = style; + style = styleNext; + styleNext = styler.StyleAt(i + 1); + bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); + if (options.foldCommentMultiline && IsStreamCommentStyle(style)) { + if (!IsStreamCommentStyle(stylePrev)) { + levelNext++; + } else if (!IsStreamCommentStyle(styleNext) && !atEOL) { + // Comments don't end at end of line and the next character may be unstyled. + levelNext--; + } + } + if (options.foldCommentExplicit && ((style == SCE_ASM_COMMENT) || options.foldExplicitAnywhere)) { + if (userDefinedFoldMarkers) { + if (styler.Match(i, options.foldExplicitStart.c_str())) { + levelNext++; + } else if (styler.Match(i, options.foldExplicitEnd.c_str())) { + levelNext--; + } + } else { + if (ch == ';') { + if (chNext == '{') { + levelNext++; + } else if (chNext == '}') { + levelNext--; + } + } + } + } + if (options.foldSyntaxBased && (style == SCE_ASM_DIRECTIVE)) { + word[wordlen++] = static_cast<char>(LowerCase(ch)); + if (wordlen == 100) { // prevent overflow + word[0] = '\0'; + wordlen = 1; + } + if (styleNext != SCE_ASM_DIRECTIVE) { // reading directive ready + word[wordlen] = '\0'; + wordlen = 0; + if (directives4foldstart.InList(word)) { + levelNext++; + } else if (directives4foldend.InList(word)){ + levelNext--; + } + } + } + if (!IsASpace(ch)) + visibleChars++; + if (atEOL || (i == endPos-1)) { + int levelUse = levelCurrent; + int lev = levelUse | levelNext << 16; + if (visibleChars == 0 && options.foldCompact) + lev |= SC_FOLDLEVELWHITEFLAG; + if (levelUse < levelNext) + lev |= SC_FOLDLEVELHEADERFLAG; + if (lev != styler.LevelAt(lineCurrent)) { + styler.SetLevel(lineCurrent, lev); + } + lineCurrent++; + levelCurrent = levelNext; + if (atEOL && (i == static_cast<unsigned int>(styler.Length()-1))) { + // There is an empty line at end of file so give it same level and empty + styler.SetLevel(lineCurrent, (levelCurrent | levelCurrent << 16) | SC_FOLDLEVELWHITEFLAG); + } + visibleChars = 0; + } + } +} + +LexerModule lmAsm(SCLEX_ASM, LexerAsm::LexerFactoryAsm, "asm", asmWordListDesc); + Modified: trunk/scintilla/lexers/LexBash.cxx =================================================================== --- trunk/scintilla/lexers/LexBash.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexBash.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -16,7 +16,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" @@ -640,6 +639,14 @@ levelCurrent--; } } + // Here Document folding + if (style == SCE_SH_HERE_DELIM) { + if (ch == '<' && chNext == '<') { + levelCurrent++; + } + } else if (style == SCE_SH_HERE_Q && styler.StyleAt(i+1) == SCE_PL_DEFAULT) { + levelCurrent--; + } if (atEOL) { int lev = levelPrev; if (visibleChars == 0 && foldCompact) Modified: trunk/scintilla/lexers/LexCOBOL.cxx =================================================================== --- trunk/scintilla/lexers/LexCOBOL.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexCOBOL.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -19,7 +19,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: trunk/scintilla/lexers/LexCPP.cxx =================================================================== --- trunk/scintilla/lexers/LexCPP.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexCPP.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -1,6 +1,7 @@ // Scintilla source code edit control /** @file LexCPP.cxx ** Lexer for C++, C, Java, and JavaScript. + ** Further folding features and configuration properties added by "Udo Lechner" <dlchnr(at)gmx(dot)net> **/ // Copyright 1998-2005 by Neil Hodgson <neilh(a)scintilla.org> // The License.txt file describes the conditions under which this software may be distributed. @@ -15,10 +16,6 @@ #ifdef _MSC_VER #pragma warning(disable: 4786) #endif -#ifdef __BORLANDC__ -// Borland C++ displays warnings in vector header without this -#pragma option -w-ccc -w-rch -#endif #include <string> #include <vector> @@ -29,7 +26,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" @@ -37,6 +33,7 @@ #include "CharacterSet.h" #include "LexerModule.h" #include "OptionSet.h" +#include "SparseState.h" #ifdef SCI_NAMESPACE using namespace Scintilla; @@ -212,8 +209,13 @@ bool trackPreprocessor; bool updatePreprocessor; bool fold; + bool foldSyntaxBased; bool foldComment; + bool foldCommentMultiline; bool foldCommentExplicit; + std::string foldExplicitStart; + std::string foldExplicitEnd; + bool foldExplicitAnywhere; bool foldPreprocessor; bool foldCompact; bool foldAtElse; @@ -223,8 +225,13 @@ trackPreprocessor = true; updatePreprocessor = true; fold = false; + foldSyntaxBased = true; foldComment = false; + foldCommentMultiline = true; foldCommentExplicit = true; + foldExplicitStart = ""; + foldExplicitEnd = ""; + foldExplicitAnywhere = false; foldPreprocessor = false; foldCompact = false; foldAtElse = false; @@ -258,14 +265,29 @@ DefineProperty("fold", &OptionsCPP::fold); + DefineProperty("fold.cpp.syntax.based", &OptionsCPP::foldSyntaxBased, + "Set this property to 0 to disable syntax based folding."); + DefineProperty("fold.comment", &OptionsCPP::foldComment, "This option enables folding multi-line comments and explicit fold points when using the C++ lexer. " "Explicit fold points allows adding extra folding by placing a //{ comment at the start and a //} " "at the end of a section that should fold."); + DefineProperty("fold.cpp.comment.multiline", &OptionsCPP::foldCommentMultiline, + "Set this property to 0 to disable folding multi-line comments when fold.comment=1."); + DefineProperty("fold.cpp.comment.explicit", &OptionsCPP::foldCommentExplicit, "Set this property to 0 to disable folding explicit fold points when fold.comment=1."); + DefineProperty("fold.cpp.explicit.start", &OptionsCPP::foldExplicitStart, + "The string to use for explicit fold start points, replacing the standard //{."); + + DefineProperty("fold.cpp.explicit.end", &OptionsCPP::foldExplicitEnd, + "The string to use for explicit fold end points, replacing the standard //}."); + + DefineProperty("fold.cpp.explicit.anywhere", &OptionsCPP::foldExplicitAnywhere, + "Set this property to 1 to enable explicit fold points anywhere, not just in line comments."); + DefineProperty("fold.preprocessor", &OptionsCPP::foldPreprocessor, "This option enables folding preprocessor directives when using the C++ lexer. " "Includes C#'s explicit #region and #endregion folding directives."); @@ -288,7 +310,6 @@ CharacterSet setLogicalOp; PPStates vlls; std::vector<PPDefinition> ppDefineHistory; - PropSetSimple props; WordList keywords; WordList keywords2; WordList keywords3; @@ -297,6 +318,7 @@ std::map<std::string, std::string> preprocessorDefinitionsStart; OptionsCPP options; OptionSetCPP osCPP; + SparseState<std::string> rawStringTerminators; public: LexerCPP(bool caseSensitive_) : caseSensitive(caseSensitive_), @@ -419,7 +441,6 @@ CharacterSet setDoxygen(CharacterSet::setAlpha, "$@\\&<>#{}[]"); CharacterSet setWordStart(CharacterSet::setAlpha, "_", 0x80, true); - CharacterSet setWord(CharacterSet::setAlphaNum, "._", 0x80, true); if (options.identifiersAllowDollars) { setWordStart.Add('$'); @@ -483,16 +504,18 @@ } const int maskActivity = 0x3F; + std::string rawStringTerminator = rawStringTerminators.ValueAt(lineCurrent-1); + SparseState<std::string> rawSTNew(lineCurrent); int activitySet = preproc.IsInactive() ? 0x40 : 0; for (; sc.More(); sc.Forward()) { if (sc.atLineStart) { - if (sc.state == SCE_C_STRING) { + if ((sc.state == SCE_C_STRING) || (sc.state == SCE_C_CHARACTER)) { // Prevent SCE_C_STRINGEOL from leaking back to previous line which // ends with a line continuation by locking in the state upto this position. - sc.SetState(SCE_C_STRING); + sc.SetState(sc.state); } // Reset states to begining of colourise so no surprises // if different sets of lines lexed. @@ -515,6 +538,9 @@ if (sc.atLineEnd) { lineCurrent++; vlls.Add(lineCurrent, preproc); + if (rawStringTerminator != "") { + rawSTNew.Set(lineCurrent-1, rawStringTerminator); + } } // Handle line continuation generically. @@ -558,6 +584,23 @@ } else if (keywords4.InList(s)) { sc.ChangeState(SCE_C_GLOBALCLASS|activitySet); } + const bool literalString = sc.ch == '\"'; + if (literalString || sc.ch == '\'') { + size_t lenS = strlen(s); + const bool raw = literalString && sc.chPrev == 'R'; + if (raw) + s[lenS--] = '\0'; + bool valid = + (lenS == 0) || + ((lenS == 1) && ((s[0] == 'L') || (s[0] == 'u') || (s[0] == 'U'))) || + ((lenS == 2) && literalString && (s[0] == 'u') && (s[1] == '8')); + if (valid) { + if (literalString) + sc.ChangeState((raw ? SCE_C_STRINGRAW : SCE_C_STRING)|activitySet); + else + sc.ChangeState(SCE_C_CHARACTER|activitySet); + } + } sc.SetState(SCE_C_DEFAULT|activitySet); } break; @@ -642,6 +685,14 @@ sc.ForwardSetState(SCE_C_DEFAULT|activitySet); } break; + case SCE_C_STRINGRAW: + if (sc.Match(rawStringTerminator.c_str())) { + for (size_t termPos=rawStringTerminator.size(); termPos; termPos--) + sc.Forward(); + sc.SetState(SCE_C_DEFAULT|activitySet); + rawStringTerminator = ""; + } + break; case SCE_C_CHARACTER: if (sc.atLineEnd) { sc.ChangeState(SCE_C_STRINGEOL|activitySet); @@ -682,6 +733,14 @@ } } break; + case SCE_C_TRIPLEVERBATIM: + if (sc.Match ("\"\"\"")) { + while (sc.Match('"')) { + sc.Forward(); + } + sc.SetState(SCE_C_DEFAULT|activitySet); + } + break; case SCE_C_UUID: if (sc.ch == '\r' || sc.ch == '\n' || sc.ch == ')') { sc.SetState(SCE_C_DEFAULT|activitySet); @@ -699,6 +758,9 @@ if (sc.Match('@', '\"')) { sc.SetState(SCE_C_VERBATIM|activitySet); sc.Forward(); + } else if (sc.Match("\"\"\"")) { + sc.SetState(SCE_C_TRIPLEVERBATIM|activitySet); + sc.Forward(2); } else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) { if (lastWordWasUUID) { sc.SetState(SCE_C_UUID|activitySet); @@ -733,7 +795,19 @@ || !FollowsPostfixOperator(sc, styler))) { sc.SetState(SCE_C_REGEX|activitySet); // JavaScript's RegEx } else if (sc.ch == '\"') { - sc.SetState(SCE_C_STRING|activitySet); + if (sc.chPrev == 'R') { + sc.SetState(SCE_C_STRINGRAW|activitySet); + rawStringTerminator = ")"; + for (int termPos = sc.currentPos + 1;;termPos++) { + char chTerminator = styler.SafeGetCharAt(termPos, '('); + if (chTerminator == '(') + break; + rawStringTerminator += chTerminator; + } + rawStringTerminator += '\"'; + } else { + sc.SetState(SCE_C_STRING|activitySet); + } isIncludePreprocessor = false; // ensure that '>' won't end the string } else if (isIncludePreprocessor && sc.ch == '<') { sc.SetState(SCE_C_STRING|activitySet); @@ -828,10 +902,10 @@ } continuationLine = false; } - if (definitionsChanged) + const bool rawStringsChanged = rawStringTerminators.Merge(rawSTNew, lineCurrent); + if (definitionsChanged || rawStringsChanged) styler.ChangeLexerState(startPos, startPos + length); sc.Complete(); - styler.Flush(); } // Store both the current line's fold level and the next lines in the @@ -856,6 +930,7 @@ char chNext = styler[startPos]; int styleNext = styler.StyleAt(startPos); int style = initStyle; + const bool userDefinedFoldMarkers = !options.foldExplicitStart.empty() && !options.foldExplicitEnd.empty(); for (unsigned int i = startPos; i < endPos; i++) { char ch = chNext; chNext = styler.SafeGetCharAt(i + 1); @@ -863,7 +938,7 @@ style = styleNext; styleNext = styler.StyleAt(i + 1); bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); - if (options.foldComment && IsStreamCommentStyle(style)) { + if (options.foldComment && options.foldCommentMultiline && IsStreamCommentStyle(style)) { if (!IsStreamCommentStyle(stylePrev) && (stylePrev != SCE_C_COMMENTLINEDOC)) { levelNext++; } else if (!IsStreamCommentStyle(styleNext) && (styleNext != SCE_C_COMMENTLINEDOC) && !atEOL) { @@ -871,14 +946,22 @@ levelNext--; } } - if (options.foldComment && options.foldCommentExplicit && (style == SCE_C_COMMENTLINE)) { - if ((ch == '/') && (chNext == '/')) { - char chNext2 = styler.SafeGetCharAt(i + 2); - if (chNext2 == '{') { + if (options.foldComment && options.foldCommentExplicit && ((style == SCE_C_COMMENTLINE) || options.foldExplicitAnywhere)) { + if (userDefinedFoldMarkers) { + if (styler.Match(i, options.foldExplicitStart.c_str())) { levelNext++; - } else if (chNext2 == '}') { + } else if (styler.Match(i, options.foldExplicitEnd.c_str())) { levelNext--; } + } else { + if ((ch == '/') && (chNext == '/')) { + char chNext2 = styler.SafeGetCharAt(i + 2); + if (chNext2 == '{') { + levelNext++; + } else if (chNext2 == '}') { + levelNext--; + } + } } } if (options.foldPreprocessor && (style == SCE_C_PREPROCESSOR)) { @@ -894,7 +977,7 @@ } } } - if (style == SCE_C_OPERATOR) { + if (options.foldSyntaxBased && (style == SCE_C_OPERATOR)) { if (ch == '{') { // Measure the minimum before a '{' to allow // folding on "} else {" @@ -910,7 +993,7 @@ visibleChars++; if (atEOL || (i == endPos-1)) { int levelUse = levelCurrent; - if (options.foldAtElse) { + if (options.foldSyntaxBased && options.foldAtElse) { levelUse = levelMinCurrent; } int lev = levelUse | levelNext << 16; Modified: trunk/scintilla/lexers/LexCSS.cxx =================================================================== --- trunk/scintilla/lexers/LexCSS.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexCSS.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -18,7 +18,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: trunk/scintilla/lexers/LexCmake.cxx =================================================================== --- trunk/scintilla/lexers/LexCmake.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexCmake.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -17,7 +17,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: trunk/scintilla/lexers/LexD.cxx =================================================================== --- trunk/scintilla/lexers/LexD.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexD.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -2,6 +2,7 @@ ** Lexer for D. ** ** Copyright (c) 2006 by Waldemar Augustyn <waldemar(a)wdmsys.com> + ** Converted to lexer object and added further folding features/properties by "Udo Lechner" <dlchnr(at)gmx(dot)net> **/ // Copyright 1998-2005 by Neil Hodgson <neilh(a)scintilla.org> // The License.txt file describes the conditions under which this software may be distributed. @@ -13,17 +14,23 @@ #include <assert.h> #include <ctype.h> +#ifdef _MSC_VER +#pragma warning(disable: 4786) +#endif + +#include <string> +#include <map> + #include "ILexer.h" #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" -#include "Accessor.h" #include "StyleContext.h" #include "CharacterSet.h" #include "LexerModule.h" +#include "OptionSet.h" #ifdef SCI_NAMESPACE using namespace Scintilla; @@ -59,18 +66,188 @@ return ch == 'c' || ch == 'w' || ch == 'd'; } +static bool IsStreamCommentStyle(int style) { + return style == SCE_D_COMMENT || + style == SCE_D_COMMENTDOC || + style == SCE_D_COMMENTDOCKEYWORD || + style == SCE_D_COMMENTDOCKEYWORDERROR; +} -static void ColouriseDoc(unsigned int startPos, int length, int initStyle, - WordList *keywordlists[], Accessor &styler, bool caseSensitive) { +// An individual named option for use in an OptionSet - WordList &keywords = *keywordlists[0]; - WordList &keywords2 = *keywordlists[1]; - WordList &keywords3 = *keywordlists[2]; //doxygen - WordList &keywords4 = *keywordlists[3]; - WordList &keywords5 = *keywordlists[4]; - WordList &keywords6 = *keywordlists[5]; - WordList &keywords7 = *keywordlists[6]; +// Options used for LexerD +struct OptionsD { + bool fold; + bool foldSyntaxBased; + bool foldComment; + bool foldCommentMultiline; + bool foldCommentExplicit; + std::string foldExplicitStart; + std::string foldExplicitEnd; + bool foldExplicitAnywhere; + bool foldCompact; + int foldAtElseInt; + bool foldAtElse; + OptionsD() { + fold = false; + foldSyntaxBased = true; + foldComment = false; + foldCommentMultiline = true; + foldCommentExplicit = true; + foldExplicitStart = ""; + foldExplicitEnd = ""; + foldExplicitAnywhere = false; + foldCompact = true; + foldAtElseInt = -1; + foldAtElse = false; + } +}; +static const char * const dWordLists[] = { + "Primary keywords and identifiers", + "Secondary keywords and identifiers", + "Documentation comment keywords", + "Type definitions and aliases", + "Keywords 5", + "Keywords 6", + "Keywords 7", + 0, + }; + +struct OptionSetD : public OptionSet<OptionsD> { + OptionSetD() { + DefineProperty("fold", &OptionsD::fold); + + DefineProperty("fold.d.syntax.based", &OptionsD::foldSyntaxBased, + "Set this property to 0 to disable syntax based folding."); + + DefineProperty("fold.comment", &OptionsD::foldComment); + + DefineProperty("fold.d.comment.multiline", &OptionsD::foldCommentMultiline, + "Set this property to 0 to disable folding multi-line comments when fold.comment=1."); + + DefineProperty("fold.d.comment.explicit", &OptionsD::foldCommentExplicit, + "Set this property to 0 to disable folding explicit fold points when fold.comment=1."); + + DefineProperty("fold.d.explicit.start", &OptionsD::foldExplicitStart, + "The string to use for explicit fold start points, replacing the standard //{."); + + DefineProperty("fold.d.explicit.end", &OptionsD::foldExplicitEnd, + "The string to use for explicit fold end points, replacing the standard //}."); + + DefineProperty("fold.d.explicit.anywhere", &OptionsD::foldExplicitAnywhere, + "Set this property to 1 to enable explicit fold points anywhere, not just in line comments."); + + DefineProperty("fold.compact", &OptionsD::foldCompact); + + DefineProperty("lexer.d.fold.at.else", &OptionsD::foldAtElseInt, + "This option enables D folding on a \"} else {\" line of an if statement."); + + DefineProperty("fold.at.else", &OptionsD::foldAtElse); + + DefineWordListSets(dWordLists); + } +}; + +class LexerD : public ILexer { + bool caseSensitive; + WordList keywords; + WordList keywords2; + WordList keywords3; + WordList keywords4; + WordList keywords5; + WordList keywords6; + WordList keywords7; + OptionsD options; + OptionSetD osD; +public: + LexerD(bool caseSensitive_) : + caseSensitive(caseSensitive_) { + } + ~LexerD() { + } + void SCI_METHOD Release() { + delete this; + } + int SCI_METHOD Version() const { + return lvOriginal; + } + const char * SCI_METHOD PropertyNames() { + return osD.PropertyNames(); + } + int SCI_METHOD PropertyType(const char *name) { + return osD.PropertyType(name); + } + const char * SCI_METHOD DescribeProperty(const char *name) { + return osD.DescribeProperty(name); + } + int SCI_METHOD PropertySet(const char *key, const char *val); + const char * SCI_METHOD DescribeWordListSets() { + return osD.DescribeWordListSets(); + } + int SCI_METHOD WordListSet(int n, const char *wl); + void SCI_METHOD Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess); + void SCI_METHOD Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess); + + void * SCI_METHOD PrivateCall(int, void *) { + return 0; + } + + static ILexer *LexerFactoryD() { + return new LexerD(true); + } + static ILexer *LexerFactoryDInsensitive() { + return new LexerD(false); + } +}; + +int SCI_METHOD LexerD::PropertySet(const char *key, const char *val) { + if (osD.PropertySet(&options, key, val)) { + return 0; + } + return -1; +} + +int SCI_METHOD LexerD::WordListSet(int n, const char *wl) { + WordList *wordListN = 0; + switch (n) { + case 0: + wordListN = &keywords; + break; + case 1: + wordListN = &keywords2; + break; + case 2: + wordListN = &keywords3; + break; + case 3: + wordListN = &keywords4; + break; + case 4: + wordListN = &keywords5; + break; + case 5: + wordListN = &keywords6; + break; + case 6: + wordListN = &keywords7; + break; + } + int firstModification = -1; + if (wordListN) { + WordList wlNew; + wlNew.Set(wl); + if (*wordListN != wlNew) { + wordListN->Set(wl); + firstModification = 0; + } + } + return firstModification; +} + +void SCI_METHOD LexerD::Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { + LexAccessor styler(pAccess); + int styleBeforeDCKeyword = SCE_D_DEFAULT; StyleContext sc(startPos, length, initStyle, styler); @@ -294,24 +471,17 @@ sc.Complete(); } -static bool IsStreamCommentStyle(int style) { - return style == SCE_D_COMMENT || - style == SCE_D_COMMENTDOC || - style == SCE_D_COMMENTDOCKEYWORD || - style == SCE_D_COMMENTDOCKEYWORDERROR; -} - // Store both the current line's fold level and the next lines in the // level store to make it easy to pick up with each increment // and to make it possible to fiddle the current level for "} else {". -static void FoldDoc(unsigned int startPos, int length, int initStyle, Accessor &styler) { - bool foldComment = styler.GetPropertyInt("fold.comment") != 0; - bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; - // property lexer.d.fold.at.else - // This option enables D folding on a "} else {" line of an if statement. - bool foldAtElse = styler.GetPropertyInt("lexer.d.fold.at.else", - styler.GetPropertyInt("fold.at.else", 0)) != 0; +void SCI_METHOD LexerD::Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { + + if (!options.fold) + return; + + LexAccessor styler(pAccess); + unsigned int endPos = startPos + length; int visibleChars = 0; int lineCurrent = styler.GetLine(startPos); @@ -323,6 +493,8 @@ char chNext = styler[startPos]; int styleNext = styler.StyleAt(startPos); int style = initStyle; + bool foldAtElse = options.foldAtElseInt >= 0 ? options.foldAtElseInt != 0 : options.foldAtElse; + const bool userDefinedFoldMarkers = !options.foldExplicitStart.empty() && !options.foldExplicitEnd.empty(); for (unsigned int i = startPos; i < endPos; i++) { char ch = chNext; chNext = styler.SafeGetCharAt(i + 1); @@ -330,7 +502,7 @@ style = styleNext; styleNext = styler.StyleAt(i + 1); bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); - if (foldComment && IsStreamCommentStyle(style)) { + if (options.foldComment && options.foldCommentMultiline && IsStreamCommentStyle(style)) { if (!IsStreamCommentStyle(stylePrev)) { levelNext++; } else if (!IsStreamCommentStyle(styleNext) && !atEOL) { @@ -338,7 +510,25 @@ levelNext--; } } - if (style == SCE_D_OPERATOR) { + if (options.foldComment && options.foldCommentExplicit && ((style == SCE_D_COMMENTLINE) || options.foldExplicitAnywhere)) { + if (userDefinedFoldMarkers) { + if (styler.Match(i, options.foldExplicitStart.c_str())) { + levelNext++; + } else if (styler.Match(i, options.foldExplicitEnd.c_str())) { + levelNext--; + } + } else { + if ((ch == '/') && (chNext == '/')) { + char chNext2 = styler.SafeGetCharAt(i + 2); + if (chNext2 == '{') { + levelNext++; + } else if (chNext2 == '}') { + levelNext--; + } + } + } + } + if (options.foldSyntaxBased && (style == SCE_D_OPERATOR)) { if (ch == '{') { // Measure the minimum before a '{' to allow // folding on "} else {" @@ -350,19 +540,19 @@ levelNext--; } } - if (atEOL) { - if (foldComment) { // Handle nested comments + if (atEOL || (i == endPos-1)) { + if (options.foldComment && options.foldCommentMultiline) { // Handle nested comments int nc; nc = styler.GetLineState(lineCurrent); nc -= lineCurrent>0? styler.GetLineState(lineCurrent-1): 0; levelNext += nc; } int levelUse = levelCurrent; - if (foldAtElse) { + if (options.foldSyntaxBased && foldAtElse) { levelUse = levelMinCurrent; } int lev = levelUse | levelNext << 16; - if (visibleChars == 0 && foldCompact) + if (visibleChars == 0 && options.foldCompact) lev |= SC_FOLDLEVELWHITEFLAG; if (levelUse < levelNext) lev |= SC_FOLDLEVELHEADERFLAG; @@ -379,25 +569,4 @@ } } -static void FoldDDoc(unsigned int startPos, int length, int initStyle, - WordList *[], Accessor &styler) { - FoldDoc(startPos, length, initStyle, styler); -} - -static const char * const dWordLists[] = { - "Primary keywords and identifiers", - "Secondary keywords and identifiers", - "Documentation comment keywords", - "Type definitions and aliases", - "Keywords 5", - "Keywords 6", - "Keywords 7", - 0, - }; - -static void ColouriseDDoc(unsigned int startPos, int length, - int initStyle, WordList *keywordlists[], Accessor &styler) { - ColouriseDoc(startPos, length, initStyle, keywordlists, styler, true); -} - -LexerModule lmD(SCLEX_D, ColouriseDDoc, "d", FoldDDoc, dWordLists); +LexerModule lmD(SCLEX_D, LexerD::LexerFactoryD, "d", dWordLists); Modified: trunk/scintilla/lexers/LexErlang.cxx =================================================================== --- trunk/scintilla/lexers/LexErlang.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexErlang.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -19,7 +19,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: trunk/scintilla/lexers/LexForth.cxx =================================================================== --- trunk/scintilla/lexers/LexForth.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexForth.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -16,7 +16,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: trunk/scintilla/lexers/LexFortran.cxx =================================================================== --- trunk/scintilla/lexers/LexFortran.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexFortran.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -17,7 +17,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" @@ -267,7 +266,7 @@ || strcmp(s, "endmodule") == 0 || strcmp(s, "endprogram") == 0 || strcmp(s, "endsubroutine") == 0 || strcmp(s, "endtype") == 0 || strcmp(s, "endwhere") == 0 - || strcmp(s, "procedure") == 0 ) { // Take care of the module procedure statement + || (strcmp(s, "procedure") == 0 && strcmp(prevWord,"module")==0) ) { // Take care of the module procedure statement lev = -1; } else if (strcmp(prevWord, "end") == 0 && strcmp(s, "if") == 0){ // end if lev = 0; Modified: trunk/scintilla/lexers/LexHTML.cxx =================================================================== --- trunk/scintilla/lexers/LexHTML.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexHTML.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -16,7 +16,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" @@ -745,8 +744,18 @@ if ((state != SCE_HPHP_COMMENT) && (state != SCE_HPHP_COMMENTLINE) && (state != SCE_HJ_COMMENT) && (state != SCE_HJ_COMMENTLINE) && (state != SCE_HJ_COMMENTDOC) && (!isStringState(state))) { //Platform::DebugPrintf("state=%d, StateToPrint=%d, initStyle=%d\n", state, StateToPrint, initStyle); //if ((state == SCE_HPHP_OPERATOR) || (state == SCE_HPHP_DEFAULT) || (state == SCE_HJ_SYMBOLS) || (state == SCE_HJ_START) || (state == SCE_HJ_DEFAULT)) { - if ((ch == '{') || (ch == '}') || (foldComment && (ch == '/') && (chNext == '*'))) { - levelCurrent += ((ch == '{') || (ch == '/')) ? 1 : -1; + if (ch == '#') { + int j = i + 1; + while ((j < lengthDoc) && IsASpaceOrTab(styler.SafeGetCharAt(j))) { + j++; + } + if (styler.Match(j, "region") || styler.Match(j, "if")) { + levelCurrent++; + } else if (styler.Match(j, "end")) { + levelCurrent--; + } + } else if ((ch == '{') || (ch == '}') || (foldComment && (ch == '/') && (chNext == '*')) ) { + levelCurrent += ((ch == '{') || (ch == '/') ) ? 1 : -1; } } else if (((state == SCE_HPHP_COMMENT) || (state == SCE_HJ_COMMENT)) && foldComment && (ch == '*') && (chNext == '/')) { levelCurrent--; Modified: trunk/scintilla/lexers/LexLisp.cxx =================================================================== --- trunk/scintilla/lexers/LexLisp.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexLisp.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -17,7 +17,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: trunk/scintilla/lexers/LexLua.cxx =================================================================== --- trunk/scintilla/lexers/LexLua.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexLua.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -18,7 +18,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: trunk/scintilla/lexers/LexMarkdown.cxx =================================================================== --- trunk/scintilla/lexers/LexMarkdown.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexMarkdown.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -44,7 +44,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: trunk/scintilla/lexers/LexMatlab.cxx =================================================================== --- trunk/scintilla/lexers/LexMatlab.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexMatlab.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -21,7 +21,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: trunk/scintilla/lexers/LexNsis.cxx =================================================================== --- trunk/scintilla/lexers/LexNsis.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexNsis.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -17,7 +17,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: trunk/scintilla/lexers/LexOthers.cxx =================================================================== --- trunk/scintilla/lexers/LexOthers.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexOthers.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -17,7 +17,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" @@ -510,7 +509,7 @@ styler.ColourTo(endLine, SCE_DIFF_COMMAND); } else if (0 == strncmp(lineBuffer, "Index: ", 7)) { // For subversion's diff styler.ColourTo(endLine, SCE_DIFF_COMMAND); - } else if (0 == strncmp(lineBuffer, "---", 3)) { + } else if (0 == strncmp(lineBuffer, "---", 3) && lineBuffer[3] != '-') { // In a context diff, --- appears in both the header and the position markers if (lineBuffer[3] == ' ' && atoi(lineBuffer + 4) && !strchr(lineBuffer, '/')) styler.ColourTo(endLine, SCE_DIFF_POSITION); @@ -930,8 +929,8 @@ // Command or return status return SCE_ERR_CMD; } else if (lineBuffer[0] == '<') { - // Diff removal, but not interested. Trapped to avoid hitting CTAG cases. - return SCE_ERR_DEFAULT; + // Diff removal. + return SCE_ERR_DIFF_DELETION; } else if (lineBuffer[0] == '!') { return SCE_ERR_DIFF_CHANGED; } else if (lineBuffer[0] == '+') { Modified: trunk/scintilla/lexers/LexPascal.cxx =================================================================== --- trunk/scintilla/lexers/LexPascal.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexPascal.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -118,7 +118,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: trunk/scintilla/lexers/LexPerl.cxx =================================================================== --- trunk/scintilla/lexers/LexPerl.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexPerl.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -17,7 +17,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: trunk/scintilla/lexers/LexPython.cxx =================================================================== --- trunk/scintilla/lexers/LexPython.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexPython.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -16,7 +16,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: trunk/scintilla/lexers/LexR.cxx =================================================================== --- trunk/scintilla/lexers/LexR.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexR.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -17,7 +17,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: trunk/scintilla/lexers/LexSQL.cxx =================================================================== --- trunk/scintilla/lexers/LexSQL.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexSQL.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -2,7 +2,7 @@ /** @file LexSQL.cxx ** Lexer for SQL, including PL/SQL and SQL*Plus. **/ -// Copyright 1998-2005 by Neil Hodgson <neilh(a)scintilla.org> +// Copyright 1998-2011 by Neil Hodgson <neilh(a)scintilla.org> // The License.txt file describes the conditions under which this software may be distributed. #include <stdlib.h> @@ -12,24 +12,36 @@ #include <assert.h> #include <ctype.h> +#ifdef _MSC_VER +#pragma warning(disable: 4786) +#endif + +#include <string> +#include <vector> +#include <map> +#include <algorithm> + #include "ILexer.h" #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" #include "StyleContext.h" #include "CharacterSet.h" #include "LexerModule.h" +#include "OptionSet.h" #ifdef SCI_NAMESPACE using namespace Scintilla; #endif -static inline bool IsAWordChar(int ch) { - return (ch < 0x80) && (isalnum(ch) || ch == '_'); +static inline bool IsAWordChar(int ch, bool sqlAllowDottedWord) { + if (!sqlAllowDottedWord) + return (ch < 0x80) && (isalnum(ch) || ch == '_'); + else + return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '.'); } static inline bool IsAWordStart(int ch) { @@ -47,31 +59,289 @@ // 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' || - ch == '.' || ch == '-' || ch == '+'); + (isdigit(ch) || toupper(ch) == 'E' || + ch == '.' || ch == '-' || ch == '+'); } -static void ColouriseSQLDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], - Accessor &styler) { - WordList &keywords1 = *keywordlists[0]; - WordList &keywords2 = *keywordlists[1]; - WordList &kw_pldoc = *keywordlists[2]; - WordList &kw_sqlplus = *keywordlists[3]; - WordList &kw_user1 = *keywordlists[4]; - WordList &kw_user2 = *keywordlists[5]; - WordList &kw_user3 = *keywordlists[6]; - WordList &kw_user4 = *keywordlists[7]; +class SQLStates { +public : + void Set(int lineNumber, unsigned short int sqlStatesLine) { + if (!sqlStatement.size() == 0 || !sqlStatesLine == 0) { + sqlStatement.resize(lineNumber + 1, 0); + sqlStatement[lineNumber] = sqlStatesLine; + } + } - StyleContext sc(startPos, length, initStyle, styler); + unsigned short int IgnoreWhen (unsigned short int sqlStatesLine, bool enable) { + if (enable) + sqlStatesLine |= MASK_IGNORE_WHEN; + else + sqlStatesLine &= ~MASK_IGNORE_WHEN; - // property sql.backslash.escapes - // Enables backslash as an escape character in SQL. - bool sqlBackslashEscapes = styler.GetPropertyInt("sql.backslash.escapes", 0) != 0; + return sqlStatesLine; + } - bool sqlBackticksIdentifier = styler.GetPropertyInt("lexer.sql.backticks.identifier", 0) != 0; + unsigned short int IntoCondition (unsigned short int sqlStatesLine, bool enable) { + if (enable) + sqlStatesLine |= MASK_INTO_CONDITION; + else + sqlStatesLine &= ~MASK_INTO_CONDITION; + + return sqlStatesLine; + } + + unsigned short int IntoExceptionBlock (unsigned short int sqlStatesLine, bool enable) { + if (enable) + sqlStatesLine |= MASK_INTO_EXCEPTION; + else + sqlStatesLine &= ~MASK_INTO_EXCEPTION; + + return sqlStatesLine; + } + + unsigned short int IntoDeclareBlock (unsigned short int sqlStatesLine, bool enable) { + if (enable) + sqlStatesLine |= MASK_INTO_DECLARE; + else + sqlStatesLine &= ~MASK_INTO_DECLARE; + + return sqlStatesLine; + } + + unsigned short int BeginCaseBlock (unsigned short int sqlStatesLine) { + if ((sqlStatesLine & MASK_NESTED_CASES) < MASK_NESTED_CASES) { + sqlStatesLine++; + } + return sqlStatesLine; + } + + unsigned short int EndCaseBlock (unsigned short int sqlStatesLine) { + if ((sqlStatesLine & MASK_NESTED_CASES) > 0) { + sqlStatesLine--; + } + return sqlStatesLine; + } + + bool IsIgnoreWhen (unsigned short int sqlStatesLine) { + return (sqlStatesLine & MASK_IGNORE_WHEN) != 0; + } + + bool IsIntoCondition (unsigned short int sqlStatesLine) { + return (sqlStatesLine & MASK_INTO_CONDITION) != 0; + } + + bool IsIntoCaseBlock (unsigned short int sqlStatesLine) { + return (sqlStatesLine & MASK_NESTED_CASES) != 0; + } + + bool IsIntoExceptionBlock (unsigned short int sqlStatesLine) { + return (sqlStatesLine & MASK_INTO_EXCEPTION) != 0; + } + + bool IsIntoDeclareBlock (unsigned short int sqlStatesLine) { + return (sqlStatesLine & MASK_INTO_DECLARE) != 0; + } + + unsigned short int ForLine(int lineNumber) { + if ((lineNumber > 0) && (sqlStatement.size() > static_cast<size_t>(lineNumber))) { + return sqlStatement[lineNumber]; + } else { + return 0; + } + } + + SQLStates() {} + +private : + std::vector <unsigned short int> sqlStatement; + enum { + MASK_INTO_DECLARE = 0x1000, + MASK_INTO_EXCEPTION = 0x2000, + MASK_INTO_CONDITION = 0x4000, + MASK_IGNORE_WHEN = 0x8000, + MASK_NESTED_CASES = 0x0FFF + }; +}; + +// Options used for LexerSQL +struct OptionsSQL { + bool fold; + bool foldAtElse; + bool foldComment; + bool foldCompact; + bool foldOnlyBegin; + bool sqlBackticksIdentifier; + bool sqlNumbersignComment; + bool sqlBackslashEscapes; + bool sqlAllowDottedWord; + OptionsSQL() { + fold = false; + foldAtElse = false; + foldComment = false; + foldCompact = false; + foldOnlyBegin = false; + sqlBackticksIdentifier = false; + sqlNumbersignComment = false; + sqlBackslashEscapes = false; + sqlAllowDottedWord = false; + } +}; + +static const char * const sqlWordListDesc[] = { + "Keywords", + "Database Objects", + "PLDoc", + "SQL*Plus", + "User Keywords 1", + "User Keywords 2", + "User Keywords 3", + "User Keywords 4", + 0 +}; + +struct OptionSetSQL : public OptionSet<OptionsSQL> { + OptionSetSQL() { + DefineProperty("fold", &OptionsSQL::fold); + + DefineProperty("lexer.sql.fold.at.else", &OptionsSQL::foldAtElse, + "This option enables SQL folding on a \"ELSE\" and \"ELSIF\"line of an IF statement."); + + DefineProperty("fold.comment", &OptionsSQL::foldComment); + + DefineProperty("fold.compact", &OptionsSQL::foldCompact); + + DefineProperty("fold.sql.only.begin", &OptionsSQL::foldOnlyBegin); + + DefineProperty("lexer.sql.backticks.identifier", &OptionsSQL::sqlBackticksIdentifier); + + DefineProperty("lexer.sql.numbersign.comment", &OptionsSQL::sqlNumbersignComment, + "If \"lexer.sql.numbersign.comment\" property is set to 0 a line beginning with '#' will not be a comment."); + + DefineProperty("sql.backslash.escapes", &OptionsSQL::sqlBackslashEscapes, + "Enables backslash as an escape character in SQL."); + + DefineProperty("lexer.sql.allow.dotted.word", &OptionsSQL::sqlAllowDottedWord, + "Set to 1 to colourise recognized words with dots " + "(recommended for Oracle PL/SQL objects)."); + + DefineWordListSets(sqlWordListDesc); + } +}; + +class LexerSQL : public ILexer { +public : + LexerSQL() {} + + int SCI_METHOD Version () const { + return lvOriginal; + } + + void SCI_METHOD Release() { + delete this; + } + + const char * SCI_METHOD PropertyNames() { + return osSQL.PropertyNames(); + } + + int SCI_METHOD PropertyType(const char *name) { + return osSQL.PropertyType(name); + } + + const char * SCI_METHOD DescribeProperty(const char *name) { + return osSQL.DescribeProperty(name); + } + + int SCI_METHOD PropertySet(const char *key, const char *val) { + if (osSQL.PropertySet(&options, key, val)) { + return 0; + } + return -1; + } + + const char * SCI_METHOD DescribeWordListSets() { + return osSQL.DescribeWordListSets(); + } + + int SCI_METHOD WordListSet(int n, const char *wl); + void SCI_METHOD Lex (unsigned int startPos, int lengthDoc, int initStyle, IDocument *pAccess); + void SCI_METHOD Fold(unsigned int startPos, int lengthDoc, int initStyle, IDocument *pAccess); + + void * SCI_METHOD PrivateCall(int, void *) { + return 0; + } + + static ILexer *LexerFactorySQL() { + return new LexerSQL(); + } +private: + bool IsStreamCommentStyle(int style) { + return style == SCE_SQL_COMMENT || + style == SCE_SQL_COMMENTDOC || + style == SCE_SQL_COMMENTDOCKEYWORD || + style == SCE_SQL_COMMENTDOCKEYWORDERROR; + } + + OptionsSQL options; + OptionSetSQL osSQL; + SQLStates sqlStates; + + WordList keywords1; + WordList keywords2; + WordList kw_pldoc; + WordList kw_sqlplus; + WordList kw_user1; + WordList kw_user2; + WordList kw_user3; + WordList kw_user4; +}; + +int SCI_METHOD LexerSQL::WordListSet(int n, const char *wl) { + WordList *wordListN = 0; + switch (n) { + case 0: + wordListN = &keywords1; + break; + case 1: + wordListN = &keywords2; + break; + case 2: + wordListN = &kw_pldoc; + break; + case 3: + wordListN = &kw_sqlplus; + break; + case 4: + wordListN = &kw_user1; + break; + case 5: + wordListN = &kw_user2; + break; + case 6: + wordListN = &kw_user3; + break; + case 7: + wordListN = &kw_user4; + } + int firstModification = -1; + if (wordListN) { + WordList wlNew; + wlNew.Set(wl); + if (*wordListN != wlNew) { + wordListN->Set(wl); + firstModification = 0; + } + } + return firstModification; +} + +void SCI_METHOD LexerSQL::Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { + LexAccessor styler(pAccess); + StyleContext sc(startPos, length, initStyle, styler); int styleBeforeDCKeyword = SCE_SQL_DEFAULT; - for (; sc.More(); sc.Forward()) { + int offset = 0; + for (; sc.More(); sc.Forward(), offset++) { // Determine if the current state should terminate. switch (sc.state) { case SCE_SQL_OPERATOR: @@ -84,7 +354,7 @@ } break; case SCE_SQL_IDENTIFIER: - if (!IsAWordChar(sc.ch)) { + if (!IsAWordChar(sc.ch, options.sqlAllowDottedWord)) { int nextState = SCE_SQL_DEFAULT; char s[1000]; sc.GetCurrentLowered(s, sizeof(s)); @@ -161,7 +431,7 @@ } break; case SCE_SQL_CHARACTER: - if (sqlBackslashEscapes && sc.ch == '\\') { + if (options.sqlBackslashEscapes && sc.ch == '\\') { sc.Forward(); } else if (sc.ch == '\'') { if (sc.chNext == '\"') { @@ -191,7 +461,7 @@ sc.SetState(SCE_SQL_NUMBER); } else if (IsAWordStart(sc.ch)) { sc.SetState(SCE_SQL_IDENTIFIER); - } else if (sc.ch == 0x60 && sqlBackticksIdentifier) { + } else if (sc.ch == 0x60 && options.sqlBackticksIdentifier) { sc.SetState(SCE_SQL_QUOTEDIDENTIFIER); } else if (sc.Match('/', '*')) { if (sc.Match("/**") || sc.Match("/*!")) { // Support of Doxygen doc. style @@ -204,9 +474,9 @@ // MySQL requires a space or control char after -- // http://dev.mysql.com/doc/mysql/en/ansi-diff-comments.html // Perhaps we should enforce that with proper property: -//~ } else if (sc.Match("-- ")) { + //~ } else if (sc.Match("-- ")) { sc.SetState(SCE_SQL_COMMENTLINE); - } else if (sc.ch == '#') { + } else if (sc.ch == '#' && options.sqlNumbersignComment) { sc.SetState(SCE_SQL_COMMENTLINEDOC); } else if (sc.ch == '\'') { sc.SetState(SCE_SQL_CHARACTER); @@ -220,25 +490,10 @@ sc.Complete(); } -static bool IsStreamCommentStyle(int style) { - return style == SCE_SQL_COMMENT || - style == SCE_SQL_COMMENTDOC || - style == SCE_SQL_COMMENTDOCKEYWORD || - style == SCE_SQL_COMMENTDOCKEYWORDERROR; -} - -// Store both the current line's fold level and the next lines in the -// level store to make it easy to pick up with each increment. -static void FoldSQLDoc(unsigned int startPos, int length, int initStyle, - 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; - - // property fold.sql.exists - // Enables "EXISTS" to end a fold as is started by "IF" in "DROP TABLE IF EXISTS". - bool foldSqlExists = styler.GetPropertyInt("fold.sql.exists", 1) != 0; - +void SCI_METHOD LexerSQL::Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { + if (!options.fold) + return; + LexAccessor styler(pAccess); unsigned int endPos = startPos + length; int visibleChars = 0; int lineCurrent = styler.GetLine(startPos); @@ -251,6 +506,14 @@ int styleNext = styler.StyleAt(startPos); int style = initStyle; bool endFound = false; + bool isUnfoldingIgnored = false; + // this statementFound flag avoids to fold when the statement is on only one line by ignoring ELSE or ELSIF + // eg. "IF condition1 THEN ... ELSIF condition2 THEN ... ELSE ... END IF;" + bool statementFound = false; + unsigned short int sqlStatesCurrentLine = 0; + if (!options.foldOnlyBegin) { + sqlStatesCurrentLine = sqlStates.ForLine(lineCurrent); + } for (unsigned int i = startPos; i < endPos; i++) { char ch = chNext; chNext = styler.SafeGetCharAt(i + 1); @@ -258,7 +521,16 @@ style = styleNext; styleNext = styler.StyleAt(i + 1); bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); - if (foldComment && IsStreamCommentStyle(style)) { + if (atEOL || (ch == ';')) { + if (endFound) { + //Maybe this is the end of "EXCEPTION" BLOCK (eg. "BEGIN ... EXCEPTION ... END;") + sqlStatesCurrentLine = sqlStates.IntoExceptionBlock(sqlStatesCurrentLine, false); + } + // set endFound and isUnfoldingIgnored to false if EOL is reached or ';' is found + endFound = false; + isUnfoldingIgnored = false; + } + if (options.foldComment && IsStreamCommentStyle(style)) { if (!IsStreamCommentStyle(stylePrev)) { levelNext++; } else if (!IsStreamCommentStyle(styleNext) && !atEOL) { @@ -266,7 +538,7 @@ levelNext--; } } - if (foldComment && (style == SCE_SQL_COMMENTLINE)) { + if (options.foldComment && (style == SCE_SQL_COMMENTLINE)) { // MySQL needs -- comments to be followed by space or control char if ((ch == '-') && (chNext == '-')) { char chNext2 = styler.SafeGetCharAt(i + 2); @@ -280,14 +552,18 @@ } if (style == SCE_SQL_OPERATOR) { if (ch == '(') { - levelNext++; + if (levelCurrent > levelNext) + levelCurrent--; + levelNext++; } else if (ch == ')') { levelNext--; + } else if ((!options.foldOnlyBegin) && ch == ';') { + sqlStatesCurrentLine = sqlStates.IgnoreWhen(sqlStatesCurrentLine, false); } } // If new keyword (cannot trigger on elseif or nullif, does less tests) if (style == SCE_SQL_WORD && stylePrev != SCE_SQL_WORD) { - const int MAX_KW_LEN = 6; // Maximum length of folding keywords + const int MAX_KW_LEN = 9; // Maximum length of folding keywords char s[MAX_KW_LEN + 2]; unsigned int j = 0; for (; j < MAX_KW_LEN + 1; j++) { @@ -302,33 +578,133 @@ } else { s[j] = '\0'; } - if ((!foldOnlyBegin) && (strcmp(s, "if") == 0 || strcmp(s, "loop") == 0)) { + + if (strcmp(s, "if") == 0) { if (endFound) { - // ignore endFound = false; + if (options.foldOnlyBegin && !isUnfoldingIgnored) { + // this end isn't for begin block, but for if block ("end if;") + // so ignore previous "end" by increment levelNext. + levelNext++; + } } else { - levelNext++; + if (!options.foldOnlyBegin) + sqlStatesCurrentLine = sqlStates.IntoCondition(sqlStatesCurrentLine, true); + if (levelCurrent > levelNext) { + // doesn't include this line into the folding block + // because doesn't hide IF (eg "END; IF") + levelCurrent = levelNext; + } } + } else if (!options.foldOnlyBegin && + strcmp(s, "then") == 0 && + sqlStates.IsIntoCondition(sqlStatesCurrentLine)) { + sqlStatesCurrentLine = sqlStates.IntoCondition(sqlStatesCurrentLine, false); + if (!options.foldOnlyBegin) { + if (levelCurrent > levelNext) { + levelCurrent = levelNext; + } + if (!statementFound) + levelNext++; + + statementFound = true; + } else if (levelCurrent > levelNext) { + // doesn't include this line into the folding block + // because doesn't hide LOOP or CASE (eg "END; LOOP" or "END; CASE") + levelCurrent = levelNext; + } + } else if (strcmp(s, "loop") == 0 || + strcmp(s, "case") == 0) { + if (endFound) { + endFound = false; + if (options.foldOnlyBegin && !isUnfoldingIgnored) { + // this end isn't for begin block, but for loop block ("end loop;") or case block ("end case;") + // so ignore previous "end" by increment levelNext. + levelNext++; + } + if ((!options.foldOnlyBegin) && strcmp(s, "case") == 0) { + sqlStatesCurrentLine = sqlStates.EndCaseBlock(sqlStatesCurrentLine); + levelNext--; //again for the "end case;" and block when + } + } else if (!options.foldOnlyBegin) { + if (strcmp(s, "case") == 0) { + sqlStatesCurrentLine = sqlStates.BeginCaseBlock(sqlStatesCurrentLine); + + //for case block increment 2 times + if (!statementFound) + levelNext++; + } + + if (levelCurrent > levelNext) { + levelCurrent = levelNext; + } + if (!statementFound) + levelNext++; + + statementFound = true; + } else if (levelCurrent > levelNext) { + // doesn't include this line into the folding block + // because doesn't hide LOOP or CASE (eg "END; LOOP" or "END; CASE") + levelCurrent = levelNext; + } + } else if ((!options.foldOnlyBegin) && ( + // folding for ELSE and ELSIF block only if foldAtElse is set + // and IF or CASE aren't on only one line with ELSE or ELSIF (with flag statementFound) + options.foldAtElse && !statementFound) && strcmp(s, "elsif") == 0) { + sqlStatesCurrentLine = sqlStates.IntoCondition(sqlStatesCurrentLine, true); + levelCurrent--; + levelNext--; + } else if ((!options.foldOnlyBegin) && ( + // folding for ELSE and ELSIF block only if foldAtElse is set + // and IF or CASE aren't on only one line with ELSE or ELSIF (with flag statementFound) + options.foldAtElse && !statementFound) && strcmp(s, "else") == 0) { + // prevent also ELSE is on the same line (eg. "ELSE ... END IF;") + statementFound = true; + // we are in same case "} ELSE {" in C language + levelCurrent--; + } else if (strcmp(s, "begin") == 0) { levelNext++; + sqlStatesCurrentLine = sqlStates.IntoDeclareBlock(sqlStatesCurrentLine, false); } else if ((strcmp(s, "end") == 0) || -// // DROP TABLE IF EXISTS or CREATE TABLE IF NOT EXISTS - (foldSqlExists && (strcmp(s, "exists") == 0)) || -// // SQL Anywhere permits IF ... ELSE ... ENDIF -// // will only be active if "endif" appears in the -// // keyword list. - (strcmp(s, "endif") == 0)) { + // SQL Anywhere permits IF ... ELSE ... ENDIF + // will only be active if "endif" appears in the + // keyword list. + (strcmp(s, "endif") == 0)) { endFound = true; levelNext--; if (levelNext < SC_FOLDLEVELBASE) { levelNext = SC_FOLDLEVELBASE; + isUnfoldingIgnored = true; } + } else if ((!options.foldOnlyBegin) && + strcmp(s, "when") == 0 && + !sqlStates.IsIgnoreWhen(sqlStatesCurrentLine) && + !sqlStates.IsIntoExceptionBlock(sqlStatesCurrentLine) && + sqlStates.IsIntoCaseBlock(sqlStatesCurrentLine)) { + sqlStatesCurrentLine = sqlStates.IntoCondition(sqlStatesCurrentLine, true); + + // Don't foldind when CASE and WHEN are on the same line (with flag statementFound) (eg. "CASE selector WHEN expression1 THEN sequence_of_statements1;\n") + if (!statementFound) { + levelCurrent--; + levelNext--; + } + } else if ((!options.foldOnlyBegin) && strcmp(s, "exit") == 0) { + sqlStatesCurrentLine = sqlStates.IgnoreWhen(sqlStatesCurrentLine, true); + } else if ((!options.foldOnlyBegin) && !sqlStates.IsIntoDeclareBlock(sqlStatesCurrentLine) && strcmp(s, "exception") == 0) { + sqlStatesCurrentLine = sqlStates.IntoExceptionBlock(sqlStatesCurrentLine, true); + } else if ((!options.foldOnlyBegin) && + (strcmp(s, "declare") == 0 || + strcmp(s, "function") == 0 || + strcmp(s, "procedure") == 0 || + strcmp(s, "package") == 0)) { + sqlStatesCurrentLine = sqlStates.IntoDeclareBlock(sqlStatesCurrentLine, true); } } if (atEOL) { int levelUse = levelCurrent; int lev = levelUse | levelNext << 16; - if (visibleChars == 0 && foldCompact) + if (visibleChars == 0 && options.foldCompact) lev |= SC_FOLDLEVELWHITEFLAG; if (levelUse < levelNext) lev |= SC_FOLDLEVELHEADERFLAG; @@ -338,7 +714,9 @@ lineCurrent++; levelCurrent = levelNext; visibleChars = 0; - endFound = false; + statementFound = false; + if (!options.foldOnlyBegin) + sqlStates.Set(lineCurrent, sqlStatesCurrentLine); } if (!isspacechar(ch)) { visibleChars++; @@ -346,16 +724,4 @@ } } -static const char * const sqlWordListDesc[] = { - "Keywords", - "Database Objects", - "PLDoc", - "SQL*Plus", - "User Keywords 1", - "User Keywords 2", - "User Keywords 3", - "User Keywords 4", - 0 -}; - -LexerModule lmSQL(SCLEX_SQL, ColouriseSQLDoc, "sql", FoldSQLDoc, sqlWordListDesc); +LexerModule lmSQL(SCLEX_SQL, LexerSQL::LexerFactorySQL, "sql", sqlWordListDesc); Modified: trunk/scintilla/lexers/LexTCL.cxx =================================================================== --- trunk/scintilla/lexers/LexTCL.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexTCL.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -16,7 +16,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: trunk/scintilla/lexers/LexTxt2tags.cxx =================================================================== --- trunk/scintilla/lexers/LexTxt2tags.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexTxt2tags.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -27,7 +27,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: trunk/scintilla/lexers/LexVHDL.cxx =================================================================== --- trunk/scintilla/lexers/LexVHDL.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexVHDL.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -21,7 +21,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: trunk/scintilla/lexers/LexVerilog.cxx =================================================================== --- trunk/scintilla/lexers/LexVerilog.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexVerilog.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -17,7 +17,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: trunk/scintilla/lexers/LexYAML.cxx =================================================================== --- trunk/scintilla/lexers/LexYAML.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexers/LexYAML.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -16,7 +16,6 @@ #include "Scintilla.h" #include "SciLexer.h" -#include "PropSetSimple.h" #include "WordList.h" #include "LexAccessor.h" #include "Accessor.h" Modified: trunk/scintilla/lexlib/CharacterSet.h =================================================================== --- trunk/scintilla/lexlib/CharacterSet.h 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexlib/CharacterSet.h 2011-04-03 16:16:52 UTC (rev 5682) @@ -50,8 +50,8 @@ assert(val < size); bset[val] = true; } - void AddString(const char *CharacterSet) { - for (const char *cp=CharacterSet; *cp; cp++) { + void AddString(const char *setToAdd) { + for (const char *cp=setToAdd; *cp; cp++) { int val = static_cast<unsigned char>(*cp); assert(val >= 0); assert(val < size); Modified: trunk/scintilla/lexlib/LexerBase.h =================================================================== --- trunk/scintilla/lexlib/LexerBase.h 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexlib/LexerBase.h 2011-04-03 16:16:52 UTC (rev 5682) @@ -20,7 +20,7 @@ WordList *keyWordLists[numWordLists+1]; public: LexerBase(); - ~LexerBase(); + virtual ~LexerBase(); void SCI_METHOD Release(); int SCI_METHOD Version() const; const char * SCI_METHOD PropertyNames(); Modified: trunk/scintilla/lexlib/OptionSet.h =================================================================== --- trunk/scintilla/lexlib/OptionSet.h 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexlib/OptionSet.h 2011-04-03 16:16:52 UTC (rev 5682) @@ -80,6 +80,8 @@ names += name; } public: + virtual ~OptionSet() { + } void DefineProperty(const char *name, plcob pb, std::string description="") { nameToDef[name] = Option(pb, description); AppendName(name); Added: trunk/scintilla/lexlib/SparseState.h =================================================================== --- trunk/scintilla/lexlib/SparseState.h (rev 0) +++ trunk/scintilla/lexlib/SparseState.h 2011-04-03 16:16:52 UTC (rev 5682) @@ -0,0 +1,110 @@ +// Scintilla source code edit control +/** @file SparseState.h + ** Hold lexer state that may change rarely. + ** This is often per-line state such as whether a particular type of section has been entered. + ** A state continues until it is changed. + **/ +// Copyright 2011 by Neil Hodgson <neilh(a)scintilla.org> +// The License.txt file describes the conditions under which this software may be distributed. + +#ifndef SPARSESTATE_H +#define SPARSESTATE_H + +#ifdef SCI_NAMESPACE +namespace Scintilla { +#endif + +template <typename T> +class SparseState { + struct State { + int position; + T value; + State(int position_, T value_) : position(position_), value(value_) { + } + inline bool operator<(const State &other) const { + return position < other.position; + } + inline bool operator==(const State &other) const { + return (position == other.position) && (value == other.value); + } + }; + int positionFirst; + typedef std::vector<State> stateVector; + stateVector states; + + typename stateVector::iterator Find(int position) { + State searchValue(position, T()); + return std::lower_bound(states.begin(), states.end(), searchValue); + } + +public: + SparseState(int positionFirst_=-1) { + positionFirst = positionFirst_; + } + void Set(int position, T value) { + Delete(position); + if ((states.size() == 0) || (value != states[states.size()-1].value)) { + states.push_back(State(position, value)); + } + } + T ValueAt(int position) { + if (!states.size()) + return T(); + if (position < states[0].position) + return T(); + typename stateVector::iterator low = Find(position); + if (low == states.end()) { + return states[states.size()-1].value; + } else { + if (low->position > position) { + --low; + } + return low->value; + } + } + bool Delete(int position) { + typename stateVector::iterator low = Find(position); + if (low != states.end()) { + states.erase(low, states.end()); + return true; + } + return false; + } + size_t size() const { + return states.size(); + } + + // Returns true if Merge caused a significant change + bool Merge(const SparseState<T> &other, int ignoreAfter) { + // Changes caused beyond ignoreAfter are not significant + Delete(ignoreAfter+1); + + bool different = true; + bool changed = false; + typename stateVector::iterator low = Find(other.positionFirst); + if (static_cast<size_t>(states.end() - low) == other.states.size()) { + // Same number in other as after positionFirst in this + different = !std::equal(low, states.end(), other.states.begin()); + } + if (different) { + if (low != states.end()) { + states.erase(low, states.end()); + changed = true; + } + typename stateVector::const_iterator startOther = other.states.begin(); + if (!states.empty() && states.back().value == startOther->value) + ++startOther; + if (startOther != other.states.end()) { + states.insert(states.end(), startOther, other.states.end()); + changed = true; + } + } + return changed; + } +}; + +#ifdef SCI_NAMESPACE +} +#endif + +#endif Property changes on: trunk/scintilla/lexlib/SparseState.h ___________________________________________________________________ Added: svn:mime-type + text/x-chdr Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/scintilla/lexlib/WordList.cxx =================================================================== --- trunk/scintilla/lexlib/WordList.cxx 2011-04-03 15:54:28 UTC (rev 5681) +++ trunk/scintilla/lexlib/WordList.cxx 2011-04-03 16:16:52 UTC (rev 5682) @@ -110,6 +110,11 @@ } } @@ 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:[5681] trunk
by colombanw＠users.sourceforge.net 03 Apr '11

03 Apr '11

Revision: 5681 http://geany.svn.sourceforge.net/geany/?rev=5681&view=rev Author: colombanw Date: 2011-04-03 15:54:28 +0000 (Sun, 03 Apr 2011) Log Message: ----------- Don't allow editing keybinding column of group rows Modified Paths: -------------- trunk/ChangeLog trunk/src/prefs.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-04-03 15:54:09 UTC (rev 5680) +++ trunk/ChangeLog 2011-04-03 15:54:28 UTC (rev 5681) @@ -2,6 +2,8 @@ * src/main.c, src/prefs.c, src/tools.c: Fix loading and updating menu accelerators for custom commands. + * src/prefs.c: + Don't allow editing keybinding column of group rows. 2011-04-02 Colomban Wendling <colomban(at)geany(dot)org> Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2011-04-03 15:54:09 UTC (rev 5680) +++ trunk/src/prefs.c 2011-04-03 15:54:28 UTC (rev 5681) @@ -128,7 +128,8 @@ { KB_TREE_ACTION, KB_TREE_SHORTCUT, - KB_TREE_INDEX + KB_TREE_INDEX, + KB_TREE_EDITABLE }; @@ -266,7 +267,7 @@ tree = GTK_TREE_VIEW(ui_lookup_widget(ui_widgets.prefs_dialog, "treeview7")); - store = gtk_tree_store_new(3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT); + store = gtk_tree_store_new(4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN); gtk_tree_view_set_model(GTK_TREE_VIEW(tree), GTK_TREE_MODEL(store)); g_object_unref(store); @@ -275,8 +276,8 @@ gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column); renderer = gtk_cell_renderer_text_new(); - g_object_set(renderer, "editable", TRUE, NULL); - column = gtk_tree_view_column_new_with_attributes(_("Shortcut"), renderer, "text", KB_TREE_SHORTCUT, NULL); + column = gtk_tree_view_column_new_with_attributes(_("Shortcut"), renderer, + "text", KB_TREE_SHORTCUT, "editable", KB_TREE_EDITABLE, NULL); gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column); /* set policy settings for the scrolled window around the treeview again, because glade @@ -316,7 +317,7 @@ key_string = gtk_accelerator_name(kb->key, kb->mods); gtk_tree_store_append(store, &iter, &parent); gtk_tree_store_set(store, &iter, KB_TREE_ACTION, label, - KB_TREE_SHORTCUT, key_string, KB_TREE_INDEX, kb->id, -1); + KB_TREE_SHORTCUT, key_string, KB_TREE_EDITABLE, TRUE, KB_TREE_INDEX, kb->id, -1); g_free(key_string); g_free(label); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5680] trunk/src/tools.c
by colombanw＠users.sourceforge.net 03 Apr '11

03 Apr '11

Revision: 5680 http://geany.svn.sourceforge.net/geany/?rev=5680&view=rev Author: colombanw Date: 2011-04-03 15:54:09 +0000 (Sun, 03 Apr 2011) Log Message: ----------- Simplify a bit `Set Custom Command` dialog code Modified Paths: -------------- trunk/src/tools.c Modified: trunk/src/tools.c =================================================================== --- trunk/src/tools.c 2011-04-03 15:53:48 UTC (rev 5679) +++ trunk/src/tools.c 2011-04-03 15:54:09 UTC (rev 5680) @@ -59,8 +59,6 @@ CC_COLUMN_STATUS, CC_COLUMN_TOOLTIP, CC_COLUMN_CMD, - CC_COLUMN_EDITABLE, - CC_COLUMN_ELLIPSIZE, CC_COLUMN_COUNT }; @@ -113,8 +111,7 @@ cmd = (idx >= 0) ? ui_prefs.custom_commands[idx] : NULL; gtk_list_store_append(cc->store, &iter); - gtk_list_store_set(cc->store, &iter, CC_COLUMN_ID, cc->count, CC_COLUMN_CMD, cmd, - CC_COLUMN_EDITABLE, TRUE, CC_COLUMN_ELLIPSIZE, PANGO_ELLIPSIZE_END, -1); + gtk_list_store_set(cc->store, &iter, CC_COLUMN_ID, cc->count, CC_COLUMN_CMD, cmd, -1); cc_dialog_update_row_status(cc->store, &iter, cmd); cc->count++; @@ -495,7 +492,7 @@ cc.count = 1; cc.store = gtk_list_store_new(CC_COLUMN_COUNT, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, - G_TYPE_STRING, G_TYPE_BOOLEAN, PANGO_TYPE_ELLIPSIZE_MODE); + G_TYPE_STRING); cc.view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(cc.store)); gtk_tree_view_set_tooltip_column(GTK_TREE_VIEW(cc.view), CC_COLUMN_TOOLTIP); gtk_tree_view_set_reorderable(GTK_TREE_VIEW(cc.view), TRUE); @@ -511,10 +508,10 @@ gtk_tree_view_column_pack_start(column, renderer, FALSE); gtk_tree_view_column_set_attributes(column, renderer, "stock-id", CC_COLUMN_STATUS, NULL); renderer = gtk_cell_renderer_text_new(); + g_object_set(renderer, "editable", TRUE, "ellipsize", PANGO_ELLIPSIZE_END, NULL); g_signal_connect(renderer, "edited", G_CALLBACK(cc_dialog_on_command_edited), &cc); gtk_tree_view_column_pack_start(column, renderer, TRUE); - gtk_tree_view_column_set_attributes(column, renderer, "text", CC_COLUMN_CMD, - "editable", CC_COLUMN_EDITABLE, "ellipsize", CC_COLUMN_ELLIPSIZE, NULL); + gtk_tree_view_column_set_attributes(column, renderer, "text", CC_COLUMN_CMD, NULL); cc.edit_column = column; gtk_tree_view_append_column(GTK_TREE_VIEW(cc.view), column); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5679] trunk
by colombanw＠users.sourceforge.net 03 Apr '11

03 Apr '11

Revision: 5679 http://geany.svn.sourceforge.net/geany/?rev=5679&view=rev Author: colombanw Date: 2011-04-03 15:53:48 +0000 (Sun, 03 Apr 2011) Log Message: ----------- Fix loading and updating menu accelerators for custom commands Modified Paths: -------------- trunk/ChangeLog trunk/src/main.c trunk/src/prefs.c trunk/src/tools.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-04-03 11:52:27 UTC (rev 5678) +++ trunk/ChangeLog 2011-04-03 15:53:48 UTC (rev 5679) @@ -1,3 +1,9 @@ +2011-04-03 Colomban Wendling <colomban(at)geany(dot)org> + + * src/main.c, src/prefs.c, src/tools.c: + Fix loading and updating menu accelerators for custom commands. + + 2011-04-02 Colomban Wendling <colomban(at)geany(dot)org> * src/tools.c, doc/geany.txt, doc/geany.html: Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2011-04-03 11:52:27 UTC (rev 5678) +++ trunk/src/main.c 2011-04-03 15:53:48 UTC (rev 5679) @@ -1038,7 +1038,6 @@ ui_create_insert_menu_items(); ui_create_insert_date_menu_items(); keybindings_init(); - tools_create_insert_custom_command_menu_items(); notebook_init(); filetypes_init(); templates_init(); @@ -1088,6 +1087,10 @@ /* load keybinding settings after plugins have added their groups */ keybindings_load_keyfile(); + /* create the custom command menu after the keybindings have been loaded to have the proper + * accelerator shown for the menu items */ + tools_create_insert_custom_command_menu_items(); + /* load any command line files or session files */ main_status.opening_session_files = TRUE; load_startup_files(argc, argv); Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2011-04-03 11:52:27 UTC (rev 5678) +++ trunk/src/prefs.c 2011-04-03 15:53:48 UTC (rev 5679) @@ -59,6 +59,7 @@ #include "templates.h" #include "search.h" #include "toolbar.h" +#include "tools.h" #include "stash.h" #include "keyfile.h" #include "filetypes.h" @@ -1120,6 +1121,7 @@ if (edited) { kb_update(); + tools_create_insert_custom_command_menu_items(); keybindings_write_to_file(); } @@ -1342,7 +1344,7 @@ gchar *str; gint state; - state = event->state & gtk_accelerator_get_default_mod_mask(); + state = event->state & gtk_accelerator_get_default_mod_mask(); if (event->keyval == GDK_Escape) return FALSE; /* close the dialog, don't allow escape when detecting keybindings. */ Modified: trunk/src/tools.c =================================================================== --- trunk/src/tools.c 2011-04-03 11:52:27 UTC (rev 5678) +++ trunk/src/tools.c 2011-04-03 15:53:48 UTC (rev 5679) @@ -660,13 +660,13 @@ case 2: key_idx = GEANY_KEYS_FORMAT_SENDTOCMD3; break; } + item = gtk_menu_item_new_with_label(label); if (key_idx != -1) + { kb = keybindings_lookup_item(GEANY_KEY_GROUP_FORMAT, key_idx); - - item = gtk_menu_item_new_with_label(label); - if (key_idx != -1) gtk_widget_add_accelerator(item, "activate", gtk_accel_group_new(), kb->key, kb->mods, GTK_ACCEL_VISIBLE); + } gtk_container_add(GTK_CONTAINER(me), item); gtk_widget_show(item); g_signal_connect(item, "activate", G_CALLBACK(cc_on_custom_command_activate), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5678] trunk/po
by frlan＠users.sourceforge.net 03 Apr '11

03 Apr '11

Revision: 5678 http://geany.svn.sourceforge.net/geany/?rev=5678&view=rev Author: frlan Date: 2011-04-03 11:52:27 +0000 (Sun, 03 Apr 2011) Log Message: ----------- Update of German translation Modified Paths: -------------- trunk/po/ChangeLog trunk/po/de.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2011-04-02 20:09:42 UTC (rev 5677) +++ trunk/po/ChangeLog 2011-04-03 11:52:27 UTC (rev 5678) @@ -1,3 +1,8 @@ +2011-04-03 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * de.po: Update of German translation. + + 2011-03-27 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * de.po: Update of German translation. Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2011-04-02 20:09:42 UTC (rev 5677) +++ trunk/po/de.po 2011-04-03 11:52:27 UTC (rev 5678) @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: geany 0.20\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-27 13:18+0200\n" -"PO-Revision-Date: 2011-03-27 13:18+0100\n" +"POT-Creation-Date: 2011-04-03 12:46+0200\n" +"PO-Revision-Date: 2011-04-03 12:49+0100\n" "Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <geany-i18n(a)uvena.de>\n" "Language: de\n" @@ -28,7 +28,9 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Eine kleine und schnelle Entwicklungsumgebung für GTK2" -#: ../geany.desktop.in.h:2 ../src/interface.c:310 ../src/interface.c:1814 +#: ../geany.desktop.in.h:2 +#: ../src/interface.c:310 +#: ../src/interface.c:1814 msgid "Geany" msgstr "Geany" @@ -62,7 +64,8 @@ msgid "maintainer" msgstr "Hauptentwickler" -#: ../src/about.c:289 ../src/about.c:297 +#: ../src/about.c:289 +#: ../src/about.c:297 msgid "developer" msgstr "Entwickler" @@ -84,11 +87,8 @@ #: ../src/about.c:365 #, c-format -msgid "" -"Some of the many contributors (for a more detailed list, see the file %s):" -msgstr "" -"Einige der vielen Leute, die an Geany mitgearbeitet haben (eine " -"detailliertere Liste findet sich in der Datei %s):" +msgid "Some of the many contributors (for a more detailed list, see the file %s):" +msgstr "Einige der vielen Leute, die an Geany mitgearbeitet haben (eine detailliertere Liste findet sich in der Datei %s):" #: ../src/about.c:391 msgid "Credits" @@ -99,12 +99,8 @@ msgstr "Lizenz" #: ../src/about.c:414 -msgid "" -"License text could not be found, please visit http://www.gnu.org/licenses/" -"gpl-2.0.txt to view it online." -msgstr "" -"Der Lizenztext konnte nicht gefunden werden. Bitte besuchen Sie http://www." -"gnu.org/licenses/gpl-2.0.txt um die Lizenz online zu lesen." +msgid "License text could not be found, please visit http://www.gnu.org/licenses/gpl-2.0.txt to view it online." +msgstr "Der Lizenztext konnte nicht gefunden werden. Bitte besuchen Sie http://www.gnu.org/licenses/gpl-2.0.txt um die Lizenz online zu lesen." #. fall back to %d #: ../src/build.c:655 @@ -121,7 +117,9 @@ msgid "%s (in directory: %s)" msgstr "%s (im Verzeichnis: %s)" -#: ../src/build.c:739 ../src/build.c:961 ../src/search.c:1542 +#: ../src/build.c:739 +#: ../src/build.c:961 +#: ../src/search.c:1542 #, c-format msgid "Process failed (%s)" msgstr "Prozess fehlgeschlagen (%s)" @@ -137,20 +135,13 @@ msgstr "Konnte »%s« nicht ausführen (Start-Script konnte nicht erzeugt werden)" #: ../src/build.c:890 -msgid "" -"Could not execute the file in the VTE because it probably contains a command." -msgstr "" -"Konnte die Datei nicht in der VTE ausführen. Eventuell steht bereits ein " -"Befehl auf der Kommandozeile." +msgid "Could not execute the file in the VTE because it probably contains a command." +msgstr "Konnte die Datei nicht in der VTE ausführen. Eventuell steht bereits ein Befehl auf der Kommandozeile." #: ../src/build.c:928 #, 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:1101 msgid "Compilation failed." @@ -166,9 +157,7 @@ #: ../src/build.c:1275 msgid "Enter custom text here, all entered text is appended to the command." -msgstr "" -"Hier kann freier Text eingefügt werden, welcher an das Kommando angefügt " -"wird." +msgstr "Hier kann freier Text eingefügt werden, welcher an das Kommando angefügt wird." #: ../src/build.c:1353 msgid "_Next Error" @@ -178,11 +167,14 @@ msgid "_Previous Error" msgstr "_Vorheriger Fehler" +#. arguments #: ../src/build.c:1365 +#: ../src/build.c:2749 msgid "_Set Build Commands" msgstr "_Kommandos zum Erstellen konfigurieren" -#: ../src/build.c:1649 ../src/toolbar.c:374 +#: ../src/build.c:1649 +#: ../src/toolbar.c:373 msgid "Build the current file" msgstr "Kompiliert die aktuelle Datei" @@ -203,7 +195,8 @@ msgid "Process could not be stopped (%s)." msgstr "Der Prozess konnte nicht angehalten werden (%s)." -#: ../src/build.c:1711 ../src/build.c:1723 +#: ../src/build.c:1711 +#: ../src/build.c:1723 msgid "No more build errors." msgstr "Keine weiteren Fehlermeldungen." @@ -212,11 +205,14 @@ msgid "Set menu item label" msgstr "Bezeichnung für den Menüeintrag definieren" -#: ../src/build.c:1845 ../src/symbols.c:737 +#: ../src/build.c:1845 +#: ../src/symbols.c:737 msgid "Label" msgstr "Label" -#: ../src/build.c:1846 ../src/symbols.c:732 +#: ../src/build.c:1846 +#: ../src/symbols.c:732 +#: ../src/tools.c:509 msgid "Command" msgstr "Kommando" @@ -225,90 +221,90 @@ msgstr "Arbeitsverzeichnis" #: ../src/build.c:1848 -msgid "Clear" -msgstr "Leeren" +msgid "Reset" +msgstr "Zurücksetzen" -#: ../src/build.c:1891 +#: ../src/build.c:1893 msgid "Click to set menu item label" msgstr "Klicken, um die Bezeichnung für den Menüeintrag zu definieren" -#: ../src/build.c:1975 ../src/build.c:1977 +#: ../src/build.c:1977 +#: ../src/build.c:1979 #, c-format -msgid "%s Commands" +msgid "%s commands" msgstr "Kommandos für %s" -#: ../src/build.c:1977 -msgid "No Filetype" +#: ../src/build.c:1979 +msgid "No filetype" msgstr "Kein Dateityp" -#: ../src/build.c:1985 ../src/build.c:2020 -msgid "Error Regular Expression:" +#: ../src/build.c:1988 +#: ../src/build.c:2023 +msgid "Error regular expression:" msgstr "Regulärer Ausdruck für Fehlermeldungen:" -#: ../src/build.c:2013 -msgid "Independent Commands" +#: ../src/build.c:2016 +msgid "Independent commands" msgstr "Dateitypunabhängige Befehle" -#: ../src/build.c:2045 +#: ../src/build.c:2048 msgid "Note: Item 2 opens a dialog and appends the response to the command." -msgstr "" -"Notiz: Element 2 öffnet ein Dialog und fügt das Ergebnis am Ende des " -"Kommandos an" +msgstr "Notiz: Element 2 öffnet ein Dialog und fügt das Ergebnis am Ende des Kommandos an" -#: ../src/build.c:2054 -msgid "Execute Commands" +#: ../src/build.c:2057 +msgid "Execute commands" msgstr "Befehle zum Ausführen" -#: ../src/build.c:2066 +#: ../src/build.c:2069 #, c-format -msgid "" -"%d, %e, %f, %p are substituted in command and directory fields, see manual " -"for details." -msgstr "" -"%d, %e, %f, %p werden innerhalb der Kommando- und Verzeichnisfelder ersetzt " -"- Details gibt es in der Dokumentation." +msgid "%d, %e, %f, %p are substituted in command and directory fields, see manual for details." +msgstr "%d, %e, %f, %p werden innerhalb der Kommando- und Verzeichnisfelder ersetzt - Details gibt es in der Dokumentation." -#: ../src/build.c:2226 +#: ../src/build.c:2229 msgid "Set Build Commands" msgstr "Kommandos zum Erstellen konfigurieren" -#: ../src/build.c:2437 +#: ../src/build.c:2440 msgid "_Compile" msgstr "_Kompilieren" #. build the code -#: ../src/build.c:2444 ../src/build.c:2706 ../src/interface.c:1223 +#: ../src/build.c:2447 +#: ../src/build.c:2709 +#: ../src/interface.c:1223 msgid "_Build" msgstr "_Erstellen" -#: ../src/build.c:2451 ../src/build.c:2481 ../src/build.c:2674 +#: ../src/build.c:2454 +#: ../src/build.c:2484 +#: ../src/build.c:2677 msgid "_Execute" msgstr "_Ausführen" #. build the code with make custom -#: ../src/build.c:2496 ../src/build.c:2672 ../src/build.c:2726 +#: ../src/build.c:2499 +#: ../src/build.c:2675 +#: ../src/build.c:2729 msgid "Make Custom _Target" msgstr "Make (eigenes _Target)" #. build the code with make object -#: ../src/build.c:2498 ../src/build.c:2673 ../src/build.c:2734 +#: ../src/build.c:2501 +#: ../src/build.c:2676 +#: ../src/build.c:2737 msgid "Make _Object" msgstr "Make _Objekt-Datei" -#: ../src/build.c:2500 ../src/build.c:2671 +#: ../src/build.c:2503 +#: ../src/build.c:2674 msgid "_Make" msgstr "_Make" #. build the code with make all -#: ../src/build.c:2718 +#: ../src/build.c:2721 msgid "_Make All" msgstr "_Make all" -#. arguments -#: ../src/build.c:2746 -msgid "_Set Build Menu Commands" -msgstr "Kommandos zum Erstellen konfigurieren" - #: ../src/callbacks.c:150 msgid "Do you really want to quit?" msgstr "Soll Geany wirklich beendet werden?" @@ -320,7 +316,9 @@ msgstr[0] "%d Datei gespeichert." msgstr[1] "%d Dateien gespeichert." -#: ../src/callbacks.c:490 ../src/document.c:2900 ../src/interface.c:381 +#: ../src/callbacks.c:490 +#: ../src/document.c:2900 +#: ../src/interface.c:381 #: ../src/sidebar.c:687 msgid "_Reload" msgstr "_Neu laden" @@ -334,7 +332,8 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Möchten Sie »%s« wirklich neu laden?" -#: ../src/callbacks.c:1210 ../src/keybindings.c:425 +#: ../src/callbacks.c:1210 +#: ../src/keybindings.c:425 msgid "Go to Line" msgstr "Gehe zu Zeile" @@ -342,36 +341,43 @@ msgid "Enter the line you want to go to:" msgstr "Geben Sie die Zeile an, zu der Sie springen möchten:" -#: ../src/callbacks.c:1305 ../src/callbacks.c:1332 -msgid "" -"Please set the filetype for the current file before using this function." +#: ../src/callbacks.c:1305 +#: ../src/callbacks.c:1332 +msgid "Please set the filetype for the current file before using this function." msgstr "Bitte legen Sie den Dateityp fest, bevor Sie diese Funktion benutzen." -#: ../src/callbacks.c:1448 ../src/ui_utils.c:619 +#: ../src/callbacks.c:1448 +#: ../src/ui_utils.c:619 msgid "dd.mm.yyyy" msgstr "TT.MM.JJJJ" -#: ../src/callbacks.c:1450 ../src/ui_utils.c:620 +#: ../src/callbacks.c:1450 +#: ../src/ui_utils.c:620 msgid "mm.dd.yyyy" msgstr "MM.TT.JJJJ" -#: ../src/callbacks.c:1452 ../src/ui_utils.c:621 +#: ../src/callbacks.c:1452 +#: ../src/ui_utils.c:621 msgid "yyyy/mm/dd" msgstr "JJJJ/MM/TT" -#: ../src/callbacks.c:1454 ../src/ui_utils.c:630 +#: ../src/callbacks.c:1454 +#: ../src/ui_utils.c:630 msgid "dd.mm.yyyy hh:mm:ss" msgstr "TT.MM.JJJJ HH:MM:SS" -#: ../src/callbacks.c:1456 ../src/ui_utils.c:631 +#: ../src/callbacks.c:1456 +#: ../src/ui_utils.c:631 msgid "mm.dd.yyyy hh:mm:ss" msgstr "MM.TT.JJJJ HH:MM:SS" -#: ../src/callbacks.c:1458 ../src/ui_utils.c:632 +#: ../src/callbacks.c:1458 +#: ../src/ui_utils.c:632 msgid "yyyy/mm/dd hh:mm:ss" msgstr "JJJJ/MM/TT HH:MM:SS" -#: ../src/callbacks.c:1460 ../src/ui_utils.c:641 +#: ../src/callbacks.c:1460 +#: ../src/ui_utils.c:641 msgid "_Use Custom Date Format" msgstr "Benutze selbst erstelltes _Datumsformat" @@ -380,23 +386,19 @@ msgstr "Benutzerdefiniertes Datumsformat" #: ../src/callbacks.c:1465 -msgid "" -"Enter here a custom date and time format. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"Hier kann ein benutzerdefiniertes Datumsformat eingegeben werden. Dabei " -"funktionieren alle Platzhalter der ANSI C Funktion »strftime«." +msgid "Enter here a custom date and time format. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Hier kann ein benutzerdefiniertes Datumsformat eingegeben werden. Dabei funktionieren alle Platzhalter der ANSI C Funktion »strftime«." #: ../src/callbacks.c:1488 msgid "Date format string could not be converted (possibly too long)." -msgstr "" -"Das Datenformat konnte nicht umgewandelt werden. Eventuell ist es zu lang." +msgstr "Das Datenformat konnte nicht umgewandelt werden. Eventuell ist es zu lang." -#: ../src/callbacks.c:1716 ../src/callbacks.c:1726 +#: ../src/callbacks.c:1716 +#: ../src/callbacks.c:1726 msgid "No more message items." msgstr "Keine weiteren Nachrichten." -#: ../src/dialogs.c:178 ../src/interface.c:5716 +#: ../src/dialogs.c:178 msgid "Detect from file" msgstr "Aus Datei lesen" @@ -420,27 +422,31 @@ msgid "Middle Eastern" msgstr "Nahöstlich" -#: ../src/dialogs.c:191 ../src/encodings.c:120 ../src/encodings.c:121 -#: ../src/encodings.c:122 ../src/encodings.c:123 ../src/encodings.c:124 -#: ../src/encodings.c:125 ../src/encodings.c:126 ../src/encodings.c:127 +#: ../src/dialogs.c:191 +#: ../src/encodings.c:120 +#: ../src/encodings.c:121 +#: ../src/encodings.c:122 +#: ../src/encodings.c:123 +#: ../src/encodings.c:124 +#: ../src/encodings.c:125 +#: ../src/encodings.c:126 +#: ../src/encodings.c:127 msgid "Unicode" msgstr "Unicode" -#: ../src/dialogs.c:239 ../src/dialogs.c:324 +#: ../src/dialogs.c:239 +#: ../src/dialogs.c:324 msgid "Open File" msgstr "Datei öffnen" -#: ../src/dialogs.c:243 ../src/interface.c:873 +#: ../src/dialogs.c:243 +#: ../src/interface.c:873 msgid "_View" msgstr "_Ansicht" #: ../src/dialogs.c:246 -msgid "" -"Opens the file in read-only mode. If you choose more than one file to open, " -"all files will be opened read-only." -msgstr "" -"Öffnet die Datei schreibgeschützt. Bei Auswahl mehrerer Dateien, werden alle " -"schreibgeschützt geöffnet." +msgid "Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only." +msgstr "Öffnet die Datei schreibgeschützt. Bei Auswahl mehrerer Dateien, werden alle schreibgeschützt geöffnet." #: ../src/dialogs.c:268 msgid "Detect by file extension" @@ -461,16 +467,11 @@ #: ../src/dialogs.c:384 msgid "" -"Explicitly defines an encoding for the file, if it would not be detected. " -"This is useful when you know that the encoding of a file cannot be detected " -"correctly by Geany.\n" -"Note if you choose multiple files, they will all be opened with the chosen " -"encoding." +"Explicitly defines an encoding for the file, if it would not be detected. This is useful when you know that the encoding of a file cannot be detected correctly by Geany.\n" +"Note if you choose multiple files, they will all be opened with the chosen encoding." msgstr "" -"Definiert explizit eine bestimmte Zeichenkodierung, wenn sie nicht " -"automatisch erkannt werden kann.\n" -"Beachten Sie: Wenn Sie mehrere Dateien auswählen, werden alle mit der " -"gewählten Zeichenkodierung geöffnet." +"Definiert explizit eine bestimmte Zeichenkodierung, wenn sie nicht automatisch erkannt werden kann.\n" +"Beachten Sie: Wenn Sie mehrere Dateien auswählen, werden alle mit der gewählten Zeichenkodierung geöffnet." #. line 2 with filetype combo #: ../src/dialogs.c:391 @@ -479,15 +480,11 @@ #: ../src/dialogs.c:401 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 werden kann.\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 werden kann.\n" +"Beachten Sie: Wenn Sie mehrere Dateien auswählen, werden alle mit dem gewählten Dateityp geöffnet." #: ../src/dialogs.c:480 msgid "Overwrite?" @@ -497,7 +494,8 @@ msgid "Filename already exists!" msgstr "Der Dateiname existiert bereits!" -#: ../src/dialogs.c:513 ../src/dialogs.c:642 +#: ../src/dialogs.c:513 +#: ../src/dialogs.c:642 msgid "Save File" msgstr "Datei speichern" @@ -514,27 +512,28 @@ msgstr "_Datei in einem neuen Reiter öffnen" #: ../src/dialogs.c:533 -msgid "" -"Keep the current unsaved document open and open the newly saved file in a " -"new tab" -msgstr "" -"Lässt das ungesicherte Dokument geöffnet und öffnet das gesicherte in einem " -"neuen Reiter." +msgid "Keep the current unsaved document open and open the newly saved file in a new tab" +msgstr "Lässt das ungesicherte Dokument geöffnet und öffnet das gesicherte in einem neuen Reiter." -#: ../src/dialogs.c:660 ../src/win32.c:681 +#: ../src/dialogs.c:660 +#: ../src/win32.c:681 msgid "Error" msgstr "Fehler" -#: ../src/dialogs.c:663 ../src/dialogs.c:1543 ../src/win32.c:687 +#: ../src/dialogs.c:663 +#: ../src/dialogs.c:1546 +#: ../src/win32.c:687 #: ../src/win32.c:746 msgid "Question" msgstr "Frage" -#: ../src/dialogs.c:666 ../src/win32.c:693 +#: ../src/dialogs.c:666 +#: ../src/win32.c:693 msgid "Warning" msgstr "Warnung" -#: ../src/dialogs.c:669 ../src/win32.c:699 +#: ../src/dialogs.c:669 +#: ../src/win32.c:699 msgid "Information" msgstr "Information" @@ -555,98 +554,102 @@ msgid "Choose font" msgstr "Schriftart auswählen" -#: ../src/dialogs.c:1157 -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, noch nicht gespeicherten Datei)." +#: ../src/dialogs.c:1158 +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, noch nicht gespeicherten Datei)." -#: ../src/dialogs.c:1176 ../src/dialogs.c:1177 ../src/dialogs.c:1178 -#: ../src/dialogs.c:1184 ../src/dialogs.c:1185 ../src/dialogs.c:1186 -#: ../src/symbols.c:1980 ../src/symbols.c:2001 ../src/symbols.c:2053 +#: ../src/dialogs.c:1177 +#: ../src/dialogs.c:1178 +#: ../src/dialogs.c:1179 +#: ../src/dialogs.c:1185 +#: ../src/dialogs.c:1186 +#: ../src/dialogs.c:1187 +#: ../src/symbols.c:1980 +#: ../src/symbols.c:2001 +#: ../src/symbols.c:2053 #: ../src/ui_utils.c:244 msgid "unknown" msgstr "unbekannt" -#: ../src/dialogs.c:1191 ../src/symbols.c:887 +#: ../src/dialogs.c:1192 +#: ../src/symbols.c:887 msgid "Properties" msgstr "Eigenschaften" -#: ../src/dialogs.c:1220 +#: ../src/dialogs.c:1223 msgid "Type:" msgstr "Dateityp:" -#: ../src/dialogs.c:1234 +#: ../src/dialogs.c:1237 msgid "Size:" msgstr "Größe:" -#: ../src/dialogs.c:1250 +#: ../src/dialogs.c:1253 msgid "Location:" msgstr "Ort:" -#: ../src/dialogs.c:1264 +#: ../src/dialogs.c:1267 msgid "Read-only:" msgstr "Schreibgeschützt:" -#: ../src/dialogs.c:1271 +#: ../src/dialogs.c:1274 msgid "(only inside Geany)" msgstr "(nur innerhalb von Geany)" -#: ../src/dialogs.c:1280 +#: ../src/dialogs.c:1283 msgid "Encoding:" msgstr "Kodierung:" -#: ../src/dialogs.c:1290 ../src/ui_utils.c:248 +#: ../src/dialogs.c:1293 +#: ../src/ui_utils.c:248 msgid "(with BOM)" msgstr "(mit BOM)" -#: ../src/dialogs.c:1290 +#: ../src/dialogs.c:1293 msgid "(without BOM)" msgstr "(ohne BOM)" -#: ../src/dialogs.c:1301 +#: ../src/dialogs.c:1304 msgid "Modified:" msgstr "Modifiziert:" -#: ../src/dialogs.c:1315 +#: ../src/dialogs.c:1318 msgid "Changed:" msgstr "Geändert:" -#: ../src/dialogs.c:1329 +#: ../src/dialogs.c:1332 msgid "Accessed:" msgstr "Zugriff:" -#: ../src/dialogs.c:1351 +#: ../src/dialogs.c:1354 msgid "Permissions:" msgstr "Zugriffsrechte:" #. Header -#: ../src/dialogs.c:1359 +#: ../src/dialogs.c:1362 msgid "Read:" msgstr "Lesen:" -#: ../src/dialogs.c:1366 +#: ../src/dialogs.c:1369 msgid "Write:" msgstr "Schreiben:" -#: ../src/dialogs.c:1373 +#: ../src/dialogs.c:1376 msgid "Execute:" msgstr "Ausführen:" #. Owner -#: ../src/dialogs.c:1381 +#: ../src/dialogs.c:1384 msgid "Owner:" msgstr "Eigentümer:" #. Group -#: ../src/dialogs.c:1417 +#: ../src/dialogs.c:1420 msgid "Group:" msgstr "Gruppe:" #. Other -#: ../src/dialogs.c:1453 +#: ../src/dialogs.c:1456 msgid "Other:" msgstr "Andere:" @@ -660,7 +663,8 @@ msgid "New file \"%s\" opened." msgstr "Neue Datei »%s« geöffnet." -#: ../src/document.c:845 ../src/document.c:1370 +#: ../src/document.c:845 +#: ../src/document.c:1370 #, c-format msgid "Could not open file %s (%s)" msgstr "Konnte Datei »%s« nicht öffnen (%s)." @@ -672,24 +676,16 @@ #: ../src/document.c:871 #, c-format -msgid "" -"The file \"%s\" does not look like a text file or the file encoding is not " -"supported." -msgstr "" -"Die Datei »%s« scheint keine Textdatei zu sein, oder die Zeichenkodierung " -"wird nicht unterstützt." +msgid "The file \"%s\" does not look like a text file or the file encoding is not supported." +msgstr "Die Datei »%s« scheint keine Textdatei zu sein, oder die Zeichenkodierung wird nicht unterstützt." #: ../src/document.c:881 #, c-format msgid "" -"The file \"%s\" could not be opened properly and has been truncated. This " -"can occur if the file contains a NULL byte. Be aware that saving it can " -"cause data loss.\n" +"The file \"%s\" could not be opened properly and has been truncated. This can occur if the file contains a NULL byte. Be aware that saving it can cause data loss.\n" "The file was set to read-only." msgstr "" -"Die Datei »%s« konnte nicht ordnungsgemäß geladen werden und wurde eventuell " -"abgeschnitten. Dies passiert beispielsweise, wenn die Datei ein »NULL-Byte« " -"enthält und kann zu Datenverlust beim Speichern führen!\n" +"Die Datei »%s« konnte nicht ordnungsgemäß geladen werden und wurde eventuell abgeschnitten. Dies passiert beispielsweise, wenn die Datei ein »NULL-Byte« enthält und kann zu Datenverlust beim Speichern führen!\n" "Die Datei wird schreibgeschützt geöffnet." #: ../src/document.c:1090 @@ -716,7 +712,8 @@ msgid "Setting indentation width to %d for %s." msgstr "Setze Einrückungsbreite auf %d für »%s«." -#: ../src/document.c:1145 ../src/document.c:1743 +#: ../src/document.c:1145 +#: ../src/document.c:1743 msgid "Invalid filename" msgstr "Ungültiger Dateiname" @@ -743,12 +740,8 @@ #: ../src/document.c:1551 #, c-format -msgid "" -"An error occurred while converting the file from UTF-8 in \"%s\". The file " -"remains unsaved." -msgstr "" -"Beim Konvertieren der Datei von UTF-8 nach »%s« ist ein Fehler aufgetreten. " -"Die Datei wird nicht gespeichert." +msgid "An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved." +msgstr "Beim Konvertieren der Datei von UTF-8 nach »%s« ist ein Fehler aufgetreten. Die Datei wird nicht gespeichert." #: ../src/document.c:1573 #, c-format @@ -767,22 +760,20 @@ #: ../src/document.c:1628 #, c-format msgid "Failed to open file '%s' for writing: fopen() failed: %s" -msgstr "" -"Konnte Datei »%s« nicht zum Schreiben öffnen: fopen() fehlgeschlagen: %s" +msgstr "Konnte Datei »%s« nicht zum Schreiben öffnen: fopen() fehlgeschlagen: %s" #: ../src/document.c:1646 #, c-format msgid "Failed to write file '%s': fwrite() failed: %s" -msgstr "" -"Konnte Datei »%s« nicht zum Schreiben öffnen: fwrite() fehlgeschlagen: %s" +msgstr "Konnte Datei »%s« nicht zum Schreiben öffnen: fwrite() fehlgeschlagen: %s" #: ../src/document.c:1660 #, c-format msgid "Failed to close file '%s': fclose() failed: %s" -msgstr "" -"Konnte Datei »%s« nicht zum Schreiben öffnen: fclose() fehlgeschlagen: %s" +msgstr "Konnte Datei »%s« nicht zum Schreiben öffnen: fclose() fehlgeschlagen: %s" -#: ../src/document.c:1743 ../src/document.c:1808 +#: ../src/document.c:1743 +#: ../src/document.c:1808 #, c-format msgid "Error saving file (%s)." msgstr "Fehler beim Speichern der Datei (%s)." @@ -807,7 +798,9 @@ msgid "File %s saved." msgstr "Datei »%s« wurde gespeichert." -#: ../src/document.c:1916 ../src/document.c:1973 ../src/document.c:1981 +#: ../src/document.c:1916 +#: ../src/document.c:1973 +#: ../src/document.c:1981 #, c-format msgid "\"%s\" was not found." msgstr "»%s« wurde nicht gefunden." @@ -816,13 +809,17 @@ msgid "Wrap search and find again?" msgstr "Suche vom Dokumentanfang bzw. -ende neu beginnen?" -#: ../src/document.c:2060 ../src/search.c:1203 ../src/search.c:1247 -#: ../src/search.c:1938 ../src/search.c:1939 +#: ../src/document.c:2060 +#: ../src/search.c:1203 +#: ../src/search.c:1247 +#: ../src/search.c:1938 +#: ../src/search.c:1939 #, c-format msgid "No matches found for \"%s\"." msgstr "Keine Treffer für »%s« gefunden." -#: ../src/document.c:2071 ../src/document.c:2080 +#: ../src/document.c:2071 +#: ../src/document.c:2080 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." @@ -838,9 +835,7 @@ msgid "" "The file '%s' on the disk is more recent than\n" "the current buffer." -msgstr "" -"Die Datei »%s« auf dem Datenträger ist aktueller als die momentan geöffnete " -"Version." +msgstr "Die Datei »%s« auf dem Datenträger ist aktueller als die momentan geöffnete Version." #: ../src/document.c:2920 msgid "Close _without saving" @@ -861,9 +856,7 @@ #: ../src/editor.c:4383 msgid "Enter the amount of spaces which should be replaced by a tab character." -msgstr "" -"Geben Sie die Anzahl der Leerzeichen an, welche durch den Tabulator ersetzt " -"werden sollen." +msgstr "Geben Sie die Anzahl der Leerzeichen an, welche durch den Tabulator ersetzt werden sollen." #: ../src/editor.c:4533 #, c-format @@ -874,7 +867,8 @@ msgid "Celtic" msgstr "Keltisch" -#: ../src/encodings.c:76 ../src/encodings.c:77 +#: ../src/encodings.c:76 +#: ../src/encodings.c:77 msgid "Greek" msgstr "Griechisch" @@ -886,22 +880,31 @@ msgid "South European" msgstr "Südeuropäisch" -#: ../src/encodings.c:80 ../src/encodings.c:81 ../src/encodings.c:82 +#: ../src/encodings.c:80 +#: ../src/encodings.c:81 +#: ../src/encodings.c:82 #: ../src/encodings.c:83 msgid "Western" msgstr "Westlich" -#: ../src/encodings.c:85 ../src/encodings.c:86 ../src/encodings.c:87 +#: ../src/encodings.c:85 +#: ../src/encodings.c:86 +#: ../src/encodings.c:87 msgid "Baltic" msgstr "Baltisch" -#: ../src/encodings.c:88 ../src/encodings.c:89 ../src/encodings.c:90 +#: ../src/encodings.c:88 +#: ../src/encodings.c:89 +#: ../src/encodings.c:90 msgid "Central European" msgstr "Mitteleuropäisch" #. ISO-IR-111 not available on Windows -#: ../src/encodings.c:91 ../src/encodings.c:92 ../src/encodings.c:94 -#: ../src/encodings.c:95 ../src/encodings.c:96 +#: ../src/encodings.c:91 +#: ../src/encodings.c:92 +#: ../src/encodings.c:94 +#: ../src/encodings.c:95 +#: ../src/encodings.c:96 msgid "Cyrillic" msgstr "Kyrillisch" @@ -917,12 +920,16 @@ msgid "Romanian" msgstr "Rumänisch" -#: ../src/encodings.c:101 ../src/encodings.c:102 ../src/encodings.c:103 +#: ../src/encodings.c:101 +#: ../src/encodings.c:102 +#: ../src/encodings.c:103 msgid "Arabic" msgstr "Arabisch" #. not available at all, ? -#: ../src/encodings.c:104 ../src/encodings.c:106 ../src/encodings.c:107 +#: ../src/encodings.c:104 +#: ../src/encodings.c:106 +#: ../src/encodings.c:107 msgid "Hebrew" msgstr "Hebräisch" @@ -942,30 +949,42 @@ msgid "Thai" msgstr "Thai" -#: ../src/encodings.c:113 ../src/encodings.c:114 ../src/encodings.c:115 +#: ../src/encodings.c:113 +#: ../src/encodings.c:114 +#: ../src/encodings.c:115 msgid "Turkish" msgstr "Türkisch" -#: ../src/encodings.c:116 ../src/encodings.c:117 ../src/encodings.c:118 +#: ../src/encodings.c:116 +#: ../src/encodings.c:117 +#: ../src/encodings.c:118 msgid "Vietnamese" msgstr "Vietnamesisch" #. maybe not available on Linux -#: ../src/encodings.c:129 ../src/encodings.c:130 ../src/encodings.c:131 +#: ../src/encodings.c:129 +#: ../src/encodings.c:130 +#: ../src/encodings.c:131 #: ../src/encodings.c:133 msgid "Chinese Simplified" msgstr "Chinesisch, vereinfacht" -#: ../src/encodings.c:134 ../src/encodings.c:135 ../src/encodings.c:136 +#: ../src/encodings.c:134 +#: ../src/encodings.c:135 +#: ../src/encodings.c:136 msgid "Chinese Traditional" msgstr "Chinesisch, traditionell" -#: ../src/encodings.c:137 ../src/encodings.c:138 ../src/encodings.c:139 +#: ../src/encodings.c:137 +#: ../src/encodings.c:138 +#: ../src/encodings.c:139 #: ../src/encodings.c:140 msgid "Japanese" msgstr "Japanisch" -#: ../src/encodings.c:141 ../src/encodings.c:142 ../src/encodings.c:143 +#: ../src/encodings.c:141 +#: ../src/encodings.c:142 +#: ../src/encodings.c:143 #: ../src/encodings.c:144 msgid "Korean" msgstr "Koreanisch" @@ -974,110 +993,119 @@ msgid "Without encoding" msgstr "Ohne Zeichenkodierung" -#: ../src/encodings.c:368 +#: ../src/encodings.c:430 msgid "_West European" msgstr "_Westeuropäisch" -#: ../src/encodings.c:374 +#: ../src/encodings.c:436 msgid "_East European" msgstr "_Osteuropäisch" -#: ../src/encodings.c:380 +#: ../src/encodings.c:442 msgid "East _Asian" msgstr "Ost_asiatisch" -#: ../src/encodings.c:386 +#: ../src/encodings.c:448 msgid "_SE & SW Asian" msgstr "_SO- & SW-Asiatisch" -#: ../src/encodings.c:392 +#: ../src/encodings.c:454 msgid "_Middle Eastern" msgstr "_Nahöstlich" -#: ../src/encodings.c:398 +#: ../src/encodings.c:460 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:80 ../src/filetypes.c:162 ../src/filetypes.c:176 -#: ../src/filetypes.c:184 ../src/filetypes.c:198 +#: ../src/filetypes.c:81 +#: ../src/filetypes.c:163 +#: ../src/filetypes.c:177 +#: ../src/filetypes.c:185 +#: ../src/filetypes.c:199 #, c-format msgid "%s source file" msgstr "%s Quelldatei" -#: ../src/filetypes.c:81 +#: ../src/filetypes.c:82 #, c-format msgid "%s file" msgstr "%s Quelldatei" -#: ../src/filetypes.c:99 ../src/filetypes.c:1645 ../src/interface.c:3874 +#: ../src/filetypes.c:100 +#: ../src/filetypes.c:1669 +#: ../src/interface.c:3874 #: ../src/interface.c:5524 msgid "None" msgstr "Keiner" -#: ../src/filetypes.c:299 +#: ../src/filetypes.c:300 msgid "Shell script file" msgstr "Shellskript Datei" -#: ../src/filetypes.c:307 +#: ../src/filetypes.c:308 msgid "Makefile" msgstr "Makefile" -#: ../src/filetypes.c:314 +#: ../src/filetypes.c:315 msgid "XML document" msgstr "XML-Dokument" -#: ../src/filetypes.c:338 +#: ../src/filetypes.c:339 msgid "Cascading StyleSheet" msgstr "Cascading StyleSheet" -#: ../src/filetypes.c:346 +#: ../src/filetypes.c:347 msgid "SQL Dump file" msgstr "SQL-Dump Datei" -#: ../src/filetypes.c:405 +#: ../src/filetypes.c:406 msgid "Config file" msgstr "Konfigurationsdatei" -#: ../src/filetypes.c:411 +#: ../src/filetypes.c:412 msgid "Gettext translation file" msgstr "Gettext-Übersetzungsdatei" -#: ../src/filetypes.c:434 +#: ../src/filetypes.c:435 #, c-format msgid "%s script file" msgstr "%s Skript Datei" -#: ../src/filetypes.c:667 +#: ../src/filetypes.c:691 msgid "_Programming Languages" msgstr "_Kompilersprachen" -#: ../src/filetypes.c:668 +#: ../src/filetypes.c:692 msgid "_Scripting Languages" msgstr "_Interpretersprachen" -#: ../src/filetypes.c:669 +#: ../src/filetypes.c:693 msgid "_Markup Languages" msgstr "_Markup-Sprachen" -#: ../src/filetypes.c:670 +#: ../src/filetypes.c:694 msgid "M_iscellaneous Languages" msgstr "_Sonstige Sprachen" -#: ../src/filetypes.c:671 +#: ../src/filetypes.c:695 msgid "_Custom Filetypes" msgstr "_Benutzerdefinierte Dateitypen" -#: ../src/filetypes.c:1373 ../src/win32.c:105 +#: ../src/filetypes.c:1397 +#: ../src/win32.c:105 msgid "All Source" msgstr "Alle Quellen" #. create meta file filter "All files" -#: ../src/filetypes.c:1398 ../src/project.c:293 ../src/win32.c:95 -#: ../src/win32.c:143 ../src/win32.c:145 +#: ../src/filetypes.c:1422 +#: ../src/project.c:293 +#: ../src/win32.c:95 +#: ../src/win32.c:143 +#: ../src/win32.c:145 msgid "All files" msgstr "Alle Dateien" -#: ../src/filetypes.c:1456 +#: ../src/filetypes.c:1480 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Schlechter RegEx für Dateityp %s: %s" @@ -1086,8 +1114,10 @@ msgid "untitled" msgstr "unbenannt" -#: ../src/highlighting.c:3621 ../src/main.c:817 ../src/socket.c:165 -#: ../src/templates.c:327 +#: ../src/highlighting.c:3621 +#: ../src/main.c:818 +#: ../src/socket.c:165 +#: ../src/templates.c:258 #, c-format msgid "Could not find file '%s'." msgstr "Konnte die Datei »%s« nicht finden." @@ -1108,7 +1138,8 @@ msgid "New (with _Template)" msgstr "Neu (aus _Vorlage)" -#: ../src/interface.c:352 ../src/interface.c:2346 +#: ../src/interface.c:352 +#: ../src/interface.c:2346 msgid "Open Selected F_ile" msgstr "_Markierte Datei öffnen" @@ -1124,9 +1155,14 @@ msgid "R_eload As" msgstr "N_eu laden als" -#: ../src/interface.c:400 ../src/interface.c:635 ../src/interface.c:694 -#: ../src/interface.c:708 ../src/interface.c:1088 ../src/interface.c:1098 -#: ../src/interface.c:2311 ../src/interface.c:2325 +#: ../src/interface.c:400 +#: ../src/interface.c:635 +#: ../src/interface.c:694 +#: ../src/interface.c:708 +#: ../src/interface.c:1088 +#: ../src/interface.c:1098 +#: ../src/interface.c:2311 +#: ../src/interface.c:2325 msgid "invisible" msgstr "unsichtbar" @@ -1134,15 +1170,18 @@ msgid "Page Set_up" msgstr "Seiteneigensc_haften" -#: ../src/interface.c:434 ../src/notebook.c:257 +#: ../src/interface.c:434 +#: ../src/notebook.c:257 msgid "Close Ot_her Documents" msgstr "_Inaktive Dateien schließen" -#: ../src/interface.c:442 ../src/notebook.c:262 +#: ../src/interface.c:442 +#: ../src/notebook.c:262 msgid "C_lose All" msgstr "_Alle schließen" -#: ../src/interface.c:459 ../src/interface.c:2241 +#: ../src/interface.c:459 +#: ../src/interface.c:2241 msgid "_Edit" msgstr "_Bearbeiten" @@ -1150,47 +1189,58 @@ msgid "_Commands" msgstr "_Kommandos" -#: ../src/interface.c:516 ../src/keybindings.c:311 +#: ../src/interface.c:516 +#: ../src/keybindings.c:311 msgid "_Cut Current Line(s)" msgstr "Aktuelle Zeile(n) _ausschneiden" -#: ../src/interface.c:524 ../src/keybindings.c:308 +#: ../src/interface.c:524 +#: ../src/keybindings.c:308 msgid "_Copy Current Line(s)" msgstr "Aktuelle Zeile(n) _kopieren" -#: ../src/interface.c:532 ../src/keybindings.c:263 +#: ../src/interface.c:532 +#: ../src/keybindings.c:263 msgid "_Delete Current Line(s)" msgstr "Aktuelle Zeile(n) _löschen" -#: ../src/interface.c:536 ../src/keybindings.c:260 +#: ../src/interface.c:536 +#: ../src/keybindings.c:260 msgid "_Duplicate Line or Selection" msgstr "_Zeile oder Auswahl duplizieren" -#: ../src/interface.c:545 ../src/keybindings.c:321 +#: ../src/interface.c:545 +#: ../src/keybindings.c:321 msgid "_Select Current Line(s)" msgstr "Aktuelle Zeile(n) a_uswählen" -#: ../src/interface.c:549 ../src/keybindings.c:324 +#: ../src/interface.c:549 +#: ../src/keybindings.c:324 msgid "_Select Current Paragraph" msgstr "Aktuellen Absatz au_swählen" -#: ../src/interface.c:558 ../src/keybindings.c:363 +#: ../src/interface.c:558 +#: ../src/keybindings.c:363 msgid "_Send Selection to Terminal" msgstr "_Auswahl an Terminal senden" -#: ../src/interface.c:562 ../src/interface.c:2245 +#: ../src/interface.c:562 +#: ../src/interface.c:2245 msgid "_Format" msgstr "_Format" -#: ../src/interface.c:569 ../src/keybindings.c:365 +#: ../src/interface.c:569 +#: ../src/keybindings.c:365 msgid "_Reflow Lines/Block" msgstr "_Neuformatieren der Zeile/des Abschnitts" -#: ../src/interface.c:573 ../src/keybindings.c:335 +#: ../src/interface.c:573 +#: ../src/keybindings.c:335 msgid "T_oggle Case of Selection" msgstr "_Groß- und Kleinschreibung für die Auswahl tauschen" -#: ../src/interface.c:577 ../src/keybindings.c:270 +#: ../src/interface.c:577 +#: ../src/keybindings.c:270 msgid "_Transpose Current Line" msgstr "Aktuelle Zeile _tauschen" @@ -1214,7 +1264,8 @@ msgid "_Decrease Indent" msgstr "Einzug _verringern" -#: ../src/interface.c:619 ../src/keybindings.c:354 +#: ../src/interface.c:619 +#: ../src/keybindings.c:354 msgid "_Smart Line Indent" msgstr "Intelligentes _Einrücken" @@ -1226,39 +1277,49 @@ msgid "I_nsert Comments" msgstr "K_ommentare einfügen" -#: ../src/interface.c:654 ../src/interface.c:2260 +#: ../src/interface.c:654 +#: ../src/interface.c:2260 msgid "Insert _ChangeLog Entry" msgstr "_ChangeLog-Eintrag hinzufügen" -#: ../src/interface.c:658 ../src/interface.c:2264 +#: ../src/interface.c:658 +#: ../src/interface.c:2264 msgid "Insert _Function Description" msgstr "_Funktionsbeschreibung einfügen" -#: ../src/interface.c:662 ../src/interface.c:2268 +#: ../src/interface.c:662 +#: ../src/interface.c:2268 msgid "Insert _Multiline Comment" msgstr "_Mehrzeiligen Kommentar einfügen" -#: ../src/interface.c:671 ../src/interface.c:2283 +#: ../src/interface.c:671 +#: ../src/interface.c:2283 msgid "Insert File _Header" msgstr "_Dateikopf einfügen" -#: ../src/interface.c:675 ../src/interface.c:2287 +#: ../src/interface.c:675 +#: ../src/interface.c:2287 msgid "Insert _GPL Notice" msgstr "_GPL-Hinweis einfügen" -#: ../src/interface.c:679 ../src/interface.c:2291 +#: ../src/interface.c:679 +#: ../src/interface.c:2291 msgid "Insert _BSD License Notice" msgstr "_BSD-Lizenz-Hinweis einfügen" -#: ../src/interface.c:683 ../src/interface.c:2300 +#: ../src/interface.c:683 +#: ../src/interface.c:2300 msgid "Insert Dat_e" msgstr "_Datum einfügen" -#: ../src/interface.c:697 ../src/interface.c:2314 +#: ../src/interface.c:697 +#: ../src/interface.c:2314 msgid "_Insert \"include <...>\"" msgstr "\"include <...>\" ei_nfügen" -#: ../src/interface.c:711 ../src/interface.c:2333 ../src/keybindings.c:374 +#: ../src/interface.c:711 +#: ../src/interface.c:2333 +#: ../src/keybindings.c:374 msgid "_Insert Alternative White Space" msgstr "Alternatives _Leerzeichen einfügen" @@ -1266,11 +1327,13 @@ msgid "Preference_s" msgstr "E_instellungen" -#: ../src/interface.c:728 ../src/keybindings.c:387 +#: ../src/interface.c:728 +#: ../src/keybindings.c:387 msgid "P_lugin Preferences" msgstr "Plugin-_Einstellungen" -#: ../src/interface.c:736 ../src/interface.c:2337 +#: ../src/interface.c:736 +#: ../src/interface.c:2337 msgid "_Search" msgstr "_Suchen" @@ -1286,7 +1349,8 @@ msgid "Find in F_iles" msgstr "In _Dateien suchen" -#: ../src/interface.c:768 ../src/search.c:620 +#: ../src/interface.c:768 +#: ../src/search.c:620 msgid "_Replace" msgstr "_Ersetzen" @@ -1298,11 +1362,13 @@ msgid "Pr_evious Message" msgstr "V_orherige Nachricht" -#: ../src/interface.c:802 ../src/keybindings.c:434 +#: ../src/interface.c:802 +#: ../src/keybindings.c:434 msgid "_Go to Next Marker" msgstr "Zur _nächsten Markierung springen" -#: ../src/interface.c:806 ../src/keybindings.c:437 +#: ../src/interface.c:806 +#: ../src/keybindings.c:437 msgid "_Go to Previous Marker" msgstr "Zur _vorherigen Markierung springen" @@ -1310,31 +1376,38 @@ msgid "_Go to Line" msgstr "_Gehe zu Zeile" -#: ../src/interface.c:823 ../src/interface.c:2272 ../src/interface.c:3532 +#: ../src/interface.c:823 +#: ../src/interface.c:2272 msgid "_More" msgstr "_Weitere" -#: ../src/interface.c:830 ../src/keybindings.c:399 +#: ../src/interface.c:830 +#: ../src/keybindings.c:399 msgid "Find Next _Selection" msgstr "Auswahl _vorwärts im Dokument finden " -#: ../src/interface.c:834 ../src/keybindings.c:401 +#: ../src/interface.c:834 +#: ../src/keybindings.c:401 msgid "Find Pre_vious Selection" msgstr "Auswahl _rückwärts im Dokument finden" -#: ../src/interface.c:843 ../src/interface.c:2354 +#: ../src/interface.c:843 +#: ../src/interface.c:2354 msgid "Find _Usage" msgstr "_Auftreten finden" -#: ../src/interface.c:847 ../src/interface.c:2362 +#: ../src/interface.c:847 +#: ../src/interface.c:2362 msgid "Find _Document Usage" msgstr "_Auftreten im Dokument finden" -#: ../src/interface.c:856 ../src/keybindings.c:416 +#: ../src/interface.c:856 +#: ../src/keybindings.c:416 msgid "_Mark All" msgstr "_Alles markieren" -#: ../src/interface.c:865 ../src/interface.c:2370 +#: ../src/interface.c:865 +#: ../src/interface.c:2370 msgid "Go to _Tag Definition" msgstr "Gehe zur _Tagdefinition" @@ -1366,8 +1439,11 @@ msgid "Show Side_bar" msgstr "Seiten_leiste anzeigen" -#: ../src/interface.c:916 ../src/interface.c:4310 ../src/interface.c:5654 -#: ../src/keybindings.c:253 ../src/prefs.c:1557 +#: ../src/interface.c:916 +#: ../src/interface.c:4310 +#: ../src/interface.c:5654 +#: ../src/keybindings.c:253 +#: ../src/prefs.c:1557 msgid "Editor" msgstr "Editor" @@ -1411,11 +1487,15 @@ msgid "In_dent Type" msgstr "Art der _Einrückung" -#: ../src/interface.c:990 ../src/interface.c:3904 ../src/interface.c:5554 +#: ../src/interface.c:990 +#: ../src/interface.c:3904 +#: ../src/interface.c:5554 msgid "_Tabs" msgstr "_Tabulatoren" -#: ../src/interface.c:996 ../src/interface.c:3895 ../src/interface.c:5545 +#: ../src/interface.c:996 +#: ../src/interface.c:3895 +#: ../src/interface.c:5545 msgid "_Spaces" msgstr "_Leerzeichen" @@ -1571,7 +1651,8 @@ msgid "Load Ta_gs" msgstr "_Tags laden" -#: ../src/interface.c:1271 ../src/interface.c:1278 +#: ../src/interface.c:1271 +#: ../src/interface.c:1278 msgid "_Help" msgstr "_Hilfe" @@ -1587,7 +1668,8 @@ msgid "_Debug Messages" msgstr "_Debug-Meldungen" -#: ../src/interface.c:1333 ../src/sidebar.c:124 +#: ../src/interface.c:1333 +#: ../src/sidebar.c:124 msgid "Symbols" msgstr "Symbole" @@ -1627,7 +1709,8 @@ msgid "Conte_xt Action" msgstr "_Kontextaktion" -#: ../src/interface.c:2908 ../src/keybindings.c:384 +#: ../src/interface.c:2908 +#: ../src/keybindings.c:384 msgid "Preferences" msgstr "Einstellungen" @@ -1644,13 +1727,8 @@ msgstr "Die Virtual Terminal Emulation (VTE) laden" #: ../src/interface.c:2951 -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 diese Option " -"deaktiviert werden." +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 diese Option deaktiviert werden." #: ../src/interface.c:2953 msgid "Enable plugin support" @@ -1666,9 +1744,7 @@ #: ../src/interface.c:2979 msgid "Saves the window position and geometry and restores it at the start" -msgstr "" -"Speichert die Fensterposition und die Fenstergröße und stellt sie beim " -"nächsten Start wieder her." +msgstr "Speichert die Fensterposition und die Fenstergröße und stellt sie beim nächsten Start wieder her." #: ../src/interface.c:2981 msgid "Confirm exit" @@ -1687,13 +1763,8 @@ msgstr "Startpfad:" #: ../src/interface.c:3019 -msgid "" -"Path to start in when opening or saving files. Must be an absolute path. " -"Leave blank to use the current working directory." -msgstr "" -"Startpfad, wenn Dateien geöffnet oder gespeichert werden sollen. Der Pfad " -"muss absolut sein. Um das aktuelle Arbeitsverzeichnis zu benutzen, lassen " -"Sie das Feld leer." +msgid "Path to start in when opening or saving files. Must be an absolute path. Leave blank to use the current working directory." +msgstr "Startpfad, wenn Dateien geöffnet oder gespeichert werden sollen. Der Pfad muss absolut sein. Um das aktuelle Arbeitsverzeichnis zu benutzen, lassen Sie das Feld leer." #: ../src/interface.c:3032 msgid "Project files:" @@ -1708,15 +1779,8 @@ msgstr "Zusätzlicher Pluginpfad" #: ../src/interface.c:3069 -msgid "" -"Geany looks by default in the global installation path and in the " -"configuration directory. The path entered here will be searched additionally " -"for plugins. Leave blank to disable." -msgstr "" -"Geany schaut standardmäßig im Installationsverzeichnis und im " -"Konfigurationsverzeichnis nach Plugins. Ein Pfad, der hier eingegeben wird, " -"wird zusätzlich bei der Suche nach Plugins berücksichtigt. Das Feld wird " -"ignoriert, falls es leer ist." +msgid "Geany looks by default in the global installation path and in the configuration directory. The path entered here will be searched additionally for plugins. Leave blank to disable." +msgstr "Geany schaut standardmäßig im Installationsverzeichnis und im Konfigurationsverzeichnis nach Plugins. Ein Pfad, der hier eingegeben wird, wird zusätzlich bei der Suche nach Plugins berücksichtigt. Das Feld wird ignoriert, falls es leer ist." #: ../src/interface.c:3082 msgid "Paths" @@ -1731,65 +1795,44 @@ msgstr "Bei Fehlern oder beendeter Kompilierung Piepton ausgeben" #: ../src/interface.c:3113 -msgid "" -"Whether to beep if an error occurred or when the compilation process has " -"finished" -msgstr "" -"Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein Piepton " -"ausgegeben werden soll" +msgid "Whether to beep if an error occurred or when the compilation process has finished" +msgstr "Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein Piepton ausgegeben werden soll" #: ../src/interface.c:3115 msgid "Switch to status message list at new message" msgstr "Bei neuen Meldungen zu den Statusmeldungen wechseln" #: ../src/interface.c:3118 -msgid "" -"Switch to the status message tab (in the notebook window at the bottom) if a " -"new status message arrives" -msgstr "" -"Wechselt automatisch zu dem Reiter mit den Statusmeldungen im Infobereich, " -"wenn eine neue Statusmeldung vorliegt" +msgid "Switch to the status message tab (in the notebook window at the bottom) if a new status message arrives" +msgstr "Wechselt automatisch zu dem Reiter mit den Statusmeldungen im Infobereich, wenn eine neue Statusmeldung vorliegt" #: ../src/interface.c:3120 msgid "Suppress status messages in the status bar" msgstr "Meldungen in der Statuszeile unterdrücken" #: ../src/interface.c:3123 -msgid "" -"Removes all messages from the status bar. The messages are still displayed " -"in the status messages window." -msgstr "" -"Entfernt alle Nachrichten aus der Statuszeile. Die Nachrichten sind " -"weiterhin über den »Status«-Reiter im Infobereich abrufbar." +msgid "Removes all messages from the status bar. The messages are still displayed in the status messages window." +msgstr "Entfernt alle Nachrichten aus der Statuszeile. Die Nachrichten sind weiterhin über den »Status«-Reiter im Infobereich abrufbar." #: ../src/interface.c:3125 msgid "Auto-focus widgets (focus follows mouse)" msgstr "Autofokus (Der Fokus folgt der Maus)" #: ../src/interface.c:3128 -msgid "" -"Gives the focus automatically to widgets below the mouse cursor. Works for " -"the main editor widget, the scribble, the toolbar search and goto line " -"fields and the VTE." -msgstr "" -"Wenn diese Option aktiviert ist, gibt Geany dem Fenster den Fokus, über dem " -"sich im Moment der Zeiger der Maus befindet. Diese Option funktioniert für " -"das Hauptfenster, das Notizbuch, den Such- und Springe-zu-Feldern in der " -"Werkzeugliste sowie für das integrierte Terminal." +msgid "Gives the focus automatically to widgets below the mouse cursor. Works for the main editor widget, the scribble, the toolbar search and goto line fields and the VTE." +msgstr "Wenn diese Option aktiviert ist, gibt Geany dem Fenster den Fokus, über dem sich im Moment der Zeiger der Maus befindet. Diese Option funktioniert für das Hauptfenster, das Notizbuch, den Such- und Springe-zu-Feldern in der Werkzeugliste sowie für das integrierte Terminal." #: ../src/interface.c:3130 msgid "Use Windows File Open/Save dialogs" msgstr "Benutze den Windows Datei öffnen/speichern Dialog" #: ../src/interface.c:3133 -msgid "" -"Defines whether to use the native Windows File Open/Save dialogs or whether " -"to use the GTK default dialogs" -msgstr "" -"Bestimmt, ob der native Windows Datei öffnen/speichern anstelle des GTK-" -"Dialogs genutzt werden soll." +msgid "Defines whether to use the native Windows File Open/Save dialogs or whether to use the GTK default dialogs" +msgstr "Bestimmt, ob der native Windows Datei öffnen/speichern anstelle des GTK-Dialogs genutzt werden soll." -#: ../src/interface.c:3135 ../src/interface.c:3371 ../src/interface.c:4520 +#: ../src/interface.c:3135 +#: ../src/interface.c:3371 +#: ../src/interface.c:4520 msgid "Miscellaneous" msgstr "Sonstiges" @@ -1798,23 +1841,16 @@ msgstr "Das vollständige Dokument durchsuchen und den Suchen-Dialog schließen" #: ../src/interface.c:3157 -msgid "" -"Always wrap search around the document and hide the Find dialog after " -"clicking Find Next/Previous" -msgstr "" -"Immer das vollständige Dokument durchsuchen und den Suchen-Dialog nach " -"Klicken auf Nächstes/Vorheriges schließen" +msgid "Always wrap search around the document and hide the Find dialog after clicking Find Next/Previous" +msgstr "Immer das vollständige Dokument durchsuchen und den Suchen-Dialog nach Klicken auf Nächstes/Vorheriges schließen" #: ../src/interface.c:3159 msgid "Use the current word under the cursor for Find dialogs" msgstr "Aktuelle Cursorposition zur Suche heranziehen" #: ../src/interface.c:3162 -msgid "" -"Use current word under the cursor when opening the Find, Find in Files or " -"Replace dialog and there is no selection" -msgstr "" -"Bestimmt das aktuelle Wort zum Suchen & Ersetzen anhand der Cursorposition" +msgid "Use current word under the cursor when opening the Find, Find in Files or Replace dialog and there is no selection" +msgstr "Bestimmt das aktuelle Wort zum Suchen & Ersetzen anhand der Cursorposition" #: ../src/interface.c:3164 msgid "Use the current file's directory for Find in Files" @@ -1829,28 +1865,16 @@ msgstr "Sitzung im Projekt speichern und wieder öffnen" #: ../src/interface.c:3190 -msgid "" -"Whether to store a project's session files and open them when re-opening the " -"project" -msgstr "" -"Speichert die geöffneten Dateien (aktuelle Sitzung) zusammen mit dem Projekt " -"und öffnet diese Dateien wieder wenn das Projekt geöffnet wird" +msgid "Whether to store a project's session files and open them when re-opening the project" +msgstr "Speichert die geöffneten Dateien (aktuelle Sitzung) zusammen mit dem Projekt und öffnet diese Dateien wieder wenn das Projekt geöffnet wird" #: ../src/interface.c:3192 msgid "Store project file inside the project base directory" msgstr "Projektdatei innerhalb des Projektbasisverzeichnis erstellen" #: ../src/interface.c:3195 -msgid "" -"When enabled, a project file is stored by default inside the project base " -"directory when creating new projects instead of one directory above the base " -"directory. You can still change the path of the project file in the New " -"Project dialog." -msgstr "" -"Wenn diese Option eingeschaltet ist, wird beim Erzeugen eines neuen Projekts " -"die Projektdatei standardmäßig innerhalb des Basisverzeichnis des Projekts " -"angelegt, ansonsten wird die Datei ein Verzeichnis über dem Basisverzeichnis " -"angelegt. Der Pfad kann im »Neues Projekt«-Dialog geändert werden." +msgid "When enabled, a project file is stored by default inside the project base directory when creating new projects instead of one directory above the base directory. You can still change the path of the project file in the New Project dialog." +msgstr "Wenn diese Option eingeschaltet ist, wird beim Erzeugen eines neuen Projekts die Projektdatei standardmäßig innerhalb des Basisverzeichnis des Projekts angelegt, ansonsten wird die Datei ein Verzeichnis über dem Basisverzeichnis angelegt. Der Pfad kann im »Neues Projekt«-Dialog geändert werden." #: ../src/interface.c:3197 msgid "Projects" @@ -1864,7 +1888,8 @@ #. * corresponding chapter in the documentation, comparing translatable #. * strings is easy to break. Maybe attach an identifying string to the #. * tab label object. -#: ../src/interface.c:3206 ../src/prefs.c:1551 +#: ../src/interface.c:3206 +#: ../src/prefs.c:1551 msgid "General" msgstr "Allgemein" @@ -1892,13 +1917,19 @@ msgid "Position:" msgstr "Position:" -#: ../src/interface.c:3269 ../src/interface.c:3425 ../src/interface.c:3486 -#: ../src/interface.c:3504 ../src/interface.c:3522 +#: ../src/interface.c:3269 +#: ../src/interface.c:3425 +#: ../src/interface.c:3486 +#: ../src/interface.c:3504 +#: ../src/interface.c:3522 msgid "Left" msgstr "Links" -#: ../src/interface.c:3276 ../src/interface.c:3433 ../src/interface.c:3487 -#: ../src/interface.c:3505 ../src/interface.c:3523 +#: ../src/interface.c:3276 +#: ../src/interface.c:3433 +#: ../src/interface.c:3487 +#: ../src/interface.c:3505 +#: ../src/interface.c:3523 msgid "Right" msgstr "Rechts" @@ -1910,11 +1941,13 @@ msgid "Symbol list:" msgstr "Symbolliste:" -#: ../src/interface.c:3310 ../src/interface.c:3473 +#: ../src/interface.c:3310 +#: ../src/interface.c:3473 msgid "Message window:" msgstr "Meldungsfenster:" -#: ../src/interface.c:3317 ../src/interface.c:3509 +#: ../src/interface.c:3317 +#: ../src/interface.c:3509 msgid "Editor:" msgstr "Editor:" @@ -1940,11 +1973,11 @@ #: ../src/interface.c:3369 msgid "Whether to show the status bar at the bottom of the main window" -msgstr "" -"Legt fest, ob die Statuszeile an der unteren Seite des Fensters angezeigt " -"werden soll oder nicht" +msgstr "Legt fest, ob die Statuszeile an der unteren Seite des Fensters angezeigt werden soll oder nicht" -#: ../src/interface.c:3376 ../src/interface.c:3536 ../src/prefs.c:1553 +#: ../src/interface.c:3376 +#: ../src/interface.c:3711 +#: ../src/prefs.c:1553 msgid "Interface" msgstr "Schnittstelle" @@ -1957,12 +1990,8 @@ msgstr "»Schließen«-Schaltflächen anzeigen" #: ../src/interface.c:3406 -msgid "" -"Shows a small cross button in the file tabs to easily close files when " -"clicking on it (requires restart of Geany)" -msgstr "" -"Zeigt ein kleines Kreuz auf den Dateireitern zum einfachen Schließen einer " -"Datei an. (Diese Option benötigt einen Neustart von Geany zum Aktivieren.)" +msgid "Shows a small cross button in the file tabs to easily close files when clicking on it (requires restart of Geany)" +msgstr "Zeigt ein kleines Kreuz auf den Dateireitern zum einfachen Schließen einer Datei an. (Diese Option benötigt einen Neustart von Geany zum Aktivieren.)" #: ../src/interface.c:3412 msgid "Placement of new file tabs:" @@ -1981,18 +2010,12 @@ msgstr "Reiter neben aktuellem öffnen" #: ../src/interface.c:3445 -msgid "" -"Whether to place file tabs next to the current tab rather than at the edges " -"of the notebook" -msgstr "" -"Legt fest, ob neue Reiter direkt neben dem aktuellen oder an den Enden der " -"Liste eingefügt werden." +msgid "Whether to place file tabs next to the current tab rather than at the edges of the notebook" +msgstr "Legt fest, ob neue Reiter direkt neben dem aktuellen oder an den Enden der Liste eingefügt werden." #: ../src/interface.c:3447 msgid "Double-clicking hides all additional widgets" -msgstr "" -"Doppelklick versteckt die zusätzlichen Unterfenster und zeigt nur den Editor " -"an" +msgstr "Doppelklick versteckt die zusätzlichen Unterfenster und zeigt nur den Editor an" #: ../src/interface.c:3450 msgid "Calls the View->Toggle All Additional Widgets command" @@ -2002,11 +2025,15 @@ msgid "Editor tabs" msgstr "Dateireiter" -#: ../src/interface.c:3488 ../src/interface.c:3506 ../src/interface.c:3524 +#: ../src/interface.c:3488 +#: ../src/interface.c:3506 +#: ../src/interface.c:3524 msgid "Top" msgstr "Oben" -#: ../src/interface.c:3489 ../src/interface.c:3507 ../src/interface.c:3525 +#: ../src/interface.c:3489 +#: ../src/interface.c:3507 +#: ../src/interface.c:3525 msgid "Bottom" msgstr "Unten" @@ -2018,69 +2045,73 @@ msgid "Tab positions" msgstr "Reiterposition" -#: ../src/interface.c:3567 +#: ../src/interface.c:3532 +msgid "Notebook tabs" +msgstr "Notizbuchreiter" + +#: ../src/interface.c:3563 msgid "Show t_oolbar" msgstr "Werkzeugleiste _anzeigen" -#: ../src/interface.c:3571 +#: ../src/interface.c:3567 msgid "_Append toolbar to the menu" msgstr "_Werkzeugliste direkt an das Menü anfügen" -#: ../src/interface.c:3574 +#: ../src/interface.c:3570 msgid "Pack the toolbar to the main menu to save vertical space" -msgstr "" -"Die Werkzeugliste direkt hinter dem Hauptmenü platzieren um etwas vertikalen " -"Platz zu sparen." +msgstr "Die Werkzeugliste direkt hinter dem Hauptmenü platzieren um etwas vertikalen Platz zu sparen." -#: ../src/interface.c:3596 ../src/toolbar.c:934 +#: ../src/interface.c:3592 +#: ../src/toolbar.c:933 msgid "Customize Toolbar" msgstr "Werkzeugleiste anpassen" -#: ../src/interface.c:3616 +#: ../src/interface.c:3612 msgid "System _default" msgstr "S_ystemvorgabe" -#: ../src/interface.c:3624 +#: ../src/interface.c:3620 msgid "Images _and text" msgstr "Symbole _und Text" -#: ../src/interface.c:3632 +#: ../src/interface.c:3628 msgid "_Images only" msgstr "Nur _Symbole" -#: ../src/interface.c:3640 +#: ../src/interface.c:3636 msgid "_Text only" msgstr "Nur _Text" -#: ../src/interface.c:3648 +#: ../src/interface.c:3644 msgid "Icon style" msgstr "Symbolstil" -#: ../src/interface.c:3669 +#: ../src/interface.c:3665 msgid "S_ystem default" msgstr "S_ystemvorgabe" -#: ../src/interface.c:3677 +#: ../src/interface.c:3673 msgid "_Small icons" msgstr "_Kleine Symbole" -#: ../src/interface.c:3685 +#: ../src/interface.c:3681 msgid "_Very small icons" msgstr "_Sehr kleine Symbole" -#: ../src/interface.c:3693 +#: ../src/interface.c:3689 msgid "_Large icons" msgstr "_Große Symbole" -#: ../src/interface.c:3701 +#: ../src/interface.c:3697 msgid "Icon size" msgstr "Symbolgröße" -#: ../src/interface.c:3706 +#: ../src/interface.c:3702 msgid "Toolbar" msgstr "Werkzeugleiste" -#: ../src/interface.c:3711 ../src/prefs.c:1555 +#: ../src/interface.c:3707 +#: ../src/prefs.c:1555 msgid "Toolbar" msgstr "Werkzeugleiste" @@ -2089,44 +2120,24 @@ msgstr "Visueller Zeilenumbruch" #: ../src/interface.c:3741 -msgid "" -"Wrap the line at the window border and continue it on the next line. Note: " -"line wrapping has a high performance cost for large documents so should be " -"disabled on slow machines." -msgstr "" -"Bricht lange Zeilen am Fensterrand um und setzt sie auf der nächsten Zeile " -"fort. Achtung: Bei großen Dokumenten erfordert der Zeilenumbruch viel " -"Rechenleistung und sollte daher auf langsameren Rechnern deaktiviert werden." +msgid "Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines." +msgstr "Bricht lange Zeilen am Fensterrand um und setzt sie auf der nächsten Zeile fort. Achtung: Bei großen Dokumenten erfordert der Zeilenumbruch viel Rechenleistung und sollte daher auf langsameren Rechnern deaktiviert werden." #: ../src/interface.c:3743 msgid "\"Smart\" home key" msgstr "»Intelligente« Pos1-Taste (Home)" #: ../src/interface.c:3746 -msgid "" -"When \"smart\" home is enabled, the HOME key will move the caret to the " -"first non-blank character of the line, unless it is already there, it moves " -"to the very beginning of the line. When this feature is disabled, the HOME " -"key always moves the caret to the start of the current line, regardless of " -"its current position." -msgstr "" -"Wenn die intelligente Pos1-Taste (Home) aktiviert ist, springt der Cursor " -"bei Tastendruck zum ersten Zeichen der Zeile. Sollte er sich bereits dort " -"befinden, springt er zum Beginn der Zeile. Wenn diese Option nicht aktiviert " -"ist, springt der Cursor immer zum Beginn der Zeile ohne auf die aktuelle " -"Position Rücksicht zu nehmen." +msgid "When \"smart\" home is enabled, the HOME key will move the caret to the first non-blank character of the line, unless it is already there, it moves to the very beginning of the line. When this feature is disabled, the HOME key always moves the caret to the start of the current line, regardless of its current position." +msgstr "Wenn die intelligente Pos1-Taste (Home) aktiviert ist, springt der Cursor bei Tastendruck zum ersten Zeichen der Zeile. Sollte er sich bereits dort befinden, springt er zum Beginn der Zeile. Wenn diese Option nicht aktiviert ist, springt der Cursor immer zum Beginn der Zeile ohne auf die aktuelle Position Rücksicht zu nehmen." #: ../src/interface.c:3748 msgid "Disable Drag and Drop" msgstr "Drag and Drop deaktivieren" #: ../src/interface.c:3751 -msgid "" -"Disable drag and drop completely in the editor window so you can't drag and " -"drop any selections within or outside of the editor window" -msgstr "" -"Deaktiviert Drag and Drop für das Editorfenster. Dies verhindert, dass " -"markierter Text mit der Maus verschoben werden kann." +msgid "Disable drag and drop completely in the editor window so you can't drag and drop any selections within or outside of the editor window" +msgstr "Deaktiviert Drag and Drop für das Editorfenster. Dies verhindert, dass markierter Text mit der Maus verschoben werden kann." #: ../src/interface.c:3753 msgid "Code folding" @@ -2137,25 +2148,16 @@ msgstr "Alle untergeordneten Quelltextblöcke ein/ausklappen" #: ../src/interface.c:3760 -msgid "" -"Fold or unfold all children of a fold point. By pressing the Shift key while " -"clicking on a fold symbol the contrary behavior is used." -msgstr "" -"Ein- oder Ausklappen aller Unterpunkte eines Quelltextabschnittes. Bei " -"gedrückt halten der Umschalttaste wird das Gegenteil gemacht, wenn auf das " -"Symbol geklickt wird." +msgid "Fold or unfold all children of a fold point. By pressing the Shift key while clicking on a fold symbol the contrary behavior is used." +msgstr "Ein- oder Ausklappen aller Unterpunkte eines Quelltextabschnittes. Bei gedrückt halten der Umschalttaste wird das Gegenteil gemacht, wenn auf das Symbol geklickt wird." #: ../src/interface.c:3762 msgid "Use indicators to show compile errors" msgstr "Benutzt Markierungen, um Probleme beim Kompilieren anzuzeigen" #: ../src/interface.c:3765 -msgid "" -"Whether to use indicators (a squiggly underline) to highlight the lines " -"where the compiler found a warning or an error" -msgstr "" -"Legt fest, ob Markierungen (gewellte Unterstreichungen) benutzt werden " -"sollen, um Zeilen mit Fehlern beim Kompiliervorgang zu markieren" +msgid "Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error" +msgstr "Legt fest, ob Markierungen (gewellte Unterstreichungen) benutzt werden sollen, um Zeilen mit Fehlern beim Kompiliervorgang zu markieren" #: ../src/interface.c:3767 msgid "Newline strips trailing spaces" @@ -2163,9 +2165,7 @@ #: ../src/interface.c:3770 msgid "Enable newline to strip the trailing spaces on the previous line" -msgstr "" -"Legt fest ob beim Wechseln in eine neue Zeile unnötige Leerzeichen am Ende " -"einer Zeile automatisch entfernt werden sollen" +msgstr "Legt fest ob beim Wechseln in eine neue Zeile unnötige Leerzeichen am Ende einer Zeile automatisch entfernt werden sollen" #: ../src/interface.c:3776 msgid "Line breaking column:" @@ -2177,13 +2177,8 @@ msgstr "Kommentarumschaltzeichen:" #: ../src/interface.c:3797 -msgid "" -"A string which is added when toggling a line comment in a source file, it is " -"used to mark the comment as toggled." -msgstr "" -"Eine Zeichenkette, welche bei einem Zeilenkommentar benutzt wird um den " -"Kommentar zu markieren, der per Tastenkombination ein- oder ausgeschaltet " -"werden kann." +msgid "A string which is added when toggling a line comment in a source file, it is used to mark the comment as toggled." +msgstr "Eine Zeichenkette, welche bei einem Zeilenkommentar benutzt wird um den Kommentar zu markieren, der per Tastenkombination ein- oder ausgeschaltet werden kann." #: ../src/interface.c:3799 msgid "Features" @@ -2194,82 +2189,82 @@ msgstr "Funktionen" #: ../src/interface.c:3817 -msgid "" -"Note: To apply these settings to all currently open documents, use " -"Project->Apply Default Indentation." -msgstr "" -"Anmerkung: Um diese Einstellungen auf alle geöffneten Dokumente anzuwenden, " -"bitte nutzen Sie Projekt->Standardeinrückung anwenden." +msgid "Note: To apply these settings to all currently open documents, use Project->Apply Default Indentation." +msgstr "Anmerkung: Um diese Einstellungen auf alle geöffneten Dokumente anzuwenden, bitte nutzen Sie Projekt->Standardeinrückung anwenden." -#: ../src/interface.c:3844 ../src/interface.c:5494 +#: ../src/interface.c:3844 +#: ../src/interface.c:5494 msgid "Width:" msgstr "Breite:" -#: ../src/interface.c:3857 ../src/interface.c:5507 +#: ../src/interface.c:3857 +#: ../src/interface.c:5507 msgid "The width in chars of a single indent" msgstr "Die Breite einer Einrückung in Zeichen" -#: ../src/interface.c:3862 ../src/interface.c:5512 +#: ../src/interface.c:3862 +#: ../src/interface.c:5512 msgid "Auto-indent mode:" msgstr "Modus für automatische Einrückung:" -#: ../src/interface.c:3875 ../src/interface.c:5525 +#: ../src/interface.c:3875 +#: ../src/interface.c:5525 msgid "Basic" msgstr "Einfach" -#: ../src/interface.c:3876 ../src/interface.c:5526 +#: ../src/interface.c:3876 +#: ../src/interface.c:5526 msgid "Current chars" msgstr "Aktuelle Zeichenkette" -#: ../src/interface.c:3877 ../src/interface.c:5527 +#: ../src/interface.c:3877 +#: ../src/interface.c:5527 msgid "Match braces" msgstr "Übereinstimmende Klammerung" -#: ../src/interface.c:3879 ../src/interface.c:5529 +#: ../src/interface.c:3879 +#: ../src/interface.c:5529 msgid "Detect type from file" msgstr "Einrücktyp aus Datei lesen" -#: ../src/interface.c:3884 ../src/interface.c:5534 ../src/interface.c:5717 -msgid "" -"Whether to detect the indentation type from file contents when a file is " -"opened" -msgstr "" -"Wenn diese Option aktiviert ist, versucht Geany den Typ der Einrückung " -"(Tabulatoren oder Leerzeichen) automatisch aus der geöffneten Datei zu " -"bestimmen" +#: ../src/interface.c:3884 +#: ../src/interface.c:5534 +msgid "Whether to detect the indentation type from file contents when a file is opened" +msgstr "Wenn diese Option aktiviert ist, versucht Geany den Typ der Einrückung (Tabulatoren oder Leerzeichen) automatisch aus der geöffneten Datei zu bestimmen" -#: ../src/interface.c:3886 ../src/interface.c:5536 +#: ../src/interface.c:3886 +#: ../src/interface.c:5536 msgid "T_abs and spaces" msgstr "Tabulatoren _und Leerzeichen" -#: ../src/interface.c:3891 ../src/interface.c:5541 -msgid "" -"Use spaces if the total indent is less than the tab width, otherwise use both" -msgstr "" -"Benutzt Leerzeichen, falls die Einrückung kleiner ist als die " -"Tabulatorenbreite, anderenfalls beides (Leerzeichen und Tabulatoren)" +#: ../src/interface.c:3891 +#: ../src/interface.c:5541 +msgid "Use spaces if the total indent is less than the tab width, otherwise use both" +msgstr "Benutzt Leerzeichen, falls die Einrückung kleiner ist als die Tabulatorenbreite, anderenfalls beides (Leerzeichen und Tabulatoren)" -#: ../src/interface.c:3900 ../src/interface.c:5550 +#: ../src/interface.c:3900 +#: ../src/interface.c:5550 msgid "Use spaces when inserting indentation" msgstr "Benutze Leerzeichen zum Einrücken" -#: ../src/interface.c:3909 ../src/interface.c:5559 +#: ../src/interface.c:3909 +#: ../src/interface.c:5559 msgid "Use one tab per indent" msgstr "Ein Tabulator pro Einzug" -#: ../src/interface.c:3913 ../src/interface.c:5570 +#: ../src/interface.c:3913 +#: ../src/interface.c:5570 msgid "Detect width from file" msgstr "Einrücktiefe aus Datei lesen" -#: ../src/interface.c:3918 ../src/interface.c:5575 -msgid "" -"Whether to detect the indentation width from file contents when a file is " -"opened" -msgstr "" -"Wenn diese Option aktiviert ist, versucht Geany den Breite der Einrückung " -"automatisch aus der geöffneten Datei zu bestimmen" +#: ../src/interface.c:3918 +#: ../src/interface.c:5575 +msgid "Whether to detect the indentation width from file contents when a file is opened" +msgstr "Wenn diese Option aktiviert ist, versucht Geany den Breite der Einrückung automatisch aus der geöffneten Datei zu bestimmen" -#: ../src/interface.c:3920 ../src/interface.c:4210 ../src/interface.c:5563 +#: ../src/interface.c:3920 +#: ../src/interface.c:4210 +#: ../src/interface.c:5563 msgid "Type:" msgstr "Typ:" @@ -2278,17 +2273,15 @@ msgstr "Einrücken mit der Tabulatortaste" #: ../src/interface.c:3930 -msgid "" -"Pressing tab/shift-tab indents/unindents instead of inserting a tab character" -msgstr "" -"Tabulator und Shift+Tabulator rückt den Text ein oder aus anstatt nur ein " -"Tabulatorzeichen einzufügen" +msgid "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" +msgstr "Tabulator und Shift+Tabulator rückt den Text ein oder aus anstatt nur ein Tabulatorzeichen einzufügen" #: ../src/interface.c:3932 msgid "Indentation" msgstr "Einrückung" -#: ../src/interface.c:3937 ../src/interface.c:5577 +#: ../src/interface.c:3937 +#: ../src/interface.c:5577 msgid "Indentation" msgstr "Einrückung" @@ -2297,12 +2290,8 @@ msgstr "Vervollständigung von (Code-)Schnipseln" #: ../src/interface.c:3963 -msgid "" -"Type a defined short character sequence and complete it to a more complex " -"string using a single keypress" -msgstr "" -"Mittels eines Tastenkürzels kann ein kurzer (Code-)Schnipsel zu einem " -"komplexeren Text erweitert werden" +msgid "Type a defined short character sequence and complete it to a more complex string using a single keypress" +msgstr "Mittels eines Tastenkürzels kann ein kurzer (Code-)Schnipsel zu einem komplexeren Text erweitert werden" #: ../src/interface.c:3965 msgid "XML/HTML tag auto-closing" @@ -2317,24 +2306,16 @@ msgstr "Automatisches Weiterführen von mehrzeiligen Kommentaren" #: ../src/interface.c:3973 -msgid "" -"Continue automatically multi-line comments in languages like C, C++ and Java " -"when a new line is entered inside such a comment" -msgstr "" -"Verlängert die Kommentarzeilen in Sprachen wie C, C++ und Java, wenn eine " -"neue Zeile innerhalb eines Kommentars hinzugefügt wird." +msgid "Continue automatically multi-line comments in languages like C, C++ and Java when a new line is entered inside such a comment" +msgstr "Verlängert die Kommentarzeilen in Sprachen wie C, C++ und Java, wenn eine neue Zeile innerhalb eines Kommentars hinzugefügt wird." #: ../src/interface.c:3975 msgid "Autocomplete symbols" msgstr "Autovervollständigung von Symbolen" #: ../src/interface.c:3978 -msgid "" -"Automatic completion of known symbols in open files (function names, global " -"variables, ...)" -msgstr "" -"Automatische Vervollständigung von bekannten Variablen und Funktionsnamen " -"aus den geöffneten Dateien" +msgid "Automatic completion of known symbols in open files (function names, global variables, ...)" +msgstr "Automatische Vervollständigung von bekannten Variablen und Funktionsnamen aus den geöffneten Dateien" #: ../src/interface.c:3980 msgid "Autocomplete all words in document" @@ -2357,9 +2338,7 @@ msgstr "Zu tippende Zeichen für die Vervollständigung:" #: ../src/interface.c:4021 -msgid "" -"The amount of characters which are necessary to show the symbol " -"autocompletion list" +msgid "The amount of characters which are necessary to show the symbol autocompletion list" msgstr "Die Anzahl der Zeichen, die nötig sind um die Vorschläge anzuzeigen" #: ../src/interface.c:4030 @@ -2368,24 +2347,15 @@ #: ../src/interface.c:4039 msgid "Maximum number of entries to display in the autocompletion list" -msgstr "" -"Anzahl der Elemente, die maximal angezeigt werden sollen, wenn die Liste " -"angezeigt wird" +msgstr "Anzahl der Elemente, die maximal angezeigt werden sollen, wenn die Liste angezeigt wird" #: ../src/interface.c:4042 msgid "Symbol list update frequency:" msgstr "Aktualisierungsfrequenz der Symbolliste:" #: ../src/interface.c:4055 -msgid "" -"Minimal delay (in milliseconds) between two automatic updates of the symbol " -"list. Note that a too short delay may have performance impact, especially " -"with large files. A delay of 0 disables real-time updates." -msgstr "" -"Minimale Pause (in Millisekunden) zwischen Aktualisierungen der Symbolliste. " -"Vorsicht! Ein zu geringer Wert kann vor allem bei großen Dokumenten " -"Geschwindigkeitseinbußen nach sich ziehen. Ein Wert von 0 deaktiviert die " -"dynamischen Aktualisierungen." +msgid "Minimal delay (in milliseconds) between two automatic updates of the symbol list. Note that a too short delay may have performance impact, especially with large files. A delay of 0 disables real-time updates." +msgstr "Minimale Pause (in Millisekunden) zwischen Aktualisierungen der Symbolliste. Vorsicht! Ein zu geringer Wert kann vor allem bei großen Dokumenten Geschwindigkeitseinbußen nach sich ziehen. Ein Wert von 0 deaktiviert die dynamischen Aktualisierungen." #: ../src/interface.c:4058 msgid "Completions" @@ -2405,9 +2375,7 @@ #: ../src/interface.c:4089 msgid "Auto-close single quote when typing an opening one" -msgstr "" -"Automatisches Setzen der schließenden Anführungsstriche beim Tippen der " -"öffnenden" +msgstr "Automatisches Setzen der schließenden Anführungsstriche beim Tippen der öffnenden" #: ../src/interface.c:4091 msgid "Curly brackets { }" @@ -2423,9 +2391,7 @@ #: ../src/interface.c:4103 msgid "Auto-close square-bracket when typing an opening one" -msgstr "" -"Automatisches Schließen von eckigen Klammern beim Tippen der öffnenden " -"Klammer" +msgstr "Automatisches Schließen von eckigen Klammern beim Tippen der öffnenden Klammer" #: ../src/interface.c:4105 msgid "Double quotes \" \"" @@ -2433,9 +2399,7 @@ #: ../src/interface.c:4110 msgid "Auto-close double quote when typing an opening one" -msgstr "" -"Automatisches Setzen der schließenden Anführungsstriche beim Tippen der " -"öffnenden" +msgstr "Automatisches Setzen der schließenden Anführungsstriche beim Tippen der öffnenden" #: ../src/interface.c:4112 msgid "Auto-close quotes and brackets" @@ -2451,9 +2415,7 @@ #: ../src/interface.c:4143 msgid "Invert all colors, by default using white text on a black background" -msgstr "" -"Vertauscht die Farben für die Anzeige. Im Standard wird weißer Text auf " -"einem schwarzen Hintergrund genutzt." +msgstr "Vertauscht die Farben für die Anzeige. Im Standard wird weißer Text auf einem schwarzen Hintergrund genutzt." #: ../src/interface.c:4145 msgid "Show indentation guides" @@ -2461,8 +2423,7 @@ #: ../src/interface.c:4148 msgid "Shows small dotted lines to help you to use the right indentation" -msgstr "" -"Blendet gepunktete Linien ein, um die richtige Einrückung zu erleichtern" +msgstr "Blendet gepunktete Linien ein, um die richtige Einrückung zu erleichtern" #: ../src/interface.c:4150 msgid "Show white space" @@ -2493,12 +2454,8 @@ msgstr "Markierungsrand anzeigen" #: ../src/interface.c:4168 -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, welcher " -"zum Anzeigen von Markierungen genutzt wird" +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, welcher zum Anzeigen von Markierungen genutzt wird" #: ../src/interface.c:4170 msgid "Stop scrolling at last line" @@ -2506,15 +2463,14 @@ #: ../src/interface.c:4173 msgid "Whether to stop scrolling one page past the last line of a document" -msgstr "" -"Legt fest, ob am Ende des Dokuments noch eine Seite weiter nach unten " -"gerollt werden kann oder nicht" +msgstr "Legt fest, ob am Ende des Dokuments noch eine Seite weiter nach unten gerollt werden kann oder nicht" #: ../src/interface.c:4175 msgid "Display" msgstr "Anzeige" -#: ../src/interface.c:4196 ../src/interface.c:5609 +#: ../src/interface.c:4196 +#: ../src/interface.c:5609 msgid "Column:" msgstr "Spalte:" @@ -2526,57 +2482,45 @@ msgid "Sets the color of the long line marker" msgstr "Stellt die Farbe der »Umbruchhilfe für lange Zeilen« ein" -#: ../src/interface.c:4223 ../src/toolbar.c:72 ../src/tools.c:724 -#: ../src/vte.c:794 ../src/vte.c:801 +#: ../src/interface.c:4223 +#: ../src/toolbar.c:72 +#: ../src/tools.c:916 +#: ../src/vte.c:794 +#: ../src/vte.c:801 msgid "Color Chooser" msgstr "Farbwähler" #: ../src/interface.c:4231 -msgid "" -"The long line marker is a thin vertical line in the editor, it helps to mark " -"long lines, or as a hint to break the line. Set this value to a value " -"greater than 0 to specify the column where it should appear." -msgstr "" -"Die Umbruchhilfe für lange Zeilen ist eine dünne vertikale Linie im Editor. " -"Sie hilft dabei, lange Zeilen zu finden und weist dabei auf einen eventuell " -"notwendigen Zeilenumbruch hin. Werte größer als 0 geben die Spalte an, in " -"der die Linie angezeigt werden soll." +msgid "The long line marker is a thin vertical line in the editor, it helps to mark long lines, or as a hint to break the line. Set this value to a value greater than 0 to specify the column where it should appear." +msgstr "Die Umbruchhilfe für lange Zeilen ist eine dünne vertikale Linie im Editor. Sie hilft dabei, lange Zeilen zu finden und weist dabei auf einen eventuell notwendigen Zeilenumbruch hin. Werte größer als 0 geben die Spalte an, in der die Linie angezeigt werden soll." #: ../src/interface.c:4241 msgid "Line" msgstr "Linie" #: ../src/interface.c:4244 -msgid "" -"Prints a vertical line in the editor window at the given cursor position " -"(see below)" -msgstr "" -"Zeichnet eine vertikale Linie im Editor an der angegebenen Cursor-Position " -"(nur sinnvoll mit dicktengleichen Schriften)" +msgid "Prints a vertical line in the editor window at the given cursor position (see below)" +msgstr "Zeichnet eine vertikale Linie im Editor an der angegebenen Cursor-Position (nur sinnvoll mit dicktengleichen Schriften)" #: ../src/interface.c:4248 msgid "Background" msgstr "Hintergrund" #: ../src/interface.c:4251 -msgid "" -"The background color of characters after the given cursor position (see " -"below) changed to the color set below, (this is recommended if you use " -"proportional fonts)" -msgstr "" -"Die Hintergrundfarbe der Zeichen, die hinter der angegebenen Cursor-Position " -"(siehe unten) stehen, wird auf die unten angegebene Farbe geändert (nützlich " -"für proportionale Schriftarten)" +msgid "The background color of characters after the given cursor position (see below) changed to the color set below, (this is recommended if you use proportional fonts)" +msgstr "Die Hintergrundfarbe der Zeichen, die hinter der angegebenen Cursor-Position (siehe unten) stehen, wird auf die unten angegebene Farbe geändert (nützlich für proportionale Schriftarten)" #: ../src/interface.c:4255 msgid "Enabled" msgstr "Aktiviert" -#: ../src/interface.c:4261 ../src/interface.c:5649 +#: ../src/interface.c:4261 +#: ../src/interface.c:5649 msgid "Long line marker" msgstr "Umbruchhilfe für lange Zeilen" -#: ../src/interface.c:4280 ../src/interface.c:5616 +#: ../src/interface.c:4280 +#: ../src/interface.c:5616 msgid "Disabled" msgstr "Deaktiviert" @@ -2589,12 +2533,8 @@ msgstr "Nur für rechteckige Auswahl" #: ../src/interface.c:4290 -msgid "" -"Only show virtual spaces beyond the end of lines when drawing a rectangular " -"selection" -msgstr "" -"Virtuelle Leerzeichen nur in Zeilen anzeigen, in denen gerade eine " -"rechteckige Auswahl statt findet." +msgid "Only show virtual spaces beyond the end of lines when drawing a rectangular selection" +msgstr "Virtuelle Leerzeichen nur in Zeilen anzeigen, in denen gerade eine rechteckige Auswahl statt findet." #: ../src/interface.c:4294 msgid "Always" @@ -2618,9 +2558,7 @@ #: ../src/interface.c:4340 msgid "Start a new file for each command-line filename that doesn't exist" -msgstr "" -"Öffnet eine neue Datei für jeden Dateinamen, der auf der Kommandozeile " -"angegeben wurde aber nicht geöffnet werden konnte" +msgstr "Öffnet eine neue Datei für jeden Dateinamen, der auf der Kommandozeile angegeben wurde aber nicht geöffnet werden konnte" #: ../src/interface.c:4354 msgid "Default end of line characters:" @@ -2640,19 +2578,11 @@ #: ../src/interface.c:4398 msgid "Use fixed encoding when opening non-Unicode files" -msgstr "" -"Benutze feststehende Zeichenkodierung beim Öffnen neuer, nicht Unicode-" -"Dateien" +msgstr "Benutze feststehende Zeichenkodierung beim Öffnen neuer, nicht Unicode-Dateien" #: ../src/interface.c:4401 -msgid "" -"This option disables the automatic detection of the file encoding when " -"opening non-Unicode files and opens the file with the specified encoding " -"(usually not needed)" -msgstr "" -"Diese Option deaktiviert die automatische Erkennung der Zeichenkodierung und " -"öffnet die ausgewählten nicht Unicode-Dateien mit der angegebenen Kodierung. " -"(Wird nur in Ausnahmen benötigt)" +msgid "This option disables the automatic detection of the file encoding when opening non-Unicode files and opens the file with the specified encoding (usually not needed)" +msgstr "Diese Option deaktiviert die automatische Erkennung der Zeichenkodierung und öffnet die ausgewählten nicht Unicode-Dateien mit der angegebenen Kodierung. (Wird nur in Ausnahmen benötigt)" #: ../src/interface.c:4407 msgid "Default encoding (existing non-Unicode files):" @@ -2660,9 +2590,7 @@ #: ../src/interface.c:4415 msgid "Sets the default encoding for opening existing non-Unicode files" -msgstr "" -"Setzt die Standardzeichenkodierung für zu öffnende Dateien, wenn kein " -"Unicode (z.B. UTF-8) zur Anwendung kommt" +msgstr "Setzt die Standardzeichenkodierung für zu öffnende Dateien, wenn kein Unicode (z.B. UTF-8) zur Anwendung kommt" #: ../src/interface.c:4421 msgid "Encodings" @@ -2681,12 +2609,8 @@ msgstr "Konsistente Zeilenenden sicherstellen" #: ../src/interface.c:4448 -msgid "" -"Ensures that newline characters always get converted before saving, avoiding " -"mixed line endings in the same file" -msgstr "" -"Stellt sicher, dass die Zeilenumbrüche vor dem Speichern immer umgewandelt " -"werden um gemischte Zeilenende zu vermeiden." +msgid "Ensures that newline characters always get converted before saving, avoiding mixed line endings in the same file" +msgstr "Stellt sicher, dass die Zeilenumbrüche vor dem Speichern immer umgewandelt werden um gemischte Zeilenende zu vermeiden." #: ../src/interface.c:4450 msgid "Strip trailing spaces and tabs" @@ -2696,7 +2620,8 @@ msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Entfernt Leerzeichen und Tabulatoren am Ende einer Zeile" -#: ../src/interface.c:4455 ../src/keybindings.c:519 +#: ../src/interface.c:4455 +#: ../src/keybindings.c:519 msgid "Replace tabs by space" msgstr "Tabulatoren durch Leerzeichen ersetzen" @@ -2721,15 +2646,13 @@ msgstr "Zeitinterval zum Prüfen auf Dateiänderungen:" #: ../src/interface.c:4516 -msgid "" -"How often to check for changes to document files on disk, in seconds. Zero " -"disables checking." -msgstr "" -"Wie oft soll auf Veränderungen geprüft werden? Angabe in Sekunden. 0 " -"deaktiviert die Funktion." +msgid "How often to check for changes to document files on disk, in seconds. Zero disables checking." +msgstr "Wie oft soll auf Veränderungen geprüft werden? Angabe in Sekunden. 0 deaktiviert die Funktion." -#: ../src/interface.c:4525 ../src/prefs.c:1559 ../src/symbols.c:682 -#: ../plugins/filebrowser.c:1133 +#: ../src/interface.c:4525 +#: ../src/prefs.c:1559 +#: ../src/symbols.c:682 +#: ../plugins/filebrowser.c:1118 msgid "Files" msgstr "Dateien" @@ -2742,12 +2665,8 @@ msgstr "Browser:" #: ../src/interface.c:4577 -msgid "" -"A terminal emulator like xterm, gnome-terminal or konsole (should accept the " -"-e argument)" -msgstr "" -"Eine Terminalemulation wie z.B. xterm, gnome-terminal oder konsole (sie " -"sollte die Option -e akzeptieren)" +msgid "A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)" +msgstr "Eine Terminalemulation wie z.B. xterm, gnome-terminal oder konsole (sie sollte die Option -e akzeptieren)" #: ../src/interface.c:4584 msgid "Path (and possibly additional arguments) to your favorite browser" @@ -2767,19 +2686,16 @@ #: ../src/interface.c:4661 #, c-format -msgid "" -"Context action command. The currently selected word can be used with %s. It " -"can appear anywhere in the given command and will be replaced before " -"execution." -msgstr "" -"Der aktuell markierte Text kann mit %s angegeben werden. Es darf überall in " -"der Kommandozeile vorkommen und wird vor dem Ausführen ersetzt." +msgid "Context action command. The currently selected word can be used with %s. It can appear anywhere in the given command and will be replaced before execution." +msgstr "Der aktuell markierte Text kann mit %s angegeben werden. Es darf überall in der Kommandozeile vorkommen und wird vor dem Ausführen ersetzt." #: ../src/interface.c:4674 msgid "Commands" msgstr "Befehle" -#: ../src/interface.c:4679 ../src/keybindings.c:557 ../src/prefs.c:1561 +#: ../src/interface.c:4679 +#: ../src/keybindings.c:559 +#: ../src/prefs.c:1561 msgid "Tools" msgstr "Werkzeuge" @@ -2836,37 +2752,23 @@ msgstr "Datum & Zeit:" #: ../src/interface.c:4808 -msgid "" -"Specify a format for the the {datetime} wildcard. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"Geben Sie ein Datumsformat für den Platzhalter {datetime} an. Dabei können " -"alle Platzhalter verwendet werden, die auch in der ANSI C Funktion " -"»strftime« zum Einsatz kommen können." +msgid "Specify a format for the the {datetime} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Geben Sie ein Datumsformat für den Platzhalter {datetime} an. Dabei können alle Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« zum Einsatz kommen können." #: ../src/interface.c:4815 -msgid "" -"Specify a format for the the {year} wildcard. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"Geben Sie ein Datumsformat für den Platzhalter {year} an. Dabei können alle " -"Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« zum " -"Einsatz kommen können." +msgid "Specify a format for the the {year} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Geben Sie ein Datumsformat für den Platzhalter {year} an. Dabei können alle Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« zum Einsatz kommen können." #: ../src/interface.c:4822 -msgid "" -"Specify a format for the the {date} wildcard. You can use any conversion " -"specifiers which can be used with the ANSI C strftime function." -msgstr "" -"Geben Sie ein Datumsformat für den Platzhalter {date} an. Dabei können alle " -"Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« zum " -"Einsatz kommen können." +msgid "Specify a format for the the {date} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Geben Sie ein Datumsformat für den Platzhalter {date} an. Dabei können alle Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« zum Einsatz kommen können." #: ../src/interface.c:4824 msgid "Template data" msgstr "Daten für Vorlagen:" -#: ../src/interface.c:4829 ../src/prefs.c:1563 +#: ../src/interface.c:4829 +#: ../src/prefs.c:1563 msgid "Templates" msgstr "Vorlagen" @@ -2878,7 +2780,8 @@ msgid "Keyboard shortcuts" msgstr "Tastaturkürzel" -#: ../src/interface.c:4876 ../src/prefs.c:1565 +#: ../src/interface.c:4876 +#: ../src/prefs.c:1565 msgid "Keybindings" msgstr "Tastenkürzel" @@ -2895,60 +2798,54 @@ msgid "Use an external command for printing" msgstr "Ein externes Programm zum Drucken benutzen" -#: ../src/interface.c:4947 ../src/printing.c:381 +#: ../src/interface.c:4947 +#: ../src/printing.c:381 msgid "Print line numbers" msgstr "Drucke Zeilennummern" -#: ../src/interface.c:4950 ../src/printing.c:383 +#: ../src/interface.c:4950 +#: ../src/printing.c:383 msgid "Add line numbers to the printed page" msgstr "Zeige Zeilennummern auf der gedruckten Seite" -#: ../src/interface.c:4952 ../src/printing.c:386 +#: ../src/interface.c:4952 +#: ../src/printing.c:386 msgid "Print page numbers" msgstr "Drucke Seitenzahlen" -#: ../src/interface.c:4955 ../src/printing.c:388 -msgid "" -"Add page numbers at the bottom of each page. It takes 2 lines of the page." -msgstr "" -"Füge jeder Seite die Seitenzahlen hinzu. Dazu werden zwei Zeilen der Seite " -"benutzt." +#: ../src/interface.c:4955 +#: ../src/printing.c:388 +msgid "Add page numbers at the bottom of each page. It takes 2 lines of the page." +msgstr "Füge jeder Seite die Seitenzahlen hinzu. Dazu werden zwei Zeilen der Seite benutzt." -#: ../src/interface.c:4957 ../src/printing.c:391 +#: ../src/interface.c:4957 +#: ../src/printing.c:391 msgid "Print page header" msgstr "Drucke Seitenkopf" -#: ../src/interface.c:4960 ../src/printing.c:393 -msgid "" -"Add a little header to every page containing the page number, the filename " -"and the current date (see below). It takes 3 lines of the page." -msgstr "" -"Fügt drei Kopfzeilen am Anfang jeder Seite ein (beinhaltet die Seitenzahl, " -"den Dateinamen sowie das Datum)." +#: ../src/interface.c:4960 +#: ../src/printing.c:393 +msgid "Add a little header to every page containing the page number, the filename and the current date (see below). It takes 3 lines of the page." +msgstr "Fügt drei Kopfzeilen am Anfang jeder Seite ein (beinhaltet die Seitenzahl, den Dateinamen sowie das Datum)." -#: ../src/interface.c:4977 ../src/printing.c:409 +#: ../src/interface.c:4977 +#: ../src/printing.c:409 msgid "Use the basename of the printed file" msgstr "Basisnamen der aktuellen Datei benutzen" #: ../src/interface.c:4980 msgid "Print only the basename (without the path) of the printed file" -msgstr "" -"Nur den Basisdateinamen (ohne die Pfadangabe) der zu druckenden Datei " -"verwenden" +msgstr "Nur den Basisdateinamen (ohne die Pfadangabe) der zu druckenden Datei verwenden" -#: ../src/interface.c:4986 ../src/printing.c:417 +#: ../src/interface.c:4986 +#: ../src/printing.c:417 msgid "Date format:" msgstr "Datumsformat:" -#: ../src/interface.c:4993 ../src/printing.c:423 -msgid "" -"Specify a format for the date and time stamp which is added to the page " -"header on each page. You can use any conversion specifiers which can be used " -"with the ANSI C strftime function." -msgstr "" -"Geben Sie ein Datumsformat an, dass für jeden Seitenkopf benutzt wird. Dabei " -"können alle Platzhalter verwendet werden, die auch in der ANSI C Funktion " -"»strftime« zum Einsatz kommen können." +#: ../src/interface.c:4993 +#: ../src/printing.c:423 +msgid "Specify a format for the date and time stamp which is added to the page header on each page. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Geben Sie ein Datumsformat an, dass für jeden Seitenkopf benutzt wird. Dabei können alle Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« zum Einsatz kommen können." #: ../src/interface.c:4996 msgid "Use native GTK printing" @@ -2958,7 +2855,8 @@ msgid "Printing" msgstr "Drucken" -#: ../src/interface.c:5007 ../src/prefs.c:1567 +#: ../src/interface.c:5007 +#: ../src/prefs.c:1567 msgid "Printing" msgstr "Drucken" @@ -2978,7 +2876,9 @@ msgid "Use global settings" msgstr "Benutze globale Einstellungen" -#: ../src/keybindings.c:220 ../src/plugins.c:1191 ../src/symbols.c:709 +#: ../src/keybindings.c:220 +#: ../src/plugins.c:1212 +#: ../src/symbols.c:709 msgid "File" msgstr "Datei" @@ -2998,7 +2898,8 @@ msgid "Save" msgstr "Speichern" -#: ../src/keybindings.c:232 ../src/toolbar.c:57 +#: ../src/keybindings.c:232 +#: ../src/toolbar.c:57 msgid "Save as" msgstr "Speichern unter" @@ -3026,7 +2927,8 @@ msgid "Re-open last closed tab" msgstr "Zuletzt geschlossenes Dokument wieder öffnen" -#: ../src/keybindings.c:248 ../src/project.c:509 +#: ../src/keybindings.c:248 +#: ../src/project.c:509 msgid "Project" msgstr "Projekt" @@ -3198,11 +3100,13 @@ msgid "Settings" msgstr "Einstellungen" -#: ../src/keybindings.c:389 ../src/toolbar.c:382 +#: ../src/keybindings.c:389 +#: ../src/toolbar.c:381 msgid "Search" msgstr "Suchen" -#: ../src/keybindings.c:392 ../src/search.c:453 +#: ../src/keybindings.c:392 +#: ../src/search.c:453 msgid "Find" msgstr "Suchen" @@ -3214,11 +3118,13 @@ msgid "Find Previous" msgstr "Vorheriges" -#: ../src/keybindings.c:403 ../src/search.c:610 +#: ../src/keybindings.c:403 +#: ../src/search.c:610 msgid "Replace" msgstr "Ersetzen" -#: ../src/keybindings.c:405 ../src/search.c:783 +#: ../src/keybindings.c:405 +#: ../src/search.c:783 msgid "Find in Files" msgstr "In Dateien suchen" @@ -3242,11 +3148,13 @@ msgid "Go to" msgstr "Gehe zu" -#: ../src/keybindings.c:421 ../src/toolbar.c:68 +#: ../src/keybindings.c:421 +#: ../src/toolbar.c:68 msgid "Navigate back a location" msgstr "Navigiert eine Position nach hinten" -#: ../src/keybindings.c:423 ../src/toolbar.c:69 +#: ../src/keybindings.c:423 +#: ../src/toolbar.c:69 msgid "Navigate forward a location" msgstr "Navigiert eine Position nach vorne" @@ -3434,73 +3342,78 @@ msgid "Remove Error Indicators" msgstr "Fehlermarkierungen entfernen" -#: ../src/keybindings.c:535 ../src/keybindings.c:540 ../src/project.c:482 +#: ../src/keybindings.c:535 +msgid "Remove Markers and Error Indicators" +msgstr "Fehlermarkierungen und andere Markierungen entfernen" + +#: ../src/keybindings.c:537 +#: ../src/keybindings.c:542 +#: ../src/project.c:482 #: ../src/ui_utils.c:1942 msgid "Build" msgstr "Erstellen" -#: ../src/keybindings.c:538 ../src/toolbar.c:70 +#: ../src/keybindings.c:540 +#: ../src/toolbar.c:70 msgid "Compile" msgstr "Kompilieren" -#: ../src/keybindings.c:542 +#: ../src/keybindings.c:544 msgid "Make all" msgstr "Make all" -#: ../src/keybindings.c:545 +#: ../src/keybindings.c:547 msgid "Make custom target" msgstr "Make mit eigenem Target" -#: ../src/keybindings.c:547 +#: ../src/keybindings.c:549 msgid "Make object" msgstr "Make Objekt-Datei" -#: ../src/keybindings.c:549 +#: ../src/keybindings.c:551 msgid "Next error" msgstr "Nächster Fehler" -#: ../src/keybindings.c:551 +#: ../src/keybindings.c:553 msgid "Previous error" msgstr "Vorheriger Fehler" -#: ../src/keybindings.c:553 +#: ../src/keybindings.c:555 msgid "Run" msgstr "Ausführen" -#: ../src/keybindings.c:555 +#: ../src/keybindings.c:557 msgid "Build options" msgstr "Optionen bei der Erzeugung" -#: ../src/keybindings.c:560 +#: ../src/keybindings.c:562 msgid "Show Color Chooser" msgstr "Farbwähler öffnen" -#: ../src/keybindings.c:562 ../src/keybindings.c:565 +#: ../src/keybindings.c:564 +#: ../src/keybindings.c:567 msgid "Help" msgstr "Hilfe" -#: ../src/keybindings.c:847 +#: ../src/keybindings.c:849 msgid "Keyboard Shortcuts" msgstr "Tastenkürzel" -#: ../src/keybindings.c:859 +#: ../src/keybindings.c:861 msgid "The following keyboard shortcuts are configurable:" msgstr "Die folgenden Tastenkürzel sind frei definierbar:" -#: ../src/keybindings.c:1760 +#: ../src/keybindings.c:1762 msgid "Switch to Document" msgstr "Zum Dokument wechseln" #: ../src/keyfile.c:860 msgid "Type here what you want, use it as a notice/scratch board" -msgstr "" -"Schreiben Sie hier rein, was sie möchten. Sie können es als Notizbuch nutzen." +msgstr "Schreiben Sie hier rein, was sie möchten. Sie können es als Notizbuch nutzen." #: ../src/keyfile.c:1065 msgid "Failed to load one or more session files." -msgstr "" -"Eine oder mehre Datei(en) aus der letzten Sitzung konnte(n) nicht geladen " -"werden." +msgstr "Eine oder mehre Datei(en) aus der letzten Sitzung konnte(n) nicht geladen werden." #: ../src/log.c:182 msgid "Debug Messages" @@ -3511,12 +3424,8 @@ msgstr "_Leeren" #: ../src/main.c:131 -msgid "" -"Set initial column number for the first opened file (useful in conjunction " -"with --line)" -msgstr "" -"Setzt die Spaltennummer in der zuerst geöffneten Datei. Sinnvoll nur in " -"Kombination mit der Option -l oder --line" +msgid "Set initial column number for the first opened file (useful in conjunction with --line)" +msgstr "Setzt die Spaltennummer in der zuerst geöffneten Datei. Sinnvoll nur in Kombination mit der Option -l oder --line" #: ../src/main.c:132 msgid "Use an alternate configuration directory" @@ -3536,21 +3445,15 @@ #: ../src/main.c:137 msgid "Don't open files in a running instance, force opening a new instance" -msgstr "" -"Dateien nicht in einer bereits laufenden Instanz, sondern in einer neuen " -"Instanz öffnen" +msgstr "Dateien nicht in einer bereits laufenden Instanz, sondern in einer neuen Instanz öffnen" #: ../src/main.c:138 -msgid "" -"Use this socket filename for communication with a running Geany instance" -msgstr "" -"Benutze diesen Socket-Namen für die Kommunikation mit einer bereits " -"laufenden Instanz von Geany" +msgid "Use this socket filename for communication with a running Geany instance" +msgstr "Benutze diesen Socket-Namen für die Kommunikation mit einer bereits laufenden Instanz von Geany" #: ../src/main.c:139 msgid "Return a list of open documents in a running Geany instance" -msgstr "" -"Gibt eine Liste mit in dieser Instanz von Geany geöffneten Dokumenten aus" +msgstr "Gibt eine Liste mit in dieser Instanz von Geany geöffneten Dokumenten aus" #: ../src/main.c:141 msgid "Set initial line number for the first opened file" @@ -3593,47 +3496,37 @@ msgid "Show version and exit" msgstr "Versionsinformation anzeigen und Programm beenden" -#: ../src/main.c:511 +#: ../src/main.c:512 msgid "[FILES...]" msgstr "[Dateien...]" #. note for translators: library versions are printed after this -#: ../src/main.c:529 +#: ../src/main.c:530 #, c-format msgid "built on %s with " msgstr "kompiliert am %s mit" -#: ../src/main.c:622 +#: ../src/main.c:623 msgid "Move it now?" msgstr "Soll es jetzt verschoben werden?" -#: ../src/main.c:624 +#: ../src/main.c:625 msgid "Geany needs to move your old configuration directory before starting." -msgstr "" -"Geany muss Ihr aktuelles Konfigurationsverzeichnis an einen neuen Ort " -"verschieben, bevor es gestartet wird." +msgstr "Geany muss Ihr aktuelles Konfigurationsverzeichnis an einen neuen Ort verschieben, bevor es gestartet wird." -#: ../src/main.c:633 +#: ../src/main.c:634 #, c-format -msgid "" -"Your configuration directory has been successfully moved from \"%s\" to \"%s" -"\"." -msgstr "" -"Ihr Konfigurationsverzeichnis wurde erfolgreich von »%s« nach »%s« " -"verschoben." +msgid "Your configuration directory has been successfully moved from \"%s\" to \"%s\"." +msgstr "Ihr Konfigurationsverzeichnis wurde erfolgreich von »%s« nach »%s« verschoben." #. for translators: the third %s in brackets is the error message which #. * describes why moving the dir didn't work -#: ../src/main.c:643 +#: ../src/main.c:644 #, c-format -msgid "" -"Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). " -"Please move manually the directory to the new location." -msgstr "" -"Ihr altes Konfigurationsverzeichnis »%s« konnte nicht nach »%s« verschoben " -"werden. Fehlermeldung: %s. Bitte führen Sie die Aktion manuell aus." +msgid "Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). Please move manually the directory to the new location." +msgstr "Ihr altes Konfigurationsverzeichnis »%s« konnte nicht nach »%s« verschoben werden. Fehlermeldung: %s. Bitte führen Sie die Aktion manuell aus." -#: ../src/main.c:724 +#: ../src/main.c:725 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3644,17 +3537,17 @@ "Es könnte zu Problemen bei der Verwendung von Geany kommen.\n" "Geany trotzdem starten?" -#: ../src/main.c:1063 +#: ../src/main.c:1069 #, c-format msgid "This is Geany %s." msgstr "Willkommen zu Geany %s." -#: ../src/main.c:1065 +#: ../src/main.c:1071 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Konfigurationsverzeichnis konnte nicht erstellt werden (%s)." -#: ../src/main.c:1279 +#: ../src/main.c:1285 msgid "Configuration files reloaded." msgstr "Einstellungen erneut geladen." @@ -3677,23 +3570,18 @@ #: ../src/msgwindow.c:649 #, c-format msgid "Could not find file '%s' - trying the current document path." -msgstr "" -"Konnte die Datei »%s« nicht finden - Versuche den aktuellen Dokumentenpfad." +msgstr "Konnte die Datei »%s« nicht finden - Versuche den aktuellen Dokumentenpfad." -#: ../src/plugins.c:478 +#: ../src/plugins.c:482 #, c-format -msgid "" -"The plugin \"%s\" is not binary compatible with this release of Geany - " -"please recompile it." -msgstr "" -"Das Plugin »%s« ist nicht kompatibel mit dieser Version von Geany. Bitte neu " -"kompilieren." +msgid "The plugin \"%s\" is not binary compatible with this release of Geany - please recompile it." +msgstr "Das Plugin »%s« ist nicht kompatibel mit dieser Version von Geany. Bitte neu kompilieren." -#: ../src/plugins.c:939 +#: ../src/plugins.c:960 msgid "_Plugin Manager" msgstr "_Plugin-Verwaltung" -#: ../src/plugins.c:1103 +#: ../src/plugins.c:1124 #, c-format msgid "" "Plugin: %s %s\n" @@ -3704,31 +3592,31 @@ "Beschreibung: %s\n" "Autor(en): %s" -#: ../src/plugins.c:1179 +#: ../src/plugins.c:1200 msgid "Active" msgstr "Aktiv" -#: ../src/plugins.c:1185 +#: ../src/plugins.c:1206 msgid "Plugin" msgstr "Plugin" -#: ../src/plugins.c:1209 +#: ../src/plugins.c:1230 msgid "No plugins available." msgstr "Keine Plugins gefunden." -#: ../src/plugins.c:1289 +#: ../src/plugins.c:1310 msgid "Plugins" msgstr "Plugins" -#: ../src/plugins.c:1309 +#: ../src/plugins.c:1330 msgid "Choose which plugins should be loaded at startup:" @@ 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:[5677] trunk/ChangeLog
by colombanw＠users.sourceforge.net 02 Apr '11

02 Apr '11

Revision: 5677 http://geany.svn.sourceforge.net/geany/?rev=5677&view=rev Author: colombanw Date: 2011-04-02 20:09:42 +0000 (Sat, 02 Apr 2011) Log Message: ----------- Fix date in the ChangeLog (oops) Modified Paths: -------------- trunk/ChangeLog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-04-02 18:36:35 UTC (rev 5676) +++ trunk/ChangeLog 2011-04-02 20:09:42 UTC (rev 5677) @@ -1,4 +1,4 @@ -2011-04-01 Colomban Wendling <colomban(at)geany(dot)org> +2011-04-02 Colomban Wendling <colomban(at)geany(dot)org> * src/tools.c, doc/geany.txt, doc/geany.html: Improve the `Set Custom Commands` dialog. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5676] trunk
by colombanw＠users.sourceforge.net 02 Apr '11

02 Apr '11

Revision: 5676 http://geany.svn.sourceforge.net/geany/?rev=5676&view=rev Author: colombanw Date: 2011-04-02 18:36:35 +0000 (Sat, 02 Apr 2011) Log Message: ----------- Improve the `Set Custom Commands` dialog Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt trunk/src/tools.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-04-01 20:52:31 UTC (rev 5675) +++ trunk/ChangeLog 2011-04-02 18:36:35 UTC (rev 5676) @@ -1,3 +1,9 @@ +2011-04-01 Colomban Wendling <colomban(at)geany(dot)org> + + * src/tools.c, doc/geany.txt, doc/geany.html: + Improve the `Set Custom Commands` dialog. + + 2011-04-01 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/interface.c, src/interface.h, geany.glade: Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2011-04-01 20:52:31 UTC (rev 5675) +++ trunk/doc/geany.html 2011-04-02 18:36:35 UTC (rev 5676) @@ -1324,10 +1324,9 @@ output. If there is no selection, the whole current line is used instead. To add a custom command, use the Send Selection to->Set Custom -Commands menu item. Click on Add to get a new text entry and type -the command. You can also specify some command line options. To -delete a command, just clear the text entry and press OK. It will be -deleted automatically. +Commands menu item. Click on Add to get a new item and type the +command. You can also specify some command line options. Empty +commands are not saved. Normal shell quoting is supported, so you can do things like: <ul class="simple"> <li><tt class="docutils literal">sed 's/\./(dot)/g'</tt></li> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2011-04-01 20:52:31 UTC (rev 5675) +++ trunk/doc/geany.txt 2011-04-02 18:36:35 UTC (rev 5676) @@ -883,10 +883,9 @@ If there is no selection, the whole current line is used instead. To add a custom command, use the *Send Selection to->Set Custom -Commands* menu item. Click on *Add* to get a new text entry and type -the command. You can also specify some command line options. To -delete a command, just clear the text entry and press OK. It will be -deleted automatically. +Commands* menu item. Click on *Add* to get a new item and type the +command. You can also specify some command line options. Empty +commands are not saved. Normal shell quoting is supported, so you can do things like: Modified: trunk/src/tools.c =================================================================== --- trunk/src/tools.c 2011-04-01 20:52:31 UTC (rev 5675) +++ trunk/src/tools.c 2011-04-02 18:36:35 UTC (rev 5676) @@ -53,46 +53,132 @@ #include "dialogs.h" +enum +{ + CC_COLUMN_ID, + CC_COLUMN_STATUS, + CC_COLUMN_TOOLTIP, + CC_COLUMN_CMD, + CC_COLUMN_EDITABLE, + CC_COLUMN_ELLIPSIZE, + CC_COLUMN_COUNT +}; + /* custom commands code*/ struct cc_dialog { gint count; - GtkWidget *box; + GtkWidget *view; + GtkTreeViewColumn *edit_column; + GtkListStore *store; + GtkTreeSelection *selection; + GtkWidget *button_add; + GtkWidget *button_remove; + GtkWidget *button_up; + GtkWidget *button_down; }; static gboolean cc_error_occurred = FALSE; static gboolean cc_reading_finished = FALSE; static GString *cc_buffer; -static void cc_add_command(struct cc_dialog *cc, gint idx) + +/* update STATUS and TOOLTIP columns according to cmd */ +static void cc_dialog_update_row_status(GtkListStore *store, GtkTreeIter *iter, const gchar *cmd) { - GtkWidget *label, *entry, *hbox; - gchar str[6]; + GError *err = NULL; + const gchar *stock_id; + gchar *tooltip = NULL; - hbox = gtk_hbox_new(FALSE, 5); - g_snprintf(str, 5, "%d:", cc->count); - label = gtk_label_new(str); + if (! NZV(cmd) || g_shell_parse_argv(cmd, NULL, NULL, &err)) + stock_id = GTK_STOCK_YES; + else + { + stock_id = GTK_STOCK_NO; + tooltip = g_strdup_printf(_("Command cannot be parsed: %s"), err->message); + g_error_free(err); + } - entry = gtk_entry_new(); - if (idx >= 0) - gtk_entry_set_text(GTK_ENTRY(entry), ui_prefs.custom_commands[idx]); - ui_entry_add_clear_icon(GTK_ENTRY(entry)); - gtk_entry_set_max_length(GTK_ENTRY(entry), 255); - gtk_entry_set_width_chars(GTK_ENTRY(entry), 30); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0); - gtk_widget_show_all(hbox); - gtk_container_add(GTK_CONTAINER(cc->box), hbox); + gtk_list_store_set(store, iter, CC_COLUMN_STATUS, stock_id, CC_COLUMN_TOOLTIP, tooltip, -1); + g_free(tooltip); +} + + +/* adds a new row for custom command @p idx, or an new empty one if < 0 */ +static void cc_dialog_add_command(struct cc_dialog *cc, gint idx, gboolean start_editing) +{ + GtkTreeIter iter; + const gchar *cmd; + + cmd = (idx >= 0) ? ui_prefs.custom_commands[idx] : NULL; + + gtk_list_store_append(cc->store, &iter); + gtk_list_store_set(cc->store, &iter, CC_COLUMN_ID, cc->count, CC_COLUMN_CMD, cmd, + CC_COLUMN_EDITABLE, TRUE, CC_COLUMN_ELLIPSIZE, PANGO_ELLIPSIZE_END, -1); + cc_dialog_update_row_status(cc->store, &iter, cmd); cc->count++; + + if (start_editing) + { + GtkTreePath *path; + + gtk_widget_grab_focus(cc->view); + path = gtk_tree_model_get_path(GTK_TREE_MODEL(cc->store), &iter); + gtk_tree_view_set_cursor(GTK_TREE_VIEW(cc->view), path, cc->edit_column, TRUE); + gtk_tree_path_free(path); + } } -static void cc_on_custom_commands_dlg_add_clicked(GtkToolButton *toolbutton, struct cc_dialog *cc) +static void cc_on_dialog_add_clicked(GtkButton *button, struct cc_dialog *cc) { - cc_add_command(cc, -1); + cc_dialog_add_command(cc, -1, TRUE); } +static void cc_on_dialog_remove_clicked(GtkButton *button, struct cc_dialog *cc) +{ + GtkTreeIter iter; + + if (gtk_tree_selection_get_selected(cc->selection, NULL, &iter)) + gtk_list_store_remove(cc->store, &iter); +} + + +static void cc_on_dialog_move_up_clicked(GtkButton *button, struct cc_dialog *cc) +{ + GtkTreeIter iter; + + if (gtk_tree_selection_get_selected(cc->selection, NULL, &iter)) + { + GtkTreePath *path; + GtkTreeIter prev; + + path = gtk_tree_model_get_path(GTK_TREE_MODEL(cc->store), &iter); + if (gtk_tree_path_prev(path) && + gtk_tree_model_get_iter(GTK_TREE_MODEL(cc->store), &prev, path)) + { + gtk_list_store_move_before(cc->store, &iter, &prev); + } + gtk_tree_path_free(path); + } +} + + +static void cc_on_dialog_move_down_clicked(GtkButton *button, struct cc_dialog *cc) +{ + GtkTreeIter iter; + + if (gtk_tree_selection_get_selected(cc->selection, NULL, &iter)) + { + GtkTreeIter next = iter; + + if (gtk_tree_model_iter_next(GTK_TREE_MODEL(cc->store), &next)) + gtk_list_store_move_after(cc->store, &iter, &next); + } +} + + static gboolean cc_iofunc(GIOChannel *ioc, GIOCondition cond, gpointer data) { if (cond & (G_IO_IN | G_IO_PRI)) @@ -300,15 +386,104 @@ } +static void cc_dialog_on_command_edited(GtkCellRendererText *renderer, gchar *path, gchar *text, + struct cc_dialog *cc) +{ + GtkTreeIter iter; + + gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(cc->store), &iter, path); + gtk_list_store_set(cc->store, &iter, CC_COLUMN_CMD, text, -1); + cc_dialog_update_row_status(cc->store, &iter, text); +} + + +/* re-compute IDs to reflect the current store state */ +static void cc_dialog_update_ids(struct cc_dialog *cc) +{ + GtkTreeIter iter; + + cc->count = 1; + if (! gtk_tree_model_get_iter_first(GTK_TREE_MODEL(cc->store), &iter)) + return; + + do + { + gtk_list_store_set(cc->store, &iter, CC_COLUMN_ID, cc->count, -1); + cc->count++; + } + while (gtk_tree_model_iter_next(GTK_TREE_MODEL(cc->store), &iter)); +} + + +/* update sensitiveness of the buttons according to the selection */ +static void cc_dialog_update_sensitive(struct cc_dialog *cc) +{ + GtkTreeIter iter; + gboolean has_selection = FALSE; + gboolean first_selected = FALSE; + gboolean last_selected = FALSE; + + if ((has_selection = gtk_tree_selection_get_selected(cc->selection, NULL, &iter))) + { + GtkTreePath *path; + GtkTreePath *copy; + + path = gtk_tree_model_get_path(GTK_TREE_MODEL(cc->store), &iter); + copy = gtk_tree_path_copy(path); + first_selected = ! gtk_tree_path_prev(copy); + gtk_tree_path_free(copy); + gtk_tree_path_next(path); + last_selected = ! gtk_tree_model_get_iter(GTK_TREE_MODEL(cc->store), &iter, path); + gtk_tree_path_free(path); + } + + gtk_widget_set_sensitive(cc->button_remove, has_selection); + gtk_widget_set_sensitive(cc->button_up, has_selection && ! first_selected); + gtk_widget_set_sensitive(cc->button_down, has_selection && ! last_selected); +} + + +static void cc_dialog_on_tree_selection_changed(GtkTreeSelection *selection, struct cc_dialog *cc) +{ + cc_dialog_update_sensitive(cc); +} + + +static void cc_dialog_on_row_inserted(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, + struct cc_dialog *cc) +{ + cc_dialog_update_ids(cc); + cc_dialog_update_sensitive(cc); +} + + +static void cc_dialog_on_row_deleted(GtkTreeModel *model, GtkTreePath *path, struct cc_dialog *cc) +{ + cc_dialog_update_ids(cc); + cc_dialog_update_sensitive(cc); +} + + +static void cc_dialog_on_rows_reordered(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, + gpointer new_order, struct cc_dialog *cc) +{ + cc_dialog_update_ids(cc); + cc_dialog_update_sensitive(cc); +} + + static void cc_show_dialog_custom_commands(void) { - GtkWidget *dialog, *label, *vbox, *button; + GtkWidget *dialog, *label, *vbox, *scroll, *buttonbox; + GtkCellRenderer *renderer; + GtkTreeViewColumn *column; guint i; struct cc_dialog cc; dialog = gtk_dialog_new_with_buttons(_("Set Custom Commands"), GTK_WINDOW(main_widgets.window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); + gtk_window_set_default_size(GTK_WINDOW(dialog), 300, 300); /* give a reasonable minimal default size */ vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); gtk_box_set_spacing(GTK_BOX(vbox), 6); gtk_widget_set_name(dialog, "GeanyDialog"); @@ -316,74 +491,127 @@ label = gtk_label_new(_("You can send the current selection to any of these commands and the output of the command replaces the current selection.")); gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - gtk_container_add(GTK_CONTAINER(vbox), label); + gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); cc.count = 1; - cc.box = gtk_vbox_new(FALSE, 0); - gtk_container_add(GTK_CONTAINER(vbox), cc.box); + cc.store = gtk_list_store_new(CC_COLUMN_COUNT, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, + G_TYPE_STRING, G_TYPE_BOOLEAN, PANGO_TYPE_ELLIPSIZE_MODE); + cc.view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(cc.store)); + gtk_tree_view_set_tooltip_column(GTK_TREE_VIEW(cc.view), CC_COLUMN_TOOLTIP); + gtk_tree_view_set_reorderable(GTK_TREE_VIEW(cc.view), TRUE); + cc.selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(cc.view)); + /* ID column */ + renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes(_("ID"), renderer, "text", CC_COLUMN_ID, NULL); + gtk_tree_view_append_column(GTK_TREE_VIEW(cc.view), column); + /* command column, holding status and command display */ + column = gtk_tree_view_column_new(); + gtk_tree_view_column_set_title(column, _("Command")); + renderer = gtk_cell_renderer_pixbuf_new(); + gtk_tree_view_column_pack_start(column, renderer, FALSE); + gtk_tree_view_column_set_attributes(column, renderer, "stock-id", CC_COLUMN_STATUS, NULL); + renderer = gtk_cell_renderer_text_new(); + g_signal_connect(renderer, "edited", G_CALLBACK(cc_dialog_on_command_edited), &cc); + gtk_tree_view_column_pack_start(column, renderer, TRUE); + gtk_tree_view_column_set_attributes(column, renderer, "text", CC_COLUMN_CMD, + "editable", CC_COLUMN_EDITABLE, "ellipsize", CC_COLUMN_ELLIPSIZE, NULL); + cc.edit_column = column; + gtk_tree_view_append_column(GTK_TREE_VIEW(cc.view), column); - if (ui_prefs.custom_commands == NULL || g_strv_length(ui_prefs.custom_commands) == 0) + scroll = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll), GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scroll), GTK_SHADOW_IN); + gtk_container_add(GTK_CONTAINER(scroll), cc.view); + gtk_box_pack_start(GTK_BOX(vbox), scroll, TRUE, TRUE, 0); + + if (ui_prefs.custom_commands != NULL) { - cc_add_command(&cc, -1); - } - else - { + GtkTreeIter iter; guint len = g_strv_length(ui_prefs.custom_commands); + for (i = 0; i < len; i++) { - if (ui_prefs.custom_commands[i][0] == '\0') + if (! NZV(ui_prefs.custom_commands[i])) continue; /* skip empty fields */ - cc_add_command(&cc, i); + cc_dialog_add_command(&cc, i, FALSE); } + + /* focus the first row if any */ + if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(cc.store), &iter)) + { + GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(cc.store), &iter); + + gtk_tree_view_set_cursor(GTK_TREE_VIEW(cc.view), path, cc.edit_column, FALSE); + gtk_tree_path_free(path); + } } - button = gtk_button_new_from_stock("gtk-add"); - g_signal_connect(button, "clicked", G_CALLBACK(cc_on_custom_commands_dlg_add_clicked), &cc); - gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0); + buttonbox = gtk_hbutton_box_new(); + gtk_box_set_spacing(GTK_BOX(buttonbox), 6); + gtk_box_pack_start(GTK_BOX(vbox), buttonbox, FALSE, FALSE, 0); + cc.button_add = gtk_button_new_from_stock(GTK_STOCK_ADD); + g_signal_connect(cc.button_add, "clicked", G_CALLBACK(cc_on_dialog_add_clicked), &cc); + gtk_container_add(GTK_CONTAINER(buttonbox), cc.button_add); + cc.button_remove = gtk_button_new_from_stock(GTK_STOCK_REMOVE); + g_signal_connect(cc.button_remove, "clicked", G_CALLBACK(cc_on_dialog_remove_clicked), &cc); + gtk_container_add(GTK_CONTAINER(buttonbox), cc.button_remove); + cc.button_up = gtk_button_new_from_stock(GTK_STOCK_GO_UP); + g_signal_connect(cc.button_up, "clicked", G_CALLBACK(cc_on_dialog_move_up_clicked), &cc); + gtk_container_add(GTK_CONTAINER(buttonbox), cc.button_up); + cc.button_down = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN); + g_signal_connect(cc.button_down, "clicked", G_CALLBACK(cc_on_dialog_move_down_clicked), &cc); + gtk_container_add(GTK_CONTAINER(buttonbox), cc.button_down); + cc_dialog_update_sensitive(&cc); + + /* only connect the selection signal when all other cc_dialog fields are set */ + g_signal_connect(cc.selection, "changed", G_CALLBACK(cc_dialog_on_tree_selection_changed), &cc); + g_signal_connect(cc.store, "row-inserted", G_CALLBACK(cc_dialog_on_row_inserted), &cc); + g_signal_connect(cc.store, "row-deleted", G_CALLBACK(cc_dialog_on_row_deleted), &cc); + g_signal_connect(cc.store, "rows-reordered", G_CALLBACK(cc_dialog_on_rows_reordered), &cc); + gtk_widget_show_all(vbox); if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { - /* get all hboxes which contain a label and an entry element */ - GList *children = gtk_container_get_children(GTK_CONTAINER(cc.box)); - GList *node, *list; GSList *result_list = NULL; - gint j = 0; gint len = 0; gchar **result = NULL; - const gchar *text; + GtkTreeIter iter; - foreach_list(node, children) + if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(cc.store), &iter)) { - /* get the contents of each hbox */ - list = gtk_container_get_children(GTK_CONTAINER(node->data)); + do + { + gchar *cmd; - /* first element of the list is the label, so skip it and get the entry element */ - text = gtk_entry_get_text(GTK_ENTRY(list->next->data)); - - /* if the content of the entry is non-empty, add it to the result array */ - if (text[0] != '\0') - { - result_list = g_slist_prepend(result_list, g_strdup(text)); - len++; + gtk_tree_model_get(GTK_TREE_MODEL(cc.store), &iter, CC_COLUMN_CMD, &cmd, -1); + if (NZV(cmd)) + { + result_list = g_slist_prepend(result_list, cmd); + len++; + } + else + g_free(cmd); } - g_list_free(list); + while (gtk_tree_model_iter_next(GTK_TREE_MODEL(cc.store), &iter)); } result_list = g_slist_reverse(result_list); - /* create a new null-terminated array but only if there any commands defined */ + /* create a new null-terminated array but only if there is any commands defined */ if (len > 0) { + gint j = 0; + GSList *node; + result = g_new(gchar*, len + 1); - while (result_list != NULL) + foreach_list(node, result_list) { - result[j] = (gchar*) result_list->data; - - result_list = result_list->next; + result[j] = (gchar*) node->data; j++; } - result[len] = NULL; /* null-terminate the array */ + result[j] = NULL; /* null-terminate the array */ } /* set the new array */ g_strfreev(ui_prefs.custom_commands); @@ -392,7 +620,6 @@ tools_create_insert_custom_command_menu_items(); g_slist_free(result_list); - g_list_free(children); } gtk_widget_destroy(dialog); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5675] trunk
by colombanw＠users.sourceforge.net 01 Apr '11

01 Apr '11

Revision: 5675 http://geany.svn.sourceforge.net/geany/?rev=5675&view=rev Author: colombanw Date: 2011-04-01 20:52:31 +0000 (Fri, 01 Apr 2011) Log Message: ----------- Make `Send selection to` send the current line if there is no selection Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt trunk/src/tools.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-04-01 16:27:38 UTC (rev 5674) +++ trunk/ChangeLog 2011-04-01 20:52:31 UTC (rev 5675) @@ -36,6 +36,9 @@ information in them but only use the UTF-8 compatible part of ISO-8859-1 to be properly loaded as ISO-8859-1, rather than UTF-8. Also fix check for locale encoding. + * src/tools.c, doc/geany.txt, doc/geany.html: + Make `Send selection to` send the current line if there is no + selection. 2011-03-31 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2011-04-01 16:27:38 UTC (rev 5674) +++ trunk/doc/geany.html 2011-04-01 20:52:31 UTC (rev 5675) @@ -1322,6 +1322,7 @@ Geany. To help finding errors in executing the command, the output of the program's standard error will be printed on Geany's standard output. +If there is no selection, the whole current line is used instead. To add a custom command, use the Send Selection to->Set Custom Commands menu item. Click on Add to get a new text entry and type the command. You can also specify some command line options. To Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2011-04-01 16:27:38 UTC (rev 5674) +++ trunk/doc/geany.txt 2011-04-01 20:52:31 UTC (rev 5675) @@ -880,6 +880,8 @@ of the program's standard error will be printed on Geany's standard output. +If there is no selection, the whole current line is used instead. + To add a custom command, use the *Send Selection to->Set Custom Commands* menu item. Click on *Add* to get a new text entry and type the command. You can also specify some command line options. To Modified: trunk/src/tools.c =================================================================== --- trunk/src/tools.c 2011-04-01 16:27:38 UTC (rev 5674) +++ trunk/src/tools.c 2011-04-01 20:52:31 UTC (rev 5675) @@ -240,7 +240,7 @@ g_return_if_fail(doc != NULL && command != NULL); if (! sci_has_selection(doc->editor->sci)) - return; + editor_select_lines(doc->editor, FALSE); if (!g_shell_parse_argv(command, NULL, &argv, &error)) { @@ -398,33 +398,6 @@ } -/* enable or disable all custom command menu items when the sub menu is opened */ -static void cc_on_custom_command_menu_activate(GtkMenuItem *menuitem, gpointer user_data) -{ - GeanyDocument *doc = document_get_current(); - gint i, len; - gboolean enable; - GList *children, *node; - - g_return_if_fail(doc != NULL); - - enable = sci_has_selection(doc->editor->sci) && (ui_prefs.custom_commands != NULL); - - children = gtk_container_get_children(GTK_CONTAINER(user_data)); - len = g_list_length(children); - i = 0; - foreach_list(node, children) - { - if (i == (len - 2)) - break; /* stop before the last two elements (the seperator and the set entry) */ - - gtk_widget_set_sensitive(GTK_WIDGET(node->data), enable); - i++; - } - g_list_free(children); -} - - static void cc_on_custom_command_activate(GtkMenuItem *menuitem, gpointer user_data) { GeanyDocument *doc = document_get_current(); @@ -479,7 +452,6 @@ GtkMenu *menu_edit = GTK_MENU(ui_lookup_widget(main_widgets.window, "send_selection_to2_menu")); GtkWidget *item; GList *me_children, *node; - static gboolean signal_set = FALSE; /* first clean the menus to be able to rebuild them */ me_children = gtk_container_get_children(GTK_CONTAINER(menu_edit)); @@ -515,13 +487,6 @@ gtk_widget_show(item); cc_insert_custom_command_items(menu_edit, _("Set Custom Commands"), -1); - - if (! signal_set) - { - g_signal_connect(ui_lookup_widget(main_widgets.window, "send_selection_to2"), - "activate", G_CALLBACK(cc_on_custom_command_menu_activate), menu_edit); - signal_set = TRUE; - } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2011