Commits March 2011

commits@lists.geany.org

4 participants
116 discussions

SF.net SVN: geany:[5637] trunk
by eht16＠users.sourceforge.net 27 Mar '11

27 Mar '11

Revision: 5637 http://geany.svn.sourceforge.net/geany/?rev=5637&view=rev Author: eht16 Date: 2011-03-27 15:04:58 +0000 (Sun, 27 Mar 2011) Log Message: ----------- Initialize GLib's Gthread system early at startup in case any plugins need it. Modified Paths: -------------- trunk/ChangeLog trunk/configure.ac trunk/src/Makefile.am trunk/src/main.c trunk/src/makefile.win32 trunk/wscript Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-27 15:02:07 UTC (rev 5636) +++ trunk/ChangeLog 2011-03-27 15:04:58 UTC (rev 5637) @@ -1,3 +1,11 @@ +2011-03-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/makefile.win32, src/main.c, src/Makefile.am, configure.ac, + wscript: + Initialize GLib's Gthread system early at startup in case any + plugins need it. + + 2011-03-27 Colomban Wendling <colomban(at)geany(dot)org> * plugins/splitwindow.c: Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2011-03-27 15:02:07 UTC (rev 5636) +++ trunk/configure.ac 2011-03-27 15:04:58 UTC (rev 5637) @@ -146,6 +146,11 @@ if test $have_gio = 1 ; then AC_DEFINE(HAVE_GIO, 1, [Whether GIO is available]) fi +# GTHREAD checks +gthread_modules="gthread-2.0" +PKG_CHECK_MODULES(GTHREAD, [$gthread_modules]) +AC_SUBST(GTHREAD_CFLAGS) +AC_SUBST(GTHREAD_LIBS) # --disable-deprecated switch for GTK2 purification AC_ARG_ENABLE(deprecated, [ --disable-deprecated Disable deprecated GTK functions. ], Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2011-03-27 15:02:07 UTC (rev 5636) +++ trunk/src/Makefile.am 2011-03-27 15:04:58 UTC (rev 5637) @@ -74,7 +74,7 @@ INCLUDES = -I$(top_srcdir) -I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include \ - -I$(topsrcdir)/tagmanager/mio @GTK_CFLAGS@ @GIO_CFLAGS@ + -I$(topsrcdir)/tagmanager/mio @GTK_CFLAGS@ @GIO_CFLAGS@ @GTHREAD_CFLAGS@ # tell automake we have a C++ file so it uses the C++ linker we need for Scintilla nodist_EXTRA_geany_SOURCES = dummy.cxx @@ -86,7 +86,8 @@ geany_SOURCES = $(SRCS) win32.c win32.h geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a ../tagmanager/mio/libmio.a \ - @GTK_LIBS@ @GIO_LIBS@ $(INTLLIBS) -lole32 -luuid -liberty -lwsock32 geany_private.res + @GTK_LIBS@ @GIO_LIBS@ @GTHREAD_LIBS@ $(INTLLIBS) -lole32 -luuid -liberty -lwsock32 \ + geany_private.res AM_CFLAGS = -DGEANY_DATADIR=\"data\" \ -DGEANY_DOCDIR=\"\" \ @@ -113,7 +114,7 @@ geany_SOURCES = $(SRCS) vte.c vte.h geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a ../tagmanager/mio/libmio.a \ - @GTK_LIBS@ @GIO_LIBS@ $(INTLLIBS) + @GTK_LIBS@ @GIO_LIBS@ @GTHREAD_LIBS@ $(INTLLIBS) AM_CFLAGS = -DGEANY_DATADIR=\""$(datadir)"\" \ -DGEANY_DOCDIR=\""$(docdir)"\" \ Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2011-03-27 15:02:07 UTC (rev 5636) +++ trunk/src/main.c 2011-03-27 15:04:58 UTC (rev 5637) @@ -480,7 +480,7 @@ foreach_slist(node, filetypes_by_title) { GeanyFiletype *ft = node->data; - + printf("%s\n", ft->name); } filetypes_free_types(); @@ -959,6 +959,11 @@ #endif parse_command_line_options(&argc, &argv); + /* Initialize GLib's thread system in case any plugins want to use it or their + * dependencies (e.g. WebKit, Soup, ...) */ + if (!g_thread_supported()) + g_thread_init(NULL); + signal(SIGTERM, signal_cb); #ifdef G_OS_UNIX /* SIGQUIT is used to kill spawned children and we get also this signal, so ignore */ Modified: trunk/src/makefile.win32 =================================================================== --- trunk/src/makefile.win32 2011-03-27 15:02:07 UTC (rev 5636) +++ trunk/src/makefile.win32 2011-03-27 15:04:58 UTC (rev 5637) @@ -39,7 +39,7 @@ ALL_GTK_LIBS= \ -L"$(PREFIX)/lib" \ -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 \ - -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl + -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lgthread-2.0 -lintl # these things are for GTK >= 2.8 # (should be same as with MSYS: pkg-config --libs gtk+-2.0 gthread-2.0) #"$(PREFIX)/lib/libcairo.dll.a" \ Modified: trunk/wscript =================================================================== --- trunk/wscript 2011-03-27 15:02:07 UTC (rev 5636) +++ trunk/wscript 2011-03-27 15:04:58 UTC (rev 5637) @@ -150,6 +150,7 @@ have_gtk_210 = True else: gtk_version = 'Unknown' + conf.check_cfg(package='gthread-2.0', uselib_store='GTHREAD', args='--cflags --libs') conf.check_cfg(package='gio-2.0', uselib_store='GIO', args='--cflags --libs', mandatory=False) # Windows specials @@ -332,7 +333,7 @@ source = geany_sources, includes = ['.', 'scintilla/include/', 'tagmanager/include/'], defines = ['G_LOG_DOMAIN="Geany"', 'GEANY_PRIVATE'], - uselib = ['GTK', 'GIO', 'WIN32', 'SUNOS_SOCKET'], + uselib = ['GTK', 'GIO', 'GTHREAD', 'WIN32', 'SUNOS_SOCKET'], use = ['scintilla', 'tagmanager', 'mio']) # geanyfunctions.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5636] trunk
by colombanw＠users.sourceforge.net 27 Mar '11

27 Mar '11

Revision: 5636 http://geany.svn.sourceforge.net/geany/?rev=5636&view=rev Author: colombanw Date: 2011-03-27 15:02:07 +0000 (Sun, 27 Mar 2011) Log Message: ----------- Remove widget reparenting in Split Window plugin Instead of reparenting the documents notebook full of ScintillaObjects, just ref it, remove it from the old parent, add it to the new parent, and then unref it. This fixes the display issue on Windows and seems to have no issues on Linux. Patch by Matthew Brush, thanks. Closes #2725342. Modified Paths: -------------- trunk/ChangeLog trunk/plugins/splitwindow.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-27 11:20:21 UTC (rev 5635) +++ trunk/ChangeLog 2011-03-27 15:02:07 UTC (rev 5636) @@ -1,3 +1,10 @@ +2011-03-27 Colomban Wendling <colomban(at)geany(dot)org> + + * plugins/splitwindow.c: + Remove widget reparenting in Split Window plugin. This fixes plugin + issues on Windows (patch by Matthew Brush, thanks - closes #2725342). + + 2011-03-26 Colomban Wendling <colomban(at)geany(dot)org> * src/sidebar.c: Modified: trunk/plugins/splitwindow.c =================================================================== --- trunk/plugins/splitwindow.c 2011-03-27 11:20:21 UTC (rev 5635) +++ trunk/plugins/splitwindow.c 2011-03-27 15:02:07 UTC (rev 5636) @@ -307,15 +307,15 @@ set_state(horizontal ? STATE_SPLIT_HORIZONTAL : STATE_SPLIT_VERTICAL); - /* temporarily put document notebook in main vbox (scintilla widgets must stay - * in a visible parent window, otherwise there are X selection and scrollbar issues) */ - gtk_widget_reparent(notebook, - ui_lookup_widget(geany->main_widgets->window, "vbox1")); + gtk_widget_ref(notebook); + gtk_container_remove(GTK_CONTAINER(parent), notebook); pane = horizontal ? gtk_hpaned_new() : gtk_vpaned_new(); gtk_container_add(GTK_CONTAINER(parent), pane); - gtk_widget_reparent(notebook, pane); + gtk_container_add(GTK_CONTAINER(pane), notebook); + gtk_widget_unref(notebook); + box = gtk_vbox_new(FALSE, 0); toolbar = create_toolbar(); gtk_box_pack_start(GTK_BOX(box), toolbar, FALSE, FALSE, 0); @@ -358,10 +358,8 @@ g_return_if_fail(edit_window.editor); - /* temporarily put document notebook in main vbox (scintilla widgets must stay - * in a visible parent window, otherwise there are X selection and scrollbar issues) */ - gtk_widget_reparent(notebook, - ui_lookup_widget(geany->main_widgets->window, "vbox1")); + gtk_widget_ref(notebook); + gtk_container_remove(GTK_CONTAINER(pane), notebook); if (edit_window.sci != NULL && edit_window.handler_id > 0) { @@ -372,7 +370,9 @@ gtk_widget_destroy(pane); edit_window.editor = NULL; edit_window.sci = NULL; - gtk_widget_reparent(notebook, parent); + + gtk_container_add(GTK_CONTAINER(parent), notebook); + gtk_widget_unref(notebook); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5635] trunk/po
by frlan＠users.sourceforge.net 27 Mar '11

27 Mar '11

