Commits February 2008

commits@lists.geany.org

4 participants
75 discussions

SF.net SVN: geany: [2298] trunk/po
by frlan＠users.sourceforge.net 29 Feb '08

29 Feb '08

Revision: 2298 http://geany.svn.sourceforge.net/geany/?rev=2298&view=rev Author: frlan Date: 2008-02-29 14:26:30 -0800 (Fri, 29 Feb 2008) Log Message: ----------- Little update of German translation Modified Paths: -------------- trunk/po/ChangeLog trunk/po/de.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2008-02-29 19:30:28 UTC (rev 2297) +++ trunk/po/ChangeLog 2008-02-29 22:26:30 UTC (rev 2298) @@ -1,3 +1,8 @@ +2008-02-29 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * de.po: Little update of German translation + + 2008-02-21 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * *.po: Update of version strings to 0.14svn Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2008-02-29 19:30:28 UTC (rev 2297) +++ trunk/po/de.po 2008-02-29 22:26:30 UTC (rev 2298) @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: geany 0.14svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-02 14:50+0100\n" -"PO-Revision-Date: 2008-02-02 14:39+0100\n" -"Last-Translator: Enrico Tröger <enrico.troeger(a)uvena.de>\n" +"POT-Creation-Date: 2008-02-29 23:17+0100\n" +"PO-Revision-Date: 2008-02-29 23:21+0100\n" +"Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <geany-i18n(a)uvena.de>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -23,15 +23,15 @@ msgid "A fast and lightweight IDE using GTK2" msgstr "Öffnen _mit..." -#: ../geany.desktop.in.h:2 ../src/interface.c:283 ../src/interface.c:1676 +#: ../geany.desktop.in.h:2 +#: ../src/interface.c:283 +#: ../src/interface.c:1676 msgid "Geany" msgstr "Geany" #: ../geany.desktop.in.h:3 msgid "Integrated Development Environment" -msgstr "" -"Das Run-Skript, dass gewöhnlich zur Ausgabe des Rückgabewertes eines " -"ausgeführten Programms genutzt wird, nicht benutzen." +msgstr "Das Run-Skript, dass gewöhnlich zur Ausgabe des Rückgabewertes eines ausgeführten Programms genutzt wird, nicht benutzen." #: ../src/about.c:122 msgid "About Geany" @@ -84,270 +84,263 @@ msgstr "Lizenz" #: ../src/about.c:337 -msgid "" -"License text could not be found, please visit http://www.gnu.org/licenses/" -"gpl-2.0.txt to view it online." -msgstr "" -"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 "Lizenztext konnte nicht gefunden werden. Bitte besuchen Sie http://www.gnu.org/licenses/gpl-2.0.txt um die Lizenz online zu lesen." #: ../src/build.c:177 #, c-format msgid "Failed to view %s (make sure it is already compiled)" -msgstr "" -"Konnte »%s« nicht anzeigen (die Datei muss bereits erzeugt worden sein)" +msgstr "Konnte »%s« nicht anzeigen (die Datei muss bereits erzeugt worden sein)" -#: ../src/build.c:210 ../src/build.c:838 +#: ../src/build.c:210 +#: ../src/build.c:840 #, 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:224 ../src/build.c:744 +#: ../src/build.c:225 +#: ../src/build.c:746 #, c-format msgid "Failed to execute \"%s\" (start-script could not be created)" msgstr "Konnte »%s« nicht ausführen (Start-Script konnte nicht erzeugt werden)" -#: ../src/build.c:261 ../src/build.c:562 ../src/build.c:871 -#: ../src/search.c:1170 +#: ../src/build.c:262 +#: ../src/build.c:563 +#: ../src/build.c:873 +#: ../src/search.c:1186 #, c-format msgid "Process failed (%s)" msgstr "Prozess fehlgeschlagen (%s)" -#: ../src/build.c:379 ../src/build.c:629 +#: ../src/build.c:380 +#: ../src/build.c:630 msgid "Command stopped because the current file has no extension." -msgstr "" -"Die Ausführung des Kommandos wurde unterbrochen, da die Datei keine " -"Dateiendung besitzt." +msgstr "Die Ausführung des Kommandos wurde unterbrochen, da die Datei keine Dateiendung besitzt." -#: ../src/build.c:403 +#: ../src/build.c:404 #, c-format msgid "Something very strange is occurred, could not stat %s (%s)." msgstr "Ein Fehler ist aufgetreten, konnte Datei %s nicht prüfen (%s)." -#: ../src/build.c:549 +#: ../src/build.c:550 #, c-format msgid "%s (in directory: %s)" msgstr "%s (im Verzeichnis: %s)" -#: ../src/build.c:640 +#: ../src/build.c:641 #, c-format msgid "Failed to execute \"%s\" (make sure it is already built)" -msgstr "" -"Konnte »%s« nicht ausführen (die Datei muss bereits erzeugt worden sein)" +msgstr "Konnte »%s« nicht ausführen (die Datei muss bereits erzeugt worden sein)" -#: ../src/build.c:708 +#: ../src/build.c:709 #, c-format msgid "Failed to change the working directory to \"%s\"" msgstr "Konnte nicht in das Arbeitsverzeichnis »%s« wechseln" -#: ../src/build.c:802 -msgid "" -"Could not execute the file in the VTE because it probably contains a command." -msgstr "" -"Konnte nicht die Datei in der VTE ausführen weil eventuell ein Befehl auf " -"der Kommandozeile steht." +#: ../src/build.c:804 +msgid "Could not execute the file in the VTE because it probably contains a command." +msgstr "Konnte nicht die Datei in der VTE ausführen weil eventuell ein Befehl auf der Kommandozeile steht." -#: ../src/build.c:984 +#: ../src/build.c:986 msgid "Compilation failed." msgstr "Übersetzung fehlgeschlagen." -#: ../src/build.c:998 +#: ../src/build.c:1000 msgid "Compilation finished successfully." msgstr "Übersetzung erfolgreich beendet." #. compile the code -#: ../src/build.c:1101 +#: ../src/build.c:1108 msgid "_Compile" msgstr "_Kompilieren" -#: ../src/build.c:1104 +#: ../src/build.c:1111 msgid "Compiles the current file" msgstr "Kompiliert die aktuelle Datei" #. build the code -#: ../src/build.c:1113 ../src/interface.c:967 +#: ../src/build.c:1120 +#: ../src/interface.c:967 msgid "_Build" msgstr "_Erstellen" -#: ../src/build.c:1117 +#: ../src/build.c:1124 msgid "Builds the current file (generate an executable file)" msgstr "Übersetzt die aktuelle Datei (erzeugt eine ausführbare Datei)" #. build the code with make all -#: ../src/build.c:1127 ../src/build.c:1247 +#: ../src/build.c:1134 +#: ../src/build.c:1254 msgid "_Make All" msgstr "_Make all" -#: ../src/build.c:1130 ../src/build.c:1250 +#: ../src/build.c:1137 +#: ../src/build.c:1257 msgid "Builds the current file with the make tool and the default target" msgstr "Übersetzt die aktuelle Datei mit »make« und dem Default-Target" #. build the code with make custom -#: ../src/build.c:1138 ../src/build.c:1258 +#: ../src/build.c:1145 +#: ../src/build.c:1265 msgid "Make Custom _Target" msgstr "Make (eigenes _Target)" -#: ../src/build.c:1142 ../src/build.c:1262 +#: ../src/build.c:1149 +#: ../src/build.c:1269 msgid "Builds the current file with the make tool and the specified target" msgstr "Übersetzt die aktuelle Datei mit »make« und dem angegebenem Target" #. build the code with make object -#: ../src/build.c:1149 +#: ../src/build.c:1156 msgid "Make _Object" msgstr "Make _Objekt-Datei" -#: ../src/build.c:1153 +#: ../src/build.c:1160 msgid "Compiles the current file using the make tool" msgstr "Kompiliert die aktuelle Datei mittels make" #. next error -#: ../src/build.c:1164 ../src/build.c:1273 +#: ../src/build.c:1171 +#: ../src/build.c:1280 msgid "_Next Error" msgstr "Nächster _Fehler" -#: ../src/build.c:1179 ../src/interface.c:1111 +#: ../src/build.c:1186 +#: ../src/interface.c:1111 msgid "Run or view the current file" msgstr "Aktuelle Datei anzeigen oder ausführen" #. arguments -#: ../src/build.c:1190 +#: ../src/build.c:1197 msgid "_Set Includes and Arguments" msgstr "_Include-Parameter und Argumente angeben" -#: ../src/build.c:1195 -msgid "" -"Sets the includes and library paths for the compiler and the program " -"arguments for execution" -msgstr "" -"Include-Dateien, Pfade zu den Bibliotheken sowie Programmparameter festlegen" +#: ../src/build.c:1202 +msgid "Sets the includes and library paths for the compiler and the program arguments for execution" +msgstr "Include-Dateien, Pfade zu den Bibliotheken sowie Programmparameter festlegen" #. DVI -#: ../src/build.c:1217 +#: ../src/build.c:1224 msgid "LaTeX -> DVI" msgstr "LaTeX -> DVI" -#: ../src/build.c:1220 +#: ../src/build.c:1227 msgid "Compiles the current file into a DVI file" msgstr "Kompiliert die aktuelle Datei als DVI-Datei." #. PDF -#: ../src/build.c:1230 +#: ../src/build.c:1237 msgid "LaTeX -> PDF" msgstr "LaTeX -> PDF" -#: ../src/build.c:1233 +#: ../src/build.c:1240 msgid "Compiles the current file into a PDF file" msgstr "Kompiliert die aktuelle Datei als PDF-Datei." #. DVI view -#: ../src/build.c:1285 +#: ../src/build.c:1292 msgid "View DVI File" msgstr "DVI-Datei anzeigen" -#: ../src/build.c:1290 ../src/build.c:1303 +#: ../src/build.c:1297 +#: ../src/build.c:1310 msgid "Compile and view the current file" msgstr "Kompiliert und zeigt die aktuelle Datei an" #. PDF view -#: ../src/build.c:1299 +#: ../src/build.c:1306 msgid "View PDF File" msgstr "PDF-Datei anzeigen" #. arguments -#: ../src/build.c:1318 ../src/build.c:1397 +#: ../src/build.c:1325 +#: ../src/build.c:1404 msgid "Set Arguments" msgstr "Programm-Parameter angeben" -#: ../src/build.c:1323 +#: ../src/build.c:1330 msgid "Sets the program paths and arguments" msgstr "Programmpfade und Parameter festlegen" -#: ../src/build.c:1404 +#: ../src/build.c:1411 msgid "Set programs and options for compiling and viewing (La)TeX files." -msgstr "" -"Setzt Programme und deren Optionen zum Kompilieren bzw. Betrachten von (La)" -"TeX-Dateien." +msgstr "Setzt Programme und deren Optionen zum Kompilieren bzw. Betrachten von (La)TeX-Dateien." -#: ../src/build.c:1415 +#: ../src/build.c:1422 msgid "DVI creation:" msgstr "DVI-Erstellung:" -#: ../src/build.c:1434 +#: ../src/build.c:1441 msgid "PDF creation:" msgstr "PDF-Erstellung:" -#: ../src/build.c:1453 +#: ../src/build.c:1460 msgid "DVI preview:" msgstr "DVI-Vorschau:" -#: ../src/build.c:1472 +#: ../src/build.c:1479 msgid "PDF preview:" msgstr "PDF-Vorschau:" -#: ../src/build.c:1488 ../src/build.c:1660 +#: ../src/build.c:1495 +#: ../src/build.c:1667 #, c-format msgid "" "%f will be replaced by the current filename, e.g. test_file.c\n" "%e will be replaced by the filename without extension, e.g. test_file" msgstr "" -"%f wird durch den aktuellen Dateinamen ersetzt. Zum Beispiel: meine_Datei." -"c \n" -"%e wird durch den Dateinamen ohne Dateiendung ersetzt. Zum Beispiel " -"meine_Datei " +"%f wird durch den aktuellen Dateinamen ersetzt. Zum Beispiel: meine_Datei.c \n" +"%e wird durch den Dateinamen ohne Dateiendung ersetzt. Zum Beispiel meine_Datei " -#: ../src/build.c:1566 +#: ../src/build.c:1573 msgid "Set Includes and Arguments" msgstr "Include-Parameter und Argumente angeben" -#: ../src/build.c:1573 +#: ../src/build.c:1580 msgid "Set the commands for building and running programs." msgstr "Legt die Kommandos zum Erstellen und Ausführen von Programmen fest." #. in-dialog heading for the "Set Includes and Arguments" dialog -#: ../src/build.c:1581 +#: ../src/build.c:1588 #, c-format msgid "%s commands" msgstr "Kommandos für %s" -#: ../src/build.c:1596 +#: ../src/build.c:1603 msgid "Compile:" msgstr "Kompilieren:" -#: ../src/build.c:1617 +#: ../src/build.c:1624 msgid "Build:" msgstr "Erstellen:" -#: ../src/build.c:1638 ../src/dialogs.c:1164 +#: ../src/build.c:1645 +#: ../src/dialogs.c:1190 msgid "Execute:" msgstr "Ausführen:" -#: ../src/build.c:1951 +#: ../src/build.c:1958 msgid "Make Custom Target" msgstr "Make (eigenes Target)" -#: ../src/build.c:1952 -msgid "" -"Enter custom options here, all entered text is passed to the make command." +#: ../src/build.c:1959 +msgid "Enter custom options here, all entered text is passed to the make command." msgstr "Alles was Sie hier angeben, wird direkt an »make« übergeben." -#: ../src/build.c:2042 +#: ../src/build.c:2049 msgid "Failed to execute the view program" msgstr "Konnte das Anzeigeprogramm nicht ausführen." -#: ../src/build.c:2056 +#: ../src/build.c:2063 msgid "Failed to execute the terminal program" msgstr "Konnte das Terminal-Programm nicht ausführen." -#: ../src/build.c:2082 +#: ../src/build.c:2089 #, c-format msgid "Process could not be stopped (%s)." msgstr "Der Prozess konnte nicht angehalten werden (%s)." -#: ../src/build.c:2101 +#: ../src/build.c:2108 msgid "No more build errors." msgstr "Keine weiteren Fehlermeldungen." @@ -355,97 +348,99 @@ msgid "Do you really want to quit?" msgstr "Soll Geany wirklich beendet werden?" -#: ../src/callbacks.c:513 ../src/interface.c:357 ../src/treeviews.c:448 -#: ../src/utils.c:336 +#: ../src/callbacks.c:514 +#: ../src/interface.c:357 +#: ../src/treeviews.c:448 +#: ../src/utils.c:345 msgid "_Reload" msgstr "_Neu laden" -#: ../src/callbacks.c:514 +#: ../src/callbacks.c:515 msgid "Any unsaved changes will be lost." msgstr "Alle ungesicherten Änderungen gehen verloren." -#: ../src/callbacks.c:515 +#: ../src/callbacks.c:516 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Möchten Sie %s wirklich neu laden?" -#: ../src/callbacks.c:1324 ../src/callbacks.c:1348 -msgid "" -"Please set the filetype for the current file before using this function." +#: ../src/callbacks.c:1329 +#: ../src/callbacks.c:1353 +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:1450 ../src/ui_utils.c:480 +#: ../src/callbacks.c:1455 +#: ../src/ui_utils.c:485 msgid "dd.mm.yyyy" msgstr "TT.MM.JJ" -#: ../src/callbacks.c:1452 ../src/ui_utils.c:481 +#: ../src/callbacks.c:1457 +#: ../src/ui_utils.c:486 msgid "mm.dd.yyyy" msgstr "MM.TT.JJ" -#: ../src/callbacks.c:1454 ../src/ui_utils.c:482 +#: ../src/callbacks.c:1459 +#: ../src/ui_utils.c:487 msgid "yyyy/mm/dd" msgstr "JJJJ/MM/TT" -#: ../src/callbacks.c:1456 ../src/ui_utils.c:491 +#: ../src/callbacks.c:1461 +#: ../src/ui_utils.c:496 msgid "dd.mm.yyyy hh:mm:ss" msgstr "TT.MM.JJJJ Stunden:Minuten:Sekunden" -#: ../src/callbacks.c:1458 ../src/ui_utils.c:492 +#: ../src/callbacks.c:1463 +#: ../src/ui_utils.c:497 msgid "mm.dd.yyyy hh:mm:ss" msgstr "MM.TT.JJJJ Stunden:Minuten:Sekunden" -#: ../src/callbacks.c:1460 ../src/ui_utils.c:493 +#: ../src/callbacks.c:1465 +#: ../src/ui_utils.c:498 msgid "yyyy/mm/dd hh:mm:ss" msgstr "JJJJ/MM/TT Stunden:Minuten:Sekunden" -#: ../src/callbacks.c:1462 ../src/ui_utils.c:502 +#: ../src/callbacks.c:1467 +#: ../src/ui_utils.c:507 msgid "_Use Custom Date Format" msgstr "Benutze selbst erstelltes _Datumsformat" -#: ../src/callbacks.c:1473 +#: ../src/callbacks.c:1478 msgid "Custom Date Format" msgstr "Benutzerdefiniertes Datumsformat" -#: ../src/callbacks.c:1474 -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 " -"können alle Platzhalter verwendet werden, die auch in ANSI C strftime zum " -"Einsatz kommen." +#: ../src/callbacks.c:1479 +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 können alle Platzhalter verwendet werden, die auch in ANSI C strftime zum Einsatz kommen." -#: ../src/callbacks.c:1493 +#: ../src/callbacks.c:1498 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:1791 +#: ../src/callbacks.c:1796 msgid "No more message items." msgstr "Keine weiteren Nachrichten." #. initialize the dialog -#: ../src/dialogs.c:174 ../src/prefs.c:1442 +#: ../src/dialogs.c:174 +#: ../src/prefs.c:1481 msgid "Open File" msgstr "Datei öffnen" -#: ../src/dialogs.c:178 ../src/interface.c:708 +#: ../src/dialogs.c:178 +#: ../src/interface.c:708 msgid "_View" msgstr "_Ansicht" #: ../src/dialogs.c:180 -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. Wenn Sie mehrere Dateien zum Öffnen " -"wählen, 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. Wenn Sie mehrere Dateien zum Öffnen wählen, werden alle schreibgeschützt geöffnet." #: ../src/dialogs.c:216 msgid "Detect by file extension" msgstr "Durch Dateiendung erkennen" -#: ../src/dialogs.c:227 ../src/interface.c:3693 +#: ../src/dialogs.c:227 +#: ../src/interface.c:3693 msgid "Detect from file" msgstr "Aus Datei lesen" @@ -460,16 +455,11 @@ #: ../src/dialogs.c:313 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." #: ../src/dialogs.c:333 msgid "Set filetype:" @@ -477,17 +467,14 @@ #: ../src/dialogs.c:343 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 wird.\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 wird.\n" +"Beachten Sie, wenn Sie mehrere Dateien auswählen, werden alle mit dem gewählten Dateityp geöffnet." -#: ../src/dialogs.c:454 ../plugins/export.c:333 +#: ../src/dialogs.c:454 +#: ../plugins/export.c:333 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Die Datei »%s« existiert bereits. Soll sie überschreiben werden?" @@ -509,215 +496,212 @@ msgstr "_Datei in einem neuen Tab öffnen" #: ../src/dialogs.c:502 -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 Tab." +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 Tab." -#: ../src/dialogs.c:661 +#: ../src/dialogs.c:687 #, c-format msgid "The file '%s' is not saved." msgstr "'%s' wurde nicht gespeichert." -#: ../src/dialogs.c:663 +#: ../src/dialogs.c:689 msgid "Do you want to save it before closing?" msgstr "Möchten Sie vor dem Schließen speichern?" -#: ../src/dialogs.c:675 +#: ../src/dialogs.c:701 msgid "_Don't save" msgstr "_Nicht speichern" -#: ../src/dialogs.c:752 +#: ../src/dialogs.c:778 msgid "Choose font" msgstr "Schriftart auswählen" -#: ../src/dialogs.c:902 ../src/interface.c:2316 ../src/keybindings.c:170 +#: ../src/dialogs.c:928 +#: ../src/interface.c:2316 +#: ../src/keybindings.c:238 msgid "Go to Line" msgstr "Gehe zu Zeile" -#: ../src/dialogs.c:909 +#: ../src/dialogs.c:935 msgid "Enter the line you want to go to:" msgstr "Geben Sie die Zeile an, zu der Sie springen möchten:" -#: ../src/dialogs.c:956 -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, ungespeicherten Datei)." +#: ../src/dialogs.c:982 +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, ungespeicherten Datei)." -#: ../src/dialogs.c:975 ../src/dialogs.c:976 ../src/dialogs.c:977 -#: ../src/dialogs.c:983 ../src/dialogs.c:984 ../src/dialogs.c:985 -#: ../src/ui_utils.c:161 ../src/utils.c:498 ../src/utils.c:519 -#: ../src/utils.c:572 +#: ../src/dialogs.c:1001 +#: ../src/dialogs.c:1002 +#: ../src/dialogs.c:1003 +#: ../src/dialogs.c:1009 +#: ../src/dialogs.c:1010 +#: ../src/dialogs.c:1011 +#: ../src/ui_utils.c:164 +#: ../src/utils.c:507 +#: ../src/utils.c:528 +#: ../src/utils.c:581 msgid "unknown" msgstr "unbekannt" -#: ../src/dialogs.c:989 +#: ../src/dialogs.c:1015 msgid "Properties" msgstr "Eigenschaften" -#: ../src/dialogs.c:1018 +#: ../src/dialogs.c:1044 msgid "Type:" msgstr "Dateityp:" -#: ../src/dialogs.c:1031 +#: ../src/dialogs.c:1057 msgid "Size:" msgstr "Größe:" -#: ../src/dialogs.c:1046 +#: ../src/dialogs.c:1072 msgid "Location:" msgstr "Ort:" -#: ../src/dialogs.c:1059 +#: ../src/dialogs.c:1085 msgid "Read-only:" msgstr "Schreibgeschützt:" -#: ../src/dialogs.c:1066 +#: ../src/dialogs.c:1092 msgid "(only inside Geany)" msgstr "(nur innerhalb von Geany)" -#: ../src/dialogs.c:1075 +#: ../src/dialogs.c:1101 msgid "Encoding:" msgstr "Kodierung:" -#: ../src/dialogs.c:1085 ../src/ui_utils.c:163 +#. BOM = byte order mark +#: ../src/dialogs.c:1111 +#: ../src/ui_utils.c:167 msgid "(with BOM)" msgstr "(mit BOM)" -#: ../src/dialogs.c:1085 +#: ../src/dialogs.c:1111 msgid "(without BOM)" msgstr "(ohne BOM)" -#: ../src/dialogs.c:1095 +#: ../src/dialogs.c:1121 msgid "Modified:" msgstr "Modifiziert:" -#: ../src/dialogs.c:1108 +#: ../src/dialogs.c:1134 msgid "Changed:" msgstr "Geändert:" -#: ../src/dialogs.c:1121 +#: ../src/dialogs.c:1147 msgid "Accessed:" msgstr "Zugriff:" -#: ../src/dialogs.c:1142 +#: ../src/dialogs.c:1168 msgid "Permissions:" msgstr "Berechtigungen:" #. Header -#: ../src/dialogs.c:1150 +#: ../src/dialogs.c:1176 msgid "Read:" msgstr "Lesen:" -#: ../src/dialogs.c:1157 +#: ../src/dialogs.c:1183 msgid "Write:" msgstr "Schreiben:" #. Owner -#: ../src/dialogs.c:1172 +#: ../src/dialogs.c:1198 msgid "Owner:" msgstr "Eigentümer:" #. Group -#: ../src/dialogs.c:1208 +#: ../src/dialogs.c:1234 msgid "Group:" msgstr "Gruppe:" #. Other -#: ../src/dialogs.c:1244 +#: ../src/dialogs.c:1270 msgid "Other:" msgstr "Andere:" -#: ../src/document.c:493 +#: ../src/document.c:531 #, c-format msgid "File %s closed." msgstr "Datei %s wurde geschlossen." -#: ../src/document.c:592 +#: ../src/document.c:638 #, c-format msgid "New file \"%s\" opened." msgstr "Neue Datei \"%s\" geöffnet." -#: ../src/document.c:758 ../src/document.c:1134 +#: ../src/document.c:823 +#: ../src/document.c:1215 #, c-format msgid "Could not open file %s (%s)" msgstr "Konnte Datei '%s' nicht öffnen(%s)." -#: ../src/document.c:785 +#: ../src/document.c:850 #, c-format msgid "" -"The file \"%s\" could not be opened properly and has been truncated. This " -"can occur if the file contains a NULL byte. Be aware that saving it can " -"cause data loss.\n" +"The file \"%s\" could not be opened properly and has been truncated. This can occur if the file contains a NULL byte. Be aware that saving it can cause data loss.\n" "The file was set to read-only." msgstr "" -"Die Datei »%s« konnte nicht ordnungsgemäß geladen werden und wurde evtl. " -"abgeschnitten. Die kann zu Datenverlust beim Speichern führen!\n" +"Die Datei »%s« konnte nicht ordnungsgemäß geladen werden und wurde evtl. abgeschnitten. Die kann zu Datenverlust beim Speichern führen!\n" "Die Datei wird schreibgeschützt geöffnet." -#: ../src/document.c:809 +#: ../src/document.c:874 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Die Datei \"%s\" ist kein gültiges %s." -#: ../src/document.c:818 +#: ../src/document.c:883 #, 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 das Format wird nicht " -"unterstützt." +msgid "The file \"%s\" does not look like a text file or the file encoding is not supported." +msgstr "Die Datei \"%s\" scheint keine Textdatei zu sein, oder das Format wird nicht unterstützt." -#: ../src/document.c:927 +#: ../src/document.c:992 msgid "Invalid filename" msgstr "Ungültiger Dateiname" -#: ../src/document.c:987 +#: ../src/document.c:1052 #, c-format msgid "Setting %s indentation mode." msgstr "Modus für automatische Einrückung auf %s eingestellt." -#: ../src/document.c:988 ../src/interface.c:808 ../src/interface.c:3672 +#: ../src/document.c:1053 +#: ../src/interface.c:808 +#: ../src/interface.c:3672 msgid "Tabs" msgstr "Tabulatoren" -#: ../src/document.c:988 ../src/interface.c:814 ../src/interface.c:3679 +#: ../src/document.c:1053 +#: ../src/interface.c:814 +#: ../src/interface.c:3679 msgid "Spaces" msgstr "Leerzeichen" -#: ../src/document.c:1037 +#: ../src/document.c:1102 #, c-format msgid "File %s reloaded." msgstr "Datei %s neu geladen." -#: ../src/document.c:1039 +#: ../src/document.c:1104 #, c-format msgid "File %s opened(%d%s)." msgstr "Datei %s geöffnet(%d%s)." -#: ../src/document.c:1041 +#: ../src/document.c:1106 msgid ", read-only" msgstr ", schreibgeschützt" -#: ../src/document.c:1188 ../src/document.c:1302 +#: ../src/document.c:1279 +#: ../src/document.c:1391 msgid "Error saving file." msgstr "Fehler beim Speichern der Datei." -#: ../src/document.c:1236 +#: ../src/document.c:1325 #, 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 in \"%s\" ist ein Fehler aufgetreten. " -"Die Datei bleibt ungespeichert." +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 in \"%s\" ist ein Fehler aufgetreten. Die Datei bleibt ungespeichert." -#: ../src/document.c:1257 +#: ../src/document.c:1346 #, c-format msgid "" "Error message: %s\n" @@ -726,191 +710,243 @@ "Fehlermeldung: %s\n" "Der Fehler trat bei \"%s\" (Zeile: %d, Spalte: %d) auf." -#: ../src/document.c:1262 +#: ../src/document.c:1351 #, c-format msgid "Error message: %s." msgstr "Fehlermeldung: %s." -#: ../src/document.c:1290 +#: ../src/document.c:1379 #, c-format msgid "Error saving file (%s)." msgstr "Fehler beim Speichern der Datei (%s)." -#: ../src/document.c:1341 +#: ../src/document.c:1430 #, c-format msgid "File %s saved." msgstr "Datei %s wurde gespeichert." -#: ../src/document.c:1405 ../src/document.c:1459 ../src/document.c:1467 +#: ../src/document.c:1498 +#: ../src/document.c:1552 +#: ../src/document.c:1560 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" wurde nicht gefunden." -#: ../src/document.c:1467 +#: ../src/document.c:1560 msgid "Wrap search and find again?" msgstr "Suche vom Dokumentanfang bzw. -ende neu beginnen?" -#: ../src/document.c:1542 ../src/search.c:869 ../src/search.c:1359 -#: ../src/search.c:1360 +#: ../src/document.c:1635 +#: ../src/search.c:873 +#: ../src/search.c:1375 +#: ../src/search.c:1376 #, c-format msgid "No matches found for \"%s\"." msgstr "Keine Treffer für \"%s\" gefunden." -#: ../src/document.c:1552 ../src/document.c:1559 +#: ../src/document.c:1645 +#: ../src/document.c:1652 #, c-format msgid "%s: replaced %d occurrence(s) of \"%s\" with \"%s\"." msgstr "%s: %d mal wurde \"%s\" mit \"%s\" ersetzt." -#: ../src/document.c:1976 +#: ../src/document.c:2064 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: ../src/document.c:1977 +#: ../src/document.c:2065 msgid "Mac (CR)" msgstr "Mac (CR)" -#: ../src/document.c:1979 +#: ../src/document.c:2067 msgid "Unix (LF)" msgstr "Unix (LF)" -#: ../src/encodings.c:65 +#: ../src/encodings.c:68 msgid "Celtic" msgstr "Keltisch" -#: ../src/encodings.c:66 ../src/encodings.c:67 +#: ../src/encodings.c:69 +#: ../src/encodings.c:70 msgid "Greek" msgstr "Griechisch" -#: ../src/encodings.c:68 +#: ../src/encodings.c:71 msgid "Nordic" msgstr "Nordisch" -#: ../src/encodings.c:69 +#: ../src/encodings.c:72 msgid "South European" msgstr "Südeuropäisch" -#: ../src/encodings.c:70 ../src/encodings.c:71 ../src/encodings.c:72 #: ../src/encodings.c:73 +#: ../src/encodings.c:74 +#: ../src/encodings.c:75 +#: ../src/encodings.c:76 msgid "Western" msgstr "Westlich" -#: ../src/encodings.c:75 ../src/encodings.c:76 ../src/encodings.c:77 +#: ../src/encodings.c:78 +#: ../src/encodings.c:79 +#: ../src/encodings.c:80 msgid "Baltic" msgstr "Baltisch" -#: ../src/encodings.c:78 ../src/encodings.c:79 ../src/encodings.c:80 +#: ../src/encodings.c:81 +#: ../src/encodings.c:82 +#: ../src/encodings.c:83 msgid "Central European" msgstr "Mitteleuropäisch" -#: ../src/encodings.c:81 ../src/encodings.c:82 ../src/encodings.c:83 -#: ../src/encodings.c:84 ../src/encodings.c:85 +#: ../src/encodings.c:84 +#: ../src/encodings.c:85 +#: ../src/encodings.c:86 +#: ../src/encodings.c:87 +#: ../src/encodings.c:88 msgid "Cyrillic" msgstr "Kyrillisch" -#: ../src/encodings.c:86 +#: ../src/encodings.c:89 msgid "Cyrillic/Russian" msgstr "Kyrillisch/Russisch" -#: ../src/encodings.c:87 +#: ../src/encodings.c:90 msgid "Cyrillic/Ukrainian" msgstr "Kyrillisch/Ukrainisch" -#: ../src/encodings.c:88 +#: ../src/encodings.c:91 msgid "Romanian" msgstr "Rumänisch" -#: ../src/encodings.c:90 ../src/encodings.c:91 ../src/encodings.c:92 +#: ../src/encodings.c:93 +#: ../src/encodings.c:94 +#: ../src/encodings.c:95 msgid "Arabic" msgstr "Arabisch" -#: ../src/encodings.c:93 ../src/encodings.c:94 ../src/encodings.c:95 +#: ../src/encodings.c:96 +#: ../src/encodings.c:97 +#: ../src/encodings.c:98 msgid "Hebrew" msgstr "Hebräisch" -#: ../src/encodings.c:96 +#: ../src/encodings.c:99 msgid "Hebrew Visual" msgstr "Hebräisch visuell" -#: ../src/encodings.c:98 +#: ../src/encodings.c:101 msgid "Armenian" msgstr "Armenisch" -#: ../src/encodings.c:99 +#: ../src/encodings.c:102 msgid "Georgian" msgstr "Georgian" -#: ../src/encodings.c:100 +#: ../src/encodings.c:103 msgid "Thai" msgstr "Thai" -#: ../src/encodings.c:101 ../src/encodings.c:102 ../src/encodings.c:103 +#: ../src/encodings.c:104 +#: ../src/encodings.c:105 +#: ../src/encodings.c:106 msgid "Turkish" msgstr "Türkisch" -#: ../src/encodings.c:104 ../src/encodings.c:105 ../src/encodings.c:106 +#: ../src/encodings.c:107 +#: ../src/encodings.c:108 +#: ../src/encodings.c:109 msgid "Vietnamese" msgstr "Vietnamesisch" -#: ../src/encodings.c:108 ../src/encodings.c:109 ../src/encodings.c:110 -#: ../src/encodings.c:111 ../src/encodings.c:112 ../src/encodings.c:113 -#: ../src/encodings.c:114 ../src/encodings.c:115 +#: ../src/encodings.c:111 +#: ../src/encodings.c:112 +#: ../src/encodings.c:113 +#: ../src/encodings.c:114 +#: ../src/encodings.c:115 +#: ../src/encodings.c:116 +#: ../src/encodings.c:117 +#: ../src/encodings.c:118 msgid "Unicode" msgstr "Unicode" -#: ../src/encodings.c:117 ../src/encodings.c:118 ../src/encodings.c:119 #: ../src/encodings.c:120 +#: ../src/encodings.c:121 +#: ../src/encodings.c:122 +#: ../src/encodings.c:123 msgid "Chinese Simplified" msgstr "Chinesisch vereinfacht" -#: ../src/encodings.c:121 ../src/encodings.c:122 ../src/encodings.c:123 +#: ../src/encodings.c:124 +#: ../src/encodings.c:125 +#: ../src/encodings.c:126 msgid "Chinese Traditional" msgstr "Chinesisch traditionell" -#: ../src/encodings.c:124 ../src/encodings.c:125 ../src/encodings.c:126 +#: ../src/encodings.c:127 +#: ../src/encodings.c:128 +#: ../src/encodings.c:129 msgid "Japanese" msgstr "Japanisch" -#: ../src/encodings.c:127 ../src/encodings.c:128 ../src/encodings.c:129 #: ../src/encodings.c:130 +#: ../src/encodings.c:131 +#: ../src/encodings.c:132 +#: ../src/encodings.c:133 msgid "Korean" msgstr "Koreanisch" -#: ../src/encodings.c:132 +#: ../src/encodings.c:135 msgid "Without encoding" msgstr "Ohne Zeichenkodierung" -#: ../src/encodings.c:329 +#: ../src/encodings.c:331 msgid "_West European" msgstr "_Westeuropäisch" -#: ../src/encodings.c:335 +#: ../src/encodings.c:337 msgid "_East European" msgstr "_Osteuropäisch" -#: ../src/encodings.c:341 +#: ../src/encodings.c:343 msgid "East _Asian" msgstr "Ost_asiatisch" -#: ../src/encodings.c:347 +#: ../src/encodings.c:349 msgid "_SE & SW Asian" msgstr "_SO- & SW-Asiatisch" -#: ../src/encodings.c:353 +#: ../src/encodings.c:355 msgid "_Middle Eastern" msgstr "_Nahöstlich" -#: ../src/encodings.c:359 +#: ../src/encodings.c:361 msgid "_Unicode" msgstr "_Unicode" -#: ../src/filetypes.c:107 ../src/filetypes.c:118 ../src/filetypes.c:130 -#: ../src/filetypes.c:141 ../src/filetypes.c:152 ../src/filetypes.c:163 -#: ../src/filetypes.c:175 ../src/filetypes.c:186 ../src/filetypes.c:197 -#: ../src/filetypes.c:209 ../src/filetypes.c:220 ../src/filetypes.c:232 -#: ../src/filetypes.c:244 ../src/filetypes.c:255 ../src/filetypes.c:266 -#: ../src/filetypes.c:277 ../src/filetypes.c:288 ../src/filetypes.c:299 -#: ../src/filetypes.c:310 ../src/filetypes.c:357 ../src/filetypes.c:368 -#: ../src/filetypes.c:402 ../src/filetypes.c:413 ../src/filetypes.c:424 +#: ../src/filetypes.c:107 +#: ../src/filetypes.c:118 +#: ../src/filetypes.c:130 +#: ../src/filetypes.c:141 +#: ../src/filetypes.c:152 +#: ../src/filetypes.c:163 +#: ../src/filetypes.c:175 +#: ../src/filetypes.c:186 +#: ../src/filetypes.c:197 +#: ../src/filetypes.c:209 +#: ../src/filetypes.c:220 +#: ../src/filetypes.c:232 +#: ../src/filetypes.c:244 +#: ../src/filetypes.c:255 +#: ../src/filetypes.c:266 +#: ../src/filetypes.c:277 +#: ../src/filetypes.c:288 +#: ../src/filetypes.c:299 +#: ../src/filetypes.c:310 +#: ../src/filetypes.c:357 +#: ../src/filetypes.c:368 +#: ../src/filetypes.c:402 +#: ../src/filetypes.c:413 +#: ../src/filetypes.c:424 #: ../src/filetypes.c:458 #, c-format msgid "%s source file" @@ -948,7 +984,8 @@ msgid "reStructuredText file" msgstr "reST Quelldatei" -#: ../src/filetypes.c:481 ../src/project.c:277 +#: ../src/filetypes.c:481 +#: ../src/project.c:277 msgid "All files" msgstr "Alle Dateien" @@ -968,11 +1005,14 @@ msgid "M_iscellaneous Languages" msgstr "_Sonstige Sprachen" -#: ../src/filetypes.c:545 ../src/interface.c:3643 ../src/templates.c:350 +#: ../src/filetypes.c:545 +#: ../src/interface.c:3643 +#: ../src/templates.c:350 msgid "None" msgstr "Keiner" -#: ../src/filetypes.c:964 ../src/win32.c:83 +#: ../src/filetypes.c:964 +#: ../src/win32.c:105 msgid "All Source" msgstr "Alle Quellen" @@ -988,14 +1028,21 @@ msgid "New (with _Template)" msgstr "Neu (aus _Vorlage)" -#: ../src/interface.c:315 ../src/interface.c:376 ../src/interface.c:556 -#: ../src/interface.c:616 ../src/interface.c:630 ../src/interface.c:846 -#: ../src/interface.c:856 ../src/interface.c:2209 ../src/interface.c:2269 +#: ../src/interface.c:315 +#: ../src/interface.c:376 +#: ../src/interface.c:556 +#: ../src/interface.c:616 +#: ../src/interface.c:630 +#: ../src/interface.c:846 +#: ../src/interface.c:856 +#: ../src/interface.c:2209 +#: ../src/interface.c:2269 #: ../src/interface.c:2283 msgid "invisible" msgstr "unsichtbar" -#: ../src/interface.c:327 ../src/interface.c:2135 +#: ../src/interface.c:327 +#: ../src/interface.c:2135 msgid "Open Selected F_ile" msgstr "_Markierte Datei öffnen" @@ -1039,7 +1086,8 @@ msgid "Closes all open files" msgstr "Schließt alle offenen Dateien" -#: ../src/interface.c:438 ../src/interface.c:1203 +#: ../src/interface.c:438 +#: ../src/interface.c:1203 msgid "Quit Geany" msgstr "Geany beenden" @@ -1047,11 +1095,13 @@ msgid "_Edit" msgstr "_Bearbeiten" -#: ../src/interface.c:481 ../src/interface.c:2126 +#: ../src/interface.c:481 +#: ../src/interface.c:2126 msgid "Select _All" msgstr "A_lles auswählen" -#: ../src/interface.c:490 ../src/interface.c:2144 +#: ../src/interface.c:490 +#: ../src/interface.c:2144 msgid "_Format" msgstr "_Format" @@ -1059,35 +1109,43 @@ msgid "Convert the case of the current selection" msgstr "Ändert die Großschreibung der aktuellen Auswahl" -#: ../src/interface.c:498 ../src/interface.c:2151 +#: ../src/interface.c:498 +#: ../src/interface.c:2151 msgid "T_oggle Case of Selection" msgstr "_Groß- und Kleinschreibung bei Auswahl vertauschen" -#: ../src/interface.c:507 ../src/interface.c:2160 +#: ../src/interface.c:507 +#: ../src/interface.c:2160 msgid "_Comment Line(s)" msgstr "Zeile(n) _auskommentieren" -#: ../src/interface.c:511 ../src/interface.c:2164 +#: ../src/interface.c:511 +#: ../src/interface.c:2164 msgid "U_ncomment Line(s)" msgstr "Zeile(n) _einkommentieren" -#: ../src/interface.c:515 ../src/interface.c:2168 +#: ../src/interface.c:515 +#: ../src/interface.c:2168 msgid "_Toggle Line Commentation" msgstr "Kommentierung _umschalten" -#: ../src/interface.c:519 ../src/interface.c:2172 +#: ../src/interface.c:519 +#: ../src/interface.c:2172 msgid "Du_plicate Line or Selection" msgstr "_Zeile oder Auswahl kopieren" -#: ../src/interface.c:528 ../src/interface.c:2181 +#: ../src/interface.c:528 +#: ../src/interface.c:2181 msgid "_Increase Indent" msgstr "Einzug _erhöhen" -#: ../src/interface.c:536 ../src/interface.c:2189 +#: ../src/interface.c:536 +#: ../src/interface.c:2189 msgid "_Decrease Indent" msgstr "Einzug _verringern" -#: ../src/interface.c:549 ../src/interface.c:2202 +#: ../src/interface.c:549 +#: ../src/interface.c:2202 msgid "_Send Selection to" msgstr "_Auswahl senden an" @@ -1095,60 +1153,68 @@ msgid "I_nsert Comments" msgstr "K_ommentare einfügen" -#: ../src/interface.c:575 ../src/interface.c:2228 +#: ../src/interface.c:575 +#: ../src/interface.c:2228 msgid "Insert ChangeLog Entry" msgstr "ChangeLog-Eintrag hinzufügen" -#: ../src/interface.c:578 ../src/interface.c:2231 +#: ../src/interface.c:578 +#: ../src/interface.c:2231 msgid "Inserts a typical ChangeLog entry in the current file" msgstr "Fügt einen typischen ChangeLog-Eintrag an den Anfang der Datei ein." -#: ../src/interface.c:580 ../src/interface.c:2233 +#: ../src/interface.c:580 +#: ../src/interface.c:2233 msgid "Insert File Header" msgstr "Dateikopf einfügen" -#: ../src/interface.c:583 ../src/interface.c:2236 +#: ../src/interface.c:583 +#: ../src/interface.c:2236 msgid "Inserts a file header at the beginning of the file" msgstr "Fügt einen Dateikopf am Anfang einer neu erzeugten Datei ein." -#: ../src/interface.c:585 ../src/interface.c:2238 +#: ../src/interface.c:585 +#: ../src/interface.c:2238 msgid "Insert Function Description" msgstr "Funktionsbeschreibung einfügen" -#: ../src/interface.c:588 ../src/interface.c:2241 +#: ../src/interface.c:588 +#: ../src/interface.c:2241 msgid "Inserts a description before the current function" msgstr "Fügt eine Funktionsbeschreibung vor der Funktion ein." -#: ../src/interface.c:590 ../src/interface.c:2243 +#: ../src/interface.c:590 +#: ../src/interface.c:2243 msgid "Insert Multiline Comment" msgstr "Mehrzeiligen Kommentar einfügen" -#: ../src/interface.c:593 ../src/interface.c:2246 +#: ../src/interface.c:593 +#: ../src/interface.c:2246 msgid "Inserts a multiline comment" msgstr "Fügt einen mehrzeiligen Kommentar ein." -#: ../src/interface.c:595 ../src/interface.c:2248 +#: ../src/interface.c:595 +#: ../src/interface.c:2248 msgid "Insert GPL Notice" msgstr "GPL-Hinweis einfügen" -#: ../src/interface.c:598 ../src/interface.c:2251 +#: ../src/interface.c:598 +#: ../src/interface.c:2251 msgid "Inserts a GPL notice (should be done at the beginning of the file)" -msgstr "" -"Fügt einen kurzen Lizenz-Hinweis auf die GPL ein (sollte am Anfang einer " -"Datei sein)." +msgstr "Fügt einen kurzen Lizenz-Hinweis auf die GPL ein (sollte am Anfang einer Datei sein)." -#: ../src/interface.c:600 ../src/interface.c:2253 +#: ../src/interface.c:600 +#: ../src/interface.c:2253 msgid "Insert BSD License Notice" msgstr "BSD-Lizenz-Hinweis einfügen" -#: ../src/interface.c:603 ../src/interface.c:2256 -msgid "" -"Inserts a BSD licence notice (should be done at the beginning of the file)" -msgstr "" -"Fügt einen kurzen Lizenz-Hinweis auf die BSD-Lizenz ein (sollte am Anfang " -"einer Datei sein)." +#: ../src/interface.c:603 +#: ../src/interface.c:2256 +msgid "Inserts a BSD licence notice (should be done at the beginning of the file)" +msgstr "Fügt einen kurzen Lizenz-Hinweis auf die BSD-Lizenz ein (sollte am Anfang einer Datei sein)." -#: ../src/interface.c:605 ../src/interface.c:2258 +#: ../src/interface.c:605 +#: ../src/interface.c:2258 msgid "Insert Dat_e" msgstr "_Datum einfügen" @@ -1172,7 +1238,8 @@ msgid "Find in F_iles" msgstr "In _Dateien suchen" -#: ../src/interface.c:665 ../src/search.c:405 +#: ../src/interface.c:665 +#: ../src/search.c:407 msgid "_Replace" msgstr "_Ersetzen" @@ -1200,7 +1267,8 @@ msgid "Change the default font" msgstr "Ändert die Standardschriftart für das Editor-Fenster" -#: ../src/interface.c:729 ../src/keybindings.c:173 +#: ../src/interface.c:729 +#: ../src/keybindings.c:243 msgid "Toggle All Additional Widgets" msgstr "Zusätzliche _Infofenster ausblenden" @@ -1214,8 +1282,7 @@ #: ../src/interface.c:740 msgid "Toggle the window with status and compiler messages on and off" -msgstr "" -"Schaltet das Meldungsfenster (beinhaltet auch Compiler-Ausgaben) ein und aus." +msgstr "Schaltet das Meldungsfenster (beinhaltet auch Compiler-Ausgaben) ein und aus." #: ../src/interface.c:743 msgid "Show _Toolbar" @@ -1234,12 +1301,8 @@ msgstr "M_arkierungsrand anzeigen" #: ../src/interface.c:757 -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, der zum " -"Anzeigen von Markierungen genutzt wird." +msgid "Shows or hides the small margin right of the line numbers, which is used to mark lines." +msgstr "Zeigt oder versteckt den kleinen Rand rechts von den Zeilennummern, der zum Anzeigen von Markierungen genutzt wird." #: ../src/interface.c:760 msgid "Show _Line Numbers" @@ -1257,15 +1320,10 @@ msgid "_Line Wrapping" msgstr "_Zeilenumbruch" -#: ../src/interface.c:793 ../src/interface.c:3722 -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:793 +#: ../src/interface.c:3722 +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:796 msgid "_Auto-indentation" @@ -1319,7 +1377,8 @@ msgid "_Replace Tabs by Spaces" msgstr "_Tabulatoren durch Leerzeichen ersetzen" -#: ../src/interface.c:896 ../src/interface.c:3948 +#: ../src/interface.c:896 +#: ../src/interface.c:3948 msgid "Replaces all tabs in document by spaces." msgstr "Ersetzt alle Tabulatoren im Dokument durch Leerzeichen" @@ -1349,8 +1408,7 @@ #: ../src/interface.c:925 msgid "Removes all error indicators in the current document." -msgstr "" -"Entfernt alle gesetzten (Fehler)-Markierungen innerhalb des Dokumentes." +msgstr "Entfernt alle gesetzten (Fehler)-Markierungen innerhalb des Dokumentes." #: ../src/interface.c:927 msgid "_Project" @@ -1376,25 +1434,21 @@ msgid "_Color Chooser" msgstr "_Farb-Wähler" -#: ../src/interface.c:981 ../src/interface.c:1122 -msgid "" -"Open a color chooser dialog, to interactively pick colors from a palette." -msgstr "" -"Öffnet einen Farbauswahl-Dialog zum Auswählen einer Farbe von einer Palette." +#: ../src/interface.c:981 +#: ../src/interface.c:1122 +msgid "Open a color chooser dialog, to interactively pick colors from a palette." +msgstr "Öffnet einen Farbauswahl-Dialog zum Auswählen einer Farbe von einer Palette." #: ../src/interface.c:987 msgid "_Word Count" msgstr "_Wörter zählen" #: ../src/interface.c:990 -msgid "" -"Counts the words and characters in the current selection or the whole " -"document" -msgstr "" -"Zählt die Wörter und Zeichen in der aktuellen Auswahl bzw. dem aktuellen " -"Dokument." +msgid "Counts the words and characters in the current selection or the whole document" +msgstr "Zählt die Wörter und Zeichen in der aktuellen Auswahl bzw. dem aktuellen Dokument." -#: ../src/interface.c:992 ../src/interface.c:999 +#: ../src/interface.c:992 +#: ../src/interface.c:999 msgid "_Help" msgstr "_Hilfe" @@ -1422,11 +1476,13 @@ msgid "Save the current file" msgstr "Speichert die aktuelle Datei" -#: ../src/interface.c:1048 ../src/keybindings.c:123 +#: ../src/interface.c:1048 +#: ../src/keybindings.c:188 msgid "Save all" msgstr "Alle speichern" -#: ../src/interface.c:1051 ../plugins/autosave.c:152 +#: ../src/interface.c:1051 +#: ../plugins/autosave.c:152 msgid "Save all open files" msgstr "Speichere alle offenen Dateien" @@ -1446,15 +1502,18 @@ msgid "Redo the last modification" msgstr "Wiederholt die letzte Änderung." -#: ../src/interface.c:1089 ../src/keybindings.c:245 +#: ../src/interface.c:1089 +#: ../src/keybindings.c:417 msgid "Navigate back a location" msgstr "Eine Position nach hinten" -#: ../src/interface.c:1095 ../src/keybindings.c:247 +#: ../src/interface.c:1095 +#: ../src/keybindings.c:419 msgid "Navigate forward a location" msgstr "Eine Position nach vorne" -#: ../src/interface.c:1103 ../src/keybindings.c:200 +#: ../src/interface.c:1103 +#: ../src/keybindings.c:269 msgid "Compile" msgstr "Kompilieren" @@ -1482,7 +1541,8 @@ msgid "Increase indentation" msgstr "Einzug erhöhen" -#: ../src/interface.c:1163 ../src/interface.c:1168 +#: ../src/interface.c:1163 +#: ../src/interface.c:1168 msgid "Find the entered text in the current file" msgstr "Findet den eingegebenen Text im aktuellen Dokument" @@ -1494,11 +1554,13 @@ msgid "Jump to the entered line number." msgstr "Springe zu angegebener Zeile" -#: ../src/interface.c:1231 ../src/treeviews.c:108 +#: ../src/interface.c:1231 +#: ../src/treeviews.c:108 msgid "Symbols" msgstr "Symbole" -#: ../src/interface.c:1245 ../src/treeviews.c:261 +#: ../src/interface.c:1245 +#: ../src/treeviews.c:261 msgid "Documents" msgstr "Dokumente" @@ -1518,23 +1580,28 @@ msgid "Scribble" msgstr "Notizen" -#: ../src/interface.c:1943 ../src/interface.c:3424 +#: ../src/interface.c:1943 +#: ../src/interface.c:3424 msgid "Images and text" msgstr "Icons und Text" -#: ../src/interface.c:1949 ../src/interface.c:3456 +#: ../src/interface.c:1949 +#: ../src/interface.c:3456 msgid "Images only" msgstr "Nur Icons" -#: ../src/interface.c:1955 ../src/interface.c:3448 +#: ../src/interface.c:1955 +#: ../src/interface.c:3448 msgid "Text only" msgstr "Nur Text" -#: ../src/interface.c:1966 ../src/interface.c:3440 +#: ../src/interface.c:1966 +#: ../src/interface.c:3440 msgid "Large icons" msgstr "Große Symbole" -#: ../src/interface.c:1971 ../src/interface.c:3432 +#: ../src/interface.c:1971 +#: ../src/interface.c:3432 msgid "Small icons" msgstr "Kleine Symbole" @@ -1550,19 +1617,23 @@ msgid "Insert \"include <...>\"" msgstr "\"include <...>\" einfügen" -#: ../src/interface.c:2291 ../src/keybindings.c:324 +#: ../src/interface.c:2291 +#: ../src/keybindings.c:393 msgid "Find Usage" msgstr "Auftreten finden" -#: ../src/interface.c:2299 ../src/keybindings.c:326 +#: ../src/interface.c:2299 +#: ../src/keybindings.c:410 msgid "Go to Tag Definition" msgstr "Gehe zu Tag Definition" -#: ../src/interface.c:2303 ../src/keybindings.c:328 +#: ../src/interface.c:2303 +#: ../src/keybindings.c:412 msgid "Go to Tag Declaration" msgstr "Gehe zu Tag Deklaration" -#: ../src/interface.c:2307 ../src/keybindings.c:330 +#: ../src/interface.c:2307 +#: ../src/keybindings.c:395 msgid "Context Action" msgstr "Kontextaktion" @@ -1570,7 +1641,8 @@ msgid "Go to the entered line" msgstr "Springe zu angegebener Zeile" -#: ../src/interface.c:2783 ../src/keybindings.c:150 +#: ../src/interface.c:2783 +#: ../src/keybindings.c:217 msgid "Preferences" msgstr "Einstellungen" @@ -1587,13 +1659,8 @@ msgstr "Die Virtual Terminal Emulation (VTE) laden" #: ../src/interface.c:2825 -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 dieser Punkt " -"deaktiviert werden" +msgid "Whether the virtual terminal emulation (VTE) should be loaded at startup. Disable it if you do not need it." +msgstr "Stellt ein, ob die Virtual Terminal Emulation beim Starten geladen werden soll oder nicht. Wenn sie nicht benötigt wird, sollte dieser Punkt deaktiviert werden" #: ../src/interface.c:2828 msgid "Enable plugin support" @@ -1628,12 +1695,8 @@ msgstr "Sitzung im Projekt speichern und wieder öffnen" #: ../src/interface.c:2888 -msgid "" -"Whether to store a project's session files and open them when re-opening the " -"project." -msgstr "" -"Speichert die geöffneten Dateien(aktuelle Sitzung) zusammen mit dem Projekt " -"und öffnet diese Dateien wieder wenn das Projekt geöffnet wird." +msgid "Whether to store a project's session files and open them when re-opening the project." +msgstr "Speichert die geöffneten Dateien(aktuelle Sitzung) zusammen mit dem Projekt und öffnet diese Dateien wieder wenn das Projekt geöffnet wird." #: ../src/interface.c:2891 msgid "Projects" @@ -1644,65 +1707,44 @@ msgstr "Bei Fehlern oder beendeter Kompilierung Piepton ausgeben" #: ../src/interface.c:2913 -msgid "" -"Whether to beep if an error occurred or when the compilation process has " -"finished." -msgstr "" -"Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein Piepton " -"ausgegeben werden soll." +msgid "Whether to beep if an error occurred or when the compilation process has finished." +msgstr "Legt fest, ob bei einem Fehler oder bei beendeter Kompilierung ein Piepton ausgegeben werden soll." #: ../src/interface.c:2916 msgid "Switch to status message list at new message" msgstr "Bei neuen Meldungen zum Statusmeldungsfenster wechseln" #: ../src/interface.c:2919 -msgid "" -"Switch to the status message tab (in the notebook window at the bottom) if a " -"new status message arrives." -msgstr "" -"Automatisch zu dem Statusmeldungsfenster wechseln, wenn eine neue " -"Statusmeldung vorliegt." +msgid "Switch to the status message tab (in the notebook window at the bottom) if a new status message arrives." +msgstr "Automatisch zu dem Statusmeldungsfenster wechseln, wenn eine neue Statusmeldung vorliegt." #: ../src/interface.c:2922 msgid "Suppress status messages in the status bar" msgstr "Statusmeldungen in der Statuszeile unterdrücken" #: ../src/interface.c:2925 -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 das Statusfenster abrufbar." +msgid "Removes all messages from the status bar. The messages are still displayed in the status messages window." +msgstr "Entfernt alle Nachrichten aus der Statuszeile. Die Nachrichten sind weiterhin über das Statusfenster abrufbar." #: ../src/interface.c:2928 msgid "Auto focus widgets (focus follows mouse)" msgstr "Autofokus (Der Fokus folgt der Maus)" #: ../src/interface.c:2931 -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 Terminal." +msgid "Gives the focus automatically to widgets below the mouse cursor. Works for the main editor widget, the scribble, the toolbar search and goto line fields and the VTE." +msgstr "Wenn diese Option aktiviert ist, gibt Geany dem Fenster den Fokus, über dem sich im Moment der Zeiger der Maus befindet. Diese Option funktioniert für das Hauptfenster, das Notizbuch, den Such- und Springe-zu-Feldern in der Werkzeugliste sowie für das Terminal." #: ../src/interface.c:2934 msgid "Always wrap search and hide the Find dialog" msgstr "Das vollständige Dokument durchsuchen und den Suchen-Dialog schließen" #: ../src/interface.c:2938 -msgid "" -"Always wrap search around the document and hide the Find dialog after " -"clicking Find Next/Previous" -msgstr "" -"Immer das vollständige Dokument durchsuchen und den Suchen-Dialog nach " -"Klicken auf Nächstes/Vorheriges schließen." +msgid "Always wrap search around the document and hide the Find dialog after clicking Find Next/Previous" +msgstr "Immer das vollständige Dokument durchsuchen und den Suchen-Dialog nach Klicken auf Nächstes/Vorheriges schließen." -#: ../src/interface.c:2941 ../src/interface.c:3271 ../src/interface.c:3990 +#: ../src/interface.c:2941 +#: ../src/interface.c:3271 +#: ../src/interface.c:3990 msgid "Miscellaneous" msgstr "Sonstiges" @@ -1711,13 +1753,8 @@ msgstr "Startpfad:" #: ../src/interface.c:2974 -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 soll. Der Pfad muss " -"ein absoluter Pfad sein. Um das aktuelle Arbeitsverzeichnis zu benutzen, " -"keinen Pfad eintragen." +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 soll. Der Pfad muss ein absoluter Pfad sein. Um das aktuelle Arbeitsverzeichnis zu benutzen, keinen Pfad eintragen." #: ../src/interface.c:2987 msgid "Project files:" @@ -1763,11 +1800,13 @@ msgid "Symbol list:" msgstr "Symbol-Liste:" -#: ../src/interface.c:3084 ../src/interface.c:3196 +#: ../src/interface.c:3084 +#: ../src/interface.c:3196 msgid "Message window:" msgstr "Meldungsfenster:" -#: ../src/interface.c:3091 ../src/interface.c:3230 +#: ../src/interface.c:3091 +#: ../src/interface.c:3230 msgid "Editor:" msgstr "Editor:" @@ -1796,18 +1835,16 @@ msgstr "Schließenbutton anzeigen" #: ../src/interface.c:3148 -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 in den Dateireitern zum einfachen schließen einer " -"Datei an. (Option benötigt einen Neustart von Geany zum Aktivieren)" +msgid "Shows a small cross button in the file tabs to easily close files when clicking on it (requires restart of Geany)." +msgstr "Zeigt ein kleines Kreuz in den Dateireitern zum einfachen schließen einer Datei an. (Option benötigt einen Neustart von Geany zum Aktivieren)" #: ../src/interface.c:3155 msgid "Placement of new file tabs:" msgstr "Platzierung neuer Dateien:" -#: ../src/interface.c:3160 ../src/interface.c:3208 ../src/interface.c:3225 +#: ../src/interface.c:3160 +#: ../src/interface.c:3208 +#: ../src/interface.c:3225 #: ../src/interface.c:3242 msgid "Left" msgstr "Links" @@ -1816,7 +1853,9 @@ msgid "File tabs will be placed on the left of the notebook" msgstr "Neue Dateien werden links von der Datei-Liste platziert." -#: ../src/interface.c:3168 ../src/interface.c:3209 ../src/interface.c:3226 +#: ../src/interface.c:3168 +#: ../src/interface.c:3209 +#: ../src/interface.c:3226 #: ../src/interface.c:3243 msgid "Right" msgstr "Rechts" @@ -1829,11 +1868,15 @@ msgid "Editor tabs" msgstr "Dateireiter" -#: ../src/interface.c:3210 ../src/interface.c:3227 ../src/interface.c:3244 +#: ../src/interface.c:3210 +#: ../src/interface.c:3227 +#: ../src/interface.c:3244 msgid "Top" msgstr "Oben" -#: ../src/interface.c:3211 ../src/interface.c:3228 ../src/interface.c:3245 +#: ../src/interface.c:3211 +#: ../src/interface.c:3228 +#: ../src/interface.c:3245 msgid "Bottom" msgstr "Unten" @@ -1851,9 +1894,7 @@ #: ../src/interface.c:3269 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:3276 msgid "Interface" @@ -1873,8 +1914,7 @@ #: ../src/interface.c:3323 msgid "Display the New, Open, Close, Save and Reload buttons in the toolbar" -msgstr "" -"Zeigt Symbole für Neu, Öffnen, Schließen und Neuladen in der Werkzeugleiste." +msgstr "Zeigt Symbole für Neu, Öffnen, Schließen und Neuladen in der Werkzeugleiste." #: ../src/interface.c:3326 msgid "Show Redo and Undo buttons" @@ -1882,19 +1922,15 @@ #: ../src/interface.c:3330 msgid "Display the Redo and Undo buttons in the toolbar" -msgstr "" -"Zeigt die Symbole zum Rückgängigmachen und Wiederholen in der Werkzeugleiste." +msgstr "Zeigt die Symbole zum Rückgängigmachen und Wiederholen in der Werkzeugleiste." #: ../src/interface.c:3333 msgid "Show Back and Forward buttons" msgstr "Schaltflächen zur Vorwärts- und Rückwärtsnavigation anzeigen" #: ../src/interface.c:3337 -msgid "" -"Display the Back and Forward buttons in the toolbar used for code navigation" -msgstr "" -"Zeigt die Schaltflächen zur Vorwärts- und Rückwärtsnavigation innerhalb des " -"Quellcodes in der Werkzeugliste an" +msgid "Display the Back and Forward buttons in the toolbar used for code navigation" +msgstr "Zeigt die Schaltflächen zur Vorwärts- und Rückwärtsnavigation innerhalb des Quellcodes in der Werkzeugliste an" #: ../src/interface.c:3340 msgid "Show Compile and Run buttons" @@ -1916,7 +1952,8 @@ msgid "Show Zoom In and Zoom Out buttons" msgstr "Schaltflächen zum Heran- und Wegzoomen anzeigen" -#: ../src/interface.c:3358 ../src/interface.c:3365 +#: ../src/interface.c:3358 +#: ../src/interface.c:3365 msgid "Display the Zoom In and Zoom Out buttons in the toolbar" msgstr "Zeigt die Symbole zum Heran- und Herauszoomen in der Werkzeugleiste." @@ -1982,8 +2019,7 @@ #: ../src/interface.c:3498 msgid "Shows small dotted lines to help you to use the right indentation." -msgstr "" -"Blendet punktierte Linien ein, um die richtige Einrückung zu erleichtern." +msgstr "Blendet punktierte Linien ein, um die richtige Einrückung zu erleichtern." #: ../src/interface.c:3501 msgid "Show white space" @@ -2013,7 +2049,8 @@ msgid "Long line marker color:" msgstr "Farbe der Markierung für statischen Zeilenumbruch:" -#: ../src/interface.c:3548 ../src/interface.c:3686 +#: ../src/interface.c:3548 +#: ../src/interface.c:3686 msgid "Type:" msgstr "Typ:" @@ -2021,47 +2058,32 @@ msgid "Sets the color of the long line marker" msgstr "Stellt die Farbe des \"long line markers\" ein." -#: ../src/interface.c:3561 ../src/tools.c:652 ../src/vte.c:693 -#: ../src/vte.c:700 +#: ../src/interface.c:3561 +#: ../src/tools.c:655 +#: ../src/vte.c:698 +#: ../src/vte.c:705 msgid "Color Chooser" msgstr "Farbwähler" #: ../src/interface.c:3569 -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 Markierung für statischen Zeilenumbruch ist eine dünne Linie im " -"Editorfenster. Sie hilft dabei, lange Zeilen zu markieren und dabei auf " -"einen eventuell notwendigen Zeilenumbruch hinzuweisen. Werte größer als 0 " -"geben die Spalte an, in der die Linie angezeigt werden soll." +msgid "The long line marker is a thin vertical line in the editor. It helps to mark long lines, or as a hint to break the line. Set this value to a value greater than 0 to specify the column where it should appear." +msgstr "Die Markierung für statischen Zeilenumbruch ist eine dünne Linie im Editorfenster. Sie hilft dabei, lange Zeilen zu markieren und dabei auf einen eventuell notwendigen Zeilenumbruch hinzuweisen. Werte größer als 0 geben die Spalte an, in der die Linie angezeigt werden soll." #: ../src/interface.c:3579 msgid "Line" msgstr "Linie" #: ../src/interface.c:3582 -msgid "" -"Prints a vertical line in the editor window at the given cursor position " -"(see below)." -msgstr "" -"Zeichnet eine vertikale Linie im Editorfenster an der angegebenen Cursor-" -"Position (nur sinnvoll mit Festbreitenschriften)." +msgid "Prints a vertical line in the editor window at the given cursor position (see below)." +msgstr "Zeichnet eine vertikale Linie im Editorfenster an der angegebenen Cursor-Position (nur sinnvoll mit Festbreitenschriften)." #: ../src/interface.c:3586 msgid "Background" msgstr "Hintergrund" #: ../src/interface.c:3589 -msgid "" -"The background color of characters after the given cursor position (see " -"below) changed to the color set below. (This is recommended if you use " -"proportional fonts)" -msgstr "" -"Die Hintergrundfarbe der Zeichen, die hinter der angegebenen Cursor-Position" -"(siehe unten) stehen, wird auf die unten angegebene Farbe geändert " -"(nützlich für proportionale Schriftarten)." +msgid "The background color of characters after the given cursor position (see below) changed to the color set below. (This is recommended if you use proportional fonts)" +msgstr "Die Hintergrundfarbe der Zeichen, die hinter der angegebenen Cursor-Position(siehe unten) stehen, wird auf die unten angegebene Farbe geändert (nützlich für proportionale Schriftarten)." #: ../src/interface.c:3593 msgid "Disabled" @@ -2099,20 +2121,14 @@ msgid "Tab width:" msgstr "Tabulatorbreite:" -#: ../src/interface.c:3675 ../src/interface.c:3682 +#: ../src/interface.c:3675 +#: ../src/interface.c:3682 msgid "Whether to use tabs or spaces when indentation is inserted." -msgstr "" -"Legt fest, ob entweder Leerzeichen oder Tabulatoren zum Einrücken genutzt " -"werden sollen." +msgstr "Legt fest, ob entweder Leerzeichen oder Tabulatoren zum Einrücken genutzt werden sollen." #: ../src/interface.c:3698 -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." +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:3700 msgid "Indentation" @@ -2127,27 +2143,15 @@ msgstr "»Intelligente« Pos1-Taste (home) aktivieren" #: ../src/interface.c:3727 -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 Editorzeile. Sollte er sich bereits " -"dort befinden, springt er zum Beginn der kompletten Zeile. Wenn diese Option " -"nicht aktiviert ist, springt der Cursor immer zum Beginn der Zeile ohne auf " -"die aktuelle Position Rücksicht zu nehmen." +msgid "When \"smart\" home is enabled, the HOME key will move the caret to the first non-blank character of the line, unless it is already there, it moves to the very beginning of the line. When this feature is disabled, the HOME key always moves the caret to the start of the current line, regardless of its current position." +msgstr "Wenn die intelligente Pos1-taste (home) aktiviert ist, springt der Cursor bei Tastendruck zum ersten Zeichen der Editorzeile. Sollte er sich bereits dort befinden, springt er zum Beginn der kompletten 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:3730 msgid "Disable Drag and Drop" msgstr "Drag and Drop deaktivieren" #: ../src/interface.c:3733 -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." +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 komplette Editorfenster." #: ../src/interface.c:3736 @@ -2163,24 +2167,16 @@ msgstr "Alle untergeordneten Codeblöcke ebenfalls ein/ausklappen" #: ../src/interface.c:3745 -msgid "" -"Fold or unfold all children of a fold point. By pressing the Shift key while " -"clicking on a fold symbol the contrary behaviour is used." -msgstr "" -"Konnte nicht die Datei in der VTE ausführen weil eventuell ein Befehl auf " -"der Kommandozeile steht." +msgid "Fold or unfold all children of a fold point. By pressing the Shift key while clicking on a fold symbol the contrary behaviour is used." +msgstr "Konnte nicht die Datei in der VTE ausführen weil eventuell ein Befehl auf der Kommandozeile steht." #: ../src/interface.c:3748 msgid "Use indicators to show compile errors" msgstr "Benutzt Markierungen, um Probleme beim Kompilieren anzuzeigen." #: ../src/interface.c:3751 -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 (wellige Unterstreichungen) benutzt werden " -"sollen, um Zeilen mit Fehlern beim Kompiliervorgang zu markieren" +msgid "Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error." +msgstr "Legt fest, ob Markierungen (wellige Unterstreichungen) benutzt werden sollen, um Zeilen mit Fehlern beim Kompiliervorgang zu markieren" #: ../src/interface.c:3754 msgid "Newline strips trailing spaces" @@ -2188,9 +2184,7 @@ #: ../src/interface.c:3757 msgid "Enable newline to strip the trailing spaces on the previous line." -msgstr "" -"Legt fest, ob unnötige Leerzeichen am Ende einer Zeile automatisch beim " -"Wechseln in eine neue Zeile entfernt werden sollen." +msgstr "Legt fest, ob unnötige Leerzeichen am Ende einer Zeile automatisch beim Wechseln in eine neue Zeile entfernt werden sollen." #: ../src/interface.c:3760 msgid "Features" @@ -2201,12 +2195,8 @@ msgstr "Vervollständigung von (Code-)Schnipseln" #: ../src/interface.c:3782 -msgid "" -"Type a defined short character sequence and complete it to a more complex " -"string using a single keypress." -msgstr "" -"Mittels eines Tastenkürzels kann ein kurzer (Code-)Schnipsel zu einem " -"komplexeren Text erweitert werden." +msgid "Type a defined short character sequence and complete it to a more complex string using a single keypress." +msgstr "Mittels eines Tastenkürzels kann ein kurzer (Code-)Schnipsel zu einem komplexeren Text erweitert werden." #: ../src/interface.c:3785 msgid "XML tag autocompletion" @@ -2221,18 +2211,12 @@ msgstr "Automatische Vervollständigung von Symbolen" #: ../src/interface.c:3794 -msgid "" -"Automatic completion of known symbols in open files (function names, global " -"variables, ...)" -msgstr "" -"Automatische Vervollständigung von bekannten Variablen und Funktionsnamen " -"geöffneter Dateien." +msgid "Automatic completion of known symbols in open files (function names, global variables, ...)" +msgstr "Automatische Vervollständigung von bekannten Variablen und Funktionsnamen geöffneter Dateien." #: ../src/interface.c:3809 msgid "Number of rows to display in the autocompletion list." -msgstr "" -"Anzahl der Zeilen, die maximal angezeigt werden sollen, wenn die " -"Autovervollständigungsliste angezeigt wird." +msgstr "Anzahl der Zeilen, die maximal angezeigt werden sollen, wenn die Autovervollständigungsliste angezeigt wird." #: ../src/interface.c:3812 msgid "Characters to type for completion:" @@ -2243,12 +2227,8 @@ msgstr "Anzahl der Zeilen der Vervollständigungsliste:" #: ../src/interface.c:3832 -msgid "" -"The amount of characters which are necessary to show the symbol auto " -"completion list." -msgstr "" -"Die Anzahl der Zeichen, die nötig sind um die Symbol-Vervollständigungsliste " -"anzuzeigen." +msgid "The amount of characters which are necessary to show the symbol auto completion list." +msgstr "Die Anzahl der Zeichen, die nötig sind um die Symbol-Vervollständigungsliste anzuzeigen." #: ../src/interface.c:3835 msgid "Completions" @@ -2279,13 +2259,8 @@ msgstr "Benutze feststehende Kodierung beim Öffnen neuer Dateien" #: ../src/interface.c:3908 -msgid "" -"This option disables the automatic detection of the file encoding when " -"opening 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 Dateien mit der angegebenen Kodierung." +msgid "This option disables the automatic detection of the file encoding when opening 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 Dateien mit der angegebenen Kodierung." #: ../src/interface.c:3911 msgid "New files" @@ -2307,7 +2282,8 @@ msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Entfernt Leerzeichen an Zeilenenden" -#: ../src/interface.c:3944 ../src/keybindings.c:191 +#: ../src/interface.c:3944 +#: ../src/keybindings.c:258 msgid "Replace tabs by space" msgstr "Tabulatoren durch Leerzeichen ersetzen" @@ -2320,11 +2296,12 @@ msgstr "Anzahl der \"Zuletzt geöffneten\" Dateien" #: ../src/interface.c:3986 -msgid "" -"Specifies the number of files which are stored in the Recent files list." +msgid "Specifies the number of files which are stored in the Recent files list." msgstr "Gibt die Länge der Liste von Dateien an, die zuletzt geöffnet wurden." -#: ../src/interface.c:3995 ../src/symbols.c:520 ../plugins/filebrowser.c:812 +#: ../src/interface.c:3995 +#: ../src/symbols.c:545 +#: ../plugins/filebrowser.c:816 msgid "Files" msgstr "Dateien" @@ -2345,12 +2322,8 @@ msgstr "Pfad und spezielle Optionen und / oder Targets für \"make\" angeben." #: ../src/interface.c:4060 -msgid "" -"A terminal emulator like xterm, gnome-terminal or konsole (should accept the " -"-e argument)" -msgstr "" -"Eine Terminal-Emulation wie z.B. xterm, gnome-terminal oder konsole (sie " -"sollte die Option -e akzeptieren)." +msgid "A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)" +msgstr "Eine Terminal-Emulation wie z.B. xterm, gnome-terminal oder konsole (sie sollte die Option -e akzeptieren)." #: ../src/interface.c:4067 msgid "Path (and possibly additional arguments) to your favorite browser" @@ -2370,13 +2343,8 @@ #: ../src/interface.c:4154 #, 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:4167 msgid "Commands" @@ -2459,58 +2427,55 @@ msgid "Use an external command for printing" msgstr "Ein externes Programm zum Drucken benutzen" -#: ../src/interface.c:4382 ../src/printing.c:342 +#: ../src/interface.c:4382 +#: ../src/printing.c:343 msgid "Print line numbers" msgstr "Drucke Zeilennummern" -#: ../src/interface.c:4385 ../src/printing.c:344 +#: ../src/interface.c:4385 +#: ../src/printing.c:345 msgid "Add line numbers to the printed page." msgstr "Zeige Zeilennummern auf der gedruckten Seite" -#: ../src/interface.c:4388 ../src/printing.c:348 +#: ../src/interface.c:4388 +#: ../src/printing.c:349 msgid "Print page numbers" msgstr "Drucke Seitenzahlen" -#: ../src/interface.c:4391 ../src/printing.c:350 -msgid "" -"Add page numbers at the bottom of each page. It takes 2 lines of the page." +#: ../src/interface.c:4391 +#: ../src/printing.c:351 +msgid "Add page numbers at the bottom of each page. It takes 2 lines of the page." msgstr "Füge jeder Seite die Seitenzahlen hinzu. Es werden 2 Zeilen benutzt." -#: ../src/interface.c:4394 ../src/printing.c:354 +#: ../src/interface.c:4394 +#: ../src/printing.c:355 msgid "Print page header" msgstr "Drucke Seitenkopf" -#: ../src/interface.c:4397 ../src/printing.c:356 -msgid "" -"Adds a little header to every page containing the page number, the filename " -"and the current date(see below). It takes 3 lines of the page." -msgstr "" -"Fügt 3 Kopfzeilen am Anfang jeder Seite ein (beinhaltet die Seitenzahl, den " -"Dateinamen sowie das Datum). Es werden 3 Zeilen benutzt." +#: ../src/interface.c:4397 +#: ../src/printing.c:357 +msgid "Adds a little header to every page containing the page number, the filename and the current date(see below). It takes 3 lines of the page." +msgstr "Fügt 3 Kopfzeilen am Anfang jeder Seite ein (beinhaltet die Seitenzahl, den Dateinamen sowie das Datum). Es werden 3 Zeilen benutzt." -#: ../src/interface.c:4415 ../src/printing.c:373 +#: ../src/interface.c:4415 +#: ../src/printing.c:374 msgid "Use the basename of the printed file" msgstr "Basisname der aktuellen Datei benutzen" -#: ../src/interface.c:4418 ../src/printing.c:375 +#: ../src/interface.c:4418 +#: ../src/printing.c:376 msgid "Print only the basename(without the path) of the printed file." -msgstr "" -"Nur den Basisdateinamen(ohne die Pfadangabe) der zu druckenden Datei " -"verwenden." +msgstr "Nur den Basisdateinamen(ohne die Pfadangabe) der zu druckenden Datei verwenden." -#: ../src/interface.c:4425 ../src/printing.c:382 +#: ../src/interface.c:4425 +#: ../src/printing.c:383 msgid "Date format:" msgstr "Datumsformat:" -#: ../src/interface.c:4432 ../src/printing.c:387 -msgid "" -"Specify a format for the date and time stamp which is added to the page " -"header on each page. You can use any conversion specifiers which can be used " -"with the ANSI C strftime function." -msgstr "" -"Geben Sie ein Datumsformat an, dass für jeden Seitenkopf benutzt wird. Dabei " -"können alle Platzhalter verwendet werden, die auch in ANSI C strftime zum " -"Einsatz kommen." +#: ../src/interface.c:4432 +#: ../src/printing.c:388 +msgid "Specify a format for the date and time stamp which is added to the page header on each page. You can use any conversion specifiers which can be used with the ANSI C strftime function." +msgstr "Geben Sie ein Datumsformat an, dass für jeden Seitenkopf benutzt wird. Dabei können alle Platzhalter verwendet werden, die auch in ANSI C strftime zum Einsatz kommen." #: ../src/interface.c:4435 msgid "Use native GTK printing" @@ -2520,507 +2485,501 @@ msgid "Printing" msgstr "Drucken" -#: ../src/keybindings.c:113 +#: ../src/keybindings.c:175 +msgid "File menu" +msgstr "Datei-Menü" + +#: ../src/keybindings.c:178 msgid "New" msgstr "Neu" -#: ../src/keybindings.c:115 +#: ../src/keybindings.c:180 msgid "Open" msgstr "Öffnen" -#: ../src/keybindings.c:117 +#: ../src/keybindings.c:182 msgid "Open selected file" msgstr "Markierte Datei öffnen" -#: ../src/keybindings.c:119 +#: ../src/keybindings.c:184 msgid "Save" msgstr "Speichern" -#: ../src/keybindings.c:121 +#: ../src/keybindings.c:186 msgid "Save as" msgstr "Speichern unter" -#: ../src/keybindings.c:125 +#: ../src/keybindings.c:190 msgid "Print" msgstr "Drucken" -#: ../src/keybindings.c:127 +#: ../src/keybindings.c:192 msgid "Close" msgstr "Schließen" -#: ../src/keybindings.c:129 +#: ../src/keybindings.c:194 msgid "Close all" msgstr "Alle Schließen" -#: ../src/keybindings.c:131 +#: ../src/keybindings.c:196 msgid "Reload file" msgstr "Neu laden" -#: ../src/keybindings.c:133 +#: ../src/keybindings.c:198 msgid "Project properties" msgstr "Projekt-Eigenschaften" -#: ../src/keybindings.c:136 +#: ../src/keybindings.c:200 +msgid "Edit menu" +msgstr "Bearbeiten-Menü" + +#: ../src/keybindings.c:203 msgid "Undo" msgstr "Zurück" -#: ../src/keybindings.c:138 +#: ../src/keybindings.c:205 msgid "Redo" msgstr "Wiederholen" -#: ../src/keybindings.c:140 +#: ../src/keybindings.c:207 msgid "Cut" msgstr "Ausschneiden" -#: ../src/keybindings.c:142 +#: ../src/keybindings.c:209 msgid "Copy" msgstr "Kopieren" -#: ../src/keybindings.c:144 +#: ../src/keybindings.c:211 msgid "Paste" msgstr "Einfügen" -#: ../src/keybindings.c:146 +#: ../src/keybindings.c:213 msgid "Select All" msgstr "Alles ersetzen" -#: ../src/keybindings.c:148 +#: ../src/keybindings.c:215 msgid "Insert date" msgstr "Datum einfügen" -#: ../src/keybindings.c:154 ../src/search.c:275 +#: ../src/keybindings.c:219 +msgid "Search menu" +msgstr "Suchen-Menü" + +#: ../src/keybindings.c:222 +#: ../src/search.c:277 msgid "Find" msgstr "Suchen" -#: ../src/keybindings.c:156 +#: ../src/keybindings.c:224 msgid "Find Next" msgstr "Weitersuchen" -#: ../src/keybindings.c:158 +#: ../src/keybindings.c:226 msgid "Find Previous" msgstr "Vorheriges" -#: ../src/keybindings.c:160 +#: ../src/keybindings.c:228 msgid "Find Next Selection" msgstr "Auswahl vorwärts im Dokument finden " -#: ../src/keybindings.c:162 +#: ../src/keybindings.c:230 msgid "Find Previous Selection" msgstr "Auswahl rückwärts im Dokument finden" -#: ../src/keybindings.c:164 ../src/search.c:395 +#: ../src/keybindings.c:232 +#: ../src/search.c:397 msgid "Replace" msgstr "Ersetzen" -#: ../src/keybindings.c:166 ../src/search.c:546 +#: ../src/keybindings.c:234 +#: ../src/search.c:546 msgid "Find in Files" msgstr "In Dateien suchen" -#: ../src/keybindings.c:168 +#: ../src/keybindings.c:236 msgid "Next Message" msgstr "Nächste Nachricht" -#: ../src/keybindings.c:175 +#: ../src/keybindings.c:240 +msgid "View menu" +msgstr "Ansicht-Menü" + +#: ../src/keybindings.c:245 msgid "Fullscreen" msgstr "Vollbild" -#: ../src/keybindings.c:177 +#: ../src/keybindings.c:247 msgid "Toggle Messages Window" msgstr "Meldungsfenster verstecken" -#: ../src/keybindings.c:179 +#: ../src/keybindings.c:249 msgid "Toggle Sidebar" msgstr "Seitenleiste ausblenden" -#: ../src/keybindings.c:181 +#: ../src/keybindings.c:251 msgid "Zoom In" msgstr "Hineinzoomen" -#: ../src/keybindings.c:183 +#: ../src/keybindings.c:253 msgid "Zoom Out" msgstr "Herauszoomen" -#: ../src/keybindings.c:186 -msgid "Show Color Chooser" -msgstr "Farbwähler öffnen" +#: ../src/keybindings.c:255 +msgid "Document menu" +msgstr "Dokument-Menü" -#: ../src/keybindings.c:188 -msgid "Insert Special HTML Characters" -msgstr "HTML-Sonderzeichen einfügen" - -#: ../src/keybindings.c:193 +#: ../src/keybindings.c:260 msgid "Fold all" msgstr "Alle einklappen" -#: ../src/keybindings.c:195 +#: ../src/keybindings.c:262 msgid "Unfold all" msgstr "Alle ausklappen" -#: ../src/keybindings.c:197 +#: ../src/keybindings.c:264 msgid "Reload symbol list" msgstr "Symbol-Ansicht neuladen" -#: ../src/keybindings.c:202 +#: ../src/keybindings.c:266 +msgid "Build menu" +msgstr "Erstellen-Menü" + +#: ../src/keybindings.c:271 msgid "Build" msgstr "Erstellen" -#: ../src/keybindings.c:204 +#: ../src/keybindings.c:273 msgid "Make all" msgstr "Make all" -#: ../src/keybindings.c:207 +#: ../src/keybindings.c:276 msgid "Make custom target" msgstr "Make mit eigenem Target" -#: ../src/keybindings.c:209 +#: ../src/keybindings.c:278 msgid "Make object" msgstr "Make Objekt-Datei" -#: ../src/keybindings.c:211 +#: ../src/keybindings.c:280 msgid "Next error" msgstr "Nächster Fehler" -#: ../src/keybindings.c:213 +#: ../src/keybindings.c:282 msgid "Run" msgstr "Ausführen" -#: ../src/keybindings.c:215 +#: ../src/keybindings.c:284 msgid "Run (alternative command)" msgstr "Ausführen (alternativer Befehl)" -#: ../src/keybindings.c:217 +#: ../src/keybindings.c:286 msgid "Build options" msgstr "Optionen bei der Erzeugung" -#: ../src/keybindings.c:220 +#: ../src/keybindings.c:288 +msgid "Tools menu" +msgstr "Werkzeugmenü" + +#: ../src/keybindings.c:291 +msgid "Show Color Chooser" +msgstr "Farbwähler öffnen" + +#: ../src/keybindings.c:293 +msgid "Insert Special HTML Characters" +msgstr "HTML-Sonderzeichen einfügen" + +#: ../src/keybindings.c:295 +msgid "Help menu" +msgstr "Hilfe-Menü" + +#: ../src/keybindings.c:298 msgid "Help" msgstr "Hilfe" -#: ../src/keybindings.c:223 +#: ../src/keybindings.c:300 +msgid "Focus commands" +msgstr "Fokus-Kommandos" + +#: ../src/keybindings.c:303 msgid "Switch to Editor" msgstr "Zum Editor wechseln" -#: ../src/keybindings.c:225 +#: ../src/keybindings.c:305 msgid "Switch to Scribble" msgstr "Zu den Notizen wechseln " -#: ../src/keybindings.c:227 +#: ../src/keybindings.c:307 msgid "Switch to VTE" msgstr "Zur VTE wechseln" -#: ../src/keybindings.c:229 +#: ../src/keybindings.c:309 msgid "Switch to Search Bar" msgstr "Zu dem Suchfenster wechseln " -#: ../src/keybindings.c:231 +#: ../src/keybindings.c:311 +msgid "Notebook tab commands" +msgstr "Dateireiter-Kommandos" + +#: ../src/keybindings.c:314 msgid "Switch to left document" msgstr "Zum linken Dokument wechseln" -#: ../src/keybindings.c:233 +#: ../src/keybindings.c:316 msgid "Switch to right document" msgstr "Zum rechten Dokument wechseln" -#: ../src/keybindings.c:235 +#: ../src/keybindings.c:318 msgid "Switch to last used document" msgstr "Zum letzten Dokument wechseln" -#: ../src/keybindings.c:237 +#: ../src/keybindings.c:320 msgid "Move document left" msgstr "Dateireiter nach links verschieben" -#: ../src/keybindings.c:239 +#: ../src/keybindings.c:322 msgid "Move document right" msgstr "Dateireiter nach rechts verschieben" -#: ../src/keybindings.c:241 +#: ../src/keybindings.c:324 msgid "Move document first" msgstr "Dateireiter an den Anfang verschieben" -#: ../src/keybindings.c:243 +#: ../src/keybindings.c:326 msgid "Move document last" msgstr "Dateireiter ans Ende verschieben" -#: ../src/keybindings.c:250 +#: ../src/keybindings.c:328 +msgid "Editing commands" +msgstr "Editor-Kommandos" + +#: ../src/keybindings.c:331 msgid "Duplicate line or selection" msgstr "Zeile oder Auswahl kopieren" -#: ../src/keybindings.c:252 +#: ../src/keybindings.c:333 msgid "Delete current line(s)" msgstr "Aktuelle Zeile(n) löschen" -#: ../src/keybindings.c:254 +#: ../src/keybindings.c:335 msgid "Copy current line(s)" msgstr "Aktuelle Zeile(n) kopieren" -#: ../src/keybindings.c:256 +#: ../src/keybindings.c:337 msgid "Cut current line(s)" msgstr "Aktuelle Zeile(n) ausschneiden" -#: ../src/keybindings.c:258 +#: ../src/keybindings.c:339 msgid "Transpose current line" msgstr "Aktuelle Zeile tauschen" -#: ../src/keybindings.c:260 +#: ../src/keybindings.c:341 msgid "Toggle Case of Selection" msgstr "Groß- und Kleinschreibung bei Auswahl vertauschen" -#: ../src/keybindings.c:262 +#: ../src/keybindings.c:343 msgid "Toggle line commentation" msgstr "Kommentierung umschalten" -#: ../src/keybindings.c:264 +#: ../src/keybindings.c:345 msgid "Comment line(s)" msgstr "Zeile(n) auskommentieren" -#: ../src/keybindings.c:266 +#: ../src/keybindings.c:347 msgid "Uncomment line(s)" msgstr "Zeile(n) einkommentieren" -#: ../src/keybindings.c:268 +#: ../src/keybindings.c:349 msgid "Increase indent" msgstr "Einzug erhöhen" -#: ../src/keybindings.c:270 +#: ../src/keybindings.c:351 msgid "Decrease indent" msgstr "Einzug verringern" -#: ../src/keybindings.c:272 +#: ../src/keybindings.c:353 msgid "Increase indent by one space" msgstr "Einzug um ein Leerzeichen erhöhen" -#: ../src/keybindings.c:274 +#: ../src/keybindings.c:355 msgid "Decrease indent by one space" msgstr "Einzug um ein Leerzeichen verringern" -#: ../src/keybindings.c:276 +#: ../src/keybindings.c:357 msgid "Smart line indent" msgstr "Intelligentes Einrücken" -#: ../src/keybindings.c:278 +#: ../src/keybindings.c:359 msgid "Send to Custom Command 1" msgstr "Zum 1. benutzerdefinierten Kommando senden" -#: ../src/keybindings.c:280 +#: ../src/keybindings.c:361 msgid "Send to Custom Command 2" msgstr "Zum 2. benutzerdefinierten Kommando senden" -#: ../src/keybindings.c:282 +#: ../src/keybindings.c:363 msgid "Send to Custom Command 3" msgstr "Zum 3. benutzerdefinierten Kommando senden" -#: ../src/keybindings.c:285 +#: ../src/keybindings.c:366 msgid "Go to matching brace" msgstr "Springe zur passenden Klammer" -#: ../src/keybindings.c:288 +#: ../src/keybindings.c:369 msgid "Toggle marker" msgstr "Markierung setzen" -#: ../src/keybindings.c:291 +#: ../src/keybindings.c:372 msgid "Go to next marker" msgstr "Zur nächsten Markierung springen" -#: ../src/keybindings.c:294 +#: ../src/keybindings.c:375 msgid "Go to previous marker" msgstr "Zur vorherigen Markierung springen" -#: ../src/keybindings.c:297 -msgid "Complete word" -msgstr "Vervollständige Wort" - -#: ../src/keybindings.c:299 -msgid "Show calltip" -msgstr "Calltip anzeigen" - -#: ../src/keybindings.c:301 -msgid "Show macro list" -msgstr "Zeige Makroliste" - -#. has special callback -#: ../src/keybindings.c:303 -msgid "Complete snippet" -msgstr "Vervollständige (Code-)Schnipsel" - -#: ../src/keybindings.c:305 -msgid "Suppress snippet completion" -msgstr "Vervollständigung von (Code-)Schnipseln unterdrücken" - -#: ../src/keybindings.c:308 +#: ../src/keybindings.c:377 msgid "Select current word" msgstr "Aktuelles Wort auswählen" -#: ../src/keybindings.c:310 +#: ../src/keybindings.c:379 msgid "Select current line(s)" msgstr "Aktuelle Zeile(n) auswählen" -#: ../src/keybindings.c:312 +#: ../src/keybindings.c:381 msgid "Select current paragraph" msgstr "Aktuellen Absatz auswählen" -#: ../src/keybindings.c:314 +#: ../src/keybindings.c:383 msgid "Scroll to current line" msgstr "Zu aktuellen Zeile scrollen" -#: ../src/keybindings.c:316 +#: ../src/keybindings.c:385 msgid "Scroll up the view by one line" msgstr "Scrollt um eine Zeile nach oben" -#: ../src/keybindings.c:318 +#: ../src/keybindings.c:387 msgid "Scroll down the view by one line" msgstr "Scrollt um eine Zeile nach unten" -#: ../src/keybindings.c:321 +#: ../src/keybindings.c:389 msgid "Insert alternative whitespace" msgstr "Alternative Leerzeichen einfügen" -#. set section name -#: ../src/keybindings.c:369 -msgid "File menu" -msgstr "Datei-Menü" +#: ../src/keybindings.c:397 +msgid "Tag commands" +msgstr "Tag-Kommandos" -#: ../src/keybindings.c:370 -msgid "Edit menu" -msgstr "Bearbeiten-Menü" +#: ../src/keybindings.c:400 +msgid "Complete word" +msgstr "Vervollständige Wort" -#: ../src/keybindings.c:371 -msgid "Search menu" -msgstr "Suchen-Menü" +#: ../src/keybindings.c:402 +msgid "Show calltip" +msgstr "Calltip anzeigen" -#: ../src/keybindings.c:372 -msgid "View menu" -msgstr "Ansicht-Menü" +#: ../src/keybindings.c:404 +msgid "Show macro list" +msgstr "Zeige Makroliste" -#: ../src/keybindings.c:373 -msgid "Document menu" -msgstr "Dokument-Menü" +#. has special callback +#: ../src/keybindings.c:406 +msgid "Complete snippet" +msgstr "Vervollständige (Code-)Schnipsel" -#: ../src/keybindings.c:374 -msgid "Build menu" -msgstr "Erstellen-Menü" +#: ../src/keybindings.c:408 +msgid "Suppress snippet completion" +msgstr "Vervollständigung von (Code-)Schnipseln unterdrücken" -#: ../src/keybindings.c:375 -msgid "Tools menu" -msgstr "Werkzeugmenü" - -#: ../src/keybindings.c:376 -msgid "Help menu" -msgstr "Hilfe-Menü" - -#: ../src/keybindings.c:377 -msgid "Focus commands" -msgstr "Fokus-Kommandos" - -#: ../src/keybindings.c:378 -msgid "Notebook tab commands" -msgstr "Dateireiter-Kommandos" - -#: ../src/keybindings.c:379 -msgid "Editing commands" -msgstr "Editor-Kommandos" - -#: ../src/keybindings.c:380 -msgid "Tag commands" -msgstr "Tag-Kommandos" - -#: ../src/keybindings.c:381 +#: ../src/keybindings.c:414 msgid "Other commands" msgstr "Andere Kommandos" -#: ../src/keybindings.c:564 +#. tmp +#: ../src/keybindings.c:667 msgid "Keyboard Shortcuts" msgstr "Tastenkürzel" -#: ../src/keybindings.c:576 +#: ../src/keybindings.c:679 msgid "The following keyboard shortcuts are configurable:" msgstr "Die folgende Tastenkürzel sind frei definierbar: " -#: ../src/keyfile.c:700 +#: ../src/keyfile.c:705 msgid "Type here what you want, use it as a notice/scratch board" -msgstr "" -"Schreiben Sie hier rein, was sie möchten. Sie können es als Notizbuch nutzen." +msgstr "Schreiben Sie hier rein, was sie möchten. Sie können es als Notizbuch nutzen." -#: ../src/keyfile.c:885 +#: ../src/keyfile.c:890 msgid "Failed to load one or more session files." -msgstr "" -"Eine oder mehre Datei(en) aus der letzten Sitzung konnte(n) nicht geladen " -"werden." +msgstr "Eine oder mehre Datei(en) aus der letzten Sitzung konnte(n) nicht geladen werden." -#: ../src/main.c:119 -msgid "" -"Set initial column number for the first opened file (useful in conjunction " -"with --line)" -msgstr "" -"Setzt die Spaltennummer in der zuerst geöffneten Datei. Sinnvoll nur in " -"Kombination mit der Option -l oder --line." - #: ../src/main.c:120 +msgid "Set initial column number for the first opened file (useful in conjunction with --line)" +msgstr "Setzt die Spaltennummer in der zuerst geöffneten Datei. Sinnvoll nur in Kombination mit der Option -l oder --line." + +#: ../src/main.c:121 msgid "Use an alternate configuration directory" msgstr "Benutzt ein anderes Verzeichnis für die Konfigurationsdateien" -#: ../src/main.c:121 +#: ../src/main.c:122 msgid "Runs in debug mode (means being verbose)" msgstr "Geany im Debug-Modus ausführen (Gesprächig!)" -#: ../src/main.c:122 +#: ../src/main.c:123 msgid "Print internal filetype names" msgstr "Listet die unterstützen Dateitypen auf" -#: ../src/main.c:123 +#: ../src/main.c:124 msgid "Generate global tags file (see documentation)" msgstr "Erstelle globale Tag-Datei (Dokumentation beachten!)" -#: ../src/main.c:127 +#: ../src/main.c:128 msgid "Don't open files in a running instance, force opening a new instance" -msgstr "" -"Dateien nicht in einer bereits laufenden Instanz, sondern in einer neuen " -"Instanz öffnen." +msgstr "Dateien nicht in einer bereits laufenden Instanz, sondern in einer neuen Instanz öffnen." -#: ../src/main.c:129 +#: ../src/main.c:130 msgid "Set initial line number for the first opened file" msgstr "Setzt die Zeilennummer in der zuerst geöffneten Datei" -#: ../src/main.c:130 +#: ../src/main.c:131 msgid "Don't show message window at startup" msgstr "Kein Meldungsfenster beim Starten anzeigen" -#: ../src/main.c:131 +#: ../src/main.c:132 msgid "Don't load auto completion data (see documentation)" msgstr "Autovervollständigungsdaten nicht laden (Dokumentation beachten)" -#: ../src/main.c:133 +#: ../src/main.c:134 msgid "Don't load plugins" msgstr "Plugins nicht laden" -#: ../src/main.c:135 +#: ../src/main.c:136 msgid "Print Geany's installation prefix" msgstr "Geany's Installationsverzeichnis ausgeben" -#: ../src/main.c:136 +#: ../src/main.c:137 msgid "don't load the previous session's files" msgstr "Dateien aus der letzten Sitzung nicht laden" -#: ../src/main.c:138 +#: ../src/main.c:139 msgid "Don't load terminal support" msgstr "Die virtual terminal emulation (VTE) nicht starten" -#: ../src/main.c:139 +#: ../src/main.c:140 msgid "Filename of libvte.so" msgstr "Name der libvte.so" -#: ../src/main.c:141 +#: ../src/main.c:142 msgid "Show version and exit" msgstr "Versionsinformation anzeigen und Programm beenden" -#: ../src/main.c:428 +#: ../src/main.c:499 msgid "[FILES...]" msgstr "[Dateien...]" -#: ../src/main.c:450 +#: ../src/main.c:516 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "(kompiliert am %s mit GTK %d.%d.%d, GLib %d.%d.%d)" -#: ../src/main.c:567 +#: ../src/main.c:631 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -3031,17 +2990,18 @@ "Es könnte zu Problemen bei der Verwendung von Geany kommen.\n" "Geany trotzdem starten?" -#: ../src/main.c:620 ../src/socket.c:143 +#: ../src/main.c:695 +#: ../src/socket.c:156 #, c-format msgid "Could not find file '%s'." msgstr "Konnte die Datei %s nicht finden." -#: ../src/main.c:767 +#: ../src/main.c:842 #, c-format msgid "This is Geany %s." msgstr "Willkommen zu Geany %s." -#: ../src/main.c:769 +#: ../src/main.c:844 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Konfigurationsverzeichnis konnte nicht erstellt werden (%s)." @@ -3050,15 +3010,15 @@ msgid "Status messages" msgstr "Meldungen" -#: ../src/msgwindow.c:436 +#: ../src/msgwindow.c:438 msgid "_Hide Message Window" msgstr "Meldungs_fenster ausblenden" -#: ../src/plugins.c:579 +#: ../src/plugins.c:583 msgid "Plugin Manager" msgstr "Plugin Manager" -#: ../src/plugins.c:707 +#: ../src/plugins.c:711 #, c-format msgid "" "Plugin: %s %s\n" @@ -3069,147 +3029,121 @@ "Beschreibung: %s\n" "Autor(en): %s" -#: ../src/plugins.c:768 +#: ../src/plugins.c:772 msgid "Active" msgstr "Aktiv" -#: ../src/plugins.c:774 +#: ../src/plugins.c:778 msgid "Plugin" msgstr "Plugin" -#: ../src/plugins.c:780 +#: ../src/plugins.c:784 msgid "File" msgstr "Datei" -#: ../src/plugins.c:798 +#: ../src/plugins.c:802 msgid "No plugins available." msgstr "Keine Plugins vorhanden." -#: ../src/plugins.c:843 +#: ../src/plugins.c:847 msgid "Plugins" msgstr "Plugins" -#: ../src/plugins.c:864 -msgid "" -"Below is a list of available plugins. Select the plugins which should be " -"loaded when Geany is started." -msgstr "" -"Unten ist eine Liste mit verfügbaren Plugins. Wählen Sie die Plugins aus, " -"die beim Starten Geany geladen werden sollen." +#: ../src/plugins.c:868 +msgid "Below is a list of available plugins. Select the plugins which should be loaded when Geany is started." +msgstr "Unten ist eine Liste mit verfügbaren Plugins. Wählen Sie die Plugins aus, die beim Starten Geany geladen werden sollen." -#: ../src/plugins.c:872 +#: ../src/plugins.c:876 msgid "Plugin details:" msgstr "Plugin-Details" -#: ../src/prefs.c:105 +#: ../src/prefs.c:106 msgid "Action" msgstr "Aktion" -#: ../src/prefs.c:110 +#: ../src/prefs.c:111 msgid "Shortcut" msgstr "Tastenkürzel" -#: ../src/prefs.c:1075 +#: ../src/prefs.c:1081 msgid "Grab Key" msgstr "Tasten festlegen" -#: ../src/prefs.c:1081 +#: ../src/prefs.c:1087 #, c-format msgid "Type the combination of the keys you want to use for \"%s\"" msgstr "Welche Tastenkombination soll für \"%s\" benutzt werden?" -#: ../src/prefs.c:1233 +#: ../src/prefs.c:1274 msgid "_Override" msgstr "_Ersetzen" -#: ../src/prefs.c:1234 +#: ../src/prefs.c:1275 msgid "Override that keybinding?" msgstr "Diese Tastenkombination ersetzen?" -#: ../src/prefs.c:1235 +#: ../src/prefs.c:1276 #, c-format msgid "The combination '%s' is already used for \"%s\"." msgstr "Die Tastenkombination '%s' wird bereits für \"%s\" verwendet." #. add manually GeanyWrapLabels because it can't be added with Glade -#. page Tools -#: ../src/prefs.c:1343 +#. * page Tools +#: ../src/prefs.c:1382 msgid "Enter tool paths below. Tools you do not need can be left blank." -msgstr "" -"Geben Sie hier die Pfade zu den einzelnen Werkzeugen an (Programme, die " -"nicht benötigt werden, können freigelassen werden)." +msgstr "Geben Sie hier die Pfade zu den einzelnen Werkzeugen an (Programme, die nicht benötigt werden, können freigelassen werden)." #. page Templates -#: ../src/prefs.c:1348 -msgid "" -"Set the information to be used in templates. See the documentation for " -"details." +#: ../src/prefs.c:1387 +msgid "Set the information to be used in templates. See the documentation for details." msgstr "" -"Geben Sie hier die Informationen an, die in den Vorlagen benutzt werden " -"sollen.\n" -"Konsultieren Sie die Dokumentation, um mehr über die Arbeitsweise der " -"Vorlagen zu erfahren." +"Geben Sie hier die Informationen an, die in den Vorlagen benutzt werden sollen.\n" +"Konsultieren Sie die Dokumentation, um mehr über die Arbeitsweise der Vorlagen zu erfahren." -#: ../src/prefs.c:1352 -msgid "" -"Notice: For all changes you make here to take effect, you need to restart " -"Geany." -msgstr "" -"Damit die hier gemachten Änderungen an den Einstellungen wirksam werden, " -"muss Geany neu gestartet werden" +#: ../src/prefs.c:1391 +msgid "Notice: For all changes you make here to take effect, you need to restart Geany." +msgstr "Damit die hier gemachten Änderungen an den Einstellungen wirksam werden, muss Geany neu gestartet werden" #. page Keybindings -#: ../src/prefs.c:1358 -msgid "" -"Here you can change keyboard shortcuts for various actions. Select one and " -"press the Change button to enter a new shortcut, or double click on an " -"action to edit the string representation of the shortcut directly." -msgstr "" -"Hier können die Tastenkombinationen für verschiedene Aktionen innerhalb von " -"Geany festgelegt bzw. verändert werden. Um eine Tastenkombination zu ändern, " -"einfach Doppelklicken oder markieren und auf Ändern klicken. Zudem können " -"die Tastenkombinationen auch direkt eingegeben werden." +#: ../src/prefs.c:1397 +msgid "Here you can change keyboard shortcuts for various actions. Select one and press the Change button to enter a new shortcut, or double click on an action to edit the string representation of the shortcut directly." +msgstr "Hier können die Tastenkombinationen für verschiedene Aktionen innerhalb von Geany festgelegt bzw. verändert werden. Um eine Tastenkombination zu ändern, einfach Doppelklicken oder markieren und auf Ändern klicken. Zudem können die Tastenkombinationen auch direkt eingegeben werden." #. page Printing -#: ../src/prefs.c:1363 -msgid "" -"Notice: Native GTK printing is only available if Geany was built against " -"GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." -msgstr "" -"GTK-Druckunterstützung ist nur verfügbar wenn Geany mit GTK 2.10 (oder " -"neuer) kompiliert wurde und Geany mit GTK 2.10 (oder neuer) " -"ausgeführt wird." +#: ../src/prefs.c:1402 +msgid "Notice: Native GTK printing is only available if Geany was built against GTK 2.10 (or above) and Geany is running with GTK 2.10 (or above)." +msgstr "GTK-Druckunterstützung ist nur verfügbar wenn Geany mit GTK 2.10 (oder neuer) kompiliert wurde und Geany mit GTK 2.10 (oder neuer) ausgeführt wird." -#: ../src/printing.c:269 +#: ../src/printing.c:270 #, c-format msgid "Page %d of %d" msgstr "Seite %d von %d" -#: ../src/printing.c:337 +#: ../src/printing.c:338 msgid "Document Setup" msgstr "Dokument einrichten" -#: ../src/printing.c:724 +#: ../src/printing.c:728 #, c-format msgid "Printing of file %s was cancelled." msgstr "Drucken der Datei \"%s\" wurde abgebrochen." -#: ../src/printing.c:726 ../src/printing.c:843 +#: ../src/printing.c:730 +#: ../src/printing.c:849 #, c-format msgid "File %s printed." msgstr "Datei %s wurde gedruckt." -#: ../src/printing.c:774 +#: ../src/printing.c:779 #, c-format msgid "Printing of %s failed (%s)." msgstr "Drucken der Datei \"%s\" ist fehlgeschlagen (%s)." -#: ../src/printing.c:814 +#: ../src/printing.c:819 msgid "Please set a print command in the preferences dialog first" -msgstr "" -"Bitte geben Sie zuerst einen befehl zum Drucken im einstellungsdialog an" +msgstr "Bitte geben Sie zuerst einen befehl zum Drucken im einstellungsdialog an" -#: ../src/printing.c:822 +#: ../src/printing.c:827 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -3220,13 +3154,13 @@ "\n" "%s" -#: ../src/printing.c:837 +#: ../src/printing.c:843 #, c-format msgid "Printing of \"%s\" failed (return code: %s)." msgstr "Drucken der Datei \"%s\" ist fehlgeschlagen (Rückgabewert: %s)." #. "projects" is part of the default project base path so be careful when translating -#. please avoid special characters and spaces, look at the source for details or ask Frank +#. * please avoid special characters and spaces, look at the source for details or ask Frank #: ../src/project.c:90 msgid "projects" msgstr "Projekte" @@ -3239,39 +3173,40 @@ msgid "C_reate" msgstr "_Erstellen" @@ 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: [2297] branches/plugin-keybindings
by ntrel＠users.sourceforge.net 29 Feb '08

