Commits September 2006

commits@lists.geany.org

3 participants
80 discussions

SF.net SVN: geany: [816] trunk/po
by kretek＠users.sourceforge.net 13 Sep '06

13 Sep '06

Revision: 816 http://svn.sourceforge.net/geany/?rev=816&view=rev Author: kretek Date: 2006-09-13 00:43:47 -0700 (Wed, 13 Sep 2006) Log Message: ----------- Small fix in German translation Modified Paths: -------------- trunk/po/ChangeLog trunk/po/de.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2006-09-12 09:18:43 UTC (rev 815) +++ trunk/po/ChangeLog 2006-09-13 07:43:47 UTC (rev 816) @@ -1,3 +1,8 @@ +2006-09-13 Frank Lanitz <frank(a)frank.uvena.de> + + * de.po: Fixed wrong translation + + 2006-09-12 Frank Lanitz <frank(a)frank.uvena.de> * de.po: Update fo German translation. Fixed a big number of Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2006-09-12 09:18:43 UTC (rev 815) +++ trunk/po/de.po 2006-09-13 07:43:47 UTC (rev 816) @@ -8,7 +8,7 @@ "Project-Id-Version: geany 0.8\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-09-12 10:41+0200\n" -"PO-Revision-Date: 2006-09-12 11:09+0100\n" +"PO-Revision-Date: 2006-09-13 00:54+0100\n" "Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <frank(a)frank.uvena.de>\n" "MIME-Version: 1.0\n" @@ -264,7 +264,7 @@ #: src/interface.c:530 #: src/interface.c:1896 msgid "_Toggle line commentation" -msgstr "A_uskommentierung klappen" +msgstr "Kommentierung _umschalten" #: src/interface.c:534 #: src/interface.c:1900 @@ -2633,7 +2633,7 @@ #: src/keybindings.c:208 msgid "Toggle line commentation" -msgstr "A_uskommentierung umklappen" +msgstr "Kommentierung umschalten" #: src/keybindings.c:210 msgid "Comment line" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [815] trunk/po
by kretek＠users.sourceforge.net 12 Sep '06

12 Sep '06