Revision: 5635 http://geany.svn.sourceforge.net/geany/?rev=5635&view=rev Author: frlan Date: 2011-03-27 11:20:21 +0000 (Sun, 27 Mar 2011) Log Message: ----------- Update of German translation Modified Paths: -------------- trunk/po/ChangeLog trunk/po/de.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2011-03-27 00:18:31 UTC (rev 5634) +++ trunk/po/ChangeLog 2011-03-27 11:20:21 UTC (rev 5635) @@ -1,3 +1,8 @@ +2011-03-27 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * de.po: Update of German translation. + + 2011-03-22 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * sl.po: Fix of a typo inside Slovenian translation. Thanks to Jože Klepec. Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2011-03-27 00:18:31 UTC (rev 5634) +++ trunk/po/de.po 2011-03-27 11:20:21 UTC (rev 5635) @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: geany 0.20\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-06 20:08+0100\n" -"PO-Revision-Date: 2011-03-06 20:14+0100\n" +"POT-Creation-Date: 2011-03-27 13:18+0200\n" +"PO-Revision-Date: 2011-03-27 13:18+0100\n" "Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <geany-i18n(a)uvena.de>\n" "Language: de\n" @@ -28,9 +28,7 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Eine kleine und schnelle Entwicklungsumgebung für GTK2" -#: ../geany.desktop.in.h:2 -#: ../src/interface.c:310 -#: ../src/interface.c:1814 +#: ../geany.desktop.in.h:2 ../src/interface.c:310 ../src/interface.c:1814 msgid "Geany" msgstr "Geany" @@ -64,8 +62,7 @@ msgid "maintainer" msgstr "Hauptentwickler" -#: ../src/about.c:289 -#: ../src/about.c:297 +#: ../src/about.c:289 ../src/about.c:297 msgid "developer" msgstr "Entwickler" @@ -87,8 +84,11 @@ #: ../src/about.c:365 #, c-format -msgid "Some of the many contributors (for a more detailed list, see the file %s):" -msgstr "Einige der vielen Leute, die an Geany mitgearbeitet haben (eine detailliertere Liste findet sich in der Datei %s):" +msgid "" +"Some of the many contributors (for a more detailed list, see the file %s):" +msgstr "" +"Einige der vielen Leute, die an Geany mitgearbeitet haben (eine " +"detailliertere Liste findet sich in der Datei %s):" #: ../src/about.c:391 msgid "Credits" @@ -99,8 +99,12 @@ msgstr "Lizenz" #: ../src/about.c:414 -msgid "License text could not be found, please visit http://www.gnu.org/licenses/gpl-2.0.txt to view it online." -msgstr "Der Lizenztext konnte nicht gefunden werden. Bitte besuchen Sie http://www.gnu.org/licenses/gpl-2.0.txt um die Lizenz online zu lesen." +msgid "" +"License text could not be found, please visit http://www.gnu.org/licenses/" +"gpl-2.0.txt to view it online." +msgstr "" +"Der Lizenztext konnte nicht gefunden werden. Bitte besuchen Sie http://www." +"gnu.org/licenses/gpl-2.0.txt um die Lizenz online zu lesen." #. fall back to %d #: ../src/build.c:655 @@ -117,9 +121,7 @@ msgid "%s (in directory: %s)" msgstr "%s (im Verzeichnis: %s)" -#: ../src/build.c:739 -#: ../src/build.c:961 -#: ../src/search.c:1524 +#: ../src/build.c:739 ../src/build.c:961 ../src/search.c:1542 #, c-format msgid "Process failed (%s)" msgstr "Prozess fehlgeschlagen (%s)" @@ -135,13 +137,20 @@ msgstr "Konnte »%s« nicht ausführen (Start-Script konnte nicht erzeugt werden)" #: ../src/build.c:890 -msgid "Could not execute the file in the VTE because it probably contains a command." -msgstr "Konnte die Datei nicht in der VTE ausführen. Eventuell steht bereits ein Befehl auf der Kommandozeile." +msgid "" +"Could not execute the file in the VTE because it probably contains a command." +msgstr "" +"Konnte die Datei nicht in der VTE ausführen. Eventuell steht bereits ein " +"Befehl auf der Kommandozeile." #: ../src/build.c:928 #, c-format -msgid "Could not find terminal \"%s\" (check path for Terminal tool setting in Preferences)" -msgstr "Konnte das Terminalprogramm »%s« nicht finden (Pfad zum Terminalprogramm in den Einstellungen überprüfen)" +msgid "" +"Could not find terminal \"%s\" (check path for Terminal tool setting in " +"Preferences)" +msgstr "" +"Konnte das Terminalprogramm »%s« nicht finden (Pfad zum Terminalprogramm in " +"den Einstellungen überprüfen)" #: ../src/build.c:1101 msgid "Compilation failed." @@ -157,7 +166,9 @@ #: ../src/build.c:1275 msgid "Enter custom text here, all entered text is appended to the command." -msgstr "Hier kann freier Text eingefügt werden, welcher an das Kommando angefügt wird." +msgstr "" +"Hier kann freier Text eingefügt werden, welcher an das Kommando angefügt " +"wird." #: ../src/build.c:1353 msgid "_Next Error" @@ -171,8 +182,7 @@ msgid "_Set Build Commands" msgstr "_Kommandos zum Erstellen konfigurieren" -#: ../src/build.c:1649 -#: ../src/toolbar.c:374 +#: ../src/build.c:1649 ../src/toolbar.c:374 msgid "Build the current file" msgstr "Kompiliert die aktuelle Datei" @@ -193,8 +203,7 @@ msgid "Process could not be stopped (%s)." msgstr "Der Prozess konnte nicht angehalten werden (%s)." -#: ../src/build.c:1711 -#: ../src/build.c:1723 +#: ../src/build.c:1711 ../src/build.c:1723 msgid "No more build errors." msgstr "Keine weiteren Fehlermeldungen." @@ -203,13 +212,11 @@ msgid "Set menu item label" msgstr "Bezeichnung für den Menüeintrag definieren" -#: ../src/build.c:1845 -#: ../src/symbols.c:737 +#: ../src/build.c:1845 ../src/symbols.c:737 msgid "Label" msgstr "Label" -#: ../src/build.c:1846 -#: ../src/symbols.c:732 +#: ../src/build.c:1846 ../src/symbols.c:732 msgid "Command" msgstr "Kommando" @@ -225,8 +232,7 @@ msgid "Click to set menu item label" msgstr "Klicken, um die Bezeichnung für den Menüeintrag zu definieren" -#: ../src/build.c:1975 -#: ../src/build.c:1977 +#: ../src/build.c:1975 ../src/build.c:1977 #, c-format msgid "%s Commands" msgstr "Kommandos für %s" @@ -235,8 +241,7 @@ msgid "No Filetype" msgstr "Kein Dateityp" -#: ../src/build.c:1985 -#: ../src/build.c:2020 +#: ../src/build.c:1985 ../src/build.c:2020 msgid "Error Regular Expression:" msgstr "Regulärer Ausdruck für Fehlermeldungen:" @@ -246,7 +251,9 @@ #: ../src/build.c:2045 msgid "Note: Item 2 opens a dialog and appends the response to the command." -msgstr "Notiz: Element 2 öffnet ein Dialog und fügt das Ergebnis am Ende des Kommandos an" +msgstr "" +"Notiz: Element 2 öffnet ein Dialog und fügt das Ergebnis am Ende des " +"Kommandos an" #: ../src/build.c:2054 msgid "Execute Commands" @@ -254,8 +261,12 @@ #: ../src/build.c:2066 #, c-format -msgid "%d, %e, %f, %p are substituted in command and directory fields, see manual for details." -msgstr "%d, %e, %f, %p werden innerhalb der Kommando- und Verzeichnisfelder ersetzt - Details gibt es in der Dokumentation." +msgid "" +"%d, %e, %f, %p are substituted in command and directory fields, see manual " +"for details." +msgstr "" +"%d, %e, %f, %p werden innerhalb der Kommando- und Verzeichnisfelder ersetzt " +"- Details gibt es in der Dokumentation." #: ../src/build.c:2226 msgid "Set Build Commands" @@ -266,34 +277,25 @@ msgstr "_Kompilieren" #. build the code -#: ../src/build.c:2444 -#: ../src/build.c:2706 -#: ../src/interface.c:1223 +#: ../src/build.c:2444 ../src/build.c:2706 ../src/interface.c:1223 msgid "_Build" msgstr "_Erstellen" -#: ../src/build.c:2451 -#: ../src/build.c:2481 -#: ../src/build.c:2674 +#: ../src/build.c:2451 ../src/build.c:2481 ../src/build.c:2674 msgid "_Execute" msgstr "_Ausführen" #. build the code with make custom -#: ../src/build.c:2496 -#: ../src/build.c:2672 -#: ../src/build.c:2726 +#: ../src/build.c:2496 ../src/build.c:2672 ../src/build.c:2726 msgid "Make Custom _Target" msgstr "Make (eigenes _Target)" #. build the code with make object -#: ../src/build.c:2498 -#: ../src/build.c:2673 -#: ../src/build.c:2734 +#: ../src/build.c:2498 ../src/build.c:2673 ../src/build.c:2734 msgid "Make _Object" msgstr "Make _Objekt-Datei" -#: ../src/build.c:2500 -#: ../src/build.c:2671 +#: ../src/build.c:2500 ../src/build.c:2671 msgid "_Make" msgstr "_Make" @@ -318,10 +320,8 @@ msgstr[0] "%d Datei gespeichert." msgstr[1] "%d Dateien gespeichert." -#: ../src/callbacks.c:490 -#: ../src/document.c:2999 -#: ../src/interface.c:381 -#: ../src/sidebar.c:695 +#: ../src/callbacks.c:490 ../src/document.c:2900 ../src/interface.c:381 +#: ../src/sidebar.c:687 msgid "_Reload" msgstr "_Neu laden" @@ -334,75 +334,69 @@ msgid "Are you sure you want to reload '%s'?" msgstr "Möchten Sie »%s« wirklich neu laden?" -#: ../src/callbacks.c:1196 -#: ../src/keybindings.c:425 +#: ../src/callbacks.c:1210 ../src/keybindings.c:425 msgid "Go to Line" msgstr "Gehe zu Zeile" -#: ../src/callbacks.c:1197 +#: ../src/callbacks.c:1211 msgid "Enter the line you want to go to:" msgstr "Geben Sie die Zeile an, zu der Sie springen möchten:" -#: ../src/callbacks.c:1291 -#: ../src/callbacks.c:1316 -msgid "Please set the filetype for the current file before using this function." +#: ../src/callbacks.c:1305 ../src/callbacks.c:1332 +msgid "" +"Please set the filetype for the current file before using this function." msgstr "Bitte legen Sie den Dateityp fest, bevor Sie diese Funktion benutzen." -#: ../src/callbacks.c:1424 -#: ../src/ui_utils.c:619 +#: ../src/callbacks.c:1448 ../src/ui_utils.c:619 msgid "dd.mm.yyyy" msgstr "TT.MM.JJJJ" -#: ../src/callbacks.c:1426 -#: ../src/ui_utils.c:620 +#: ../src/callbacks.c:1450 ../src/ui_utils.c:620 msgid "mm.dd.yyyy" msgstr "MM.TT.JJJJ" -#: ../src/callbacks.c:1428 -#: ../src/ui_utils.c:621 +#: ../src/callbacks.c:1452 ../src/ui_utils.c:621 msgid "yyyy/mm/dd" msgstr "JJJJ/MM/TT" -#: ../src/callbacks.c:1430 -#: ../src/ui_utils.c:630 +#: ../src/callbacks.c:1454 ../src/ui_utils.c:630 msgid "dd.mm.yyyy hh:mm:ss" msgstr "TT.MM.JJJJ HH:MM:SS" -#: ../src/callbacks.c:1432 -#: ../src/ui_utils.c:631 +#: ../src/callbacks.c:1456 ../src/ui_utils.c:631 msgid "mm.dd.yyyy hh:mm:ss" msgstr "MM.TT.JJJJ HH:MM:SS" -#: ../src/callbacks.c:1434 -#: ../src/ui_utils.c:632 +#: ../src/callbacks.c:1458 ../src/ui_utils.c:632 msgid "yyyy/mm/dd hh:mm:ss" msgstr "JJJJ/MM/TT HH:MM:SS" -#: ../src/callbacks.c:1436 -#: ../src/ui_utils.c:641 +#: ../src/callbacks.c:1460 ../src/ui_utils.c:641 msgid "_Use Custom Date Format" msgstr "Benutze selbst erstelltes _Datumsformat" -#: ../src/callbacks.c:1440 +#: ../src/callbacks.c:1464 msgid "Custom Date Format" msgstr "Benutzerdefiniertes Datumsformat" -#: ../src/callbacks.c:1441 -msgid "Enter here a custom date and time format. You can use any conversion specifiers which can be used with the ANSI C strftime function." -msgstr "Hier kann ein benutzerdefiniertes Datumsformat eingegeben werden. Dabei funktionieren alle Platzhalter der ANSI C Funktion »strftime«." +#: ../src/callbacks.c:1465 +msgid "" +"Enter here a custom date and time format. You can use any conversion " +"specifiers which can be used with the ANSI C strftime function." +msgstr "" +"Hier kann ein benutzerdefiniertes Datumsformat eingegeben werden. Dabei " +"funktionieren alle Platzhalter der ANSI C Funktion »strftime«." -#: ../src/callbacks.c:1462 +#: ../src/callbacks.c:1488 msgid "Date format string could not be converted (possibly too long)." -msgstr "Das Datenformat konnte nicht umgewandelt werden. Eventuell ist es zu lang." +msgstr "" +"Das Datenformat konnte nicht umgewandelt werden. Eventuell ist es zu lang." -#: ../src/callbacks.c:1688 -#: ../src/callbacks.c:1698 +#: ../src/callbacks.c:1716 ../src/callbacks.c:1726 msgid "No more message items." msgstr "Keine weiteren Nachrichten." -#: ../src/dialogs.c:178 -#: ../src/interface.c:3912 -#: ../src/interface.c:5553 +#: ../src/dialogs.c:178 ../src/interface.c:5716 msgid "Detect from file" msgstr "Aus Datei lesen" @@ -426,31 +420,27 @@ msgid "Middle Eastern" msgstr "Nahöstlich" -#: ../src/dialogs.c:191 -#: ../src/encodings.c:120 -#: ../src/encodings.c:121 -#: ../src/encodings.c:122 -#: ../src/encodings.c:123 -#: ../src/encodings.c:124 -#: ../src/encodings.c:125 -#: ../src/encodings.c:126 -#: ../src/encodings.c:127 +#: ../src/dialogs.c:191 ../src/encodings.c:120 ../src/encodings.c:121 +#: ../src/encodings.c:122 ../src/encodings.c:123 ../src/encodings.c:124 +#: ../src/encodings.c:125 ../src/encodings.c:126 ../src/encodings.c:127 msgid "Unicode" msgstr "Unicode" -#: ../src/dialogs.c:239 -#: ../src/dialogs.c:324 +#: ../src/dialogs.c:239 ../src/dialogs.c:324 msgid "Open File" msgstr "Datei öffnen" -#: ../src/dialogs.c:243 -#: ../src/interface.c:873 +#: ../src/dialogs.c:243 ../src/interface.c:873 msgid "_View" msgstr "_Ansicht" #: ../src/dialogs.c:246 -msgid "Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only." -msgstr "Öffnet die Datei schreibgeschützt. Bei Auswahl mehrerer Dateien, werden alle schreibgeschützt geöffnet." +msgid "" +"Opens the file in read-only mode. If you choose more than one file to open, " +"all files will be opened read-only." +msgstr "" +"Öffnet die Datei schreibgeschützt. Bei Auswahl mehrerer Dateien, werden alle " +"schreibgeschützt geöffnet." #: ../src/dialogs.c:268 msgid "Detect by file extension" @@ -471,11 +461,16 @@ #: ../src/dialogs.c:384 msgid "" -"Explicitly defines an encoding for the file, if it would not be detected. This is useful when you know that the encoding of a file cannot be detected correctly by Geany.\n" -"Note if you choose multiple files, they will all be opened with the chosen encoding." +"Explicitly defines an encoding for the file, if it would not be detected. " +"This is useful when you know that the encoding of a file cannot be detected " +"correctly by Geany.\n" +"Note if you choose multiple files, they will all be opened with the chosen " +"encoding." msgstr "" -"Definiert explizit eine bestimmte Zeichenkodierung, wenn sie nicht automatisch erkannt werden kann.\n" -"Beachten Sie: Wenn Sie mehrere Dateien auswählen, werden alle mit der gewählten Zeichenkodierung geöffnet." +"Definiert explizit eine bestimmte Zeichenkodierung, wenn sie nicht " +"automatisch erkannt werden kann.\n" +"Beachten Sie: Wenn Sie mehrere Dateien auswählen, werden alle mit der " +"gewählten Zeichenkodierung geöffnet." #. line 2 with filetype combo #: ../src/dialogs.c:391 @@ -484,11 +479,15 @@ #: ../src/dialogs.c:401 msgid "" -"Explicitly defines a filetype for the file, if it would not be detected by filename extension.\n" -"Note if you choose multiple files, they will all be opened with the chosen filetype." +"Explicitly defines a filetype for the file, if it would not be detected by " +"filename extension.\n" +"Note if you choose multiple files, they will all be opened with the chosen " +"filetype." msgstr "" -"Definiert explizit einen bestimmten Dateityp, wenn er nicht durch die Dateiendung erkannt werden kann.\n" -"Beachten Sie: Wenn Sie mehrere Dateien auswählen, werden alle mit dem gewählten Dateityp geöffnet." +"Definiert explizit einen bestimmten Dateityp, wenn er nicht durch die " +"Dateiendung erkannt werden kann.\n" +"Beachten Sie: Wenn Sie mehrere Dateien auswählen, werden alle mit dem " +"gewählten Dateityp geöffnet." #: ../src/dialogs.c:480 msgid "Overwrite?" @@ -498,8 +497,7 @@ msgid "Filename already exists!" msgstr "Der Dateiname existiert bereits!" -#: ../src/dialogs.c:513 -#: ../src/dialogs.c:642 +#: ../src/dialogs.c:513 ../src/dialogs.c:642 msgid "Save File" msgstr "Datei speichern" @@ -516,28 +514,27 @@ msgstr "_Datei in einem neuen Reiter öffnen" #: ../src/dialogs.c:533 -msgid "Keep the current unsaved document open and open the newly saved file in a new tab" -msgstr "Lässt das ungesicherte Dokument geöffnet und öffnet das gesicherte in einem neuen Reiter." +msgid "" +"Keep the current unsaved document open and open the newly saved file in a " +"new tab" +msgstr "" +"Lässt das ungesicherte Dokument geöffnet und öffnet das gesicherte in einem " +"neuen Reiter." -#: ../src/dialogs.c:660 -#: ../src/win32.c:681 +#: ../src/dialogs.c:660 ../src/win32.c:681 msgid "Error" msgstr "Fehler" -#: ../src/dialogs.c:663 -#: ../src/dialogs.c:1543 -#: ../src/win32.c:687 +#: ../src/dialogs.c:663 ../src/dialogs.c:1543 ../src/win32.c:687 #: ../src/win32.c:746 msgid "Question" msgstr "Frage" -#: ../src/dialogs.c:666 -#: ../src/win32.c:693 +#: ../src/dialogs.c:666 ../src/win32.c:693 msgid "Warning" msgstr "Warnung" -#: ../src/dialogs.c:669 -#: ../src/win32.c:699 +#: ../src/dialogs.c:669 ../src/win32.c:699 msgid "Information" msgstr "Information" @@ -559,24 +556,21 @@ msgstr "Schriftart auswählen" #: ../src/dialogs.c:1157 -msgid "An error occurred or file information could not be retrieved (e.g. from a new file)." -msgstr "Es ist ein Fehler aufgetreten oder Datei-Informationen konnten nicht gelesen werden (z.B. bei einer neuen, noch nicht gespeicherten Datei)." +msgid "" +"An error occurred or file information could not be retrieved (e.g. from a " +"new file)." +msgstr "" +"Es ist ein Fehler aufgetreten oder Datei-Informationen konnten nicht gelesen " +"werden (z.B. bei einer neuen, noch nicht gespeicherten Datei)." -#: ../src/dialogs.c:1176 -#: ../src/dialogs.c:1177 -#: ../src/dialogs.c:1178 -#: ../src/dialogs.c:1184 -#: ../src/dialogs.c:1185 -#: ../src/dialogs.c:1186 -#: ../src/symbols.c:1980 -#: ../src/symbols.c:2001 -#: ../src/symbols.c:2053 +#: ../src/dialogs.c:1176 ../src/dialogs.c:1177 ../src/dialogs.c:1178 +#: ../src/dialogs.c:1184 ../src/dialogs.c:1185 ../src/dialogs.c:1186 +#: ../src/symbols.c:1980 ../src/symbols.c:2001 ../src/symbols.c:2053 #: ../src/ui_utils.c:244 msgid "unknown" msgstr "unbekannt" -#: ../src/dialogs.c:1191 -#: ../src/symbols.c:887 +#: ../src/dialogs.c:1191 ../src/symbols.c:887 msgid "Properties" msgstr "Eigenschaften" @@ -604,8 +598,7 @@ msgid "Encoding:" msgstr "Kodierung:" -#: ../src/dialogs.c:1290 -#: ../src/ui_utils.c:248 +#: ../src/dialogs.c:1290 ../src/ui_utils.c:248 msgid "(with BOM)" msgstr "(mit BOM)" @@ -667,58 +660,67 @@ msgid "New file \"%s\" opened." msgstr "Neue Datei »%s« geöffnet." -#: ../src/document.c:967 -#: ../src/document.c:1485 +#: ../src/document.c:845 ../src/document.c:1370 #, c-format msgid "Could not open file %s (%s)" msgstr "Konnte Datei »%s« nicht öffnen (%s)." -#: ../src/document.c:997 +#: ../src/document.c:865 #, c-format +msgid "The file \"%s\" is not valid %s." +msgstr "Die Datei »%s« ist kein gültiges %s." + +#: ../src/document.c:871 +#, c-format msgid "" -"The file \"%s\" could not be opened properly and has been truncated. This can occur if the file contains a NULL byte. Be aware that saving it can cause data loss.\n" +"The file \"%s\" does not look like a text file or the file encoding is not " +"supported." +msgstr "" +"Die Datei »%s« scheint keine Textdatei zu sein, oder die Zeichenkodierung " +"wird nicht unterstützt." + +#: ../src/document.c:881 +#, c-format +msgid "" +"The file \"%s\" could not be opened properly and has been truncated. This " +"can occur if the file contains a NULL byte. Be aware that saving it can " +"cause data loss.\n" "The file was set to read-only." msgstr "" -"Die Datei »%s« konnte nicht ordnungsgemäß geladen werden und wurde eventuell abgeschnitten. Dies passiert beispielsweise, wenn die Datei ein »NULL-Byte« enthält und kann zu Datenverlust beim Speichern führen!\n" +"Die Datei »%s« konnte nicht ordnungsgemäß geladen werden und wurde eventuell " +"abgeschnitten. Dies passiert beispielsweise, wenn die Datei ein »NULL-Byte« " +"enthält und kann zu Datenverlust beim Speichern führen!\n" "Die Datei wird schreibgeschützt geöffnet." -#. For translators: the second wildcard is an encoding name, e.g. -#. * The file \"test.txt\" is not valid UTF-8. -#: ../src/document.c:1023 -#, c-format -msgid "The file \"%s\" is not valid %s." -msgstr "Die Datei »%s« ist kein gültiges %s." - -#: ../src/document.c:1033 -#, c-format -msgid "The file \"%s\" does not look like a text file or the file encoding is not supported." -msgstr "Die Datei »%s« scheint keine Textdatei zu sein, oder die Zeichenkodierung wird nicht unterstützt." - -#: ../src/document.c:1184 +#: ../src/document.c:1090 msgid "Spaces" msgstr "Leerzeichen" -#: ../src/document.c:1187 +#: ../src/document.c:1093 msgid "Tabs" msgstr "Tabulatoren" -#: ../src/document.c:1190 +#: ../src/document.c:1096 msgid "Tabs and Spaces" msgstr "Tabulatoren und Leerzeichen" #. For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs #. * and Spaces), the second one is the filename -#: ../src/document.c:1195 +#: ../src/document.c:1101 #, c-format msgid "Setting %s indentation mode for %s." msgstr "Setze Einrückungsmodus %s für »%s«." -#: ../src/document.c:1248 -#: ../src/document.c:1858 +#: ../src/document.c:1111 +#, c-format +msgid "Setting indentation width to %d for %s." +msgstr "Setze Einrückungsbreite auf %d für »%s«." + +#: ../src/document.c:1145 ../src/document.c:1743 msgid "Invalid filename" msgstr "Ungültiger Dateiname" -#: ../src/document.c:1363 +#: ../src/document.c:1260 #, c-format msgid "File %s reloaded." msgstr "Datei »%s« neu geladen." @@ -726,25 +728,29 @@ #. For translators: this is the status window message for opening a file. %d is the number #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). -#: ../src/document.c:1368 +#: ../src/document.c:1265 #, c-format msgid "File %s opened(%d%s)." msgstr "Datei »%s« geöffnet (%d%s)." -#: ../src/document.c:1370 +#: ../src/document.c:1267 msgid ", read-only" msgstr ", schreibgeschützt" -#: ../src/document.c:1579 +#: ../src/document.c:1464 msgid "Error renaming file." msgstr "Fehler beim Umbenennen der Datei." -#: ../src/document.c:1666 +#: ../src/document.c:1551 #, c-format -msgid "An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved." -msgstr "Beim Konvertieren der Datei von UTF-8 nach »%s« ist ein Fehler aufgetreten. Die Datei wird nicht gespeichert." +msgid "" +"An error occurred while converting the file from UTF-8 in \"%s\". The file " +"remains unsaved." +msgstr "" +"Beim Konvertieren der Datei von UTF-8 nach »%s« ist ein Fehler aufgetreten. " +"Die Datei wird nicht gespeichert." -#: ../src/document.c:1688 +#: ../src/document.c:1573 #, c-format msgid "" "Error message: %s\n" @@ -753,33 +759,35 @@ "Fehlermeldung: %s\n" "Der Fehler trat bei »%s« (Zeile: %d, Spalte: %d) auf." -#: ../src/document.c:1693 +#: ../src/document.c:1578 #, c-format msgid "Error message: %s." msgstr "Fehlermeldung: %s." -#: ../src/document.c:1743 +#: ../src/document.c:1628 #, c-format msgid "Failed to open file '%s' for writing: fopen() failed: %s" -msgstr "Konnte Datei »%s« nicht zum Schreiben öffnen: fopen() fehlgeschlagen: %s" +msgstr "" +"Konnte Datei »%s« nicht zum Schreiben öffnen: fopen() fehlgeschlagen: %s" -#: ../src/document.c:1761 +#: ../src/document.c:1646 #, c-format msgid "Failed to write file '%s': fwrite() failed: %s" -msgstr "Konnte Datei »%s« nicht zum Schreiben öffnen: fwrite() fehlgeschlagen: %s" +msgstr "" +"Konnte Datei »%s« nicht zum Schreiben öffnen: fwrite() fehlgeschlagen: %s" -#: ../src/document.c:1775 +#: ../src/document.c:1660 #, c-format msgid "Failed to close file '%s': fclose() failed: %s" -msgstr "Konnte Datei »%s« nicht zum Schreiben öffnen: fclose() fehlgeschlagen: %s" +msgstr "" +"Konnte Datei »%s« nicht zum Schreiben öffnen: fclose() fehlgeschlagen: %s" -#: ../src/document.c:1858 -#: ../src/document.c:1923 +#: ../src/document.c:1743 ../src/document.c:1808 #, c-format msgid "Error saving file (%s)." msgstr "Fehler beim Speichern der Datei (%s)." -#: ../src/document.c:1928 +#: ../src/document.c:1813 #, c-format msgid "" "%s\n" @@ -790,76 +798,74 @@ "\n" "Die Datei ist möglicherweise nicht vollständig auf der Festplatte gespeichert" -#: ../src/document.c:1930 +#: ../src/document.c:1815 msgid "Error saving file." msgstr "Fehler beim Speichern der Datei." -#: ../src/document.c:1954 +#: ../src/document.c:1839 #, c-format msgid "File %s saved." msgstr "Datei »%s« wurde gespeichert." -#: ../src/document.c:2022 -#: ../src/document.c:2079 -#: ../src/document.c:2087 +#: ../src/document.c:1916 ../src/document.c:1973 ../src/document.c:1981 #, c-format msgid "\"%s\" was not found." msgstr "»%s« wurde nicht gefunden." -#: ../src/document.c:2087 +#: ../src/document.c:1981 msgid "Wrap search and find again?" msgstr "Suche vom Dokumentanfang bzw. -ende neu beginnen?" -#: ../src/document.c:2166 -#: ../src/search.c:1185 -#: ../src/search.c:1229 -#: ../src/search.c:1920 -#: ../src/search.c:1921 +#: ../src/document.c:2060 ../src/search.c:1203 ../src/search.c:1247 +#: ../src/search.c:1938 ../src/search.c:1939 #, c-format msgid "No matches found for \"%s\"." msgstr "Keine Treffer für »%s« gefunden." -#: ../src/document.c:2177 -#: ../src/document.c:2186 +#: ../src/document.c:2071 ../src/document.c:2080 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: %d mal wurde »%s« mit »%s« ersetzt." msgstr[1] "%s: %d mal wurde »%s« mit »%s« ersetzt." -#: ../src/document.c:3000 +#: ../src/document.c:2901 msgid "Do you want to reload it?" msgstr "Möchten Sie die Datei neu laden?" -#: ../src/document.c:3001 +#: ../src/document.c:2902 #, c-format msgid "" "The file '%s' on the disk is more recent than\n" "the current buffer." -msgstr "Die Datei »%s« auf dem Datenträger ist aktueller als die momentan geöffnete Version." +msgstr "" +"Die Datei »%s« auf dem Datenträger ist aktueller als die momentan geöffnete " +"Version." -#: ../src/document.c:3019 +#: ../src/document.c:2920 msgid "Close _without saving" msgstr "Schließen _ohne Speichern" -#: ../src/document.c:3022 +#: ../src/document.c:2923 msgid "Try to resave the file?" msgstr "Versuchen die Datei erneut zu speichern?" -#: ../src/document.c:3023 +#: ../src/document.c:2924 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "»%s« wurde nicht auf dem Datenträger gefunden." -#: ../src/editor.c:4362 +#: ../src/editor.c:4382 msgid "Enter Tab Width" msgstr "Tabulatorbreite:" -#: ../src/editor.c:4363 +#: ../src/editor.c:4383 msgid "Enter the amount of spaces which should be replaced by a tab character." -msgstr "Geben Sie die Anzahl der Leerzeichen an, welche durch den Tabulator ersetzt werden sollen." +msgstr "" +"Geben Sie die Anzahl der Leerzeichen an, welche durch den Tabulator ersetzt " +"werden sollen." -#: ../src/editor.c:4513 +#: ../src/editor.c:4533 #, c-format msgid "Warning: non-standard hard tab width: %d != 8!" msgstr "Achtung: Keine gewöhnliche harte Tabulatorbreite:: %d != 8!" @@ -868,8 +874,7 @@ msgid "Celtic" msgstr "Keltisch" -#: ../src/encodings.c:76 -#: ../src/encodings.c:77 +#: ../src/encodings.c:76 ../src/encodings.c:77 msgid "Greek" msgstr "Griechisch" @@ -881,31 +886,22 @@ msgid "South European" msgstr "Südeuropäisch" -#: ../src/encodings.c:80 -#: ../src/encodings.c:81 -#: ../src/encodings.c:82 +#: ../src/encodings.c:80 ../src/encodings.c:81 ../src/encodings.c:82 #: ../src/encodings.c:83 msgid "Western" msgstr "Westlich" -#: ../src/encodings.c:85 -#: ../src/encodings.c:86 -#: ../src/encodings.c:87 +#: ../src/encodings.c:85 ../src/encodings.c:86 ../src/encodings.c:87 msgid "Baltic" msgstr "Baltisch" -#: ../src/encodings.c:88 -#: ../src/encodings.c:89 -#: ../src/encodings.c:90 +#: ../src/encodings.c:88 ../src/encodings.c:89 ../src/encodings.c:90 msgid "Central European" msgstr "Mitteleuropäisch" #. ISO-IR-111 not available on Windows -#: ../src/encodings.c:91 -#: ../src/encodings.c:92 -#: ../src/encodings.c:94 -#: ../src/encodings.c:95 -#: ../src/encodings.c:96 +#: ../src/encodings.c:91 ../src/encodings.c:92 ../src/encodings.c:94 +#: ../src/encodings.c:95 ../src/encodings.c:96 msgid "Cyrillic" msgstr "Kyrillisch" @@ -921,16 +917,12 @@ msgid "Romanian" msgstr "Rumänisch" -#: ../src/encodings.c:101 -#: ../src/encodings.c:102 -#: ../src/encodings.c:103 +#: ../src/encodings.c:101 ../src/encodings.c:102 ../src/encodings.c:103 msgid "Arabic" msgstr "Arabisch" #. not available at all, ? -#: ../src/encodings.c:104 -#: ../src/encodings.c:106 -#: ../src/encodings.c:107 +#: ../src/encodings.c:104 ../src/encodings.c:106 ../src/encodings.c:107 msgid "Hebrew" msgstr "Hebräisch" @@ -950,42 +942,30 @@ msgid "Thai" msgstr "Thai" -#: ../src/encodings.c:113 -#: ../src/encodings.c:114 -#: ../src/encodings.c:115 +#: ../src/encodings.c:113 ../src/encodings.c:114 ../src/encodings.c:115 msgid "Turkish" msgstr "Türkisch" -#: ../src/encodings.c:116 -#: ../src/encodings.c:117 -#: ../src/encodings.c:118 +#: ../src/encodings.c:116 ../src/encodings.c:117 ../src/encodings.c:118 msgid "Vietnamese" msgstr "Vietnamesisch" #. maybe not available on Linux -#: ../src/encodings.c:129 -#: ../src/encodings.c:130 -#: ../src/encodings.c:131 +#: ../src/encodings.c:129 ../src/encodings.c:130 ../src/encodings.c:131 #: ../src/encodings.c:133 msgid "Chinese Simplified" msgstr "Chinesisch, vereinfacht" -#: ../src/encodings.c:134 -#: ../src/encodings.c:135 -#: ../src/encodings.c:136 +#: ../src/encodings.c:134 ../src/encodings.c:135 ../src/encodings.c:136 msgid "Chinese Traditional" msgstr "Chinesisch, traditionell" -#: ../src/encodings.c:137 -#: ../src/encodings.c:138 -#: ../src/encodings.c:139 +#: ../src/encodings.c:137 ../src/encodings.c:138 ../src/encodings.c:139 #: ../src/encodings.c:140 msgid "Japanese" msgstr "Japanisch" -#: ../src/encodings.c:141 -#: ../src/encodings.c:142 -#: ../src/encodings.c:143 +#: ../src/encodings.c:141 ../src/encodings.c:142 ../src/encodings.c:143 #: ../src/encodings.c:144 msgid "Korean" msgstr "Koreanisch" @@ -1018,11 +998,8 @@ msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:80 -#: ../src/filetypes.c:162 -#: ../src/filetypes.c:176 -#: ../src/filetypes.c:184 -#: ../src/filetypes.c:198 +#: ../src/filetypes.c:80 ../src/filetypes.c:162 ../src/filetypes.c:176 +#: ../src/filetypes.c:184 ../src/filetypes.c:198 #, c-format msgid "%s source file" msgstr "%s Quelldatei" @@ -1032,10 +1009,8 @@ msgid "%s file" msgstr "%s Quelldatei" -#: ../src/filetypes.c:99 -#: ../src/filetypes.c:1560 -#: ../src/interface.c:3855 -#: ../src/interface.c:5496 +#: ../src/filetypes.c:99 ../src/filetypes.c:1645 ../src/interface.c:3874 +#: ../src/interface.c:5524 msgid "None" msgstr "Keiner" @@ -1072,41 +1047,37 @@ msgid "%s script file" msgstr "%s Skript Datei" -#: ../src/filetypes.c:668 +#: ../src/filetypes.c:667 msgid "_Programming Languages" msgstr "_Kompilersprachen" -#: ../src/filetypes.c:669 +#: ../src/filetypes.c:668 msgid "_Scripting Languages" msgstr "_Interpretersprachen" -#: ../src/filetypes.c:670 +#: ../src/filetypes.c:669 msgid "_Markup Languages" msgstr "_Markup-Sprachen" -#: ../src/filetypes.c:671 +#: ../src/filetypes.c:670 msgid "M_iscellaneous Languages" msgstr "_Sonstige Sprachen" -#: ../src/filetypes.c:672 +#: ../src/filetypes.c:671 msgid "_Custom Filetypes" msgstr "_Benutzerdefinierte Dateitypen" -#: ../src/filetypes.c:1288 -#: ../src/win32.c:105 +#: ../src/filetypes.c:1373 ../src/win32.c:105 msgid "All Source" msgstr "Alle Quellen" #. create meta file filter "All files" -#: ../src/filetypes.c:1313 -#: ../src/project.c:293 -#: ../src/win32.c:95 -#: ../src/win32.c:143 -#: ../src/win32.c:145 +#: ../src/filetypes.c:1398 ../src/project.c:293 ../src/win32.c:95 +#: ../src/win32.c:143 ../src/win32.c:145 msgid "All files" msgstr "Alle Dateien" -#: ../src/filetypes.c:1371 +#: ../src/filetypes.c:1456 #, c-format msgid "Bad regex for filetype %s: %s" msgstr "Schlechter RegEx für Dateityp %s: %s" @@ -1115,10 +1086,8 @@ msgid "untitled" msgstr "unbenannt" -#: ../src/highlighting.c:3621 -#: ../src/main.c:815 -#: ../src/socket.c:165 -#: ../src/templates.c:315 +#: ../src/highlighting.c:3621 ../src/main.c:817 ../src/socket.c:165 +#: ../src/templates.c:327 #, c-format msgid "Could not find file '%s'." msgstr "Konnte die Datei »%s« nicht finden." @@ -1139,8 +1108,7 @@ msgid "New (with _Template)" msgstr "Neu (aus _Vorlage)" -#: ../src/interface.c:352 -#: ../src/interface.c:2346 +#: ../src/interface.c:352 ../src/interface.c:2346 msgid "Open Selected F_ile" msgstr "_Markierte Datei öffnen" @@ -1156,14 +1124,9 @@ msgid "R_eload As" msgstr "N_eu laden als" -#: ../src/interface.c:400 -#: ../src/interface.c:635 -#: ../src/interface.c:694 -#: ../src/interface.c:708 -#: ../src/interface.c:1088 -#: ../src/interface.c:1098 -#: ../src/interface.c:2311 -#: ../src/interface.c:2325 +#: ../src/interface.c:400 ../src/interface.c:635 ../src/interface.c:694 +#: ../src/interface.c:708 ../src/interface.c:1088 ../src/interface.c:1098 +#: ../src/interface.c:2311 ../src/interface.c:2325 msgid "invisible" msgstr "unsichtbar" @@ -1171,18 +1134,15 @@ msgid "Page Set_up" msgstr "Seiteneigensc_haften" -#: ../src/interface.c:434 -#: ../src/notebook.c:257 +#: ../src/interface.c:434 ../src/notebook.c:257 msgid "Close Ot_her Documents" msgstr "_Inaktive Dateien schließen" -#: ../src/interface.c:442 -#: ../src/notebook.c:262 +#: ../src/interface.c:442 ../src/notebook.c:262 msgid "C_lose All" msgstr "_Alle schließen" -#: ../src/interface.c:459 -#: ../src/interface.c:2241 +#: ../src/interface.c:459 ../src/interface.c:2241 msgid "_Edit" msgstr "_Bearbeiten" @@ -1190,58 +1150,47 @@ msgid "_Commands" msgstr "_Kommandos" -#: ../src/interface.c:516 -#: ../src/keybindings.c:311 +#: ../src/interface.c:516 ../src/keybindings.c:311 msgid "_Cut Current Line(s)" msgstr "Aktuelle Zeile(n) _ausschneiden" -#: ../src/interface.c:524 -#: ../src/keybindings.c:308 +#: ../src/interface.c:524 ../src/keybindings.c:308 msgid "_Copy Current Line(s)" msgstr "Aktuelle Zeile(n) _kopieren" -#: ../src/interface.c:532 -#: ../src/keybindings.c:263 +#: ../src/interface.c:532 ../src/keybindings.c:263 msgid "_Delete Current Line(s)" msgstr "Aktuelle Zeile(n) _löschen" -#: ../src/interface.c:536 -#: ../src/keybindings.c:260 +#: ../src/interface.c:536 ../src/keybindings.c:260 msgid "_Duplicate Line or Selection" msgstr "_Zeile oder Auswahl duplizieren" -#: ../src/interface.c:545 -#: ../src/keybindings.c:321 +#: ../src/interface.c:545 ../src/keybindings.c:321 msgid "_Select Current Line(s)" msgstr "Aktuelle Zeile(n) a_uswählen" -#: ../src/interface.c:549 -#: ../src/keybindings.c:324 +#: ../src/interface.c:549 ../src/keybindings.c:324 msgid "_Select Current Paragraph" msgstr "Aktuellen Absatz au_swählen" -#: ../src/interface.c:558 -#: ../src/keybindings.c:363 +#: ../src/interface.c:558 ../src/keybindings.c:363 msgid "_Send Selection to Terminal" msgstr "_Auswahl an Terminal senden" -#: ../src/interface.c:562 -#: ../src/interface.c:2245 +#: ../src/interface.c:562 ../src/interface.c:2245 msgid "_Format" msgstr "_Format" -#: ../src/interface.c:569 -#: ../src/keybindings.c:365 +#: ../src/interface.c:569 ../src/keybindings.c:365 msgid "_Reflow Lines/Block" msgstr "_Neuformatieren der Zeile/des Abschnitts" -#: ../src/interface.c:573 -#: ../src/keybindings.c:335 +#: ../src/interface.c:573 ../src/keybindings.c:335 msgid "T_oggle Case of Selection" msgstr "_Groß- und Kleinschreibung für die Auswahl tauschen" -#: ../src/interface.c:577 -#: ../src/keybindings.c:270 +#: ../src/interface.c:577 ../src/keybindings.c:270 msgid "_Transpose Current Line" msgstr "Aktuelle Zeile _tauschen" @@ -1265,8 +1214,7 @@ msgid "_Decrease Indent" msgstr "Einzug _verringern" -#: ../src/interface.c:619 -#: ../src/keybindings.c:354 +#: ../src/interface.c:619 ../src/keybindings.c:354 msgid "_Smart Line Indent" msgstr "Intelligentes _Einrücken" @@ -1278,49 +1226,39 @@ msgid "I_nsert Comments" msgstr "K_ommentare einfügen" -#: ../src/interface.c:654 -#: ../src/interface.c:2260 +#: ../src/interface.c:654 ../src/interface.c:2260 msgid "Insert _ChangeLog Entry" msgstr "_ChangeLog-Eintrag hinzufügen" -#: ../src/interface.c:658 -#: ../src/interface.c:2264 +#: ../src/interface.c:658 ../src/interface.c:2264 msgid "Insert _Function Description" msgstr "_Funktionsbeschreibung einfügen" -#: ../src/interface.c:662 -#: ../src/interface.c:2268 +#: ../src/interface.c:662 ../src/interface.c:2268 msgid "Insert _Multiline Comment" msgstr "_Mehrzeiligen Kommentar einfügen" -#: ../src/interface.c:671 -#: ../src/interface.c:2283 +#: ../src/interface.c:671 ../src/interface.c:2283 msgid "Insert File _Header" msgstr "_Dateikopf einfügen" -#: ../src/interface.c:675 -#: ../src/interface.c:2287 +#: ../src/interface.c:675 ../src/interface.c:2287 msgid "Insert _GPL Notice" msgstr "_GPL-Hinweis einfügen" -#: ../src/interface.c:679 -#: ../src/interface.c:2291 +#: ../src/interface.c:679 ../src/interface.c:2291 msgid "Insert _BSD License Notice" msgstr "_BSD-Lizenz-Hinweis einfügen" -#: ../src/interface.c:683 -#: ../src/interface.c:2300 +#: ../src/interface.c:683 ../src/interface.c:2300 msgid "Insert Dat_e" msgstr "_Datum einfügen" -#: ../src/interface.c:697 -#: ../src/interface.c:2314 +#: ../src/interface.c:697 ../src/interface.c:2314 msgid "_Insert \"include <...>\"" msgstr "\"include <...>\" ei_nfügen" -#: ../src/interface.c:711 -#: ../src/interface.c:2333 -#: ../src/keybindings.c:374 +#: ../src/interface.c:711 ../src/interface.c:2333 ../src/keybindings.c:374 msgid "_Insert Alternative White Space" msgstr "Alternatives _Leerzeichen einfügen" @@ -1328,13 +1266,11 @@ msgid "Preference_s" msgstr "E_instellungen" -#: ../src/interface.c:728 -#: ../src/keybindings.c:387 +#: ../src/interface.c:728 ../src/keybindings.c:387 msgid "P_lugin Preferences" msgstr "Plugin-_Einstellungen" -#: ../src/interface.c:736 -#: ../src/interface.c:2337 +#: ../src/interface.c:736 ../src/interface.c:2337 msgid "_Search" msgstr "_Suchen" @@ -1350,8 +1286,7 @@ msgid "Find in F_iles" msgstr "In _Dateien suchen" -#: ../src/interface.c:768 -#: ../src/search.c:614 +#: ../src/interface.c:768 ../src/search.c:620 msgid "_Replace" msgstr "_Ersetzen" @@ -1363,13 +1298,11 @@ msgid "Pr_evious Message" msgstr "V_orherige Nachricht" -#: ../src/interface.c:802 -#: ../src/keybindings.c:434 +#: ../src/interface.c:802 ../src/keybindings.c:434 msgid "_Go to Next Marker" msgstr "Zur _nächsten Markierung springen" -#: ../src/interface.c:806 -#: ../src/keybindings.c:437 +#: ../src/interface.c:806 ../src/keybindings.c:437 msgid "_Go to Previous Marker" msgstr "Zur _vorherigen Markierung springen" @@ -1377,39 +1310,31 @@ msgid "_Go to Line" msgstr "_Gehe zu Zeile" -#: ../src/interface.c:823 -#: ../src/interface.c:2272 -#: ../src/interface.c:3531 +#: ../src/interface.c:823 ../src/interface.c:2272 ../src/interface.c:3532 msgid "_More" msgstr "_Weitere" -#: ../src/interface.c:830 -#: ../src/keybindings.c:399 +#: ../src/interface.c:830 ../src/keybindings.c:399 msgid "Find Next _Selection" msgstr "Auswahl _vorwärts im Dokument finden " -#: ../src/interface.c:834 -#: ../src/keybindings.c:401 +#: ../src/interface.c:834 ../src/keybindings.c:401 msgid "Find Pre_vious Selection" msgstr "Auswahl _rückwärts im Dokument finden" -#: ../src/interface.c:843 -#: ../src/interface.c:2354 +#: ../src/interface.c:843 ../src/interface.c:2354 msgid "Find _Usage" msgstr "_Auftreten finden" -#: ../src/interface.c:847 -#: ../src/interface.c:2362 +#: ../src/interface.c:847 ../src/interface.c:2362 msgid "Find _Document Usage" msgstr "_Auftreten im Dokument finden" -#: ../src/interface.c:856 -#: ../src/keybindings.c:416 +#: ../src/interface.c:856 ../src/keybindings.c:416 msgid "_Mark All" msgstr "_Alles markieren" -#: ../src/interface.c:865 -#: ../src/interface.c:2370 +#: ../src/interface.c:865 ../src/interface.c:2370 msgid "Go to _Tag Definition" msgstr "Gehe zur _Tagdefinition" @@ -1441,11 +1366,8 @@ msgid "Show Side_bar" msgstr "Seiten_leiste anzeigen" -#: ../src/interface.c:916 -#: ../src/interface.c:4302 -#: ../src/interface.c:5637 -#: ../src/keybindings.c:253 -#: ../src/prefs.c:1557 +#: ../src/interface.c:916 ../src/interface.c:4310 ../src/interface.c:5654 +#: ../src/keybindings.c:253 ../src/prefs.c:1557 msgid "Editor" msgstr "Editor" @@ -1489,21 +1411,15 @@ msgid "In_dent Type" msgstr "Art der _Einrückung" -#: ../src/interface.c:990 -#: ../src/interface.c:3894 -#: ../src/interface.c:5535 +#: ../src/interface.c:990 ../src/interface.c:3904 ../src/interface.c:5554 msgid "_Tabs" msgstr "_Tabulatoren" -#: ../src/interface.c:996 -#: ../src/interface.c:3885 -#: ../src/interface.c:5526 +#: ../src/interface.c:996 ../src/interface.c:3895 ../src/interface.c:5545 msgid "_Spaces" msgstr "_Leerzeichen" #: ../src/interface.c:1002 -#: ../src/interface.c:3903 -#: ../src/interface.c:5544 msgid "T_abs and Spaces" msgstr "Tabulatoren _und Leerzeichen" @@ -1655,8 +1571,7 @@ msgid "Load Ta_gs" msgstr "_Tags laden" -#: ../src/interface.c:1271 -#: ../src/interface.c:1278 +#: ../src/interface.c:1271 ../src/interface.c:1278 msgid "_Help" msgstr "_Hilfe" @@ -1672,8 +1587,7 @@ msgid "_Debug Messages" msgstr "_Debug-Meldungen" -#: ../src/interface.c:1333 -#: ../src/sidebar.c:132 +#: ../src/interface.c:1333 ../src/sidebar.c:124 msgid "Symbols" msgstr "Symbole" @@ -1713,178 +1627,236 @@ msgid "Conte_xt Action" msgstr "_Kontextaktion" -#: ../src/interface.c:2907 -#: ../src/keybindings.c:384 +#: ../src/interface.c:2908 ../src/keybindings.c:384 msgid "Preferences" msgstr "Einstellungen" -#: ../src/interface.c:2943 +#: ../src/interface.c:2944 msgid "Load files from the last session" msgstr "Dateien aus der letzten Sitzung laden" -#: ../src/interface.c:2946 +#: ../src/interface.c:2947 msgid "Opens at startup the files from the last session" msgstr "Lädt die geöffneten Dateien aus der letzten Sitzung" -#: ../src/interface.c:2948 +#: ../src/interface.c:2949 msgid "Load virtual terminal support" msgstr "Die Virtual Terminal Emulation (VTE) laden" -#: ../src/interface.c:2950 -msgid "Whether the virtual terminal emulation (VTE) should be loaded at startup, disable it if you do not need it" -msgstr "Stellt ein, ob die Virtual Terminal Emulation beim Starten geladen werden soll oder nicht. Wenn sie nicht benötigt wird, sollte diese Option deaktiviert werden." +#: ../src/interface.c:2951 +msgid "" +"Whether the virtual terminal emulation (VTE) should be loaded at startup, " +"disable it if you do not need it" +msgstr "" +"Stellt ein, ob die Virtual Terminal Emulation beim Starten geladen werden " +"soll oder nicht. Wenn sie nicht benötigt wird, sollte diese Option " +"deaktiviert werden." -#: ../src/interface.c:2952 +#: ../src/interface.c:2953 msgid "Enable plugin support" msgstr "Plugins aktivieren" -#: ../src/interface.c:2956 +#: ../src/interface.c:2957 msgid "Startup" msgstr "Starten" -#: ../src/interface.c:2975 +#: ../src/interface.c:2976 msgid "Save window position and geometry" msgstr "Fensterposition und -größe speichern" -#: ../src/interface.c:2978 +#: ../src/interface.c:2979 msgid "Saves the window position and geometry and restores it at the start" -msgstr "Speichert die Fensterposition und die Fenstergröße und stellt sie beim nächsten Start wieder her." +msgstr "" +"Speichert die Fensterposition und die Fenstergröße und stellt sie beim " +"nächsten Start wieder her." -#: ../src/interface.c:2980 +#: ../src/interface.c:2981 msgid "Confirm exit" msgstr "Beenden bestätigen" -#: ../src/interface.c:2983 +#: ../src/interface.c:2984 msgid "Shows a confirmation dialog on exit" msgstr "Zeigt einen Bestätigungsdialog vor dem Beenden" -#: ../src/interface.c:2985 +#: ../src/interface.c:2986 msgid "Shutdown" msgstr "Beenden " -#: ../src/interface.c:3006 +#: ../src/interface.c:3007 msgid "Startup path:" msgstr "Startpfad:" -#: ../src/interface.c:3018 -msgid "Path to start in when opening or saving files. Must be an absolute path. Leave blank to use the current working directory." -msgstr "Startpfad, wenn Dateien geöffnet oder gespeichert werden sollen. Der Pfad muss absolut sein. Um das aktuelle Arbeitsverzeichnis zu benutzen, lassen Sie das Feld leer." +#: ../src/interface.c:3019 +msgid "" +"Path to start in when opening or saving files. Must be an absolute path. " +"Leave blank to use the current working directory." +msgstr "" +"Startpfad, wenn Dateien geöffnet oder gespeichert werden sollen. Der Pfad " +"muss absolut sein. Um das aktuelle Arbeitsverzeichnis zu benutzen, lassen " +"Sie das Feld leer." -#: ../src/interface.c:3031 +#: ../src/interface.c:3032 msgid "Project files:" msgstr "Projektdateien:" -#: ../src/interface.c:3043 +#: ../src/interface.c:3044 msgid "Path to start in when opening project files" msgstr "Pfad zum Öffnen von Projektdateien" -#: ../src/interface.c:3056 +#: ../src/interface.c:3057 msgid "Extra plugin path:" msgstr "Zusätzlicher Pluginpfad" -#: ../src/interface.c:3068 -msgid "Geany looks by default in the global installation path and in the configuration directory. The path entered here will be searched additionally for plugins. Leave blank to disable." -msgstr "Geany schaut standardmäßig im Installationsverzeichnis und im Konfigurationsverzeichnis nach Plugins. Ein Pfad, der hier eingegeben wird, wird zusätzlich bei der Suche nach Plugins berücksichtigt. Das Feld wird ignoriert, falls es leer ist." +#: ../src/interface.c:3069 +msgid "" +"Geany looks by default in the global installation path and in the " +"configuration directory. The path entered here will be searched additionally " +"for plugins. Leave blank to disable." +msgstr "" +"Geany schaut standardmäßig im Installationsverzeichnis und im " +"Konfigurationsverzeichnis nach Plugins. Ein Pfad, der hier eingegeben wird, " +"wird zusätzlich bei der Suche nach Plugins berücksichtigt. Das Feld wird " +"ignoriert, falls es leer ist." -#: ../src/interface.c:3081 +#: ../src/interface.c:3082 msgid "Paths" msgstr "Pfade" -#: ../src/interface.c:3086 +#: ../src/interface.c:3087 msgid "Startup" msgstr "Starten & Beenden" -#: ../src/interface.c:3109 +#: ../src/interface.c:3110 msgid "Beep on errors or when compilation has finished" msgstr "Bei Fehlern oder beendeter Kompilierung Piepton ausgeben" -#: ../src/interface.c:3112 -msgid "Whether to beep if an error occurred or when the compilation process has finished" -msgstr "Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein Piepton ausgegeben werden soll" +#: ../src/interface.c:3113 +msgid "" +"Whether to beep if an error occurred or when the compilation process has " +"finished" +msgstr "" +"Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein Piepton " +"ausgegeben werden soll" -#: ../src/interface.c:3114 +#: ../src/interface.c:3115 msgid "Switch to status message list at new message" msgstr "Bei neuen Meldungen zu den Statusmeldungen wechseln" -#: ../src/interface.c:3117 -msgid "Switch to the status message tab (in the notebook window at the bottom) if a new status message arrives" -msgstr "Wechselt automatisch zu dem Reiter mit den Statusmeldungen im Infobereich, wenn eine neue Statusmeldung vorliegt" +#: ../src/interface.c:3118 +msgid "" +"Switch to the status message tab (in the notebook window at the bottom) if a " +"new status message arrives" +msgstr "" +"Wechselt automatisch zu dem Reiter mit den Statusmeldungen im Infobereich, " +"wenn eine neue Statusmeldung vorliegt" -#: ../src/interface.c:3119 +#: ../src/interface.c:3120 msgid "Suppress status messages in the status bar" msgstr "Meldungen in der Statuszeile unterdrücken" -#: ../src/interface.c:3122 -msgid "Removes all messages from the status bar. The messages are still displayed in the status messages window." -msgstr "Entfernt alle Nachrichten aus der Statuszeile. Die Nachrichten sind weiterhin über den »Status«-Reiter im Infobereich abrufbar." +#: ../src/interface.c:3123 +msgid "" +"Removes all messages from the status bar. The messages are still displayed " +"in the status messages window." +msgstr "" +"Entfernt alle Nachrichten aus der Statuszeile. Die Nachrichten sind " +"weiterhin über den »Status«-Reiter im Infobereich abrufbar." -#: ../src/interface.c:3124 +#: ../src/interface.c:3125 msgid "Auto-focus widgets (focus follows mouse)" msgstr "Autofokus (Der Fokus folgt der Maus)" -#: ../src/interface.c:3127 -msgid "Gives the focus automatically to widgets below the mouse cursor. Works for the main editor widget, the scribble, the toolbar search and goto line fields and the VTE." -msgstr "Wenn diese Option aktiviert ist, gibt Geany dem Fenster den Fokus, über dem sich im Moment der Zeiger der Maus befindet. Diese Option funktioniert für das Hauptfenster, das Notizbuch, den Such- und Springe-zu-Feldern in der Werkzeugliste sowie für das integrierte Terminal." +#: ../src/interface.c:3128 +msgid "" +"Gives the focus automatically to widgets below the mouse cursor. Works for " +"the main editor widget, the scribble, the toolbar search and goto line " +"fields and the VTE." +msgstr "" +"Wenn diese Option aktiviert ist, gibt Geany dem Fenster den Fokus, über dem " +"sich im Moment der Zeiger der Maus befindet. Diese Option funktioniert für " +"das Hauptfenster, das Notizbuch, den Such- und Springe-zu-Feldern in der " +"Werkzeugliste sowie für das integrierte Terminal." -#: ../src/interface.c:3129 +#: ../src/interface.c:3130 msgid "Use Windows File Open/Save dialogs" msgstr "Benutze den Windows Datei öffnen/speichern Dialog" -#: ../src/interface.c:3132 -msgid "Defines whether to use the native Windows File Open/Save dialogs or whether to use the GTK default dialogs" -msgstr "Bestimmt, ob der native Windows Datei öffnen/speichern anstelle des GTK-Dialogs genutzt werden soll." +#: ../src/interface.c:3133 +msgid "" +"Defines whether to use the native Windows File Open/Save dialogs or whether " +"to use the GTK default dialogs" +msgstr "" +"Bestimmt, ob der native Windows Datei öffnen/speichern anstelle des GTK-" +"Dialogs genutzt werden soll." -#: ../src/interface.c:3134 -#: ../src/interface.c:3370 -#: ../src/interface.c:4512 +#: ../src/interface.c:3135 ../src/interface.c:3371 ../src/interface.c:4520 msgid "Miscellaneous" msgstr "Sonstiges" -#: ../src/interface.c:3153 +#: ../src/interface.c:3154 msgid "Always wrap search and hide the Find dialog" msgstr "Das vollständige Dokument durchsuchen und den Suchen-Dialog schließen" -#: ../src/interface.c:3156 -msgid "Always wrap search around the document and hide the Find dialog after clicking Find Next/Previous" -msgstr "Immer das vollständige Dokument durchsuchen und den Suchen-Dialog nach Klicken auf Nächstes/Vorheriges schließen" +#: ../src/interface.c:3157 +msgid "" +"Always wrap search around the document and hide the Find dialog after " +"clicking Find Next/Previous" +msgstr "" +"Immer das vollständige Dokument durchsuchen und den Suchen-Dialog nach " +"Klicken auf Nächstes/Vorheriges schließen" -#: ../src/interface.c:3158 +#: ../src/interface.c:3159 msgid "Use the current word under the cursor for Find dialogs" msgstr "Aktuelle Cursorposition zur Suche heranziehen" -#: ../src/interface.c:3161 -msgid "Use current word under the cursor when opening the Find, Find in Files or Replace dialog and there is no selection" -msgstr "Bestimmt das aktuelle Wort zum Suchen & Ersetzen anhand der Cursorposition" +#: ../src/interface.c:3162 +msgid "" +"Use current word under the cursor when opening the Find, Find in Files or " +"Replace dialog and there is no selection" +msgstr "" +"Bestimmt das aktuelle Wort zum Suchen & Ersetzen anhand der Cursorposition" -#: ../src/interface.c:3163 +#: ../src/interface.c:3164 msgid "Use the current file's directory for Find in Files" msgstr "Verzeichnis der aktuellen Datei für »In Dateien suchen« benutzen" -#: ../src/interface.c:3167 +#: ../src/interface.c:3168 msgid "Search" msgstr "Suche" -#: ../src/interface.c:3186 +#: ../src/interface.c:3187 msgid "Use project-based session files" msgstr "Sitzung im Projekt speichern und wieder öffnen" -#: ../src/interface.c:3189 -msgid "Whether to store a project's session files and open them when re-opening the project" -msgstr "Speichert die geöffneten Dateien (aktuelle Sitzung) zusammen mit dem Projekt und öffnet diese Dateien wieder wenn das Projekt geöffnet wird" +#: ../src/interface.c:3190 +msgid "" +"Whether to store a project's session files and open them when re-opening the " +"project" +msgstr "" +"Speichert die geöffneten Dateien (aktuelle Sitzung) zusammen mit dem Projekt " +"und öffnet diese Dateien wieder wenn das Projekt geöffnet wird" -#: ../src/interface.c:3191 +#: ../src/interface.c:3192 msgid "Store project file inside the project base directory" msgstr "Projektdatei innerhalb des Projektbasisverzeichnis erstellen" -#: ../src/interface.c:3194 -msgid "When enabled, a project file is stored by default inside the project base directory when creating new projects instead of one directory above the base directory. You can still change the path of the project file in the New Project dialog." -msgstr "Wenn diese Option eingeschaltet ist, wird beim Erzeugen eines neuen Projekts die Projektdatei standardmäßig innerhalb des Basisverzeichnis des Projekts angelegt, ansonsten wird die Datei ein Verzeichnis über dem Basisverzeichnis angelegt. Der Pfad kann im »Neues Projekt«-Dialog geändert werden." +#: ../src/interface.c:3195 +msgid "" +"When enabled, a project file is stored by default inside the project base " +"directory when creating new projects instead of one directory above the base " +"directory. You can still change the path of the project file in the New " +"Project dialog." +msgstr "" +"Wenn diese Option eingeschaltet ist, wird beim Erzeugen eines neuen Projekts " +"die Projektdatei standardmäßig innerhalb des Basisverzeichnis des Projekts " +"angelegt, ansonsten wird die Datei ein Verzeichnis über dem Basisverzeichnis " +"angelegt. Der Pfad kann im »Neues Projekt«-Dialog geändert werden." -#: ../src/interface.c:3196 +#: ../src/interface.c:3197 msgid "Projects" msgstr "Projekte" -#: ../src/interface.c:3201 +#: ../src/interface.c:3202 msgid "Miscellaneous" msgstr "Sonstiges" @@ -1892,973 +1864,1121 @@ #. * corresponding chapter in the documentation, comparing translatable #. * strings is easy to break. Maybe attach an identifying string to the #. * tab label object. -#: ../src/interface.c:3205 -#: ../src/prefs.c:1551 +#: ../src/interface.c:3206 ../src/prefs.c:1551 msgid "General" msgstr "Allgemein" -#: ../src/interface.c:3246 +#: ../src/interface.c:3247 msgid "Show symbol list" msgstr "Symbolliste anzeigen" -#: ../src/interface.c:3249 +#: ../src/interface.c:3250 msgid "Toggle the symbol list on and off" msgstr "Blendet die Symbolliste ein und aus" -#: ../src/interface.c:3251 +#: ../src/interface.c:3252 msgid "Show documents list" msgstr "Dokumentenliste anzeigen" -#: ../src/interface.c:3254 +#: ../src/interface.c:3255 msgid "Toggle the documents list on and off" msgstr "Blendet die Dokumentenliste ein und aus" -#: ../src/interface.c:3256 +#: ../src/interface.c:3257 msgid "Show sidebar" msgstr "Seitenleiste anzeigen" -#: ../src/interface.c:3264 +#: ../src/interface.c:3265 msgid "Position:" msgstr "Position:" -#: ../src/interface.c:3268 -#: ../src/interface.c:3424 -#: ../src/interface.c:3485 -#: ../src/interface.c:3503 -#: ../src/interface.c:3521 +#: ../src/interface.c:3269 ../src/interface.c:3425 ../src/interface.c:3486 +#: ../src/interface.c:3504 ../src/interface.c:3522 msgid "Left" msgstr "Links" -#: ../src/interface.c:3275 -#: ../src/interface.c:3432 -#: ../src/interface.c:3486 -#: ../src/interface.c:3504 -#: ../src/interface.c:3522 +#: ../src/interface.c:3276 ../src/interface.c:3433 ../src/interface.c:3487 +#: ../src/interface.c:3505 ../src/interface.c:3523 msgid "Right" msgstr "Rechts" -#: ../src/interface.c:3281 +#: ../src/interface.c:3282 msgid "Sidebar" msgstr "Seitenleiste" -#: ../src/interface.c:3302 +#: ../src/interface.c:3303 msgid "Symbol list:" msgstr "Symbolliste:" -#: ../src/interface.c:3309 -#: ../src/interface.c:3472 +#: ../src/interface.c:3310 ../src/interface.c:3473 msgid "Message window:" msgstr "Meldungsfenster:" -#: ../src/interface.c:3316 -#: ../src/interface.c:3508 +#: ../src/interface.c:3317 ../src/interface.c:3509 msgid "Editor:" msgstr "Editor:" -#: ../src/interface.c:3328 +#: ../src/interface.c:3329 msgid "Sets the font for the message window" msgstr "Ändert die Schriftart für das Meldungsfenster im Infobereich" -#: ../src/interface.c:3336 +#: ../src/interface.c:3337 msgid "Sets the font for the symbol list" msgstr "Legt die Schriftart für die Symbolliste fest" -#: ../src/interface.c:3344 +#: ../src/interface.c:3345 msgid "Sets the editor font" msgstr "Legt die Schriftart für das Editorfenster fest" -#: ../src/interface.c:3346 +#: ../src/interface.c:3347 msgid "Fonts" msgstr "Schriftarten" -#: ../src/interface.c:3365 +#: ../src/interface.c:3366 msgid "Show status bar" msgstr "Statusleiste anzeigen" -#: ../src/interface.c:3368 +#: ../src/interface.c:3369 msgid "Whether to show the status bar at the bottom of the main window" -msgstr "Legt fest, ob die Statuszeile an der unteren Seite des Fensters angezeigt werden soll oder nicht" +msgstr "" +"Legt fest, ob die Statuszeile an der unteren Seite des Fensters angezeigt " +"werden soll oder nicht" -#: ../src/interface.c:3375 -#: ../src/interface.c:3535 -#: ../src/prefs.c:1553 +#: ../src/interface.c:3376 ../src/interface.c:3536 ../src/prefs.c:1553 msgid "Interface" msgstr "Schnittstelle" -#: ../src/interface.c:3398 +#: ../src/interface.c:3399 msgid "Show editor tabs" msgstr "Zeige Dateireiter für geöffnete Dateien" -#: ../src/interface.c:3402 +#: ../src/interface.c:3403 msgid "Show close buttons" msgstr "»Schließen«-Schaltflächen anzeigen" -#: ../src/interface.c:3405 -msgid "Shows a small cross button in the file tabs to easily close files when clicking on it (requires restart of Geany)" -msgstr "Zeigt ein kleines Kreuz auf den Dateireitern zum einfachen Schließen einer Datei an. (Diese Option benötigt einen Neustart von Geany zum Aktivieren.)" +#: ../src/interface.c:3406 +msgid "" +"Shows a small cross button in the file tabs to easily close files when " +"clicking on it (requires restart of Geany)" +msgstr "" +"Zeigt ein kleines Kreuz auf den Dateireitern zum einfachen Schließen einer " +"Datei an. (Diese Option benötigt einen Neustart von Geany zum Aktivieren.)" -#: ../src/interface.c:3411 +#: ../src/interface.c:3412 msgid "Placement of new file tabs:" msgstr "Platzierung neuer Dateireiter:" -#: ../src/interface.c:3427 +#: ../src/interface.c:3428 msgid "File tabs will be placed on the left of the notebook" msgstr "Neue Dateireiter werden links von der Dateiliste platziert" -#: ../src/interface.c:3435 +#: ../src/interface.c:3436 msgid "File tabs will be placed on the right of the notebook" msgstr "Neue Dateireiter werden rechts von der Dateiliste platziert" -#: ../src/interface.c:3439 +#: ../src/interface.c:3440 msgid "Next to current" msgstr "Reiter neben aktuellem öffnen" -#: ../src/interface.c:3444 -msgid "Whether to place file tabs next to the current tab rather than at the edges of the notebook" -msgstr "Legt fest, ob neue Reiter direkt neben dem aktuellen oder an den Enden der Liste eingefügt werden." +#: ../src/interface.c:3445 +msgid "" +"Whether to place file tabs next to the current tab rather than at the edges " +"of the notebook" +msgstr "" +"Legt fest, ob neue Reiter direkt neben dem aktuellen oder an den Enden der " +"Liste eingefügt werden." -#: ../src/interface.c:3446 +#: ../src/interface.c:3447 msgid "Double-clicking hides all additional widgets" -msgstr "Doppelklick versteckt die zusätzlichen Unterfenster und zeigt nur den Editor an" +msgstr "" +"Doppelklick versteckt die zusätzlichen Unterfenster und zeigt nur den Editor " +"an" -#: ../src/interface.c:3449 +#: ../src/interface.c:3450 msgid "Calls the View->Toggle All Additional Widgets command" msgstr "Zusätzliche Infofenster ein-/ausblenden" -#: ../src/interface.c:3451 +#: ../src/interface.c:3452 msgid "Editor tabs" msgstr "Dateireiter" -#: ../src/interface.c:3487 -#: ../src/interface.c:3505 -#: ../src/interface.c:3523 +#: ../src/interface.c:3488 ../src/interface.c:3506 ../src/interface.c:3524 msgid "Top" msgstr "Oben" -#: ../src/interface.c:3488 -#: ../src/interface.c:3506 -#: ../src/interface.c:3524 +#: ../src/interface.c:3489 ../src/interface.c:3507 ../src/interface.c:3525 msgid "Bottom" msgstr "Unten" -#: ../src/interface.c:3490 +#: ../src/interface.c:3491 msgid "Sidebar:" msgstr "Seitenleiste:" -#: ../src/interface.c:3526 +#: ../src/interface.c:3527 msgid "Tab positions" msgstr "Reiterposition" -#: ../src/interface.c:3566 -msgid "Show T_oolbar" +#: ../src/interface.c:3567 +msgid "Show t_oolbar" msgstr "Werkzeugleiste _anzeigen" -#: ../src/interface.c:3570 -msgid "_Append Toolbar to the Menu" +#: ../src/interface.c:3571 +msgid "_Append toolbar to the menu" msgstr "_Werkzeugliste direkt an das Menü anfügen" -#: ../src/interface.c:3573 +#: ../src/interface.c:3574 msgid "Pack the toolbar to the main menu to save vertical space" -msgstr "Die Werkzeugliste direkt hinter dem Hauptmenü platzieren um etwas vertikalen Platz zu sparen." +msgstr "" +"Die Werkzeugliste direkt hinter dem Hauptmenü platzieren um etwas vertikalen " +"Platz zu sparen." -#: ../src/interface.c:3595 -#: ../src/toolbar.c:931 +#: ../src/interface.c:3596 ../src/toolbar.c:934 msgid "Customize Toolbar" msgstr "Werkzeugleiste anpassen" -#: ../src/interface.c:3615 -msgid "System _Default" +#: ../src/interface.c:3616 +msgid "System _default" msgstr "S_ystemvorgabe" -#: ../src/interface.c:3623 -msgid "Images _and Text" +#: ../src/interface.c:3624 +msgid "Images _and text" msgstr "Symbole _und Text" -#: ../src/interface.c:3631 -msgid "_Images Only" +#: ../src/interface.c:3632 +msgid "_Images only" msgstr "Nur _Symbole" -#: ../src/interface.c:3639 -msgid "_Text Only" +#: ../src/interface.c:3640 +msgid "_Text only" msgstr "Nur _Text" -#: ../src/interface.c:3647 -msgid "Icon Style" +#: ../src/interface.c:3648 +msgid "Icon style" msgstr "Symbolstil" -#: ../src/interface.c:3668 -msgid "S_ystem Default" +#: ../src/interface.c:3669 +msgid "S_ystem default" msgstr "S_ystemvorgabe" -#: ../src/interface.c:3676 -msgid "_Small Icons" +#: ../src/interface.c:3677 +msgid "_Small icons" msgstr "_Kleine Symbole" -#: ../src/interface.c:3684 -msgid "_Very Small Icons" +#: ../src/interface.c:3685 +msgid "_Very small icons" msgstr "_Sehr kleine Symbole" -#: ../src/interface.c:3692 -msgid "_Large Icons" +#: ../src/interface.c:3693 +msgid "_Large icons" msgstr "_Große Symbole" -#: ../src/interface.c:3700 -msgid "Icon Size" -msgstr "Symbolgröße:" +#: ../src/interface.c:3701 +msgid "Icon size" +msgstr "Symbolgröße" -#: ../src/interface.c:3705 +#: ../src/interface.c:3706 msgid "Toolbar" msgstr "Werkzeugleiste" -#: ../src/interface.c:3710 -#: ../src/prefs.c:1555 +#: ../src/interface.c:3711 ../src/prefs.c:1555 msgid "Toolbar" msgstr "Werkzeugleiste" -#: ../src/interface.c:3737 +#: ../src/interface.c:3738 msgid "Line wrapping" msgstr "Visueller Zeilenumbruch" -#: ../src/interface.c:3740 -msgid "Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines." -msgstr "Bricht lange Zeilen am Fensterrand um und setzt sie auf der nächsten Zeile fort. Achtung: Bei großen Dokumenten erfordert der Zeilenumbruch viel Rechenleistung und sollte daher auf langsameren Rechnern deaktiviert werden." +#: ../src/interface.c:3741 +msgid "" +"Wrap the line at the window border and continue it on the next line. Note: " +"line wrapping has a high performance cost for large documents so should be " +"disabled on slow machines." +msgstr "" +"Bricht lange Zeilen am Fensterrand um und setzt sie auf der nächsten Zeile " +"fort. Achtung: Bei großen Dokumenten erfordert der Zeilenumbruch viel " +"Rechenleistung und sollte daher auf langsameren Rechnern deaktiviert werden." -#: ../src/interface.c:3742 +#: ../src/interface.c:3743 msgid "\"Smart\" home key" msgstr "»Intelligente« Pos1-Taste (Home)" -#: ../src/interface.c:3745 -msgid "When \"smart\" home is enabled, the HOME key will move the caret to the first non-blank character of the line, unless it is already there, it moves to the very beginning of the line. When this feature is disabled, the HOME key always moves the caret to the start of the current line, regardless of its current position." -msgstr "Wenn die intelligente Pos1-Taste (Home) aktiviert ist, springt der Cursor bei Tastendruck zum ersten Zeichen der Zeile. Sollte er sich bereits dort befinden, springt er zum Beginn der Zeile. Wenn diese Option nicht aktiviert ist, springt der Cursor immer zum Beginn der Zeile ohne auf die aktuelle Position Rücksicht zu nehmen." +#: ../src/interface.c:3746 +msgid "" +"When \"smart\" home is enabled, the HOME key will move the caret to the " +"first non-blank character of the line, unless it is already there, it moves " +"to the very beginning of the line. When this feature is disabled, the HOME " +"key always moves the caret to the start of the current line, regardless of " +"its current position." +msgstr "" +"Wenn die intelligente Pos1-Taste (Home) aktiviert ist, springt der Cursor " +"bei Tastendruck zum ersten Zeichen der Zeile. Sollte er sich bereits dort " +"befinden, springt er zum Beginn der Zeile. Wenn diese Option nicht aktiviert " +"ist, springt der Cursor immer zum Beginn der Zeile ohne auf die aktuelle " +"Position Rücksicht zu nehmen." -#: ../src/interface.c:3747 +#: ../src/interface.c:3748 msgid "Disable Drag and Drop" msgstr "Drag and Drop deaktivieren" -#: ../src/interface.c:3750 -msgid "Disable drag and drop completely in the editor window so you can't drag and drop any selections within or outside of the editor window" -msgstr "Deaktiviert Drag and Drop für das Editorfenster. Dies verhindert, dass markierter Text mit der Maus verschoben werden kann." +#: ../src/interface.c:3751 +msgid "" +"Disable drag and drop completely in the editor window so you can't drag and " +"drop any selections within or outside of the editor window" +msgstr "" +"Deaktiviert Drag and Drop für das Editorfenster. Dies verhindert, dass " +"markierter Text mit der Maus verschoben werden kann." -#: ../src/interface.c:3752 +#: ../src/interface.c:3753 msgid "Code folding" msgstr "Quelltext-Ausblendung" -#: ../src/interface.c:3756 +#: ../src/interface.c:3757 msgid "Fold/unfold all children of a fold point" msgstr "Alle untergeordneten Quelltextblöcke ein/ausklappen" -#: ../src/interface.c:3759 -msgid "Fold or unfold all children of a fold point. By pressing the Shift key while clicking on a fold symbol the contrary behavior is used." -msgstr "Ein- oder Ausklappen aller Unterpunkte eines Quelltextabschnittes. Bei gedrückt halten der Umschalttaste wird das Gegenteil gemacht, wenn auf das Symbol geklickt wird." +#: ../src/interface.c:3760 +msgid "" +"Fold or unfold all children of a fold point. By pressing the Shift key while " +"clicking on a fold symbol the contrary behavior is used." +msgstr "" +"Ein- oder Ausklappen aller Unterpunkte eines Quelltextabschnittes. Bei " +"gedrückt halten der Umschalttaste wird das Gegenteil gemacht, wenn auf das " +"Symbol geklickt wird." -#: ../src/interface.c:3761 +#: ../src/interface.c:3762 msgid "Use indicators to show compile errors" msgstr "Benutzt Markierungen, um Probleme beim Kompilieren anzuzeigen" -#: ../src/interface.c:3764 -msgid "Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error" -msgstr "Legt fest, ob Markierungen (gewellte Unterstreichungen) benutzt werden sollen, um Zeilen mit Fehlern beim Kompiliervorgang zu markieren" +#: ../src/interface.c:3765 +msgid "" +"Whether to use indicators (a squiggly underline) to highlight the lines " +"where the compiler found a warning or an error" +msgstr "" +"Legt fest, ob Markierungen (gewellte Unterstreichungen) benutzt werden " +"sollen, um Zeilen mit Fehlern beim Kompiliervorgang zu markieren" -#: ../src/interface.c:3766 +#: ../src/interface.c:3767 msgid "Newline strips trailing spaces" msgstr "Neue Zeile entfernt Leerzeichen am Zeilenende" -#: ../src/interface.c:3769 +#: ../src/interface.c:3770 msgid "Enable newline to strip the trailing spaces on the previous line" -msgstr "Legt fest ob beim Wechseln in eine neue Zeile unnötige Leerzeichen am Ende einer Zeile automatisch entfernt werden sollen" +msgstr "" +"Legt fest ob beim Wechseln in eine neue Zeile unnötige Leerzeichen am Ende " +"einer Zeile automatisch entfernt werden sollen" -#: ../src/interface.c:3775 +#: ../src/interface.c:3776 msgid "Line breaking column:" msgstr "Spalte für automatischen Zeilenumbruch:" # TODO woah, hier muss noch was anderes her :D -#: ../src/interface.c:3789 +#: ../src/interface.c:3790 msgid "Comment toggle marker:" msgstr "Kommentarumschaltzeichen:" -#: ../src/interface.c:3796 -msgid "A string which is added when toggling a line comment in a source file, it is used to mark the comment as toggled." -msgstr "Eine Zeichenkette, welche bei einem Zeilenkommentar benutzt wird um den Kommentar zu markieren, der per Tastenkombination ein- oder ausgeschaltet werden kann." +#: ../src/interface.c:3797 +msgid "" +"A string which is added when toggling a line comment in a source file, it is " +"used to mark the comment as toggled." +msgstr "" +"Eine Zeichenkette, welche bei einem Zeilenkommentar benutzt wird um den " +"Kommentar zu markieren, der per Tastenkombination ein- oder ausgeschaltet " +"werden kann." -#: ../src/interface.c:3798 +#: ../src/interface.c:3799 msgid "Features" msgstr "Funktionen" -#: ../src/interface.c:3803 +#: ../src/interface.c:3804 msgid "Features" msgstr "Funktionen" -#: ../src/interface.c:3816 -msgid "Note: To apply these settings to all currently open documents, use Project->Apply Default Indentation." -msgstr "Anmerkung: Um diese Einstellungen auf alle geöffneten Dokumente anzuwenden, bitte nutzen Sie Projekt->Standardeinrückung anwenden." +#: ../src/interface.c:3817 +msgid "" +"Note: To apply these settings to all currently open documents, use " +"Project->Apply Default Indentation." +msgstr "" +"Anmerkung: Um diese Einstellungen auf alle geöffneten Dokumente anzuwenden, " +"bitte nutzen Sie Projekt->Standardeinrückung anwenden." -#: ../src/interface.c:3843 -#: ../src/interface.c:5484 +#: ../src/interface.c:3844 ../src/interface.c:5494 +msgid "Width:" +msgstr "Breite:" + +#: ../src/interface.c:3857 ../src/interface.c:5507 +msgid "The width in chars of a single indent" +msgstr "Die Breite einer Einrückung in Zeichen" + +#: ../src/interface.c:3862 ../src/interface.c:5512 msgid "Auto-indent mode:" msgstr "Modus für automatische Einrückung:" -#: ../src/interface.c:3856 -#: ../src/interface.c:5497 +#: ../src/interface.c:3875 ../src/interface.c:5525 msgid "Basic" msgstr "Einfach" -#: ../src/interface.c:3857 -#: ../src/interface.c:5498 +#: ../src/interface.c:3876 ../src/interface.c:5526 msgid "Current chars" msgstr "Aktuelle Zeichenkette" -#: ../src/interface.c:3858 -#: ../src/interface.c:5499 +#: ../src/interface.c:3877 ../src/interface.c:5527 msgid "Match braces" msgstr "Übereinstimmende Klammerung" -#: ../src/interface.c:3860 -#: ../src/interface.c:4202 -#: ../src/interface.c:5501 -msgid "Type:" -msgstr "Typ:" +#: ../src/interface.c:3879 ../src/interface.c:5529 +msgid "Detect type from file" +msgstr "Einrücktyp aus Datei lesen" -#: ../src/interface.c:3867 -#: ../src/interface.c:5508 -msgid "Width:" -msgstr "Breite:" +#: ../src/interface.c:3884 ../src/interface.c:5534 ../src/interface.c:5717 +msgid "" +"Whether to detect the indentation type from file contents when a file is " +"opened" +msgstr "" +"Wenn diese Option aktiviert ist, versucht Geany den Typ der Einrückung " +"(Tabulatoren oder Leerzeichen) automatisch aus der geöffneten Datei zu " +"bestimmen" -#: ../src/interface.c:3880 -#: ../src/interface.c:5521 -msgid "The width in chars of a single indent" -msgstr "Die Breite einer Einrückung in Zeichen" +#: ../src/interface.c:3886 ../src/interface.c:5536 +msgid "T_abs and spaces" +msgstr "Tabulatoren _und Leerzeichen" -#: ../src/interface.c:3890 -#: ../src/interface.c:5531 +#: ../src/interface.c:3891 ../src/interface.c:5541 +msgid "" +"Use spaces if the total indent is less than the tab width, otherwise use both" +msgstr "" +"Benutzt Leerzeichen, falls die Einrückung kleiner ist als die " +"Tabulatorenbreite, anderenfalls beides (Leerzeichen und Tabulatoren)" + +#: ../src/interface.c:3900 ../src/interface.c:5550 msgid "Use spaces when inserting indentation" msgstr "Benutze Leerzeichen zum Einrücken" -#: ../src/interface.c:3899 -#: ../src/interface.c:5540 +#: ../src/interface.c:3909 ../src/interface.c:5559 msgid "Use one tab per indent" msgstr "Ein Tabulator pro Einzug" -#: ../src/interface.c:3908 -#: ../src/interface.c:5549 -msgid "Use spaces if the total indent is less than the tab width, otherwise use both" -msgstr "Benutzt Leerzeichen, falls die Einrückung kleiner ist als die Tabulatorenbreite, anderenfalls beides (Leerzeichen und Tabulatoren)" +#: ../src/interface.c:3913 ../src/interface.c:5570 +msgid "Detect width from file" +msgstr "Einrücktiefe aus Datei lesen" -#: ../src/interface.c:3917 -#: ../src/interface.c:5558 -msgid "Whether to detect the indentation type from file contents when a file is opened" -msgstr "Wenn diese Option aktiviert ist, versucht Geany den Typ der Einrückung (Tabulatoren oder Leerzeichen) automatisch aus der geöffneten Datei zu bestimmen" +#: ../src/interface.c:3918 ../src/interface.c:5575 +msgid "" +"Whether to detect the indentation width from file contents when a file is " +"opened" +msgstr "" +"Wenn diese Option aktiviert ist, versucht Geany den Breite der Einrückung " +"automatisch aus der geöffneten Datei zu bestimmen" -#: ../src/interface.c:3919 +#: ../src/interface.c:3920 ../src/interface.c:4210 ../src/interface.c:5563 +msgid "Type:" +msgstr "Typ:" + +#: ../src/interface.c:3927 msgid "Tab key indents" msgstr "Einrücken mit der Tabulatortaste" -#: ../src/interface.c:3922 -msgid "Pressing tab/shift-tab indents/unindents instead of inserting a tab character" -msgstr "Tabulator und Shift+Tabulator rückt den Text ein oder aus anstatt nur ein Tabulatorzeichen einzufügen" +#: ../src/interface.c:3930 +msgid "" +"Pressing tab/shift-tab indents/unindents instead of inserting a tab character" +msgstr "" +"Tabulator und Shift+Tabulator rückt den Text ein oder aus anstatt nur ein " +"Tabulatorzeichen einzufügen" -#: ../src/interface.c:3924 +#: ../src/interface.c:3932 msgid "Indentation" msgstr "Einrückung" -#: ../src/interface.c:3929 -#: ../src/interface.c:5560 +#: ../src/interface.c:3937 ../src/interface.c:5577 msgid "Indentation" msgstr "Einrückung" -#: ../src/interface.c:3952 +#: ../src/interface.c:3960 msgid "Snippet completion" msgstr "Vervollständigung von (Code-)Schnipseln" -#: ../src/interface.c:3955 -msgid "Type a defined short character sequence and complete it to a more complex string using a single keypress" -msgstr "Mittels eines Tastenkürzels kann ein kurzer (Code-)Schnipsel zu einem komplexeren Text erweitert werden" +#: ../src/interface.c:3963 +msgid "" +"Type a defined short character sequence and complete it to a more complex " +"string using a single keypress" +msgstr "" +"Mittels eines Tastenkürzels kann ein kurzer (Code-)Schnipsel zu einem " +"komplexeren Text erweitert werden" -#: ../src/interface.c:3957 +#: ../src/interface.c:3965 msgid "XML/HTML tag auto-closing" msgstr "Automatischen Schließen von XML/HTML-Tag " -#: ../src/interface.c:3960 +#: ../src/interface.c:3968 msgid "Insert matching closing tag for XML/HTML" msgstr "Passendes schließendes Tag für XML/HTML einfügen" -#: ../src/interface.c:3962 +#: ../src/interface.c:3970 msgid "Automatic continuation of multi-line comments" msgstr "Automatisches Weiterführen von mehrzeiligen Kommentaren" -#: ../src/interface.c:3965 -msgid "Continue automatically multi-line comments in languages like C, C++ and Java when a new line is entered inside such a comment" -msgstr "Verlängert die Kommentarzeilen in Sprachen wie C, C++ und Java, wenn eine neue Zeile innerhalb eines Kommentars hinzugefügt wird." +#: ../src/interface.c:3973 +msgid "" +"Continue automatically multi-line comments in languages like C, C++ and Java " +"when a new line is entered inside such a comment" +msgstr "" +"Verlängert die Kommentarzeilen in Sprachen wie C, C++ und Java, wenn eine " +"neue Zeile innerhalb eines Kommentars hinzugefügt wird." -#: ../src/interface.c:3967 +#: ../src/interface.c:3975 msgid "Autocomplete symbols" msgstr "Autovervollständigung von Symbolen" -#: ../src/interface.c:3970 -msgid "Automatic completion of known symbols in open files (function names, global variables, ...)" -msgstr "Automatische Vervollständigung von bekannten Variablen und Funktionsnamen aus den geöffneten Dateien" +#: ../src/interface.c:3978 +msgid "" +"Automatic completion of known symbols in open files (function names, global " +"variables, ...)" +msgstr "" +"Automatische Vervollständigung von bekannten Variablen und Funktionsnamen " +"aus den geöffneten Dateien" -#: ../src/interface.c:3972 +#: ../src/interface.c:3980 msgid "Autocomplete all words in document" msgstr "Autovervollständigung aller Wörter im Dokument" -#: ../src/interface.c:3976 +#: ../src/interface.c:3984 msgid "Drop rest of word on completion" msgstr "Bei Vervollständigung den Rest des Wortes ersetzen." -#: ../src/interface.c:3986 +#: ../src/interface.c:3994 msgid "Max. symbol name suggestions:" msgstr "Max. Vorschläge der Symbolvervollständigung:" -#: ../src/interface.c:3993 +#: ../src/interface.c:4001 msgid "Completion list height:" msgstr "Höhe der Vervollständigungsliste:" -#: ../src/interface.c:4000 +#: ../src/interface.c:4008 msgid "Characters to type for autocompletion:" msgstr "Zu tippende Zeichen für die Vervollständigung:" -#: ../src/interface.c:4013 -msgid "The amount of characters which are necessary to show the symbol autocompletion list" +#: ../src/interface.c:4021 +msgid "" +"The amount of characters which are necessary to show the symbol " +"autocompletion list" msgstr "Die Anzahl der Zeichen, die nötig sind um die Vorschläge anzuzeigen" -#: ../src/interface.c:4022 +#: ../src/interface.c:4030 msgid "Display height in rows for the autocompletion list" msgstr "Höhe der Liste in Zeilen" -#: ../src/interface.c:4031 +#: ../src/interface.c:4039 msgid "Maximum number of entries to display in the autocompletion list" -msgstr "Anzahl der Elemente, die maximal angezeigt werden sollen, wenn die Liste angezeigt wird" +msgstr "" +"Anzahl der Elemente, die maximal angezeigt werden sollen, wenn die Liste " +"angezeigt wird" -#: ../src/interface.c:4034 +#: ../src/interface.c:4042 msgid "Symbol list update frequency:" msgstr "Aktualisierungsfrequenz der Symbolliste:" -#: ../src/interface.c:4047 -msgid "Minimal delay (in milliseconds) between two automatic updates of the symbol list. Note that a too short delay may have performance impact, especially with large files. A delay of 0 disables real-time updates." -msgstr "Minimale Pause (in Millisekunden) zwischen Aktualisierungen der Symbolliste. Vorsicht! Ein zu geringer Wert kann vor allem bei großen Dokumenten Geschwindigkeitseinbußen nach sich ziehen. Ein Wert von 0 deaktiviert die dynamischen Aktualisierungen." +#: ../src/interface.c:4055 +msgid "" +"Minimal delay (in milliseconds) between two automatic updates of the symbol " +"list. Note that a too short delay may have performance impact, especially " +"with large files. A delay of 0 disables real-time updates." +msgstr "" +"Minimale Pause (in Millisekunden) zwischen Aktualisierungen der Symbolliste. " +"Vorsicht! Ein zu geringer Wert kann vor allem bei großen Dokumenten " +"Geschwindigkeitseinbußen nach sich ziehen. Ein Wert von 0 deaktiviert die " +"dynamischen Aktualisierungen." -#: ../src/interface.c:4050 +#: ../src/interface.c:4058 msgid "Completions" msgstr "Vervollständigungen" -#: ../src/interface.c:4069 +#: ../src/interface.c:4077 msgid "Parenthesis ( )" msgstr "Klammern ( )" -#: ../src/interface.c:4074 +#: ../src/interface.c:4082 msgid "Auto-close parenthesis when typing an opening one" msgstr "Automatisches Schließen der Klammern beim Tippen der öffnenden Klammer" -#: ../src/interface.c:4076 +#: ../src/interface.c:4084 msgid "Single quotes ' '" msgstr "Einfache Anführungs-/Schlusszeichen" -#: ../src/interface.c:4081 +#: ../src/interface.c:4089 msgid "Auto-close single quote when typing an opening one" -msgstr "Automatisches Setzen der schließenden Anführungsstriche beim Tippen der öffnenden" +msgstr "" +"Automatisches Setzen der schließenden Anführungsstriche beim Tippen der " +"öffnenden" -#: ../src/interface.c:4083 +#: ../src/interface.c:4091 msgid "Curly brackets { }" msgstr "Geschweifte Klammern {}" -#: ../src/interface.c:4088 +#: ../src/interface.c:4096 msgid "Auto-close curly bracket when typing an opening one" msgstr "Automatisches Schließen der Klammern beim Tippen der öffnenden Klammer" -#: ../src/interface.c:4090 +#: ../src/interface.c:4098 msgid "Square brackets [ ]" msgstr "Eckige Klammern [ ]" -#: ../src/interface.c:4095 +#: ../src/interface.c:4103 msgid "Auto-close square-bracket when typing an opening one" -msgstr "Automatisches Schließen von eckigen Klammern beim Tippen der öffnenden Klammer" +msgstr "" +"Automatisches Schließen von eckigen Klammern beim Tippen der öffnenden " +"Klammer" -#: ../src/interface.c:4097 +#: ../src/interface.c:4105 msgid "Double quotes \" \"" msgstr "Doppelte Anführungs-/Schlusszeichen" -#: ../src/interface.c:4102 +#: ../src/interface.c:4110 msgid "Auto-close double quote when typing an opening one" -msgstr "Automatisches Setzen der schließenden Anführungsstriche beim Tippen der öffnenden" +msgstr "" +"Automatisches Setzen der schließenden Anführungsstriche beim Tippen der " +"öffnenden" -#: ../src/interface.c:4104 +#: ../src/interface.c:4112 msgid "Auto-close quotes and brackets" msgstr "Automatisches Schließen von Klammern und Anführungszeichen" -#: ../src/interface.c:4109 +#: ../src/interface.c:4117 msgid "Completions" msgstr "Vervollständigungen" -#: ../src/interface.c:4132 +#: ../src/interface.c:4140 msgid "Invert syntax highlighting colors" msgstr "Invertiere Syntaxhervorhebungen" -#: ../src/interface.c:4135 +#: ../src/interface.c:4143 msgid "Invert all colors, by default using white text on a black background" -msgstr "Vertauscht die Farben für die Anzeige. Im Standard wird weißer Text auf einem schwarzen Hintergrund genutzt." +msgstr "" +"Vertauscht die Farben für die Anzeige. Im Standard wird weißer Text auf " +"einem schwarzen Hintergrund genutzt." -#: ../src/interface.c:4137 +#: ../src/interface.c:4145 msgid "Show indentation guides" msgstr "Zeige Einrückungshinweise" -#: ../src/interface.c:4140 +#: ../src/interface.c:4148 msgid "Shows small dotted lines to help you to use the right indentation" -msgstr "Blendet gepunktete Linien ein, um die richtige Einrückung zu erleichtern" +msgstr "" +"Blendet gepunktete Linien ein, um die richtige Einrückung zu erleichtern" -#: ../src/interface.c:4142 +#: ../src/interface.c:4150 msgid "Show white space" msgstr "Zeige Leerzeichen" -#: ../src/interface.c:4145 +#: ../src/interface.c:4153 msgid "Marks spaces with dots and tabs with arrows" msgstr "Markiert Leerzeichen mit Punkten und Tabulatoren mit kleinen Pfeilen" -#: ../src/interface.c:4147 +#: ../src/interface.c:4155 msgid "Show line endings" msgstr "Zeige Zeilenenden" -#: ../src/interface.c:4150 +#: ../src/interface.c:4158 msgid "Shows the line ending character" msgstr "Macht Zeilenenden mit einem Sonderzeichen sichtbar" -#: ../src/interface.c:4152 +#: ../src/interface.c:4160 msgid "Show line numbers" msgstr "Zeilennummern anzeigen" -#: ../src/interface.c:4155 +#: ../src/interface.c:4163 msgid "Shows or hides the Line Number margin" msgstr "Zeigt oder versteckt den Rand mit den Zeilennummern" -#: ../src/interface.c:4157 +#: ../src/interface.c:4165 msgid "Show markers margin" msgstr "Markierungsrand anzeigen" -#: ../src/interface.c:4160 -msgid "Shows or hides the small margin right of the line numbers, which is used to mark lines" -msgstr "Zeigt oder versteckt den kleinen Rand rechts von den Zeilennummern, welcher zum Anzeigen von Markierungen genutzt wird" +#: ../src/interface.c:4168 +msgid "" +"Shows or hides the small margin right of the line numbers, which is used to " +"mark lines" +msgstr "" +"Zeigt oder versteckt den kleinen Rand rechts von den Zeilennummern, welcher " +"zum Anzeigen von Markierungen genutzt wird" -#: ../src/interface.c:4162 +#: ../src/interface.c:4170 msgid "Stop scrolling at last line" msgstr "Am Ende des Dokuments nicht mehr weiter rollen" -#: ../src/interface.c:4165 +#: ../src/interface.c:4173 msgid "Whether to stop scrolling one page past the last line of a document" -msgstr "Legt fest, ob am Ende des Dokuments noch eine Seite weiter nach unten gerollt werden kann oder nicht" +msgstr "" +"Legt fest, ob am Ende des Dokuments noch eine Seite weiter nach unten " +"gerollt werden kann oder nicht" -#: ../src/interface.c:4167 +#: ../src/interface.c:4175 msgid "Display" msgstr "Anzeige" -#: ../src/interface.c:4188 -#: ../src/interface.c:5592 +#: ../src/interface.c:4196 ../src/interface.c:5609 msgid "Column:" msgstr "Spalte:" -#: ../src/interface.c:4195 +#: ../src/interface.c:4203 msgid "Color:" msgstr "Farbe:" -#: ../src/interface.c:4214 +#: ../src/interface.c:4222 msgid "Sets the color of the long line marker" msgstr "Stellt die Farbe der »Umbruchhilfe für lange Zeilen« ein" -#: ../src/interface.c:4215 -#: ../src/toolbar.c:72 -#: ../src/tools.c:722 -#: ../src/vte.c:785 -#: ../src/vte.c:792 +#: ../src/interface.c:4223 ../src/toolbar.c:72 ../src/tools.c:724 +#: ../src/vte.c:794 ../src/vte.c:801 msgid "Color Chooser" msgstr "Farbwähler" -#: ../src/interface.c:4223 -msgid "The long line marker is a thin vertical line in the editor, it helps to mark long lines, or as a hint to break the line. Set this value to a value greater than 0 to specify the column where it should appear." -msgstr "Die Umbruchhilfe für lange Zeilen ist eine dünne vertikale Linie im Editor. Sie hilft dabei, lange Zeilen zu finden und weist dabei auf einen eventuell notwendigen Zeilenumbruch hin. Werte größer als 0 geben die Spalte an, in der die Linie angezeigt werden soll." +#: ../src/interface.c:4231 +msgid "" +"The long line marker is a thin vertical line in the editor, it helps to mark " +"long lines, or as a hint to break the line. Set this value to a value " +"greater than 0 to specify the column where it should appear." +msgstr "" +"Die Umbruchhilfe für lange Zeilen ist eine dünne vertikale Linie im Editor. " +"Sie hilft dabei, lange Zeilen zu finden und weist dabei auf einen eventuell " +"notwendigen Zeilenumbruch hin. Werte größer als 0 geben die Spalte an, in " +"der die Linie angezeigt werden soll." -#: ../src/interface.c:4233 +#: ../src/interface.c:4241 msgid "Line" msgstr "Linie" -#: ../src/interface.c:4236 -msgid "Prints a vertical line in the editor window at the given cursor position (see below)" -msgstr "Zeichnet eine vertikale Linie im Editor an der angegebenen Cursor-Position (nur sinnvoll mit dicktengleichen Schriften)" +#: ../src/interface.c:4244 +msgid "" +"Prints a vertical line in the editor window at the given cursor position " +"(see below)" +msgstr "" +"Zeichnet eine vertikale Linie im Editor an der angegebenen Cursor-Position " +"(nur sinnvoll mit dicktengleichen Schriften)" -#: ../src/interface.c:4240 +#: ../src/interface.c:4248 msgid "Background" msgstr "Hintergrund" -#: ../src/interface.c:4243 -msgid "The background color of characters after the given cursor position (see below) changed to the color set below, (this is recommended if you use proportional fonts)" -msgstr "Die Hintergrundfarbe der Zeichen, die hinter der angegebenen Cursor-Position (siehe unten) stehen, wird auf die unten angegebene Farbe geändert (nützlich für proportionale Schriftarten)" +#: ../src/interface.c:4251 +msgid "" +"The background color of characters after the given cursor position (see " +"below) changed to the color set below, (this is recommended if you use " +"proportional fonts)" +msgstr "" +"Die Hintergrundfarbe der Zeichen, die hinter der angegebenen Cursor-Position " +"(siehe unten) stehen, wird auf die unten angegebene Farbe geändert (nützlich " +"für proportionale Schriftarten)" -#: ../src/interface.c:4247 +#: ../src/interface.c:4255 msgid "Enabled" msgstr "Aktiviert" -#: ../src/interface.c:4253 -#: ../src/interface.c:5632 +#: ../src/interface.c:4261 ../src/interface.c:5649 msgid "Long line marker" msgstr "Umbruchhilfe für lange Zeilen" -#: ../src/interface.c:4272 -#: ../src/interface.c:5599 +#: ../src/interface.c:4280 ../src/interface.c:5616 msgid "Disabled" msgstr "Deaktiviert" -#: ../src/interface.c:4275 +#: ../src/interface.c:4283 msgid "Do not show virtual spaces" msgstr "Keine virtuellen Leerzeichen anzeigen" -#: ../src/interface.c:4279 +#: ../src/interface.c:4287 msgid "Only for rectangular selections" msgstr "Nur für rechteckige Auswahl" -#: ../src/interface.c:4282 -msgid "Only show virtual spaces beyond the end of lines when drawing a rectangular selection" -msgstr "Virtuelle Leerzeichen nur in Zeilen anzeigen, in denen gerade eine rechteckige Auswahl statt findet." +#: ../src/interface.c:4290 +msgid "" +"Only show virtual spaces beyond the end of lines when drawing a rectangular " +"selection" +msgstr "" +"Virtuelle Leerzeichen nur in Zeilen anzeigen, in denen gerade eine " +"rechteckige Auswahl statt findet." -#: ../src/interface.c:4286 +#: ../src/interface.c:4294 msgid "Always" msgstr "Immer" -#: ../src/interface.c:4289 +#: ../src/interface.c:4297 msgid "Always show virtual spaces beyond the end of lines" msgstr "Immer virtuelle Leerzeichen am Ende der Zeilen anzeigen" -#: ../src/interface.c:4293 +#: ../src/interface.c:4301 msgid "Virtual spaces" msgstr "Virtuelle Leerzeichen" -#: ../src/interface.c:4298 +#: ../src/interface.c:4306 msgid "Display" msgstr "Ansicht" -#: ../src/interface.c:4329 +#: ../src/interface.c:4337 msgid "Open new documents from the command-line" msgstr "Öffne neue Dokumente von der Kommandozeile" -#: ../src/interface.c:4332 +#: ../src/interface.c:4340 msgid "Start a new file for each command-line filename that doesn't exist" -msgstr "Öffnet eine neue Datei für jeden Dateinamen, der auf der Kommandozeile angegeben wurde aber nicht geöffnet werden konnte" +msgstr "" +"Öffnet eine neue Datei für jeden Dateinamen, der auf der Kommandozeile " +"angegeben wurde aber nicht geöffnet werden konnte" -#: ../src/interface.c:4346 +#: ../src/interface.c:4354 msgid "Default end of line characters:" msgstr "Zeichen für das Standardzeilenende:" -#: ../src/interface.c:4353 +#: ../src/interface.c:4361 msgid "New files" msgstr "Neue Dateien" -#: ../src/interface.c:4376 +#: ../src/interface.c:4384 msgid "Default encoding (new files):" msgstr "Standardzeichenkodierung (neue Dateien):" -#: ../src/interface.c:4384 +#: ../src/interface.c:4392 msgid "Sets the default encoding for newly created files" msgstr "Setzt die Zeichenkodierung für neu erstellte Dateien" -#: ../src/interface.c:4390 +#: ../src/interface.c:4398 msgid "Use fixed encoding when opening non-Unicode files" -msgstr "Benutze feststehende Zeichenkodierung beim Öffnen neuer, nicht Unicode-Dateien" +msgstr "" +"Benutze feststehende Zeichenkodierung beim Öffnen neuer, nicht Unicode-" +"Dateien" -#: ../src/interface.c:4393 -msgid "This option disables the automatic detection of the file encoding when opening non-Unicode files and opens the file with the specified encoding (usually not needed)" -msgstr "Diese Option deaktiviert die automatische Erkennung der Zeichenkodierung und öffnet die ausgewählten nicht Unicode-Dateien mit der angegebenen Kodierung. (Wird nur in Ausnahmen benötigt)" +#: ../src/interface.c:4401 +msgid "" +"This option disables the automatic detection of the file encoding when " +"opening non-Unicode files and opens the file with the specified encoding " +"(usually not needed)" +msgstr "" +"Diese Option deaktiviert die automatische Erkennung der Zeichenkodierung und " +"öffnet die ausgewählten nicht Unicode-Dateien mit der angegebenen Kodierung. " +"(Wird nur in Ausnahmen benötigt)" -#: ../src/interface.c:4399 +#: ../src/interface.c:4407 msgid "Default encoding (existing non-Unicode files):" msgstr "Standardzeichenkodierung (nicht Unicode-Dateien):" -#: ../src/interface.c:4407 +#: ../src/interface.c:4415 msgid "Sets the default encoding for opening existing non-Unicode files" -msgstr "Setzt die Standardzeichenkodierung für zu öffnende Dateien, wenn kein Unicode (z.B. UTF-8) zur Anwendung kommt" +msgstr "" +"Setzt die Standardzeichenkodierung für zu öffnende Dateien, wenn kein " +"Unicode (z.B. UTF-8) zur Anwendung kommt" -#: ../src/interface.c:4413 +#: ../src/interface.c:4421 msgid "Encodings" msgstr "Zeichenkodierungen:" -#: ../src/interface.c:4432 +#: ../src/interface.c:4440 msgid "Ensure new line at file end" msgstr "Neue Zeile am Dateiende" -#: ../src/interface.c:4435 +#: ../src/interface.c:4443 msgid "Ensures that at the end of the file is a new line" msgstr "Fügt am Dateiende eine neue Zeile an, falls keine vorhanden ist" -#: ../src/interface.c:4437 +#: ../src/interface.c:4445 msgid "Ensure consistent line endings" msgstr "Konsistente Zeilenenden sicherstellen" -#: ../src/interface.c:4440 -msgid "Ensures that newline characters always get converted before saving, avoiding mixed line endings in the same file" -msgstr "Stellt sicher, dass die Zeilenumbrüche vor dem Speichern immer umgewandelt werden um gemischte Zeilenende zu vermeiden." +#: ../src/interface.c:4448 +msgid "" +"Ensures that newline characters always get converted before saving, avoiding " +"mixed line endings in the same file" +msgstr "" +"Stellt sicher, dass die Zeilenumbrüche vor dem Speichern immer umgewandelt " +"werden um gemischte Zeilenende zu vermeiden." -#: ../src/interface.c:4442 +#: ../src/interface.c:4450 msgid "Strip trailing spaces and tabs" msgstr "Leerzeichen und Tabulatoren am Zeilenende entfernen" -#: ../src/interface.c:4445 +#: ../src/interface.c:4453 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Entfernt Leerzeichen und Tabulatoren am Ende einer Zeile" -#: ../src/interface.c:4447 -#: ../src/keybindings.c:519 +#: ../src/interface.c:4455 ../src/keybindings.c:519 msgid "Replace tabs by space" msgstr "Tabulatoren durch Leerzeichen ersetzen" -#: ../src/interface.c:4450 +#: ../src/interface.c:4458 msgid "Replaces all tabs in document by spaces" msgstr "Ersetzt alle Tabulatoren im Dokument durch Leerzeichen" -#: ../src/interface.c:4452 +#: ../src/interface.c:4460 msgid "Saving files" msgstr "Speichern" -#: ../src/interface.c:4477 +#: ../src/interface.c:4485 msgid "Recent files list length:" msgstr "Anzahl der »Zuletzt geöffneten Dateien«" -#: ../src/interface.c:4491 +#: ../src/interface.c:4499 msgid "Specifies the number of files which are stored in the Recent files list" msgstr "Gibt die Länge der Liste der zuletzt geöffneten Dateien an" -#: ../src/interface.c:4495 +#: ../src/interface.c:4503 msgid "Disk check timeout:" msgstr "Zeitinterval zum Prüfen auf Dateiänderungen:" -#: ../src/interface.c:4508 -msgid "How often to check for changes to document files on disk, in seconds. Zero disables checking." -msgstr "Wie oft soll auf Veränderungen geprüft werden? Angabe in Sekunden. 0 deaktiviert die Funktion." +#: ../src/interface.c:4516 +msgid "" +"How often to check for changes to document files on disk, in seconds. Zero " +"disables checking." +msgstr "" +"Wie oft soll auf Veränderungen geprüft werden? Angabe in Sekunden. 0 " +"deaktiviert die Funktion." -#: ../src/interface.c:4517 -#: ../src/prefs.c:1559 -#: ../src/symbols.c:682 -#: ../plugins/filebrowser.c:1126 +#: ../src/interface.c:4525 ../src/prefs.c:1559 ../src/symbols.c:682 +#: ../plugins/filebrowser.c:1133 msgid "Files" msgstr "Dateien" -#: ../src/interface.c:4550 +#: ../src/interface.c:4558 msgid "Terminal:" msgstr "Terminal:" -#: ../src/interface.c:4557 +#: ../src/interface.c:4565 msgid "Browser:" msgstr "Browser:" -#: ../src/interface.c:4569 -msgid "A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)" -msgstr "Eine Terminalemulation wie z.B. xterm, gnome-terminal oder konsole (sie sollte die Option -e akzeptieren)" +#: ../src/interface.c:4577 +msgid "" +"A terminal emulator like xterm, gnome-terminal or konsole (should accept the " +"-e argument)" +msgstr "" +"Eine Terminalemulation wie z.B. xterm, gnome-terminal oder konsole (sie " +"sollte die Option -e akzeptieren)" -#: ../src/interface.c:4576 +#: ../src/interface.c:4584 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Pfad und evtl. Argumente zum Starten eines Browsers" -#: ../src/interface.c:4598 +#: ../src/interface.c:4606 msgid "Grep:" msgstr "Grep:" -#: ../src/interface.c:4621 +#: ../src/interface.c:4629 msgid "Tool paths" msgstr "Pfade zu den Werkzeugen" -#: ../src/interface.c:4642 +#: ../src/interface.c:4650 msgid "Context action:" msgstr "Kontextaktion:" -#: ../src/interface.c:4653 +#: ../src/interface.c:4661 #, c-format -msgid "Context action command. The currently selected word can be used with %s. It can appear anywhere in the given command and will be replaced before execution." -msgstr "Der aktuell markierte Text kann mit %s angegeben werden. Es darf überall in der Kommandozeile vorkommen und wird vor dem Ausführen ersetzt." +msgid "" +"Context action command. The currently selected word can be used with %s. It " +"can appear anywhere in the given command and will be replaced before " +"execution." +msgstr "" +"Der aktuell markierte Text kann mit %s angegeben werden. Es darf überall in " +"der Kommandozeile vorkommen und wird vor dem Ausführen ersetzt." -#: ../src/interface.c:4666 +#: ../src/interface.c:4674 msgid "Commands" msgstr "Befehle" -#: ../src/interface.c:4671 -#: ../src/keybindings.c:557 -#: ../src/prefs.c:1561 +#: ../src/interface.c:4679 ../src/keybindings.c:557 ../src/prefs.c:1561 msgid "Tools" msgstr "Werkzeuge" -#: ../src/interface.c:4709 +#: ../src/interface.c:4717 msgid "email address of the developer" msgstr "E-Mailadresse des Entwicklers" -#: ../src/interface.c:4716 +#: ../src/interface.c:4724 msgid "Initials of the developer name" msgstr "Initialen des Entwicklernamens" -#: ../src/interface.c:4718 +#: ../src/interface.c:4726 msgid "Initial version:" msgstr "Anfangsversion:" -#: ../src/interface.c:4730 +#: ../src/interface.c:4738 msgid "Version number, which a new file initially has" msgstr "Versionsnummer, welche eine neue Datei zu Beginn hat" -#: ../src/interface.c:4737 +#: ../src/interface.c:4745 msgid "Company name" msgstr "Firmenname" -#: ../src/interface.c:4739 +#: ../src/interface.c:4747 msgid "Developer:" msgstr "Entwickler:" -#: ../src/interface.c:4746 +#: ../src/interface.c:4754 msgid "Company:" msgstr "Firma:" -#: ../src/interface.c:4753 +#: ../src/interface.c:4761 msgid "Mail address:" msgstr "E-Mail-Adresse:" -#: ../src/interface.c:4760 +#: ../src/interface.c:4768 msgid "Initials:" msgstr "Initialen:" -#: ../src/interface.c:4772 +#: ../src/interface.c:4780 msgid "The name of the developer" msgstr "Der Name des Entwicklers" -#: ../src/interface.c:4774 +#: ../src/interface.c:4782 msgid "Year:" msgstr "Jahr:" -#: ../src/interface.c:4781 +#: ../src/interface.c:4789 msgid "Date:" msgstr "Datum:" -#: ../src/interface.c:4788 -msgid "Date & Time:" -msgstr "Datum / Zeit:" +#: ../src/interface.c:4796 +msgid "Date & time:" +msgstr "Datum & Zeit:" -#: ../src/interface.c:4800 -msgid "Specify a format for the the {datetime} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function." -msgstr "Geben Sie ein Datumsformat für den Platzhalter {datetime} an. Dabei können alle Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« zum Einsatz kommen können." +#: ../src/interface.c:4808 +msgid "" +"Specify a format for the the {datetime} wildcard. You can use any conversion " +"specifiers which can be used with the ANSI C strftime function." +msgstr "" +"Geben Sie ein Datumsformat für den Platzhalter {datetime} an. Dabei können " +"alle Platzhalter verwendet werden, die auch in der ANSI C Funktion " +"»strftime« zum Einsatz kommen können." -#: ../src/interface.c:4807 -msgid "Specify a format for the the {year} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function." -msgstr "Geben Sie ein Datumsformat für den Platzhalter {year} an. Dabei können alle Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« zum Einsatz kommen können." +#: ../src/interface.c:4815 +msgid "" +"Specify a format for the the {year} wildcard. You can use any conversion " +"specifiers which can be used with the ANSI C strftime function." +msgstr "" +"Geben Sie ein Datumsformat für den Platzhalter {year} an. Dabei können alle " +"Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« zum " +"Einsatz kommen können." -#: ../src/interface.c:4814 -msgid "Specify a format for the the {date} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function." -msgstr "Geben Sie ein Datumsformat für den Platzhalter {date} an. Dabei können alle Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« zum Einsatz kommen können." +#: ../src/interface.c:4822 +msgid "" +"Specify a format for the the {date} wildcard. You can use any conversion " +"specifiers which can be used with the ANSI C strftime function." +msgstr "" +"Geben Sie ein Datumsformat für den Platzhalter {date} an. Dabei können alle " +"Platzhalter verwendet werden, die auch in der ANSI C Funktion »strftime« zum " +"Einsatz kommen können." @@ 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:[5634] trunk
by colombanw＠users.sourceforge.net 27 Mar '11