29 Feb '08

Revision: 2297 http://geany.svn.sourceforge.net/geany/?rev=2297&view=rev Author: ntrel Date: 2008-02-29 11:30:28 -0800 (Fri, 29 Feb 2008) Log Message: ----------- Change keybindings code to use keybinding groups, each with a separate enum set, which will make the plugin ABI more stable, and lay the groundwork for plugin keybindings support. Note: this breaks the plugin API. Disable setting menu accelerators (temporary). Disable Keyboard Shortcuts dialog (temporary). Disable snippets completion (temporary). Disable focus commands in the VTE (temporary). Make Tags group use separate cb_func_tags callback. Rename keybindings_cmd() to keybindings_send_command(). Add keybindings_lookup_item(). Modified Paths: -------------- branches/plugin-keybindings/ChangeLog branches/plugin-keybindings/plugins/filebrowser.c branches/plugin-keybindings/src/build.c branches/plugin-keybindings/src/callbacks.c branches/plugin-keybindings/src/keybindings.c branches/plugin-keybindings/src/keybindings.h branches/plugin-keybindings/src/plugindata.h branches/plugin-keybindings/src/plugins.c branches/plugin-keybindings/src/prefs.c branches/plugin-keybindings/src/tools.c Modified: branches/plugin-keybindings/ChangeLog =================================================================== --- branches/plugin-keybindings/ChangeLog 2008-02-29 18:56:41 UTC (rev 2296) +++ branches/plugin-keybindings/ChangeLog 2008-02-29 19:30:28 UTC (rev 2297) @@ -1,3 +1,21 @@ +2008-02-29 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/build.c, src/keybindings.c, src/keybindings.h, src/tools.c, + src/prefs.c, src/plugindata.h, src/callbacks.c, src/plugins.c, + plugins/filebrowser.c: + Change keybindings code to use keybinding groups, each with a + separate enum set, which will make the plugin ABI more stable, + and lay the groundwork for plugin keybindings support. + Note: this breaks the plugin API. + Disable setting menu accelerators (temporary). + Disable Keyboard Shortcuts dialog (temporary). + Disable snippets completion (temporary). + Disable focus commands in the VTE (temporary). + Make Tags group use separate cb_func_tags callback. + Rename keybindings_cmd() to keybindings_send_command(). + Add keybindings_lookup_item(). + + 2008-02-28 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/utils.c, src/utils.h, tagmanager/parse.h: Modified: branches/plugin-keybindings/plugins/filebrowser.c =================================================================== --- branches/plugin-keybindings/plugins/filebrowser.c 2008-02-29 18:56:41 UTC (rev 2296) +++ branches/plugin-keybindings/plugins/filebrowser.c 2008-02-29 19:30:28 UTC (rev 2297) @@ -495,6 +495,12 @@ } +static void on_hide_sidebar(void) +{ + p_keybindings->send_command(GEANY_KEYGROUP_VIEW, GEANY_KEYS_MENU_SIDEBAR); +} + + static GtkWidget *create_popup_menu(void) { GtkWidget *item, *menu, *image; @@ -545,9 +551,7 @@ gtk_image_new_from_stock("gtk-close", GTK_ICON_SIZE_MENU)); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); - g_signal_connect_swapped((gpointer) item, "activate", - G_CALLBACK(p_keybindings->send_command), - GINT_TO_POINTER(GEANY_KEYS_MENU_SIDEBAR)); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_hide_sidebar), NULL); return menu; } Modified: branches/plugin-keybindings/src/build.c =================================================================== --- branches/plugin-keybindings/src/build.c 2008-02-29 18:56:41 UTC (rev 2296) +++ branches/plugin-keybindings/src/build.c 2008-02-29 19:30:28 UTC (rev 2297) @@ -1087,10 +1087,14 @@ } +#if 1 /* tmp */ +#define GEANY_ADD_WIDGET_ACCEL(gkey, menuitem) +#else #define GEANY_ADD_WIDGET_ACCEL(gkey, menuitem) \ if (keys[(gkey)]->key != 0) \ gtk_widget_add_accelerator(menuitem, "activate", accel_group, \ keys[(gkey)]->key, keys[(gkey)]->mods, GTK_ACCEL_VISIBLE) +#endif static void create_build_menu_gen(BuildMenuItems *menu_items) { Modified: branches/plugin-keybindings/src/callbacks.c =================================================================== --- branches/plugin-keybindings/src/callbacks.c 2008-02-29 18:56:41 UTC (rev 2296) +++ branches/plugin-keybindings/src/callbacks.c 2008-02-29 19:30:28 UTC (rev 2297) @@ -654,7 +654,7 @@ { if (event->keyval == GDK_Escape) { - keybindings_cmd(GEANY_KEYS_SWITCH_EDITOR); + keybindings_send_command(GEANY_KEYGROUP_FOCUS, GEANY_KEYS_SWITCH_EDITOR); return TRUE; } return FALSE; @@ -925,7 +925,7 @@ if (! sci_can_copy(sci)) { - keybindings_cmd(GEANY_KEYS_EDIT_SELECTWORD); + keybindings_send_command(GEANY_KEYGROUP_EDITING, GEANY_KEYS_EDIT_SELECTWORD); keep_sel = FALSE; } @@ -1114,7 +1114,7 @@ on_compile_button_clicked (GtkToolButton *toolbutton, gpointer user_data) { - keybindings_cmd(GEANY_KEYS_BUILD_COMPILE); + keybindings_send_command(GEANY_KEYGROUP_BUILD, GEANY_KEYS_BUILD_COMPILE); } @@ -1562,7 +1562,7 @@ on_run_button_clicked (GtkToolButton *toolbutton, gpointer user_data) { - keybindings_cmd(GEANY_KEYS_BUILD_RUN); + keybindings_send_command(GEANY_KEYGROUP_BUILD, GEANY_KEYS_BUILD_RUN); } @@ -1718,7 +1718,7 @@ on_menu_duplicate_line1_activate (GtkMenuItem *menuitem, gpointer user_data) { - keybindings_cmd(GEANY_KEYS_EDIT_DUPLICATELINE); + keybindings_send_command(GEANY_KEYGROUP_EDITING, GEANY_KEYS_EDIT_DUPLICATELINE); } Modified: branches/plugin-keybindings/src/keybindings.c =================================================================== --- branches/plugin-keybindings/src/keybindings.c 2008-02-29 18:56:41 UTC (rev 2296) +++ branches/plugin-keybindings/src/keybindings.c 2008-02-29 19:30:28 UTC (rev 2297) @@ -46,15 +46,13 @@ #include "vte.h" -KeyBinding *keys[GEANY_MAX_KEYS]; +GPtrArray *keybinding_groups; /* array of KeyBindingGroup pointers */ +static const gchar default_group_name[] = "Bindings"; + static const gboolean swap_alt_tab_order = FALSE; -/* simple convenience function to allocate and fill the struct */ -static KeyBinding *fill(KBCallback func, guint key, GdkModifierType mod, const gchar *name, - const gchar *label); - static void cb_func_file_action(guint key_id); static void cb_func_menu_print(guint key_id); @@ -96,11 +94,14 @@ static void cb_func_nav_forward(guint key_id); static void cb_func_toggle_sidebar(guint key_id); +/* common function for global editing keybindings. */ +static void cb_func_editing_global(guint key_id); + /* common function for editing keybindings, only valid when scintilla has focus. */ -static void cb_func_edit(guint key_id); +static void cb_func_editing(guint key_id); -/* common function for global editing keybindings. */ -static void cb_func_edit_global(guint key_id); +/* common function for tags keybindings, only valid when scintilla has focus. */ +static void cb_func_tags(guint key_id); /* common function for keybindings using current word */ static void cb_func_current_word(guint key_id); @@ -108,254 +109,364 @@ static void add_menu_accels(void); +/* simple convenience function to fill a KeyBinding struct item */ +static void add_kb(KeyBindingGroup *group, gsize kb_id, + KBCallback func, guint key, GdkModifierType mod, + const gchar *name, const gchar *label) +{ + KeyBinding *kb; + + g_assert(kb_id < group->count); + + kb = &group->keys[kb_id]; + + kb->name = name; + kb->label = label; + kb->key = key; + kb->mods = mod; + kb->cb_func = func; +} + + +static KeyBindingGroup *add_kb_group(KeyBindingGroup *group, + const gchar *name, const gchar *label, gsize count, KeyBinding *keys) +{ + g_ptr_array_add(keybinding_groups, group); + + group->name = name; + group->label = label; + group->count = count; + group->keys = keys; + return group; +} + + +/* Expansion for group_id = FILE: + * static KeyBinding FILE_keys[GEANY_KEYS_FILE_COUNT]; */ +#define DECLARE_KEYS(group_id) \ + static KeyBinding group_id ## _keys[GEANY_KEYS_ ## group_id ## _COUNT] + +/* Expansion for group_id = FILE: + * add_kb_group(&groups[GEANY_KEYGROUP_FILE], NULL, _("File menu"), + * GEANY_KEYS_FILE_COUNT, FILE_keys); */ +#define ADD_KB_GROUP(group_id, label) \ + add_kb_group(&groups[GEANY_KEYGROUP_ ## group_id], default_group_name, label, \ + GEANY_KEYS_ ## group_id ## _COUNT, group_id ## _keys) + +/* init all fields of keys with default values. */ static void init_default_kb(void) { - /* init all fields of keys with default values */ - keys[GEANY_KEYS_MENU_NEW] = fill(cb_func_file_action, + static KeyBindingGroup groups[GEANY_KEYGROUP_COUNT]; + KeyBindingGroup *group; + DECLARE_KEYS(FILE); + DECLARE_KEYS(EDIT); + DECLARE_KEYS(SEARCH); + DECLARE_KEYS(VIEW); + DECLARE_KEYS(DOCUMENT); + DECLARE_KEYS(BUILD); + DECLARE_KEYS(TOOLS); + DECLARE_KEYS(HELP); + DECLARE_KEYS(FOCUS); + DECLARE_KEYS(NOTEBOOK); + DECLARE_KEYS(EDITING); + DECLARE_KEYS(TAGS); + DECLARE_KEYS(OTHER); + + group = ADD_KB_GROUP(FILE, _("File menu")); + + add_kb(group, GEANY_KEYS_MENU_NEW, cb_func_file_action, GDK_n, GDK_CONTROL_MASK, "menu_new", _("New")); - keys[GEANY_KEYS_MENU_OPEN] = fill(cb_func_file_action, + add_kb(group, GEANY_KEYS_MENU_OPEN, cb_func_file_action, GDK_o, GDK_CONTROL_MASK, "menu_open", _("Open")); - keys[GEANY_KEYS_MENU_OPENSELECTED] = fill(cb_func_file_action, + add_kb(group, GEANY_KEYS_MENU_OPENSELECTED, cb_func_file_action, GDK_o, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "menu_open_selected", _("Open selected file")); - keys[GEANY_KEYS_MENU_SAVE] = fill(cb_func_file_action, + add_kb(group, GEANY_KEYS_MENU_SAVE, cb_func_file_action, GDK_s, GDK_CONTROL_MASK, "menu_save", _("Save")); - keys[GEANY_KEYS_MENU_SAVEAS] = fill(cb_func_file_action, + add_kb(group, GEANY_KEYS_MENU_SAVEAS, cb_func_file_action, 0, 0, "menu_saveas", _("Save as")); - keys[GEANY_KEYS_MENU_SAVEALL] = fill(cb_func_file_action, + add_kb(group, GEANY_KEYS_MENU_SAVEALL, cb_func_file_action, GDK_S, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "menu_saveall", _("Save all")); - keys[GEANY_KEYS_MENU_PRINT] = fill(cb_func_menu_print, + add_kb(group, GEANY_KEYS_MENU_PRINT, cb_func_menu_print, GDK_p, GDK_CONTROL_MASK, "menu_print", _("Print")); - keys[GEANY_KEYS_MENU_CLOSE] = fill(cb_func_file_action, + add_kb(group, GEANY_KEYS_MENU_CLOSE, cb_func_file_action, GDK_w, GDK_CONTROL_MASK, "menu_close", _("Close")); - keys[GEANY_KEYS_MENU_CLOSEALL] = fill(cb_func_file_action, + add_kb(group, GEANY_KEYS_MENU_CLOSEALL, cb_func_file_action, GDK_w, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "menu_closeall", _("Close all")); - keys[GEANY_KEYS_MENU_RELOADFILE] = fill(cb_func_file_action, + add_kb(group, GEANY_KEYS_MENU_RELOADFILE, cb_func_file_action, GDK_r, GDK_CONTROL_MASK, "menu_reloadfile", _("Reload file")); - keys[GEANY_KEYS_MENU_PROJECTPROPERTIES] = fill(cb_func_file_action, + add_kb(group, GEANY_KEYS_MENU_PROJECTPROPERTIES, cb_func_file_action, 0, 0, "project_properties", _("Project properties")); - keys[GEANY_KEYS_MENU_UNDO] = fill(cb_func_menu_undo, + group = ADD_KB_GROUP(EDIT, _("Edit menu")); + + add_kb(group, GEANY_KEYS_MENU_UNDO, cb_func_menu_undo, GDK_z, GDK_CONTROL_MASK, "menu_undo", _("Undo")); - keys[GEANY_KEYS_MENU_REDO] = fill(cb_func_menu_redo, + add_kb(group, GEANY_KEYS_MENU_REDO, cb_func_menu_redo, GDK_y, GDK_CONTROL_MASK, "menu_redo", _("Redo")); - keys[GEANY_KEYS_MENU_CUT] = fill(cb_func_clipboard, + add_kb(group, GEANY_KEYS_MENU_CUT, cb_func_clipboard, GDK_x, GDK_CONTROL_MASK, "menu_cut", _("Cut")); - keys[GEANY_KEYS_MENU_COPY] = fill(cb_func_clipboard, + add_kb(group, GEANY_KEYS_MENU_COPY, cb_func_clipboard, GDK_c, GDK_CONTROL_MASK, "menu_copy", _("Copy")); - keys[GEANY_KEYS_MENU_PASTE] = fill(cb_func_clipboard, + add_kb(group, GEANY_KEYS_MENU_PASTE, cb_func_clipboard, GDK_v, GDK_CONTROL_MASK, "menu_paste", _("Paste")); - keys[GEANY_KEYS_MENU_SELECTALL] = fill(cb_func_menu_selectall, + add_kb(group, GEANY_KEYS_MENU_SELECTALL, cb_func_menu_selectall, GDK_a, GDK_CONTROL_MASK, "menu_selectall", _("Select All")); - keys[GEANY_KEYS_MENU_INSERTDATE] = fill(cb_func_menu_insert_date, + add_kb(group, GEANY_KEYS_MENU_INSERTDATE, cb_func_menu_insert_date, GDK_d, GDK_SHIFT_MASK | GDK_MOD1_MASK, "menu_insert_date", _("Insert date")); - keys[GEANY_KEYS_MENU_PREFERENCES] = fill(cb_func_menu_preferences, + add_kb(group, GEANY_KEYS_MENU_PREFERENCES, cb_func_menu_preferences, GDK_p, GDK_CONTROL_MASK | GDK_MOD1_MASK, "menu_preferences", _("Preferences")); - /* search */ - keys[GEANY_KEYS_MENU_FIND] = fill(cb_func_menu_search, + group = ADD_KB_GROUP(SEARCH, _("Search menu")); + + add_kb(group, GEANY_KEYS_MENU_FIND, cb_func_menu_search, GDK_f, GDK_CONTROL_MASK, "menu_find", _("Find")); - keys[GEANY_KEYS_MENU_FINDNEXT] = fill(cb_func_menu_search, + add_kb(group, GEANY_KEYS_MENU_FINDNEXT, cb_func_menu_search, GDK_g, GDK_CONTROL_MASK, "menu_findnext", _("Find Next")); - keys[GEANY_KEYS_MENU_FINDPREVIOUS] = fill(cb_func_menu_search, + add_kb(group, GEANY_KEYS_MENU_FINDPREVIOUS, cb_func_menu_search, GDK_g, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "menu_findprevious", _("Find Previous")); - keys[GEANY_KEYS_MENU_FINDNEXTSEL] = fill(cb_func_menu_search, + add_kb(group, GEANY_KEYS_MENU_FINDNEXTSEL, cb_func_menu_search, 0, 0, "menu_findnextsel", _("Find Next Selection")); - keys[GEANY_KEYS_MENU_FINDPREVSEL] = fill(cb_func_menu_search, + add_kb(group, GEANY_KEYS_MENU_FINDPREVSEL, cb_func_menu_search, 0, 0, "menu_findprevsel", _("Find Previous Selection")); - keys[GEANY_KEYS_MENU_REPLACE] = fill(cb_func_menu_search, + add_kb(group, GEANY_KEYS_MENU_REPLACE, cb_func_menu_search, GDK_h, GDK_CONTROL_MASK, "menu_replace", _("Replace")); - keys[GEANY_KEYS_MENU_FINDINFILES] = fill(cb_func_menu_search, GDK_f, + add_kb(group, GEANY_KEYS_MENU_FINDINFILES, cb_func_menu_search, GDK_f, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "menu_findinfiles", _("Find in Files")); - keys[GEANY_KEYS_MENU_NEXTMESSAGE] = fill(cb_func_menu_search, + add_kb(group, GEANY_KEYS_MENU_NEXTMESSAGE, cb_func_menu_search, 0, 0, "menu_nextmessage", _("Next Message")); - keys[GEANY_KEYS_MENU_GOTOLINE] = fill(cb_func_menu_search, + add_kb(group, GEANY_KEYS_MENU_GOTOLINE, cb_func_menu_search, GDK_l, GDK_CONTROL_MASK, "menu_gotoline", _("Go to Line")); - keys[GEANY_KEYS_MENU_TOGGLEALL] = fill(cb_func_menu_toggle_all, + group = ADD_KB_GROUP(VIEW, _("View menu")); + + add_kb(group, GEANY_KEYS_MENU_TOGGLEALL, cb_func_menu_toggle_all, 0, 0, "menu_toggleall", _("Toggle All Additional Widgets")); - keys[GEANY_KEYS_MENU_FULLSCREEN] = fill(cb_func_menu_fullscreen, + add_kb(group, GEANY_KEYS_MENU_FULLSCREEN, cb_func_menu_fullscreen, GDK_F11, 0, "menu_fullscreen", _("Fullscreen")); - keys[GEANY_KEYS_MENU_MESSAGEWINDOW] = fill(cb_func_menu_messagewindow, + add_kb(group, GEANY_KEYS_MENU_MESSAGEWINDOW, cb_func_menu_messagewindow, 0, 0, "menu_messagewindow", _("Toggle Messages Window")); - keys[GEANY_KEYS_MENU_SIDEBAR] = fill(cb_func_toggle_sidebar, + add_kb(group, GEANY_KEYS_MENU_SIDEBAR, cb_func_toggle_sidebar, 0, 0, "toggle_sidebar", _("Toggle Sidebar")); - keys[GEANY_KEYS_MENU_ZOOMIN] = fill(cb_func_menu_zoomin, + add_kb(group, GEANY_KEYS_MENU_ZOOMIN, cb_func_menu_zoomin, GDK_plus, GDK_CONTROL_MASK, "menu_zoomin", _("Zoom In")); - keys[GEANY_KEYS_MENU_ZOOMOUT] = fill(cb_func_menu_zoomout, + add_kb(group, GEANY_KEYS_MENU_ZOOMOUT, cb_func_menu_zoomout, GDK_minus, GDK_CONTROL_MASK, "menu_zoomout", _("Zoom Out")); - keys[GEANY_KEYS_MENU_OPENCOLORCHOOSER] = fill(cb_func_menu_opencolorchooser, - 0, 0, "menu_opencolorchooser", _("Show Color Chooser")); - keys[GEANY_KEYS_MENU_INSERTSPECIALCHARS] = fill(cb_func_menu_insert_specialchars, - 0, 0, "menu_insert_specialchars", _("Insert Special HTML Characters")); + group = ADD_KB_GROUP(DOCUMENT, _("Document menu")); - keys[GEANY_KEYS_MENU_REPLACETABS] = fill(cb_func_menu_replacetabs, + add_kb(group, GEANY_KEYS_MENU_REPLACETABS, cb_func_menu_replacetabs, 0, 0, "menu_replacetabs", _("Replace tabs by space")); - keys[GEANY_KEYS_MENU_FOLDALL] = fill(cb_func_menu_foldall, + add_kb(group, GEANY_KEYS_MENU_FOLDALL, cb_func_menu_foldall, 0, 0, "menu_foldall", _("Fold all")); - keys[GEANY_KEYS_MENU_UNFOLDALL] = fill(cb_func_menu_unfoldall, + add_kb(group, GEANY_KEYS_MENU_UNFOLDALL, cb_func_menu_unfoldall, 0, 0, "menu_unfoldall", _("Unfold all")); - keys[GEANY_KEYS_RELOADTAGLIST] = fill(cb_func_reloadtaglist, + add_kb(group, GEANY_KEYS_RELOADTAGLIST, cb_func_reloadtaglist, GDK_r, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "reloadtaglist", _("Reload symbol list")); - keys[GEANY_KEYS_BUILD_COMPILE] = fill(cb_func_build_action, + group = ADD_KB_GROUP(BUILD, _("Build menu")); + + add_kb(group, GEANY_KEYS_BUILD_COMPILE, cb_func_build_action, GDK_F8, 0, "build_compile", _("Compile")); - keys[GEANY_KEYS_BUILD_LINK] = fill(cb_func_build_action, + add_kb(group, GEANY_KEYS_BUILD_LINK, cb_func_build_action, GDK_F9, 0, "build_link", _("Build")); - keys[GEANY_KEYS_BUILD_MAKE] = fill(cb_func_build_action, + add_kb(group, GEANY_KEYS_BUILD_MAKE, cb_func_build_action, GDK_F9, GDK_SHIFT_MASK, "build_make", _("Make all")); - keys[GEANY_KEYS_BUILD_MAKEOWNTARGET] = fill(cb_func_build_action, + add_kb(group, GEANY_KEYS_BUILD_MAKEOWNTARGET, cb_func_build_action, GDK_F9, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "build_makeowntarget", _("Make custom target")); - keys[GEANY_KEYS_BUILD_MAKEOBJECT] = fill(cb_func_build_action, + add_kb(group, GEANY_KEYS_BUILD_MAKEOBJECT, cb_func_build_action, 0, 0, "build_makeobject", _("Make object")); - keys[GEANY_KEYS_BUILD_NEXTERROR] = fill(cb_func_build_action, + add_kb(group, GEANY_KEYS_BUILD_NEXTERROR, cb_func_build_action, 0, 0, "build_nexterror", _("Next error")); - keys[GEANY_KEYS_BUILD_RUN] = fill(cb_func_build_action, + add_kb(group, GEANY_KEYS_BUILD_RUN, cb_func_build_action, GDK_F5, 0, "build_run", _("Run")); - keys[GEANY_KEYS_BUILD_RUN2] = fill(cb_func_build_action, + add_kb(group, GEANY_KEYS_BUILD_RUN2, cb_func_build_action, 0, 0, "build_run2", _("Run (alternative command)")); - keys[GEANY_KEYS_BUILD_OPTIONS] = fill(cb_func_build_action, + add_kb(group, GEANY_KEYS_BUILD_OPTIONS, cb_func_build_action, 0, 0, "build_options", _("Build options")); - keys[GEANY_KEYS_MENU_HELP] = fill(cb_func_menu_help, + group = ADD_KB_GROUP(TOOLS, _("Tools menu")); + + add_kb(group, GEANY_KEYS_MENU_OPENCOLORCHOOSER, cb_func_menu_opencolorchooser, + 0, 0, "menu_opencolorchooser", _("Show Color Chooser")); + add_kb(group, GEANY_KEYS_MENU_INSERTSPECIALCHARS, cb_func_menu_insert_specialchars, + 0, 0, "menu_insert_specialchars", _("Insert Special HTML Characters")); + + group = ADD_KB_GROUP(HELP, _("Help menu")); + + add_kb(group, GEANY_KEYS_MENU_HELP, cb_func_menu_help, GDK_F1, 0, "menu_help", _("Help")); - keys[GEANY_KEYS_SWITCH_EDITOR] = fill(cb_func_switch_editor, + group = ADD_KB_GROUP(FOCUS, _("Focus commands")); + + add_kb(group, GEANY_KEYS_SWITCH_EDITOR, cb_func_switch_editor, GDK_F2, 0, "switch_editor", _("Switch to Editor")); - keys[GEANY_KEYS_SWITCH_SCRIBBLE] = fill(cb_func_switch_scribble, + add_kb(group, GEANY_KEYS_SWITCH_SCRIBBLE, cb_func_switch_scribble, GDK_F6, 0, "switch_scribble", _("Switch to Scribble")); - keys[GEANY_KEYS_SWITCH_VTE] = fill(cb_func_switch_vte, + add_kb(group, GEANY_KEYS_SWITCH_VTE, cb_func_switch_vte, GDK_F4, 0, "switch_vte", _("Switch to VTE")); - keys[GEANY_KEYS_SWITCH_SEARCH_BAR] = fill(cb_func_switch_search_bar, + add_kb(group, GEANY_KEYS_SWITCH_SEARCH_BAR, cb_func_switch_search_bar, GDK_F7, 0, "switch_search_bar", _("Switch to Search Bar")); - keys[GEANY_KEYS_SWITCH_TABLEFT] = fill(cb_func_switch_tableft, + + group = ADD_KB_GROUP(NOTEBOOK, _("Notebook tab commands")); + + add_kb(group, GEANY_KEYS_SWITCH_TABLEFT, cb_func_switch_tableft, GDK_Page_Up, GDK_CONTROL_MASK, "switch_tableft", _("Switch to left document")); - keys[GEANY_KEYS_SWITCH_TABRIGHT] = fill(cb_func_switch_tabright, + add_kb(group, GEANY_KEYS_SWITCH_TABRIGHT, cb_func_switch_tabright, GDK_Page_Down, GDK_CONTROL_MASK, "switch_tabright", _("Switch to right document")); - keys[GEANY_KEYS_SWITCH_TABLASTUSED] = fill(cb_func_switch_tablastused, + add_kb(group, GEANY_KEYS_SWITCH_TABLASTUSED, cb_func_switch_tablastused, GDK_Tab, GDK_CONTROL_MASK, "switch_tablastused", _("Switch to last used document")); - keys[GEANY_KEYS_MOVE_TABLEFT] = fill(cb_func_move_tab, + add_kb(group, GEANY_KEYS_MOVE_TABLEFT, cb_func_move_tab, GDK_Page_Up, GDK_MOD1_MASK, "move_tableft", _("Move document left")); - keys[GEANY_KEYS_MOVE_TABRIGHT] = fill(cb_func_move_tab, + add_kb(group, GEANY_KEYS_MOVE_TABRIGHT, cb_func_move_tab, GDK_Page_Down, GDK_MOD1_MASK, "move_tabright", _("Move document right")); - keys[GEANY_KEYS_MOVE_TABFIRST] = fill(cb_func_move_tab, + add_kb(group, GEANY_KEYS_MOVE_TABFIRST, cb_func_move_tab, 0, 0, "move_tabfirst", _("Move document first")); - keys[GEANY_KEYS_MOVE_TABLAST] = fill(cb_func_move_tab, + add_kb(group, GEANY_KEYS_MOVE_TABLAST, cb_func_move_tab, 0, 0, "move_tablast", _("Move document last")); - keys[GEANY_KEYS_NAV_BACK] = fill(cb_func_nav_back, - 0, 0, "nav_back", _("Navigate back a location")); - keys[GEANY_KEYS_NAV_FORWARD] = fill(cb_func_nav_forward, - 0, 0, "nav_forward", _("Navigate forward a location")); - keys[GEANY_KEYS_EDIT_DUPLICATELINE] = fill(cb_func_edit, + group = ADD_KB_GROUP(EDITING, _("Editing commands")); + + add_kb(group, GEANY_KEYS_EDIT_DUPLICATELINE, cb_func_editing, GDK_d, GDK_CONTROL_MASK, "edit_duplicateline", _("Duplicate line or selection")); - keys[GEANY_KEYS_EDIT_DELETELINE] = fill(cb_func_edit, + add_kb(group, GEANY_KEYS_EDIT_DELETELINE, cb_func_editing, GDK_k, GDK_CONTROL_MASK, "edit_deleteline", _("Delete current line(s)")); - keys[GEANY_KEYS_EDIT_COPYLINE] = fill(cb_func_edit, + add_kb(group, GEANY_KEYS_EDIT_COPYLINE, cb_func_editing, GDK_c, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "edit_copyline", _("Copy current line(s)")); - keys[GEANY_KEYS_EDIT_CUTLINE] = fill(cb_func_edit, + add_kb(group, GEANY_KEYS_EDIT_CUTLINE, cb_func_editing, GDK_x, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "edit_cutline", _("Cut current line(s)")); - keys[GEANY_KEYS_EDIT_TRANSPOSELINE] = fill(cb_func_edit, + add_kb(group, GEANY_KEYS_EDIT_TRANSPOSELINE, cb_func_editing, GDK_t, GDK_CONTROL_MASK, "edit_transposeline", _("Transpose current line")); - keys[GEANY_KEYS_EDIT_TOGGLECASE] = fill(cb_func_edit, + add_kb(group, GEANY_KEYS_EDIT_TOGGLECASE, cb_func_editing, GDK_u, GDK_CONTROL_MASK | GDK_MOD1_MASK, "edit_togglecase", _("Toggle Case of Selection")); - keys[GEANY_KEYS_EDIT_COMMENTLINETOGGLE] = fill(cb_func_edit, + add_kb(group, GEANY_KEYS_EDIT_COMMENTLINETOGGLE, cb_func_editing, GDK_e, GDK_CONTROL_MASK, "edit_commentlinetoggle", _("Toggle line commentation")); - keys[GEANY_KEYS_EDIT_COMMENTLINE] = fill(cb_func_edit, + add_kb(group, GEANY_KEYS_EDIT_COMMENTLINE, cb_func_editing, 0, 0, "edit_commentline", _("Comment line(s)")); - keys[GEANY_KEYS_EDIT_UNCOMMENTLINE] = fill(cb_func_edit, + add_kb(group, GEANY_KEYS_EDIT_UNCOMMENTLINE, cb_func_editing, 0, 0, "edit_uncommentline", _("Uncomment line(s)")); - keys[GEANY_KEYS_EDIT_INCREASEINDENT] = fill(cb_func_edit, + add_kb(group, GEANY_KEYS_EDIT_INCREASEINDENT, cb_func_editing, GDK_i, GDK_CONTROL_MASK, "edit_increaseindent", _("Increase indent")); - keys[GEANY_KEYS_EDIT_DECREASEINDENT] = fill(cb_func_edit, + add_kb(group, GEANY_KEYS_EDIT_DECREASEINDENT, cb_func_editing, GDK_u, GDK_CONTROL_MASK, "edit_decreaseindent", _("Decrease indent")); - keys[GEANY_KEYS_EDIT_INCREASEINDENTBYSPACE] = fill(cb_func_edit, + add_kb(group, GEANY_KEYS_EDIT_INCREASEINDENTBYSPACE, cb_func_editing, 0, 0, "edit_increaseindentbyspace", _("Increase indent by one space")); - keys[GEANY_KEYS_EDIT_DECREASEINDENTBYSPACE] = fill(cb_func_edit, + add_kb(group, GEANY_KEYS_EDIT_DECREASEINDENTBYSPACE, cb_func_editing, 0, 0, "edit_decreaseindentbyspace", _("Decrease indent by one space")); - keys[GEANY_KEYS_EDIT_AUTOINDENT] = fill(cb_func_edit, + add_kb(group, GEANY_KEYS_EDIT_AUTOINDENT, cb_func_editing, 0, 0, "edit_autoindent", _("Smart line indent")); - keys[GEANY_KEYS_EDIT_SENDTOCMD1] = fill(cb_func_edit, + add_kb(group, GEANY_KEYS_EDIT_SENDTOCMD1, cb_func_editing, GDK_1, GDK_CONTROL_MASK, "edit_sendtocmd1", _("Send to Custom Command 1")); - keys[GEANY_KEYS_EDIT_SENDTOCMD2] = fill(cb_func_edit, + add_kb(group, GEANY_KEYS_EDIT_SENDTOCMD2, cb_func_editing, GDK_2, GDK_CONTROL_MASK, "edit_sendtocmd2", _("Send to Custom Command 2")); - keys[GEANY_KEYS_EDIT_SENDTOCMD3] = fill(cb_func_edit, + add_kb(group, GEANY_KEYS_EDIT_SENDTOCMD3, cb_func_editing, GDK_3, GDK_CONTROL_MASK, "edit_sendtocmd3", _("Send to Custom Command 3")); - keys[GEANY_KEYS_EDIT_GOTOMATCHINGBRACE] = fill(cb_func_edit_global, + add_kb(group, GEANY_KEYS_EDIT_GOTOMATCHINGBRACE, cb_func_editing_global, GDK_b, GDK_CONTROL_MASK, "edit_gotomatchingbrace", _("Go to matching brace")); - keys[GEANY_KEYS_EDIT_TOGGLEMARKER] = fill(cb_func_edit_global, + add_kb(group, GEANY_KEYS_EDIT_TOGGLEMARKER, cb_func_editing_global, GDK_m, GDK_CONTROL_MASK, "edit_togglemarker", _("Toggle marker")); - keys[GEANY_KEYS_EDIT_GOTONEXTMARKER] = fill(cb_func_edit_global, + add_kb(group, GEANY_KEYS_EDIT_GOTONEXTMARKER, cb_func_editing_global, GDK_period, GDK_CONTROL_MASK, "edit_gotonextmarker", _("Go to next marker")); - keys[GEANY_KEYS_EDIT_GOTOPREVIOUSMARKER] = fill(cb_func_edit_global, + add_kb(group, GEANY_KEYS_EDIT_GOTOPREVIOUSMARKER, cb_func_editing_global, GDK_comma, GDK_CONTROL_MASK, "edit_gotopreviousmarker", _("Go to previous marker")); - - keys[GEANY_KEYS_EDIT_AUTOCOMPLETE] = fill(cb_func_edit, - GDK_space, GDK_CONTROL_MASK, "edit_autocomplete", _("Complete word")); - keys[GEANY_KEYS_EDIT_CALLTIP] = fill(cb_func_edit, - GDK_space, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "edit_calltip", _("Show calltip")); - keys[GEANY_KEYS_EDIT_MACROLIST] = fill(cb_func_edit, - GDK_Return, GDK_CONTROL_MASK, "edit_macrolist", _("Show macro list")); - keys[GEANY_KEYS_EDIT_COMPLETESNIPPET] = fill(NULL, /* has special callback */ - GDK_Tab, 0, "edit_completesnippet", _("Complete snippet")); - keys[GEANY_KEYS_EDIT_SUPPRESSSNIPPETCOMPLETION] = fill(cb_func_edit, - 0, 0, "edit_suppresssnippetcompletion", _("Suppress snippet completion")); - - keys[GEANY_KEYS_EDIT_SELECTWORD] = fill(cb_func_edit, + add_kb(group, GEANY_KEYS_EDIT_SELECTWORD, cb_func_editing, GDK_w, GDK_SHIFT_MASK | GDK_MOD1_MASK, "edit_selectword", _("Select current word")); - keys[GEANY_KEYS_EDIT_SELECTLINE] = fill(cb_func_edit, + add_kb(group, GEANY_KEYS_EDIT_SELECTLINE, cb_func_editing, GDK_l, GDK_SHIFT_MASK | GDK_MOD1_MASK, "edit_selectline", _("Select current line(s)")); - keys[GEANY_KEYS_EDIT_SELECTPARAGRAPH] = fill(cb_func_edit, + add_kb(group, GEANY_KEYS_EDIT_SELECTPARAGRAPH, cb_func_editing, GDK_p, GDK_SHIFT_MASK | GDK_MOD1_MASK, "edit_selectparagraph", _("Select current paragraph")); - keys[GEANY_KEYS_EDIT_SCROLLTOLINE] = fill(cb_func_edit, + add_kb(group, GEANY_KEYS_EDIT_SCROLLTOLINE, cb_func_editing, GDK_l, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "edit_scrolltoline", _("Scroll to current line")); - keys[GEANY_KEYS_EDIT_SCROLLLINEUP] = fill(cb_func_edit, + add_kb(group, GEANY_KEYS_EDIT_SCROLLLINEUP, cb_func_editing, GDK_Up, GDK_MOD1_MASK, "edit_scrolllineup", _("Scroll up the view by one line")); - keys[GEANY_KEYS_EDIT_SCROLLLINEDOWN] = fill(cb_func_edit, + add_kb(group, GEANY_KEYS_EDIT_SCROLLLINEDOWN, cb_func_editing, GDK_Down, GDK_MOD1_MASK, "edit_scrolllinedown", _("Scroll down the view by one line")); - - keys[GEANY_KEYS_EDIT_INSERTALTWHITESPACE] = fill(cb_func_edit, + add_kb(group, GEANY_KEYS_EDIT_INSERTALTWHITESPACE, cb_func_editing, 0, 0, "edit_insertwhitespace", _("Insert alternative whitespace")); - keys[GEANY_KEYS_POPUP_FINDUSAGE] = fill(cb_func_current_word, + /* popup menu editing commands */ + add_kb(group, GEANY_KEYS_POPUP_FINDUSAGE, cb_func_current_word, 0, 0, "popup_findusage", _("Find Usage")); - keys[GEANY_KEYS_POPUP_GOTOTAGDEFINITION] = fill(cb_func_current_word, + add_kb(group, GEANY_KEYS_POPUP_CONTEXTACTION, cb_func_current_word, + 0, 0, "popup_contextaction", _("Context Action")); + + group = ADD_KB_GROUP(TAGS, _("Tag commands")); + + add_kb(group, GEANY_KEYS_EDIT_AUTOCOMPLETE, cb_func_tags, + GDK_space, GDK_CONTROL_MASK, "edit_autocomplete", _("Complete word")); + add_kb(group, GEANY_KEYS_EDIT_CALLTIP, cb_func_tags, + GDK_space, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "edit_calltip", _("Show calltip")); + add_kb(group, GEANY_KEYS_EDIT_MACROLIST, cb_func_tags, + GDK_Return, GDK_CONTROL_MASK, "edit_macrolist", _("Show macro list")); + add_kb(group, GEANY_KEYS_EDIT_COMPLETESNIPPET, NULL, /* has special callback */ + GDK_Tab, 0, "edit_completesnippet", _("Complete snippet")); + add_kb(group, GEANY_KEYS_EDIT_SUPPRESSSNIPPETCOMPLETION, cb_func_tags, + 0, 0, "edit_suppresssnippetcompletion", _("Suppress snippet completion")); + add_kb(group, GEANY_KEYS_POPUP_GOTOTAGDEFINITION, cb_func_current_word, 0, 0, "popup_gototagdefinition", _("Go to Tag Definition")); - keys[GEANY_KEYS_POPUP_GOTOTAGDECLARATION] = fill(cb_func_current_word, + add_kb(group, GEANY_KEYS_POPUP_GOTOTAGDECLARATION, cb_func_current_word, 0, 0, "popup_gototagdeclaration", _("Go to Tag Declaration")); - keys[GEANY_KEYS_POPUP_CONTEXTACTION] = fill(cb_func_current_word, - 0, 0, "popup_contextaction", _("Context Action")); + + group = ADD_KB_GROUP(OTHER, _("Other commands")); + + add_kb(group, GEANY_KEYS_NAV_BACK, cb_func_nav_back, + 0, 0, "nav_back", _("Navigate back a location")); + add_kb(group, GEANY_KEYS_NAV_FORWARD, cb_func_nav_forward, + 0, 0, "nav_forward", _("Navigate forward a location")); } -static void load_user_kb(void) +typedef void (*KBItemCallback) (KeyBindingGroup *group, KeyBinding *kb, gpointer user_data); + +static void keybindings_foreach(KBItemCallback cb, gpointer user_data) { - gchar *configfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "keybindings.conf", NULL); + gsize g, i; + + for (g = 0; g < keybinding_groups->len; g++) + { + KeyBindingGroup *group = g_ptr_array_index(keybinding_groups, g); + + for (i = 0; i < group->count; i++) + { + KeyBinding *kb = &group->keys[i]; + + cb(group, kb, user_data); + } + } +} + + +static void get_keyfile_kb(KeyBindingGroup *group, KeyBinding *kb, gpointer user_data) +{ + GKeyFile *config = user_data; gchar *val; - guint i; guint key; GdkModifierType mods; + + val = g_key_file_get_string(config, group->name, kb->name, NULL); + if (val != NULL) + { + gtk_accelerator_parse(val, &key, &mods); + kb->key = key; + kb->mods = mods; + } + g_free(val); +} + + +static void load_user_kb(void) +{ + gchar *configfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "keybindings.conf", NULL); GKeyFile *config = g_key_file_new(); /* now load user defined keys */ if (g_key_file_load_from_file(config, configfile, G_KEY_FILE_KEEP_COMMENTS, NULL)) { - for (i = 0; i < GEANY_MAX_KEYS; i++) - { - val = g_key_file_get_string(config, "Bindings", keys[i]->name, NULL); - if (val != NULL) - { - gtk_accelerator_parse(val, &key, &mods); - keys[i]->key = key; - keys[i]->mods = mods; - } - g_free(val); - } + keybindings_foreach(get_keyfile_kb, config); } g_free(configfile); g_key_file_free(config); @@ -364,24 +475,10 @@ void keybindings_init(void) { + keybinding_groups = g_ptr_array_sized_new(GEANY_KEYGROUP_COUNT); + init_default_kb(); load_user_kb(); - - /* set section name */ - keys[GEANY_KEYS_GROUP_FILE]->section = _("File menu"); - keys[GEANY_KEYS_GROUP_EDIT]->section = _("Edit menu"); - keys[GEANY_KEYS_GROUP_SEARCH]->section = _("Search menu"); - keys[GEANY_KEYS_GROUP_VIEW]->section = _("View menu"); - keys[GEANY_KEYS_GROUP_DOCUMENT]->section = _("Document menu"); - keys[GEANY_KEYS_GROUP_BUILD]->section = _("Build menu"); - keys[GEANY_KEYS_GROUP_TOOLS]->section = _("Tools menu"); - keys[GEANY_KEYS_GROUP_HELP]->section = _("Help menu"); - keys[GEANY_KEYS_GROUP_FOCUS]->section = _("Focus commands"); - keys[GEANY_KEYS_GROUP_TABS]->section = _("Notebook tab commands"); - keys[GEANY_KEYS_GROUP_EDITING]->section = _("Editing commands"); - keys[GEANY_KEYS_GROUP_TAGS]->section = _("Tag commands"); - keys[GEANY_KEYS_GROUP_OTHER]->section = _("Other commands"); - add_menu_accels(); } @@ -402,6 +499,7 @@ static void add_menu_accels() { +#if 0 /* tmp */ GtkAccelGroup *accel_group = gtk_accel_group_new(); /* apply the settings */ @@ -474,15 +572,26 @@ /* the build menu items are set if the build menus are created */ gtk_window_add_accel_group(GTK_WINDOW(app->window), accel_group); +#endif } +static void set_keyfile_kb(KeyBindingGroup *group, KeyBinding *kb, gpointer user_data) +{ + GKeyFile *config = user_data; + gchar *val; + + val = gtk_accelerator_name(kb->key, kb->mods); + g_key_file_set_string(config, group->name, kb->name, val); + g_free(val); +} + + /* just write the content of the keys array to the config file */ void keybindings_write_to_file(void) { gchar *configfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "keybindings.conf", NULL); - gchar *val, *data; - guint i; + gchar *data; GKeyFile *config = g_key_file_new(); /* add comment if the file is newly created */ @@ -491,12 +600,7 @@ g_key_file_set_comment(config, NULL, NULL, "Keybindings for Geany\nThe format looks like \"<Control>a\" or \"<Shift><Alt>F1\".\nBut you can also change the keys in Geany's preferences dialog.", NULL); } - for (i = 0; i < GEANY_MAX_KEYS; i++) - { - val = gtk_accelerator_name(keys[i]->key, keys[i]->mods); - g_key_file_set_string(config, "Bindings", keys[i]->name, val); - g_free(val); - } + keybindings_foreach(set_keyfile_kb, config); /* write the file */ data = g_key_file_to_data(config, NULL, NULL); @@ -510,17 +614,13 @@ void keybindings_free(void) { - guint i; - - for (i = 0; i < GEANY_MAX_KEYS; i++) - { - g_free(keys[i]); - } + g_ptr_array_free(keybinding_groups, TRUE); } static void get_shortcut_labels_text(GString **text_names_str, GString **text_keys_str) { +#if 0 guint i; GString *text_names = g_string_sized_new(600); GString *text_keys = g_string_sized_new(600); @@ -553,6 +653,7 @@ g_string_append(text_keys, "\n"); g_free(shortcut); } +#endif } @@ -562,7 +663,7 @@ GString *text_names; GString *text_keys; gint height, response; - +return;/* tmp */ dialog = gtk_dialog_new_with_buttons(_("Keyboard Shortcuts"), GTK_WINDOW(app->window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_EDIT, GTK_RESPONSE_APPLY, @@ -664,8 +765,9 @@ * return FALSE if no completion occurs, so the tab or space is handled normally. */ static gboolean check_snippet_completion(guint keyval, guint state) { +return FALSE; /* tmp */ +#if 0 const guint i = GEANY_KEYS_EDIT_COMPLETESNIPPET; - if (keys[i]->key == keyval && keys[i]->mods == state) { gint idx = document_get_cur_idx(); @@ -682,6 +784,7 @@ } } return FALSE; +#endif } @@ -695,7 +798,7 @@ static gboolean check_vte(GdkModifierType state, guint keyval) { - guint i; + /*guint i;*/ GtkWidget *widget; if (! vc->enable_bash_keys) @@ -708,12 +811,14 @@ if (state == 0 && (keyval < GDK_F1 || keyval > GDK_F35)) /* e.g. backspace */ return FALSE; +#if 0 /* tmp */ /* make focus commands override any bash commands */ for (i = GEANY_KEYS_GROUP_FOCUS; i < GEANY_KEYS_GROUP_TABS; i++) { if (state == keys[i]->mods && keyval == keys[i]->key) return FALSE; } +#endif /* Temporarily disable the menus to prevent conflicting menu accelerators * from overriding the VTE bash shortcuts. @@ -733,7 +838,8 @@ /* central keypress event handler, almost all keypress events go to this function */ gboolean keybindings_got_event(GtkWidget *widget, GdkEventKey *ev, gpointer user_data) { - guint i, state, keyval; + guint state, keyval; + gsize g, i; if (ev->keyval == 0) return FALSE; @@ -756,47 +862,53 @@ if (check_snippet_completion(keyval, state)) return TRUE; - for (i = 0; i < GEANY_MAX_KEYS; i++) + for (g = 0; g < keybinding_groups->len; g++) { - if (keyval == keys[i]->key && state == keys[i]->mods) + KeyBindingGroup *group = g_ptr_array_index(keybinding_groups, g); + + for (i = 0; i < group->count; i++) { - if (keys[i]->cb_func == NULL) - return FALSE; /* ignore the keybinding */ + KeyBinding *kb = &group->keys[i]; - /* call the corresponding callback function for this shortcut */ - keys[i]->cb_func(i); - return TRUE; + if (keyval == kb->key && state == kb->mods) + { + if (kb->cb_func == NULL) + return FALSE; /* ignore the keybinding */ + + /* call the corresponding callback function for this shortcut */ + kb->cb_func(i); + return TRUE; + } } } - /* fixed keybindings can be overridden by user bindings */ + /* fixed keybindings can be overridden by user bindings, so check them last */ if (check_fixed_kb(keyval, state)) return TRUE; return FALSE; } -/* simple convenience function to allocate and fill the struct */ -static KeyBinding *fill(KBCallback func, guint key, GdkModifierType mod, const gchar *name, - const gchar *label) +KeyBinding *keybindings_lookup_item(guint group_id, guint cmd_id) { - KeyBinding *result; + KeyBindingGroup *group; - result = g_new0(KeyBinding, 1); - result->name = name; - result->label = label; - result->key = key; - result->mods = mod; - result->cb_func = func; - result->section = NULL; + g_return_val_if_fail(group_id < GEANY_KEYGROUP_COUNT, NULL); /* plugins can't use this */ - return result; + group = g_ptr_array_index(keybinding_groups, group_id); + + g_return_val_if_fail(group && cmd_id < group->count, NULL); + + return &group->keys[cmd_id]; } -/* Mimic a keybinding action */ -void keybindings_cmd(GeanyKeyCommand cmd_id) +/* Mimic a (built-in only) keybinding action */ +void keybindings_send_command(gint group_id, gint cmd_id) { - keys[cmd_id]->cb_func(cmd_id); + KeyBinding *kb = keybindings_lookup_item(group_id, cmd_id); + + if (kb) + kb->cb_func(cmd_id); } @@ -1162,7 +1274,7 @@ /* Common function for editing keybindings that don't change any text, and are * useful even when sci doesn't have focus. */ -static void cb_func_edit_global(guint key_id) +static void cb_func_editing_global(guint key_id) { gint idx = document_get_cur_idx(); gint cur_line; @@ -1231,7 +1343,7 @@ /* common function for editing keybindings, only valid when scintilla has focus. */ -static void cb_func_edit(guint key_id) +static void cb_func_editing(guint key_id) { gint idx = document_get_cur_idx(); GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(app->window)); @@ -1274,30 +1386,6 @@ case GEANY_KEYS_EDIT_UNCOMMENTLINE: on_menu_uncomment_line1_activate(NULL, NULL); break; - case GEANY_KEYS_EDIT_AUTOCOMPLETE: - editor_start_auto_complete(idx, sci_get_current_position(doc_list[idx].sci), TRUE); - break; - case GEANY_KEYS_EDIT_CALLTIP: - editor_show_calltip(idx, -1); - break; - case GEANY_KEYS_EDIT_MACROLIST: - editor_show_macro_list(doc_list[idx].sci); - break; - - case GEANY_KEYS_EDIT_SUPPRESSSNIPPETCOMPLETION: - switch (keys[GEANY_KEYS_EDIT_COMPLETESNIPPET]->key) - { - case GDK_space: - sci_add_text(doc_list[idx].sci, " "); - break; - case GDK_Tab: - sci_cmd(doc_list[idx].sci, SCI_TAB); - break; - default: - break; - } - break; - case GEANY_KEYS_EDIT_SELECTWORD: editor_select_word(doc_list[idx].sci); break; @@ -1344,6 +1432,48 @@ } +/* common function for tags keybindings, only valid when scintilla has focus. */ +static void cb_func_tags(guint key_id) +{ + gint idx = document_get_cur_idx(); + GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(app->window)); + + /* tags keybindings only valid when scintilla widget has focus */ + if (! DOC_IDX_VALID(idx) || focusw != GTK_WIDGET(doc_list[idx].sci)) return; + + switch (key_id) + { + case GEANY_KEYS_EDIT_AUTOCOMPLETE: + editor_start_auto_complete(idx, sci_get_current_position(doc_list[idx].sci), TRUE); + break; + case GEANY_KEYS_EDIT_CALLTIP: + editor_show_calltip(idx, -1); + break; + case GEANY_KEYS_EDIT_MACROLIST: + editor_show_macro_list(doc_list[idx].sci); + break; + case GEANY_KEYS_EDIT_SUPPRESSSNIPPETCOMPLETION: + { + KeyBinding *kb = keybindings_lookup_item(GEANY_KEYGROUP_TAGS, + GEANY_KEYS_EDIT_COMPLETESNIPPET); + + switch (kb->key) + { + case GDK_space: + sci_add_text(doc_list[idx].sci, " "); + break; + case GDK_Tab: + sci_cmd(doc_list[idx].sci, SCI_TAB); + break; + default: + break; + } + break; + } + } +} + + static void cb_func_menu_replacetabs(G_GNUC_UNUSED guint key_id) { on_replace_tabs_activate(NULL, NULL); Modified: branches/plugin-keybindings/src/keybindings.h =================================================================== --- branches/plugin-keybindings/src/keybindings.h 2008-02-29 18:56:41 UTC (rev 2296) +++ branches/plugin-keybindings/src/keybindings.h 2008-02-29 19:30:28 UTC (rev 2297) @@ -25,6 +25,15 @@ #ifndef GEANY_KEYBINDINGS_H #define GEANY_KEYBINDINGS_H 1 +/* allowed modifier keys (especially NOT Caps lock, no Num lock) */ +#if GTK_CHECK_VERSION(2, 10, 0) +# define GEANY_KEYS_MODIFIER_MASK (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK | \ + GDK_META_MASK | GDK_SUPER_MASK | GDK_HYPER_MASK) +#else +# define GEANY_KEYS_MODIFIER_MASK (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK) +#endif + + typedef void (*KBCallback) (guint key_id); /* holds all user-definable key bindings */ @@ -39,25 +48,43 @@ /* function pointer to a callback function, just to keep the code in keypress event * callback function clear */ KBCallback cb_func; - /* string to use as a section name in the preferences dialog in keybinding treeview as well as - * in the keybinding help dialog, set only for the first binding in the section */ - gchar *section; } KeyBinding; -/* allowed modifier keys (especially NOT Caps lock, no Num lock) */ -#if GTK_CHECK_VERSION(2, 10, 0) -# define GEANY_KEYS_MODIFIER_MASK (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK | \ - GDK_META_MASK | GDK_SUPER_MASK | GDK_HYPER_MASK) -#else -# define GEANY_KEYS_MODIFIER_MASK (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK) -#endif +typedef struct KeyBindingGroup +{ + const gchar *name; /* group name used for keyfile group */ + const gchar *label; /* group label in preferences dialog in keybinding treeview */ + gsize count; /* count of KeyBinding structs in keys */ + KeyBinding *keys; /* fixed array of KeyBinding structs */ +} +KeyBindingGroup; -/* Plugin API */ -typedef enum +extern GPtrArray *keybinding_groups; /* array of KeyBindingGroup pointers */ + + +/* Plugin API enums - append only to maintain plugin ABI */ +enum { - GEANY_KEYS_GROUP_FILE = 0, - GEANY_KEYS_MENU_NEW = GEANY_KEYS_GROUP_FILE, + GEANY_KEYGROUP_FILE, + GEANY_KEYGROUP_EDIT, + GEANY_KEYGROUP_SEARCH, + GEANY_KEYGROUP_VIEW, + GEANY_KEYGROUP_DOCUMENT, + GEANY_KEYGROUP_BUILD, + GEANY_KEYGROUP_TOOLS, + GEANY_KEYGROUP_HELP, + GEANY_KEYGROUP_FOCUS, + GEANY_KEYGROUP_NOTEBOOK, + GEANY_KEYGROUP_EDITING, + GEANY_KEYGROUP_TAGS, + GEANY_KEYGROUP_OTHER, + GEANY_KEYGROUP_COUNT +}; + +enum +{ + GEANY_KEYS_MENU_NEW, GEANY_KEYS_MENU_OPEN, GEANY_KEYS_MENU_OPENSELECTED, GEANY_KEYS_MENU_SAVE, @@ -68,9 +95,12 @@ GEANY_KEYS_MENU_CLOSEALL, GEANY_KEYS_MENU_RELOADFILE, GEANY_KEYS_MENU_PROJECTPROPERTIES, + GEANY_KEYS_FILE_COUNT +}; - GEANY_KEYS_GROUP_EDIT, - GEANY_KEYS_MENU_UNDO = GEANY_KEYS_GROUP_EDIT, +enum +{ + GEANY_KEYS_MENU_UNDO, GEANY_KEYS_MENU_REDO, GEANY_KEYS_MENU_CUT, GEANY_KEYS_MENU_COPY, @@ -78,9 +108,12 @@ GEANY_KEYS_MENU_SELECTALL, GEANY_KEYS_MENU_INSERTDATE, GEANY_KEYS_MENU_PREFERENCES, + GEANY_KEYS_EDIT_COUNT +}; - GEANY_KEYS_GROUP_SEARCH, - GEANY_KEYS_MENU_FIND = GEANY_KEYS_GROUP_SEARCH, +enum +{ + GEANY_KEYS_MENU_FIND, GEANY_KEYS_MENU_FINDNEXT, GEANY_KEYS_MENU_FINDPREVIOUS, GEANY_KEYS_MENU_FINDINFILES, @@ -89,23 +122,32 @@ GEANY_KEYS_MENU_FINDPREVSEL, GEANY_KEYS_MENU_NEXTMESSAGE, GEANY_KEYS_MENU_GOTOLINE, + GEANY_KEYS_SEARCH_COUNT +}; - GEANY_KEYS_GROUP_VIEW, - GEANY_KEYS_MENU_TOGGLEALL = GEANY_KEYS_GROUP_VIEW, +enum +{ + GEANY_KEYS_MENU_TOGGLEALL, GEANY_KEYS_MENU_FULLSCREEN, GEANY_KEYS_MENU_MESSAGEWINDOW, GEANY_KEYS_MENU_SIDEBAR, GEANY_KEYS_MENU_ZOOMIN, GEANY_KEYS_MENU_ZOOMOUT, + GEANY_KEYS_VIEW_COUNT +}; - GEANY_KEYS_GROUP_DOCUMENT, - GEANY_KEYS_MENU_REPLACETABS = GEANY_KEYS_GROUP_DOCUMENT, +enum +{ + GEANY_KEYS_MENU_REPLACETABS, GEANY_KEYS_MENU_FOLDALL, GEANY_KEYS_MENU_UNFOLDALL, GEANY_KEYS_RELOADTAGLIST, + GEANY_KEYS_DOCUMENT_COUNT +}; - GEANY_KEYS_GROUP_BUILD, - GEANY_KEYS_BUILD_COMPILE = GEANY_KEYS_GROUP_BUILD, +enum +{ + GEANY_KEYS_BUILD_COMPILE, GEANY_KEYS_BUILD_LINK, GEANY_KEYS_BUILD_MAKE, GEANY_KEYS_BUILD_MAKEOWNTARGET, @@ -114,31 +156,46 @@ GEANY_KEYS_BUILD_RUN, GEANY_KEYS_BUILD_RUN2, GEANY_KEYS_BUILD_OPTIONS, + GEANY_KEYS_BUILD_COUNT +}; - GEANY_KEYS_GROUP_TOOLS, - GEANY_KEYS_MENU_OPENCOLORCHOOSER = GEANY_KEYS_GROUP_TOOLS, +enum +{ + GEANY_KEYS_MENU_OPENCOLORCHOOSER, GEANY_KEYS_MENU_INSERTSPECIALCHARS, + GEANY_KEYS_TOOLS_COUNT +}; - GEANY_KEYS_GROUP_HELP, - GEANY_KEYS_MENU_HELP = GEANY_KEYS_GROUP_HELP, +enum +{ + GEANY_KEYS_MENU_HELP, + GEANY_KEYS_HELP_COUNT +}; - GEANY_KEYS_GROUP_FOCUS, - GEANY_KEYS_SWITCH_EDITOR = GEANY_KEYS_GROUP_FOCUS, +enum +{ + GEANY_KEYS_SWITCH_EDITOR, GEANY_KEYS_SWITCH_SCRIBBLE, GEANY_KEYS_SWITCH_VTE, GEANY_KEYS_SWITCH_SEARCH_BAR, + GEANY_KEYS_FOCUS_COUNT +}; - GEANY_KEYS_GROUP_TABS, - GEANY_KEYS_SWITCH_TABLEFT = GEANY_KEYS_GROUP_TABS, +enum +{ + GEANY_KEYS_SWITCH_TABLEFT, GEANY_KEYS_SWITCH_TABRIGHT, GEANY_KEYS_SWITCH_TABLASTUSED, GEANY_KEYS_MOVE_TABLEFT, GEANY_KEYS_MOVE_TABRIGHT, GEANY_KEYS_MOVE_TABFIRST, GEANY_KEYS_MOVE_TABLAST, + GEANY_KEYS_NOTEBOOK_COUNT +}; - GEANY_KEYS_GROUP_EDITING, - GEANY_KEYS_EDIT_TOGGLECASE = GEANY_KEYS_GROUP_EDITING, +enum +{ + GEANY_KEYS_EDIT_TOGGLECASE, GEANY_KEYS_EDIT_DUPLICATELINE, GEANY_KEYS_EDIT_DELETELINE, GEANY_KEYS_EDIT_COPYLINE, @@ -168,32 +225,37 @@ GEANY_KEYS_EDIT_INSERTALTWHITESPACE, GEANY_KEYS_POPUP_FINDUSAGE, GEANY_KEYS_POPUP_CONTEXTACTION, + GEANY_KEYS_EDITING_COUNT +}; - GEANY_KEYS_GROUP_TAGS, - GEANY_KEYS_EDIT_AUTOCOMPLETE = GEANY_KEYS_GROUP_TAGS, +enum +{ + GEANY_KEYS_EDIT_AUTOCOMPLETE, GEANY_KEYS_EDIT_CALLTIP, GEANY_KEYS_EDIT_MACROLIST, GEANY_KEYS_EDIT_COMPLETESNIPPET, GEANY_KEYS_EDIT_SUPPRESSSNIPPETCOMPLETION, GEANY_KEYS_POPUP_GOTOTAGDEFINITION, GEANY_KEYS_POPUP_GOTOTAGDECLARATION, + GEANY_KEYS_TAGS_COUNT +}; - GEANY_KEYS_GROUP_OTHER, - GEANY_KEYS_NAV_FORWARD = GEANY_KEYS_GROUP_OTHER, +enum +{ + GEANY_KEYS_NAV_FORWARD, GEANY_KEYS_NAV_BACK, - GEANY_MAX_KEYS -} -GeanyKeyCommand; + GEANY_KEYS_OTHER_COUNT +}; -extern KeyBinding *keys[GEANY_MAX_KEYS]; - void keybindings_init(void); void keybindings_free(void); -void keybindings_cmd(GeanyKeyCommand cmd_id); +void keybindings_send_command(gint group_id, gint cmd_id); +KeyBinding *keybindings_lookup_item(guint group_id, guint cmd_id); + /* just write the content of the keys array to the config file */ void keybindings_write_to_file(void); Modified: branches/plugin-keybindings/src/plugindata.h =================================================================== --- branches/plugin-keybindings/src/plugindata.h 2008-02-29 18:56:41 UTC (rev 2296) +++ branches/plugin-keybindings/src/plugindata.h 2008-02-29 19:30:28 UTC (rev 2297) @@ -36,12 +36,12 @@ /* The API version should be incremented whenever any plugin data types below are * modified or appended to. */ -static const gint api_version = 45; +static const gint api_version = 46; /* The ABI version should be incremented whenever existing fields in the plugin * data types below have to be changed or reordered. It should stay the same if fields * are only appended, as this doesn't affect existing fields. */ -static const gint abi_version = 20; +static const gint abi_version = 21; /* This performs runtime checks that try to ensure: * 1. Geany ABI data types are compatible with this plugin. @@ -311,8 +311,7 @@ typedef struct KeybindingFuncs { - /* See GeanyKeyCommand enum for cmd_id. */ - void (*send_command) (gint cmd_id); + void (*send_command) (gint group_id, gint cmd_id); } KeybindingFuncs; Modified: branches/plugin-keybindings/src/plugins.c =================================================================== --- branches/plugin-keybindings/src/plugins.c 2008-02-29 18:56:41 UTC (rev 2296) +++ branches/plugin-keybindings/src/plugins.c 2008-02-29 19:30:28 UTC (rev 2297) @@ -53,11 +53,9 @@ #include "encodings.h" #include "search.h" #include "highlighting.h" +#include "keybindings.h" -void keybindings_cmd(gint cmd_id); /* don't require keybindings.h enum in plugindata.h */ - - #ifdef G_OS_WIN32 # define PLUGIN_EXT "dll" #else @@ -189,7 +187,7 @@ }; static KeybindingFuncs keybindings_funcs = { - &keybindings_cmd + &keybindings_send_command }; static TagManagerFuncs tagmanager_funcs = { Modified: branches/plugin-keybindings/src/prefs.c =================================================================== --- branches/plugin-keybindings/src/prefs.c 2008-02-29 18:56:41 UTC (rev 2296) +++ branches/plugin-keybindings/src/prefs.c 2008-02-29 19:30:28 UTC (rev 2297) @@ -73,7 +73,8 @@ static void on_cell_edited(GtkCellRendererText *cellrenderertext, gchar *path, gchar *new_text, gpointer user_data); static gboolean on_keytype_dialog_response(GtkWidget *dialog, GdkEventKey *event, gpointer user_data); static void on_dialog_response(GtkWidget *dialog, gint response, gpointer user_data); -static gboolean find_duplicate(guint idx, guint key, GdkModifierType mods, const gchar *action); +static gboolean find_duplicate(KeyBinding *search_kb, + guint key, GdkModifierType mods, const gchar *action); static void on_toolbar_show_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_show_notebook_tabs_toggled(GtkToggleButton *togglebutton, gpointer user_data); static void on_use_folding_toggled(GtkToggleButton *togglebutton, gpointer user_data); @@ -127,25 +128,30 @@ static void init_keybindings(void) { GtkTreeIter parent, iter; - gint i; - gchar *key_string; + gsize g, i; if (store == NULL) init_kb_tree(); - for (i = 0; i < GEANY_MAX_KEYS; i++) + for (g = 0; g < keybinding_groups->len; g++) { - if (keys[i]->section != NULL) + KeyBindingGroup *group = g_ptr_array_index(keybinding_groups, g); + + gtk_tree_store_append(store, &parent, NULL); + gtk_tree_store_set(store, &parent, KB_TREE_ACTION, group->label, + KB_TREE_INDEX, g, -1); + + for (i = 0; i < group->count; i++) { - gtk_tree_store_append(store, &parent, NULL); - gtk_tree_store_set(store, &parent, KB_TREE_ACTION, keys[i]->section, -1); + KeyBinding *kb = &group->keys[i]; + gchar *key_string; + + key_string = gtk_accelerator_name(kb->key, kb->mods); + gtk_tree_store_append(store, &iter, &parent); + gtk_tree_store_set(store, &iter, KB_TREE_ACTION, kb->label, + KB_TREE_SHORTCUT, key_string, KB_TREE_INDEX, i, -1); + g_free(key_string); } - - key_string = gtk_accelerator_name(keys[i]->key, keys[i]->mods); - gtk_tree_store_append(store, &iter, &parent); - gtk_tree_store_set(store, &iter, KB_TREE_ACTION, keys[i]->label, - KB_TREE_SHORTCUT, key_string, KB_TREE_INDEX, i, -1); - g_free(key_string); } gtk_tree_view_expand_all(GTK_TREE_VIEW(tree)); } @@ -1065,7 +1071,7 @@ return TRUE; } - gtk_tree_model_get(model, &g_iter, 0, &name, -1); + gtk_tree_model_get(model, &g_iter, KB_TREE_ACTION, &name, -1); if (name != NULL) { GtkWidget *dialog; @@ -1103,33 +1109,48 @@ } +static KeyBinding *lookup_kb_from_iter(G_GNUC_UNUSED GtkTreeModel *model, GtkTreeIter *iter) +{ + guint group_idx, keybinding_idx; + GtkTreeIter parent; + + /* get kb index */ + gtk_tree_model_get(GTK_TREE_MODEL(store), iter, KB_TREE_INDEX, &keybinding_idx, -1); + + /* lookup the parent to get group index */ + gtk_tree_model_iter_parent(GTK_TREE_MODEL(store), &parent, iter); + gtk_tree_model_get(GTK_TREE_MODEL(store), iter, KB_TREE_INDEX, &group_idx, -1); + + return keybindings_lookup_item(group_idx, keybinding_idx); +} + + static void on_cell_edited(GtkCellRendererText *cellrenderertext, gchar *path, gchar *new_text, gpointer user_data) { if (path != NULL && new_text != NULL) { - guint idx; + GtkTreeIter iter; guint lkey; GdkModifierType lmods; - GtkTreeIter iter; + KeyBinding *kb; gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(store), &iter, path); if (gtk_tree_model_iter_has_child(GTK_TREE_MODEL(store), &iter)) - return; + return; /* ignore group items */ gtk_accelerator_parse(new_text, &lkey, &lmods); - /* get index */ - gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 2, &idx, -1); + kb = lookup_kb_from_iter(GTK_TREE_MODEL(store), &iter); - if (find_duplicate(idx, lkey, lmods, new_text)) + if (find_duplicate(kb, lkey, lmods, new_text)) return; /* set the values here, because of the above check, setting it in * gtk_accelerator_parse would return a wrong key combination if it is duplicate */ - keys[idx]->key = lkey; - keys[idx]->mods = lmods; + kb->key = lkey; + kb->mods = lmods; - gtk_tree_store_set(store, &iter, 1, new_text, -1); + gtk_tree_store_set(store, &iter, KB_TREE_SHORTCUT, new_text, -1); edited = TRUE; } @@ -1155,29 +1176,28 @@ } -static void on_dialog_response(GtkWidget *dialog, gint response, gpointer iter) +static void on_dialog_response(GtkWidget *dialog, gint response, G_GNUC_UNUSED gpointer iter) { if (response == GTK_RESPONSE_ACCEPT) { - guint idx; guint lkey; GdkModifierType lmods; + KeyBinding *kb; - /* get index */ - gtk_tree_model_get(GTK_TREE_MODEL(store), &g_iter, 2, &idx, -1); + kb = lookup_kb_from_iter(GTK_TREE_MODEL(store), &g_iter); gtk_accelerator_parse(gtk_label_get_text(GTK_LABEL(dialog_label)), &lkey, &lmods); - if (find_duplicate(idx, lkey, lmods, gtk_label_get_text(GTK_LABEL(dialog_label)))) + if (find_duplicate(kb, lkey, lmods, gtk_label_get_text(GTK_LABEL(dialog_label)))) return; /* set the values here, because of the above check, setting it in * gtk_accelerator_parse would return a wrong key combination if it is duplicate */ - keys[idx]->key = lkey; - keys[idx]->mods = lmods; + kb->key = lkey; + kb->mods = lmods; gtk_tree_store_set(store, &g_iter, - 1, gtk_label_get_text(GTK_LABEL(dialog_label)), -1); + KB_TREE_SHORTCUT, gtk_label_get_text(GTK_LABEL(dialog_label)), -1); g_free(dialog_key_name); dialog_key_name = NULL; @@ -1188,63 +1208,81 @@ } -static gboolean find_iter(guint i, GtkTreeIter *iter) +/* Look for a (1st-level) child of parent whose KB_TREE_INDEX matches i, + * setting iter to point to the node if found. + * If parent is NULL, look for a parent node whose KB_TREE_INDEX matches i. */ +static gboolean find_child_iter(GtkTreeIter *parent, guint i, GtkTreeIter *iter) { GtkTreeModel *model = GTK_TREE_MODEL(store); guint idx; - GtkTreeIter parent; - if (! gtk_tree_model_get_iter_first(model, &parent)) - return FALSE; /* no items */ + /* get first child of parent */ + if (! gtk_tree_model_iter_children(model, iter, parent)) + return FALSE; - while (TRUE) + while (TRUE) /* foreach child */ { - if (! gtk_tree_model_iter_children(model, iter, &parent)) - return FALSE; - - while (TRUE) - { - gtk_tree_model_get(model, iter, 2, &idx, -1); - if (idx == i) - return TRUE; - if (! gtk_tree_model_iter_next(model, iter)) - break; - } - if (! gtk_tree_model_iter_next(model, &parent)) - return FALSE; + gtk_tree_model_get(model, iter, KB_TREE_INDEX, &idx, -1); + if (idx == i) + return TRUE; + if (! gtk_tree_model_iter_next(model, iter)) + return FALSE; /* no more children */ } } +static void clear_tree_shortcut(gsize group_id, gsize keybinding_id) +{ + GtkTreeIter parent; + GtkTreeIter child; + + /* find parent kb group */ + if (! find_child_iter(NULL, group_id, &parent)) + return; + + /* find child kb node*/ + if (! find_child_iter(&parent, group_id, &child)) + return; + + gtk_tree_store_set(store, &child, KB_TREE_SHORTCUT, NULL, -1); /* clear shortcut */ +} + + /* test if the entered key combination is already used */ -static gboolean find_duplicate(guint idx, guint key, GdkModifierType mods, const gchar *action) +static gboolean find_duplicate(KeyBinding *search_kb, + guint key, GdkModifierType mods, const gchar *action) { - guint i; + gsize g, i; /* allow duplicate if there is no key combination */ if (key == 0 && mods == 0) return FALSE; - for (i = 0; i < GEANY_MAX_KEYS; i++) + for (g = 0; g < keybinding_groups->len; g++) { - /* search another item with the same key, - * but take not the key we are searching for(-> idx) */ - if (keys[i]->key == key && keys[i]->mods == mods - && ! (keys[i]->key == keys[idx]->key && keys[i]->mods == keys[idx]->mods)) + KeyBindingGroup *group = g_ptr_array_index(keybinding_groups, g); + + for (i = 0; i < group->count; i++) { - if (dialogs_show_question_full(app->window, _("_Override"), GTK_STOCK_CANCEL, - _("Override that keybinding?"), - _("The combination '%s' is already used for \"%s\"."), - action, keys[i]->label)) + KeyBinding *keys = group->keys; + KeyBinding *kb = &keys[i]; + + /* search another item with the same key, + * but don't search the key we're looking for keys[idx] */ + if (kb->key == key && kb->mods == mods + && ! (kb->key == search_kb->key && kb->mods == search_kb->mods)) { - GtkTreeIter iter; - - keys[i]->key = 0; - keys[i]->mods = 0; - if (find_iter(i, &iter)) - gtk_tree_store_set(store, &iter, 1, NULL, -1); /* clear item */ - continue; + if (dialogs_show_question_full(app->window, _("_Override"), GTK_STOCK_CANCEL, + _("Override that keybinding?"), + _("The combination '%s' is already used for \"%s\"."), + action, kb->label)) + { + kb->key = 0; + kb->mods = 0; + clear_tree_shortcut(g, i); + continue; + } + return TRUE; } - return TRUE; } } return FALSE; Modified: branches/plugin-keybindings/src/tools.c =================================================================== --- branches/plugin-keybindings/src/tools.c 2008-02-29 18:56:41 UTC (rev 2296) +++ branches/plugin-keybindings/src/tools.c 2008-02-29 19:30:28 UTC (rev 2297) @@ -361,6 +361,7 @@ { GtkWidget *item; gint key_idx = -1; + KeyBinding *kb; switch (idx) { @@ -369,10 +370,13 @@ case 2: key_idx = GEANY_KEYS_EDIT_SENDTOCMD3; break; } + if (key_idx != -1) + kb = keybindings_lookup_item(GEANY_KEYGROUP_EDITING, key_idx); + item = gtk_menu_item_new_with_label(label); if (key_idx != -1) gtk_widget_add_accelerator(item, "activate", gtk_accel_group_new(), - keys[key_idx]->key, keys[key_idx]->mods, GTK_ACCEL_VISIBLE); + kb->key, kb->mods, GTK_ACCEL_VISIBLE); gtk_container_add(GTK_CONTAINER(me), item); gtk_widget_show(item); g_signal_connect((gpointer) item, "activate", G_CALLBACK(cc_on_custom_command_activate), @@ -381,7 +385,7 @@ item = gtk_menu_item_new_with_label(label); if (key_idx != -1) gtk_widget_add_accelerator(item, "activate", gtk_accel_group_new(), - keys[key_idx]->key, keys[key_idx]->mods, GTK_ACCEL_VISIBLE); + kb->key, kb->mods, GTK_ACCEL_VISIBLE); gtk_container_add(GTK_CONTAINER(mp), item); gtk_widget_show(item); g_signal_connect((gpointer) item, "activate", G_CALLBACK(cc_on_custom_command_activate), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2296] branches/plugin-keybindings/
by ntrel＠users.sourceforge.net 29 Feb '08