Revision: 815 http://svn.sourceforge.net/geany/?rev=815&view=rev Author: kretek Date: 2006-09-12 02:18:43 -0700 (Tue, 12 Sep 2006) Log Message: ----------- Update of German translation. Modified Paths: -------------- trunk/po/ChangeLog trunk/po/de.po trunk/po/geany.pot Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2006-09-12 08:32:52 UTC (rev 814) +++ trunk/po/ChangeLog 2006-09-12 09:18:43 UTC (rev 815) @@ -1,3 +1,10 @@ +2006-09-12 Frank Lanitz <frank(a)frank.uvena.de> + + * de.po: Update fo German translation. Fixed a big number of + missing accelerators »_« + * geany.pot: Update of catalog + + 2006-09-04 Frank Lanitz <frank(a)frank.uvena.de> * de.po: Update of German translation Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2006-09-12 08:32:52 UTC (rev 814) +++ trunk/po/de.po 2006-09-12 09:18:43 UTC (rev 815) @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: geany 0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-09-03 21:07+0200\n" -"PO-Revision-Date: 2006-09-04 00:13+0100\n" +"POT-Creation-Date: 2006-09-12 10:41+0200\n" +"PO-Revision-Date: 2006-09-12 11:09+0100\n" "Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <frank(a)frank.uvena.de>\n" "MIME-Version: 1.0\n" @@ -20,48 +20,52 @@ "X-Poedit-SourceCharset: utf-8\n" "X-Poedit-Basepath: /home/enrico/src/geany/\n" -#: src/main.c:111 +#: src/main.c:84 msgid "runs in debug mode (means being verbose)" msgstr "Geany im Debug-Modus ausführen (Gesprächig!)" -#: src/main.c:112 +#: src/main.c:85 +msgid "don't load the previous session's files" +msgstr "Dateien aus der letzten Sitzung nicht laden" + +#: src/main.c:86 msgid "don't load auto completion data (see documentation)" msgstr "Autovervollständigungsdaten nicht laden " -#: src/main.c:114 +#: src/main.c:88 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." -#: src/main.c:116 +#: src/main.c:90 msgid "use an alternate configuration directory" msgstr "Benutzt ein anderes Verzeichnis für die Konfigurationsdateien" -#: src/main.c:117 +#: src/main.c:91 msgid "don't show message window at startup" msgstr "Kein Meldungsfenster beim Starten anzeigen" -#: src/main.c:119 +#: src/main.c:93 msgid "don't load terminal support" msgstr "Die virtual terminal emulation (VTE) nicht starten" -#: src/main.c:120 +#: src/main.c:94 msgid "filename of libvte.so" msgstr "Name der libvte.so" -#: src/main.c:122 +#: src/main.c:96 msgid "show version and exit" msgstr "Versionsinformation anzeigen und Programm beenden" -#: src/main.c:410 +#: src/main.c:387 msgid " - A fast and lightweight IDE" msgstr " - Eine kleine und schnelle Entwicklungsumgebung" -#: src/main.c:420 +#: src/main.c:397 #, 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:462 +#: src/main.c:439 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -72,1002 +76,1007 @@ "Es können einige Probleme in Geany ohne ein Konfigurationsverzeichnis auftreten.\n" "Geany trotzdem starten?" -#: src/main.c:572 +#: src/main.c:555 #, c-format msgid "This is Geany %s." msgstr "Willkommen zu Geany %s." -#: src/main.c:574 +#: src/main.c:557 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "Konfigurationsverzeichnis konnte nicht erstellt werden (%s)." -#: src/main.c:599 -#: src/callbacks.c:825 -#: src/dialogs.c:146 -#: src/document.c:374 -#: src/document.c:408 -#: src/win32.c:150 +#: src/main.c:582 +#: src/callbacks.c:823 +#: src/dialogs.c:150 +#: src/document.c:378 +#: src/document.c:416 +#: src/win32.c:151 #, c-format msgid "You have opened too many files. There is a limit of %d concurrent open files." msgstr "Sie haben zu viele Dateien geöffnet, Es dürfen maximal %d Datei gleichzeitig geöffnet sein." -#: src/interface.c:240 -#: src/interface.c:1364 +#: src/interface.c:241 +#: src/interface.c:1374 msgid "Geany" msgstr "Geany" -#: src/interface.c:250 +#: src/interface.c:251 msgid "_File" msgstr "_Datei" -#: src/interface.c:261 +#: src/interface.c:262 msgid "New (with _template)" msgstr "Neu (aus _Vorlage)" -#: src/interface.c:272 -#: src/interface.c:291 -#: src/interface.c:335 -#: src/interface.c:446 -#: src/interface.c:492 -#: src/interface.c:728 -#: src/interface.c:738 -#: src/interface.c:1802 -#: src/interface.c:1848 +#: src/interface.c:273 +#: src/interface.c:292 +#: src/interface.c:336 +#: src/interface.c:447 +#: src/interface.c:493 +#: src/interface.c:733 +#: src/interface.c:743 +#: src/interface.c:1814 +#: src/interface.c:1860 msgid "invisible" msgstr "invisible" -#: src/interface.c:284 +#: src/interface.c:285 msgid "Recent _files" msgstr "Z_uletzt geöffnet" -#: src/interface.c:307 +#: src/interface.c:308 msgid "Save a_ll" msgstr "A_lle speichern" -#: src/interface.c:310 +#: src/interface.c:311 msgid "Saves all open files" msgstr "Speichert alle offenen Dateien" -#: src/interface.c:316 -#: src/callbacks.c:508 -#: src/utils.c:988 +#: src/interface.c:317 +#: src/callbacks.c:506 +#: src/utils.c:508 msgid "_Reload" msgstr "_Neu laden" -#: src/interface.c:324 +#: src/interface.c:325 msgid "R_eload as" msgstr "N_eu laden als" -#: src/interface.c:355 +#: src/interface.c:356 msgid "Prints the current file" msgstr "Druckt die aktuelle Datei" -#: src/interface.c:366 +#: src/interface.c:367 msgid "C_lose all" msgstr "_Alle schließen" -#: src/interface.c:369 +#: src/interface.c:370 msgid "Closes all open files" msgstr "Schließt alle offenen Dateien" -#: src/interface.c:383 -#: src/interface.c:973 +#: src/interface.c:384 +#: src/interface.c:980 msgid "Quit Geany" msgstr "Geany beenden" -#: src/interface.c:385 +#: src/interface.c:386 msgid "_Edit" msgstr "_Bearbeiten" -#: src/interface.c:426 -#: src/interface.c:1765 +#: src/interface.c:427 +#: src/interface.c:1777 msgid "Select _All" msgstr "A_lles auswählen" -#: src/interface.c:435 +#: src/interface.c:436 msgid "_Insert \"include <...>\"" msgstr "\"include <...>\" ei_nfügen" -#: src/interface.c:449 +#: src/interface.c:450 msgid "I_nsert Comments" msgstr "K_ommentare einfügen" -#: src/interface.c:460 -#: src/interface.c:1816 +#: src/interface.c:461 +#: src/interface.c:1828 msgid "Insert ChangeLog entry" msgstr "ChangeLog-Eintrag hinzufügen" -#: src/interface.c:463 -#: src/interface.c:1819 +#: src/interface.c:464 +#: src/interface.c:1831 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:465 -#: src/interface.c:1821 +#: src/interface.c:466 +#: src/interface.c:1833 msgid "Insert file header" msgstr "Dateikopf einfügen" -#: src/interface.c:468 -#: src/interface.c:1824 +#: src/interface.c:469 +#: src/interface.c:1836 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:470 -#: src/interface.c:1826 +#: src/interface.c:471 +#: src/interface.c:1838 msgid "Insert function description" msgstr "Funktionsbeschreibung einfügen" -#: src/interface.c:473 -#: src/interface.c:1829 +#: src/interface.c:474 +#: src/interface.c:1841 msgid "Inserts a description before the current function" msgstr "Fügt eine Funktionsbeschreibung vor der Funktion ein." -#: src/interface.c:475 -#: src/interface.c:1831 +#: src/interface.c:476 +#: src/interface.c:1843 msgid "Insert multiline comment" msgstr "Mehrzeiligen Kommentar einfügen" -#: src/interface.c:478 -#: src/interface.c:1834 +#: src/interface.c:479 +#: src/interface.c:1846 msgid "Inserts a multiline comment" msgstr "Fügt einen mehrzeiligen Kommentar ein." -#: src/interface.c:480 -#: src/interface.c:1836 +#: src/interface.c:481 +#: src/interface.c:1848 msgid "Insert GPL notice" msgstr "GPL-Hinweis am Dateianfang einfügen" -#: src/interface.c:483 -#: src/interface.c:1839 +#: src/interface.c:484 +#: src/interface.c:1851 msgid "Inserts a GPL notice (should be done at the beginning of the file)" msgstr "Fügt einen kurzen Lizenz-Hinweis auf die GPL am Anfang einer neu erzeugten Datei ein" -#: src/interface.c:485 -#: src/interface.c:1841 +#: src/interface.c:486 +#: src/interface.c:1853 msgid "Insert Dat_e" -msgstr "Datum einfügen" +msgstr "_Datum einfügen" -#: src/interface.c:500 -#: src/interface.c:1856 +#: src/interface.c:501 +#: src/interface.c:1868 msgid "_Format" msgstr "_Format" -#: src/interface.c:503 +#: src/interface.c:504 msgid "Convert the case of the current selection" msgstr "Ändert die Großschreibung der aktuellen Auswahl" -#: src/interface.c:508 -#: src/interface.c:1863 +#: src/interface.c:509 +#: src/interface.c:1875 msgid "Convert Selection to _lower-case" msgstr "Auswahl in _Kleinbuchstaben umwandeln" -#: src/interface.c:512 -#: src/interface.c:1867 +#: src/interface.c:513 +#: src/interface.c:1879 msgid "Convert Selection to _upper-case" msgstr "Auswahl in _Großbuchstaben umwandeln" -#: src/interface.c:521 -#: src/interface.c:1876 +#: src/interface.c:522 +#: src/interface.c:1888 msgid "_Comment Line" msgstr "Zeile _auskommentieren" -#: src/interface.c:525 -#: src/interface.c:1880 -msgid "_Uncomment Line" +#: src/interface.c:526 +#: src/interface.c:1892 +msgid "U_ncomment Line" msgstr "Zeile _einkommentieren" -#: src/interface.c:529 -#: src/interface.c:1884 -msgid "D_uplicate Line" -msgstr "_Zeile oder Auswahl kopieren" +#: src/interface.c:530 +#: src/interface.c:1896 +msgid "_Toggle line commentation" +msgstr "A_uskommentierung klappen" -#: src/interface.c:538 -#: src/interface.c:1893 +#: src/interface.c:534 +#: src/interface.c:1900 +msgid "Du_plicate Line" +msgstr "_Zeile kopieren" + +#: src/interface.c:543 +#: src/interface.c:1909 msgid "_Increase Indent" msgstr "Einzug _erhöhen" -#: src/interface.c:542 -#: src/interface.c:1897 +#: src/interface.c:547 +#: src/interface.c:1913 msgid "_Decrease Indent" msgstr "Einzug _verringern" -#: src/interface.c:546 +#: src/interface.c:551 msgid "Count _words" msgstr "Wörter _zählen" -#: src/interface.c:549 +#: src/interface.c:554 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:560 +#: src/interface.c:565 msgid "_Search" msgstr "_Suchen" -#: src/interface.c:571 +#: src/interface.c:576 msgid "Find _Next" msgstr "_Nächstes" -#: src/interface.c:575 +#: src/interface.c:580 msgid "Find _Previous" msgstr "_Vorheriges" -#: src/interface.c:579 +#: src/interface.c:584 #: src/search.c:283 msgid "_Replace" msgstr "_Ersetzen" -#: src/interface.c:592 +#: src/interface.c:597 msgid "Find in f_iles" msgstr "In _Dateien suchen" -#: src/interface.c:601 +#: src/interface.c:606 msgid "_Go to line" msgstr "Gehe zu _Zeile" -#: src/interface.c:609 -#: src/dialogs.c:70 +#: src/interface.c:614 +#: src/dialogs.c:74 msgid "_View" msgstr "_Ansicht" -#: src/interface.c:616 +#: src/interface.c:621 msgid "Change _Font" msgstr "_Schriftart ändern" -#: src/interface.c:619 +#: src/interface.c:624 msgid "Change the default font" msgstr "Ändert die Standardschriftart für das Editor-Fenster" -#: src/interface.c:625 +#: src/interface.c:630 msgid "Show _Colour Chooser" msgstr "_Farbwähler öffnen" -#: src/interface.c:628 -#: src/interface.c:912 +#: src/interface.c:633 +#: src/interface.c:919 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:639 +#: src/interface.c:644 msgid "Full_screen" msgstr "_Vollbild" -#: src/interface.c:643 +#: src/interface.c:648 msgid "Show Messages _Window" msgstr "_Meldungsfenster anzeigen" -#: src/interface.c:646 +#: src/interface.c:651 msgid "Toggle the window with status and compiler messages on and off" msgstr "Schaltet das Meldungsfenster(beinhaltet auch Compiler-Ausgaben) ein und aus." -#: src/interface.c:649 +#: src/interface.c:654 msgid "Show _Toolbar" msgstr "_Werkzeugleiste anzeigen" -#: src/interface.c:652 +#: src/interface.c:657 msgid "Toggle the toolbar on and off" msgstr "Schaltet die Anzeige der Werkzeugleiste an und aus." -#: src/interface.c:655 +#: src/interface.c:660 msgid "Show Side_bar" msgstr "Seiten_leiste anzeigen" -#: src/interface.c:660 +#: src/interface.c:665 msgid "Show _Markers Margin" msgstr "M_arkierungsrand anzeigen" -#: src/interface.c:663 +#: src/interface.c:668 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:666 +#: src/interface.c:671 msgid "Show _Line Numbers" msgstr "_Zeilennummern anzeigen" -#: src/interface.c:669 +#: src/interface.c:674 msgid "Shows or hides the Line Number margin." msgstr "Zeigt oder versteckt den Zeilennummernrand." -#: src/interface.c:689 +#: src/interface.c:694 msgid "_Document" msgstr "D_okument" -#: src/interface.c:696 +#: src/interface.c:701 msgid "_Line wrapping" msgstr "Zeilenu_mbruch" -#: src/interface.c:699 -#: src/interface.c:2990 +#: src/interface.c:704 +#: src/interface.c:3010 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: Zeilenumbruch erfordert viel Rechenleistung für große Dokumente und sollte daher auf langsameren Rechnern deaktiviert werden!" -#: src/interface.c:702 +#: src/interface.c:707 msgid "_Use auto indentation" msgstr "Automatische _Einrückung benutzen" -#: src/interface.c:707 +#: src/interface.c:712 msgid "Read _only" msgstr "_Schreibgeschützt" -#: src/interface.c:710 +#: src/interface.c:715 msgid "Treat this file as read-only. No changes can be made." msgstr "Datei als schreibgeschützt behandeln. Keine Änderungen möglich." -#: src/interface.c:712 +#: src/interface.c:717 msgid "_Write Unicode BOM" msgstr "_Unicode BOM schreiben" -#: src/interface.c:721 +#: src/interface.c:726 msgid "Set file_type" msgstr "Datei_typ festlegen" -#: src/interface.c:731 +#: src/interface.c:736 msgid "Set _encoding" msgstr "Zeichen_kodierung festlegen" -#: src/interface.c:741 +#: src/interface.c:746 msgid "Set line e_ndings" msgstr "_Zeilenenden anzeigen" -#: src/interface.c:748 +#: src/interface.c:753 msgid "Convert and set to _CR/LF (Win)" msgstr "Auf _CR/LF setzen umwandeln (Win)" -#: src/interface.c:753 +#: src/interface.c:759 msgid "Convert and set to _LF (Unix)" msgstr "Auf _LF setzen und umwandeln (Unix)" -#: src/interface.c:758 +#: src/interface.c:765 msgid "Convert and set to CR (_Mac)" msgstr "Auf CR setzen umwandeln (_Mac)" -#: src/interface.c:769 +#: src/interface.c:776 msgid "_Replace tabs by spaces" msgstr "_Tabulatoren durch Leerzeichen ersetzen" -#: src/interface.c:772 -#: src/interface.c:2923 +#: src/interface.c:779 +#: src/interface.c:2943 msgid "Replaces all tabs in document by spaces." msgstr "Ersetzt alle Tabulatoren im Dokument durch Leerzeichen" -#: src/interface.c:779 +#: src/interface.c:786 msgid "_Fold all" msgstr "Alle _einklappen" -#: src/interface.c:782 +#: src/interface.c:789 msgid "Folds all contractible code blocks" msgstr "Klappt alle ausblendbaren Codeblöcke ein" -#: src/interface.c:784 +#: src/interface.c:791 msgid "_Unfold all" msgstr "Alle _ausklappen" -#: src/interface.c:787 +#: src/interface.c:794 msgid "Unfolds all contracted code blocks" msgstr "Klappt alle ausgeblendeten Codeblöcke wieder aus" -#: src/interface.c:794 +#: src/interface.c:801 msgid "Remove all _indicators" msgstr "Alle _Markierungen löschen" -#: src/interface.c:797 +#: src/interface.c:804 msgid "Removes all set indicators in the current document." msgstr "Entfernt alle gesetzten Markierungen innerhalb des Dokumentes." #. build the code -#: src/interface.c:799 -#: src/dialogs.c:485 +#: src/interface.c:806 +#: src/ui_utils.c:790 msgid "_Build" msgstr "_Erstellen" -#: src/interface.c:803 +#: src/interface.c:810 msgid "_Help" msgstr "_Hilfe" -#: src/interface.c:814 +#: src/interface.c:821 msgid "_Keyboard shortcuts" msgstr "_Tastenkürzel" -#: src/interface.c:817 +#: src/interface.c:824 msgid "Shows a list of all keyboard shortcuts for Geany." msgstr "Zeige eine Übersicht mit allen Tastenkürzeln für Geany." -#: src/interface.c:819 +#: src/interface.c:826 msgid "_Website" msgstr "_Webseite" -#: src/interface.c:842 +#: src/interface.c:849 msgid "Create a new file" msgstr "Neue Datei anlegen" -#: src/interface.c:847 +#: src/interface.c:854 msgid "Open an existing file" msgstr "Öffnet eine existierende Datei" -#: src/interface.c:852 +#: src/interface.c:859 msgid "Save the current file" msgstr "Speichert die aktuelle Datei" -#: src/interface.c:854 -#: src/keybindings.c:121 +#: src/interface.c:861 +#: src/keybindings.c:125 msgid "Save all" msgstr "Alle speichern" -#: src/interface.c:857 +#: src/interface.c:864 msgid "Save all open files" msgstr "Speichere alle offenen Dateien" -#: src/interface.c:866 +#: src/interface.c:873 msgid "Reload the current file from disk" msgstr "Liest die aktuelle Datei neu ein." -#: src/interface.c:871 +#: src/interface.c:878 msgid "Close the current file" msgstr "Schließt die aktuelle Datei" -#: src/interface.c:880 +#: src/interface.c:887 msgid "Undo the last modification" msgstr "Macht die letzte Änderung rückgängig." -#: src/interface.c:885 +#: src/interface.c:892 msgid "Redo the last modification" msgstr "Wiederholt die letzte Änderung." -#: src/interface.c:893 -#: src/keybindings.c:169 +#: src/interface.c:900 +#: src/keybindings.c:173 msgid "Compile" msgstr "Kompilieren" -#: src/interface.c:896 +#: src/interface.c:903 msgid "Compile the current file" msgstr "Kompiliert die aktuelle Datei" -#: src/interface.c:901 -#: src/dialogs.c:538 +#: src/interface.c:908 +#: src/ui_utils.c:847 msgid "Run or view the current file" msgstr "Aktuelle Datei anzeigen oder ausführen" -#: src/interface.c:909 +#: src/interface.c:916 msgid "Color" msgstr "Farbwähler" -#: src/interface.c:921 +#: src/interface.c:928 msgid "Zoom in the text" msgstr "Text vergrößern" -#: src/interface.c:926 +#: src/interface.c:933 msgid "Zoom out the text" msgstr "Text verkleinern" -#: src/interface.c:939 -#: src/interface.c:944 +#: src/interface.c:946 +#: src/interface.c:951 msgid "Find the entered text in the current file" msgstr "Findet den eingegebenen Text im aktuellen Dokument" -#: src/interface.c:957 +#: src/interface.c:964 msgid "Enter a line number and jump to it." msgstr "Geben Sie die Zeile an, zu der Sie springen möchten." -#: src/interface.c:964 +#: src/interface.c:971 msgid "Jump to the entered line number." msgstr "Springe zu angegebener Zeile" -#: src/interface.c:1000 -#: src/treeviews.c:41 +#: src/interface.c:1007 +#: src/treeviews.c:40 msgid "Symbols" msgstr "Symbole" -#: src/interface.c:1013 -#: src/treeviews.c:219 +#: src/interface.c:1020 +#: src/treeviews.c:218 msgid "Open files" msgstr "Geöffnete Dateien" -#: src/interface.c:1048 +#: src/interface.c:1055 msgid "Status" msgstr "Status" -#: src/interface.c:1062 +#: src/interface.c:1069 msgid "Compiler" msgstr "Compiler" -#: src/interface.c:1076 +#: src/interface.c:1083 msgid "Messages" msgstr "Meldungen" -#: src/interface.c:1089 +#: src/interface.c:1096 msgid "Scribble" msgstr "Notizen" -#: src/interface.c:1589 -#: src/interface.c:2764 +#: src/interface.c:1600 +#: src/interface.c:2784 msgid "Images and text" msgstr "Icons und Text" -#: src/interface.c:1595 -#: src/interface.c:2772 +#: src/interface.c:1606 +#: src/interface.c:2792 msgid "Images only" msgstr "Nur Icons" -#: src/interface.c:1601 -#: src/interface.c:2780 +#: src/interface.c:1612 +#: src/interface.c:2800 msgid "Text only" msgstr "Nur Text" -#: src/interface.c:1612 -#: src/interface.c:2788 +#: src/interface.c:1623 +#: src/interface.c:2808 msgid "Large icons" msgstr "Große Symbole" -#: src/interface.c:1617 -#: src/interface.c:2796 +#: src/interface.c:1628 +#: src/interface.c:2816 msgid "Small icons" msgstr "Kleine Symbole" -#: src/interface.c:1627 +#: src/interface.c:1638 msgid "Hide toolbar" msgstr "Toolbar verbergen" -#: src/interface.c:1791 +#: src/interface.c:1803 msgid "Insert \"include <...>\"" msgstr "\"include <...>\" einfügen" -#: src/interface.c:1805 +#: src/interface.c:1817 msgid "Insert Comments" msgstr "Kommentare einfügen" -#: src/interface.c:1906 +#: src/interface.c:1922 msgid "Find usage" msgstr "Auftreten finden" -#: src/interface.c:1914 -#: src/keybindings.c:224 +#: src/interface.c:1930 +#: src/keybindings.c:234 msgid "Go to tag definition" msgstr "Gehe zu Tag Definition" -#: src/interface.c:1918 -#: src/keybindings.c:226 +#: src/interface.c:1934 +#: src/keybindings.c:236 msgid "Go to tag declaration" msgstr "Gehe zu Tag Deklaration" -#: src/interface.c:1927 -#: src/dialogs.c:739 -#: src/keybindings.c:149 +#: src/interface.c:1943 +#: src/dialogs.c:563 +#: src/keybindings.c:153 msgid "Go to line" msgstr "Gehe zu Zeile" -#: src/interface.c:1930 +#: src/interface.c:1946 msgid "Goto to the entered line" msgstr "Springe zu angegebener Zeile" -#: src/interface.c:2269 -#: src/keybindings.c:139 +#: src/interface.c:2289 +#: src/keybindings.c:143 msgid "Preferences" msgstr "Einstellungen" -#: src/interface.c:2298 +#: src/interface.c:2318 msgid "Load files from the last session" msgstr "Dateien aus der letzten Sitzung laden" -#: src/interface.c:2302 +#: src/interface.c:2322 msgid "Opens at startup the files from the last session" msgstr "Lädt die geöffneten Dateien aus der letzten Sitzung" -#: src/interface.c:2305 +#: src/interface.c:2325 msgid "Save window position and geometry" msgstr "Fensterposition und -größe speichern" -#: src/interface.c:2309 +#: src/interface.c:2329 msgid "Saves the window position and geometry and restores it at the start" msgstr "Speichert die Fensterposition und -größe" -#: src/interface.c:2312 +#: src/interface.c:2332 msgid "Beep on errors or when compilation has finished" msgstr "Bei Fehlern oder beendeter Kompilierung Piepton ausgeben" -#: src/interface.c:2315 +#: src/interface.c:2335 msgid "Whether to beep if an error occured or when the compilation process has finished." msgstr "Soll bei Fehlern oder beendeter Kompilierung ein Piepton ausgegeben werden?" -#: src/interface.c:2318 +#: src/interface.c:2338 msgid "Switch to status message list at new message" msgstr "Wechsele zum Statusmeldungsfenster bei neuer Meldung" -#: src/interface.c:2321 +#: src/interface.c:2341 msgid "Switch to the status message tab (in the notebook window at the bottom) if a new status message arrives." msgstr "Automatisch zu dem Statusmeldungs-Reiter im unteren Fenster wechseln, wenn eine neue Statusmeldung vorliegt." -#: src/interface.c:2324 +#: src/interface.c:2344 msgid "Load virtual terminal emulation at startup" msgstr "Starte die Virtual Terminal Emulation beim Starten" -#: src/interface.c:2326 +#: src/interface.c:2346 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:2329 +#: src/interface.c:2349 msgid "Confirm exit" msgstr "Beenden bestätigen" -#: src/interface.c:2333 +#: src/interface.c:2353 msgid "Shows a confirmation dialog on exit." msgstr "Zeigt einen Bestätigungsdialog vor dem Beenden." -#: src/interface.c:2344 +#: src/interface.c:2364 msgid "Recent files list length:" msgstr "Anzahl der \"Zuletzt geöffneten\" Dateien" -#: src/interface.c:2352 +#: src/interface.c:2372 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:2360 +#: src/interface.c:2380 msgid "Placement of new file tabs: " msgstr "Platzierung neuer Dateien:" -#: src/interface.c:2364 -#: src/interface.c:2620 -#: src/interface.c:2630 +#: src/interface.c:2384 #: src/interface.c:2640 +#: src/interface.c:2650 +#: src/interface.c:2660 msgid "Left" msgstr "Links" -#: src/interface.c:2367 +#: src/interface.c:2387 msgid "New file tabs will be placed to the left of the tab list" msgstr "Neue Dateien werden links von der Datei-Liste platziert." -#: src/interface.c:2376 -#: src/interface.c:2621 -#: src/interface.c:2631 +#: src/interface.c:2396 #: src/interface.c:2641 +#: src/interface.c:2651 +#: src/interface.c:2661 msgid "Right" msgstr "Rechts" -#: src/interface.c:2379 +#: src/interface.c:2399 msgid "New file tabs will be placed to the right of the tab list" msgstr "Neue Dateien werden rechts von der Datei-Liste platziert." -#: src/interface.c:2388 +#: src/interface.c:2408 msgid "General" msgstr "Allgemein" -#: src/interface.c:2410 +#: src/interface.c:2430 msgid "Show symbol list" msgstr "Symbol-Ansicht anzeigen" -#: src/interface.c:2413 -#: src/interface.c:2419 +#: src/interface.c:2433 +#: src/interface.c:2439 msgid "Toggle the symbol list on and off" msgstr "Schaltet die Symbol-Ansicht ein und aus." -#: src/interface.c:2416 +#: src/interface.c:2436 msgid "Show open files list" msgstr "Zeige Liste mit geöffneten Dateien" -#: src/interface.c:2422 +#: src/interface.c:2442 msgid "Sidebar" msgstr "Seitenleiste" -#: src/interface.c:2443 +#: src/interface.c:2463 msgid "Symbol list font" msgstr "Schriftart der Symbol-Liste" -#: src/interface.c:2450 +#: src/interface.c:2470 msgid "Message window font" msgstr "Schriftart des Meldungsfenster" -#: src/interface.c:2462 +#: src/interface.c:2482 msgid "Sets the font for the message window" msgstr "Ändert die Schriftart für das Meldungsfenster" -#: src/interface.c:2470 +#: src/interface.c:2490 msgid "Sets the font for symbol list window" msgstr "Ändert die Schriftart für die Symbol-Ansicht" -#: src/interface.c:2473 +#: src/interface.c:2493 msgid "Editor font" msgstr "Editor-Schriftart" -#: src/interface.c:2485 +#: src/interface.c:2505 msgid "Sets the font for the editors windows" msgstr "Ändert die Schriftart des Editors" -#: src/interface.c:2487 +#: src/interface.c:2507 msgid "Fonts" msgstr "Schriftarten" -#: src/interface.c:2508 +#: src/interface.c:2528 msgid "Long line marker" msgstr "Long line marker" -#: src/interface.c:2515 +#: src/interface.c:2535 msgid "Long line marker color" msgstr "Long line marker Farbe" -#: src/interface.c:2528 +#: src/interface.c:2548 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 "Der \"long line marker\" 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:2532 +#: src/interface.c:2552 msgid "Type" msgstr "Typ" -#: src/interface.c:2545 +#: src/interface.c:2565 msgid "Line" msgstr "Linie" -#: src/interface.c:2548 +#: src/interface.c:2568 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(siehe unten)." -#: src/interface.c:2552 +#: src/interface.c:2572 msgid "Background" msgstr "Hintergrund" -#: src/interface.c:2555 +#: src/interface.c:2575 msgid "The background colour of characters after the given cursor position (see below) changed to the colour 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. (Das ist nützlich für proportionale Schriftarten)" -#: src/interface.c:2559 +#: src/interface.c:2579 msgid "Disabled" msgstr "Aus" -#: src/interface.c:2570 +#: src/interface.c:2590 msgid "Sets the color of the long line marker" msgstr "Stellt die Farbe des \"long line markers\" ein." -#: src/interface.c:2571 -#: src/dialogs.c:423 -#: src/prefs.c:988 -#: src/prefs.c:995 +#: src/interface.c:2591 +#: src/dialogs.c:497 +#: src/prefs.c:976 +#: src/prefs.c:983 msgid "Color Chooser" msgstr "Farb-Wähler" -#: src/interface.c:2573 +#: src/interface.c:2593 msgid "Long line marker" msgstr "Long line marker" -#: src/interface.c:2594 -#: src/interface.c:3036 +#: src/interface.c:2614 +#: src/interface.c:3056 msgid "Editor" msgstr "Editor" -#: src/interface.c:2601 +#: src/interface.c:2621 msgid "Message window" msgstr "Meldungsfenster" -#: src/interface.c:2608 +#: src/interface.c:2628 msgid "Sidebar" msgstr "Seitenleiste" -#: src/interface.c:2622 -#: src/interface.c:2632 #: src/interface.c:2642 +#: src/interface.c:2652 +#: src/interface.c:2662 msgid "Top" msgstr "Oben" -#: src/interface.c:2623 -#: src/interface.c:2633 #: src/interface.c:2643 +#: src/interface.c:2653 +#: src/interface.c:2663 msgid "Bottom" msgstr "Unten" -#: src/interface.c:2645 +#: src/interface.c:2665 msgid "Tab placement" msgstr "Tab-Platzierung:" -#: src/interface.c:2650 +#: src/interface.c:2670 msgid "Interface" msgstr "Schnittstelle" -#: src/interface.c:2669 +#: src/interface.c:2689 msgid "Show Toolbar" msgstr "Werkzeugleiste anzeigen" -#: src/interface.c:2694 +#: src/interface.c:2714 msgid "Show file operation buttons" msgstr "Dateioperationssymbole anzeigen" -#: src/interface.c:2698 +#: src/interface.c:2718 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." -#: src/interface.c:2701 +#: src/interface.c:2721 msgid "Show Compile and Run" msgstr "Kompileren und Ausführen anzeigen" -#: src/interface.c:2705 +#: src/interface.c:2725 msgid "Display the Compile and Run buttons in the toolbar" msgstr "Zeigt die Kompilieren- und Ausführensymbole in der Werkzeugleiste." -#: src/interface.c:2708 +#: src/interface.c:2728 msgid "Show Colour Chooser button" msgstr "Farbwähler anzeigen" -#: src/interface.c:2712 +#: src/interface.c:2732 msgid "Display the Colour Chooser button in the toolbar" msgstr "Zeigt das Farbwählersymbol in der Werkzeugleiste." -#: src/interface.c:2715 +#: src/interface.c:2735 msgid "Show Zoom In and Zoom Out" msgstr "Heran- und Wegzoomen anzeigen" -#: src/interface.c:2719 +#: src/interface.c:2739 msgid "Display the Zoom In and Zoom Out buttons in the toolbar" msgstr "Zeigt die Heran- und Wegzoomensymbole in der Werkzeugleiste." -#: src/interface.c:2722 +#: src/interface.c:2742 msgid "Show Redo and Undo buttons" msgstr "Rückgängig und Wiederholen anzeigen" -#: src/interface.c:2726 +#: src/interface.c:2746 msgid "Display the Redo and Undo buttons in the toolbar" msgstr "Zeigt die Rückgängig- und Wiederholensymbole in der Werkzeugleiste." -#: src/interface.c:2729 +#: src/interface.c:2749 msgid "Show Search field" msgstr "Such-Feld anzeigen" -#: src/interface.c:2733 +#: src/interface.c:2753 msgid "Display the search field and button in the toolbar" msgstr "Zeige das Suchfeld in der Werkzeugleiste" -#: src/interface.c:2736 +#: src/interface.c:2756 msgid "Show Goto line field" msgstr "Zeilennummereingabefeld anzeigen" -#: src/interface.c:2740 +#: src/interface.c:2760 msgid "Display the line number field and button in the toolbar" msgstr "Zeige das Zeilennummereingabefeld in der Werkzeugleiste" -#: src/interface.c:2743 +#: src/interface.c:2763 msgid "Items" msgstr "Symbole" -#: src/interface.c:2804 +#: src/interface.c:2824 msgid "Icon style" msgstr "Symbolstil" -#: src/interface.c:2811 +#: src/interface.c:2831 msgid "Icon size" msgstr "Symbolgröße" -#: src/interface.c:2818 +#: src/interface.c:2838 msgid "Appearance" msgstr "Aussehen" -#: src/interface.c:2823 +#: src/interface.c:2843 msgid "Toolbar" msgstr "Werkzeugleiste" -#: src/interface.c:2851 +#: src/interface.c:2871 msgid "Tab Width:" msgstr "Tabulatorbreite" -#: src/interface.c:2858 +#: src/interface.c:2878 msgid "Default encoding:" msgstr "Standardkodierung:" -#: src/interface.c:2869 +#: src/interface.c:2889 msgid "Sets the default encoding for newly created files." msgstr "Setzt die Zeichenkodierung für neu erstellte Dateien" -#: src/interface.c:2881 +#: src/interface.c:2901 msgid "The width in chars, which one tab character will take" msgstr "Die Breite in Zeichen, die ein Tabalutar-Zeichen einnimmt" -#: src/interface.c:2886 +#: src/interface.c:2906 msgid "New files" msgstr "Neue Dateien" -#: src/interface.c:2905 +#: src/interface.c:2925 msgid "Strip trailing spaces" msgstr "Leerzeichen am Zeilenende entfernen" -#: src/interface.c:2909 +#: src/interface.c:2929 msgid "Removes trailing spaces and tabs and the end of lines" msgstr "Entfernt Leerzeichen an Zeilenenden" -#: src/interface.c:2912 +#: src/interface.c:2932 msgid "Ensure new line at file end" msgstr "Neue Zeile am Dateiende" -#: src/interface.c:2916 +#: src/interface.c:2936 msgid "Ensures that at the end of the file is a new line" msgstr "Fügt am Dateiende eine neue Zeile an (wenn keine vorhanden ist)" -#: src/interface.c:2919 -#: src/keybindings.c:163 +#: src/interface.c:2939 +#: src/keybindings.c:167 msgid "Replace tabs by space" msgstr "Tabulatoren durch Leerzeichen ersetzen" -#: src/interface.c:2926 +#: src/interface.c:2946 msgid "Saving files" msgstr "Speichern" -#: src/interface.c:2945 +#: src/interface.c:2965 msgid "Show indentation guides" msgstr "Zeige Einrückungshinweise" -#: src/interface.c:2948 +#: src/interface.c:2968 msgid "Shows small dotted lines to help you to use the right indentation." msgstr "Blendet punktierte Linien ein, um die Einrückung zu erleichtern." -#: src/interface.c:2951 +#: src/interface.c:2971 msgid "Show white space" msgstr "Zeige Leerzeichen" -#: src/interface.c:2954 +#: src/interface.c:2974 msgid "Marks spaces with dots and tabs with arrows." msgstr "Markiert Leerzeichen mit Punkten und Tabulatoren mit kleinen Pfeilen." -#: src/interface.c:2957 +#: src/interface.c:2977 msgid "Show line endings" msgstr "Zeilenenden anzeigen" -#: src/interface.c:2960 +#: src/interface.c:2980 msgid "Show the line ending character" msgstr "Zeilenende-Zeichen anzeigen" -#: src/interface.c:2963 +#: src/interface.c:2983 msgid "Display" msgstr "Anzeige" -#: src/interface.c:2982 +#: src/interface.c:3002 msgid "Auto indentation" msgstr "Automatische Einrückung benutzen" -#: src/interface.c:2985 +#: src/interface.c:3005 msgid "Add the same indentation as the previous line after pressing enter" msgstr "Fügt denselben Einzug wie in der vorherigen Zeile nach Drücken von Enter ein." -#: src/interface.c:2987 +#: src/interface.c:3007 msgid "Line wrapping" msgstr "Zeilenumbruch" -#: src/interface.c:2992 +#: src/interface.c:3012 msgid "Construct auto completion" msgstr "Autovervollständigung von Konstrukten" -#: src/interface.c:2995 +#: src/interface.c:3015 msgid "Automatic completion of often used constructs like if and for" msgstr "Autovervollständigung von häufig benutzten Konstrukten wie if, for und switch." -#: src/interface.c:2998 +#: src/interface.c:3018 msgid "XML tag auto completion" msgstr "XML-Tag Autovervollständigung" -#: src/interface.c:3001 +#: src/interface.c:3021 msgid "Automatic completion of open XML tags (includes HTML tags)" msgstr "Autovervollständigung von offenen XML-Tags, einschließlich HTML-Tags" -#: src/interface.c:3004 +#: src/interface.c:3024 msgid "Enable folding" msgstr "Code-Ausblendung aktivieren" -#: src/interface.c:3007 +#: src/interface.c:3027 msgid "Whether to enable folding the code" msgstr "Soll Code-Ausblendung aktiviert werden?" -#: src/interface.c:3010 +#: src/interface.c:3030 msgid "Use indicators to show compile errors" msgstr "Benutzt Markierungen, um Probleme beim Kompilieren anzuzeigen. " -#: src/interface.c:3013 +#: src/interface.c:3033 msgid "Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error." msgstr "Benutzt Markierungen (wellige Unterstreichungen), um die Zeilen zu markieren, in denen Fehler beim Kompilieren aufgetreten sind. " -#: src/interface.c:3020 +#: src/interface.c:3040 msgid "Rows of auto completion list:" msgstr "Anzahl der Zeilen der Autovervollständigungsliste: " -#: src/interface.c:3028 +#: src/interface.c:3048 msgid "Number of rows to display in the auto completion list." msgstr "Anzahl der Zeilen, die maximal angezeigt werden sollen, wenn die Autovervollständigungsliste angezeigt wird. " -#: src/interface.c:3031 +#: src/interface.c:3051 msgid "Features" msgstr "Eigenschaften" -#: src/interface.c:3044 +#: src/interface.c:3064 msgid "" "Enter here the paths to the make tool and the compiler\n" "(tools you do not need can be let blank)" @@ -1075,50 +1084,50 @@ "Geben Sie hier die Pfade für make und die Compiler an\n" "(Programme, die nicht benötigt werden, können Sie frei lassen)" -#: src/interface.c:3055 +#: src/interface.c:3075 msgid "Make" msgstr "Make" -#: src/interface.c:3062 -#: src/prefs.c:1074 -#: src/vte.c:165 +#: src/interface.c:3082 +#: src/prefs.c:1062 +#: src/vte.c:164 msgid "Terminal" msgstr "Terminal" -#: src/interface.c:3069 +#: src/interface.c:3089 msgid "Browser" msgstr "Browser" -#: src/interface.c:3081 +#: src/interface.c:3101 msgid "Path and options for the make tool" msgstr "Pfad und spezielle Optionen und / oder Targets für \"make\" angeben." -#: src/interface.c:3088 +#: src/interface.c:3108 msgid "A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)" msgstr "Ein Terminal-Emulator wie z.B. xterm, gnome-terminal oder konsole (es sollte die Option -e akzeptieren)" -#: src/interface.c:3095 +#: src/interface.c:3115 msgid "Path (and possibly additional arguments) to your favorite browser" msgstr "Pfad und evtl. Argumente zu Ihrem Lieblingsbrowser" -#: src/interface.c:3127 +#: src/interface.c:3147 msgid "Print command" msgstr "Druckbefehl" -#: src/interface.c:3139 +#: src/interface.c:3159 #, c-format msgid "Path to the command for printing files (use %f for the filename)." msgstr "Pfad zum Druckbefehl (benutzen Sie %f für den Dateinamen)." -#: src/interface.c:3151 +#: src/interface.c:3171 msgid "Grep" msgstr "Grep" -#: src/interface.c:3174 +#: src/interface.c:3194 msgid "Tools" msgstr "Werkzeuge" -#: src/interface.c:3182 +#: src/interface.c:3202 msgid "" "Specify here information you want to use in templates.\n" "See documentation if you don't know how templates work." @@ -1126,47 +1135,47 @@ "Geben Sie hier die Informationen an, die in Vorlagen benutzt werden sollen.\n" "Konsultieren Sie die Dokumentation, um mehr über die Arbeitsweise der Vorlagen zu erfahren." -#: src/interface.c:3198 +#: src/interface.c:3218 msgid "email address of the developer" msgstr "eMail-Adresse des Entwicklers" -#: src/interface.c:3205 +#: src/interface.c:3225 msgid "Initials of the developer name" msgstr "Initialen des Entwicklernames" -#: src/interface.c:3207 +#: src/interface.c:3227 msgid "Initial Version" msgstr "Anfangsversion" -#: src/interface.c:3219 +#: src/interface.c:3239 msgid "Version number, which a new file initially has" msgstr "Versionsnummer, die eine neue Datei zu Beginn hat" -#: src/interface.c:3226 +#: src/interface.c:3246 msgid "Company name" msgstr "Firmenname" -#: src/interface.c:3228 +#: src/interface.c:3248 msgid "Developer" msgstr "Entwickler" -#: src/interface.c:3235 +#: src/interface.c:3255 msgid "Company" msgstr "Firma" -#: src/interface.c:3242 +#: src/interface.c:3262 msgid "Mail address" msgstr "Mail-Adresse" -#: src/interface.c:3249 +#: src/interface.c:3269 msgid "Initials" msgstr "Initialen" -#: src/interface.c:3261 +#: src/interface.c:3281 msgid "The name of the developer" msgstr "Der Name des Entwicklers" -#: src/interface.c:3263 +#: src/interface.c:3283 msgid "" "Notice: For all changes you make here,\n" "you need to restart Geany to take effect." @@ -1174,132 +1183,132 @@ "Hinweis: Sie müssen Geany neustarten,\n" "wenn Sie hier Änderungen vornehmen." -#: src/interface.c:3267 +#: src/interface.c:3287 msgid "Templates" msgstr "Vorlagen" -#: src/interface.c:3275 +#: src/interface.c:3295 msgid "Here you can change keyboard shortcuts for various actions. Just double click on a action or select one and press the Change button to enter a new shortcut. You can also edit the string representation of the shortcut directly." msgstr "Hier können die Tastenkominationen für verschiedene Aktionen innerhalb Geanys festgelegt bzw. verändert werden. Um die Tastenkombinationen zu ändern, einfach Doppelklicken oder markieren und auf Ändern klicken. Zudem können die Tastenkombinationen auch direkt eingegeben werden. " -#: src/interface.c:3298 +#: src/interface.c:3318 msgid "Change" msgstr "Ändern" -#: src/interface.c:3302 +#: src/interface.c:3322 msgid "Keybindings" msgstr "Tastenkürzel" -#: src/callbacks.c:190 -#: src/callbacks.c:206 +#: src/callbacks.c:188 +#: src/callbacks.c:204 msgid "Do you really want to quit?" msgstr "Möchten Sie wirklich beenden?" -#: src/callbacks.c:509 +#: src/callbacks.c:507 msgid "Any unsaved changes will be lost." msgstr "Alle ungesicherten Änderungen gehen verloren." -#: src/callbacks.c:510 +#: src/callbacks.c:508 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Wollen Sie %s wirklich neu laden?" -#: src/callbacks.c:899 +#: src/callbacks.c:897 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Die Datei '%s' existiert bereits. Möchten Sie sie überschreiben?" -#: src/callbacks.c:1353 +#: src/callbacks.c:1314 #, c-format msgid "No matches found for '%s'." msgstr "Keine Treffer für '%s' gefunden." -#: src/callbacks.c:1399 +#: src/callbacks.c:1360 #, c-format msgid "Declaration of \"%s()\" not found" msgstr "Deklaration von \"%s()\" nicht gefunden." -#: src/callbacks.c:1401 +#: src/callbacks.c:1362 #, c-format msgid "Definition of \"%s()\" not found" msgstr "Definition von \"%s()\" nicht gefunden." -#: src/callbacks.c:1660 +#: src/callbacks.c:1621 msgid "Enter custom options for the make tool" msgstr "Spezielle Optionen / Targets für \"make\" angeben." -#: src/callbacks.c:1661 +#: src/callbacks.c:1622 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/callbacks.c:1716 +#: src/callbacks.c:1677 msgid "Failed to execute the view program" msgstr "Konnte das Anzeigeprogramm nicht ausführen" -#: src/callbacks.c:1733 +#: src/callbacks.c:1695 msgid "Failed to execute the terminal program" msgstr "Konnte das Terminal-Programm nicht ausführen" #. initialize the dialog -#: src/callbacks.c:1957 -#: src/dialogs.c:67 +#: src/callbacks.c:1920 +#: src/dialogs.c:71 msgid "Open File" msgstr "Datei öffnen" -#: src/callbacks.c:2006 -#: src/callbacks.c:2051 -#: src/callbacks.c:2091 -#: src/callbacks.c:2149 +#: src/callbacks.c:1969 +#: src/callbacks.c:2014 +#: src/callbacks.c:2054 +#: src/callbacks.c:2112 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:2219 -#: src/utils.c:1705 +#: src/callbacks.c:2182 +#: src/ui_utils.c:532 msgid "dd.mm.yyyy" msgstr "TT.MM.JJ" -#: src/callbacks.c:2221 -#: src/utils.c:1706 +#: src/callbacks.c:2184 +#: src/ui_utils.c:533 msgid "mm.dd.yyyy" msgstr "MM.TT.JJ" -#: src/callbacks.c:2223 -#: src/utils.c:1707 +#: src/callbacks.c:2186 +#: src/ui_utils.c:534 msgid "yyyy/mm/dd" msgstr "JJJJ/MM/TT" -#: src/callbacks.c:2225 -#: src/utils.c:1716 +#: src/callbacks.c:2188 +#: src/ui_utils.c:543 msgid "dd.mm.yyyy hh:mm:ss" msgstr "TT.MM.JJJJ Stunden:Minuten:Sekunden" -#: src/callbacks.c:2227 -#: src/utils.c:1717 +#: src/callbacks.c:2190 +#: src/ui_utils.c:544 msgid "mm.dd.yyyy hh:mm:ss" msgstr "MM.TT.JJJJ Stunden:Minuten:Sekunden" -#: src/callbacks.c:2229 -#: src/utils.c:1718 +#: src/callbacks.c:2192 +#: src/ui_utils.c:545 msgid "yyyy/mm/dd hh:mm:ss" msgstr "JJJJ/MM/TT Stunden:Minuten:Sekunden" -#: src/callbacks.c:2231 -#: src/utils.c:1727 -#: src/utils.c:1731 -#: src/utils.c:1735 -#: src/utils.c:1739 +#: src/callbacks.c:2194 +#: src/ui_utils.c:554 +#: src/ui_utils.c:558 +#: src/ui_utils.c:562 +#: src/ui_utils.c:566 msgid "Use custom date format" msgstr "Benutze selbst erstelltes Zeitformat" -#: src/callbacks.c:2238 +#: src/callbacks.c:2201 msgid "Custom date format" msgstr "Benutzerdefiniertes Datumsformat" -#: src/callbacks.c:2239 +#: src/callbacks.c:2202 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. See \"man strftime\" for more information." 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:2258 +#: src/callbacks.c:2221 msgid "Date format string could not be converted (possibly too long)." msgstr "Das Datenformat konnte nicht umgewandelt werden. Eventuell ist es zu lang. " @@ -1309,19 +1318,35 @@ msgid "Couldn't find pixmap file: %s" msgstr "Konnte PixMap %s nicht finden." -#: src/dialogs.c:72 +#: src/dialogs.c:76 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 als schreibgeschützt. Wenn Sie mehrere Dateien wählen, werden alle schreibgeschützt geöffnet." -#: src/dialogs.c:108 +#: src/dialogs.c:112 msgid "Detect by file extension " msgstr "Durch Dateiendung erkennen" -#: src/dialogs.c:162 +#: src/dialogs.c:174 +msgid "Show _hidden files" +msgstr "_Versteckte Dateien anzeigen" + +#: src/dialogs.c:190 +msgid "Set filetype:" +msgstr "Dateityp festlegen:" + +#: src/dialogs.c:193 +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." +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." + +#: src/dialogs.c:233 msgid "Save File" msgstr "Datei speichern" -#: src/dialogs.c:272 +#: src/dialogs.c:343 #, c-format msgid "" "The file '%s' is not saved.\n" @@ -1330,7 +1355,7 @@ "%s ist nicht gespeichert.\n" "Möchten Sie die Datei vor dem Beenden speichern?" -#: src/dialogs.c:277 +#: src/dialogs.c:348 msgid "" "The file is not saved.\n" "Do you want to save it before closing?" @@ -1338,27 +1363,27 @@ "Die Datei ist nicht gespeichert.\n" "Möchten Sie die Datei vor dem Beenden speichern?" -#: src/dialogs.c:288 +#: src/dialogs.c:359 msgid "_Don't save" -msgstr "Nicht speichern" +msgstr "_Nicht speichern" -#: src/dialogs.c:340 +#: src/dialogs.c:414 msgid "Choose font" msgstr "Schriftart auswählen" -#: src/dialogs.c:379 +#: src/dialogs.c:453 msgid "Word Count" msgstr "Wörter zählen" -#: src/dialogs.c:388 +#: src/dialogs.c:462 msgid "selection" msgstr "Auswahl" -#: src/dialogs.c:396 +#: src/dialogs.c:470 msgid "whole document" msgstr "Ganzes Dokument" -#: src/dialogs.c:398 +#: src/dialogs.c:472 #, c-format msgid "" "Range:\t\t%s\n" @@ -1373,114 +1398,17 @@ "Wörter:\t\t%d\n" "Zeichen:\t\t%d\n" -#. compile the code -#: src/dialogs.c:471 -msgid "_Compile" -msgstr "_Kompilieren" +#: src/dialogs.c:568 +msgid "Enter the line you want to go to" +msgstr "Geben Sie die Zeile an, zu der Sie springen möchten" -#: src/dialogs.c:474 -msgid "Compiles the current file" -msgstr "Kompiliert die aktuelle Datei" - -#: src/dialogs.c:489 -msgid "Builds the current file (generate an executable file)" -msgstr "Erstellt die aktuelle Datei(erzeugt eine ausführbare Datei)" - -#. build the code with make all -#: src/dialogs.c:503 -msgid "_Make all" -msgstr "_Make all" - -#: src/dialogs.c:506 -#: src/dialogs.c:608 -msgid "Builds the current file with the make tool and the default target" -msgstr "Erstellt die aktuelle Datei mit \"make\" und dem Default-Target" - -#. build the code with make -#: src/dialogs.c:512 -msgid "Make custom _target" -msgstr "Make eigenes _Target" - -#: src/dialogs.c:516 -#: src/dialogs.c:622 -msgid "Builds the current file with the make tool and the specified target" -msgstr "Erstellt die aktuelle Datei mit \"make\" und dem angegebenem Target" - -#. build the code with make object -#: src/dialogs.c:521 -msgid "Make _object" -msgstr "Make _Objekt-Datei" - -#: src/dialogs.c:525 -msgid "Compiles the current file using the make tool" -msgstr "Kompiliert die aktuelle Datei mit dem make-Programm" - -#: src/dialogs.c:553 -msgid "_Set Includes and Arguments" -msgstr "Programm-Parameter angeben" - -#: src/dialogs.c:558 -msgid "Sets the includes and library paths for the compiler and the program arguments for execution" -msgstr "Include-Dateien und Bibliotheken-Pfade sowie Programmparameter festlegen" - -#. DVI -#: src/dialogs.c:579 -msgid "LaTeX -> DVI" -msgstr "LaTeX -> DVI" - -#: src/dialogs.c:582 -msgid "Compiles the current file into a DVI file" -msgstr "Kompiliert die aktuelle Datei als DVI-Datei" - -#. PDF -#: src/dialogs.c:592 -msgid "LaTeX -> PDF" -msgstr "LaTeX -> PDF" - -#: src/dialogs.c:595 -msgid "Compiles the current file into a PDF file" -msgstr "Kompiliert die aktuelle Datei als PDF-Datei" - -#. build the code with make all -#: src/dialogs.c:605 -msgid "Build with \"make\"" -msgstr "Mit \"make\" erstellen" - -#. build the code with make -#: src/dialogs.c:616 -msgid "Build with make (custom target)" -msgstr "Mit \"make\" erstellen (eigenes Target angeben)" - -#. DVI view -#: src/dialogs.c:627 -msgid "View DVI file" -msgstr "DVI-Datei anzeigen" - -#: src/dialogs.c:633 -#: src/dialogs.c:646 -msgid "Compiles and view the current file" -msgstr "Kompiliert und zeigt die aktuelle Datei an" - -#. PDF view -#: src/dialogs.c:640 -msgid "View PDF file" -msgstr "PDF-Datei anzeigen" - #. arguments -#: src/dialogs.c:659 -#: src/dialogs.c:766 +#: src/dialogs.c:590 +#: src/ui_utils.c:980 msgid "Set Arguments" msgstr "Programm-Parameter angeben" -#: src/dialogs.c:666 -msgid "Sets the program paths and arguments" -msgstr "Programm-Parameter angeben" - -#: src/dialogs.c:744 -msgid "Enter the line you want to go to" -msgstr "Geben Sie die Zeile an, zu der Sie springen möchten" - -#: src/dialogs.c:771 +#: src/dialogs.c:595 msgid "" "Set programs and options for compilation and viewing (La)TeX files.\n" "The filename is appended automatically at the end.\n" @@ -1488,37 +1416,37 @@ "Setzt Programme und deren Optionen zum Kompilieren bzw. Betrachten von (La)TeX-Dateien.\n" "Der jeweilige Dateiname wird bei einem Aufruf automatisch an das Ende angefügt. \n" -#: src/dialogs.c:779 +#: src/dialogs.c:603 msgid "Enter here the (La)TeX command (for DVI creation) and some useful options." msgstr "Geben Sie hier den Befehl und dessen Optionen, für die DVI-Erzeugung, an." -#: src/dialogs.c:800 +#: src/dialogs.c:624 msgid "Enter here the (La)TeX command (for PDF creation) and some useful options." msgstr "Geben Sie hier den Befehl und dessen Optionen, für die PDF-Erzeugung, an." -#: src/dialogs.c:821 +#: src/dialogs.c:645 msgid "Enter here the (La)TeX command (for DVI preview) and some useful options." msgstr "Geben Sie hier den Befehl und dessen Optionen, für die DVI-Anzeige, an." -#: src/dialogs.c:842 +#: src/dialogs.c:666 msgid "Enter here the (La)TeX command (for PDF preview) and some useful options." msgstr "Geben Sie hier den Befehl und dessen Optionen, für die PDF-Anzeige, an." -#: src/dialogs.c:873 +#: src/dialogs.c:697 msgid "Set Includes and Arguments" msgstr "Programm-Parameter angeben" -#: src/dialogs.c:878 +#: src/dialogs.c:702 msgid "Sets the includes and library paths for the compiler and the program arguments for execution\n" msgstr "Include-Dateien und Bibliotheken-Pfade sowie Programmparameter festlegen.\n" -#: src/dialogs.c:887 +#: src/dialogs.c:711 msgid "Enter here arguments to your compiler." msgstr "Geben Sie hier Paramter für den Compiler an." -#: src/dialogs.c:893 -#: src/dialogs.c:916 -#: src/dialogs.c:940 +#: src/dialogs.c:717 +#: src/dialogs.c:740 +#: src/dialogs.c:764 #, c-format msgid "" "%f will be replaced by the complete filename\n" @@ -1533,182 +1461,165 @@ "%f -> test_datei.c\n" "%e -> test_datei" -#: src/dialogs.c:910 +#: src/dialogs.c:734 msgid "Enter here arguments to your linker." msgstr "Geben Sie hier Parameter für den Linker an." #. program-args -#: src/dialogs.c:934 +#: src/dialogs.c:758 msgid "Enter here arguments to your program." msgstr "Geben Sie hier Parameter für Ihr Programm an." -#: src/dialogs.c:978 -msgid "Show _hidden files" -msgstr "_Versteckte Dateien anzeigen" - -#: src/dialogs.c:994 -msgid "Set filetype:" -msgstr "Dateityp festlegen:" - -#: src/dialogs.c:997 -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." -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." - -#: src/dialogs.c:1058 +#: src/dialogs.c:817 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 Datei)." -#: src/dialogs.c:1077 -#: src/dialogs.c:1078 -#: src/dialogs.c:1079 -#: src/dialogs.c:1085 -#: src/dialogs.c:1086 -#: src/dialogs.c:1087 -#: src/utils.c:150 -#: src/utils.c:152 -#: src/utils.c:1089 +#: src/dialogs.c:836 +#: src/dialogs.c:837 +#: src/dialogs.c:838 +#: src/dialogs.c:844 +#: src/dialogs.c:845 +#: src/dialogs.c:846 +#: src/utils.c:609 +#: src/ui_utils.c:103 +#: src/ui_utils.c:105 msgid "unknown" msgstr "unbekannt" -#: src/dialogs.c:1091 +#: src/dialogs.c:850 msgid "Properties" msgstr "Eigenschaften" -#: src/dialogs.c:1119 +#: src/dialogs.c:878 msgid "Type:" msgstr "Dateityp:" -#: src/dialogs.c:1132 +#: src/dialogs.c:891 msgid "Size:" msgstr "Größe:" -#: src/dialogs.c:1147 +#: src/dialogs.c:906 msgid "Location:" msgstr "Ort:" -#: src/dialogs.c:1160 +#: src/dialogs.c:919 msgid "Read-only:" msgstr "Schreibgeschützt:" -#: src/dialogs.c:1167 +#: src/dialogs.c:926 msgid "(only inside Geany)" msgstr "(nur innerhalb von Geany)" -#: src/dialogs.c:1176 +#: src/dialogs.c:935 msgid "Encoding:" msgstr "Kodierung:" -#: src/dialogs.c:1185 -#: src/utils.c:151 +#: src/dialogs.c:944 +#: src/ui_utils.c:104 msgid "(with BOM)" msgstr "(mit BOM)" -#: src/dialogs.c:1185 -#: src/utils.c:151 +#: src/dialogs.c:944 +#: src/ui_utils.c:104 msgid "(without BOM)" msgstr "(ohne BOM)" -#: src/dialogs.c:1195 +#: src/dialogs.c:954 msgid "Modified:" msgstr "Modifiziert:" -#: src/dialogs.c:1208 +#: src/dialogs.c:967 msgid "Changed:" msgstr "Geändert:" -#: src/dialogs.c:1221 +#: src/dialogs.c:980 msgid "Accessed:" msgstr "Zugriff:" #. Header -#: src/dialogs.c:1250 +#: src/dialogs.c:1009 msgid "Read:" msgstr "Lesen" -#: src/dialogs.c:1257 +#: src/dialogs.c:1016 msgid "Write:" msgstr "Schreiben:" -#: src/dialogs.c:1264 +#: src/dialogs.c:1023 msgid "Execute:" msgstr "Ausführen:" #. Owner -#: src/dialogs.c:1272 +#: src/dialogs.c:1031 msgid "Owner:" msgstr "Eigentümer:" #. Group -#: src/dialogs.c:1308 +#: src/dialogs.c:1067 msgid "Group:" msgstr "Gruppe:" #. Other -#: src/dialogs.c:1344 +#: src/dialogs.c:1103 msgid "Other:" msgstr "Andere:" -#: src/dialogs.c:1465 +#: src/dialogs.c:1224 msgid "Keyboard shortcuts" msgstr "Tastaturkürzel" -#: src/dialogs.c:1472 +#: src/dialogs.c:1231 msgid "The following keyboard shortcuts are defined:" msgstr "Folgende Tastenkürzel sind definiert: " -#: src/document.c:334 +#: src/document.c:336 #, c-format msgid "File %s closed." msgstr "Datei %s wurde geschlossen." -#: src/document.c:403 +#: src/document.c:411 msgid "New file opened." msgstr "Neue Datei geöffnet." -#: src/document.c:448 +#: src/document.c:564 msgid "Invalid filename" msgstr "Ungültiger Dateiname" -#: src/document.c:472 +#: src/document.c:589 #, c-format msgid "Could not open file %s (%s)" msgstr "Konnte Datei '%s' nicht öffnen(%s)." -#: src/document.c:499 -#: src/document.c:517 +#: src/document.c:614 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Die Datei \"%s\" ist kein gültiges %s." -#: src/document.c:574 +#: src/document.c:625 #, 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." -#: src/document.c:649 +#: src/document.c:685 #, c-format msgid "File %s reloaded." msgstr "Datei %s neu geladen." -#: src/document.c:651 +#: src/document.c:687 #, c-format msgid "File %s opened(%d%s)." msgstr "Datei %s geöffnet(%d%s)." -#: src/document.c:653 +#: src/document.c:689 msgid ", read-only" msgstr ", schreibgeschützt" -#: src/document.c:692 -#: src/document.c:772 +#: src/document.c:729 +#: src/document.c:809 msgid "Error saving file." msgstr "Fehler beim Speichern der Datei." -#: src/document.c:736 +#: src/document.c:773 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved.\n" @@ -1717,40 +1628,40 @@ "Beim Konvertieren der Datei von UTF-8 in \"%s\" ist ein Fehler aufgetreten. Die Datei bleibt ungespeichert.\n" "Fehlermeldung: %s\n" -#: src/document.c:760 +#: src/document.c:797 #, c-format msgid "Error saving file (%s)." msgstr "Fehler beim Speichern der Datei (%s)." -#: src/document.c:797 +#: src/document.c:834 #, c-format msgid "File %s saved." msgstr "Datei %s wurde gespeichert." -#: src/document.c:809 +#: src/document.c:847 #, c-format msgid "The document has been searched completely but the match \"%s\" was not found. Wrap search around the document?" msgstr "\"%s\" wurde nicht gefunden. Am Anfang des Dokumentes beginnen?" -#: src/document.c:990 -#: src/document.c:997 +#: src/document.c:1028 +#: src/document.c:1035 #, c-format msgid "Replaced %d occurrences of \"%s\" with \"%s\"." msgstr "%d: Alle \"%s\" gegen \"%s\" ausgetauscht." -#: src/document.c:1162 +#: src/document.c:1200 msgid "Win (CRLF)" msgstr "Win (CRLF)" -#: src/document.c:1163 +#: src/document.c:1201 msgid "Mac (CR)" msgstr "Mac (CR)" -#: src/document.c:1165 +#: src/document.c:1203 msgid "Unix (LF)" msgstr "Unix (LF)" -#: src/document.c:1315 +#: src/document.c:1364 #, c-format msgid "" "The file \"%s\" will be printed with the following command:\n" @@ -1761,419 +1672,508 @@ "\n" "%s" -#: src/document.c:1324 +#: src/document.c:1373 #, c-format msgid "Printing of \"%s\" failed (return code: %d)." msgstr "Drucken der Datei \"%s\" ist fehlgeschlagen(Rückgabewert: %d)." -#: src/document.c:1329 +#: src/document.c:1378 #, c-format msgid "File %s printed." msgstr "Datei %s wurde gedruckt." -#: src/utils.c:142 +#: src/utils.c:509 +msgid "Do you want to reload it?" +msgstr "Möchte Sie es neu laden? " + +#: src/utils.c:510 #, c-format +msgid "" +"The file '%s' on the disk is more recent than\n" +"the current buffer." +msgstr "Die Datei '%s' auf den Datenträger ist aktueller als die momentan geöffnete Version " + +#: src/ui_utils.c:95 +#, c-format msgid "%c line: % 4d column: % 3d selection: % 4d %s mode: %s%s cur. function: %s encoding: %s %s filetype: %s" msgstr "%c Zeile: % 4d Spalte: % 3d Auswahl: % 4d %s Modus: %s%s akt. Funktion: %s Kodierung: %s %s Dateityp: %s" -#: src/utils.c:146 +#: src/ui_utils.c:99 msgid "OVR" msgstr "ÜBER" -#: src/utils.c:146 +#: src/ui_utils.c:99 msgid "INS" msgstr "EINF" -#: src/utils.c:416 -#, c-format -msgid "Font updated (%s)." -msgstr "Schriftart gewechselt (%s)." - -#: src/utils.c:430 +#: src/ui_utils.c:125 #: src/geany.h:49 msgid "untitled" msgstr "unbenannt" -#: src/utils.c:431 +#: src/ui_utils.c:126 msgid "(Unsaved)" msgstr "(Ungespeichert)" -#: src/utils.c:700 +#: src/ui_utils.c:164 +#, c-format +msgid "Font updated (%s)." +msgstr "Schriftart gewechselt (%s)." + +#: src/ui_utils.c:197 msgid "No tags found" msgstr "Keine Symbole gefunden." -#: src/utils.c:989 -msgid "Do you want to reload it?" -msgstr "Möchte Sie es neu laden? " - -#: src/utils.c:990 -#, c-format -msgid "" -"The file '%s' on the disk is more recent than\n" -"the current buffer." -msgstr "Die Datei '%s' auf den Datenträger ist aktueller als die momentan geöffnete Version " - -#: src/utils.c:1675 +#: src/ui_utils.c:502 msgid "C Standard Library" msgstr "C Standard Bibliothek" -#: src/utils.c:1676 +#: src/ui_utils.c:503 msgid "ISO C99" msgstr "ISO C99" -#: src/utils.c:1677 +#: src/ui_utils.c:504 msgid "C++ (C Standard Library)" msgstr "C++ (C Standard Bibliothek)" -#: src/utils.c:1678 +#: src/ui_utils.c:505 msgid "C++ Standard Library" msgstr "C++ Standard Bibliothek" -#: src/utils.c:1679 +#: src/ui_utils.c:506 msgid "C++ STL" msgstr "C++ STL" -#: src/utils.c:1743 +#: src/ui_utils.c:570 msgid "Set custom date format" msgstr "Benutzerdefiniertes Datumsformat einstellen " +#. compile the code +#: src/ui_utils.c:776 +msgid "_Compile" +msgstr "_Kompilieren" + +#: src/ui_utils.c:779 +msgid "Compiles the current file" +msgstr "Kompiliert die aktuelle Datei" + +#: src/ui_utils.c:794 +msgid "Builds the current file (generate an executable file)" +msgstr "Erstellt die aktuelle Datei(erzeugt eine ausführbare Datei)" + +#. build the code with make all +#: src/ui_utils.c:808 +#: src/ui_utils.c:922 +msgid "_Make all" +msgstr "_Make all" + +#: src/ui_utils.c:811 +#: src/ui_utils.c:925 +msgid "Builds the current file with the make tool and the default target" +msgstr "Erstellt die aktuelle Datei mit \"make\" und dem Default-Target" + +#. build the code with make +#: src/ui_utils.c:817 +#: src/ui_utils.c:931 +msgid "Make custom _target" +msgstr "Make eigenes _Target" + +#: src/ui_utils.c:821 +#: src/ui_utils.c:935 +msgid "Builds the current file with the make tool and the specified target" +msgstr "Erstellt die aktuelle Datei mit \"make\" und dem angegebenem Target" + +#. build the code with make object +#: src/ui_utils.c:826 +msgid "Make _object" +msgstr "Make _Objekt-Datei" + +#: src/ui_utils.c:830 +msgid "Compiles the current file using the make tool" +msgstr "Kompiliert die aktuelle Datei mit dem make-Programm" + +#: src/ui_utils.c:862 +msgid "_Set Includes and Arguments" +msgstr "_Programm-Parameter angeben" + +#: src/ui_utils.c:867 +msgid "Sets the includes and library paths for the compiler and the program arguments for execution" +msgstr "Include-Dateien und Bibliotheken-Pfade sowie Programmparameter festlegen" + +#. DVI +#: src/ui_utils.c:889 +msgid "LaTeX -> DVI" +msgstr "LaTeX -> DVI" + +#: src/ui_utils.c:892 +msgid "Compiles the current file into a DVI file" +msgstr "Kompiliert die aktuelle Datei als DVI-Datei" + +#. PDF +#: src/ui_utils.c:902 +msgid "LaTeX -> PDF" +msgstr "LaTeX -> PDF" + +#: src/ui_utils.c:905 +msgid "Compiles the current file into a PDF file" +msgstr "Kompiliert die aktuelle Datei als PDF-Datei" + +#. DVI view +#: src/ui_utils.c:948 +msgid "View DVI file" +msgstr "DVI-Datei anzeigen" + +#: src/ui_utils.c:954 +#: src/ui_utils.c:967 +msgid "Compiles and view the current file" +msgstr "Kompiliert und zeigt die aktuelle Datei an" + +#. PDF view +#: src/ui_utils.c:961 +msgid "View PDF file" +msgstr "PDF-Datei anzeigen" + +#: src/ui_utils.c:987 +msgid "Sets the program paths and arguments" +msgstr "Programm-Parameter angeben" + #: src/filetypes.c:126 msgid "C source file" msgstr "C Quelldatei" -#: src/filetypes.c:147 +#: src/filetypes.c:146 msgid "C++ source file" msgstr "C++ Quelldatei" -#: src/filetypes.c:176 +#: src/filetypes.c:174 msgid "D source file" msgstr "D Quelldatei" -#: src/filetypes.c:197 +#: src/filetypes.c:194 msgid "Java source file" msgstr "Java Quelldatei" -#: src/filetypes.c:217 +#: src/filetypes.c:213 msgid "Pascal source file" msgstr "Pascal Quelldatei" -#: src/filetypes.c:241 +#: src/filetypes.c:236 msgid "Assembler source file" msgstr "Assembler Quelldatei" -#: src/filetypes.c:260 +#: src/filetypes.c:255 msgid "Fortran source file (F77)" msgstr "Fortran (F77) Quelldatei" -#: src/filetypes.c:284 +#: src/filetypes.c:279 msgid "(O)Caml source file" msgstr "(O)Caml Quelldatei" -#: src/filetypes.c:304 +#: src/filetypes.c:299 msgid "Perl source file" msgstr "Perl Quelldatei" -#: src/filetypes.c:325 +#: src/filetypes.c:320 msgid "PHP source file" msgstr "PHP Quelldatei" -#: src/filetypes.c:349 +#: src/filetypes.c:343 msgid "Python source file" msgstr "Python Quelldatei" -#: src/filetypes.c:369 +#: src/filetypes.c:363 msgid "Ruby source file" msgstr "Ruby Quelldatei" -#: src/filetypes.c:390 +#: src/filetypes.c:383 msgid "Tcl source file" msgstr "Tcl Quelldatei" -#: src/filetypes.c:411 +#: src/filetypes.c:404 msgid "Ferite source file" msgstr "Ferite Qulldatei" -#: src/filetypes.c:430 +#: src/filetypes.c:423 msgid "Shell script file" msgstr "Shellscript Datei" -#: src/filetypes.c:455 +#: src/filetypes.c:448 msgid "Makefile" msgstr "Makefile" -#: src/filetypes.c:475 +#: src/filetypes.c:468 msgid "XML source file" msgstr "XML Quelldatei" -#: src/filetypes.c:495 +#: src/filetypes.c:488 msgid "Docbook source file" msgstr "Docbook Quelldatei" -#: src/filetypes.c:514 +#: src/filetypes.c:507 msgid "HTML source file" msgstr "HTML Quelldatei" -#: src/filetypes.c:540 +#: src/filetypes.c:532 msgid "Cascading StyleSheet" msgstr "Cascading StyleSheet" -#: src/filetypes.c:559 +#: src/filetypes.c:551 msgid "SQL Dump file" msgstr "SQL-Dump Datei" -#: src/filetypes.c:578 +#: src/filetypes.c:570 msgid "LaTeX source file" msgstr "LaTeX Quelldatei" -#: src/filetypes.c:599 +#: src/filetypes.c:591 msgid "O-Matrix source file" msgstr "O-Matrix Quelldatei" -#: src/filetypes.c:618 +#: src/filetypes.c:610 msgid "Diff file" msgstr "Diff Daten" -#: src/filetypes.c:638 +#: src/filetypes.c:630 msgid "Config file" msgstr "Konfigurationsdatei" -#: src/filetypes.c:661 +#: src/filetypes.c:653 msgid "All files" msgstr "Alle Dateien" -#: src/filetypes.c:670 +#: src/filetypes.c:662 msgid "None" msgstr "Keiner" -#: src/win32.c:59 +#: src/win32.c:60 msgid "Executables" msgstr "Executables" -#: src/win32.c:341 +#: src/win32.c:342 msgid "Error" msgstr "Fehler" -#: src/win32.c:347 -#: src/win32.c:382 +#: src/win32.c:348 +#: src/win32.c:383 msgid "Question" msgstr "Frage" -#: src/win32.c:353 +#: src/win32.c:354 msgid "Information" msgstr "Information" -#: src/keyfile.c:70 +#: src/keyfile.c:72 #, c-format msgid "%s configuration file, edit as you need" msgstr "%s Konfigurationsdatei. Bei Bedarf anpassen." -#: src/keyfile.c:304 +#: src/keyfile.c:309 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." -#: src/msgwindow.c:99 +#: src/msgwindow.c:100 msgid "Status messages" msgstr "Meldungen" -#: src/build.c:90 +#: src/build.c:91 #, 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)" -#: src/build.c:116 -#: src/build.c:298 -#: src/build.c:437 +#: src/build.c:124 +#: src/build.c:309 +#: src/build.c:478 #: src/search.c:849 #, c-format msgid "Process failed (%s)" msgstr "Prozess fehlgeschlagen (%s)" -#: src/build.c:284 +#: src/build.c:295 #, c-format msgid "%s (in directory: %s)" msgstr "%s (im Verzeichnis: %s)" -#: src/build.c:371 +#: src/build.c:400 #, 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)" -#: src/build.c:386 +#: src/build.c:416 #, 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)" -#: src/build.c:400 +#: src/build.c:430 #, c-format msgid "Failed to change the working directory to %s" msgstr "Konnte Arbeitsverzeichnis(%s) nicht wechseln" -#: src/build.c:418 +#: src/build.c:448 #, 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:529 -msgid "compilation finished unsuccessful" -msgstr "Kompilierung beendet - nicht erfolgreich." +#: src/build.c:568 +msgid "Compilation failed." +msgstr "Kompilierung fehlgeschlagen." -#: src/build.c:533 -msgid "compilation finished successful" +#: src/build.c:573 +msgid "Compilation finished successfully." msgstr "Kompilierung beendet - erfolgreich." -#: src/prefs.c:291 +#: src/prefs.c:287 msgid "Action" msgstr "Aktion" -#: src/prefs.c:296 +#: src/prefs.c:292 msgid "Shortcut" msgstr "Tastenkürzel" -#: src/prefs.c:757 +#: src/prefs.c:749 msgid "Grab key" msgstr "Tasten festlegen" -#: src/prefs.c:761 +#: src/prefs.c:753 #, c-format msgid "Type the combination of the keys you want to use for \"%s\"" msgstr "Welche Tastenkomination soll für \"%s\" benutzt werden? " -#: src/prefs.c:885 +#: src/prefs.c:877 #, c-format msgid "The combination '%s' is already used for \"%s\". Please choose another one." msgstr "Die Tastenkombination '%s' wird bereits für \"%s\" verwendet. Bitte wählen Sie eine andere Tastenkombination. " -#: src/prefs.c:943 +#: src/prefs.c:931 msgid "These are settings for the virtual terminal emulator widget (VTE). They only apply, if the VTE library could be loaded." msgstr "Hier sehen Sie Einstellungen für die Terminalemulation (VTE). Änderungen werden nur wirksam, wenn die VTE-Bibliothek geladen werden konnte." -#: src/prefs.c:959 +#: src/prefs.c:947 msgid "Terminal font" msgstr "Terminal Schriftart" -#: src/prefs.c:969 +#: src/prefs.c:957 msgid "Sets the font for the terminal widget." msgstr "Ändert die Schriftart für das Terminal" -#: src/prefs.c:971 +#: src/prefs.c:959 msgid "Foreground color" msgstr "Vordergrundfarbe" -#: src/prefs.c:977 +#: src/prefs.c:965 msgid "Background color" msgstr "Hintergrundfarbe" -#: src/prefs.c:987 +#: src/prefs.c:975 msgid "Sets the foreground color of the text in the terminal widget." msgstr "Setzt die Vordergrundfarbe für Text im Terminal." -#: src/prefs.c:994 +#: src/prefs.c:982 msgid "Sets the background color of the text in the terminal widget." msgstr "Setzt die Hintergrundfarbe für Text im Terminal." -#: src/prefs.c:997 +#: src/prefs.c:985 msgid "Scrollback lines" msgstr "Zeilen zum Zurückrollen" -#: src/prefs.c:1008 +#: src/prefs.c:996 msgid "Specifies the history in lines, which you can scroll back in the terminal widget." msgstr "Gibt die Zeilen an, die man im Terminal zurückscrollen kann." -#: src/prefs.c:1012 +#: src/prefs.c:1000 msgid "Terminal emulation" msgstr "Terminalemulation" -#: src/prefs.c:1022 +#: src/prefs.c:1010 msgid "Controls how the terminal emulator should behave. xterm is a good start." msgstr "Steuert wie sich das Terminal verhalten soll. xterm ist ein guter Startwert." -#: src/prefs.c:1024 +#: src/prefs.c:1012 msgid "Shell" msgstr "Shell" -#: src/prefs.c:1034 +#: src/prefs.c:1022 msgid "Sets the path to the shell which should be started inside the terminal emulation." msgstr "Setzt den Pfad zu der Shell, die in der VTE benutzt werden soll. " -#: src/prefs.c:1046 +#: src/prefs.c:1034 msgid "Scroll on keystroke" msgstr "Bei Tastendruck scrollen" -#: src/prefs.c:1050 +#: src/prefs.c:1038 msgid "Whether to scroll to the bottom if a key was pressed." msgstr "Ob das Fenster bei Tastendruck bis zum Ende gescrollt werden soll" -#: src/prefs.c:1053 +#: src/prefs.c:1041 msgid "Scroll on output" msgstr "Bei Ausgabe scrollen" -#: src/prefs.c:1057 +#: src/prefs.c:1045 msgid "Whether to scroll to the bottom if an output was generated." msgstr "Ob das Fenster bei Ausgabe bis zum Ende gescrollt werden soll" -#: src/prefs.c:1060 +#: src/prefs.c:1048 msgid "Disable menu shortcut key (F10 by default)" msgstr "Me_nütastenkombination deaktivieren (Vorgabe ist F10)" -#: src/prefs.c:1064 +#: src/prefs.c:1052 msgid "This option disables the keybinding to popup the menu bar (default is F10). Disabling it can be useful if you use, for example, Midnight Commander within the VTE." msgstr "Diese Option deaktiviert bestimmte Tastenkombinationen des Menüs. Eine Deaktivierung kann sinnvoll sein, wenn man zum Beispiel den Midnight Commander in der VTE benutzen möchte. " -#: src/prefs.c:1067 +#: src/prefs.c:1055 msgid "Follow the path of the current file" msgstr "Pfad der aktuellen Datei setzen" -#: src/prefs.c:1071 +#: src/prefs.c:1059 msgid "Whether to execute \"cd $path\" when you switch between opened files." msgstr "Soll \"cd $path\" ausgeführt werden, wenn Sie zwischen geöffneten Dateien wechseln." -#: src/about.c:105 +#: src/about.c:106 msgid "About Geany" msgstr "Über Geany" -#: src/about.c:152 +#: src/about.c:153 msgid "A fast and lightweight IDE" msgstr "Eine kleine und schnelle Entwicklungsumgebung" -#: src/about.c:173 +#: src/about.c:174 #, c-format msgid "(built on %s)" msgstr "(kompiliert am %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: src/about.c:204 +#: src/about.c:205 msgid "Info" msgstr "Info" -#: src/about.c:216 +#: src/about.c:217 msgid "Developers" msgstr "Entwickler" -#: src/about.c:216 +#: src/about.c:217 msgid "Maintainer" msgstr "Hauptentwickler" -#: src/about.c:216 +#: src/about.c:217 msgid "developer" msgstr "Entwickler" -#: src/about.c:217 +#: src/about.c:218 msgid "translation maintainer" msgstr "Übersetzungskoordinator" -#: src/about.c:217 +#: src/about.c:218 msgid "Translators" msgstr "Übersetzer" -#: src/about.c:218 +#: src/about.c:219 msgid "language" msgstr "Sprache" -#: src/about.c:224 +#: src/about.c:225 msgid "Credits" msgstr "Credits" -#: src/about.c:237 +#: src/about.c:238 msgid "License" msgstr "Lizenz" @@ -2334,335 +2334,347 @@ msgid "_Unicode" msgstr "_Unicode" -#: src/treeviews.c:77 +#: src/treeviews.c:76 msgid "Chapter" msgstr "Kapitel" -#: src/treeviews.c:79 -#: src/treeviews.c:101 +#: src/treeviews.c:78 +#: src/treeviews.c:100 msgid "Section" msgstr "Section" -#: src/treeviews.c:81 +#: src/treeviews.c:80 msgid "Sect1" msgstr "Sect1" -#: src/treeviews.c:83 +#: src/treeviews.c:82 msgid "Sect2" msgstr "Sect2" -#: src/treeviews.c:85 +#: src/treeviews.c:84 msgid "Sect3" msgstr "Sect3" -#: src/treeviews.c:87 +#: src/treeviews.c:86 msgid "Appendix" msgstr "Anhang" -#: src/treeviews.c:89 -#: src/treeviews.c:111 -#: src/treeviews.c:194 +#: src/treeviews.c:88 +#: src/treeviews.c:110 +#: src/treeviews.c:193 msgid "Other" msgstr "Sonstiges" -#: src/treeviews.c:97 +#: src/treeviews.c:96 msgid "Command" msgstr "Command" -#: src/treeviews.c:99 +#: src/treeviews.c:98 msgid "Environment" msgstr "Umgebung" -#: src/treeviews.c:103 +#: src/treeviews.c:102 msgid "Subsection" msgstr "Subsection" -#: src/treeviews.c:105 +#: src/treeviews.c:104 msgid "Subsubsection" msgstr "Subsubsection" -#: src/treeviews.c:107 +#: src/treeviews.c:106 msgid "Label" msgstr "Label" -#: src/treeviews.c:109 +#: src/treeviews.c:108 msgid "Begin" msgstr "Begin" -#: src/treeviews.c:117 +#: src/treeviews.c:116 msgid "Function" msgstr "Funktion" -#: src/treeviews.c:119 +#: src/treeviews.c:118 msgid "Package" msgstr "Package" -#: src/treeviews.c:121 +#: src/treeviews.c:120 msgid "My" msgstr "My" -#: src/treeviews.c:123 +#: src/treeviews.c:122 msgid "Local" msgstr "Lokal" -#: src/treeviews.c:125 +#: src/treeviews.c:124 msgid "Our" msgstr "Our" -#: src/treeviews.c:138 -#: src/treeviews.c:163 +#: src/treeviews.c:137 +#: src/treeviews.c:162 msgid "Methods" msgstr "Methoden" -#: src/treeviews.c:140 -#: src/treeviews.c:161 -#: src/treeviews.c:182 +#: src/treeviews.c:139 +#: src/treeviews.c:160 +#: src/treeviews.c:181 msgid "Classes" msgstr "Klassen" -#: src/treeviews.c:142 +#: src/treeviews.c:141 msgid "Singletons" msgstr "Singletons" -#: src/treeviews.c:144 +#: src/treeviews.c:143 msgid "Mixins" msgstr "Mixin" -#: src/treeviews.c:146 -#: src/treeviews.c:188 +#: src/treeviews.c:145 +#: src/treeviews.c:187 msgid "Variables" msgstr "Variablen" -#: src/treeviews.c:148 -#: src/treeviews.c:184 +#: src/treeviews.c:147 +#: src/treeviews.c:183 msgid "Members" msgstr "Instanzvariablen" -#: src/treeviews.c:159 -#: src/treeviews.c:180 +#: src/treeviews.c:158 +#: src/treeviews.c:179 msgid "Functions" msgstr "Funktionen" -#: src/treeviews.c:186 +#: src/treeviews.c:185 msgid "Macros" msgstr "Makros" -#: src/treeviews.c:190 +#: src/treeviews.c:189 msgid "Namespaces" msgstr "Namensräume" -#: src/treeviews.c:192 +#: src/treeviews.c:191 msgid "Structs / Typedefs" msgstr "Structs / Typedefs" -#: src/treeviews.c:290 -#: src/treeviews.c:342 +#: src/treeviews.c:289 +#: src/treeviews.c:341 msgid "Hide" msgstr "Verbergen" -#: src/treeviews.c:298 -#: src/treeviews.c:350 +#: src/treeviews.c:297 +#: src/treeviews.c:349 msgid "Hide sidebar" msgstr "Sidebar verbergen" -#: src/treeviews.c:330 +#: src/treeviews.c:329 msgid "Reload" msgstr "Neu laden" -#: src/vte.c:366 +#: src/vte.c:365 msgid "_Input Methods" msgstr "_Eingabemethoden" -#: src/keybindings.c:115 +#: src/keybindings.c:119 msgid "New" msgstr "Neu" -#: src/keybindings.c:117 +#: src/keybindings.c:121 msgid "Open" msgstr "Öffnen" -#: src/keybindings.c:119 +#: src/keybindings.c:123 msgid "Save" msgstr "Speichern" -#: src/keybindings.c:123 +#: src/keybindings.c:127 msgid "Print" msgstr "Drucken" -#: src/keybindings.c:125 +#: src/keybindings.c:129 msgid "Close" msgstr "Schließen" -#: src/keybindings.c:127 +#: src/keybindings.c:131 msgid "Close all" msgstr "Alle Schließen" -#: src/keybindings.c:129 +#: src/keybindings.c:133 msgid "Reload file" msgstr "Neu laden" -#: src/keybindings.c:131 +#: src/keybindings.c:135 msgid "Undo" msgstr "Zurück" -#: src/keybindings.c:133 +#: src/keybindings.c:137 msgid "Redo" msgstr "Wiederholen" -#: src/keybindings.c:135 +#: src/keybindings.c:139 msgid "Select All" msgstr "Alles ersetzen" -#: src/keybindings.c:137 +#: src/keybindings.c:141 msgid "Insert date" msgstr "Datum einfügen" -#: src/keybindings.c:141 +#: src/keybindings.c:145 msgid "Find Next" msgstr "Weitersuchen" -#: src/keybindings.c:143 +#: src/keybindings.c:147 msgid "Find Previous" msgstr "Vorheriges" -#: src/keybindings.c:145 +#: src/keybindings.c:149 #: src/search.c:265 msgid "Replace" msgstr "Ersetzen" -#: src/keybindings.c:147 +#: src/keybindings.c:151 #: src/search.c:394 msgid "Find in files" msgstr "In Dateien suchen" -#: src/keybindings.c:151 +#: src/keybindings.c:155 msgid "Show Colour Chooser" msgstr "Farbwähler öffnen" -#: src/keybindings.c:153 +#: src/keybindings.c:157 msgid "Fullscreen" msgstr "Vollbild" -#: src/keybindings.c:155 +#: src/keybindings.c:159 msgid "Toggle Messages Window" msgstr "Meldungsfenster verstecken" -#: src/keybindings.c:157 +#: src/keybindings.c:161 msgid "Toggle Sidebar" msgstr "Seitenleiste ausblenden" -#: src/keybindings.c:159 +#: src/keybindings.c:163 msgid "Zoom In" msgstr "Hineinzoomen" -#: src/keybindings.c:161 +#: src/keybindings.c:165 msgid "Zoom Out" msgstr "Herauszoomen" -#: src/keybindings.c:165 +#: src/keybindings.c:169 msgid "Fold all" msgstr "Alle einklappen" -#: src/keybindings.c:167 +#: src/keybindings.c:171 msgid "Unfold all" msgstr "Alle ausklappen" -#: src/keybindings.c:171 +#: src/keybindings.c:175 msgid "Build" msgstr "Erstellen" -#: src/keybindings.c:173 +#: src/keybindings.c:177 msgid "Make all" msgstr "Make all" -#: src/keybindings.c:176 +#: src/keybindings.c:180 msgid "Make custom target" msgstr "Make mit eigenem Target" -#: src/keybindings.c:178 +#: src/keybindings.c:182 msgid "Make object" msgstr "Make Objekt-Datei" -#: src/keybindings.c:180 +#: src/keybindings.c:184 msgid "Run" msgstr "Ausführen" -#: src/keybindings.c:182 +#: src/keybindings.c:186 msgid "Run (alternative command)" msgstr "Ausführen (alternativer Befehl)" -#: src/keybindings.c:184 +#: src/keybindings.c:188 msgid "Build options" msgstr "Optionen bei der Erzeugung" -#: src/keybindings.c:186 +#: src/keybindings.c:190 msgid "Reload symbol list" msgstr "Symbol-Ansicht neuladen" -#: src/keybindings.c:188 +#: src/keybindings.c:192 msgid "Switch to Editor" msgstr "Zum Editor wechseln" -#: src/keybindings.c:190 +#: src/keybindings.c:194 msgid "Switch to Scribble" msgstr "Zu den Notizen wechseln " -#: src/keybindings.c:192 +#: src/keybindings.c:196 msgid "Switch to VTE" msgstr "Wechsel zur VTE" -#: src/keybindings.c:194 +#: src/keybindings.c:198 msgid "Switch to left document" msgstr "Zum linken Dokument wechseln" -#: src/keybindings.c:196 +#: src/keybindings.c:200 msgid "Switch to right document" msgstr "Zum rechten Dokument wechseln" -#: src/keybindings.c:198 +#: src/keybindings.c:202 msgid "Duplicate line or selection" msgstr "Zeile oder Auswahl kopieren" -#: src/keybindings.c:200 +#: src/keybindings.c:204 +msgid "Convert Selection to lower-case" +msgstr "Auswahl in _Kleinbuchstaben umwandeln" + +#: src/keybindings.c:206 +msgid "Convert Selection to upper-case" +msgstr "Auswahl in _Großbuchstaben umwandeln" + +#: src/keybindings.c:208 +msgid "Toggle line commentation" +msgstr "A_uskommentierung umklappen" + +#: src/keybindings.c:210 msgid "Comment line" msgstr "Zeile auskommentieren" -#: src/keybindings.c:202 +#: src/keybindings.c:212 msgid "Uncomment line" msgstr "Zeile einkommentieren" -#: src/keybindings.c:204 +#: src/keybindings.c:214 msgid "Increase indent" msgstr "Einzug erhöhen" -#: src/keybindings.c:206 +#: src/keybindings.c:216 msgid "Decrease indent" msgstr "Einzug verringern" -#: src/keybindings.c:208 +#: src/keybindings.c:218 msgid "Complete word" msgstr "Vervollständige Wort" -#: src/keybindings.c:212 -#: src/keybindings.c:215 +#: src/keybindings.c:222 +#: src/keybindings.c:225 msgid "Show calltip" msgstr "Calltip anzeigen" -#: src/keybindings.c:218 +#: src/keybindings.c:228 msgid "Show macro list" msgstr "Zeige Makroliste" -#: src/keybindings.c:220 +#: src/keybindings.c:230 msgid "Suppress auto completion" msgstr "Autovervollständigung abstellen" -#: src/keybindings.c:222 +#: src/keybindings.c:232 msgid "Find Usage" msgstr "Auftreten finden" #: src/search.c:125 msgid "_Use regular expressions" -msgstr "Reguläre Ausdrücke benutzen" +msgstr "Reguläre Ausdrücke _benutzen" #: src/search.c:129 msgid "Use POSIX-like regular expressions. For detailed information about using regular expressions, please read the documentation." @@ -2670,7 +2682,7 @@ #: src/search.c:134 msgid "_Search backwards" -msgstr "Rückwärts suchen" +msgstr "_Rückwärts suchen" #: src/search.c:139 msgid "Use _escape sequences" @@ -2688,11 +2700,12 @@ #: src/search.c:153 #: src/search.c:439 msgid "_Case sensitive" -msgstr "Groß- / Kleinschreibung beachten" +msgstr "_Groß- / Kleinschreibung beachten" +# "ganz" ist ein schlechtes Wort. Bessere Ideen gesucht #: src/search.c:158 msgid "Match only a _whole word" -msgstr "Nur ganze Wörter finden" +msgstr "Nur _ganze Wörter finden" #: src/search.c:163 msgid "Match only word s_tart" @@ -2735,7 +2748,7 @@ #. Don't close window checkbox #: src/search.c:343 msgid "_Don't close this dialog" -msgstr "Diesen Dialog nicht schließen. " +msgstr "Diesen Dialog _nicht schließen. " #: src/search.c:348 msgid "The dialog window won't be closed when you start the operation." @@ -2747,7 +2760,7 @@ #: src/search.c:444 msgid "_Invert search results" -msgstr "Suchmuster umkehren" +msgstr "_Suchmuster umkehren" #: src/search.c:449 msgid "Invert the sense of matching, to select non-matching lines." @@ -2795,3 +2808,10 @@ msgid "No matches found." msgstr "Keine Treffer gefunden." +#~ msgid "Build with \"make\"" +#~ msgstr "Mit \"make\" erstellen" +#~ msgid "Build with make (custom target)" +#~ msgstr "Mit \"make\" erstellen (eigenes Target angeben)" +#~ msgid "compilation finished unsuccessful" +#~ msgstr "Kompilierung beendet - nicht erfolgreich." + Modified: trunk/po/geany.pot =================================================================== --- trunk/po/geany.pot 2006-09-12 08:32:52 UTC (rev 814) +++ trunk/po/geany.pot 2006-09-12 09:18:43 UTC (rev 815) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-09-03 21:07+0200\n" +"POT-Creation-Date: 2006-09-12 10:41+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -16,48 +16,52 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/main.c:111 +#: src/main.c:84 msgid "runs in debug mode (means being verbose)" msgstr "" -#: src/main.c:112 +#: src/main.c:85 +msgid "don't load the previous session's files" +msgstr "" + +#: src/main.c:86 msgid "don't load auto completion data (see documentation)" msgstr "" -#: src/main.c:114 +#: src/main.c:88 msgid "don't open files in a running instance, force opening a new instance" msgstr "" -#: src/main.c:116 +#: src/main.c:90 msgid "use an alternate configuration directory" msgstr "" -#: src/main.c:117 +#: src/main.c:91 msgid "don't show message window at startup" msgstr "" -#: src/main.c:119 +#: src/main.c:93 msgid "don't load terminal support" msgstr "" -#: src/main.c:120 +#: src/main.c:94 msgid "filename of libvte.so" msgstr "" -#: src/main.c:122 +#: src/main.c:96 msgid "show version and exit" msgstr "" -#: src/main.c:410 +#: src/main.c:387 msgid " - A fast and lightweight IDE" msgstr "" -#: src/main.c:420 +#: src/main.c:397 #, c-format msgid "(built on %s with GTK %d.%d.%d, GLib %d.%d.%d)" msgstr "" -#: src/main.c:462 +#: src/main.c:439 #, c-format msgid "" "Configuration directory could not be created (%s).\n" @@ -65,1063 +69,1067 @@ "Start Geany anyway?" msgstr "" -#: src/main.c:572 +#: src/main.c:555 #, c-format msgid "This is Geany %s." msgstr "" -#: src/main.c:574 +#: src/main.c:557 #, c-format msgid "Configuration directory could not be created (%s)." msgstr "" -#: src/main.c:599 src/callbacks.c:825 src/dialogs.c:146 src/document.c:374 -#: src/document.c:408 src/win32.c:150 +#: src/main.c:582 src/callbacks.c:823 src/dialogs.c:150 src/document.c:378 +#: src/document.c:416 src/win32.c:151 #, c-format msgid "" "You have opened too many files. There is a limit of %d concurrent open files." msgstr "" -#: src/interface.c:240 src/interface.c:1364 +#: src/interface.c:241 src/interface.c:1374 msgid "Geany" msgstr "" -#: src/interface.c:250 +#: src/interface.c:251 msgid "_File" msgstr "" -#: src/interface.c:261 +#: src/interface.c:262 msgid "New (with _template)" msgstr "" -#: src/interface.c:272 src/interface.c:291 src/interface.c:335 -#: src/interface.c:446 src/interface.c:492 src/interface.c:728 -#: src/interface.c:738 src/interface.c:1802 src/interface.c:1848 +#: src/interface.c:273 src/interface.c:292 src/interface.c:336 +#: src/interface.c:447 src/interface.c:493 src/interface.c:733 +#: src/interface.c:743 src/interface.c:1814 src/interface.c:1860 msgid "invisible" msgstr "" -#: src/interface.c:284 +#: src/interface.c:285 msgid "Recent _files" msgstr "" -#: src/interface.c:307 +#: src/interface.c:308 msgid "Save a_ll" msgstr "" -#: src/interface.c:310 +#: src/interface.c:311 msgid "Saves all open files" msgstr "" -#: src/interface.c:316 src/callbacks.c:508 src/utils.c:988 +#: src/interface.c:317 src/callbacks.c:506 src/utils.c:508 msgid "_Reload" msgstr "" -#: src/interface.c:324 +#: src/interface.c:325 msgid "R_eload as" msgstr "" -#: src/interface.c:355 +#: src/interface.c:356 msgid "Prints the current file" msgstr "" -#: src/interface.c:366 +#: src/interface.c:367 msgid "C_lose all" msgstr "" -#: src/interface.c:369 +#: src/interface.c:370 msgid "Closes all open files" msgstr "" -#: src/interface.c:383 src/interface.c:973 +#: src/interface.c:384 src/interface.c:980 msgid "Quit Geany" msgstr "" -#: src/interface.c:385 +#: src/interface.c:386 msgid "_Edit" msgstr "" -#: src/interface.c:426 src/interface.c:1765 +#: src/interface.c:427 src/interface.c:1777 msgid "Select _All" msgstr "" -#: src/interface.c:435 +#: src/interface.c:436 msgid "_Insert \"include <...>\"" msgstr "" -#: src/interface.c:449 +#: src/interface.c:450 msgid "I_nsert Comments" msgstr "" -#: src/interface.c:460 src/interface.c:1816 +#: src/interface.c:461 src/interface.c:1828 msgid "Insert ChangeLog entry" msgstr "" -#: src/interface.c:463 src/interface.c:1819 +#: src/interface.c:464 src/interface.c:1831 msgid "Inserts a typical ChangeLog entry in the current file" msgstr "" -#: src/interface.c:465 src/interface.c:1821 +#: src/interface.c:466 src/interface.c:1833 msgid "Insert file header" msgstr "" -#: src/interface.c:468 src/interface.c:1824 +#: src/interface.c:469 src/interface.c:1836 msgid "Inserts a file header at the beginning of the file" msgstr "" -#: src/interface.c:470 src/interface.c:1826 +#: src/interface.c:471 src/interface.c:1838 msgid "Insert function description" msgstr "" -#: src/interface.c:473 src/interface.c:1829 +#: src/interface.c:474 src/interface.c:1841 msgid "Inserts a description before the current function" msgstr "" -#: src/interface.c:475 src/interface.c:1831 +#: src/interface.c:476 src/interface.c:1843 msgid "Insert multiline comment" msgstr "" -#: src/interface.c:478 src/interface.c:1834 +#: src/interface.c:479 src/interface.c:1846 msgid "Inserts a multiline comment" msgstr "" -#: src/interface.c:480 src/interface.c:1836 +#: src/interface.c:481 src/interface.c:1848 msgid "Insert GPL notice" msgstr "" -#: src/interface.c:483 src/interface.c:1839 +#: src/interface.c:484 src/interface.c:1851 msgid "Inserts a GPL notice (should be done at the beginning of the file)" msgstr "" -#: src/interface.c:485 src/interface.c:1841 +#: src/interface.c:486 src/interface.c:1853 msgid "Insert Dat_e" msgstr "" -#: src/interface.c:500 src/interface.c:1856 +#: src/interface.c:501 src/interface.c:1868 msgid "_Format" msgstr "" -#: src/interface.c:503 +#: src/interface.c:504 msgid "Convert the case of the current selection" msgstr "" -#: src/interface.c:508 src/interface.c:1863 +#: src/interface.c:509 src/interface.c:1875 msgid "Convert Selection to _lower-case" msgstr "" -#: src/interface.c:512 src/interface.c:1867 +#: src/interface.c:513 src/interface.c:1879 msgid "Convert Selection to _upper-case" msgstr "" -#: src/interface.c:521 src/interface.c:1876 +#: src/interface.c:522 src/interface.c:1888 msgid "_Comment Line" msgstr "" -#: src/interface.c:525 src/interface.c:1880 -msgid "_Uncomment Line" +#: src/interface.c:526 src/interface.c:1892 +msgid "U_ncomment Line" msgstr "" -#: src/interface.c:529 src/interface.c:1884 -msgid "D_uplicate Line" +#: src/interface.c:530 src/interface.c:1896 +msgid "_Toggle line commentation" msgstr "" -#: src/interface.c:538 src/interface.c:1893 +#: src/interface.c:534 src/interface.c:1900 +msgid "Du_plicate Line" +msgstr "" + +#: src/interface.c:543 src/interface.c:1909 msgid "_Increase Indent" msgstr "" -#: src/interface.c:542 src/interface.c:1897 +#: src/interface.c:547 src/interface.c:1913 msgid "_Decrease Indent" msgstr "" -#: src/interface.c:546 +#: src/interface.c:551 msgid "Count _words" msgstr "" -#: src/interface.c:549 +#: src/interface.c:554 msgid "" "Counts the words and characters in the current selection or the whole " "document" msgstr "" -#: src/interface.c:560 +#: src/interface.c:565 msgid "_Search" msgstr "" -#: src/interface.c:571 +#: src/interface.c:576 msgid "Find _Next" msgstr "" -#: src/interface.c:575 +#: src/interface.c:580 msgid "Find _Previous" msgstr "" -#: src/interface.c:579 src/search.c:283 +#: src/interface.c:584 src/search.c:283 msgid "_Replace" msgstr "" -#: src/interface.c:592 +#: src/interface.c:597 msgid "Find in f_iles" msgstr "" -#: src/interface.c:601 +#: src/interface.c:606 msgid "_Go to line" msgstr "" -#: src/interface.c:609 src/dialogs.c:70 +#: src/interface.c:614 src/dialogs.c:74 msgid "_View" msgstr "" -#: src/interface.c:616 +#: src/interface.c:621 msgid "Change _Font" msgstr "" -#: src/interface.c:619 +#: src/interface.c:624 msgid "Change the default font" msgstr "" -#: src/interface.c:625 +#: src/interface.c:630 msgid "Show _Colour Chooser" msgstr "" -#: src/interface.c:628 src/interface.c:912 +#: src/interface.c:633 src/interface.c:919 msgid "" "Open a color chooser dialog, to interactively pick colors from a palette." msgstr "" -#: src/interface.c:639 +#: src/interface.c:644 msgid "Full_screen" msgstr "" -#: src/interface.c:643 +#: src/interface.c:648 msgid "Show Messages _Window" msgstr "" -#: src/interface.c:646 +#: src/interface.c:651 msgid "Toggle the window with status and compiler messages on and off" msgstr "" -#: src/interface.c:649 +#: src/interface.c:654 msgid "Show _Toolbar" msgstr "" -#: src/interface.c:652 +#: src/interface.c:657 msgid "Toggle the toolbar on and off" msgstr "" -#: src/interface.c:655 +#: src/interface.c:660 msgid "Show Side_bar" msgstr "" -#: src/interface.c:660 +#: src/interface.c:665 msgid "Show _Markers Margin" msgstr "" -#: src/interface.c:663 +#: src/interface.c:668 msgid "" "Shows or hides the small margin right of the line numbers, which is used to " "mark lines." msgstr "" -#: src/interface.c:666 +#: src/interface.c:671 msgid "Show _Line Numbers" msgstr "" -#: src/interface.c:669 +#: src/interface.c:674 msgid "Shows or hides the Line Number margin." msgstr "" -#: src/interface.c:689 +#: src/interface.c:694 msgid "_Document" msgstr "" -#: src/interface.c:696 +#: src/interface.c:701 msgid "_Line wrapping" msgstr "" -#: src/interface.c:699 src/interface.c:2990 +#: src/interface.c:704 src/interface.c:3010 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 "" -#: src/interface.c:702 +#: src/interface.c:707 msgid "_Use auto indentation" msgstr "" -#: src/interface.c:707 +#: src/interface.c:712 msgid "Read _only" msgstr "" -#: src/interface.c:710 +#: src/interface.c:715 msgid "Treat this file as read-only. No changes can be made." msgstr "" -#: src/interface.c:712 +#: src/interface.c:717 msgid "_Write Unicode BOM" msgstr "" -#: src/interface.c:721 +#: src/interface.c:726 msgid "Set file_type" msgstr "" -#: src/interface.c:731 +#: src/interface.c:736 msgid "Set _encoding" msgstr "" -#: src/interface.c:741 +#: src/interface.c:746 msgid "Set line e_ndings" msgstr "" -#: src/interface.c:748 +#: src/interface.c:753 msgid "Convert and set to _CR/LF (Win)" msgstr "" -#: src/interface.c:753 +#: src/interface.c:759 msgid "Convert and set to _LF (Unix)" msgstr "" -#: src/interface.c:758 +#: src/interface.c:765 msgid "Convert and set to CR (_Mac)" msgstr "" -#: src/interface.c:769 +#: src/interface.c:776 msgid "_Replace tabs by spaces" msgstr "" -#: src/interface.c:772 src/interface.c:2923 +#: src/interface.c:779 src/interface.c:2943 msgid "Replaces all tabs in document by spaces." msgstr "" -#: src/interface.c:779 +#: src/interface.c:786 msgid "_Fold all" msgstr "" -#: src/interface.c:782 +#: src/interface.c:789 msgid "Folds all contractible code blocks" msgstr "" -#: src/interface.c:784 +#: src/interface.c:791 msgid "_Unfold all" msgstr "" -#: src/interface.c:787 +#: src/interface.c:794 msgid "Unfolds all contracted code blocks" msgstr "" -#: src/interface.c:794 +#: src/interface.c:801 msgid "Remove all _indicators" msgstr "" -#: src/interface.c:797 +#: src/interface.c:804 msgid "Removes all set indicators in the current document." msgstr "" #. build the code -#: src/interface.c:799 src/dialogs.c:485 +#: src/interface.c:806 src/ui_utils.c:790 msgid "_Build" msgstr "" -#: src/interface.c:803 +#: src/interface.c:810 msgid "_Help" msgstr "" -#: src/interface.c:814 +#: src/interface.c:821 msgid "_Keyboard shortcuts" msgstr "" -#: src/interface.c:817 +#: src/interface.c:824 msgid "Shows a list of all keyboard shortcuts for Geany." msgstr "" -#: src/interface.c:819 +#: src/interface.c:826 msgid "_Website" msgstr "" -#: src/interface.c:842 +#: src/interface.c:849 msgid "Create a new file" msgstr "" -#: src/interface.c:847 +#: src/interface.c:854 msgid "Open an existing file" msgstr "" -#: src/interface.c:852 +#: src/interface.c:859 msgid "Save the current file" msgstr "" -#: src/interface.c:854 src/keybindings.c:121 +#: src/interface.c:861 src/keybindings.c:125 msgid "Save all" msgstr "" -#: src/interface.c:857 +#: src/interface.c:864 msgid "Save all open files" msgstr "" -#: src/interface.c:866 +#: src/interface.c:873 msgid "Reload the current file from disk" msgstr "" -#: src/interface.c:871 +#: src/interface.c:878 msgid "Close the current file" msgstr "" -#: src/interface.c:880 +#: src/interface.c:887 msgid "Undo the last modification" msgstr "" -#: src/interface.c:885 +#: src/interface.c:892 msgid "Redo the last modification" msgstr "" -#: src/interface.c:893 src/keybindings.c:169 +#: src/interface.c:900 src/keybindings.c:173 msgid "Compile" msgstr "" -#: src/interface.c:896 +#: src/interface.c:903 msgid "Compile the current file" msgstr "" -#: src/interface.c:901 src/dialogs.c:538 +#: src/interface.c:908 src/ui_utils.c:847 msgid "Run or view the current file" msgstr "" -#: src/interface.c:909 +#: src/interface.c:916 msgid "Color" msgstr "" -#: src/interface.c:921 +#: src/interface.c:928 msgid "Zoom in the text" msgstr "" -#: src/interface.c:926 +#: src/interface.c:933 msgid "Zoom out the text" msgstr "" -#: src/interface.c:939 src/interface.c:944 +#: src/interface.c:946 src/interface.c:951 msgid "Find the entered text in the current file" msgstr "" -#: src/interface.c:957 +#: src/interface.c:964 msgid "Enter a line number and jump to it." msgstr "" -#: src/interface.c:964 +#: src/interface.c:971 msgid "Jump to the entered line number." msgstr "" -#: src/interface.c:1000 src/treeviews.c:41 +#: src/interface.c:1007 src/treeviews.c:40 msgid "Symbols" msgstr "" -#: src/interface.c:1013 src/treeviews.c:219 +#: src/interface.c:1020 src/treeviews.c:218 msgid "Open files" msgstr "" -#: src/interface.c:1048 +#: src/interface.c:1055 msgid "Status" msgstr "" -#: src/interface.c:1062 +#: src/interface.c:1069 msgid "Compiler" msgstr "" -#: src/interface.c:1076 +#: src/interface.c:1083 msgid "Messages" msgstr "" -#: src/interface.c:1089 +#: src/interface.c:1096 msgid "Scribble" msgstr "" -#: src/interface.c:1589 src/interface.c:2764 +#: src/interface.c:1600 src/interface.c:2784 msgid "Images and text" msgstr "" -#: src/interface.c:1595 src/interface.c:2772 +#: src/interface.c:1606 src/interface.c:2792 msgid "Images only" msgstr "" -#: src/interface.c:1601 src/interface.c:2780 +#: src/interface.c:1612 src/interface.c:2800 msgid "Text only" msgstr "" -#: src/interface.c:1612 src/interface.c:2788 +#: src/interface.c:1623 src/interface.c:2808 msgid "Large icons" msgstr "" -#: src/interface.c:1617 src/interface.c:2796 +#: src/interface.c:1628 src/interface.c:2816 msgid "Small icons" msgstr "" -#: src/interface.c:1627 +#: src/interface.c:1638 msgid "Hide toolbar" msgstr "" -#: src/interface.c:1791 +#: src/interface.c:1803 msgid "Insert \"include <...>\"" msgstr "" -#: src/interface.c:1805 +#: src/interface.c:1817 msgid "Insert Comments" msgstr "" -#: src/interface.c:1906 +#: src/interface.c:1922 msgid "Find usage" msgstr "" -#: src/interface.c:1914 src/keybindings.c:224 +#: src/interface.c:1930 src/keybindings.c:234 msgid "Go to tag definition" msgstr "" -#: src/interface.c:1918 src/keybindings.c:226 +#: src/interface.c:1934 src/keybindings.c:236 msgid "Go to tag declaration" msgstr "" -#: src/interface.c:1927 src/dialogs.c:739 src/keybindings.c:149 +#: src/interface.c:1943 src/dialogs.c:563 src/keybindings.c:153 msgid "Go to line" msgstr "" -#: src/interface.c:1930 +#: src/interface.c:1946 msgid "Goto to the entered line" msgstr "" -#: src/interface.c:2269 src/keybindings.c:139 +#: src/interface.c:2289 src/keybindings.c:143 msgid "Preferences" msgstr "" -#: src/interface.c:2298 +#: src/interface.c:2318 msgid "Load files from the last session" msgstr "" -#: src/interface.c:2302 +#: src/interface.c:2322 msgid "Opens at startup the files from the last session" msgstr "" -#: src/interface.c:2305 +#: src/interface.c:2325 msgid "Save window position and geometry" msgstr "" -#: src/interface.c:2309 +#: src/interface.c:2329 msgid "Saves the window position and geometry and restores it at the start" msgstr "" -#: src/interface.c:2312 +#: src/interface.c:2332 msgid "Beep on errors or when compilation has finished" msgstr "" -#: src/interface.c:2315 +#: src/interface.c:2335 msgid "" "Whether to beep if an error occured or when the compilation process has " "finished." msgstr "" -#: src/interface.c:2318 +#: src/interface.c:2338 msgid "Switch to status message list at new message" msgstr "" -#: src/interface.c:2321 +#: src/interface.c:2341 msgid "" "Switch to the status message tab (in the notebook window at the bottom) if a " "new status message arrives." msgstr "" -#: src/interface.c:2324 +#: src/interface.c:2344 msgid "Load virtual terminal emulation at startup" msgstr "" -#: src/interface.c:2326 +#: src/interface.c:2346 msgid "" "Whether the virtual terminal emulation(VTE) should be loaded at startup. " "Disable it if you do not need it." msgstr "" -#: src/interface.c:2329 +#: src/interface.c:2349 msgid "Confirm exit" msgstr "" -#: src/interface.c:2333 +#: src/interface.c:2353 msgid "Shows a confirmation dialog on exit." msgstr "" -#: src/interface.c:2344 +#: src/interface.c:2364 msgid "Recent files list length:" msgstr "" -#: src/interface.c:2352 @@ 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: [814] trunk
by eht16＠users.sourceforge.net 12 Sep '06