27 Mar '11

Revision: 5634 http://geany.svn.sourceforge.net/geany/?rev=5634&view=rev Author: colombanw Date: 2011-03-27 00:18:31 +0000 (Sun, 27 Mar 2011) Log Message: ----------- Don't unsplit when closing the document if we can show another one Modified Paths: -------------- trunk/ChangeLog trunk/plugins/splitwindow.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-27 00:18:18 UTC (rev 5633) +++ trunk/ChangeLog 2011-03-27 00:18:31 UTC (rev 5634) @@ -16,6 +16,8 @@ Brush, thanks! - closes #3097780). Fix confusing terminology in Split Window plugin menu labels (patch by Matthew Brush - closes #2796316). + Don't unsplit when closing the displayed document but rather pick the + new current one if any. 2011-03-25 Colomban Wendling <colomban(at)geany(dot)org> Modified: trunk/plugins/splitwindow.c =================================================================== --- trunk/plugins/splitwindow.c 2011-03-27 00:18:18 UTC (rev 5633) +++ trunk/plugins/splitwindow.c 2011-03-27 00:18:31 UTC (rev 5634) @@ -438,11 +438,31 @@ } +static gboolean do_select_current(gpointer data) +{ + GeanyDocument *doc; + + /* guard out for the unlikely case we get called after another unsplitting */ + if (plugin_state == STATE_UNSPLIT) + return FALSE; + + doc = document_get_current(); + if (DOC_VALID(doc)) + set_editor(&edit_window, doc->editor); + else + on_unsplit(NULL, NULL); + + return FALSE; +} + + static void on_document_close(GObject *obj, GeanyDocument *doc, gpointer user_data) { - /* remove the split window because the document won't exist anymore */ if (doc->editor == edit_window.editor) - on_unsplit(NULL, NULL); + { + /* select current or unsplit in IDLE time, so the tab has changed */ + g_idle_add(do_select_current, NULL); + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5633] trunk
by colombanw＠users.sourceforge.net 27 Mar '11

