Plugins-Commits November 2010

plugins-commits@lists.geany.org

8 participants
64 discussions

SF.net SVN: geany-plugins:[1750] trunk/geany-plugins/po
by frlan＠users.sourceforge.net 16 Nov '10

16 Nov '10

Revision: 1750 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1750&view=rev Author: frlan Date: 2010-11-16 16:07:46 +0000 (Tue, 16 Nov 2010) Log Message: ----------- Update of German translation Modified Paths: -------------- trunk/geany-plugins/po/ChangeLog trunk/geany-plugins/po/de.po Modified: trunk/geany-plugins/po/ChangeLog =================================================================== --- trunk/geany-plugins/po/ChangeLog 2010-11-15 22:58:26 UTC (rev 1749) +++ trunk/geany-plugins/po/ChangeLog 2010-11-16 16:07:46 UTC (rev 1750) @@ -1,3 +1,8 @@ +2010-11-16 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * de.po: Minor update of German translation. + + 2010-10-23 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * de.po: Minor update of German translation. Modified: trunk/geany-plugins/po/de.po =================================================================== --- trunk/geany-plugins/po/de.po 2010-11-15 22:58:26 UTC (rev 1749) +++ trunk/geany-plugins/po/de.po 2010-11-16 16:07:46 UTC (rev 1750) @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: geany-plugins 0.19\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-23 12:01+0200\n" -"PO-Revision-Date: 2010-10-23 12:00+0100\n" +"POT-Creation-Date: 2010-11-16 17:06+0100\n" +"PO-Revision-Date: 2010-11-16 17:06+0100\n" "Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <geany-i18n(a)uvena.de>\n" "Language: de\n" @@ -89,7 +89,7 @@ #: ../addons/src/addons.c:353 ../geanylatex/src/geanylatex.c:202 #: ../geanysendmail/src/geanysendmail.c:154 #: ../geanysendmail/src/geanysendmail.c:318 ../geanyvc/src/geanyvc.c:1782 -#: ../spellcheck/src/scplugin.c:141 ../treebrowser/src/treebrowser.c:1658 +#: ../spellcheck/src/scplugin.c:141 ../treebrowser/src/treebrowser.c:1666 #: ../updatechecker/src/updatechecker.c:248 msgid "Plugin configuration directory could not be created." msgstr "" @@ -3213,8 +3213,8 @@ msgid "Project \"%s\" opened." msgstr "Projekt »%s« geöffnet." -#: ../geanyinsertnum/src/insertnum.c:33 ../geanyinsertnum/src/insertnum.c:373 -#: ../geanyinsertnum/src/insertnum.c:501 +#: ../geanyinsertnum/src/insertnum.c:33 ../geanyinsertnum/src/insertnum.c:329 +#: ../geanyinsertnum/src/insertnum.c:460 msgid "Insert Numbers" msgstr "Nummern einfügen" @@ -3222,71 +3222,71 @@ msgid "Insert/Fill columns with numbers." msgstr "Einfügen/Ausfüllen der Spalten mit Nummern" -#: ../geanyinsertnum/src/insertnum.c:151 +#: ../geanyinsertnum/src/insertnum.c:142 msgid "Counting..." msgstr "Zählung läuft..." -#: ../geanyinsertnum/src/insertnum.c:198 +#: ../geanyinsertnum/src/insertnum.c:189 msgid "Preparing..." msgstr "Vorbereitung läuft..." -#: ../geanyinsertnum/src/insertnum.c:204 +#: ../geanyinsertnum/src/insertnum.c:195 msgid "Inserting..." msgstr "Einfügen läuft..." -#: ../geanyinsertnum/src/insertnum.c:363 +#: ../geanyinsertnum/src/insertnum.c:318 msgid "For base 11 and above" msgstr "Für Basis 11 oder höher" -#: ../geanyinsertnum/src/insertnum.c:385 +#: ../geanyinsertnum/src/insertnum.c:341 msgid "_Start:" msgstr "_Start:" -#: ../geanyinsertnum/src/insertnum.c:390 +#: ../geanyinsertnum/src/insertnum.c:346 msgid "S_tep:" msgstr "S_tep:" -#: ../geanyinsertnum/src/insertnum.c:396 +#: ../geanyinsertnum/src/insertnum.c:352 msgid "_Base:" msgstr "_Basis" -#: ../geanyinsertnum/src/insertnum.c:406 +#: ../geanyinsertnum/src/insertnum.c:363 msgid "Letters:" msgstr "Buchstaben:" -#: ../geanyinsertnum/src/insertnum.c:409 +#: ../geanyinsertnum/src/insertnum.c:366 msgid "_Upper" msgstr "_Obere" -#: ../geanyinsertnum/src/insertnum.c:414 +#: ../geanyinsertnum/src/insertnum.c:371 msgid "_Lower" msgstr "_Untere" -#: ../geanyinsertnum/src/insertnum.c:418 +#: ../geanyinsertnum/src/insertnum.c:375 msgid "Base _prefix" msgstr "Basis _Prefix:" -#: ../geanyinsertnum/src/insertnum.c:420 +#: ../geanyinsertnum/src/insertnum.c:377 msgid "0 for octal, 0x for hex, + for positive decimal" msgstr "0 für Oktal, 0x für Hexadezimal, + für positive Dezimalzahlen" -#: ../geanyinsertnum/src/insertnum.c:422 +#: ../geanyinsertnum/src/insertnum.c:379 msgid "Padding:" msgstr "Versatz:" -#: ../geanyinsertnum/src/insertnum.c:424 +#: ../geanyinsertnum/src/insertnum.c:381 msgid "Sp_ace" msgstr "Leer_zeichen" -#: ../geanyinsertnum/src/insertnum.c:427 +#: ../geanyinsertnum/src/insertnum.c:384 msgid "_Zero" msgstr "_Null" -#: ../geanyinsertnum/src/insertnum.c:494 +#: ../geanyinsertnum/src/insertnum.c:453 msgid "Insert _Numbers" msgstr "_Nummern einfügen" -#: ../treebrowser/src/treebrowser.c:105 ../treebrowser/src/treebrowser.c:1538 +#: ../treebrowser/src/treebrowser.c:105 ../treebrowser/src/treebrowser.c:1546 msgid "Tree Browser" msgstr "Baumnavigator" @@ -3317,108 +3317,122 @@ msgid "NewFile" msgstr "Datei" -#: ../treebrowser/src/treebrowser.c:926 +#: ../treebrowser/src/treebrowser.c:885 #, c-format +msgid "" +"Target file '%s' exists\n" +", do you really want to replace it with empty file?" +msgstr "" +"Zieldatei »%s« existiert bereits.\n" +"Möchten Sie diese wirklich mit einer leeren Datei ersetzen?" + +#: ../treebrowser/src/treebrowser.c:930 +#, c-format msgid "Do you really want to delete '%s' ?" msgstr "Soll »%s« wirklich gelöscht werden?" -#: ../treebrowser/src/treebrowser.c:1025 ../treebrowser/src/treebrowser.c:1471 +#: ../treebrowser/src/treebrowser.c:1029 ../treebrowser/src/treebrowser.c:1479 msgid "Go up" msgstr "Aufwärts" -#: ../treebrowser/src/treebrowser.c:1029 ../treebrowser/src/treebrowser.c:1486 +#: ../treebrowser/src/treebrowser.c:1033 ../treebrowser/src/treebrowser.c:1494 msgid "Set path from document" msgstr "Pfad des Dokumentes übernehmen" -#: ../treebrowser/src/treebrowser.c:1033 +#: ../treebrowser/src/treebrowser.c:1037 msgid "Open externally" msgstr "Extern öffnen" -#: ../treebrowser/src/treebrowser.c:1038 +#: ../treebrowser/src/treebrowser.c:1042 msgid "Open Terminal" msgstr "In Terminal ausführen" -#: ../treebrowser/src/treebrowser.c:1042 +#: ../treebrowser/src/treebrowser.c:1046 msgid "Set as root" msgstr "Als Wurzel festlegen" -#: ../treebrowser/src/treebrowser.c:1050 +#: ../treebrowser/src/treebrowser.c:1054 msgid "Create new directory" msgstr "Neues Verzeichnis anlegen" -#: ../treebrowser/src/treebrowser.c:1054 +#: ../treebrowser/src/treebrowser.c:1058 msgid "Create new file" msgstr "Neue Datei erstellen" -#: ../treebrowser/src/treebrowser.c:1058 +#: ../treebrowser/src/treebrowser.c:1062 msgid "Rename" msgstr "Umbenennen" -#: ../treebrowser/src/treebrowser.c:1063 +#: ../treebrowser/src/treebrowser.c:1067 msgid "Delete" msgstr "Löschen" -#: ../treebrowser/src/treebrowser.c:1071 ../treebrowser/src/treebrowser.c:1476 -#: ../treebrowser/src/treebrowser.c:1826 +#: ../treebrowser/src/treebrowser.c:1075 ../treebrowser/src/treebrowser.c:1484 +#: ../treebrowser/src/treebrowser.c:1834 msgid "Refresh" msgstr "Auffrischen" -#: ../treebrowser/src/treebrowser.c:1079 +#: ../treebrowser/src/treebrowser.c:1083 msgid "Expand all" msgstr "Alle ausklappen" -#: ../treebrowser/src/treebrowser.c:1083 +#: ../treebrowser/src/treebrowser.c:1087 msgid "Collapse all" msgstr "Alle einklappen" -#: ../treebrowser/src/treebrowser.c:1090 +#: ../treebrowser/src/treebrowser.c:1094 #, c-format msgid "Close: %s" msgstr "%s: Schließen" -#: ../treebrowser/src/treebrowser.c:1095 +#: ../treebrowser/src/treebrowser.c:1099 msgid "Copy full path to clipboard" msgstr "Den vollständigen Pfad in die Zwischenablage kopieren" -#: ../treebrowser/src/treebrowser.c:1103 ../treebrowser/src/treebrowser.c:1752 +#: ../treebrowser/src/treebrowser.c:1107 ../treebrowser/src/treebrowser.c:1760 msgid "Show bookmarks" msgstr "Lesezeichen anzeigen" -#: ../treebrowser/src/treebrowser.c:1108 ../treebrowser/src/treebrowser.c:1706 +#: ../treebrowser/src/treebrowser.c:1112 ../treebrowser/src/treebrowser.c:1714 msgid "Show hidden files" msgstr "Versteckte Dateien anzeigen" -#: ../treebrowser/src/treebrowser.c:1113 +#: ../treebrowser/src/treebrowser.c:1117 msgid "Show bars" msgstr "Leisten anzeigen" -#: ../treebrowser/src/treebrowser.c:1481 +#: ../treebrowser/src/treebrowser.c:1361 +#, c-format +msgid "Target file '%s' exists, do you really want to replace it?" +msgstr "Zieldatei »%s« existiert bereits. Möchten Sie diese wirklich ersetzen?" + +#: ../treebrowser/src/treebrowser.c:1489 msgid "Home" msgstr "Ausgabe" -#: ../treebrowser/src/treebrowser.c:1491 +#: ../treebrowser/src/treebrowser.c:1499 msgid "Track path" msgstr "Pfad aufzeichnen" -#: ../treebrowser/src/treebrowser.c:1496 +#: ../treebrowser/src/treebrowser.c:1504 msgid "Hide bars" msgstr "Leisten verbergen" -#: ../treebrowser/src/treebrowser.c:1506 +#: ../treebrowser/src/treebrowser.c:1514 msgid "" "Filter (*.c;*.h;*.cpp), and if you want temporary filter using the '!' " "reverse try for example this '!;*.c;*.h;*.cpp'" msgstr "Filter (*.c;*.h;*.cpp). Die Nutzung von ! invertiert das Ergebnis." -#: ../treebrowser/src/treebrowser.c:1514 +#: ../treebrowser/src/treebrowser.c:1522 msgid "Addressbar for example '/projects/my-project'" msgstr "Adressleiste. Zum Beispiel »/projects/my-projet«" -#: ../treebrowser/src/treebrowser.c:1670 +#: ../treebrowser/src/treebrowser.c:1678 msgid "External open command" msgstr "Externes öffnen Kommando" -#: ../treebrowser/src/treebrowser.c:1675 +#: ../treebrowser/src/treebrowser.c:1683 #, c-format msgid "" "The command to execute when using \"Open with\". You can use %f and %d " @@ -3432,53 +3446,53 @@ "%f wird mit dem Dateinamen ersetzt, der den kompletten Pfad beinhaltet%d " "wird mit dem Pfad des Verzeichnisses der aktuellen Datei ersetzt" -#: ../treebrowser/src/treebrowser.c:1683 +#: ../treebrowser/src/treebrowser.c:1691 msgid "Toolbar" msgstr "Werkzeugleiste" -#: ../treebrowser/src/treebrowser.c:1685 +#: ../treebrowser/src/treebrowser.c:1693 msgid "Hidden" msgstr "Versteckt" -#: ../treebrowser/src/treebrowser.c:1686 +#: ../treebrowser/src/treebrowser.c:1694 msgid "Top" msgstr "Spitze" -#: ../treebrowser/src/treebrowser.c:1687 +#: ../treebrowser/src/treebrowser.c:1695 msgid "Bottom" msgstr "Boden" -#: ../treebrowser/src/treebrowser.c:1692 +#: ../treebrowser/src/treebrowser.c:1700 msgid "If position is changed, the option require plugin restart." msgstr "" "Bei einer Veränderung der Position, muss das Plugin neu geladen werden." -#: ../treebrowser/src/treebrowser.c:1696 +#: ../treebrowser/src/treebrowser.c:1704 msgid "Show icons" msgstr "Symbole anzeigen" -#: ../treebrowser/src/treebrowser.c:1698 +#: ../treebrowser/src/treebrowser.c:1706 msgid "None" msgstr "Keines" -#: ../treebrowser/src/treebrowser.c:1699 +#: ../treebrowser/src/treebrowser.c:1707 msgid "Base" msgstr "Basis" -#: ../treebrowser/src/treebrowser.c:1700 +#: ../treebrowser/src/treebrowser.c:1708 msgid "Content-type" msgstr "Inhaltsart" -#: ../treebrowser/src/treebrowser.c:1711 +#: ../treebrowser/src/treebrowser.c:1719 msgid "On Windows, this just hide files that are prefixed with '.' (dot)" msgstr "" "Unter Windows versteckt dies nur Dateien, die mit \".\" (Punkt) beginnen. " -#: ../treebrowser/src/treebrowser.c:1713 +#: ../treebrowser/src/treebrowser.c:1721 msgid "Hide object files" msgstr "Objektdateien verbergen" -#: ../treebrowser/src/treebrowser.c:1718 +#: ../treebrowser/src/treebrowser.c:1726 msgid "" "Don't show generated object files in the file browser, this includes *.o, *." "obj. *.so, *.dll, *.a, *.lib" @@ -3486,40 +3500,40 @@ "Keine generierten Objektdateien anzeigen. Dies bezieht *.o, *.obj. *.so, *." "dll, *.a, *.lib mit ein." -#: ../treebrowser/src/treebrowser.c:1720 +#: ../treebrowser/src/treebrowser.c:1728 msgid "Reverse filter" msgstr "Filter zurücksetzen" -#: ../treebrowser/src/treebrowser.c:1725 +#: ../treebrowser/src/treebrowser.c:1733 msgid "Follow current document" msgstr "Dem aktuellen Dokument folgen" -#: ../treebrowser/src/treebrowser.c:1730 +#: ../treebrowser/src/treebrowser.c:1738 msgid "Single click, open document and focus it" msgstr "Einfacher Klick, öffne Dokument und fokussiere es" -#: ../treebrowser/src/treebrowser.c:1735 +#: ../treebrowser/src/treebrowser.c:1743 msgid "Double click open directory" msgstr "Doppelklick zum Öffnen des Verzeichnisses" -#: ../treebrowser/src/treebrowser.c:1740 +#: ../treebrowser/src/treebrowser.c:1748 msgid "On delete file, close it if is opened" msgstr "Datei schließen, wenn sie gelöscht wird" # Gibts für Tooltip nich ne bessere Übersetzung? Sonst würde ich evtl. "Tooltip" auch als Eigennamen deklarieren :D -#: ../treebrowser/src/treebrowser.c:1745 +#: ../treebrowser/src/treebrowser.c:1753 msgid "Show tree lines" msgstr "Leere Zeilen anzeigen" -#: ../treebrowser/src/treebrowser.c:1820 +#: ../treebrowser/src/treebrowser.c:1828 msgid "Focus File List" msgstr "Dateiliste fokussieren" -#: ../treebrowser/src/treebrowser.c:1822 +#: ../treebrowser/src/treebrowser.c:1830 msgid "Focus Path Entry" msgstr "Pfadeintrag fokusieren" -#: ../treebrowser/src/treebrowser.c:1824 +#: ../treebrowser/src/treebrowser.c:1832 msgid "Rename Object" msgstr "Objekt Umbenennen" @@ -3531,31 +3545,31 @@ msgid "Column mode, select to line / matching brace." msgstr "Spaltenmodus. Auswählen bis zur Zeile/passenden Klammer" -#: ../geanyextrasel/src/extrasel.c:276 +#: ../geanyextrasel/src/extrasel.c:307 msgid "E_xtra Selection" msgstr "E_xtra Selection" -#: ../geanyextrasel/src/extrasel.c:282 +#: ../geanyextrasel/src/extrasel.c:313 msgid "_Column Mode" msgstr "_Spaltenmodus" -#: ../geanyextrasel/src/extrasel.c:286 +#: ../geanyextrasel/src/extrasel.c:317 msgid "Column mode" msgstr "Spaltenmodus" -#: ../geanyextrasel/src/extrasel.c:288 +#: ../geanyextrasel/src/extrasel.c:319 msgid "Select to _Line" msgstr "Zeile _auswählen" -#: ../geanyextrasel/src/extrasel.c:292 +#: ../geanyextrasel/src/extrasel.c:323 msgid "Select to line" msgstr "Zeile auswählen" -#: ../geanyextrasel/src/extrasel.c:294 +#: ../geanyextrasel/src/extrasel.c:325 msgid "Select to Matching _Brace" msgstr "Bis zur passenden Klammer auswählen" -#: ../geanyextrasel/src/extrasel.c:299 +#: ../geanyextrasel/src/extrasel.c:330 msgid "Select to matching brace" msgstr "Bis zur passenden Klammer auswählen" @@ -3597,6 +3611,65 @@ msgid "Check for Updates" msgstr "Auf mögliche Aktualisierungen prüfen" +#: ../webhelper/src/gwh-browser.c:463 +msgid "_Zoom" +msgstr "Vergrößerung" + +#: ../webhelper/src/gwh-browser.c:485 +msgid "Full-_content zoom" +msgstr "Dokument einpassen" + +#: ../webhelper/src/gwh-browser.c:496 +#, fuzzy +msgid "Flip panes orientation" +msgstr "Seitenausrichtung:" + +#: ../webhelper/src/gwh-browser.c:738 +msgid "Back" +msgstr "Zurück" + +#: ../webhelper/src/gwh-browser.c:742 +msgid "Forward" +msgstr "Weiter" + +#: ../webhelper/src/gwh-browser.c:746 +msgid "Cancel loading" +msgstr "Laden abbrechen" + +#: ../webhelper/src/gwh-browser.c:750 +msgid "Reload current page" +msgstr "Aktuelle Seite neu laden" + +#: ../webhelper/src/gwh-browser.c:763 ../webhelper/src/gwh-browser.c:836 +msgid "Web inspector" +msgstr "Web inspector" + +#: ../webhelper/src/gwh-browser.c:764 +msgid "Toggle web inspector" +msgstr "Webinspektor umschalten" + +#: ../webhelper/src/gwh-plugin.c:49 +msgid "Web helper" +msgstr "Web Helper" + +#: ../webhelper/src/gwh-plugin.c:50 +msgid "" +"Display a preview web page that gets updated upon document saving and " +"provide web analysis and debugging tools (aka Web Inspector), all using " +"WebKit." +msgstr "" +"Zeigt eine Vorschau für eine Webseite an, die jedes Mal beim Speichern neu " +"geladen wird. Es bietet dabei analytische Unterstützung sowie ein " +"Debuggingwerkzeug (Webinspektor) und basiert dabei auf Webkit. " + +#: ../webhelper/src/gwh-plugin.c:100 +msgid "Reload upon document saving" +msgstr "Beim Speichern des Dokumentes neu laden" + +#: ../webhelper/src/gwh-plugin.c:176 +msgid "Web preview" +msgstr "Webvorschau" + #~ msgid "Directory '%s' not exists." #~ msgstr "Verzeichnis »%s« existiert nicht." This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1749] trunk/geany-plugins/build/updatechecker.m4
by frlan＠users.sourceforge.net 15 Nov '10

