Commits May 2013

commits@lists.geany.org

1 participants
50 discussions

[geany/geany] 4bac37: Update for new Scintilla styles
by Colomban Wendling 22 May '13

22 May '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 22 May 2013 01:38:21 UTC Commit: 4bac3717eaaaa0ab4d915694ec9a47524c42372a https://github.com/geany/geany/commit/4bac3717eaaaa0ab4d915694ec9a47524c423… Log Message: ----------- Update for new Scintilla styles Modified Paths: -------------- data/filetypes.c data/filetypes.haskell src/highlighting.c src/highlightingmappings.h Modified: data/filetypes.c 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -6,6 +6,7 @@ commentline=comment_line commentdoc=comment_doc preprocessorcomment=comment +preprocessorcommentdoc=comment_doc number=number_1 word=keyword_1 word2=keyword_2 Modified: data/filetypes.haskell 4 files changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -20,6 +20,10 @@ module=function data=number_2 pragma=preprocessor preprocessor=preprocessor +stringeol=string_eol +reserved_operator=operator +literate_comment=comment +literate_codedelim=other [keywords] # all items must be in one line Modified: src/highlighting.c 5 files changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1510,6 +1510,7 @@ gboolean highlighting_is_string_style(gint lexer, gint style) case SCLEX_HASKELL: return (style == SCE_HA_CHARACTER || + style == SCE_HA_STRINGEOL || style == SCE_HA_STRING); case SCLEX_FREEBASIC: @@ -1592,6 +1593,7 @@ gboolean highlighting_is_comment_style(gint lexer, gint style) style == SCE_C_COMMENTLINE || style == SCE_C_COMMENTDOC || style == SCE_C_PREPROCESSORCOMMENT || + style == SCE_C_PREPROCESSORCOMMENTDOC || style == SCE_C_COMMENTLINEDOC || style == SCE_C_COMMENTDOCKEYWORD || style == SCE_C_COMMENTDOCKEYWORDERROR); @@ -1670,7 +1672,8 @@ gboolean highlighting_is_comment_style(gint lexer, gint style) return (style == SCE_HA_COMMENTLINE || style == SCE_HA_COMMENTBLOCK || style == SCE_HA_COMMENTBLOCK2 || - style == SCE_HA_COMMENTBLOCK3); + style == SCE_HA_COMMENTBLOCK3 || + style == SCE_HA_LITERATE_COMMENT); case SCLEX_FREEBASIC: return (style == SCE_B_COMMENT); Modified: src/highlightingmappings.h 43 files changed, 24 insertions(+), 19 deletions(-) =================================================================== @@ -206,6 +206,7 @@ { SCE_C_COMMENTLINE, "commentline", FALSE }, { SCE_C_COMMENTDOC, "commentdoc", FALSE }, { SCE_C_PREPROCESSORCOMMENT, "preprocessorcomment", FALSE }, + { SCE_C_PREPROCESSORCOMMENTDOC, "preprocessorcommentdoc", FALSE }, { SCE_C_NUMBER, "number", FALSE }, { SCE_C_WORD, "word", FALSE }, { SCE_C_WORD2, "word2", FALSE }, @@ -594,25 +595,29 @@ #define highlighting_lexer_HASKELL SCLEX_HASKELL static const HLStyle highlighting_styles_HASKELL[] = { - { SCE_HA_DEFAULT, "default", FALSE }, - { SCE_HA_COMMENTLINE, "commentline", FALSE }, - { SCE_HA_COMMENTBLOCK, "commentblock", FALSE }, - { SCE_HA_COMMENTBLOCK2, "commentblock2", FALSE }, - { SCE_HA_COMMENTBLOCK3, "commentblock3", FALSE }, - { SCE_HA_NUMBER, "number", FALSE }, - { SCE_HA_KEYWORD, "keyword", FALSE }, - { SCE_HA_IMPORT, "import", FALSE }, - { SCE_HA_STRING, "string", FALSE }, - { SCE_HA_CHARACTER, "character", FALSE }, - { SCE_HA_CLASS, "class", FALSE }, - { SCE_HA_OPERATOR, "operator", FALSE }, - { SCE_HA_IDENTIFIER, "identifier", FALSE }, - { SCE_HA_INSTANCE, "instance", FALSE }, - { SCE_HA_CAPITAL, "capital", FALSE }, - { SCE_HA_MODULE, "module", FALSE }, - { SCE_HA_DATA, "data", FALSE }, - { SCE_HA_PRAGMA, "pragma", FALSE }, - { SCE_HA_PREPROCESSOR, "preprocessor", FALSE } + { SCE_HA_DEFAULT, "default", FALSE }, + { SCE_HA_COMMENTLINE, "commentline", FALSE }, + { SCE_HA_COMMENTBLOCK, "commentblock", FALSE }, + { SCE_HA_COMMENTBLOCK2, "commentblock2", FALSE }, + { SCE_HA_COMMENTBLOCK3, "commentblock3", FALSE }, + { SCE_HA_NUMBER, "number", FALSE }, + { SCE_HA_KEYWORD, "keyword", FALSE }, + { SCE_HA_IMPORT, "import", FALSE }, + { SCE_HA_STRING, "string", FALSE }, + { SCE_HA_CHARACTER, "character", FALSE }, + { SCE_HA_CLASS, "class", FALSE }, + { SCE_HA_OPERATOR, "operator", FALSE }, + { SCE_HA_IDENTIFIER, "identifier", FALSE }, + { SCE_HA_INSTANCE, "instance", FALSE }, + { SCE_HA_CAPITAL, "capital", FALSE }, + { SCE_HA_MODULE, "module", FALSE }, + { SCE_HA_DATA, "data", FALSE }, + { SCE_HA_PRAGMA, "pragma", FALSE }, + { SCE_HA_PREPROCESSOR, "preprocessor", FALSE }, + { SCE_HA_STRINGEOL, "stringeol", FALSE }, + { SCE_HA_RESERVED_OPERATOR, "reserved_operator", FALSE }, + { SCE_HA_LITERATE_COMMENT, "literate_comment", FALSE }, + { SCE_HA_LITERATE_CODEDELIM, "literate_codedelim", FALSE } }; static const HLKeyword highlighting_keywords_HASKELL[] = { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] f55880: Update Scintilla to version 3.3.2
by Colomban Wendling 22 May '13