27 Mar '11

Revision: 5633 http://geany.svn.sourceforge.net/geany/?rev=5633&view=rev Author: colombanw Date: 2011-03-27 00:18:18 +0000 (Sun, 27 Mar 2011) Log Message: ----------- Fix confusing terminology in Split Window plugin menu labels Patch by Matthew Brush, thanks. Closes #2796316. Modified Paths: -------------- trunk/ChangeLog trunk/plugins/splitwindow.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-27 00:18:05 UTC (rev 5632) +++ trunk/ChangeLog 2011-03-27 00:18:18 UTC (rev 5633) @@ -14,6 +14,8 @@ * plugins/splitwindow.c: Enable code folding in splitview window (based on a patch by Matthew Brush, thanks! - closes #3097780). + Fix confusing terminology in Split Window plugin menu labels (patch + by Matthew Brush - closes #2796316). 2011-03-25 Colomban Wendling <colomban(at)geany(dot)org> Modified: trunk/plugins/splitwindow.c =================================================================== --- trunk/plugins/splitwindow.c 2011-03-27 00:18:05 UTC (rev 5632) +++ trunk/plugins/splitwindow.c 2011-03-27 00:18:18 UTC (rev 5633) @@ -409,12 +409,12 @@ gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_items.main), menu); menu_items.horizontal = item = - gtk_menu_item_new_with_mnemonic(_("_Horizontally")); + gtk_menu_item_new_with_mnemonic(_("_Side by Side")); g_signal_connect(item, "activate", G_CALLBACK(on_split_horizontally), NULL); gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); menu_items.vertical = item = - gtk_menu_item_new_with_mnemonic(_("_Vertically")); + gtk_menu_item_new_with_mnemonic(_("_Top and Bottom")); g_signal_connect(item, "activate", G_CALLBACK(on_split_vertically), NULL); gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5632] trunk
by colombanw＠users.sourceforge.net 27 Mar '11