29 Feb '08

Revision: 2296 http://geany.svn.sourceforge.net/geany/?rev=2296&view=rev Author: ntrel Date: 2008-02-29 10:56:41 -0800 (Fri, 29 Feb 2008) Log Message: ----------- Creating temporary branch copied from trunk to develop plugin keybindings Added Paths: ----------- branches/plugin-keybindings/ Copied: branches/plugin-keybindings (from rev 2295, trunk) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2295] trunk/TODO
by ntrel＠users.sourceforge.net 29 Feb '08

29 Feb '08

Revision: 2295 http://geany.svn.sourceforge.net/geany/?rev=2295&view=rev Author: ntrel Date: 2008-02-29 10:51:36 -0800 (Fri, 29 Feb 2008) Log Message: ----------- items:configurable filetype regex for build errors(1.0) look into using a geany-dev package for plugin development Modified Paths: -------------- trunk/TODO Modified: trunk/TODO =================================================================== --- trunk/TODO 2008-02-28 16:41:23 UTC (rev 2294) +++ trunk/TODO 2008-02-29 18:51:36 UTC (rev 2295) @@ -15,6 +15,7 @@ o basic support for adding custom filetypes? o configurable filetype and project make commands (e.g. using bud for D) + o configurable filetype regex for build errors o recent projects menu o project indentation settings support o plugin keybindings @@ -41,6 +42,7 @@ o stable plugin ABI for the 1.0 series? (Split up geany_data, prefs, GeanyKeyCommand enum into groups) o review documentation + o look into using a geany-dev package for plugin development Wishlist This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2294] trunk
by eht16＠users.sourceforge.net 28 Feb '08