12 Sep '06

Revision: 814 http://svn.sourceforge.net/geany/?rev=814&view=rev Author: eht16 Date: 2006-09-12 01:32:52 -0700 (Tue, 12 Sep 2006) Log Message: ----------- Added menu items for toggle line commentation. Changed some mnemonics in the "format" submenu. Added keyboard shortcuts for "Convert Selection to lower-case". Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/interface.c trunk/src/keybindings.c trunk/src/keybindings.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-09-12 00:33:57 UTC (rev 813) +++ trunk/ChangeLog 2006-09-12 08:32:52 UTC (rev 814) @@ -1,3 +1,12 @@ +2006-09-12 Enrico Tröger <enrico.troeger(a)uvena.de> + + * geany.glade, src/interface.c, src/callbacks.c, src/keybindings.c: + Added menu items for toggle line commentation. + Changed some mnemonics in the "format" submenu. + * src/callbacks.c, src/keybindings.c: + Added keyboard shortcuts for "Convert Selection to lower-case". + + 2006-09-12 Frank Lanitz <frank(a)frank.uvena.de> * data/pascal.tags: Adding data for unit x86. Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2006-09-12 00:33:57 UTC (rev 813) +++ trunk/geany.glade 2006-09-12 08:32:52 UTC (rev 814) @@ -57,7 +57,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1037"> + <widget class="GtkImage" id="image1088"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -150,7 +150,7 @@ <signal name="activate" handler="on_save_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1038"> + <widget class="GtkImage" id="image1089"> <property name="visible">True</property> <property name="stock">gtk-save</property> <property name="icon_size">1</property> @@ -171,7 +171,7 @@ <signal name="activate" handler="on_toolbutton23_clicked" last_modification_time="Mon, 24 Jul 2006 19:26:04 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1039"> + <widget class="GtkImage" id="image1090"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -191,7 +191,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1040"> + <widget class="GtkImage" id="image1091"> <property name="visible">True</property> <property name="stock">gtk-revert-to-saved</property> <property name="icon_size">1</property> @@ -271,7 +271,7 @@ <signal name="activate" handler="on_close_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1041"> + <widget class="GtkImage" id="image1092"> <property name="visible">True</property> <property name="stock">gtk-close</property> <property name="icon_size">1</property> @@ -402,7 +402,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1042"> + <widget class="GtkImage" id="image1093"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -434,7 +434,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1043"> + <widget class="GtkImage" id="image1094"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -539,7 +539,7 @@ <widget class="GtkMenu" id="menu_format1_menu"> <child> - <widget class="GtkMenuItem" id="menu_to_lower-case2"> + <widget class="GtkMenuItem" id="menu_to_lower_case2"> <property name="visible">True</property> <property name="label" translatable="yes">Convert Selection to _lower-case</property> <property name="use_underline">True</property> @@ -548,7 +548,7 @@ </child> <child> - <widget class="GtkMenuItem" id="menu_to_upper-case2"> + <widget class="GtkMenuItem" id="menu_to_upper_case2"> <property name="visible">True</property> <property name="label" translatable="yes">Convert Selection to _upper-case</property> <property name="use_underline">True</property> @@ -574,16 +574,25 @@ <child> <widget class="GtkMenuItem" id="menu_uncomment_line1"> <property name="visible">True</property> - <property name="label" translatable="yes">_Uncomment Line</property> + <property name="label" translatable="yes">U_ncomment Line</property> <property name="use_underline">True</property> <signal name="activate" handler="on_menu_uncomment_line1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/> </widget> </child> <child> + <widget class="GtkMenuItem" id="menu_toggle_line_commentation1"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Toggle line commentation</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_menu_toggle_line_commentation1_activate" last_modification_time="Tue, 12 Sep 2006 08:06:46 GMT"/> + </widget> + </child> + + <child> <widget class="GtkMenuItem" id="menu_duplicate_line1"> <property name="visible">True</property> - <property name="label" translatable="yes">D_uplicate Line</property> + <property name="label" translatable="yes">Du_plicate Line</property> <property name="use_underline">True</property> <signal name="activate" handler="on_menu_duplicate_line1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/> </widget> @@ -690,7 +699,7 @@ <signal name="activate" handler="on_replace1_activate" last_modification_time="Sun, 23 Oct 2005 13:22:36 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1044"> + <widget class="GtkImage" id="image1095"> <property name="visible">True</property> <property name="stock">gtk-find-and-replace</property> <property name="icon_size">1</property> @@ -732,7 +741,7 @@ <signal name="activate" handler="on_go_to_line1_activate" last_modification_time="Tue, 23 May 2006 17:10:49 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1045"> + <widget class="GtkImage" id="image1096"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> @@ -767,7 +776,7 @@ <signal name="activate" handler="on_change_font1_activate" last_modification_time="Fri, 22 Apr 2005 18:58:45 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1046"> + <widget class="GtkImage" id="image1097"> <property name="visible">True</property> <property name="stock">gtk-select-font</property> <property name="icon_size">1</property> @@ -789,7 +798,7 @@ <signal name="activate" handler="on_show_color_chooser1_activate" last_modification_time="Wed, 22 Jun 2005 18:10:21 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1047"> + <widget class="GtkImage" id="image1098"> <property name="visible">True</property> <property name="stock">gtk-select-color</property> <property name="icon_size">1</property> @@ -1020,7 +1029,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">Convert and set to _CR/LF (Win)</property> <property name="use_underline">True</property> - <property name="active">False</property> + <property name="active">True</property> <signal name="activate" handler="on_crlf_activate" last_modification_time="Thu, 28 Apr 2005 16:27:24 GMT"/> </widget> </child> @@ -1030,7 +1039,7 @@ <property name="visible">True</property> <property name="label" translatable="yes">Convert and set to _LF (Unix)</property> <property name="use_underline">True</property> - <property name="active">False</property> + <property name="active">True</property> <property name="group">crlf</property> <signal name="activate" handler="on_lf_activate" last_modification_time="Thu, 28 Apr 2005 16:27:24 GMT"/> </widget> @@ -2277,7 +2286,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1054"> + <widget class="GtkImage" id="image1084"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -2309,7 +2318,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1055"> + <widget class="GtkImage" id="image1085"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -2413,7 +2422,7 @@ <widget class="GtkMenu" id="menu_format2_menu"> <child> - <widget class="GtkMenuItem" id="to_lower-case1"> + <widget class="GtkMenuItem" id="to_lower_case1"> <property name="visible">True</property> <property name="label" translatable="yes">Convert Selection to _lower-case</property> <property name="use_underline">True</property> @@ -2422,7 +2431,7 @@ </child> <child> - <widget class="GtkMenuItem" id="to_upper-case1"> + <widget class="GtkMenuItem" id="to_upper_case1"> <property name="visible">True</property> <property name="label" translatable="yes">Convert Selection to _upper-case</property> <property name="use_underline">True</property> @@ -2448,16 +2457,25 @@ <child> <widget class="GtkMenuItem" id="menu_uncomment_line2"> <property name="visible">True</property> - <property name="label" translatable="yes">_Uncomment Line</property> + <property name="label" translatable="yes">U_ncomment Line</property> <property name="use_underline">True</property> <signal name="activate" handler="on_menu_uncomment_line1_activate" last_modification_time="Tue, 01 Aug 2006 10:31:38 GMT"/> </widget> </child> <child> + <widget class="GtkMenuItem" id="menu_toggle_line_commentation2"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Toggle line commentation</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_menu_toggle_line_commentation1_activate" last_modification_time="Tue, 12 Sep 2006 08:07:58 GMT"/> + </widget> + </child> + + <child> <widget class="GtkMenuItem" id="menu_duplicate_line2"> <property name="visible">True</property> - <property name="label" translatable="yes">D_uplicate Line</property> + <property name="label" translatable="yes">Du_plicate Line</property> <property name="use_underline">True</property> <signal name="activate" handler="on_menu_duplicate_line1_activate" last_modification_time="Tue, 01 Aug 2006 10:31:38 GMT"/> </widget> @@ -2505,7 +2523,7 @@ <signal name="activate" handler="on_find_usage1_activate" last_modification_time="Fri, 27 May 2005 21:55:12 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1056"> + <widget class="GtkImage" id="image1086"> <property name="visible">True</property> <property name="stock">gtk-find</property> <property name="icon_size">1</property> @@ -2551,7 +2569,7 @@ <signal name="activate" handler="on_go_to_line_activate" last_modification_time="Sat, 16 Jul 2005 11:20:32 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1057"> + <widget class="GtkImage" id="image1087"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-09-12 00:33:57 UTC (rev 813) +++ trunk/src/callbacks.c 2006-09-12 08:32:52 UTC (rev 814) @@ -1143,13 +1143,10 @@ gpointer user_data) { gint idx = document_get_cur_idx(); - gchar *text; - if (idx < 0) return; - text = g_malloc(sci_get_selected_text_length(doc_list[idx].sci) + 1); - sci_get_selected_text(doc_list[idx].sci, text); - sci_replace_sel(doc_list[idx].sci, g_ascii_strdown(text, -1)); - g_free(text); + if (idx < 0 || ! doc_list[idx].is_valid) return; + + sci_cmd(doc_list[idx].sci, SCI_LOWERCASE); } @@ -1158,13 +1155,10 @@ gpointer user_data) { gint idx = document_get_cur_idx(); - gchar *text; - if (idx < 0) return; - text = g_malloc(sci_get_selected_text_length(doc_list[idx].sci) + 1); - sci_get_selected_text(doc_list[idx].sci, text); - sci_replace_sel(doc_list[idx].sci, g_ascii_strup(text, -1)); - g_free(text); + if (idx < 0 || ! doc_list[idx].is_valid) return; + + sci_cmd(doc_list[idx].sci, SCI_UPPERCASE); } @@ -2472,6 +2466,17 @@ void +on_menu_toggle_line_commentation1_activate + (GtkMenuItem *menuitem, + gpointer user_data) +{ + gint idx = document_get_cur_idx(); + if (idx == -1 || ! doc_list[idx].is_valid) return; + sci_cb_do_comment_toggle(idx); +} + + +void on_menu_duplicate_line1_activate (GtkMenuItem *menuitem, gpointer user_data) { @@ -2535,3 +2540,4 @@ } } + Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2006-09-12 00:33:57 UTC (rev 813) +++ trunk/src/callbacks.h 2006-09-12 08:32:52 UTC (rev 814) @@ -605,3 +605,8 @@ void on_menu_decrease_indent1_activate (GtkMenuItem *menuitem, gpointer user_data); + +void +on_menu_toggle_line_commentation1_activate + (GtkMenuItem *menuitem, + gpointer user_data); Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2006-09-12 00:33:57 UTC (rev 813) +++ trunk/src/interface.c 2006-09-12 08:32:52 UTC (rev 814) @@ -37,7 +37,7 @@ GtkWidget *menuitem1_menu; GtkWidget *menu_new1; GtkWidget *menu_new_with_template1; - GtkWidget *image1037; + GtkWidget *image1088; GtkWidget *menu_new_with_template1_menu; GtkWidget *invisible2; GtkWidget *separator12; @@ -49,11 +49,11 @@ GtkWidget *menu_save1; GtkWidget *menu_save_as1; GtkWidget *menu_save_all1; - GtkWidget *image1038; + GtkWidget *image1089; GtkWidget *menu_reload1; - GtkWidget *image1039; + GtkWidget *image1090; GtkWidget *menu_reload_as1; - GtkWidget *image1040; + GtkWidget *image1091; GtkWidget *menu_reload_as1_menu; GtkWidget *invisible7; GtkWidget *separator21; @@ -63,7 +63,7 @@ GtkWidget *separator14; GtkWidget *menu_close1; GtkWidget *menu_close_all1; - GtkWidget *image1041; + GtkWidget *image1092; GtkWidget *menu_separatormenuitem1; GtkWidget *menu_quit1; GtkWidget *edit1; @@ -79,11 +79,11 @@ GtkWidget *menu_select_all1; GtkWidget *separator25; GtkWidget *insert_include2; - GtkWidget *image1042; + GtkWidget *image1093; GtkWidget *insert_include2_menu; GtkWidget *invisible4; GtkWidget *add_comments1; - GtkWidget *image1043; + GtkWidget *image1094; GtkWidget *add_comments1_menu; GtkWidget *menu_add_changelog_entry1; GtkWidget *insert_file_header1; @@ -101,6 +101,7 @@ GtkWidget *separator28; GtkWidget *menu_comment_line1; GtkWidget *menu_uncomment_line1; + GtkWidget *menu_toggle_line_commentation1; GtkWidget *menu_duplicate_line1; GtkWidget *separator29; GtkWidget *menu_increase_indent1; @@ -114,18 +115,18 @@ GtkWidget *find_next1; GtkWidget *find_previous1; GtkWidget *replace1; - GtkWidget *image1044; + GtkWidget *image1095; GtkWidget *separator27; GtkWidget *find_in_files1; GtkWidget *separator11; GtkWidget *go_to_line1; - GtkWidget *image1045; + GtkWidget *image1096; GtkWidget *menuitem3; GtkWidget *menuitem3_menu; GtkWidget *menu_change_font1; - GtkWidget *image1046; + GtkWidget *image1097; GtkWidget *menu_choose_color1; - GtkWidget *image1047; + GtkWidget *image1098; GtkWidget *menu_separator4; GtkWidget *menu_fullscreen1; GtkWidget *menu_show_messages_window1; @@ -262,9 +263,9 @@ gtk_widget_show (menu_new_with_template1); gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_new_with_template1); - image1037 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1037); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image1037); + image1088 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1088); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image1088); menu_new_with_template1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_new_with_template1), menu_new_with_template1_menu); @@ -309,25 +310,25 @@ gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_save_all1); gtk_tooltips_set_tip (tooltips, menu_save_all1, _("Saves all open files"), NULL); - image1038 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1038); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image1038); + image1089 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1089); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image1089); menu_reload1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload")); gtk_widget_show (menu_reload1); gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_reload1); - image1039 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1039); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image1039); + image1090 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1090); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image1090); menu_reload_as1 = gtk_image_menu_item_new_with_mnemonic (_("R_eload as")); gtk_widget_show (menu_reload_as1); gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_reload_as1); - image1040 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1040); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image1040); + image1091 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1091); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image1091); menu_reload_as1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_reload_as1), menu_reload_as1_menu); @@ -368,9 +369,9 @@ gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_close_all1); gtk_tooltips_set_tip (tooltips, menu_close_all1, _("Closes all open files"), NULL); - image1041 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1041); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image1041); + image1092 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1092); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image1092); menu_separatormenuitem1 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separatormenuitem1); @@ -436,9 +437,9 @@ gtk_widget_show (insert_include2); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2); - image1042 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1042); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image1042); + image1093 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1093); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image1093); insert_include2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu); @@ -450,9 +451,9 @@ gtk_widget_show (add_comments1); gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1); - image1043 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1043); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image1043); + image1094 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1094); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image1094); add_comments1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu); @@ -522,11 +523,15 @@ gtk_widget_show (menu_comment_line1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_comment_line1); - menu_uncomment_line1 = gtk_menu_item_new_with_mnemonic (_("_Uncomment Line")); + menu_uncomment_line1 = gtk_menu_item_new_with_mnemonic (_("U_ncomment Line")); gtk_widget_show (menu_uncomment_line1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_uncomment_line1); - menu_duplicate_line1 = gtk_menu_item_new_with_mnemonic (_("D_uplicate Line")); + menu_toggle_line_commentation1 = gtk_menu_item_new_with_mnemonic (_("_Toggle line commentation")); + gtk_widget_show (menu_toggle_line_commentation1); + gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_toggle_line_commentation1); + + menu_duplicate_line1 = gtk_menu_item_new_with_mnemonic (_("Du_plicate Line")); gtk_widget_show (menu_duplicate_line1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_duplicate_line1); @@ -580,9 +585,9 @@ gtk_widget_show (replace1); gtk_container_add (GTK_CONTAINER (search1_menu), replace1); - image1044 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1044); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image1044); + image1095 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1095); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image1095); separator27 = gtk_separator_menu_item_new (); gtk_widget_show (separator27); @@ -602,9 +607,9 @@ gtk_widget_show (go_to_line1); gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1); - image1045 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1045); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image1045); + image1096 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1096); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image1096); menuitem3 = gtk_menu_item_new_with_mnemonic (_("_View")); gtk_widget_show (menuitem3); @@ -618,18 +623,18 @@ gtk_container_add (GTK_CONTAINER (menuitem3_menu), menu_change_font1); gtk_tooltips_set_tip (tooltips, menu_change_font1, _("Change the default font"), NULL); - image1046 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1046); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image1046); + image1097 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1097); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image1097); menu_choose_color1 = gtk_image_menu_item_new_with_mnemonic (_("Show _Colour Chooser")); gtk_widget_show (menu_choose_color1); gtk_container_add (GTK_CONTAINER (menuitem3_menu), menu_choose_color1); gtk_tooltips_set_tip (tooltips, menu_choose_color1, _("Open a color chooser dialog, to interactively pick colors from a palette."), NULL); - image1047 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1047); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image1047); + image1098 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1098); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image1098); menu_separator4 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separator4); @@ -749,11 +754,13 @@ crlf_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (crlf)); gtk_widget_show (crlf); gtk_container_add (GTK_CONTAINER (menu_line_endings1_menu), crlf); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (crlf), TRUE); lf = gtk_radio_menu_item_new_with_mnemonic (crlf_group, _("Convert and set to _LF (Unix)")); crlf_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (lf)); gtk_widget_show (lf); gtk_container_add (GTK_CONTAINER (menu_line_endings1_menu), lf); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lf), TRUE); cr = gtk_radio_menu_item_new_with_mnemonic (crlf_group, _("Convert and set to CR (_Mac)")); crlf_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (cr)); @@ -1182,6 +1189,9 @@ g_signal_connect ((gpointer) menu_uncomment_line1, "activate", G_CALLBACK (on_menu_uncomment_line1_activate), NULL); + g_signal_connect ((gpointer) menu_toggle_line_commentation1, "activate", + G_CALLBACK (on_menu_toggle_line_commentation1_activate), + NULL); g_signal_connect ((gpointer) menu_duplicate_line1, "activate", G_CALLBACK (on_menu_duplicate_line1_activate), NULL); @@ -1372,7 +1382,7 @@ GLADE_HOOKUP_OBJECT (window1, menuitem1_menu, "menuitem1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_new1, "menu_new1"); GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1, "menu_new_with_template1"); - GLADE_HOOKUP_OBJECT (window1, image1037, "image1037"); + GLADE_HOOKUP_OBJECT (window1, image1088, "image1088"); GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1_menu, "menu_new_with_template1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible2, "invisible2"); GLADE_HOOKUP_OBJECT (window1, separator12, "separator12"); @@ -1384,11 +1394,11 @@ GLADE_HOOKUP_OBJECT (window1, menu_save1, "menu_save1"); GLADE_HOOKUP_OBJECT (window1, menu_save_as1, "menu_save_as1"); GLADE_HOOKUP_OBJECT (window1, menu_save_all1, "menu_save_all1"); - GLADE_HOOKUP_OBJECT (window1, image1038, "image1038"); + GLADE_HOOKUP_OBJECT (window1, image1089, "image1089"); GLADE_HOOKUP_OBJECT (window1, menu_reload1, "menu_reload1"); - GLADE_HOOKUP_OBJECT (window1, image1039, "image1039"); + GLADE_HOOKUP_OBJECT (window1, image1090, "image1090"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1, "menu_reload_as1"); - GLADE_HOOKUP_OBJECT (window1, image1040, "image1040"); + GLADE_HOOKUP_OBJECT (window1, image1091, "image1091"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1_menu, "menu_reload_as1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible7, "invisible7"); GLADE_HOOKUP_OBJECT (window1, separator21, "separator21"); @@ -1398,7 +1408,7 @@ GLADE_HOOKUP_OBJECT (window1, separator14, "separator14"); GLADE_HOOKUP_OBJECT (window1, menu_close1, "menu_close1"); GLADE_HOOKUP_OBJECT (window1, menu_close_all1, "menu_close_all1"); - GLADE_HOOKUP_OBJECT (window1, image1041, "image1041"); + GLADE_HOOKUP_OBJECT (window1, image1092, "image1092"); GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1"); GLADE_HOOKUP_OBJECT (window1, menu_quit1, "menu_quit1"); GLADE_HOOKUP_OBJECT (window1, edit1, "edit1"); @@ -1414,11 +1424,11 @@ GLADE_HOOKUP_OBJECT (window1, menu_select_all1, "menu_select_all1"); GLADE_HOOKUP_OBJECT (window1, separator25, "separator25"); GLADE_HOOKUP_OBJECT (window1, insert_include2, "insert_include2"); - GLADE_HOOKUP_OBJECT (window1, image1042, "image1042"); + GLADE_HOOKUP_OBJECT (window1, image1093, "image1093"); GLADE_HOOKUP_OBJECT (window1, insert_include2_menu, "insert_include2_menu"); GLADE_HOOKUP_OBJECT (window1, invisible4, "invisible4"); GLADE_HOOKUP_OBJECT (window1, add_comments1, "add_comments1"); - GLADE_HOOKUP_OBJECT (window1, image1043, "image1043"); + GLADE_HOOKUP_OBJECT (window1, image1094, "image1094"); GLADE_HOOKUP_OBJECT (window1, add_comments1_menu, "add_comments1_menu"); GLADE_HOOKUP_OBJECT (window1, menu_add_changelog_entry1, "menu_add_changelog_entry1"); GLADE_HOOKUP_OBJECT (window1, insert_file_header1, "insert_file_header1"); @@ -1436,6 +1446,7 @@ GLADE_HOOKUP_OBJECT (window1, separator28, "separator28"); GLADE_HOOKUP_OBJECT (window1, menu_comment_line1, "menu_comment_line1"); GLADE_HOOKUP_OBJECT (window1, menu_uncomment_line1, "menu_uncomment_line1"); + GLADE_HOOKUP_OBJECT (window1, menu_toggle_line_commentation1, "menu_toggle_line_commentation1"); GLADE_HOOKUP_OBJECT (window1, menu_duplicate_line1, "menu_duplicate_line1"); GLADE_HOOKUP_OBJECT (window1, separator29, "separator29"); GLADE_HOOKUP_OBJECT (window1, menu_increase_indent1, "menu_increase_indent1"); @@ -1449,18 +1460,18 @@ GLADE_HOOKUP_OBJECT (window1, find_next1, "find_next1"); GLADE_HOOKUP_OBJECT (window1, find_previous1, "find_previous1"); GLADE_HOOKUP_OBJECT (window1, replace1, "replace1"); - GLADE_HOOKUP_OBJECT (window1, image1044, "image1044"); + GLADE_HOOKUP_OBJECT (window1, image1095, "image1095"); GLADE_HOOKUP_OBJECT (window1, separator27, "separator27"); GLADE_HOOKUP_OBJECT (window1, find_in_files1, "find_in_files1"); GLADE_HOOKUP_OBJECT (window1, separator11, "separator11"); GLADE_HOOKUP_OBJECT (window1, go_to_line1, "go_to_line1"); - GLADE_HOOKUP_OBJECT (window1, image1045, "image1045"); + GLADE_HOOKUP_OBJECT (window1, image1096, "image1096"); GLADE_HOOKUP_OBJECT (window1, menuitem3, "menuitem3"); GLADE_HOOKUP_OBJECT (window1, menuitem3_menu, "menuitem3_menu"); GLADE_HOOKUP_OBJECT (window1, menu_change_font1, "menu_change_font1"); - GLADE_HOOKUP_OBJECT (window1, image1046, "image1046"); + GLADE_HOOKUP_OBJECT (window1, image1097, "image1097"); GLADE_HOOKUP_OBJECT (window1, menu_choose_color1, "menu_choose_color1"); - GLADE_HOOKUP_OBJECT (window1, image1047, "image1047"); + GLADE_HOOKUP_OBJECT (window1, image1098, "image1098"); GLADE_HOOKUP_OBJECT (window1, menu_separator4, "menu_separator4"); GLADE_HOOKUP_OBJECT (window1, menu_fullscreen1, "menu_fullscreen1"); GLADE_HOOKUP_OBJECT (window1, menu_show_messages_window1, "menu_show_messages_window1"); @@ -1685,11 +1696,11 @@ GtkWidget *normal_size2; GtkWidget *separator6; GtkWidget *insert_include1; - GtkWidget *image1054; + GtkWidget *image1084; GtkWidget *insert_include1_menu; GtkWidget *invisible3; GtkWidget *comments; - GtkWidget *image1055; + GtkWidget *image1085; GtkWidget *comments_menu; GtkWidget *add_changelog_entry2; GtkWidget *insert_file_header2; @@ -1707,18 +1718,19 @@ GtkWidget *separator30; GtkWidget *menu_comment_line2; GtkWidget *menu_uncomment_line2; + GtkWidget *menu_toggle_line_commentation2; GtkWidget *menu_duplicate_line2; GtkWidget *separator31; GtkWidget *menu_increase_indent2; GtkWidget *menu_decrease_indent2; GtkWidget *separator7; GtkWidget *find_usage1; - GtkWidget *image1056; + GtkWidget *image1086; GtkWidget *goto_tag_definition1; GtkWidget *goto_tag_declaration1; GtkWidget *separator15; GtkWidget *go_to_line; - GtkWidget *image1057; + GtkWidget *image1087; GtkAccelGroup *accel_group; GtkTooltips *tooltips; @@ -1792,9 +1804,9 @@ gtk_widget_show (insert_include1); gtk_container_add (GTK_CONTAINER (edit_menu1), insert_include1); - image1054 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1054); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image1054); + image1084 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1084); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include1), image1084); insert_include1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include1), insert_include1_menu); @@ -1806,9 +1818,9 @@ gtk_widget_show (comments); gtk_container_add (GTK_CONTAINER (edit_menu1), comments); - image1055 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1055); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image1055); + image1085 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1085); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (comments), image1085); comments_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (comments), comments_menu); @@ -1877,11 +1889,15 @@ gtk_widget_show (menu_comment_line2); gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_comment_line2); - menu_uncomment_line2 = gtk_menu_item_new_with_mnemonic (_("_Uncomment Line")); + menu_uncomment_line2 = gtk_menu_item_new_with_mnemonic (_("U_ncomment Line")); gtk_widget_show (menu_uncomment_line2); gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_uncomment_line2); - menu_duplicate_line2 = gtk_menu_item_new_with_mnemonic (_("D_uplicate Line")); + menu_toggle_line_commentation2 = gtk_menu_item_new_with_mnemonic (_("_Toggle line commentation")); + gtk_widget_show (menu_toggle_line_commentation2); + gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_toggle_line_commentation2); + + menu_duplicate_line2 = gtk_menu_item_new_with_mnemonic (_("Du_plicate Line")); gtk_widget_show (menu_duplicate_line2); gtk_container_add (GTK_CONTAINER (menu_format2_menu), menu_duplicate_line2); @@ -1907,9 +1923,9 @@ gtk_widget_show (find_usage1); gtk_container_add (GTK_CONTAINER (edit_menu1), find_usage1); - image1056 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1056); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image1056); + image1086 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1086); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (find_usage1), image1086); goto_tag_definition1 = gtk_menu_item_new_with_mnemonic (_("Go to tag definition")); gtk_widget_show (goto_tag_definition1); @@ -1929,9 +1945,9 @@ gtk_container_add (GTK_CONTAINER (edit_menu1), go_to_line); gtk_tooltips_set_tip (tooltips, go_to_line, _("Goto to the entered line"), NULL); - image1057 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1057); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line), image1057); + image1087 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1087); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line), image1087); g_signal_connect ((gpointer) undo1, "activate", G_CALLBACK (on_undo1_activate), @@ -1990,6 +2006,9 @@ g_signal_connect ((gpointer) menu_uncomment_line2, "activate", G_CALLBACK (on_menu_uncomment_line1_activate), NULL); + g_signal_connect ((gpointer) menu_toggle_line_commentation2, "activate", + G_CALLBACK (on_menu_toggle_line_commentation1_activate), + NULL); g_signal_connect ((gpointer) menu_duplicate_line2, "activate", G_CALLBACK (on_menu_duplicate_line1_activate), NULL); @@ -2029,11 +2048,11 @@ GLADE_HOOKUP_OBJECT (edit_menu1, normal_size2, "normal_size2"); GLADE_HOOKUP_OBJECT (edit_menu1, separator6, "separator6"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1, "insert_include1"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1054, "image1054"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1084, "image1084"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_include1_menu, "insert_include1_menu"); GLADE_HOOKUP_OBJECT (edit_menu1, invisible3, "invisible3"); GLADE_HOOKUP_OBJECT (edit_menu1, comments, "comments"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1055, "image1055"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1085, "image1085"); GLADE_HOOKUP_OBJECT (edit_menu1, comments_menu, "comments_menu"); GLADE_HOOKUP_OBJECT (edit_menu1, add_changelog_entry2, "add_changelog_entry2"); GLADE_HOOKUP_OBJECT (edit_menu1, insert_file_header2, "insert_file_header2"); @@ -2051,18 +2070,19 @@ GLADE_HOOKUP_OBJECT (edit_menu1, separator30, "separator30"); GLADE_HOOKUP_OBJECT (edit_menu1, menu_comment_line2, "menu_comment_line2"); GLADE_HOOKUP_OBJECT (edit_menu1, menu_uncomment_line2, "menu_uncomment_line2"); + GLADE_HOOKUP_OBJECT (edit_menu1, menu_toggle_line_commentation2, "menu_toggle_line_commentation2"); GLADE_HOOKUP_OBJECT (edit_menu1, menu_duplicate_line2, "menu_duplicate_line2"); GLADE_HOOKUP_OBJECT (edit_menu1, separator31, "separator31"); GLADE_HOOKUP_OBJECT (edit_menu1, menu_increase_indent2, "menu_increase_indent2"); GLADE_HOOKUP_OBJECT (edit_menu1, menu_decrease_indent2, "menu_decrease_indent2"); GLADE_HOOKUP_OBJECT (edit_menu1, separator7, "separator7"); GLADE_HOOKUP_OBJECT (edit_menu1, find_usage1, "find_usage1"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1056, "image1056"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1086, "image1086"); GLADE_HOOKUP_OBJECT (edit_menu1, goto_tag_definition1, "goto_tag_definition1"); GLADE_HOOKUP_OBJECT (edit_menu1, goto_tag_declaration1, "goto_tag_declaration1"); GLADE_HOOKUP_OBJECT (edit_menu1, separator15, "separator15"); GLADE_HOOKUP_OBJECT (edit_menu1, go_to_line, "go_to_line"); - GLADE_HOOKUP_OBJECT (edit_menu1, image1057, "image1057"); + GLADE_HOOKUP_OBJECT (edit_menu1, image1087, "image1087"); GLADE_HOOKUP_OBJECT_NO_REF (edit_menu1, tooltips, "tooltips"); gtk_menu_set_accel_group (GTK_MENU (edit_menu1), accel_group); Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2006-09-12 00:33:57 UTC (rev 813) +++ trunk/src/keybindings.c 2006-09-12 08:32:52 UTC (rev 814) @@ -86,6 +86,8 @@ static void cb_func_switch_tabright(void); static void cb_func_toggle_sidebar(void); static void cb_func_edit_duplicateline(void); +static void cb_func_edit_tolowercase(void); +static void cb_func_edit_touppercase(void); static void cb_func_edit_commentline(void); static void cb_func_edit_commentlinetoggle(void); static void cb_func_edit_uncommentline(void); @@ -198,6 +200,10 @@ GDK_Page_Down, GDK_CONTROL_MASK, "switch_tabright", _("Switch to right document")); keys[GEANY_KEYS_EDIT_DUPLICATELINE] = fill(cb_func_edit_duplicateline, GDK_g, GDK_CONTROL_MASK, "edit_duplicateline", _("Duplicate line or selection")); + keys[GEANY_KEYS_EDIT_TOLOWERCASE] = fill(cb_func_edit_tolowercase, + GDK_u, GDK_CONTROL_MASK, "edit_tolowercase", _("Convert Selection to lower-case")); + keys[GEANY_KEYS_EDIT_TOUPPERCASE] = fill(cb_func_edit_touppercase, + GDK_u, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "edit_touppercase", _("Convert Selection to upper-case")); keys[GEANY_KEYS_EDIT_COMMENTLINETOGGLE] = fill(cb_func_edit_commentlinetoggle, GDK_b, GDK_CONTROL_MASK, "edit_commentlinetoggle", _("Toggle line commentation")); keys[GEANY_KEYS_EDIT_COMMENTLINE] = fill(cb_func_edit_commentline, @@ -294,8 +300,11 @@ GEANY_ADD_ACCEL(GEANY_KEYS_MENU_REPLACETABS, menu_replace_tabs); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_FOLDALL, menu_fold_all1); GEANY_ADD_ACCEL(GEANY_KEYS_MENU_UNFOLDALL, menu_unfold_all1); + GEANY_ADD_ACCEL(GEANY_KEYS_EDIT_TOLOWERCASE, menu_to_lower_case2); + GEANY_ADD_ACCEL(GEANY_KEYS_EDIT_TOUPPERCASE, menu_to_upper_case2); GEANY_ADD_ACCEL(GEANY_KEYS_EDIT_COMMENTLINE, menu_comment_line1); GEANY_ADD_ACCEL(GEANY_KEYS_EDIT_UNCOMMENTLINE, menu_uncomment_line1); + GEANY_ADD_ACCEL(GEANY_KEYS_EDIT_COMMENTLINETOGGLE, menu_toggle_line_commentation1); GEANY_ADD_ACCEL(GEANY_KEYS_EDIT_DUPLICATELINE, menu_duplicate_line1); GEANY_ADD_ACCEL(GEANY_KEYS_EDIT_INCREASEINDENT, menu_increase_indent1); GEANY_ADD_ACCEL(GEANY_KEYS_EDIT_DECREASEINDENT, menu_decrease_indent1); @@ -310,8 +319,11 @@ GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_POPUP_GOTOTAGDEFINITION, goto_tag_definition1); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_POPUP_GOTOTAGDECLARATION, goto_tag_declaration1); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_MENU_GOTOLINE, go_to_line); + GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDIT_TOLOWERCASE, to_lower_case1); + GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDIT_TOUPPERCASE, to_upper_case1); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDIT_COMMENTLINE, menu_comment_line2); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDIT_UNCOMMENTLINE, menu_uncomment_line2); + GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDIT_COMMENTLINETOGGLE, menu_toggle_line_commentation2); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDIT_DUPLICATELINE, menu_duplicate_line2); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDIT_INCREASEINDENT, menu_increase_indent2); GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDIT_DECREASEINDENT, menu_decrease_indent2); @@ -721,9 +733,7 @@ static void cb_func_edit_commentlinetoggle(void) { - gint idx = document_get_cur_idx(); - if (idx == -1 || ! doc_list[idx].is_valid) return; - sci_cb_do_comment_toggle(idx); + on_menu_toggle_line_commentation1_activate(NULL, NULL); } static void cb_func_edit_commentline(void) @@ -786,6 +796,16 @@ on_menu_decrease_indent1_activate(NULL, NULL); } +static void cb_func_edit_tolowercase(void) +{ + on_to_lower_case1_activate(NULL, NULL); +} + +static void cb_func_edit_touppercase(void) +{ + on_to_upper_case1_activate(NULL, NULL); +} + static void cb_func_menu_insert_date(void) { gtk_menu_item_activate(GTK_MENU_ITEM(lookup_widget(app->popup_menu, "insert_date_custom2"))); Modified: trunk/src/keybindings.h =================================================================== --- trunk/src/keybindings.h 2006-09-12 00:33:57 UTC (rev 813) +++ trunk/src/keybindings.h 2006-09-12 08:32:52 UTC (rev 814) @@ -82,6 +82,8 @@ GEANY_KEYS_SWITCH_VTE, GEANY_KEYS_SWITCH_TABLEFT, GEANY_KEYS_SWITCH_TABRIGHT, + GEANY_KEYS_EDIT_TOLOWERCASE, + GEANY_KEYS_EDIT_TOUPPERCASE, GEANY_KEYS_EDIT_DUPLICATELINE, GEANY_KEYS_EDIT_COMMENTLINETOGGLE, GEANY_KEYS_EDIT_COMMENTLINE, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [813] trunk
by kretek＠users.sourceforge.net 12 Sep '06