27 Mar '11

Revision: 5632 http://geany.svn.sourceforge.net/geany/?rev=5632&view=rev Author: colombanw Date: 2011-03-27 00:18:05 +0000 (Sun, 27 Mar 2011) Log Message: ----------- Enable code folding in splitview window (closes #3097780) Based on a patch by Matthew Brush, thanks! Modified Paths: -------------- trunk/ChangeLog trunk/plugins/splitwindow.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-26 17:25:24 UTC (rev 5631) +++ trunk/ChangeLog 2011-03-27 00:18:05 UTC (rev 5632) @@ -11,6 +11,9 @@ src/project.c: Add possibility to detect the indentation width from the file content (not supported if indentation type is tabs only). + * plugins/splitwindow.c: + Enable code folding in splitview window (based on a patch by Matthew + Brush, thanks! - closes #3097780). 2011-03-25 Colomban Wendling <colomban(at)geany(dot)org> Modified: trunk/plugins/splitwindow.c =================================================================== --- trunk/plugins/splitwindow.c 2011-03-26 17:25:24 UTC (rev 5631) +++ trunk/plugins/splitwindow.c 2011-03-27 00:18:05 UTC (rev 5632) @@ -73,10 +73,11 @@ ScintillaObject *sci; /* new editor widget */ GtkWidget *vbox; GtkWidget *name_label; + gint handler_id; } EditWindow; -static EditWindow edit_window = {NULL, NULL, NULL, NULL}; +static EditWindow edit_window = {NULL, NULL, NULL, NULL, 0 }; static void on_unsplit(GtkMenuItem *menuitem, gpointer user_data); @@ -103,6 +104,25 @@ } +static void on_sci_notify (ScintillaObject *sci, gint param, SCNotification *notif, gpointer data) +{ + gint line; + + switch (notif->nmhdr.code) + { + case SCN_MARGINCLICK: + if (notif->margin == 2) + { + line = sci_get_line_from_position(sci, notif->position); + scintilla_send_message(sci, SCI_TOGGLEFOLD, line, 0); + } + break; + + default: break; + } +} + + static void sync_to_current(ScintillaObject *sci, ScintillaObject *current) { gpointer sdoc; @@ -119,7 +139,6 @@ /* override some defaults */ set_line_numbers(sci, geany->editor_prefs->show_linenumber_margin); scintilla_send_message(sci, SCI_SETMARGINWIDTHN, 1, 0 ); /* hide marker margin (no commands) */ - scintilla_send_message(sci, SCI_SETMARGINWIDTHN, 2, 0 ); /* hide fold margin (no toggle callback) */ } @@ -127,6 +146,12 @@ { editwin->editor = editor; + if (editwin->handler_id > 0 && editwin->sci != NULL) + { + g_signal_handler_disconnect(editwin->sci, editwin->handler_id); + editwin->handler_id = 0; + } + /* first destroy any widget, otherwise its signals will have an * invalid document as user_data */ if (editwin->sci != NULL) @@ -138,6 +163,12 @@ sync_to_current(editwin->sci, editor->sci); + if (geany->editor_prefs->folding) + editwin->handler_id = g_signal_connect(editwin->sci, "sci-notify", + G_CALLBACK(on_sci_notify), NULL); + else + scintilla_send_message(editwin->sci, SCI_SETMARGINWIDTHN, 2, 0); + gtk_label_set_text(GTK_LABEL(editwin->name_label), DOC_FILENAME(editor->document)); } @@ -332,6 +363,12 @@ gtk_widget_reparent(notebook, ui_lookup_widget(geany->main_widgets->window, "vbox1")); + if (edit_window.sci != NULL && edit_window.handler_id > 0) + { + g_signal_handler_disconnect(edit_window.sci, edit_window.handler_id); + edit_window.handler_id = 0; + } + gtk_widget_destroy(pane); edit_window.editor = NULL; edit_window.sci = NULL; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5631] trunk
by colombanw＠users.sourceforge.net 26 Mar '11