28 Feb '08

Revision: 2294 http://geany.svn.sourceforge.net/geany/?rev=2294&view=rev Author: eht16 Date: 2008-02-28 08:41:23 -0800 (Thu, 28 Feb 2008) Log Message: ----------- Make Scintilla remember the current column when changing the cursor position (#1902732). Modified Paths: -------------- trunk/ChangeLog trunk/src/sciwrappers.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-02-28 16:06:04 UTC (rev 2293) +++ trunk/ChangeLog 2008-02-28 16:41:23 UTC (rev 2294) @@ -3,6 +3,8 @@ * src/utils.c, src/utils.h, tagmanager/parse.h: Replace unsigned long in guint64 and use int instead of off_t (patch by Daniel Richard G., thanks). + * src/sciwrappers.c: Make Scintilla remember the current column when + changing the cursor position (#1902732). 2008-02-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2008-02-28 16:06:04 UTC (rev 2293) +++ trunk/src/sciwrappers.c 2008-02-28 16:41:23 UTC (rev 2294) @@ -398,6 +398,7 @@ SSM(sci, SCI_SETCURRENTPOS, position, 0); SSM(sci, SCI_SETANCHOR, position, 0); /* to avoid creation of a selection */ } + SSM(sci, SCI_CHOOSECARETX, 0, 0); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2293] trunk
by eht16＠users.sourceforge.net 28 Feb '08