12 Sep '06

Revision: 813 http://svn.sourceforge.net/geany/?rev=813&view=rev Author: kretek Date: 2006-09-11 17:33:57 -0700 (Mon, 11 Sep 2006) Log Message: ----------- Adding data for freepascal unit x86 Modified Paths: -------------- trunk/ChangeLog trunk/data/pascal.tags Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-09-11 11:14:09 UTC (rev 812) +++ trunk/ChangeLog 2006-09-12 00:33:57 UTC (rev 813) @@ -1,3 +1,8 @@ +2006-09-12 Frank Lanitz <frank(a)frank.uvena.de> + + * data/pascal.tags: Adding data for unit x86. + + 2006-09-11 Enrico Tröger <enrico.troeger(a)uvena.de> * src/socket.c: Made socket code for detecting running instances Modified: trunk/data/pascal.tags =================================================================== --- trunk/data/pascal.tags 2006-09-11 11:14:09 UTC (rev 812) +++ trunk/data/pascal.tags 2006-09-12 00:33:57 UTC (rev 813) @@ -25,6 +25,8 @@ fillellipse||(X: SmallInt; Y: SmallInt; XRadius: Word; YRadius: Word)| fillpoly||(NumPoints: Word; var PolyPoints)| floodfill||(x: SmallInt; y: SmallInt; Border: Word)| +fpioperm|cInt|(From: Cardinal; Num: Cardinal; Value: cInt)| +fpiopl|cInt|(Level: cInt|) getarccoords||(var ArcCoords: ArcCoordsType)| getaspectratio||(Xasp: Word; Yasp: Word)| getbkcolor|word|| @@ -83,6 +85,15 @@ read||(Identifier)| readln||(Identifier)| readkey|char|| +readport||(Port: LongInt; var Value: Byte)| +readport||(Port: LongInt; var Value: LongInt)| +readport||(Port: LongInt; var Value: Word)| +readportb|Byte|(Port: LongInt)| +readportb||(Port: LongInt; var Buf; Count: LongInt)| +readportl|LongInt|(Port: LongInt)| +readportl||(Port: LongInt; var Buf; Count: LongInt)| +readportw|Word|(Port: LongInt)| +readportw||(Port: LongInt; var Buf; Count: LongInt)| rectangle||(x1: SmallInt; y1: SmallInt; x2: SmallInt; y2: SmallInt)| red||| registerbgidriver|Smallint|(driver: pointer)| @@ -116,4 +127,13 @@ window||(X1: Byte, Y1: Byte, X2: Byte, Y2: Byte)| write||(Output)| writeln||(Output)| +writeport||(Port: LongInt; Value: Byte)| +writeport||(Port: LongInt; Value: LongInt)| +writeport||(Port: LongInt; Value: Word)| +writeportb||(Port: LongInt; Value: Byte)| +wrtieportb||(Port: LongInt; var Buf; Count: LongInt)| +writeportl||(Port: LongInt; Value: LongInt)| +wrtieportl||(Port: LongInt; var Buf; Count: LongInt)| +writeportw||(Port: LongInt; Value: Word)| +wrtieportw||(Port: LongInt; var Buf; Count: LongInt)| yellow||| This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [812] trunk/ChangeLog
by eht16＠users.sourceforge.net 11 Sep '06