26 Mar '11

Revision: 5631 http://geany.svn.sourceforge.net/geany/?rev=5631&view=rev Author: colombanw Date: 2011-03-26 17:25:24 +0000 (Sat, 26 Mar 2011) Log Message: ----------- Add possibility to detect the indentation width from the file content Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt trunk/geany.glade trunk/src/document.c trunk/src/editor.h trunk/src/interface.c trunk/src/interface.h trunk/src/keyfile.c trunk/src/project.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-26 03:12:50 UTC (rev 5630) +++ trunk/ChangeLog 2011-03-26 17:25:24 UTC (rev 5631) @@ -6,6 +6,11 @@ Also change the hack used for the selection to be updated in the input handlers to call the GtkTreeView's handler manually rather than doing the actual job in IDLE callbacks for the TreeView's handler to have run. + * doc/geany.html, doc/geany.txt, geany.glade, src/document.c, + src/editor.h, src/interface.c, src/interface.h, src/keyfile.c, + src/project.c: + Add possibility to detect the indentation width from the file content + (not supported if indentation type is tabs only). 2011-03-25 Colomban Wendling <colomban(at)geany(dot)org> Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2011-03-26 03:12:50 UTC (rev 5630) +++ trunk/doc/geany.html 2011-03-26 17:25:24 UTC (rev 5631) @@ -2338,6 +2338,12 @@ <h4><a class="toc-backref" href="#id105">Indentation group</a></h4> See <a class="reference internal" href="#indentation">Indentation</a> for more information. <dl class="docutils"> +<dt>Width</dt> +<dd>The width of a single indent size in spaces. By default the indent +size is equivalent to 4 spaces.</dd> +<dt>Detect width from file</dt> +<dd>Try to detect and set the indent width based on file content, when +a file is opened.</dd> <dt>Type</dt> <dd>When Geany inserts indentation, whether to use: <ul class="simple"> @@ -2348,10 +2354,7 @@ The Tabs and Spaces indent type is also known as Soft tab support in some other editors. </dd> -<dt>Width</dt> -<dd>The width of a single indent size in spaces. By default the indent -size is equivalent to 4 spaces.</dd> -<dt>Detect from file</dt> +<dt>Detect type from file</dt> <dd>Try to detect and set the indent type based on file content, when a file is opened.</dd> <dt>Auto-indent mode</dt> @@ -6484,7 +6487,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference external" href="geany.txt">View document source</a>. -Generated on: 2011-03-24 16:40 UTC. +Generated on: 2011-03-26 17:15 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: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2011-03-26 03:12:50 UTC (rev 5630) +++ trunk/doc/geany.txt 2011-03-26 17:25:24 UTC (rev 5631) @@ -1993,6 +1993,14 @@ See `Indentation`_ for more information. +Width + The width of a single indent size in spaces. By default the indent + size is equivalent to 4 spaces. + +Detect width from file + Try to detect and set the indent width based on file content, when + a file is opened. + Type When Geany inserts indentation, whether to use: @@ -2003,11 +2011,7 @@ The *Tabs and Spaces* indent type is also known as *Soft tab support* in some other editors. -Width - The width of a single indent size in spaces. By default the indent - size is equivalent to 4 spaces. - -Detect from file +Detect type from file Try to detect and set the indent type based on file content, when a file is opened. Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2011-03-26 03:12:50 UTC (rev 5630) +++ trunk/geany.glade 2011-03-26 17:25:24 UTC (rev 5631) @@ -6138,16 +6138,16 @@ <child> <widget class="GtkTable" id="table13"> <property name="visible">True</property> - <property name="n_rows">6</property> + <property name="n_rows">7</property> <property name="n_columns">2</property> <property name="homogeneous">False</property> <property name="row_spacing">3</property> <property name="column_spacing">24</property> <child> - <widget class="GtkLabel" id="label183"> + <widget class="GtkLabel" id="label222"> <property name="visible">True</property> - <property name="label" translatable="yes">Auto-indent mode:</property> + <property name="label" translatable="yes">Width:</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -6165,37 +6165,39 @@ <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkComboBox" id="combo_auto_indent_mode"> + <widget class="GtkSpinButton" id="spin_indent_width"> <property name="visible">True</property> - <property name="items" translatable="yes">None -Basic -Current chars -Match braces</property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> + <property name="tooltip" translatable="yes">The width in chars of a single indent</property> + <property name="can_focus">True</property> + <property name="climb_rate">1</property> + <property name="digits">0</property> + <property name="numeric">True</property> + <property name="update_policy">GTK_UPDATE_IF_VALID</property> + <property name="snap_to_ticks">False</property> + <property name="wrap">True</property> + <property name="adjustment">1 1 99 1 10 0</property> </widget> <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> - <property name="x_options">fill</property> - <property name="y_options">fill</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label200"> + <widget class="GtkLabel" id="label183"> <property name="visible">True</property> - <property name="label" translatable="yes">Type:</property> + <property name="label" translatable="yes">Auto-indent mode:</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -6213,69 +6215,62 @@ <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label222"> + <widget class="GtkComboBox" id="combo_auto_indent_mode"> <property name="visible">True</property> - <property name="label" translatable="yes">Width:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> + <property name="items" translatable="yes">None +Basic +Current chars +Match braces</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> </widget> <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="y_options">fill</property> </packing> </child> <child> - <widget class="GtkSpinButton" id="spin_indent_width"> + <widget class="GtkCheckButton" id="check_detect_indent_type"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">The width in chars of a single indent</property> + <property name="tooltip" translatable="yes">Whether to detect the indentation type from file contents when a file is opened</property> <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">True</property> - <property name="update_policy">GTK_UPDATE_IF_VALID</property> - <property name="snap_to_ticks">False</property> - <property name="wrap">True</property> - <property name="adjustment">1 1 99 1 10 0</property> + <property name="label" translatable="yes">Detect type from file</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkRadioButton" id="radio_indent_spaces"> + <widget class="GtkRadioButton" id="radio_indent_both"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Use spaces when inserting indentation</property> + <property name="tooltip" translatable="yes">Use spaces if the total indent is less than the tab width, otherwise use both</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Spaces</property> + <property name="label" translatable="yes">T_abs and spaces</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -6286,67 +6281,67 @@ <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> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkRadioButton" id="radio_indent_tabs"> + <widget class="GtkRadioButton" id="radio_indent_spaces"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Use one tab per indent</property> + <property name="tooltip" translatable="yes">Use spaces when inserting indentation</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Tabs</property> + <property name="label" translatable="yes">_Spaces</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> - <property name="group">radio_indent_spaces</property> + <property name="group">radio_indent_both</property> </widget> <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> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkRadioButton" id="radio_indent_both"> + <widget class="GtkRadioButton" id="radio_indent_tabs"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Use spaces if the total indent is less than the tab width, otherwise use both</property> + <property name="tooltip" translatable="yes">Use one tab per indent</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">T_abs and spaces</property> + <property name="label" translatable="yes">_Tabs</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> - <property name="group">radio_indent_spaces</property> + <property name="group">radio_indent_both</property> </widget> <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> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkCheckButton" id="check_detect_indent"> + <widget class="GtkCheckButton" id="check_detect_indent_width"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Whether to detect the indentation type from file contents when a file is opened</property> + <property name="tooltip" translatable="yes">Whether to detect the indentation width from file contents when a file is opened</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Detect from file</property> + <property name="label" translatable="yes">Detect width from file</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -6357,12 +6352,40 @@ <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> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> + + <child> + <widget class="GtkLabel" id="label200"> + <property name="visible">True</property> + <property name="label" translatable="yes">Type:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> @@ -10128,16 +10151,16 @@ <widget class="GtkTable" id="table17"> <property name="border_width">6</property> <property name="visible">True</property> - <property name="n_rows">6</property> + <property name="n_rows">7</property> <property name="n_columns">2</property> <property name="homogeneous">False</property> <property name="row_spacing">3</property> <property name="column_spacing">24</property> <child> - <widget class="GtkLabel" id="label228"> + <widget class="GtkLabel" id="label230"> <property name="visible">True</property> - <property name="label" translatable="yes">Auto-indent mode:</property> + <property name="label" translatable="yes">Width:</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -10155,37 +10178,39 @@ <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkComboBox" id="combo_auto_indent_mode"> + <widget class="GtkSpinButton" id="spin_indent_width"> <property name="visible">True</property> - <property name="items" translatable="yes">None -Basic -Current chars -Match braces</property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> + <property name="tooltip" translatable="yes">The width in chars of a single indent</property> + <property name="can_focus">True</property> + <property name="climb_rate">1</property> + <property name="digits">0</property> + <property name="numeric">True</property> + <property name="update_policy">GTK_UPDATE_IF_VALID</property> + <property name="snap_to_ticks">False</property> + <property name="wrap">True</property> + <property name="adjustment">1 1 99 1 10 0</property> </widget> <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> - <property name="x_options">fill</property> - <property name="y_options">fill</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label229"> + <widget class="GtkLabel" id="label228"> <property name="visible">True</property> - <property name="label" translatable="yes">Type:</property> + <property name="label" translatable="yes">Auto-indent mode:</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -10203,69 +10228,62 @@ <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label230"> + <widget class="GtkComboBox" id="combo_auto_indent_mode"> <property name="visible">True</property> - <property name="label" translatable="yes">Width:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> + <property name="items" translatable="yes">None +Basic +Current chars +Match braces</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> </widget> <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="y_options">fill</property> </packing> </child> <child> - <widget class="GtkSpinButton" id="spin_indent_width"> + <widget class="GtkCheckButton" id="check_detect_indent_type"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">The width in chars of a single indent</property> + <property name="tooltip" translatable="yes">Whether to detect the indentation type from file contents when a file is opened</property> <property name="can_focus">True</property> - <property name="climb_rate">1</property> - <property name="digits">0</property> - <property name="numeric">True</property> - <property name="update_policy">GTK_UPDATE_IF_VALID</property> - <property name="snap_to_ticks">False</property> - <property name="wrap">True</property> - <property name="adjustment">1 1 99 1 10 0</property> + <property name="label" translatable="yes">Detect type from file</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkRadioButton" id="radio_indent_spaces"> + <widget class="GtkRadioButton" id="radio_indent_both"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Use spaces when inserting indentation</property> + <property name="tooltip" translatable="yes">Use spaces if the total indent is less than the tab width, otherwise use both</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Spaces</property> + <property name="label" translatable="yes">T_abs and spaces</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -10276,67 +10294,95 @@ <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> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkRadioButton" id="radio_indent_tabs"> + <widget class="GtkRadioButton" id="radio_indent_spaces"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Use one tab per indent</property> + <property name="tooltip" translatable="yes">Use spaces when inserting indentation</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Tabs</property> + <property name="label" translatable="yes">_Spaces</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> - <property name="group">radio_indent_spaces</property> + <property name="group">radio_indent_both</property> </widget> <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> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkRadioButton" id="radio_indent_both"> + <widget class="GtkRadioButton" id="radio_indent_tabs"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Use spaces if the total indent is less than the tab width, otherwise use both</property> + <property name="tooltip" translatable="yes">Use one tab per indent</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">T_abs and spaces</property> + <property name="label" translatable="yes">_Tabs</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> - <property name="group">radio_indent_spaces</property> + <property name="group">radio_indent_both</property> </widget> <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> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkCheckButton" id="check_detect_indent"> + <widget class="GtkLabel" id="label229"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Whether to detect the indentation type from file contents when a file is opened</property> + <property name="label" translatable="yes">Type:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="check_detect_indent_width"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Whether to detect the indentation width from file contents when a file is opened</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Detect from file</property> + <property name="label" translatable="yes">Detect width from file</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -10347,8 +10393,8 @@ <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> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> @@ -10637,4 +10683,17 @@ </child> </widget> +<widget class="GtkCheckButton" id="checkbutton3"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Whether to detect the indentation type from file contents when a file is opened</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Detect from file</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> +</widget> + </glade-interface> Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2011-03-26 03:12:50 UTC (rev 5630) +++ trunk/src/document.c 2011-03-26 17:25:24 UTC (rev 5631) @@ -997,22 +997,72 @@ } -static gboolean apply_forced_indent_settings(GeanyDocument *doc) +/* Detect the indent width based on counting the leading indent characters for each line. */ +static gint detect_indent_width(GeanyEditor *editor, GeanyIndentType type) { - const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(NULL); + const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(editor); + ScintillaObject *sci = editor->sci; + guint line, line_count; + gint widths[7] = { 0 }; /* width can be from 2 to 8 */ + gint count, width, i; + /* can't easily detect the supposed width of a tab, guess the default is OK */ + if (type == GEANY_INDENT_TYPE_TABS) + return iprefs->width; + + /* force 8 at detection time for tab & spaces -- anyway we don't use tabs at this point */ + sci_set_tab_width(sci, 8); + + line_count = sci_get_line_count(sci); + for (line = 0; line < line_count; line++) + { + width = sci_get_line_indentation(sci, line); + /* most code will have indent total <= 24, otherwise it's more likely to be + * alignment than indentation */ + if (width > 24) + continue; + /* < 2 is no indentation */ + if (width < 2) + continue; + + for (i = G_N_ELEMENTS(widths) - 1; i >= 0; i--) + { + if ((width % (i + 2)) == 0) + { + widths[i]++; + break; + } + } + } + count = 0; + width = iprefs->width; + for (i = 0; i < G_N_ELEMENTS(widths); i++) + { + /* give small lengths higher weight not for nested blocks to confuse detection */ + if (widths[i] > count * 4) + { + width = i + 2; + count = widths[i]; + } + } + + return width; +} + + +/* returns the forced indent type or -1 if none is forced */ +static gint get_forced_indent_type(GeanyDocument *doc) +{ switch (doc->file_type->id) { case GEANY_FILETYPES_MAKE: /* force using tabs for indentation for Makefiles */ - editor_set_indent(doc->editor, GEANY_INDENT_TYPE_TABS, iprefs->width); - return TRUE; + return GEANY_INDENT_TYPE_TABS; case GEANY_FILETYPES_F77: /* force using spaces for indentation for Fortran 77 */ - editor_set_indent(doc->editor, GEANY_INDENT_TYPE_SPACES, iprefs->width); - return TRUE; + return GEANY_INDENT_TYPE_SPACES; default: - return FALSE; + return -1; } } @@ -1020,11 +1070,13 @@ void document_apply_indent_settings(GeanyDocument *doc) { const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(NULL); - GeanyIndentType type = iprefs->type; + gint type; + gint width = iprefs->width; - if (apply_forced_indent_settings(doc)) - return; - if (iprefs->detect_type) + type = get_forced_indent_type(doc); + if (type < 0 && ! iprefs->detect_type) + type = iprefs->type; + else if (type < 0) { type = detect_indent_type(doc->editor); @@ -1050,7 +1102,17 @@ DOC_FILENAME(doc)); } } - editor_set_indent(doc->editor, type, iprefs->width); + if (iprefs->detect_width) + { + width = detect_indent_width(doc->editor, type); + + if (width != iprefs->width) + { + ui_set_statusbar(TRUE, _("Setting indentation width to %d for %s."), width, + DOC_FILENAME(doc)); + } + } + editor_set_indent(doc->editor, type, width); } @@ -2417,8 +2479,13 @@ if (ft_changed) { - if (apply_forced_indent_settings(doc)) /* update forced indents, like Makefiles and F77 */ + gint forced_indent_type = get_forced_indent_type(doc); + + if (forced_indent_type >= 0) + { /* update forced indents, like Makefiles and F77 */ + editor_set_indent_type(doc->editor, forced_indent_type); ui_document_show_hide(doc); + } sidebar_openfiles_update(doc); /* to update the icon */ g_signal_emit_by_name(geany_object, "document-filetype-set", doc, old_ft); } Modified: trunk/src/editor.h =================================================================== --- trunk/src/editor.h 2011-03-26 03:12:50 UTC (rev 5630) +++ trunk/src/editor.h 2011-03-26 17:25:24 UTC (rev 5631) @@ -96,6 +96,7 @@ gint hard_tab_width; GeanyAutoIndent auto_indent_mode; gboolean detect_type; + gboolean detect_width; } GeanyIndentPrefs; Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2011-03-26 03:12:50 UTC (rev 5630) +++ trunk/src/interface.c 2011-03-26 17:25:24 UTC (rev 5631) @@ -2676,17 +2676,18 @@ GtkWidget *alignment30; GtkWidget *vbox25; GtkWidget *table13; - GtkWidget *label183; - GtkWidget *combo_auto_indent_mode; - GtkWidget *label200; GtkWidget *label222; GtkObject *spin_indent_width_adj; GtkWidget *spin_indent_width; + GtkWidget *label183; + GtkWidget *combo_auto_indent_mode; + GtkWidget *check_detect_indent_type; + GtkWidget *radio_indent_both; + GSList *radio_indent_both_group = NULL; GtkWidget *radio_indent_spaces; - GSList *radio_indent_spaces_group = NULL; GtkWidget *radio_indent_tabs; - GtkWidget *radio_indent_both; - GtkWidget *check_detect_indent; + GtkWidget *check_detect_indent_width; + GtkWidget *label200; GtkWidget *check_tab_key_indents; GtkWidget *label195; GtkWidget *label232; @@ -3834,22 +3835,40 @@ gtk_widget_show (vbox25); gtk_container_add (GTK_CONTAINER (alignment30), vbox25); - table13 = gtk_table_new (6, 2, FALSE); + table13 = gtk_table_new (7, 2, FALSE); gtk_widget_show (table13); gtk_box_pack_start (GTK_BOX (vbox25), table13, FALSE, TRUE, 0); gtk_table_set_row_spacings (GTK_TABLE (table13), 3); gtk_table_set_col_spacings (GTK_TABLE (table13), 24); + label222 = gtk_label_new (_("Width:")); + gtk_widget_show (label222); + gtk_table_attach (GTK_TABLE (table13), label222, 0, 1, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment (GTK_MISC (label222), 0, 0.5); + + spin_indent_width_adj = gtk_adjustment_new (1, 1, 99, 1, 10, 0); + spin_indent_width = gtk_spin_button_new (GTK_ADJUSTMENT (spin_indent_width_adj), 1, 0); + gtk_widget_show (spin_indent_width); + gtk_table_attach (GTK_TABLE (table13), spin_indent_width, 1, 2, 0, 1, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip (tooltips, spin_indent_width, _("The width in chars of a single indent"), NULL); + gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_indent_width), TRUE); + gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (spin_indent_width), GTK_UPDATE_IF_VALID); + gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spin_indent_width), TRUE); + label183 = gtk_label_new (_("Auto-indent mode:")); gtk_widget_show (label183); - gtk_table_attach (GTK_TABLE (table13), label183, 0, 1, 5, 6, + gtk_table_attach (GTK_TABLE (table13), label183, 0, 1, 6, 7, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label183), 0, 0.5); combo_auto_indent_mode = gtk_combo_box_new_text (); gtk_widget_show (combo_auto_indent_mode); - gtk_table_attach (GTK_TABLE (table13), combo_auto_indent_mode, 1, 2, 5, 6, + gtk_table_attach (GTK_TABLE (table13), combo_auto_indent_mode, 1, 2, 6, 7, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); gtk_combo_box_append_text (GTK_COMBO_BOX (combo_auto_indent_mode), _("None")); @@ -3857,64 +3876,53 @@ gtk_combo_box_append_text (GTK_COMBO_BOX (combo_auto_indent_mode), _("Current chars")); gtk_combo_box_append_text (GTK_COMBO_BOX (combo_auto_indent_mode), _("Match braces")); - label200 = gtk_label_new (_("Type:")); - gtk_widget_show (label200); - gtk_table_attach (GTK_TABLE (table13), label200, 0, 1, 1, 2, + check_detect_indent_type = gtk_check_button_new_with_mnemonic (_("Detect type from file")); + gtk_widget_show (check_detect_indent_type); + gtk_table_attach (GTK_TABLE (table13), check_detect_indent_type, 1, 2, 5, 6, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment (GTK_MISC (label200), 0, 0.5); + gtk_tooltips_set_tip (tooltips, check_detect_indent_type, _("Whether to detect the indentation type from file contents when a file is opened"), NULL); - label222 = gtk_label_new (_("Width:")); - gtk_widget_show (label222); - gtk_table_attach (GTK_TABLE (table13), label222, 0, 1, 0, 1, + radio_indent_both = gtk_radio_button_new_with_mnemonic (NULL, _("T_abs and spaces")); + gtk_widget_show (radio_indent_both); + gtk_table_attach (GTK_TABLE (table13), radio_indent_both, 1, 2, 4, 5, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment (GTK_MISC (label222), 0, 0.5); + gtk_tooltips_set_tip (tooltips, radio_indent_both, _("Use spaces if the total indent is less than the tab width, otherwise use both"), NULL); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_indent_both), radio_indent_both_group); + radio_indent_both_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_indent_both)); - spin_indent_width_adj = gtk_adjustment_new (1, 1, 99, 1, 10, 0); - spin_indent_width = gtk_spin_button_new (GTK_ADJUSTMENT (spin_indent_width_adj), 1, 0); - gtk_widget_show (spin_indent_width); - gtk_table_attach (GTK_TABLE (table13), spin_indent_width, 1, 2, 0, 1, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip (tooltips, spin_indent_width, _("The width in chars of a single indent"), NULL); - gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_indent_width), TRUE); - gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (spin_indent_width), GTK_UPDATE_IF_VALID); - gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spin_indent_width), TRUE); - radio_indent_spaces = gtk_radio_button_new_with_mnemonic (NULL, _("_Spaces")); gtk_widget_show (radio_indent_spaces); - gtk_table_attach (GTK_TABLE (table13), radio_indent_spaces, 1, 2, 2, 3, + gtk_table_attach (GTK_TABLE (table13), radio_indent_spaces, 1, 2, 3, 4, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_tooltips_set_tip (tooltips, radio_indent_spaces, _("Use spaces when inserting indentation"), NULL); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_indent_spaces), radio_indent_spaces_group); - radio_indent_spaces_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_indent_spaces)); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_indent_spaces), radio_indent_both_group); + radio_indent_both_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_indent_spaces)); radio_indent_tabs = gtk_radio_button_new_with_mnemonic (NULL, _("_Tabs")); gtk_widget_show (radio_indent_tabs); - gtk_table_attach (GTK_TABLE (table13), radio_indent_tabs, 1, 2, 1, 2, + gtk_table_attach (GTK_TABLE (table13), radio_indent_tabs, 1, 2, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_tooltips_set_tip (tooltips, radio_indent_tabs, _("Use one tab per indent"), NULL); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_indent_tabs), radio_indent_spaces_group); - radio_indent_spaces_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_indent_tabs)); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_indent_tabs), radio_indent_both_group); + radio_indent_both_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_indent_tabs)); - radio_indent_both = gtk_radio_button_new_with_mnemonic (NULL, _("T_abs and spaces")); - gtk_widget_show (radio_indent_both); - gtk_table_attach (GTK_TABLE (table13), radio_indent_both, 1, 2, 3, 4, + check_detect_indent_width = gtk_check_button_new_with_mnemonic (_("Detect width from file")); + gtk_widget_show (check_detect_indent_width); + gtk_table_attach (GTK_TABLE (table13), check_detect_indent_width, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip (tooltips, radio_indent_both, _("Use spaces if the total indent is less than the tab width, otherwise use both"), NULL); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_indent_both), radio_indent_spaces_group); - radio_indent_spaces_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_indent_both)); + gtk_tooltips_set_tip (tooltips, check_detect_indent_width, _("Whether to detect the indentation width from file contents when a file is opened"), NULL); - check_detect_indent = gtk_check_button_new_with_mnemonic (_("Detect from file")); - gtk_widget_show (check_detect_indent); - gtk_table_attach (GTK_TABLE (table13), check_detect_indent, 1, 2, 4, 5, + label200 = gtk_label_new (_("Type:")); + gtk_widget_show (label200); + gtk_table_attach (GTK_TABLE (table13), label200, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip (tooltips, check_detect_indent, _("Whether to detect the indentation type from file contents when a file is opened"), NULL); + gtk_misc_set_alignment (GTK_MISC (label200), 0, 0.5); check_tab_key_indents = gtk_check_button_new_with_mnemonic (_("Tab key indents")); gtk_widget_show (check_tab_key_indents); @@ -5206,15 +5214,16 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, alignment30, "alignment30"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox25, "vbox25"); GLADE_HOOKUP_OBJECT (prefs_dialog, table13, "table13"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label222, "label222"); + GLADE_HOOKUP_OBJECT (prefs_dialog, spin_indent_width, "spin_indent_width"); GLADE_HOOKUP_OBJECT (prefs_dialog, label183, "label183"); GLADE_HOOKUP_OBJECT (prefs_dialog, combo_auto_indent_mode, "combo_auto_indent_mode"); - GLADE_HOOKUP_OBJECT (prefs_dialog, label200, "label200"); - GLADE_HOOKUP_OBJECT (prefs_dialog, label222, "label222"); - GLADE_HOOKUP_OBJECT (prefs_dialog, spin_indent_width, "spin_indent_width"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_detect_indent_type, "check_detect_indent_type"); + GLADE_HOOKUP_OBJECT (prefs_dialog, radio_indent_both, "radio_indent_both"); GLADE_HOOKUP_OBJECT (prefs_dialog, radio_indent_spaces, "radio_indent_spaces"); GLADE_HOOKUP_OBJECT (prefs_dialog, radio_indent_tabs, "radio_indent_tabs"); - GLADE_HOOKUP_OBJECT (prefs_dialog, radio_indent_both, "radio_indent_both"); - GLADE_HOOKUP_OBJECT (prefs_dialog, check_detect_indent, "check_detect_indent"); + GLADE_HOOKUP_OBJECT (prefs_dialog, check_detect_indent_width, "check_detect_indent_width"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label200, "label200"); GLADE_HOOKUP_OBJECT (prefs_dialog, check_tab_key_indents, "check_tab_key_indents"); GLADE_HOOKUP_OBJECT (prefs_dialog, label195, "label195"); GLADE_HOOKUP_OBJECT (prefs_dialog, label232, "label232"); @@ -5430,17 +5439,18 @@ GtkWidget *dialog_vbox4; GtkWidget *project_notebook; GtkWidget *table17; - GtkWidget *label228; - GtkWidget *combo_auto_indent_mode; - GtkWidget *label229; GtkWidget *label230; GtkObject *spin_indent_width_adj; GtkWidget *spin_indent_width; + GtkWidget *label228; + GtkWidget *combo_auto_indent_mode; + GtkWidget *check_detect_indent_type; + GtkWidget *radio_indent_both; + GSList *radio_indent_both_group = NULL; GtkWidget *radio_indent_spaces; - GSList *radio_indent_spaces_group = NULL; GtkWidget *radio_indent_tabs; - GtkWidget *radio_indent_both; - GtkWidget *check_detect_indent; + GtkWidget *label229; + GtkWidget *check_detect_indent_width; GtkWidget *label227; GtkWidget *vbox47; GtkWidget *frame40; @@ -5474,23 +5484,41 @@ gtk_widget_show (project_notebook); gtk_box_pack_start (GTK_BOX (dialog_vbox4), project_notebook, TRUE, TRUE, 0); - table17 = gtk_table_new (6, 2, FALSE); + table17 = gtk_table_new (7, 2, FALSE); gtk_widget_show (table17); gtk_container_add (GTK_CONTAINER (project_notebook), table17); gtk_container_set_border_width (GTK_CONTAINER (table17), 6); gtk_table_set_row_spacings (GTK_TABLE (table17), 3); gtk_table_set_col_spacings (GTK_TABLE (table17), 24); + label230 = gtk_label_new (_("Width:")); + gtk_widget_show (label230); + gtk_table_attach (GTK_TABLE (table17), label230, 0, 1, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_misc_set_alignment (GTK_MISC (label230), 0, 0.5); + + spin_indent_width_adj = gtk_adjustment_new (1, 1, 99, 1, 10, 0); + spin_indent_width = gtk_spin_button_new (GTK_ADJUSTMENT (spin_indent_width_adj), 1, 0); + gtk_widget_show (spin_indent_width); + gtk_table_attach (GTK_TABLE (table17), spin_indent_width, 1, 2, 0, 1, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_tooltips_set_tip (tooltips, spin_indent_width, _("The width in chars of a single indent"), NULL); + gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_indent_width), TRUE); + gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (spin_indent_width), GTK_UPDATE_IF_VALID); + gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spin_indent_width), TRUE); + label228 = gtk_label_new (_("Auto-indent mode:")); gtk_widget_show (label228); - gtk_table_attach (GTK_TABLE (table17), label228, 0, 1, 5, 6, + gtk_table_attach (GTK_TABLE (table17), label228, 0, 1, 6, 7, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label228), 0, 0.5); combo_auto_indent_mode = gtk_combo_box_new_text (); gtk_widget_show (combo_auto_indent_mode); - gtk_table_attach (GTK_TABLE (table17), combo_auto_indent_mode, 1, 2, 5, 6, + gtk_table_attach (GTK_TABLE (table17), combo_auto_indent_mode, 1, 2, 6, 7, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); gtk_combo_box_append_text (GTK_COMBO_BOX (combo_auto_indent_mode), _("None")); @@ -5498,64 +5526,53 @@ gtk_combo_box_append_text (GTK_COMBO_BOX (combo_auto_indent_mode), _("Current chars")); gtk_combo_box_append_text (GTK_COMBO_BOX (combo_auto_indent_mode), _("Match braces")); - label229 = gtk_label_new (_("Type:")); - gtk_widget_show (label229); - gtk_table_attach (GTK_TABLE (table17), label229, 0, 1, 1, 2, + check_detect_indent_type = gtk_check_button_new_with_mnemonic (_("Detect type from file")); + gtk_widget_show (check_detect_indent_type); + gtk_table_attach (GTK_TABLE (table17), check_detect_indent_type, 1, 2, 5, 6, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment (GTK_MISC (label229), 0, 0.5); + gtk_tooltips_set_tip (tooltips, check_detect_indent_type, _("Whether to detect the indentation type from file contents when a file is opened"), NULL); - label230 = gtk_label_new (_("Width:")); - gtk_widget_show (label230); - gtk_table_attach (GTK_TABLE (table17), label230, 0, 1, 0, 1, + radio_indent_both = gtk_radio_button_new_with_mnemonic (NULL, _("T_abs and spaces")); + gtk_widget_show (radio_indent_both); + gtk_table_attach (GTK_TABLE (table17), radio_indent_both, 1, 2, 4, 5, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment (GTK_MISC (label230), 0, 0.5); + gtk_tooltips_set_tip (tooltips, radio_indent_both, _("Use spaces if the total indent is less than the tab width, otherwise use both"), NULL); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_indent_both), radio_indent_both_group); + radio_indent_both_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_indent_both)); - spin_indent_width_adj = gtk_adjustment_new (1, 1, 99, 1, 10, 0); - spin_indent_width = gtk_spin_button_new (GTK_ADJUSTMENT (spin_indent_width_adj), 1, 0); - gtk_widget_show (spin_indent_width); - gtk_table_attach (GTK_TABLE (table17), spin_indent_width, 1, 2, 0, 1, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip (tooltips, spin_indent_width, _("The width in chars of a single indent"), NULL); - gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_indent_width), TRUE); - gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (spin_indent_width), GTK_UPDATE_IF_VALID); - gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spin_indent_width), TRUE); - radio_indent_spaces = gtk_radio_button_new_with_mnemonic (NULL, _("_Spaces")); gtk_widget_show (radio_indent_spaces); - gtk_table_attach (GTK_TABLE (table17), radio_indent_spaces, 1, 2, 2, 3, + gtk_table_attach (GTK_TABLE (table17), radio_indent_spaces, 1, 2, 3, 4, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_tooltips_set_tip (tooltips, radio_indent_spaces, _("Use spaces when inserting indentation"), NULL); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_indent_spaces), radio_indent_spaces_group); - radio_indent_spaces_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_indent_spaces)); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_indent_spaces), radio_indent_both_group); + radio_indent_both_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_indent_spaces)); radio_indent_tabs = gtk_radio_button_new_with_mnemonic (NULL, _("_Tabs")); gtk_widget_show (radio_indent_tabs); - gtk_table_attach (GTK_TABLE (table17), radio_indent_tabs, 1, 2, 1, 2, + gtk_table_attach (GTK_TABLE (table17), radio_indent_tabs, 1, 2, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_tooltips_set_tip (tooltips, radio_indent_tabs, _("Use one tab per indent"), NULL); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_indent_tabs), radio_indent_spaces_group); - radio_indent_spaces_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_indent_tabs)); + gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_indent_tabs), radio_indent_both_group); + radio_indent_both_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_indent_tabs)); - radio_indent_both = gtk_radio_button_new_with_mnemonic (NULL, _("T_abs and spaces")); - gtk_widget_show (radio_indent_both); - gtk_table_attach (GTK_TABLE (table17), radio_indent_both, 1, 2, 3, 4, + label229 = gtk_label_new (_("Type:")); + gtk_widget_show (label229); + gtk_table_attach (GTK_TABLE (table17), label229, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip (tooltips, radio_indent_both, _("Use spaces if the total indent is less than the tab width, otherwise use both"), NULL); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_indent_both), radio_indent_spaces_group); - radio_indent_spaces_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_indent_both)); + gtk_misc_set_alignment (GTK_MISC (label229), 0, 0.5); - check_detect_indent = gtk_check_button_new_with_mnemonic (_("Detect from file")); - gtk_widget_show (check_detect_indent); - gtk_table_attach (GTK_TABLE (table17), check_detect_indent, 1, 2, 4, 5, + check_detect_indent_width = gtk_check_button_new_with_mnemonic (_("Detect width from file")); + gtk_widget_show (check_detect_indent_width); + gtk_table_attach (GTK_TABLE (table17), check_detect_indent_width, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_tooltips_set_tip (tooltips, check_detect_indent, _("Whether to detect the indentation type from file contents when a file is opened"), NULL); + gtk_tooltips_set_tip (tooltips, check_detect_indent_width, _("Whether to detect the indentation width from file contents when a file is opened"), NULL); label227 = gtk_label_new (_("Indentation")); gtk_widget_show (label227); @@ -5657,15 +5674,16 @@ GLADE_HOOKUP_OBJECT_NO_REF (project_dialog, dialog_vbox4, "dialog_vbox4"); GLADE_HOOKUP_OBJECT (project_dialog, project_notebook, "project_notebook"); GLADE_HOOKUP_OBJECT (project_dialog, table17, "table17"); + GLADE_HOOKUP_OBJECT (project_dialog, label230, "label230"); + GLADE_HOOKUP_OBJECT (project_dialog, spin_indent_width, "spin_indent_width"); GLADE_HOOKUP_OBJECT (project_dialog, label228, "label228"); GLADE_HOOKUP_OBJECT (project_dialog, combo_auto_indent_mode, "combo_auto_indent_mode"); - GLADE_HOOKUP_OBJECT (project_dialog, label229, "label229"); - GLADE_HOOKUP_OBJECT (project_dialog, label230, "label230"); - GLADE_HOOKUP_OBJECT (project_dialog, spin_indent_width, "spin_indent_width"); + GLADE_HOOKUP_OBJECT (project_dialog, check_detect_indent_type, "check_detect_indent_type"); + GLADE_HOOKUP_OBJECT (project_dialog, radio_indent_both, "radio_indent_both"); GLADE_HOOKUP_OBJECT (project_dialog, radio_indent_spaces, "radio_indent_spaces"); GLADE_HOOKUP_OBJECT (project_dialog, radio_indent_tabs, "radio_indent_tabs"); - GLADE_HOOKUP_OBJECT (project_dialog, radio_indent_both, "radio_indent_both"); - GLADE_HOOKUP_OBJECT (project_dialog, check_detect_indent, "check_detect_indent"); + GLADE_HOOKUP_OBJECT (project_dialog, label229, "label229"); + GLADE_HOOKUP_OBJECT (project_dialog, check_detect_indent_width, "check_detect_indent_width"); GLADE_HOOKUP_OBJECT (project_dialog, label227, "label227"); GLADE_HOOKUP_OBJECT (project_dialog, vbox47, "vbox47"); GLADE_HOOKUP_OBJECT (project_dialog, frame40, "frame40"); @@ -5687,3 +5705,21 @@ return project_dialog; } +GtkWidget* +create_checkbutton3 (void) +{ + GtkWidget *checkbutton3; + GtkTooltips *tooltips; + + tooltips = gtk_tooltips_new (); + + checkbutton3 = gtk_check_button_new_with_mnemonic (_("Detect from file")); + gtk_tooltips_set_tip (tooltips, checkbutton3, _("Whether to detect the indentation type from file contents when a file is opened"), NULL); + + /* Store pointers to all widgets, for use by lookup_widget(). */ + GLADE_HOOKUP_OBJECT_NO_REF (checkbutton3, checkbutton3, "checkbutton3"); + GLADE_HOOKUP_OBJECT_NO_REF (checkbutton3, tooltips, "tooltips"); + + return checkbutton3; +} + Modified: trunk/src/interface.h =================================================================== --- trunk/src/interface.h 2011-03-26 03:12:50 UTC (rev 5630) +++ trunk/src/interface.h 2011-03-26 17:25:24 UTC (rev 5631) @@ -7,3 +7,4 @@ GtkWidget* create_edit_menu1 (void); GtkWidget* create_prefs_dialog (void); GtkWidget* create_project_dialog (void); +GtkWidget* create_checkbutton3 (void); Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2011-03-26 03:12:50 UTC (rev 5630) +++ trunk/src/keyfile.c 2011-03-26 17:25:24 UTC (rev 5631) @@ -140,7 +140,9 @@ /* editor */ stash_group_add_toggle_button(group, &editor_prefs.indentation->detect_type, - "check_detect_indent", FALSE, "check_detect_indent"); + "check_detect_indent", FALSE, "check_detect_indent_type"); + stash_group_add_toggle_button(group, &editor_prefs.indentation->detect_width, + "detect_indent_width", FALSE, "check_detect_indent_width"); stash_group_add_toggle_button(group, &editor_prefs.use_tab_to_indent, "use_tab_to_indent", TRUE, "check_tab_key_indents"); stash_group_add_spin_button_integer(group, &editor_prefs.indentation->width, Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2011-03-26 03:12:50 UTC (rev 5630) +++ trunk/src/project.c 2011-03-26 17:25:24 UTC (rev 5631) @@ -1209,7 +1209,9 @@ stash_group_add_integer(group, &indentation.hard_tab_width, "indent_hard_tab_width", 8); stash_group_add_toggle_button(group, &indentation.detect_type, - "detect_indent", FALSE, "check_detect_indent"); + "detect_indent", FALSE, "check_detect_indent_type"); + stash_group_add_toggle_button(group, &indentation.detect_width, + "detect_indent_width", FALSE, "check_detect_indent_width"); stash_group_add_combo_box(group, (gint*)(gpointer)&indentation.auto_indent_mode, "indent_mode", GEANY_AUTOINDENT_CURRENTCHARS, "combo_auto_indent_mode"); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5630] trunk
by colombanw＠users.sourceforge.net 26 Mar '11