28 Feb '08

Revision: 2293 http://geany.svn.sourceforge.net/geany/?rev=2293&view=rev Author: eht16 Date: 2008-02-28 08:06:04 -0800 (Thu, 28 Feb 2008) Log Message: ----------- Replace unsigned long in guint64 and use int instead of off_t (patch by Daniel Richard G., thanks). Modified Paths: -------------- trunk/ChangeLog trunk/src/utils.c trunk/src/utils.h trunk/tagmanager/parse.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-02-27 16:10:41 UTC (rev 2292) +++ trunk/ChangeLog 2008-02-28 16:06:04 UTC (rev 2293) @@ -1,3 +1,10 @@ +2008-02-28 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/utils.c, src/utils.h, tagmanager/parse.h: + Replace unsigned long in guint64 and use int instead of off_t + (patch by Daniel Richard G., thanks). + + 2008-02-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * plugins/*, scintilla/*, src/*, tagmanager/*: Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2008-02-27 16:10:41 UTC (rev 2292) +++ trunk/src/utils.c 2008-02-28 16:06:04 UTC (rev 2293) @@ -1145,7 +1145,7 @@ /* taken from busybox, thanks */ -gchar *utils_make_human_readable_str(unsigned long size, gulong block_size, +gchar *utils_make_human_readable_str(guint64 size, gulong block_size, gulong display_unit) { /* The code will adjust for additional (appended) units. */ @@ -1153,7 +1153,7 @@ static const gchar fmt[] = "%Lu %c%c"; static const gchar fmt_tenths[] = "%Lu.%d %c%c"; - unsigned long val; + guint64 val; gint frac; const gchar *u; const gchar *f; Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2008-02-27 16:10:41 UTC (rev 2292) +++ trunk/src/utils.h 2008-02-28 16:06:04 UTC (rev 2293) @@ -114,7 +114,7 @@ void utils_beep(void); -gchar *utils_make_human_readable_str(unsigned long size, gulong block_size, +gchar *utils_make_human_readable_str(guint64 size, gulong block_size, gulong display_unit); gint utils_strtod(const gchar *source, gchar **end, gboolean with_route); Modified: trunk/tagmanager/parse.h =================================================================== --- trunk/tagmanager/parse.h 2008-02-27 16:10:41 UTC (rev 2292) +++ trunk/tagmanager/parse.h 2008-02-28 16:06:04 UTC (rev 2293) @@ -15,8 +15,6 @@ */ #include "general.h" /* must always come first */ -#include <sys/types.h> - #include "parsers.h" /* contains list of parsers */ #include "strlist.h" #include "entry.h" @@ -69,7 +67,7 @@ typedef parserDefinition* (parserDefinitionFunc) (void); typedef struct { - off_t start; /* character index in line where match starts */ + int start; /* character index in line where match starts */ size_t length; /* length of match */ } regexMatch; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2292] trunk
by eht16＠users.sourceforge.net 27 Feb '08