22 May '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 22 May 2013 01:23:57 UTC Commit: f5588043b7e6bbd9dff5ac37eb37b00a503d192a https://github.com/geany/geany/commit/f5588043b7e6bbd9dff5ac37eb37b00a503d1… Log Message: ----------- Update Scintilla to version 3.3.2 Modified Paths: -------------- scintilla/gtk/PlatGTK.cxx scintilla/gtk/ScintillaGTK.cxx scintilla/include/SciLexer.h scintilla/include/Scintilla.h scintilla/include/Scintilla.iface scintilla/lexers/LexCPP.cxx scintilla/lexers/LexHaskell.cxx scintilla/lexers/LexLaTeX.cxx scintilla/lexers/LexOthers.cxx scintilla/lexlib/LexerModule.cxx scintilla/lexlib/PropSetSimple.cxx scintilla/lexlib/PropSetSimple.h scintilla/lexlib/StyleContext.h scintilla/lexlib/WordList.cxx scintilla/lexlib/WordList.h scintilla/scintilla_changes.patch scintilla/src/CallTip.cxx scintilla/src/CallTip.h scintilla/src/CellBuffer.cxx scintilla/src/CellBuffer.h scintilla/src/ContractionState.cxx scintilla/src/Decoration.cxx scintilla/src/Document.cxx scintilla/src/Document.h scintilla/src/Editor.cxx scintilla/src/Editor.h scintilla/src/Indicator.cxx scintilla/src/KeyMap.cxx scintilla/src/KeyMap.h scintilla/src/PerLine.cxx scintilla/src/PerLine.h scintilla/src/PositionCache.cxx scintilla/src/PositionCache.h scintilla/src/RESearch.cxx scintilla/src/RESearch.h scintilla/src/RunStyles.cxx scintilla/src/RunStyles.h scintilla/src/Selection.cxx scintilla/src/SplitVector.h scintilla/src/Style.cxx scintilla/src/Style.h scintilla/src/ViewStyle.cxx scintilla/src/ViewStyle.h scintilla/src/XPM.cxx scintilla/src/XPM.h scintilla/version.txt Modified: scintilla/gtk/PlatGTK.cxx 122 files changed, 58 insertions(+), 64 deletions(-) =================================================================== @@ -9,6 +9,7 @@ #include <stddef.h> #include <math.h> +#include <string> #include <vector> #include <map> @@ -259,6 +260,7 @@ class FontCached : Font { public: static FontID FindOrCreate(const FontParameters &fp); static void ReleaseId(FontID fid_); + static void ReleaseAll(); }; FontCached *FontCached::first = 0; @@ -299,11 +301,9 @@ FontID FontCached::FindOrCreate(const FontParameters &fp) { } if (ret == 0) { FontCached *fc = new FontCached(fp); - if (fc) { - fc->next = first; - first = fc; - ret = fc->fid; - } + fc->next = first; + first = fc; + ret = fc->fid; } FontMutexUnlock(); return ret; @@ -328,6 +328,12 @@ void FontCached::ReleaseId(FontID fid_) { FontMutexUnlock(); } +void FontCached::ReleaseAll() { + while (first) { + ReleaseId(first->GetID()); + } +} + FontID FontCached::CreateNewFont(const FontParameters &fp) { PangoFontDescription *pfd = pango_font_description_new(); if (pfd) { @@ -831,8 +837,8 @@ void SurfaceImpl::Copy(PRectangle rc, Point from, Surface &surfaceSource) { } } -char *UTF8FromLatin1(const char *s, int &len) { - char *utfForm = new char[len*2+1]; +std::string UTF8FromLatin1(const char *s, int len) { + std::string utfForm(len*2 + 1, '\0'); size_t lenU = 0; for (int i=0;i<len;i++) { unsigned int uch = static_cast<unsigned char>(s[i]); @@ -843,27 +849,26 @@ char *UTF8FromLatin1(const char *s, int &len) { utfForm[lenU++] = static_cast<char>(0x80 | (uch & 0x3f)); } } - utfForm[lenU] = '\0'; - len = lenU; + utfForm.resize(lenU); return utfForm; } -static char *UTF8FromIconv(const Converter &conv, const char *s, int &len) { +static std::string UTF8FromIconv(const Converter &conv, const char *s, int len) { if (conv) { - char *utfForm = new char[len*3+1]; + std::string utfForm(len*3+1, '\0'); char *pin = const_cast<char *>(s); size_t inLeft = len; - char *pout = utfForm; + char *putf = &utfForm[0]; + char *pout = putf; size_t outLeft = len*3+1; size_t conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft); if (conversions != ((size_t)(-1))) { *pout = '\0'; - len = pout - utfForm; + utfForm.resize(pout - putf); return utfForm; } - delete []utfForm; } - return 0; + return std::string(); } // Work out how many bytes are in a character by trying to convert using iconv, @@ -901,18 +906,16 @@ void SurfaceImpl::DrawTextBase(PRectangle rc, Font &font_, XYPOSITION ybase, con if (context) { XYPOSITION xText = rc.left; if (PFont(font_)->pfd) { - char *utfForm = 0; + std::string utfForm; if (et == UTF8) { pango_layout_set_text(layout, s, len); } else { - if (!utfForm) { - SetConverter(PFont(font_)->characterSet); - utfForm = UTF8FromIconv(conv, s, len); - } - if (!utfForm) { // iconv failed so treat as Latin1 + SetConverter(PFont(font_)->characterSet); + utfForm = UTF8FromIconv(conv, s, len); + if (utfForm.empty()) { // iconv failed so treat as Latin1 utfForm = UTF8FromLatin1(s, len); } - pango_layout_set_text(layout, utfForm, len); + pango_layout_set_text(layout, utfForm.c_str(), utfForm.length()); } pango_layout_set_font_description(layout, PFont(font_)->pfd); pango_cairo_update_layout(context, layout); @@ -923,7 +926,6 @@ void SurfaceImpl::DrawTextBase(PRectangle rc, Font &font_, XYPOSITION ybase, con #endif cairo_move_to(context, xText, ybase); pango_cairo_show_layout_line(context, pll); - delete []utfForm; } } } @@ -1020,20 +1022,20 @@ void SurfaceImpl::MeasureWidths(Font &font_, const char *s, int len, XYPOSITION int positionsCalculated = 0; if (et == dbcs) { SetConverter(PFont(font_)->characterSet); - char *utfForm = UTF8FromIconv(conv, s, len); - if (utfForm) { + std::string utfForm = UTF8FromIconv(conv, s, len); + if (!utfForm.empty()) { // Convert to UTF-8 so can ask Pango for widths, then // Loop through UTF-8 and DBCS forms, taking account of different // character byte lengths. Converter convMeasure("UCS-2", CharacterSetID(characterSet), false); - pango_layout_set_text(layout, utfForm, strlen(utfForm)); + pango_layout_set_text(layout, utfForm.c_str(), strlen(utfForm.c_str())); int i = 0; int clusterStart = 0; - ClusterIterator iti(layout, strlen(utfForm)); + ClusterIterator iti(layout, strlen(utfForm.c_str())); while (!iti.finished) { iti.Next(); int clusterEnd = iti.curIndex; - int places = g_utf8_strlen(utfForm + clusterStart, clusterEnd - clusterStart); + int places = g_utf8_strlen(utfForm.c_str() + clusterStart, clusterEnd - clusterStart); int place = 1; while (clusterStart < clusterEnd) { size_t lenChar = MultiByteLenFromIconv(convMeasure, s+i, len-i); @@ -1041,38 +1043,36 @@ void SurfaceImpl::MeasureWidths(Font &font_, const char *s, int len, XYPOSITION positions[i++] = iti.position - (places - place) * iti.distance / places; positionsCalculated++; } - clusterStart += UTF8CharLength(utfForm+clusterStart); + clusterStart += UTF8CharLength(utfForm.c_str()+clusterStart); place++; } } - delete []utfForm; PLATFORM_ASSERT(i == lenPositions); } } if (positionsCalculated < 1 ) { // Either Latin1 or DBCS conversion failed so treat as Latin1. SetConverter(PFont(font_)->characterSet); - char *utfForm = UTF8FromIconv(conv, s, len); - if (!utfForm) { + std::string utfForm = UTF8FromIconv(conv, s, len); + if (utfForm.empty()) { utfForm = UTF8FromLatin1(s, len); } - pango_layout_set_text(layout, utfForm, len); + pango_layout_set_text(layout, utfForm.c_str(), utfForm.length()); int i = 0; int clusterStart = 0; // Each Latin1 input character may take 1 or 2 bytes in UTF-8 // and groups of up to 3 may be represented as ligatures. - ClusterIterator iti(layout, strlen(utfForm)); + ClusterIterator iti(layout, utfForm.length()); while (!iti.finished) { iti.Next(); int clusterEnd = iti.curIndex; - int ligatureLength = g_utf8_strlen(utfForm + clusterStart, clusterEnd - clusterStart); + int ligatureLength = g_utf8_strlen(utfForm.c_str() + clusterStart, clusterEnd - clusterStart); PLATFORM_ASSERT(ligatureLength > 0 && ligatureLength <= 3); for (int charInLig=0; charInLig<ligatureLength; charInLig++) { positions[i++] = iti.position - (ligatureLength - 1 - charInLig) * iti.distance / ligatureLength; } clusterStart = clusterEnd; } - delete []utfForm; PLATFORM_ASSERT(i == lenPositions); } } @@ -1092,20 +1092,18 @@ void SurfaceImpl::MeasureWidths(Font &font_, const char *s, int len, XYPOSITION XYPOSITION SurfaceImpl::WidthText(Font &font_, const char *s, int len) { if (font_.GetID()) { if (PFont(font_)->pfd) { - char *utfForm = 0; + std::string utfForm; pango_layout_set_font_description(layout, PFont(font_)->pfd); PangoRectangle pos; if (et == UTF8) { pango_layout_set_text(layout, s, len); } else { - if (!utfForm) { // use iconv - SetConverter(PFont(font_)->characterSet); - utfForm = UTF8FromIconv(conv, s, len); - } - if (!utfForm) { // iconv failed so treat as Latin1 + SetConverter(PFont(font_)->characterSet); + utfForm = UTF8FromIconv(conv, s, len); + if (utfForm.empty()) { // iconv failed so treat as Latin1 utfForm = UTF8FromLatin1(s, len); } - pango_layout_set_text(layout, utfForm, len); + pango_layout_set_text(layout, utfForm.c_str(), utfForm.length()); } #ifdef PANGO_VERSION PangoLayoutLine *pangoLine = pango_layout_get_line_readonly(layout,0); @@ -1113,7 +1111,6 @@ XYPOSITION SurfaceImpl::WidthText(Font &font_, const char *s, int len) { PangoLayoutLine *pangoLine = pango_layout_get_line(layout,0); #endif pango_layout_line_get_extents(pangoLine, NULL, &pos); - delete []utfForm; return doubleFromPangoUnits(pos.width); } return 1; @@ -1883,30 +1880,26 @@ void ListBoxX::ClearRegisteredImages() { void ListBoxX::SetList(const char *listText, char separator, char typesep) { Clear(); int count = strlen(listText) + 1; - char *words = new char[count]; - if (words) { - memcpy(words, listText, count); - char *startword = words; - char *numword = NULL; - int i = 0; - for (; words[i]; i++) { - if (words[i] == separator) { - words[i] = '\0'; - if (numword) - *numword = '\0'; - Append(startword, numword?atoi(numword + 1):-1); - startword = words + i + 1; - numword = NULL; - } else if (words[i] == typesep) { - numword = words + i; - } - } - if (startword) { + std::vector<char> words(listText, listText+count); + char *startword = words.data(); + char *numword = NULL; + int i = 0; + for (; words[i]; i++) { + if (words[i] == separator) { + words[i] = '\0'; if (numword) *numword = '\0'; Append(startword, numword?atoi(numword + 1):-1); + startword = words.data() + i + 1; + numword = NULL; + } else if (words[i] == typesep) { + numword = words.data() + i; } - delete []words; + } + if (startword) { + if (numword) + *numword = '\0'; + Append(startword, numword?atoi(numword + 1):-1); } } @@ -2165,5 +2158,6 @@ void Platform_Initialise() { } void Platform_Finalise() { + FontCached::ReleaseAll(); FontMutexFree(); } Modified: scintilla/gtk/ScintillaGTK.cxx 236 files changed, 84 insertions(+), 152 deletions(-) =================================================================== @@ -30,7 +30,6 @@ #ifdef SCI_LEXER #include "SciLexer.h" #endif -#include "SVector.h" #include "SplitVector.h" #include "Partitioning.h" #include "RunStyles.h" @@ -109,7 +108,7 @@ static GdkWindow *PWindow(const Window &w) { using namespace Scintilla; #endif -extern char *UTF8FromLatin1(const char *s, int &len); +extern std::string UTF8FromLatin1(const char *s, int len); class ScintillaGTK : public ScintillaBase { _ScintillaObject *sci; @@ -186,7 +185,6 @@ class ScintillaGTK : public ScintillaBase { virtual bool PaintContains(PRectangle rc); void FullPaint(); virtual PRectangle GetClientRectangle(); - void SyncPaint(PRectangle rc); virtual void ScrollText(int linesToMove); virtual void SetVerticalScrollPos(); virtual void SetHorizontalScrollPos(); @@ -280,7 +278,6 @@ class ScintillaGTK : public ScintillaBase { static void SelectionGet(GtkWidget *widget, GtkSelectionData *selection_data, guint info, guint time); static gint SelectionClear(GtkWidget *widget, GdkEventSelection *selection_event); - static void DragBegin(GtkWidget *widget, GdkDragContext *context); gboolean DragMotionThis(GdkDragContext *context, gint x, gint y, guint dragtime); static gboolean DragMotion(GtkWidget *widget, GdkDragContext *context, gint x, gint y, guint dragtime); @@ -373,12 +370,12 @@ static ScintillaGTK *ScintillaFromWidget(GtkWidget *widget) { #endif #if PLAT_GTK_WIN32 - // There does not seem to be a real standard for indicating that the clipboard + // There does not seem to be a real standard for indicating that the clipboard // contains a rectangular selection, so copy Developer Studio. cfColumnSelect = static_cast<CLIPFORMAT>( ::RegisterClipboardFormat("MSDEVColumnSelect")); - // Get intellimouse parameters when running on win32; otherwise use + // Get intellimouse parameters when running on win32; otherwise use // reasonable default #ifndef SPI_GETWHEELSCROLLLINES #define SPI_GETWHEELSCROLLLINES 104 @@ -837,37 +834,34 @@ void ScintillaGTK::StartDrag() { reinterpret_cast<GdkEvent *>(&evbtn)); } -static char *ConvertText(int *lenResult, char *s, size_t len, const char *charSetDest, +static std::string ConvertText(char *s, size_t len, const char *charSetDest, const char *charSetSource, bool transliterations, bool silent=false) { // s is not const because of different versions of iconv disagreeing about const - *lenResult = 0; - char *destForm = 0; + std::string destForm; Converter conv(charSetDest, charSetSource, transliterations); if (conv) { - destForm = new char[len*3+1]; + size_t outLeft = len*3+1; + destForm = std::string(outLeft, '\0'); char *pin = s; size_t inLeft = len; - char *pout = destForm; - size_t outLeft = len*3+1; + char *putf = &destForm[0]; + char *pout = putf; size_t conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft); if (conversions == ((size_t)(-1))) { - if (!silent) - fprintf(stderr, "iconv %s->%s failed for %s\n", - charSetSource, charSetDest, static_cast<char *>(s)); - delete []destForm; - destForm = 0; + if (!silent) { + if (len == 1) + fprintf(stderr, "iconv %s->%s failed for %0x '%s'\n", + charSetSource, charSetDest, (unsigned char)(*s), static_cast<char *>(s)); + else + fprintf(stderr, "iconv %s->%s failed for %s\n", + charSetSource, charSetDest, static_cast<char *>(s)); + } + destForm = std::string(); } else { -//fprintf(stderr, "iconv OK %s %d\n", destForm, pout - destForm); - *pout = '\0'; - *lenResult = pout - destForm; + destForm.resize(pout - putf); } } else { -fprintf(stderr, "Can not iconv %s %s\n", charSetDest, charSetSource); - } - if (!destForm) { - destForm = new char[1]; - destForm[0] = '\0'; - *lenResult = 0; + fprintf(stderr, "Can not iconv %s %s\n", charSetDest, charSetSource); } return destForm; } @@ -884,26 +878,18 @@ int ScintillaGTK::TargetAsUTF8(char *text) { // Need to convert const char *charSetBuffer = CharacterSetID(); if (*charSetBuffer) { -//~ fprintf(stderr, "AsUTF8 %s %d %0d-%0d\n", charSetBuffer, targetLength, targetStart, targetEnd); - char *s = new char[targetLength]; - if (s) { - pdoc->GetCharRange(s, targetStart, targetLength); -//~ fprintf(stderr, " \"%s\"\n", s); - if (text) { - char *tmputf = ConvertText(&targetLength, s, targetLength, "UTF-8", charSetBuffer, false); - memcpy(text, tmputf, targetLength); - delete []tmputf; -//~ fprintf(stderr, " \"%s\"\n", text); - } - delete []s; + std::string s = RangeText(targetStart, targetEnd); + std::string tmputf = ConvertText(&s[0], targetLength, "UTF-8", charSetBuffer, false); + if (text) { + memcpy(text, tmputf.c_str(), tmputf.length()); } + return tmputf.length(); } else { if (text) { pdoc->GetCharRange(text, targetStart, targetLength); } } } -//~ fprintf(stderr, "Length = %d bytes\n", targetLength); return targetLength; } @@ -920,15 +906,11 @@ int ScintillaGTK::EncodedFromUTF8(char *utf8, char *encoded) { // Need to convert const char *charSetBuffer = CharacterSetID(); if (*charSetBuffer) { - int outLength = 0; - char *tmpEncoded = ConvertText(&outLength, utf8, inputLength, charSetBuffer, "UTF-8", true); - if (tmpEncoded) { - if (encoded) { - memcpy(encoded, tmpEncoded, outLength); - } - delete []tmpEncoded; + std::string tmpEncoded = ConvertText(utf8, inputLength, charSetBuffer, "UTF-8", true); + if (encoded) { + memcpy(encoded, tmpEncoded.c_str(), tmpEncoded.length()); } - return outLength; + return tmpEncoded.length(); } else { if (encoded) { memcpy(encoded, utf8, inputLength); @@ -966,7 +948,7 @@ sptr_t ScintillaGTK::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam #ifdef SCI_LEXER case SCI_LOADLEXERLIBRARY: - LexerManager::GetInstance()->Load(reinterpret_cast<const char*>(lParam)); + LexerManager::GetInstance()->Load(reinterpret_cast<const char*>(lParam)); break; #endif case SCI_TARGETASUTF8: @@ -1109,30 +1091,6 @@ PRectangle ScintillaGTK::GetClientRectangle() { return rc; } -// Synchronously paint a rectangle of the window. -void ScintillaGTK::SyncPaint(PRectangle rc) { - paintState = painting; - rcPaint = rc; - PRectangle rcClient = GetClientRectangle(); - paintingAllText = rcPaint.Contains(rcClient); - if (PWindow(wText)) { - Surface *sw = Surface::Allocate(SC_TECHNOLOGY_DEFAULT); - if (sw) { - cairo_t *cr = gdk_cairo_create(PWindow(wText)); - sw->Init(cr, PWidget(wText)); - Paint(sw, rc); - sw->Release(); - delete sw; - cairo_destroy(cr); - } - } - if (paintState == paintAbandoned) { - // Painting area was insufficient to cover new styling or brace highlight positions - FullPaint(); - } - paintState = notPainting; -} - void ScintillaGTK::ScrollText(int linesToMove) { int diff = vs.lineHeight * -linesToMove; //Platform::DebugPrintf("ScintillaGTK::ScrollText %d %d %0d,%0d %0d,%0d\n", linesToMove, diff, @@ -1301,11 +1259,10 @@ class CaseFolderDBCS : public CaseFolderTable { folded[0] = mapping[static_cast<unsigned char>(mixed[0])]; return 1; } else if (*charSet) { - int convertedLength = lenMixed; - char *sUTF8 = ConvertText(&convertedLength, const_cast<char *>(mixed), lenMixed, + std::string sUTF8 = ConvertText(const_cast<char *>(mixed), lenMixed, "UTF-8", charSet, false); - if (sUTF8) { - gchar *mapped = g_utf8_casefold(sUTF8, strlen(sUTF8)); + if (!sUTF8.empty()) { + gchar *mapped = g_utf8_casefold(sUTF8.c_str(), sUTF8.length()); size_t lenMapped = strlen(mapped); if (lenMapped < sizeFolded) { memcpy(folded, mapped, lenMapped); @@ -1314,7 +1271,6 @@ class CaseFolderDBCS : public CaseFolderTable { lenMapped = 1; } g_free(mapped); - delete []sUTF8; return lenMapped; } } @@ -1337,23 +1293,20 @@ CaseFolder *ScintillaGTK::CaseFolderForEncoding() { for (int i=0x80; i<0x100; i++) { char sCharacter[2] = "A"; sCharacter[0] = i; - int convertedLength = 1; - const char *sUTF8 = ConvertText(&convertedLength, sCharacter, 1, - "UTF-8", charSetBuffer, false); - if (sUTF8) { - gchar *mapped = g_utf8_casefold(sUTF8, strlen(sUTF8)); + // Silent as some bytes have no assigned character + std::string sUTF8 = ConvertText(sCharacter, 1, + "UTF-8", charSetBuffer, false, true); + if (!sUTF8.empty()) { + gchar *mapped = g_utf8_casefold(sUTF8.c_str(), sUTF8.length()); if (mapped) { - int mappedLength = strlen(mapped); - const char *mappedBack = ConvertText(&mappedLength, mapped, - mappedLength, charSetBuffer, "UTF-8", false, true); - if (mappedBack && (strlen(mappedBack) == 1) && (mappedBack[0] != sCharacter[0])) { + std::string mappedBack = ConvertText(mapped, strlen(mapped), + charSetBuffer, "UTF-8", false, true); + if ((mappedBack.length() == 1) && (mappedBack[0] != sCharacter[0])) { pcf->SetTranslation(sCharacter[0], mappedBack[0]); } - delete []mappedBack; g_free(mapped); } } - delete []sUTF8; } return pcf; } else { @@ -1364,6 +1317,24 @@ CaseFolder *ScintillaGTK::CaseFolderForEncoding() { } } +namespace { + +struct CaseMapper { + gchar *mapped; // Must be freed with g_free + CaseMapper(const std::string &sUTF8, bool toUpperCase) { + if (toUpperCase) { + mapped = g_utf8_strup(sUTF8.c_str(), sUTF8.length()); + } else { + mapped = g_utf8_strdown(sUTF8.c_str(), sUTF8.length()); + } + } + ~CaseMapper() { + g_free(mapped); + } +}; + +} + std::string ScintillaGTK::CaseMapString(const std::string &s, int caseMapping) { if (s.size() == 0) return std::string(); @@ -1371,43 +1342,18 @@ CaseFolder *ScintillaGTK::CaseFolderForEncoding() { if (caseMapping == cmSame) return s; - const char *needsFree1 = 0; // Must be freed with delete [] const char *charSetBuffer = CharacterSetID(); - const char *sUTF8 = s.c_str(); - int rangeBytes = s.size(); - int convertedLength = rangeBytes; - // Change text to UTF-8 - if (!IsUnicodeMode()) { - // Need to convert - if (*charSetBuffer) { - sUTF8 = ConvertText(&convertedLength, const_cast<char *>(s.c_str()), rangeBytes, - "UTF-8", charSetBuffer, false); - needsFree1 = sUTF8; - } - } - gchar *mapped; // Must be freed with g_free - if (caseMapping == cmUpper) { - mapped = g_utf8_strup(sUTF8, convertedLength); + if (IsUnicodeMode() || !*charSetBuffer) { + CaseMapper mapper(s, caseMapping == cmUpper); + return std::string(mapper.mapped, strlen(mapper.mapped)); } else { - mapped = g_utf8_strdown(sUTF8, convertedLength); - } - int mappedLength = strlen(mapped); - char *mappedBack = mapped; - - char *needsFree2 = 0; // Must be freed with delete [] - if (!IsUnicodeMode()) { - if (*charSetBuffer) { - mappedBack = ConvertText(&mappedLength, mapped, mappedLength, charSetBuffer, "UTF-8", false); - needsFree2 = mappedBack; - } + // Change text to UTF-8 + std::string sUTF8 = ConvertText(const_cast<char *>(s.c_str()), s.length(), + "UTF-8", charSetBuffer, false); + CaseMapper mapper(sUTF8, caseMapping == cmUpper); + return ConvertText(mapper.mapped, strlen(mapper.mapped), charSetBuffer, "UTF-8", false); } - - std::string ret(mappedBack, mappedLength); - g_free(mapped); - delete []needsFree1; - delete []needsFree2; - return ret; } int ScintillaGTK::KeyDefault(int key, int modifiers) { @@ -1528,9 +1474,7 @@ void ScintillaGTK::GetGtkSelectionText(GtkSelectionData *selectionData, Selectio // Return empty string if selection is not a string if ((selectionTypeData != GDK_TARGET_STRING) && (selectionTypeData != atomUTF8)) { - char *empty = new char[1]; - empty[0] = '\0'; - selText.Set(empty, 0, SC_CP_UTF8, 0, false, false); + selText.Copy("", 0, SC_CP_UTF8, 0, false, false); return; } @@ -1544,28 +1488,24 @@ void ScintillaGTK::GetGtkSelectionText(GtkSelectionData *selectionData, Selectio len--; // Forget the extra '\0' #endif - char *dest; + std::string dest = Document::TransformLineEnds(data, len, pdoc->eolMode); if (selectionTypeData == GDK_TARGET_STRING) { - dest = Document::TransformLineEnds(&len, data, len, pdoc->eolMode); if (IsUnicodeMode()) { // Unknown encoding so assume in Latin1 - char *destPrevious = dest; - dest = UTF8FromLatin1(dest, len); - selText.Set(dest, len, SC_CP_UTF8, 0, selText.rectangular, false); - delete []destPrevious; + dest = UTF8FromLatin1(dest.c_str(), len); + selText.Copy(dest.c_str(), dest.length(), SC_CP_UTF8, 0, selText.rectangular, false); } else { // Assume buffer is in same encoding as selection - selText.Set(dest, len, pdoc->dbcsCodePage, + selText.Copy(dest.c_str(), dest.length(), pdoc->dbcsCodePage, vs.styles[STYLE_DEFAULT].characterSet, isRectangular, false); } } else { // UTF-8 - dest = Document::TransformLineEnds(&len, data, len, pdoc->eolMode); - selText.Set(dest, len, SC_CP_UTF8, 0, isRectangular, false); + selText.Copy(dest.c_str(), dest.length(), SC_CP_UTF8, 0, isRectangular, false); const char *charSetBuffer = CharacterSetID(); if (!IsUnicodeMode() && *charSetBuffer) { // Convert to locale - dest = ConvertText(&len, selText.s, selText.len, charSetBuffer, "UTF-8", true); - selText.Set(dest, len, pdoc->dbcsCodePage, + dest = ConvertText(selText.s, selText.len, charSetBuffer, "UTF-8", true); + selText.Copy(dest.c_str(), dest.length(), pdoc->dbcsCodePage, vs.styles[STYLE_DEFAULT].characterSet, selText.rectangular, false); } } @@ -1611,11 +1551,10 @@ void ScintillaGTK::ReceivedSelection(GtkSelectionData *selection_data) { void ScintillaGTK::ReceivedDrop(GtkSelectionData *selection_data) { dragWasDropped = true; if (TypeOfGSD(selection_data) == atomUriList || TypeOfGSD(selection_data) == atomDROPFILES_DND) { - char *ptr = new char[LengthOfGSD(selection_data) + 1]; - ptr[LengthOfGSD(selection_data)] = '\0'; - memcpy(ptr, DataOfGSD(selection_data), LengthOfGSD(selection_data)); - NotifyURIDropped(ptr); - delete []ptr; + const char *data = reinterpret_cast<const char *>(DataOfGSD(selection_data)); + std::vector<char> drop(data, data + LengthOfGSD(selection_data)); + drop.push_back('\0'); + NotifyURIDropped(drop.data()); } else if ((TypeOfGSD(selection_data) == GDK_TARGET_STRING) || (TypeOfGSD(selection_data) == atomUTF8)) { if (TypeOfGSD(selection_data) > 0) { SelectionText selText; @@ -1637,10 +1576,9 @@ void ScintillaGTK::GetSelection(GtkSelectionData *selection_data, guint info, Se // from code below SelectionText *newline_normalized = NULL; { - int tmpstr_len; - char *tmpstr = Document::TransformLineEnds(&tmpstr_len, text->s, text->len, SC_EOL_LF); + std::string tmpstr = Document::TransformLineEnds(text->s, text->len, SC_EOL_LF); newline_normalized = new SelectionText(); - newline_normalized->Set(tmpstr, tmpstr_len, SC_CP_UTF8, 0, text->rectangular, false); + newline_normalized->Copy(tmpstr.c_str(), tmpstr.length(), SC_CP_UTF8, 0, text->rectangular, false); text = newline_normalized; } #endif @@ -1650,10 +1588,9 @@ void ScintillaGTK::GetSelection(GtkSelectionData *selection_data, guint info, Se if ((text->codePage != SC_CP_UTF8) && (info == TARGET_UTF8_STRING)) { const char *charSet = ::CharacterSetID(text->characterSet); if (*charSet) { - int new_len; - char* tmputf = ConvertText(&new_len, text->s, text->len, "UTF-8", charSet, false); + std::string tmputf = ConvertText(text->s, text->len, "UTF-8", charSet, false); converted = new SelectionText(); - converted->Set(tmputf, new_len, SC_CP_UTF8, 0, text->rectangular, false); + converted->Copy(tmputf.c_str(), tmputf.length(), SC_CP_UTF8, 0, text->rectangular, false); text = converted; } } @@ -1923,8 +1860,7 @@ gint ScintillaGTK::MouseRelease(GtkWidget *widget, GdkEventButton *event) { // win32gtk and GTK >= 2 use SCROLL_* events instead of passing the // button4/5/6/7 events to the GTK app -gint ScintillaGTK::ScrollEvent(GtkWidget *widget, - GdkEventScroll *event) { +gint ScintillaGTK::ScrollEvent(GtkWidget *widget, GdkEventScroll *event) { ScintillaGTK *sciThis = ScintillaFromWidget(widget); try { @@ -2617,10 +2553,6 @@ gint ScintillaGTK::SelectionClear(GtkWidget *widget, GdkEventSelection *selectio return TRUE; } -void ScintillaGTK::DragBegin(GtkWidget *, GdkDragContext *) { - //Platform::DebugPrintf("DragBegin\n"); -} - gboolean ScintillaGTK::DragMotionThis(GdkDragContext *context, gint x, gint y, guint dragtime) { try { Modified: scintilla/include/SciLexer.h 9 files changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -120,6 +120,7 @@ #define SCLEX_ECL 105 #define SCLEX_OSCRIPT 106 #define SCLEX_VISUALPROLOG 107 +#define SCLEX_LITERATEHASKELL 108 #define SCLEX_AUTOMATIC 1000 #define SCE_P_DEFAULT 0 #define SCE_P_COMMENTLINE 1 @@ -161,6 +162,7 @@ #define SCE_C_TRIPLEVERBATIM 21 #define SCE_C_HASHQUOTEDSTRING 22 #define SCE_C_PREPROCESSORCOMMENT 23 +#define SCE_C_PREPROCESSORCOMMENTDOC 24 #define SCE_D_DEFAULT 0 #define SCE_D_COMMENT 1 #define SCE_D_COMMENTLINE 2 @@ -1022,6 +1024,10 @@ #define SCE_HA_COMMENTBLOCK3 16 #define SCE_HA_PRAGMA 17 #define SCE_HA_PREPROCESSOR 18 +#define SCE_HA_STRINGEOL 19 +#define SCE_HA_RESERVED_OPERATOR 20 +#define SCE_HA_LITERATE_COMMENT 21 +#define SCE_HA_LITERATE_CODEDELIM 22 #define SCE_T3_DEFAULT 0 #define SCE_T3_X_DEFAULT 1 #define SCE_T3_PREPROCESSOR 2 @@ -1326,6 +1332,9 @@ #define SCE_POWERSHELL_FUNCTION 11 #define SCE_POWERSHELL_USER1 12 #define SCE_POWERSHELL_COMMENTSTREAM 13 +#define SCE_POWERSHELL_HERE_STRING 14 +#define SCE_POWERSHELL_HERE_CHARACTER 15 +#define SCE_POWERSHELL_COMMENTDOCKEYWORD 16 #define SCE_MYSQL_DEFAULT 0 #define SCE_MYSQL_COMMENT 1 #define SCE_MYSQL_COMMENTLINE 2 Modified: scintilla/include/Scintilla.h 13 files changed, 13 insertions(+), 0 deletions(-) =================================================================== @@ -264,6 +264,7 @@ #define INDIC_SQUIGGLELOW 11 #define INDIC_DOTBOX 12 #define INDIC_SQUIGGLEPIXMAP 13 +#define INDIC_COMPOSITIONTHICK 14 #define INDIC_MAX 31 #define INDIC_CONTAINER 8 #define INDIC0_MASK 0x20 @@ -440,7 +441,19 @@ #define SCI_SETFOLDEXPANDED 2229 #define SCI_GETFOLDEXPANDED 2230 #define SCI_TOGGLEFOLD 2231 +#define SC_FOLDACTION_CONTRACT 0 +#define SC_FOLDACTION_EXPAND 1 +#define SC_FOLDACTION_TOGGLE 2 +#define SCI_FOLDLINE 2237 +#define SCI_FOLDCHILDREN 2238 +#define SCI_EXPANDCHILDREN 2239 +#define SCI_FOLDALL 2662 #define SCI_ENSUREVISIBLE 2232 +#define SC_AUTOMATICFOLD_SHOW 0x0001 +#define SC_AUTOMATICFOLD_CLICK 0x0002 +#define SC_AUTOMATICFOLD_CHANGE 0x0004 +#define SCI_SETAUTOMATICFOLD 2663 +#define SCI_GETAUTOMATICFOLD 2664 #define SC_FOLDFLAG_LINEBEFORE_EXPANDED 0x0002 #define SC_FOLDFLAG_LINEBEFORE_CONTRACTED 0x0004 #define SC_FOLDFLAG_LINEAFTER_EXPANDED 0x0008 Modified: scintilla/include/Scintilla.iface 38 files changed, 38 insertions(+), 0 deletions(-) =================================================================== @@ -581,6 +581,7 @@ val INDIC_DOTS=10 val INDIC_SQUIGGLELOW=11 val INDIC_DOTBOX=12 val INDIC_SQUIGGLEPIXMAP=13 +val INDIC_COMPOSITIONTHICK=14 val INDIC_MAX=31 val INDIC_CONTAINER=8 val INDIC0_MASK=0x20 @@ -1109,9 +1110,37 @@ get bool GetFoldExpanded=2230(int line,) # Switch a header line between expanded and contracted. fun void ToggleFold=2231(int line,) +enu FoldAction=SC_FOLDACTION +val SC_FOLDACTION_CONTRACT=0 +val SC_FOLDACTION_EXPAND=1 +val SC_FOLDACTION_TOGGLE=2 + +# Expand or contract a fold header. +fun void FoldLine=2237(int line, int action) + +# Expand or contract a fold header and its children. +fun void FoldChildren=2238(int line, int action) + +# Expand a fold header and all children. Use the level argument instead of the line's current level. +fun void ExpandChildren=2239(int line, int level) + +# Expand or contract all fold headers. +fun void FoldAll=2662(int action,) + # Ensure a particular line is visible by expanding any header line hiding it. fun void EnsureVisible=2232(int line,) +enu AutomaticFold=SC_AUTOMATICFOLD_ +val SC_AUTOMATICFOLD_SHOW=0x0001 +val SC_AUTOMATICFOLD_CLICK=0x0002 +val SC_AUTOMATICFOLD_CHANGE=0x0004 + +# Set automatic folding behaviours. +set void SetAutomaticFold=2663(int automaticFold,) + +# Get automatic folding behaviours. +get int GetAutomaticFold=2664(,) + enu FoldFlag=SC_FOLDFLAG_ val SC_FOLDFLAG_LINEBEFORE_EXPANDED=0x0002 val SC_FOLDFLAG_LINEBEFORE_CONTRACTED=0x0004 @@ -2549,6 +2578,7 @@ val SCLEX_AVS=104 val SCLEX_ECL=105 val SCLEX_OSCRIPT=106 val SCLEX_VISUALPROLOG=107 +val SCLEX_LITERATEHASKELL=108 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a # value assigned in sequence from SCLEX_AUTOMATIC+1. @@ -2599,6 +2629,7 @@ val SCE_C_STRINGRAW=20 val SCE_C_TRIPLEVERBATIM=21 val SCE_C_HASHQUOTEDSTRING=22 val SCE_C_PREPROCESSORCOMMENT=23 +val SCE_C_PREPROCESSORCOMMENTDOC=24 # Lexical states for SCLEX_D lex D=SCLEX_D SCE_D_ val SCE_D_DEFAULT=0 @@ -3583,6 +3614,10 @@ val SCE_HA_COMMENTBLOCK2=15 val SCE_HA_COMMENTBLOCK3=16 val SCE_HA_PRAGMA=17 val SCE_HA_PREPROCESSOR=18 +val SCE_HA_STRINGEOL=19 +val SCE_HA_RESERVED_OPERATOR=20 +val SCE_HA_LITERATE_COMMENT=21 +val SCE_HA_LITERATE_CODEDELIM=22 # Lexical states of SCLEX_TADS3 lex TADS3=SCLEX_TADS3 SCE_T3_ val SCE_T3_DEFAULT=0 @@ -3923,6 +3958,9 @@ val SCE_POWERSHELL_ALIAS=10 val SCE_POWERSHELL_FUNCTION=11 val SCE_POWERSHELL_USER1=12 val SCE_POWERSHELL_COMMENTSTREAM=13 +val SCE_POWERSHELL_HERE_STRING=14 +val SCE_POWERSHELL_HERE_CHARACTER=15 +val SCE_POWERSHELL_COMMENTDOCKEYWORD=16 # Lexical state for SCLEX_MYSQL lex MySQL=SCLEX_MYSQL SCE_MYSQL_ val SCE_MYSQL_DEFAULT=0 Modified: scintilla/lexers/LexCPP.cxx 15 files changed, 10 insertions(+), 5 deletions(-) =================================================================== @@ -455,9 +455,9 @@ int SCI_METHOD LexerCPP::WordListSet(int n, const char *wl) { if (n == 4) { // Rebuild preprocessorDefinitions preprocessorDefinitionsStart.clear(); - for (int nDefinition = 0; nDefinition < ppDefinitions.len; nDefinition++) { - char *cpDefinition = ppDefinitions.words[nDefinition]; - char *cpEquals = strchr(cpDefinition, '='); + for (int nDefinition = 0; nDefinition < ppDefinitions.Length(); nDefinition++) { + const char *cpDefinition = ppDefinitions.WordAt(nDefinition); + const char *cpEquals = strchr(cpDefinition, '='); if (cpEquals) { std::string name(cpDefinition, cpEquals - cpDefinition); std::string val(cpEquals+1); @@ -672,7 +672,7 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle, sc.SetState(SCE_C_DEFAULT|activitySet); } break; - case SCE_C_PREPROCESSOR: + case SCE_C_PREPROCESSOR: if (options.stylingWithinPreprocessor) { if (IsASpace(sc.ch)) { sc.SetState(SCE_C_DEFAULT|activitySet); @@ -683,7 +683,11 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle, if ((isIncludePreprocessor && sc.Match('<')) || sc.Match('\"')) { isStringInPreprocessor = true; } else if (sc.Match('/', '*')) { - sc.SetState(SCE_C_PREPROCESSORCOMMENT|activitySet); + if (sc.Match("/**") || sc.Match("/*!")) { + sc.SetState(SCE_C_PREPROCESSORCOMMENTDOC|activitySet); + } else { + sc.SetState(SCE_C_PREPROCESSORCOMMENT|activitySet); + } sc.Forward(); // Eat the * } else if (sc.Match('/', '/')) { sc.SetState(SCE_C_DEFAULT|activitySet); @@ -691,6 +695,7 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle, } break; case SCE_C_PREPROCESSORCOMMENT: + case SCE_C_PREPROCESSORCOMMENTDOC: if (sc.Match('*', '/')) { sc.Forward(); sc.ForwardSetState(SCE_C_PREPROCESSOR|activitySet); Modified: scintilla/lexers/LexHaskell.cxx 1063 files changed, 871 insertions(+), 192 deletions(-) =================================================================== @@ -4,21 +4,20 @@ * A haskell lexer for the scintilla code control. * Some stuff "lended" from LexPython.cxx and LexCPP.cxx. * External lexer stuff inspired from the caml external lexer. + * Folder copied from Python's. * * Written by Tobias Engvall - tumm at dtek dot chalmers dot se * * Several bug fixes by Krasimir Angelov - kr.angelov at gmail.com * - * Improvements by kudah - kudahkukarek at gmail.com + * Improved by kudah <kudahkukarek(a)gmail.com> * * TODO: - * * Implement a folder :) - * * Nice Character-lexing (stuff inside '\''), LexPython has - * this. - * + * * A proper lexical folder to fold group declarations, comments, pragmas, + * #ifdefs, explicit layout, lists, tuples, quasi-quotes, splces, etc, etc, + * etc. * *****************************************************************/ - #include <stdlib.h> #include <string.h> #include <stdio.h> @@ -26,6 +25,9 @@ #include <assert.h> #include <ctype.h> +#include <string> +#include <map> + #include "ILexer.h" #include "Scintilla.h" #include "SciLexer.h" @@ -37,195 +39,746 @@ #include "StyleContext.h" #include "CharacterSet.h" #include "LexerModule.h" +#include "OptionSet.h" #ifdef SCI_NAMESPACE using namespace Scintilla; #endif -#ifdef BUILD_AS_EXTERNAL_LEXER +static int u_iswalpha(int); +static int u_iswalnum(int); +static int u_iswupper(int); +static int u_IsHaskellSymbol(int); -#include "ExternalLexer.h" -#include "WindowAccessor.h" +// #define HASKELL_UNICODE -#define BUILD_EXTERNAL_LEXER 0 +#ifndef HASKELL_UNICODE + +// Stubs + +static int u_iswalpha(int) { + return 0; +} + +static int u_iswalnum(int) { + return 0; +} + +static int u_iswupper(int) { + return 0; +} + +static int u_IsHaskellSymbol(int) { + return 0; +} #endif -#define HA_MODE_DEFAULT 0 -#define HA_MODE_IMPORT1 1 -#define HA_MODE_IMPORT2 2 -#define HA_MODE_IMPORT3 3 -#define HA_MODE_MODULE 4 -#define HA_MODE_FFI 5 -#define HA_MODE_TYPE 6 +static inline bool IsHaskellLetter(const int ch) { + if (IsASCII(ch)) { + return (ch >= 'a' && ch <= 'z') + || (ch >= 'A' && ch <= 'Z'); + } else { + return u_iswalpha(ch) != 0; + } +} + +static inline bool IsHaskellAlphaNumeric(const int ch) { + if (IsASCII(ch)) { + return IsAlphaNumeric(ch); + } else { + return u_iswalnum(ch) != 0; + } +} + +static inline bool IsHaskellUpperCase(const int ch) { + if (IsASCII(ch)) { + return ch >= 'A' && ch <= 'Z'; + } else { + return u_iswupper(ch) != 0; + } +} -static inline bool IsAWordStart(const int ch) { - return (IsLowerCase(ch) || IsUpperCase(ch) || ch == '_'); +static inline bool IsAnHaskellOperatorChar(const int ch) { + if (IsASCII(ch)) { + return + ( ch == '!' || ch == '#' || ch == '$' || ch == '%' + || ch == '&' || ch == '*' || ch == '+' || ch == '-' + || ch == '.' || ch == '/' || ch == ':' || ch == '<' + || ch == '=' || ch == '>' || ch == '?' || ch == '@' + || ch == '^' || ch == '|' || ch == '~' || ch == '\\'); + } else { + return u_IsHaskellSymbol(ch) != 0; + } } -static inline bool IsAWordChar(const int ch, const bool magicHash) { - return ( IsAlphaNumeric(ch) +static inline bool IsAHaskellWordStart(const int ch) { + return IsHaskellLetter(ch) || ch == '_'; +} + +static inline bool IsAHaskellWordChar(const int ch) { + return ( IsHaskellAlphaNumeric(ch) || ch == '_' - || ch == '\'' - || (magicHash && ch == '#')); + || ch == '\''); } -static inline bool IsAnOperatorChar(const int ch) { - return - ( ch == '!' || ch == '#' || ch == '$' || ch == '%' - || ch == '&' || ch == '*' || ch == '+' || ch == '-' - || ch == '.' || ch == '/' || ch == ':' || ch == '<' - || ch == '=' || ch == '>' || ch == '?' || ch == '@' - || ch == '\\' || ch == '^' || ch == '|' || ch == '~'); +static inline bool IsCommentBlockStyle(int style) { + return (style >= SCE_HA_COMMENTBLOCK && style <= SCE_HA_COMMENTBLOCK3); } -static void ColorizeHaskellDoc(unsigned int startPos, int length, int initStyle, - WordList *keywordlists[], Accessor &styler) { +static inline bool IsCommentStyle(int style) { + return (style >= SCE_HA_COMMENTLINE && style <= SCE_HA_COMMENTBLOCK3) + || ( style == SCE_HA_LITERATE_COMMENT + || style == SCE_HA_LITERATE_CODEDELIM); +} - WordList &keywords = *keywordlists[0]; - WordList &ffi = *keywordlists[1]; +// styles which do not belong to Haskell, but to external tools +static inline bool IsExternalStyle(int style) { + return ( style == SCE_HA_PREPROCESSOR + || style == SCE_HA_LITERATE_COMMENT + || style == SCE_HA_LITERATE_CODEDELIM); +} - // property lexer.haskell.allow.hash - // Set to 1 to allow the # character in identifiers with the haskell lexer. - // (GHC -XMagicHash extension) - const bool magicHash = styler.GetPropertyInt("lexer.haskell.allow.hash") != 0; - const bool stylingWithinPreprocessor = styler.GetPropertyInt("styling.within.preprocessor") != 0; +static inline int CommentBlockStyleFromNestLevel(const unsigned int nestLevel) { + return SCE_HA_COMMENTBLOCK + (nestLevel % 3); +} - StyleContext sc(startPos, length, initStyle, styler); +// Mangled version of lexlib/Accessor.cxx IndentAmount. +// Modified to treat comment blocks as whitespace +// plus special case for commentline/preprocessor. +static int HaskellIndentAmount(Accessor &styler, const int line) { + + // Determines the indentation level of the current line + // Comment blocks are treated as whitespace + + int pos = styler.LineStart(line); + int eol_pos = styler.LineStart(line + 1) - 1; + + char ch = styler[pos]; + int style = styler.StyleAt(pos); + + int indent = 0; + bool inPrevPrefix = line > 0; + + int posPrev = inPrevPrefix ? styler.LineStart(line-1) : 0; + + while (( ch == ' ' || ch == '\t' + || IsCommentBlockStyle(style) + || style == SCE_HA_LITERATE_CODEDELIM) + && (pos < eol_pos)) { + if (inPrevPrefix) { + char chPrev = styler[posPrev++]; + if (chPrev != ' ' && chPrev != '\t') { + inPrevPrefix = false; + } + } + if (ch == '\t') { + indent = (indent / 8 + 1) * 8; + } else { // Space or comment block + indent++; + } + pos++; + ch = styler[pos]; + style = styler.StyleAt(pos); + } + + indent += SC_FOLDLEVELBASE; + // if completely empty line or the start of a comment or preprocessor... + if ( styler.LineStart(line) == styler.Length() + || ch == ' ' + || ch == '\t' + || ch == '\n' + || ch == '\r' + || IsCommentStyle(style) + || style == SCE_HA_PREPROCESSOR) + return indent | SC_FOLDLEVELWHITEFLAG; + else + return indent; +} + +struct OptionsHaskell { + bool magicHash; + bool allowQuotes; + bool implicitParams; + bool highlightSafe; + bool cpp; + bool stylingWithinPreprocessor; + bool fold; + bool foldComment; + bool foldCompact; + bool foldImports; + OptionsHaskell() { + magicHash = true; // Widespread use, enabled by default. + allowQuotes = true; // Widespread use, enabled by default. + implicitParams = false; // Fell out of favor, seldom used, disabled. + highlightSafe = true; // Moderately used, doesn't hurt to enable. + cpp = true; // Widespread use, enabled by default; + stylingWithinPreprocessor = false; + fold = false; + foldComment = false; + foldCompact = false; + foldImports = false; + } +}; + +static const char * const haskellWordListDesc[] = { + "Keywords", + "FFI", + "Reserved operators", + 0 +}; + +struct OptionSetHaskell : public OptionSet<OptionsHaskell> { + OptionSetHaskell() { + DefineProperty("lexer.haskell.allow.hash", &OptionsHaskell::magicHash, + "Set to 0 to disallow the '#' character at the end of identifiers and " + "literals with the haskell lexer " + "(GHC -XMagicHash extension)"); + + DefineProperty("lexer.haskell.allow.quotes", &OptionsHaskell::allowQuotes, + "Set to 0 to disable highlighting of Template Haskell name quotations " + "and promoted constructors " + "(GHC -XTemplateHaskell and -XDataKinds extensions)"); + + DefineProperty("lexer.haskell.allow.questionmark", &OptionsHaskell::implicitParams, + "Set to 1 to allow the '?' character at the start of identifiers " + "with the haskell lexer " + "(GHC & Hugs -XImplicitParams extension)"); + + DefineProperty("lexer.haskell.import.safe", &OptionsHaskell::highlightSafe, + "Set to 0 to disallow \"safe\" keyword in imports " + "(GHC -XSafe, -XTrustworthy, -XUnsafe extensions)"); + + DefineProperty("lexer.haskell.cpp", &OptionsHaskell::cpp, + "Set to 0 to disable C-preprocessor highlighting " + "(-XCPP extension)"); + + DefineProperty("styling.within.preprocessor", &OptionsHaskell::stylingWithinPreprocessor, + "For Haskell code, determines whether all preprocessor code is styled in the " + "preprocessor style (0, the default) or only from the initial # to the end " + "of the command word(1)." + ); + + DefineProperty("fold", &OptionsHaskell::fold); + + DefineProperty("fold.comment", &OptionsHaskell::foldComment); + + DefineProperty("fold.compact", &OptionsHaskell::foldCompact); + + DefineProperty("fold.haskell.imports", &OptionsHaskell::foldImports, + "Set to 1 to enable folding of import declarations"); + + DefineWordListSets(haskellWordListDesc); + } +}; + +class LexerHaskell : public ILexer { + bool literate; + int firstImportLine; + int firstImportIndent; + WordList keywords; + WordList ffi; + WordList reserved_operators; + OptionsHaskell options; + OptionSetHaskell osHaskell; + + enum HashCount { + oneHash + ,twoHashes + ,unlimitedHashes + }; + + enum KeywordMode { + HA_MODE_DEFAULT = 0 + ,HA_MODE_IMPORT1 = 1 // after "import", before "qualified" or "safe" or package name or module name. + ,HA_MODE_IMPORT2 = 2 // after module name, before "as" or "hiding". + ,HA_MODE_IMPORT3 = 3 // after "as", before "hiding" + ,HA_MODE_MODULE = 4 // after "module", before module name. + ,HA_MODE_FFI = 5 // after "foreign", before FFI keywords + ,HA_MODE_TYPE = 6 // after "type" or "data", before "family" + }; + + enum LiterateMode { + LITERATE_BIRD = 0 // if '>' is the first character on the line, + // color '>' as a codedelim and the rest of + // the line as code. + // else if "\begin{code}" is the only word on the + // line except whitespace, switch to LITERATE_BLOCK + // otherwise color the line as a literate comment. + ,LITERATE_BLOCK = 1 // if the string "\end{code}" is encountered at column + // 0 ignoring all later characters, color the line + // as a codedelim and switch to LITERATE_BIRD + // otherwise color the line as code. + }; + + struct HaskellLineInfo { + unsigned int nestLevel; // 22 bits ought to be enough for anybody + unsigned int nonexternalStyle; // 5 bits, widen if number of styles goes + // beyond 31. + bool pragma; + LiterateMode lmode; + KeywordMode mode; + + HaskellLineInfo(int state) : + nestLevel (state >> 10) + , nonexternalStyle ((state >> 5) & 0x1F) + , pragma ((state >> 4) & 0x1) + , lmode (static_cast<LiterateMode>((state >> 3) & 0x1)) + , mode (static_cast<KeywordMode>(state & 0x7)) + {} + + int ToLineState() { + return + (nestLevel << 10) + | (nonexternalStyle << 5) + | (pragma << 4) + | (lmode << 3) + | mode; + } + }; + + inline void skipMagicHash(StyleContext &sc, const HashCount hashes) const { + if (options.magicHash && sc.ch == '#') { + sc.Forward(); + if (hashes == twoHashes && sc.ch == '#') { + sc.Forward(); + } else if (hashes == unlimitedHashes) { + while (sc.ch == '#') { + sc.Forward(); + } + } + } + } + + bool LineContainsImport(const int line, Accessor &styler) const { + if (options.foldImports) { + int currentPos = styler.LineStart(line); + int style = styler.StyleAt(currentPos); + + int eol_pos = styler.LineStart(line + 1) - 1; + + while (currentPos < eol_pos) { + int ch = styler[currentPos]; + style = styler.StyleAt(currentPos); + + if (ch == ' ' || ch == '\t' + || IsCommentBlockStyle(style) + || style == SCE_HA_LITERATE_CODEDELIM) { + currentPos++; + } else { + break; + } + } + + return (style == SCE_HA_KEYWORD + && styler.Match(currentPos, "import")); + } else { + return false; + } + } + + inline int IndentAmountWithOffset(Accessor &styler, const int line) const { + const int indent = HaskellIndentAmount(styler, line); + const int indentLevel = indent & SC_FOLDLEVELNUMBERMASK; + return indentLevel <= ((firstImportIndent - 1) + SC_FOLDLEVELBASE) + ? indent + : (indentLevel + firstImportIndent) | (indent & ~SC_FOLDLEVELNUMBERMASK); + } + + inline int IndentLevelRemoveIndentOffset(const int indentLevel) const { + return indentLevel <= ((firstImportIndent - 1) + SC_FOLDLEVELBASE) + ? indentLevel + : indentLevel - firstImportIndent; + } + +public: + LexerHaskell(bool literate_) + : literate(literate_) + , firstImportLine(-1) + , firstImportIndent(0) + {} + virtual ~LexerHaskell() {} + + void SCI_METHOD Release() { + delete this; + } + + int SCI_METHOD Version() const { + return lvOriginal; + } + + const char * SCI_METHOD PropertyNames() { + return osHaskell.PropertyNames(); + } + + int SCI_METHOD PropertyType(const char *name) { + return osHaskell.PropertyType(name); + } + + const char * SCI_METHOD DescribeProperty(const char *name) { + return osHaskell.DescribeProperty(name); + } + + int SCI_METHOD PropertySet(const char *key, const char *val); + + const char * SCI_METHOD DescribeWordListSets() { + return osHaskell.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 *LexerFactoryHaskell() { + return new LexerHaskell(false); + } + + static ILexer *LexerFactoryLiterateHaskell() { + return new LexerHaskell(true); + } +}; + +int SCI_METHOD LexerHaskell::PropertySet(const char *key, const char *val) { + if (osHaskell.PropertySet(&options, key, val)) { + return 0; + } + return -1; +} + +int SCI_METHOD LexerHaskell::WordListSet(int n, const char *wl) { + WordList *wordListN = 0; + switch (n) { + case 0: + wordListN = &keywords; + break; + case 1: + wordListN = &ffi; + break; + case 2: + wordListN = &reserved_operators; + break; + } + int firstModification = -1; + if (wordListN) { + WordList wlNew; + wlNew.Set(wl); + if (*wordListN != wlNew) { + wordListN->Set(wl); + firstModification = 0; + } + } + return firstModification; +} + +void SCI_METHOD LexerHaskell::Lex(unsigned int startPos, int length, int initStyle + ,IDocument *pAccess) { + LexAccessor styler(pAccess); int lineCurrent = styler.GetLine(startPos); - int state = lineCurrent ? styler.GetLineState(lineCurrent-1) - : HA_MODE_DEFAULT; - int mode = state & 0xF; - int xmode = state >> 4; // obscure parameter. Means different things in different modes. + + HaskellLineInfo hs = HaskellLineInfo(lineCurrent ? styler.GetLineState(lineCurrent-1) : 0); + + // Do not leak onto next line + if (initStyle == SCE_HA_STRINGEOL) + initStyle = SCE_HA_DEFAULT; + else if (initStyle == SCE_HA_LITERATE_CODEDELIM) + initStyle = hs.nonexternalStyle; + + StyleContext sc(startPos, length, initStyle, styler); + + int base = 10; + bool dot = false; + + bool inDashes = false; + bool alreadyInTheMiddleOfOperator = false; + + assert(!(IsCommentBlockStyle(initStyle) && hs.nestLevel == 0)); while (sc.More()) { // Check for state end + if (!IsExternalStyle(sc.state)) { + hs.nonexternalStyle = sc.state; + } + + // For lexer to work, states should unconditionally forward at least one + // character. + // If they don't, they should still check if they are at line end and + // forward if so. + // If a state forwards more than one character, it should check every time + // that it is not a line end and cease forwarding otherwise. + if (sc.atLineEnd) { + // Remember the line state for future incremental lexing + styler.SetLineState(lineCurrent, hs.ToLineState()); + lineCurrent++; + } + + // Handle line continuation generically. + if (sc.ch == '\\' && (sc.chNext == '\n' || sc.chNext == '\r') + && ( sc.state == SCE_HA_STRING + || sc.state == SCE_HA_PREPROCESSOR)) { + // Remember the line state for future incremental lexing + styler.SetLineState(lineCurrent, hs.ToLineState()); + lineCurrent++; + + sc.Forward(); + if (sc.ch == '\r' && sc.chNext == '\n') { + sc.Forward(); + } + sc.Forward(); + + continue; + } + + if (sc.atLineStart) { + + if (sc.state == SCE_HA_STRING || sc.state == SCE_HA_CHARACTER) { + // Prevent SCE_HA_STRINGEOL from leaking back to previous line + sc.SetState(sc.state); + } + + if (literate && hs.lmode == LITERATE_BIRD) { + if (!IsExternalStyle(sc.state)) { + sc.SetState(SCE_HA_LITERATE_COMMENT); + } + } + } + + // External + // Literate + if ( literate && hs.lmode == LITERATE_BIRD && sc.atLineStart + && sc.ch == '>') { + sc.SetState(SCE_HA_LITERATE_CODEDELIM); + sc.ForwardSetState(hs.nonexternalStyle); + } + else if (literate && hs.lmode == LITERATE_BIRD && sc.atLineStart + && ( sc.ch == ' ' || sc.ch == '\t' + || sc.Match("\\begin{code}"))) { + sc.SetState(sc.state); + + while ((sc.ch == ' ' || sc.ch == '\t') && sc.More()) + sc.Forward(); + + if (sc.Match("\\begin{code}")) { + sc.Forward(static_cast<int>(strlen("\\begin{code}"))); + + bool correct = true; + + while (!sc.atLineEnd && sc.More()) { + if (sc.ch != ' ' && sc.ch != '\t') { + correct = false; + } + sc.Forward(); + } + + if (correct) { + sc.ChangeState(SCE_HA_LITERATE_CODEDELIM); // color the line end + hs.lmode = LITERATE_BLOCK; + } + } + } + else if (literate && hs.lmode == LITERATE_BLOCK && sc.atLineStart + && sc.Match("\\end{code}")) { + sc.SetState(SCE_HA_LITERATE_CODEDELIM); + + sc.Forward(static_cast<int>(strlen("\\end{code}"))); + + while (!sc.atLineEnd && sc.More()) { + sc.Forward(); + } + + sc.SetState(SCE_HA_LITERATE_COMMENT); + hs.lmode = LITERATE_BIRD; + } + // Preprocessor + else if (sc.atLineStart && sc.ch == '#' && options.cpp) { + sc.SetState(SCE_HA_PREPROCESSOR); + sc.Forward(); + } + // Literate + else if (sc.state == SCE_HA_LITERATE_COMMENT) { + sc.Forward(); + } + else if (sc.state == SCE_HA_LITERATE_CODEDELIM) { + sc.ForwardSetState(hs.nonexternalStyle); + } + // Preprocessor + else if (sc.state == SCE_HA_PREPROCESSOR) { + if (sc.atLineEnd) { + sc.SetState(options.stylingWithinPreprocessor + ? SCE_HA_DEFAULT + : hs.nonexternalStyle); + sc.Forward(); // prevent double counting a line + } else if (options.stylingWithinPreprocessor && !IsHaskellLetter(sc.ch)) { + sc.SetState(SCE_HA_DEFAULT); + } else { + sc.Forward(); + } + } + // Haskell // Operator - if (sc.state == SCE_HA_OPERATOR) { + else if (sc.state == SCE_HA_OPERATOR) { int style = SCE_HA_OPERATOR; - if (sc.ch == ':' && + if ( sc.ch == ':' + && !alreadyInTheMiddleOfOperator // except "::" - !(sc.chNext == ':' && !IsAnOperatorChar(sc.GetRelative(2)))) { + && !( sc.chNext == ':' + && !IsAnHaskellOperatorChar(sc.GetRelative(2)))) { style = SCE_HA_CAPITAL; } - while(IsAnOperatorChar(sc.ch)) + alreadyInTheMiddleOfOperator = false; + + while (IsAnHaskellOperatorChar(sc.ch)) sc.Forward(); - styler.ColourTo(sc.currentPos - 1, style); - sc.ChangeState(SCE_HA_DEFAULT); + char s[100]; + sc.GetCurrent(s, sizeof(s)); + + if (reserved_operators.InList(s)) + style = SCE_HA_RESERVED_OPERATOR; + + sc.ChangeState(style); + sc.SetState(SCE_HA_DEFAULT); } // String else if (sc.state == SCE_HA_STRING) { - if (sc.ch == '\"') { + if (sc.atLineEnd) { + sc.ChangeState(SCE_HA_STRINGEOL); + sc.ForwardSetState(SCE_HA_DEFAULT); + } else if (sc.ch == '\"') { sc.Forward(); + skipMagicHash(sc, oneHash); sc.SetState(SCE_HA_DEFAULT); } else if (sc.ch == '\\') { sc.Forward(2); - } else if (sc.atLineEnd) { - sc.SetState(SCE_HA_DEFAULT); } else { sc.Forward(); } } // Char else if (sc.state == SCE_HA_CHARACTER) { - if (sc.ch == '\'') { + if (sc.atLineEnd) { + sc.ChangeState(SCE_HA_STRINGEOL); + sc.ForwardSetState(SCE_HA_DEFAULT); + } else if (sc.ch == '\'') { sc.Forward(); + skipMagicHash(sc, oneHash); sc.SetState(SCE_HA_DEFAULT); } else if (sc.ch == '\\') { sc.Forward(2); - } else if (sc.atLineEnd) { - sc.SetState(SCE_HA_DEFAULT); } else { sc.Forward(); } } // Number else if (sc.state == SCE_HA_NUMBER) { - if (IsADigit(sc.ch, xmode) || - (sc.ch=='.' && IsADigit(sc.chNext, xmode))) { + if (sc.atLineEnd) { + sc.SetState(SCE_HA_DEFAULT); + sc.Forward(); // prevent double counting a line + } else if (IsADigit(sc.ch, base)) { sc.Forward(); - } else if ((xmode == 10) && + } else if (sc.ch=='.' && dot && IsADigit(sc.chNext, base)) { + sc.Forward(2); + dot = false; + } else if ((base == 10) && (sc.ch == 'e' || sc.ch == 'E') && (IsADigit(sc.chNext) || sc.chNext == '+' || sc.chNext == '-')) { sc.Forward(); if (sc.ch == '+' || sc.ch == '-') sc.Forward(); } else { + skipMagicHash(sc, twoHashes); sc.SetState(SCE_HA_DEFAULT); } } // Keyword or Identifier else if (sc.state == SCE_HA_IDENTIFIER) { + int style = IsHaskellUpperCase(sc.ch) ? SCE_HA_CAPITAL : SCE_HA_IDENTIFIER; + + assert(IsAHaskellWordStart(sc.ch)); + + sc.Forward(); + while (sc.More()) { - if (IsAWordChar(sc.ch, magicHash)) { + if (IsAHaskellWordChar(sc.ch)) { sc.Forward(); - } else if (xmode == SCE_HA_CAPITAL && sc.ch=='.') { - if (isupper(sc.chNext)) { - xmode = SCE_HA_CAPITAL; + } else if (sc.ch == '.' && style == SCE_HA_CAPITAL) { + if (IsHaskellUpperCase(sc.chNext)) { sc.Forward(); - } else if (IsAWordStart(sc.chNext)) { - xmode = SCE_HA_IDENTIFIER; + style = SCE_HA_CAPITAL; + } else if (IsAHaskellWordStart(sc.chNext)) { sc.Forward(); - } else if (IsAnOperatorChar(sc.chNext)) { - xmode = SCE_HA_OPERATOR; + style = SCE_HA_IDENTIFIER; + } else if (IsAnHaskellOperatorChar(sc.chNext)) { sc.Forward(); + style = sc.ch == ':' ? SCE_HA_CAPITAL : SCE_HA_OPERATOR; + while (IsAnHaskellOperatorChar(sc.ch)) + sc.Forward(); + break; } else { break; } - } else if (xmode == SCE_HA_OPERATOR && IsAnOperatorChar(sc.ch)) { - sc.Forward(); } else { break; } } + skipMagicHash(sc, unlimitedHashes); + char s[100]; sc.GetCurrent(s, sizeof(s)); - int style = xmode; - - int new_mode = HA_MODE_DEFAULT; + KeywordMode new_mode = HA_MODE_DEFAULT; if (keywords.InList(s)) { style = SCE_HA_KEYWORD; - } else if (isupper(s[0])) { - if (mode >= HA_MODE_IMPORT1 && mode <= HA_MODE_IMPORT3) { + } else if (style == SCE_HA_CAPITAL) { + if (hs.mode == HA_MODE_IMPORT1 || hs.mode == HA_MODE_IMPORT3) { style = SCE_HA_MODULE; new_mode = HA_MODE_IMPORT2; - } else if (mode == HA_MODE_MODULE) { + } else if (hs.mode == HA_MODE_MODULE) { style = SCE_HA_MODULE; } - } else if (mode == HA_MODE_IMPORT1 && + } else if (hs.mode == HA_MODE_IMPORT1 && strcmp(s,"qualified") == 0) { style = SCE_HA_KEYWORD; new_mode = HA_MODE_IMPORT1; - } else if (mode == HA_MODE_IMPORT2) { + } else if (options.highlightSafe && + hs.mode == HA_MODE_IMPORT1 && + strcmp(s,"safe") == 0) { + style = SCE_HA_KEYWORD; + new_mode = HA_MODE_IMPORT1; + } else if (hs.mode == HA_MODE_IMPORT2) { if (strcmp(s,"as") == 0) { style = SCE_HA_KEYWORD; new_mode = HA_MODE_IMPORT3; } else if (strcmp(s,"hiding") == 0) { style = SCE_HA_KEYWORD; } - } else if (mode == HA_MODE_TYPE) { + } else if (hs.mode == HA_MODE_TYPE) { if (strcmp(s,"family") == 0) style = SCE_HA_KEYWORD; } - if (mode == HA_MODE_FFI) { + if (hs.mode == HA_MODE_FFI) { if (ffi.InList(s)) { style = SCE_HA_KEYWORD; new_mode = HA_MODE_FFI; } } - styler.ColourTo(sc.currentPos - 1, style); + sc.ChangeState(style); + sc.SetState(SCE_HA_DEFAULT); - if (strcmp(s,"import") == 0 && mode != HA_MODE_FFI) + if (strcmp(s,"import") == 0 && hs.mode != HA_MODE_FFI) new_mode = HA_MODE_IMPORT1; else if (strcmp(s,"module") == 0) new_mode = HA_MODE_MODULE; @@ -235,87 +788,88 @@ static void ColorizeHaskellDoc(unsigned int startPos, int length, int initStyle, || strcmp(s,"data") == 0) new_mode = HA_MODE_TYPE; - xmode = 0; - sc.ChangeState(SCE_HA_DEFAULT); - mode = new_mode; + hs.mode = new_mode; } // Comments // Oneliner else if (sc.state == SCE_HA_COMMENTLINE) { - if (xmode == 1 && sc.ch != '-') { - xmode = 0; - if (IsAnOperatorChar(sc.ch)) + if (sc.atLineEnd) { + sc.SetState(hs.pragma ? SCE_HA_PRAGMA : SCE_HA_DEFAULT); + sc.Forward(); // prevent double counting a line + } else if (inDashes && sc.ch != '-' && !hs.pragma) { + inDashes = false; + if (IsAnHaskellOperatorChar(sc.ch)) { + alreadyInTheMiddleOfOperator = true; sc.ChangeState(SCE_HA_OPERATOR); - } else if (sc.atLineEnd) { - sc.SetState(SCE_HA_DEFAULT); + } } else { sc.Forward(); } } // Nested - else if (sc.state == SCE_HA_COMMENTBLOCK) { + else if (IsCommentBlockStyle(sc.state)) { if (sc.Match('{','-')) { + sc.SetState(CommentBlockStyleFromNestLevel(hs.nestLevel)); sc.Forward(2); - xmode++; - } - else if (sc.Match('-','}')) { + hs.nestLevel++; + } else if (sc.Match('-','}')) { sc.Forward(2); - xmode--; - if (xmode == 0) { - sc.SetState(SCE_HA_DEFAULT); - } + assert(hs.nestLevel > 0); + if (hs.nestLevel > 0) + hs.nestLevel--; + sc.SetState( + hs.nestLevel == 0 + ? (hs.pragma ? SCE_HA_PRAGMA : SCE_HA_DEFAULT) + : CommentBlockStyleFromNestLevel(hs.nestLevel - 1)); } else { - if (sc.atLineEnd) { - // Remember the line state for future incremental lexing - styler.SetLineState(lineCurrent, (xmode << 4) | mode); - lineCurrent++; - } sc.Forward(); } } // Pragma else if (sc.state == SCE_HA_PRAGMA) { if (sc.Match("#-}")) { + hs.pragma = false; sc.Forward(3); sc.SetState(SCE_HA_DEFAULT); - } else { - sc.Forward(); - } - } - // Preprocessor - else if (sc.state == SCE_HA_PREPROCESSOR) { - if (stylingWithinPreprocessor && !IsAWordStart(sc.ch)) { - sc.SetState(SCE_HA_DEFAULT); - } else if (sc.ch == '\\' && !stylingWithinPreprocessor) { + } else if (sc.Match('-','-')) { + sc.SetState(SCE_HA_COMMENTLINE); sc.Forward(2); - } else if (sc.atLineEnd) { - sc.SetState(SCE_HA_DEFAULT); + inDashes = false; + } else if (sc.Match('{','-')) { + sc.SetState(CommentBlockStyleFromNestLevel(hs.nestLevel)); + sc.Forward(2); + hs.nestLevel = 1; } else { sc.Forward(); } } - // New state? - if (sc.state == SCE_HA_DEFAULT) { + // New state? + else if (sc.state == SCE_HA_DEFAULT) { // Digit if (IsADigit(sc.ch)) { + hs.mode = HA_MODE_DEFAULT; + sc.SetState(SCE_HA_NUMBER); if (sc.ch == '0' && (sc.chNext == 'X' || sc.chNext == 'x')) { - // Match anything starting with "0x" or "0X", too - sc.Forward(2); - xmode = 16; + // Match anything starting with "0x" or "0X", too + sc.Forward(2); + base = 16; + dot = false; } else if (sc.ch == '0' && (sc.chNext == 'O' || sc.chNext == 'o')) { - // Match anything starting with "0x" or "0X", too - sc.Forward(2); - xmode = 8; + // Match anything starting with "0o" or "0O", too + sc.Forward(2); + base = 8; + dot = false; } else { - sc.Forward(); - xmode = 10; + sc.Forward(); + base = 10; + dot = true; } - mode = HA_MODE_DEFAULT; } // Pragma else if (sc.Match("{-#")) { + hs.pragma = true; sc.SetState(SCE_HA_PRAGMA); sc.Forward(3); } @@ -323,33 +877,65 @@ static void ColorizeHaskellDoc(unsigned int startPos, int length, int initStyle, else if (sc.Match('-','-')) { sc.SetState(SCE_HA_COMMENTLINE); sc.Forward(2); - xmode = 1; + inDashes = true; } // Comment block else if (sc.Match('{','-')) { - sc.SetState(SCE_HA_COMMENTBLOCK); + sc.SetState(CommentBlockStyleFromNestLevel(hs.nestLevel)); sc.Forward(2); - xmode = 1; + hs.nestLevel = 1; } // String - else if (sc.Match('\"')) { + else if (sc.ch == '\"') { sc.SetState(SCE_HA_STRING); sc.Forward(); } - // Character - else if (sc.Match('\'')) { + // Character or quoted name or promoted term + else if (sc.ch == '\'') { + hs.mode = HA_MODE_DEFAULT; + sc.SetState(SCE_HA_CHARACTER); sc.Forward(); + + if (options.allowQuotes) { + // Quoted type ''T + if (sc.ch=='\'' && IsAHaskellWordStart(sc.chNext)) { + sc.Forward(); + sc.ChangeState(SCE_HA_IDENTIFIER); + } else if (sc.chNext != '\'') { + // Quoted name 'n or promoted constructor 'N + if (IsAHaskellWordStart(sc.ch)) { + sc.ChangeState(SCE_HA_IDENTIFIER); + // Promoted constructor operator ':~> + } else if (sc.ch == ':') { + alreadyInTheMiddleOfOperator = false; + sc.ChangeState(SCE_HA_OPERATOR); + // Promoted list or tuple '[T] + } else if (sc.ch == '[' || sc.ch== '(') { + sc.ChangeState(SCE_HA_OPERATOR); + sc.ForwardSetState(SCE_HA_DEFAULT); + } + } + } } - // Preprocessor - else if (sc.atLineStart && sc.ch == '#') { - mode = HA_MODE_DEFAULT; - sc.SetState(SCE_HA_PREPROCESSOR); - sc.Forward(); + // Operator starting with '?' or an implicit parameter + else if (sc.ch == '?') { + hs.mode = HA_MODE_DEFAULT; + + alreadyInTheMiddleOfOperator = false; + sc.SetState(SCE_HA_OPERATOR); + + if ( options.implicitParams + && IsAHaskellWordStart(sc.chNext) + && !IsHaskellUpperCase(sc.chNext)) { + sc.Forward(); + sc.ChangeState(SCE_HA_IDENTIFIER); + } } // Operator - else if (IsAnOperatorChar(sc.ch)) { - mode = HA_MODE_DEFAULT; + else if (IsAnHaskellOperatorChar(sc.ch)) { + hs.mode = HA_MODE_DEFAULT; + sc.SetState(SCE_HA_OPERATOR); } // Braces and punctuation @@ -358,78 +944,171 @@ static void ColorizeHaskellDoc(unsigned int startPos, int length, int initStyle, || sc.ch == '[' || sc.ch == ']' || sc.ch == '{' || sc.ch == '}') { sc.SetState(SCE_HA_OPERATOR); - sc.Forward(); - sc.SetState(SCE_HA_DEFAULT); + sc.ForwardSetState(SCE_HA_DEFAULT); } // Keyword or Identifier - else if (IsAWordStart(sc.ch)) { - xmode = isupper(sc.ch) ? SCE_HA_CAPITAL : SCE_HA_IDENTIFIER; + else if (IsAHaskellWordStart(sc.ch)) { sc.SetState(SCE_HA_IDENTIFIER); - sc.Forward(); + // Something we don't care about } else { - if (sc.atLineEnd) { - // Remember the line state for future incremental lexing - styler.SetLineState(lineCurrent, (xmode << 4) | mode); - lineCurrent++; - } sc.Forward(); } } + // This branch should never be reached. + else { + assert(false); + sc.Forward(); + } } + styler.SetLineState(lineCurrent, hs.ToLineState()); sc.Complete(); } -// External stuff - used for dynamic-loading, not implemented in wxStyledTextCtrl yet. -// Inspired by the caml external lexer - Credits to Robert Roessler - http://www.rftp.com -#ifdef BUILD_EXTERNAL_LEXER -static const char* LexerName = "haskell"; - -void EXT_LEXER_DECL Lex(unsigned int lexer, unsigned int startPos, int length, int initStyle, - char *words[], WindowID window, char *props) -{ - PropSetSimple ps; - ps.SetMultiple(props); - WindowAccessor wa(window, ps); - - int nWL = 0; - for (; words[nWL]; nWL++) ; - WordList** wl = new WordList* [nWL + 1]; - int i = 0; - for (; i<nWL; i++) - { - wl[i] = new WordList(); - wl[i]->Set(words[i]); +void SCI_METHOD LexerHaskell::Fold(unsigned int startPos, int length, int // initStyle + ,IDocument *pAccess) { + if (!options.fold) + return; + + Accessor styler(pAccess, NULL); + + int lineCurrent = styler.GetLine(startPos); + + if (lineCurrent <= firstImportLine) { + firstImportLine = -1; // readjust first import position + firstImportIndent = 0; } - wl[i] = 0; - ColorizeHaskellDoc(startPos, length, initStyle, wl, wa); - wa.Flush(); - for (i=nWL-1;i>=0;i--) - delete wl[i]; - delete [] wl; -} + const int maxPos = startPos + length; + const int maxLines = + maxPos == styler.Length() + ? styler.GetLine(maxPos) + : styler.GetLine(maxPos - 1); // Requested last line + const int docLines = styler.GetLine(styler.Length()); // Available last line -void EXT_LEXER_DECL Fold (unsigned int lexer, unsigned int startPos, int length, int initStyle, - char *words[], WindowID window, char *props) -{ + // Backtrack to previous non-blank line so we can determine indent level + // for any white space lines + // and so we can fix any preceding fold level (which is why we go back + // at least one line in all cases) + bool importHere = LineContainsImport(lineCurrent, styler); + int indentCurrent = IndentAmountWithOffset(styler, lineCurrent); -} + while (lineCurrent > 0) { + lineCurrent--; + importHere = LineContainsImport(lineCurrent, styler); + indentCurrent = IndentAmountWithOffset(styler, lineCurrent); + if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) + break; + } -int EXT_LEXER_DECL GetLexerCount() -{ - return 1; -} + int indentCurrentLevel = indentCurrent & SC_FOLDLEVELNUMBERMASK; -void EXT_LEXER_DECL GetLexerName(unsigned int Index, char *name, int buflength) -{ - if (buflength > 0) { - buflength--; - int n = strlen(LexerName); - if (n > buflength) - n = buflength; - memcpy(name, LexerName, n), name[n] = '\0'; + if (importHere) { + indentCurrentLevel = IndentLevelRemoveIndentOffset(indentCurrentLevel); + if (firstImportLine == -1) { + firstImportLine = lineCurrent; + firstImportIndent = (1 + indentCurrentLevel) - SC_FOLDLEVELBASE; + } + if (firstImportLine != lineCurrent) { + indentCurrentLevel++; + } } + + indentCurrent = indentCurrentLevel | (indentCurrent & ~SC_FOLDLEVELNUMBERMASK); + + // Process all characters to end of requested range + //that hangs over the end of the range. Cap processing in all cases + // to end of document. + while (lineCurrent <= docLines && lineCurrent <= maxLines) { + + // Gather info + int lineNext = lineCurrent + 1; + importHere = false; + int indentNext = indentCurrent; + + if (lineNext <= docLines) { + // Information about next line is only available if not at end of document + importHere = LineContainsImport(lineNext, styler); + indentNext = IndentAmountWithOffset(styler, lineNext); + } + if (indentNext & SC_FOLDLEVELWHITEFLAG) + indentNext = SC_FOLDLEVELWHITEFLAG | indentCurrentLevel; + + // Skip past any blank lines for next indent level info; we skip also + // comments (all comments, not just those starting in column 0) + // which effectively folds them into surrounding code rather + // than screwing up folding. + + while (lineNext < docLines && (indentNext & SC_FOLDLEVELWHITEFLAG)) { + lineNext++; + importHere = LineContainsImport(lineNext, styler); + indentNext = IndentAmountWithOffset(styler, lineNext); + } + + int indentNextLevel = indentNext & SC_FOLDLEVELNUMBERMASK; + + if (importHere) { + indentNextLevel = IndentLevelRemoveIndentOffset(indentNextLevel); + if (firstImportLine == -1) { + firstImportLine = lineNext; + firstImportIndent = (1 + indentNextLevel) - SC_FOLDLEVELBASE; + } + if (firstImportLine != lineNext) { + indentNextLevel++; + } + } + + indentNext = indentNextLevel | (indentNext & ~SC_FOLDLEVELNUMBERMASK); + + const int levelBeforeComments = Maximum(indentCurrentLevel,indentNextLevel); + + // Now set all the indent levels on the lines we skipped + // Do this from end to start. Once we encounter one line + // which is indented more than the line after the end of + // the comment-block, use the level of the block before + + int skipLine = lineNext; + int skipLevel = indentNextLevel; + + while (--skipLine > lineCurrent) { + int skipLineIndent = IndentAmountWithOffset(styler, skipLine); + + if (options.foldCompact) { + if ((skipLineIndent & SC_FOLDLEVELNUMBERMASK) > indentNextLevel) { + skipLevel = levelBeforeComments; + } + + int whiteFlag = skipLineIndent & SC_FOLDLEVELWHITEFLAG; + + styler.SetLevel(skipLine, skipLevel | whiteFlag); + } else { + if ( (skipLineIndent & SC_FOLDLEVELNUMBERMASK) > indentNextLevel + && !(skipLineIndent & SC_FOLDLEVELWHITEFLAG)) { + skipLevel = levelBeforeComments; + } + + styler.SetLevel(skipLine, skipLevel); + } + } + + int lev = indentCurrent; + + if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) { + if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK)) + lev |= SC_FOLDLEVELHEADERFLAG; + } + + // Set fold level for this line and move to next line + styler.SetLevel(lineCurrent, options.foldCompact ? lev : lev & ~SC_FOLDLEVELWHITEFLAG); + + indentCurrent = indentNext; + indentCurrentLevel = indentNextLevel; + lineCurrent = lineNext; + } + + // NOTE: Cannot set level of last line here because indentCurrent doesn't have + // header flag set; the loop above is crafted to take care of this case! + //styler.SetLevel(lineCurrent, indentCurrent); } -#endif -LexerModule lmHaskell(SCLEX_HASKELL, ColorizeHaskellDoc, "haskell"); +LexerModule lmHaskell(SCLEX_HASKELL, LexerHaskell::LexerFactoryHaskell, "haskell", haskellWordListDesc); +LexerModule lmLiterateHaskell(SCLEX_LITERATEHASKELL, LexerHaskell::LexerFactoryLiterateHaskell, "literatehaskell", haskellWordListDesc); Modified: scintilla/lexers/LexLaTeX.cxx 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -224,7 +224,7 @@ void SCI_METHOD LexerLaTeX::Lex(unsigned int startPos, int length, int initStyle chNext = styler.SafeGetCharAt(i + 1); } else if (chNext == '\r' || chNext == '\n') { styler.ColourTo(i, SCE_L_ERROR); - } else { + } else if (isascii(chNext)) { styler.ColourTo(i + 1, SCE_L_SHORTCMD); if (chNext == '(') { mode = 1; @@ -340,7 +340,7 @@ void SCI_METHOD LexerLaTeX::Lex(unsigned int startPos, int length, int initStyle chNext = styler.SafeGetCharAt(i + 1); } else if (chNext == '\r' || chNext == '\n') { styler.ColourTo(i, SCE_L_ERROR); - } else { + } else if (isascii(chNext)) { if (chNext == ')') { mode = 0; state = SCE_L_DEFAULT; @@ -382,7 +382,7 @@ void SCI_METHOD LexerLaTeX::Lex(unsigned int startPos, int length, int initStyle chNext = styler.SafeGetCharAt(i + 1); } else if (chNext == '\r' || chNext == '\n') { styler.ColourTo(i, SCE_L_ERROR); - } else { + } else if (isascii(chNext)) { if (chNext == ']') { mode = 0; state = SCE_L_DEFAULT; Modified: scintilla/lexers/LexOthers.cxx 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1047,10 +1047,10 @@ static int RecogniseErrorListLine(const char *lineBuffer, unsigned int lengthLin } } else if (state == stCtagsStart) { if ((lineBuffer[i - 1] == '\t') && - ((ch == '/' && lineBuffer[i + 1] == '^') || Is0To9(ch))) { + ((ch == '/' && chNext == '^') || Is0To9(ch))) { state = stCtags; break; - } else if ((ch == '/') && (lineBuffer[i + 1] == '^')) { + } else if ((ch == '/') && (chNext == '^')) { state = stCtagsStartString; } } else if ((state == stCtagsStartString) && ((lineBuffer[i] == '$') && (lineBuffer[i + 1] == '/'))) { Modified: scintilla/lexlib/LexerModule.cxx 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -75,7 +75,7 @@ int LexerModule::GetNumWordLists() const { const char *LexerModule::GetWordListDescription(int index) const { assert(index < GetNumWordLists()); - if (index >= GetNumWordLists()) { + if (!wordListDescriptions || (index >= GetNumWordLists())) { return ""; } else { return wordListDescriptions[index]; Modified: scintilla/lexlib/PropSetSimple.cxx 23 files changed, 7 insertions(+), 16 deletions(-) =================================================================== @@ -141,30 +141,21 @@ static int ExpandAllInPlace(const PropSetSimple &props, std::string &withVars, i return maxExpands; } -char *PropSetSimple::Expanded(const char *key) const { +int PropSetSimple::GetExpanded(const char *key, char *result) const { std::string val = Get(key); ExpandAllInPlace(*this, val, 100, VarChain(key)); - char *ret = new char [val.size() + 1]; - strcpy(ret, val.c_str()); - return ret; -} - -int PropSetSimple::GetExpanded(const char *key, char *result) const { - char *val = Expanded(key); - const int n = static_cast<int>(strlen(val)); + const int n = static_cast<int>(val.size()); if (result) { - strcpy(result, val); + strcpy(result, val.c_str()); } - delete []val; return n; // Not including NUL } int PropSetSimple::GetInt(const char *key, int defaultValue) const { - char *val = Expanded(key); - if (val) { - int retVal = val[0] ? atoi(val) : defaultValue; - delete []val; - return retVal; + std::string val = Get(key); + ExpandAllInPlace(*this, val, 100, VarChain(key)); + if (!val.empty()) { + return atoi(val.c_str()); } return defaultValue; } Modified: scintilla/lexlib/PropSetSimple.h 1 files changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -21,7 +21,6 @@ class PropSetSimple { void Set(const char *key, const char *val, int lenKey=-1, int lenVal=-1); void SetMultiple(const char *); const char *Get(const char *key) const; - char *Expanded(const char *key) const; int GetExpanded(const char *key, char *result) const; int GetInt(const char *key, int defaultValue=0) const; }; Modified: scintilla/lexlib/StyleContext.h 4 files changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -76,7 +76,7 @@ class StyleContext { // End of line? // Trigger on CR only (Mac style) or either on LF from CR+LF (Dos/Win) // or on LF alone (Unix). Avoid triggering two times on Dos/Win. - if (lineStartNext < styler.Length()) + if (currentLine < lineDocEnd) atLineEnd = static_cast<int>(pos) >= (lineStartNext-1); else // Last line atLineEnd = static_cast<int>(pos) >= lineStartNext; @@ -85,6 +85,7 @@ class StyleContext { public: unsigned int currentPos; int currentLine; + int lineDocEnd; int lineStartNext; bool atLineStart; bool atLineEnd; @@ -112,6 +113,7 @@ class StyleContext { lengthDocument = static_cast<unsigned int>(styler.Length()); if (endPos == lengthDocument) endPos++; + lineDocEnd = styler.GetLine(lengthDocument); atLineStart = static_cast<unsigned int>(styler.LineStart(currentLine)) == startPos; unsigned int pos = currentPos; ch = static_cast<unsigned char>(styler.SafeGetCharAt(pos, 0)); Modified: scintilla/lexlib/WordList.cxx 51 files changed, 34 insertions(+), 17 deletions(-) =================================================================== @@ -45,29 +45,37 @@ static char **ArrayFromWordList(char *wordlist, int *len, bool onlyLineEnds = fa prev = curr; } char **keywords = new char *[words + 1]; - if (keywords) { - words = 0; - prev = '\0'; - size_t slen = strlen(wordlist); - for (size_t k = 0; k < slen; k++) { - if (!wordSeparator[static_cast<unsigned char>(wordlist[k])]) { - if (!prev) { - keywords[words] = &wordlist[k]; - words++; - } - } else { - wordlist[k] = '\0'; + words = 0; + prev = '\0'; + size_t slen = strlen(wordlist); + for (size_t k = 0; k < slen; k++) { + if (!wordSeparator[static_cast<unsigned char>(wordlist[k])]) { + if (!prev) { + keywords[words] = &wordlist[k]; + words++; } - prev = wordlist[k]; + } else { + wordlist[k] = '\0'; } - keywords[words] = &wordlist[slen]; - *len = words; - } else { - *len = 0; + prev = wordlist[k]; } + keywords[words] = &wordlist[slen]; + *len = words; return keywords; } +WordList::WordList(bool onlyLineEnds_) : + words(0), list(0), len(0), onlyLineEnds(onlyLineEnds_) { +} + +WordList::~WordList() { + Clear(); +} + +WordList::operator bool() const { + return len ? true : false; +} + bool WordList::operator!=(const WordList &other) const { if (len != other.len) return true; @@ -78,6 +86,10 @@ bool WordList::operator!=(const WordList &other) const { return false; } +int WordList::Length() const { + return len; +} + void WordList::Clear() { if (words) { delete []list; @@ -217,3 +229,8 @@ bool WordList::InListAbbreviated(const char *s, const char marker) const { } return false; } + +const char *WordList::WordAt(int n) const { + return words[n]; +} + Modified: scintilla/lexlib/WordList.h 12 files changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -15,23 +15,23 @@ /** */ class WordList { -public: // Each word contains at least one character - a empty word acts as sentinel at the end. char **words; char *list; int len; bool onlyLineEnds; ///< Delimited by any white space or only line ends int starts[256]; - WordList(bool onlyLineEnds_ = false) : - words(0), list(0), len(0), onlyLineEnds(onlyLineEnds_) - {} - ~WordList() { Clear(); } - operator bool() const { return len ? true : false; } +public: + WordList(bool onlyLineEnds_ = false); + ~WordList(); + operator bool() const; bool operator!=(const WordList &other) const; + int Length() const; void Clear(); void Set(const char *s); bool InList(const char *s) const; bool InListAbbreviated(const char *s, const char marker) const; + const char *WordAt(int n) const; }; #ifdef SCI_NAMESPACE Modified: scintilla/scintilla_changes.patch 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -31,7 +31,7 @@ diff --git b/scintilla/src/Catalogue.cxx a/scintilla/src/Catalogue.cxx index 2f75247..a34f834 100644 +++ scintilla/src/Catalogue.cxx --- scintilla/src/Catalogue.cxx -@@ -81,108 +81,45 @@ int Scintilla_LinkLexers() { +@@ -81,109 +81,45 @@ int Scintilla_LinkLexers() { //++Autogenerated -- run src/LexGen.py to regenerate //**$\tLINK_LEXER(\*);\n$ @@ -82,6 +82,7 @@ index 2f75247..a34f834 100644 - LINK_LEXER(lmKix); LINK_LEXER(lmLatex); LINK_LEXER(lmLISP); +- LINK_LEXER(lmLiterateHaskell); - LINK_LEXER(lmLot); - LINK_LEXER(lmLout); LINK_LEXER(lmLua); Modified: scintilla/src/CallTip.cxx 22 files changed, 9 insertions(+), 13 deletions(-) =================================================================== @@ -7,12 +7,14 @@ #include <stdlib.h> #include <string.h> +#include <stdio.h> + +#include <string> #include "Platform.h" #include "Scintilla.h" #include "CallTip.h" -#include <stdio.h> #ifdef SCI_NAMESPACE using namespace Scintilla; @@ -22,7 +24,6 @@ wCallTip = 0; inCallTipMode = false; posStartCallTip = 0; - val = 0; rectUp = PRectangle(0,0,0,0); rectDown = PRectangle(0,0,0,0); lineHeight = 1; @@ -56,8 +57,6 @@ CallTip::~CallTip() { font.Release(); wCallTip.Destroy(); - delete []val; - val = 0; } // Although this test includes 0, we should never see a \0 character. @@ -176,17 +175,17 @@ int CallTip::PaintContents(Surface *surfaceWindow, bool draw) { // Draw the definition in three parts: before highlight, highlighted, after highlight int ytext = rcClient.top + ascent + 1; rcClient.bottom = ytext + surfaceWindow->Descent(font) + 1; - char *chunkVal = val; + const char *chunkVal = val.c_str(); bool moreChunks = true; int maxWidth = 0; while (moreChunks) { - char *chunkEnd = strchr(chunkVal, '\n'); + const char *chunkEnd = strchr(chunkVal, '\n'); if (chunkEnd == NULL) { chunkEnd = chunkVal + strlen(chunkVal); moreChunks = false; } - int chunkOffset = chunkVal - val; + int chunkOffset = chunkVal - val.c_str(); int chunkLength = chunkEnd - chunkVal; int chunkEndOffset = chunkOffset + chunkLength; int thisStartHighlight = Platform::Maximum(startHighlight, chunkOffset); @@ -215,7 +214,7 @@ int CallTip::PaintContents(Surface *surfaceWindow, bool draw) { } void CallTip::PaintCT(Surface *surfaceWindow) { - if (!val) + if (val.empty()) return; PRectangle rcClientPos = wCallTip.GetClientPosition(); PRectangle rcClientSize(0, 0, rcClientPos.right - rcClientPos.left, @@ -253,10 +252,7 @@ PRectangle CallTip::CallTipStart(int pos, Point pt, int textHeight, const char * int codePage_, int characterSet, int technology, Window &wParent) { clickPlace = 0; - delete []val; - val = 0; - val = new char[strlen(defn) + 1]; - strcpy(val, defn); + val = defn; codePage = codePage_; Surface *surfaceMeasure = Surface::Allocate(technology); if (!surfaceMeasure) @@ -275,7 +271,7 @@ PRectangle CallTip::CallTipStart(int pos, Point pt, int textHeight, const char * // Only support \n here - simply means container must avoid \r! int numLines = 1; const char *newline; - const char *look = val; + const char *look = val.c_str(); rectUp = PRectangle(0,0,0,0); rectDown = PRectangle(0,0,0,0); offsetMain = insetX; // changed to right edge of any arrows Modified: scintilla/src/CallTip.h 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -17,7 +17,7 @@ class CallTip { int startHighlight; // character offset to start and... int endHighlight; // ...end of highlighted text - char *val; + std::string val; Font font; PRectangle rectUp; // rectangle of last up angle in the tip PRectangle rectDown; // rectangle of last down arrow in the tip Modified: scintilla/src/CellBuffer.cxx 24 files changed, 12 insertions(+), 12 deletions(-) =================================================================== @@ -10,6 +10,8 @@ #include <stdlib.h> #include <stdarg.h> +#include <algorithm> + #include "Platform.h" #include "Scintilla.h" @@ -81,11 +83,15 @@ int LineVector::LineFromPosition(int pos) const { Destroy(); } -void Action::Create(actionType at_, int position_, char *data_, int lenData_, bool mayCoalesce_) { +void Action::Create(actionType at_, int position_, const char *data_, int lenData_, bool mayCoalesce_) { delete []data; + data = NULL; position = position_; at = at_; - data = data_; + if (lenData_) { + data = new char[lenData_]; + memcpy(data, data_, lenData_); + } lenData = lenData_; mayCoalesce = mayCoalesce_; } @@ -162,7 +168,7 @@ void UndoHistory::EnsureUndoRoom() { } } -void UndoHistory::AppendAction(actionType at, int position, char *data, int lengthData, +void UndoHistory::AppendAction(actionType at, int position, const char *data, int lengthData, bool &startSequence, bool mayCoalesce) { EnsureUndoRoom(); //Platform::DebugPrintf("%% %d action %d %d %d\n", at, position, lengthData, currentAction); @@ -393,11 +399,7 @@ const char *CellBuffer::InsertString(int position, const char *s, int insertLeng if (collectingUndo) { // Save into the undo/redo stack, but only the characters - not the formatting // This takes up about half load time - data = new char[insertLength]; - for (int i = 0; i < insertLength; i++) { - data[i] = s[i]; - } - uh.AppendAction(insertAction, position, data, insertLength, startSequence); + uh.AppendAction(insertAction, position, s, insertLength, startSequence); } BasicInsertString(position, s, insertLength); @@ -439,10 +441,8 @@ const char *CellBuffer::DeleteChars(int position, int deleteLength, bool &startS if (!readOnly) { if (collectingUndo) { // Save into the undo/redo stack, but only the characters - not the formatting - data = new char[deleteLength]; - for (int i = 0; i < deleteLength; i++) { - data[i] = substance.ValueAt(position + i); - } + // The gap would be moved to position anyway for the deletion so this doesn't cost extra + const char *data = substance.RangePointer(position, deleteLength); uh.AppendAction(removeAction, position, data, deleteLength, startSequence); } Modified: scintilla/src/CellBuffer.h 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -80,7 +80,7 @@ class Action { Action(); ~Action(); - void Create(actionType at_, int position_=0, char *data_=0, int lenData_=0, bool mayCoalesce_=true); + void Create(actionType at_, int position_=0, const char *data_=0, int lenData_=0, bool mayCoalesce_=true); void Destroy(); void Grab(Action *source); }; @@ -105,7 +105,7 @@ class UndoHistory { UndoHistory(); ~UndoHistory(); - void AppendAction(actionType at, int position, char *data, int length, bool &startSequence, bool mayCoalesce=true); + void AppendAction(actionType at, int position, const char *data, int length, bool &startSequence, bool mayCoalesce=true); void BeginUndoAction(); void EndUndoAction(); Modified: scintilla/src/ContractionState.cxx 2 files changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -7,6 +7,8 @@ #include <string.h> +#include <algorithm> + #include "Platform.h" #include "SplitVector.h" Modified: scintilla/src/Decoration.cxx 2 files changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -9,6 +9,8 @@ #include <stdlib.h> #include <stdarg.h> +#include <algorithm> + #include "Platform.h" #include "Scintilla.h" Modified: scintilla/src/Document.cxx 228 files changed, 66 insertions(+), 162 deletions(-) =================================================================== @@ -13,6 +13,7 @@ #include <string> #include <vector> +#include <algorithm> #include "Platform.h" @@ -102,8 +103,6 @@ int LexInterface::LineEndTypesSupported() { useTabs = true; tabIndents = true; backspaceUnindents = false; - watchers = 0; - lenWatchers = 0; matchesValid = false; regex = 0; @@ -122,16 +121,13 @@ int LexInterface::LineEndTypesSupported() { } Document::~Document() { - for (int i = 0; i < lenWatchers; i++) { - watchers[i].watcher->NotifyDeleted(this, watchers[i].userData); + for (std::vector<WatcherWithUserData>::iterator it = watchers.begin(); it != watchers.end(); ++it) { + it->watcher->NotifyDeleted(this, it->userData); } - delete []watchers; for (int j=0; j<ldSize; j++) { delete perLineData[j]; perLineData[j] = 0; } - watchers = 0; - lenWatchers = 0; delete regex; regex = 0; delete pli; @@ -309,9 +305,9 @@ int SCI_METHOD Document::LineEnd(int line) const { } void SCI_METHOD Document::SetErrorStatus(int status) { - // Tell the watchers the lexer has changed. - for (int i = 0; i < lenWatchers; i++) { - watchers[i].watcher->NotifyErrorOccurred(this, watchers[i].userData, status); + // Tell the watchers an error has occurred. + for (std::vector<WatcherWithUserData>::iterator it = watchers.begin(); it != watchers.end(); ++it) { + it->watcher->NotifyErrorOccurred(this, it->userData, status); } } @@ -420,7 +416,7 @@ void Document::GetHighlightDelimiters(HighlightDelimiter &highlightDelimiter, in int lookLine = line; int lookLineLevel = level; int lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; - while ((lookLine > 0) && ((lookLineLevel & SC_FOLDLEVELWHITEFLAG) || + while ((lookLine > 0) && ((lookLineLevel & SC_FOLDLEVELWHITEFLAG) || ((lookLineLevel & SC_FOLDLEVELHEADERFLAG) && (lookLineLevelNum >= (GetLevel(lookLine + 1) & SC_FOLDLEVELNUMBERMASK))))) { lookLineLevel = GetLevel(--lookLine); lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; @@ -453,8 +449,8 @@ void Document::GetHighlightDelimiters(HighlightDelimiter &highlightDelimiter, in } } if (firstChangeableLineBefore == -1) { - for (lookLine = line - 1, lookLineLevel = GetLevel(lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; - lookLine >= beginFoldBlock; + for (lookLine = line - 1, lookLineLevel = GetLevel(lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; + lookLine >= beginFoldBlock; lookLineLevel = GetLevel(--lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK) { if ((lookLineLevel & SC_FOLDLEVELWHITEFLAG) || (lookLineLevelNum > (level & SC_FOLDLEVELNUMBERMASK))) { firstChangeableLineBefore = lookLine; @@ -466,8 +462,8 @@ void Document::GetHighlightDelimiters(HighlightDelimiter &highlightDelimiter, in firstChangeableLineBefore = beginFoldBlock - 1; int firstChangeableLineAfter = -1; - for (lookLine = line + 1, lookLineLevel = GetLevel(lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; - lookLine <= endFoldBlock; + for (lookLine = line + 1, lookLineLevel = GetLevel(lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK; + lookLine <= endFoldBlock; lookLineLevel = GetLevel(++lookLine), lookLineLevelNum = lookLineLevel & SC_FOLDLEVELNUMBERMASK) { if ((lookLineLevel & SC_FOLDLEVELHEADERFLAG) && (lookLineLevelNum < (GetLevel(lookLine + 1) & SC_FOLDLEVELNUMBERMASK))) { firstChangeableLineAfter = lookLine; @@ -715,7 +711,7 @@ bool SCI_METHOD Document::IsDBCSLeadByte(char ch) const { // Shift_jis return ((uch >= 0x81) && (uch <= 0x9F)) || ((uch >= 0xE0) && (uch <= 0xFC)); - // Lead bytes F0 to FC may be a Microsoft addition. + // Lead bytes F0 to FC may be a Microsoft addition. case 936: // GBK return (uch >= 0x81) && (uch <= 0xFE); @@ -892,7 +888,7 @@ void * SCI_METHOD Document::ConvertToDocument() { int Document::Undo() { int newPos = -1; CheckReadOnly(); - if (enteredModification == 0) { + if ((enteredModification == 0) && (cb.IsCollectingUndo())) { enteredModification++; if (!cb.IsReadOnly()) { bool startSavePoint = cb.IsSavePoint(); @@ -977,7 +973,7 @@ int Document::Undo() { int Document::Redo() { int newPos = -1; CheckReadOnly(); - if (enteredModification == 0) { + if ((enteredModification == 0) && (cb.IsCollectingUndo())) { enteredModification++; if (!cb.IsReadOnly()) { bool startSavePoint = cb.IsSavePoint(); @@ -1050,11 +1046,6 @@ bool Document::InsertCString(int position, const char *s) { return InsertString(position, s, static_cast<int>(s ? strlen(s) : 0)); } -void Document::ChangeChar(int pos, char ch) { - DeleteChars(pos, 1); - InsertChar(pos, ch); -} - void Document::DelChar(int pos) { DeleteChars(pos, LenChar(pos)); } @@ -1212,32 +1203,25 @@ void Document::Indent(bool forwards, int lineBottom, int lineTop) { // Convert line endings for a piece of text to a particular mode. // Stop at len or when a NUL is found. -// Caller must delete the returned pointer. -char *Document::TransformLineEnds(int *pLenOut, const char *s, size_t len, int eolModeWanted) { - char *dest = new char[2 * len + 1]; - const char *sptr = s; - char *dptr = dest; - for (size_t i = 0; (i < len) && (*sptr != '\0'); i++) { - if (*sptr == '\n' || *sptr == '\r') { +std::string Document::TransformLineEnds(const char *s, size_t len, int eolModeWanted) { + std::string dest; + for (size_t i = 0; (i < len) && (s[i]); i++) { + if@@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 55fe6d: Updated Hebrew translation
by Yosef Or Boczko 21 May '13