26 Mar '11

Revision: 5630 http://geany.svn.sourceforge.net/geany/?rev=5630&view=rev Author: colombanw Date: 2011-03-26 03:12:50 +0000 (Sat, 26 Mar 2011) Log Message: ----------- Fix the sidebar popup menu to popup for the correct selection Fix the sidebar popup menu to properly use the currently selected item rather than the previous one. Also change the hack used for the selection to be updated in the input handlers (key and mouse button) to call the GtkTreeView's handler manually rather than doing the actual job in IDLE callbacks for the TreeView's handler to have run. This prevents from having several different handlers but removes the need to work in IDLE time and then possible have a lag, as well as simplifying the code. Modified Paths: -------------- trunk/ChangeLog trunk/src/sidebar.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-26 03:12:38 UTC (rev 5629) +++ trunk/ChangeLog 2011-03-26 03:12:50 UTC (rev 5630) @@ -1,3 +1,13 @@ +2011-03-26 Colomban Wendling <colomban(at)geany(dot)org> + + * src/sidebar.c: + Fix the sidebar popup menu to properly use the currently selected item + rather than the previous one. + Also change the hack used for the selection to be updated in the input + handlers to call the GtkTreeView's handler manually rather than doing + the actual job in IDLE callbacks for the TreeView's handler to have run. + + 2011-03-25 Colomban Wendling <colomban(at)geany(dot)org> * data/filetypes.vala: Modified: trunk/src/sidebar.c =================================================================== --- trunk/src/sidebar.c 2011-03-26 03:12:38 UTC (rev 5629) +++ trunk/src/sidebar.c 2011-03-26 03:12:50 UTC (rev 5630) @@ -62,12 +62,6 @@ } doc_items = {NULL, NULL, NULL, NULL, NULL}; -static struct -{ - GtkTreeSelection *selection; - guint keyval; -} selection_change = {NULL, 0}; - enum { TREEVIEW_SYMBOL = 0, @@ -97,9 +91,7 @@ static GtkWidget *tag_window; /* scrolled window that holds the symbol list GtkTreeView */ /* callback prototypes */ -static gboolean on_openfiles_tree_selection_changed(gpointer data); static void on_openfiles_document_action(GtkMenuItem *menuitem, gpointer user_data); -static gboolean on_taglist_tree_selection_changed(gpointer data); static gboolean sidebar_button_press_cb(GtkWidget *widget, GdkEventButton *event, gpointer user_data); static gboolean sidebar_key_press_cb(GtkWidget *widget, GdkEventKey *event, @@ -716,6 +708,7 @@ gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), item); doc_items.show_paths = gtk_check_menu_item_new_with_mnemonic(_("Show _Paths")); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(doc_items.show_paths), documents_show_paths); gtk_widget_show(doc_items.show_paths); gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), doc_items.show_paths); g_signal_connect(doc_items.show_paths, "activate", @@ -836,14 +829,14 @@ } -static gboolean on_openfiles_tree_selection_changed(gpointer data) +static gboolean openfiles_go_to_selection(GtkTreeSelection *selection, guint keyval) { GtkTreeIter iter; GtkTreeModel *model; GeanyDocument *doc = NULL; /* use switch_notebook_page to ignore changing the notebook page because it is already done */ - if (gtk_tree_selection_get_selected(selection_change.selection, &model, &iter) && ! ignore_callback) + if (gtk_tree_selection_get_selected(selection, &model, &iter) && ! ignore_callback) { gtk_tree_model_get(model, &iter, DOCUMENTS_DOCUMENT, &doc, -1); if (! doc) @@ -853,20 +846,20 @@ gtk_notebook_set_current_page(GTK_NOTEBOOK(main_widgets.notebook), gtk_notebook_page_num(GTK_NOTEBOOK(main_widgets.notebook), (GtkWidget*) doc->editor->sci)); - if (selection_change.keyval != GDK_space) + if (keyval != GDK_space) change_focus_to_editor(doc, tv.tree_openfiles); } return FALSE; } -static gboolean on_taglist_tree_selection_changed(gpointer data) +static gboolean taglist_go_to_selection(GtkTreeSelection *selection, guint keyval) { GtkTreeIter iter; GtkTreeModel *model; gint line = 0; - if (gtk_tree_selection_get_selected(selection_change.selection, &model, &iter)) + if (gtk_tree_selection_get_selected(selection, &model, &iter)) { TMTag *tag; @@ -882,7 +875,7 @@ if (doc != NULL) { navqueue_goto_line(doc, doc, line); - if (selection_change.keyval != GDK_space) + if (keyval != GDK_space) change_focus_to_editor(doc, NULL); } } @@ -892,29 +885,28 @@ } -static void update_selection_change(GtkTreeSelection *selection, guint keyval) -{ - selection_change.selection = selection; - selection_change.keyval = keyval; -} - - static gboolean sidebar_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer user_data) { may_steal_focus = FALSE; if (ui_is_keyval_enter_or_return(event->keyval) || event->keyval == GDK_space) { + GtkWidgetClass *widget_class = GTK_WIDGET_GET_CLASS(widget); GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); may_steal_focus = TRUE; - /* delay the query of selection state because this callback is executed before GTK - * changes the selection (g_signal_connect_after would be better but it doesn't work) */ - update_selection_change(selection, event->keyval); - if (widget == tv.tree_openfiles) /* tag and doc list have separate handlers */ - g_idle_add(on_openfiles_tree_selection_changed, NULL); + /* force the TreeView handler to run before us for it to do its job (selection & stuff). + * doing so will prevent further handlers to be run in most cases, but the only one is our + * own, so guess it's fine. */ + if (widget_class->key_press_event) + widget_class->key_press_event(widget, event); + + if (widget == tv.tree_openfiles) /* tag and doc list have separate handlers */ + openfiles_go_to_selection(selection, event->keyval); else - g_idle_add(on_taglist_tree_selection_changed, NULL); + taglist_go_to_selection(selection, event->keyval); + + return TRUE; } return FALSE; } @@ -924,7 +916,15 @@ G_GNUC_UNUSED gpointer user_data) { GtkTreeSelection *selection; + GtkWidgetClass *widget_class = GTK_WIDGET_GET_CLASS(widget); + gboolean handled = FALSE; + /* force the TreeView handler to run before us for it to do its job (selection & stuff). + * doing so will prevent further handlers to be run in most cases, but the only one is our own, + * so guess it's fine. */ + if (widget_class->button_press_event) + handled = widget_class->button_press_event(widget, event); + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); may_steal_focus = TRUE; @@ -951,14 +951,11 @@ } else if (event->button == 1) { /* allow reclicking of taglist treeview item */ - /* delay the query of selection state because this callback is executed before GTK - * changes the selection (g_signal_connect_after would be better but it doesn't work) */ - update_selection_change(selection, 0); - if (widget == tv.tree_openfiles) - g_idle_add(on_openfiles_tree_selection_changed, NULL); + openfiles_go_to_selection(selection, 0); else - g_idle_add(on_taglist_tree_selection_changed, NULL); + taglist_go_to_selection(selection, 0); + handled = TRUE; } else if (event->button == 3) { @@ -977,8 +974,9 @@ gtk_menu_popup(GTK_MENU(tv.popup_taglist), NULL, NULL, NULL, NULL, event->button, event->time); } + handled = TRUE; } - return FALSE; + return handled; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5629] trunk
by colombanw＠users.sourceforge.net 26 Mar '11