27 Feb '08

Revision: 2292 http://geany.svn.sourceforge.net/geany/?rev=2292&view=rev Author: eht16 Date: 2008-02-27 08:10:41 -0800 (Wed, 27 Feb 2008) Log Message: ----------- Enable startup notification in desktop entry file and remove it from TODO list. Modified Paths: -------------- trunk/ChangeLog trunk/TODO trunk/geany.desktop.in.in Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-02-27 16:09:06 UTC (rev 2291) +++ trunk/ChangeLog 2008-02-27 16:10:41 UTC (rev 2292) @@ -9,6 +9,9 @@ * src/utils.c, src/win32.c, src/win32.h: Apply patch from Pierre Joye to improve new Win32 process spawning code (thanks). + * geany.desktop.in.in, TODO: + Enable startup notification in desktop entry file and remove it from + TODO list. 2008-02-26 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/TODO =================================================================== --- trunk/TODO 2008-02-27 16:09:06 UTC (rev 2291) +++ trunk/TODO 2008-02-27 16:10:41 UTC (rev 2292) @@ -20,7 +20,6 @@ o plugin keybindings o (line breaking mode to limit words on a line for e.g. XML content) o (DBUS) - o (startup notification) o (indent wrapped lines - Scintilla issue) o (folder tree in the sidebar) o (macro support) Modified: trunk/geany.desktop.in.in =================================================================== --- trunk/geany.desktop.in.in 2008-02-27 16:09:06 UTC (rev 2291) +++ trunk/geany.desktop.in.in 2008-02-27 16:10:41 UTC (rev 2292) @@ -9,3 +9,4 @@ Terminal=false Categories=GTK;Development;IDE; MimeType=text/plain;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;text/x-java;text/x-dsrc;text/x-pascal;text/x-perl;text/x-python;application/x-php;application/x-httpd-php*;application/xml;text/html;text/css;text/x-sql;text/x-diff; +StartupNotify=true This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2291] trunk/src/build.c
by eht16＠users.sourceforge.net 27 Feb '08