21 May '13

Branch: refs/heads/master Author: Yosef Or Boczko <yosefor3(a)walla.com> Committer: Frank Lanitz <flanitz(a)bgc-jena.mpg.de> Date: Tue, 21 May 2013 07:11:13 UTC Commit: 55fe6d8b6611d40d84ce0abca2921cd14182c63b https://github.com/geany/geany/commit/55fe6d8b6611d40d84ce0abca2921cd14182c… Log Message: ----------- Updated Hebrew translation Signed-off-by: Frank Lanitz <flanitz(a)bgc-jena.mpg.de> Modified Paths: -------------- po/he.po Modified: po/he.po 985 files changed, 502 insertions(+), 483 deletions(-) =================================================================== @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Geany 1.23\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-27 02:36+0000\n" -"PO-Revision-Date: 2013-04-27 23:42+0300\n" +"POT-Creation-Date: 2013-05-20 02:36+0000\n" +"PO-Revision-Date: 2013-05-21 00:42+0300\n" "Last-Translator: Yosef Or Botschko <yosefor3(a)walla.com>\n" "Language-Team: Hebrew <>\n" "Language: he\n" @@ -124,7 +124,7 @@ msgstr "<b>כיבוי</b>" #: ../data/geany.glade.h:24 msgid "<b>Sidebar</b>" -msgstr "<b>סרגל צידי</b>" +msgstr "<b>סרגל צדי</b>" #: ../data/geany.glade.h:25 msgid "<b>Startup</b>" @@ -132,7 +132,7 @@ msgstr "<b>אתחול</b>" #: ../data/geany.glade.h:26 msgid "<b>Tab positions</b>" -msgstr "<b>מיקום הכרטיסיות</b>" +msgstr "<b>מיקום הלשוניות</b>" #: ../data/geany.glade.h:27 msgid "<b>Template data</b>" @@ -213,9 +213,7 @@ msgstr "חיפוש חוזר בהגעה לסוף המסמך" #: ../data/geany.glade.h:44 msgid "Always wrap search around the document" -msgstr "" -"מאפשר התחלה מחודשת של החיפוש, מתחילת הדף, לאחר שהחיפוש הסתיים והגיע לסוף " -"המסמך." +msgstr "מאפשר חיפוש חוזר מתחילת הדף, לאחר שהחיפוש הסתיים והגיע לסוף המסמך" #: ../data/geany.glade.h:45 msgid "Apply the default indentation settings to all documents" @@ -263,7 +261,7 @@ msgid "" "variables, ...)" msgstr "" "השלמה אוטומטית של הסמלים הידועים בקבצים פתוחים (פונקציות, משתנים גלובליים, " -"הגדרות פונקציות וכד')." +"הגדרות פונקציות וכד')" #: ../data/geany.glade.h:56 msgid "Automatic continuation of multi-line comments" @@ -304,7 +302,7 @@ msgstr "השמעת צפצוף בסיום הידור ובהצגת שגיאות" #: ../data/geany.glade.h:64 msgid "Bottom" -msgstr "למטה" +msgstr "מטה" #: ../data/geany.glade.h:65 msgid "Browser:" @@ -327,12 +325,12 @@ msgid "Calls the View->Toggle All Additional Widgets command" msgstr "'תצוגה -> הצגה או הסתרת היישומונים' מציגה שוב את כל היישומונים" #: ../data/geany.glade.h:70 -msgid "Change _Color Scheme" -msgstr "שינוי ער_כת צבעים" +msgid "Change _Color Scheme..." +msgstr "שינוי ער_כת צבעים..." #: ../data/geany.glade.h:71 -msgid "Change _Font" -msgstr "שינוי גו_פן" +msgid "Change _Font..." +msgstr "שינוי גו_פן..." #: ../data/geany.glade.h:72 msgid "Characters to type for autocompletion:" @@ -417,8 +415,8 @@ msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" msgstr "" -"המשך הערה מרובת שורות באופן אוטומטיבשפות ‎כמו C ו־Java, כאשר השורה החדשה " -"מוזחת אוטומטית." +"המשך הערה מרובת שורות באופן אוטומטי בשפות ‎דוגמת C ו־Java, כאשר השורה החדשה " +"מוזחת אוטומטית" #: ../data/geany.glade.h:92 msgid "Convert and Set to CR (_Mac)" @@ -563,7 +561,7 @@ msgstr "גרשיים \" \"" #: ../data/geany.glade.h:125 msgid "Double-clicking hides all additional widgets" -msgstr "לחיצה כפולה על כרטיסייה מסתירה את כל היישומונים" +msgstr "הסתרת כל היישומונים בלחיצה כפולה על לשונית" #: ../data/geany.glade.h:126 msgid "Drop rest of word on completion" @@ -599,7 +597,7 @@ msgstr "הוספת שורה חדשה בסוף קובץ" #: ../data/geany.glade.h:134 msgid "Ensures that at the end of the file is a new line" -msgstr "מוודא שקיימת שורה ריקה בסוף מסמך" +msgstr "מוודא שקיימת שורה ריקה בסוף קובץ" #: ../data/geany.glade.h:135 msgid "" @@ -625,17 +623,17 @@ msgstr "סוגי קבצים:" #: ../data/geany.glade.h:140 msgid "File tabs will be placed on the left of the notebook" -msgstr "כרטיסיות קבצים חדשים תוצבנה מימין לכרטיסיות הפתוחות" +msgstr "לשוניות קבצים חדשים תוצבנה מימין ללשוניות הפתוחות" #: ../data/geany.glade.h:141 msgid "File tabs will be placed on the right of the notebook" -msgstr "כרטיסיות קבצים חדשים תוצבנה משמאל לכרטיסיות הפתוחות" +msgstr "לשוניות קבצים חדשים תוצבנה משמאל ללשוניות הפתוחות" #: ../data/geany.glade.h:142 ../src/plugins.c:1458 ../src/project.c:153 msgid "Filename:" msgstr "שם קובץ:" -#: ../data/geany.glade.h:143 ../src/prefs.c:1593 ../src/symbols.c:684 +#: ../data/geany.glade.h:143 ../src/prefs.c:1593 ../src/symbols.c:691 #: ../plugins/filebrowser.c:1119 msgid "Files" msgstr "קבצים" @@ -648,7 +646,7 @@ msgstr "מעבר לבחירה ה_באה" msgid "Find Pre_vious Selection" msgstr "מעבר לבחירה ה_קודמת" -#: ../data/geany.glade.h:146 ../src/symbols.c:2385 +#: ../data/geany.glade.h:146 ../src/symbols.c:2392 msgid "Find _Document Usage" msgstr "חיפוש _מספר המופעים במסמך" @@ -660,20 +658,20 @@ msgstr "חיפוש ה_בא" msgid "Find _Previous" msgstr "חיפוש ה_קודם" -#: ../data/geany.glade.h:149 ../src/symbols.c:2380 +#: ../data/geany.glade.h:149 ../src/symbols.c:2387 msgid "Find _Usage" msgstr "חיפוש _מספר המופעים" -#: ../data/geany.glade.h:150 ../src/symbols.c:2390 -msgid "Find in F_iles" -msgstr "חיפוש ב_קובץ" +#: ../data/geany.glade.h:150 ../src/symbols.c:2397 +msgid "Find in F_iles..." +msgstr "חיפוש ב_קובץ..." #: ../data/geany.glade.h:151 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 "" -"כאשר אפשרות זו מופעלת, אם קופל או נפתח קטע קוד, כל הקוד שבתוכו יקופל/יפתח" +"כאשר אפשרות זו מופעלת, אם קופל או נפתח קטע קוד, כל הקוד שבתוכו יקופל/יפתח." #: ../data/geany.glade.h:152 msgid "Fold/unfold all children of a fold point" @@ -852,8 +850,8 @@ msgid "Line wrapping" msgstr "גלישת שורות" #: ../data/geany.glade.h:193 -msgid "Load Ta_gs" -msgstr "טעינת _תגיות" +msgid "Load Ta_gs..." +msgstr "טעינת _תגיות..." #: ../data/geany.glade.h:194 msgid "Load files from the last session" @@ -924,7 +922,7 @@ msgstr "ה_ודעה הבאה" #: ../data/geany.glade.h:209 msgid "Next to current" -msgstr "לצד הכרטיסייה הנוכחית" +msgstr "לצד הלשונית הנוכחית" #: ../data/geany.glade.h:210 ../src/filetypes.c:102 ../src/filetypes.c:1789 msgid "None" @@ -940,7 +938,7 @@ msgstr "" #: ../data/geany.glade.h:212 msgid "Notebook tabs" -msgstr "כרטיסיות" +msgstr "לשוניות" #: ../data/geany.glade.h:213 msgid "Only for rectangular selections" @@ -1006,7 +1004,7 @@ msgstr "נתיב הפקודה להדפסת קבצים ‏(השתמש במחרו #: ../data/geany.glade.h:228 msgid "Placement of new file tabs:" -msgstr "מיקום פתיחת כרטיסיות קבצים חדשים:" +msgstr "מיקום פתיחת לשוניות קבצים חדשים:" #: ../data/geany.glade.h:229 msgid "Position:" @@ -1028,7 +1026,7 @@ msgstr "העדפות" msgid "" "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" msgstr "" -"מאפשר הזחה באמצעות לחיצה על Tab והפחתת רמת הזחה באמצעות לחיצה על Shift + Tab." +"מאפשר הזחה באמצעות לחיצה על Tab והפחתת רמת הזחה באמצעות לחיצה על Shift + Tab" #: ../data/geany.glade.h:234 ../src/printing.c:234 msgid "Print line numbers" @@ -1096,16 +1094,15 @@ msgstr "הסרת הדג_שות" msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." -msgstr "" -"הסרת כל ההודעות משורת המצב. ההודעות עדיין תוצגנה בכרטיסיית הודעות המצב." +msgstr "הסרת כל ההודעות משורת המצב. ההודעות עדיין תוצגנה בלשונית הודעות המצב." #: ../data/geany.glade.h:250 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "מסיר רווחים והזחות הנמצאים בסופי שורות" #: ../data/geany.glade.h:251 -msgid "Replace Spaces b_y Tabs" -msgstr "החלפת רווחים בטא_בים" +msgid "Replace Spaces b_y Tabs..." +msgstr "החלפת רווחים בטא_בים..." #: ../data/geany.glade.h:252 ../src/keybindings.c:570 msgid "Replace tabs by space" @@ -1116,8 +1113,8 @@ msgid "Replaces all tabs in document by spaces" msgstr "החלפת כל הטאבים במסמך ברווחים" #: ../data/geany.glade.h:254 -msgid "Report a _Bug" -msgstr "דווח על _תקלה" +msgid "Report a _Bug..." +msgstr "דיווח על _תקלה..." #: ../data/geany.glade.h:255 msgid "Right" @@ -1140,229 +1137,233 @@ msgid "Save A_ll" msgstr "שמירת ה_כל" #: ../data/geany.glade.h:259 +msgid "Save _As..." +msgstr "שמירה _בשם..." + +#: ../data/geany.glade.h:260 msgid "Save window position and geometry" msgstr "שמירת מיקום החלון ותכונותיו הגאומטריות" -#: ../data/geany.glade.h:260 +#: ../data/geany.glade.h:261 msgid "Saves the window position and geometry and restores it at the start" msgstr "שומר את מיקום החלון ותכונותיו הגיאומטריות ומשחזרם בהפעלה הבאה" -#: ../data/geany.glade.h:261 +#: ../data/geany.glade.h:262 msgid "Scribble" msgstr "הערות" -#: ../data/geany.glade.h:262 +#: ../data/geany.glade.h:263 msgid "Scroll on keystroke" msgstr "גלילה לסוף בלחיצת מקש" -#: ../data/geany.glade.h:263 +#: ../data/geany.glade.h:264 msgid "Scroll on output" msgstr "גלילה לסוף עם קבלת פלט" -#: ../data/geany.glade.h:264 +#: ../data/geany.glade.h:265 msgid "Scrollback lines:" msgstr "קווי גלילה:" -#: ../data/geany.glade.h:265 +#: ../data/geany.glade.h:266 msgid "Set File_type" msgstr "הגדרת סוג הקו_בץ" -#: ../data/geany.glade.h:266 +#: ../data/geany.glade.h:267 msgid "Set Line E_ndings" msgstr "הגדרת סוג תו סיו_ם־שורה" -#: ../data/geany.glade.h:267 +#: ../data/geany.glade.h:268 msgid "Set _Encoding" msgstr "הגדרת _קידוד" -#: ../data/geany.glade.h:268 +#: ../data/geany.glade.h:269 msgid "Sets the background color of the text in the terminal widget" -msgstr "קובע את צבע רקע הטקסט של מדמה המסוף" +msgstr "מגדיר את צבע רקע הטקסט של מדמה המסוף" -#: ../data/geany.glade.h:269 +#: ../data/geany.glade.h:270 msgid "Sets the color of the long line marker" msgstr "מגדיר צבע לסימון שורה ארוכה" -#: ../data/geany.glade.h:270 +#: ../data/geany.glade.h:271 msgid "Sets the default encoding for newly created files" -msgstr "קובע את קידוד ברירת המחדל לקבצים שנוצרים על ידי Geany" +msgstr "מגדיר את קידוד ברירת המחדל לקבצים שנוצרים על ידי Geany" -#: ../data/geany.glade.h:271 +#: ../data/geany.glade.h:272 msgid "Sets the default encoding for opening existing non-Unicode files" -msgstr "קובע את קידוד ברירת המחדל לקבצים קיימים שאינם בקידוד יוניקוד" +msgstr "מגדיר את קידוד ברירת המחדל לקבצים קיימים שאינם בקידוד יוניקוד" -#: ../data/geany.glade.h:272 +#: ../data/geany.glade.h:273 msgid "Sets the editor font" -msgstr "קובע את גופן העורך" +msgstr "מגדיר את גופן העורך" -#: ../data/geany.glade.h:273 +#: ../data/geany.glade.h:274 msgid "Sets the font for the message window" -msgstr "קובע את גופן חלון ההודעות" +msgstr "מגדיר את גופן חלון ההודעות" -#: ../data/geany.glade.h:274 +#: ../data/geany.glade.h:275 msgid "Sets the font for the symbol list" -msgstr "קובע את גופן רשימת הסמלים" +msgstr "מגדיר את גופן רשימת הסמלים" -#: ../data/geany.glade.h:275 +#: ../data/geany.glade.h:276 msgid "Sets the font for the terminal widget" -msgstr "קובע את גופן מדמה המסוף" +msgstr "מגדיר את גופן מדמה המסוף" -#: ../data/geany.glade.h:276 +#: ../data/geany.glade.h:277 msgid "Sets the foreground color of the text in the terminal widget" -msgstr "קובע את צבע החזית של טקסט מדמה המסוף" +msgstr "מגדיר את צבע החזית של טקסט מדמה המסוף" -#: ../data/geany.glade.h:277 +#: ../data/geany.glade.h:278 msgid "Sets the path to the background image in the terminal widget" -msgstr "קובע את תמונת רקע הטקסט של מדמה המסוף" +msgstr "מגדיר את תמונת רקע הטקסט של מדמה המסוף" -#: ../data/geany.glade.h:278 +#: ../data/geany.glade.h:279 msgid "" "Sets the path to the shell which should be started inside the terminal " "emulation" msgstr "מגדיר את מיקום המעטפת במערכת" -#: ../data/geany.glade.h:279 +#: ../data/geany.glade.h:280 msgid "Shell:" msgstr "מעטפת:" -#: ../data/geany.glade.h:280 +#: ../data/geany.glade.h:281 msgid "Show Line _Endings" msgstr "הצגת תו סיום שו_רה" -#: ../data/geany.glade.h:281 +#: ../data/geany.glade.h:282 msgid "Show Message _Window" msgstr "הצגת _חלון ההודעות" -#: ../data/geany.glade.h:282 +#: ../data/geany.glade.h:283 msgid "Show Side_bar" -msgstr "הצגת הסרגל ה_צידי" +msgstr "הצגת הסרגל ה_צדי" -#: ../data/geany.glade.h:283 +#: ../data/geany.glade.h:284 msgid "Show _Indentation Guides" msgstr "הצגת ה_זחה" -#: ../data/geany.glade.h:284 +#: ../data/geany.glade.h:285 msgid "Show _Line Numbers" msgstr "הצגת מספור _שורות" -#: ../data/geany.glade.h:285 +#: ../data/geany.glade.h:286 msgid "Show _Markers Margin" msgstr "הצגת שוליים צרים לצד _מספור השורות" -#: ../data/geany.glade.h:286 +#: ../data/geany.glade.h:287 msgid "Show _Toolbar" msgstr "הצגת _סרגל הכלים" -#: ../data/geany.glade.h:287 +#: ../data/geany.glade.h:288 msgid "Show _White Space" msgstr "הצגת רוו_חים לבנים" -#: ../data/geany.glade.h:288 +#: ../data/geany.glade.h:289 msgid "Show close buttons" msgstr "הצגת כפתורי סגירה" -#: ../data/geany.glade.h:289 +#: ../data/geany.glade.h:290 msgid "Show documents list" msgstr "הצגת רשימת המסמכים" -#: ../data/geany.glade.h:290 +#: ../data/geany.glade.h:291 msgid "Show editor tabs" msgstr "הצגת לשוניות העורך" -#: ../data/geany.glade.h:291 +#: ../data/geany.glade.h:292 msgid "Show indentation guides" msgstr "הצגת הזחה" -#: ../data/geany.glade.h:292 +#: ../data/geany.glade.h:293 msgid "Show line endings" msgstr "הצגת תווי סוף־שורה" -#: ../data/geany.glade.h:293 +#: ../data/geany.glade.h:294 msgid "Show line numbers" msgstr "הצגת מספור שורות" -#: ../data/geany.glade.h:294 +#: ../data/geany.glade.h:295 msgid "Show markers margin" msgstr "הצגת שוליים צרים לצד מספור השורות" -#: ../data/geany.glade.h:295 +#: ../data/geany.glade.h:296 msgid "Show sidebar" -msgstr "הצגת הסרגל הצידי" +msgstr "הצגת הסרגל הצדי" -#: ../data/geany.glade.h:296 +#: ../data/geany.glade.h:297 msgid "Show status bar" msgstr "הצגת שורת המצב" -#: ../data/geany.glade.h:297 +#: ../data/geany.glade.h:298 msgid "Show symbol list" msgstr "הצגת רשימת הסמלים" -#: ../data/geany.glade.h:298 +#: ../data/geany.glade.h:299 msgid "Show t_oolbar" msgstr "הצגת סרגל ה_כלים" -#: ../data/geany.glade.h:299 +#: ../data/geany.glade.h:300 msgid "Show white space" msgstr "הצגת רווחים לבנים" -#: ../data/geany.glade.h:300 +#: ../data/geany.glade.h:301 msgid "Shows a confirmation dialog on exit" msgstr "מציג דו־שיח לאישור יציאה" -#: ../data/geany.glade.h:301 +#: ../data/geany.glade.h:302 msgid "" "Shows a small cross button in the file tabs to easily close files when " "clicking on it (requires restart of Geany)" msgstr "מציג כפתור X קטן המאפשר לסגור קבצים בקלות על־ידי לחיצה עליו" -#: ../data/geany.glade.h:302 +#: ../data/geany.glade.h:303 msgid "Shows or hides the Line Number margin" msgstr "הצגה או הסתרה של מספור השורות" -#: ../data/geany.glade.h:303 +#: ../data/geany.glade.h:304 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines" msgstr "מציג או מסתיר שוליים צרים לצד מספור השורות" -#: ../data/geany.glade.h:304 +#: ../data/geany.glade.h:305 msgid "Shows small dotted lines to help you to use the right indentation" msgstr "מציג קווים אנכיים בכדי להראות את רוחב ההזחה בכל שורה" -#: ../data/geany.glade.h:305 +#: ../data/geany.glade.h:306 msgid "Shows the line ending character" msgstr "מציג תווי סיום שורה בסוף כל שורה" -#: ../data/geany.glade.h:306 +#: ../data/geany.glade.h:307 msgid "Sidebar:" -msgstr "סרגל צידי:" +msgstr "סרגל צדי:" -#: ../data/geany.glade.h:307 +#: ../data/geany.glade.h:308 msgid "Single quotes ' '" msgstr "גרש ' '" -#: ../data/geany.glade.h:308 +#: ../data/geany.glade.h:309 msgid "Snippet completion" msgstr "השלמת קוד" -#: ../data/geany.glade.h:309 +#: ../data/geany.glade.h:310 msgid "" "Space separated list of file patterns used for the find in files dialog (e." "g. *.c *.h)" msgstr "רשימת סוגי הקבצים המשמשים את דו־שיח מציאת הקבצים (לדוגמה: ‎*.c *.h)" -#: ../data/geany.glade.h:310 +#: ../data/geany.glade.h:311 msgid "" "Specifies the history in lines, which you can scroll back in the terminal " "widget" msgstr "" "מציין את מספר השורות שתשמרנה בהיסטוריה, כך שיהיה ניתן לגלול חזרה במדמה המסוף" -#: ../data/geany.glade.h:311 +#: ../data/geany.glade.h:312 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "מציין את מספר הקבצים שמאוחסנים ברשימת הקבצים האחרונים שנפתחו" -#: ../data/geany.glade.h:312 ../src/printing.c:276 +#: ../data/geany.glade.h:313 ../src/printing.c:276 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 " @@ -1371,7 +1372,7 @@ msgstr "" "ציין תבנית עבור תווים כלליים לציון תאריך. ניתן להשתמש בכל תווי ההמרה אשר " "ניתן להשתמש בפונקציית strftime לפי תקן ANSI C." -#: ../data/geany.glade.h:313 +#: ../data/geany.glade.h:314 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." @@ -1379,7 +1380,7 @@ msgstr "" "ציין תבנית עבור תווים כלליים לציון תאריך ושעה. ניתן להשתמש בכל תווי ההמרה " "אשר ניתן להשתמש בפונקציית strftime לפי תקן ANSI C." -#: ../data/geany.glade.h:314 +#: ../data/geany.glade.h:315 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." @@ -1387,7 +1388,7 @@ msgstr "" "ציין תבנית עבור תווים כלליים לציון תאריך. ניתן להשתמש בכל תווי ההמרה אשר " "ניתן להשתמש בפונקציית strftime לפי תקן ANSI C." -#: ../data/geany.glade.h:315 +#: ../data/geany.glade.h:316 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." @@ -1395,116 +1396,116 @@ msgstr "" "ציין תבנית עבור תווים כלליים לציון שנה. ניתן להשתמש בכל תווי ההמרה אשר ניתן " "להשתמש בפונקציית strftime לפי תקן ANSI C." -#: ../data/geany.glade.h:316 +#: ../data/geany.glade.h:317 msgid "Square brackets [ ]" msgstr "סוגריים מרובעים [ ]" -#: ../data/geany.glade.h:317 +#: ../data/geany.glade.h:318 msgid "Start a new file for each command-line filename that doesn't exist" -msgstr "אם ליצור מסמכים חדשים, כאשר נשלחים משורת הפקודה קבצים שאינם קיימים." +msgstr "אם ליצור מסמכים חדשים, כאשר נשלחים משורת הפקודה קבצים שאינם קיימים" -#: ../data/geany.glade.h:318 +#: ../data/geany.glade.h:319 msgid "Startup" msgstr "אתחול" -#: ../data/geany.glade.h:319 +#: ../data/geany.glade.h:320 msgid "Startup path:" msgstr "נתיב הפעלה:" -#: ../data/geany.glade.h:320 +#: ../data/geany.glade.h:321 msgid "Status" msgstr "מצבים" -#: ../data/geany.glade.h:321 +#: ../data/geany.glade.h:322 msgid "Stop scrolling at last line" msgstr "עצירת הגלילה בשורה האחרונה" -#: ../data/geany.glade.h:322 +#: ../data/geany.glade.h:323 msgid "Store project file inside the project base directory" msgstr "אחסון קָבְצי המיזם בתיקיית המיזם הבסיסית" -#: ../data/geany.glade.h:323 +#: ../data/geany.glade.h:324 msgid "Strip trailing spaces and tabs" msgstr "הסרת רווחים והזחות מיותרים" -#: ../data/geany.glade.h:324 +#: ../data/geany.glade.h:325 msgid "Suppress status messages in the status bar" msgstr "הסתרת הודעות־מצב בשורת המצב" -#: ../data/geany.glade.h:325 +#: ../data/geany.glade.h:326 msgid "Switch to last used document after closing a tab" -msgstr "לאחר סגירת לשונית, עבור למסמך האחרון שנצפה" +msgstr "מעבר למסמך האחרון שנצפה לאחר סגירת לשונית" -#: ../data/geany.glade.h:326 +#: ../data/geany.glade.h:327 msgid "Switch to status message list at new message" msgstr "מעבר לרשימת ההודעות בעת קבלת הודעת־מצב חדשה" -#: ../data/geany.glade.h:327 +#: ../data/geany.glade.h:328 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives" msgstr "" -"מעבר אל כרטיסיית הודעות המצב (בחלון הכרטיסיות שבתחתית החלון הראשי) כאשר " -"מתקבלת הודעת־מצב חדשה" +"מעבר אל לשונית הודעות המצב (בחלון הלשוניות שבתחתית החלון הראשי) כאשר מתקבלת " +"הודעת־מצב חדשה" -#: ../data/geany.glade.h:328 +#: ../data/geany.glade.h:329 msgid "Symbol list update frequency:" msgstr "תדירות עדכון רשימת הסמלים:" -#: ../data/geany.glade.h:329 +#: ../data/geany.glade.h:330 msgid "Symbol list:" msgstr "רשימת סמלים:" -#: ../data/geany.glade.h:330 ../src/sidebar.c:124 +#: ../data/geany.glade.h:331 ../src/sidebar.c:124 msgid "Symbols" msgstr "סמלים" -#: ../data/geany.glade.h:331 +#: ../data/geany.glade.h:332 msgid "System _default" msgstr "ברירת המח_דל של המערכת" -#: ../data/geany.glade.h:332 +#: ../data/geany.glade.h:333 msgid "T_abs and Spaces" msgstr "טאבים ורוו_חים" -#: ../data/geany.glade.h:333 +#: ../data/geany.glade.h:334 msgid "T_abs and spaces" msgstr "טאבים ורוו_חים" -#: ../data/geany.glade.h:334 ../src/keybindings.c:374 +#: ../data/geany.glade.h:335 ../src/keybindings.c:374 msgid "T_oggle Case of Selection" msgstr "שינוי הטקסט הנוכחי לאותיות ק_טנות" -#: ../data/geany.glade.h:335 +#: ../data/geany.glade.h:336 msgid "Tab key indents" msgstr "הזחה באמצעות מקש טאב" -#: ../data/geany.glade.h:336 ../src/prefs.c:1597 +#: ../data/geany.glade.h:337 ../src/prefs.c:1597 msgid "Templates" msgstr "תבניות" -#: ../data/geany.glade.h:337 ../src/prefs.c:1605 ../src/vte.c:298 +#: ../data/geany.glade.h:338 ../src/prefs.c:1605 ../src/vte.c:298 msgid "Terminal" msgstr "מסוף" -#: ../data/geany.glade.h:338 +#: ../data/geany.glade.h:339 msgid "Terminal:" msgstr "מדמה מסוף:" -#: ../data/geany.glade.h:339 +#: ../data/geany.glade.h:340 msgid "" "The amount of characters which are necessary to show the symbol " "autocompletion list" msgstr "מספר התווים המזערי הנחוץ בכדי להציג רשימת השלמה אוטומטית" -#: ../data/geany.glade.h:340 +#: ../data/geany.glade.h:341 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 "צבע הרקע של התווים לאחר מיקום שבירת השורה" -#: ../data/geany.glade.h:341 +#: ../data/geany.glade.h:342 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 " @@ -1513,15 +1514,15 @@ msgstr "" "קו אנכי דק בעורך משמש להצגת שורה ארוכה, או רמז לשבירת שורה. קבע ערך זה לגדול " "מאפס בכדי לציין את מיקום העמודה בו הוא אמור להופיע" -#: ../data/geany.glade.h:342 +#: ../data/geany.glade.h:343 msgid "The name of the developer" msgstr "שם המפתח" -#: ../data/geany.glade.h:343 +#: ../data/geany.glade.h:344 msgid "The width in chars of a single indent" msgstr "רוחב (בתווים) של הזחה אחת" -#: ../data/geany.glade.h:344 +#: ../data/geany.glade.h:345 msgid "" "This option disables the automatic detection of the file encoding when " "opening non-Unicode files and opens the file with the specified encoding " @@ -1530,121 +1531,121 @@ msgstr "" "אפשרות זו מבטלת זיהוי אוטומטי של קידוד קובץ שאינו בקידוד יוניקוד ופותחת את " "הקובץ בקידוד שצוין (ראה להלן)." -#: ../data/geany.glade.h:345 +#: ../data/geany.glade.h:346 msgid "" "This option disables the keybinding to popup the menu bar (default is F10). " "Disabling it can be useful if you use, for example, Midnight Commander " "within the VTE." msgstr "אפשרות זו מבטלת את צירוף־המקש להצגת התפריט קופץ (F10 בברירת מחדל)" -#: ../data/geany.glade.h:346 +#: ../data/geany.glade.h:347 msgid "To_ggle All Additional Widgets" msgstr "ה_צגה או הסתרת היישומונים" -#: ../data/geany.glade.h:347 +#: ../data/geany.glade.h:348 msgid "Toggle the documents list on and off" msgstr "הצגה או הסתרה של רשימת המסמכים" -#: ../data/geany.glade.h:348 +#: ../data/geany.glade.h:349 msgid "Toggle the symbol list on and off" msgstr "הצגה או הסתרה של רשימת הסמלים" -#: ../data/geany.glade.h:349 ../src/prefs.c:1589 +#: ../data/geany.glade.h:350 ../src/prefs.c:1589 msgid "Toolbar" msgstr "סרגל הכלים" -#: ../data/geany.glade.h:350 ../src/keybindings.c:240 ../src/prefs.c:1595 +#: ../data/geany.glade.h:351 ../src/keybindings.c:240 ../src/prefs.c:1595 msgid "Tools" msgstr "כלים" -#: ../data/geany.glade.h:351 +#: ../data/geany.glade.h:352 msgid "Top" msgstr "למעלה" -#: ../data/geany.glade.h:352 +#: ../data/geany.glade.h:353 msgid "" "Type a defined short character sequence and complete it to a more complex " "string using a single keypress" msgstr "" "מאפשר הקלדת רצף תווים קצר ומוגדר ולהשלים אותו באמצעות לחיצה על מקש מסוים" -#: ../data/geany.glade.h:353 +#: ../data/geany.glade.h:354 msgid "Type:" msgstr "סוג:" -#: ../data/geany.glade.h:354 +#: ../data/geany.glade.h:355 msgid "U_ncomment Line(s)" msgstr "הסרת הער_ת שורה" -#: ../data/geany.glade.h:355 +#: ../data/geany.glade.h:356 msgid "Use Windows File Open/Save dialogs" msgstr "שימוש בסייר הקבצים של חלונות לפתיחה ולשמירת קבצים" -#: ../data/geany.glade.h:356 +#: ../data/geany.glade.h:357 msgid "Use an external command for printing" msgstr "השתמש בפקודה חיצונית להדפסה" -#: ../data/geany.glade.h:357 +#: ../data/geany.glade.h:358 msgid "" "Use current word under the cursor when opening the Find, Find in Files or " "Replace dialog and there is no selection" msgstr "" "משתמש במילה הנמצאת תחת הסמן בתיבת דו־שיח לחיפוש, חיפוש בקובץ וחיפוש והחלפה" -#: ../data/geany.glade.h:358 +#: ../data/geany.glade.h:359 msgid "Use fixed encoding when opening non-Unicode files" msgstr "שימוש בקידוד קבוע לפתיחת קבצים שאינם בקידוד יוניקוד" -#: ../data/geany.glade.h:359 +#: ../data/geany.glade.h:360 msgid "Use global settings" msgstr "שימוש בהגדרות הראשיות" -#: ../data/geany.glade.h:360 +#: ../data/geany.glade.h:361 msgid "Use indicators to show compile errors" msgstr "שימוש במחוונים להצגת שגיאות הידור" -#: ../data/geany.glade.h:361 +#: ../data/geany.glade.h:362 msgid "Use native GTK printing" msgstr "השתמש במדפיס GTK" -#: ../data/geany.glade.h:362 +#: ../data/geany.glade.h:363 msgid "Use one tab per indent" msgstr "משתמש בטאב אחד לכל כניסה" -#: ../data/geany.glade.h:363 +#: ../data/geany.glade.h:364 msgid "Use project-based session files" msgstr "שמירת הקבצים הפתוחים האחרונים במיזם ושחזורם בפתיחתו הבאה" -#: ../data/geany.glade.h:364 +#: ../data/geany.glade.h:365 msgid "" "Use spaces if the total indent is less than the tab width, otherwise use both" -msgstr "משתמש ברווחים אם הכניסה קטנה מרוחב הטאב, אחרת משתמש בשניהם." +msgstr "משתמש ברווחים אם הכניסה קטנה מרוחב הטאב, אחרת משתמש בשניהם" -#: ../data/geany.glade.h:365 +#: ../data/geany.glade.h:366 msgid "Use spaces when inserting indentation" msgstr "מכניס רווחים במקום טאבים" -#: ../data/geany.glade.h:366 ../src/printing.c:262 +#: ../data/geany.glade.h:367 ../src/printing.c:262 msgid "Use the basename of the printed file" msgstr "הדפסת שם הקובץ הבסיסי בלבד" -#: ../data/geany.glade.h:367 +#: ../data/geany.glade.h:368 msgid "Use the current file's directory for Find in Files" msgstr "שימוש בתיקיית הקובץ הנוכחי לחיפוש קבצים" -#: ../data/geany.glade.h:368 +#: ../data/geany.glade.h:369 msgid "Use the current word under the cursor for Find dialogs" msgstr "שימוש במילה הנמצאת תחת הסמן לחיפוש בדו־שיח החיפוש" -#: ../data/geany.glade.h:369 ../src/prefs.c:1603 +#: ../data/geany.glade.h:370 ../src/prefs.c:1603 msgid "Various" msgstr "שונות" -#: ../data/geany.glade.h:370 +#: ../data/geany.glade.h:371 msgid "Version number, which a new file initially has" msgstr "מספר הגרסה, אשר יופיע בתחילת כל קובץ" -#: ../data/geany.glade.h:371 +#: ../data/geany.glade.h:372 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 " @@ -1655,7 +1656,7 @@ msgstr "" "כאשר המקש \"Home\" נמצא במצב \"חכם\", שימוש בו יזיז את הסמן לתו הראשון בשורה " "שאינו תו לבן. אם הסמן כבר מוצב עליו, אזיי הוא יוזז לתחילת השורה. " -#: ../data/geany.glade.h:372 +#: ../data/geany.glade.h:373 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 " @@ -1666,7 +1667,7 @@ msgstr "" "שלו במקום תיקייה אחת מעל. עדיין ניתן לשנות את נתיב קובץ המיזם בדו־שיח ליצירת " "מיזם חדש." -#: ../data/geany.glade.h:373 +#: ../data/geany.glade.h:374 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" @@ -1674,58 +1675,57 @@ msgstr "" "האם לטעון את הדמיית המסוף בעת ההפעלה, לא לסמן אם אתה רוצה להשבית את הדמיית " "המסוף" -#: ../data/geany.glade.h:374 +#: ../data/geany.glade.h:375 msgid "" "Whether to beep if an error occurred or when the compilation process has " "finished" msgstr "האם להשמיע צפצוף בסיום הידור ובעת הצגת שגיאות" -#: ../data/geany.glade.h:375 +#: ../data/geany.glade.h:376 msgid "Whether to blink the cursor" msgstr "מגדיר אם סמן מדמה המסוף יהבהב" -#: ../data/geany.glade.h:376 +#: ../data/geany.glade.h:377 msgid "" "Whether to detect the indentation type from file contents when a file is " "opened" -msgstr "מנסה לזהות ולהגדיר את סוג הזחת הקובץ בעת פתיחתו, בהסתמך על תָכְנו." +msgstr "מנסה לזהות ולהגדיר את סוג הזחת הקובץ בעת פתיחתו, בהסתמך על תָכְנו" -#: ../data/geany.glade.h:377 +#: ../data/geany.glade.h:378 msgid "" "Whether to detect the indentation width from file contents when a file is " "opened" -msgstr "מנסה לזהות ולהגדיר את סוג הזחת הקובץ בעת פתיחתו, בהסתמך על תָכְנו." +msgstr "מנסה לזהות ולהגדיר את סוג הזחת הקובץ בעת פתיחתו, בהסתמך על תָכְנו" -#: ../data/geany.glade.h:378 +#: ../data/geany.glade.h:379 msgid "" "Whether to execute \\\"cd $path\\\" when you switch between opened files" msgstr "האם לבצע \\\"‎cd $path\\\" ‏בעת מעבר בין קבצים פתוחים" -#: ../data/geany.glade.h:379 +#: ../data/geany.glade.h:380 msgid "" "Whether to place file tabs next to the current tab rather than at the edges " "of the notebook" msgstr "" -"אם למקם כרטיסיות קבצים חדשים לצד הכרטיסייה הנוכחית במקום בצידי הכרטיסיות " -"הפתוחות." +"אם למקם לשוניות קבצים חדשים לצד הלשונית הנוכחית במקום בצדי הלשוניות הפתוחות" -#: ../data/geany.glade.h:380 +#: ../data/geany.glade.h:381 msgid "Whether to scroll to the bottom if a key was pressed" msgstr "מגדיר אם לגלול לתחתית מדמה המסוף בלחיצת מקש" -#: ../data/geany.glade.h:381 +#: ../data/geany.glade.h:382 msgid "Whether to scroll to the bottom when output is generated" msgstr "מגדיר אם לגלול לתחתית מדמה המסוף כשמתקבל פלט" -#: ../data/geany.glade.h:382 +#: ../data/geany.glade.h:383 msgid "Whether to show the status bar at the bottom of the main window" msgstr "קובע האם להציג את שורת המצב בחלון הראשי" -#: ../data/geany.glade.h:383 +#: ../data/geany.glade.h:384 msgid "Whether to stop scrolling one page past the last line of a document" -msgstr "קובע אם אפשר לגלול דף נוסף מעבר לסוף הקובץ." +msgstr "קובע אם אפשר לגלול דף נוסף מעבר לסוף הקובץ" -#: ../data/geany.glade.h:384 +#: ../data/geany.glade.h:385 msgid "" "Whether to store a project's session files and open them when re-opening the " "project" @@ -1733,7 +1733,7 @@ msgstr "" "האם לשמור את קָבְצי המיזם הפתוחים לפני סגירת המיזם, ולפָתְחם בפתיחה מחודשת של " "המיזם" -#: ../data/geany.glade.h:385 +#: ../data/geany.glade.h:386 msgid "" "Whether to use indicators (a squiggly underline) to highlight the lines " "where the compiler found a warning or an error" @@ -1741,15 +1741,15 @@ msgstr "" "קובע האם להשתמש במחוונים (קו תחתון מתפתל) כדי להדגיש את השורות בהן המהדר מצא " "שגיאה או התרה על אזהרה" -#: ../data/geany.glade.h:386 +#: ../data/geany.glade.h:387 msgid "Wi_ki" msgstr "וי_קי" -#: ../data/geany.glade.h:387 +#: ../data/geany.glade.h:388 msgid "Width:" msgstr "רוחב:" -#: ../data/geany.glade.h:388 +#: ../data/geany.glade.h:389 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 " @@ -1759,317 +1759,325 @@ msgstr "" "שורות עלות ביצועים גבוהה במסמכים גדולים, לכן יש להימנע משימוש באפשרות זו " "במחשבים אטיים." -#: ../data/geany.glade.h:389 +#: ../data/geany.glade.h:390 msgid "XML/HTML tag auto-closing" -msgstr "תג סגירה אוטומטי ב-XML/HTML" +msgstr "תג סגירה אוטומטי ב־XML/HTML" -#: ../data/geany.glade.h:390 +#: ../data/geany.glade.h:391 msgid "Year:" msgstr "שנה:" -#: ../data/geany.glade.h:391 +#: ../data/geany.glade.h:392 msgid "_1" msgstr "_1" -#: ../data/geany.glade.h:392 +#: ../data/geany.glade.h:393 msgid "_2" msgstr "_2" -#: ../data/geany.glade.h:393 +#: ../data/geany.glade.h:394 msgid "_3" msgstr "_3" -#: ../data/geany.glade.h:394 +#: ../data/geany.glade.h:395 msgid "_4" msgstr "_4" -#: ../data/geany.glade.h:395 +#: ../data/geany.glade.h:396 msgid "_5" msgstr "_5" -#: ../data/geany.glade.h:396 +#: ../data/geany.glade.h:397 msgid "_6" msgstr "_6" -#: ../data/geany.glade.h:397 +#: ../data/geany.glade.h:398 msgid "_7" msgstr "_7" -#: ../data/geany.glade.h:398 +#: ../data/geany.glade.h:399 msgid "_8" msgstr "_8" -#: ../data/geany.glade.h:399 +#: ../data/geany.glade.h:400 msgid "_Append toolbar to the menu" msgstr "_צירוף סרגל הכלים לשורת התפריטים" -#: ../data/geany.glade.h:400 +#: ../data/geany.glade.h:401 msgid "_Apply Default Indentation" msgstr "ה_חלת הזחת ברירת מחדל" -#: ../data/geany.glade.h:401 +#: ../data/geany.glade.h:402 msgid "_Auto-indentation" msgstr "הזחה אוטומ_טית" #. build the code -#: ../data/geany.glade.h:402 ../src/build.c:2552 ../src/build.c:2829 +#: ../data/geany.glade.h:403 ../src/build.c:2552 ../src/build.c:2829 msgid "_Build" msgstr "_בנייה" -#: ../data/geany.glade.h:403 ../src/keybindings.c:568 +#: ../data/geany.glade.h:404 ../src/keybindings.c:568 msgid "_Clone" msgstr "פתי_חת עותק זמני של הקובץ" -#: ../data/geany.glade.h:404 +#: ../data/geany.glade.h:405 msgid "_Close" msgstr "_סגירה" -#: ../data/geany.glade.h:405 +#: ../data/geany.glade.h:406 msgid "_Color Chooser" msgstr "בחירת _צבע" -#: ../data/geany.glade.h:406 +#: ../data/geany.glade.h:407 msgid "_Commands" msgstr "פ_קודות" -#: ../data/geany.glade.h:407 +#: ../data/geany.glade.h:408 msgid "_Comment Line(s)" msgstr "ה_כנסת הערת שורה" -#: ../data/geany.glade.h:408 ../src/keybindings.c:347 +#: ../data/geany.glade.h:409 ../src/keybindings.c:347 msgid "_Copy Current Line(s)" msgstr "ה_עתקת השורה הנוכחית" -#: ../data/geany.glade.h:409 ../src/keybindings.c:350 +#: ../data/geany.glade.h:410 ../src/keybindings.c:350 msgid "_Cut Current Line(s)" msgstr "_גזירת השורה הנוכחית" -#: ../data/geany.glade.h:410 +#: ../data/geany.glade.h:411 msgid "_Decrease Indent" msgstr "ה_זחה החוצה" -#: ../data/geany.glade.h:411 ../src/keybindings.c:301 +#: ../data/geany.glade.h:412 ../src/keybindings.c:301 msgid "_Delete Current Line(s)" msgstr "_מחיקת השורה הנוכחית" -#: ../data/geany.glade.h:412 +#: ../data/geany.glade.h:413 msgid "_Detect from Content" msgstr "זיהוי סוג הז_חת הקובץ" -#: ../data/geany.glade.h:413 +#: ../data/geany.glade.h:414 msgid "_Document" msgstr "_מסמך" -#: ../data/geany.glade.h:414 -msgid "_Donate" -msgstr "תרומו_ת" +#: ../data/geany.glade.h:415 +msgid "_Donate..." +msgstr "תרומו_ת..." -#: ../data/geany.glade.h:415 ../src/keybindings.c:298 +#: ../data/geany.glade.h:416 ../src/keybindings.c:298 msgid "_Duplicate Line or Selection" msgstr "שכפול השו_רה או הבחירה נוכחית" -#: ../data/geany.glade.h:416 +#: ../data/geany.glade.h:417 msgid "_Edit" msgstr "_עריכה" -#: ../data/geany.glade.h:417 +#: ../data/geany.glade.h:418 msgid "_File" msgstr "_קובץ" -#: ../data/geany.glade.h:418 +#: ../data/geany.glade.h:419 +msgid "_Find..." +msgstr "_חיפוש..." + +#: ../data/geany.glade.h:420 msgid "_Fold All" msgstr "קיפול ה_כל" -#: ../data/geany.glade.h:419 +#: ../data/geany.glade.h:421 msgid "_Format" msgstr "_תבנית" -#: ../data/geany.glade.h:420 -msgid "_Go to Line" -msgstr "מעבר _לשורה" +#: ../data/geany.glade.h:422 +msgid "_Go to Line..." +msgstr "מעבר _לשורה..." -#: ../data/geany.glade.h:421 ../src/keybindings.c:477 +#: ../data/geany.glade.h:423 ../src/keybindings.c:477 msgid "_Go to Next Marker" msgstr "מ_עבר להדגשה הבאה" -#: ../data/geany.glade.h:422 ../src/keybindings.c:480 +#: ../data/geany.glade.h:424 ../src/keybindings.c:480 msgid "_Go to Previous Marker" msgstr "מ_עבר להדגשה הקודמת" -#: ../data/geany.glade.h:423 +#: ../data/geany.glade.h:425 msgid "_Help" msgstr "ע_זרה" -#: ../data/geany.glade.h:424 +#: ../data/geany.glade.h:426 msgid "_Hide Toolbar" msgstr "הסתרת סרגל הכ_לים" -#: ../data/geany.glade.h:425 +#: ../data/geany.glade.h:427 msgid "_Images only" msgstr "רק תמו_נות" -#: ../data/geany.glade.h:426 +#: ../data/geany.glade.h:428 msgid "_Increase Indent" msgstr "_הזחה פנימה" -#: ../data/geany.glade.h:427 +#: ../data/geany.glade.h:429 msgid "_Insert \"include <...>\"" msgstr "ה_כנסת \"include <...>\"" -#: ../data/geany.glade.h:428 ../src/keybindings.c:415 +#: ../data/geany.glade.h:430 ../src/keybindings.c:415 msgid "_Insert Alternative White Space" msgstr "ה_כנסת רווחים" -#: ../data/geany.glade.h:429 +#: ../data/geany.glade.h:431 msgid "_Keyboard Shortcuts" msgstr "צירופי־_מקשים" -#: ../data/geany.glade.h:430 +#: ../data/geany.glade.h:432 msgid "_Large icons" msgstr "צלמיות _גדולות" -#: ../data/geany.glade.h:431 +#: ../data/geany.glade.h:433 msgid "_Line Wrapping" msgstr "גלישת _שורות" -#: ../data/geany.glade.h:432 ../src/keybindings.c:459 +#: ../data/geany.glade.h:434 ../src/keybindings.c:459 msgid "_Mark All" msgstr "הד_גשת הכל" -#: ../data/geany.glade.h:433 +#: ../data/geany.glade.h:435 msgid "_More" msgstr "_עוד" -#: ../data/geany.glade.h:434 +#: ../data/geany.glade.h:436 msgid "_Move Line(s) Down" msgstr "ה_זזת שורה מטה" -#: ../data/geany.glade.h:435 +#: ../data/geany.glade.h:437 msgid "_Move Line(s) Up" msgstr "הזז_ת שורה מעלה" -#: ../data/geany.glade.h:436 -msgid "_New" -msgstr "_חדש" +#: ../data/geany.glade.h:438 +msgid "_New..." +msgstr "_חדש..." -#: ../data/geany.glade.h:437 -msgid "_Open" -msgstr "_פתיחה" +#: ../data/geany.glade.h:439 +msgid "_Open..." +msgstr "_פתיחה..." -#: ../data/geany.glade.h:438 +#: ../data/geany.glade.h:440 +msgid "_Print..." +msgstr "ה_דפסה..." + +#: ../data/geany.glade.h:441 msgid "_Project" msgstr "_מיזם" -#: ../data/geany.glade.h:439 +#: ../data/geany.glade.h:442 msgid "_Recent Projects" msgstr "מיזמים _אחרונים" -#: ../data/geany.glade.h:440 ../src/keybindings.c:404 +#: ../data/geany.glade.h:443 ../src/keybindings.c:404 msgid "_Reflow Lines/Block" msgstr "הצג_ת בלוק/שורות מחדש" -#: ../data/geany.glade.h:441 ../src/callbacks.c:434 ../src/document.c:2943 +#: ../data/geany.glade.h:444 ../src/callbacks.c:434 ../src/document.c:2943 #: ../src/sidebar.c:705 msgid "_Reload" msgstr "טעינה מחד_ש" -#: ../data/geany.glade.h:442 +#: ../data/geany.glade.h:445 msgid "_Reload Configuration" msgstr "רענון תצו_רה" -#: ../data/geany.glade.h:443 ../src/search.c:616 -msgid "_Replace" -msgstr "הח_לפה" - -#: ../data/geany.glade.h:444 +#: ../data/geany.glade.h:446 msgid "_Replace Tabs by Spaces" msgstr "החלפת _טאבים ברווחים" -#: ../data/geany.glade.h:445 +#: ../data/geany.glade.h:447 +msgid "_Replace..." +msgstr "הח_לפה..." + +#: ../data/geany.glade.h:448 msgid "_Search" msgstr "_חיפוש" -#: ../data/geany.glade.h:446 ../src/keybindings.c:360 +#: ../data/geany.glade.h:449 ../src/keybindings.c:360 msgid "_Select Current Line(s)" msgstr "_בחירת השורה הנוכחית" -#: ../data/geany.glade.h:447 ../src/keybindings.c:363 +#: ../data/geany.glade.h:450 ../src/keybindings.c:363 msgid "_Select Current Paragraph" msgstr "_בחירת הפסקה הנוכחית" -#: ../data/geany.glade.h:448 +#: ../data/geany.glade.h:451 msgid "_Send Selection to" msgstr "שליחת בח_ירה אל" -#: ../data/geany.glade.h:449 ../src/keybindings.c:402 +#: ../data/geany.glade.h:452 ../src/keybindings.c:402 msgid "_Send Selection to Terminal" msgstr "_שליחת הבחירה למסוף" -#: ../data/geany.glade.h:450 +#: ../data/geany.glade.h:453 msgid "_Small icons" msgstr "_צלמיות קטנות" -#: ../data/geany.glade.h:451 ../src/keybindings.c:393 +#: ../data/geany.glade.h:454 ../src/keybindings.c:393 msgid "_Smart Line Indent" msgstr "הזחת ש_ורות" -#: ../data/geany.glade.h:452 +#: ../data/geany.glade.h:455 msgid "_Spaces" msgstr "רוו_חים" -#: ../data/geany.glade.h:453 +#: ../data/geany.glade.h:456 msgid "_Strip Trailing Spaces" msgstr "הסרת רווחים והזחות מ_יותרים" -#: ../data/geany.glade.h:454 +#: ../data/geany.glade.h:457 msgid "_Tabs" msgstr "_טאב" -#: ../data/geany.glade.h:455 +#: ../data/geany.glade.h:458 msgid "_Text only" msgstr "רק טקס_ט" -#: ../data/geany.glade.h:456 +#: ../data/geany.glade.h:459 msgid "_Toggle Line Commentation" msgstr "הכנסת/הסרת הע_רת שורה" -#: ../data/geany.glade.h:457 +#: ../data/geany.glade.h:460 msgid "_Toolbar Preferences" msgstr "העדפות סרגל ה_כלים" -#: ../data/geany.glade.h:458 +#: ../data/geany.glade.h:461 msgid "_Tools" msgstr "_כלים" -#: ../data/geany.glade.h:459 +#: ../data/geany.glade.h:462 msgid "_Unfold All" msgstr "פתיחת ה_כל" -#: ../data/geany.glade.h:460 +#: ../data/geany.glade.h:463 msgid "_Very small icons" msgstr "צלמיות קטנו_ת מאוד" -#: ../data/geany.glade.h:461 ../src/dialogs.c:359 +#: ../data/geany.glade.h:464 ../src/dialogs.c:359 msgid "_View" msgstr "תצו_גה" -#: ../data/geany.glade.h:462 +#: ../data/geany.glade.h:465 msgid "_Website" msgstr "דף ה_בית" -#: ../data/geany.glade.h:463 +#: ../data/geany.glade.h:466 msgid "_Word Count" msgstr "מונה _מילים" -#: ../data/geany.glade.h:464 +#: ../data/geany.glade.h:467 msgid "_Write Unicode BOM" msgstr "_כתיבת יוניקוד BOM" -#: ../data/geany.glade.h:465 +#: ../data/geany.glade.h:468 msgid "email address of the developer" msgstr "כתובת הדואר האלקטרוני של המפתח" -#: ../data/geany.glade.h:466 +#: ../data/geany.glade.h:469 msgid "invisible" msgstr "הסתרה" @@ -2167,7 +2175,7 @@ msgstr "נכשלה החלפת המיזם %%p, אין מיזם פעיל" #: ../src/build.c:787 msgid "Process failed, no working directory" -msgstr "התהליך נכשל, אין תיקיית עבודה." +msgstr "התהליך נכשל, אין תיקיית עבודה" #: ../src/build.c:812 #, c-format @@ -2268,12 +2276,12 @@ msgstr "אין עוד שגיאות בנייה." msgid "Set menu item label" msgstr "הזנת תווית לפריט בתפריט" -#: ../src/build.c:1951 ../src/symbols.c:739 ../src/tools.c:570 +#: ../src/build.c:1951 ../src/symbols.c:746 ../src/tools.c:570 msgid "Label" msgstr "תווית" #. command column, holding status and command display -#: ../src/build.c:1952 ../src/symbols.c:734 ../src/tools.c:555 +#: ../src/build.c:1952 ../src/symbols.c:741 ../src/tools.c:555 msgid "Command" msgstr "פקודה" @@ -2336,8 +2344,8 @@ msgstr "ה_רצה" #. build the code with make custom #: ../src/build.c:2604 ../src/build.c:2795 ../src/build.c:2849 -msgid "Make Custom _Target" -msgstr "בנייה _מותאמת אישית" +msgid "Make Custom _Target..." +msgstr "בנייה _מותאמת אישית..." #. build the code with make object #: ../src/build.c:2606 ../src/build.c:2796 ../src/build.c:2857 @@ -2586,13 +2594,14 @@ msgstr "ארעה שגיאה או שפרטי הקובץ אינם ניתנים ל #: ../src/dialogs.c:1197 ../src/dialogs.c:1198 ../src/dialogs.c:1199 #: ../src/dialogs.c:1205 ../src/dialogs.c:1206 ../src/dialogs.c:1207 -#: ../src/symbols.c:2196 ../src/symbols.c:2210 ../src/ui_utils.c:281 +#: ../src/symbols.c:2203 ../src/symbols.c:2217 ../src/ui_utils.c:281 msgid "unknown" msgstr "לא ידוע" -#: ../src/dialogs.c:1212 ../src/symbols.c:909 -msgid "Properties" -msgstr "מאפיינים" +#: ../src/dialogs.c:1212 +#, c-format +msgid "%s Properties" +msgstr "%s מאפיינים" #: ../src/dialogs.c:1243 msgid "<b>Type:</b>" @@ -2745,7 +2754,7 @@ msgstr "הקובץ %s נטען מחדש." #: ../src/document.c:1218 #, c-format msgid "File %s opened(%d%s)." -msgstr "הקובץ %s נפתח (%d%s)" +msgstr "הקובץ %s נפתח (%d%s)." #: ../src/document.c:1220 msgid ", read-only" @@ -2769,7 +2778,7 @@ msgid "" "The error occurred at \"%s\" (line: %d, column: %d)." msgstr "" "הודעת שגיאה: %s\n" -"השגיאה ארעה ב-\"%s\" (שורה: %d, עמודה: %d)" +"השגיאה ארעה ב-\"%s\" (שורה: %d, עמודה: %d)." #: ../src/document.c:1531 #, c-format @@ -2835,7 +2844,7 @@ msgstr "לא נמצאו התאמות עבור \"%s\"." #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." -msgstr[0] "לא נמצאו התאמות עבור \"%s\"." +msgstr[0] "%s: הוחלפו %d מופעים של \"%s\" ב-\"%s\"" msgstr[1] "%s: הוחלפו %d מופעים של \"%s\" ב-\"%s\"" #: ../src/document.c:2944 @@ -3096,7 +3105,7 @@ msgid "Color Schemes" msgstr "ערכות צבעים" #. visual group order -#: ../src/keybindings.c:227 ../src/symbols.c:711 +#: ../src/keybindings.c:227 ../src/symbols.c:718 msgid "File" msgstr "קובץ" @@ -3132,12 +3141,12 @@ msgstr "קפיצה אל" msgid "View" msgstr "תצוגה" -#: ../src/keybindings.c:237 ../src/symbols.c:826 +#: ../src/keybindings.c:237 ../src/symbols.c:833 msgid "Document" msgstr "מסמך" #: ../src/keybindings.c:239 ../src/keybindings.c:593 ../src/project.c:452 -#: ../src/ui_utils.c:1892 +#: ../src/ui_utils.c:1897 msgid "Build" msgstr "בנייה" @@ -3195,7 +3204,7 @@ msgstr "טעינה מחודשת של קובץ" #: ../src/keybindings.c:275 msgid "Re-open last closed tab" -msgstr "פתיחת מחודשת של הכרטיסייה האחרונה שנסגרה" +msgstr "פתיחת מחודשת של הלשונית האחרונה שנסגרה" #: ../src/keybindings.c:277 msgid "Quit" @@ -3315,7 +3324,7 @@ msgstr "הזחה פנימה" #: ../src/keybindings.c:386 msgid "Decrease indent" -msgstr "הזחה החוצה" +msgstr "הזחה החוּצה" #: ../src/keybindings.c:389 msgid "Increase indent by one space" @@ -3323,7 +3332,7 @@ msgstr "הזחה פנימה עם רווחים" #: ../src/keybindings.c:391 msgid "Decrease indent by one space" -msgstr "הזחה החוצה עם רווחים" +msgstr "הזחה החוּצה עם רווחים" #: ../src/keybindings.c:395 msgid "Send to Custom Command 1" @@ -3479,15 +3488,15 @@ msgstr "מעבר לחלון ההודעות" #: ../src/keybindings.c:528 msgid "Switch to Compiler" -msgstr "מעבר לכרטיסיית המהדר" +msgstr "מעבר ללשונית המהדר" #: ../src/keybindings.c:530 msgid "Switch to Messages" -msgstr "מעבר לכרטיסיית ההודעות" +msgstr "מעבר ללשונית ההודעות" #: ../src/keybindings.c:532 msgid "Switch to Scribble" -msgstr "מעבר לכרטיסיית ההערות" +msgstr "מעבר ללשונית ההערות" #: ../src/keybindings.c:534 msgid "Switch to VTE" @@ -3495,23 +3504,23 @@ msgstr "מעבר למדמה המסוף" #: ../src/keybindings.c:536 msgid "Switch to Sidebar" -msgstr "מעבר לסרגל הצידי" +msgstr "מעבר לסרגל הצדי" #: ../src/keybindings.c:538 msgid "Switch to Sidebar Symbol List" -msgstr "מעבר לרשימת הסמלים בסרגל הצידי" +msgstr "מעבר לרשימת הסמלים בסרגל הצדי" #: ../src/keybindings.c:540 msgid "Switch to Sidebar Document List" -msgstr "מעבר לרשימת המסמכים בסרגל הצידי" +msgstr "מעבר לרשימת המסמכים בסרגל הצדי" #: ../src/keybindings.c:545 msgid "Switch to left document" -msgstr "מעבר למסמך השמאלי" +msgstr "מעבר למסמך הימני" #: ../src/keybindings.c:547 msgid "Switch to right document" -msgstr "מעבר למסמך הימני" +msgstr "מעבר למסמך השמאלי" #: ../src/keybindings.c:549 msgid "Switch to last used document" @@ -3519,19 +3528,19 @@ msgstr "מעבר למסמך האחרון שנעשה בו שימוש" #: ../src/keybindings.c:552 msgid "Move document left" -msgstr "הזזת המסמך שמאלה" +msgstr "הזזת המסמך ימינה" #: ../src/keybindings.c:555 msgid "Move document right" -msgstr "הזזת המסמך ימינה" +msgstr "הזזת המסמך שמאלה" #: ../src/keybindings.c:557 msgid "Move document first" -msgstr "הזזת המסמך לפני שאר המסמכים" +msgstr "הזזת המסמך לימין שאר המסמכים" #: ../src/keybindings.c:559 msgid "Move document last" -msgstr "הזזת המסמך לאחרי שאר המסמכים" +msgstr "הזזת המסמך לשמאל שאר המסמכים" #: ../src/keybindings.c:564 msgid "Toggle Line wrapping" @@ -3637,84 +3646,87 @@ msgstr "ני_קוי" msgid "" "Set initial column number for the first opened file (useful in conjunction " "with --line)" -msgstr "הגדרת העמודה בה יוצב הסמן לראשונה, יחד עם הדגל --line" +msgstr "" +"Set initial column number for the first opened file (useful in conjunction " +"with --line)" #: ../src/main.c:122 msgid "Use an alternate configuration directory" -msgstr "שימוש בתיקיית תצורה חלופית" +msgstr "Use an alternate configuration directory" #: ../src/main.c:123 msgid "Print internal filetype names" -msgstr "הדפסת כל סוגי הקבצים הנתמכים על ידי ‫Geany" +msgstr "Print internal filetype names" #: ../src/main.c:124 msgid "Generate global tags file (see documentation)" -msgstr "יצירת קובץ תגיות ראשי ‫(עָיֵּן בתיעוד)" +msgstr "Generate global tags file (see documentation)" #: ../src/main.c:125 msgid "Don't preprocess C/C++ files when generating tags" -msgstr "הכללת הגדרות אשר לא מהודרות לאחר סינון הקדם מעבד בשפות C/C‎‭++‭‮‏" +msgstr "Don't preprocess C/C++ files when generating tags" #: ../src/main.c:127 msgid "Don't open files in a running instance, force opening a new instance" -msgstr "במקרה ש-Geany כבר רץ ברקע, אפשרות זו תכפה פתיחת הקובץ בחלון חדש." +msgstr "Don't open files in a running instance, force opening a new instance" #: ../src/main.c:128 msgid "" "Use this socket filename for communication with a running Geany instance" -msgstr "שימוש בקובץ שקע לתקשורת עם מופע פועל של Geany" +msgstr "" +"Use this socket filename for communication with a running Geany instance" #: ../src/main.c:129 msgid "Return a list of open documents in a running Geany instance" -msgstr "החזר רשימה של קבצים הפתוחים כעת, במקרה ש‫-Geany כבר פתוח" +msgstr "Return a list of open documents in a running Geany instance" #: ../src/main.c:131 msgid "Set initial line number for the first opened file" -msgstr "הגדר השורה בה יוצב הסמן לראשונה" +msgstr "Set initial line number for the first opened file" #: ../src/main.c:132 msgid "Don't show message window at startup" -msgstr "אל תציג את חלון ההודעות בעת ההפעלה" +msgstr "Don't show message window at startup" #: ../src/main.c:133 msgid "Don't load auto completion data (see documentation)" -msgstr "אל תטען נתוני השלמה אוטומטית ‫(עָיֵּן בתיעוד)" +msgstr "Don't load auto completion data (see documentation)" #: ../src/main.c:135 msgid "Don't load plugins" -msgstr "אל תטען תוספים" +msgstr "Don't load plugins" #: ../src/main.c:137 msgid "Print Geany's installation prefix" -msgstr "הדפס את קידומת ההתקנה של ‫Geany" +msgstr "Print Geany's installation prefix" #: ../src/main.c:138 msgid "Open all FILES in read-only mode (see documention)" -msgstr "פתח את כל הקבצים לקריאה בלבד ‫(עָיֵּן בתיעוד)" +msgstr "Open all FILES in read-only mode (see documention)" #: ../src/main.c:139 msgid "Don't load the previous session's files" -msgstr "אל תטען קבצים מההפעלה הקודמת" +msgstr "Don't load the previous session's files" #: ../src/main.c:141 msgid "Don't load terminal support" -msgstr "אל תטען תמיכה במדמה מסוף" +msgstr "Don't load terminal support" #: ../src/main.c:142 msgid "Filename of libvte.so" -msgstr "שם הקובץ ל‫־libvte.so" +msgstr "Filename of libvte.so" #: ../src/main.c:144 msgid "Be verbose" -msgstr "מידע מפורט יותר" +msgstr "Be verbose" #: ../src/main.c:145 msgid "Show version and exit" -msgstr "הצגת הגרסה ויציאה" +msgstr "Show version and exit" #: ../src/main.c:545 msgid "[FILES...]" -msgstr "‫[קבצים...]" +msgstr "[FILES...]" #. note for translators: library versions are printed after this #: ../src/main.c:578 @@ -3724,11 +3736,11 @@ msgstr "נבנה בתאריך %s עם " #: ../src/main.c:667 msgid "Move it now?" -msgstr "להזיז אותו עכשיו ?" +msgstr "להזיז אותה עכשיו ?" #: ../src/main.c:669 msgid "Geany needs to move your old configuration directory before starting." -msgstr "‏Geany לעבור בתיקיית התצורה לפני כן." +msgstr "‏Geany צריך לעבור לתיקיית התצורה הישנה שלך לפני שיתחיל לפעול." #: ../src/main.c:678 #, c-format @@ -3794,7 +3806,7 @@ msgstr "לא ניתן למצוא את הקובץ '%s' - נוסה נתיב הקו #: ../src/notebook.c:196 msgid "Switch to Document" -msgstr "מעבר למסמך." +msgstr "מעבר למסמך" #: ../src/plugins.c:496 #, c-format @@ -3862,11 +3874,11 @@ msgstr "בחירת צירוף־מקשים" msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "לחץ על צירוף המקשים שברצונך להשתמש עבור \"%s\"." -#: ../src/prefs.c:226 ../src/symbols.c:2348 ../src/sidebar.c:739 +#: ../src/prefs.c:226 ../src/symbols.c:2355 ../src/sidebar.c:739 msgid "_Expand All" msgstr "הר_חב הכל" -#: ../src/prefs.c:231 ../src/symbols.c:2353 ../src/sidebar.c:745 +#: ../src/prefs.c:231 ../src/symbols.c:2360 ../src/sidebar.c:745 msgid "_Collapse All" msgstr "_כווץ הכל" @@ -3876,7 +3888,7 @@ msgstr "פעולה" #: ../src/prefs.c:296 msgid "Shortcut" -msgstr "צירוף מקשים" +msgstr "צירוף־מקשים" #: ../src/prefs.c:1466 msgid "_Allow" @@ -3899,7 +3911,7 @@ msgstr "צירוף המקשים '‎%s'‫ כבר קיים עבור \"%s\"." #. page Tools #: ../src/prefs.c:1667 msgid "Enter tool paths below. Tools you do not need can be left blank." -msgstr "הזן נתיבי הכלים שלהלן. נתיבי כלים שאינך צריך יכולים להישאר ריקים." +msgstr "הזן נתיבי הכלים שלהלן. השאר ריק נתיבי כלים שאינך צריך." #. page Templates #: ../src/prefs.c:1672 @@ -3953,7 +3965,7 @@ msgstr "עמוד %d מתוך %d" #: ../src/printing.c:484 #, c-format msgid "Did not send document %s to the printing subsystem." -msgstr "לא לשלוח את המסמכך %s להדפסה." +msgstr "לא ניתן לשלוח את המסמך %s להדפסה." #: ../src/printing.c:486 #, c-format @@ -4005,11 +4017,11 @@ msgstr "י_צירה" #: ../src/project.c:180 ../src/project.c:425 msgid "Choose Project Base Path" -msgstr "בחירת נתיב למיזם" +msgstr "בחירת נתיב בסיסי למיזם" #: ../src/project.c:202 ../src/project.c:568 msgid "Project file could not be written" -msgstr "אין אפשרות לכתוב על קובץ המיזם." +msgstr "קובץ המיזם לא ניתן לכתיבה" #: ../src/project.c:205 #, c-format @@ -4037,7 +4049,7 @@ msgstr "המיזם \"%s\" נסגר." #: ../src/project.c:571 #, c-format msgid "Project \"%s\" saved." -msgstr "המיזם \"%s\" נסגר." +msgstr "המיזם \"%s\" נשמר." #: ../src/project.c:604 msgid "Do you want to close it before proceeding?" @@ -4170,6 +4182,10 @@ msgstr "סגיר_ת דו־שיח" msgid "Disable this option to keep the dialog open" msgstr "בטל אפשרות זו בכדי להשאיר חלון דו־שיח זה פתוח" +#: ../src/search.c:616 +msgid "_Replace" +msgstr "הח_לפה" + #: ../src/search.c:621 msgid "Replace & Fi_nd" msgstr "החלפ_ה וחיפוש" @@ -4251,14 +4267,14 @@ msgstr "אפשרו_יות נוספות:" #: ../src/search.c:1001 msgid "Other options to pass to Grep" -msgstr "אפשרויות נוספות שיועברו ל־grep" +msgstr "אפשרויות נוספות שיועברו ל־Grep" #: ../src/search.c:1354 ../src/search.c:2196 ../src/search.c:2199 #, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." msgstr[0] "נמצאו %d התאמות ל־\"%s\"." -msgstr[1] "נמצאו %d התאמות ל־%s" +msgstr[1] "נמצאו %d התאמות ל־%s." #: ../src/search.c:1401 #, c-format @@ -4336,294 +4352,298 @@ msgstr "שם" msgid "Value" msgstr "ערך" -#: ../src/symbols.c:690 ../src/symbols.c:740 ../src/symbols.c:816 +#: ../src/symbols.c:697 ../src/symbols.c:747 ../src/symbols.c:823 msgid "Chapter" msgstr "פרק" -#: ../src/symbols.c:691 ../src/symbols.c:736 ../src/symbols.c:817 +#: ../src/symbols.c:698 ../src/symbols.c:743 ../src/symbols.c:824 msgid "Section" msgstr "בחירה" -#: ../src/symbols.c:692 +#: ../src/symbols.c:699 msgid "Sect1" msgstr "קטע 1" -#: ../src/symbols.c:693 +#: ../src/symbols.c:700 msgid "Sect2" msgstr "קטע 2" -#: ../src/symbols.c:694 +#: ../src/symbols.c:701 msgid "Sect3" msgstr "קטע 3" -#: ../src/symbols.c:695 +#: ../src/symbols.c:702 msgid "Appendix" msgstr "נספח" -#: ../src/symbols.c:696 ../src/symbols.c:741 ../src/symbols.c:766 -#: ../src/symbols.c:777 ../src/symbols.c:875 ../src/symbols.c:886 -#: ../src/symbols.c:898 ../src/symbols.c:912 ../src/symbols.c:924 -#: ../src/symbols.c:936 ../src/symbols.c:951 ../src/symbols.c:980 -#: ../src/symbols.c:1010 +#: ../src/symbols.c:703 ../src/symbols.c:748 ../src/symbols.c:773 +#: ../src/symbols.c:784 ../src/symbols.c:882 ../src/symbols.c:893 +#: ../src/symbols.c:905 ../src/symbols.c:919 ../src/symbols.c:931 +#: ../src/symbols.c:943 ../src/symbols.c:958 ../src/symbols.c:987 +#: ../src/symbols.c:1017 msgid "Other" msgstr "אחר" -#: ../src/symbols.c:702 ../src/symbols.c:944 ../src/symbols.c:989 +#: ../src/symbols.c:709 ../src/symbols.c:951 ../src/symbols.c:996 msgid "Module" msgstr "מודול" -#: ../src/symbols.c:703 ../src/symbols.c:871 ../src/symbols.c:922 -#: ../src/symbols.c:934 ../src/symbols.c:949 ../src/symbols.c:961 +#: ../src/symbols.c:710 ../src/symbols.c:878 ../src/symbols.c:929 +#: ../src/symbols.c:941 ../src/symbols.c:956 ../src/symbols.c:968 msgid "Types" msgstr "סוג" -#: ../src/symbols.c:704 +#: ../src/symbols.c:711 msgid "Type constructors" msgstr "סוג בנאי" -#: ../src/symbols.c:705 ../src/symbols.c:727 ../src/symbols.c:748 -#: ../src/symbols.c:765 ../src/symbols.c:774 ../src/symbols.c:786 -#: ../src/symbols.c:795 ../src/symbols.c:859 ../src/symbols.c:908 -#: ../src/symbols.c:931 ../src/symbols.c:946 ../src/symbols.c:974 -#: ../src/symbols.c:997 +#: ../src/symbols.c:712 ../src/symbols.c:734 ../src/symbols.c:755 +#: ../src/symbols.c:772 ../src/symbols.c:781 ../src/symbols.c:793 +#: ../src/symbols.c:802 ../src/symbols.c:866 ../src/symbols.c:915 +#: ../src/symbols.c:938 ../src/symbols.c:953 ../src/symbols.c:981 +#: ../src/symbols.c:1004 msgid "Functions" msgstr "פונקציות" -#: ../src/symbols.c:710 +#: ../src/symbols.c:717 msgid "Program" msgstr "תכנית" -#: ../src/symbols.c:712 ../src/symbols.c:720 ../src/symbols.c:726 +#: ../src/symbols.c:719 ../src/symbols.c:727 ../src/symbols.c:733 msgid "Sections" msgstr "סעיפים" -#: ../src/symbols.c:713 +#: ../src/symbols.c:720 msgid "Paragraph" msgstr "פסקה" -#: ../src/symbols.c:714 +#: ../src/symbols.c:721 msgid "Group" msgstr "קבוצה" -#: ../src/symbols.c:715 +#: ../src/symbols.c:722 msgid "Data" msgstr "תאריך" -#: ../src/symbols.c:721 +#: ../src/symbols.c:728 msgid "Keys" msgstr "מקשים" -#: ../src/symbols.c:728 ../src/symbols.c:788 ../src/symbols.c:860 -#: ../src/symbols.c:885 ../src/symbols.c:910 ../src/symbols.c:923 -#: ../src/symbols.c:932 ../src/symbols.c:948 ../src/symbols.c:1009 +#: ../src/symbols.c:735 ../src/symbols.c:795 ../src/symbols.c:867 +#: ../src/symbols.c:892 ../src/symbols.c:917 ../src/symbols.c:930 +#: ../src/symbols.c:939 ../src/symbols.c:955 ../src/symbols.c:1016 msgid "Variables" msgstr "משתנים" -#: ../src/symbols.c:735 +#: ../src/symbols.c:742 msgid "Environment" msgstr "סביבה" -#: ../src/symbols.c:737 ../src/symbols.c:818 +#: ../src/symbols.c:744 ../src/symbols.c:825 msgid "Subsection" msgstr "תת־סעיף" -#: ../src/symbols.c:738 ../src/symbols.c:819 +#: ../src/symbols.c:745 ../src/symbols.c:826 msgid "Subsubsection" msgstr "תת־תת סעיף" -#: ../src/symbols.c:749 +#: ../src/symbols.c:756 msgid "Structures" msgstr "מבנים" -#: ../src/symbols.c:756 +#: ../src/symbols.c:763 msgid "Parts" msgstr "חלקים" -#: ../src/symbols.c:757 +#: ../src/symbols.c:764 msgid "Assembly" msgstr "אסמבלי" -#: ../src/symbols.c:758 +#: ../src/symbols.c:765 msgid "Steps" msgstr "צעדים" -#: ../src/symbols.c:773 ../src/symbols.c:868 ../src/symbols.c:893 -#: ../src/symbols.c:905 +#: ../src/symbols.c:780 ../src/symbols.c:875 ../src/symbols.c:900 +#: ../src/symbols.c:912 msgid "Package" msgstr "חבילה" -#: ../src/symbols.c:775 ../src/symbols.c:935 ../src/symbols.c:958 +#: ../src/symbols.c:782 ../src/symbols.c:942 ../src/symbols.c:965 msgid "Labels" msgstr "תוויות" -#: ../src/symbols.c:776 ../src/symbols.c:787 ../src/symbols.c:911 -#: ../src/symbols.c:933 +#: ../src/symbols.c:783 ../src/symbols.c:794 ../src/symbols.c:918 +#: ../src/symbols.c:940 msgid "Constants" msgstr "קבועים" -#: ../src/symbols.c:784 ../src/symbols.c:894 ../src/symbols.c:906 -#: ../src/symbols.c:919 ../src/symbols.c:945 ../src/symbols.c:996 +#: ../src/symbols.c:791 ../src/symbols.c:901 ../src/symbols.c:913 +#: ../src/symbols.c:926 ../src/symbols.c:952 ../src/symbols.c:1003 msgid "Interfaces" msgstr "ממשקים" -#: ../src/symbols.c:785 ../src/symbols.c:806 ../src/symbols.c:838 -#: ../src/symbols.c:848 ../src/symbols.c:857 ../src/symbols.c:895 -#: ../src/symbols.c:907 ../src/symbols.c:920 ../src/symbols.c:995 +#: ../src/symbols.c:792 ../src/symbols.c:813 ../src/symbols.c:845 +#: ../src/symbols.c:855 ../src/symbols.c:864 ../src/symbols.c:902 +#: ../src/symbols.c:914 ../src/symbols.c:927 ../src/symbols.c:1002 msgid "Classes" msgstr "מחלקות" -#: ../src/symbols.c:796 +#: ../src/symbols.c:803 msgid "Anchors" msgstr "עוגן" -#: ../src/symbols.c:797 +#: ../src/symbols.c:804 msgid "H1 Headings" msgstr "כותרות H1" -#: ../src/symbols.c:798 +#: ../src/symbols.c:805 msgid "H2 Headings" msgstr "כותרות H2" -#: ../src/symbols.c:799 +#: ../src/symbols.c:806 msgid "H3 Headings" msgstr "כותרות H3" -#: ../src/symbols.c:807 +#: ../src/symbols.c:814 msgid "ID Selectors" msgstr "ID Selectors" -#: ../src/symbols.c:808 +#: ../src/symbols.c:815 msgid "Type Selectors" msgstr "Type Selectors" -#: ../src/symbols.c:827 +#: ../src/symbols.c:834 msgid "Section Level 1" msgstr "בחירה רמה 1" -#: ../src/symbols.c:828 +#: ../src/symbols.c:835 msgid "Section Level 2" msgstr "בחירה רמה 2" -#: ../src/symbols.c:829 +#: ../src/symbols.c:836 msgid "Section Level 3" msgstr "בחירה רמה 3" -#: ../src/symbols.c:830 +#: ../src/symbols.c:837 msgid "Section Level 4" msgstr "בחירה רמה 4" -#: ../src/symbols.c:837 ../src/symbols.c:883 +#: ../src/symbols.c:844 ../src/symbols.c:890 msgid "Modules" msgstr "מודולים" -#: ../src/symbols.c:839 +#: ../src/symbols.c:846 msgid "Singletons" msgstr "אותות" -#: ../src/symbols.c:840 ../src/symbols.c:849 ../src/symbols.c:858 -#: ../src/symbols.c:896 ../src/symbols.c:921 +#: ../src/symbols.c:847 ../src/symbols.c:856 ../src/symbols.c:865 +#: ../src/symbols.c:903 ../src/symbols.c:928 msgid "Methods" msgstr "שגרות" -#: ../src/symbols.c:847 ../src/symbols.c:992 +#: ../src/symbols.c:854 ../src/symbols.c:999 msgid "Namespaces" msgstr "מרחבי שם" -#: ../src/symbols.c:850 ../src/symbols.c:975 +#: ../src/symbols.c:857 ../src/symbols.c:982 msgid "Procedures" msgstr "פרוצדורה" -#: ../src/symbols.c:861 +#: ../src/symbols.c:868 msgid "Imports" msgstr "יִבּוא" -#: ../src/symbols.c:869 +#: ../src/symbols.c:876 msgid "Entities" msgstr "ישויות" -#: ../src/symbols.c:870 +#: ../src/symbols.c:877 msgid "Architectures" msgstr "ארכיטקטורות" -#: ../src/symbols.c:872 +#: ../src/symbols.c:879 msgid "Functions / Procedures" msgstr "פונקציות/שגרות" -#: ../src/symbols.c:873 +#: ../src/symbols.c:880 msgid "Variables / Signals" msgstr "משתנים/אותות" -#: ../src/symbols.c:874 +#: ../src/symbols.c:881 msgid "Processes / Blocks / Components" msgstr "תהליכים / בלוקים / רכיבים" -#: ../src/symbols.c:882 +#: ../src/symbols.c:889 msgid "Events" msgstr "אירועים" -#: ../src/symbols.c:884 +#: ../src/symbols.c:891 msgid "Functions / Tasks" msgstr "פונקציות/משימות" -#: ../src/symbols.c:897 ../src/symbols.c:998 +#: ../src/symbols.c:904 ../src/symbols.c:1005 msgid "Members" msgstr "משתמשים" -#: ../src/symbols.c:947 +#: ../src/symbols.c:916 +msgid "Properties" +msgstr "מאפיינים" + +#: ../src/symbols.c:954 msgid "Subroutines" msgstr "שגרות" -#: ../src/symbols.c:950 +#: ../src/symbols.c:957 msgid "Blocks" msgstr "בלוקים" -#: ../src/symbols.c:959 ../src/symbols.c:968 ../src/symbols.c:1006 +#: ../src/symbols.c:966 ../src/symbols.c:975 ../src/symbols.c:1013 msgid "Macros" msgstr "הגדרות מאקרו" -#: ../src/symbols.c:960 +#: ../src/symbols.c:967 msgid "Defines" msgstr "הגדרות Define" -#: ../src/symbols.c:967 +#: ../src/symbols.c:974 msgid "Targets" msgstr "מטרות" -#: ../src/symbols.c:976 +#: ../src/symbols.c:983 msgid "Indexes" msgstr "אינדקסים" -#: ../src/symbols.c:977 +#: ../src/symbols.c:984 msgid "Tables" msgstr "לוחות" -#: ../src/symbols.c:978 +#: ../src/symbols.c:985 msgid "Triggers" msgstr "Triggers" -#: ../src/symbols.c:979 +#: ../src/symbols.c:986 msgid "Views" msgstr "תצוגות" -#: ../src/symbols.c:999 +#: ../src/symbols.c:1006 msgid "Structs" msgstr "מבנים" -#: ../src/symbols.c:1000 +#: ../src/symbols.c:1007 msgid "Typedefs / Enums" msgstr "Typedefs / Enums" -#: ../src/symbols.c:1764 +#: ../src/symbols.c:1771 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "סיומת הקובץ \"%s\" לא מוכרת.\n" -#: ../src/symbols.c:1787 +#: ../src/symbols.c:1794 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "נכשל ניסיון יצירת תגיות לקובץ, אולי לא נמצאו תגיות.\n" -#: ../src/symbols.c:1794 +#: ../src/symbols.c:1801 #, c-format msgid "" "Usage: %s -g <Tag File> <File list>\n" @@ -4632,7 +4652,7 @@ msgstr "" "השתמש: %s -g <קובץ תג> <רשימת קבצים>\n" "\n" -#: ../src/symbols.c:1795 +#: ../src/symbols.c:1802 #, c-format msgid "" "Example:\n" @@ -4643,40 +4663,40 @@ msgstr "" "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1809 +#: ../src/symbols.c:1816 msgid "Load Tags" msgstr "טעינת תגיות" -#: ../src/symbols.c:1816 +#: ../src/symbols.c:1823 msgid "Geany tag files (*.*.tags)" msgstr "‏Geany קָבְצי תג (‎*.*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1836 +#: ../src/symbols.c:1843 #, c-format msgid "Loaded %s tags file '%s'." msgstr "טעינת %s קובץ תג '%s'." -#: ../src/symbols.c:1839 +#: ../src/symbols.c:1846 #, c-format msgid "Could not load tags file '%s'." msgstr "לא ניתן לטעון את קובץ התגיות '%s'." -#: ../src/symbols.c:1979 +#: ../src/symbols.c:1986 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "לא נמצאה הצהרה קודמת של \"%s\"." -#: ../src/symbols.c:1981 +#: ../src/symbols.c:1988 #, c-format msgid "Definition of \"%s\" not found." msgstr "לא נמצאה הגדרה קודמת של \"%s\"." -#: ../src/symbols.c:2363 +#: ../src/symbols.c:2370 msgid "Sort by _Name" msgstr "מיין ל_פי שם" -#: ../src/symbols.c:2370 +#: ../src/symbols.c:2377 msgid "Sort by _Appearance" msgstr "מיין ל_פי סדר הופעה" @@ -4824,8 +4844,7 @@ msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "" -"בחירת הפריטים המוצגים בסרגל הכלים. ניתן לבחור פריטים חדשים על ידי גרירה " -"ושחרור." +"בחירת הפריטים להצגה בסרגל הכלים. ניתן לבחור פריטים חדשים על ידי גרירה ושחרור." #: ../src/toolbar.c:968 msgid "Available Items" @@ -4927,11 +4946,11 @@ msgstr "הצגת רשימת המסמ_כים" #: ../src/sidebar.c:613 ../plugins/filebrowser.c:659 msgid "H_ide Sidebar" -msgstr "הסתרת ה_סרגל הצידי" +msgstr "הסתרת ה_סרגל הצדי" #: ../src/sidebar.c:718 ../plugins/filebrowser.c:630 -msgid "_Find in Files" -msgstr "חיפוש בק_ובץ" +msgid "_Find in Files..." +msgstr "חיפוש בק_בצים..." #: ../src/sidebar.c:728 msgid "Show _Paths" @@ -5016,23 +5035,23 @@ msgstr "C++ STL" msgid "_Set Custom Date Format" msgstr "הגדרת תבני_ת תאריך מותאמת אישית" -#: ../src/ui_utils.c:1735 +#: ../src/ui_utils.c:1740 msgid "Select Folder" msgstr "בחירת תיקייה" -#: ../src/ui_utils.c:1735 +#: ../src/ui_utils.c:1740 msgid "Select File" msgstr "בחירת קובץ" -#: ../src/ui_utils.c:1890 +#: ../src/ui_utils.c:1895 msgid "Save All" msgstr "שמירת הכל" -#: ../src/ui_utils.c:1891 +#: ../src/ui_utils.c:1896 msgid "Close All" msgstr "סגירת הכל" -#: ../src/ui_utils.c:2124 +#: ../src/ui_utils.c:2129 msgid "Geany cannot start!" msgstr "‫Geany לא יכול לרוץ !" @@ -5191,16 +5210,16 @@ msgid "Create Cla_ss" msgstr "יצירת _מחלקה" #: ../plugins/classbuilder.c:1097 -msgid "_C++ Class" -msgstr "מחל_קת ‪C++" +msgid "_C++ Class..." +msgstr "מחל_קת ‪C++..." #: ../plugins/classbuilder.c:1100 -msgid "_GTK+ Class" -msgstr "מחלקת ‪G_TK+" +msgid "_GTK+ Class..." +msgstr "מחלקת ‪G_TK+..." #: ../plugins/classbuilder.c:1103 -msgid "_PHP Class" -msgstr "מחלק_ת PHP" +msgid "_PHP Class..." +msgstr "מחלק_ת PHP..." #: ../plugins/htmlchars.c:40 msgid "HTML Characters" @@ -5249,7 +5268,7 @@ msgid "Miscellaneous characters" msgstr "תווים שונים" #: ../plugins/htmlchars.c:369 ../plugins/filebrowser.c:1153 -#: ../plugins/saveactions.c:475 +#: ../plugins/saveactions.c:476 msgid "Plugin configuration directory could not be created." msgstr "לא ניתן ליצור את תיקיית תצורת התוסף." @@ -5278,8 +5297,8 @@ msgid "HTML (name)" msgstr "HTML" #: ../plugins/htmlchars.c:739 -msgid "_Insert Special HTML Characters" -msgstr "הכנסת תווי H_TML מיוחדים" +msgid "_Insert Special HTML Characters..." +msgstr "הכנסת תווי H_TML מיוחדים..." #. Add menuitem for html replacement functions #: ../plugins/htmlchars.c:754 @@ -5338,7 +5357,7 @@ msgstr "מעבד את גודל הגופן של המסמך הנוכחי, יחד #: ../plugins/export.c:280 #, c-format msgid "Document successfully exported as '%s'." -msgstr "המסמך יוצא בהצלחה ל-'%s'." +msgstr "המסמך יוצא בהצלחה ל־'%s'." #: ../plugins/export.c:282 #, c-format @@ -5356,13 +5375,13 @@ msgstr "יִ_צּוא" #. HTML #: ../plugins/export.c:787 -msgid "As _HTML" -msgstr "ל-H_TML" +msgid "As _HTML..." +msgstr "ל־H_TML..." #. LaTeX #: ../plugins/export.c:793 -msgid "As _LaTeX" -msgstr "ל-La_TeX" +msgid "As _LaTeX..." +msgstr "ל־La_TeX..." #: ../plugins/filebrowser.c:45 msgid "File Browser" @@ -5370,7 +5389,7 @@ msgstr "סייר קבצים" #: ../plugins/filebrowser.c:45 msgid "Adds a file browser tab to the sidebar." -msgstr "הוספת סייר קבצים לסרגל הצידי." +msgstr "הוספת סייר קבצים לסרגל הצדי." #: ../plugins/filebrowser.c:369 msgid "Too many items selected!" @@ -5382,8 +5401,8 @@ msgid "Could not execute configured external command '%s' (%s)." msgstr "פקודת התצורה '%s' לא ניתנת לביצוע (%s)." #: ../plugins/filebrowser.c:615 -msgid "Open _externally" -msgstr "פתיח_ה חיצונית" +msgid "Open _Externally" +msgstr "פתיח_ה חיצונית..." #: ../plugins/filebrowser.c:640 msgid "Show _Hidden Files" @@ -5475,17 +5494,17 @@ msgid "Backup Copy: Directory could not be created (%s)." msgstr "גיבוי: לא הייתה אפשרות ליצור את התיקייה (%s)." #. it's unlikely that this happens -#: ../plugins/saveactions.c:203 +#: ../plugins/saveactions.c:204 #, c-format msgid "Backup Copy: File could not be read (%s)." msgstr "גיבוי: לא היה ניתן לקרוא את הקובץ (%s)." -#: ../plugins/saveactions.c:221 +#: ../plugins/saveactions.c:222 #, c-format msgid "Backup Copy: File could not be saved (%s)." msgstr "גיבוי: לא היה ניתן לשמור את הקובץ (%s)." -#: ../plugins/saveactions.c:313 +#: ../plugins/saveactions.c:314 #, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." @@ -5493,64 +5512,64 @@ msgstr[0] "שמירה אוטומטית: קובץ אחד נשמר אוטומטי msgstr[1] "שמירה אוטומטית: %d קבצים נשמרו אוטומטית." #. initialize the dialog -#: ../plugins/saveactions.c:382 +#: ../plugins/saveactions.c:383 msgid "Select Directory" msgstr "בחירת תיקייה" -#: ../plugins/saveactions.c:467 +#: ../plugins/saveactions.c:468 msgid "Backup directory does not exist or is not writable." msgstr "תיקיית הגיבוי לא קיימת או שאינה ניתנת לכתיבה." -#: ../plugins/saveactions.c:548 +#: ../plugins/saveactions.c:549 msgid "Auto Save" msgstr "שמירה אוטומטית" -#: ../plugins/saveactions.c:550 ../plugins/saveactions.c:612 -#: ../plugins/saveactions.c:653 +#: ../plugins/saveactions.c:551 ../plugins/saveactions.c:613 +#: ../plugins/saveactions.c:654 msgid "_Enable" msgstr "לאפש_ר שמירה אוטומטית" -#: ../plugins/saveactions.c:558 +#: ../plugins/saveactions.c:559 msgid "Auto save _interval:" msgstr "תדירו_ת שמירה אוטומטית:" -#: ../plugins/saveactions.c:566 +#: ../plugins/saveactions.c:567 msgid "seconds" msgstr "שניות" -#: ../plugins/saveactions.c:575 +#: ../plugins/saveactions.c:576 msgid "_Print status message if files have been automatically saved" -msgstr "הדפסת הודעות שמירת ק_בצים בשורת הקבצים אם הקבצים נשמרו אוטומטית." +msgstr "הדפסת הודעות שמירת ק_בצים בשורת הקבצים אם הקבצים נשמרו אוטומטית" -#: ../plugins/saveactions.c:583 +#: ../plugins/saveactions.c:584 msgid "Save only current open _file" msgstr "שמירת הקובץ ה_פתוח הנוכחי בלבד" -#: ../plugins/saveactions.c:590 +#: ../plugins/saveactions.c:591 msgid "Sa_ve all open files" msgstr "שמירת _כל הקבצים הפתוחים" -#: ../plugins/saveactions.c:610 +#: ../plugins/saveactions.c:611 msgid "Instant Save" msgstr "שמירה מיידית" -#: ../plugins/saveactions.c:620 +#: ../plugins/saveactions.c:621 msgid "_Filetype to use for newly opened files:" msgstr "סוג הקו_בץ לשימוש קבצים חדשים שנפתחו:" -#: ../plugins/saveactions.c:651 +#: ../plugins/saveactions.c:652 msgid "Backup Copy" msgstr "גיבוי" -#: ../plugins/saveactions.c:661 +#: ../plugins/saveactions.c:662 msgid "_Directory to save backup files in:" msgstr "תיקייה לשמי_רת קָבְצי הגיבוי:" -#: ../plugins/saveactions.c:684 +#: ../plugins/saveactions.c:685 msgid "Date/_Time format for backup files (\"man strftime\" for details):" msgstr "תבנית תאריך/זמן ל_שמירת קָבְצי גיבוי (\"man strftime\" לפרטים נוספים):" -#: ../plugins/saveactions.c:697 +#: ../plugins/saveactions.c:698 msgid "Directory _levels to include in the backup destination:" msgstr "ר_מות התיקייה להכללה בתיקיית הגיבוי:" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 72c809: Use Glade to create the File Properties dialog
by Colomban Wendling 20 May '13

