Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Mon, 11 Feb 2013 03:47:02 UTC Commit: a77ac1407a1285c21acf1745fb60ddfd5cf758d5 https://github.com/geany/geany/commit/a77ac1407a1285c21acf1745fb60ddfd5cf758...
Log Message: ----------- Merge branch 'master' into gtk3-support
Modified Paths: -------------- .gitignore NEWS THANKS data/filetype_extensions.conf data/filetypes.d data/geany.gtkrc po/de.po po/fi.po po/he.po po/hi.po po/sr.po po/sv.po scripts/plugin_test.c src/about.c src/document.c src/document.h src/ui_utils.c
Modified: .gitignore 2 files changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -45,6 +45,7 @@ Makefile.in /libtool /localwin32.mk /.lock-wscript +/.lock-wafbuild /ltmain.sh /m4/lt*.m4 /m4/intltool.m4 @@ -80,6 +81,7 @@ Makefile.in /po/*.sed /po/*.sin /po/stamp-it +/po/.intlcache
#----------------------------------------------------------------------- # /src/
Modified: NEWS 101 files changed, 100 insertions(+), 1 deletions(-) =================================================================== @@ -2,16 +2,115 @@ Geany 1.23 (unreleased)
General * Scope detection now finds classes and namespaces (#1996778). + * Various fixes to language theming. + * Various Windows makefile fixes. + * Rewrite printing code (#2629121, #2804000, #3475444, #3580268, + #3580269). + * Use the Geany icon from the theme. + * Make Geany-specific icons themeable.
Bug fixes * Fix too aggressive scope caching (#2142789, #2667917, #2868850). + * Fix showing project name in the Documents sidebar. + * Fix opening filenames with leading or trailing space from the + command line into a running instance. + * Fix re-opening files with unknown but detected encoding. + * Fix crash when loading a broken or incompatible VTE library. + * Report scope including classes, namespaces and alike (#1996778). + * Fix cancelling Project Close when showing the unsaved changes + dialog. + * Only use "allow_always_save" setting for direct user interaction + (Quentin Glidic). + + Interface + * Control-click on the symbols sidebar don't focus the editor. + * Add an option to place message window on the right. + * Fix display of non-ASCII tags in the symbols tree for non-UTF-8 + files. + * Replace 'Open file in a new tab' save dialog option with new + 'Document->Clone' menu item. + * Fix clashing button mnemonic in detect/reload dialog (#3587465). + * Grab focus in the embedded terminal upon middle click. + * Add support for embedded terminal background image (Mislav + Blažević).
Editor * Update Scintilla to version 3.2.3 (#2808638, #2909124, #3094431, #3233160, #3540469). + * Properly indent even if the indenting character isn't the last + one. + * Always display text in LTR direction. + * Improve collapsing fold behavior when start point is offscreen. + * Faster squiggle underlining. + * Fix multiline comments at end of file (#3026691). + * Keep caret and anchor position upon indent and unindent + (#3167355). + * Complete on dash (-) too in CSS. + * Make wordchars have precedence over whitespacechars (#3429368). + * Fix cursor position after comment toggling with no selection + (#3576431). + * Fix reshowing calltip after autocompletion list closed. + * Fix uncommenting multiline comments when cursor is on a delimiter. + * Clear search markers on Mark All keybinding when already set. + * Never strip trailing spaces for Diff documents. + * Reduce unnecessary redraws when typing (Evandro Borracini).
Search - * 'Mark All' now also uses the fully-featured PCRE engine (#3564132). + * 'Mark All' now also uses the fully-featured PCRE engine + (#3564132). + * Only set Find in Files directory once per-document. + * Fix a crash when a matching the very last character of the + document. + * Fix search and replacement of empty matches. + * Fix a possible crash when searching on a range. + + Keybindings + * Add keybinding for 'Go to Start of Display Line' (#3182425) + + Filetypes + * Parse '!' char in D parameter lists. + * Fix parsing of Haskell comments inside a type (#3552129). + * Fix Cython auto indentation. + * Add more keywords to Forth (Oco). + * Add some missing Haxe keywords (#3448664). + * Add some missing CSS3 keywords (Trong Thanh Tran). + * Fix a crash parsing some C macros (#3556536). + * Update some Python keywords. + * Update Python global tags file. + * Show VHDL blocks in the symbol list. + * Fix ruby scope after "do". + * Fix parsing of ruby keywords when followed by a semicolon + (#2130612). + * Lots of JavaScript symbols parsing improvements (#2992393, + #3036476, #3398636, #3470609, #3568542, #3570192). + * Use "scala" extension for Scala (#3574723). + * Fix parsing of reStructuredText titles containing UTF-8 + characters (#3578050). + * Parse C++11 final classes (#3577559). + * Parse C++11 enums with type specifier and classed enums + (#3578557). + * Fix highlighting of C++11 raw strings (#3578557). + * Fix parsing of colons in D (#3577788). + * Fix parsing D 'static assert' (#3582833). + * Parse scope for D nested template blocks (#3582833). + * Ignore D angle brackets. + * Fix reStructuredText comment marker (#3585377). + * Add Asciidoc filetype. + * Fix parsing of Python keywords followed by a tab (\t). + * Add more HTML5 self-closing tags (Duncan de Wet). + + Plugins + * Export: Fix missing linking on libm (Chow Loong Jin) + * File Browser: Backspace now moves to parent directory. + + Windows + * Fix spawning synchronous commands on Windows. + * Show Find in Files status summary. + + Internationalization + * Add translations: et, eu, he, hi, sr + * Update translations: cs, de, fi, it, nl, ru, sv, tr + * Fix a crash when using the Turkish translation.
Geany 1.22 (June 18, 2012)
Modified: THANKS 14 files changed, 8 insertions(+), 6 deletions(-) =================================================================== @@ -119,6 +119,7 @@ Roland Baudin <roland(dot)baudin(at)thalesaleniaspace(dot)com> - fr Lionel Fuentes <funto66(at)gmail(dot)com> - fr Benjamin Ballet <benjamin(dot)ballet(at)gmail(dot)com> -fr José Manuel Castroagudín Silva <chavescesures(at)mail(dot)com> - gl +Asheesh Ranjan <asheeshranjan1(at)gmail(dot)com> - hi Yosef Or Botschko <yosefor3(at)walla(dot)com> - he Gabor Kmetyko aka kilo <kg_kilo(at)freemail(dot)hu> - hu M.Baldinelli <m(dot)baldinelli(at)agora(dot)it> - it @@ -142,14 +143,15 @@ Alexandre Moreira <alexandream(at)gmail(dot)com> - pt_BR Adrovane Marques Kade <adrovane(at)gmail(dot)com> - pt_BR Rafael Peregrino da Silva <rperegrino(at)linuxnewmedia(dot)com(dot)br> - pt_BR Alex Eftimie <alex(at)rosedu(dot)org> - ro -brahmann_ <brahmann(at)pisem(dot)net> - ru_RU -Nikita E. Shalaev <nshalaev(at)eu(dot)spb(dot)ru> - ru_RU -stat.c <Static-Const(at)yandex(dot)ru> - ru_RU -Andrew Drynov <adryno(at)gmail(dot)com> - ru_RU -John Wehin <john(dot)wehin(at)gmail(dot)com> - ru_RU -Maxim Musatov <m1kc(at)yandex(dot)ru> - ru_RU +brahmann_ <brahmann(at)pisem(dot)net> - ru +Nikita E. Shalaev <nshalaev(at)eu(dot)spb(dot)ru> - ru +stat.c <Static-Const(at)yandex(dot)ru> - ru +Andrew Drynov <adryno(at)gmail(dot)com> - ru +John Wehin <john(dot)wehin(at)gmail(dot)com> - ru +Maxim Musatov <m1kc(at)yandex(dot)ru> - ru Tomáš Vadina <kyberdev(at)gmail(dot)com> - sk Jože Klepec <joze(dot)klepec(at)siol(dot)net> - sl +Nikola Radovanovic <cobisimo(at)gmail(dot)com> - sr Tony Mattsson <superxorn(at)gmail(dot)com> - sv Gürkan Gür <seqizz(at)gmail(dot)com> - tr Boris Dibrov <dibrov(dot)bor(at)gmail(dot)com> - uk
Modified: data/filetype_extensions.conf 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -44,7 +44,7 @@ Pascal=*.pas;*.pp;*.inc;*.dpr;*.dpk; Perl=*.pl;*.perl;*.pm;*.agi;*.pod; PHP=*.php;*.php3;*.php4;*.php5;*.phtml; Po=*.po;*.pot; -Python=*.py;*.pyw; +Python=*.py;*.pyw;SConstruct;SConscript; reStructuredText=*.rest;*.reST;*.rst; R=*.R;*.r; Ruby=*.rb;*.rhtml;*.ruby;
Modified: data/filetypes.d 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -22,7 +22,7 @@ commentdockeyworderror=comment_doc_keyword_error
[keywords] # all items must be in one line -primary=__FILE__ __LINE__ __DATA__ __TIME__ __TIMESTAMP__ abstract alias align asm assert auto body bool break byte case cast catch cdouble cent cfloat char class const continue creal dchar debug default delegate delete deprecated do double else enum export extern false final finally float for foreach function goto idouble if ifloat immutable import in inout int interface invariant ireal is long macro mixin module new nothrow null out override package pragma private protected public pure real ref return scope shared short static struct super switch synchronized template this throw true try typedef typeof ubyte ucent uint ulong union unittest ushort version void volatile wchar while with +primary=__FILE__ __LINE__ __DATA__ __TIME__ __TIMESTAMP__ abstract alias align asm assert auto body bool break byte case cast catch cdouble cent cfloat char class const continue creal dchar debug default delegate delete deprecated do double else enum export extern false final finally float for foreach foreach_reverse function goto idouble if ifloat immutable import in inout int interface invariant ireal is lazy long macro mixin module new nothrow null out override package pragma private protected public pure real ref return scope shared short static struct super switch synchronized template this throw true try typedef typeof ubyte ucent uint ulong union unittest ushort version void volatile wchar while with secondary= # documentation keywords for D, currently not working docComment=Authors Bugs Copyright Date Deprecated Examples History License Macros Params Returns See_Also Standards Throws Version
Modified: data/geany.gtkrc 24 files changed, 21 insertions(+), 3 deletions(-) =================================================================== @@ -7,17 +7,35 @@ style "geany-close-tab-button-style" { xthickness = 0 ythickness = 0 } -widget "*.geany-close-tab-button" style "geany-close-tab-button-style" +widget "*.geany-close-tab-button" style:theme "geany-close-tab-button-style"
# use monospaced font in search entries for easier reading of regexp (#1907117) style "geany-monospace" { font_name = "Monospace" } -widget "GeanyDialogSearch.*.GtkEntry" style "geany-monospace" +widget "GeanyDialogSearch.*.GtkEntry" style:theme "geany-monospace" +widget "GeanyDialogSearch.*.geany-search-entry-no-match" style:theme "geany-monospace"
# set red background for GtkEntries showing unmatched searches style "geany-search-entry-no-match-style" { base[NORMAL] = "#ffff66666666" text[NORMAL] = "#ffffffffffff" } -widget "*.geany-search-entry-no-match" style "geany-search-entry-no-match-style" +widget "*.geany-search-entry-no-match" style:theme "geany-search-entry-no-match-style" + +# document status colors +style "geany-document-status-changed-style" { + fg[NORMAL] = "#ffff00000000" + fg[ACTIVE] = "#ffff00000000" +} +style "geany-document-status-disk-changed-style" { + fg[NORMAL] = "#ffff7fff0000" + fg[ACTIVE] = "#ffff7fff0000" +} +style "geany-document-status-readonly-style" { + fg[NORMAL] = "#00007fff0000" + fg[ACTIVE] = "#00007fff0000" +} +widget "*.geany-document-status-changed" style:theme "geany-document-status-changed-style" +widget "*.geany-document-status-disk-changed" style:theme "geany-document-status-disk-changed-style" +widget "*.geany-document-status-readonly" style:theme "geany-document-status-readonly-style"
Modified: po/de.po 2362 files changed, 1210 insertions(+), 1152 deletions(-) =================================================================== No diff available, check online
Modified: po/fi.po 4273 files changed, 2128 insertions(+), 2145 deletions(-) =================================================================== No diff available, check online
Modified: po/he.po 174 files changed, 95 insertions(+), 79 deletions(-) =================================================================== @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Geany 1.23\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-08 04:40+0000\n" -"PO-Revision-Date: 2013-01-08 20:48+0200\n" +"POT-Creation-Date: 2013-01-20 04:40+0000\n" +"PO-Revision-Date: 2013-01-20 22:03+0200\n" "Last-Translator: Yosef Or Botschko yosefor3@walla.com\n" "Language-Team: Hebrew <>\n" "Language: he\n" @@ -920,7 +920,7 @@ msgstr "ה_ודעה הבאה" msgid "Next to current" msgstr "לצד הכרטיסייה הנוכחית"
-#: ../data/geany.glade.h:208 ../src/filetypes.c:102 ../src/filetypes.c:1775 +#: ../data/geany.glade.h:208 ../src/filetypes.c:102 ../src/filetypes.c:1783 msgid "None" msgstr "ללא"
@@ -2576,11 +2576,11 @@ msgstr "ארעה שגיאה או שפרטי הקובץ אינם ניתנים ל
#: ../src/dialogs.c:1182 ../src/dialogs.c:1183 ../src/dialogs.c:1184 #: ../src/dialogs.c:1190 ../src/dialogs.c:1191 ../src/dialogs.c:1192 -#: ../src/symbols.c:2156 ../src/symbols.c:2170 ../src/ui_utils.c:267 +#: ../src/symbols.c:2167 ../src/symbols.c:2181 ../src/ui_utils.c:267 msgid "unknown" msgstr "לא ידוע"
-#: ../src/dialogs.c:1197 ../src/symbols.c:885 +#: ../src/dialogs.c:1197 ../src/symbols.c:896 msgid "Properties" msgstr "מאפיינים"
@@ -3028,33 +3028,33 @@ msgstr "קובץ תצורה" msgid "Gettext translation file" msgstr "קובץ תרגום Gettext"
-#: ../src/filetypes.c:720 +#: ../src/filetypes.c:728 msgid "_Programming Languages" msgstr "שפות ת_כנות"
-#: ../src/filetypes.c:721 +#: ../src/filetypes.c:729 msgid "_Scripting Languages" msgstr "שפות _תסריט"
-#: ../src/filetypes.c:722 +#: ../src/filetypes.c:730 msgid "_Markup Languages" msgstr "שפות _סימון"
-#: ../src/filetypes.c:723 +#: ../src/filetypes.c:731 msgid "M_iscellaneous" msgstr "_שונות"
-#: ../src/filetypes.c:1461 ../src/win32.c:105 +#: ../src/filetypes.c:1469 ../src/win32.c:105 msgid "All Source" msgstr "כל מקור"
#. create meta file filter "All files" -#: ../src/filetypes.c:1486 ../src/project.c:295 ../src/win32.c:95 +#: ../src/filetypes.c:1494 ../src/project.c:295 ../src/win32.c:95 #: ../src/win32.c:140 ../src/win32.c:161 ../src/win32.c:166 msgid "All files" msgstr "כל הקבצים"
-#: ../src/filetypes.c:1534 +#: ../src/filetypes.c:1542 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "ביטוי רגולרי לא תקין בסוג הקובץ %s: %s" @@ -3122,7 +3122,7 @@ msgstr "קפיצה אל" msgid "View" msgstr "תצוגה"
-#: ../src/keybindings.c:236 +#: ../src/keybindings.c:236 ../src/symbols.c:813 msgid "Document" msgstr "מסמך"
@@ -3848,11 +3848,11 @@ msgstr "בחירת צירוף-מקשים" msgid "Press the combination of the keys you want to use for "%s"." msgstr "לחץ על צירוף המקשים שברצונך להשתמש עבור "%s"."
-#: ../src/prefs.c:226 ../src/symbols.c:2278 ../src/sidebar.c:731 +#: ../src/prefs.c:226 ../src/symbols.c:2289 ../src/sidebar.c:731 msgid "_Expand All" msgstr "הר_חב הכל"
-#: ../src/prefs.c:231 ../src/symbols.c:2283 ../src/sidebar.c:737 +#: ../src/prefs.c:231 ../src/symbols.c:2294 ../src/sidebar.c:737 msgid "_Collapse All" msgstr "_כווץ הכל"
@@ -4344,19 +4344,19 @@ msgid "Appendix" msgstr "נספח"
#: ../src/symbols.c:692 ../src/symbols.c:737 ../src/symbols.c:753 -#: ../src/symbols.c:764 ../src/symbols.c:851 ../src/symbols.c:862 -#: ../src/symbols.c:874 ../src/symbols.c:888 ../src/symbols.c:900 -#: ../src/symbols.c:912 ../src/symbols.c:927 ../src/symbols.c:956 -#: ../src/symbols.c:986 +#: ../src/symbols.c:764 ../src/symbols.c:862 ../src/symbols.c:873 +#: ../src/symbols.c:885 ../src/symbols.c:899 ../src/symbols.c:911 +#: ../src/symbols.c:923 ../src/symbols.c:938 ../src/symbols.c:967 +#: ../src/symbols.c:997 msgid "Other" msgstr "אחר"
-#: ../src/symbols.c:698 ../src/symbols.c:920 ../src/symbols.c:965 +#: ../src/symbols.c:698 ../src/symbols.c:931 ../src/symbols.c:976 msgid "Module" msgstr "מודול"
-#: ../src/symbols.c:699 ../src/symbols.c:847 ../src/symbols.c:898 -#: ../src/symbols.c:910 ../src/symbols.c:925 ../src/symbols.c:937 +#: ../src/symbols.c:699 ../src/symbols.c:858 ../src/symbols.c:909 +#: ../src/symbols.c:921 ../src/symbols.c:936 ../src/symbols.c:948 msgid "Types" msgstr "סוג"
@@ -4366,9 +4366,9 @@ msgstr "סוג בנאי"
#: ../src/symbols.c:701 ../src/symbols.c:723 ../src/symbols.c:744 #: ../src/symbols.c:752 ../src/symbols.c:761 ../src/symbols.c:773 -#: ../src/symbols.c:782 ../src/symbols.c:835 ../src/symbols.c:884 -#: ../src/symbols.c:907 ../src/symbols.c:922 ../src/symbols.c:950 -#: ../src/symbols.c:973 +#: ../src/symbols.c:782 ../src/symbols.c:846 ../src/symbols.c:895 +#: ../src/symbols.c:918 ../src/symbols.c:933 ../src/symbols.c:961 +#: ../src/symbols.c:984 msgid "Functions" msgstr "פונקציות"
@@ -4396,9 +4396,9 @@ msgstr "תאריך" msgid "Keys" msgstr "מקשים"
-#: ../src/symbols.c:724 ../src/symbols.c:775 ../src/symbols.c:836 -#: ../src/symbols.c:861 ../src/symbols.c:886 ../src/symbols.c:899 -#: ../src/symbols.c:908 ../src/symbols.c:924 ../src/symbols.c:985 +#: ../src/symbols.c:724 ../src/symbols.c:775 ../src/symbols.c:847 +#: ../src/symbols.c:872 ../src/symbols.c:897 ../src/symbols.c:910 +#: ../src/symbols.c:919 ../src/symbols.c:935 ../src/symbols.c:996 msgid "Variables" msgstr "משתנים"
@@ -4418,28 +4418,28 @@ msgstr "תת-תת סעיף" msgid "Structures" msgstr "מבנים"
-#: ../src/symbols.c:760 ../src/symbols.c:844 ../src/symbols.c:869 -#: ../src/symbols.c:881 +#: ../src/symbols.c:760 ../src/symbols.c:855 ../src/symbols.c:880 +#: ../src/symbols.c:892 msgid "Package" msgstr "חבילה"
-#: ../src/symbols.c:762 ../src/symbols.c:911 ../src/symbols.c:934 +#: ../src/symbols.c:762 ../src/symbols.c:922 ../src/symbols.c:945 msgid "Labels" msgstr "תוויות"
-#: ../src/symbols.c:763 ../src/symbols.c:774 ../src/symbols.c:887 -#: ../src/symbols.c:909 +#: ../src/symbols.c:763 ../src/symbols.c:774 ../src/symbols.c:898 +#: ../src/symbols.c:920 msgid "Constants" msgstr "קבועים"
-#: ../src/symbols.c:771 ../src/symbols.c:870 ../src/symbols.c:882 -#: ../src/symbols.c:895 ../src/symbols.c:921 ../src/symbols.c:972 +#: ../src/symbols.c:771 ../src/symbols.c:881 ../src/symbols.c:893 +#: ../src/symbols.c:906 ../src/symbols.c:932 ../src/symbols.c:983 msgid "Interfaces" msgstr "ממשקים"
-#: ../src/symbols.c:772 ../src/symbols.c:793 ../src/symbols.c:814 -#: ../src/symbols.c:824 ../src/symbols.c:833 ../src/symbols.c:871 -#: ../src/symbols.c:883 ../src/symbols.c:896 ../src/symbols.c:971 +#: ../src/symbols.c:772 ../src/symbols.c:793 ../src/symbols.c:825 +#: ../src/symbols.c:835 ../src/symbols.c:844 ../src/symbols.c:882 +#: ../src/symbols.c:894 ../src/symbols.c:907 ../src/symbols.c:982 msgid "Classes" msgstr "מחלקות"
@@ -4467,118 +4467,134 @@ msgstr "ID Selectors" msgid "Type Selectors" msgstr "Type Selectors"
-#: ../src/symbols.c:813 ../src/symbols.c:859 +#: ../src/symbols.c:814 +msgid "Section Level 1" +msgstr "בחירה רמה 1" + +#: ../src/symbols.c:815 +msgid "Section Level 2" +msgstr "בחירה רמה 2" + +#: ../src/symbols.c:816 +msgid "Section Level 3" +msgstr "בחירה רמה 3" + +#: ../src/symbols.c:817 +msgid "Section Level 4" +msgstr "בחירה רמה 4" + +#: ../src/symbols.c:824 ../src/symbols.c:870 msgid "Modules" msgstr "מודולים"
-#: ../src/symbols.c:815 +#: ../src/symbols.c:826 msgid "Singletons" msgstr "אותות"
-#: ../src/symbols.c:816 ../src/symbols.c:825 ../src/symbols.c:834 -#: ../src/symbols.c:872 ../src/symbols.c:897 +#: ../src/symbols.c:827 ../src/symbols.c:836 ../src/symbols.c:845 +#: ../src/symbols.c:883 ../src/symbols.c:908 msgid "Methods" msgstr "שגרות"
-#: ../src/symbols.c:823 ../src/symbols.c:968 +#: ../src/symbols.c:834 ../src/symbols.c:979 msgid "Namespaces" msgstr "מרחבי שם"
-#: ../src/symbols.c:826 ../src/symbols.c:951 +#: ../src/symbols.c:837 ../src/symbols.c:962 msgid "Procedures" msgstr "פרוצדורה"
-#: ../src/symbols.c:837 +#: ../src/symbols.c:848 msgid "Imports" msgstr "יִבּוא"
-#: ../src/symbols.c:845 +#: ../src/symbols.c:856 msgid "Entities" msgstr "ישויות"
-#: ../src/symbols.c:846 +#: ../src/symbols.c:857 msgid "Architectures" msgstr "ארכיטקטורות"
-#: ../src/symbols.c:848 +#: ../src/symbols.c:859 msgid "Functions / Procedures" msgstr "פונקציות/שגרות"
-#: ../src/symbols.c:849 +#: ../src/symbols.c:860 msgid "Variables / Signals" msgstr "משתנים/אותות"
-#: ../src/symbols.c:850 +#: ../src/symbols.c:861 msgid "Processes / Blocks / Components" msgstr "תהליכים / בלוקים / רכיבים"
-#: ../src/symbols.c:858 +#: ../src/symbols.c:869 msgid "Events" msgstr "אירועים"
-#: ../src/symbols.c:860 +#: ../src/symbols.c:871 msgid "Functions / Tasks" msgstr "פונקציות/משימות"
-#: ../src/symbols.c:873 ../src/symbols.c:974 +#: ../src/symbols.c:884 ../src/symbols.c:985 msgid "Members" msgstr "משתמשים"
-#: ../src/symbols.c:923 +#: ../src/symbols.c:934 msgid "Subroutines" msgstr "שגרות"
-#: ../src/symbols.c:926 +#: ../src/symbols.c:937 msgid "Blocks" msgstr "בלוקים"
-#: ../src/symbols.c:935 ../src/symbols.c:944 ../src/symbols.c:982 +#: ../src/symbols.c:946 ../src/symbols.c:955 ../src/symbols.c:993 msgid "Macros" msgstr "הגדרות מאקרו"
-#: ../src/symbols.c:936 +#: ../src/symbols.c:947 msgid "Defines" msgstr "הגדרות Define"
-#: ../src/symbols.c:943 +#: ../src/symbols.c:954 msgid "Targets" msgstr "מטרות"
-#: ../src/symbols.c:952 +#: ../src/symbols.c:963 msgid "Indexes" msgstr "אינדקסים"
-#: ../src/symbols.c:953 +#: ../src/symbols.c:964 msgid "Tables" msgstr "לוחות"
-#: ../src/symbols.c:954 +#: ../src/symbols.c:965 msgid "Triggers" msgstr "Triggers"
-#: ../src/symbols.c:955 +#: ../src/symbols.c:966 msgid "Views" msgstr "תצוגות"
-#: ../src/symbols.c:975 +#: ../src/symbols.c:986 msgid "Structs" msgstr "מבנים"
-#: ../src/symbols.c:976 +#: ../src/symbols.c:987 msgid "Typedefs / Enums" msgstr "Typedefs / Enums"
-#: ../src/symbols.c:1724 +#: ../src/symbols.c:1735 #, c-format msgid "Unknown filetype extension for "%s".\n" msgstr "סיומת הקובץ "%s" לא מוכרת.\n"
-#: ../src/symbols.c:1747 +#: ../src/symbols.c:1758 #, c-format msgid "Failed to create tags file, perhaps because no tags were found.\n" msgstr "נכשל ניסיון יצירת תגיות לקובץ, אולי לא נמצאו תגיות.\n"
-#: ../src/symbols.c:1754 +#: ../src/symbols.c:1765 #, c-format msgid "" "Usage: %s -g <Tag File> <File list>\n" @@ -4587,7 +4603,7 @@ msgstr "" "השתמש: %s -g <קובץ תג> <רשימת קבצים>\n" "\n"
-#: ../src/symbols.c:1755 +#: ../src/symbols.c:1766 #, c-format msgid "" "Example:\n" @@ -4598,40 +4614,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:1769 +#: ../src/symbols.c:1780 msgid "Load Tags" msgstr "טעינת תגיות"
-#: ../src/symbols.c:1776 +#: ../src/symbols.c:1787 msgid "Geany tag files (*.*.tags)" msgstr "Geany קָבְצי תג (*.*.tags)"
#. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1796 +#: ../src/symbols.c:1807 #, c-format msgid "Loaded %s tags file '%s'." msgstr "טעינת %s קובץ תג '%s'."
-#: ../src/symbols.c:1799 +#: ../src/symbols.c:1810 #, c-format msgid "Could not load tags file '%s'." msgstr "לא ניתן לטעון את קובץ התגיות '%s'."
-#: ../src/symbols.c:1939 +#: ../src/symbols.c:1950 #, c-format msgid "Forward declaration "%s" not found." msgstr "לא נמצאה הצהרה קודמת של "%s"."
-#: ../src/symbols.c:1941 +#: ../src/symbols.c:1952 #, c-format msgid "Definition of "%s" not found." msgstr "לא נמצאה הגדרה קודמת של "%s"."
-#: ../src/symbols.c:2293 +#: ../src/symbols.c:2304 msgid "Sort by _Name" msgstr "מיין ל_פי שם"
-#: ../src/symbols.c:2300 +#: ../src/symbols.c:2311 msgid "Sort by _Appearance" msgstr "מיין ל_פי סדר הופעה"
@@ -5012,15 +5028,15 @@ msgid "" "another one." msgstr "נכשלה הפקודה המוגדרת בדפדפן. אנא תקן תקלה זו."
-#: ../src/utils.c:366 +#: ../src/utils.c:374 msgid "Win (CRLF)" msgstr "Win (CRLF)"
-#: ../src/utils.c:367 +#: ../src/utils.c:375 msgid "Mac (CR)" msgstr "Mac (CR)"
-#: ../src/utils.c:368 +#: ../src/utils.c:376 msgid "Unix (LF)" msgstr "Unix (LF)"
Modified: po/hi.po 5528 files changed, 5528 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: po/sr.po 5466 files changed, 5466 insertions(+), 0 deletions(-) =================================================================== No diff available, check online
Modified: po/sv.po 13 files changed, 5 insertions(+), 8 deletions(-) =================================================================== @@ -2,13 +2,13 @@ # Copyright (C) 2007 - 2011 THE geany'S COPYRIGHT HOLDER # This file is distributed under the same license as the geany package. # -# Tony Mattsson superxorn@gmail.com, 2007 - 2011 +# Tony Mattsson superxorn@gmail.com, 2007 - 2013 msgid "" msgstr "" -"Project-Id-Version: Geany 1.22\n" +"Project-Id-Version: Geany 1.23\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-06-20 17:07+0200\n" -"PO-Revision-Date: 2012-06-20 13:49+0100\n" +"PO-Revision-Date: 2013-02-06 09:20+0100\n" "Last-Translator: Tony Mattsson superxorn@gmail.com\n" "Language-Team: Swedish geany-i18n@uvena.de\n" "Language: sv\n" @@ -16,9 +16,8 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Poedit-Language: Swedish\n" -"X-Poedit-Country: SWEDEN\n" "X-Poedit-SourceCharset: utf-8\n" +"X-Generator: Poedit 1.5.5\n"
#: ../geany.desktop.in.h:1 ../data/geany.glade.h:346 msgid "Geany" @@ -185,13 +184,11 @@ msgid "Startup path:" msgstr "Sökväg vid start:"
#: ../data/geany.glade.h:38 -#, fuzzy msgid "" "Path to start in when opening or saving files. Must be an absolute path." msgstr "" "Sökväg att starta i vid öppning eller sparning av filer. Detta måste vara en " -"absolut sökväg. Lämna blankt för att automatiskt välja filens nuvarande " -"sökväg." +"absolut sökväg."
#: ../data/geany.glade.h:39 msgid "Project files:"
Modified: scripts/plugin_test.c 3 files changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -67,7 +67,7 @@ static gboolean test_plugin(const gchar *filename) module = g_module_open(filename, G_MODULE_BIND_LOCAL); if (! module) { - g_warning("Can't load plugin: %s", g_module_error()); + g_warning("Can't load plugin: "%s": %s", filename, g_module_error()); return FALSE; }
@@ -121,4 +121,3 @@ gint main(gint argc, gchar **argv)
return result; } -
Modified: src/about.c 4 files changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -57,6 +57,7 @@ { "fi", "Harri Koskinen <harri@fastmonkey.org>\nJari Rahkonen <jari.rahkonen@pp1.inet.fi>" }, { "fr", "Jean-Philippe Moal <skateinmars@skateinmars.net>" }, { "gl", "José Manuel Castroagudín Silva <chavescesures@gmail.com>"}, + { "hi", "Asheesh Ranjan <asheeshranjan1@gmail.com>"}, { "he", "Yosef Or Botschko <yosefor3@walla.com>"}, { "hu", "Gabor Kmetyko <kg_kilo@freemail.hu>" }, { "it", "Max Baldinelli <m.baldinelli@agora.it>,\nDario Santomarco <dariello@yahoo.it>" }, @@ -72,10 +73,11 @@ "Adrovane Marques Kade <adrovane@gmail.com>\n" "Rafael Peregrino da Silva <rperegrino@linuxnewmedia.com.br>"}, { "ro", "Alex Eftimie <alex@rosedu.org>" }, - { "ru_RU", "brahmann_ <brahmann@pisem.net>,\nNikita E. Shalaev <nshalaev@eu.spb.ru>" }, + { "ru", "brahmann_ <brahmann@pisem.net>,\nNikita E. Shalaev <nshalaev@eu.spb.ru>" }, { "sk", "Tomáš Vadina <kyberdev@gmail.com>" }, { "sl", "Jože Klepec <joze.klepec@siol.net>"}, { "sv", "Tony Mattsson <superxorn@gmail.com>" }, + { "sr", "Nikola Radovanovic <cobisimo@gmail.com>"}, { "tr", "Gürkan Gür <seqizz@gmail.com>"}, { "uk", "Boris Dibrov <dibrov.bor@gmail.com>" }, { "vi_VN", "Clytie Siddall <clytie@riverland.net.au>" },
Modified: src/document.c 84 files changed, 69 insertions(+), 15 deletions(-) =================================================================== @@ -2693,6 +2693,60 @@ static void document_redo_add(GeanyDocument *doc, guint type, gpointer data) }
+enum +{ + STATUS_CHANGED, +#ifdef USE_GIO_FILEMON + STATUS_DISK_CHANGED, +#endif + STATUS_READONLY +}; +static struct +{ + const gchar *name; + GdkColor color; + gboolean loaded; +} document_status_styles[] = { + { "geany-document-status-changed", {0}, FALSE }, +#ifdef USE_GIO_FILEMON + { "geany-document-status-disk-changed", {0}, FALSE }, +#endif + { "geany-document-status-readonly", {0}, FALSE } +}; + + +static gint document_get_status_id(GeanyDocument *doc) +{ + if (doc->changed) + return STATUS_CHANGED; +#ifdef USE_GIO_FILEMON + else if (doc->priv->file_disk_status == FILE_CHANGED) + return STATUS_DISK_CHANGED; +#endif + else if (doc->readonly) + return STATUS_READONLY; + + return -1; +} + + +/* returns an identifier that is to be set as a widget name or class to get it styled + * depending on the document status (changed, readonly, etc.) + * a NULL return value means default (unchanged) style */ +const gchar *document_get_status_widget_class(GeanyDocument *doc) +{ + gint status; + + g_return_val_if_fail(doc != NULL, NULL); + + status = document_get_status_id(doc); + if (status < 0) + return NULL; + else + return document_status_styles[status].name; +} + + /** * Gets the status color of the document, or @c NULL if default widget coloring should be used. * Returned colors are red if the document has changes, green if the document is read-only @@ -2707,25 +2761,25 @@ static void document_redo_add(GeanyDocument *doc, guint type, gpointer data) */ const GdkColor *document_get_status_color(GeanyDocument *doc) { - static GdkColor red = {0, 0xFFFF, 0, 0}; - static GdkColor green = {0, 0, 0x7FFF, 0}; -#ifdef USE_GIO_FILEMON - static GdkColor orange = {0, 0xFFFF, 0x7FFF, 0}; -#endif - GdkColor *color = NULL; + gint status;
g_return_val_if_fail(doc != NULL, NULL);
- if (doc->changed) - color = &red; -#ifdef USE_GIO_FILEMON - else if (doc->priv->file_disk_status == FILE_CHANGED) - color = &orange; -#endif - else if (doc->readonly) - color = &green; + status = document_get_status_id(doc); + if (status < 0) + return NULL; + if (! document_status_styles[status].loaded) + { + GtkSettings *settings = gtk_widget_get_settings(GTK_WIDGET(doc->editor->sci)); + gchar *path = g_strconcat("GeanyMainWindow.GtkHBox.GtkNotebook.", + document_status_styles[status].name, NULL); + GtkStyle *style = gtk_rc_get_style_by_paths(settings, path, NULL, GTK_TYPE_LABEL);
- return color; /* return pointer to static GdkColor. */ + document_status_styles[status].color = style->fg[GTK_STATE_NORMAL]; + document_status_styles[status].loaded = TRUE; + g_free(path); + } + return &document_status_styles[status].color; }
Modified: src/document.h 2 files changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -259,6 +259,8 @@ void document_replace_sel(GeanyDocument *doc, const gchar *find_text, const gcha
void document_update_tab_label(GeanyDocument *doc);
+const gchar *document_get_status_widget_class(GeanyDocument *doc); + const GdkColor *document_get_status_color(GeanyDocument *doc);
gchar *document_get_basename_for_display(GeanyDocument *doc, gint length);
Modified: src/ui_utils.c 11 files changed, 2 insertions(+), 9 deletions(-) =================================================================== @@ -1516,11 +1516,7 @@ void ui_combo_box_prepend_text_once(GtkComboBoxText *combo, const gchar *text) * document status. */ void ui_update_tab_status(GeanyDocument *doc) { - const GdkColor *color = document_get_status_color(doc); - - /* NULL color will reset to default */ - gtk_widget_modify_fg(doc->priv->tab_label, GTK_STATE_NORMAL, color); - gtk_widget_modify_fg(doc->priv->tab_label, GTK_STATE_ACTIVE, color); + gtk_widget_set_name(doc->priv->tab_label, document_get_status_widget_class(doc));
sidebar_openfiles_update(doc); } @@ -2553,7 +2549,6 @@ void ui_menu_add_document_items_sorted(GtkMenu *menu, GeanyDocument *active, GCallback callback, GCompareFunc compare_func) { GtkWidget *menu_item, *menu_item_label, *image; - const GdkColor *color; GeanyDocument *doc; guint i, len; gchar *base_name, *label; @@ -2586,10 +2581,8 @@ void ui_menu_add_document_items_sorted(GtkMenu *menu, GeanyDocument *active, gtk_container_add(GTK_CONTAINER(menu), menu_item); g_signal_connect(menu_item, "activate", callback, doc);
- color = document_get_status_color(doc); menu_item_label = gtk_bin_get_child(GTK_BIN(menu_item)); - gtk_widget_modify_fg(menu_item_label, GTK_STATE_NORMAL, color); - gtk_widget_modify_fg(menu_item_label, GTK_STATE_ACTIVE, color); + gtk_widget_set_name(menu_item_label, document_get_status_widget_class(doc));
if (doc == active) {
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).