27 Feb '08

Revision: 2291 http://geany.svn.sourceforge.net/geany/?rev=2291&view=rev Author: eht16 Date: 2008-02-27 08:09:06 -0800 (Wed, 27 Feb 2008) Log Message: ----------- Fix typos. Modified Paths: -------------- trunk/src/build.c Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2008-02-27 16:08:07 UTC (rev 2290) +++ trunk/src/build.c 2008-02-27 16:09:06 UTC (rev 2291) @@ -171,7 +171,7 @@ /* try convert in locale for stat() */ locale_filename = utils_get_locale_from_utf8(view_file); - /* check wether view_file exists */ + /* check whether view_file exists */ if (g_stat(locale_filename, &st) != 0) { ui_set_statusbar(TRUE, _("Failed to view %s (make sure it is already compiled)"), view_file); @@ -385,9 +385,9 @@ object_file = g_strdup_printf("%s.o", executable); - /* check wether object file (file.o) exists */ + /* check whether object file (file.o) exists */ if (g_stat(object_file, &st) == 0) - { /* check wether src is newer than object file */ + { /* check whether src is newer than object file */ if (g_stat(locale_filename, &st2) == 0) { if (st2.st_mtime > st.st_mtime) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2290] trunk
by eht16＠users.sourceforge.net 27 Feb '08