20 May '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 20 May 2013 02:12:44 UTC Commit: 72c809f633c20ba4f552fa199defc9b0ddd8da09 https://github.com/geany/geany/commit/72c809f633c20ba4f552fa199defc9b0ddd8d… Log Message: ----------- Use Glade to create the File Properties dialog Modified Paths: -------------- data/geany.glade src/dialogs.c Modified: data/geany.glade 605 files changed, 605 insertions(+), 0 deletions(-) =================================================================== @@ -7251,6 +7251,611 @@ <action-widget response="-5">okbutton1</action-widget> </action-widgets> </object> + <object class="GtkDialog" id="properties_dialog"> + <property name="can_focus">False</property> + <property name="border_width">5</property> + <property name="default_width">300</property> + <property name="type_hint">dialog</property> + <property name="transient_for">window1</property> + <signal name="delete-event" handler="gtk_widget_hide_on_delete" swapped="no"/> + <signal name="response" handler="gtk_widget_hide" swapped="no"/> + <child internal-child="vbox"> + <object class="GtkVBox" id="dialog-vbox4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">2</property> + <child internal-child="action_area"> + <object class="GtkHButtonBox" id="dialog-action_area5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="button1"> + <property name="label">gtk-close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">6</property> + <property name="spacing">12</property> + <child> + <object class="GtkHBox" id="hbox3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkImage" id="file_type_image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="stock">gtk-file</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="file_name_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">file name</property> + <property name="selectable">True</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkTable" id="table3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="n_rows">8</property> + <property name="n_columns">2</property> + <property name="column_spacing">10</property> + <property name="row_spacing">10</property> + <child> + <object class="GtkLabel" id="label6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Type:</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + <child> + <object class="GtkLabel" id="file_type_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">file type</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Size:</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Location:</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Read-only:</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Encoding:</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label12"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Modified:</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label13"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Changed:</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label14"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Accessed:</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="top_attach">7</property> + <property name="bottom_attach">8</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="file_size_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">file size</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="file_location_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">file path</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="file_read_only_check"> + <property name="label" translatable="yes">(only inside Geany)</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="receives_default">False</property> + <property name="focus_on_click">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="file_encoding_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">file encoding</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="file_modified_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">file mdate</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="file_changed_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">file cdate</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="file_accessed_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">file adate</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">7</property> + <property name="bottom_attach">8</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkTable" id="table5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="n_rows">5</property> + <property name="n_columns">4</property> + <property name="column_spacing">5</property> + <property name="row_spacing">5</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkLabel" id="label15"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Permissions:</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="right_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label16"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Read:</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label17"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Write:</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label18"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Execute:</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label20"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Owner:</property> + </object> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label21"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Group:</property> + </object> + <packing> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label22"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Other:</property> + </object> + <packing> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="file_perm_owner_r_check"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="focus_on_click">False</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="file_perm_owner_w_check"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="focus_on_click">False</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="file_perm_owner_x_check"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="focus_on_click">False</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="file_perm_group_r_check"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="focus_on_click">False</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="file_perm_group_w_check"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="focus_on_click">False</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="file_perm_group_x_check"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="focus_on_click">False</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="file_perm_other_r_check"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="focus_on_click">False</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="file_perm_other_w_check"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="focus_on_click">False</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="file_perm_other_x_check"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="focus_on_click">False</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + <action-widgets> + <action-widget response="0">button1</action-widget> + </action-widgets> + </object> <object class="GtkListStore" id="tab_pos_list"> <columns>  Modified: src/dialogs.c 302 files changed, 33 insertions(+), 269 deletions(-) =================================================================== @@ -1143,7 +1143,7 @@ gboolean dialogs_show_input_numeric(const gchar *title, const gchar *label_text, void dialogs_show_file_properties(GeanyDocument *doc) { - GtkWidget *dialog, *label, *table, *hbox, *image, *perm_table, *check, *vbox; + GtkWidget *dialog, *label, *image, *check; gchar *file_size, *title, *base_name, *time_changed, *time_modified, *time_accessed, *enctext; gchar *short_name; GdkPixbuf *pixbuf; @@ -1210,311 +1210,75 @@ void dialogs_show_file_properties(GeanyDocument *doc) base_name = g_path_get_basename(doc->file_name); short_name = utils_str_middle_truncate(base_name, 30); title = g_strdup_printf(_("%s Properties"), short_name); - dialog = gtk_dialog_new_with_buttons(title, GTK_WINDOW(main_widgets.window), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL, NULL); + dialog = ui_builder_get_object("properties_dialog"); + gtk_window_set_title(GTK_WINDOW(dialog), title); g_free(short_name); g_free(title); gtk_widget_set_name(dialog, "GeanyDialog"); - vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); - g_signal_connect(dialog, "response", G_CALLBACK(gtk_widget_destroy), NULL); - g_signal_connect(dialog, "delete-event", G_CALLBACK(gtk_widget_destroy), NULL); + label = ui_lookup_widget(dialog, "file_name_label"); + gtk_label_set_text(GTK_LABEL(label), base_name); - gtk_window_set_default_size(GTK_WINDOW(dialog), 300, -1); - - label = ui_label_new_bold(base_name); - gtk_label_set_selectable(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + image = ui_lookup_widget(dialog, "file_type_image"); pixbuf = ui_get_mime_icon(doc->file_type->mime_type, GTK_ICON_SIZE_BUTTON); - image = gtk_image_new_from_pixbuf(pixbuf); + gtk_image_set_from_pixbuf(GTK_IMAGE(image), pixbuf); g_object_unref(pixbuf); - gtk_misc_set_alignment(GTK_MISC(image), 1.0, 0.5); - hbox = gtk_hbox_new(FALSE, 6); - gtk_label_set_use_markup(GTK_LABEL(label), TRUE); - gtk_box_pack_start(GTK_BOX(hbox), image, TRUE, TRUE, 0); - gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0); - gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0); - - table = gtk_table_new(8, 2, FALSE); - gtk_table_set_row_spacings(GTK_TABLE(table), 10); - gtk_table_set_col_spacings(GTK_TABLE(table), 10); - - label = gtk_label_new(_("<b>Type:</b>")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_label_set_use_markup(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0); - label = gtk_label_new(doc->file_type->title); - gtk_label_set_selectable(GTK_LABEL(label), TRUE); - gtk_table_attach(GTK_TABLE(table), label, 1, 2, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0); - - label = gtk_label_new(_("<b>Size:</b>")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_label_set_use_markup(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0); + label = ui_lookup_widget(dialog, "file_type_label"); + gtk_label_set_text(GTK_LABEL(label), doc->file_type->title); + label = ui_lookup_widget(dialog, "file_size_label"); file_size = utils_make_human_readable_str(filesize, 1, 0); - label = gtk_label_new(file_size); - gtk_label_set_selectable(GTK_LABEL(label), TRUE); - gtk_table_attach(GTK_TABLE(table), label, 1, 2, 1, 2, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + gtk_label_set_text(GTK_LABEL(label), file_size); g_free(file_size); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0); - label = gtk_label_new(_("<b>Location:</b>")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_label_set_use_markup(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0); - - label = gtk_label_new(doc->file_name); - gtk_label_set_selectable(GTK_LABEL(label), TRUE); - gtk_table_attach(GTK_TABLE(table), label, 1, 2, 2, 3, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0); - - label = gtk_label_new(_("<b>Read-only:</b>")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_label_set_use_markup(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0); + label = ui_lookup_widget(dialog, "file_location_label"); + gtk_label_set_text(GTK_LABEL(label), doc->file_name); - check = gtk_check_button_new_with_label(_("(only inside Geany)")); - gtk_widget_set_sensitive(check, FALSE); - gtk_button_set_focus_on_click(GTK_BUTTON(check), FALSE); + check = ui_lookup_widget(dialog, "file_read_only_check"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), doc->readonly); - gtk_table_attach(GTK_TABLE(table), check, 1, 2, 3, 4, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_button_set_alignment(GTK_BUTTON(check), 0.0, 0); - - label = gtk_label_new(_("<b>Encoding:</b>")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 4, 5, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_label_set_use_markup(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0); + label = ui_lookup_widget(dialog, "file_encoding_label"); enctext = g_strdup_printf("%s %s", doc->encoding, (encodings_is_unicode_charset(doc->encoding)) ? ((doc->has_bom) ? _("(with BOM)") : _("(without BOM)")) : ""); - - label = gtk_label_new(enctext); - gtk_label_set_selectable(GTK_LABEL(label), TRUE); + gtk_label_set_text(GTK_LABEL(label), enctext); g_free(enctext); - gtk_table_attach(GTK_TABLE(table), label, 1, 2, 4, 5, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0); - - label = gtk_label_new(_("<b>Modified:</b>")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 5, 6, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_label_set_use_markup(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0); - - label = gtk_label_new(time_modified); - gtk_label_set_selectable(GTK_LABEL(label), TRUE); - gtk_table_attach(GTK_TABLE(table), label, 1, 2, 5, 6, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0); - - label = gtk_label_new(_("<b>Changed:</b>")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 6, 7, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_label_set_use_markup(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0); - - label = gtk_label_new(time_changed); - gtk_label_set_selectable(GTK_LABEL(label), TRUE); - gtk_table_attach(GTK_TABLE(table), label, 1, 2, 6, 7, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + label = ui_lookup_widget(dialog, "file_modified_label"); + gtk_label_set_text(GTK_LABEL(label), time_modified); + label = ui_lookup_widget(dialog, "file_changed_label"); + gtk_label_set_text(GTK_LABEL(label), time_changed); + label = ui_lookup_widget(dialog, "file_accessed_label"); + gtk_label_set_text(GTK_LABEL(label), time_accessed); - label = gtk_label_new(_("<b>Accessed:</b>")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 7, 8, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_label_set_use_markup(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0); - - label = gtk_label_new(time_accessed); - gtk_label_set_selectable(GTK_LABEL(label), TRUE); - gtk_table_attach(GTK_TABLE(table), label, 1, 2, 7, 8, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0); - - /* add table */ - gtk_box_pack_start(GTK_BOX(vbox), table, TRUE, TRUE, 0); - - /* create table with the permissions */ - perm_table = gtk_table_new(5, 4, TRUE); - gtk_table_set_row_spacings(GTK_TABLE(perm_table), 5); - gtk_table_set_col_spacings(GTK_TABLE(perm_table), 5); - - label = gtk_label_new(_("<b>Permissions:</b>")); - gtk_label_set_use_markup(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - gtk_table_attach(GTK_TABLE(perm_table), label, 0, 4, 0, 1, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - - /* Header */ - label = gtk_label_new(_("Read:")); - gtk_table_attach(GTK_TABLE(perm_table), label, 1, 2, 1, 2, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_label_set_use_markup(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0); - - label = gtk_label_new(_("Write:")); - gtk_table_attach(GTK_TABLE(perm_table), label, 2, 3, 1, 2, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_label_set_use_markup(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0); - - label = gtk_label_new(_("Execute:")); - gtk_table_attach(GTK_TABLE(perm_table), label, 3, 4, 1, 2, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_label_set_use_markup(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0); - - /* Owner */ - label = gtk_label_new(_("Owner:")); - gtk_table_attach(GTK_TABLE(perm_table), label, 0, 1, 2, 3, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_label_set_use_markup(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0); - - check = gtk_check_button_new(); - gtk_widget_set_sensitive(check, FALSE); - gtk_button_set_focus_on_click(GTK_BUTTON(check), FALSE); + /* permissions */ + check = ui_lookup_widget(dialog, "file_perm_owner_r_check"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), mode & S_IRUSR); - gtk_table_attach(GTK_TABLE(perm_table), check, 1, 2, 2, 3, - (GtkAttachOptions) (GTK_EXPAND | GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_button_set_alignment(GTK_BUTTON(check), 0.5, 0); - - check = gtk_check_button_new(); - gtk_widget_set_sensitive(check, FALSE); - gtk_button_set_focus_on_click(GTK_BUTTON(check), FALSE); + check = ui_lookup_widget(dialog, "file_perm_owner_w_check"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), mode & S_IWUSR); - gtk_table_attach(GTK_TABLE(perm_table), check, 2, 3, 2, 3, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_button_set_alignment(GTK_BUTTON(check), 0.5, 0); - - check = gtk_check_button_new(); - gtk_widget_set_sensitive(check, FALSE); - gtk_button_set_focus_on_click(GTK_BUTTON(check), FALSE); + check = ui_lookup_widget(dialog, "file_perm_owner_x_check"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), mode & S_IXUSR); - gtk_table_attach(GTK_TABLE(perm_table), check, 3, 4, 2, 3, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_button_set_alignment(GTK_BUTTON(check), 0.5, 0); - - - /* Group */ - label = gtk_label_new(_("Group:")); - gtk_table_attach(GTK_TABLE(perm_table), label, 0, 1, 3, 4, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_label_set_use_markup(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0); - - check = gtk_check_button_new(); - gtk_widget_set_sensitive(check, FALSE); - gtk_button_set_focus_on_click(GTK_BUTTON(check), FALSE); + check = ui_lookup_widget(dialog, "file_perm_group_r_check"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), mode & S_IRGRP); - gtk_table_attach(GTK_TABLE(perm_table), check, 1, 2, 3, 4, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_button_set_alignment(GTK_BUTTON(check), 0.5, 0); - - check = gtk_check_button_new(); - gtk_widget_set_sensitive(check, FALSE); - gtk_button_set_focus_on_click(GTK_BUTTON(check), FALSE); + check = ui_lookup_widget(dialog, "file_perm_group_w_check"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), mode & S_IWGRP); - gtk_table_attach(GTK_TABLE(perm_table), check, 2, 3, 3, 4, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_button_set_alignment(GTK_BUTTON(check), 0.5, 0); - - check = gtk_check_button_new(); - gtk_widget_set_sensitive(check, FALSE); - gtk_button_set_focus_on_click(GTK_BUTTON(check), FALSE); + check = ui_lookup_widget(dialog, "file_perm_group_x_check"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), mode & S_IXGRP); - gtk_table_attach(GTK_TABLE(perm_table), check, 3, 4, 3, 4, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_button_set_alignment(GTK_BUTTON(check), 0.5, 0); - - - /* Other */ - label = gtk_label_new(_("Other:")); - gtk_table_attach(GTK_TABLE(perm_table), label, 0, 1, 4, 5, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_label_set_use_markup(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0); - - check = gtk_check_button_new(); - gtk_widget_set_sensitive(check, FALSE); - gtk_button_set_focus_on_click(GTK_BUTTON(check), FALSE); + check = ui_lookup_widget(dialog, "file_perm_other_r_check"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), mode & S_IROTH); - gtk_table_attach(GTK_TABLE(perm_table), check, 1, 2, 4, 5, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_button_set_alignment(GTK_BUTTON(check), 0.5, 0); - - check = gtk_check_button_new(); - gtk_widget_set_sensitive(check, FALSE); - gtk_button_set_focus_on_click(GTK_BUTTON(check), FALSE); + check = ui_lookup_widget(dialog, "file_perm_other_w_check"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), mode & S_IWOTH); - gtk_table_attach(GTK_TABLE(perm_table), check, 2, 3, 4, 5, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_button_set_alignment(GTK_BUTTON(check), 0.5, 0); - - check = gtk_check_button_new(); - gtk_widget_set_sensitive(check, FALSE); - gtk_button_set_focus_on_click(GTK_BUTTON(check), FALSE); + check = ui_lookup_widget(dialog, "file_perm_other_x_check"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), mode & S_IXOTH); - gtk_table_attach(GTK_TABLE(perm_table), check, 3, 4, 4, 5, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_button_set_alignment(GTK_BUTTON(check), 0.5, 0); - - gtk_box_pack_start(GTK_BOX(vbox), perm_table ,TRUE, TRUE, 0); g_free(base_name); g_free(time_changed); g_free(time_modified); g_free(time_accessed); - gtk_widget_show_all(dialog); + gtk_widget_show(dialog); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 2e9a17: Fix internationalization of the File Properties dialog title
by Colomban Wendling 20 May '13