11 Sep '06

Revision: 812 http://svn.sourceforge.net/geany/?rev=812&view=rev Author: eht16 Date: 2006-09-11 04:14:09 -0700 (Mon, 11 Sep 2006) Log Message: ----------- Implemented Run command (from the build menu) under Windows, the other commands will follow somewhen. Modified Paths: -------------- trunk/ChangeLog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-09-11 11:13:36 UTC (rev 811) +++ trunk/ChangeLog 2006-09-11 11:14:09 UTC (rev 812) @@ -5,6 +5,9 @@ * src/win32.c, src/ui_utils.c, src/dialogs.c: Fixed compile warnings under Windows. * src/highlighting.c: Fixed a typo. + * src/callbacks.c, src/build.c, src/main.c, src/prefs.c, + src/ui_utils.c: Implemented Run command (from the build menu) under + Windows, the other commands will follow somewhen. 2006-09-10 Enrico Tröger <enrico.troeger(a)uvena.de> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [811] trunk/src
by eht16＠users.sourceforge.net 11 Sep '06

11 Sep '06

Revision: 811 http://svn.sourceforge.net/geany/?rev=811&view=rev Author: eht16 Date: 2006-09-11 04:13:36 -0700 (Mon, 11 Sep 2006) Log Message: ----------- Implemented Run command (from the build menu) under Windows, the other commands will follow somewhen. Modified Paths: -------------- trunk/src/build.c trunk/src/callbacks.c trunk/src/main.c trunk/src/prefs.c trunk/src/ui_utils.c Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2006-09-11 07:41:37 UTC (rev 810) +++ trunk/src/build.c 2006-09-11 11:13:36 UTC (rev 811) @@ -104,6 +104,12 @@ // try convert in locale locale_cmd_string = utils_get_locale_from_utf8(cmd_string); +#ifdef G_OS_WIN32 + argv = NULL; + child_pid = (GPid) 0; + + if (! g_spawn_command_line_async(locale_cmd_string, &error)) +#else argv = g_new0(gchar *, 4); argv[0] = g_strdup("/bin/sh"); argv[1] = g_strdup("-c"); @@ -112,6 +118,7 @@ if (! g_spawn_async_with_pipes(NULL, argv, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &child_pid, NULL, NULL, NULL, &error)) +#endif { geany_debug("g_spawn_async_with_pipes() failed: %s", error->message); msgwin_status_add(_("Process failed (%s)"), error->message); @@ -120,6 +127,9 @@ g_free(executable); g_free(locale_filename); g_free(cmd_string); +#ifdef G_OS_WIN32 + g_free(locale_cmd_string); +#endif g_strfreev(argv); g_error_free(error); error = NULL; @@ -345,7 +355,11 @@ if (idx < 0 || doc_list[idx].file_name == NULL) return (GPid) 1; +#ifdef G_OS_WIN32 + script_name = g_strdup("./geany_run_script.bat"); +#else script_name = g_strdup("./geany_run_script.sh"); +#endif locale_filename = utils_get_locale_from_utf8(doc_list[idx].file_name); @@ -355,22 +369,37 @@ term_argv_len = g_strv_length(term_argv); long_executable = utils_remove_ext_from_filename(locale_filename); +#ifdef G_OS_WIN32 + long_executable = g_strconcat(long_executable, ".exe", NULL); +#endif // only check for existing executable, if executable is required by %e if (strstr(doc_list[idx].file_type->programs->run_cmd, "%e") != NULL) { // add .class extension for JAVA source files (only for stat) if (doc_list[idx].file_type->id == GEANY_FILETYPES_JAVA) + { +#ifdef G_OS_WIN32 + // there is already the extension .exe, so first remove it and then add .class + check_executable = utils_remove_ext_from_filename(long_executable); + check_executable = g_strconcat(check_executable, ".class", NULL); +#else check_executable = g_strconcat(long_executable, ".class", NULL); +#endif + } else check_executable = g_strdup(long_executable); // check whether executable exists if (stat(check_executable, &st) != 0) { +#ifndef G_OS_WIN32 + utf8_check_executable = g_strdup(check_executable); +#else utf8_check_executable = utils_remove_ext_from_filename(doc_list[idx].file_name); msgwin_status_add(_("Failed to execute %s (make sure it is already built)"), utf8_check_executable); +#endif result_id = (GPid) 1; goto free_strings; } @@ -427,10 +456,21 @@ { argv[i] = g_strdup(term_argv[i]); } - argv[term_argv_len ] = g_strdup("-e"); +#ifdef G_OS_WIN32 + // command line arguments for cmd.exe + argv[term_argv_len ] = g_strdup("/Q /C"); + argv[term_argv_len + 1] = g_path_get_basename(script_name); +#else + argv[term_argv_len ] = g_strdup("-e"); argv[term_argv_len + 1] = g_strdup(script_name); +#endif argv[term_argv_len + 2] = NULL; + for (i = 0; argv[i] != NULL; i++) + { + msgwin_status_add("%s", argv[i]); + } + if (! g_spawn_async_with_pipes(working_dir, argv, NULL, 0, NULL, NULL, &child_pid, NULL, NULL, NULL, &error)) { @@ -545,37 +585,34 @@ static gboolean build_create_shellscript(const gint idx, const gchar *fname, const gchar *cmd) { FILE *fp; - gint i; - gchar *str, *exec, **tmp_args = NULL, *tmp; + gchar *str; +#ifdef G_OS_WIN32 + gchar *tmp; +#endif fp = fopen(fname, "w"); if (! fp) return FALSE; - // enclose all args in "" - tmp_args = g_strsplit(cmd, " ", -1); - for (i = 0; ; i++) - { - if (tmp_args[i] == NULL) break; - tmp = g_strdup(tmp_args[i]); - g_free(tmp_args[i]); - tmp_args[i] = g_strconcat("\"", tmp, "\"", NULL); - g_free(tmp); - } - exec = g_strjoinv(" ", tmp_args); - +#ifdef G_OS_WIN32 + tmp = g_path_get_basename(fname); + str = g_strdup_printf("%s\n\npause\ndel %s\n", cmd, tmp); + g_free(tmp); +#else str = g_strdup_printf( "#!/bin/sh\n\n%s\n\necho \"\n\n------------------\n(program exited with code: $?)\" \ - \n\necho \"Press return to continue\"\nread\nunlink $0\n", exec); + \n\necho \"Press return to continue\"\nread\nunlink $0\n", cmd); +#endif + fputs(str, fp); g_free(str); - g_free(exec); - g_strfreev(tmp_args); +#ifndef G_OS_WIN32 if (chmod(fname, 0700) != 0) { unlink(fname); return FALSE; } +#endif fclose(fp); return TRUE; Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-09-11 07:41:37 UTC (rev 810) +++ trunk/src/callbacks.c 2006-09-11 11:13:36 UTC (rev 811) @@ -1697,7 +1697,9 @@ document_save_file(idx, FALSE); if (build_run_cmd(idx) == (GPid) 0) { +#ifndef G_OS_WIN32 // on Windows there is no PID returned msgwin_status_add(_("Failed to execute the terminal program")); +#endif } } //gtk_widget_grab_focus(GTK_WIDGET(doc_list[idx].sci)); Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2006-09-11 07:41:37 UTC (rev 810) +++ trunk/src/main.c 2006-09-11 11:13:36 UTC (rev 811) @@ -610,10 +610,7 @@ #ifdef G_OS_WIN32 // hide "Build" menu item, at least until it is available for Windows - gtk_widget_hide(lookup_widget(app->window, "menu_build1")); gtk_widget_hide(app->compile_button); - gtk_widget_hide(app->run_button); - gtk_widget_hide(lookup_widget(app->window, "separatortoolitem6")); { GtkWidget *compiler_tab; compiler_tab = gtk_notebook_get_tab_label(GTK_NOTEBOOK(msgwindow.notebook), Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2006-09-11 07:41:37 UTC (rev 810) +++ trunk/src/prefs.c 2006-09-11 11:13:36 UTC (rev 811) @@ -237,18 +237,13 @@ gtk_widget_set_sensitive(lookup_widget(app->prefs_dialog, "label11"), FALSE); gtk_widget_set_sensitive(lookup_widget(app->prefs_dialog, "entry_com_make"), FALSE); gtk_widget_set_sensitive(lookup_widget(app->prefs_dialog, "button_make"), FALSE); - - // hide related Terminal path setting - gtk_widget_set_sensitive(lookup_widget(app->prefs_dialog, "label97"), FALSE); - gtk_widget_set_sensitive(lookup_widget(app->prefs_dialog, "entry_com_term"), FALSE); - gtk_widget_set_sensitive(lookup_widget(app->prefs_dialog, "button_term"), FALSE); #else if (app->tools_make_cmd) gtk_entry_set_text(GTK_ENTRY(lookup_widget(app->prefs_dialog, "entry_com_make")), app->tools_make_cmd); - - if (app->tools_term_cmd) - gtk_entry_set_text(GTK_ENTRY(lookup_widget(app->prefs_dialog, "entry_com_term")), app->tools_term_cmd); #endif + if (app->tools_term_cmd) + gtk_entry_set_text(GTK_ENTRY(lookup_widget(app->prefs_dialog, "entry_com_term")), app->tools_term_cmd); + if (app->tools_browser_cmd) gtk_entry_set_text(GTK_ENTRY(lookup_widget(app->prefs_dialog, "entry_browser")), app->tools_browser_cmd); @@ -443,11 +438,7 @@ app->pref_toolbar_show_undo = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); widget = lookup_widget(app->prefs_dialog, "check_toolbar_compile"); -#ifdef G_OS_WIN32 - app->pref_toolbar_show_compile = FALSE; -#else app->pref_toolbar_show_compile = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); -#endif widget = lookup_widget(app->prefs_dialog, "check_toolbar_colour"); app->pref_toolbar_show_colour = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); @@ -912,10 +903,6 @@ app->prefs_dialog = create_prefs_dialog(); gtk_window_set_transient_for(GTK_WINDOW(app->prefs_dialog), GTK_WINDOW(app->window)); -#ifdef G_OS_WIN32 - gtk_widget_hide(lookup_widget(app->prefs_dialog, "check_toolbar_compile")); -#endif - // init the default file encoding combo box combo = lookup_widget(app->prefs_dialog, "combo_encoding"); gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(combo), 3); Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2006-09-11 07:41:37 UTC (rev 810) +++ trunk/src/ui_utils.c 2006-09-11 11:13:36 UTC (rev 811) @@ -46,11 +46,10 @@ recent_file_activate_cb (GtkMenuItem *menuitem, gpointer user_data); -#ifndef G_OS_WIN32 static GtkWidget *create_build_menu_tex(gint idx); static GtkWidget *create_build_menu_gen(gint idx); -#endif + /* allow_override is TRUE if text can be ignored when another message has been set * that didn't use allow_override and has not timed out. */ void ui_set_statusbar(const gchar *text, gboolean allow_override) @@ -619,7 +618,6 @@ void ui_build_show_hide(gint idx) { -#ifndef G_OS_WIN32 gboolean is_header = FALSE; gchar *ext = NULL; filetype *ft; @@ -637,12 +635,18 @@ ft = doc_list[idx].file_type; +#ifdef G_OS_WIN32 + // disable compile and link under Windows until it is implemented + ft->menu_items->can_compile = FALSE; + ft->menu_items->can_link = FALSE; +#endif + if (doc_list[idx].file_name) { ext = strrchr(doc_list[idx].file_name, '.'); } - // TODO: separate function for matching headers, perhaps based on file extensions + /// TODO: separate function for matching headers, perhaps based on file extensions if (! ext || utils_strcmp(ext + 1, "h") || utils_strcmp(ext + 1, "hpp") || utils_strcmp(ext + 1, "hxx")) { @@ -748,12 +752,9 @@ } } } -#endif } -#ifndef G_OS_WIN32 - #define GEANY_ADD_WIDGET_ACCEL(gkey, menuitem) \ if (keys[(gkey)]->key != 0) \ gtk_widget_add_accelerator(menuitem, "activate", accel_group, \ @@ -768,6 +769,7 @@ menu = gtk_menu_new(); +#ifndef G_OS_WIN32 if (ft->menu_items->can_compile) { // compile the code @@ -828,13 +830,17 @@ gtk_tooltips_set_tip(tooltips, item, _("Compiles the current file using the " "make tool"), NULL); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_make_activate), GINT_TO_POINTER(2)); +#endif - if (ft->menu_items->can_exec) - { // execute the code + if (item != NULL) + { item = gtk_separator_menu_item_new(); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); + } + if (ft->menu_items->can_exec) + { // execute the code item = gtk_image_menu_item_new_from_stock("gtk-execute", accel_group); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); @@ -878,6 +884,7 @@ menu = gtk_menu_new(); +#ifndef G_OS_WIN32 // DVI item = gtk_image_menu_item_new_with_mnemonic(_("LaTeX -> DVI")); gtk_widget_show(item); @@ -904,28 +911,39 @@ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_tex_activate), GINT_TO_POINTER(1)); + if (item != NULL) + { + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + } + // build the code with make all - item = gtk_image_menu_item_new_with_mnemonic(_("Build with \"make\"")); + item = gtk_image_menu_item_new_with_mnemonic(_("_Make all")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); gtk_tooltips_set_tip(tooltips, item, _("Builds the current file with the " "make tool and the default target"), NULL); - if (keys[GEANY_KEYS_BUILD_MAKE]->key) - gtk_widget_add_accelerator(item, "activate", accel_group, keys[GEANY_KEYS_BUILD_MAKE]->key, - keys[GEANY_KEYS_BUILD_MAKE]->mods, GTK_ACCEL_VISIBLE); + GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_MAKE, item); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_make_activate), GINT_TO_POINTER(0)); // build the code with make - item = gtk_image_menu_item_new_with_mnemonic(_("Build with make (custom target)")); + item = gtk_image_menu_item_new_with_mnemonic(_("Make custom _target")); gtk_widget_show(item); - if (keys[GEANY_KEYS_BUILD_MAKEOWNTARGET]->key) - gtk_widget_add_accelerator(item, "activate", accel_group, keys[GEANY_KEYS_BUILD_MAKEOWNTARGET]->key, - keys[GEANY_KEYS_BUILD_MAKEOWNTARGET]->mods, GTK_ACCEL_VISIBLE); + GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_MAKEOWNTARGET, item); gtk_container_add(GTK_CONTAINER(menu), item); gtk_tooltips_set_tip(tooltips, item, _("Builds the current file with the " "make tool and the specified target"), NULL); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_make_activate), GINT_TO_POINTER(1)); + if (item != NULL) + { + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + } +#endif + // DVI view item = gtk_image_menu_item_new_with_mnemonic(_("View DVI file")); gtk_widget_show(item); @@ -976,7 +994,6 @@ return menu; } -#endif void ui_treeviews_show_hide(gboolean force) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [810] trunk
by eht16＠users.sourceforge.net 11 Sep '06