27 Feb '08

Revision: 2290 http://geany.svn.sourceforge.net/geany/?rev=2290&view=rev Author: eht16 Date: 2008-02-27 08:08:07 -0800 (Wed, 27 Feb 2008) Log Message: ----------- Apply patch from Pierre Joye to improve new Win32 process spawning code (thanks). Modified Paths: -------------- trunk/ChangeLog trunk/src/utils.c trunk/src/win32.c trunk/src/win32.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-02-27 14:23:13 UTC (rev 2289) +++ trunk/ChangeLog 2008-02-27 16:08:07 UTC (rev 2290) @@ -6,6 +6,9 @@ active (introduced in r2253). * src/document.c, src/utils.c, src/utils.h: Fix a few more compiler warnings (type conversion warnings). + * src/utils.c, src/win32.c, src/win32.h: + Apply patch from Pierre Joye to improve new Win32 process spawning + code (thanks). 2008-02-26 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2008-02-27 14:23:13 UTC (rev 2289) +++ trunk/src/utils.c 2008-02-27 16:08:07 UTC (rev 2290) @@ -1849,10 +1849,7 @@ *std_err = NULL; #ifdef G_OS_WIN32 - result = win32_spawn(dir, argv, env, flags, std_out, std_err, exit_status); - /** TODO create error messages in win32_spawn with appropriate error message text **/ - if (! result) - *error = g_error_new(G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED, _("Process could not be created.")); + result = win32_spawn(dir, argv, env, flags, std_out, std_err, exit_status, error); #else result = g_spawn_sync(dir, argv, env, flags, NULL, NULL, std_out, std_err, exit_status, error); #endif @@ -1892,10 +1889,7 @@ } #ifdef G_OS_WIN32 - result = win32_spawn(dir, argv, env, flags, NULL, NULL, NULL); - /** TODO create error messages in win32_spawn with appropriate error message text **/ - if (! result) - *error = g_error_new(G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED, _("Process could not be created.")); + result = win32_spawn(dir, argv, env, flags, NULL, NULL, NULL, error); #else result = g_spawn_async(dir, argv, env, flags, NULL, NULL, child_pid, error); #endif Modified: trunk/src/win32.c =================================================================== --- trunk/src/win32.c 2008-02-27 14:23:13 UTC (rev 2289) +++ trunk/src/win32.c 2008-02-27 16:08:07 UTC (rev 2290) @@ -67,16 +67,17 @@ HANDLE hInputFile; HANDLE hStdout; HANDLE hStderr; + HANDLE processId; + DWORD dwExitCode; }; typedef struct _geany_win32_spawn geany_win32_spawn; +static gboolean GetContentFromHandle(HANDLE hFile, gchar **content, GError **error); +static HANDLE GetTempFileHandle(GError **error); +static gboolean CreateChildProcess(geany_win32_spawn *gw_spawn, TCHAR *szCmdline, const TCHAR *dir, GError **error); +static VOID ReadFromPipe(HANDLE hRead, HANDLE hWrite, HANDLE hFile, GError **error); -static gboolean GetContentFromHandle(HANDLE hFile, gchar **content); -static HANDLE GetTempFileHandle(void); -static gboolean CreateChildProcess(geany_win32_spawn *gw_spawn, TCHAR *szCmdline, const TCHAR *dir); -static VOID ReadFromPipe(HANDLE hRead, HANDLE hWrite, HANDLE hFile); - static gchar *get_file_filters() { gchar *string; @@ -736,7 +737,7 @@ /* Process spawning implementation for Windows, by Pierre Joye. * Don't call this function directly, use utils_spawn_[a]sync() instead. */ gboolean win32_spawn(const gchar *dir, gchar **argv, gchar **env, GSpawnFlags flags, - gchar **std_out, gchar **std_err, gint *exit_status) + gchar **std_out, gchar **std_err, gint *exit_status, GError **error) { TCHAR buffer[MAX_PATH]=TEXT(""); TCHAR cmdline[MAX_PATH] = TEXT(""); @@ -781,20 +782,26 @@ if (std_err != NULL) { - hStderrTempFile = GetTempFileHandle(); + hStderrTempFile = GetTempFileHandle(error); if (hStderrTempFile == INVALID_HANDLE_VALUE) { - geany_debug("win32_spawn: Second CreateFile failed (%d)\n", (gint) GetLastError()); + gchar *msg = g_win32_error_message(GetLastError()); + geany_debug("win32_spawn: Second CreateFile failed (%d)", (gint) GetLastError()); + *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR, msg); + g_free(msg); return FALSE; } } if (std_out != NULL) { - hStdoutTempFile = GetTempFileHandle(); + hStdoutTempFile = GetTempFileHandle(error); if (hStdoutTempFile == INVALID_HANDLE_VALUE) { - geany_debug("win32_spawn: Second CreateFile failed (%d)\n", (gint) GetLastError()); + gchar *msg = g_win32_error_message(GetLastError()); + geany_debug("win32_spawn: Second CreateFile failed (%d)", (gint) GetLastError()); + *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR, msg); + g_free(msg); return FALSE; } } @@ -807,11 +814,15 @@ /* Get the handle to the current STDOUT and STDERR. */ gw_spawn.hStdout = GetStdHandle(STD_OUTPUT_HANDLE); gw_spawn.hStderr = GetStdHandle(STD_ERROR_HANDLE); + gw_spawn.dwExitCode = 0; /* Create a pipe for the child process's STDOUT. */ if (! CreatePipe(&(gw_spawn.hChildStdoutRd), &(gw_spawn.hChildStdoutWr), &saAttr, 0)) { - geany_debug("win32_spawn: Stdout pipe creation failed\n"); + gchar *msg = g_win32_error_message(GetLastError()); + geany_debug("win32_spawn: Stdout pipe creation failed (%d)", (gint) GetLastError()); + *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_PIPE, msg); + g_free(msg); return FALSE; } @@ -821,7 +832,10 @@ /* Create a pipe for the child process's STDERR. */ if (!CreatePipe(&(gw_spawn.hChildStderrRd), &(gw_spawn.hChildStderrWr), &saAttr, 0)) { - geany_debug("win32_spawn: Stdout pipe creation failed\n"); + gchar *msg = g_win32_error_message(GetLastError()); + geany_debug("win32_spawn: Stderr pipe creation failed"); + *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_PIPE, msg); + g_free(msg); return FALSE; } @@ -831,42 +845,55 @@ /* Create a pipe for the child process's STDIN. */ if (!CreatePipe(&(gw_spawn.hChildStdinRd), &(gw_spawn.hChildStdinWr), &saAttr, 0)) { - geany_debug("win32_spawn: Stdin pipe creation failed\n"); + gchar *msg = g_win32_error_message(GetLastError()); + geany_debug("win32_spawn: Stdin pipe creation failed"); + *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_PIPE, g_win32_error_message (GetLastError())); + *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_PIPE, msg); + g_free(msg); return FALSE; } /* Ensure that the write handle to the child process's pipe for STDIN is not inherited. */ SetHandleInformation(gw_spawn.hChildStdinWr, HANDLE_FLAG_INHERIT, 0); + /* Now create the child process. */ + fSuccess = CreateChildProcess(&gw_spawn, cmdline, dir, error); + if (exit_status) + { + *exit_status = gw_spawn.dwExitCode; + } - /* Now create the child process. */ - fSuccess = CreateChildProcess(&gw_spawn, cmdline, dir); if (!fSuccess) { - geany_debug("win32_spawn: Create process failed with"); + geany_debug("win32_spawn: Create process failed"); return FALSE; } /* Read from pipe that is the standard output for child process. */ if (std_out != NULL) { - ReadFromPipe(gw_spawn.hChildStdoutRd, gw_spawn.hChildStdoutWr, hStdoutTempFile); - GetContentFromHandle(hStdoutTempFile, &stdout_content); + ReadFromPipe(gw_spawn.hChildStdoutRd, gw_spawn.hChildStdoutWr, hStdoutTempFile, error); + if (!GetContentFromHandle(hStdoutTempFile, &stdout_content, error)) + { + return FALSE; + } *std_out = stdout_content; } if (std_err != NULL) { - ReadFromPipe(gw_spawn.hChildStderrRd, gw_spawn.hChildStderrWr, hStderrTempFile); - GetContentFromHandle(hStderrTempFile, &stderr_content); + ReadFromPipe(gw_spawn.hChildStderrRd, gw_spawn.hChildStderrWr, hStderrTempFile, error); + if (!GetContentFromHandle(hStderrTempFile, &stderr_content, error)) + { + return FALSE; + } *std_err = stderr_content; } - return TRUE; } -static gboolean GetContentFromHandle(HANDLE hFile, gchar **content) +static gboolean GetContentFromHandle(HANDLE hFile, gchar **content, GError **error) { DWORD filesize; gchar * buffer; @@ -882,7 +909,10 @@ buffer = g_malloc(sizeof(gchar*) * (filesize+1)); if (!buffer) { + gchar *msg = g_win32_error_message(GetLastError()); geany_debug("GetContentFromHandle: Alloc failed"); + *error = g_error_new(G_SPAWN_ERROR, G_SPAWN_ERROR, msg); + g_free(msg); return FALSE; } @@ -890,13 +920,19 @@ if (!ReadFile(hFile, buffer, filesize, &dwRead, NULL) || dwRead == 0) { + gchar *msg = g_win32_error_message(GetLastError()); geany_debug("GetContentFromHandle: Cannot read tempfile"); + *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_FAILED, msg); + g_free(msg); return FALSE; } if (!CloseHandle (hFile)) { - geany_debug("GetContentFromHandle: CloseHandle failed (%d)\n", (gint) GetLastError()); + gchar *msg = g_win32_error_message(GetLastError()); + geany_debug("GetContentFromHandle: CloseHandle failed (%d)", (gint) GetLastError()); + *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_FAILED, msg); + g_free(msg); g_free(buffer); *content = NULL; return FALSE; @@ -906,7 +942,7 @@ } -static gboolean CreateChildProcess(geany_win32_spawn *gw_spawn, TCHAR *szCmdline, const TCHAR *dir) +static gboolean CreateChildProcess(geany_win32_spawn *gw_spawn, TCHAR *szCmdline, const TCHAR *dir, GError **error) { PROCESS_INFORMATION piProcInfo; STARTUPINFO siStartInfo; @@ -938,11 +974,30 @@ if (bFuncRetn == 0) { - geany_debug("CreateChildProcess: CreateProcess failed\n"); + gchar *msg = g_win32_error_message(GetLastError()); + geany_debug("CreateChildProcess: CreateProcess failed"); + *error = g_error_new(G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED, msg); + g_free(msg); return FALSE; } else { + int i; + DWORD dwStatus; + + for (i = 0; i < 2 && (dwStatus = WaitForSingleObject(piProcInfo.hProcess, 30*1000)) == WAIT_TIMEOUT; i++) + { + geany_debug("CreateChildProcess: CreateProcess failed"); + TerminateProcess(piProcInfo.hProcess, WAIT_TIMEOUT); /* NOTE: This will not kill grandkids. */ + } + + if (GetExitCodeProcess(piProcInfo.hProcess, &gw_spawn->dwExitCode) != 0) + { + gchar *msg = g_win32_error_message(GetLastError()); + geany_debug("GetExitCodeProcess failed"); + *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_FAILED, msg); + g_free(msg); + } CloseHandle(piProcInfo.hProcess); CloseHandle(piProcInfo.hThread); return bFuncRetn; @@ -951,7 +1006,7 @@ } -static VOID ReadFromPipe(HANDLE hRead, HANDLE hWrite, HANDLE hFile) +static VOID ReadFromPipe(HANDLE hRead, HANDLE hWrite, HANDLE hFile, GError **error) { DWORD dwRead, dwWritten; CHAR chBuf[BUFSIZE]; @@ -960,7 +1015,10 @@ read end of the pipe. */ if (!CloseHandle(hWrite)) { + gchar *msg = g_win32_error_message(GetLastError()); geany_debug("ReadFromPipe: Closing handle failed"); + *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR_PIPE, msg); + g_free(msg); return; } @@ -976,7 +1034,7 @@ } -static HANDLE GetTempFileHandle(void) +static HANDLE GetTempFileHandle(GError **error) { /* Temp file */ DWORD dwBufSize=BUFSIZE; @@ -992,7 +1050,10 @@ if (dwRetVal > dwBufSize || (dwRetVal == 0)) { - geany_debug("GetTempFileHandle: GetTempPath failed (%d)\n", (gint) GetLastError()); + gchar *msg = g_win32_error_message(GetLastError()); + geany_debug("GetTempFileHandle: GetTempPath failed (%d)", (gint) GetLastError()); + *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR, msg); + g_free(msg); return NULL; } @@ -1003,7 +1064,10 @@ szTempName); /* buffer for name */ if (uRetVal == 0) { - geany_debug("GetTempFileName failed (%d)\n", (gint) GetLastError()); + gchar *msg = g_win32_error_message(GetLastError()); + geany_debug("GetTempFileName failed (%d)", (gint) GetLastError()); + *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR, msg); + g_free(msg); return NULL; } @@ -1017,7 +1081,10 @@ if (hTempFile == INVALID_HANDLE_VALUE) { - geany_debug("GetTempFileHandle: Second CreateFile failed (%d)\n", (gint) GetLastError()); + gchar *msg = g_win32_error_message(GetLastError()); + geany_debug("GetTempFileHandle: Second CreateFile failed (%d)", (gint) GetLastError()); + *error = g_error_new(G_SPAWN_ERROR, G_FILE_ERROR, msg); + g_free(msg); return NULL; } return hTempFile; Modified: trunk/src/win32.h =================================================================== --- trunk/src/win32.h 2008-02-27 14:23:13 UTC (rev 2289) +++ trunk/src/win32.h 2008-02-27 16:08:07 UTC (rev 2290) @@ -33,23 +33,16 @@ void win32_show_color_dialog(const gchar *colour); -/* Creates a native Windows message box of the given type and returns always TRUE - * or FALSE representing th pressed Yes or No button. - * If type is not GTK_MESSAGE_QUESTION, it returns always TRUE. */ gboolean win32_message_dialog(GtkWidget *parent, GtkMessageType type, const gchar *msg); -/* Special dialog to ask for an action when closing an unsaved file */ gint win32_message_dialog_unsaved(const gchar *msg); -/* Just a simple wrapper function to open a browser window */ void win32_open_browser(const gchar *uri); gchar *win32_show_project_open_dialog(GtkWidget *parent, const gchar *title, const gchar *initial_dir, gboolean allow_new_file, gboolean project_file_filter); -/* Shows a folder selection dialog. - * The selected folder name is returned. */ gchar *win32_show_project_folder_dialog(GtkWidget *parent, const gchar *title, const gchar *initial_dir); @@ -62,6 +55,6 @@ gchar *win32_get_hostname(); gboolean win32_spawn(const gchar *dir, gchar **argv, gchar **env, GSpawnFlags flags, - gchar **std_out, gchar **std_err, gint *exit_status); + gchar **std_out, gchar **std_err, gint *exit_status, GError **error); #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2289] trunk
by eht16＠users.sourceforge.net 27 Feb '08

27 Feb '08

Revision: 2289 http://geany.svn.sourceforge.net/geany/?rev=2289&view=rev Author: eht16 Date: 2008-02-27 06:23:13 -0800 (Wed, 27 Feb 2008) Log Message: ----------- Fix a few more compiler warnings (type conversion warnings). Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-02-27 14:21:34 UTC (rev 2288) +++ trunk/ChangeLog 2008-02-27 14:23:13 UTC (rev 2289) @@ -2,6 +2,10 @@ * plugins/*, scintilla/*, src/*, tagmanager/*: Replace all C++-style comments with usual C-like multi-line comments. + * src/keybindings.c: Fix ignoring of some keybindings when caps lock is + active (introduced in r2253). + * src/document.c, src/utils.c, src/utils.h: + Fix a few more compiler warnings (type conversion warnings). 2008-02-26 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2008-02-27 14:21:34 UTC (rev 2288) +++ trunk/src/document.c 2008-02-27 14:23:13 UTC (rev 2289) @@ -1127,7 +1127,7 @@ if (length < 0) length = strlen(data); - switch (utils_get_line_endings((gchar*) data, length)) + 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; Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2008-02-27 14:21:34 UTC (rev 2288) +++ trunk/src/utils.c 2008-02-27 14:23:13 UTC (rev 2289) @@ -94,7 +94,7 @@ /* taken from anjuta, to determine the EOL mode of the file */ -gint utils_get_line_endings(gchar* buffer, glong size) +gint utils_get_line_endings(const gchar* buffer, glong size) { gint i; guint cr, lf, crlf, max_mode; @@ -941,7 +941,7 @@ } -gchar *utils_get_initials(gchar *name) +gchar *utils_get_initials(const gchar *name) { gint i = 1, j = 1; gchar *initials = g_malloc0(5); @@ -1542,7 +1542,7 @@ * The first argument is nothing special. * The list must be ended with NULL. * If first is NULL, NULL is returned. */ -gchar **utils_strv_new(gchar *first, ...) +gchar **utils_strv_new(const gchar *first, ...) { gsize strvlen, i; va_list args; @@ -1734,6 +1734,7 @@ /* check only letters and stop once the first non-capital was found */ if (g_unichar_isalpha(c) && g_unichar_isupper(c)) return TRUE; + /** FIXME don't write a const string */ str = g_utf8_next_char(str); } return FALSE; Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2008-02-27 14:21:34 UTC (rev 2288) +++ trunk/src/utils.h 2008-02-27 14:23:13 UTC (rev 2289) @@ -48,7 +48,7 @@ void utils_start_browser(const gchar *uri); -gint utils_get_line_endings(gchar* buffer, glong size); +gint utils_get_line_endings(const gchar* buffer, glong size); gboolean utils_isbrace(gchar c, gboolean include_angles); @@ -90,11 +90,11 @@ gchar *utils_str_replace(gchar *haystack, const gchar *needle, const gchar *replacement); -gint utils_strpos(const gchar* haystack, const gchar * needle); +gint utils_strpos(const gchar* haystack, const gchar *needle); gchar *utils_get_date_time(const gchar *format, time_t *time_to_use); -gchar *utils_get_initials(gchar *name); +gchar *utils_get_initials(const gchar *name); gboolean utils_get_setting_boolean(GKeyFile *config, const gchar *section, const gchar *key, const gboolean default_value); @@ -136,7 +136,7 @@ void utils_free_pointers(gpointer first, ...) G_GNUC_NULL_TERMINATED; -gchar **utils_strv_new(gchar *first, ...) G_GNUC_NULL_TERMINATED; +gchar **utils_strv_new(const gchar *first, ...) G_GNUC_NULL_TERMINATED; gint utils_mkdir(const gchar *path, gboolean create_parent_dirs); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2008