20 May '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 19 May 2013 23:50:02 UTC Commit: 2e9a1753d7b11e2f7acf630fe2a4895727130b72 https://github.com/geany/geany/commit/2e9a1753d7b11e2f7acf630fe2a4895727130… Log Message: ----------- Fix internationalization of the File Properties dialog title Modified Paths: -------------- src/dialogs.c Modified: src/dialogs.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1209,7 +1209,7 @@ void dialogs_show_file_properties(GeanyDocument *doc) base_name = g_path_get_basename(doc->file_name); short_name = utils_str_middle_truncate(base_name, 30); - title = g_strconcat(short_name, " ", _("Properties"), NULL); + title = g_strdup_printf(_("%s Properties"), short_name); dialog = gtk_dialog_new_with_buttons(title, GTK_WINDOW(main_widgets.window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL, NULL); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 5608b2: Small update of the French translation
by Colomban Wendling 20 May '13

20 May '13

1 0

[geany/geany] 9652a3: Add ellipsis to menu items requiring further user input
by Colomban Wendling 19 May '13

19 May '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 19 May 2013 21:15:38 UTC Commit: 9652a34ef0d7df831d2636e499fea8ee91d83121 https://github.com/geany/geany/commit/9652a34ef0d7df831d2636e499fea8ee91d83… Log Message: ----------- Add ellipsis to menu items requiring further user input This is a very common paradigm used by GNOME, KDE, MacOSX, Windows, etc., and following it makes our UI more consistent with these and easier to use by their users. https://developer.gnome.org/hig-book/stable/menus-design.html.en#menu-item-… Closes #3613494. Modified Paths: -------------- data/geany.glade plugins/classbuilder.c plugins/export.c plugins/filebrowser.c plugins/htmlchars.c src/build.c src/sidebar.c src/symbols.c Modified: data/geany.glade 66 files changed, 47 insertions(+), 19 deletions(-) =================================================================== @@ -458,6 +458,30 @@ <property name="stock">gtk-select-color</property> <property name="icon-size">1</property> </object> + <object class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-open</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-save-as</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-print</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-find</property> + <property name="icon-size">1</property> + </object> <object class="GtkImage" id="image4060"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -7346,12 +7370,13 @@ </child> <child> <object class="GtkImageMenuItem" id="menu_open1"> - <property name="label">gtk-open</property> + <property name="label" translatable="yes">_Open...</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> - <property name="use_stock">True</property> + <property name="image">image3</property> + <property name="use_stock">False</property> <signal name="activate" handler="on_open1_activate" swapped="no"/> </object> </child> @@ -7393,12 +7418,13 @@ </child> <child> <object class="GtkImageMenuItem" id="menu_save_as1"> - <property name="label">gtk-save-as</property> + <property name="label" translatable="yes">Save _As...</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> - <property name="use_stock">True</property> + <property name="image">image4</property> + <property name="use_stock">False</property> <signal name="activate" handler="on_save_as1_activate" swapped="no"/> </object> </child> @@ -7485,12 +7511,13 @@ </child> <child> <object class="GtkImageMenuItem" id="print1"> - <property name="label">gtk-print</property> + <property name="label" translatable="yes">_Print...</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> - <property name="use_stock">True</property> + <property name="image">image5</property> + <property name="use_stock">False</property> <signal name="activate" handler="on_print1_activate" swapped="no"/> </object> </child> @@ -8119,12 +8146,13 @@ <property name="can_focus">False</property> <child> <object class="GtkImageMenuItem" id="find1"> - <property name="label">gtk-find</property> + <property name="label" translatable="yes">_Find...</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> - <property name="use_stock">True</property> + <property name="image">image6</property> + <property name="use_stock">False</property> <signal name="activate" handler="on_find1_activate" swapped="no"/> </object> </child> @@ -8156,7 +8184,7 @@ </child> <child> <object class="GtkImageMenuItem" id="find_in_files1"> - <property name="label" translatable="yes">Find in F_iles</property> + <property name="label" translatable="yes">Find in F_iles...</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> @@ -8168,7 +8196,7 @@ </child> <child> <object class="GtkImageMenuItem" id="replace1"> - <property name="label" translatable="yes">_Replace</property> + <property name="label" translatable="yes">_Replace...</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> @@ -8242,7 +8270,7 @@ </child> <child> <object class="GtkImageMenuItem" id="go_to_line1"> - <property name="label" translatable="yes">_Go to Line</property> + <property name="label" translatable="yes">_Go to Line...</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> @@ -8370,7 +8398,7 @@ <property name="can_focus">False</property> <child> <object class="GtkImageMenuItem" id="menu_change_font1"> - <property name="label" translatable="yes">Change _Font</property> + <property name="label" translatable="yes">Change _Font...</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> @@ -8382,7 +8410,7 @@ </child> <child> <object class="GtkImageMenuItem" id="menu_color_schemes"> - <property name="label" translatable="yes">Change _Color Scheme</property> + <property name="label" translatable="yes">Change _Color Scheme...</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> @@ -8940,7 +8968,7 @@ <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Replace Spaces b_y Tabs</property> + <property name="label" translatable="yes">Replace Spaces b_y Tabs...</property> <property name="use_underline">True</property> <signal name="activate" handler="on_replace_spaces_activate" swapped="no"/> </object> @@ -9014,7 +9042,7 @@ <property name="can_focus">False</property> <child> <object class="GtkImageMenuItem" id="project_new1"> - <property name="label" translatable="yes">_New</property> + <property name="label" translatable="yes">_New...</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> @@ -9026,7 +9054,7 @@ </child> <child> <object class="GtkImageMenuItem" id="project_open1"> - <property name="label" translatable="yes">_Open</property> + <property name="label" translatable="yes">_Open...</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> @@ -9170,7 +9198,7 @@ <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Load Ta_gs</property> + <property name="label" translatable="yes">Load Ta_gs...</property> <property name="use_underline">True</property> <signal name="activate" handler="on_load_tags1_activate" swapped="no"/> </object> @@ -9253,7 +9281,7 @@ <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Report a _Bug</property> + <property name="label" translatable="yes">Report a _Bug...</property> <property name="use_underline">True</property> <signal name="activate" handler="on_help_menu_item_bug_report_activate" swapped="no"/> </object> @@ -9263,7 +9291,7 @@ <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Donate</property> + <property name="label" translatable="yes">_Donate...</property> <property name="use_underline">True</property> <signal name="activate" handler="on_help_menu_item_donate_activate" swapped="no"/> </object> Modified: plugins/classbuilder.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -1094,13 +1094,13 @@ void plugin_init(GeanyData *data) menu_create_class1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_create_class1), menu_create_class1_menu); - menu_create_cpp_class = gtk_menu_item_new_with_mnemonic (_("_C++ Class")); + menu_create_cpp_class = gtk_menu_item_new_with_mnemonic (_("_C++ Class...")); gtk_container_add (GTK_CONTAINER (menu_create_class1_menu), menu_create_cpp_class); - menu_create_gtk_class = gtk_menu_item_new_with_mnemonic (_("_GTK+ Class")); + menu_create_gtk_class = gtk_menu_item_new_with_mnemonic (_("_GTK+ Class...")); gtk_container_add (GTK_CONTAINER (menu_create_class1_menu), menu_create_gtk_class); - menu_create_php_class = gtk_menu_item_new_with_mnemonic (_("_PHP Class")); + menu_create_php_class = gtk_menu_item_new_with_mnemonic (_("_PHP Class...")); gtk_container_add (GTK_CONTAINER (menu_create_class1_menu), menu_create_php_class); g_signal_connect(menu_create_cpp_class, "activate", Modified: plugins/export.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -784,13 +784,13 @@ void plugin_init(GeanyData *data) gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_export), menu_export_menu); /* HTML */ - menu_create_html = gtk_menu_item_new_with_mnemonic(_("As _HTML")); + menu_create_html = gtk_menu_item_new_with_mnemonic(_("As _HTML...")); gtk_container_add(GTK_CONTAINER (menu_export_menu), menu_create_html); g_signal_connect(menu_create_html, "activate", G_CALLBACK(on_menu_create_html_activate), NULL); /* LaTeX */ - menu_create_latex = gtk_menu_item_new_with_mnemonic(_("As _LaTeX")); + menu_create_latex = gtk_menu_item_new_with_mnemonic(_("As _LaTeX...")); gtk_container_add(GTK_CONTAINER (menu_export_menu), menu_create_latex); g_signal_connect(menu_create_latex, "activate", Modified: plugins/filebrowser.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -627,7 +627,7 @@ static GtkWidget *create_popup_menu(void) gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect(item, "activate", G_CALLBACK(refresh), NULL); - item = ui_image_menu_item_new(GTK_STOCK_FIND, _("_Find in Files")); + item = ui_image_menu_item_new(GTK_STOCK_FIND, _("_Find in Files...")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect(item, "activate", G_CALLBACK(on_find_in_files), NULL); Modified: plugins/htmlchars.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -736,7 +736,7 @@ static void init_configuration(void) void plugin_init(GeanyData *data) { GtkWidget *menu_item; - const gchar *menu_text = _("_Insert Special HTML Characters"); + const gchar *menu_text = _("_Insert Special HTML Characters..."); /* First we catch the configuration and initialize them */ init_configuration(); Modified: src/build.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -2601,7 +2601,7 @@ void build_load_menu(GKeyFile *config, GeanyBuildSource src, gpointer p) { if (non_ft_pref == NULL) non_ft_pref = g_new0(GeanyBuildCommand, build_groups_count[GEANY_GBG_NON_FT]); - ASSIGNIF(non_ft_pref, GEANY_GBO_CUSTOM, _("Make Custom _Target"), + ASSIGNIF(non_ft_pref, GEANY_GBO_CUSTOM, _("Make Custom _Target..."), g_strdup_printf("%s ", value)); ASSIGNIF(non_ft_pref, GEANY_GBO_MAKE_OBJECT, _("Make _Object"), g_strdup_printf("%s %%e.o",value)); @@ -2792,7 +2792,7 @@ static void on_project_close(void) gint index; } default_cmds[] = { { N_("_Make"), "make", NULL, &non_ft_def, GBO_TO_CMD(GEANY_GBO_MAKE_ALL)}, - { N_("Make Custom _Target"), "make ", NULL, &non_ft_def, GBO_TO_CMD(GEANY_GBO_CUSTOM)}, + { N_("Make Custom _Target..."), "make ", NULL, &non_ft_def, GBO_TO_CMD(GEANY_GBO_CUSTOM)}, { N_("Make _Object"), "make %e.o", NULL, &non_ft_def, GBO_TO_CMD(GEANY_GBO_MAKE_OBJECT)}, { N_("_Execute"), "./%e", NULL, &exec_def, GBO_TO_CMD(GEANY_GBO_EXEC)}, { NULL, NULL, NULL, NULL, 0 } @@ -2846,7 +2846,7 @@ void build_init(void) widgets.toolitem_make_all = item; /* build the code with make custom */ - item = gtk_image_menu_item_new_with_mnemonic(_("Make Custom _Target")); + item = gtk_image_menu_item_new_with_mnemonic(_("Make Custom _Target...")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(toolmenu), item); g_signal_connect(item, "activate", G_CALLBACK(on_toolbutton_make_activate), Modified: src/sidebar.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -715,7 +715,7 @@ static void create_openfiles_popup_menu(void) gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), item); - item = ui_image_menu_item_new(GTK_STOCK_FIND, _("_Find in Files")); + item = ui_image_menu_item_new(GTK_STOCK_FIND, _("_Find in Files...")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), item); g_signal_connect(item, "activate", G_CALLBACK(on_find_in_files), NULL); Modified: src/symbols.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -2394,7 +2394,7 @@ static void create_taglist_popup_menu(void) gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect(item, "activate", G_CALLBACK(on_find_usage), symbol_menu.find_doc_usage); - symbol_menu.find_in_files = item = ui_image_menu_item_new(GTK_STOCK_FIND, _("Find in F_iles")); + symbol_menu.find_in_files = item = ui_image_menu_item_new(GTK_STOCK_FIND, _("Find in F_iles...")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect(item, "activate", G_CALLBACK(on_find_usage), NULL); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 4807ba: file browser: Fix capitalization in menu item
by Adam Dingle 19 May '13