26 Mar '11

Revision: 5629 http://geany.svn.sourceforge.net/geany/?rev=5629&view=rev Author: colombanw Date: 2011-03-26 03:12:38 +0000 (Sat, 26 Mar 2011) Log Message: ----------- Small code cleanups Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-03-25 16:49:18 UTC (rev 5628) +++ trunk/ChangeLog 2011-03-26 03:12:38 UTC (rev 5629) @@ -2,6 +2,8 @@ * data/filetypes.vala: Update Vala keywords (based on a patch from Matthew Brush, thanks). + * data/document.c: + Small code cleanups. 2011-03-24 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2011-03-25 16:49:18 UTC (rev 5628) +++ trunk/src/document.c 2011-03-26 03:12:38 UTC (rev 5629) @@ -980,13 +980,9 @@ c = sci_get_char_at(sci, pos); if (c == '\t') tabs++; - else - if (c == ' ') - { - /* check for at least 2 spaces */ - if (sci_get_char_at(sci, pos + 1) == ' ') - spaces++; - } + /* check for at least 2 spaces */ + else if (c == ' ' && sci_get_char_at(sci, pos + 1) == ' ') + spaces++; } if (spaces == 0 && tabs == 0) return iprefs->type; @@ -1058,25 +1054,6 @@ } -#if 0 -static gboolean auto_update_tag_list(gpointer data) -{ - GeanyDocument *doc = data; - - if (! doc || ! doc->is_valid || doc->tm_file == NULL) - return FALSE; - - if (gtk_window_get_focus(GTK_WINDOW(main_widgets.window)) != GTK_WIDGET(doc->editor->sci)) - return TRUE; - - if (update_tags_from_buffer(doc)) - sidebar_update_tag_list(doc, TRUE); - - return TRUE; -} -#endif - - /* To open a new file, set doc to NULL; filename should be locale encoded. * To reload a file, set the doc for the document to be reloaded; filename should be NULL. * pos is the cursor position, which can be overridden by --line and --column. @@ -1232,10 +1209,6 @@ g_free(utf8_filename); g_free(locale_filename); - /* TODO This could be used to automatically update the symbol list, - * based on a configurable interval */ - /*g_timeout_add(10000, auto_update_tag_list, doc);*/ - /* set the cursor position according to pos, cl_options.goto_line and cl_options.goto_column */ pos = set_cursor_position(doc->editor, pos); /* now bring the file in front */ @@ -1261,18 +1234,10 @@ if (length < 0) length = strlen(data); - switch (utils_get_line_endings(data, length)) - { - case SC_EOL_CR: list = g_strsplit(data, "\r", 0); break; - case SC_EOL_CRLF: list = g_strsplit(data, "\r\n", 0); break; - case SC_EOL_LF: list = g_strsplit(data, "\n", 0); break; - default: list = g_strsplit(data, "\n", 0); - } + list = g_strsplit(data, utils_get_eol_char(utils_get_line_endings(data, length)), 0); - for (i = 0; ; i++) + for (i = 0; list[i] != NULL; i++) { - if (list[i] == NULL) - break; filename = g_filename_from_uri(list[i], NULL, NULL); if (G_UNLIKELY(filename == NULL)) continue; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5628] trunk/data/filetypes.vala
by colombanw＠users.sourceforge.net 25 Mar '11

25 Mar '11

Revision: 5628 http://geany.svn.sourceforge.net/geany/?rev=5628&view=rev Author: colombanw Date: 2011-03-25 16:49:18 +0000 (Fri, 25 Mar 2011) Log Message: ----------- Restore secondary keywords entry although it's empty (oops) Modified Paths: -------------- trunk/data/filetypes.vala Modified: trunk/data/filetypes.vala =================================================================== --- trunk/data/filetypes.vala 2011-03-25 15:34:21 UTC (rev 5627) +++ trunk/data/filetypes.vala 2011-03-25 16:49:18 UTC (rev 5628) @@ -27,6 +27,7 @@ [keywords] # all items must be in one line primary=abstract as async base bool break callback case catch char class const constpointer construct continue default delegate delete do double dynamic else ensures enum errordomain extern false finally float for foreach generic get global if in inline int int16 int32 int64 int8 interface internal is lock long namespace new null out override owned private protected public ref requires return set sealed short signal size_t sizeof ssize_t static string struct switch this throw throws time_t true try typeof uchar uint uint16 uint32 uint64 uint8 ulong unichar unowned ushort using value var virtual void weak while yield +#secondary= # these are some doxygen and valadoc keywords (incomplete) docComment=attention author brief bug class code date def deprecated enum example exception file fn inheritDoc link namespace note param remarks return see since struct throw throws todo typedef union var version warning This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2011