11 Sep '06

Revision: 810 http://svn.sourceforge.net/geany/?rev=810&view=rev Author: eht16 Date: 2006-09-11 00:41:37 -0700 (Mon, 11 Sep 2006) Log Message: ----------- Made socket code for detecting running instances working under Windows. Fixed compile warnings under Windows. Modified Paths: -------------- trunk/ChangeLog trunk/src/dialogs.c trunk/src/makefile.win32 trunk/src/socket.c trunk/src/ui_utils.c trunk/src/win32.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-09-11 07:39:37 UTC (rev 809) +++ trunk/ChangeLog 2006-09-11 07:41:37 UTC (rev 810) @@ -1,3 +1,12 @@ +2006-09-11 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/socket.c: Made socket code for detecting running instances + working under Windows. + * src/win32.c, src/ui_utils.c, src/dialogs.c: + Fixed compile warnings under Windows. + * src/highlighting.c: Fixed a typo. + + 2006-09-10 Enrico Tröger <enrico.troeger(a)uvena.de> * src/sci_cb.c, src/keybindings.c, src/callbacks.c: Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-09-11 07:39:37 UTC (rev 809) +++ trunk/src/dialogs.c 2006-09-11 07:41:37 UTC (rev 810) @@ -46,9 +46,10 @@ #include "keybindings.h" +#ifndef G_OS_WIN32 static GtkWidget *add_file_open_extra_widget(); +#endif - /* This shows the file selection dialog to open a file. */ void dialogs_show_open_file () { @@ -152,6 +153,7 @@ } +#ifndef G_OS_WIN32 static GtkWidget *add_file_open_extra_widget() { GtkWidget *vbox; @@ -215,6 +217,7 @@ return vbox; } +#endif /* This shows the file selection dialog to save a file. */ Modified: trunk/src/makefile.win32 =================================================================== --- trunk/src/makefile.win32 2006-09-11 07:39:37 UTC (rev 809) +++ trunk/src/makefile.win32 2006-09-11 07:41:37 UTC (rev 810) @@ -71,7 +71,7 @@ $(TARGET): $(OBJS) $(RES) ../scintilla/scintilla.a ../tagmanager/tagmanager.a $(CXX) $(OBJS) $(RES) -o $(TARGET) \ ../scintilla/scintilla.a ../tagmanager/tagmanager.a $(ALL_GTK_LIBS) \ - -mwindows -limm32 -lshell32 -lole32 -luuid -lcomdlg32 -lcomctl32 -liberty + -mwindows -limm32 -lshell32 -lole32 -luuid -lcomdlg32 -lcomctl32 -liberty -lwsock32 deps.mak: $(CC) -MM $(CCFLAGS) *.c >deps.mak Modified: trunk/src/socket.c =================================================================== --- trunk/src/socket.c 2006-09-11 07:39:37 UTC (rev 809) +++ trunk/src/socket.c 2006-09-11 07:41:37 UTC (rev 810) @@ -25,9 +25,14 @@ #ifdef HAVE_SOCKET -#include <sys/socket.h> -#include <sys/un.h> -#include <netinet/in.h> +#ifndef G_OS_WIN32 +# include <sys/socket.h> +# include <sys/un.h> +# include <netinet/in.h> +#else +# include <winsock2.h> +# include <ws2tcpip.h> +#endif #include <unistd.h> #include <fcntl.h> @@ -38,11 +43,24 @@ #ifdef G_OS_WIN32 +#define REMOTE_CMD_PORT 49876 +#define SockDesc SOCKET +#define SOCKET_IS_VALID(s) ((s) != INVALID_SOCKET) +#else +#define SockDesc gint +#define SOCKET_IS_VALID(s) ((s) >= 0) +#define INVALID_SOCKET (-1) +#endif + + +#ifdef G_OS_WIN32 static gint socket_fd_connect_inet (gushort port); static gint socket_fd_open_inet (gushort port); -#endif +static void socket_init_win32(); +#else static gint socket_fd_connect_unix (const gchar *path); static gint socket_fd_open_unix (const gchar *path); +#endif static gint socket_fd_write (gint sock, const gchar *buf, gint len); static gint socket_fd_write_all (gint sock, const gchar *buf, gint len); @@ -63,6 +81,7 @@ #ifdef G_OS_WIN32 HANDLE hmutex; + socket_init_win32(); hmutex = CreateMutexA(NULL, FALSE, "Geany"); if (! hmutex) { @@ -135,7 +154,9 @@ socket_info.read_ioc = NULL; } -#ifndef G_OS_WIN32 +#ifdef G_OS_WIN32 + WSACleanup(); +#else unlink(socket_info.file_name); g_free(socket_info.file_name); #endif @@ -144,19 +165,9 @@ } -#ifdef G_OS_WIN32 -#define SockDesc SOCKET -#define SOCKET_IS_VALID(s) ((s) != INVALID_SOCKET) -#else -#define SockDesc gint -#define SOCKET_IS_VALID(s) ((s) >= 0) -#define INVALID_SOCKET (-1) -#endif - - +#ifdef G_OS_UNIX static gint socket_fd_connect_unix(const gchar *path) { -#ifdef G_OS_UNIX gint sock; struct sockaddr_un addr; @@ -178,15 +189,11 @@ } return sock; -#else - return -1; -#endif } static gint socket_fd_open_unix(const gchar *path) { -#ifdef G_OS_UNIX gint sock; struct sockaddr_un addr; gint val; @@ -226,12 +233,9 @@ } return sock; -#else - return -1; +} #endif -} - static gint socket_fd_close(gint fd) { #ifdef G_OS_WIN32 @@ -247,16 +251,12 @@ { SockDesc sock; struct sockaddr_in addr; - gint val; + gchar val; sock = socket(AF_INET, SOCK_STREAM, 0); if (! SOCKET_IS_VALID(sock)) { -#ifdef G_OS_WIN32 geany_debug("fd_open_inet(): socket() failed: %ld\n", WSAGetLastError()); -#else - perror("fd_open_inet(): socket"); -#endif return -1; } @@ -299,11 +299,7 @@ sock = socket(AF_INET, SOCK_STREAM, 0); if (! SOCKET_IS_VALID(sock)) { -#ifdef G_OS_WIN32 geany_debug("fd_connect_inet(): socket() failed: %ld\n", WSAGetLastError()); -#else - perror("fd_connect_inet(): socket"); -#endif return -1; } @@ -320,6 +316,17 @@ return sock; } + + +static void socket_init_win32() +{ + WSADATA wsadata; + + if (WSAStartup(MAKEWORD(2, 2), &wsadata) != NO_ERROR) + geany_debug("WSAStartup() failed\n"); + + return; +} #endif @@ -408,7 +415,9 @@ { struct timeval timeout; fd_set fds; +#ifdef G_OS_UNIX gint flags; +#endif timeout.tv_sec = 60; timeout.tv_usec = 0; Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2006-09-11 07:39:37 UTC (rev 809) +++ trunk/src/ui_utils.c 2006-09-11 07:41:37 UTC (rev 810) @@ -46,10 +46,11 @@ recent_file_activate_cb (GtkMenuItem *menuitem, gpointer user_data); +#ifndef G_OS_WIN32 static GtkWidget *create_build_menu_tex(gint idx); static GtkWidget *create_build_menu_gen(gint idx); +#endif - /* allow_override is TRUE if text can be ignored when another message has been set * that didn't use allow_override and has not timed out. */ void ui_set_statusbar(const gchar *text, gboolean allow_override) @@ -751,6 +752,8 @@ } +#ifndef G_OS_WIN32 + #define GEANY_ADD_WIDGET_ACCEL(gkey, menuitem) \ if (keys[(gkey)]->key != 0) \ gtk_widget_add_accelerator(menuitem, "activate", accel_group, \ @@ -973,6 +976,7 @@ return menu; } +#endif void ui_treeviews_show_hide(gboolean force) Modified: trunk/src/win32.c =================================================================== --- trunk/src/win32.c 2006-09-11 07:39:37 UTC (rev 809) +++ trunk/src/win32.c 2006-09-11 07:41:37 UTC (rev 810) @@ -40,6 +40,7 @@ #include "document.h" #include "support.h" #include "utils.h" +#include "ui_utils.h" #include "sciwrappers.h" #include "dialogs.h" @@ -210,7 +211,7 @@ { gchar *editorfont = g_strdup_printf("%s %d", lf.lfFaceName, (cf.iPointSize / 10)); - utils_set_editor_font(editorfont); + ui_set_editor_font(editorfont); g_free(editorfont); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [809] trunk/src/highlighting.c
by eht16＠users.sourceforge.net 11 Sep '06

11 Sep '06

Revision: 809 http://svn.sourceforge.net/geany/?rev=809&view=rev Author: eht16 Date: 2006-09-11 00:39:37 -0700 (Mon, 11 Sep 2006) Log Message: ----------- Fixed a typo. Modified Paths: -------------- trunk/src/highlighting.c Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2006-09-10 11:47:26 UTC (rev 808) +++ trunk/src/highlighting.c 2006-09-11 07:39:37 UTC (rev 809) @@ -359,8 +359,8 @@ styleset_get_hex(config, config_home, "styling", "number", "0x007f00", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[4]); styleset_get_hex(config, config_home, "styling", "word", "0x111199", "0xffffff", "true", types[GEANY_FILETYPES_C]->styling[5]); styleset_get_hex(config, config_home, "styling", "word2", "0x7f0000", "0xffffff", "true", types[GEANY_FILETYPES_C]->styling[6]); - styleset_get_hex(config, config_home, "styling", "string", "0x90ff1e", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[7]); - styleset_get_hex(config, config_home, "styling", "character", "0x90ff1e", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[8]); + styleset_get_hex(config, config_home, "styling", "string", "0xff901e", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[7]); + styleset_get_hex(config, config_home, "styling", "character", "0xff901e", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[8]); styleset_get_hex(config, config_home, "styling", "uuid", "0x404080", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[9]); styleset_get_hex(config, config_home, "styling", "preprocessor", "0x007f7f", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[10]); styleset_get_hex(config, config_home, "styling", "operator", "0x301010", "0xffffff", "false", types[GEANY_FILETYPES_C]->styling[11]); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [808] trunk
by eht16＠users.sourceforge.net 10 Sep '06

10 Sep '06