19 May '13

Branch: refs/heads/master Author: Adam Dingle <adam(a)yorba.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 19 May 2013 21:15:19 UTC Commit: 4807ba6ce5b669d0e3265631138c226a54ac04bf https://github.com/geany/geany/commit/4807ba6ce5b669d0e3265631138c226a54ac0… Log Message: ----------- file browser: Fix capitalization in menu item Closes #3613558. Modified Paths: -------------- plugins/filebrowser.c Modified: plugins/filebrowser.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -612,7 +612,7 @@ static GtkWidget *create_popup_menu(void) g_signal_connect(item, "activate", G_CALLBACK(on_open_clicked), NULL); popup_items.open = item; - item = ui_image_menu_item_new(GTK_STOCK_OPEN, _("Open _externally")); + item = ui_image_menu_item_new(GTK_STOCK_OPEN, _("Open _Externally")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect(item, "activate", G_CALLBACK(on_external_open), NULL); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 8916a8: Merge NEWS from 1.23.1 release
by Colomban Wendling 19 May '13

19 May '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 19 May 2013 14:13:51 UTC Commit: 8916a8e09224fc9a12dc604305b6ab1c054f4bb0 https://github.com/geany/geany/commit/8916a8e09224fc9a12dc604305b6ab1c054f4… Log Message: ----------- Merge NEWS from 1.23.1 release Modified Paths: -------------- NEWS Modified: NEWS 8 files changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -7,6 +7,14 @@ Geany 1.24 (unreleased) * Fix custom GTK styles under KDE (#3607935). +Geany 1.23.1 (May 19, 2013) + + Bug fixes + * Fix custom styles under KDE and for people using gtk-chtheme + (corrects tab coloring, #3607935). + * Fix broken opening files from command line on Windows (#3613096). + + Geany 1.23 (March 10, 2013) General -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] b65284: Pre-release version bump for 1.23.1
by Colomban Wendling 19 May '13