15 Nov '10

Revision: 1749 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1749&view=rev Author: frlan Date: 2010-11-15 22:58:26 +0000 (Mon, 15 Nov 2010) Log Message: ----------- Added missed file from last commit. Oops Added Paths: ----------- trunk/geany-plugins/build/updatechecker.m4 Added: trunk/geany-plugins/build/updatechecker.m4 =================================================================== --- trunk/geany-plugins/build/updatechecker.m4 (rev 0) +++ trunk/geany-plugins/build/updatechecker.m4 2010-11-15 22:58:26 UTC (rev 1749) @@ -0,0 +1,14 @@ +AC_DEFUN([GP_CHECK_UPDATECHECKER], +[ + GP_ARG_DISABLE([Updatechecker], [auto]) + + GP_CHECK_PLUGIN_DEPS([Updatechecker], UPDATECHECKER, + [libsoup-2.4 >= 2.4.0]) + + GP_STATUS_PLUGIN_ADD([Updatechecker], [$enable_updatechecker]) + + AC_CONFIG_FILES([ + updatechecker/Makefile + updatechecker/src/Makefile + ]) +]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1748] trunk/geany-plugins
by frlan＠users.sourceforge.net 15 Nov '10

15 Nov '10

Revision: 1748 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1748&view=rev Author: frlan Date: 2010-11-15 22:33:34 +0000 (Mon, 15 Nov 2010) Log Message: ----------- Fix make distcheck for Updatechecker plugin and make plugin compile at all with autotools. To do this patches by Colomban Wendling has been applied. Thanks for providing them Modified Paths: -------------- trunk/geany-plugins/Makefile.am trunk/geany-plugins/build/geany.m4 trunk/geany-plugins/build/status.m4 trunk/geany-plugins/configure.ac trunk/geany-plugins/updatechecker/src/Makefile.am Modified: trunk/geany-plugins/Makefile.am =================================================================== --- trunk/geany-plugins/Makefile.am 2010-11-14 20:46:14 UTC (rev 1747) +++ trunk/geany-plugins/Makefile.am 2010-11-15 22:33:34 UTC (rev 1748) @@ -16,6 +16,7 @@ shiftcolumn \ spellcheck \ treebrowser \ + updatechecker \ webhelper ACLOCAL_AMFLAGS = -I build/cache -I build --install Modified: trunk/geany-plugins/build/geany.m4 =================================================================== --- trunk/geany-plugins/build/geany.m4 2010-11-14 20:46:14 UTC (rev 1747) +++ trunk/geany-plugins/build/geany.m4 2010-11-15 22:33:34 UTC (rev 1748) @@ -11,8 +11,9 @@ PKG_CHECK_MODULES([GEANY], [geany >= $1]) geanypluginsdir=$geany_libdir/geany - geanyversion=$(${PKG_CONFIG} --modversion geany) + GEANY_VERSION=$(${PKG_CONFIG} --modversion geany) AC_SUBST([geanypluginsdir]) + AC_SUBST([GEANY_VERSION]) export PKG_CONFIG_PATH="${PKG_CONFIG_PATH#*:}" test -z "${PKG_CONFIG_PATH}" && unset PKG_CONFIG_PATH Modified: trunk/geany-plugins/build/status.m4 =================================================================== --- trunk/geany-plugins/build/status.m4 2010-11-14 20:46:14 UTC (rev 1747) +++ trunk/geany-plugins/build/status.m4 2010-11-15 22:33:34 UTC (rev 1748) @@ -42,7 +42,7 @@ ${PACKAGE}-${VERSION} Build Environment: - Geany version: ${geanyversion} + Geany version: ${GEANY_VERSION} Install prefix: ${prefix} Datadir: ${expanded_datadir}/${PACKAGE_TARNAME} Libdir: ${expanded_libdir}/${PACKAGE_TARNAME} Modified: trunk/geany-plugins/configure.ac =================================================================== --- trunk/geany-plugins/configure.ac 2010-11-14 20:46:14 UTC (rev 1747) +++ trunk/geany-plugins/configure.ac 2010-11-15 22:33:34 UTC (rev 1748) @@ -39,6 +39,7 @@ GP_CHECK_SHIFTCOLUMN GP_CHECK_SPELLCHECK GP_CHECK_TREEBROWSER +GP_CHECK_UPDATECHECKER GP_CHECK_WEBHELPER AC_CONFIG_FILES([ Modified: trunk/geany-plugins/updatechecker/src/Makefile.am =================================================================== --- trunk/geany-plugins/updatechecker/src/Makefile.am 2010-11-14 20:46:14 UTC (rev 1747) +++ trunk/geany-plugins/updatechecker/src/Makefile.am 2010-11-15 22:33:34 UTC (rev 1748) @@ -1,9 +1,20 @@ include $(top_srcdir)/build/vars.build.mk +plugin = updatechecker if ENABLE_UPDATECHECKER geanyplugins_LTLIBRARIES = updatechecker.la else EXTRA_LTLIBRARIES = updatechecker.la endif + updatechecker_la_SOURCES = updatechecker.c -updatechecker_la_LIBADD = $(COMMONLIBS) +updatechecker_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DGEANY_VERSION=\"$(GEANY_VERSION)\" \ + -DG_LOG_DOMAIN=\"Updatechecker\" +updatechecker_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(UPDATECHECKER_CFLAGS) +updatechecker_la_LIBADD = \ + $(COMMONLIBS) \ + $(UPDATECHECKER_LIBS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1747] trunk/geany-plugins/waf
by eht16＠users.sourceforge.net 14 Nov '10

14 Nov '10

Revision: 1747 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1747&view=rev Author: eht16 Date: 2010-11-14 20:46:14 +0000 (Sun, 14 Nov 2010) Log Message: ----------- Update Waf to current SVN version This fixes a build error if the WebHelper plugin is enabled and GLib version is older than 2.25.0. Modified Paths: -------------- trunk/geany-plugins/waf Modified: trunk/geany-plugins/waf =================================================================== --- trunk/geany-plugins/waf 2010-11-13 21:38:37 UTC (rev 1746) +++ trunk/geany-plugins/waf 2010-11-14 20:46:14 UTC (rev 1747) @@ -33,9 +33,9 @@ import os, sys VERSION="1.6.1" -REVISION="1369902f3a1b0afb93dd6cdf3068f626" +REVISION="6204fe6c124920a536f913a440ffa204" INSTALL='' -C1='#)' +C1='#+' C2='#(' cwd = os.getcwd() join = os.path.join @@ -161,5 +161,5 @@ Scripting.waf_entry_point(cwd, VERSION, wafdir) #==> @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1746] trunk/geanylatex/src
by frlan＠users.sourceforge.net 13 Nov '10

13 Nov '10

Revision: 1746 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1746&view=rev Author: frlan Date: 2010-11-13 21:38:37 +0000 (Sat, 13 Nov 2010) Log Message: ----------- GeanyLaTeX: Clean up some code Modified Paths: -------------- trunk/geanylatex/src/datatypes.h trunk/geanylatex/src/geanylatex.c trunk/geanylatex/src/latexenvironments.c trunk/geanylatex/src/latexenvironments.h trunk/geanylatex/src/latexutils.c trunk/geanylatex/src/latexutils.h trunk/geanylatex/src/letters.c trunk/geanylatex/src/letters.h Modified: trunk/geanylatex/src/datatypes.h =================================================================== --- trunk/geanylatex/src/datatypes.h 2010-11-13 11:38:06 UTC (rev 1745) +++ trunk/geanylatex/src/datatypes.h 2010-11-13 21:38:37 UTC (rev 1746) @@ -25,8 +25,8 @@ typedef struct { gint cat; - gchar *label; - gchar *latex; + const gchar *label; + const gchar *latex; } SubMenuTemplate; Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2010-11-13 11:38:06 UTC (rev 1745) +++ trunk/geanylatex/src/geanylatex.c 2010-11-13 21:38:37 UTC (rev 1746) @@ -772,7 +772,7 @@ }; -static inline gchar* +static inline const gchar* get_latex_command(gint tab_index) { return glatex_char_array[tab_index].latex; @@ -827,8 +827,8 @@ if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { gchar *label_str = NULL; - label_str = g_strconcat("\\label{",g_strdup(gtk_entry_get_text( - GTK_ENTRY(textbox_label))), "}", NULL); + label_str = g_strconcat("\\label{",gtk_entry_get_text( + GTK_ENTRY(textbox_label)), "}", NULL); glatex_insert_string(label_str, TRUE); } Modified: trunk/geanylatex/src/latexenvironments.c =================================================================== --- trunk/geanylatex/src/latexenvironments.c 2010-11-13 11:38:06 UTC (rev 1745) +++ trunk/geanylatex/src/latexenvironments.c 2010-11-13 21:38:37 UTC (rev 1746) @@ -60,7 +60,7 @@ /* if type == -1 then we will try to autodetect the type */ -void glatex_insert_environment(gchar *environment, gint type) +void glatex_insert_environment(const gchar *environment, gint type) { GeanyDocument *doc = NULL; Modified: trunk/geanylatex/src/latexenvironments.h =================================================================== --- trunk/geanylatex/src/latexenvironments.h 2010-11-13 11:38:06 UTC (rev 1745) +++ trunk/geanylatex/src/latexenvironments.h 2010-11-13 21:38:37 UTC (rev 1746) @@ -50,7 +50,7 @@ extern CategoryName glatex_environment_cat_names[]; -void glatex_insert_environment(gchar *environment, gint type); +void glatex_insert_environment(const gchar *environment, gint type); void glatex_insert_environment_dialog(G_GNUC_UNUSED GtkMenuItem *menuitem, Modified: trunk/geanylatex/src/latexutils.c =================================================================== --- trunk/geanylatex/src/latexutils.c 2010-11-13 11:38:06 UTC (rev 1745) +++ trunk/geanylatex/src/latexutils.c 2010-11-13 21:38:37 UTC (rev 1746) @@ -98,7 +98,7 @@ void -glatex_insert_string(gchar *string, gboolean reset_position) +glatex_insert_string(const gchar *string, gboolean reset_position) { GeanyDocument *doc = NULL; @@ -148,11 +148,12 @@ if (entity != NULL) { - replacement = g_string_append(replacement, entity); + + g_string_append(replacement, entity); } else { - replacement = g_string_append(replacement, buf); + g_string_append(replacement, buf); } } new = g_string_free(replacement, FALSE); Modified: trunk/geanylatex/src/latexutils.h =================================================================== --- trunk/geanylatex/src/latexutils.h 2010-11-13 11:38:06 UTC (rev 1745) +++ trunk/geanylatex/src/latexutils.h 2010-11-13 21:38:37 UTC (rev 1746) @@ -26,7 +26,7 @@ gchar **glatex_read_file_in_array(const gchar *filename); void glatex_usepackage(const gchar *pkg, const gchar *options); void glatex_enter_key_pressed_in_entry(G_GNUC_UNUSED GtkWidget *widget, gpointer dialog); -void glatex_insert_string(gchar *string, gboolean reset_position); +void glatex_insert_string(const gchar *string, gboolean reset_position); void glatex_replace_special_character(void); #endif Modified: trunk/geanylatex/src/letters.c =================================================================== --- trunk/geanylatex/src/letters.c 2010-11-13 11:38:06 UTC (rev 1745) +++ trunk/geanylatex/src/letters.c 2010-11-13 21:38:37 UTC (rev 1746) @@ -222,7 +222,7 @@ }; -gchar *glatex_get_entity(const gchar *letter) +const gchar *glatex_get_entity(const gchar *letter) { if (! utils_str_equal(letter, "\\")) { Modified: trunk/geanylatex/src/letters.h =================================================================== --- trunk/geanylatex/src/letters.h 2010-11-13 11:38:06 UTC (rev 1745) +++ trunk/geanylatex/src/letters.h 2010-11-13 21:38:37 UTC (rev 1746) @@ -33,6 +33,6 @@ extern CategoryName glatex_cat_names[]; -gchar *glatex_get_entity(const gchar *letter); +const gchar *glatex_get_entity(const gchar *letter); #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1745] trunk/geanylatex/src/geanylatex.c
by frlan＠users.sourceforge.net 13 Nov '10

13 Nov '10

Revision: 1745 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1745&view=rev Author: frlan Date: 2010-11-13 11:38:06 +0000 (Sat, 13 Nov 2010) Log Message: ----------- GeanyLaTeX: Don't insert braces on newline in case of command in front contains a quot Modified Paths: -------------- trunk/geanylatex/src/geanylatex.c Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2010-11-13 11:37:47 UTC (rev 1744) +++ trunk/geanylatex/src/geanylatex.c 2010-11-13 11:38:06 UTC (rev 1745) @@ -653,7 +653,8 @@ * would cause a bigger mass. */ else if (buf[i] == ' ' || buf[i] == '}' || - buf[i] == '{') + buf[i] == '{' || + buf[i] == '"') { break; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1744] trunk/geanylatex/src/letters.c
by frlan＠users.sourceforge.net 13 Nov '10

13 Nov '10

Revision: 1744 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1744&view=rev Author: frlan Date: 2010-11-13 11:37:47 +0000 (Sat, 13 Nov 2010) Log Message: ----------- GeanyLaTeX: Insert a backslash in front of a couple of replacing letters Modified Paths: -------------- trunk/geanylatex/src/letters.c Modified: trunk/geanylatex/src/letters.c =================================================================== --- trunk/geanylatex/src/letters.c 2010-11-11 18:10:59 UTC (rev 1743) +++ trunk/geanylatex/src/letters.c 2010-11-13 11:37:47 UTC (rev 1744) @@ -107,13 +107,13 @@ {GREEK_LETTERS, "ϖ", "\\piv" }, /* German Umlaute */ - {GERMAN_LETTERS, "ä","\"a"}, - {GERMAN_LETTERS, "Ä","\"A"}, - {GERMAN_LETTERS, "ü","\"u"}, - {GERMAN_LETTERS, "Ü","\"U"}, - {GERMAN_LETTERS, "ö","\"o"}, - {GERMAN_LETTERS, "Ö","\"O"}, - {GERMAN_LETTERS, "ß","\"s"}, + {GERMAN_LETTERS, "ä","\\\"a"}, + {GERMAN_LETTERS, "Ä","\\\"A"}, + {GERMAN_LETTERS, "ü","\\\"u"}, + {GERMAN_LETTERS, "Ü","\\\"U"}, + {GERMAN_LETTERS, "ö","\\\"o"}, + {GERMAN_LETTERS, "Ö","\\\"O"}, + {GERMAN_LETTERS, "ß","\\\"s"}, /* Czech characters */ {MISC_LETTERS, "ě","\\v{e}"}, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1743] trunk/geany-plugins/po/ru.po
by sheckley＠users.sourceforge.net 11 Nov '10

11 Nov '10

Revision: 1743 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1743&view=rev Author: sheckley Date: 2010-11-11 18:10:59 +0000 (Thu, 11 Nov 2010) Log Message: ----------- removed the russian translation of all extrasel and insertnum strings, it was completely wrong Modified Paths: -------------- trunk/geany-plugins/po/ru.po Modified: trunk/geany-plugins/po/ru.po =================================================================== --- trunk/geany-plugins/po/ru.po 2010-11-11 18:05:33 UTC (rev 1742) +++ trunk/geany-plugins/po/ru.po 2010-11-11 18:10:59 UTC (rev 1743) @@ -3109,7 +3109,7 @@ #: ../geanyinsertnum/src/insertnum.c:501 #, fuzzy msgid "Insert Numbers" -msgstr "Настройки" +msgstr "" #: ../geanyinsertnum/src/insertnum.c:33 msgid "Insert/Fill columns with numbers." @@ -3118,7 +3118,7 @@ #: ../geanyinsertnum/src/insertnum.c:151 #, fuzzy msgid "Counting..." -msgstr "_Продолжить" +msgstr "" #: ../geanyinsertnum/src/insertnum.c:198 msgid "Preparing..." @@ -3127,7 +3127,7 @@ #: ../geanyinsertnum/src/insertnum.c:204 #, fuzzy msgid "Inserting..." -msgstr "запущено" +msgstr "" #: ../geanyinsertnum/src/insertnum.c:363 msgid "For base 11 and above" @@ -3136,17 +3136,17 @@ #: ../geanyinsertnum/src/insertnum.c:385 #, fuzzy msgid "_Start:" -msgstr "_Пауза" +msgstr "" #: ../geanyinsertnum/src/insertnum.c:390 #, fuzzy msgid "S_tep:" -msgstr "Следующая _строка" +msgstr "" #: ../geanyinsertnum/src/insertnum.c:396 #, fuzzy msgid "_Base:" -msgstr "_Пауза" +msgstr "" #: ../geanyinsertnum/src/insertnum.c:406 msgid "Letters:" @@ -3183,7 +3183,7 @@ #: ../geanyinsertnum/src/insertnum.c:494 #, fuzzy msgid "Insert _Numbers" -msgstr "Настройки" +msgstr "" #: ../treebrowser/src/treebrowser.c:89 ../treebrowser/src/treebrowser.c:1315 msgid "Tree Browser" @@ -3392,7 +3392,7 @@ #: ../geanyextrasel/src/extrasel.c:30 #, fuzzy msgid "Extra Selection" -msgstr "Выбрать шрифт" +msgstr "" #: ../geanyextrasel/src/extrasel.c:30 msgid "Column mode, select to line / matching brace." This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1742] trunk/geany-plugins/po
by sheckley＠users.sourceforge.net 11 Nov '10

11 Nov '10

Revision: 1742 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1742&view=rev Author: sheckley Date: 2010-11-11 18:05:33 +0000 (Thu, 11 Nov 2010) Log Message: ----------- updated the translations for "E_xtra Selection" and "_Column mode" of course, they should be verified by the translators removed the improper russian translation of "Select to _Line" and "Select to Line" as "Select font" (nah?) Modified Paths: -------------- trunk/geany-plugins/po/be.po trunk/geany-plugins/po/ca.po trunk/geany-plugins/po/da.po trunk/geany-plugins/po/de.po trunk/geany-plugins/po/es.po trunk/geany-plugins/po/fr.po trunk/geany-plugins/po/geany-plugins.pot trunk/geany-plugins/po/gl.po trunk/geany-plugins/po/ja.po trunk/geany-plugins/po/pt.po trunk/geany-plugins/po/pt_BR.po trunk/geany-plugins/po/ru.po trunk/geany-plugins/po/tr.po trunk/geany-plugins/po/zh_CN.po Modified: trunk/geany-plugins/po/be.po =================================================================== --- trunk/geany-plugins/po/be.po 2010-11-11 17:41:03 UTC (rev 1741) +++ trunk/geany-plugins/po/be.po 2010-11-11 18:05:33 UTC (rev 1742) @@ -3337,11 +3337,11 @@ msgstr "" #: ../geanyextrasel/src/extrasel.c:265 -msgid "E_xtra selection" +msgid "E_xtra Selection" msgstr "" #: ../geanyextrasel/src/extrasel.c:271 -msgid "_Column mode" +msgid "_Column Mode" msgstr "" #: ../geanyextrasel/src/extrasel.c:275 Modified: trunk/geany-plugins/po/ca.po =================================================================== --- trunk/geany-plugins/po/ca.po 2010-11-11 17:41:03 UTC (rev 1741) +++ trunk/geany-plugins/po/ca.po 2010-11-11 18:05:33 UTC (rev 1742) @@ -3347,11 +3347,11 @@ msgstr "" #: ../geanyextrasel/src/extrasel.c:265 -msgid "E_xtra selection" +msgid "E_xtra Selection" msgstr "" #: ../geanyextrasel/src/extrasel.c:271 -msgid "_Column mode" +msgid "_Column Mode" msgstr "" #: ../geanyextrasel/src/extrasel.c:275 Modified: trunk/geany-plugins/po/da.po =================================================================== --- trunk/geany-plugins/po/da.po 2010-11-11 17:41:03 UTC (rev 1741) +++ trunk/geany-plugins/po/da.po 2010-11-11 18:05:33 UTC (rev 1742) @@ -3293,11 +3293,11 @@ msgstr "" #: ../geanyextrasel/src/extrasel.c:265 -msgid "E_xtra selection" +msgid "E_xtra Selection" msgstr "" #: ../geanyextrasel/src/extrasel.c:271 -msgid "_Column mode" +msgid "_Column Mode" msgstr "" #: ../geanyextrasel/src/extrasel.c:275 Modified: trunk/geany-plugins/po/de.po =================================================================== --- trunk/geany-plugins/po/de.po 2010-11-11 17:41:03 UTC (rev 1741) +++ trunk/geany-plugins/po/de.po 2010-11-11 18:05:33 UTC (rev 1742) @@ -3532,11 +3532,11 @@ msgstr "Spaltenmodus. Auswählen bis zur Zeile/passenden Klammer" #: ../geanyextrasel/src/extrasel.c:276 -msgid "E_xtra selection" -msgstr "E_xtra selection" +msgid "E_xtra Selection" +msgstr "E_xtra Selection" #: ../geanyextrasel/src/extrasel.c:282 -msgid "_Column mode" +msgid "_Column Mode" msgstr "_Spaltenmodus" #: ../geanyextrasel/src/extrasel.c:286 Modified: trunk/geany-plugins/po/es.po =================================================================== --- trunk/geany-plugins/po/es.po 2010-11-11 17:41:03 UTC (rev 1741) +++ trunk/geany-plugins/po/es.po 2010-11-11 18:05:33 UTC (rev 1742) @@ -3299,11 +3299,11 @@ msgstr "" #: ../geanyextrasel/src/extrasel.c:265 -msgid "E_xtra selection" +msgid "E_xtra Selection" msgstr "" #: ../geanyextrasel/src/extrasel.c:271 -msgid "_Column mode" +msgid "_Column Mode" msgstr "" #: ../geanyextrasel/src/extrasel.c:275 Modified: trunk/geany-plugins/po/fr.po =================================================================== --- trunk/geany-plugins/po/fr.po 2010-11-11 17:41:03 UTC (rev 1741) +++ trunk/geany-plugins/po/fr.po 2010-11-11 18:05:33 UTC (rev 1742) @@ -3355,11 +3355,11 @@ msgstr "" #: ../geanyextrasel/src/extrasel.c:265 -msgid "E_xtra selection" +msgid "E_xtra Selection" msgstr "" #: ../geanyextrasel/src/extrasel.c:271 -msgid "_Column mode" +msgid "_Column Mode" msgstr "" #: ../geanyextrasel/src/extrasel.c:275 Modified: trunk/geany-plugins/po/geany-plugins.pot =================================================================== --- trunk/geany-plugins/po/geany-plugins.pot 2010-11-11 17:41:03 UTC (rev 1741) +++ trunk/geany-plugins/po/geany-plugins.pot 2010-11-11 18:05:33 UTC (rev 1742) @@ -3291,11 +3291,11 @@ msgstr "" #: ../geanyextrasel/src/extrasel.c:265 -msgid "E_xtra selection" +msgid "E_xtra Selection" msgstr "" #: ../geanyextrasel/src/extrasel.c:271 -msgid "_Column mode" +msgid "_Column Mode" msgstr "" #: ../geanyextrasel/src/extrasel.c:275 Modified: trunk/geany-plugins/po/gl.po =================================================================== --- trunk/geany-plugins/po/gl.po 2010-11-11 17:41:03 UTC (rev 1741) +++ trunk/geany-plugins/po/gl.po 2010-11-11 18:05:33 UTC (rev 1742) @@ -3362,11 +3362,11 @@ msgstr "Modo de columna, seleccionar ata a liña ou chave correspondente." #: ../geanyextrasel/src/extrasel.c:265 -msgid "E_xtra selection" +msgid "E_xtra Selection" msgstr "Selección e_xtra" #: ../geanyextrasel/src/extrasel.c:271 -msgid "_Column mode" +msgid "_Column Mode" msgstr "Modo de _columna" #: ../geanyextrasel/src/extrasel.c:275 Modified: trunk/geany-plugins/po/ja.po =================================================================== --- trunk/geany-plugins/po/ja.po 2010-11-11 17:41:03 UTC (rev 1741) +++ trunk/geany-plugins/po/ja.po 2010-11-11 18:05:33 UTC (rev 1742) @@ -3624,11 +3624,11 @@ msgstr "列選択モード、行番号指定選択、対応する括弧で選択" #: ../geanyextrasel/src/extrasel.c:265 -msgid "E_xtra selection" +msgid "E_xtra Selection" msgstr "特殊な選択(_X)" #: ../geanyextrasel/src/extrasel.c:271 -msgid "_Column mode" +msgid "_Column Mode" msgstr "列選択モード(_C)" #: ../geanyextrasel/src/extrasel.c:275 Modified: trunk/geany-plugins/po/pt.po =================================================================== --- trunk/geany-plugins/po/pt.po 2010-11-11 17:41:03 UTC (rev 1741) +++ trunk/geany-plugins/po/pt.po 2010-11-11 18:05:33 UTC (rev 1742) @@ -3474,11 +3474,11 @@ msgstr "Modo coluna, selecções até à linha / chaveta correspondente." #: ../geanyextrasel/src/extrasel.c:265 -msgid "E_xtra selection" -msgstr "Selecções e_xtra" +msgid "E_xtra Selection" +msgstr "Selecções E_xtra" #: ../geanyextrasel/src/extrasel.c:271 -msgid "_Column mode" +msgid "_Column Mode" msgstr "Modo de _Coluna" #: ../geanyextrasel/src/extrasel.c:275 Modified: trunk/geany-plugins/po/pt_BR.po =================================================================== --- trunk/geany-plugins/po/pt_BR.po 2010-11-11 17:41:03 UTC (rev 1741) +++ trunk/geany-plugins/po/pt_BR.po 2010-11-11 18:05:33 UTC (rev 1742) @@ -3361,11 +3361,11 @@ msgstr "Modo coluna, seleção até a linha / colchete casado." #: ../geanyextrasel/src/extrasel.c:265 -msgid "E_xtra selection" -msgstr "Seleção e_xtra" +msgid "E_xtra Selection" +msgstr "Seleção E_xtra" #: ../geanyextrasel/src/extrasel.c:271 -msgid "_Column mode" +msgid "_Column Mode" msgstr "Modo _Coluna" #: ../geanyextrasel/src/extrasel.c:275 Modified: trunk/geany-plugins/po/ru.po =================================================================== --- trunk/geany-plugins/po/ru.po 2010-11-11 17:41:03 UTC (rev 1741) +++ trunk/geany-plugins/po/ru.po 2010-11-11 18:05:33 UTC (rev 1742) @@ -3399,11 +3399,11 @@ msgstr "" #: ../geanyextrasel/src/extrasel.c:265 -msgid "E_xtra selection" +msgid "E_xtra Selection" msgstr "" #: ../geanyextrasel/src/extrasel.c:271 -msgid "_Column mode" +msgid "_Column Mode" msgstr "" #: ../geanyextrasel/src/extrasel.c:275 @@ -3413,12 +3413,12 @@ #: ../geanyextrasel/src/extrasel.c:277 #, fuzzy msgid "Select to _Line" -msgstr "Выбрать шрифт" +msgstr "" #: ../geanyextrasel/src/extrasel.c:281 #, fuzzy msgid "Select to line" -msgstr "Выбрать шрифт" +msgstr "" #: ../geanyextrasel/src/extrasel.c:283 msgid "Select to Matching _Brace" Modified: trunk/geany-plugins/po/tr.po =================================================================== --- trunk/geany-plugins/po/tr.po 2010-11-11 17:41:03 UTC (rev 1741) +++ trunk/geany-plugins/po/tr.po 2010-11-11 18:05:33 UTC (rev 1742) @@ -3324,11 +3324,11 @@ msgstr "" #: ../geanyextrasel/src/extrasel.c:276 -msgid "E_xtra selection" +msgid "E_xtra Selection" msgstr "" #: ../geanyextrasel/src/extrasel.c:282 -msgid "_Column mode" +msgid "_Column Mode" msgstr "S_ütun Modu" #: ../geanyextrasel/src/extrasel.c:286 Modified: trunk/geany-plugins/po/zh_CN.po =================================================================== --- trunk/geany-plugins/po/zh_CN.po 2010-11-11 17:41:03 UTC (rev 1741) +++ trunk/geany-plugins/po/zh_CN.po 2010-11-11 18:05:33 UTC (rev 1742) @@ -3456,11 +3456,11 @@ msgstr "" #: ../geanyextrasel/src/extrasel.c:265 -msgid "E_xtra selection" +msgid "E_xtra Selection" msgstr "" #: ../geanyextrasel/src/extrasel.c:271 -msgid "_Column mode" +msgid "_Column Mode" msgstr "" #: ../geanyextrasel/src/extrasel.c:275 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1741] trunk/geany-plugins/geanyextrasel
by sheckley＠users.sourceforge.net 11 Nov '10

11 Nov '10

Revision: 1741 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1741&view=rev Author: sheckley Date: 2010-11-11 17:41:03 +0000 (Thu, 11 Nov 2010) Log Message: ----------- smart home selection synced with Geany Camel Cased E_xtra selection, _Column mode fixed a small compilation warning Modified Paths: -------------- trunk/geany-plugins/geanyextrasel/ChangeLog trunk/geany-plugins/geanyextrasel/src/extrasel.c Modified: trunk/geany-plugins/geanyextrasel/ChangeLog =================================================================== --- trunk/geany-plugins/geanyextrasel/ChangeLog 2010-11-11 15:48:55 UTC (rev 1740) +++ trunk/geany-plugins/geanyextrasel/ChangeLog 2010-11-11 17:41:03 UTC (rev 1741) @@ -1,14 +1,20 @@ +2010-11-11 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> + + * src/extrasel.c: + Respect 'Smart' home key (Geany does now). + Camel Cased "Extra selection" and "Column mode" menu items. + 2010-05-31 Dimitar Zhekov <dimitar.zhekov(a)gmail.com> * src/extrasel.c: - Fixed "Goto line and select" with the toolbar visible. - + Fixed "Select to Line" with the toolbar visible. + 2010-05-22 Dimitar Zhekov <hamster(a)mbox.contact.bg> * src/extrasel.c: Fixed crash in plugin_cleanup() - patch by Colomban Wendling, thanks. Use documents_foreach() if foreach_document() is not available. - + 2010-05-21 Dimitar Zhekov <hamster(a)mbox.contact.bg> * src/extrasel.c: Modified: trunk/geany-plugins/geanyextrasel/src/extrasel.c =================================================================== --- trunk/geany-plugins/geanyextrasel/src/extrasel.c 2010-11-11 15:48:55 UTC (rev 1740) +++ trunk/geany-plugins/geanyextrasel/src/extrasel.c 2010-11-11 17:41:03 UTC (rev 1741) @@ -28,7 +28,7 @@ PLUGIN_VERSION_CHECK(150) PLUGIN_SET_INFO(_("Extra Selection"), _("Column mode, select to line / matching brace."), - "0.1", "Dimitar Toshkov Zhekov <dimitar.zhekov(a)gmail.com>"); + "0.2", "Dimitar Toshkov Zhekov <dimitar.zhekov(a)gmail.com>"); /* Keybinding(s) */ enum @@ -58,12 +58,12 @@ static const command_key command_keys[] = { + { GDK_Up, GDK_KP_Up, SCI_PARAUP }, + { GDK_Down, GDK_KP_Down, SCI_PARADOWN }, { GDK_Left, GDK_KP_Left, SCI_WORDLEFT }, { GDK_Right, GDK_KP_Right, SCI_WORDRIGHTEND }, { GDK_Home, GDK_KP_Home, SCI_DOCUMENTSTART }, { GDK_End, GDK_KP_End, SCI_DOCUMENTEND }, - { GDK_Up, GDK_KP_Up, SCI_PARAUP }, - { GDK_Down, GDK_KP_Down, SCI_PARADOWN }, { 0, 0, 0 } }; @@ -104,13 +104,13 @@ { ScintillaObject *sci = doc->editor->sci; - if (gtk_window_get_focus(GTK_WINDOW(widget)) == sci) + if (gtk_window_get_focus(GTK_WINDOW(widget)) == GTK_WIDGET(sci)) { column_mode_command(sci, ck->command); return TRUE; } } - /* no document or not focused */ + break; } } @@ -126,54 +126,85 @@ gint rectangle; } select_key; -static const select_key select_keys[] = +/* not #defined in 0.18 */ +#define sci_clear_cmdkey(sci, key) scintilla_send_message((sci), SCI_CLEARCMDKEY, (key), 0) +#define sci_assign_cmdkey(sci, key, command) \ + scintilla_send_message((sci), SCI_ASSIGNCMDKEY, (key), (command)) + +static void assign_select_key(ScintillaObject *sci, const select_key *sk) { + if (column_mode) + { + sci_clear_cmdkey(sci, sk->key | (SCMOD_ALT << 16)); + sci_assign_cmdkey(sci, sk->key, sk->rectangle); + } + else + { + sci_assign_cmdkey(sci, sk->key, sk->stream); + sci_assign_cmdkey(sci, sk->key | (SCMOD_ALT << 16), sk->rectangle); + } +} + +static select_key select_keys[] = +{ + { SCK_HOME | (SCMOD_SHIFT << 16), SCI_NULL, SCI_NULL }, + { SCK_UP | (SCMOD_SHIFT << 16), SCI_LINEUPEXTEND, SCI_LINEUPRECTEXTEND }, { SCK_DOWN | (SCMOD_SHIFT << 16), SCI_LINEDOWNEXTEND, SCI_LINEDOWNRECTEXTEND }, - { SCK_UP | (SCMOD_SHIFT << 16), SCI_LINEUPEXTEND, SCI_LINEUPRECTEXTEND }, { SCK_LEFT | (SCMOD_SHIFT << 16), SCI_CHARLEFTEXTEND, SCI_CHARLEFTRECTEXTEND }, { SCK_RIGHT | (SCMOD_SHIFT << 16), SCI_CHARRIGHTEXTEND, SCI_CHARRIGHTRECTEXTEND }, - { SCK_HOME | (SCMOD_SHIFT << 16), SCI_VCHOMEEXTEND, SCI_VCHOMERECTEXTEND }, { SCK_END | (SCMOD_SHIFT << 16), SCI_LINEENDEXTEND, SCI_LINEENDRECTEXTEND }, { SCK_PRIOR | (SCMOD_SHIFT << 16), SCI_PAGEUPEXTEND, SCI_PAGEUPRECTEXTEND }, { SCK_NEXT | (SCMOD_SHIFT << 16), SCI_PAGEDOWNEXTEND, SCI_PAGEDOWNRECTEXTEND }, { 0, 0, 0 } }; -/* not #defined in 0.18 */ -#define sci_clear_cmdkey(sci, key) scintilla_send_message((sci), SCI_CLEARCMDKEY, (key), 0) -#define sci_assign_cmdkey(sci, key, command) \ - scintilla_send_message((sci), SCI_ASSIGNCMDKEY, (key), (command)) - -static void assign_column_keys(ScintillaObject *sci) +static void assign_select_keys(ScintillaObject *sci) { const select_key *sk; for (sk = select_keys; sk->key; sk++) - { - if (column_mode) - { - sci_clear_cmdkey(sci, sk->key | (SCMOD_ALT << 16)); - sci_assign_cmdkey(sci, sk->key, sk->rectangle); - } - else - { - sci_assign_cmdkey(sci, sk->key, sk->stream); - sci_assign_cmdkey(sci, sk->key | (SCMOD_ALT << 16), sk->rectangle); - } - } + assign_select_key(sci, sk); } static void on_document_switch(G_GNUC_UNUSED GObject *obj, GeanyDocument *doc, G_GNUC_UNUSED gpointer user_data) { - assign_column_keys(doc->editor->sci); + assign_select_keys(doc->editor->sci); } +static void update_home_key(void) +{ + if (geany_data->editor_prefs->smart_home_key) + { + select_keys->stream = SCI_VCHOMEEXTEND; + select_keys->rectangle = SCI_VCHOMERECTEXTEND; + } + else + { + select_keys->stream = SCI_HOMEEXTEND; + select_keys->rectangle = SCI_HOMERECTEXTEND; + } +} + +static void on_settings_change(G_GNUC_UNUSED GKeyFile *config) +{ + update_home_key(); + + if (column_mode) + { + GeanyDocument *doc = document_get_current(); + + if (doc) + assign_select_key(doc->editor->sci, select_keys); + } +} + PluginCallback plugin_callbacks[] = { { "document-new", (GCallback) &on_document_switch, FALSE, NULL }, { "document-open", (GCallback) &on_document_switch, FALSE, NULL }, { "document-activate", (GCallback) &on_document_switch, FALSE, NULL }, + { "save-settings", (GCallback) &on_settings_change, FALSE, NULL }, { NULL, NULL, FALSE, NULL } }; @@ -197,7 +228,7 @@ int anchor = sci_get_anchor(sci); int cursor = sci_get_current_position(sci); - assign_column_keys(sci); + assign_select_keys(sci); if (column_mode && select_mode == SC_SEL_STREAM) { sci_set_selection_mode(sci, SC_SEL_RECTANGLE); @@ -273,13 +304,13 @@ main_locale_init(LOCALEDIR, GETTEXT_PACKAGE); - main_menu_item = gtk_menu_item_new_with_mnemonic(_("E_xtra selection")); + main_menu_item = gtk_menu_item_new_with_mnemonic(_("E_xtra Selection")); gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), main_menu_item); g_signal_connect(main_menu_item, "activate", G_CALLBACK(on_extra_select_activate), NULL); extra_select_menu = gtk_menu_new(); gtk_menu_item_set_submenu(GTK_MENU_ITEM(main_menu_item), extra_select_menu); - column_mode_item = gtk_check_menu_item_new_with_mnemonic(_("_Column mode")); + column_mode_item = gtk_check_menu_item_new_with_mnemonic(_("_Column Mode")); gtk_container_add(GTK_CONTAINER(extra_select_menu), column_mode_item); g_signal_connect(column_mode_item, "toggled", G_CALLBACK(on_column_mode_toggled), NULL); keybindings_set_item(plugin_key_group, COLUMN_MODE_KB, on_column_mode_key, 0, 0, @@ -303,6 +334,8 @@ go_to_line1_item = g_object_get_data((gpointer) geany->main_widgets->window, "go_to_line1"); + update_home_key(); + plugin_signal_connect(geany_plugin, G_OBJECT(geany->main_widgets->window), "key-press-event", FALSE, G_CALLBACK(on_key_press_event), NULL); } @@ -318,6 +351,6 @@ column_mode = FALSE; foreach_document (i) - assign_column_keys(documents[i]->editor->sci); + assign_select_keys(documents[i]->editor->sci); gtk_widget_destroy(main_menu_item); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits November 2010