Revision: 808 http://svn.sourceforge.net/geany/?rev=808&view=rev Author: eht16 Date: 2006-09-10 04:47:26 -0700 (Sun, 10 Sep 2006) Log Message: ----------- Added comment toggle functionality to easily comment and uncomment a line with one shortcut (default Ctrl+B) (closes #1552184). Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/keybindings.c trunk/src/keybindings.h trunk/src/sci_cb.c trunk/src/sci_cb.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-09-09 14:36:15 UTC (rev 807) +++ trunk/ChangeLog 2006-09-10 11:47:26 UTC (rev 808) @@ -1,3 +1,10 @@ +2006-09-10 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/sci_cb.c, src/keybindings.c, src/callbacks.c: + Added comment toggle functionality to easily comment and uncomment a + line with one shortcut (default Ctrl+B) (closes #1552184). + + 2006-09-09 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/document.c, src/ui_utils.c: Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-09-09 14:36:15 UTC (rev 807) +++ trunk/src/callbacks.c 2006-09-10 11:47:26 UTC (rev 808) @@ -2455,7 +2455,7 @@ { gint idx = document_get_cur_idx(); if (idx == -1 || ! doc_list[idx].is_valid) return; - sci_cb_do_comment(idx); + sci_cb_do_comment(idx, -1); } @@ -2465,7 +2465,7 @@ { gint idx = document_get_cur_idx(); if (idx == -1 || ! doc_list[idx].is_valid) return; - sci_cb_do_uncomment(idx); + sci_cb_do_uncomment(idx, -1); } Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2006-09-09 14:36:15 UTC (rev 807) +++ trunk/src/keybindings.c 2006-09-10 11:47:26 UTC (rev 808) @@ -87,6 +87,7 @@ static void cb_func_toggle_sidebar(void); static void cb_func_edit_duplicateline(void); static void cb_func_edit_commentline(void); +static void cb_func_edit_commentlinetoggle(void); static void cb_func_edit_uncommentline(void); static void cb_func_edit_increaseindent(void); static void cb_func_edit_decreaseindent(void); @@ -197,6 +198,8 @@ GDK_Page_Down, GDK_CONTROL_MASK, "switch_tabright", _("Switch to right document")); keys[GEANY_KEYS_EDIT_DUPLICATELINE] = fill(cb_func_edit_duplicateline, GDK_g, GDK_CONTROL_MASK, "edit_duplicateline", _("Duplicate line or selection")); + keys[GEANY_KEYS_EDIT_COMMENTLINETOGGLE] = fill(cb_func_edit_commentlinetoggle, + GDK_b, GDK_CONTROL_MASK, "edit_commentlinetoggle", _("Toggle line commentation")); keys[GEANY_KEYS_EDIT_COMMENTLINE] = fill(cb_func_edit_commentline, GDK_d, GDK_CONTROL_MASK, "edit_commentline", _("Comment line")); keys[GEANY_KEYS_EDIT_UNCOMMENTLINE] = fill(cb_func_edit_uncommentline, @@ -716,6 +719,13 @@ on_menu_duplicate_line1_activate(NULL, NULL); } +static void cb_func_edit_commentlinetoggle(void) +{ + gint idx = document_get_cur_idx(); + if (idx == -1 || ! doc_list[idx].is_valid) return; + sci_cb_do_comment_toggle(idx); +} + static void cb_func_edit_commentline(void) { on_menu_comment_line1_activate(NULL, NULL); Modified: trunk/src/keybindings.h =================================================================== --- trunk/src/keybindings.h 2006-09-09 14:36:15 UTC (rev 807) +++ trunk/src/keybindings.h 2006-09-10 11:47:26 UTC (rev 808) @@ -83,6 +83,7 @@ GEANY_KEYS_SWITCH_TABLEFT, GEANY_KEYS_SWITCH_TABRIGHT, GEANY_KEYS_EDIT_DUPLICATELINE, + GEANY_KEYS_EDIT_COMMENTLINETOGGLE, GEANY_KEYS_EDIT_COMMENTLINE, GEANY_KEYS_EDIT_UNCOMMENTLINE, GEANY_KEYS_EDIT_INCREASEINDENT, Modified: trunk/src/sci_cb.c =================================================================== --- trunk/src/sci_cb.c 2006-09-09 14:36:15 UTC (rev 807) +++ trunk/src/sci_cb.c 2006-09-10 11:47:26 UTC (rev 808) @@ -1013,7 +1013,6 @@ } - void sci_cb_auto_table(ScintillaObject *sci, gint pos) { gchar *table; @@ -1046,31 +1045,98 @@ } -void sci_cb_do_uncomment(gint idx) +static void real_comment_multiline(gint idx, gint line_start, gint last_line) { + gchar *eol, *str_begin, *str_end; + gint line_len; + + if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_type == NULL) return; + + eol = utils_get_eol_char(idx); + str_begin = g_strdup_printf("%s%s", doc_list[idx].file_type->comment_open, eol); + str_end = g_strdup_printf("%s%s", doc_list[idx].file_type->comment_close, eol); + + // insert the comment strings + sci_insert_text(doc_list[idx].sci, line_start, str_begin); + line_len = sci_get_position_from_line(doc_list[idx].sci, last_line + 2); + sci_insert_text(doc_list[idx].sci, line_len, str_end); + + g_free(str_begin); + g_free(str_end); +} + + +static void real_uncomment_multiline(gint idx) +{ + // find the beginning of the multi line comment + gint pos, line, len, x; + gchar *linebuf; + + if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_type == NULL) return; + + // remove comment open chars + pos = document_find_text(idx, doc_list[idx].file_type->comment_open, 0, TRUE); + SSM(doc_list[idx].sci, SCI_DELETEBACK, 0, 0); + + // check whether the line is empty and can be deleted + line = sci_get_line_from_position(doc_list[idx].sci, pos); + len = sci_get_line_length(doc_list[idx].sci, line); + linebuf = g_malloc(len + 1); + sci_get_line(doc_list[idx].sci, line, linebuf); + linebuf[len] = '\0'; + x = 0; + while (linebuf[x] != '\0' && isspace(linebuf[x])) x++; + if (x == len) SSM(doc_list[idx].sci, SCI_LINEDELETE, 0, 0); + g_free(linebuf); + + // remove comment close chars + pos = document_find_text(idx, doc_list[idx].file_type->comment_close, 0, FALSE); + SSM(doc_list[idx].sci, SCI_DELETEBACK, 0, 0); + + // check whether the line is empty and can be deleted + line = sci_get_line_from_position(doc_list[idx].sci, pos); + len = sci_get_line_length(doc_list[idx].sci, line); + linebuf = g_malloc(len + 1); + sci_get_line(doc_list[idx].sci, line, linebuf); + linebuf[len] = '\0'; + x = 0; + while (linebuf[x] != '\0' && isspace(linebuf[x])) x++; + if (x == len) SSM(doc_list[idx].sci, SCI_LINEDELETE, 0, 0); + g_free(linebuf); +} + + +void sci_cb_do_uncomment(gint idx, gint line) +{ gint first_line, last_line; gint x, i, line_start, line_len; gint sel_start, sel_end; gsize co_len; - gchar sel[64], *co, *cc; + gchar sel[256], *co, *cc; gboolean break_loop = FALSE, single_line = FALSE; filetype *ft; if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_type == NULL) return; - sel_start = sci_get_selection_start(doc_list[idx].sci); - sel_end = sci_get_selection_end(doc_list[idx].sci); + if (line < 0) + { // use selection or current line + sel_start = sci_get_selection_start(doc_list[idx].sci); + sel_end = sci_get_selection_end(doc_list[idx].sci); + first_line = sci_get_line_from_position(doc_list[idx].sci, sel_start); + // Find the last line with chars selected (not EOL char) + last_line = sci_get_line_from_position(doc_list[idx].sci, sel_end - 1); + last_line = MAX(first_line, last_line); + } + else + { + first_line = last_line = line; + sel_start = sel_end = sci_get_position_from_line(doc_list[idx].sci, line); + } + ft = doc_list[idx].file_type; - first_line = sci_get_line_from_position(doc_list[idx].sci, - sci_get_selection_start(doc_list[idx].sci)); - // Find the last line with chars selected (not EOL char) - last_line = sci_get_line_from_position(doc_list[idx].sci, - sci_get_selection_end(doc_list[idx].sci) - 1); - last_line = MAX(first_line, last_line); - - // hack for detection of HTML vs PHP code, if non-PHP set filetype to XML + // detection of HTML vs PHP code, if non-PHP set filetype to XML line_start = sci_get_position_from_line(doc_list[idx].sci, first_line); if (ft->id == GEANY_FILETYPES_PHP) { @@ -1094,9 +1160,9 @@ line_len = sci_get_line_length(doc_list[idx].sci, i); x = 0; - //geany_debug("line: %d line_start: %d len: %d (%d)", i, line_start, MIN(63, (line_len - 1)), line_len); - sci_get_text_range(doc_list[idx].sci, line_start, MIN((line_start + 63), (line_start + line_len - 1)), sel); - sel[MIN(63, (line_len - 1))] = '\0'; + //geany_debug("line: %d line_start: %d len: %d (%d)", i, line_start, MIN(255, (line_len - 1)), line_len); + sci_get_text_range(doc_list[idx].sci, line_start, MIN((line_start + 255), (line_start + line_len - 1)), sel); + sel[MIN(255, (line_len - 1))] = '\0'; while (isspace(sel[x])) x++; @@ -1106,7 +1172,7 @@ // use single line comment if (cc == NULL || strlen(cc) == 0) { - guint i; + guint j; single_line = TRUE; @@ -1120,7 +1186,7 @@ } SSM(doc_list[idx].sci, SCI_GOTOPOS, line_start + x + co_len, 0); - for (i = 0; i < co_len; i++) SSM(doc_list[idx].sci, SCI_DELETEBACK, 0, 0); + for (j = 0; j < co_len; j++) SSM(doc_list[idx].sci, SCI_DELETEBACK, 0, 0); } // use multi line comment else @@ -1149,39 +1215,7 @@ } if (sci_get_style_at(doc_list[idx].sci, line_start + x) == style_comment) { - // find the beginning of the multi line comment - gint pos, line, len, x; - gchar *linebuf; - - // remove comment open chars - pos = document_find_text(idx, co, 0, TRUE); - SSM(doc_list[idx].sci, SCI_DELETEBACK, 0, 0); - - // check whether the line is empty and can be deleted - line = sci_get_line_from_position(doc_list[idx].sci, pos); - len = sci_get_line_length(doc_list[idx].sci, line); - linebuf = g_malloc(len + 1); - sci_get_line(doc_list[idx].sci, line, linebuf); - linebuf[len] = '\0'; - x = 0; - while (linebuf[x] != '\0' && isspace(linebuf[x])) x++; - if (x == len) SSM(doc_list[idx].sci, SCI_LINEDELETE, 0, 0); - g_free(linebuf); - - // remove comment close chars - pos = document_find_text(idx, cc, 0, FALSE); - SSM(doc_list[idx].sci, SCI_DELETEBACK, 0, 0); - - // check whether the line is empty and can be deleted - line = sci_get_line_from_position(doc_list[idx].sci, pos); - len = sci_get_line_length(doc_list[idx].sci, line); - linebuf = g_malloc(len + 1); - sci_get_line(doc_list[idx].sci, line, linebuf); - linebuf[len] = '\0'; - x = 0; - while (linebuf[x] != '\0' && isspace(linebuf[x])) x++; - if (x == len) SSM(doc_list[idx].sci, SCI_LINEDELETE, 0, 0); - g_free(linebuf); + real_uncomment_multiline(idx); } // break because we are already on the last line @@ -1192,28 +1226,33 @@ } SSM(doc_list[idx].sci, SCI_ENDUNDOACTION, 0, 0); - // restore selection - if (single_line) + // restore selection if there is one + if (sel_start < sel_end) { - sci_set_selection_start(doc_list[idx].sci, sel_start - co_len); - sci_set_selection_end(doc_list[idx].sci, sel_end - ((i - first_line) * co_len)); + if (single_line) + { + sci_set_selection_start(doc_list[idx].sci, sel_start - co_len); + sci_set_selection_end(doc_list[idx].sci, sel_end - ((i - first_line) * co_len)); + } + else + { + gint eol_len = (sci_get_eol_mode(doc_list[idx].sci) == SC_EOL_CRLF) ? 2 : 1; + sci_set_selection_start(doc_list[idx].sci, sel_start - co_len - eol_len); + sci_set_selection_end(doc_list[idx].sci, sel_end - co_len - eol_len); + } } - else - { - gint eol_len = (sci_get_eol_mode(doc_list[idx].sci) == SC_EOL_CRLF) ? 2 : 1; - sci_set_selection_start(doc_list[idx].sci, sel_start - co_len - eol_len); - sci_set_selection_end(doc_list[idx].sci, sel_end - co_len - eol_len); - } } -void sci_cb_do_comment(gint idx) +void sci_cb_do_comment_toggle(gint idx) { gint first_line, last_line; gint x, i, line_start, line_len; gint sel_start, sel_end, co_len; - gchar sel[64], *co, *cc; + gint count_commented = 0, count_uncommented = 0; + gchar sel[256], *co, *cc; gboolean break_loop = FALSE, single_line = FALSE; + gboolean first_line_was_comment = FALSE; filetype *ft; if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_type == NULL) return; @@ -1230,7 +1269,7 @@ sci_get_selection_end(doc_list[idx].sci) - 1); last_line = MAX(first_line, last_line); - // hack for detection of HTML vs PHP code, if non-PHP set filetype to XML + // detection of HTML vs PHP code, if non-PHP set filetype to XML line_start = sci_get_position_from_line(doc_list[idx].sci, first_line); if (ft->id == GEANY_FILETYPES_PHP) { @@ -1246,17 +1285,15 @@ co_len = strlen(co); if (co_len == 0) return; - SSM(doc_list[idx].sci, SCI_BEGINUNDOACTION, 0, 0); - for (i = first_line; (i <= last_line) && (! break_loop); i++) { line_start = sci_get_position_from_line(doc_list[idx].sci, i); line_len = sci_get_line_length(doc_list[idx].sci, i); x = 0; - //geany_debug("line: %d line_start: %d len: %d (%d)", i, line_start, MIN(63, (line_len - 1)), line_len); - sci_get_text_range(doc_list[idx].sci, line_start, MIN((line_start + 63), (line_start + line_len - 1)), sel); - sel[MIN(63, (line_len - 1))] = '\0'; + //geany_debug("line: %d line_start: %d len: %d (%d)", i, line_start, MIN(255, (line_len - 1)), line_len); + sci_get_text_range(doc_list[idx].sci, line_start, MIN((line_start + 255), (line_start + line_len - 1)), sel); + sel[MIN(255, (line_len - 1))] = '\0'; while (isspace(sel[x])) x++; @@ -1266,20 +1303,196 @@ // use single line comment if (cc == NULL || strlen(cc) == 0) { - /* disabled because of #1521714, it makes sense to double(or triple, ...) comment - * if someone think it is not that good we could introduce a config option for it gboolean do_continue = FALSE; + single_line = TRUE; + switch (co_len) { - case 1: if (sel[x] == co[0]) do_continue = TRUE; break; - case 2: if (sel[x] == co[0] && sel[x+1] == co[1]) do_continue = TRUE; break; - case 3: if (sel[x] == co[0] && sel[x+1] == co[1] && sel[x+2] == co[2]) - do_continue = TRUE; break; + case 1: + if (sel[x] == co[0]) + { + do_continue = TRUE; + sci_cb_do_uncomment(idx, i); + count_uncommented++; + } + break; + case 2: + if (sel[x] == co[0] && sel[x+1] == co[1]) + { + do_continue = TRUE; + sci_cb_do_uncomment(idx, i); + count_uncommented++; + } + break; + case 3: + if (sel[x] == co[0] && sel[x+1] == co[1] && sel[x+2] == co[2]) + { + do_continue = TRUE; + sci_cb_do_uncomment(idx, i); + count_uncommented++; + } + break; default: return; } + if (do_continue && i == first_line) first_line_was_comment = TRUE; if (do_continue) continue; - */ + + // we are still here, so the above lines were not already comments, so comment it + sci_cb_do_comment(idx, i); + count_commented++; + } + // use multi line comment + else + { + gint style_comment; + gint lexer = SSM(doc_list[idx].sci, SCI_GETLEXER, 0, 0); + + // skip lines which are already comments + switch (lexer) + { // I will list only those lexers which support multi line comments + case SCLEX_XML: + case SCLEX_HTML: + { + if (sci_get_style_at(doc_list[idx].sci, line_start) >= 118 && + sci_get_style_at(doc_list[idx].sci, line_start) <= 127) + style_comment = SCE_HPHP_COMMENT; + else style_comment = SCE_H_COMMENT; + break; + } + case SCLEX_CSS: style_comment = SCE_CSS_COMMENT; break; + case SCLEX_SQL: style_comment = SCE_SQL_COMMENT; break; + case SCLEX_CAML: style_comment = SCE_CAML_COMMENT; break; + case SCLEX_CPP: + case SCLEX_PASCAL: + default: style_comment = SCE_C_COMMENT; + } + if (sci_get_style_at(doc_list[idx].sci, line_start + x) == style_comment) + { + real_uncomment_multiline(idx); + count_uncommented++; + } + else + { + real_comment_multiline(idx, line_start, last_line); + count_commented++; + } + + // break because we are already on the last line + break_loop = TRUE; + break; + } + } + } + + // restore selection if there is one + if (sel_start < sel_end) + { + if (single_line) + { + gint a = (first_line_was_comment) ? - co_len : co_len; + gint line_start; + + // don't modify sel_start when the selection starts within indentation + line_start = sci_get_position_from_line(doc_list[idx].sci, + sci_get_line_from_position(doc_list[idx].sci, sel_start)); + sci_cb_get_indent(doc_list[idx].sci, sel_start, TRUE); + if ((sel_start - line_start) <= strlen(indent)) + a = 0; + + sci_set_selection_start(doc_list[idx].sci, sel_start + a); + sci_set_selection_end(doc_list[idx].sci, sel_end + + (count_commented * co_len) - (count_uncommented * co_len)); + } + else + { + gint eol_len = (sci_get_eol_mode(doc_list[idx].sci) == SC_EOL_CRLF) ? 2 : 1; + if (count_uncommented > 0) + { + sci_set_selection_start(doc_list[idx].sci, sel_start - co_len - eol_len); + sci_set_selection_end(doc_list[idx].sci, sel_end - co_len - eol_len); + } + else + { + sci_set_selection_start(doc_list[idx].sci, sel_start + co_len + eol_len); + sci_set_selection_end(doc_list[idx].sci, sel_end + co_len + eol_len); + } + } + } + else if (count_uncommented > 0) + { + gint eol_len = (sci_get_eol_mode(doc_list[idx].sci) == SC_EOL_CRLF) ? 2 : 1; + sci_set_current_position(doc_list[idx].sci, sel_start - co_len - eol_len); + } +} + + +void sci_cb_do_comment(gint idx, gint line) +{ + gint first_line, last_line; + gint x, i, line_start, line_len; + gint sel_start, sel_end, co_len; + gchar sel[256], *co, *cc; + gboolean break_loop = FALSE, single_line = FALSE; + filetype *ft; + + if (idx == -1 || ! doc_list[idx].is_valid || doc_list[idx].file_type == NULL) return; + + if (line < 0) + { // use selection or current line + sel_start = sci_get_selection_start(doc_list[idx].sci); + sel_end = sci_get_selection_end(doc_list[idx].sci); + + first_line = sci_get_line_from_position(doc_list[idx].sci, sel_start); + // Find the last line with chars selected (not EOL char) + last_line = sci_get_line_from_position(doc_list[idx].sci, sel_end - 1); + last_line = MAX(first_line, last_line); + } + else + { + first_line = last_line = line; + sel_start = sel_end = sci_get_position_from_line(doc_list[idx].sci, line); + } + + ft = doc_list[idx].file_type; + + // detection of HTML vs PHP code, if non-PHP set filetype to XML + line_start = sci_get_position_from_line(doc_list[idx].sci, first_line); + if (ft->id == GEANY_FILETYPES_PHP) + { + if (sci_get_style_at(doc_list[idx].sci, line_start) < 118 || + sci_get_style_at(doc_list[idx].sci, line_start) > 127) + ft = filetypes[GEANY_FILETYPES_XML]; + } + + co = ft->comment_open; + cc = ft->comment_close; + if (co == NULL) return; + + co_len = strlen(co); + if (co_len == 0) return; + + SSM(doc_list[idx].sci, SCI_BEGINUNDOACTION, 0, 0); + + for (i = first_line; (i <= last_line) && (! break_loop); i++) + { + line_start = sci_get_position_from_line(doc_list[idx].sci, i); + line_len = sci_get_line_length(doc_list[idx].sci, i); + x = 0; + + //geany_debug("line: %d line_start: %d len: %d (%d)", i, line_start, MIN(256, (line_len - 1)), line_len); + sci_get_text_range(doc_list[idx].sci, line_start, MIN((line_start + 256), (line_start + line_len - 1)), sel); + sel[MIN(256, (line_len - 1))] = '\0'; + + while (isspace(sel[x])) x++; + + // to skip blank lines + if (x < line_len && sel[x] != '\0') + { + // use single line comment + if (cc == NULL || strlen(cc) == 0) + { single_line = TRUE; + if (ft->comment_use_indent) sci_insert_text(doc_list[idx].sci, line_start + x, co); else @@ -1288,9 +1501,6 @@ // use multi line comment else { - gchar *eol = utils_get_eol_char(idx); - gchar *str_begin = g_strdup_printf("%s%s", co, eol); - gchar *str_end = g_strdup_printf("%s%s", cc, eol); gint style_comment; gint lexer = SSM(doc_list[idx].sci, SCI_GETLEXER, 0, 0); @@ -1315,14 +1525,8 @@ } if (sci_get_style_at(doc_list[idx].sci, line_start + x) == style_comment) continue; - // insert the comment strings - sci_insert_text(doc_list[idx].sci, line_start, str_begin); - line_len = sci_get_position_from_line(doc_list[idx].sci, last_line + 2); - sci_insert_text(doc_list[idx].sci, line_len, str_end); + real_comment_multiline(idx, line_start, last_line); - g_free(str_begin); - g_free(str_end); - // break because we are already on the last line break_loop = TRUE; break; @@ -1331,19 +1535,21 @@ } SSM(doc_list[idx].sci, SCI_ENDUNDOACTION, 0, 0); - // restore selection - if (single_line) + // restore selection if there is one + if (sel_start < sel_end) { - sci_set_selection_start(doc_list[idx].sci, sel_start + co_len); - sci_set_selection_end(doc_list[idx].sci, sel_end + ((i - first_line) * co_len)); + if (single_line) + { + sci_set_selection_start(doc_list[idx].sci, sel_start + co_len); + sci_set_selection_end(doc_list[idx].sci, sel_end + ((i - first_line) * co_len)); + } + else + { + gint eol_len = (sci_get_eol_mode(doc_list[idx].sci) == SC_EOL_CRLF) ? 2 : 1; + sci_set_selection_start(doc_list[idx].sci, sel_start + co_len + eol_len); + sci_set_selection_end(doc_list[idx].sci, sel_end + co_len + eol_len); + } } - else - { - gint eol_len = (sci_get_eol_mode(doc_list[idx].sci) == SC_EOL_CRLF) ? 2 : 1; - sci_set_selection_start(doc_list[idx].sci, sel_start + co_len + eol_len); - sci_set_selection_end(doc_list[idx].sci, sel_end + co_len + eol_len); - } - } Modified: trunk/src/sci_cb.h =================================================================== --- trunk/src/sci_cb.h 2006-09-09 14:36:15 UTC (rev 807) +++ trunk/src/sci_cb.h 2006-09-10 11:47:26 UTC (rev 808) @@ -69,10 +69,12 @@ gboolean sci_cb_show_calltip(gint idx, gint pos); -void sci_cb_do_comment(gint idx); +void sci_cb_do_comment_toggle(gint idx); -void sci_cb_do_uncomment(gint idx); +void sci_cb_do_comment(gint idx, gint line); +void sci_cb_do_uncomment(gint idx, gint line); + void sci_cb_highlight_braces(ScintillaObject *sci, gint cur_pos); void sci_cb_auto_multiline(ScintillaObject *sci, gint pos); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [807] trunk
by ntrel＠users.sourceforge.net 09 Sep '06

09 Sep '06