19 May '13

Branch: refs/heads/1.23 Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 19 May 2013 13:11:41 UTC Commit: b65284d973219cec41ed6b8f9905c130eeb5721d https://github.com/geany/geany/commit/b65284d973219cec41ed6b8f9905c130eeb57… Log Message: ----------- Pre-release version bump for 1.23.1 Modified Paths: -------------- configure.ac doc/geany.1.in doc/geany.html doc/geany.txt geany.nsi geany_private.rc win32-config.h wscript Modified: configure.ac 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.60]) -AC_INIT([Geany], [1.23], +AC_INIT([Geany], [1.23.1], [https://sourceforge.net/tracker/?group_id=153444&atid=787791]) AC_CONFIG_SRCDIR([src/geany.h]) AC_CONFIG_AUX_DIR([build-aux]) Modified: doc/geany.1.in 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ -.TH "GEANY" "1" "March 10, 2013" "geany @VERSION@" "" +.TH "GEANY" "1" "May 19, 2013" "geany @VERSION@" "" .SH "NAME" Geany \(em a small and lightweight IDE .SH "SYNOPSIS" Modified: doc/geany.html 14 files changed, 7 insertions(+), 7 deletions(-) =================================================================== @@ -3,10 +3,10 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.8.1: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.10: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz Colomban Wendling Matthew Brush" /> -<meta name="date" content="2013-03-10" /> +<meta name="date" content="2013-05-19" /> <style type="text/css"> /* @@ -141,9 +141,9 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2> <br />Colomban Wendling <br />Matthew Brush</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2013-03-10</td></tr> +<td>2013-05-19</td></tr> <tr><th class="docinfo-name">Version:</th> -<td>1.23</td></tr> +<td>1.23.1</td></tr> </tbody> </table> <p>Copyright © 2005-2012</p> @@ -5696,7 +5696,7 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2> </tr> <tr><td>geanyversion</td> <td>The actual Geany version, e.g. -"Geany 1.23".</td> +"Geany 1.23.1".</td> <td>file templates, file header, function description, ChangeLog entry, bsd, gpl, snippets.</td> @@ -6028,7 +6028,7 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2> look, run "<tt class="docutils literal">make doc</tt>" in the subdirectory <tt class="docutils literal">doc</tt> of Geany's source directory. This regenerates the <tt class="docutils literal">geany.html</tt> file. To generate a PDF file, use the command "<tt class="docutils literal">make pdf</tt>" which should generate a file called -geany-1.23.pdf.</p> +geany-1.23.1.pdf.</p> <p>After you are happy with your changes, create a patch e.g. by using:</p> <pre class="literal-block"> % git diff geany.txt > foo.patch @@ -6836,7 +6836,7 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2> <div class="footer"> <hr class="footer" /> <a class="reference external" href="geany.txt">View document source</a>. -Generated on: 2013-03-10 12:45 UTC. +Generated on: 2013-05-19 13:09 UTC. Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: doc/geany.txt 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,4 +1,4 @@ -.. |(version)| replace:: 1.23 +.. |(version)| replace:: 1.23.1 ======= Geany @@ -13,7 +13,7 @@ Frank Lanitz, Colomban Wendling, Matthew Brush -:Date: 2013-03-10 +:Date: 2013-05-19 :Version: |(version)| Copyright © 2005-2012 Modified: geany.nsi 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -32,8 +32,8 @@ RequestExecutionLevel highest ; set execution level for Windows Vista ; helper defines ; ;;;;;;;;;;;;;;;;;;; !define PRODUCT_NAME "Geany" -!define PRODUCT_VERSION "1.23" -!define PRODUCT_VERSION_ID "1.23.0.0" +!define PRODUCT_VERSION "1.23.1" +!define PRODUCT_VERSION_ID "1.23.1.0" !define PRODUCT_PUBLISHER "The Geany developer team" !define PRODUCT_WEB_SITE "http://www.geany.org/" !define PRODUCT_DIR_REGKEY "Software\Geany" Modified: geany_private.rc 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,8 @@ #include <windows.h> // include for version info constants -#define VER_FILEVERSION 1,23,0,0 -#define VER_FILEVERSION_STR "1.23" +#define VER_FILEVERSION 1,23,1,0 +#define VER_FILEVERSION_STR "1.23.1" #define APP_MANIFEST 1 A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../icons/geany.ico" Modified: win32-config.h 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -314,7 +314,7 @@ /* #undef volatile */ /* Version number of package */ -#define VERSION "1.23" +#define VERSION "1.23.1" #define REVISION "-1" Modified: wscript 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -49,7 +49,7 @@ from waflib.TaskGen import feature APPNAME = 'geany' -VERSION = '1.23' +VERSION = '1.23.1' LINGUAS_FILE = 'po/LINGUAS' MINIMUM_GTK_VERSION = '2.16.0' MINIMUM_GLIB_VERSION = '2.20.0' -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2013