Revision: 807 http://svn.sourceforge.net/geany/?rev=807&view=rev Author: ntrel Date: 2006-09-09 07:36:15 -0700 (Sat, 09 Sep 2006) Log Message: ----------- Move on_recent_file_activate, dialogs_create_recent_menu, dialogs_create_build_menu_gen, dialogs_create_build_menu_tex to ui_utils.c. Also make some functions static. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/dialogs.c trunk/src/dialogs.h trunk/src/main.c trunk/src/ui_utils.c trunk/src/ui_utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-09-09 14:26:54 UTC (rev 806) +++ trunk/ChangeLog 2006-09-09 14:36:15 UTC (rev 807) @@ -3,6 +3,12 @@ * src/document.c, src/ui_utils.c: Reorder the recent files list if necessary when a file is (re)opened - closes #1552178. + * src/msgwindow.c: Check msgwin visible before scrolling. + * src/ui_utils.h, src/ui_utils.c, src/callbacks.c, + src/callbacks.h, src/dialogs.c, src/dialogs.h, src/main.c: + Move on_recent_file_activate, dialogs_create_recent_menu, + dialogs_create_build_menu_gen, dialogs_create_build_menu_tex to + ui_utils.c. Also make some functions static. 2006-09-08 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-09-09 14:26:54 UTC (rev 806) +++ trunk/src/callbacks.c 2006-09-09 14:36:15 UTC (rev 807) @@ -2310,19 +2310,6 @@ void -on_recent_file_activate (GtkMenuItem *menuitem, - gpointer user_data) -{ - gchar *locale_filename = utils_get_locale_from_utf8((gchar*) user_data); - - document_open_file(-1, locale_filename, 0, FALSE, NULL, NULL); - ui_recent_file_loaded((gchar*) user_data); - - g_free(locale_filename); -} - - -void on_file_open_check_hidden_toggled (GtkToggleButton *togglebutton, gpointer user_data) { Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2006-09-09 14:26:54 UTC (rev 806) +++ trunk/src/callbacks.h 2006-09-09 14:36:15 UTC (rev 807) @@ -467,10 +467,6 @@ gpointer user_data); void -on_recent_file_activate (GtkMenuItem *menuitem, - gpointer user_data); - -void on_file_open_selection_changed (GtkFileChooser *filechooser, gpointer user_data); Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-09-09 14:26:54 UTC (rev 806) +++ trunk/src/dialogs.c 2006-09-09 14:36:15 UTC (rev 807) @@ -46,6 +46,9 @@ #include "keybindings.h" +static GtkWidget *add_file_open_extra_widget(); + + /* This shows the file selection dialog to open a file. */ void dialogs_show_open_file () { @@ -90,7 +93,7 @@ // add checkboxes and filename entry gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(app->open_filesel), - dialogs_add_file_open_extra_widget()); + add_file_open_extra_widget()); combo = lookup_widget(app->open_filesel, "filetype_combo"); // add FileFilters(start with "All Files") @@ -149,6 +152,71 @@ } +static GtkWidget *add_file_open_extra_widget() +{ + GtkWidget *vbox; + GtkWidget *lbox; + GtkWidget *ebox; + GtkWidget *hbox; + GtkWidget *file_entry; + GtkSizeGroup *size_group; + GtkWidget *align; + GtkWidget *check_hidden; + GtkWidget *filetype_label; + GtkWidget *filetype_combo; + GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(app->window, "tooltips")); + + vbox = gtk_vbox_new(FALSE, 6); + + align = gtk_alignment_new(1.0, 0.0, 0.0, 0.0); + check_hidden = gtk_check_button_new_with_mnemonic(_("Show _hidden files")); + gtk_widget_show(check_hidden); + gtk_container_add(GTK_CONTAINER(align), check_hidden); + gtk_box_pack_start(GTK_BOX(vbox), align, FALSE, FALSE, 0); + gtk_button_set_focus_on_click(GTK_BUTTON(check_hidden), FALSE); + + lbox = gtk_hbox_new(FALSE, 12); + file_entry = gtk_entry_new(); + gtk_widget_show(file_entry); + gtk_box_pack_start(GTK_BOX(lbox), file_entry, TRUE, TRUE, 0); + //gtk_editable_set_editable(GTK_EDITABLE(file_entry), FALSE); + gtk_entry_set_activates_default(GTK_ENTRY(file_entry), TRUE); + + // the ebox is for the tooltip, because gtk_combo_box doesn't show a tooltip for unknown reason + ebox = gtk_event_box_new(); + hbox = gtk_hbox_new(FALSE, 6); + filetype_label = gtk_label_new(_("Set filetype:")); + filetype_combo = gtk_combo_box_new_text(); + gtk_tooltips_set_tip(tooltips, ebox, + _("Explicitly defines a filetype for the file, if it would not be detected by filename extension.\nNote if you choose multiple files, they will all be opened with the chosen filetype."), NULL); + gtk_box_pack_start(GTK_BOX(hbox), filetype_label, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), filetype_combo, FALSE, FALSE, 0); + gtk_container_add(GTK_CONTAINER(ebox), hbox); + gtk_box_pack_start(GTK_BOX(lbox), ebox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox), lbox, FALSE, FALSE, 0); + gtk_widget_show_all(vbox); + + size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + gtk_size_group_add_widget(GTK_SIZE_GROUP(size_group), check_hidden); + gtk_size_group_add_widget(GTK_SIZE_GROUP(size_group), filetype_combo); + g_object_unref(G_OBJECT(size_group)); // auto destroy the size group + + g_signal_connect((gpointer) file_entry, "activate", + G_CALLBACK(on_file_open_entry_activate), NULL); + g_signal_connect((gpointer) check_hidden, "toggled", + G_CALLBACK(on_file_open_check_hidden_toggled), NULL); + + g_object_set_data_full(G_OBJECT(app->open_filesel), "file_entry", + gtk_widget_ref(file_entry), (GDestroyNotify)gtk_widget_unref); + g_object_set_data_full(G_OBJECT(app->open_filesel), "check_hidden", + gtk_widget_ref(check_hidden), (GDestroyNotify)gtk_widget_unref); + g_object_set_data_full(G_OBJECT(app->open_filesel), "filetype_combo", + gtk_widget_ref(filetype_combo), (GDestroyNotify)gtk_widget_unref); + + return vbox; +} + + /* This shows the file selection dialog to save a file. */ void dialogs_show_save_as() { @@ -332,7 +400,7 @@ /* This shows the font selection dialog to choose a font. */ -void dialogs_show_open_font(void) +void dialogs_show_open_font() { #ifdef G_OS_WIN32 win32_show_font_dialog(); @@ -367,7 +435,7 @@ } -void dialogs_show_word_count(void) +void dialogs_show_word_count() { GtkWidget *dialog, *label; gint idx; @@ -454,256 +522,6 @@ } -#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) - -GtkWidget *dialogs_create_build_menu_gen(gint idx) -{ - GtkWidget *menu, *item = NULL, *image, *separator; - GtkAccelGroup *accel_group = gtk_accel_group_new(); - GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(app->window, "tooltips")); - filetype *ft = doc_list[idx].file_type; - - menu = gtk_menu_new(); - - if (ft->menu_items->can_compile) - { - // compile the code - item = gtk_image_menu_item_new_with_mnemonic(_("_Compile")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - gtk_tooltips_set_tip(tooltips, item, _("Compiles the current file"), NULL); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_COMPILE, item); - image = gtk_image_new_from_stock("gtk-convert", GTK_ICON_SIZE_MENU); - gtk_widget_show(image); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); - g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_compile_activate), NULL); - ft->menu_items->item_compile = item; - } - - if (ft->menu_items->can_link) - { // build the code - item = gtk_image_menu_item_new_with_mnemonic(_("_Build")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - gtk_tooltips_set_tip(tooltips, item, - _("Builds the current file (generate an executable file)"), NULL); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_LINK, item); - g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_build_activate), NULL); - ft->menu_items->item_link = item; - } - - if (item != NULL) - { - item = gtk_separator_menu_item_new(); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - } - - // build the code with make all - item = gtk_image_menu_item_new_with_mnemonic(_("_Make all")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - gtk_tooltips_set_tip(tooltips, item, _("Builds the current file with the " - "make tool and the default target"), NULL); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_MAKE, item); - g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_make_activate), GINT_TO_POINTER(0)); - - // build the code with make - item = gtk_image_menu_item_new_with_mnemonic(_("Make custom _target")); - gtk_widget_show(item); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_MAKEOWNTARGET, item); - gtk_container_add(GTK_CONTAINER(menu), item); - gtk_tooltips_set_tip(tooltips, item, _("Builds the current file with the " - "make tool and the specified target"), NULL); - g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_make_activate), GINT_TO_POINTER(1)); - - // build the code with make object - item = gtk_image_menu_item_new_with_mnemonic(_("Make _object")); - gtk_widget_show(item); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_MAKEOBJECT, item); - gtk_container_add(GTK_CONTAINER(menu), item); - gtk_tooltips_set_tip(tooltips, item, _("Compiles the current file using the " - "make tool"), NULL); - g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_make_activate), GINT_TO_POINTER(2)); - - if (ft->menu_items->can_exec) - { // execute the code - item = gtk_separator_menu_item_new(); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - - item = gtk_image_menu_item_new_from_stock("gtk-execute", accel_group); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - gtk_tooltips_set_tip(tooltips, item, _("Run or view the current file"), NULL); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_RUN, item); - g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_execute_activate), NULL); - ft->menu_items->item_exec = item; - } - - // arguments - if (ft->menu_items->can_compile || ft->menu_items->can_link || ft->menu_items->can_exec) - { - // separator - separator = gtk_separator_menu_item_new(); - gtk_widget_show(separator); - gtk_container_add(GTK_CONTAINER(menu), separator); - gtk_widget_set_sensitive(separator, FALSE); - - item = gtk_image_menu_item_new_with_mnemonic(_("_Set Includes and Arguments")); - gtk_widget_show(item); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_OPTIONS, item); - gtk_container_add(GTK_CONTAINER(menu), item); - gtk_tooltips_set_tip(tooltips, item, - _("Sets the includes and library paths for the compiler and " - "the program arguments for execution"), NULL); - image = gtk_image_new_from_stock("gtk-preferences", GTK_ICON_SIZE_MENU); - gtk_widget_show(image); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); - g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_arguments_activate), NULL); - } - - return menu; -} - - -GtkWidget *dialogs_create_build_menu_tex(gint idx) -{ - GtkWidget *menu, *item, *image, *separator; - GtkAccelGroup *accel_group = gtk_accel_group_new(); - GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(app->window, "tooltips")); - - menu = gtk_menu_new(); - - // DVI - item = gtk_image_menu_item_new_with_mnemonic(_("LaTeX -> DVI")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - gtk_tooltips_set_tip(tooltips, item, _("Compiles the current file into a DVI file"), NULL); - if (keys[GEANY_KEYS_BUILD_COMPILE]->key) - gtk_widget_add_accelerator(item, "activate", accel_group, keys[GEANY_KEYS_BUILD_COMPILE]->key, - keys[GEANY_KEYS_BUILD_COMPILE]->mods, GTK_ACCEL_VISIBLE); - image = gtk_image_new_from_stock("gtk-convert", GTK_ICON_SIZE_MENU); - gtk_widget_show(image); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); - g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_tex_activate), GINT_TO_POINTER(0)); - - // PDF - item = gtk_image_menu_item_new_with_mnemonic(_("LaTeX -> PDF")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - gtk_tooltips_set_tip(tooltips, item, _("Compiles the current file into a PDF file"), NULL); - if (keys[GEANY_KEYS_BUILD_LINK]->key) - gtk_widget_add_accelerator(item, "activate", accel_group, keys[GEANY_KEYS_BUILD_LINK]->key, - keys[GEANY_KEYS_BUILD_LINK]->mods, GTK_ACCEL_VISIBLE); - image = gtk_image_new_from_stock("gtk-convert", GTK_ICON_SIZE_MENU); - gtk_widget_show(image); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); - g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_tex_activate), GINT_TO_POINTER(1)); - - // build the code with make all - item = gtk_image_menu_item_new_with_mnemonic(_("Build with \"make\"")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - gtk_tooltips_set_tip(tooltips, item, _("Builds the current file with the " - "make tool and the default target"), NULL); - if (keys[GEANY_KEYS_BUILD_MAKE]->key) - gtk_widget_add_accelerator(item, "activate", accel_group, keys[GEANY_KEYS_BUILD_MAKE]->key, - keys[GEANY_KEYS_BUILD_MAKE]->mods, GTK_ACCEL_VISIBLE); - g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_make_activate), GINT_TO_POINTER(0)); - - // build the code with make - item = gtk_image_menu_item_new_with_mnemonic(_("Build with make (custom target)")); - gtk_widget_show(item); - if (keys[GEANY_KEYS_BUILD_MAKEOWNTARGET]->key) - gtk_widget_add_accelerator(item, "activate", accel_group, keys[GEANY_KEYS_BUILD_MAKEOWNTARGET]->key, - keys[GEANY_KEYS_BUILD_MAKEOWNTARGET]->mods, GTK_ACCEL_VISIBLE); - gtk_container_add(GTK_CONTAINER(menu), item); - gtk_tooltips_set_tip(tooltips, item, _("Builds the current file with the " - "make tool and the specified target"), NULL); - g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_make_activate), GINT_TO_POINTER(1)); - - // DVI view - item = gtk_image_menu_item_new_with_mnemonic(_("View DVI file")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - if (keys[GEANY_KEYS_BUILD_RUN]->key) - gtk_widget_add_accelerator(item, "activate", accel_group, keys[GEANY_KEYS_BUILD_RUN]->key, - keys[GEANY_KEYS_BUILD_RUN]->mods, GTK_ACCEL_VISIBLE); - gtk_tooltips_set_tip(tooltips, item, _("Compiles and view the current file"), NULL); - image = gtk_image_new_from_stock("gtk-find", GTK_ICON_SIZE_MENU); - gtk_widget_show(image); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); - g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_tex_activate), GINT_TO_POINTER(2)); - - // PDF view - item = gtk_image_menu_item_new_with_mnemonic(_("View PDF file")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - if (keys[GEANY_KEYS_BUILD_RUN2]->key) - gtk_widget_add_accelerator(item, "activate", accel_group, keys[GEANY_KEYS_BUILD_RUN2]->key, - keys[GEANY_KEYS_BUILD_RUN2]->mods, GTK_ACCEL_VISIBLE); - gtk_tooltips_set_tip(tooltips, item, _("Compiles and view the current file"), NULL); - image = gtk_image_new_from_stock("gtk-find", GTK_ICON_SIZE_MENU); - gtk_widget_show(image); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); - g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_tex_activate), GINT_TO_POINTER(3)); - - // separator - separator = gtk_separator_menu_item_new(); - gtk_widget_show(separator); - gtk_container_add(GTK_CONTAINER(menu), separator); - gtk_widget_set_sensitive(separator, FALSE); - - // arguments - item = gtk_image_menu_item_new_with_mnemonic(_("Set Arguments")); - gtk_widget_show(item); - if (keys[GEANY_KEYS_BUILD_OPTIONS]->key) - gtk_widget_add_accelerator(item, "activate", accel_group, keys[GEANY_KEYS_BUILD_OPTIONS]->key, - keys[GEANY_KEYS_BUILD_OPTIONS]->mods, GTK_ACCEL_VISIBLE); - gtk_container_add(GTK_CONTAINER(menu), item); - gtk_tooltips_set_tip(tooltips, item, - _("Sets the program paths and arguments"), NULL); - image = gtk_image_new_from_stock("gtk-preferences", GTK_ICON_SIZE_MENU); - gtk_widget_show(image); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); - g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_tex_arguments_activate), NULL); - - gtk_window_add_accel_group(GTK_WINDOW(app->window), accel_group); - - return menu; -} - - -void dialogs_create_recent_menu(void) -{ - GtkWidget *recent_menu = lookup_widget(app->window, "recent_files1_menu"); - GtkWidget *tmp; - guint i; - gchar *filename; - - if (g_queue_get_length(app->recent_queue) == 0) - { - gtk_widget_set_sensitive(lookup_widget(app->window, "recent_files1"), FALSE); - return; - } - - for (i = 0; i < MIN(app->mru_length, g_queue_get_length(app->recent_queue)); - i++) - { - filename = g_queue_peek_nth(app->recent_queue, i); - tmp = gtk_menu_item_new_with_label(filename); - gtk_widget_show(tmp); - gtk_menu_shell_append(GTK_MENU_SHELL(recent_menu), tmp); - g_signal_connect((gpointer) tmp, "activate", - G_CALLBACK(on_recent_file_activate), (gpointer) filename); - } -} - - void dialogs_show_input(const gchar *title, const gchar *label_text, const gchar *default_text, GCallback cb_dialog, GCallback cb_entry) { @@ -735,7 +553,7 @@ } -void dialogs_show_goto_line(void) +void dialogs_show_goto_line() { GtkWidget *dialog, *label, *entry; @@ -760,7 +578,7 @@ } -void dialogs_show_includes_arguments_tex(void) +void dialogs_show_includes_arguments_tex() { GtkWidget *dialog, *label, *entries[4]; gint idx = document_get_cur_idx(); @@ -867,7 +685,7 @@ } -void dialogs_show_includes_arguments_gen(void) +void dialogs_show_includes_arguments_gen() { GtkWidget *dialog, *label, *entries[3]; gint idx = document_get_cur_idx(); @@ -961,71 +779,6 @@ } -GtkWidget *dialogs_add_file_open_extra_widget(void) -{ - GtkWidget *vbox; - GtkWidget *lbox; - GtkWidget *ebox; - GtkWidget *hbox; - GtkWidget *file_entry; - GtkSizeGroup *size_group; - GtkWidget *align; - GtkWidget *check_hidden; - GtkWidget *filetype_label; - GtkWidget *filetype_combo; - GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(app->window, "tooltips")); - - vbox = gtk_vbox_new(FALSE, 6); - - align = gtk_alignment_new(1.0, 0.0, 0.0, 0.0); - check_hidden = gtk_check_button_new_with_mnemonic(_("Show _hidden files")); - gtk_widget_show(check_hidden); - gtk_container_add(GTK_CONTAINER(align), check_hidden); - gtk_box_pack_start(GTK_BOX(vbox), align, FALSE, FALSE, 0); - gtk_button_set_focus_on_click(GTK_BUTTON(check_hidden), FALSE); - - lbox = gtk_hbox_new(FALSE, 12); - file_entry = gtk_entry_new(); - gtk_widget_show(file_entry); - gtk_box_pack_start(GTK_BOX(lbox), file_entry, TRUE, TRUE, 0); - //gtk_editable_set_editable(GTK_EDITABLE(file_entry), FALSE); - gtk_entry_set_activates_default(GTK_ENTRY(file_entry), TRUE); - - // the ebox is for the tooltip, because gtk_combo_box doesn't show a tooltip for unknown reason - ebox = gtk_event_box_new(); - hbox = gtk_hbox_new(FALSE, 6); - filetype_label = gtk_label_new(_("Set filetype:")); - filetype_combo = gtk_combo_box_new_text(); - gtk_tooltips_set_tip(tooltips, ebox, - _("Explicitly defines a filetype for the file, if it would not be detected by filename extension.\nNote if you choose multiple files, they will all be opened with the chosen filetype."), NULL); - gtk_box_pack_start(GTK_BOX(hbox), filetype_label, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(hbox), filetype_combo, FALSE, FALSE, 0); - gtk_container_add(GTK_CONTAINER(ebox), hbox); - gtk_box_pack_start(GTK_BOX(lbox), ebox, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(vbox), lbox, FALSE, FALSE, 0); - gtk_widget_show_all(vbox); - - size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - gtk_size_group_add_widget(GTK_SIZE_GROUP(size_group), check_hidden); - gtk_size_group_add_widget(GTK_SIZE_GROUP(size_group), filetype_combo); - g_object_unref(G_OBJECT(size_group)); // auto destroy the size group - - g_signal_connect((gpointer) file_entry, "activate", - G_CALLBACK(on_file_open_entry_activate), NULL); - g_signal_connect((gpointer) check_hidden, "toggled", - G_CALLBACK(on_file_open_check_hidden_toggled), NULL); - - g_object_set_data_full(G_OBJECT(app->open_filesel), "file_entry", - gtk_widget_ref(file_entry), (GDestroyNotify)gtk_widget_unref); - g_object_set_data_full(G_OBJECT(app->open_filesel), "check_hidden", - gtk_widget_ref(check_hidden), (GDestroyNotify)gtk_widget_unref); - g_object_set_data_full(G_OBJECT(app->open_filesel), "filetype_combo", - gtk_widget_ref(filetype_combo), (GDestroyNotify)gtk_widget_unref); - - return vbox; -} - - void dialogs_show_file_properties(gint idx) { GtkWidget *dialog, *label, *table, *hbox, *image, *perm_table, *check; @@ -1456,7 +1209,7 @@ } -void dialogs_show_keyboard_shortcuts(void) +void dialogs_show_keyboard_shortcuts() { GtkWidget *dialog, *hbox, *label1, *label2, *label3, *swin; GString *text_names = g_string_sized_new(600); Modified: trunk/src/dialogs.h =================================================================== --- trunk/src/dialogs.h 2006-09-09 14:26:54 UTC (rev 806) +++ trunk/src/dialogs.h 2006-09-09 14:36:15 UTC (rev 807) @@ -25,7 +25,7 @@ #define GEANY_DIALOGS_H 1 /* This shows the file selection dialog to open a file. */ -void dialogs_show_open_file(void); +void dialogs_show_open_file(); /* This shows the file selection dialog to save a file. */ void dialogs_show_save_as(); @@ -37,29 +37,21 @@ gboolean dialogs_show_unsaved_file(gint idx); /* This shows the font selection dialog to choose a font. */ -void dialogs_show_open_font(void); +void dialogs_show_open_font(); -void dialogs_show_word_count(void); +void dialogs_show_word_count(); void dialogs_show_color(gchar *colour); -GtkWidget *dialogs_create_build_menu_gen(gint idx); - -GtkWidget *dialogs_create_build_menu_tex(gint idx); - void dialogs_show_input(const gchar *title, const gchar *label_text, const gchar *default_text, GCallback cb_dialog, GCallback cb_entry); -void dialogs_show_goto_line(void); +void dialogs_show_goto_line(); -void dialogs_show_includes_arguments_gen(void); +void dialogs_show_includes_arguments_gen(); -void dialogs_show_includes_arguments_tex(void); +void dialogs_show_includes_arguments_tex(); -void dialogs_create_recent_menu(void); - -GtkWidget *dialogs_add_file_open_extra_widget(void); - void dialogs_show_file_properties(gint idx); gboolean dialogs_show_question(const gchar *text, ...); @@ -68,6 +60,6 @@ gboolean dialogs_show_question_full(const gchar *yes_btn, const gchar *no_btn, const gchar *extra_text, const gchar *main_text, ...); -void dialogs_show_keyboard_shortcuts(void); +void dialogs_show_keyboard_shortcuts(); #endif Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2006-09-09 14:26:54 UTC (rev 806) +++ trunk/src/main.c 2006-09-09 14:36:15 UTC (rev 807) @@ -550,7 +550,7 @@ #ifdef HAVE_VTE vte_init(); #endif - dialogs_create_recent_menu(); + ui_create_recent_menu(); msgwin_status_add(_("This is Geany %s."), VERSION); if (config_dir_result != 0) Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2006-09-09 14:26:54 UTC (rev 806) +++ trunk/src/ui_utils.c 2006-09-09 14:36:15 UTC (rev 807) @@ -34,14 +34,20 @@ #include "utils.h" #include "callbacks.h" #include "encodings.h" -#include "dialogs.h" #include "images.c" #include "treeviews.h" +#include "keybindings.h" -static void ui_update_recent_menu(); +static void update_recent_menu(); +static void recreate_recent_menu(); +static void recent_file_loaded(const gchar *utf8_filename); +static void +recent_file_activate_cb (GtkMenuItem *menuitem, + gpointer user_data); -static void ui_recreate_recent_menu(); +static GtkWidget *create_build_menu_tex(gint idx); +static GtkWidget *create_build_menu_gen(gint idx); /* allow_override is TRUE if text can be ignored when another message has been set @@ -651,7 +657,7 @@ { if (ft->menu_items->menu == NULL) { - ft->menu_items->menu = dialogs_create_build_menu_gen(idx); + ft->menu_items->menu = create_build_menu_gen(idx); g_object_ref((gpointer)ft->menu_items->menu); // to hold it after removing } @@ -687,7 +693,7 @@ { if (ft->menu_items->menu == NULL) { - ft->menu_items->menu = dialogs_create_build_menu_tex(idx); + ft->menu_items->menu = create_build_menu_tex(idx); g_object_ref((gpointer)ft->menu_items->menu); // to hold it after removing } if (doc_list[idx].file_name == NULL) @@ -711,7 +717,7 @@ { if (ft->menu_items->menu == NULL) { - ft->menu_items->menu = dialogs_create_build_menu_gen(idx); + ft->menu_items->menu = create_build_menu_gen(idx); g_object_ref((gpointer)ft->menu_items->menu); // to hold it after removing } if (doc_list[idx].file_name == NULL) @@ -745,6 +751,230 @@ } +#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) + +static GtkWidget *create_build_menu_gen(gint idx) +{ + GtkWidget *menu, *item = NULL, *image, *separator; + GtkAccelGroup *accel_group = gtk_accel_group_new(); + GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(app->window, "tooltips")); + filetype *ft = doc_list[idx].file_type; + + menu = gtk_menu_new(); + + if (ft->menu_items->can_compile) + { + // compile the code + item = gtk_image_menu_item_new_with_mnemonic(_("_Compile")); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + gtk_tooltips_set_tip(tooltips, item, _("Compiles the current file"), NULL); + GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_COMPILE, item); + image = gtk_image_new_from_stock("gtk-convert", GTK_ICON_SIZE_MENU); + gtk_widget_show(image); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_compile_activate), NULL); + ft->menu_items->item_compile = item; + } + + if (ft->menu_items->can_link) + { // build the code + item = gtk_image_menu_item_new_with_mnemonic(_("_Build")); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + gtk_tooltips_set_tip(tooltips, item, + _("Builds the current file (generate an executable file)"), NULL); + GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_LINK, item); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_build_activate), NULL); + ft->menu_items->item_link = item; + } + + if (item != NULL) + { + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + } + + // build the code with make all + item = gtk_image_menu_item_new_with_mnemonic(_("_Make all")); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + gtk_tooltips_set_tip(tooltips, item, _("Builds the current file with the " + "make tool and the default target"), NULL); + GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_MAKE, item); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_make_activate), GINT_TO_POINTER(0)); + + // build the code with make + item = gtk_image_menu_item_new_with_mnemonic(_("Make custom _target")); + gtk_widget_show(item); + GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_MAKEOWNTARGET, item); + gtk_container_add(GTK_CONTAINER(menu), item); + gtk_tooltips_set_tip(tooltips, item, _("Builds the current file with the " + "make tool and the specified target"), NULL); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_make_activate), GINT_TO_POINTER(1)); + + // build the code with make object + item = gtk_image_menu_item_new_with_mnemonic(_("Make _object")); + gtk_widget_show(item); + GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_MAKEOBJECT, item); + gtk_container_add(GTK_CONTAINER(menu), item); + gtk_tooltips_set_tip(tooltips, item, _("Compiles the current file using the " + "make tool"), NULL); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_make_activate), GINT_TO_POINTER(2)); + + if (ft->menu_items->can_exec) + { // execute the code + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + + item = gtk_image_menu_item_new_from_stock("gtk-execute", accel_group); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + gtk_tooltips_set_tip(tooltips, item, _("Run or view the current file"), NULL); + GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_RUN, item); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_execute_activate), NULL); + ft->menu_items->item_exec = item; + } + + // arguments + if (ft->menu_items->can_compile || ft->menu_items->can_link || ft->menu_items->can_exec) + { + // separator + separator = gtk_separator_menu_item_new(); + gtk_widget_show(separator); + gtk_container_add(GTK_CONTAINER(menu), separator); + gtk_widget_set_sensitive(separator, FALSE); + + item = gtk_image_menu_item_new_with_mnemonic(_("_Set Includes and Arguments")); + gtk_widget_show(item); + GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_OPTIONS, item); + gtk_container_add(GTK_CONTAINER(menu), item); + gtk_tooltips_set_tip(tooltips, item, + _("Sets the includes and library paths for the compiler and " + "the program arguments for execution"), NULL); + image = gtk_image_new_from_stock("gtk-preferences", GTK_ICON_SIZE_MENU); + gtk_widget_show(image); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_arguments_activate), NULL); + } + + return menu; +} + + +static GtkWidget *create_build_menu_tex(gint idx) +{ + GtkWidget *menu, *item, *image, *separator; + GtkAccelGroup *accel_group = gtk_accel_group_new(); + GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(app->window, "tooltips")); + + menu = gtk_menu_new(); + + // DVI + item = gtk_image_menu_item_new_with_mnemonic(_("LaTeX -> DVI")); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + gtk_tooltips_set_tip(tooltips, item, _("Compiles the current file into a DVI file"), NULL); + if (keys[GEANY_KEYS_BUILD_COMPILE]->key) + gtk_widget_add_accelerator(item, "activate", accel_group, keys[GEANY_KEYS_BUILD_COMPILE]->key, + keys[GEANY_KEYS_BUILD_COMPILE]->mods, GTK_ACCEL_VISIBLE); + image = gtk_image_new_from_stock("gtk-convert", GTK_ICON_SIZE_MENU); + gtk_widget_show(image); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_tex_activate), GINT_TO_POINTER(0)); + + // PDF + item = gtk_image_menu_item_new_with_mnemonic(_("LaTeX -> PDF")); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + gtk_tooltips_set_tip(tooltips, item, _("Compiles the current file into a PDF file"), NULL); + if (keys[GEANY_KEYS_BUILD_LINK]->key) + gtk_widget_add_accelerator(item, "activate", accel_group, keys[GEANY_KEYS_BUILD_LINK]->key, + keys[GEANY_KEYS_BUILD_LINK]->mods, GTK_ACCEL_VISIBLE); + image = gtk_image_new_from_stock("gtk-convert", GTK_ICON_SIZE_MENU); + gtk_widget_show(image); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_tex_activate), GINT_TO_POINTER(1)); + + // build the code with make all + item = gtk_image_menu_item_new_with_mnemonic(_("Build with \"make\"")); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + gtk_tooltips_set_tip(tooltips, item, _("Builds the current file with the " + "make tool and the default target"), NULL); + if (keys[GEANY_KEYS_BUILD_MAKE]->key) + gtk_widget_add_accelerator(item, "activate", accel_group, keys[GEANY_KEYS_BUILD_MAKE]->key, + keys[GEANY_KEYS_BUILD_MAKE]->mods, GTK_ACCEL_VISIBLE); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_make_activate), GINT_TO_POINTER(0)); + + // build the code with make + item = gtk_image_menu_item_new_with_mnemonic(_("Build with make (custom target)")); + gtk_widget_show(item); + if (keys[GEANY_KEYS_BUILD_MAKEOWNTARGET]->key) + gtk_widget_add_accelerator(item, "activate", accel_group, keys[GEANY_KEYS_BUILD_MAKEOWNTARGET]->key, + keys[GEANY_KEYS_BUILD_MAKEOWNTARGET]->mods, GTK_ACCEL_VISIBLE); + gtk_container_add(GTK_CONTAINER(menu), item); + gtk_tooltips_set_tip(tooltips, item, _("Builds the current file with the " + "make tool and the specified target"), NULL); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_make_activate), GINT_TO_POINTER(1)); + + // DVI view + item = gtk_image_menu_item_new_with_mnemonic(_("View DVI file")); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + if (keys[GEANY_KEYS_BUILD_RUN]->key) + gtk_widget_add_accelerator(item, "activate", accel_group, keys[GEANY_KEYS_BUILD_RUN]->key, + keys[GEANY_KEYS_BUILD_RUN]->mods, GTK_ACCEL_VISIBLE); + gtk_tooltips_set_tip(tooltips, item, _("Compiles and view the current file"), NULL); + image = gtk_image_new_from_stock("gtk-find", GTK_ICON_SIZE_MENU); + gtk_widget_show(image); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_tex_activate), GINT_TO_POINTER(2)); + + // PDF view + item = gtk_image_menu_item_new_with_mnemonic(_("View PDF file")); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + if (keys[GEANY_KEYS_BUILD_RUN2]->key) + gtk_widget_add_accelerator(item, "activate", accel_group, keys[GEANY_KEYS_BUILD_RUN2]->key, + keys[GEANY_KEYS_BUILD_RUN2]->mods, GTK_ACCEL_VISIBLE); + gtk_tooltips_set_tip(tooltips, item, _("Compiles and view the current file"), NULL); + image = gtk_image_new_from_stock("gtk-find", GTK_ICON_SIZE_MENU); + gtk_widget_show(image); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_tex_activate), GINT_TO_POINTER(3)); + + // separator + separator = gtk_separator_menu_item_new(); + gtk_widget_show(separator); + gtk_container_add(GTK_CONTAINER(menu), separator); + gtk_widget_set_sensitive(separator, FALSE); + + // arguments + item = gtk_image_menu_item_new_with_mnemonic(_("Set Arguments")); + gtk_widget_show(item); + if (keys[GEANY_KEYS_BUILD_OPTIONS]->key) + gtk_widget_add_accelerator(item, "activate", accel_group, keys[GEANY_KEYS_BUILD_OPTIONS]->key, + keys[GEANY_KEYS_BUILD_OPTIONS]->mods, GTK_ACCEL_VISIBLE); + gtk_container_add(GTK_CONTAINER(menu), item); + gtk_tooltips_set_tip(tooltips, item, + _("Sets the program paths and arguments"), NULL); + image = gtk_image_new_from_stock("gtk-preferences", GTK_ICON_SIZE_MENU); + gtk_widget_show(image); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_tex_arguments_activate), NULL); + + gtk_window_add_accel_group(GTK_WINDOW(app->window), accel_group); + + return menu; +} + + void ui_treeviews_show_hide(gboolean force) { GtkWidget *widget; @@ -934,23 +1164,79 @@ } -void ui_add_recent_file(const gchar *filename) +void ui_create_recent_menu() { - if (g_queue_find_custom(app->recent_queue, filename, (GCompareFunc) strcmp) == NULL) + GtkWidget *recent_menu = lookup_widget(app->window, "recent_files1_menu"); + GtkWidget *tmp; + guint i; + gchar *filename; + + if (g_queue_get_length(app->recent_queue) == 0) { - g_queue_push_head(app->recent_queue, g_strdup(filename)); + gtk_widget_set_sensitive(lookup_widget(app->window, "recent_files1"), FALSE); + return; + } + + for (i = 0; i < MIN(app->mru_length, g_queue_get_length(app->recent_queue)); + i++) + { + filename = g_queue_peek_nth(app->recent_queue, i); + tmp = gtk_menu_item_new_with_label(filename); + gtk_widget_show(tmp); + gtk_menu_shell_append(GTK_MENU_SHELL(recent_menu), tmp); + g_signal_connect((gpointer) tmp, "activate", + G_CALLBACK(recent_file_activate_cb), (gpointer) filename); + } +} + + +static void +recent_file_activate_cb (GtkMenuItem *menuitem, + gpointer user_data) +{ + gchar *locale_filename = utils_get_locale_from_utf8((gchar*) user_data); + + document_open_file(-1, locale_filename, 0, FALSE, NULL, NULL); + recent_file_loaded((gchar*) user_data); + + g_free(locale_filename); +} + + +void ui_add_recent_file(const gchar *utf8_filename) +{ + if (g_queue_find_custom(app->recent_queue, utf8_filename, (GCompareFunc) strcmp) == NULL) + { + g_queue_push_head(app->recent_queue, g_strdup(utf8_filename)); if (g_queue_get_length(app->recent_queue) > app->mru_length) { g_free(g_queue_pop_tail(app->recent_queue)); } - ui_update_recent_menu(); + update_recent_menu(); } - else ui_recent_file_loaded(filename); // filename already in recent list + else recent_file_loaded(utf8_filename); // filename already in recent list } -static void ui_update_recent_menu() +static void recent_file_loaded(const gchar *utf8_filename) { + GList *item = + g_queue_find_custom(app->recent_queue, utf8_filename, (GCompareFunc) strcmp); + gchar *data; + + g_return_if_fail(item != NULL); + // first reorder the queue + data = item->data; + g_queue_remove(app->recent_queue, data); + g_queue_push_head(app->recent_queue, data); + + // now recreate the recent files menu + recreate_recent_menu(); +} + + +static void update_recent_menu() +{ GtkWidget *recent_menu = lookup_widget(app->window, "recent_files1_menu"); GtkWidget *recent_files_item = lookup_widget(app->window, "recent_files1"); GtkWidget *tmp; @@ -984,11 +1270,11 @@ gtk_widget_show(tmp); gtk_menu_shell_prepend(GTK_MENU_SHELL(recent_menu), tmp); g_signal_connect((gpointer) tmp, "activate", - G_CALLBACK(on_recent_file_activate), (gpointer) filename); + G_CALLBACK(recent_file_activate_cb), (gpointer) filename); } -static void ui_recreate_recent_menu() +static void recreate_recent_menu() { GList *item, *children; void *data; @@ -1003,27 +1289,10 @@ if (! GTK_IS_MENU_ITEM(data)) continue; gtk_widget_destroy(GTK_WIDGET(data)); } - dialogs_create_recent_menu(); + ui_create_recent_menu(); } -void ui_recent_file_loaded(const gchar *filename) -{ - GList *item = - g_queue_find_custom(app->recent_queue, filename, (GCompareFunc) strcmp); - gchar *data; - - g_return_if_fail(item != NULL); - // first reorder the queue - data = item->data; - g_queue_remove(app->recent_queue, data); - g_queue_push_head(app->recent_queue, data); - - // now recreate the recent files menu - ui_recreate_recent_menu(); -} - - void ui_show_markers_margin() { gint i, idx, max = gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)); Modified: trunk/src/ui_utils.h =================================================================== --- trunk/src/ui_utils.h 2006-09-09 14:26:54 UTC (rev 806) +++ trunk/src/ui_utils.h 2006-09-09 14:36:15 UTC (rev 807) @@ -85,9 +85,9 @@ GtkWidget *ui_new_image_from_inline(gint img, gboolean small_img); -void ui_add_recent_file(const gchar *filename); +void ui_create_recent_menu(); -void ui_recent_file_loaded(const gchar *filename); +void ui_add_recent_file(const gchar *utf8_filename); void ui_show_markers_margin(); 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 September 2006